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/font.bib128
-rw-r--r--Master/texmf-dist/bibtex/bib/oberdiek/oberdiek-bundle.bib14
-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/bibtex/bst/iran-bibtex/iran-unsrt.bst6
-rw-r--r--Master/texmf-dist/bibtex/bst/iran-bibtex/iran-year.bst6
-rw-r--r--Master/texmf-dist/bibtex/bst/iran-bibtex/iran.bst6
-rw-r--r--Master/texmf-dist/bibtex/bst/iran-bibtex/iranlatin-unsrt.bst6
-rw-r--r--Master/texmf-dist/bibtex/bst/iran-bibtex/iranlatin-year.bst6
-rw-r--r--Master/texmf-dist/bibtex/bst/iran-bibtex/iranlatin.bst6
-rw-r--r--Master/texmf-dist/doc/bibtex/iran-bibtex/README.md8
-rw-r--r--Master/texmf-dist/doc/bibtex/iran-bibtex/iran-bibtex-pattern.pdfbin91245 -> 91432 bytes
-rw-r--r--Master/texmf-dist/doc/bibtex/iran-bibtex/iran-bibtex-pattern.tex2
-rw-r--r--Master/texmf-dist/doc/bibtex/iran-bibtex/iran-bibtex-userguide-fa.pdfbin62291 -> 62994 bytes
-rw-r--r--Master/texmf-dist/doc/bibtex/iran-bibtex/iran-bibtex-userguide-fa.tex35
-rw-r--r--Master/texmf-dist/doc/context/third/chat/LICENSE232
-rw-r--r--Master/texmf-dist/doc/context/third/chat/README.md72
-rw-r--r--Master/texmf-dist/doc/context/third/chat/VERSION1
-rw-r--r--Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdfbin13867 -> 13875 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/bonum-otf/Changes1
-rw-r--r--Master/texmf-dist/doc/fonts/bonum-otf/README.md13
-rw-r--r--Master/texmf-dist/doc/fonts/bonum-otf/bonum-otf-doc.pdfbin0 -> 479640 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/bonum-otf/bonum-otf-doc.tex900
-rw-r--r--Master/texmf-dist/doc/fonts/junicode/Feature_Reference.tex419
-rw-r--r--Master/texmf-dist/doc/fonts/junicode/GettingStarted.tex2
-rw-r--r--Master/texmf-dist/doc/fonts/junicode/JunicodeManual.pdfbin1978610 -> 2001745 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/junicode/JunicodeManual.sty1
-rw-r--r--Master/texmf-dist/doc/fonts/junicode/JunicodeManual.tex4
-rw-r--r--Master/texmf-dist/doc/fonts/junicode/README14
-rw-r--r--Master/texmf-dist/doc/fonts/junicode/Specimens.tex2
-rw-r--r--Master/texmf-dist/doc/fonts/junicode/encoded-glyphs.tex2
-rw-r--r--Master/texmf-dist/doc/fonts/junicode/junicode-samples.pdfbin164380 -> 289841 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/junicode/upperpua.tex242
-rw-r--r--Master/texmf-dist/doc/fonts/junicodevf/About.tex2
-rw-r--r--Master/texmf-dist/doc/fonts/junicodevf/EnlargeAxis.tex2
-rw-r--r--Master/texmf-dist/doc/fonts/junicodevf/Feature_Reference.tex479
-rw-r--r--Master/texmf-dist/doc/fonts/junicodevf/GettingStarted.tex6
-rw-r--r--Master/texmf-dist/doc/fonts/junicodevf/JunicodeManual.pdfbin1895371 -> 2001745 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/junicodevf/JunicodeManual.sty25
-rw-r--r--Master/texmf-dist/doc/fonts/junicodevf/JunicodeManual.tex4
-rw-r--r--Master/texmf-dist/doc/fonts/junicodevf/README41
-rw-r--r--Master/texmf-dist/doc/fonts/junicodevf/Specimens.tex2
-rw-r--r--Master/texmf-dist/doc/fonts/junicodevf/encoded-glyphs.tex2
-rw-r--r--Master/texmf-dist/doc/fonts/junicodevf/in_tex.tex8
-rw-r--r--Master/texmf-dist/doc/fonts/junicodevf/junicodevf-samples.pdfbin513977 -> 514430 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/junicodevf/junicodevf-samples.tex1
-rw-r--r--Master/texmf-dist/doc/fonts/junicodevf/tag_key_ins.tex229
-rw-r--r--Master/texmf-dist/doc/fonts/junicodevf/upperpua.tex242
-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/README.md7
-rw-r--r--Master/texmf-dist/doc/fonts/luwiantype/luwiantype-doc.pdfbin126322 -> 126315 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/luwiantype/luwiantype-doc.tex11
-rw-r--r--Master/texmf-dist/doc/fonts/mfb-oldstyle/COPYING125
-rw-r--r--Master/texmf-dist/doc/fonts/mfb-oldstyle/MFBOldStyle-CharacterMap.pdfbin0 -> 2033443 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/mfb-oldstyle/README9
-rw-r--r--Master/texmf-dist/doc/fonts/mfb-oldstyle/mfb-oldstyle-doc.pdfbin0 -> 31692 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/mfb-oldstyle/mfb-oldstyle-doc.tex50
-rw-r--r--Master/texmf-dist/doc/fonts/niceframe-type1/README.md7
-rw-r--r--Master/texmf-dist/doc/fonts/simpleicons/bindings.tex12
-rw-r--r--Master/texmf-dist/doc/fonts/simpleicons/simpleicons.pdfbin2545130 -> 2547538 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/simpleicons/simpleicons.tex2
-rw-r--r--Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdfbin208890 -> 208887 bytes
-rw-r--r--Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex2
-rw-r--r--Master/texmf-dist/doc/generic/babel-french/frenchb.pdfbin345846 -> 346426 bytes
-rw-r--r--Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md11
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/README.md6
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/bibtex/bibtex-changes.hntbin620020 -> 650920 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/bibtex/bibtex.hntbin745144 -> 745156 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/ctie/ctie-changes.hntbin444867 -> 475238 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/ctie/ctie.hntbin453833 -> 453836 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/common-changes.hntbin476784 -> 507140 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/common.hntbin549042 -> 549045 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/ctangle-changes.hntbin470989 -> 501348 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/ctangle.hntbin487785 -> 487788 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/ctwill.hntbin828110 -> 828080 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/cweave-changes.hntbin568458 -> 598996 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/cweave.hntbin712514 -> 712517 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/cwebman.hntbin731032 -> 731284 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/refsort-changes.hntbin383053 -> 413131 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/refsort.hntbin418765 -> 418770 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/twinx-changes.hntbin393438 -> 423493 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/cweb/twinx.hntbin394206 -> 394204 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.eight.hntbin806105 -> 806109 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.eleven.hntbin824007 -> 824009 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.five.hntbin789103 -> 789108 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.four.hntbin948479 -> 948482 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.hntbin904965 -> 904968 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.nine.hntbin407766 -> 407770 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.one.hntbin733431 -> 733434 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.seven.hntbin741534 -> 741537 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.six.hntbin909786 -> 909790 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.ten.hntbin1057095 -> 1057100 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.three.hntbin1158523 -> 1158528 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.twelve.hntbin1107166 -> 1107170 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errata.two.hntbin728926 -> 728931 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/errata/errorlog.hntbin601777 -> 601778 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/etc/vftovp-changes.hntbin402211 -> 432681 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/etc/vftovp.hntbin519878 -> 519883 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/etc/vptovf-changes.hntbin391090 -> 421471 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/etc/vptovf.hntbin588023 -> 588033 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/hitex/hitex.hntbin2128059 -> 2128057 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/index.html36
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/index.pdfbin151802 -> 219819 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mf/mf-changes.hntbin817883 -> 848680 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mf/mf.hntbin1568599 -> 1568604 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mf/trapman.hntbin466175 -> 466177 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mfware/gftodvi-changes.hntbin510409 -> 540919 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mfware/gftodvi.hntbin696325 -> 696334 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mfware/gftopk-changes.hntbin411326 -> 441699 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mfware/gftopk.hntbin492258 -> 492262 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mfware/gftype-changes.hntbin406825 -> 437232 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mfware/gftype.hntbin503518 -> 503522 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mfware/mft-changes.hntbin444596 -> 502125 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mfware/mft.hntbin523645 -> 523649 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mp/mp.hntbin1818565 -> 1818564 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/mp/mpost.hntbin497733 -> 497741 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/other/dvicopy-changes.hntbin480015 -> 510576 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/other/dvicopy.hntbin703121 -> 703131 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/other/patgen-changes.hntbin346856 -> 377108 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/other/patgen.hntbin502625 -> 502631 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/other/pktogf-changes.hntbin376122 -> 406520 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/other/pktogf.hntbin451060 -> 451060 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/other/pktype-changes.hntbin368455 -> 398816 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/other/pktype.hntbin397404 -> 397405 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/pdftex/pdftex-changes.hntbin1286651 -> 1320442 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/pdftex/pdftex.hntbin2182740 -> 2183435 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/tex/glue.hntbin437653 -> 437662 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/tex/tex-changes.hntbin1029743 -> 1061983 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/tex/tex.hntbin1625074 -> 1625073 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/tex/tripman.hntbin450713 -> 450717 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/texware/dvitype-changes.hntbin429279 -> 459810 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/texware/dvitype.hntbin590266 -> 590270 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/texware/pltotf-changes.hntbin386777 -> 417163 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/texware/pltotf.hntbin561616 -> 561623 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/texware/pooltype-changes.hntbin400727 -> 430904 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/texware/pooltype.hntbin403340 -> 403340 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/texware/tftopl-changes.hntbin385411 -> 415810 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/texware/tftopl.hntbin487806 -> 487811 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/tie/tie-changes.hntbin444032 -> 474265 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/tie/tie.hntbin522888 -> 522888 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/web/tangle-changes.hntbin453283 -> 483758 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/web/tangle.hntbin591493 -> 591499 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/web/twill.hntbin675856 -> 709431 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/web/weave-changes.hntbin488689 -> 519088 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/web/weave.hntbin654030 -> 654043 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/web/webman.hntbin585159 -> 585589 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/xetex/xetex-changes.pdfbin2344346 -> 2356516 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-hint/xetex/xetex.pdfbin4251718 -> 4251884 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.pdfbin629416 -> 629366 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/bibtex/bibtex.pdfbin1327941 -> 1327857 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/ctie/ctie-changes.pdfbin145326 -> 145252 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/ctie/ctie.pdfbin283980 -> 283853 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/common-changes.pdfbin231562 -> 231550 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/common.pdfbin364470 -> 364355 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctangle-changes.pdfbin225044 -> 224964 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctangle.pdfbin381756 -> 381615 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/ctwill.pdfbin1147761 -> 1147677 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/cweave-changes.pdfbin417800 -> 417717 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/cweave.pdfbin838763 -> 838509 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/cwebman.pdfbin357792 -> 365896 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/refsort-changes.pdfbin52986 -> 52905 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/refsort.pdfbin162976 -> 162724 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/twinx-changes.pdfbin86829 -> 86727 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/cweb/twinx.pdfbin194209 -> 194074 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.pdfbin368795 -> 368747 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.pdfbin413920 -> 413862 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.pdfbin216902 -> 216848 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/etc/vftovp.pdfbin461387 -> 461221 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/etc/vptovf-changes.pdfbin202774 -> 202680 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/etc/vptovf.pdfbin556019 -> 555804 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/hitex/hitex.pdfbin4392280 -> 4391869 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/index.html31
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/index.pdfbin151266 -> 219474 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mf/mf-changes.pdfbin1216755 -> 1218699 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mf/mf.pdfbin3231757 -> 3231039 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.pdfbin280945 -> 280788 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftodvi.pdfbin705180 -> 705007 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftopk-changes.pdfbin148214 -> 148184 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftopk.pdfbin370755 -> 370602 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftype-changes.pdfbin137496 -> 137441 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mfware/gftype.pdfbin327409 -> 327508 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mfware/mft-changes.pdfbin206765 -> 208171 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mfware/mft.pdfbin389351 -> 389219 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mp/mp.pdfbin4179204 -> 4180651 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/mp/mpost.pdfbin300726 -> 300582 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/other/dvicopy-changes.pdfbin318016 -> 317947 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/other/dvicopy.pdfbin789955 -> 789908 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/other/patgen-changes.pdfbin158662 -> 158583 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/other/patgen.pdfbin402456 -> 402321 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/other/pktogf-changes.pdfbin124016 -> 123929 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/other/pktogf.pdfbin318062 -> 317924 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/other/pktype-changes.pdfbin96842 -> 96771 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/other/pktype.pdfbin259019 -> 259109 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/pdftex/pdftex-changes.pdfbin2723866 -> 2726702 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/pdftex/pdftex.pdfbin5402637 -> 5404281 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/tex/glue.pdfbin198043 -> 197900 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/tex/tex-changes.pdfbin1869694 -> 1869636 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/tex/tex.pdfbin3614612 -> 3613764 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.pdfbin194586 -> 194452 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/texware/dvitype.pdfbin469704 -> 469821 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/texware/pltotf-changes.pdfbin179394 -> 179301 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/texware/pltotf.pdfbin474185 -> 474004 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/texware/pooltype-changes.pdfbin78866 -> 78771 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/texware/pooltype.pdfbin191709 -> 191809 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/texware/tftopl-changes.pdfbin160857 -> 160777 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/texware/tftopl.pdfbin360811 -> 360708 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/tie/tie-changes.pdfbin130255 -> 130163 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/tie/tie.pdfbin311712 -> 311577 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/web/tangle-changes.pdfbin262160 -> 262082 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/web/tangle.pdfbin580773 -> 580597 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/web/twill.pdfbin839862 -> 862529 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/web/weave-changes.pdfbin289149 -> 289087 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/web/weave.pdfbin765097 -> 764839 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/web/webman.pdfbin316276 -> 325263 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/xetex/xetex-changes.pdfbin2353558 -> 2353714 bytes
-rw-r--r--Master/texmf-dist/doc/generic/knuth-pdf/xetex/xetex.pdfbin4248217 -> 4248275 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-coil/Changes1
-rw-r--r--Master/texmf-dist/doc/generic/pst-coil/README2
-rw-r--r--Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.bib2
-rw-r--r--Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.pdfbin295379 -> 3748115 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.tex159
-rw-r--r--Master/texmf-dist/doc/generic/pst-diffraction/Changes3
-rw-r--r--Master/texmf-dist/doc/generic/pst-diffraction/README2
-rw-r--r--Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.pdfbin23100492 -> 23064303 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.tex12
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/CHANGELOG.md9
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/README.md2
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/expl3.pdfbin610536 -> 610110 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/interface3.pdfbin1800816 -> 1790077 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/interface3.tex2
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3doc.pdfbin565819 -> 565298 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3docstrip.pdfbin151530 -> 151011 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3news.pdfbin396223 -> 396223 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3news01.pdfbin122959 -> 122959 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3news02.pdfbin150919 -> 150919 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3news03.pdfbin148747 -> 148747 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3news04.pdfbin114754 -> 114754 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3news05.pdfbin112524 -> 112524 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3news06.pdfbin151591 -> 151591 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3news07.pdfbin128344 -> 128344 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3news08.pdfbin163484 -> 163484 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3news09.pdfbin250161 -> 250161 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3news10.pdfbin150302 -> 150302 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3news11.pdfbin170102 -> 170102 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3news12.pdfbin205020 -> 205020 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3prefixes.csv7
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3prefixes.pdfbin82843 -> 83064 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3styleguide.pdfbin296736 -> 296298 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3styleguide.tex2
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3syntax-changes.pdfbin231569 -> 231148 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3syntax-changes.tex2
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3term-glossary.pdfbin242363 -> 241946 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/l3term-glossary.tex2
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/source3.pdfbin7619159 -> 7610534 bytes
-rw-r--r--Master/texmf-dist/doc/latex-dev/l3kernel/source3.tex2
-rw-r--r--Master/texmf-dist/doc/latex/abraces/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/abraces/abraces-doc.pdfbin245502 -> 245461 bytes
-rw-r--r--Master/texmf-dist/doc/latex/abraces/abraces-doc.tex13
-rw-r--r--Master/texmf-dist/doc/latex/asmeconf/README.md30
-rw-r--r--Master/texmf-dist/doc/latex/asmeconf/asmeconf-sample.bib14
-rw-r--r--Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.pdfbin706754 -> 705662 bytes
-rw-r--r--Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.tex142
-rw-r--r--Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-fontspec.pdfbin369381 -> 39914315 bytes
-rw-r--r--Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-fontspec.tex75
-rw-r--r--Master/texmf-dist/doc/latex/asmejour/README.md10
-rw-r--r--Master/texmf-dist/doc/latex/asmejour/asmejour-sample.bib17
-rw-r--r--Master/texmf-dist/doc/latex/asmejour/asmejour-template.pdfbin729589 -> 728579 bytes
-rw-r--r--Master/texmf-dist/doc/latex/asmejour/asmejour-template.tex89
-rw-r--r--Master/texmf-dist/doc/latex/asmejour/asmewide_example/asmejour-wide-equation-examples.pdfbin2983602 -> 2982565 bytes
-rw-r--r--Master/texmf-dist/doc/latex/asmejour/asmewide_example/asmejour-wide-equation-examples.tex8
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-rainbow/beamertheme-rainbow-doc-settings.sty (renamed from Master/texmf-dist/tex/latex/beamertheme-rainbow/beamertheme-rainbow-doc-settings.sty)0
-rw-r--r--Master/texmf-dist/doc/latex/bib2qr/README.md88
-rw-r--r--Master/texmf-dist/doc/latex/bib2qr/bib2qr.pdfbin0 -> 508752 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdfbin306393 -> 305632 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex14
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.bib12
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.pdfbin402568 -> 404215 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.tex37
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-phys/biblatex-phys.bib6
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-phys/biblatex-phys.pdfbin448675 -> 482865 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-phys/biblatex-phys.tex34
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-publist/README5
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.pdfbin417904 -> 419434 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-publist/biblatex-publist.tex87
-rw-r--r--Master/texmf-dist/doc/latex/bxjatoucs/LICENSE2
-rw-r--r--Master/texmf-dist/doc/latex/bxjatoucs/README.md14
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/README-ja.md3
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/README.md1
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdfbin407611 -> 407675 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex4
-rw-r--r--Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdfbin884432 -> 887244 bytes
-rw-r--r--Master/texmf-dist/doc/latex/bxpdfver/LICENSE2
-rw-r--r--Master/texmf-dist/doc/latex/bxpdfver/README-ja.md60
-rw-r--r--Master/texmf-dist/doc/latex/bxpdfver/README.md48
-rw-r--r--Master/texmf-dist/doc/latex/changebar/CATALOG2
-rw-r--r--Master/texmf-dist/doc/latex/changebar/README2
-rw-r--r--Master/texmf-dist/doc/latex/changebar/changebar.bug4
-rw-r--r--Master/texmf-dist/doc/latex/changebar/changebar.pdfbin486497 -> 483890 bytes
-rw-r--r--Master/texmf-dist/doc/latex/circuitikz/changelog.tex34
-rw-r--r--Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdfbin2431321 -> 2451275 bytes
-rw-r--r--Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex182
-rw-r--r--Master/texmf-dist/doc/latex/citation-style-language/CHANGELOG.md19
-rw-r--r--Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.pdfbin235845 -> 240565 bytes
-rw-r--r--Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.tex82
-rw-r--r--Master/texmf-dist/doc/latex/cjs-rcs-article/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-article-fr.pdfbin120472 -> 120466 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-article.pdfbin190173 -> 190899 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-merlin.pdfbin38874 -> 38794 bytes
-rw-r--r--Master/texmf-dist/doc/latex/dashrulex/README.md12
-rw-r--r--Master/texmf-dist/doc/latex/dashrulex/dashrulex.pdfbin58940 -> 57722 bytes
-rw-r--r--Master/texmf-dist/doc/latex/dashrulex/dashrulex.tex42
-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/doibanner/README.md91
-rw-r--r--Master/texmf-dist/doc/latex/doibanner/doibanner.pdfbin0 -> 297278 bytes
-rw-r--r--Master/texmf-dist/doc/latex/easybook/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/easybook/easybook.pdfbin625940 -> 638367 bytes
-rw-r--r--Master/texmf-dist/doc/latex/easybook/easybook.tex172
-rw-r--r--Master/texmf-dist/doc/latex/fancyhdr/README2
-rw-r--r--Master/texmf-dist/doc/latex/fancyhdr/fancyhdr.pdfbin875225 -> 880898 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fillwith/MANIFEST.md54
-rw-r--r--Master/texmf-dist/doc/latex/fillwith/README.md32
-rw-r--r--Master/texmf-dist/doc/latex/fillwith/fillwith-example.pdfbin0 -> 116008 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fillwith/fillwith-example.tex71
-rw-r--r--Master/texmf-dist/doc/latex/fillwith/fillwith.pdfbin0 -> 513081 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/CHANGELOG.md54
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/README.txt2
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/beery.cls153
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-classic.tex39
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-font-steps.tex38
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-modular-musical.tex38
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/fontscale-manual.pdfbin117192 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/fontscale-manual.tex390
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/fontscale-table-classic.tex41
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/fontscale-table-font-steps.tex39
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/fontscale-table-musical.tex39
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/fontscale.pdfbin0 -> 104879 bytes
-rw-r--r--Master/texmf-dist/doc/latex/fontscale/fontscale.tex409
-rw-r--r--Master/texmf-dist/doc/latex/hebdomon/HebdomonGuide.pdfbin0 -> 544450 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hebdomon/HebdomonGuide.tex461
-rw-r--r--Master/texmf-dist/doc/latex/hebdomon/README.md18
-rw-r--r--Master/texmf-dist/doc/latex/hebdomon/figures/innsbruck.jpgbin0 -> 421584 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hypcap/README.md20
-rw-r--r--Master/texmf-dist/doc/latex/hypcap/hypcap.pdf (renamed from Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf)bin310655 -> 300905 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hypdestopt/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/hypdestopt/hypdestopt.dtx57
-rw-r--r--Master/texmf-dist/doc/latex/hypdestopt/hypdestopt.pdfbin323028 -> 347012 bytes
-rw-r--r--Master/texmf-dist/doc/latex/iwonamath/README7
-rw-r--r--Master/texmf-dist/doc/latex/iwonamath/iwonamath.pdfbin502258 -> 503042 bytes
-rw-r--r--Master/texmf-dist/doc/latex/iwonamath/sample.pdfbin382573 -> 379195 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jigsaw/jigsaw-doc-settings.sty (renamed from Master/texmf-dist/tex/latex/jigsaw/jigsaw-doc-settings.sty)0
-rw-r--r--Master/texmf-dist/doc/latex/jsonparse/README.md6
-rw-r--r--Master/texmf-dist/doc/latex/jsonparse/jason/jason.pdfbin214713 -> 3965 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jsonparse/jason/jason.svg88
-rw-r--r--Master/texmf-dist/doc/latex/jsonparse/jason/jason.tex289
-rw-r--r--Master/texmf-dist/doc/latex/jsonparse/jsonparse-doc.pdfbin578489 -> 430804 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jsonparse/jsonparse-doc.tex150
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md15
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/expl3.pdfbin610409 -> 610110 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/interface3.pdfbin1800435 -> 1790077 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/interface3.tex2
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3doc.pdfbin565557 -> 565298 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdfbin151323 -> 151011 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news.pdfbin396223 -> 396223 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news01.pdfbin122959 -> 122959 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news02.pdfbin150919 -> 150919 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news03.pdfbin148747 -> 148747 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news04.pdfbin114754 -> 114754 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news05.pdfbin112524 -> 112524 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news06.pdfbin151591 -> 151591 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news07.pdfbin128344 -> 128344 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news08.pdfbin163484 -> 163484 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news09.pdfbin250161 -> 250161 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news10.pdfbin150302 -> 150302 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news11.pdfbin170102 -> 170102 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3news12.pdfbin205020 -> 205020 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3prefixes.csv7
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3prefixes.pdfbin82843 -> 83064 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdfbin296602 -> 296298 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex2
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdfbin231447 -> 231148 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex2
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdfbin242247 -> 241946 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex2
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/source3.pdfbin7618338 -> 7610534 bytes
-rw-r--r--Master/texmf-dist/doc/latex/l3kernel/source3.tex2
-rw-r--r--Master/texmf-dist/doc/latex/lni/CHANGELOG.md15
-rw-r--r--Master/texmf-dist/doc/latex/lni/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/lni/lni.pdfbin377652 -> 377655 bytes
-rw-r--r--Master/texmf-dist/doc/latex/magicwatermark/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/magicwatermark/magicwatermark-en.pdfbin83023 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/magicwatermark/magicwatermark-en.tex212
-rw-r--r--Master/texmf-dist/doc/latex/magicwatermark/magicwatermark.pdfbin137623 -> 134525 bytes
-rw-r--r--Master/texmf-dist/doc/latex/magicwatermark/magicwatermark.tex373
-rw-r--r--Master/texmf-dist/doc/latex/mailing/CATALOG15
-rw-r--r--Master/texmf-dist/doc/latex/mailing/MANIFEST (renamed from Master/texmf-dist/doc/latex/mailing/manifest.txt)4
-rw-r--r--Master/texmf-dist/doc/latex/mailing/README14
-rw-r--r--Master/texmf-dist/doc/latex/mailing/mailing.pdfbin66516 -> 148418 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mathastext/ChangeLog.md109
-rw-r--r--Master/texmf-dist/doc/latex/mathastext/README.md158
-rw-r--r--Master/texmf-dist/doc/latex/mathastext/mathastext.pdfbin661328 -> 745164 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mathastext/mathastext.tex10
-rw-r--r--Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.tex265
-rw-r--r--Master/texmf-dist/doc/latex/mathastext/mathastexttestmathversions.tex43
-rw-r--r--Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodelinux.tex120
-rw-r--r--Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodemacos.tex124
-rw-r--r--Master/texmf-dist/doc/latex/mercatormap/CHANGES.md176
-rw-r--r--Master/texmf-dist/doc/latex/mercatormap/README43
-rw-r--r--Master/texmf-dist/doc/latex/mercatormap/README.md50
-rw-r--r--Master/texmf-dist/doc/latex/mercatormap/mercatormap-example.tex4
-rw-r--r--Master/texmf-dist/doc/latex/mercatormap/mercatormap.bib41
-rw-r--r--Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.animations.tex538
-rw-r--r--Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.definition.tex38
-rw-r--r--Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.drawing.tex62
-rw-r--r--Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.examples.tex28
-rw-r--r--Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.intro.tex6
-rw-r--r--Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.limitations.tex10
-rw-r--r--Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.maptiles.tex309
-rw-r--r--Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.marker.tex58
-rw-r--r--Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.orthodromes.tex118
-rw-r--r--Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.scales.tex20
-rw-r--r--Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.sty13
-rw-r--r--Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.versionhistory.tex50
-rw-r--r--Master/texmf-dist/doc/latex/mercatormap/mercatormap.pdfbin24872307 -> 23145514 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mercatormap/mercatormap.tex21
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-Thesis.pdfbin484515 -> 484200 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/MIT-Thesis.tex6
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/MIT-thesis-template/chapter1.tex4
-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.tex5
-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.tex2
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/README.md10
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/No_cc_license.pdfbin116903 -> 116979 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/One_author_one_degree.pdfbin118312 -> 118460 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/One_author_one_degree_two_departments.pdf (renamed from Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/Two_authors_one_degree_two_departments.pdf)bin132206 -> 118656 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/One_author_two_degrees.pdfbin118803 -> 118959 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/One_author_two_degrees_from_one_department.pdfbin118681 -> 118821 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/Two_authors_one_degree.pdfbin121664 -> 121794 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/Two_authors_two_degrees.pdfbin132021 -> 132181 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/One_author_one_degree_two_departments.tex (renamed from Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/Two_authors_one_degree_two_departments.tex)18
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/One_author_two_degrees.tex3
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/Two_authors_one_degree.tex13
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/Two_authors_two_degrees.tex9
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Defaultfonts.pdfbin482879 -> 480892 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Fira_Newtxsf.pdfbin350734 -> 349865 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Heros-Stix2.pdfbin153678 -> 152948 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Libertine.pdfbin462305 -> 461124 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Lucida.pdfbin173819 -> 173088 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx-sans-text.pdfbin279552 -> 278894 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Newtx.pdfbin320853 -> 320084 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Stix2.pdfbin163413 -> 162721 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes-stix2.pdfbin165290 -> 164333 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/examples/font_samples/Termes.pdfbin161633 -> 160667 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.pdfbin108765 -> 108977 bytes
-rw-r--r--Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.tex33
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/CHANGELOG3
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/manual/moderncv_userguide.pdfbin123424 -> 123425 bytes
-rw-r--r--Master/texmf-dist/doc/latex/moderncv/manual/moderncv_userguide.tex4
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/README.md6
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdfbin321667 -> 321663 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdfbin525958 -> 525977 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/centernot.pdfbin304565 -> 304565 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/chemarr.pdfbin318494 -> 318494 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/classlist.pdfbin298087 -> 298081 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/colonequals.pdfbin311530 -> 311533 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdfbin297233 -> 297233 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/engord.pdfbin347368 -> 347368 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/enparen.pdfbin332193 -> 332199 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/eolgrab.pdfbin346528 -> 346528 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/fibnum.pdfbin387246 -> 387246 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/flags.pdfbin311381 -> 311381 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdfbin333733 -> 333733 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdfbin317462 -> 317462 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/hypgotoe.pdfbin313697 -> 313697 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/hyphsubst.pdfbin328780 -> 328780 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdfbin292642 -> 292642 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/iflang.pdfbin344768 -> 344771 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdfbin277944 -> 272940 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.pdfbin348838 -> 348838 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdfcolparcolumns.pdfbin336523 -> 336523 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdfbin337837 -> 337837 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/protecteddef.pdfbin336483 -> 336480 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/resizegather.pdfbin543911 -> 543911 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/rotchiffre.pdfbin345328 -> 345313 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/scrindex.pdfbin309276 -> 309292 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdfbin358522 -> 358447 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/settobox-example.tex2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/settobox.pdfbin321376 -> 321375 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/stackrel.pdfbin310389 -> 310389 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/stampinclude.pdfbin304745 -> 304749 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/tabularht.pdfbin359268 -> 359270 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdfbin280523 -> 280523 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/thepdfnumber.pdfbin377485 -> 377482 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/twoopt.pdfbin301484 -> 301484 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pagelayout/README.md14
-rw-r--r--Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.pdfbin75292 -> 75391 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.tex2
-rw-r--r--Master/texmf-dist/doc/latex/pagelayout/tests.zipbin2916987 -> 2920530 bytes
-rw-r--r--Master/texmf-dist/doc/latex/passopt/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/passopt/passopt.pdfbin52267 -> 52494 bytes
-rw-r--r--Master/texmf-dist/doc/latex/passopt/passopt.tex9
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/README10
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_name.tex2
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgfPTmanual.macros.tex29
-rw-r--r--Master/texmf-dist/doc/latex/pgf-periodictable/pgf-PeriodicTableManual.pdfbin7570685 -> 7558395 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pgfornament/README.md5
-rw-r--r--Master/texmf-dist/doc/latex/pgfornament/ornaments.pdfbin1377881 -> 1352275 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pgfornament/ornaments.tex4
-rw-r--r--Master/texmf-dist/doc/latex/pgfornament/usefulcommands.tex6
-rw-r--r--Master/texmf-dist/doc/latex/pgfplotsthemebeamer/DEPENDS.txt3
-rw-r--r--Master/texmf-dist/doc/latex/pgfplotsthemebeamer/README.md39
-rw-r--r--Master/texmf-dist/doc/latex/pgfplotsthemebeamer/pgfplotsthemebeamer-doc-settings.sty200
-rw-r--r--Master/texmf-dist/doc/latex/pgfplotsthemebeamer/pgfplotsthemebeamer-doc.pdfbin0 -> 150527 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pgfplotsthemebeamer/pgfplotsthemebeamer-doc.tex119
-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 -> 146661 bytes
-rw-r--r--Master/texmf-dist/doc/latex/polyomino/README.md25
-rw-r--r--Master/texmf-dist/doc/latex/polyomino/polyomino.pdfbin0 -> 109235 bytes
-rw-r--r--Master/texmf-dist/doc/latex/polyomino/polyomino.tex278
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdfbin40800 -> 40803 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdfbin201562 -> 201562 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdfbin197818 -> 197818 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdfbin295212 -> 295212 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdfbin285559 -> 285559 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdfbin198959 -> 198959 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdfbin198796 -> 198796 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdfbin210970 -> 210970 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdfbin198303 -> 198303 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdfbin201445 -> 201445 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdfbin285501 -> 285501 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdfbin278069 -> 278069 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdfbin276219 -> 276219 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdfbin292435 -> 292435 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdfbin286624 -> 286624 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdfbin288122 -> 288122 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdfbin204669 -> 204669 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdfbin212239 -> 212239 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdfbin284580 -> 284580 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdfbin36941 -> 36941 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdfbin310601 -> 310601 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdfbin288795 -> 288795 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdfbin199919 -> 199919 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdfbin23444 -> 23442 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdfbin175645 -> 175645 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdfbin32049 -> 32049 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdfbin289211 -> 289211 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdfbin200045 -> 200045 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdfbin199281 -> 199281 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdfbin177110 -> 177110 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdfbin199684 -> 199684 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdfbin198615 -> 198615 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdfbin198673 -> 198673 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdfbin198798 -> 198798 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdfbin214375 -> 214375 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdfbin210491 -> 210491 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdfbin204973 -> 204973 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdfbin298425 -> 298425 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdfbin204015 -> 204015 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdfbin225554 -> 225554 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdfbin251039 -> 251039 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdfbin202382 -> 202382 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdfbin198565 -> 198565 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdfbin302779 -> 302779 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdfbin206948 -> 206948 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdfbin194201 -> 194201 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/migration.pdfbin368433 -> 368426 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/reledmac.pdfbin2162033 -> 2161963 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/reledpar.pdfbin1041243 -> 1040784 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reptheorem/reptheorem.pdfbin271120 -> 274602 bytes
-rw-r--r--Master/texmf-dist/doc/latex/rpgicons/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/rpgicons/rpgicons-doc.pdfbin500755 -> 500161 bytes
-rw-r--r--Master/texmf-dist/doc/latex/rpgicons/rpgicons-doc.tex5
-rw-r--r--Master/texmf-dist/doc/latex/se2thesis/CHANGELOG.md35
-rw-r--r--Master/texmf-dist/doc/latex/se2thesis/se2thesis-master-thesis-example.pdfbin231943 -> 232002 bytes
-rw-r--r--Master/texmf-dist/doc/latex/se2thesis/se2thesis.pdfbin362248 -> 366813 bytes
-rw-r--r--Master/texmf-dist/doc/latex/sillypage/sillypage-example.pdfbin104340 -> 104340 bytes
-rw-r--r--Master/texmf-dist/doc/latex/sillypage/sillypage.pdfbin220111 -> 222678 bytes
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md9
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdfbin645802 -> 645632 bytes
-rw-r--r--Master/texmf-dist/doc/latex/siunitx/siunitx.pdfbin703908 -> 703909 bytes
-rw-r--r--Master/texmf-dist/doc/latex/subeqn/CATALOG17
-rw-r--r--Master/texmf-dist/doc/latex/subeqn/MANIFEST19
-rw-r--r--Master/texmf-dist/doc/latex/subeqn/README14
-rw-r--r--Master/texmf-dist/doc/latex/subeqn/manifest.txt16
-rw-r--r--Master/texmf-dist/doc/latex/subeqn/subeqn-sample.pdfbin0 -> 80142 bytes
-rw-r--r--Master/texmf-dist/doc/latex/subeqn/subeqn-sample.tex (renamed from Master/texmf-dist/doc/latex/subeqn/subeqn.tex)34
-rw-r--r--Master/texmf-dist/doc/latex/subeqn/subeqn.pdfbin91698 -> 216768 bytes
-rw-r--r--Master/texmf-dist/doc/latex/subeqnarray/CATALOG17
-rw-r--r--Master/texmf-dist/doc/latex/subeqnarray/MANIFEST (renamed from Master/texmf-dist/doc/latex/subeqnarray/manifest.txt)8
-rw-r--r--Master/texmf-dist/doc/latex/subeqnarray/README16
-rw-r--r--Master/texmf-dist/doc/latex/subeqnarray/subeqnarray-sample.pdfbin0 -> 68356 bytes
-rw-r--r--Master/texmf-dist/doc/latex/subeqnarray/subeqnarray-sample.tex (renamed from Master/texmf-dist/doc/latex/subeqnarray/subeqnarray.tex)28
-rw-r--r--Master/texmf-dist/doc/latex/subeqnarray/subeqnarray.pdfbin126532 -> 212013 bytes
-rw-r--r--Master/texmf-dist/doc/latex/supertabular/CATALOG6
-rw-r--r--Master/texmf-dist/doc/latex/supertabular/MANIFEST6
-rw-r--r--Master/texmf-dist/doc/latex/supertabular/README4
-rw-r--r--Master/texmf-dist/doc/latex/supertabular/supertabular.bug (renamed from Master/texmf-dist/doc/latex/supertabular/ChangeLog)69
-rw-r--r--Master/texmf-dist/doc/latex/supertabular/supertabular.pdfbin254349 -> 291267 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tablvar/README.md6
-rw-r--r--Master/texmf-dist/doc/latex/tablvar/tablvar.pdfbin271901 -> 351117 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/ex-AF-file.pdf56
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/ex-alt-actualtext.pdfbin34295 -> 34295 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/ex-attribute.pdf14
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/ex-formula-problem.pdf14
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/ex-list.pdf14
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/ex-mc-manual-para-split-obsolete.pdf14
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/ex-softhyphen.pdf14
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/ex-spaceglyph-listings.pdf14
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/ex-structure-obsolete.pdf14
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/ex-tagpdf-template.pdf16
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/link-figure-input.tex6
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/pac2024-report.pngbin0 -> 60301 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/pac2024-version.pngbin0 -> 29032 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.pdfbin1716291 -> 1737121 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/tagpdf.pdfbin1172067 -> 1124473 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/tagpdf.tex75
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/tagpdfsetup-keys.tex3
-rw-r--r--Master/texmf-dist/doc/latex/telprint/README.md13
-rw-r--r--Master/texmf-dist/doc/latex/telprint/telprint.pdf (renamed from Master/texmf-dist/doc/latex/oberdiek/telprint.pdf)bin331190 -> 329028 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tikzbricks/tikzbricks-doc-settings.sty (renamed from Master/texmf-dist/tex/latex/tikzbricks/tikzbricks-doc-settings.sty)0
-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/tramlines/README5
-rw-r--r--Master/texmf-dist/doc/latex/tramlines/tramlines-documentation.pdfbin58619 -> 60656 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tramlines/tramlines-documentation.tex17
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/README13
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-deutsch.pdfbin132715 -> 132716 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-english.pdfbin127940 -> 127947 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-deutsch.pdfbin201365 -> 201366 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-english.pdfbin200965 -> 200967 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-deutsch.pdfbin172559 -> 172712 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-english.pdfbin167650 -> 167812 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-poster-deutsch.pdfbin227173 -> 227180 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-poster-english.pdfbin224980 -> 224983 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.pdfbin167845 -> 190497 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.tex4
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.pdfbin164309 -> 186645 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.tex4
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.pdfbin250473 -> 250474 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-review.pdfbin250364 -> 250365 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdfbin461504 -> 461588 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.tex7
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.pdfbin450479 -> 450553 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.tex7
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdfbin458946 -> 459207 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.tex7
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-poster.pdfbin457385 -> 457851 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-poster.tex7
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdfbin462064 -> 462143 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.tex7
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdfbin349412 -> 350542 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.tex12
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling.pdfbin365693 -> 365821 bytes
-rw-r--r--Master/texmf-dist/doc/latex/univie-ling/univie-ling.tex2
-rw-r--r--Master/texmf-dist/doc/latex/ut-thesis/README21
-rw-r--r--Master/texmf-dist/doc/latex/ut-thesis/ut-thesis.pdfbin135197 -> 135618 bytes
-rw-r--r--Master/texmf-dist/doc/latex/wheelchart/README.md6
-rw-r--r--Master/texmf-dist/doc/latex/wheelchart/wheelchart.pdfbin1198147 -> 1198402 bytes
-rw-r--r--Master/texmf-dist/doc/latex/wheelchart/wheelchart.tex21
-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/luacensor/OFL.txt93
-rw-r--r--Master/texmf-dist/doc/lualatex/luacensor/README.txt (renamed from Master/texmf-dist/doc/lualatex/luacensor/README)7
-rw-r--r--Master/texmf-dist/doc/lualatex/luacensor/luacensor-documentation.pdf (renamed from Master/texmf-dist/doc/lualatex/luacensor/luacensor.pdf)bin158771 -> 159364 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/luacensor/luacensor-documentation.tex (renamed from Master/texmf-dist/doc/lualatex/luacensor/luacensor.tex)10
-rw-r--r--Master/texmf-dist/doc/lualatex/piton/piton-french.pdf4401
-rw-r--r--Master/texmf-dist/doc/lualatex/piton/piton-french.tex1567
-rw-r--r--Master/texmf-dist/doc/lualatex/piton/piton.pdf22461
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/README13
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/tango-en.pdfbin160181 -> 160307 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/tango-en.tex32
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/tango-fr.pdfbin170145 -> 169741 bytes
-rw-r--r--Master/texmf-dist/doc/lualatex/tango/tango-fr.tex45
-rw-r--r--Master/texmf-dist/doc/luatex/luamplib/NEWS41
-rw-r--r--Master/texmf-dist/doc/luatex/luamplib/luamplib.pdfbin234171 -> 255981 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex74
-rw-r--r--Master/texmf-dist/doc/luatex/luamplib/test-luamplib-plain.tex44
-rw-r--r--Master/texmf-dist/doc/man/man1/citeproc-lua.12
-rw-r--r--Master/texmf-dist/doc/man/man1/citeproc-lua.man1.pdfbin14880 -> 14871 bytes
-rw-r--r--Master/texmf-dist/doc/man/man1/dviasm.man1.pdfbin25361 -> 25451 bytes
-rw-r--r--Master/texmf-dist/doc/man/man1/pagelayoutapi.man1.pdfbin23520 -> 23603 bytes
-rw-r--r--Master/texmf-dist/doc/man/man1/textestvis.man1.pdfbin19758 -> 19847 bytes
-rw-r--r--Master/texmf-dist/doc/plain/pwebmac/README.md2
-rw-r--r--Master/texmf-dist/doc/plain/pwebmac/editorsnote.tex22
-rw-r--r--Master/texmf-dist/doc/plain/pwebmac/index.md17
-rw-r--r--Master/texmf-dist/doc/plain/pwebmac/makeall380
-rw-r--r--Master/texmf-dist/doc/plain/pwebmac/webman.ch82
-rw-r--r--Master/texmf-dist/doc/platex/pxjahyper/LICENSE2
-rw-r--r--Master/texmf-dist/doc/platex/pxjahyper/README-ja.md8
-rw-r--r--Master/texmf-dist/doc/platex/pxjahyper/README.md1
-rw-r--r--Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.pdfbin155428 -> 165718 bytes
-rw-r--r--Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex115
-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.pdfbin1274095 -> 1274961 bytes
-rw-r--r--Master/texmf-dist/doc/support/texplate/README.md75
-rw-r--r--Master/texmf-dist/doc/support/texplate/texplate-manual.pdfbin105290 -> 105697 bytes
-rw-r--r--Master/texmf-dist/doc/support/texplate/texplate-manual.tex20
-rw-r--r--Master/texmf-dist/dvips/pst-coil/pst-coil.pro21
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_2eszu7.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_2hbdle.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_2j6faw.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_2qiiap.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_3erjze.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_4er2ou.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_4nafnj.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_4vrfuq.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_4vsefk.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_535mcm.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_5eobdx.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_5g5vl7.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_5nplrd.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_6kirfz.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_6mzsut.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_7lzoym.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_7sifzs.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_7wd7je.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_alnhow.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_atb2gm.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_c4gqgp.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_d7xkyr.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_dbackh.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_dw56zz.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_dxxiiy.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_dydq3d.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_e2angy.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_eb524t.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_fhg7wq.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_fjcuys.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_gktvs3.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_hwfs67.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_ifhpre.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_ilb24p.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_jp6lmu.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_la6rhc.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_ldcvmr.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_m67s2q.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_ncilqg.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_nghkwv.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_nqur7h.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_p7ome7.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_pm4uzf.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_qigq3r.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_qrjy3o.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_qs7fbx.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_r7dcdh.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_rhm4ae.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_rvrggq.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_rx5biu.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_sa5d62.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_sct77m.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_soeko7.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_t7d4ag.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_tbdiwj.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_tugio2.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_u6d4hm.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_uqxpwn.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_vai6ks.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_vv455d.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_wkwe3q.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_wusj3d.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_wwi77p.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_wydlop.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_y2gbot.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_y74d4a.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_yql4fv.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_yur7kb.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_z4lkq6.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/junicode/jncd_zbxsaf.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_2k4lec.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_2r5ytu.enc67
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_5lrov3.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_6mghgo.enc68
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_73nks5.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_777sfz.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_7nlkbe.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_7q6l4s.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_ahcimn.enc68
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_bgdhbr.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_cgi3xl.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_cwrjrk.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_e5y2zy.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_fy4cgk.enc68
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_hi6bgi.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_ikcbof.enc67
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_in623c.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_jaulpu.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_kod5rh.enc68
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_kosxnn.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_nduqlz.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_nrcrlb.enc67
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_oyw33c.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_q4fonx.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_qmdrba.enc68
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_radqz3.enc68
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_rxfd27.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_s7hq75.enc68
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_sbbrr6.enc68
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_traljt.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_uyp43f.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_wvbwpg.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_x5sf3h.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_xkajg4.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_xqrvjh.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_xx37di.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_y2ngde.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_y57hi6.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_ybcvk5.enc65
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_yjlipp.enc64
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_ztec7x.enc68
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconseight.enc10
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsfive.enc2
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsnine.enc10
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsoneone.enc10
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonethree.enc12
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonetwo.enc10
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonezero.enc10
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsseven.enc8
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconssix.enc2
-rw-r--r--Master/texmf-dist/fonts/map/dvips/junicode/Junicode.map1028
-rw-r--r--Master/texmf-dist/fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map106
-rw-r--r--Master/texmf-dist/fonts/map/dvips/niceframe-type1/niceframe.map2
-rw-r--r--Master/texmf-dist/fonts/map/dvips/updmap/ps2pk.map107
-rw-r--r--Master/texmf-dist/fonts/map/dvips/updmap/psfonts.map107
-rw-r--r--Master/texmf-dist/fonts/map/dvips/updmap/psfonts_pk.map107
-rw-r--r--Master/texmf-dist/fonts/map/dvips/updmap/psfonts_t1.map107
-rw-r--r--Master/texmf-dist/fonts/map/pdftex/updmap/pdftex.map107
-rw-r--r--Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_dl14.map107
-rw-r--r--Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_ndl14.map107
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Bold.otfbin957084 -> 979176 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-BoldItalic.otfbin984728 -> 1006260 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Cond.otfbin955056 -> 980740 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondItalic.otfbin999296 -> 1020988 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondLight.otfbin979384 -> 1002296 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondLightItalic.otfbin1008028 -> 1027564 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondMedium.otfbin1001164 -> 1023876 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondMediumItalic.otfbin1046064 -> 1066348 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Exp.otfbin956508 -> 980844 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpBold.otfbin984656 -> 1007396 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpBoldItalic.otfbin1018996 -> 1039800 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpItalic.otfbin1006468 -> 1025420 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpMedium.otfbin996692 -> 1019620 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpMediumItalic.otfbin1049848 -> 1068884 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpSmBold.otfbin1002372 -> 1025656 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpSmBoldItalic.otfbin1052580 -> 1072308 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Italic.otfbin955892 -> 972912 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Light.otfbin949216 -> 971728 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-LightItalic.otfbin979904 -> 999996 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Medium.otfbin985336 -> 1010804 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-MediumItalic.otfbin1006524 -> 1027148 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Regular.otfbin945380 -> 968168 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmBold.otfbin991928 -> 1017924 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmBoldItalic.otfbin1004616 -> 1023288 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCond.otfbin980936 -> 1005596 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondItalic.otfbin1001008 -> 1020892 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondLight.otfbin991316 -> 1012596 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondLightItalic.otfbin1017440 -> 1038676 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondMedium.otfbin1005232 -> 1027940 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondMediumItalic.otfbin1032180 -> 1052328 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExp.otfbin977040 -> 1000868 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpBold.otfbin992884 -> 1017828 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpBoldItalic.otfbin1030044 -> 1048932 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpItalic.otfbin993884 -> 1014456 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpMedium.otfbin1002056 -> 1026148 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpMediumItalic.otfbin1030180 -> 1049548 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpSmBold.otfbin1011364 -> 1033160 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpSmBoldItalic.otfbin1050312 -> 1070864 bytes
-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/mfb-oldstyle/MFBOldstyle-Bold.otfbin0 -> 80732 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/mfb-oldstyle/MFBOldstyle-Italic.otfbin0 -> 83352 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/mfb-oldstyle/MFBOldstyle-Regular.otfbin0 -> 115964 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/simpleicons/SimpleIcons.otfbin2462528 -> 2465024 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/bxjatoucs/bxjatoucs-tojis.tfmbin0 -> 94324 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-ly1.tfmbin79272 -> 79272 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-ot1.tfmbin21376 -> 21376 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-sc-ly1.tfmbin69364 -> 69364 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-sc-ot1.tfmbin17996 -> 17996 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-sc-t1.tfmbin95796 -> 95796 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-t1.tfmbin107888 -> 107888 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-ly1.tfmbin79172 -> 79172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-ot1.tfmbin21336 -> 21336 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-sc-ly1.tfmbin69200 -> 69200 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-sc-ot1.tfmbin17932 -> 17932 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-sc-t1.tfmbin95556 -> 95556 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-t1.tfmbin107740 -> 107740 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-ly1.tfmbin78888 -> 78888 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-ot1.tfmbin21128 -> 21128 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-sc-ly1.tfmbin68984 -> 68984 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-sc-ot1.tfmbin17744 -> 17744 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-sc-t1.tfmbin95428 -> 95428 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-t1.tfmbin107516 -> 107516 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-ly1.tfmbin78652 -> 78652 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-ot1.tfmbin20988 -> 20988 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-sc-ly1.tfmbin68676 -> 68676 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-sc-ot1.tfmbin17576 -> 17576 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-sc-t1.tfmbin95060 -> 95060 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-t1.tfmbin107244 -> 107244 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-inf-ly1.tfmbin2088 -> 2084 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-inf-ot1.tfmbin1624 -> 1620 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-inf-t1--base.tfmbin2016 -> 2012 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-inf-t1.tfmbin2020 -> 2016 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-lf-ly1.tfmbin76788 -> 76784 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-lf-ot1.tfmbin22524 -> 22520 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-lf-t1--base.tfmbin2008 -> 2004 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-lf-t1.tfmbin113196 -> 113192 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-lgr.tfmbin3604 -> 3600 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-ly1.tfmbin75728 -> 75712 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-ot1.tfmbin21968 -> 21960 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-lgr.tfmbin3536 -> 3536 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-ly1--base.tfmbin2048 -> 2044 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-ly1.tfmbin63404 -> 63400 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-ot1--base.tfmbin1580 -> 1584 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-ot1.tfmbin15460 -> 15464 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-t1--base.tfmbin1960 -> 1960 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-t1.tfmbin97716 -> 97716 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-t1--base.tfmbin2024 -> 2012 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-t1.tfmbin111924 -> 111912 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-sup-ly1.tfmbin2112 -> 2112 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-sup-ot1.tfmbin1628 -> 1628 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-sup-t1--base.tfmbin2088 -> 2088 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-sup-t1.tfmbin2092 -> 2092 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tlf-ly1.tfmbin75452 -> 75448 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tlf-ot1.tfmbin21736 -> 21732 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tlf-t1--base.tfmbin1992 -> 1988 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tlf-t1.tfmbin111648 -> 111644 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tosf-ly1.tfmbin75444 -> 75440 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tosf-ot1.tfmbin21732 -> 21728 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tosf-t1--base.tfmbin1988 -> 1984 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tosf-t1.tfmbin111644 -> 111640 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-ly1.tfmbin82068 -> 82068 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-ot1.tfmbin21648 -> 21648 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-sc-ly1.tfmbin72504 -> 72504 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-sc-ot1.tfmbin18024 -> 18024 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-sc-t1.tfmbin99776 -> 99776 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-t1.tfmbin112464 -> 112464 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-ly1.tfmbin81916 -> 81916 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-ot1.tfmbin21576 -> 21576 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-sc-ly1.tfmbin72300 -> 72300 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-sc-ot1.tfmbin17952 -> 17952 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-sc-t1.tfmbin99520 -> 99520 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-t1.tfmbin112256 -> 112256 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-ly1.tfmbin81688 -> 81688 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-ot1.tfmbin21396 -> 21396 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-sc-ly1.tfmbin72132 -> 72132 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-sc-ot1.tfmbin17776 -> 17776 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-sc-t1.tfmbin99412 -> 99412 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-t1.tfmbin112096 -> 112096 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-ly1.tfmbin81416 -> 81416 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-ot1.tfmbin21244 -> 21244 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-sc-ly1.tfmbin71812 -> 71812 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-sc-ot1.tfmbin17628 -> 17628 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-sc-t1.tfmbin99056 -> 99056 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-t1.tfmbin111784 -> 111784 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-inf-ly1.tfmbin2076 -> 2076 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-inf-ot1.tfmbin1624 -> 1624 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-inf-t1--base.tfmbin2000 -> 2000 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-inf-t1.tfmbin2004 -> 2004 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-lf-ly1.tfmbin78028 -> 78028 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-lf-ot1.tfmbin22228 -> 22228 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-lf-t1--base.tfmbin2016 -> 2016 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-lf-t1.tfmbin114980 -> 114980 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-lgr.tfmbin3688 -> 3688 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-ly1.tfmbin77108 -> 77116 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-ot1.tfmbin21736 -> 21736 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-lgr.tfmbin3572 -> 3560 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-ly1--base.tfmbin2068 -> 2068 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-ly1.tfmbin62588 -> 62588 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-ot1--base.tfmbin1620 -> 1616 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-ot1.tfmbin15376 -> 15372 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-t1--base.tfmbin1980 -> 1980 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-t1.tfmbin96308 -> 96308 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-t1--base.tfmbin2008 -> 2016 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-t1.tfmbin113896 -> 113904 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-sup-ly1.tfmbin2096 -> 2100 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-sup-ot1.tfmbin1632 -> 1636 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-sup-t1--base.tfmbin2076 -> 2080 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-sup-t1.tfmbin2080 -> 2084 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tlf-ly1.tfmbin76852 -> 76852 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tlf-ot1.tfmbin21512 -> 21512 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tlf-t1--base.tfmbin1992 -> 1992 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tlf-t1.tfmbin113640 -> 113640 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tosf-ly1.tfmbin76848 -> 76848 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tosf-ot1.tfmbin21512 -> 21512 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tosf-t1--base.tfmbin1988 -> 1988 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tosf-t1.tfmbin113636 -> 113636 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-ly1.tfmbin86732 -> 86732 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-ot1.tfmbin22996 -> 22996 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-sc-ly1.tfmbin73844 -> 73844 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-sc-ot1.tfmbin18548 -> 18548 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-sc-t1.tfmbin103380 -> 103380 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-t1.tfmbin121224 -> 121224 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-ly1.tfmbin86532 -> 86532 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-ot1.tfmbin22908 -> 22908 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-sc-ly1.tfmbin73612 -> 73612 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-sc-ot1.tfmbin18480 -> 18480 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-sc-t1.tfmbin103088 -> 103088 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-t1.tfmbin120956 -> 120956 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-ly1.tfmbin86364 -> 86364 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-ot1.tfmbin22748 -> 22748 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-sc-ly1.tfmbin73472 -> 73472 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-sc-ot1.tfmbin18300 -> 18300 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-sc-t1.tfmbin103020 -> 103020 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-t1.tfmbin120860 -> 120860 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-ly1.tfmbin86032 -> 86032 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-ot1.tfmbin22568 -> 22568 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-sc-ly1.tfmbin73092 -> 73092 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-sc-ot1.tfmbin18124 -> 18124 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-sc-t1.tfmbin102592 -> 102592 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-t1.tfmbin120472 -> 120472 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-inf-ly1.tfmbin2116 -> 2116 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-inf-ot1.tfmbin1648 -> 1648 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-inf-t1--base.tfmbin2048 -> 2048 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-inf-t1.tfmbin2052 -> 2052 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-lf-ly1.tfmbin74204 -> 74204 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-lf-ot1.tfmbin21748 -> 21748 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-lf-t1--base.tfmbin2072 -> 2072 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-lf-t1.tfmbin108344 -> 108344 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-lgr.tfmbin3656 -> 3664 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-ly1.tfmbin73412 -> 73428 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-ot1.tfmbin21288 -> 21304 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-lgr.tfmbin3572 -> 3584 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-ly1--base.tfmbin2116 -> 2132 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-ly1.tfmbin61960 -> 61976 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-ot1--base.tfmbin1624 -> 1640 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-ot1.tfmbin15248 -> 15264 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-t1--base.tfmbin2020 -> 2036 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-t1.tfmbin93696 -> 93712 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-t1--base.tfmbin2064 -> 2080 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-t1.tfmbin107404 -> 107420 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-sup-ly1.tfmbin2148 -> 2152 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-sup-ot1.tfmbin1640 -> 1644 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-sup-t1--base.tfmbin2116 -> 2120 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-sup-t1.tfmbin2120 -> 2124 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tlf-ly1.tfmbin73152 -> 73152 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tlf-ot1.tfmbin21076 -> 21076 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tlf-t1--base.tfmbin2056 -> 2056 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tlf-t1.tfmbin107152 -> 107152 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tosf-ly1.tfmbin73156 -> 73156 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tosf-ot1.tfmbin21072 -> 21072 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tosf-t1--base.tfmbin2052 -> 2052 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tosf-t1.tfmbin107148 -> 107148 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-ly1.tfmbin85164 -> 85164 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-ot1.tfmbin22608 -> 22608 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-sc-ly1.tfmbin74464 -> 74464 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-sc-ot1.tfmbin18672 -> 18672 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-sc-t1.tfmbin103056 -> 103056 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-t1.tfmbin116832 -> 116832 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-ly1.tfmbin85016 -> 85016 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-ot1.tfmbin22540 -> 22540 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-sc-ly1.tfmbin74268 -> 74268 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-sc-ot1.tfmbin18616 -> 18616 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-sc-t1.tfmbin102808 -> 102808 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-t1.tfmbin116620 -> 116620 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-ly1.tfmbin84784 -> 84784 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-ot1.tfmbin22352 -> 22352 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-sc-ly1.tfmbin74088 -> 74088 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-sc-ot1.tfmbin18428 -> 18428 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-sc-t1.tfmbin102692 -> 102692 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-t1.tfmbin116460 -> 116460 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-ly1.tfmbin84516 -> 84516 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-ot1.tfmbin22200 -> 22200 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-sc-ly1.tfmbin73768 -> 73768 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-sc-ot1.tfmbin18276 -> 18276 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-sc-t1.tfmbin102332 -> 102332 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-t1.tfmbin116144 -> 116144 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-inf-ly1.tfmbin2112 -> 2108 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-inf-ot1.tfmbin1636 -> 1632 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-inf-t1--base.tfmbin2028 -> 2024 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-inf-t1.tfmbin2032 -> 2028 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-lf-ly1.tfmbin77000 -> 76996 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-lf-ot1.tfmbin22268 -> 22264 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-lf-t1--base.tfmbin2052 -> 2048 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-lf-t1.tfmbin113312 -> 113308 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-lgr.tfmbin3640 -> 3636 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-ly1.tfmbin76016 -> 76012 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-ot1.tfmbin21740 -> 21736 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-lgr.tfmbin3560 -> 3556 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-ly1--base.tfmbin2108 -> 2100 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-ly1.tfmbin63232 -> 63224 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-ot1--base.tfmbin1620 -> 1612 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-ot1.tfmbin15320 -> 15312 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-t1--base.tfmbin2000 -> 1996 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-t1.tfmbin97556 -> 97552 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-t1--base.tfmbin2060 -> 2060 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-t1.tfmbin112152 -> 112152 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-sup-ly1.tfmbin2168 -> 2172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-sup-ot1.tfmbin1652 -> 1656 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-sup-t1--base.tfmbin2120 -> 2124 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-sup-t1.tfmbin2124 -> 2128 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tlf-ly1.tfmbin75752 -> 75748 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tlf-ot1.tfmbin21520 -> 21516 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tlf-t1--base.tfmbin2032 -> 2028 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tlf-t1.tfmbin111888 -> 111884 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tosf-ly1.tfmbin75752 -> 75748 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tosf-ot1.tfmbin21516 -> 21512 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tosf-t1--base.tfmbin2032 -> 2028 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tosf-t1.tfmbin111888 -> 111884 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-ly1.tfmbin86720 -> 86720 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-ot1.tfmbin22564 -> 22564 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-sc-ly1.tfmbin76340 -> 76340 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-sc-ot1.tfmbin19256 -> 19256 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-sc-t1.tfmbin107012 -> 107012 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-t1.tfmbin120124 -> 120124 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-ly1.tfmbin86536 -> 86536 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-ot1.tfmbin22520 -> 22520 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-sc-ly1.tfmbin76040 -> 76040 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-sc-ot1.tfmbin19160 -> 19160 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-sc-t1.tfmbin106620 -> 106620 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-t1.tfmbin119864 -> 119864 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-ly1.tfmbin86332 -> 86332 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-ot1.tfmbin22308 -> 22308 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-sc-ly1.tfmbin75948 -> 75948 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-sc-ot1.tfmbin18996 -> 18996 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-sc-t1.tfmbin106632 -> 106632 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-t1.tfmbin119748 -> 119748 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-ly1.tfmbin86012 -> 86012 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-ot1.tfmbin22152 -> 22152 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-sc-ly1.tfmbin75528 -> 75528 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-sc-ot1.tfmbin18800 -> 18800 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-sc-t1.tfmbin106120 -> 106120 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-t1.tfmbin119356 -> 119356 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-ly1.tfmbin94180 -> 94180 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-ot1.tfmbin24584 -> 24584 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-sc-ly1.tfmbin82076 -> 82076 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-sc-ot1.tfmbin20596 -> 20596 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-sc-t1.tfmbin115700 -> 115700 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-t1.tfmbin130996 -> 130996 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-ly1.tfmbin93964 -> 93964 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-ot1.tfmbin24500 -> 24500 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-sc-ly1.tfmbin81792 -> 81792 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-sc-ot1.tfmbin20512 -> 20512 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-sc-t1.tfmbin115316 -> 115316 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-t1.tfmbin130680 -> 130680 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-ly1.tfmbin93796 -> 93796 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-ot1.tfmbin24328 -> 24328 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-sc-ly1.tfmbin81692 -> 81692 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-sc-ot1.tfmbin20336 -> 20336 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-sc-t1.tfmbin115324 -> 115324 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-t1.tfmbin130620 -> 130620 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-ly1.tfmbin93444 -> 93444 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-ot1.tfmbin24144 -> 24144 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-sc-ly1.tfmbin81264 -> 81264 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-sc-ot1.tfmbin20148 -> 20148 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-sc-t1.tfmbin114812 -> 114812 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-t1.tfmbin130180 -> 130180 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-inf-ly1.tfmbin2136 -> 2132 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-inf-ot1.tfmbin1632 -> 1628 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-inf-t1--base.tfmbin2036 -> 2032 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-inf-t1.tfmbin2040 -> 2036 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-lf-ly1.tfmbin79072 -> 79068 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-lf-ot1.tfmbin23072 -> 23068 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-lf-t1--base.tfmbin2068 -> 2064 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-lf-t1.tfmbin116300 -> 116296 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-lgr.tfmbin3688 -> 3688 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-ly1.tfmbin77984 -> 77980 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-ot1.tfmbin22508 -> 22500 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-lgr.tfmbin3604 -> 3608 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-ly1--base.tfmbin2108 -> 2120 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-ly1.tfmbin68204 -> 68216 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-ot1--base.tfmbin1612 -> 1616 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-ot1.tfmbin16280 -> 16284 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-t1--base.tfmbin2008 -> 2016 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-t1.tfmbin105176 -> 105184 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-t1--base.tfmbin2060 -> 2052 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-t1.tfmbin114984 -> 114976 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-sup-ly1.tfmbin2156 -> 2156 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-sup-ot1.tfmbin1624 -> 1624 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-sup-t1--base.tfmbin2088 -> 2088 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-sup-t1.tfmbin2092 -> 2092 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tlf-ly1.tfmbin77712 -> 77708 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tlf-ot1.tfmbin22272 -> 22268 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tlf-t1--base.tfmbin2036 -> 2032 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tlf-t1.tfmbin114712 -> 114708 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tosf-ly1.tfmbin77704 -> 77700 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tosf-ot1.tfmbin22268 -> 22264 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tosf-t1--base.tfmbin2028 -> 2024 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tosf-t1.tfmbin114704 -> 114700 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-inf-ly1.tfmbin2064 -> 2060 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-inf-ot1.tfmbin1580 -> 1576 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-inf-t1--base.tfmbin1984 -> 1980 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-inf-t1.tfmbin1988 -> 1984 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-lf-ly1.tfmbin76600 -> 76596 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-lf-ot1.tfmbin22160 -> 22156 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-lf-t1--base.tfmbin2000 -> 1996 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-lf-t1.tfmbin112176 -> 112172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-lgr.tfmbin3688 -> 3688 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-ly1.tfmbin75516 -> 75516 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-ot1.tfmbin21584 -> 21576 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-lgr.tfmbin3596 -> 3604 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-ly1--base.tfmbin2048 -> 2056 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-ly1.tfmbin64968 -> 64976 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-ot1--base.tfmbin1576 -> 1580 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-ot1.tfmbin15500 -> 15504 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-t1--base.tfmbin1952 -> 1960 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-t1.tfmbin99784 -> 99792 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-t1--base.tfmbin1992 -> 1992 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-t1.tfmbin110880 -> 110880 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-sup-ly1.tfmbin2124 -> 2124 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-sup-ot1.tfmbin1620 -> 1620 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-sup-t1--base.tfmbin2084 -> 2084 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-sup-t1.tfmbin2088 -> 2088 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tlf-ly1.tfmbin75264 -> 75260 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tlf-ot1.tfmbin21360 -> 21356 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tlf-t1--base.tfmbin1976 -> 1972 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tlf-t1.tfmbin110620 -> 110616 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tosf-ly1.tfmbin75252 -> 75248 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tosf-ot1.tfmbin21352 -> 21348 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tosf-t1--base.tfmbin1968 -> 1964 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tosf-t1.tfmbin110612 -> 110608 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-ly1.tfmbin88568 -> 88568 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-ot1.tfmbin23144 -> 23144 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-sc-ly1.tfmbin78072 -> 78072 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-sc-ot1.tfmbin19668 -> 19668 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-sc-t1.tfmbin108988 -> 108988 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-t1.tfmbin122668 -> 122668 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-ly1.tfmbin88368 -> 88368 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-ot1.tfmbin23072 -> 23072 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-sc-ly1.tfmbin77792 -> 77792 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-sc-ot1.tfmbin19588 -> 19588 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-sc-t1.tfmbin108608 -> 108608 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-t1.tfmbin122380 -> 122380 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-ly1.tfmbin88192 -> 88192 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-ot1.tfmbin22896 -> 22896 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-sc-ly1.tfmbin77696 -> 77696 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-sc-ot1.tfmbin19420 -> 19420 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-sc-t1.tfmbin108624 -> 108624 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-t1.tfmbin122304 -> 122304 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-ly1.tfmbin87832 -> 87832 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-ot1.tfmbin22704 -> 22704 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-sc-ly1.tfmbin77252 -> 77252 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-sc-ot1.tfmbin19216 -> 19216 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-sc-t1.tfmbin108092 -> 108092 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-t1.tfmbin121868 -> 121868 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-inf-ly1.tfmbin2100 -> 2096 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-inf-ot1.tfmbin1604 -> 1600 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-inf-t1--base.tfmbin2004 -> 2000 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-inf-t1.tfmbin2008 -> 2004 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-lf-ly1.tfmbin75556 -> 75552 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-lf-ot1.tfmbin22332 -> 22328 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-lf-t1--base.tfmbin2048 -> 2044 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-lf-t1.tfmbin110440 -> 110436 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-lgr.tfmbin3716 -> 3720 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-ly1.tfmbin74484 -> 74484 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-ot1.tfmbin21736 -> 21740 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-lgr.tfmbin3624 -> 3632 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-ly1--base.tfmbin2088 -> 2096 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-ly1.tfmbin64904 -> 64912 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-ot1--base.tfmbin1588 -> 1600 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-ot1.tfmbin15616 -> 15628 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-t1--base.tfmbin1988 -> 1996 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-t1.tfmbin98848 -> 98856 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-t1--base.tfmbin2028 -> 2028 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-t1.tfmbin109156 -> 109156 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-sup-ly1.tfmbin2164 -> 2160 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-sup-ot1.tfmbin1648 -> 1644 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-sup-t1--base.tfmbin2108 -> 2104 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-sup-t1.tfmbin2112 -> 2108 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tlf-ly1.tfmbin74224 -> 74220 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tlf-ot1.tfmbin21524 -> 21520 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tlf-t1--base.tfmbin2016 -> 2012 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tlf-t1.tfmbin108900 -> 108896 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tosf-ly1.tfmbin74216 -> 74212 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tosf-ot1.tfmbin21512 -> 21508 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tosf-t1--base.tfmbin2000 -> 1996 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tosf-t1.tfmbin108884 -> 108880 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-ly1.tfmbin92436 -> 92436 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-ot1.tfmbin24112 -> 24112 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-sc-ly1.tfmbin80660 -> 80660 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-sc-ot1.tfmbin20204 -> 20204 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-sc-t1.tfmbin112616 -> 112616 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-t1.tfmbin127940 -> 127940 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-ly1.tfmbin92224 -> 92224 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-ot1.tfmbin24040 -> 24040 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-sc-ly1.tfmbin80372 -> 80372 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-sc-ot1.tfmbin20124 -> 20124 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-sc-t1.tfmbin112232 -> 112232 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-t1.tfmbin127628 -> 127628 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-ly1.tfmbin92048 -> 92048 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-ot1.tfmbin23856 -> 23856 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-sc-ly1.tfmbin80268 -> 80268 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-sc-ot1.tfmbin19944 -> 19944 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-sc-t1.tfmbin112236 -> 112236 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-t1.tfmbin127564 -> 127564 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-ly1.tfmbin91688 -> 91688 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-ot1.tfmbin23668 -> 23668 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-sc-ly1.tfmbin79836 -> 79836 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-sc-ot1.tfmbin19752 -> 19752 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-sc-t1.tfmbin111720 -> 111720 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-t1.tfmbin127116 -> 127116 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-inf-ly1.tfmbin2124 -> 2120 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-inf-ot1.tfmbin1628 -> 1624 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-inf-t1--base.tfmbin2028 -> 2024 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-inf-t1.tfmbin2032 -> 2028 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-lf-ly1.tfmbin76884 -> 76880 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-lf-ot1.tfmbin22820 -> 22816 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-lf-t1--base.tfmbin2048 -> 2044 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-lf-t1.tfmbin113144 -> 113140 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-lgr.tfmbin3736 -> 3728 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-ly1.tfmbin75820 -> 75824 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-ot1.tfmbin22244 -> 22244 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-lgr.tfmbin3640 -> 3632 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ly1--base.tfmbin2112 -> 2108 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ly1.tfmbin65936 -> 65932 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ot1--base.tfmbin1616 -> 1608 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ot1.tfmbin15924 -> 15916 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-t1--base.tfmbin2008 -> 2000 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-t1.tfmbin101440 -> 101432 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-t1--base.tfmbin2048 -> 2048 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-t1.tfmbin111868 -> 111868 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-sup-ly1.tfmbin2160 -> 2160 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-sup-ot1.tfmbin1636 -> 1636 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-sup-t1--base.tfmbin2100 -> 2100 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-sup-t1.tfmbin2104 -> 2104 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tlf-ly1.tfmbin75548 -> 75544 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tlf-ot1.tfmbin22008 -> 22004 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tlf-t1--base.tfmbin2020 -> 2016 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tlf-t1.tfmbin111592 -> 111588 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tosf-ly1.tfmbin75540 -> 75536 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tosf-ot1.tfmbin22004 -> 22000 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tosf-t1--base.tfmbin2012 -> 2008 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tosf-t1.tfmbin111584 -> 111580 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-inf-ly1.tfmbin2040 -> 2036 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-inf-ot1.tfmbin1596 -> 1592 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-inf-t1--base.tfmbin1976 -> 1972 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-inf-t1.tfmbin1980 -> 1976 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-lf-ly1.tfmbin80436 -> 80432 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-lf-ot1.tfmbin22800 -> 22796 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-lf-t1--base.tfmbin1980 -> 1976 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-lf-t1.tfmbin119276 -> 119272 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-lgr.tfmbin3656 -> 3656 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-ly1.tfmbin79504 -> 79496 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-ot1.tfmbin22312 -> 22300 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-lgr.tfmbin3572 -> 3568 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-ly1--base.tfmbin2024 -> 2020 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-ly1.tfmbin64624 -> 64620 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-ot1--base.tfmbin1604 -> 1596 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-ot1.tfmbin15888 -> 15880 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-t1--base.tfmbin1980 -> 1968 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-t1.tfmbin99148 -> 99136 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-t1--base.tfmbin2000 -> 1984 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-t1.tfmbin118172 -> 118156 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-sup-ly1.tfmbin2092 -> 2092 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-sup-ot1.tfmbin1628 -> 1628 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-sup-t1--base.tfmbin2060 -> 2060 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-sup-t1.tfmbin2064 -> 2064 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tlf-ly1.tfmbin79228 -> 79224 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tlf-ot1.tfmbin22068 -> 22064 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tlf-t1--base.tfmbin1960 -> 1956 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tlf-t1.tfmbin117888 -> 117884 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tosf-ly1.tfmbin79228 -> 79224 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tosf-ot1.tfmbin22068 -> 22064 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tosf-t1--base.tfmbin1960 -> 1956 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tosf-t1.tfmbin117888 -> 117884 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-ly1.tfmbin83292 -> 83292 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-ot1.tfmbin21860 -> 21860 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-sc-ly1.tfmbin72444 -> 72444 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-sc-ot1.tfmbin18080 -> 18080 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-sc-t1.tfmbin101136 -> 101136 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-t1.tfmbin115008 -> 115008 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-ly1.tfmbin83108 -> 83108 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-ot1.tfmbin21804 -> 21804 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-sc-ly1.tfmbin72248 -> 72248 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-sc-ot1.tfmbin18024 -> 18024 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-sc-t1.tfmbin100880 -> 100880 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-t1.tfmbin114764 -> 114764 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-ly1.tfmbin82916 -> 82916 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-ot1.tfmbin21608 -> 21608 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-sc-ly1.tfmbin72060 -> 72060 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-sc-ot1.tfmbin17824 -> 17824 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-sc-t1.tfmbin100764 -> 100764 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-t1.tfmbin114644 -> 114644 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-ly1.tfmbin82568 -> 82568 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-ot1.tfmbin21436 -> 21436 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-sc-ly1.tfmbin71716 -> 71716 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-sc-ot1.tfmbin17660 -> 17660 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-sc-t1.tfmbin100368 -> 100368 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-t1.tfmbin114248 -> 114248 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-inf-ly1.tfmbin2104 -> 2100 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-inf-ot1.tfmbin1616 -> 1612 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-inf-t1--base.tfmbin2016 -> 2012 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-inf-t1.tfmbin2020 -> 2016 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-lf-ly1.tfmbin74640 -> 74636 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-lf-ot1.tfmbin21528 -> 21524 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-lf-t1--base.tfmbin2024 -> 2020 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-lf-t1.tfmbin110356 -> 110352 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-lgr.tfmbin3648 -> 3652 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-ly1.tfmbin73712 -> 73696 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-ot1.tfmbin21028 -> 21020 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-lgr.tfmbin3552 -> 3556 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-ly1--base.tfmbin2104 -> 2092 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-ly1.tfmbin62312 -> 62300 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-ot1--base.tfmbin1624 -> 1620 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-ot1.tfmbin15340 -> 15336 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-t1--base.tfmbin1996 -> 1992 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-t1.tfmbin94528 -> 94524 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-t1--base.tfmbin2032 -> 2024 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-t1.tfmbin109252 -> 109244 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-sup-ly1.tfmbin2144 -> 2140 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-sup-ot1.tfmbin1648 -> 1644 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-sup-t1--base.tfmbin2092 -> 2088 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-sup-t1.tfmbin2096 -> 2092 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tlf-ly1.tfmbin73440 -> 73436 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tlf-ot1.tfmbin20796 -> 20792 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tlf-t1--base.tfmbin2004 -> 2000 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tlf-t1.tfmbin108980 -> 108976 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tosf-ly1.tfmbin73436 -> 73432 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tosf-ot1.tfmbin20788 -> 20784 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tosf-t1--base.tfmbin2000 -> 1996 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tosf-t1.tfmbin108976 -> 108972 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-ly1.tfmbin83540 -> 83540 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-ot1.tfmbin22100 -> 22100 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-sc-ly1.tfmbin73216 -> 73216 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-sc-ot1.tfmbin18584 -> 18584 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-sc-t1.tfmbin101412 -> 101412 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-t1.tfmbin113812 -> 113812 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-ly1.tfmbin83472 -> 83472 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-ot1.tfmbin22096 -> 22096 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-sc-ly1.tfmbin73124 -> 73124 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-sc-ot1.tfmbin18588 -> 18588 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-sc-t1.tfmbin101276 -> 101276 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-t1.tfmbin113700 -> 113700 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-ly1.tfmbin83160 -> 83160 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-ot1.tfmbin21844 -> 21844 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-sc-ly1.tfmbin72836 -> 72836 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-sc-ot1.tfmbin18332 -> 18332 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-sc-t1.tfmbin101040 -> 101040 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-t1.tfmbin113440 -> 113440 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-ly1.tfmbin82920 -> 82920 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-ot1.tfmbin21712 -> 21712 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-sc-ly1.tfmbin72576 -> 72576 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-sc-ot1.tfmbin18212 -> 18212 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-sc-t1.tfmbin100756 -> 100756 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-t1.tfmbin113172 -> 113172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-inf-ly1.tfmbin2072 -> 2068 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-inf-ot1.tfmbin1616 -> 1612 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-inf-t1--base.tfmbin2000 -> 1996 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-inf-t1.tfmbin2004 -> 2000 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-lf-ly1.tfmbin80164 -> 80160 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-lf-ot1.tfmbin23124 -> 23120 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-lf-t1--base.tfmbin2016 -> 2012 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-lf-t1.tfmbin118216 -> 118212 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-lgr.tfmbin3696 -> 3692 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-ly1.tfmbin79108 -> 79100 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-ot1.tfmbin22548 -> 22540 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-lgr.tfmbin3616 -> 3620 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-ly1--base.tfmbin2068 -> 2068 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-ly1.tfmbin64528 -> 64528 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-ot1--base.tfmbin1592 -> 1592 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-ot1.tfmbin15728 -> 15728 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-t1--base.tfmbin1972 -> 1972 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-t1.tfmbin98380 -> 98380 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-t1--base.tfmbin2016 -> 2012 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-t1.tfmbin116956 -> 116952 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-sup-ly1.tfmbin2120 -> 2120 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-sup-ot1.tfmbin1628 -> 1628 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-sup-t1--base.tfmbin2080 -> 2080 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-sup-t1.tfmbin2084 -> 2084 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tlf-ly1.tfmbin78828 -> 78824 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tlf-ot1.tfmbin22316 -> 22312 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tlf-t1--base.tfmbin1996 -> 1992 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tlf-t1.tfmbin116688 -> 116684 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tosf-ly1.tfmbin78828 -> 78824 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tosf-ot1.tfmbin22308 -> 22304 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tosf-t1--base.tfmbin1988 -> 1984 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tosf-t1.tfmbin116680 -> 116676 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-ly1.tfmbin81204 -> 81204 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-ot1.tfmbin21408 -> 21408 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-sc-ly1.tfmbin71136 -> 71136 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-sc-ot1.tfmbin17912 -> 17912 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-sc-t1.tfmbin99004 -> 99004 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-t1.tfmbin110836 -> 110836 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-ly1.tfmbin81064 -> 81064 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-ot1.tfmbin21364 -> 21364 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-sc-ly1.tfmbin71000 -> 71000 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-sc-ot1.tfmbin17892 -> 17892 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-sc-t1.tfmbin98808 -> 98808 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-t1.tfmbin110640 -> 110640 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-ly1.tfmbin80808 -> 80808 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-ot1.tfmbin21144 -> 21144 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-sc-ly1.tfmbin70740 -> 70740 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-sc-ot1.tfmbin17652 -> 17652 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-sc-t1.tfmbin98624 -> 98624 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-t1.tfmbin110452 -> 110452 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-ly1.tfmbin80512 -> 80512 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-ot1.tfmbin20980 -> 20980 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-sc-ly1.tfmbin70444 -> 70444 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-sc-ot1.tfmbin17504 -> 17504 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-sc-t1.tfmbin98280 -> 98280 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-t1.tfmbin110112 -> 110112 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-ly1.tfmbin81504 -> 81504 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-ot1.tfmbin22080 -> 22080 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-sc-ly1.tfmbin71712 -> 71712 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-sc-ot1.tfmbin18496 -> 18496 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-sc-t1.tfmbin99152 -> 99152 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-t1.tfmbin110784 -> 110784 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-ly1.tfmbin81396 -> 81396 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-ot1.tfmbin22064 -> 22064 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-sc-ly1.tfmbin71552 -> 71552 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-sc-ot1.tfmbin18476 -> 18476 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-sc-t1.tfmbin98928 -> 98928 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-t1.tfmbin110620 -> 110620 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-ly1.tfmbin81120 -> 81120 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-ot1.tfmbin21832 -> 21832 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-sc-ly1.tfmbin71324 -> 71324 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-sc-ot1.tfmbin18240 -> 18240 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-sc-t1.tfmbin98776 -> 98776 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-t1.tfmbin110412 -> 110412 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-ly1.tfmbin80860 -> 80860 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-ot1.tfmbin21692 -> 21692 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-sc-ly1.tfmbin71012 -> 71012 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-sc-ot1.tfmbin18096 -> 18096 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-sc-t1.tfmbin98404 -> 98404 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-t1.tfmbin110108 -> 110108 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-inf-ly1.tfmbin2108 -> 2104 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-inf-ot1.tfmbin1636 -> 1632 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-inf-t1--base.tfmbin2028 -> 2024 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-inf-t1.tfmbin2032 -> 2028 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-lf-ly1.tfmbin79404 -> 79400 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-lf-ot1.tfmbin23204 -> 23200 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-lf-t1--base.tfmbin2044 -> 2040 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-lf-t1.tfmbin117656 -> 117652 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-lgr.tfmbin3640 -> 3636 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-ly1.tfmbin78336 -> 78328 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-ot1.tfmbin22636 -> 22624 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-lgr.tfmbin3588 -> 3580 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-ly1--base.tfmbin2116 -> 2104 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-ly1.tfmbin65428 -> 65416 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-ot1--base.tfmbin1620 -> 1612 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-ot1.tfmbin15776 -> 15768 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-t1--base.tfmbin2008 -> 2000 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-t1.tfmbin100608 -> 100600 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-t1--base.tfmbin2048 -> 2040 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-t1.tfmbin116380 -> 116372 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-sup-ly1.tfmbin2132 -> 2132 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-sup-ot1.tfmbin1632 -> 1632 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-sup-t1--base.tfmbin2084 -> 2084 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-sup-t1.tfmbin2088 -> 2088 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tlf-ly1.tfmbin78068 -> 78064 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tlf-ot1.tfmbin22404 -> 22400 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tlf-t1--base.tfmbin2024 -> 2020 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tlf-t1.tfmbin116112 -> 116108 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tosf-ly1.tfmbin78056 -> 78052 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tosf-ot1.tfmbin22400 -> 22396 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tosf-t1--base.tfmbin2016 -> 2012 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tosf-t1.tfmbin116104 -> 116100 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-ly1.tfmbin79392 -> 79392 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-ot1.tfmbin21308 -> 21308 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-sc-ly1.tfmbin71416 -> 71416 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-sc-ot1.tfmbin18044 -> 18044 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-sc-t1.tfmbin99064 -> 99064 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-t1.tfmbin107824 -> 107824 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-ly1.tfmbin79312 -> 79312 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-ot1.tfmbin21296 -> 21296 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-sc-ly1.tfmbin71312 -> 71312 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-sc-ot1.tfmbin18036 -> 18036 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-sc-t1.tfmbin98924 -> 98924 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-t1.tfmbin107712 -> 107712 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-ly1.tfmbin79004 -> 79004 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-ot1.tfmbin21056 -> 21056 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-sc-ly1.tfmbin71032 -> 71032 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-sc-ot1.tfmbin17796 -> 17796 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-sc-t1.tfmbin98700 -> 98700 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-t1.tfmbin107448 -> 107448 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-ly1.tfmbin78764 -> 78764 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-ot1.tfmbin20920 -> 20920 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-sc-ly1.tfmbin70768 -> 70768 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-sc-ot1.tfmbin17668 -> 17668 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-sc-t1.tfmbin98412 -> 98412 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-t1.tfmbin107188 -> 107188 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-inf-ly1.tfmbin2084 -> 2080 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-inf-ot1.tfmbin1628 -> 1624 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-inf-t1--base.tfmbin2028 -> 2024 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-inf-t1.tfmbin2032 -> 2028 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-lf-ly1.tfmbin79876 -> 79872 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-lf-ot1.tfmbin22988 -> 22984 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-lf-t1--base.tfmbin2048 -> 2044 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-lf-t1.tfmbin117472 -> 117468 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-lgr.tfmbin3676 -> 3680 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-ly1.tfmbin78916 -> 78916 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-ot1.tfmbin22468 -> 22468 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-lgr.tfmbin3592 -> 3596 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-ly1--base.tfmbin2112 -> 2112 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-ly1.tfmbin63908 -> 63908 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-ot1--base.tfmbin1640 -> 1648 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-ot1.tfmbin15776 -> 15784 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-t1--base.tfmbin2028 -> 2036 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-t1.tfmbin98064 -> 98072 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-t1--base.tfmbin2040 -> 2040 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-t1.tfmbin116340 -> 116340 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-sup-ly1.tfmbin2116 -> 2112 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-sup-ot1.tfmbin1624 -> 1620 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-sup-t1--base.tfmbin2076 -> 2072 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-sup-t1.tfmbin2080 -> 2076 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tlf-ly1.tfmbin78660 -> 78656 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tlf-ot1.tfmbin22248 -> 22244 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tlf-t1--base.tfmbin2024 -> 2020 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tlf-t1.tfmbin116080 -> 116076 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tosf-ly1.tfmbin78644 -> 78640 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tosf-ot1.tfmbin22240 -> 22236 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tosf-t1--base.tfmbin2016 -> 2012 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tosf-t1.tfmbin116072 -> 116068 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-ly1.tfmbin84596 -> 84596 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-ot1.tfmbin22364 -> 22364 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-sc-ly1.tfmbin73608 -> 73608 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-sc-ot1.tfmbin18244 -> 18244 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-sc-t1.tfmbin103352 -> 103352 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-t1.tfmbin117900 -> 117900 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-ly1.tfmbin84392 -> 84392 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-ot1.tfmbin22308 -> 22308 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-sc-ly1.tfmbin73412 -> 73412 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-sc-ot1.tfmbin18200 -> 18200 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-sc-t1.tfmbin103100 -> 103100 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-t1.tfmbin117632 -> 117632 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-ly1.tfmbin84220 -> 84220 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-ot1.tfmbin22120 -> 22120 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-sc-ly1.tfmbin73220 -> 73220 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-sc-ot1.tfmbin17996 -> 17996 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-sc-t1.tfmbin102984 -> 102984 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-t1.tfmbin117536 -> 117536 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-ly1.tfmbin83864 -> 83864 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-ot1.tfmbin21940 -> 21940 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-sc-ly1.tfmbin72876 -> 72876 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-sc-ot1.tfmbin17832 -> 17832 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-sc-t1.tfmbin102588 -> 102588 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-t1.tfmbin117120 -> 117120 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-inf-ly1.tfmbin2112 -> 2108 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-inf-ot1.tfmbin1612 -> 1608 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-inf-t1--base.tfmbin2040 -> 2036 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-inf-t1.tfmbin2044 -> 2040 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-lf-ly1.tfmbin73700 -> 73696 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-lf-ot1.tfmbin21556 -> 21552 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-lf-t1--base.tfmbin2060 -> 2056 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-lf-t1.tfmbin108044 -> 108040 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-lgr.tfmbin3648 -> 3644 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-ly1.tfmbin72832 -> 72820 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-ot1.tfmbin21080 -> 21076 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-lgr.tfmbin3576 -> 3572 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-ly1--base.tfmbin2120 -> 2112 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-ly1.tfmbin62936 -> 62928 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-ot1--base.tfmbin1624 -> 1624 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-ot1.tfmbin15296 -> 15296 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-t1--base.tfmbin2028 -> 2024 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-t1.tfmbin95576 -> 95572 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-t1--base.tfmbin2064 -> 2056 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-t1.tfmbin107024 -> 107016 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-sup-ly1.tfmbin2120 -> 2120 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-sup-ot1.tfmbin1620 -> 1620 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-sup-t1--base.tfmbin2076 -> 2076 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-sup-t1.tfmbin2080 -> 2080 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tlf-ly1.tfmbin72556 -> 72552 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tlf-ot1.tfmbin20852 -> 20848 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tlf-t1--base.tfmbin2040 -> 2036 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tlf-t1.tfmbin106756 -> 106752 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tosf-ly1.tfmbin72556 -> 72552 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tosf-ot1.tfmbin20844 -> 20840 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tosf-t1--base.tfmbin2032 -> 2028 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tosf-t1.tfmbin106748 -> 106744 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-ly1.tfmbin82484 -> 82484 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-ot1.tfmbin21928 -> 21928 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-sc-ly1.tfmbin72672 -> 72672 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-sc-ot1.tfmbin18512 -> 18512 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-sc-t1.tfmbin100572 -> 100572 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-t1.tfmbin111956 -> 111956 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-ly1.tfmbin82384 -> 82384 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-ot1.tfmbin21900 -> 21900 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-sc-ly1.tfmbin72560 -> 72560 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-sc-ot1.tfmbin18504 -> 18504 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-sc-t1.tfmbin100416 -> 100416 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-t1.tfmbin111816 -> 111816 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-ly1.tfmbin82100 -> 82100 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-ot1.tfmbin21676 -> 21676 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-sc-ly1.tfmbin72292 -> 72292 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-sc-ot1.tfmbin18260 -> 18260 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-sc-t1.tfmbin100204 -> 100204 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-t1.tfmbin111584 -> 111584 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-ly1.tfmbin81856 -> 81856 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-ot1.tfmbin21532 -> 21532 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-sc-ly1.tfmbin72028 -> 72028 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-sc-ot1.tfmbin18128 -> 18128 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-sc-t1.tfmbin99908 -> 99908 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-t1.tfmbin111312 -> 111312 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-inf-ly1.tfmbin2076 -> 2072 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-inf-ot1.tfmbin1616 -> 1612 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-inf-t1--base.tfmbin2012 -> 2008 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-inf-t1.tfmbin2016 -> 2012 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-lf-ly1.tfmbin78268 -> 78264 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-lf-ot1.tfmbin22864 -> 22860 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-lf-t1--base.tfmbin2032 -> 2028 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-lf-t1.tfmbin115752 -> 115748 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-lgr.tfmbin3644 -> 3648 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-ly1.tfmbin77280 -> 77268 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-ot1.tfmbin22340 -> 22332 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-lgr.tfmbin3584 -> 3600 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ly1--base.tfmbin2100 -> 2100 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ly1.tfmbin62496 -> 62496 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ot1--base.tfmbin1640 -> 1644 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ot1.tfmbin15488 -> 15492 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-t1--base.tfmbin2020 -> 2020 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-t1.tfmbin96880 -> 96880 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-t1--base.tfmbin2048 -> 2036 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-t1.tfmbin114596 -> 114584 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-sup-ly1.tfmbin2104 -> 2104 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-sup-ot1.tfmbin1616 -> 1616 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-sup-t1--base.tfmbin2072 -> 2072 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-sup-t1.tfmbin2076 -> 2076 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tlf-ly1.tfmbin77000 -> 76996 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tlf-ot1.tfmbin22108 -> 22104 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tlf-t1--base.tfmbin2020 -> 2016 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tlf-t1.tfmbin114320 -> 114316 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tosf-ly1.tfmbin77000 -> 76996 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tosf-ot1.tfmbin22104 -> 22100 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tosf-t1--base.tfmbin2016 -> 2012 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tosf-t1.tfmbin114316 -> 114312 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-ly1.tfmbin84992 -> 84992 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-ot1.tfmbin22452 -> 22452 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-sc-ly1.tfmbin75860 -> 75860 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-sc-ot1.tfmbin18992 -> 18992 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-sc-t1.tfmbin105784 -> 105784 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-t1.tfmbin117336 -> 117336 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-ly1.tfmbin84848 -> 84848 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-ot1.tfmbin22408 -> 22408 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-sc-ly1.tfmbin75668 -> 75668 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-sc-ot1.tfmbin18948 -> 18948 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-sc-t1.tfmbin105512 -> 105512 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-t1.tfmbin117116 -> 117116 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-ly1.tfmbin84600 -> 84600 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-ot1.tfmbin22196 -> 22196 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-sc-ly1.tfmbin75468 -> 75468 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-sc-ot1.tfmbin18732 -> 18732 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-sc-t1.tfmbin105404 -> 105404 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-t1.tfmbin116956 -> 116956 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-ly1.tfmbin84304 -> 84304 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-ot1.tfmbin22036 -> 22036 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-sc-ly1.tfmbin75120 -> 75120 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-sc-ot1.tfmbin18564 -> 18564 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-sc-t1.tfmbin104984 -> 104984 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-t1.tfmbin116596 -> 116596 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-ly1.tfmbin86648 -> 86648 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-ot1.tfmbin22996 -> 22996 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-sc-ly1.tfmbin77220 -> 77220 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-sc-ot1.tfmbin19296 -> 19296 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-sc-t1.tfmbin107144 -> 107144 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-t1.tfmbin119140 -> 119140 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-ly1.tfmbin86532 -> 86532 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-ot1.tfmbin22952 -> 22952 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-sc-ly1.tfmbin77020 -> 77020 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-sc-ot1.tfmbin19232 -> 19232 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-sc-t1.tfmbin106876 -> 106876 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-t1.tfmbin118956 -> 118956 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-ly1.tfmbin86264 -> 86264 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-ot1.tfmbin22748 -> 22748 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-sc-ly1.tfmbin76832 -> 76832 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-sc-ot1.tfmbin19040 -> 19040 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-sc-t1.tfmbin106768 -> 106768 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-t1.tfmbin118768 -> 118768 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-ly1.tfmbin86000 -> 86000 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-ot1.tfmbin22584 -> 22584 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-sc-ly1.tfmbin76492 -> 76492 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-sc-ot1.tfmbin18868 -> 18868 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-sc-t1.tfmbin106368 -> 106368 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-t1.tfmbin118444 -> 118444 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-inf-ly1.tfmbin2120 -> 2116 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-inf-ot1.tfmbin1620 -> 1616 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-inf-t1--base.tfmbin2024 -> 2020 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-inf-t1.tfmbin2028 -> 2024 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-lf-ly1.tfmbin77524 -> 77520 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-lf-ot1.tfmbin22660 -> 22656 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-lf-t1--base.tfmbin2024 -> 2020 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-lf-t1.tfmbin113520 -> 113516 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-lgr.tfmbin3632 -> 3636 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-ly1.tfmbin76460 -> 76460 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-ot1.tfmbin22096 -> 22096 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-lgr.tfmbin3560 -> 3564 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ly1--base.tfmbin2104 -> 2104 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ly1.tfmbin66512 -> 66512 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ot1--base.tfmbin1604 -> 1604 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ot1.tfmbin15844 -> 15844 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-t1--base.tfmbin1992 -> 1992 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-t1.tfmbin101832 -> 101832 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-t1--base.tfmbin2024 -> 2028 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-t1.tfmbin112236 -> 112240 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-sup-ly1.tfmbin2144 -> 2148 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-sup-ot1.tfmbin1636 -> 1640 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-sup-t1--base.tfmbin2084 -> 2088 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-sup-t1.tfmbin2088 -> 2092 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tlf-ly1.tfmbin76196 -> 76192 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tlf-ot1.tfmbin21872 -> 21868 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tlf-t1--base.tfmbin2004 -> 2000 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tlf-t1.tfmbin111972 -> 111968 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tosf-ly1.tfmbin76188 -> 76184 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tosf-ot1.tfmbin21868 -> 21864 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tosf-t1--base.tfmbin2000 -> 1996 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tosf-t1.tfmbin111968 -> 111964 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-inf-ly1.tfmbin2104 -> 2100 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-inf-ot1.tfmbin1612 -> 1608 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-inf-t1--base.tfmbin2012 -> 2008 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-inf-t1.tfmbin2016 -> 2012 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-lf-ly1.tfmbin78812 -> 78808 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-lf-ot1.tfmbin22728 -> 22724 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-lf-t1--base.tfmbin2036 -> 2032 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-lf-t1.tfmbin116092 -> 116088 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-lgr.tfmbin3712 -> 3712 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-ly1.tfmbin77768 -> 77772 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-ot1.tfmbin22164 -> 22160 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-lgr.tfmbin3636 -> 3644 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-ly1--base.tfmbin2080 -> 2076 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-ly1.tfmbin64548 -> 64544 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-ot1--base.tfmbin1600 -> 1592 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-ot1.tfmbin15588 -> 15580 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-t1--base.tfmbin1980 -> 1976 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-t1.tfmbin98804 -> 98800 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-t1--base.tfmbin2028 -> 2032 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-t1.tfmbin114856 -> 114860 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-sup-ly1.tfmbin2116 -> 2112 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-sup-ot1.tfmbin1608 -> 1604 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-sup-t1--base.tfmbin2072 -> 2068 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-sup-t1.tfmbin2076 -> 2072 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tlf-ly1.tfmbin77504 -> 77500 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tlf-ot1.tfmbin21936 -> 21932 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tlf-t1--base.tfmbin2012 -> 2008 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tlf-t1.tfmbin114592 -> 114588 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tosf-ly1.tfmbin77496 -> 77492 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tosf-ot1.tfmbin21928 -> 21924 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tosf-t1--base.tfmbin2004 -> 2000 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tosf-t1.tfmbin114584 -> 114580 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-ly1.tfmbin85568 -> 85568 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-ot1.tfmbin22528 -> 22528 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-sc-ly1.tfmbin75964 -> 75964 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-sc-ot1.tfmbin19136 -> 19136 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-sc-t1.tfmbin105292 -> 105292 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-t1.tfmbin117360 -> 117360 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-ly1.tfmbin85440 -> 85440 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-ot1.tfmbin22508 -> 22508 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-sc-ly1.tfmbin75756 -> 75756 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-sc-ot1.tfmbin19088 -> 19088 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-sc-t1.tfmbin105000 -> 105000 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-t1.tfmbin117172 -> 117172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-ly1.tfmbin85184 -> 85184 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-ot1.tfmbin22276 -> 22276 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-sc-ly1.tfmbin75576 -> 75576 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-sc-ot1.tfmbin18880 -> 18880 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-sc-t1.tfmbin104916 -> 104916 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-t1.tfmbin116988 -> 116988 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-ly1.tfmbin84900 -> 84900 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-ot1.tfmbin22132 -> 22132 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-sc-ly1.tfmbin75220 -> 75220 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-sc-ot1.tfmbin18716 -> 18716 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-sc-t1.tfmbin104484 -> 104484 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-t1.tfmbin116652 -> 116652 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-inf-ly1.tfmbin2088 -> 2088 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-inf-ot1.tfmbin1608 -> 1608 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-inf-t1--base.tfmbin2008 -> 2008 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-inf-t1.tfmbin2012 -> 2012 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-lf-ly1.tfmbin77876 -> 77876 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-lf-ot1.tfmbin22864 -> 22864 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-lf-t1--base.tfmbin2028 -> 2028 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-lf-t1.tfmbin115104 -> 115104 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-lgr.tfmbin3684 -> 3692 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-ly1.tfmbin76828 -> 76816 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-ot1.tfmbin22312 -> 22296 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-lgr.tfmbin3624 -> 3632 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ly1--base.tfmbin2076 -> 2072 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ly1.tfmbin64592 -> 64588 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ot1--base.tfmbin1616 -> 1608 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ot1.tfmbin15708 -> 15700 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-t1--base.tfmbin1988 -> 1988 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-t1.tfmbin99240 -> 99240 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-t1--base.tfmbin2040 -> 2032 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-t1.tfmbin113832 -> 113824 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-sup-ly1.tfmbin2132 -> 2132 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-sup-ot1.tfmbin1608 -> 1608 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-sup-t1--base.tfmbin2076 -> 2076 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-sup-t1.tfmbin2080 -> 2080 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tlf-ly1.tfmbin76552 -> 76552 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tlf-ot1.tfmbin22080 -> 22080 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tlf-t1--base.tfmbin2020 -> 2020 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tlf-t1.tfmbin113564 -> 113564 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tosf-ly1.tfmbin76544 -> 76544 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tosf-ot1.tfmbin22068 -> 22068 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tosf-t1--base.tfmbin2008 -> 2008 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tosf-t1.tfmbin113552 -> 113552 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-ly1.tfmbin86416 -> 86416 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-ot1.tfmbin22800 -> 22800 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-sc-ly1.tfmbin75580 -> 75580 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-sc-ot1.tfmbin19152 -> 19152 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-sc-t1.tfmbin104864 -> 104864 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-t1.tfmbin118384 -> 118384 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-ly1.tfmbin86300 -> 86300 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-ot1.tfmbin22772 -> 22772 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-sc-ly1.tfmbin75336 -> 75336 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-sc-ot1.tfmbin19096 -> 19096 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-sc-t1.tfmbin104532 -> 104532 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-t1.tfmbin118204 -> 118204 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-ly1.tfmbin86024 -> 86024 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-ot1.tfmbin22540 -> 22540 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-sc-ly1.tfmbin75188 -> 75188 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-sc-ot1.tfmbin18896 -> 18896 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-sc-t1.tfmbin104484 -> 104484 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-t1.tfmbin118004 -> 118004 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-ly1.tfmbin85756 -> 85756 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-ot1.tfmbin22392 -> 22392 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-sc-ly1.tfmbin74784 -> 74784 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-sc-ot1.tfmbin18708 -> 18708 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-sc-t1.tfmbin104004 -> 104004 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-t1.tfmbin117684 -> 117684 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-inf-ly1.tfmbin2088 -> 2084 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-inf-ot1.tfmbin1604 -> 1600 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-inf-t1--base.tfmbin1984 -> 1980 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-inf-t1.tfmbin1984 -> 1980 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-lf-ly1.tfmbin77352 -> 77348 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-lf-ot1.tfmbin22952 -> 22948 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-lf-t1--base.tfmbin2012 -> 2008 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-lf-t1.tfmbin113364 -> 113360 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-lgr.tfmbin3708 -> 3708 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-ly1.tfmbin76300 -> 76292 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-ot1.tfmbin22376 -> 22368 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-lgr.tfmbin3640 -> 3636 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ly1--base.tfmbin2096 -> 2088 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ly1.tfmbin65516 -> 65508 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ot1--base.tfmbin1624 -> 1616 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ot1.tfmbin15684 -> 15676 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-t1--base.tfmbin1988 -> 1980 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-t1.tfmbin101124 -> 101116 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-t1--base.tfmbin2016 -> 2008 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-t1.tfmbin112088 -> 112080 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-sup-ly1.tfmbin2132 -> 2132 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-sup-ot1.tfmbin1628 -> 1628 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-sup-t1--base.tfmbin2076 -> 2076 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-sup-t1.tfmbin2076 -> 2076 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tlf-ly1.tfmbin76024 -> 76020 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tlf-ot1.tfmbin22140 -> 22136 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tlf-t1--base.tfmbin1984 -> 1980 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tlf-t1.tfmbin111812 -> 111808 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tosf-ly1.tfmbin76020 -> 76016 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tosf-ot1.tfmbin22136 -> 22132 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tosf-t1--base.tfmbin1980 -> 1976 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tosf-t1.tfmbin111808 -> 111804 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-ly1--base.tfmbin0 -> 1752 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-ly1.tfmbin0 -> 1756 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-ot1.tfmbin0 -> 1316 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t1--base.tfmbin0 -> 1724 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t1.tfmbin0 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t5--base.tfmbin0 -> 1704 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t5.tfmbin0 -> 1708 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-ly1--base.tfmbin0 -> 1752 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-ly1.tfmbin0 -> 1756 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-ot1.tfmbin0 -> 1316 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t1--base.tfmbin0 -> 1724 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t1.tfmbin0 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t5--base.tfmbin0 -> 1704 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t5.tfmbin0 -> 1708 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ly1--base.tfmbin0 -> 1820 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ly1.tfmbin0 -> 31180 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ot1.tfmbin0 -> 9748 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t1--base.tfmbin0 -> 1776 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t1.tfmbin0 -> 50564 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t5--base.tfmbin0 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t5.tfmbin0 -> 50468 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ts1--base.tfmbin0 -> 1384 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ts1.tfmbin0 -> 1408 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-ly1--base.tfmbin0 -> 1752 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-ly1.tfmbin0 -> 1756 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-ot1.tfmbin0 -> 1316 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t1--base.tfmbin0 -> 1724 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t1.tfmbin0 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t5--base.tfmbin0 -> 1704 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t5.tfmbin0 -> 1708 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-ly1--base.tfmbin0 -> 1752 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-ly1.tfmbin0 -> 1756 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-ot1.tfmbin0 -> 1316 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t1--base.tfmbin0 -> 1724 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t1.tfmbin0 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t5--base.tfmbin0 -> 1704 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t5.tfmbin0 -> 1708 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ly1--base.tfmbin0 -> 1788 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ly1.tfmbin0 -> 31148 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ot1.tfmbin0 -> 9712 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t1--base.tfmbin0 -> 1744 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t1.tfmbin0 -> 50532 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t5--base.tfmbin0 -> 1704 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t5.tfmbin0 -> 50432 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ts1--base.tfmbin0 -> 1384 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ts1.tfmbin0 -> 1408 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-ly1--base.tfmbin0 -> 1944 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-ly1.tfmbin0 -> 1944 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-ot1.tfmbin0 -> 1480 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t1--base.tfmbin0 -> 1912 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t1.tfmbin0 -> 1920 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t5--base.tfmbin0 -> 1872 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t5.tfmbin0 -> 1876 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-ly1--base.tfmbin0 -> 1940 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-ly1.tfmbin0 -> 1940 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-ot1.tfmbin0 -> 1464 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t1--base.tfmbin0 -> 1908 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t1.tfmbin0 -> 1916 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t5--base.tfmbin0 -> 1868 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t5.tfmbin0 -> 1872 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ly1--base.tfmbin0 -> 2000 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ly1.tfmbin0 -> 31344 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ot1.tfmbin0 -> 9896 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t1--base.tfmbin0 -> 1952 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t1.tfmbin0 -> 51524 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t5--base.tfmbin0 -> 1892 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t5.tfmbin0 -> 49148 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ts1--base.tfmbin0 -> 1472 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ts1.tfmbin0 -> 1496 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-ly1--base.tfmbin0 -> 1940 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-ly1.tfmbin0 -> 1940 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-ot1.tfmbin0 -> 1480 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t1--base.tfmbin0 -> 1908 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t1.tfmbin0 -> 1916 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t5--base.tfmbin0 -> 1868 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t5.tfmbin0 -> 1872 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-ly1--base.tfmbin0 -> 1940 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-ly1.tfmbin0 -> 1940 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-ot1.tfmbin0 -> 1480 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t1--base.tfmbin0 -> 1908 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t1.tfmbin0 -> 1916 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t5--base.tfmbin0 -> 1868 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t5.tfmbin0 -> 1872 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ly1--base.tfmbin0 -> 1976 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ly1.tfmbin0 -> 31320 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ot1.tfmbin0 -> 9876 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t1--base.tfmbin0 -> 1928 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t1.tfmbin0 -> 51500 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t5--base.tfmbin0 -> 1868 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t5.tfmbin0 -> 49124 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ts1--base.tfmbin0 -> 1472 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ts1.tfmbin0 -> 1496 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-ly1--base.tfmbin0 -> 1716 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-ly1.tfmbin0 -> 1720 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-ot1.tfmbin0 -> 1284 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t1--base.tfmbin0 -> 1684 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t1.tfmbin0 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t5--base.tfmbin0 -> 1664 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t5.tfmbin0 -> 1668 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-ly1--base.tfmbin0 -> 1716 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-ly1.tfmbin0 -> 1720 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-ot1.tfmbin0 -> 1284 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t1--base.tfmbin0 -> 1684 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t1.tfmbin0 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t5--base.tfmbin0 -> 1664 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t5.tfmbin0 -> 1668 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ly1--base.tfmbin0 -> 1784 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ly1.tfmbin0 -> 31144 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ot1.tfmbin0 -> 9716 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ly1--base.tfmbin0 -> 1724 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ly1.tfmbin0 -> 29040 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ot1--base.tfmbin0 -> 1296 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ot1.tfmbin0 -> 7016 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t1--base.tfmbin0 -> 1676 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t1.tfmbin0 -> 49708 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t5--base.tfmbin0 -> 1676 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t5.tfmbin0 -> 53532 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t1--base.tfmbin0 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t1.tfmbin0 -> 50524 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t5--base.tfmbin0 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t5.tfmbin0 -> 50424 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ts1--base.tfmbin0 -> 1380 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ts1.tfmbin0 -> 1404 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-ly1--base.tfmbin0 -> 1716 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-ly1.tfmbin0 -> 1720 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-ot1.tfmbin0 -> 1284 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t1--base.tfmbin0 -> 1684 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t1.tfmbin0 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t5--base.tfmbin0 -> 1664 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t5.tfmbin0 -> 1668 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ly1--base.tfmbin0 -> 1780 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ly1.tfmbin0 -> 31140 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ot1.tfmbin0 -> 9712 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ly1--base.tfmbin0 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ly1.tfmbin0 -> 29044 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ot1--base.tfmbin0 -> 1300 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ot1.tfmbin0 -> 7020 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t1--base.tfmbin0 -> 1680 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t1.tfmbin0 -> 49712 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t5--base.tfmbin0 -> 1680 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t5.tfmbin0 -> 53536 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t1--base.tfmbin0 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t1.tfmbin0 -> 50520 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t5--base.tfmbin0 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t5.tfmbin0 -> 50420 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ts1--base.tfmbin0 -> 1380 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ts1.tfmbin0 -> 1404 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-ly1--base.tfmbin0 -> 1716 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-ly1.tfmbin0 -> 1720 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-ot1.tfmbin0 -> 1284 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t1--base.tfmbin0 -> 1684 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t1.tfmbin0 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t5--base.tfmbin0 -> 1664 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t5.tfmbin0 -> 1668 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ly1--base.tfmbin0 -> 1752 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ly1.tfmbin0 -> 31112 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ot1.tfmbin0 -> 9684 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ly1--base.tfmbin0 -> 1688 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ly1.tfmbin0 -> 29004 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ot1--base.tfmbin0 -> 1260 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ot1.tfmbin0 -> 6980 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t1--base.tfmbin0 -> 1640 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t1.tfmbin0 -> 49672 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t5--base.tfmbin0 -> 1640 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t5.tfmbin0 -> 53496 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t1--base.tfmbin0 -> 1704 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t1.tfmbin0 -> 50492 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t5--base.tfmbin0 -> 1664 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t5.tfmbin0 -> 50392 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ts1--base.tfmbin0 -> 1380 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ts1.tfmbin0 -> 1404 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ly1--base.tfmbin0 -> 1752 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ly1.tfmbin0 -> 31112 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ot1.tfmbin0 -> 9684 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ly1--base.tfmbin0 -> 1688 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ly1.tfmbin0 -> 29004 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ot1--base.tfmbin0 -> 1260 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ot1.tfmbin0 -> 6980 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t1--base.tfmbin0 -> 1640 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t1.tfmbin0 -> 49672 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t5--base.tfmbin0 -> 1640 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t5.tfmbin0 -> 53496 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t1--base.tfmbin0 -> 1704 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t1.tfmbin0 -> 50492 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t5--base.tfmbin0 -> 1664 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t5.tfmbin0 -> 50392 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ts1--base.tfmbin0 -> 1380 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ts1.tfmbin0 -> 1404 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--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.tfmbin532 -> 556 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/truetype/public/junicodevf/JunicodeVF-Italic.ttfbin2825400 -> 2939520 bytes
-rw-r--r--Master/texmf-dist/fonts/truetype/public/junicodevf/JunicodeVF-Roman.ttfbin2754408 -> 2889048 bytes
-rw-r--r--Master/texmf-dist/fonts/truetype/public/luacensor/Redacted-Regular.ttfbin0 -> 15892 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-Bold.pfbbin1625973 -> 1670132 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-BoldItalic.pfbbin1725368 -> 1766156 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-Cond.pfbbin1602717 -> 1650285 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondItalic.pfbbin1716168 -> 1762863 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondLight.pfbbin1629236 -> 1673071 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondLightItalic.pfbbin1717052 -> 1767412 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondMedium.pfbbin1627526 -> 1666698 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondMediumItalic.pfbbin1732732 -> 1785435 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-Exp.pfbbin1602689 -> 1641059 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpBold.pfbbin1636019 -> 1671992 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpBoldItalic.pfbbin1740897 -> 1781452 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpItalic.pfbbin1739798 -> 1784488 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpMedium.pfbbin1598824 -> 1644422 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpMediumItalic.pfbbin1774774 -> 1804181 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpSmBold.pfbbin1611838 -> 1653845 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpSmBoldItalic.pfbbin1754627 -> 1784935 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-Italic.pfbbin1622474 -> 1667375 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-Light.pfbbin1599955 -> 1644931 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-LightItalic.pfbbin1724691 -> 1756930 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-Medium.pfbbin1620240 -> 1663594 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-MediumItalic.pfbbin1643531 -> 1697301 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-Regular.pfbbin1596886 -> 1642913 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmBold.pfbbin1607809 -> 1661336 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmBoldItalic.pfbbin1643128 -> 1677470 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCond.pfbbin1604188 -> 1655017 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondItalic.pfbbin1651922 -> 1698762 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondLight.pfbbin1620408 -> 1661305 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondLightItalic.pfbbin1719384 -> 1767040 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondMedium.pfbbin1614365 -> 1664568 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondMediumItalic.pfbbin1668192 -> 1713578 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExp.pfbbin1599763 -> 1640879 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpBold.pfbbin1627039 -> 1678311 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpBoldItalic.pfbbin1731518 -> 1767246 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpItalic.pfbbin1644524 -> 1688357 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpMedium.pfbbin1606358 -> 1651083 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpMediumItalic.pfbbin1668860 -> 1710929 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpSmBold.pfbbin1607319 -> 1662412 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpSmBoldItalic.pfbbin1742843 -> 1786073 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/mfb-oldstyle/MFBOldstyle-Bold.pfbbin0 -> 185808 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/mfb-oldstyle/MFBOldstyle-Italic.pfbbin0 -> 193414 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/mfb-oldstyle/MFBOldstyle-Regular.pfbbin0 -> 239744 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/simpleicons/SimpleIcons.pfbbin2275600 -> 2277752 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-inf-t1.vfbin1688 -> 1688 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-lf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-osf-sc-ly1.vfbin1712 -> 1712 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-osf-sc-ot1.vfbin860 -> 860 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-osf-sc-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-osf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-sup-t1.vfbin1688 -> 1688 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-tlf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-tosf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-inf-t1.vfbin1688 -> 1688 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-lf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-osf-sc-ly1.vfbin1712 -> 1712 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-osf-sc-ot1.vfbin860 -> 860 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-osf-sc-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-osf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-sup-t1.vfbin1688 -> 1688 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-tlf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-tosf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-inf-t1.vfbin1696 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-lf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-osf-sc-ly1.vfbin1720 -> 1720 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-osf-sc-ot1.vfbin864 -> 864 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-osf-sc-t1.vfbin1740 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-osf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-sup-t1.vfbin1696 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-tlf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-tosf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-inf-t1.vfbin1696 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-lf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-osf-sc-ly1.vfbin1720 -> 1720 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-osf-sc-ot1.vfbin864 -> 864 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-osf-sc-t1.vfbin1740 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-osf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-sup-t1.vfbin1696 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-tlf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-tosf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-inf-t1.vfbin1692 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-lf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-osf-sc-ly1.vfbin1716 -> 1716 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-osf-sc-ot1.vfbin860 -> 860 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-osf-sc-t1.vfbin1740 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-osf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-sup-t1.vfbin1692 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-tlf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-tosf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-inf-t1.vfbin1688 -> 1688 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-lf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-osf-sc-ly1.vfbin1712 -> 1712 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-osf-sc-ot1.vfbin856 -> 856 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-osf-sc-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-osf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-sup-t1.vfbin1688 -> 1688 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-tlf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-tosf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-inf-t1.vfbin1696 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-lf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-osf-sc-ly1.vfbin1720 -> 1720 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-osf-sc-ot1.vfbin864 -> 864 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-osf-sc-t1.vfbin1740 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-osf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-sup-t1.vfbin1696 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-tlf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-tosf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-inf-t1.vfbin1696 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-lf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ly1.vfbin1720 -> 1720 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ot1.vfbin864 -> 864 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-t1.vfbin1740 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-osf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-sup-t1.vfbin1696 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-tlf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-tosf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-inf-t1.vfbin1684 -> 1684 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-lf-t1.vfbin1724 -> 1724 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-osf-sc-ly1.vfbin1708 -> 1708 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-osf-sc-ot1.vfbin856 -> 856 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-osf-sc-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-osf-t1.vfbin1724 -> 1724 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-sup-t1.vfbin1684 -> 1684 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-tlf-t1.vfbin1724 -> 1724 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-tosf-t1.vfbin1724 -> 1724 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-inf-t1.vfbin1692 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-lf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-osf-sc-ly1.vfbin1716 -> 1716 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-osf-sc-ot1.vfbin860 -> 860 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-osf-sc-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-osf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-sup-t1.vfbin1692 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-tlf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-tosf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-inf-t1.vfbin1692 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-lf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-osf-sc-ly1.vfbin1716 -> 1716 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-osf-sc-ot1.vfbin860 -> 860 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-osf-sc-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-osf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-sup-t1.vfbin1692 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-tlf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-tosf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-inf-t1.vfbin1692 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-lf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-osf-sc-ly1.vfbin1716 -> 1716 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-osf-sc-ot1.vfbin860 -> 860 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-osf-sc-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-osf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-sup-t1.vfbin1692 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-tlf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-tosf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-inf-t1.vfbin1692 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-lf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-osf-sc-ly1.vfbin1716 -> 1716 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-osf-sc-ot1.vfbin860 -> 860 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-osf-sc-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-osf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-sup-t1.vfbin1692 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-tlf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-tosf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-inf-t1.vfbin1696 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-lf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-osf-sc-ly1.vfbin1720 -> 1720 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-osf-sc-ot1.vfbin864 -> 864 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-osf-sc-t1.vfbin1744 -> 1744 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-osf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-sup-t1.vfbin1696 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-tlf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-tosf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-inf-t1.vfbin1696 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-lf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ly1.vfbin1720 -> 1720 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ot1.vfbin868 -> 868 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-osf-sc-t1.vfbin1744 -> 1744 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-osf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-sup-t1.vfbin1696 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-tlf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-tosf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-inf-t1.vfbin1696 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-lf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ly1.vfbin1720 -> 1720 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ot1.vfbin864 -> 864 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-osf-sc-t1.vfbin1740 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-osf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-sup-t1.vfbin1696 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-tlf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-tosf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-inf-t1.vfbin1692 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-lf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-osf-sc-ly1.vfbin1716 -> 1716 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-osf-sc-ot1.vfbin860 -> 860 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-osf-sc-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-osf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-sup-t1.vfbin1692 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-tlf-t1.vfbin1728 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-tosf-t1.vfbin1732 -> 1732 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-inf-t1.vfbin1696 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-lf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ly1.vfbin1720 -> 1720 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ot1.vfbin864 -> 864 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-osf-sc-t1.vfbin1744 -> 1744 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-osf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-sup-t1.vfbin1696 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-tlf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-tosf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-inf-t1.vfbin1696 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-lf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ly1.vfbin1720 -> 1720 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ot1.vfbin864 -> 864 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-t1.vfbin1744 -> 1744 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-osf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-sup-t1.vfbin1696 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-tlf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-tosf-t1.vfbin1736 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-ly1.vfbin0 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t1.vfbin0 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t5.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-inf-ly1.vfbin0 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t1.vfbin0 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t5.vfbin0 -> 1768 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ly1.vfbin0 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t1.vfbin0 -> 1768 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t5.vfbin0 -> 1768 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ts1.vfbin0 -> 544 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-numr-ly1.vfbin0 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t1.vfbin0 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t5.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-sup-ly1.vfbin0 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t1.vfbin0 -> 1736 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t5.vfbin0 -> 1768 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ly1.vfbin0 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t1.vfbin0 -> 1768 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t5.vfbin0 -> 1768 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ts1.vfbin0 -> 544 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-ly1.vfbin0 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t1.vfbin0 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t5.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-inf-ly1.vfbin0 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t1.vfbin0 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t5.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ly1.vfbin0 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t1.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t5.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ts1.vfbin0 -> 548 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-numr-ly1.vfbin0 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t1.vfbin0 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t5.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-sup-ly1.vfbin0 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t1.vfbin0 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t5.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ly1.vfbin0 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t1.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t5.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ts1.vfbin0 -> 548 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-ly1.vfbin0 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t1.vfbin0 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t5.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-inf-ly1.vfbin0 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t1.vfbin0 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t5.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ly1.vfbin0 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ly1.vfbin0 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ot1.vfbin0 -> 796 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t1.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t5.vfbin0 -> 1776 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t1.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t5.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ts1.vfbin0 -> 548 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-numr-ly1.vfbin0 -> 1696 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t1.vfbin0 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t5.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ly1.vfbin0 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ly1.vfbin0 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ot1.vfbin0 -> 800 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t1.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t5.vfbin0 -> 1776 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t1.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t5.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ts1.vfbin0 -> 548 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-sup-ly1.vfbin0 -> 1692 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t1.vfbin0 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t5.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ly1.vfbin0 -> 1740 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ly1.vfbin0 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ot1.vfbin0 -> 800 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t1.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t5.vfbin0 -> 1776 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t1.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t5.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ts1.vfbin0 -> 548 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ly1.vfbin0 -> 1744 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ly1.vfbin0 -> 1728 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ot1.vfbin0 -> 800 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t1.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t5.vfbin0 -> 1776 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t1.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t5.vfbin0 -> 1772 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ts1.vfbin0 -> 548 bytes
-rw-r--r--Master/texmf-dist/ls-R634
-rw-r--r--Master/texmf-dist/scripts/citation-style-language/citeproc-bibtex-parser.lua8
-rw-r--r--Master/texmf-dist/scripts/citation-style-language/citeproc-bibtex2csl.lua3
-rw-r--r--Master/texmf-dist/scripts/citation-style-language/citeproc-cli.lua180
-rw-r--r--Master/texmf-dist/scripts/citation-style-language/citeproc-context.lua4
-rw-r--r--Master/texmf-dist/scripts/citation-style-language/citeproc-element.lua27
-rw-r--r--Master/texmf-dist/scripts/citation-style-language/citeproc-engine.lua17
-rw-r--r--Master/texmf-dist/scripts/citation-style-language/citeproc-latex-core.lua525
-rw-r--r--Master/texmf-dist/scripts/citation-style-language/citeproc-latex-parser.lua3
-rw-r--r--Master/texmf-dist/scripts/citation-style-language/citeproc-latex.lua183
-rw-r--r--Master/texmf-dist/scripts/citation-style-language/citeproc-manager.lua916
-rw-r--r--Master/texmf-dist/scripts/citation-style-language/citeproc-node-choose.lua12
-rw-r--r--Master/texmf-dist/scripts/citation-style-language/citeproc-node-citation.lua3
-rw-r--r--Master/texmf-dist/scripts/citation-style-language/citeproc-node-names.lua2
-rw-r--r--Master/texmf-dist/scripts/citation-style-language/citeproc-node-number.lua3
-rw-r--r--Master/texmf-dist/scripts/citation-style-language/citeproc-node-sort.lua2
-rw-r--r--Master/texmf-dist/scripts/citation-style-language/citeproc-node-text.lua4
-rw-r--r--Master/texmf-dist/scripts/citation-style-language/citeproc-output.lua68
-rw-r--r--Master/texmf-dist/scripts/citation-style-language/citeproc-util.lua77
-rwxr-xr-xMaster/texmf-dist/scripts/citation-style-language/citeproc.lua2
-rwxr-xr-xMaster/texmf-dist/scripts/dviasm/dviasm.py71
-rw-r--r--Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm4
-rw-r--r--Master/texmf-dist/scripts/latexindent/LatexIndent/Wrap.pm7
-rwxr-xr-xMaster/texmf-dist/scripts/latexindent/defaultSettings.yaml2
-rwxr-xr-xMaster/texmf-dist/scripts/latexindent/latexindent.pl2
-rwxr-xr-xMaster/texmf-dist/scripts/pagelayout/pagelayoutapi2
-rwxr-xr-xMaster/texmf-dist/scripts/pagelayout/textestvis10
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/extractbb.lua110
-rw-r--r--Master/texmf-dist/scripts/texplate/texplate.jarbin3588303 -> 3693773 bytes
-rw-r--r--Master/texmf-dist/source/generic/babel-french/frenchb.dtx12
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog47
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/Makefile4
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex3
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex40
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-env.tex17
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-fonts-noncjk.tex65
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-jats.tex26
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex24
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex204
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/expl3.dtx4
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3basics.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3bitset.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3bootstrap.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3box.dtx6
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3cctab.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3clist.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3coffins.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3color.dtx30
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3debug.dtx4
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3deprecation.dtx8
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3doc.dtx4
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3docstrip.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3expan.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3file.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3flag.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3fp-assign.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3fp-aux.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3fp-basics.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3fp-convert.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3fp-expo.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3fp-extended.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3fp-functions.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3fp-logic.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3fp-parse.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3fp-random.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3fp-round.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3fp-symbolic.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3fp-traps.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3fp-trig.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3fp-types.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3fp.dtx4
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3fparray.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3int.dtx17
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3intarray.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3kernel-functions.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3keys.dtx28
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3legacy.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3luatex.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3msg.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3names.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3pdf.dtx14
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3prg.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3prop.dtx42
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3quark.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3regex.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3seq.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3skip.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3sort.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3str-convert.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3str.dtx4
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3sys.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3text-case.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3text-map.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3text-purify.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3text.dtx16
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3tl-analysis.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3tl-build.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3tl.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3token.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/l3kernel/l3unicode.dtx2
-rw-r--r--Master/texmf-dist/source/latex/bib2qr/bib2qr.dtx594
-rw-r--r--Master/texmf-dist/source/latex/bib2qr/bib2qr.ins85
-rw-r--r--Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx90
-rw-r--r--Master/texmf-dist/source/latex/changebar/changebar.dtx158
-rw-r--r--Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-article.dtx61
-rw-r--r--Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-english.mbs6
-rw-r--r--Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-french.mbs6
-rw-r--r--Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-merlin.mbs5
-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/doibanner/doibanner.dtx412
-rw-r--r--Master/texmf-dist/source/latex/doibanner/doibanner.ins85
-rw-r--r--Master/texmf-dist/source/latex/easybook/easybook.dtx364
-rw-r--r--Master/texmf-dist/source/latex/fancyhdr/fancyhdr.dtx244
-rw-r--r--Master/texmf-dist/source/latex/fillwith/fillwith.dtx747
-rw-r--r--Master/texmf-dist/source/latex/fillwith/fillwith.ins68
-rw-r--r--Master/texmf-dist/source/latex/hypcap/hypcap.dtx (renamed from Master/texmf-dist/source/latex/oberdiek/hypcap.dtx)73
-rw-r--r--Master/texmf-dist/source/latex/iwonamath/Makefile6
-rw-r--r--Master/texmf-dist/source/latex/iwonamath/iwonamath.dtx6
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/expl3.dtx4
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3basics.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3bitset.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3box.dtx6
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3cctab.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3clist.dtx14
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3color.dtx30
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3debug.dtx4
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx8
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3doc.dtx4
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3expan.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3file.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3flag.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3fp-functions.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3fp-symbolic.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3fp-types.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3fp.dtx4
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3int.dtx17
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3keys.dtx41
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3msg.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3names.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3pdf.dtx14
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3prg.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3prop.dtx42
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3quark.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3regex.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3seq.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3skip.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3sort.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3str.dtx4
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3sys.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3text-case.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3text-map.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3text-purify.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3text.dtx16
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3tl-build.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3tl.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3token.dtx2
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx2
-rw-r--r--Master/texmf-dist/source/latex/lni/lni.dtx11
-rw-r--r--Master/texmf-dist/source/latex/magicwatermark/magicwatermark.dtx597
-rw-r--r--Master/texmf-dist/source/latex/mailing/mailing.dtx38
-rw-r--r--Master/texmf-dist/source/latex/mailing/mailing.ins42
-rw-r--r--Master/texmf-dist/source/latex/mathastext/mathastext.dtx5913
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx4
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx4
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/centernot.dtx2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/chemarr.dtx2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/classlist.dtx4
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/colonequals.dtx2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/engord.dtx2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/enparen.dtx10
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/eolgrab.dtx2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/fibnum.dtx2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/flags.dtx2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx8
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/hypgotoe.dtx4
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/hyphsubst.dtx2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/iflang.dtx8
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/oberdiek.ins4
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/oberdiek.tex33
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/protecteddef.dtx4
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/resizegather.dtx2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/rotchiffre.dtx4
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/scrindex.dtx4
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx6
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/settobox.dtx4
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/stackrel.dtx2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/stampinclude.dtx6
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/tabularht.dtx6
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx2
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/thepdfnumber.dtx12
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/twoopt.dtx2
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledmac.dtx4
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledpar.dtx49
-rw-r--r--Master/texmf-dist/source/latex/reptheorem/reptheorem.dtx84
-rw-r--r--Master/texmf-dist/source/latex/reptheorem/reptheorem.ins2
-rw-r--r--Master/texmf-dist/source/latex/se2thesis/se2colors.dtx2
-rw-r--r--Master/texmf-dist/source/latex/se2thesis/se2fonts.dtx2
-rw-r--r--Master/texmf-dist/source/latex/se2thesis/se2packages.dtx4
-rw-r--r--Master/texmf-dist/source/latex/se2thesis/se2thesis.dtx91
-rw-r--r--Master/texmf-dist/source/latex/sillypage/sillypage.dtx34
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx8
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.dtx5
-rw-r--r--Master/texmf-dist/source/latex/siunitx/siunitx.tex4
-rw-r--r--Master/texmf-dist/source/latex/subeqn/subeqn.dtx57
-rw-r--r--Master/texmf-dist/source/latex/subeqn/subeqn.ins49
-rw-r--r--Master/texmf-dist/source/latex/subeqnarray/subeqnarray.dtx85
-rw-r--r--Master/texmf-dist/source/latex/subeqnarray/subeqnarray.ins56
-rw-r--r--Master/texmf-dist/source/latex/supertabular/supertabular.dtx323
-rw-r--r--Master/texmf-dist/source/latex/tablvar/tablvar.dtx583
-rw-r--r--Master/texmf-dist/source/latex/tablvar/tablvar.ins6
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf-backend.dtx91
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf-checks.dtx4
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf-data.dtx16
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-generic.dtx6
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-luacode.dtx6
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-shared.dtx4
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf-roles.dtx4
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf-space.dtx4
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf-struct.dtx6
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf-tree.dtx4
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf-user.dtx4
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf.dtx26
-rw-r--r--Master/texmf-dist/source/latex/telprint/telprint.dtx (renamed from Master/texmf-dist/source/latex/oberdiek/telprint.dtx)79
-rw-r--r--Master/texmf-dist/source/latex/ut-thesis/ut-thesis.dtx16
-rw-r--r--Master/texmf-dist/source/latex/ut-thesis/ut-thesis.ins21
-rw-r--r--Master/texmf-dist/source/lualatex/piton/piton.dtx949
-rw-r--r--Master/texmf-dist/source/luatex/luamplib/luamplib.dtx1361
-rw-r--r--Master/texmf-dist/tex/context/third/chat/t-chat.mkiv231
-rw-r--r--Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex4
-rw-r--r--Master/texmf-dist/tex/fonts/bonum-otf/bonum-otf.sty301
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/acadian.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/canadien.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/francais.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/french.ldf6
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/frenchb.ldf2
-rw-r--r--Master/texmf-dist/tex/generic/babel-french/frenchb.lua2
-rw-r--r--Master/texmf-dist/tex/generic/circuitikz/pgfcirc.defines.tex254
-rw-r--r--Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex78
-rw-r--r--Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex6
-rw-r--r--Master/texmf-dist/tex/generic/pst-coil/pst-coil.tex63
-rw-r--r--Master/texmf-dist/tex/generic/pst-diffraction/pst-diffraction.tex4
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/amsfonts.4ht54
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/esvect.4ht25
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht231
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/jats.4ht115
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht26
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/mathml.4ht48
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/tagpdf-base-hooks.4ht7
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/tagpdf-hooks.4ht6
-rw-r--r--Master/texmf-dist/tex/latex-dev/l3kernel/expl3-code.tex21
-rw-r--r--Master/texmf-dist/tex/latex-dev/l3kernel/expl3-generic.tex2
-rw-r--r--Master/texmf-dist/tex/latex-dev/l3kernel/expl3.ltx2
-rw-r--r--Master/texmf-dist/tex/latex-dev/l3kernel/expl3.sty2
-rw-r--r--Master/texmf-dist/tex/latex-dev/l3kernel/l3debug.def2
-rw-r--r--Master/texmf-dist/tex/latex-dev/l3kernel/l3doc.cls2
-rw-r--r--Master/texmf-dist/tex/latex/abraces/abraces.sty7
-rw-r--r--Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls462
-rw-r--r--Master/texmf-dist/tex/latex/asmejour/asmejour.cls458
-rw-r--r--Master/texmf-dist/tex/latex/bib2qr/bib2qr.sty107
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.bbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx24
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx12
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-ieee/magyar-ieee.lbx6
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-phys/phys.bbx25
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-phys/phys.cbx8
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-phys/phys.dbx8
-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.bbx62
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx26
-rw-r--r--Master/texmf-dist/tex/latex/biblatex-publist/publist.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/bxjatoucs/bxjatoucs.sty80
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls8
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls13
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def14
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls13
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls8
-rw-r--r--Master/texmf-dist/tex/latex/bxpdfver/bxpdfver.sty206
-rw-r--r--Master/texmf-dist/tex/latex/changebar/changebar.sty34
-rw-r--r--Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty4
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-bib.sty137
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-cite.sty47
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty39
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-init.sty185
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty58
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/styles/apa.csl912
-rw-r--r--Master/texmf-dist/tex/latex/citation-style-language/styles/ieee.csl50
-rw-r--r--Master/texmf-dist/tex/latex/cjs-rcs-article/cjs-rcs-article.cls51
-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/doibanner/doibanner.sty98
-rw-r--r--Master/texmf-dist/tex/latex/easybook/easybase.sty360
-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/fancyhdr/extramarks.sty2
-rw-r--r--Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty52
-rw-r--r--Master/texmf-dist/tex/latex/fillwith/fillwith.sty349
-rw-r--r--Master/texmf-dist/tex/latex/fontscale/fontscale.sty1125
-rw-r--r--Master/texmf-dist/tex/latex/hebdomon/hebdomon.cls412
-rw-r--r--Master/texmf-dist/tex/latex/hypcap/hypcap.sty (renamed from Master/texmf-dist/tex/latex/oberdiek/hypcap.sty)11
-rw-r--r--Master/texmf-dist/tex/latex/hypdestopt/hypdestopt.sty18
-rw-r--r--Master/texmf-dist/tex/latex/iran-bibtex/iran-bibtex.sty14
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/iwonamath.sty3
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/omliwonamath.fd2
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/omliwonamathc.fd2
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/omliwonamathl.fd2
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/omliwonamathlc.fd2
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/omsiwonamath.fd2
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/omsiwonamathc.fd2
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/omsiwonamathcmsy.fd2
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/omsiwonamathl.fd2
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/omsiwonamathlc.fd2
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/omxiwonamath.fd2
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/omxiwonamathc.fd2
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/omxiwonamathl.fd2
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/omxiwonamathlc.fd2
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/ot1iwonamath.fd2
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathc.fd2
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathcm.fd2
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathl.fd2
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathlc.fd2
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathlcm.fd2
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathlm.fd2
-rw-r--r--Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathm.fd2
-rw-r--r--Master/texmf-dist/tex/latex/jsonparse/jsonparse.sty324
-rw-r--r--Master/texmf-dist/tex/latex/junicode/LGRJunicode-Inf.fd442
-rw-r--r--Master/texmf-dist/tex/latex/junicode/LGRJunicode-LF.fd844
-rw-r--r--Master/texmf-dist/tex/latex/junicode/LGRJunicode-OsF.fd806
-rw-r--r--Master/texmf-dist/tex/latex/junicode/LGRJunicode-Sup.fd374
-rw-r--r--Master/texmf-dist/tex/latex/junicode/LGRJunicode-TLF.fd836
-rw-r--r--Master/texmf-dist/tex/latex/junicode/LGRJunicode-TOsF.fd796
-rw-r--r--Master/texmf-dist/tex/latex/junicode/LY1Junicode-Inf.fd420
-rw-r--r--Master/texmf-dist/tex/latex/junicode/LY1Junicode-LF.fd832
-rw-r--r--Master/texmf-dist/tex/latex/junicode/LY1Junicode-OsF.fd854
-rw-r--r--Master/texmf-dist/tex/latex/junicode/LY1Junicode-Sup.fd394
-rw-r--r--Master/texmf-dist/tex/latex/junicode/LY1Junicode-TLF.fd852
-rw-r--r--Master/texmf-dist/tex/latex/junicode/LY1Junicode-TOsF.fd836
-rw-r--r--Master/texmf-dist/tex/latex/junicode/OT1Junicode-Inf.fd414
-rw-r--r--Master/texmf-dist/tex/latex/junicode/OT1Junicode-LF.fd794
-rw-r--r--Master/texmf-dist/tex/latex/junicode/OT1Junicode-OsF.fd798
-rw-r--r--Master/texmf-dist/tex/latex/junicode/OT1Junicode-Sup.fd440
-rw-r--r--Master/texmf-dist/tex/latex/junicode/OT1Junicode-TLF.fd804
-rw-r--r--Master/texmf-dist/tex/latex/junicode/OT1Junicode-TOsF.fd814
-rw-r--r--Master/texmf-dist/tex/latex/junicode/T1Junicode-Inf.fd456
-rw-r--r--Master/texmf-dist/tex/latex/junicode/T1Junicode-LF.fd832
-rw-r--r--Master/texmf-dist/tex/latex/junicode/T1Junicode-OsF.fd856
-rw-r--r--Master/texmf-dist/tex/latex/junicode/T1Junicode-Sup.fd404
-rw-r--r--Master/texmf-dist/tex/latex/junicode/T1Junicode-TLF.fd844
-rw-r--r--Master/texmf-dist/tex/latex/junicode/T1Junicode-TOsF.fd862
-rw-r--r--Master/texmf-dist/tex/latex/junicode/TS1Junicode-LF.fd398
-rw-r--r--Master/texmf-dist/tex/latex/junicode/TS1Junicode-OsF.fd422
-rw-r--r--Master/texmf-dist/tex/latex/junicode/TS1Junicode-TLF.fd446
-rw-r--r--Master/texmf-dist/tex/latex/junicode/TS1Junicode-TOsF.fd392
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex38
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.ltx2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3debug.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3doc.cls2
-rw-r--r--Master/texmf-dist/tex/latex/lete-sans-math/lete-sans-math.sty10
-rw-r--r--Master/texmf-dist/tex/latex/lni/lni.cls9
-rw-r--r--Master/texmf-dist/tex/latex/luwiantype/luwiantype.sty9
-rw-r--r--Master/texmf-dist/tex/latex/magicwatermark/magicwatermark.sty650
-rw-r--r--Master/texmf-dist/tex/latex/mailing/mailing.sty14
-rw-r--r--Master/texmf-dist/tex/latex/mathastext/mathastext.sty1326
-rw-r--r--Master/texmf-dist/tex/latex/mercatormap/mercatormap.sty922
-rw-r--r--Master/texmf-dist/tex/latex/mercatormap/mercatorpy.def16
-rw-r--r--Master/texmf-dist/tex/latex/mercatormap/mercatorsupplier.def221
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Dnom.fd67
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Inf.fd67
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-LF.fd75
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Numr.fd67
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-OsF.fd44
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Sup.fd67
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-TLF.fd75
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-TOsF.fd44
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Dnom.fd67
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Inf.fd67
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-LF.fd75
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Numr.fd67
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-OsF.fd44
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Sup.fd67
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-TLF.fd75
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-TOsF.fd44
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Dnom.fd67
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Inf.fd67
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-LF.fd75
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Numr.fd67
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-OsF.fd44
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Sup.fd67
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-TLF.fd75
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-TOsF.fd44
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Dnom.fd67
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Inf.fd67
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-LF.fd75
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Numr.fd67
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-OsF.fd44
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Sup.fd67
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-TLF.fd75
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-TOsF.fd44
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-LF.fd67
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-OsF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-TLF.fd67
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-TOsF.fd36
-rw-r--r--Master/texmf-dist/tex/latex/mfb-oldstyle/mfb-oldstyle.sty93
-rw-r--r--Master/texmf-dist/tex/latex/mitthesis/mitthesis.cls39
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncv.cls2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvbodyi.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvbodyii.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvbodyiii.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvbodyiv.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvbodyv.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcollection.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty4
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty4
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorburgundy.sty4
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty4
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty4
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty4
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty4
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty4
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcolors.tex (renamed from Master/texmf-dist/doc/latex/moderncv/commons/colors.tex)0
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvdebugtools.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvfooti.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvheadi.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvheadii.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvheadiii.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvheadiv.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvheadv.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvheadvi.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncviconsacademic.sty4
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncviconsawesome.sty4
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncviconsletters.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncviconsmarvosym.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncviconstikz.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvskillmatrix.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstylefancy.sty2
-rw-r--r--Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty2
-rw-r--r--Master/texmf-dist/tex/latex/pagelayout/pagelayout.cls10
-rw-r--r--Master/texmf-dist/tex/latex/passopt/passopt.sty2
-rw-r--r--Master/texmf-dist/tex/latex/pgf-periodictable/pgf-PeriodicTable.sty44
-rw-r--r--Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.drawing.keys.tex2
-rw-r--r--Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.names.tex18
-rw-r--r--Master/texmf-dist/tex/latex/pgfornament/pgfornament.sty13
-rw-r--r--Master/texmf-dist/tex/latex/pgfplotsthemebeamer/pgfplotsthemebeamer.sty37
-rw-r--r--Master/texmf-dist/tex/latex/photobook/photobook.cls92
-rw-r--r--Master/texmf-dist/tex/latex/polyomino/polyomino.sty286
-rw-r--r--Master/texmf-dist/tex/latex/pst-coil/pst-coil.sty2
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledpar.sty38
-rw-r--r--Master/texmf-dist/tex/latex/reptheorem/reptheorem.sty51
-rw-r--r--Master/texmf-dist/tex/latex/rpgicons/rpgicons-l3.sty40
-rw-r--r--Master/texmf-dist/tex/latex/rpgicons/rpgicons-pgf.sty2
-rw-r--r--Master/texmf-dist/tex/latex/rpgicons/rpgicons.sty4
-rw-r--r--Master/texmf-dist/tex/latex/se2thesis/se2colors.sty2
-rw-r--r--Master/texmf-dist/tex/latex/se2thesis/se2fonts.sty2
-rw-r--r--Master/texmf-dist/tex/latex/se2thesis/se2packages.sty2
-rw-r--r--Master/texmf-dist/tex/latex/se2thesis/se2thesis.cls7
-rw-r--r--Master/texmf-dist/tex/latex/se2thesis/se2translations-english.trsl10
-rw-r--r--Master/texmf-dist/tex/latex/se2thesis/se2translations-german.trsl2
-rw-r--r--Master/texmf-dist/tex/latex/sillypage/sillypage.sty30
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/simpleicons.sty2
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-pdftex.tex4158
-rw-r--r--Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-xeluatex.tex4158
-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/siunitx/siunitx.sty10
-rw-r--r--Master/texmf-dist/tex/latex/subeqn/subeqn.sty18
-rw-r--r--Master/texmf-dist/tex/latex/subeqnarray/subeqnarray.sty17
-rw-r--r--Master/texmf-dist/tex/latex/supertabular/supertabular.sty130
-rw-r--r--Master/texmf-dist/tex/latex/tablvar/tablvar.sty118
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-generic.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-lua.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def2
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-generic.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-lua.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-book.def2
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex.def2
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-mathml.def2
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf.def2
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf2.def2
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child-2.csv2
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child.csv2
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua57
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty5
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty167
-rw-r--r--Master/texmf-dist/tex/latex/telprint/telprint.sty (renamed from Master/texmf-dist/tex/generic/oberdiek/telprint.sty)15
-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/tramlines/tramlines.sty6
-rw-r--r--Master/texmf-dist/tex/latex/univie-ling/univie-ling-expose.cls8
-rw-r--r--Master/texmf-dist/tex/latex/univie-ling/univie-ling-handout.cls8
-rw-r--r--Master/texmf-dist/tex/latex/univie-ling/univie-ling-paper.cls8
-rw-r--r--Master/texmf-dist/tex/latex/univie-ling/univie-ling-poster.cls8
-rw-r--r--Master/texmf-dist/tex/latex/univie-ling/univie-ling-thesis.cls8
-rw-r--r--Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cls10
-rw-r--r--Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx2
-rw-r--r--Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/ut-thesis/ut-thesis.cls21
-rw-r--r--Master/texmf-dist/tex/latex/wheelchart/wheelchart.sty330
-rw-r--r--Master/texmf-dist/tex/lualatex/junicodevf/junicodevf.sty2
-rw-r--r--Master/texmf-dist/tex/lualatex/luacensor/luacensor.sty14
-rw-r--r--Master/texmf-dist/tex/lualatex/piton/piton.lua197
-rw-r--r--Master/texmf-dist/tex/lualatex/piton/piton.sty168
-rw-r--r--Master/texmf-dist/tex/lualatex/tango/tango.cls255
-rw-r--r--Master/texmf-dist/tex/luatex/luamplib/luamplib.lua663
-rw-r--r--Master/texmf-dist/tex/luatex/luamplib/luamplib.sty50
-rw-r--r--Master/texmf-dist/tex/plain/cweb/cwebacromac.tex104
-rw-r--r--Master/texmf-dist/tex/plain/cweb/cwebbin/dcwebmac.tex2
-rw-r--r--Master/texmf-dist/tex/plain/cweb/cwebbin/fcwebmac.tex2
-rw-r--r--Master/texmf-dist/tex/plain/cweb/cwebbin/icwebmac.tex14
-rw-r--r--Master/texmf-dist/tex/plain/cweb/cwebbin/pdfctproofmac.tex76
-rw-r--r--Master/texmf-dist/tex/plain/cweb/cwebbin/pdfctwimac.tex57
-rw-r--r--Master/texmf-dist/tex/plain/cweb/cwebbin/pdfwebtocfront.tex2
-rw-r--r--Master/texmf-dist/tex/plain/cweb/cwebmac.tex80
-rw-r--r--Master/texmf-dist/tex/plain/pwebmac/pwebmac.tex126
-rw-r--r--Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def4
-rw-r--r--Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty4
-rw-r--r--Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def4
-rw-r--r--Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty245
-rw-r--r--Master/texmf-dist/tex4ht/ht-fonts/unicode/TeXvect10/vect10.htf53
-rw-r--r--Master/texmf-dist/web2c/updmap.cfg3
3089 files changed, 72309 insertions, 45663 deletions
diff --git a/Master/texmf-dist/bibtex/bib/beebe/font.bib b/Master/texmf-dist/bibtex/bib/beebe/font.bib
index 287032abf99..65c446021c9 100644
--- a/Master/texmf-dist/bibtex/bib/beebe/font.bib
+++ b/Master/texmf-dist/bibtex/bib/beebe/font.bib
@@ -2,9 +2,9 @@
%%% ====================================================================
%%% BibTeX-file{
%%% author = "Nelson H. F. Beebe",
-%%% version = "1.127",
-%%% date = "08 May 2024",
-%%% time = "07:47:15 MST",
+%%% version = "1.129",
+%%% date = "03 August 2024",
+%%% time = "16:28:35 MDT",
%%% filename = "font.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 = "18065 25010 114533 1094663",
+%%% checksum = "28623 25116 115060 1099457",
%%% email = "beebe at math.utah.edu, beebe at acm.org,
%%% beebe at computer.org (Internet)",
%%% codetable = "ISO/ASCII",
@@ -24,7 +24,7 @@
%%% docstring = "This bibliography records publications about
%%% typographic fonts.
%%%
-%%% At version 1.127, the year coverage looked
+%%% At version 1.129, the year coverage looked
%%% like this:
%%%
%%% 1785 ( 1) 1865 ( 0) 1945 ( 0)
@@ -88,14 +88,14 @@
%%% 1859 ( 0) 1939 ( 0) 2019 ( 5)
%%% 1860 ( 0) 1940 ( 1) 2020 ( 1)
%%% 1861 ( 0) 1941 ( 0) 2021 ( 1)
-%%% 1862 ( 0) 1942 ( 0) 2022 ( 1)
-%%% 1863 ( 0) 1943 ( 0) 2023 ( 2)
-%%% 1864 ( 0) 1944 ( 0) 2024 ( 1)
+%%% 1862 ( 0) 1942 ( 0) 2022 ( 2)
+%%% 1863 ( 0) 1943 ( 0) 2023 ( 3)
+%%% 1864 ( 0) 1944 ( 0) 2024 ( 3)
%%% 19xx ( 3)
%%% 20xx ( 2)
%%%
-%%% Article: 531
-%%% Book: 167
+%%% Article: 532
+%%% Book: 170
%%% Booklet: 4
%%% InCollection: 5
%%% InProceedings: 71
@@ -108,7 +108,7 @@
%%% TechReport: 30
%%% Unpublished: 1
%%%
-%%% Total entries: 990
+%%% Total entries: 994
%%%
%%% This bibliography has been collected from
%%% bibliographies in the author's personal
@@ -24056,6 +24056,44 @@
keywords = "Adobe Systems co-founder",
}
+@Book{Cheung:2022:TLB,
+ editor = "Victor Cheung",
+ booktitle = "From Type to Logo: the Best Logotypes from Around the
+ World",
+ title = "From Type to Logo: the Best Logotypes from Around the
+ World",
+ publisher = "Victionary",
+ address = "Hong Kong",
+ pages = "269 + 3",
+ year = "2022",
+ ISBN = "988-756-659-4 (hardcover)",
+ ISBN-13 = "978-988-756-659-5 (hardcover)",
+ LCCN = "NC1002.L63 F76 2022",
+ bibdate = "Sat Aug 3 16:23:22 MDT 2024",
+ bibsource = "fsz3950.oclc.org:210/WorldCat;
+ https://www.math.utah.edu/pub/tex/bib/font.bib",
+ abstract = "``When it comes to building a brand, logo design is
+ often one of the first few important steps in the
+ creative journey. With so much more competition to
+ contend with today, how can designers help start-ups
+ and evolving brands put their best foot forward
+ visually? A key branding element used by many of the
+ biggest companies around the world, a logotype revolves
+ around a company's name or initials and features
+ typography as the main design approach. From Type to
+ Logo details the processes of combining the two
+ distinct design disciplines in a compelling book of
+ case studies that make an inspiring reference point for
+ budding and working branding professionals alike.",
+ acknowledgement = ack-nhfb,
+ tableofcontents = "Foreword \\
+ Preface \\
+ Logotypes \\
+ Feature Stories \\
+ Showcase \\
+ Biography",
+}
+
@Article{Durazzi:2022:RTM,
author = "Allison Durazzi",
title = "Review of {``\booktitle{Type Matters: The Rhetoricity
@@ -24158,6 +24196,56 @@
Computerized typesetting.",
}
+@Book{Anonymous:2024:SUC,
+ author = "Anonymous",
+ title = "Serif in Use: a Collection of Serif Typefaces",
+ publisher = "Victionary",
+ address = "Hong Kong",
+ pages = "531 + 45",
+ year = "2024",
+ ISBN = "988-768-443-0 (hardcover)",
+ ISBN-13 = "978-988-768-443-5 (hardcover)",
+ LCCN = "Z250.5.S47 S47 2024",
+ bibdate = "Fri Aug 02 10:58:16 2024",
+ bibsource = "https://www.math.utah.edu/pub/tex/bib/font.bib",
+ acknowledgement = ack-nhfb,
+}
+
+@Book{Cheung:2023:SUC,
+ author = "Victor Cheung",
+ title = "Sans in Use: Creative Typefaces and Their
+ Applications. From {A} to {Z}. {Book A}",
+ publisher = "Victionary",
+ address = "North Point, Hong Kong",
+ pages = "576",
+ remark = "Covers 93 typefaces.",
+ year = "2023",
+ ISBN = "988-768-442-2",
+ ISBN-13 = "978-988-768-442-8",
+ LCCN = "Z250.5.S24 S24 2024",
+ bibdate = "Sat Aug 3 14:46:34 MDT 2024",
+ bibsource = "fsz3950.oclc.org:210/WorldCat; https://www.math.utah.edu/pub/tex/bib/font.bib",
+ acknowledgement = ack-nhfb,
+ abstract = "In the world of typography, it is not uncommon to see
+ combinations of serif and sans serif typefaces in the
+ same design. However, it takes skill to combine them in
+ a way to avoid unwanted graphic tension or clashing
+ fonts, and ensure maximum legibility of the text in the
+ design. From font weights to classifications, each
+ typeface has its own distinct personality, and should
+ be carefully paired to convey the right tone and mood
+ of the design. Featuring a selection of type specimens,
+ their design applications, and the thoughts that go
+ behind the craft, \booktitle{Sans in Use}\slash
+ \booktitle{Serif in Use} collects the best combinations
+ of both categories and serves as a reference point for
+ inspiration-seeking designers and typographers
+ alike. Through examples and interviews with
+ internationally renowned type foundries, typography
+ designers and type experts, the future of typeface
+ creation is laid bare.",
+}
+
@Article{Hossain:2024:TSR,
author = "Anushah Hossain",
title = "Text Standards for the ``Rest of World'': The Making
@@ -24186,6 +24274,24 @@
Writing",
}
+@Article{Lovenheim:2024:SRS,
+ author = "Peter Lovenheim",
+ title = "Seeing {Rochester} signs through {Chuck Bigelow}'s
+ eyes",
+ journal = "Rochester Beacon",
+ volume = "??",
+ number = "??",
+ pages = "??--??",
+ day = "29",
+ month = jul,
+ year = "2024",
+ bibdate = "Fri Aug 02 09:04:12 2024",
+ bibsource = "https://www.math.utah.edu/pub/tex/bib/font.bib",
+ URL = "https://rochesterbeacon.com/2024/07/29/seeing-rochester-signs-through-chuck-bigelows-eyes/",
+ acknowledgement = ack-nhfb,
+ keywords = "Chuck Bigelow; Kris Holmes",
+}
+
@Misc{Anonymous:20xx:W,
author = "Anonymous",
title = "{WhatTheFont}",
diff --git a/Master/texmf-dist/bibtex/bib/oberdiek/oberdiek-bundle.bib b/Master/texmf-dist/bibtex/bib/oberdiek/oberdiek-bundle.bib
index 44fce8aeca0..364db304ef1 100644
--- a/Master/texmf-dist/bibtex/bib/oberdiek/oberdiek-bundle.bib
+++ b/Master/texmf-dist/bibtex/bib/oberdiek/oberdiek-bundle.bib
@@ -96,13 +96,6 @@
version={2.5},
url={https://ctan.org/pkg/hypbmsec},
}
-@manual{oberdiek:hypcap,
- title={The hypcap package},
- author={Heiko Oberdiek},
- date={2016-05-16},
- version={1.12},
- url={https://ctan.org/pkg/hypcap},
-}
@manual{oberdiek:hypgotoe,
title={The hypgotoe package},
author={Heiko Oberdiek},
@@ -243,13 +236,6 @@
version={1.2},
url={https://ctan.org/pkg/tabularkv},
}
-@manual{oberdiek:telprint,
- title={The telprint package},
- author={Heiko Oberdiek},
- date={2016-05-16},
- version={1.11},
- url={https://ctan.org/pkg/telprint},
-}
@manual{oberdiek:thepdfnumber,
title={The thepdfnumber package},
author={Heiko Oberdiek},
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 702e3f85f13..5dbee6f6d5c 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
@@ -29,7 +29,7 @@
%%
% -------------------------------------------------------------------
% Name and version information of the main mbs file:
- % \ProvidesFile{cjs-rcs-merlin.mbs}[2023/11/29 v1.0 (VG, PWD, AO, DPC)]
+ % \ProvidesFile{cjs-rcs-merlin.mbs}[2024/07/30 v1.1a (VG, PWD, AO, DPC)]
% For use with BibTeX version 0.99a or later
% -------------------------------------------------------------------
% This bibliography style file is intended for texts in
@@ -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}[2024/07/14 v1.1 (VG, PWD)]
+ % \ProvidesFile{cjs-rcs-english.mbs}[2024/07/30 v1.1a (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 163d4fd63a1..13480cb494d 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
@@ -29,7 +29,7 @@
%%
% -------------------------------------------------------------------
% Name and version information of the main mbs file:
- % \ProvidesFile{cjs-rcs-merlin.mbs}[2023/11/29 v1.0 (VG, PWD, AO, DPC)]
+ % \ProvidesFile{cjs-rcs-merlin.mbs}[2024/07/30 v1.1a (VG, PWD, AO, DPC)]
% For use with BibTeX version 0.99a or later
% -------------------------------------------------------------------
% This bibliography style file is intended for texts in
@@ -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}[2024/07/14 v1.1 (VG, PWD)]
+ % \ProvidesFile{cjs-rcs-french.mbs}[2024/07/30 v1.1a (VG, PWD)]
% The language selected here is FRENCH
FUNCTION {bbl.and}
diff --git a/Master/texmf-dist/bibtex/bst/iran-bibtex/iran-unsrt.bst b/Master/texmf-dist/bibtex/bst/iran-bibtex/iran-unsrt.bst
index cd7955b90a4..b0092b30f4b 100644
--- a/Master/texmf-dist/bibtex/bst/iran-bibtex/iran-unsrt.bst
+++ b/Master/texmf-dist/bibtex/bst/iran-bibtex/iran-unsrt.bst
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
-%% This file is “iran-unsrt.bstâ€, v0.1.1 (2024-05-06)
+%% This file is “iran-unsrt.bstâ€, v0.1.2 (2024/08/2)
%% generated with the DOCSTRIP utility, then modified to support
%% bilingual (English/Latin, and Persian/Farsi) in accordance with the
%% “Iran Manual of Style Citation Guide†(1st edn., 2016).
@@ -1932,7 +1932,7 @@ FUNCTION {field.doi}
doi empty$
{ "" }
{
- bbl.doi "u" change.case$ ":\doi{" * doi * "}" *
+ bbl.doi "u" change.case$ ":~\doi{" * doi * "}" *
}
if$
}
@@ -2262,7 +2262,7 @@ FUNCTION {field.url}
url duplicate$ empty$
{ pop$ "" }
{
- bbl.url "u" change.case$ ": \url{" * swap$ * "}" *
+ bbl.url "u" change.case$ ":~\url{" * swap$ * "}" *
}
if$
}
diff --git a/Master/texmf-dist/bibtex/bst/iran-bibtex/iran-year.bst b/Master/texmf-dist/bibtex/bst/iran-bibtex/iran-year.bst
index cb7feac8abd..f02038c5356 100644
--- a/Master/texmf-dist/bibtex/bst/iran-bibtex/iran-year.bst
+++ b/Master/texmf-dist/bibtex/bst/iran-bibtex/iran-year.bst
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
-%% This file is “iran-year.bstâ€, v0.1.1 (2024-05-06)
+%% This file is “iran-year.bstâ€, v0.1.2 (2024/08/2)
%% generated with the DOCSTRIP utility, then modified to support
%% bilingual (English/Latin, and Persian/Farsi) in accordance with the
%% “Iran Manual of Style Citation Guide†(1st edn., 2016).
@@ -1973,7 +1973,7 @@ FUNCTION {field.doi}
doi empty$
{ "" }
{
- bbl.doi "u" change.case$ ":\doi{" * doi * "}" *
+ bbl.doi "u" change.case$ ":~\doi{" * doi * "}" *
}
if$
}
@@ -2303,7 +2303,7 @@ FUNCTION {field.url}
url duplicate$ empty$
{ pop$ "" }
{
- bbl.url "u" change.case$ ": \url{" * swap$ * "}" *
+ bbl.url "u" change.case$ ":~\url{" * swap$ * "}" *
}
if$
}
diff --git a/Master/texmf-dist/bibtex/bst/iran-bibtex/iran.bst b/Master/texmf-dist/bibtex/bst/iran-bibtex/iran.bst
index 7a76ceb1c9c..2d384c5250f 100644
--- a/Master/texmf-dist/bibtex/bst/iran-bibtex/iran.bst
+++ b/Master/texmf-dist/bibtex/bst/iran-bibtex/iran.bst
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
-%% This file is “iran.bstâ€, v0.4.1 (2024-05-06)
+%% This file is “iran.bstâ€, v0.4.2 (2024/08/2)
%% generated with the DOCSTRIP utility, then modified to support
%% bilingual (English/Latin, and Persian/Farsi) in accordance with the
%% “Iran Manual of Style Citation Guide†(1st edn., 2016).
@@ -1973,7 +1973,7 @@ FUNCTION {field.doi}
doi empty$
{ "" }
{
- bbl.doi "u" change.case$ ":\doi{" * doi * "}" *
+ bbl.doi "u" change.case$ ":~\doi{" * doi * "}" *
}
if$
}
@@ -2303,7 +2303,7 @@ FUNCTION {field.url}
url duplicate$ empty$
{ pop$ "" }
{
- bbl.url "u" change.case$ ": \url{" * swap$ * "}" *
+ bbl.url "u" change.case$ ":~\url{" * swap$ * "}" *
}
if$
}
diff --git a/Master/texmf-dist/bibtex/bst/iran-bibtex/iranlatin-unsrt.bst b/Master/texmf-dist/bibtex/bst/iran-bibtex/iranlatin-unsrt.bst
index e34c05b977c..64915a09b05 100644
--- a/Master/texmf-dist/bibtex/bst/iran-bibtex/iranlatin-unsrt.bst
+++ b/Master/texmf-dist/bibtex/bst/iran-bibtex/iranlatin-unsrt.bst
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
-%% This file is “iranlatin-unsrt.bstâ€, v0.1.1 (2024-05-06)
+%% This file is “iranlatin-unsrt.bstâ€, v0.1.2 (2024/08/2)
%% created by modifying “iranlatin.bst†file in accordance with the
%% “Iran Manual of Style Citation Guide†(1st edn., 2016) to support
%% English/Latin only.
@@ -1528,7 +1528,7 @@ FUNCTION {field.doi}
doi empty$
{ "" }
{
- bbl.doi "u" change.case$ ":\doi{" * doi * "}" *
+ bbl.doi "u" change.case$ ":~\doi{" * doi * "}" *
}
if$
}
@@ -1852,7 +1852,7 @@ FUNCTION {field.url}
url duplicate$ empty$
{ pop$ "" }
{
- bbl.url "u" change.case$ ": \url{" * swap$ * "}" *
+ bbl.url "u" change.case$ ":~\url{" * swap$ * "}" *
}
if$
}
diff --git a/Master/texmf-dist/bibtex/bst/iran-bibtex/iranlatin-year.bst b/Master/texmf-dist/bibtex/bst/iran-bibtex/iranlatin-year.bst
index 045f3f34841..5792d53b4d3 100644
--- a/Master/texmf-dist/bibtex/bst/iran-bibtex/iranlatin-year.bst
+++ b/Master/texmf-dist/bibtex/bst/iran-bibtex/iranlatin-year.bst
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
-%% This file is “iranlatin-year.bstâ€, v0.1.1 (2024-05-06)
+%% This file is “iranlatin-year.bstâ€, v0.1.2 (2024/08/2)
%% created by modifying “iranlatin.bst†file in accordance with the
%% “Iran Manual of Style Citation Guide†(1st edn., 2016) to support
%% English/Latin only.
@@ -1569,7 +1569,7 @@ FUNCTION {field.doi}
doi empty$
{ "" }
{
- bbl.doi "u" change.case$ ":\doi{" * doi * "}" *
+ bbl.doi "u" change.case$ ":~\doi{" * doi * "}" *
}
if$
}
@@ -1893,7 +1893,7 @@ FUNCTION {field.url}
url duplicate$ empty$
{ pop$ "" }
{
- bbl.url "u" change.case$ ": \url{" * swap$ * "}" *
+ bbl.url "u" change.case$ ":~\url{" * swap$ * "}" *
}
if$
}
diff --git a/Master/texmf-dist/bibtex/bst/iran-bibtex/iranlatin.bst b/Master/texmf-dist/bibtex/bst/iran-bibtex/iranlatin.bst
index a5095e258ce..b5749534279 100644
--- a/Master/texmf-dist/bibtex/bst/iran-bibtex/iranlatin.bst
+++ b/Master/texmf-dist/bibtex/bst/iran-bibtex/iranlatin.bst
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
-%% This file is “iranlatin.bstâ€, v0.1.1 (2024-05-06)
+%% This file is “iranlatin.bstâ€, v0.1.2 (2024/08/2)
%% created by modifying “iran.bst†file in accordance with the
%% “Iran Manual of Style Citation Guide†(1st edn., 2016) to support
%% English/Latin only.
@@ -1569,7 +1569,7 @@ FUNCTION {field.doi}
doi empty$
{ "" }
{
- bbl.doi "u" change.case$ ":\doi{" * doi * "}" *
+ bbl.doi "u" change.case$ ":~\doi{" * doi * "}" *
}
if$
}
@@ -1893,7 +1893,7 @@ FUNCTION {field.url}
url duplicate$ empty$
{ pop$ "" }
{
- bbl.url "u" change.case$ ": \url{" * swap$ * "}" *
+ bbl.url "u" change.case$ ":~\url{" * swap$ * "}" *
}
if$
}
diff --git a/Master/texmf-dist/doc/bibtex/iran-bibtex/README.md b/Master/texmf-dist/doc/bibtex/iran-bibtex/README.md
index 1da64ac767d..355cdcfa9a8 100644
--- a/Master/texmf-dist/doc/bibtex/iran-bibtex/README.md
+++ b/Master/texmf-dist/doc/bibtex/iran-bibtex/README.md
@@ -111,6 +111,14 @@ If you want to report any bugs or issues, please use [the issue tracker](https:/
## Change log
+### Version 0.4.3 (2024/08/4)
+
+ 1. Fixing a minor issue that surfaced in the previous update.
+
+### Version 0.4.2 (2024/08/2)
+
+ 1. Made some improvements.
+
### Version 0.4.1 (2024/05/6)
1. Made some improvements.
diff --git a/Master/texmf-dist/doc/bibtex/iran-bibtex/iran-bibtex-pattern.pdf b/Master/texmf-dist/doc/bibtex/iran-bibtex/iran-bibtex-pattern.pdf
index c7aaac23d1d..eab5543e69a 100644
--- a/Master/texmf-dist/doc/bibtex/iran-bibtex/iran-bibtex-pattern.pdf
+++ b/Master/texmf-dist/doc/bibtex/iran-bibtex/iran-bibtex-pattern.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/bibtex/iran-bibtex/iran-bibtex-pattern.tex b/Master/texmf-dist/doc/bibtex/iran-bibtex/iran-bibtex-pattern.tex
index 76ef4209898..477390c391e 100644
--- a/Master/texmf-dist/doc/bibtex/iran-bibtex/iran-bibtex-pattern.tex
+++ b/Master/texmf-dist/doc/bibtex/iran-bibtex/iran-bibtex-pattern.tex
@@ -18,7 +18,7 @@
\begin{document}
\title{خلاصه‌ای از الگوی چیدمان مشخصه‌ها در Ùهرست‌نویسی منبعها به شیوه‌ی استناددهی ایران}
\author{Ùرشاد رسولی\thanks{رایانامه: \url{farshad.rasuli@gmail.com}}}
-\date{نسخه‌ی ۰٫۴٫۱ --- ۱۷ اردیبهشت ۱۴۰۳}
+\date{نسخه‌ی Û°Ù«Û´Ù«Û³ --- Û±Û´ اَمÙرداد Û±Û´Û°Û³}
\maketitle
diff --git a/Master/texmf-dist/doc/bibtex/iran-bibtex/iran-bibtex-userguide-fa.pdf b/Master/texmf-dist/doc/bibtex/iran-bibtex/iran-bibtex-userguide-fa.pdf
index 382d98a821d..7a4b5b22f99 100644
--- a/Master/texmf-dist/doc/bibtex/iran-bibtex/iran-bibtex-userguide-fa.pdf
+++ b/Master/texmf-dist/doc/bibtex/iran-bibtex/iran-bibtex-userguide-fa.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/bibtex/iran-bibtex/iran-bibtex-userguide-fa.tex b/Master/texmf-dist/doc/bibtex/iran-bibtex/iran-bibtex-userguide-fa.tex
index c9e7da533d7..a22e1f46918 100644
--- a/Master/texmf-dist/doc/bibtex/iran-bibtex/iran-bibtex-userguide-fa.tex
+++ b/Master/texmf-dist/doc/bibtex/iran-bibtex/iran-bibtex-userguide-fa.tex
@@ -1,7 +1,7 @@
\documentclass[a4paper,11pt]{article}
-\usepackage{color}
-\usepackage[usenames,dvpinames,table]{xcolor}
+\usepackage[usenames]{color}
+\usepackage{xcolor}
\usepackage{xecolor}
\usepackage{graphics}
\usepackage{graphicx}
@@ -46,7 +46,7 @@
\title{راهنمای کاربر بسته‌ی \lr{\bf\sffamily iran-bibtex}}
\author{Ùرشاد رسولی\thanks{رایانامه: \url{farshad.rasuli@gmail.com}}}
-\date{نسخه‌ی ۰٫۴٫۱ --- ۱۷ اردیبهشت ۱۴۰۳}
+\date{نسخه‌ی Û°Ù«Û´Ù«Û³ --- Û±Û´ اَمÙرداد Û±Û´Û°Û³}
\maketitle
@@ -60,16 +60,13 @@
شیوه‌نامه‌ی ایران یک شیوه‌نامه‌ی Ùهرست‌نویسی منبعهای اطلاعاتی به زبان Ùارسی، Ùˆ انگلیسی است Ú©Ù‡ در سال Û±Û³Û¹Ûµ توسط ایرانداک\زیرنویس{پژوهشگاه علوم Ùˆ Ùناوری اطلاعات ایران} تهیه Ùˆ منتشر شده است. این بسته با هد٠پیاده‌سازی این شیوه‌نامه در سامانه‌ی لاتک برای استÙاده در نوشتارهای Ùارسی، Ùˆ انگلیسی آماده شده است.
-این بسته به گونه‌ای طراحی شده است Ú©Ù‡ در نوشتارهای Ùارسی Ú©Ù‡ با \XePersian{} آماده میشوند Ùˆ نوشتارهای غیرÙارسی Ú©Ù‡ با موتورهای پردازش مختل٠آماده میشوند نیز کاربرد دارد.
+این بسته به گونه‌ای طراحی شده است Ú©Ù‡ در نوشتارهای Ùارسی Ú©Ù‡ با \XePersian{} آماده شده Ùˆ با موتور \XeTeX{} پردازش میشوند Ùˆ نوشتارهای غیرÙارسی Ú©Ù‡ با دیگر موتورهای پردازش آماده میشوند کاربرد دارد.
برای استنادهای درون متنی، پیش‌نهاد شیوه‌نامه‌ی ایران استÙاده از سبک پدیدآورنده-سال است؛ ولی از آن‌جایی Ú©Ù‡ سبکهای استناددهی مختلÙÛŒ در سامانه‌ی لاتک وجود دارد، با Ø­Ùظ اصلهای این شیوه‌نامه در Ùهرست‌نویسی منبعهای اطلاعاتی، دیگر سبکهای استناددهی درون متنی مانند سبکهای شماره‌گذاری نیز اÙزوده شده است.
-\section{چگونگی Ùراخوانی، Ùˆ استÙاده از بسته}
-
-
-\subsection{Ùراخوانی بسته}
+\section{Ùراخوانی بسته}
برای Ùراخوانی بسته‌ی ایران-بیب‌تک کاÙÛŒ است این بسته را با این Ùرمان Ùراخوانی کنید:\\
\hspace*{\fill}\lr{\tt \textbackslash usepackage[<bibstyle>,<options>]\{iran-bibtex\}}
@@ -86,19 +83,22 @@
برای تولید خروجی نوشتارهای Ùارسی کاÙÛŒ است پرونده‌ی موردنظر را به این ترتیب پردازش کنید:
-\begin{itemize}[nosep]
-\begin{latin}
+\begin{itemize}[noitemsep, topsep=0pt]
+\begin{latinitems}
\item \texttt{xelatex file.tex}
\item \texttt{bibtex8 -W -c iran-bibtex-cp1256fa file}
\item \texttt{xelatex file.tex}
\item \texttt{xelatex file.tex}
-\end{latin}
+\end{latinitems}
\end{itemize}
-Ùرمان \م‌ل{\tt bibtex8 -W -c iran-bibtex-cp1256fa file} مرجعهای غیرÙارسی را پس از مرجعهای Ùارسی Ùهرست میکند. اگر میخواهید Ú©Ù‡ مرجعهای غیرÙارسی در آغاز Ùهرست شوند Ùرمان \م‌ل{\tt bibtex8 file} را جایگزین کنید.
+Ùرمان \م‌ل{\tt bibtex8 -W -c iran-bibtex-cp1256fa file} مرجعهای غیرÙارسی را پس از مرجعهای Ùارسی Ùهرست میکند. اگر میخواهید Ú©Ù‡ مرجعهای غیرÙارسی پیش از مرجعهای Ùارسی Ùهرست شوند Ùرمان \م‌ل{\tt bibtex8 file} را جایگزین کنید.
+
+
+\section{استÙاده از بسته}
\subsection{سبکهای استناددهی آماده شده در این بسته}
@@ -169,14 +169,15 @@
+\newpage
\paragraph*{Ùرمان \lr{\tt \textbackslash citet} (استناد متنی)}~\\[0.5\baselineskip]
\begin{tabular}{ccc}
کیانی و همکاران (۱۳۹۵) &$\Rightarrow$& \lr{\tt \textbackslash citet\{key\}}\\
کیانی Ùˆ همکاران (۱۳۹۵، Ùصل~Û²) &$\Rightarrow$& \lr{\tt \textbackslash citet\rl{[Ùصل~Û²]}\{key\}}\\
-ببینید کیانی و همکاران (۱۳۹۵، ص.~۱۰) &$\Rightarrow$& \lr{\tt \textbackslash citet\rl{[ص.~۱۰][ببینید]}\{key\}}\\
+کیانی و همکاران (ببینید ۱۳۹۵، ص.~۱۰) &$\Rightarrow$& \lr{\tt \textbackslash citet\rl{[ص.~۱۰][ببینید]}\{key\}}\\
کیانی، صÙایی، رÙیعی، Ùˆ امانی (Û±Û³Û¹Ûµ) &$\Rightarrow$& \lr{\tt \textbackslash citet*\{key\}}\\
کیانی، صÙایی، رÙیعی، Ùˆ امانی (۱۳۹۵، Ùصل~Û²) &$\Rightarrow$& \lr{\tt \textbackslash citet*\rl{[Ùصل~Û²]}\{key\}}\\
-ببینید کیانی، صÙایی، رÙیعی، Ùˆ امانی (۱۳۹۵، ص.~Û±Û°) &$\Rightarrow$& \lr{\tt \textbackslash citet*\rl{[ص.~Û±Û°][ببینید]}\{key\}}\\
+کیانی، صÙایی، رÙیعی، Ùˆ امانی (ببینید ۱۳۹۵، ص.~Û±Û°) &$\Rightarrow$& \lr{\tt \textbackslash citet*\rl{[ص.~Û±Û°][ببینید]}\{key\}}\\
\end{tabular}
@@ -203,7 +204,7 @@
\subsection{مشخصه‌ی \lr{\tt language}}
-در این بسته، از مشخصه‌ی \م‌ل{\tt language} برای تعیین حروÙ‌چینی آن مرجع در Ùهرست مرجعها، Ùˆ منبعها استÙاده میشود. برای آن‌که مرجعی Ú©Ù‡ به زبان Ùارسی است از راست به Ú†Ù¾ حروÙ‌چینی شود، باید مشخصه‌ی \م‌ل{\tt language} آن مرجع برابر با \م‌ل{\tt persian} وارد گردد\زیرنویس{این مشخصه به بزرگی یا Ú©ÙˆÚ†Ú©ÛŒ حرÙها حساس نیست}Ø› در غیر این صورت، آن مرجع به عنوان مرجعی غیرÙارسی Ùهرست میشود.
+در این بسته، از مشخصه‌ی \م‌ل{\tt language} برای تعیین حروÙ‌چینی آن مرجع در Ùهرست مرجعها، Ùˆ منبعها استÙاده میشود. برای آن‌که مرجعی Ú©Ù‡ به زبان Ùارسی است از راست به Ú†Ù¾ حروÙ‌چینی شود، باید مشخصه‌ی \م‌ل{\tt language} آن مرجع برابر با \م‌ل{\tt persian} وارد گردد\زیرنویس{این مشخصه به بزرگی یا Ú©ÙˆÚ†Ú©ÛŒ حرÙها حساس نیست}Ø› در غیر این صورت، آن مرجع به عنوان مرجعی غیرÙارسی Ùهرست شده Ùˆ حروÙ‌چینی میگردد.
\subsection{مشخصه‌ی \lr{\tt authorfa}}
@@ -212,9 +213,9 @@
\section{مثالهای استÙاده از این بسته}
-شمار زیادی از مثالهای آورده شده در شیوه‌نامه‌ی ایران، Ú©Ù‡ با استÙاده از این بسته پیاده‌سازی شدند در مخزن گیت‌هاب این بسته به نشانی
+شمار زیادی از مثالهای ارائه شده در شیوه‌نامه‌ی ایران با استÙاده از این بسته پیاده‌سازی شده‌اند. این مثالها در مخزن گیت‌هاب این بسته به نشانی
\href{https://github.com/farshadrasuli/iran-bibtex}{github.com/farshadrasuli/iran-bibtex}
-در پوشه‌ی \م‌ل{examples} آماده شده است Ú©Ù‡ میتواند راهنمای بسیار خوبی برای یادگیری استÙاده از این بسته در استÙاده از شیوه‌نامه‌ی ایران باشد.
+در پوشه‌ی \م‌ل{examples} در دسترس هستند. این مثالها میتوانند راهنمای بسیار خوبی برای یادگیری این بسته در استÙاده از شیوه‌نامه‌ی ایران باشند.
diff --git a/Master/texmf-dist/doc/context/third/chat/LICENSE b/Master/texmf-dist/doc/context/third/chat/LICENSE
new file mode 100644
index 00000000000..c7290031817
--- /dev/null
+++ b/Master/texmf-dist/doc/context/third/chat/LICENSE
@@ -0,0 +1,232 @@
+GNU GENERAL PUBLIC LICENSE
+Version 3, 29 June 2007
+
+Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+Preamble
+
+The GNU General Public License is a free, copyleft license for software and other kinds of works.
+
+The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.
+
+Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.
+
+Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and modification follow.
+
+TERMS AND CONDITIONS
+
+0. Definitions.
+
+“This License†refers to version 3 of the GNU General Public License.
+
+“Copyright†also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
+
+“The Program†refers to any copyrightable work licensed under this License. Each licensee is addressed as “youâ€. “Licensees†and “recipients†may be individuals or organizations.
+
+To “modify†a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version†of the earlier work or a work “based on†the earlier work.
+
+A “covered work†means either the unmodified Program or a work based on the Program.
+
+To “propagate†a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
+
+To “convey†a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
+
+An interactive user interface displays “Appropriate Legal Notices†to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
+
+1. Source Code.
+The “source code†for a work means the preferred form of the work for making modifications to it. “Object code†means any non-source form of a work.
+
+A “Standard Interface†means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
+
+The “System Libraries†of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Componentâ€, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
+
+The “Corresponding Source†for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same work.
+
+2. Basic Permissions.
+All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
+
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
+
+When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
+
+4. Conveying Verbatim Copies.
+You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
+
+5. Conveying Modified Source Versions.
+You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all noticesâ€.
+
+ c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
+
+A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate†if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
+
+6. Conveying Non-Source Forms.
+You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
+
+ d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
+
+A “User Product†is either (1) a “consumer productâ€, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used†refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
+
+“Installation Information†for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
+
+The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
+
+Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
+
+7. Additional Terms.
+“Additional permissions†are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
+
+All other non-permissive additional terms are considered “further restrictions†within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
+
+8. Termination.
+You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
+
+However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
+
+Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
+
+9. Acceptance Not Required for Having Copies.
+You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
+
+10. Automatic Licensing of Downstream Recipients.
+Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
+
+An “entity transaction†is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
+
+11. Patents.
+A “contributor†is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor versionâ€.
+
+A contributor's “essential patent claims†are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control†includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
+
+In the following three paragraphs, a “patent license†is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant†such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying†means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
+
+A patent license is “discriminatory†if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
+
+12. No Surrender of Others' Freedom.
+If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
+
+13. Use with the GNU Affero General Public License.
+Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
+
+14. Revised Versions of this License.
+The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version†applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
+
+Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
+
+15. Disclaimer of Warranty.
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “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 PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+16. Limitation of Liability.
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+17. Interpretation of Sections 15 and 16.
+If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the “copyright†line and a pointer to where the full notice is found.
+
+ context-chat
+ Copyright (C) 2024 fiee
+
+ 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 the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:
+
+ context-chat Copyright (C) 2024 fiee
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an “about boxâ€.
+
+You should also get your employer (if you work as a programmer) or school, if any, to sign a “copyright disclaimer†for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see <https://www.gnu.org/licenses/>.
+
+The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <https://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Master/texmf-dist/doc/context/third/chat/README.md b/Master/texmf-dist/doc/context/third/chat/README.md
new file mode 100644
index 00000000000..ca1c5ec7e2e
--- /dev/null
+++ b/Master/texmf-dist/doc/context/third/chat/README.md
@@ -0,0 +1,72 @@
+# ConTeXt Chat
+
+Typeset messenger chats with ConTeXt
+
+2024 by Henning Hraban Ramm
+
+## Introduction
+
+In a youth novel that I’m writing, the actors frequently use a messenger app on
+their smartphones to chat. I wanted to depict that accordingly, but simplified:
+no need for a sophisticated user interface, for replies, reactions, images,
+attachments etc.
+
+## Usage
+
+ \usemodule[chat]
+ \setupChat[
+ recipient=A,
+ ]
+
+ \starttext
+ \startChat{A} Do you wanna chat?\stopChat
+ \startChat{B} Maybe. What about?\stopChat
+ \startChat{A} How about cats?\stopChat
+ \startChat{A} or squirrels?\stopChat
+ \stoptext
+
+There’s no general environment around the messages. If you need to adapt the spacing or want a background, use ConTeXt’s usual possibilities.
+
+The parameter of `\startChat` is the sender of that message, i.e. their avatar. I’m using emoji for that but I’m planning to add more options.
+
+Every first message of a person shows their avatar and a speech bubble tail.
+Follow-up messages by the same person have no avatar and no tail.
+You can use `\resetChat` to reset this “memoryâ€.
+
+Each conversation has one recipient, that’s the person reading it. Their messages (also avatar and tail) are displayed on the right-hand side, all others on the left.
+
+In my novel, the recipient is fixed by section, so I set it in a setup that is called like `\setuphead[section][before=\setup{section:before}]`.
+
+I suggest using Roboto (Condensed) as base font. You must also setup a fallback font for emojis.
+
+## Options
+
+* `recipient`: Name of the person reading the conversation.
+* `style`: text style; default: `\ss`
+* `senderstyle`: style of the avatar text; default: `\ss\bf`
+* `width`: maximum width of speech bubbles; default: `.8\textwidth`
+* `distance`: vertical distance of speech bubbles, unreliable; default: `.25em`
+* colors: You can change ChatColorI, ChatColorII, ChatNameColor and ChatFrameColor (switching to a palet soon).
+
+Options regarding the bubble, frame and tail are still missing.
+
+## Limitations
+
+Configuration options are limited. I might enhance the possibilities on request.
+
+* Avatars: I’m using emoji as avatars of the participants; I’m planning to make it work with initials (two characters) or graphics.
+* Other planned features: status messages like “Admin added Personâ€
+* Not currently planned features: images, emoji reactions, replies with quotes, read markers, date & time.
+* Background: Since I’m going for a printed version, I’m not planning to include a general background or a dark mode.
+* There are slightly different bubble forms for “soloâ€, “firstâ€, “middle†and “lastâ€, but ATM just “solo†and “middle†are used (automatically), since there’s no lookahead, i.e. the module can’t know what will come next. I’ll probably add an option to set the version manually.
+* Only one frame color for all messages.
+* No further documentation.
+
+## Contributors
+
+* Aditya Mahajan wrote a first draft of speech bubbles for me in 2022. His MetaPost code was more elegant than mine, but I didn’t manage to adapt it to my needs.
+* Hans Hagen gave me some valuable hints when I showed him my first working version.
+
+## License
+
+[GPL 3.0+](LICENSE)
diff --git a/Master/texmf-dist/doc/context/third/chat/VERSION b/Master/texmf-dist/doc/context/third/chat/VERSION
new file mode 100644
index 00000000000..72ccc5e1b68
--- /dev/null
+++ b/Master/texmf-dist/doc/context/third/chat/VERSION
@@ -0,0 +1 @@
+2024-08-10
diff --git a/Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdf b/Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdf
index cc6865c72fb..032692e01fb 100644
--- a/Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdf
+++ b/Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/bonum-otf/Changes b/Master/texmf-dist/doc/fonts/bonum-otf/Changes
new file mode 100644
index 00000000000..4eed5f4e755
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/bonum-otf/Changes
@@ -0,0 +1 @@
+0.01 2024-07-23 - first CTAN version
diff --git a/Master/texmf-dist/doc/fonts/bonum-otf/README.md b/Master/texmf-dist/doc/fonts/bonum-otf/README.md
new file mode 100644
index 00000000000..6333fa343f5
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/bonum-otf/README.md
@@ -0,0 +1,13 @@
+# README #
+Package bonum-otf supports the free TeX Gyre fonts Bonum
+as OpenType and defines all missing typefaces (slanted text
+and bold math).
+
+% This file is 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.
+%
+%
+
+% Copyright 2024 Herbert Voss hvoss@tug.org
+
diff --git a/Master/texmf-dist/doc/fonts/bonum-otf/bonum-otf-doc.pdf b/Master/texmf-dist/doc/fonts/bonum-otf/bonum-otf-doc.pdf
new file mode 100644
index 00000000000..99a465fba07
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/bonum-otf/bonum-otf-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/bonum-otf/bonum-otf-doc.tex b/Master/texmf-dist/doc/fonts/bonum-otf/bonum-otf-doc.tex
new file mode 100644
index 00000000000..067a107f111
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/bonum-otf/bonum-otf-doc.tex
@@ -0,0 +1,900 @@
+%% $Id: bonum-otf-doc.tex 925 2024-07-23 17:47:45Z herbert $
+\listfiles
+\documentclass[ngerman,spanish,polish,english,a4paper]{article}
+\usepackage{heros-otf}
+\usepackage{bonum-otf}
+\setmonofont[Scale=MatchLowercase,FakeStretch=0.88]{AnonymousPro}
+\usepackage{babel}
+\usepackage{geometry}
+\usepackage{booktabs}
+\usepackage{xltabular}
+\usepackage{listings}
+\usepackage{xspace}
+\usepackage{setspace}
+\usepackage{xltabular}
+\usepackage{marginnote}
+\usepackage{xcolor,url}
+\usepackage{varioref,multido}
+\newcommand\Macro[1]{\texttt{\textbackslash#1}}
+\newcommand\textstyleVariable[1]{\texttt{#1}}
+\newcommand\textgerman[1]{\foreignlanguage{ngerman}{\texttt{#1}}}
+\usepackage{hvextern}
+\lstset{basicstyle=\ttfamily\small}
+%\setkeys{hv}{lstOptions={basicstyle=\Mono\small,columns=fixed}}
+\setkeys{hv}{moveToExampleDir,ExampleDir=Examples,showFilename,verbose}
+
+\usepackage[imakeidx]{xindex}
+\makeindex[title=Index]
+
+\newenvironment{demoquote}
+ {\begingroup
+ \setlength{\topsep}{0pt}
+ \setlength{\partopsep}{0pt}
+ \list{}{\rightmargin\leftmargin}%
+ \item\relax}
+ {\endlist\endgroup}
+
+\def\Lcs#1{\texttt{\textbackslash#1}\index{#1@\texttt{\textbackslash#1}}}
+\def\Largb#1{\texttt{\{}\textit{#1}\texttt{\}}}
+\def\Lpack#1{\texttt{#1}\index{#1@\texttt{#1}}\index{Package!#1@\texttt{#1}}}
+\def\testfeature#1#2#3{{\fontspec[RawFeature={+#2}]{#1}#3\relax}}
+\def\Loption#1{\texttt{#1}\index{#1@\texttt{#1}}\index{Option!#1@\texttt{#1}}}
+\def\SUP{\addfontfeatures{RawFeature={+sups}}}
+
+\usepackage{multicol,luacode}
+\setlength{\columnsep}{0.3cm}
+\setlength{\columnseprule}{0.1pt}
+
+
+\title{The \TeX\ Gyre Bonum OpenType font}
+\author{Herbert Voß}
+\usepackage{parskip}
+\parindent=0pt
+
+
+\begin{document}
+\maketitle
+
+
+
+
+\section{The default setting}
+
+The \LaTeX\ package \Lpack{bonum-otf} supports the following OpenType fonts:
+\begin{verbatim}
+texgyrebonum-regular.otf
+texgyrebonum-bold.otf
+texgyrebonum-italic.otf
+texgyrebonum-bolditalic.otf
+texgyrebonum-math.otf
+\end{verbatim}
+
+The fonts are free available and part of any \TeX-distribution.
+
+
+\begin{verbatim}
+\setmainfont{texgyrebonum}[
+ RawFeature = {\bonum@figurealign;\bonum@figurestyle},
+ Scale = \bonumRM@scale ,
+ UprightFont = *-regular,
+ ItalicFont = *-italic,
+ ItalicFeatures = { SmallCapsFont = *-italic },
+ SlantedFont = *-regular,
+ SlantedFeatures= {FakeSlant=0.2},
+ BoldFont = *-bold,
+ BoldFeatures = { SmallCapsFont = *-Bold },
+ BoldItalicFont = *-bolditalic,
+ BoldItalicFeatures = { SmallCapsFont = *-bolditalic },
+ BoldSlantedFont= *-bold,
+ BoldSlantedFeatures= {FakeSlant=0.2, SmallCapsFont = *-bold },
+ SmallCapsFont = *-regular,
+% SmallCapsFeatures={RawFeature=+smcp},
+ SmallCapsFeatures={Letters=SmallCaps},
+ Extension = .otf
+]
+
+\newfontfamily\bonumOsF{texgyrebonum}[
+ RawFeature = {+onum},
+ Scale = \bonumRM@scale ,
+ UprightFont = *-regular,
+ ItalicFont = *-italic,
+ ItalicFeatures = { SmallCapsFont = *-italic },
+ SlantedFont = *-regular,
+ SlantedFeatures= {FakeSlant=0.2},
+ BoldFont = *-bold,
+ BoldFeatures = { SmallCapsFont = *-Bold },
+ BoldItalicFont = *-bolditalic,
+ BoldItalicFeatures = { SmallCapsFont = *-bolditalic },
+ BoldSlantedFont= *-bold,
+ BoldSlantedFeatures= {FakeSlant=0.2, SmallCapsFont = *-bold },
+ SmallCapsFont = *-regular,
+% SmallCapsFeatures={RawFeature=+smcp},
+ SmallCapsFeatures={Letters=SmallCaps},
+ Extension = .otf
+]
+
+\newfontfamily\bonumTLF{texgyrebonum}[
+ RawFeature = {+tnum;-onum},
+ Scale = \bonumRM@scale ,
+ UprightFont = *-regular,
+ ItalicFont = *-italic,
+ ItalicFeatures = { SmallCapsFont = *-italic },
+ SlantedFont = *-regular,
+ SlantedFeatures= {FakeSlant=0.2},
+ BoldFont = *-bold,
+ BoldFeatures = { SmallCapsFont = *-Bold },
+ BoldItalicFont = *-bolditalic,
+ BoldItalicFeatures = { SmallCapsFont = *-bolditalic },
+ BoldSlantedFont= *-bold,
+ BoldSlantedFeatures= {FakeSlant=0.2, SmallCapsFont = *-bold },
+ SmallCapsFont = *-regular,
+% SmallCapsFeatures={RawFeature=+smcp},
+ SmallCapsFeatures={Letters=SmallCaps},
+ Extension = .otf
+]
+\end{verbatim}
+
+
+\section{The serif font}
+
+\selectlanguage{polish}
+\marginnote{mdseries\\upright}
+Honoru myśliwych zaraza Rymsza Libijskich wszystkich Wożny przerywał szczodroty
+opowiadań. Cesarskich znaczy rączy muchom malarstwie spisem różowemi zacnie
+urządzał. Nasze Praga stare żeś Żyje cnoty Tabor. Mówcy pokój Również śmieléj
+wionęła jarzynach liczne drogą jastrząb słowo zabawy odjechał życie. Dano
+ojcu Wyprowadzają kuca dramatycznych myśliwskiém bór pęk żyt maja Wiec. Nię
+Taka Albo tace Usta pęk ucha.
+
+\marginnote{\normalfont bfseries\\upright}\bfseries
+Honoru myśliwych zaraza Rymsza Libijskich wszystkich Wożny przerywał szczodroty
+opowiadań. Cesarskich znaczy rączy muchom malarstwie spisem różowemi zacnie
+urządzał. Nasze Praga stare żeś Żyje cnoty Tabor. Mówcy pokój Również śmieléj
+wionęła jarzynach liczne drogą jastrząb słowo zabawy odjechał życie. Dano
+ojcu Wyprowadzają kuca dramatycznych myśliwskiém bór pęk żyt maja Wiec. Nię
+Taka Albo tace Usta pęk ucha.
+
+
+\marginnote{\normalfont mdseries\\itshape}\normalfont\itshape
+Honoru myśliwych zaraza Rymsza Libijskich wszystkich Wożny przerywał szczodroty
+opowiadań. Cesarskich znaczy rączy muchom malarstwie spisem różowemi zacnie
+urządzał. Nasze Praga stare żeś Żyje cnoty Tabor. Mówcy pokój Również śmieléj
+wionęła jarzynach liczne drogą jastrząb słowo zabawy odjechał życie. Dano
+ojcu Wyprowadzają kuca dramatycznych myśliwskiém bór pęk żyt maja Wiec. Nię
+Taka Albo tace Usta pęk ucha.
+
+\marginnote{\normalfont bfseries\\itshape}\bfseries
+Honoru myśliwych zaraza Rymsza Libijskich wszystkich Wożny przerywał szczodroty
+opowiadań. Cesarskich znaczy rączy muchom malarstwie spisem różowemi zacnie
+urządzał. Nasze Praga stare żeś Żyje cnoty Tabor. Mówcy pokój Również śmieléj
+wionęła jarzynach liczne drogą jastrząb słowo zabawy odjechał życie. Dano
+ojcu Wyprowadzają kuca dramatycznych myśliwskiém bór pęk żyt maja Wiec. Nię
+Taka Albo tace Usta pęk ucha.
+
+\normalfont
+\marginnote{\normalfont mdseries\\slshape}\normalfont\slshape
+Honoru myśliwych zaraza Rymsza Libijskich wszystkich Wożny przerywał szczodroty
+opowiadań. Cesarskich znaczy rączy muchom malarstwie spisem różowemi zacnie
+urządzał. Nasze Praga stare żeś Żyje cnoty Tabor. Mówcy pokój Również śmieléj
+wionęła jarzynach liczne drogą jastrząb słowo zabawy odjechał życie. Dano
+ojcu Wyprowadzają kuca dramatycznych myśliwskiém bór pęk żyt maja Wiec. Nię
+Taka Albo tace Usta pęk ucha.
+
+\marginnote{\normalfont bfseries\\slshape}\bfseries
+Honoru myśliwych zaraza Rymsza Libijskich wszystkich Wożny przerywał szczodroty
+opowiadań. Cesarskich znaczy rączy muchom malarstwie spisem różowemi zacnie
+urządzał. Nasze Praga stare żeś Żyje cnoty Tabor. Mówcy pokój Również śmieléj
+wionęła jarzynach liczne drogą jastrząb słowo zabawy odjechał życie. Dano
+ojcu Wyprowadzają kuca dramatycznych myśliwskiém bór pęk żyt maja Wiec. Nię
+Taka Albo tace Usta pęk ucha.
+
+\normalfont
+\marginnote{\normalfont mdseries\\upright\\scshape}\scshape
+Honoru myśliwych zaraza Rymsza Libijskich wszystkich Wożny przerywał szczodroty
+opowiadań. Cesarskich znaczy rączy muchom malarstwie spisem różowemi zacnie
+urządzał. Nasze Praga stare żeś Żyje cnoty Tabor. Mówcy pokój Również śmieléj
+wionęła jarzynach liczne drogą jastrząb słowo zabawy odjechał życie. Dano
+ojcu Wyprowadzają kuca dramatycznych myśliwskiém bór pęk żyt maja Wiec. Nię
+Taka Albo tace Usta pęk ucha.
+
+\marginnote{\normalfont bfseries\\upright\\scshape}\bfseries
+Honoru myśliwych zaraza Rymsza Libijskich wszystkich Wożny przerywał szczodroty
+opowiadań. Cesarskich znaczy rączy muchom malarstwie spisem różowemi zacnie
+urządzał. Nasze Praga stare żeś Żyje cnoty Tabor. Mówcy pokój Również śmieléj
+wionęła jarzynach liczne drogą jastrząb słowo zabawy odjechał życie. Dano
+ojcu Wyprowadzają kuca dramatycznych myśliwskiém bór pęk żyt maja Wiec. Nię
+Taka Albo tace Usta pęk ucha.
+
+\mdseries
+\marginnote{\normalfont mdseries\\itshape\\scshape}\itshape
+Honoru myśliwych zaraza Rymsza Libijskich wszystkich Wożny przerywał szczodroty
+opowiadań. Cesarskich znaczy rączy muchom malarstwie spisem różowemi zacnie
+urządzał. Nasze Praga stare żeś Żyje cnoty Tabor. Mówcy pokój Również śmieléj
+wionęła jarzynach liczne drogą jastrząb słowo zabawy odjechał życie. Dano
+ojcu Wyprowadzają kuca dramatycznych myśliwskiém bór pęk żyt maja Wiec. Nię
+Taka Albo tace Usta pęk ucha.
+
+\marginnote{\normalfont bfseries\\itshape\\scshape}\bfseries
+Honoru myśliwych zaraza Rymsza Libijskich wszystkich Wożny przerywał szczodroty
+opowiadań. Cesarskich znaczy rączy muchom malarstwie spisem różowemi zacnie
+urządzał. Nasze Praga stare żeś Żyje cnoty Tabor. Mówcy pokój Również śmieléj
+wionęła jarzynach liczne drogą jastrząb słowo zabawy odjechał życie. Dano
+ojcu Wyprowadzają kuca dramatycznych myśliwskiém bór pęk żyt maja Wiec. Nię
+Taka Albo tace Usta pęk ucha.
+
+\marginnote{\normalfont mdseries\\slshape\\scspape}\mdseries
+\slshape
+Honoru myśliwych zaraza Rymsza Libijskich wszystkich Wożny przerywał szczodroty
+opowiadań. Cesarskich znaczy rączy muchom malarstwie spisem różowemi zacnie
+urządzał. Nasze Praga stare żeś Żyje cnoty Tabor. Mówcy pokój Również śmieléj
+wionęła jarzynach liczne drogą jastrząb słowo zabawy odjechał życie. Dano
+ojcu Wyprowadzają kuca dramatycznych myśliwskiém bór pęk żyt maja Wiec. Nię
+Taka Albo tace Usta pęk ucha.
+
+\marginnote{\normalfont bfseries\\slshape\\scspape}\bfseries
+Honoru myśliwych zaraza Rymsza Libijskich wszystkich Wożny przerywał szczodroty
+opowiadań. Cesarskich znaczy rączy muchom malarstwie spisem różowemi zacnie
+urządzał. Nasze Praga stare żeś Żyje cnoty Tabor. Mówcy pokój Również śmieléj
+wionęła jarzynach liczne drogą jastrząb słowo zabawy odjechał życie. Dano
+ojcu Wyprowadzają kuca dramatycznych myśliwskiém bór pęk żyt maja Wiec. Nię
+Taka Albo tace Usta pęk ucha.
+
+
+
+\normalfont\normalsize
+\selectlanguage{english}
+
+\section{Package options}
+
+Possible optional arguments are
+
+\noindent
+\begin{tabular}{@{} >{\ttfamily}l l @{}}
+oldstyle, osf & old-style figures \\
+lining, nf, lf & lining figures (default)\\
+proportional, p & varying-width figures\\
+tabular, t & fixed-width figures (default)\\
+ScaleRM & scaling for the serif font, preset to 1\\
+defaultfeatures & presetting of features only for rmfamily\\
+libertinus & use integral symbols from Libertinus Math
+\end{tabular}
+
+
+
+%\lstset{extendedchars}
+
+\begin{externalDocument}[
+% grfOptions={width=0.5\linewidth},
+ frame,
+ compiler=lualatex,
+ crop,
+ force=true,
+ runs=2,
+ code,
+ docType=latex,
+ frame,
+ showFilename,
+ ExampleDir=Examples,
+% align=\centering,
+% lstOptions={columns=flexible}
+]{bonum}
+\documentclass{article}
+\pagestyle{empty}
+%StartVisiblePreamble
+\usepackage[osf]{bonum-otf}
+%StopVisiblePreamble
+\begin{document}
+0000111122223333444455556666777788889999\par abcdefghijklmn
+\end{document}
+\end{externalDocument}
+
+
+\begin{externalDocument}[
+% grfOptions={width=0.5\linewidth},
+ compiler=lualatex,
+ crop,
+ force=true,
+ runs=1,
+ code,
+ docType=latex,
+ frame,
+% showFilename,
+% align=\centering,
+%lstOptions={columns=flexible}
+]{bonum}
+\documentclass{article}
+\pagestyle{empty}
+%StartVisiblePreamble
+\usepackage[lining]{bonum-otf}
+%StopVisiblePreamble
+\begin{document}
+0000111122223333444455556666777788889999\par
+\addfontfeatures{RawFeature=-lnum;+onum}%
+0000111122223333444455556666777788889999
+\end{document}
+\end{externalDocument}
+
+
+
+
+\begin{externalDocument}[
+ frame,
+ compiler=lualatex,
+ crop,
+ force=true,
+ runs=1,
+ code,
+ docType=latex,
+ frame,
+% showFilename,
+% align=\centering,
+%lstOptions={columns=flexible}
+ ]{bonum}
+\documentclass{article}
+\pagestyle{empty}
+%StartVisiblePreamble
+\usepackage[t=false]{bonum-otf}
+%StopVisiblePreamble
+\begin{document}
+0000111122223333444455556666777788889999\par
+\addfontfeatures{RawFeature=+tnum}%L
+0000111122223333444455556666777788889999
+\end{document}
+\end{externalDocument}
+
+
+
+
+
+
+\begin{externalDocument}[
+% grfOptions={width=0.5\linewidth},
+ frame,compiler=lualatex,
+ crop,
+ force=true,
+ runs=2,code,docType=latex,
+ frame,
+% showFilename,
+% align=\centering,
+% lstOptions={columns=flexible}
+]{bonum}
+\documentclass{article}
+\pagestyle{empty}
+%StartVisiblePreamble
+\usepackage[p]{bonum-otf}
+%StopVisiblePreamble
+\begin{document}
+0000111122223333444455556666777788889999\par
+\addfontfeatures{RawFeature=-pnum}%
+0000111122223333444455556666777788889999
+\end{document}
+\end{externalDocument}
+
+\section{Features}
+
+
+\begin{lstlisting}[basicstyle=\ttfamily\small]
+bash-3.2$ otfinfo -f texgyrebonum-regular.otf
+aalt Access All Alternates
+c2sc Small Capitals From Capitals
+cpsp Capital Spacing
+dlig Discretionary Ligatures
+frac Fractions
+kern Kerning
+liga Standard Ligatures
+lnum Lining Figures
+onum Oldstyle Figures
+pnum Proportional Figures
+salt Stylistic Alternates
+size Optical Size
+smcp Small Capitals
+ss01 Stylistic Set 1
+ss02 Stylistic Set 2
+ss03 Stylistic Set 3
+ss04 Stylistic Set 4
+tnum Tabular Figures
+zero Slashed Zero
+\end{lstlisting}
+
+%$
+
+
+\subsection{Capitals to Small Caps}
+
+The macro \Lcs{Lctosc}\Largb{arg} is for a local change of \emph{arg} and \Lcs{LCtoSC+} and \Lcs{LCtoSC-} for
+a global change of capitals to small caps.
+
+\begin{externalDocument}[
+% grfOptions={width=0.5\linewidth},
+ frame,compiler=lualatex,
+ crop,
+ force=true,
+ runs=2,code,docType=latex,
+ frame,
+% showFilename,
+% align=\centering,
+% lstOptions={columns=flexible}
+]{bonum}
+\documentclass{article}
+\pagestyle{empty}
+\parindent=0pt
+%StartVisiblePreamble
+\usepackage{bonum-otf}
+\usepackage{xcolor}
+%StopVisiblePreamble
+\begin{document}
+bonum Font ÅŰÉÃÄ \Lctosc{bonum Font ÅŰÉÃÄ}\\
+\LCtoSC+ bonum Font ÅŰÉÃÄ
+\end{document}
+\end{externalDocument}
+
+
+
+\subsection{Capitals to Small Caps and small captitals}
+
+The macro \Lcs{Lctosmcp}\Largb{arg} is for a local change of \emph{arg} and \Lcs{LCtoSMCP+} and \Lcs{LCtoSMCP-} for
+a global change of capitals to small caps.
+
+\begin{externalDocument}[
+% grfOptions={width=0.5\linewidth},
+ frame,compiler=lualatex,
+ crop,
+ force=true,
+ runs=2,code,docType=latex,
+ frame,
+% showFilename,
+% align=\centering,
+% lstOptions={columns=flexible}
+]{bonum}
+\documentclass{article}
+\pagestyle{empty}
+\parindent=0pt
+%StartVisiblePreamble
+\usepackage{bonum-otf}
+\usepackage{xcolor}
+%StopVisiblePreamble
+\begin{document}
+bonum Font ÅŰÉÃÄ \Lctosmcp{bonum Font ÅŰÉÃÄ}\\
+\LCtoSMCP+ bonum Font ÅŰÉÃÄ
+\end{document}
+\end{externalDocument}
+
+\subsection{Ligatures}
+
+The macros \Lcs{Lliga}\Largb{arg} (standard ligatures), \Lcs{Lhlig}\Largb{arg} (historical ligatures),
+\Lcs{Ldlig}\Largb{arg} (discretionary ligatures)
+are for a local change of \emph{arg} and \Lcs{LLIGA+}/\Lcs{LLIGA-}, \Lcs{LHLIG+}/\Lcs{LHLIG-}, and \Lcs{LDLIG+}/\Lcs{LDIG-} for
+a global change of capitals to small caps relative to the current group.
+
+\begin{externalDocument}[
+% grfOptions={width=0.5\linewidth},
+ frame,compiler=lualatex,
+ crop,
+ force=true,
+ runs=2,code,docType=latex,
+ frame,
+% showFilename,
+% align=\centering,
+% lstOptions={columns=flexible}
+]{bonum}
+\documentclass{article}
+\pagestyle{empty}
+\parindent=0pt
+%StartVisiblePreamble
+\usepackage{bonum-otf}
+\usepackage{xcolor}
+%StopVisiblePreamble
+\begin{document}%\LLIGA+ % Default
+ff, fi, ffi, fl
+
+\LLIGA- ff, fi, ffi, fl
+\end{document}
+\end{externalDocument}
+
+
+
+
+\subsection{Capital spacing, uppercase kerning}
+
+\begin{externalDocument}[
+% grfOptions={width=0.5\linewidth},
+ frame,compiler=lualatex,
+ crop,
+ force=true,
+ runs=2,code,docType=latex,
+ frame,
+% showFilename,
+% align=\centering,
+% lstOptions={columns=flexible}
+]{bonum}
+\documentclass{article}
+\pagestyle{empty}
+\parindent=0pt
+%StartVisiblePreamble
+\usepackage{bonum-otf}
+\usepackage{xcolor}
+%StopVisiblePreamble
+\begin{document}
+IN THE BEGINNING GOD CREATED THE HEAVENS AND THE EARTH.\\
+\textcolor{red}{\Lcpsp{IN THE BEGINNING GOD CREATED THE HEAVENS AND THE EARTH.}}
+
+\makebox[0pt][l]{IN THE BEGINNING GOD CREATED THE HEAVENS AND THE EARTH.}%
+\textcolor{red}{\LCPSP IN THE BEGINNING GOD CREATED THE HEAVENS AND THE EARTH.}
+\end{document}
+\end{externalDocument}
+
+
+\subsection{Stylistic Alternates}
+
+The macro \Lcs{Lsalt}\Largb{arg} is for a local change of \emph{arg} and \Lcs{LSALT+} and \Lcs{LSALT-} for
+the alternate characters.
+
+\begin{externalDocument}[
+% grfOptions={width=0.5\linewidth},
+ frame,compiler=lualatex,
+ crop,
+ force=true,
+ runs=2,code,docType=latex,
+ usefancyvrb,
+ frame,
+% showFilename,
+% align=\centering,
+% lstOptions={columns=flexible}
+]{bonum}
+\documentclass{article}
+\pagestyle{empty}
+\parindent=0pt
+%StartVisiblePreamble
+\usepackage{bonum-otf}
+%StopVisiblePreamble
+\begin{document}
+θκφ \quad \Lsalt{θκφ} \quad\LSALT+ θκφ \quad\LSALT- θκφ
+\end{document}
+\end{externalDocument}
+
+
+% ss01 Stylistic Set 1
+% ss02 Stylistic Set 2
+% ss03 Stylistic Set 3
+% ss04 Stylistic Set 4
+% ss10 Stylistic Set 10
+
+\subsection{Stylistic Sets}
+
+\iffalse
+
+
+
+
+
+¡“¶¢[]|{}≠¿'
+«∑€®†Ω¨â„øπ•±
+å‚∂ƒ©ªº∆@œæ
+\≈ç√∫~µ∞…–
+---
+≥¬â€#£ï¬^\˜·¯˙˚
+»„‰¸ËˇÃÛØâˆÂ°ï£¿â€™
+Ã…Ãâ„¢ÃÌÓıˆflŒÆ
+‡ÙÇ◊‹›˘˛÷—
+\fi
+
+There is a short command \Lcs{Lssxx}\Largb{text} for the four stylistic sets,
+where xx is the number of the set (two digits)
+and \textit{text} the local argument:
+
+\begin{externalDocument}[
+% grfOptions={width=0.5\linewidth},
+ frame,compiler=lualatex,
+ crop,
+ force=true,
+ usefancyvrb,
+ runs=2,code,docType=latex,
+ frame,
+% showFilename,
+% align=\centering,
+% lstOptions={columns=flexible}
+]{bonum}
+\documentclass{article}
+\pagestyle{empty}
+\parindent=0pt
+%StartVisiblePreamble
+\usepackage{bonum-otf}
+%StopVisiblePreamble
+\begin{document}
+εμφ Ï€Ïθ Īī@©â„¶® Ì„ $\rightarrow$ \Lss01{εμφ Ï€Ïθ Īī@©â„¶® Ì„}\par
+@©â„¶® $\rightarrow$ \Lss02{@©â„¶®}\par
+εμφπÏθ $\rightarrow$ \Lss03{εμφ Ï€Ïθ}\par
+Īī̄ $\rightarrow$ \Lss04{Īī̄}\par
+\end{document}
+\end{externalDocument}
+
+For a global change of the stylistic set one can use the command \Lcs{LSSxx}, where xx
+is again the number of the set.
+
+\begin{externalDocument}[
+% grfOptions={width=0.5\linewidth},
+ frame,compiler=lualatex,
+ crop,
+ usefancyvrb,
+ force=true,
+ runs=2,code,docType=latex,
+ frame,
+% showFilename,
+% align=\centering,
+% lstOptions={columns=flexible}
+]{bonum}
+\documentclass{article}
+\pagestyle{empty}
+%StartVisiblePreamble
+\usepackage{bonum-otf}
+%StopVisiblePreamble
+\begin{document}
+εμφ Ï€Ïθ Īī@©â„¶® Ì„ $\rightarrow$ \LSS01 εμφ Ï€Ïθ Īī@©â„¶® Ì„
+\end{document}
+\end{externalDocument}
+
+
+
+\begin{externalDocument}[
+ frame,compiler=lualatex,
+ crop,
+ force=true,
+ usefancyvrb,
+ runs=2,code,docType=latex,
+ frame,
+% lstOptions={columns=flexible}
+]{bonum}
+\documentclass{article}
+\pagestyle{empty}
+%StartVisiblePreamble
+\usepackage{bonum-otf}
+%StopVisiblePreamble
+\begin{document}
+@©â„¶® $\rightarrow$ \LSS02 @©â„¶®
+\end{document}
+\end{externalDocument}
+
+\iffalse
+≤¡“¶¢[]|{}≠¿'
+«∑€®†Ω¨â„øπ•±
+å‚∂ƒ©ªº∆@œæ
+\≈ç√∫~µ∞…–
+---
+≥¬â€#£ï¬^\˜·¯˙˚
+»„‰¸ËˇÃÛØâˆÂ°ï£¿â€™
+Ã…Ãâ„¢ÃÌÓıˆflŒÆ
+‡ÙÇ◊‹›˘˛÷—
+\fi
+
+
+%\section{New text macros}
+%
+%\Lcs{textsup}\Largb{text} for superiors:
+%
+%\begin{verbatim}
+%7\textsup{th} floor
+%\end{verbatim}
+
+%7\textsup{th} floor
+
+
+\section{Font commands}
+Instead of using the command \Lcs{fontspec} for changing to a different type of
+a bonum font, one can use a predefinded command:
+
+\begin{verbatim}
+\bonum (default)
+\bonumOsF (Old style proportional figures)
+\bonumTLF (tabular lining figures)
+\end{verbatim}
+
+\begin{externalDocument}[
+ frame,compiler=lualatex,
+ crop,
+ force=true,
+ usefancyvrb,
+ runs=2,code,docType=latex,
+ frame,
+% lstOptions={columns=flexible}
+]{bonum}
+\documentclass{article}
+\pagestyle{empty}
+%StartVisiblePreamble
+\usepackage{bonum-otf}
+%StopVisiblePreamble
+\begin{document}
+The default setting with 123456. \bonumOsF Now with 123456 and
+\bonumTLF now with 123456 \bonum and back to the default 123456.
+\end{document}
+\end{externalDocument}
+
+
+
+
+
+\section{Math mode}
+
+
+%bash-3.2$ otfinfo -f --script=math texgyrebonum-math.otf
+%aalt Access All Alternates
+%dtls <unknown feature>
+%ssty <unknown feature>
+
+
+\subsection{Example for bonum math}
+
+
+\noindent\fbox{%
+\begin{minipage}{\dimexpr\textwidth-2\fboxsep-2\fboxrule}
+\textbf{Theorem 1 (Residue Theorem).}
+Let $f$ be analytic in the region $G$ except for the isolated singularities $a_1,a_2,\ldots,a_m$. If $\gamma$ is a closed rectifiable curve in $G$ which does not pass through any of the points $a_k$ and if $\gamma\approx 0$ in $G$ then
+%
+\[
+\mathop{\symup{Res}}\limits_{z=a}f(z) = \mathop{\mathrm{Res}}\limits_a f
+ = \frac{1}{2\pi\symup{i}} \int\limits_C f(z)\,\symup dz,
+\]
+%
+where $C\subset D\backslash\{a\}$ is a closed line
+$ n(C,a)=1$ (e.\,g. a counterclockwise circle loop).
+
+\medskip
+$\symup{A} \Lambda \Delta \nabla \symup{B C D} \Sigma \symup{E F} \Gamma \symup{G H I J} K L M N O
+ \Theta \Omega \symup{P} \Phi \Pi \Xi \mathtt{Q R S T} U V W X Y \Upsilon \Psi \symup{Z}$
+$\mathsf{ABCDabcd1234}$
+
+$a\alpha b \beta c \partial d \delta e \epsilon \varepsilon f \zeta \xi g \gamma h \hbar \iota i \imath j
+k \kappa l \ell \lambda m n \eta \theta \vartheta o \sigma \varsigma \phi \varphi \wp p
+\rho \varrho q r s t \tau \pi u \mu \nu v \upsilon w \omega \varpi $
+
+$xyz \infty \propto \emptyset y=f(x)$
+\hfill$\sum\int\prod\displaystyle~\prod\int\sum~
+ \textstyle\sum_a^b\int_a^b\prod_a^b~ \displaystyle\sum_a^b\int\limits_a^b\prod_a^b$
+
+\boldmath
+$\symup{A} \Lambda \Delta \nabla \symup{B C D} \Sigma \symup{E F} \Gamma \symup{G H I J} K L M N O
+ \Theta \Omega \symup{P} \Phi \Pi \Xi \mathtt{Q R S T} U V W X Y \Upsilon \Psi \symup{Z}$
+$\mathsf{ABCDabcd1234}$
+
+$a\alpha b \beta c \partial d \delta e \epsilon \varepsilon f \zeta \xi g \gamma h \hbar \iota i \imath j
+k \kappa l \ell \lambda m n \eta \theta \vartheta o \sigma \varsigma \phi \varphi \wp p
+\rho \varrho q r s t \tau \pi u \mu \nu v \upsilon w \omega \varpi $
+
+$xyz \infty \propto \emptyset y=f(x)$
+\hfill$\sum\int\prod\displaystyle~\prod\int\sum~
+ \textstyle\sum_a^b\int_a^b\prod_a^b~ \displaystyle\sum_a^b\int\limits_a^b\prod_a^b$
+\unboldmath
+\end{minipage}}
+
+
+There exists an optional argument \texttt{math} for setting features only for the math font,
+for example \texttt{+aalt} for slightly wider characters:
+
+
+\begin{externalDocument}[
+% grfOptions={width=0.5\linewidth},
+ frame,compiler=lualatex,
+ crop,
+ force=true,
+ runs=2,code,docType=latex,
+ frame,
+% showFilename,
+% align=\centering,
+% lstOptions={columns=flexible}
+]{bonum}
+\documentclass{article}
+\pagestyle{empty}
+%StartVisiblePreamble
+\usepackage{bonum-otf}
+%StopVisiblePreamble
+\begin{document}
+ $\alpha\beta\gamma\delta\Delta\epsilon\varepsilon\zeta
+ \eta\theta\Theta\vartheta\iota\kappa\lambda\Lambda\mu
+ \nu\xi\Xi\pi\Pi\varpi\rho\varrho\sigma\Sigma\varsigma
+ \tau\upsilon\Upsilon\phi\Phi\varphi\chi\psi\Psi\omega
+ \Omega$
+
+{\setmathfont[Script=Math,RawFeature=+aalt]{texgyrebonum-math.otf}
+ $\alpha\beta\gamma\delta\Delta\epsilon\varepsilon\zeta
+ \eta\theta\Theta\vartheta\iota\kappa\lambda\Lambda\mu
+ \nu\xi\Xi\pi\Pi\varpi\rho\varrho\sigma\Sigma\varsigma
+ \tau\upsilon\Upsilon\phi\Phi\varphi\chi\psi\Psi\omega
+ \Omega$
+}
+\end{document}
+\end{externalDocument}
+
+
+
+\subsection{Integrals}
+If you do not like the small integral symbols from bonum then use the package
+option \Loption{libertinus}. Then these symbols are taken from Libertinus Math.
+
+
+\begin{externalDocument}[
+ frame,compiler=lualatex,
+ crop,
+ force=true,
+ runs=2,code,docType=latex,
+ frame,
+ usefancyvrb,
+% lstOptions={columns=flexible}
+]{bonum}
+\documentclass{article}
+\pagestyle{empty}
+%StartVisiblePreamble
+\usepackage[libertinus]{bonum-otf}% use integrals from Libertinus
+%StopVisiblePreamble
+\begin{document}
+The integrals from Libertinus Math:
+\[ \int_\gamma\iint\iiint\iiiint\oint\oiint\oiiint\frac{f(x)}{z-a} \]
+
+The default integrals from bonum:
+\setmathfont{texgyrebonum-math.otf}
+\[ \int_\gamma\iint\iiint\iiiint\oint\oiint\oiiint\frac{f(x)}{z-a} \]
+\end{document}
+\end{externalDocument}
+
+
+
+
+
+
+
+
+
+\clearpage
+\newgeometry{margin=1cm,bmargin=2cm}
+
+\section{The font list of bonum Regular}
+
+\begin{multicols}{5}
+\begin{luacode*}
+ local f = fontloader.open('/Users/voss/Links/fonts/opentype/public/tex-gyre/texgyrebonum-regular.otf')
+ print("Max glyphs: "..f.glyphmax)
+ local glyphs = {}
+ for i = 0, f.glyphmax - 1 do
+ local g = f.glyphs[i]
+ if g then
+ table.insert(glyphs, {name = g.name, unicode = g.unicode})
+ end
+ end
+ table.sort(glyphs, function (a,b) return (a.unicode < b.unicode) end)
+ for i = 1, #glyphs do
+ tex.sprint('\\scriptsize'..glyphs[i].unicode .. ': ')
+ if (glyphs[i].unicode > 0) then
+ tex.sprint('{\\char' .. glyphs[i].unicode .. '}');
+ end
+ tex.sprint(' {\\scriptsize (')
+ tex.sprint(-2, glyphs[i].name)
+ tex.sprint(')}\\\\')
+ end
+ fontloader.close(f)
+\end{luacode*}
+\end{multicols}
+
+
+
+
+\section{The font list of bonum Math}
+
+
+\begingroup
+\catcode`\%=12
+\gdef\perCent{%}
+\endgroup
+
+%\UnicodeMathSymbol{"00021}{\mathexclam }{\mathclose}{exclamation mark}%
+\begin{multicols}{3}
+\def\UnicodeMathSymbol#1#2#3#4{\scriptsize\texttt{#1}: $#2{}$ (#4) \\}
+\input{unicode-math-table}
+\end{multicols}
+
+
+\clearpage\restoregeometry
+
+\printindex
+
+
+
+
+\end{document}
diff --git a/Master/texmf-dist/doc/fonts/junicode/Feature_Reference.tex b/Master/texmf-dist/doc/fonts/junicode/Feature_Reference.tex
index 77642ab0670..b7e359a9a7e 100644
--- a/Master/texmf-dist/doc/fonts/junicode/Feature_Reference.tex
+++ b/Master/texmf-dist/doc/fonts/junicode/Feature_Reference.tex
@@ -168,7 +168,7 @@ enlarged minuscule for a capital (or, less likely, a lowercase) letter everywher
a & cv02 &
{1=\cvd{2}{a}, 2=\cvd[1]{2}{a}, 3=\cvd[2]{2}{a}, 4=\cvd[3]{2}{a},
5=\cvd[4]{2}{a}, 6=\cvc{\cvd[5]{2}{a}}, 7=\cvd[6]{2}{a}, 8=\cvd[7]{2}{a}, 9=\cvd[8]{2}{a},
- 10=\cvd[9]{2}{a}}\index{cv02|textbf}\\
+ 10=\cvd[9]{2}{a}, 11=\cvd[10]{2}{a}}\index{cv02|textbf}\\
%
\bluerow B & cv03 &
1=\cvc{\cvd{3}{B}}, 2=\cvd[1]{3}{B}\index{cv03|textbf}\\
@@ -180,34 +180,39 @@ b & cv04 &
{1=\cvd{5}{C}, 2=\cvc{\cvd[1]{5}{C}}}\index{cv05|textbf}\\
%
c & cv06 &
-{1=\cvd{6}{c}, 2=\cvd[1]{6}{c}}\index{cv06|textbf}\\
+{1=\cvd{6}{c}, 2=\cvd[1]{6}{c}, 3=\cvd[2]{6}{c}}\index{cv06|textbf}\\
%
\bluerow D & cv07 &
{1=\cvd{7}{D}, 2=\cvc{\cvd[1]{7}{D}}, 3=\cvc{\cvd[2]{7}{D}}}\index{cv07|textbf}\\
%
d & cv08 &
{1=\cvd{8}{d}, 2=\cvd[1]{8}{d}, 3=\cvd[2]{8}{d}, 4=\cvc{\cvd[3]{8}{d}},
- 5=\cvc{\cvd[4]{8}{d}, 6=\cvc{\cvd[5]{8}{d}} (also affects ḋ)}\index{cv08|textbf}}\\
+ 5=\cvc{\cvd[4]{8}{d}}, 6=\cvc{\cvd[5]{8}{d}}, 7=\cvc{\cvd[6]{8}{d}},
+ 8=\cvc{\cvd[7]{8}{d}} (also affects ḋ)}\index{cv08|textbf}\\
%
\bluerow E & cv09 &
{1=\cvd{9}{E}, 2=\cvd[1]{9}{E}, 3=\cvc{\cvd[2]{9}{E}}, 4=\cvd[3]{9}{E}}\index{cv09|textbf}\\
%
e & cv10 &
-{1=\cvd{10}{e}, 2=\cvd[1]{10}{e}, 3=\cvd[2]{10}{e}, 4=\cvc{\cvd[3]{10}{e}}, 5=\cvd[4]{10}{e}}\index{cv10|textbf}\\
+{1=\cvd{10}{e}, 2=\cvd[1]{10}{e}, 3=\cvd[2]{10}{e}, 4=\cvc{\cvd[3]{10}{e}}, 5=\cvd[4]{10}{e},
+6=\cvd[5]{10}{e}, 7=\cvd[6]{10}{e}, 8=\cvd[7]{10}{e}}\index{cv10|textbf}\\
%
\bluerow F & cv11 &
{1=\cvd{11}{F}, 2=\cvc{\cvd[1]{11}{F}, 3=\cvd[2]{11}{F}}}\index{cv11|textbf}\\
%
f & cv12 &
{1=\cvd{12}{f}, 2=\cvd[1]{12}{f}, 3=\cvd[2]{12}{f}, 4=\cvd[3]{12}{f}, 5=\cvd[4]{12}{f},
- 6=\cvd[5]{12}{f}, 7=\cvc{\cvd[6]{12}{f}}, 8=\cvc{\cvd[7]{12}{f}}, 9=\cvd[8]{12}{f}}\index{cv12|textbf}\\
+ 6=\cvd[5]{12}{f}, 7=\cvc{\cvd[6]{12}{f}}, 8=\cvc{\cvd[7]{12}{f}}, 9=\cvd[8]{12}{f},
+ 10=\cvd[9]{12}{f}}\index{cv12|textbf}\\
%
\bluerow G & cv13 &
{1=\cvd{13}{G}, 2=\cvd[1]{13}{G}, 3=\cvd[2]{13}{G}, 4=\cvc{\cvd[3]{13}{G}}}\index{cv13|textbf}\\
%
g & cv14 &
{1=\cvd{14}{g}, 2=\cvd[1]{14}{g}, 3=\cvd[2]{14}{g}, 4=\cvd[3]{14}{g}, 5=\cvd[4]{14}{g},
- 6=\cvd[5]{14}{g}, 7=\cvd[6]{14}{g}, 8=\cvc{\cvd[7]{14}{g}}, 9=\cvc{\cvd[8]{14}{g}}}\index{cv14|textbf}\\
+ 6=\cvd[5]{14}{g}, 7=\cvd[6]{14}{g}, 8=\cvc{\cvd[7]{14}{g}}, 9=\cvc{\cvd[8]{14}{g}},
+ 10=\cvd[9]{14}{g}, 11=\cvd[10]{14}{g}, 12=\cvd[11]{14}{g},
+ 13=\cvd[12]{14}{g}, 14=\cvd[13]{14}{g}, 15=\cvd[14]{14}{g}}\index{cv14|textbf}\\
%
\bluerow H & cv15 &
{1=\cvd{15}{H}, 2=\cvc{\cvd[1]{15}{H}}, 3=\cvd[2]{15}{H}}\index{cv15|textbf}\\
@@ -233,7 +238,8 @@ j & cv20 &
{1=\cvc{\cvd{21}{K}}}\index{cv21|textbf}\\
%
k & cv22 &
-{1=\cvd{22}{k}, 2=\cvd[1]{22}{k}, 3=\cvd[2]{22}{k}, 4=\cvd[3]{22}{k}, \cvc{5=\cvd[4]{22}{k}}, 6=\cvd[5]{22}{k}}\index{cv22|textbf}\\
+{1=\cvd{22}{k}, 2=\cvd[1]{22}{k}, 3=\cvd[2]{22}{k}, 4=\cvd[3]{22}{k}, \cvc{5=\cvd[4]{22}{k}},
+6=\cvd[5]{22}{k}, 7=\cvd[6]{22}{k}}\index{cv22|textbf}\\
%
\bluerow L & cv23 &
{1=\cvc{\cvd{23}{L}}}\index{cv23|textbf}\\
@@ -252,7 +258,8 @@ m & cv26 &
%
n & cv28 &
{1=\cvd{28}{n}, 2=\cvd[1]{28}{n}, 3=\cvd[2]{28}{n}, 4=\cvd[3]{28}{n}, \cvc{5=\cvd[4]{28}{n}},
- 6=\cvd[5]{28}{n}, 7=\cvd[6]{28}{n}, 8=\cvd[7]{28}{n}}\index{cv28|textbf}\\
+ 6=\cvd[5]{28}{n}, 7=\cvd[6]{28}{n}, 8=\cvd[7]{28}{n},
+ \cvc{9=\cvd[8]{28}{n}}}\index{cv28|textbf}\\
%
\bluerow O & cv29 &
{1=\cvd{29}{O}, 2=\cvc{\cvd[1]{29}{O}}}\index{cv29|textbf}\\
@@ -278,7 +285,7 @@ q & cv34 &
%
r & cv36 &
{1=\cvd{36}{r}, 2=\cvd[1]{36}{r}, 3=\cvd[2]{36}{r}, 4=\cvc{\cvd[3]{36}{r}},
-5=\cvd[4]{36}{r}}\index{cv36|textbf}\\
+5=\cvd[4]{36}{r}, 6=\cvd[5]{36}{r}, 7=\cvd[6]{36}{r}}\index{cv36|textbf}\\
%
\bluerow S & cv37 &
{1=\cvd{37}{S}, 2=\cvd[1]{37}{S}, 3=\cvc{\cvd[2]{37}{S}}, 4=\cvd[3]{37}{S}, 5=\cvd[4]{37}{S},
@@ -288,7 +295,7 @@ s & cv38 &
{1=\cvd{38}{s}, 2=\cvd[1]{38}{s}, 3=\cvd[2]{38}{s}, 4=\cvd[3]{38}{s},
5=\cvd[4]{38}{s}, 6=\cvd[5]{38}{s}, 7=\cvc{\cvd[6]{38}{s}}, 8=\cvd[7]{38}{s},
9=\cvd[8]{38}{s}, 10=\cvd[9]{38}{s}, 11=\cvd[10]{38}{s}, 12=\cvd[11]{38}{s},
- 13=\cvd[12]{38}{s}, 14=\cvd[13]{38}{s}}\index{cv38|textbf}\\
+ 13=\cvd[12]{38}{s}, 14=\cvd[13]{38}{s}, 15=\cvd[14]{38}{s}}\index{cv38|textbf}\\
%
\bluerow T & cv39 &
{1=\cvd{39}{T}, 2=\cvc{\cvd[1]{39}{T}}}\index{cv39|textbf}\\
@@ -386,7 +393,8 @@ cv56\index{cv56|textbf} &
\bluerow{\ae} (\unic{U+00E6}) &
cv57\index{cv57|textbf} &
{1=\cvd{57}{\ae}, 2=\cvc{\cvd[1]{57}{\ae}}, 3=\cvd[2]{57}{\ae}, 4=\cvd[3]{57}{\ae},
-5=\cvd[4]{57}{\ae}, 6=\cvd[5]{57}{\ae}}\\
+5=\cvd[4]{57}{\ae}, 6=\cvd[5]{57}{\ae}, 7\cvd[6]{57}{\ae}, 8=\cvd[7]{57}{\ae}
+9=\cvd[8]{57}{\ae}, 10=\cvd[9]{57}{\ae}, 11=\cvd[10]{57}{\ae}}\\
%
Ꜵ (\unic{U+A734}) &
cv58\index{cv58|textbf} &
@@ -631,27 +639,33 @@ Stylistic\index{salt|textbf} Alternates (medieval capitals, etc.)}\hypertarget{s
Junicode has two series of decorative capitals in medieval scripts. These affect only the letters
A-Z and a-z. \textSourceText{salt[1]} provides rustic capitals, a script used for text in the late
ancient and early medieval periods and for display until around the eleventh century:
-\textex{\addfontfeature{StylisticAlternates=0}Gazifrequens Libycos duxit Karthago triumphos}. \textSourceText{salt[2]}
-provides Lombardic capitals, a style used mainly for what are now called drop caps. Junicode’s Lombardic capitals
-are not suitable for running text, titles, or headers:
-\textex{\addfontfeature{StylisticAlternates=1}A\,B\,C\,D\,E\,F}.
-Rustic capital Æ is available (\textex{\addfontfeature{StylisticAlternates=0}Æ}), but not Lombardic.
+\textex{\salti{0}{Gazifrequens Libycos duxit Karthago triumphos}}. \textSourceText{salt[2]}
+provides Lombardic capitals, a style used mainly for what are now called drop caps and not for
+running text, titles, or headers:
+\textex{\salti{1}{A\,B\,C\,D\,E\,F}}.
+Rustic capital Æ is available (\textex{\salti{0}{Æ}}), but not Lombardic.
\textSourceText{salt[3]} provides variants of rustic G and Lombardic F and T:
-\textex{\addfontfeature{StylisticAlternates=2}G\,F\,T}.
+\textex{\salti{2}{G\,F\,T}}
Miscellaneous alternates (for which Character Variants are
-unavailable) are also gathered here on \textSourceText{salt[1]}:
-ð \rightarrow{ }\textex{\addfontfeature{Language=English,StylisticAlternates=0}ð},
-Ạ\rightarrow{ }\textex{\addfontfeature{Language=English,StylisticAlternates=0}áº},
-Æš \rightarrow{ }\textex{\addfontfeature{Language=English,StylisticAlternates=0}Æš}.
-Also miscellaneous non-alphabetic characters:
-â“ \rightarrow{ }\textex{\addfontfeature{Language=English,StylisticAlternates=0}â“},
-- \rightarrow{ }\textex{\addfontfeature{Language=English,StylisticAlternates=0}-},
-☞ \rightarrow{ }\textex{\addfontfeature{Language=English,StylisticAlternates=0}☞} (a variant of the
-right index character used by Thomas Pynchon).
-Three variants of U+2E4D (â¹):
-1=\textex{\addfontfeature{Language=English,StylisticAlternates=0}â¹},
-2=\textex{\addfontfeature{Language=English,StylisticAlternates=1}â¹},
-3=\textex{\addfontfeature{Language=English,StylisticAlternates=2}â¹}.
+unavailable) are also gathered here:
+
+\begin{multicols}{2}
+\color{GGOrange} â¹: 1=\salti{0}{â¹}, 2=\salti{1}{â¹}, 3=\salti{2}{â¹}.
+
+{\addfontfeature{Language=English}ð: 1=\salti{0}{ð}, 2=\salti{1}{ð}, 3=\salti{2}{ð}.}
+
+áº: 1=\salti{0}{áº}.
+
+☞: 1=\salti{0}{☞}.
+
+- (hyphen): 1=\salti{0}{-}.
+
+Æš: 1=\salti{0}{Æš}.
+
+ê­: 1=\salti{0}{ê­}.
+
+Æ¿: 1=\salti{0}{Æ¿}.
+\end{multicols}
\subsection{\textSourceText{cv68} – Variant of ʔ (\unic{U+0294}, glottal stop)}
@@ -1177,7 +1191,8 @@ Colons,\index{ss18|textbf} semicolons, parentheses, quotation marks and several
\subsection{\textSourceText{cv69} – Variants of âŠâ¹’
(\unic{U+204A / U+2E52}, Tironian nota)}
1=\cvd{69}{âŠâ¹’}, 2=\cvd[1]{69}{âŠâ¹’}, 3=\cvd[2]{69}{âŠâ¹’}, 4=\cvd[3]{69}{âŠâ¹’}, 5=\cvd[4]{69}{âŠâ¹’},
-6=\cvd[5]{69}{âŠâ¹’}, 7=\cvd[6]{69}{âŠâ¹’}, 8=\cvd[7]{69}{âŠâ¹’}, 9=\cvd[8]{69}{âŠâ¹’}.\index{cv69|textbf}
+6=\cvd[5]{69}{âŠâ¹’}, 7=\cvd[6]{69}{âŠâ¹’}, 8=\cvd[7]{69}{âŠâ¹’}, 9=\cvd[8]{69}{âŠâ¹’},
+10=\cvd[9]{69}{âŠâ¹’}, 11=\cvd[10]{69}{âŠâ¹’}.\index{cv69|textbf}
\subsection{\textSourceText{cv70} –
Variants of . (period)}\index{cv70|textbf}
@@ -1362,9 +1377,13 @@ with the diacritic properly positioned.
35\hfill=\hfill\cvd[34]{84}{â—ŒÍÌ„}
-36\hfill=\hfill\cvd[34]{84}{â—ŒÍÌ„}
+36\hfill=\hfill\cvd[35]{84}{â—ŒÍÌ„}
+
+37\hfill=\hfill\cvd[36]{84}{â—ŒÍÌ„}
-37\hfill=\hfill\cvd[34]{84}{â—ŒÍÌ„}
+38\hfill=\hfill\cvd[37]{84}{â—ŒÍÌ„}
+
+39\hfill=\hfill\cvd[38]{84}{â—ŒÍÌ„}
\end{multicols}\index{cv84}
\subsection{\textSourceText{cv81} – Variants of ◌͛ (\unic{U+035B}, combining
@@ -1704,251 +1723,251 @@ Cmd-D: enable Kerning, Standard Ligatures, and Contextual Alternates, and the ot
but in most other applications they are enabled by default.
-\chapter{Non-MUFI Code Points}\hypertarget{nonmufi}{}
+% \chapter{Non-MUFI Code Points}\hypertarget{nonmufi}{}
-Characters in Junicode that do not have Unicode code points should be accessed via OpenType
-features whenever possible. MUFI/PUA code points should be used only in applications that do not support OpenType, or
-that support it only partially (for example, MS Word). For certain characters that lack either Unicode or MUFI code
-points, code points in the Supplementary Private Use Area-A (plane 15) are available.
+% Characters in Junicode that do not have Unicode code points should be accessed via OpenType
+% features whenever possible. MUFI/PUA code points should be used only in applications that do not support OpenType, or
+% that support it only partially (for example, MS Word). For certain characters that lack either Unicode or MUFI code
+% points, code points in the Supplementary Private Use Area-A (plane 15) are available.
-\begin{multicols}{4}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0000\hfill\cvd{53}{Ä„}}
+% \begin{multicols}{4}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0000\hfill\cvd{53}{Ä„}}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0001\hfill{}ó°€}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0001\hfill{}ó°€}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0002\hfill{}󰀂}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0002\hfill{}󰀂}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0003\hfill{}󰀃}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0003\hfill{}󰀃}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0004\hfill{}󰀄}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0004\hfill{}󰀄}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0005\hfill{}ó°€…}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0005\hfill{}ó°€…}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0006\hfill{}󰀆}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0006\hfill{}󰀆}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0007\hfill{}󰀇}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0007\hfill{}󰀇}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0008\hfill{}󰀈}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0008\hfill{}󰀈}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0009\hfill{}󰀉}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0009\hfill{}󰀉}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F000A\hfill{}󰀊}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F000A\hfill{}󰀊}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F000B\hfill{}󰀋}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F000B\hfill{}󰀋}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F000C\hfill{}󰀌}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F000C\hfill{}󰀌}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F000D\hfill{}ó°€}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F000D\hfill{}ó°€}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F000E\hfill{}󰀎}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F000E\hfill{}󰀎}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F000F\hfill{}ó°€}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F000F\hfill{}ó°€}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0010\hfill{}ó°€}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0010\hfill{}ó°€}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0011\hfill{}󰀑}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0011\hfill{}󰀑}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0012\hfill{}ó°€’}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0012\hfill{}ó°€’}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0013\hfill{}󰀓}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0013\hfill{}󰀓}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0014\hfill{}ó°€”}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0014\hfill{}ó°€”}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0015\hfill{}󰀕}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0015\hfill{}󰀕}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0016\hfill{}ó°€–}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0016\hfill{}ó°€–}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0017\hfill{}ó°€—}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0017\hfill{}ó°€—}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0018\hfill{}󰀘}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0018\hfill{}󰀘}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0019\hfill{}ó°€™}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0019\hfill{}ó°€™}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F001A\hfill{}󰀚}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F001A\hfill{}󰀚}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F001B\hfill{}ó°€›}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F001B\hfill{}ó°€›}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F001C\hfill{}󰀜}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F001C\hfill{}󰀜}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F001D\hfill{}ó°€}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F001D\hfill{}ó°€}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F001E\hfill{}󰀞}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F001E\hfill{}󰀞}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F001F\hfill{}󰀟}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F001F\hfill{}󰀟}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0020\hfill\char"0F0020}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0020\hfill\char"0F0020}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0021\hfill\char"0F0021}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0021\hfill\char"0F0021}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0030\hfill\char"0F0030}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0030\hfill\char"0F0030}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0031\hfill\char"0F0031}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0031\hfill\char"0F0031}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0032\hfill\char"0F0032}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0032\hfill\char"0F0032}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0033\hfill\char"0F0033}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0033\hfill\char"0F0033}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0034\hfill\char"0F0034}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0034\hfill\char"0F0034}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0035\hfill\char"0F0035}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0035\hfill\char"0F0035}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0036\hfill\char"0F0036}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0036\hfill\char"0F0036}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0037\hfill\char"0F0037}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0037\hfill\char"0F0037}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0038\hfill\char"0F0038}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0038\hfill\char"0F0038}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0039\hfill\char"0F0039}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0039\hfill\char"0F0039}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F003A\hfill\char"0F003A}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F003A\hfill\char"0F003A}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F003B\hfill\char"0F003B}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F003B\hfill\char"0F003B}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F003C\hfill\char"0F003C}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F003C\hfill\char"0F003C}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F003D\hfill\char"0F003D}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F003D\hfill\char"0F003D}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F003E\hfill\char"0F003E}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F003E\hfill\char"0F003E}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F003F\hfill\char"0F003F}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F003F\hfill\char"0F003F}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0040\hfill\char"0F0040}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0040\hfill\char"0F0040}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0041\hfill\char"0F0041}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0041\hfill\char"0F0041}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0042\hfill\char"0F0042}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0042\hfill\char"0F0042}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0043\hfill\char"0F0043}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0043\hfill\char"0F0043}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0044\hfill\char"0F0044}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0044\hfill\char"0F0044}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0045\hfill\char"0F0045}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0045\hfill\char"0F0045}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0046\hfill\char"0F0046}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0046\hfill\char"0F0046}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0047\hfill\char"0F0047}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0047\hfill\char"0F0047}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0048\hfill\char"0F0048}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0048\hfill\char"0F0048}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0049\hfill\char"0F0049}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0049\hfill\char"0F0049}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F004A\hfill\char"0F004A}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F004A\hfill\char"0F004A}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F004B\hfill\char"0F004B}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F004B\hfill\char"0F004B}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F004C\hfill\char"0F004C}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F004C\hfill\char"0F004C}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F004D\hfill\char"0F004D}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F004D\hfill\char"0F004D}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F004E\hfill\char"0F004E}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F004E\hfill\char"0F004E}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F004F\hfill\char"0F004F}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F004F\hfill\char"0F004F}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0050\hfill\char"0F0050}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0050\hfill\char"0F0050}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0051\hfill\char"0F0051}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0051\hfill\char"0F0051}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0052\hfill\char"0F0052}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0052\hfill\char"0F0052}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0053\hfill\char"0F0053}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0053\hfill\char"0F0053}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0054\hfill\char"0F0054}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0054\hfill\char"0F0054}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0055\hfill\char"0F0055}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0055\hfill\char"0F0055}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0056\hfill\char"0F0056}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0056\hfill\char"0F0056}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0057\hfill\char"0F0057}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0057\hfill\char"0F0057}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0058\hfill\char"0F0058}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0058\hfill\char"0F0058}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0059\hfill\char"0F0059}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0059\hfill\char"0F0059}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F005A\hfill\char"0F005A}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F005A\hfill\char"0F005A}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F005B\hfill\char"0F005B}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F005B\hfill\char"0F005B}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F005C\hfill\char"0F005C}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F005C\hfill\char"0F005C}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F005D\hfill\char"0F005D}
-\end{multicols}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F005D\hfill\char"0F005D}
+% \end{multicols}
diff --git a/Master/texmf-dist/doc/fonts/junicode/GettingStarted.tex b/Master/texmf-dist/doc/fonts/junicode/GettingStarted.tex
index 56bc48b825c..d458a13eec7 100644
--- a/Master/texmf-dist/doc/fonts/junicode/GettingStarted.tex
+++ b/Master/texmf-dist/doc/fonts/junicode/GettingStarted.tex
@@ -29,7 +29,7 @@ and there are good reasons to choose
the variable version of Junicode for any web project. The greatest reason to go
with the variable version is to speed the loading of web pages: users will never
have to download more than two font files (the size of which can be radically
-reduced via subsetting, explained in Section 9 of this Manual). Additionally,
+reduced via subsetting, explained in Section 8 of this Manual). Additionally,
however, variable fonts can make a page of text more dynamic and visually
interesting. See Mozilla's
\href{https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_fonts/Variable_fonts_guide}%
diff --git a/Master/texmf-dist/doc/fonts/junicode/JunicodeManual.pdf b/Master/texmf-dist/doc/fonts/junicode/JunicodeManual.pdf
index 9e09c2440f5..ecea72494e3 100644
--- a/Master/texmf-dist/doc/fonts/junicode/JunicodeManual.pdf
+++ b/Master/texmf-dist/doc/fonts/junicode/JunicodeManual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/junicode/JunicodeManual.sty b/Master/texmf-dist/doc/fonts/junicode/JunicodeManual.sty
index f7c4c7ab465..ea6cfe19599 100644
--- a/Master/texmf-dist/doc/fonts/junicode/JunicodeManual.sty
+++ b/Master/texmf-dist/doc/fonts/junicode/JunicodeManual.sty
@@ -100,6 +100,7 @@
\newcommand\textstyleEmphasis[1]{\textit{#1}}
\newcommand\textstyleEntityRef[1]{\textrm{#1}}
\newcommand{\cvd}[3][0]{{\addfontfeature{CharacterVariant=#2:#1}#3}}
+\newcommand{\salti}[2]{{\addfontfeature{StylisticAlternates=#1}#2}}
\newcommand{\hlig}[1]{{\addfontfeature{Ligatures=Historic}#1}}
\newcommand{\sups}[1]{{\addfontfeature{VerticalPosition = Superior}#1}}
\newcommand{\subs}[1]{{\addfontfeature{VerticalPosition = Inferior}#1}}
diff --git a/Master/texmf-dist/doc/fonts/junicode/JunicodeManual.tex b/Master/texmf-dist/doc/fonts/junicode/JunicodeManual.tex
index c23269c36c4..dbe787c4552 100644
--- a/Master/texmf-dist/doc/fonts/junicode/JunicodeManual.tex
+++ b/Master/texmf-dist/doc/fonts/junicode/JunicodeManual.tex
@@ -13,7 +13,7 @@
\huge \centering the font for medievalists \\[1cm]
\Huge\centering {\color{myRed}} \\[1cm]
\huge\centering {\jItalic specimens and user manual} \\[1ex]
- \Large\centering{\jRegular for version 2.208}\\
+ \Large\centering{\jRegular for version 2.209}\\
\vfill
{\color{myRed}}
\end{titlepage}
@@ -44,6 +44,8 @@
\input{encoded-glyphs.tex}
+\input{upperpua.tex}
+
\printindex
\vspace*{\fill}
diff --git a/Master/texmf-dist/doc/fonts/junicode/README b/Master/texmf-dist/doc/fonts/junicode/README
index c3ddaf1b199..cc3a848111f 100644
--- a/Master/texmf-dist/doc/fonts/junicode/README
+++ b/Master/texmf-dist/doc/fonts/junicode/README
@@ -1,5 +1,5 @@
-This is the README for version 2.208 of Peter S. Baker's
-Junicode family of fonts (2024-06-06). The Junicode font is
+This is the README for version 2.209 of Peter S. Baker's
+Junicode family of fonts (2024-07-17). The Junicode font is
primarily for scholars and students of the Middle Ages, but
it serves users with a wide variety of interests. It tracks
the development of the Medieval Unicode Font Initiative
@@ -7,9 +7,13 @@ the development of the Medieval Unicode Font Initiative
but it also provides many OpenType features that allow users
to access MUFI characters in accessible ways.
-Version 2.208 rearranges naming and encoding of standard
-f-ligatures to work better with the TeX font utility
-otftotfm. It also adds U+1DC4 combining macron-acute.
+This version of Junicode adds more than forty new glyphs
+for the Ansund project. It also adjusts the slant of
+proportional old-style figures; fixes an occasional problem
+with the combining dot accent; adds a couple of archaic
+phonetic characters; and fixes a bug that prevented the
+correct operation of a shortcut key combination in Adobe
+InDesign.
This package supports the Junicode static fonts for
XeLaTeX, LuaLaTeX and [pdf]LaTeX. To install this
diff --git a/Master/texmf-dist/doc/fonts/junicode/Specimens.tex b/Master/texmf-dist/doc/fonts/junicode/Specimens.tex
index 31526877027..df35dc9f33f 100644
--- a/Master/texmf-dist/doc/fonts/junicode/Specimens.tex
+++ b/Master/texmf-dist/doc/fonts/junicode/Specimens.tex
@@ -167,7 +167,7 @@ sadr̥śÄsadr̥śatvÄcca viá¹£ayÄviá¹£ayatvataḥ \\
{\small\jSmCondItalic Lithuanian poses several typographical challenges. Make sure
Contextual Alternates (calt\index{calt}) is turned on; for i̇Ì, use i followed
- by combining dot accent (\unic{U+0307}) and acute (\unic{U+0301}).}\\[1ex]
+ by combining dot accent (\kern+1.5pt\unic{U+0307}) and acute (\kern+1.5pt\unic{U+0301}).}\\[1ex]
{\jExp\addfontfeature{Language=Lithuanian} Visa žemÄ— turÄ—jo vienÄ… kalbÄ… ir tuos paÄius žodžius. Kai žmonÄ—s
kėlėsi iš rytų, jie rado slėnį Šinaro krašte ir ten įsikūrė. Vieni
kitiems sakė: Eime, pasidirbkime plytų ir jas išdekime. – Vietoj
diff --git a/Master/texmf-dist/doc/fonts/junicode/encoded-glyphs.tex b/Master/texmf-dist/doc/fonts/junicode/encoded-glyphs.tex
index 9ca17260996..a9f024b38f8 100644
--- a/Master/texmf-dist/doc/fonts/junicode/encoded-glyphs.tex
+++ b/Master/texmf-dist/doc/fonts/junicode/encoded-glyphs.tex
@@ -13,5 +13,5 @@ and these spill out on one or more sides.
\displayfonttable[color=blue,title-format=\caption{Encoded Glyphs in Junicode},
title-format-cont=\caption{Encoded Glyphs in Junicode, \emph{cont.}}, missing-glyph=•,
-missing-glyph-color=blue, range-end=F005F, glyph-width=12pt, hex-digits=head]{JunicodeVF-Roman.ttf}[Renderer=HarfBuzz]
+missing-glyph-color=blue, range-end=FFFFF, glyph-width=12pt, hex-digits=head]{JunicodeVF-Roman.ttf}[Renderer=HarfBuzz]
diff --git a/Master/texmf-dist/doc/fonts/junicode/junicode-samples.pdf b/Master/texmf-dist/doc/fonts/junicode/junicode-samples.pdf
index bd0f7b6a332..260aab76f6a 100644
--- a/Master/texmf-dist/doc/fonts/junicode/junicode-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/junicode/junicode-samples.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/junicode/upperpua.tex b/Master/texmf-dist/doc/fonts/junicode/upperpua.tex
new file mode 100644
index 00000000000..a1c5edfaf05
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/junicode/upperpua.tex
@@ -0,0 +1,242 @@
+\noindent Because the package that produced the table above cannot handle Unicodes greater than
+U+FFFFF, these are listed separately below.
+
+\begin{multicols}{4}
+\setlength{\parindent}{0em}\addfontfeature{Numbers={Lining,Uppercase}}10A03D: ôŠ€½
+
+10A047: ôŠ‡
+
+10A026: 􊀦
+
+10A036: 􊀶
+
+10A03F: 􊀿
+
+10A048: ôŠˆ
+
+10A04E: ôŠŽ
+
+10A04A: ôŠŠ
+
+10A04C: ôŠŒ
+
+10A008: 􊀈
+
+10A02B: 􊀫
+
+10A04B: ôŠ‹
+
+10A04D: ôŠ
+
+10A022: ôŠ€¢
+
+10A045: ôŠ…
+
+10A023: ôŠ€£
+
+10A029: 􊀩
+
+10A044: ôŠ„
+
+10A03E: ôŠ€¾
+
+10A040: ôŠ€
+
+10A031: ôŠ€±
+
+10A027: 􊀧
+
+10A053: ôŠ“
+
+10A006: 􊀆
+
+10A021: 􊀡
+
+10A02C: 􊀬
+
+10A037: ôŠ€·
+
+10A04F: ôŠ
+
+10A007: 􊀇
+
+10A032: ôŠ€²
+
+10A050: ôŠ
+
+10A033: ôŠ€³
+
+10A054: ôŠ”
+
+10A003: 􊀃
+
+10A004: 􊀄
+
+10A005: ôŠ€…
+
+10A039: ôŠ€¹
+
+10A024: 􊀤
+
+10A00D: ôŠ€
+
+10A01D: ôŠ€
+
+10A049: ôŠ‰
+
+10A025: ôŠ€¥
+
+10A028: 􊀨
+
+10A01B: ôŠ€›
+
+10A051: ôŠ‘
+
+10A052: ôŠ’
+
+10A02D: ôŠ€­
+
+10A02E: ôŠ€®
+
+10A02F: 􊀯
+
+10A00A: 􊀊
+
+10A00B: 􊀋
+
+10A00E: 􊀎
+
+10A00F: ôŠ€
+
+10A010: ôŠ€
+
+10A011: 􊀑
+
+10A012: ôŠ€’
+
+10A013: 􊀓
+
+10A014: ôŠ€”
+
+10A015: 􊀕
+
+10A016: ôŠ€–
+
+10A017: ôŠ€—
+
+10A018: 􊀘
+
+10A034: ôŠ€´
+
+10A035: ôŠ€µ
+
+10A03A: 􊀺
+
+10A030: ôŠ€°
+
+10A019: ôŠ€™
+
+10A046: ôŠ†
+
+10A00C: 􊀌
+
+10A03B: ôŠ€»
+
+10A01F: 􊀟
+
+10A041: ôŠ
+
+10A03C: ôŠ€¼
+
+10A01E: 􊀞
+
+10A042: ôŠ‚
+
+10A043: ôŠƒ
+
+10A001: ôŠ€
+
+10A002: 􊀂
+
+10A055: ôŠ•
+
+10A056: ôŠ–
+
+10A057: ôŠ—
+
+10A058: ôŠ˜
+
+10A059: ôŠ™
+
+10A05A: ôŠš
+
+10A05B: ôŠ›
+
+10A05C: ôŠœ
+
+10A05D: â—ŒôŠ
+
+10A05E: ôŠž
+
+10A05F: ôŠŸ
+
+10A060: ôŠ 
+
+10A061: ôŠ¡
+
+10A062: ôŠ¢
+
+10A063: ôŠ£
+
+10A064: ôŠ¤
+
+10A065: ôŠ¥
+
+10A066: ôŠ¦
+
+10A067: ôŠ§
+
+10A068: ôŠ¨
+
+10A069: ôŠ©
+
+10A06A: ôŠª
+
+10A06B: ôŠ«
+
+10A06D: ôŠ­
+
+10A06E: ôŠ®
+
+10A06F: ôŠ¯
+
+10A070: ôŠ°
+
+10A071: ôŠ±
+
+10A073: ôŠ³
+
+10A074: ôŠ´
+
+10A075: â—ŒôŠµ
+
+10A076: ôŠ¶
+
+10A077: ôŠ·
+
+10A078: ôŠ¸
+
+10A079: ôŠ¹
+
+10A07A: ôŠº
+
+10A07B: ôŠ»
+
+10A07C: ôŠ¼
+
+10A07D: ôŠ½
+
+10A07E: ôŠ¾
+
+10A07F: ôŠ¿
+\end{multicols}
diff --git a/Master/texmf-dist/doc/fonts/junicodevf/About.tex b/Master/texmf-dist/doc/fonts/junicodevf/About.tex
index 92b71b11510..0e6a666da50 100644
--- a/Master/texmf-dist/doc/fonts/junicodevf/About.tex
+++ b/Master/texmf-dist/doc/fonts/junicodevf/About.tex
@@ -26,7 +26,7 @@ the University. Examples of all these typefaces can be found
in {\itshape A Specimen of the
Several Sorts of Letter Given to the University by Dr. John Fell,
Sometime Lord Bishop of Oxford. To Which Is Added the Letter Given by
-Mr. F. Junius} (Oxford, 1693).\footnote{There is a facsimile of this
+Mr. F. Junius} (Oxford, 1693).\footnote{\ There is a facsimile of this
work at the
\href{https://digital.bodleian.ox.ac.uk/objects/876b73f0-3e03-41c1-9fd1-0688a1785561/}{Digital Bodleian}.}
diff --git a/Master/texmf-dist/doc/fonts/junicodevf/EnlargeAxis.tex b/Master/texmf-dist/doc/fonts/junicodevf/EnlargeAxis.tex
index 2a05205210a..119265605cb 100644
--- a/Master/texmf-dist/doc/fonts/junicodevf/EnlargeAxis.tex
+++ b/Master/texmf-dist/doc/fonts/junicodevf/EnlargeAxis.tex
@@ -52,7 +52,7 @@ is for insular d):
\noindent The result will be an abbreviation that begins with an “Enlarged Minuscule†insular d, precisely matching the look
of the second example in the figure above.
-These lowercase letters are affected by the Enlarge axis:\footnote{Note that all composite characters (e.g. \textex{á}, \textex{ü})
+These lowercase letters are affected by the Enlarge axis:\footnote{\ Note that all composite characters (e.g. \textex{á}, \textex{ü})
based on these are also affected, so that the actual number of affected characters is much greater than shown here.}
\begin{multicols}{6}
a\hfill→\hfill\enlax{a}
diff --git a/Master/texmf-dist/doc/fonts/junicodevf/Feature_Reference.tex b/Master/texmf-dist/doc/fonts/junicodevf/Feature_Reference.tex
index fc6fe7ef3fe..b7e359a9a7e 100644
--- a/Master/texmf-dist/doc/fonts/junicodevf/Feature_Reference.tex
+++ b/Master/texmf-dist/doc/fonts/junicodevf/Feature_Reference.tex
@@ -168,7 +168,7 @@ enlarged minuscule for a capital (or, less likely, a lowercase) letter everywher
a & cv02 &
{1=\cvd{2}{a}, 2=\cvd[1]{2}{a}, 3=\cvd[2]{2}{a}, 4=\cvd[3]{2}{a},
5=\cvd[4]{2}{a}, 6=\cvc{\cvd[5]{2}{a}}, 7=\cvd[6]{2}{a}, 8=\cvd[7]{2}{a}, 9=\cvd[8]{2}{a},
- 10=\cvd[9]{2}{a}}\index{cv02|textbf}\\
+ 10=\cvd[9]{2}{a}, 11=\cvd[10]{2}{a}}\index{cv02|textbf}\\
%
\bluerow B & cv03 &
1=\cvc{\cvd{3}{B}}, 2=\cvd[1]{3}{B}\index{cv03|textbf}\\
@@ -180,40 +180,46 @@ b & cv04 &
{1=\cvd{5}{C}, 2=\cvc{\cvd[1]{5}{C}}}\index{cv05|textbf}\\
%
c & cv06 &
-{1=\cvd{6}{c}, 2=\cvd[1]{6}{c}}\index{cv06|textbf}\\
+{1=\cvd{6}{c}, 2=\cvd[1]{6}{c}, 3=\cvd[2]{6}{c}}\index{cv06|textbf}\\
%
\bluerow D & cv07 &
{1=\cvd{7}{D}, 2=\cvc{\cvd[1]{7}{D}}, 3=\cvc{\cvd[2]{7}{D}}}\index{cv07|textbf}\\
%
d & cv08 &
{1=\cvd{8}{d}, 2=\cvd[1]{8}{d}, 3=\cvd[2]{8}{d}, 4=\cvc{\cvd[3]{8}{d}},
- 5=\cvc{\cvd[4]{8}{d}} (also affects ḋ)}\index{cv08|textbf}\\
+ 5=\cvc{\cvd[4]{8}{d}}, 6=\cvc{\cvd[5]{8}{d}}, 7=\cvc{\cvd[6]{8}{d}},
+ 8=\cvc{\cvd[7]{8}{d}} (also affects ḋ)}\index{cv08|textbf}\\
%
\bluerow E & cv09 &
{1=\cvd{9}{E}, 2=\cvd[1]{9}{E}, 3=\cvc{\cvd[2]{9}{E}}, 4=\cvd[3]{9}{E}}\index{cv09|textbf}\\
%
e & cv10 &
-{1=\cvd{10}{e}, 2=\cvd[1]{10}{e}, 3=\cvd[2]{10}{e}, 4=\cvc{\cvd[3]{10}{e}}, 5=\cvd[4]{10}{e}}\index{cv10|textbf}\\
+{1=\cvd{10}{e}, 2=\cvd[1]{10}{e}, 3=\cvd[2]{10}{e}, 4=\cvc{\cvd[3]{10}{e}}, 5=\cvd[4]{10}{e},
+6=\cvd[5]{10}{e}, 7=\cvd[6]{10}{e}, 8=\cvd[7]{10}{e}}\index{cv10|textbf}\\
%
\bluerow F & cv11 &
{1=\cvd{11}{F}, 2=\cvc{\cvd[1]{11}{F}, 3=\cvd[2]{11}{F}}}\index{cv11|textbf}\\
%
f & cv12 &
{1=\cvd{12}{f}, 2=\cvd[1]{12}{f}, 3=\cvd[2]{12}{f}, 4=\cvd[3]{12}{f}, 5=\cvd[4]{12}{f},
- 6=\cvd[5]{12}{f}, 7=\cvc{\cvd[6]{12}{f}}, 8=\cvc{\cvd[7]{12}{f}}, 9=\cvd[8]{12}{f}}\index{cv12|textbf}\\
+ 6=\cvd[5]{12}{f}, 7=\cvc{\cvd[6]{12}{f}}, 8=\cvc{\cvd[7]{12}{f}}, 9=\cvd[8]{12}{f},
+ 10=\cvd[9]{12}{f}}\index{cv12|textbf}\\
%
\bluerow G & cv13 &
{1=\cvd{13}{G}, 2=\cvd[1]{13}{G}, 3=\cvd[2]{13}{G}, 4=\cvc{\cvd[3]{13}{G}}}\index{cv13|textbf}\\
%
g & cv14 &
{1=\cvd{14}{g}, 2=\cvd[1]{14}{g}, 3=\cvd[2]{14}{g}, 4=\cvd[3]{14}{g}, 5=\cvd[4]{14}{g},
- 6=\cvd[5]{14}{g}, 7=\cvd[6]{14}{g}, 8=\cvc{\cvd[7]{14}{g}}, 9=\cvc{\cvd[8]{14}{g}}}\index{cv14|textbf}\\
+ 6=\cvd[5]{14}{g}, 7=\cvd[6]{14}{g}, 8=\cvc{\cvd[7]{14}{g}}, 9=\cvc{\cvd[8]{14}{g}},
+ 10=\cvd[9]{14}{g}, 11=\cvd[10]{14}{g}, 12=\cvd[11]{14}{g},
+ 13=\cvd[12]{14}{g}, 14=\cvd[13]{14}{g}, 15=\cvd[14]{14}{g}}\index{cv14|textbf}\\
%
\bluerow H & cv15 &
{1=\cvd{15}{H}, 2=\cvc{\cvd[1]{15}{H}}, 3=\cvd[2]{15}{H}}\index{cv15|textbf}\\
%
h & cv16 &
-{1=\cvd{16}{h}, 2=\cvd[1]{16}{h}, 3=\cvc{\cvd[2]{16}{h}}, 4=\cvd[3]{16}{h}, 5=\cvd[4]{16}{h}}\index{cv16|textbf}\\
+{1=\cvd{16}{h}, 2=\cvd[1]{16}{h}, 3=\cvc{\cvd[2]{16}{h}}, 4=\cvd[3]{16}{h}, 5=\cvd[4]{16}{h}}\index{cv16|textbf},
+6=\cvd[5]{16}{h}\\
%
\bluerow I & cv17 &
{1=\cvd{17}{I}, 2=\cvd[1]{17}{I}, 3=\cvc{\cvd[2]{17}{I}}, 4=\cvd[3]{17}{I}}\index{cv17|textbf}\\
@@ -232,7 +238,8 @@ j & cv20 &
{1=\cvc{\cvd{21}{K}}}\index{cv21|textbf}\\
%
k & cv22 &
-{1=\cvd{22}{k}, 2=\cvd[1]{22}{k}, 3=\cvd[2]{22}{k}, 4=\cvd[3]{22}{k}, \cvc{5=\cvd[4]{22}{k}}, 6=\cvd[5]{22}{k}}\index{cv22|textbf}\\
+{1=\cvd{22}{k}, 2=\cvd[1]{22}{k}, 3=\cvd[2]{22}{k}, 4=\cvd[3]{22}{k}, \cvc{5=\cvd[4]{22}{k}},
+6=\cvd[5]{22}{k}, 7=\cvd[6]{22}{k}}\index{cv22|textbf}\\
%
\bluerow L & cv23 &
{1=\cvc{\cvd{23}{L}}}\index{cv23|textbf}\\
@@ -251,7 +258,8 @@ m & cv26 &
%
n & cv28 &
{1=\cvd{28}{n}, 2=\cvd[1]{28}{n}, 3=\cvd[2]{28}{n}, 4=\cvd[3]{28}{n}, \cvc{5=\cvd[4]{28}{n}},
- 6=\cvd[5]{28}{n}, 7=\cvd[6]{28}{n}}\index{cv28|textbf}\\
+ 6=\cvd[5]{28}{n}, 7=\cvd[6]{28}{n}, 8=\cvd[7]{28}{n},
+ \cvc{9=\cvd[8]{28}{n}}}\index{cv28|textbf}\\
%
\bluerow O & cv29 &
{1=\cvd{29}{O}, 2=\cvc{\cvd[1]{29}{O}}}\index{cv29|textbf}\\
@@ -276,22 +284,25 @@ q & cv34 &
{1=\cvd{35}{R}, 2=\cvd[1]{35}{R}, 3=\cvc{\cvd[2]{35}{R}}}\index{cv35|textbf}\\
%
r & cv36 &
-{1=\cvd{36}{r}, 2=\cvd[1]{36}{r}, 3=\cvd[2]{36}{r}, 4=\cvc{\cvd[3]{36}{r}}}\index{cv36|textbf}\\
+{1=\cvd{36}{r}, 2=\cvd[1]{36}{r}, 3=\cvd[2]{36}{r}, 4=\cvc{\cvd[3]{36}{r}},
+5=\cvd[4]{36}{r}, 6=\cvd[5]{36}{r}, 7=\cvd[6]{36}{r}}\index{cv36|textbf}\\
%
\bluerow S & cv37 &
{1=\cvd{37}{S}, 2=\cvd[1]{37}{S}, 3=\cvc{\cvd[2]{37}{S}}, 4=\cvd[3]{37}{S}, 5=\cvd[4]{37}{S},
- 6=\cvd[5]{37}{S}, 7=\cvd[6]{37}{S}}\index{cv37|textbf}\\
+ 6=\cvd[5]{37}{S}, 7=\cvd[6]{37}{S}, 8=\cvd[7]{37}{S}}\index{cv37|textbf}\\
%
s & cv38 &
{1=\cvd{38}{s}, 2=\cvd[1]{38}{s}, 3=\cvd[2]{38}{s}, 4=\cvd[3]{38}{s},
5=\cvd[4]{38}{s}, 6=\cvd[5]{38}{s}, 7=\cvc{\cvd[6]{38}{s}}, 8=\cvd[7]{38}{s},
- 9=\cvd[8]{38}{s}, 10=\cvd[9]{38}{s}, 11=\cvd[10]{38}{s}, 12=\cvd[11]{38}{s}}\index{cv38|textbf}\\
+ 9=\cvd[8]{38}{s}, 10=\cvd[9]{38}{s}, 11=\cvd[10]{38}{s}, 12=\cvd[11]{38}{s},
+ 13=\cvd[12]{38}{s}, 14=\cvd[13]{38}{s}, 15=\cvd[14]{38}{s}}\index{cv38|textbf}\\
%
\bluerow T & cv39 &
{1=\cvd{39}{T}, 2=\cvc{\cvd[1]{39}{T}}}\index{cv39|textbf}\\
%
t & cv40 &
-{1=\cvd{40}{t}, 2=\cvd[1]{40}{t}, 3=\cvc{\cvd[2]{40}{t}}, 4=\cvd[3]{40}{t}}\index{cv40|textbf}\\
+{1=\cvd{40}{t}, 2=\cvd[1]{40}{t}, 3=\cvc{\cvd[2]{40}{t}}, 4=\cvd[3]{40}{t},
+5=\cvd[4]{40}{t}}\index{cv40|textbf}\\
%
\bluerow U & cv41 &
{1=\cvc{\cvd{41}{U}}, 2=\cvd[1]{41}{U}, 3=\cvd[2]{41}{U}}\index{cv41|textbf}\\
@@ -382,7 +393,8 @@ cv56\index{cv56|textbf} &
\bluerow{\ae} (\unic{U+00E6}) &
cv57\index{cv57|textbf} &
{1=\cvd{57}{\ae}, 2=\cvc{\cvd[1]{57}{\ae}}, 3=\cvd[2]{57}{\ae}, 4=\cvd[3]{57}{\ae},
-5=\cvd[4]{57}{\ae}, 6=\cvd[5]{57}{\ae}}\\
+5=\cvd[4]{57}{\ae}, 6=\cvd[5]{57}{\ae}, 7\cvd[6]{57}{\ae}, 8=\cvd[7]{57}{\ae}
+9=\cvd[8]{57}{\ae}, 10=\cvd[9]{57}{\ae}, 11=\cvd[10]{57}{\ae}}\\
%
Ꜵ (\unic{U+A734}) &
cv58\index{cv58|textbf} &
@@ -466,7 +478,7 @@ lowercase in size, often used in medieval manuscripts as \textit{litterae notabi
paragraphs, and other textual units.
This feature
covers the whole of the basic Latin alphabet and a number of other letters that
-occur at the beginnings of sentences.
+occur at the beginnings of sentences, plus a few punctuation marks.
Uppercase letters are also covered by this feature so that enlarged minuscules
can, if you like, be searched as capitals. This is Junicode's collection of
enlarged minuscules:
@@ -583,6 +595,14 @@ z\hfill→\hfill\enla{z}
{\addfontfeature{Language=Icelandic}þ\hfill→\hfill\EnlargedMinuscules\addfontfeature{Language=Icelandic}þ}
{\addfontfeature{Language=English}þ\hfill→\hfill\EnlargedMinuscules\addfontfeature{Language=English}þ}
+
+{⹎\hfill→\hfill\EnlargedMinuscules⹎}
+
+{\addfontfeature{CharacterVariant=74:4}⹎\hfill→\hfill\EnlargedMinuscules\addfontfeature{CharacterVariant=74:4}⹎}
+
+{\addfontfeature{CharacterVariant=74:5}⹎\hfill→\hfill\EnlargedMinuscules\addfontfeature{CharacterVariant=74:5}⹎}
+
+{\addfontfeature{CharacterVariant=74:6}⹎\hfill→\hfill\EnlargedMinuscules\addfontfeature{CharacterVariant=74:6}⹎}
\end{multicols}
\noindent If you are using the variable version of the font (Junicode VF), consider using the
@@ -619,17 +639,34 @@ Stylistic\index{salt|textbf} Alternates (medieval capitals, etc.)}\hypertarget{s
Junicode has two series of decorative capitals in medieval scripts. These affect only the letters
A-Z and a-z. \textSourceText{salt[1]} provides rustic capitals, a script used for text in the late
ancient and early medieval periods and for display until around the eleventh century:
-\textex{\addfontfeature{StylisticAlternates=0}Gazifrequens Libycos duxit Karthago triumphos}. \textSourceText{salt[2]}
-provides Lombardic capitals, a style used mainly for what are now called drop caps. Junicode’s Lombardic capitals
-are not suitable for running text, titles, or headers:
-\textex{\addfontfeature{StylisticAlternates=1}A\,B\,C\,D\,E\,F}.
-Rustic capital Æ is available (\textex{\addfontfeature{StylisticAlternates=0}Æ}), but not Lombardic.
+\textex{\salti{0}{Gazifrequens Libycos duxit Karthago triumphos}}. \textSourceText{salt[2]}
+provides Lombardic capitals, a style used mainly for what are now called drop caps and not for
+running text, titles, or headers:
+\textex{\salti{1}{A\,B\,C\,D\,E\,F}}.
+Rustic capital Æ is available (\textex{\salti{0}{Æ}}), but not Lombardic.
\textSourceText{salt[3]} provides variants of rustic G and Lombardic F and T:
-\textex{\addfontfeature{StylisticAlternates=2}G\,F\,T}.
+\textex{\salti{2}{G\,F\,T}}
Miscellaneous alternates (for which Character Variants are
-unavailable) are also gathered here on \textSourceText{salt[1]}:
-ð \rightarrow{ }\textex{\addfontfeature{Language=English,StylisticAlternates=0}ð},
-Ạ\rightarrow{ }\textex{\addfontfeature{Language=English,StylisticAlternates=0}áº}.
+unavailable) are also gathered here:
+
+\begin{multicols}{2}
+\color{GGOrange} â¹: 1=\salti{0}{â¹}, 2=\salti{1}{â¹}, 3=\salti{2}{â¹}.
+
+{\addfontfeature{Language=English}ð: 1=\salti{0}{ð}, 2=\salti{1}{ð}, 3=\salti{2}{ð}.}
+
+áº: 1=\salti{0}{áº}.
+
+☞: 1=\salti{0}{☞}.
+
+- (hyphen): 1=\salti{0}{-}.
+
+Æš: 1=\salti{0}{Æš}.
+
+ê­: 1=\salti{0}{ê­}.
+
+Æ¿: 1=\salti{0}{Æ¿}.
+\end{multicols}
+
\subsection{\textSourceText{cv68} – Variant of ʔ (\unic{U+0294}, glottal stop)}
1=\cvd{68}{Ê”}\index{cv68|textbf}.
@@ -727,11 +764,23 @@ Old-style fonts typically contain a standard collection of ligatures (conjoined
\textex{fi}, \textex{fl}, \textex{ff}, \textex{ffi}, and \textex{ffl}.
Most software will display these ligatures automatically (except
Microsoft Word, for which they must be enabled explicitly). Junicode has a large number of ligatures,
-including the standard f-ligatures, a similar set for long s, e.g. \textex{Å¿l}, \textex{Å¿Å¿}, \textex{Å¿Å¿i}, but also more
-specialized forms like \textex{ſꞇ},
+including the standard f-ligatures, a similar set for long s, e.g. \textex{Å¿l}, \textex{Å¿Å¿}, \textex{Å¿Å¿i}, but also
+more unusual forms like \textex{ſꞇ},
\textex{\addfontfeatures{StylisticSet=2,CharacterVariant=38:10}st},
\textex{\addfontfeatures{Language=English,StylisticSet=2,CharacterVariant=38:10}sw}
-(the last two with \textSourceText{ss02}\index{ss02} and \textSourceText{cv38[11]}\index{cv38}), and a few more. Most of Junicode’s
+(the last two with \textSourceText{ss02}\index{ss02} and \textSourceText{cv38[11]}\index{cv38}).
+
+Junicode also contains more specialized ligatures: for various enclosed alphanumerics, e.g.
+\textex{â¶\char"200Câº} $\rightarrow $ \textex{â¶âº}, \textex{â‘ \char"200C⑧} $\rightarrow $ \textex{①⑧};
+for the five tone modifiers
+(\unic{U+02E5}, \unic{U+02E9}, \unic{U+02E6}, \unic{U+02E8}, \unic{U+02E7}), a large number of
+ligatures, e.g. \textex{\char"02E5\char"200C\char"02E6} $\rightarrow $ \textex{\char"02E5\char"02E6},
+\textex{˦‌˦‌˧} $\rightarrow $ \textex{˦˦˧};
+for combinations of vowel + rhotic hook (\unic{U+02DE}), several more ligatures, e.g. \textex{a\,Ëž} $\rightarrow $ \textex{aËž},
+\textex{Å“\,Ëž} $\rightarrow $ \textex{Å“Ëž}.
+These, like the more common ligatures, are automatic.
+
+Many of Junicode’s
ligatures, however, are not automatic, but belong to the set of either Historic Ligatures
or Discretionary Ligatures, both of which must be invoked explicitly. These are listed in the following sections.
@@ -1123,7 +1172,7 @@ characters generated by some programs. With sups: \sups{4567}. Scaled: \textsupe
Produces\index{subs|textbf} subscript numbers. Only produces oldstyle proportional and lining tabular figures:
\subs{\oprop{2345} \ltab{8901}}.
-\section{Punctuation}
+\section{Punctuation and Symbols}
MUFI encodes nearly twenty marks of punctuation in the PUA. In Junicode these can be accessed in
either of two ways: all are indexed variants of \textex{.} (period), and all are associated with the Unicode marks of
punctuation they most resemble (but it should not be inferred that the medieval marks are semantically identical with
@@ -1141,16 +1190,18 @@ Colons,\index{ss18|textbf} semicolons, parentheses, quotation marks and several
\subsection{\textSourceText{cv69} – Variants of âŠâ¹’
(\unic{U+204A / U+2E52}, Tironian nota)}
-1=\cvd{69}{âŠâ¹’}, 2=\cvd[1]{69}{âŠâ¹’}, 3=\cvd[2]{69}{âŠâ¹’}.\index{cv69|textbf}
+1=\cvd{69}{âŠâ¹’}, 2=\cvd[1]{69}{âŠâ¹’}, 3=\cvd[2]{69}{âŠâ¹’}, 4=\cvd[3]{69}{âŠâ¹’}, 5=\cvd[4]{69}{âŠâ¹’},
+6=\cvd[5]{69}{âŠâ¹’}, 7=\cvd[6]{69}{âŠâ¹’}, 8=\cvd[7]{69}{âŠâ¹’}, 9=\cvd[8]{69}{âŠâ¹’},
+10=\cvd[9]{69}{âŠâ¹’}, 11=\cvd[10]{69}{âŠâ¹’}.\index{cv69|textbf}
\subsection{\textSourceText{cv70} –
Variants of . (period)}\index{cv70|textbf}
1=\cvd{70}{.}, 2=\cvd[1]{70}{.}, 3=\cvd[2]{70}{.}, 4=\cvd[3]{70}{.}, 5=\cvd[4]{70}{.}, 6=\cvd[5]{70}{.},
7=\cvd[6]{70}{.}, 8=\cvd[7]{70}{.}, 9=\cvd[8]{70}{.}, 10=\cvd[9]{70}{.}, 11=\cvd[10]{70}{.}, 12=\cvd[11]{70}{.},
13=\cvd[12]{70}{.}, 14=\cvd[13]{70}{.}, 15=\cvd[14]{70}{.}, 16=\cvd[15]{70}{.}, 17=\cvd[16]{70}{.},
-18=\cvd[17]{70}{.}, 19=\cvd[18]{70}{.}, 20=\cvd[19]{70}{.}. This
-feature provides access to all non-Unicode MUFI punctuation marks. Some of them are available via other features (see
-below).
+18=\cvd[17]{70}{.}, 19=\cvd[18]{70}{.}, 20=\cvd[19]{70}{.}, 21=\cvd[20]{70}{.}, 22=\cvd[21]{70}{.},
+23=\cvd[22]{70}{.}. This feature provides access to all non-Unicode MUFI punctuation marks. Some of them
+are available via other features (see below).
\subsection{\textSourceText{cv71} – Variant of {\textperiodcentered} (\unic{U+00B7}, middle dot)}\index{cv71|textbf}
1=\cvd{71}{\char"25CC\textperiodcentered} (\textit{distinctio}), 2=\cvd[1]{71}{\char"25CC\textperiodcentered}.
@@ -1162,10 +1213,14 @@ Variants of , (comma)}\index{cv72|textbf}
\subsection{\textSourceText{cv73} –
Variants of ; (semicolon)}\index{cv73|textbf}
1=\cvd{73}{;} (\textit{punctus versus}), 2=\cvd[1]{73}{;}, 3=\cvd[2]{73}{;}, 4=\cvd[3]{73}{;},
-5=\cvd[4]{73}{;}, 6=\cvd[5]{73}{;}, 7=\cvd[6]{73}{;}.
+5=\cvd[4]{73}{;}, 6=\cvd[5]{73}{;}, 7=\cvd[6]{73}{;}, 8=\cvd[7]{73}{;}. Several complex
+punctuation marks are gathered here. This does not imply that these marks are variants of
+the semicolon.
\subsection{\textSourceText{cv74} – Variants of ⹎ (\unic{U+2E4E}, \textit{punctus elevatus})}\index{cv74|textbf}
-1=\cvd{74}{⹎}, 2=\cvd[1]{74}{⹎}, 3=\cvd[2]{74}{⹎}, 4=\cvd[3]{74}{⹎} (\textit{punctus flexus}).
+1=\cvd{74}{⹎}, 2=\cvd[1]{74}{⹎}, 3=\cvd[2]{74}{⹎}, 4=\cvd[3]{74}{⹎} (\textit{punctus flexus}),
+5=\cvd[4]{74}{⹎}, 6=\cvd[5]{74}{⹎}, 7=\cvd[6]{74}{⹎}. Some of these are affected by \textSourceText{ss06},
+Enlarged Minuscules.
\subsection{\textSourceText{cv75} – Variant of ! (exclamation mark)}\index{cv75|textbf}
1=\cvd{75}{!} (\textit{punctus exclamativus}).
@@ -1180,8 +1235,9 @@ Variants of ; (semicolon)}\index{cv73|textbf}
\subsection{\textSourceText{cv78} –
Variant of * (asterisk)}\index{cv78|textbf}
-1=\cvd{78}{*}. MUFI defines \unic{U+F1EC} as a \textit{signe de renvoi}. Manuscripts employ a number of shapes (of which this is one) for
-this purpose. Junicode defines it as a variant of the asterisk—the most common modern \textit{signe de renvoi}.
+1=\cvd{78}{*}, 2=\cvd[1]{78}{*}, 3=\cvd[2]{78}{*}, 4=\cvd[3]{78}{*}, 5=\cvd[4]{78}{*}.
+MUFI defines \unic{U+F1EC} as a \textit{signe de renvoi}. Manuscripts employ a number of shapes (of which this is one) for
+this purpose. Junicode defines it as variant 1 of the asterisk—the most common modern \textit{signe de renvoi}.
\subsection{\textSourceText{cv79} – Variants of / (slash)}\index{cv79|textbf}
1=\cvd{79}{/}, 2=\cvd[1]{79}{/}. The first of these is Unicode, \unic{U+2E4E}.
@@ -1197,11 +1253,12 @@ abbreviation)}\index{cv80|textbf}
of \unic{U+A770} to pair it with, it is indexed separately here.
\subsection{\textSourceText{cv83} – Variants of ê« (\unic{U+A76B}, “et†abbreviation)}\index{cv83|textbf}
-1=\cvd{83}{ê«}, 2=\cvd[1]{83}{ê«}, 3=\cvd[2]{83}{ê«}. \textSourceText{[1]} and \textSourceText{[3]} are
+1=\cvd{83}{ê«}, 2=\cvd[1]{83}{ê«}, 3=\cvd[2]{83}{ê«}, 4=\cvd[3]{83}{ê«}. \textSourceText{[1]} and \textSourceText{[3]} are
identical in shape to a semicolon and a colon, but as they are semantically the same as \unic{U+A76B},
it is preferable to use those
characters with this feature. \textSourceText{[2]} produces a subscript version of
-the character, a common variant in early printed books.
+the character, a common variant in early printed books. \textSourceText{[4]} has a lower extension that
+crosses the descender of a preceding \textex{q}.
\subsection{\textSourceText{cv67} – Spacing zigzag (variant of \unic{U+00AF}, spacing macron)}\index{cv67|textbf}
A spacing version of ◌͛ (\unic{U+035B}, combining zigzag) appears in John Hutchins,
@@ -1209,6 +1266,10 @@ A spacing version of ◌͛ (\unic{U+035B}, combining zigzag) appears in John Hut
is not in Unicode or MUFI. In the future this feature may be used, as necessary,
for other spacing marks of abbreviation.
+\subsection{\textSourceText{cv99} – Word omitted symbol (variant of \unic{U+00B0}, degree)}\index{cv99|textbf}
+The degree sign is often used as an editorial sign in editions of the Greek New Testament. This feature
+scales and positions it to match other editorial signs (U+2E00--u+2E0D).
+
\section{Combining Marks}\index{cv84|textbf}
\subsection{\textSourceText{cv84} – MUFI combining marks (variants of \unic{U+0304})}\hypertarget{cv84}{}
MUFI encodes a number of combining marks in the PUA (with code points between \unic{E000} and \unic{F8FF}), but when these characters
@@ -1316,9 +1377,13 @@ with the diacritic properly positioned.
35\hfill=\hfill\cvd[34]{84}{â—ŒÍÌ„}
-36\hfill=\hfill\cvd[34]{84}{â—ŒÍÌ„}
+36\hfill=\hfill\cvd[35]{84}{â—ŒÍÌ„}
-37\hfill=\hfill\cvd[34]{84}{â—ŒÍÌ„}
+37\hfill=\hfill\cvd[36]{84}{â—ŒÍÌ„}
+
+38\hfill=\hfill\cvd[37]{84}{â—ŒÍÌ„}
+
+39\hfill=\hfill\cvd[38]{84}{â—ŒÍÌ„}
\end{multicols}\index{cv84}
\subsection{\textSourceText{cv81} – Variants of ◌͛ (\unic{U+035B}, combining
@@ -1658,251 +1723,251 @@ Cmd-D: enable Kerning, Standard Ligatures, and Contextual Alternates, and the ot
but in most other applications they are enabled by default.
-\chapter{Non-MUFI Code Points}\hypertarget{nonmufi}{}
+% \chapter{Non-MUFI Code Points}\hypertarget{nonmufi}{}
-Characters in Junicode that do not have Unicode code points should be accessed via OpenType
-features whenever possible. MUFI/PUA code points should be used only in applications that do not support OpenType, or
-that support it only partially (for example, MS Word). For certain characters that lack either Unicode or MUFI code
-points, code points in the Supplementary Private Use Area-A (plane 15) are available.
+% Characters in Junicode that do not have Unicode code points should be accessed via OpenType
+% features whenever possible. MUFI/PUA code points should be used only in applications that do not support OpenType, or
+% that support it only partially (for example, MS Word). For certain characters that lack either Unicode or MUFI code
+% points, code points in the Supplementary Private Use Area-A (plane 15) are available.
-\begin{multicols}{4}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0000\hfill\cvd{53}{Ä„}}
+% \begin{multicols}{4}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0000\hfill\cvd{53}{Ä„}}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0001\hfill{}ó°€}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0001\hfill{}ó°€}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0002\hfill{}󰀂}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0002\hfill{}󰀂}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0003\hfill{}󰀃}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0003\hfill{}󰀃}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0004\hfill{}󰀄}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0004\hfill{}󰀄}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0005\hfill{}ó°€…}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0005\hfill{}ó°€…}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0006\hfill{}󰀆}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0006\hfill{}󰀆}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0007\hfill{}󰀇}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0007\hfill{}󰀇}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0008\hfill{}󰀈}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0008\hfill{}󰀈}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0009\hfill{}󰀉}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0009\hfill{}󰀉}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F000A\hfill{}󰀊}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F000A\hfill{}󰀊}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F000B\hfill{}󰀋}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F000B\hfill{}󰀋}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F000C\hfill{}󰀌}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F000C\hfill{}󰀌}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F000D\hfill{}ó°€}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F000D\hfill{}ó°€}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F000E\hfill{}󰀎}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F000E\hfill{}󰀎}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F000F\hfill{}ó°€}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F000F\hfill{}ó°€}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0010\hfill{}ó°€}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0010\hfill{}ó°€}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0011\hfill{}󰀑}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0011\hfill{}󰀑}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0012\hfill{}ó°€’}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0012\hfill{}ó°€’}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0013\hfill{}󰀓}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0013\hfill{}󰀓}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0014\hfill{}ó°€”}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0014\hfill{}ó°€”}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0015\hfill{}󰀕}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0015\hfill{}󰀕}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0016\hfill{}ó°€–}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0016\hfill{}ó°€–}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0017\hfill{}ó°€—}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0017\hfill{}ó°€—}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0018\hfill{}󰀘}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0018\hfill{}󰀘}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0019\hfill{}ó°€™}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0019\hfill{}ó°€™}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F001A\hfill{}󰀚}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F001A\hfill{}󰀚}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F001B\hfill{}ó°€›}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F001B\hfill{}ó°€›}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F001C\hfill{}󰀜}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F001C\hfill{}󰀜}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F001D\hfill{}ó°€}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F001D\hfill{}ó°€}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F001E\hfill{}󰀞}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F001E\hfill{}󰀞}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F001F\hfill{}󰀟}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F001F\hfill{}󰀟}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0020\hfill\char"0F0020}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0020\hfill\char"0F0020}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0021\hfill\char"0F0021}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0021\hfill\char"0F0021}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0030\hfill\char"0F0030}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0030\hfill\char"0F0030}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0031\hfill\char"0F0031}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0031\hfill\char"0F0031}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0032\hfill\char"0F0032}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0032\hfill\char"0F0032}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0033\hfill\char"0F0033}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0033\hfill\char"0F0033}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0034\hfill\char"0F0034}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0034\hfill\char"0F0034}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0035\hfill\char"0F0035}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0035\hfill\char"0F0035}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0036\hfill\char"0F0036}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0036\hfill\char"0F0036}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0037\hfill\char"0F0037}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0037\hfill\char"0F0037}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0038\hfill\char"0F0038}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0038\hfill\char"0F0038}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0039\hfill\char"0F0039}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0039\hfill\char"0F0039}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F003A\hfill\char"0F003A}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F003A\hfill\char"0F003A}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F003B\hfill\char"0F003B}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F003B\hfill\char"0F003B}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F003C\hfill\char"0F003C}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F003C\hfill\char"0F003C}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F003D\hfill\char"0F003D}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F003D\hfill\char"0F003D}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F003E\hfill\char"0F003E}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F003E\hfill\char"0F003E}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F003F\hfill\char"0F003F}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F003F\hfill\char"0F003F}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0040\hfill\char"0F0040}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0040\hfill\char"0F0040}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0041\hfill\char"0F0041}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0041\hfill\char"0F0041}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0042\hfill\char"0F0042}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0042\hfill\char"0F0042}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0043\hfill\char"0F0043}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0043\hfill\char"0F0043}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0044\hfill\char"0F0044}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0044\hfill\char"0F0044}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0045\hfill\char"0F0045}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0045\hfill\char"0F0045}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0046\hfill\char"0F0046}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0046\hfill\char"0F0046}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0047\hfill\char"0F0047}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0047\hfill\char"0F0047}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0048\hfill\char"0F0048}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0048\hfill\char"0F0048}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0049\hfill\char"0F0049}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0049\hfill\char"0F0049}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F004A\hfill\char"0F004A}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F004A\hfill\char"0F004A}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F004B\hfill\char"0F004B}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F004B\hfill\char"0F004B}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F004C\hfill\char"0F004C}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F004C\hfill\char"0F004C}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F004D\hfill\char"0F004D}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F004D\hfill\char"0F004D}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F004E\hfill\char"0F004E}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F004E\hfill\char"0F004E}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F004F\hfill\char"0F004F}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F004F\hfill\char"0F004F}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0050\hfill\char"0F0050}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0050\hfill\char"0F0050}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0051\hfill\char"0F0051}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0051\hfill\char"0F0051}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0052\hfill\char"0F0052}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0052\hfill\char"0F0052}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0053\hfill\char"0F0053}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0053\hfill\char"0F0053}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0054\hfill\char"0F0054}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0054\hfill\char"0F0054}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0055\hfill\char"0F0055}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0055\hfill\char"0F0055}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0056\hfill\char"0F0056}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0056\hfill\char"0F0056}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0057\hfill\char"0F0057}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0057\hfill\char"0F0057}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0058\hfill\char"0F0058}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0058\hfill\char"0F0058}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F0059\hfill\char"0F0059}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F0059\hfill\char"0F0059}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F005A\hfill\char"0F005A}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F005A\hfill\char"0F005A}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F005B\hfill\char"0F005B}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F005B\hfill\char"0F005B}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F005C\hfill\char"0F005C}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F005C\hfill\char"0F005C}
-{\color[rgb]{0.13333334,0.29411766,0.07058824}
-U+F005D\hfill\char"0F005D}
-\end{multicols}
+% {\color[rgb]{0.13333334,0.29411766,0.07058824}
+% U+F005D\hfill\char"0F005D}
+% \end{multicols}
diff --git a/Master/texmf-dist/doc/fonts/junicodevf/GettingStarted.tex b/Master/texmf-dist/doc/fonts/junicodevf/GettingStarted.tex
index 7120a474f45..d458a13eec7 100644
--- a/Master/texmf-dist/doc/fonts/junicodevf/GettingStarted.tex
+++ b/Master/texmf-dist/doc/fonts/junicodevf/GettingStarted.tex
@@ -29,14 +29,14 @@ and there are good reasons to choose
the variable version of Junicode for any web project. The greatest reason to go
with the variable version is to speed the loading of web pages: users will never
have to download more than two font files (the size of which can be radically
-reduced via subsetting, explained in Section 9 of this Manual). Additionally,
+reduced via subsetting, explained in Section 8 of this Manual). Additionally,
however, variable fonts can make a page of text more dynamic and visually
interesting. See Mozilla's
\href{https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_fonts/Variable_fonts_guide}%
{Variable Fonts Guide} for more information about using variable fonts on the web.
A growing number of desktop applications support variable fonts. Use the variable version of
-Junicode in Adobe InDesign (always with the World-Ready Paragraph Composer).\footnote{%
+Junicode in Adobe InDesign (always with the World-Ready Paragraph Composer).\footnote{\ %
The choice of a Composer is well hidden in the “Justification†section of the
“Paragraph Style Options†dialog. Use of the default “Adobe Paragraph Composerâ€
with Junicode VF may cause InDesign to crash or otherwise misbehave. To prevent crashes
@@ -58,7 +58,7 @@ Sketch, and CorelDRAW.
The static version of Junicode has five weights and five widths, which are combined in many ways
for a total of nineteen styles in
-both roman and italic.\footnote{Several of the twenty-five possible combinations
+both roman and italic.\footnote{\ Several of the twenty-five possible combinations
(e.g. {\jExpLight light expanded})
have been omitted as unlikely to be useful; however, these can be accessed via the variable font.}
It is not necessary to install all of these; in fact,
diff --git a/Master/texmf-dist/doc/fonts/junicodevf/JunicodeManual.pdf b/Master/texmf-dist/doc/fonts/junicodevf/JunicodeManual.pdf
index 952fcabed3a..ecea72494e3 100644
--- a/Master/texmf-dist/doc/fonts/junicodevf/JunicodeManual.pdf
+++ b/Master/texmf-dist/doc/fonts/junicodevf/JunicodeManual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/junicodevf/JunicodeManual.sty b/Master/texmf-dist/doc/fonts/junicodevf/JunicodeManual.sty
index 2c9d4517ef9..ea6cfe19599 100644
--- a/Master/texmf-dist/doc/fonts/junicodevf/JunicodeManual.sty
+++ b/Master/texmf-dist/doc/fonts/junicodevf/JunicodeManual.sty
@@ -35,7 +35,9 @@
{size=11,wght=400,wdth=75},
{size=22,wght=350,wdth=75},
{size=22,wght=345,wdth=75}
- }
+ },
+ SmCondLightFeatures={StylisticSet=9},
+ SmCondFeatures={StylisticSet=9}
]{junicodevf}
\setfontface\samplefootnote{JunicodeVF}[
Renderer = HarfBuzz,
@@ -43,6 +45,7 @@
]
\setfontface\sampleheader{JunicodeVF}[
Renderer = HarfBuzz,
+ StylisticSet = 9,
SizeFeatures = {{Size={5-}, RawFeature={axis={wght=350,wdth=95}}}}
]
\setmonofont{Fira Mono}[Scale=MatchLowercase,Numbers=Lowercase]
@@ -50,7 +53,7 @@
\usepackage{imakeidx}
\usepackage{idxlayout}
-%\renewcommand{\indexname}{Index of OpenType Features}
+
\makeindex[title=Index of OpenType Features,intoc]
\usepackage{fancyhdr}
@@ -97,6 +100,7 @@
\newcommand\textstyleEmphasis[1]{\textit{#1}}
\newcommand\textstyleEntityRef[1]{\textrm{#1}}
\newcommand{\cvd}[3][0]{{\addfontfeature{CharacterVariant=#2:#1}#3}}
+\newcommand{\salti}[2]{{\addfontfeature{StylisticAlternates=#1}#2}}
\newcommand{\hlig}[1]{{\addfontfeature{Ligatures=Historic}#1}}
\newcommand{\sups}[1]{{\addfontfeature{VerticalPosition = Superior}#1}}
\newcommand{\subs}[1]{{\addfontfeature{VerticalPosition = Inferior}#1}}
@@ -105,11 +109,9 @@
\newcommand{\otab}[1]{{\addfontfeature{Numbers={Lowercase,Monospaced}}#1}}
\newcommand{\ltab}[1]{{\addfontfeature{Numbers={Uppercase,Monospaced}}#1}}
\newcommand{\ornm}[2][0]{{\addfontfeature{Ornament=#1}#2}}
-\newcommand{\unic}[1]{{\addfontfeature{Numbers={Uppercase,Monospaced}}#1}}
+\newcommand{\unic}[1]{{\jSmCond\addfontfeature{Numbers={Uppercase,Monospaced}}#1}}
\newcommand{\src}[1]{{\color{BrickRed}\texttt{#1}}}
-%\newcommand{\src}[1]{#1}
\newcommand{\option}[1]{{\color{RViolet}\sffamily#1}}
-%\newcommand{\option}[1]{#1}
\newcommand{\enla}[1]{{\EnlargedOne#1}}
\newcommand{\enlax}[1]{{\EnlargedTwo#1}}
\newcommand{\ltech}{Lua\kern-1.5pt\TeX}
@@ -126,20 +128,7 @@
\makeatletter
\newcommand\arraybslash{\let\\\@arraycr}
\makeatother
-% Page layout (geometry)
-%\setlength\voffset{-1in}
-%\setlength\hoffset{-0.75in}
-%\setlength\topmargin{1in}
-%\setlength\oddsidemargin{1in}
-%\setlength\textheight{8.000001in}
-%\setlength\textwidth{6in}
-%\setlength\footskip{0.0cm}
\setlength\headheight{15pt}
-%\setlength\headsep{0.2in}
-% Footnote rule
-%\setlength{\skip\footins}{14pt}
-%\renewcommand\footnoterule{\vspace*{-0.0071in}\setlength\leftskip{0pt}\setlength\rightskip{0pt plus 1fil}\noindent\textcolor{black}{\rule{0.25\columnwidth}{0.0071in}}\vspace*{0.0398in}}
-% Pages styles
\pagestyle{fancy}
\footskip = 30pt
\headsep = 30pt
diff --git a/Master/texmf-dist/doc/fonts/junicodevf/JunicodeManual.tex b/Master/texmf-dist/doc/fonts/junicodevf/JunicodeManual.tex
index 236af06fee9..dbe787c4552 100644
--- a/Master/texmf-dist/doc/fonts/junicodevf/JunicodeManual.tex
+++ b/Master/texmf-dist/doc/fonts/junicodevf/JunicodeManual.tex
@@ -13,7 +13,7 @@
\huge \centering the font for medievalists \\[1cm]
\Huge\centering {\color{myRed}} \\[1cm]
\huge\centering {\jItalic specimens and user manual} \\[1ex]
- \Large\centering{\jRegular for version 2.206}\\
+ \Large\centering{\jRegular for version 2.209}\\
\vfill
{\color{myRed}}
\end{titlepage}
@@ -44,6 +44,8 @@
\input{encoded-glyphs.tex}
+\input{upperpua.tex}
+
\printindex
\vspace*{\fill}
diff --git a/Master/texmf-dist/doc/fonts/junicodevf/README b/Master/texmf-dist/doc/fonts/junicodevf/README
index 0836397c117..76df6bf06ae 100644
--- a/Master/texmf-dist/doc/fonts/junicodevf/README
+++ b/Master/texmf-dist/doc/fonts/junicodevf/README
@@ -1,15 +1,32 @@
-This is the README for version 2.206 of the variable variant
-of Peter S. Baker's Junicode fonts. The Junicode font is
-primarily for scholars and students of the Middle Ages, but
-it serves users with a wide variety of interests. It tracks
-the development of the Medieval Unicode Font Initiative
-(MUFI), with its wealth of specialized medieval characters,
-but it also provides many OpenType features that allow users
-to access MUFI characters in accessible ways.
-
-This package supports the Junicode variable
-fonts for LuaLaTeX. To install this package on
-a TDS-compliant TeX system download the file
+This is the README for version 2.209 of the variable variant
+of Peter S. Baker's Junicode fonts.
+
+The Junicode font is primarily for scholars and students of
+the Middle Ages, but it serves users with a wide variety of
+interests. It tracks the development of the Medieval Unicode
+Font Initiative (MUFI), with its wealth of specialized
+medieval characters, but it also provides many OpenType
+features that allow users to access MUFI characters in
+accessible ways.
+
+This package provides the variable version, in
+which all the capabilities of the traditional “staticâ€
+version - and more! - are packaged in just two files.
+The variable version is especially suitable for web use,
+but variable fonts can also be used in Adobe InDesign,
+LibreOffice, LuaTeX, and other text-processing apps (see the
+file JunicodeManual.pdf for details).
+
+This version of Junicode adds more than forty new glyphs
+for the Ansund project. It also adjusts the slant of
+proportional old-style figures; fixes an occasional problem
+with the combining dot accent; fixes a bug in the junicodevf
+LaTeX package; adds a couple of archaic phonetic characters;
+and fixes a bug that prevented the correct operation of a
+shortcut key combination in Adobe InDesign.
+
+To install this package on a TDS-compliant
+TeX system download the file
"tex-archive"/install/fonts/junicodevf.tds.zip where the
preferred URL for "tex-archive" is http://mirrors.ctan.org.
Unzip the archive at the root of an appropriate texmf tree,
diff --git a/Master/texmf-dist/doc/fonts/junicodevf/Specimens.tex b/Master/texmf-dist/doc/fonts/junicodevf/Specimens.tex
index 31526877027..df35dc9f33f 100644
--- a/Master/texmf-dist/doc/fonts/junicodevf/Specimens.tex
+++ b/Master/texmf-dist/doc/fonts/junicodevf/Specimens.tex
@@ -167,7 +167,7 @@ sadr̥śÄsadr̥śatvÄcca viá¹£ayÄviá¹£ayatvataḥ \\
{\small\jSmCondItalic Lithuanian poses several typographical challenges. Make sure
Contextual Alternates (calt\index{calt}) is turned on; for i̇Ì, use i followed
- by combining dot accent (\unic{U+0307}) and acute (\unic{U+0301}).}\\[1ex]
+ by combining dot accent (\kern+1.5pt\unic{U+0307}) and acute (\kern+1.5pt\unic{U+0301}).}\\[1ex]
{\jExp\addfontfeature{Language=Lithuanian} Visa žemÄ— turÄ—jo vienÄ… kalbÄ… ir tuos paÄius žodžius. Kai žmonÄ—s
kėlėsi iš rytų, jie rado slėnį Šinaro krašte ir ten įsikūrė. Vieni
kitiems sakė: Eime, pasidirbkime plytų ir jas išdekime. – Vietoj
diff --git a/Master/texmf-dist/doc/fonts/junicodevf/encoded-glyphs.tex b/Master/texmf-dist/doc/fonts/junicodevf/encoded-glyphs.tex
index 9ca17260996..a9f024b38f8 100644
--- a/Master/texmf-dist/doc/fonts/junicodevf/encoded-glyphs.tex
+++ b/Master/texmf-dist/doc/fonts/junicodevf/encoded-glyphs.tex
@@ -13,5 +13,5 @@ and these spill out on one or more sides.
\displayfonttable[color=blue,title-format=\caption{Encoded Glyphs in Junicode},
title-format-cont=\caption{Encoded Glyphs in Junicode, \emph{cont.}}, missing-glyph=•,
-missing-glyph-color=blue, range-end=F005F, glyph-width=12pt, hex-digits=head]{JunicodeVF-Roman.ttf}[Renderer=HarfBuzz]
+missing-glyph-color=blue, range-end=FFFFF, glyph-width=12pt, hex-digits=head]{JunicodeVF-Roman.ttf}[Renderer=HarfBuzz]
diff --git a/Master/texmf-dist/doc/fonts/junicodevf/in_tex.tex b/Master/texmf-dist/doc/fonts/junicodevf/in_tex.tex
index 5b534d9ed81..e469789e49d 100644
--- a/Master/texmf-dist/doc/fonts/junicodevf/in_tex.tex
+++ b/Master/texmf-dist/doc/fonts/junicodevf/in_tex.tex
@@ -107,19 +107,19 @@ the \src{size} key is mandatory: any array without one is ignored. The
arrays should be in order of point size. The first array
prescribes axis coordinates for all sizes up to \src{size}, the last array for all sizes
greater than \src{size}, and any intermediate arrays a range from the previous to the
-current \src{size}.\footnote{%
+current \src{size}.\footnote{\ %
If you want only one size array, make \src{size} improbably low (e.g. 5) and place
a comma after the closing brace of the array.%
} So the ranges covered in each list above are \src{-8.6}, \src{8.6-10.99},
\src{10.99-21.59},
-and \src{21.59-}.\footnote{Any modification of the default text size (e.g. in the
+and \src{21.59-}.\footnote{\ Any modification of the default text size (e.g. in the
\src{\textbackslash documentclass} command) can affect the size definitions in these
arrays, with the result that (for example)
\src{10} no longer means exactly “ten points.†You may have to experiment to get these numbers
right.}
The keys other than \src{size} are the four-letter tags for the font's axes: \src{wght}
-(Weight), \src{wdth} (Width), and \src{ENLA} (Enlarge).\footnote{%
+(Weight), \src{wdth} (Width), and \src{ENLA} (Enlarge).\footnote{\ %
By convention, tags for axes defined in the OpenType standard are lowercase; custom axes
are uppercase. Junicode’s \src{ENLA} is a custom axis.%
} When a key
@@ -218,7 +218,7 @@ append “Italic†to any of the others, except “jRegularâ€):
\end{multicols}
\noindent These commands will be self-explanatory if you bear in mind Junicode's
-abbreviations for style names: Cond=Condensed, Exp=Expanded, Sm=Semi.\footnote{%
+abbreviations for style names: Cond=Condensed, Exp=Expanded, Sm=Semi.\footnote{\ %
The purpose of these abbreviations is to keep font names under the character-limit
imposed by some systems.} Use
them to shift temporarily to a style other than that of the main text.
diff --git a/Master/texmf-dist/doc/fonts/junicodevf/junicodevf-samples.pdf b/Master/texmf-dist/doc/fonts/junicodevf/junicodevf-samples.pdf
index 9944981966b..2c4d6d1476f 100644
--- a/Master/texmf-dist/doc/fonts/junicodevf/junicodevf-samples.pdf
+++ b/Master/texmf-dist/doc/fonts/junicodevf/junicodevf-samples.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/junicodevf/junicodevf-samples.tex b/Master/texmf-dist/doc/fonts/junicodevf/junicodevf-samples.tex
index 8824890bc47..f8ce6ec0c84 100644
--- a/Master/texmf-dist/doc/fonts/junicodevf/junicodevf-samples.tex
+++ b/Master/texmf-dist/doc/fonts/junicodevf/junicodevf-samples.tex
@@ -10,6 +10,7 @@
\end{center}
\section*{Regular}
+
\lipsum[1]
\section*{Italic}
diff --git a/Master/texmf-dist/doc/fonts/junicodevf/tag_key_ins.tex b/Master/texmf-dist/doc/fonts/junicodevf/tag_key_ins.tex
index fff64f13c4c..cec3b6814ef 100644
--- a/Master/texmf-dist/doc/fonts/junicodevf/tag_key_ins.tex
+++ b/Master/texmf-dist/doc/fonts/junicodevf/tag_key_ins.tex
@@ -210,6 +210,41 @@ Characters without code points can only be entered via tags or OpenType features
\arraybslash Punctus flexus / F1F5\\\hline
%
\mufi{period} &
+{.\&\_\_2;\&\_\_2;} &
+{\restag{.\char"0E0032\char"0E0032}} &
+\arraybslash Dotless punctus elevatus / TBA\\\hline
+%
+\mufi{period} &
+{.\&\_\_2;\&\_\_3;} &
+{\restag{.\char"0E0032\char"0E0033}} &
+\arraybslash Punctus elevatus with s-shaped top / TBA\\\hline
+%
+\mufi{period} &
+{.\&\_\_2;\&\_\_4;} &
+{\restag{.\char"0E0032\char"0E0034}} &
+\arraybslash Dotless punctus elevatus with s-shaped top / TBA\\\hline
+%
+\mufi{period} &
+{.\&\_\_2;\&\_\_5;} &
+{\restag{.\char"0E0032\char"0E0035}} &
+\arraybslash Enlarged punctus elevatus / TBA\\\hline
+%
+\mufi{period} &
+{.\&\_\_2;\&\_\_6;} &
+{\restag{.\char"0E0032\char"0E0036}} &
+\arraybslash Enlarged dotless punctus elevatus / TBA\\\hline
+%
+\mufi{period} &
+{.\&\_\_2;\&\_\_7;} &
+{\restag{.\char"0E0032\char"0E0037}} &
+\arraybslash Enlarged punctus elevatus with s-shaped top / TBA\\\hline
+%
+\mufi{period} &
+{.\&\_\_2;\&\_\_8;} &
+{\restag{.\char"0E0032\char"0E0038}} &
+\arraybslash Enlarged dotless punctus elevatus with s-shaped top / TBA\\\hline
+%
+\mufi{period} &
{.\&\_\_1;\&\_\_3;} &
{\restag{.\char"0E0031\char"0E0033}} &
\arraybslash Punctus exclamativus / F1E7\\\hline
@@ -569,6 +604,11 @@ Characters without code points can only be entered via tags or OpenType features
{\restag{d\char"0E0069\char"0E0032}} &
\arraybslash Insular d second form\\\hline
%
+\nuni{d} &
+{d\&\_\_i;\&\_\_3;} &
+{\restag{d\char"0E0069\char"0E0033}} &
+\arraybslash Insular d third form\\\hline
+%
\mufi{d} &
{d\&\_\_i;\&\_\_e;} &
{\restag{d\char"0E0069\char"0E0065}} &
@@ -799,6 +839,11 @@ Characters without code points can only be entered via tags or OpenType features
{\restag{h\char"0E0064\char"0E0062}} &
\arraybslash{\jCond Caroline h with right descender and bar / TBD}\\\hline
%
+\mufi{h} &
+{h\&\_\_c;\&\_\_u;} &
+{\restag{h\char"0E0063\char"0E0075}} &
+\arraybslash{\jCond h with curl / TBD}\\\hline
+%
\stdu{I} &
{I\&\_\_d;\&\_\_a;} &
{\restag{I\char"0E0064\char"0E0061}} &
@@ -944,6 +989,11 @@ Characters without code points can only be entered via tags or OpenType features
{\restag{l\char"0E0069\char"0E006E}} &
\arraybslash {Insular l}\\\hline
%
+\nuni{U+019A} &
+{Æš\&\_\_c;\&\_\_u;} &
+{\restag{Æš\char"0E0063\char"0E0075}} &
+\arraybslash {barred l with curl}\\\hline
+%
\mufi{M} &
{M\&\_\_u;\&\_\_d;} &
{\restag{M\char"0E0075\char"0E0064}} &
@@ -1034,6 +1084,11 @@ Characters without code points can only be entered via tags or OpenType features
{\restag{n\char"0E0077\char"0E0070}} &
\arraybslash {Wide petite cap n with descender / TBD}\\\hline
%
+\mufi{n} &
+{n\&\_\_e;\&\_\_m;} &
+{\restag{n\char"0E0065\char"0E006D}} &
+\arraybslash {enim abbreviation / TBD}\\\hline
+%
\nuni{O} &
{O\&\_\_e;\&\_\_n;} &
{\restag{O\char"0E0065\char"0E006E}} &
@@ -1125,6 +1180,11 @@ Characters without code points can only be entered via tags or OpenType features
\arraybslash r with curl / F19B\\\hline
%
\mufi{r} &
+{r\&\_\_c;\&\_\_2;} &
+\restag{r\char"0E0063\char"0E0032} &
+\arraybslash r with alternate curl / TBA\\\hline
+%
+\mufi{r} &
{r\&\_\_e;\&\_\_n;} &
\restag{r\char"0E0065\char"0E006E} &
\arraybslash Enlarged minuscule r / EEF3\\\hline
@@ -1164,6 +1224,11 @@ Characters without code points can only be entered via tags or OpenType features
\restag{S\char"0E006D\char"0E0073} &
\arraybslash {Middle Scots S}\\\hline
%
+\stdu{S} &
+{S\&\_\_h;\&\_\_o;} &
+\restag{S\char"0E0068\char"0E0064} &
+\arraybslash {Hollow S}\\\hline
+%
\stdu{s} &
{s\&\_\_i;\&\_\_n;} &
\restag{s\char"0E0069\char"0E006E} &
@@ -1224,6 +1289,16 @@ Characters without code points can only be entered via tags or OpenType features
\restag{s\char"0E006D\char"0E0073} &
\arraybslash {Middle Scots s}\\\hline
%
+\stdu{s} &
+{s\&\_\_c;\&\_\_u;} &
+\restag{s\char"0E0063\char"0E0075} &
+\arraybslash {s with curl}\\\hline
+%
+\stdu{s} &
+{s\&\_\_h;\&\_\_k;} &
+\restag{s\char"0E0068\char"0E006B} &
+\arraybslash {s with hook}\\\hline
+%
\stdu{T} &
{T\&\_\_i;\&\_\_n;} &
\restag{T\char"0E0069\char"0E006E} &
@@ -1254,6 +1329,11 @@ Characters without code points can only be entered via tags or OpenType features
\restag{t\char"0E0063\char"0E0064} &
\arraybslash Cap-like t with descender / TBD\\\hline
%
+\mufi{t} &
+{t\&\_\_a;\&\_\_p;} &
+\restag{t\char"0E0061\char"0E0070} &
+\arraybslash t with approach / TBD\\\hline
+%
\nuni{U} &
{U\&\_\_e;\&\_\_n;} &
\restag{U\char"0E0065\char"0E006E} &
@@ -1689,6 +1769,36 @@ Characters without code points can only be entered via tags or OpenType features
\restag{\char"204A\char"0E0061\char"0E0033} &
\arraybslash {\jCond Tironian et sign without descender / TBD}\\\hline
%
+\mufi{U+204A} &
+{\char"204A\&\_\_a;\&\_\_4;} &
+\restag{\char"204A\char"0E0061\char"0E0034} &
+\arraybslash {\jCond Tironian et sign with bar / TBD}\\\hline
+%
+\mufi{U+204A} &
+{\char"204A\&\_\_a;\&\_\_5;} &
+\restag{\char"204A\char"0E0061\char"0E0035} &
+\arraybslash {\jCond Tironian et sign round form / TBD}\\\hline
+%
+\mufi{U+204A} &
+{\char"204A\&\_\_a;\&\_\_6;} &
+\restag{\char"204A\char"0E0061\char"0E0036} &
+\arraybslash {\jCond Generic Tironian et sign / TBD}\\\hline
+%
+\mufi{U+204A} &
+{\char"204A\&\_\_a;\&\_\_7;} &
+\restag{\char"204A\char"0E0061\char"0E0037} &
+\arraybslash {\jCond Generic Tironian et sign with bar / TBD}\\\hline
+%
+\mufi{U+204A} &
+{\char"204A\&\_\_a;\&\_\_8;} &
+\restag{\char"204A\char"0E0061\char"0E0038} &
+\arraybslash {\jCond Generic Tironian et sign with curl / TBD}\\\hline
+%
+\mufi{U+204A} &
+{\char"204A\&\_\_a;\&\_\_9;} &
+\restag{\char"204A\char"0E0061\char"0E0039} &
+\arraybslash {\jCond Generic Tironian et sign with curl and bar / TBD}\\\hline
+%
\opua{U+2E52} &
{\char"2E52\&\_\_a;\&\_\_1;} &
\restag{\char"2E52\char"0E0061\char"0E0031} &
@@ -1704,6 +1814,46 @@ Characters without code points can only be entered via tags or OpenType features
\restag{\char"2E52\char"0E0061\char"0E0033} &
\arraybslash {\jCond Tironian Et sign without descender / TBD}\\\hline
%
+\mufi{U+2E52} &
+{\char"2E52\&\_\_a;\&\_\_4;} &
+\restag{\char"2E52\char"0E0061\char"0E0034} &
+\arraybslash {\jCond Tironian Et sign with bar / TBD}\\\hline
+%
+\mufi{U+2E52} &
+{\char"2E52\&\_\_a;\&\_\_5;} &
+\restag{\char"2E52\char"0E0061\char"0E0035} &
+\arraybslash {\jCond Tironian Et sign round form / TBD}\\\hline
+%
+\mufi{U+2E52} &
+{\char"2E52\&\_\_a;\&\_\_6;} &
+\restag{\char"2E52\char"0E0061\char"0E0036} &
+\arraybslash {\jCond Generic Tironian Et sign / TBD}\\\hline
+%
+\mufi{U+2E52} &
+{\char"2E52\&\_\_a;\&\_\_7;} &
+\restag{\char"2E52\char"0E0061\char"0E0037} &
+\arraybslash {\jCond Generic Tironian Et sign with bar / TBD}\\\hline
+%
+\mufi{U+2E52} &
+{\char"2E52\&\_\_a;\&\_\_8;} &
+\restag{\char"2E52\char"0E0061\char"0E0038} &
+\arraybslash {\jCond Generic Tironian Et sign with curl / TBD}\\\hline
+%
+\mufi{U+2E52} &
+{\char"2E52\&\_\_a;\&\_\_9;} &
+\restag{\char"2E52\char"0E0061\char"0E0039} &
+\arraybslash {\jCond Generic Tironian Et sign with curl and bar / TBD}\\\hline
+%
+\mufi{U+2E52} &
+{\char"2E4D\&\_\_s;\&\_\_s;} &
+\restag{\char"2E52\char"0E0073\char"0E0073} &
+\arraybslash {\jCond s-shaped paragraphus / TBD}\\\hline
+%
+\mufi{U+2E52} &
+{\char"2E4D\&\_\_c;\&\_\_c;} &
+\restag{\char"2E52\char"0E0063\char"0E0063} &
+\arraybslash {\jCond cc-shaped paragraphus / TBD}\\\hline
+%
\nuni{U+00AF} &
{{\textasciimacron}\&\_\_0;\&\_\_1;} &
\restag{{\textasciimacron}\char"0E0030\char"0E0031} &
@@ -1774,6 +1924,11 @@ Characters without code points can only be entered via tags or OpenType features
\restag{;\char"0E0061\char"0E0037} &
\arraybslash Hexagonal positura / TBD\\\hline
%
+\mufi{semicolon} &
+{;\&\_\_a;\&\_\_8;} &
+\restag{;\char"0E0061\char"0E0038} &
+\arraybslash Positura with two dots and tick / TBD\\\hline
+%
\mufi{U+2E4E} &
{\char"2E4E\&\_\_a;\&\_\_1;} &
\restag{\char"2E4E\char"0E0061\char"0E0031} &
@@ -1794,6 +1949,43 @@ Characters without code points can only be entered via tags or OpenType features
\restag{\char"2E4E\char"0E0061\char"0E0034} &
\arraybslash Punctus flexus / F1F5\\\hline
%
+%
+\mufi{U+2E4E} &
+{\char"2E4E\&\_\_a;\&\_\_5;} &
+\restag{\char"2E4E\char"0E0061\char"0E0035} &
+\arraybslash Dotless punctus elevatus / TBA\\\hline
+%
+\mufi{U+2E4E} &
+{\char"2E4E\&\_\_a;\&\_\_6;} &
+\restag{\char"2E4E\char"0E0061\char"0E0036} &
+\arraybslash Punctus elevatus with s-shaped top / TBA\\\hline
+%
+\mufi{U+2E4E} &
+{\char"2E4E\&\_\_a;\&\_\_7;} &
+\restag{\char"2E4E\char"0E0061\char"0E0037} &
+\arraybslash Dotless punctus elevatus with s-shaped top / TBA\\\hline
+%
+\mufi{U+2E4E} &
+{\char"2E4E\&\_\_a;\&\_\_8;} &
+\restag{\char"2E4E\char"0E0061\char"0E0038} &
+\arraybslash Enlarged punctus elevatus / TBA\\\hline
+%
+\mufi{U+2E4E} &
+{\char"2E4E\&\_\_a;\&\_\_9;} &
+\restag{\char"2E4E\char"0E0061\char"0E0039} &
+\arraybslash Enlarged dotless punctus elevatus / F1F5\\\hline
+%
+\mufi{U+2E4E} &
+{\char"2E4E\&\_\_b;\&\_\_1;} &
+\restag{\char"2E4E\char"0E0062\char"0E0031} &
+\arraybslash Enlarged punctus elevatus with s-shaped top / F1F5\\\hline
+%
+\mufi{U+2E4E} &
+{\char"2E4E\&\_\_b;\&\_\_2;} &
+\restag{\char"2E4E\char"0E0062\char"0E0032} &
+\arraybslash Enlarged dotless punctus elevatus with s-shaped top / F1F5\\\hline
+%
+%
\mufi{exclam} &
{!\&\_\_a;\&\_\_1;} &
\restag{!\char"0E0061\char"0E0031} &
@@ -1819,11 +2011,36 @@ Characters without code points can only be entered via tags or OpenType features
\restag{\~{}\char"0E0061\char"0E0031} &
\arraybslash Wavy line / F1F9\\\hline
%
+\mufi{asciitilde} &
+{\~{}\&\_\_s;\&\_\_t;} &
+\restag{\~{}\char"0E0073\char"0E0074} &
+\arraybslash Wavy line / F1F9\\\hline
+%
\mufi{asterisk} &
{*\&\_\_a;\&\_\_1;} &
\restag{*\char"0E0061\char"0E0031} &
\arraybslash Signe de renvoi / F1EC\\\hline
%
+\mufi{asterisk} &
+{*\&\_\_a;\&\_\_2;} &
+\restag{*\char"0E0061\char"0E0032} &
+\arraybslash Aldine asterisk with long limb / F1EC\\\hline
+%
+\mufi{asterisk} &
+{*\&\_\_a;\&\_\_3;} &
+\restag{*\char"0E0061\char"0E0033} &
+\arraybslash Five-spoked Aldine asterisk / F1EC\\\hline
+%
+\mufi{asterisk} &
+{*\&\_\_a;\&\_\_4;} &
+\restag{*\char"0E0061\char"0E0034} &
+\arraybslash Eight-spoked Aldine asterisk / F1EC\\\hline
+%
+\mufi{asterisk} &
+{*\&\_\_a;\&\_\_5;} &
+\restag{*\char"0E0061\char"0E0035} &
+\arraybslash Dotted Aldine asterisk / F1EC\\\hline
+%
\mufi{slash} &
{/\&\_\_a;\&\_\_1;} &
\restag{/\char"0E0061\char"0E0031} &
@@ -1834,6 +2051,11 @@ Characters without code points can only be entered via tags or OpenType features
\restag{/\char"0E0061\char"0E0032} &
\arraybslash Short virgula / F1F7\\\hline
%
+\mufi{hyphen} &
+{-\&\_\_c;\&\_\_u;} &
+\restag{-\char"0E0063\char"0E0075} &
+\arraybslash Hyphen with curl / F1F7\\\hline
+%
\opua{U+A75D} &
{\char"0A75D\&\_\_a;\&\_\_1;} &
\restag{\char"0A75D\char"0E0061\char"0E0031} &
@@ -1879,6 +2101,11 @@ Characters without code points can only be entered via tags or OpenType features
\restag{\char"0A76B\char"0E0061\char"0E0033} &
\arraybslash Colon-like et abbreviation / TBD\\\hline
%
+\mufi{U+A76B} &
+{\char"0A76B\&\_\_a;\&\_\_4;} &
+\restag{\char"0A76B\char"0E0061\char"0E0034} &
+\arraybslash et abbreviation crossing preceding q / TBD\\\hline
+%
\mufi{U+1DD3} &
{\char"25CC\char"1DD3\&\_\_a;\&\_\_1;} &
\restag{\char"25CC\char"1DD3\char"0E0061\char"0E0031} &
@@ -2105,7 +2332,7 @@ Characters without code points can only be entered via tags or OpenType features
\arraybslash Script ounce sign / F2FD\\\hline
\end{supertabular}
\end{center}
-\footnotetext{Junicode entities (like \&\_\_a\textcompwordmark;) following U+A7C1 (Old Polish o) are not properly
+\footnotetext{\ Junicode entities (like \&\_\_a\textcompwordmark;) following U+A7C1 (Old Polish o) are not properly
displayed or resolved for technical reasons related to U+A7C1 having very recently been added to Unicode. However, tags
entered directly (as here) or via HTML/XML entity references and TeX commands will still work, and the Junicode entity
will work once applications are updated with the latest additions to the Unicode standard.}
diff --git a/Master/texmf-dist/doc/fonts/junicodevf/upperpua.tex b/Master/texmf-dist/doc/fonts/junicodevf/upperpua.tex
new file mode 100644
index 00000000000..a1c5edfaf05
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/junicodevf/upperpua.tex
@@ -0,0 +1,242 @@
+\noindent Because the package that produced the table above cannot handle Unicodes greater than
+U+FFFFF, these are listed separately below.
+
+\begin{multicols}{4}
+\setlength{\parindent}{0em}\addfontfeature{Numbers={Lining,Uppercase}}10A03D: ôŠ€½
+
+10A047: ôŠ‡
+
+10A026: 􊀦
+
+10A036: 􊀶
+
+10A03F: 􊀿
+
+10A048: ôŠˆ
+
+10A04E: ôŠŽ
+
+10A04A: ôŠŠ
+
+10A04C: ôŠŒ
+
+10A008: 􊀈
+
+10A02B: 􊀫
+
+10A04B: ôŠ‹
+
+10A04D: ôŠ
+
+10A022: ôŠ€¢
+
+10A045: ôŠ…
+
+10A023: ôŠ€£
+
+10A029: 􊀩
+
+10A044: ôŠ„
+
+10A03E: ôŠ€¾
+
+10A040: ôŠ€
+
+10A031: ôŠ€±
+
+10A027: 􊀧
+
+10A053: ôŠ“
+
+10A006: 􊀆
+
+10A021: 􊀡
+
+10A02C: 􊀬
+
+10A037: ôŠ€·
+
+10A04F: ôŠ
+
+10A007: 􊀇
+
+10A032: ôŠ€²
+
+10A050: ôŠ
+
+10A033: ôŠ€³
+
+10A054: ôŠ”
+
+10A003: 􊀃
+
+10A004: 􊀄
+
+10A005: ôŠ€…
+
+10A039: ôŠ€¹
+
+10A024: 􊀤
+
+10A00D: ôŠ€
+
+10A01D: ôŠ€
+
+10A049: ôŠ‰
+
+10A025: ôŠ€¥
+
+10A028: 􊀨
+
+10A01B: ôŠ€›
+
+10A051: ôŠ‘
+
+10A052: ôŠ’
+
+10A02D: ôŠ€­
+
+10A02E: ôŠ€®
+
+10A02F: 􊀯
+
+10A00A: 􊀊
+
+10A00B: 􊀋
+
+10A00E: 􊀎
+
+10A00F: ôŠ€
+
+10A010: ôŠ€
+
+10A011: 􊀑
+
+10A012: ôŠ€’
+
+10A013: 􊀓
+
+10A014: ôŠ€”
+
+10A015: 􊀕
+
+10A016: ôŠ€–
+
+10A017: ôŠ€—
+
+10A018: 􊀘
+
+10A034: ôŠ€´
+
+10A035: ôŠ€µ
+
+10A03A: 􊀺
+
+10A030: ôŠ€°
+
+10A019: ôŠ€™
+
+10A046: ôŠ†
+
+10A00C: 􊀌
+
+10A03B: ôŠ€»
+
+10A01F: 􊀟
+
+10A041: ôŠ
+
+10A03C: ôŠ€¼
+
+10A01E: 􊀞
+
+10A042: ôŠ‚
+
+10A043: ôŠƒ
+
+10A001: ôŠ€
+
+10A002: 􊀂
+
+10A055: ôŠ•
+
+10A056: ôŠ–
+
+10A057: ôŠ—
+
+10A058: ôŠ˜
+
+10A059: ôŠ™
+
+10A05A: ôŠš
+
+10A05B: ôŠ›
+
+10A05C: ôŠœ
+
+10A05D: â—ŒôŠ
+
+10A05E: ôŠž
+
+10A05F: ôŠŸ
+
+10A060: ôŠ 
+
+10A061: ôŠ¡
+
+10A062: ôŠ¢
+
+10A063: ôŠ£
+
+10A064: ôŠ¤
+
+10A065: ôŠ¥
+
+10A066: ôŠ¦
+
+10A067: ôŠ§
+
+10A068: ôŠ¨
+
+10A069: ôŠ©
+
+10A06A: ôŠª
+
+10A06B: ôŠ«
+
+10A06D: ôŠ­
+
+10A06E: ôŠ®
+
+10A06F: ôŠ¯
+
+10A070: ôŠ°
+
+10A071: ôŠ±
+
+10A073: ôŠ³
+
+10A074: ôŠ´
+
+10A075: â—ŒôŠµ
+
+10A076: ôŠ¶
+
+10A077: ôŠ·
+
+10A078: ôŠ¸
+
+10A079: ôŠ¹
+
+10A07A: ôŠº
+
+10A07B: ôŠ»
+
+10A07C: ôŠ¼
+
+10A07D: ôŠ½
+
+10A07E: ôŠ¾
+
+10A07F: ôŠ¿
+\end{multicols}
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/README.md b/Master/texmf-dist/doc/fonts/luwiantype/README.md
index 21b6238f437..0f69525bca1 100644
--- a/Master/texmf-dist/doc/fonts/luwiantype/README.md
+++ b/Master/texmf-dist/doc/fonts/luwiantype/README.md
@@ -1,4 +1,4 @@
-LuwianType Package v1.1
+LuwianType Package v1.2
==================
2024/07/15
@@ -18,7 +18,7 @@ __________________________
Copyright 2024 Jonathan Walls
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
@@ -30,11 +30,12 @@ This work has the LPPL maintenance status `maintained'.
The Current Maintainer of this work is Jonathan Walls.
-This work consists of the files luwiantype-doc.tex and the derived file luwiantype.sty.
+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/luwiantype-doc.pdf b/Master/texmf-dist/doc/fonts/luwiantype/luwiantype-doc.pdf
index bf9f2e9ad5a..406fb8fab0a 100644
--- a/Master/texmf-dist/doc/fonts/luwiantype/luwiantype-doc.pdf
+++ 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
index c896b0c521c..1529b12e4e1 100644
--- a/Master/texmf-dist/doc/fonts/luwiantype/luwiantype-doc.tex
+++ b/Master/texmf-dist/doc/fonts/luwiantype/luwiantype-doc.tex
@@ -1,7 +1,7 @@
%% Copyright 2024 Jonathan Walls
%
% 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/lppl-1-3c.txt
@@ -12,11 +12,12 @@
%
% The Current Maintainer of this work is Jonathan Walls.
%
-% This work consists of the files luwiantype-doc.tex
-% and the derived file LuwianType.sty.
+% 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}
@@ -30,7 +31,7 @@
\usepackage{lua-ul, luacolor}
\usepackage{hyperref}
\setmainfont{Charis SIL}
-\usepackage{LuwianType}
+\usepackage{luwiantype}
\usepackage{float}
\title{The LuwianType Package}
@@ -52,7 +53,7 @@ The system aims to be maximally user-friendly (to the extent that LaTeX ever is)
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}
+\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
diff --git a/Master/texmf-dist/doc/fonts/mfb-oldstyle/COPYING b/Master/texmf-dist/doc/fonts/mfb-oldstyle/COPYING
new file mode 100644
index 00000000000..373d7ec0c57
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/mfb-oldstyle/COPYING
@@ -0,0 +1,125 @@
+MFB Oldstyle is in the public domain and may be used without restriction.
+
+* * * * *
+
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+ REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+ PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+ THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+ HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+ i. the right to reproduce, adapt, distribute, perform, display,
+ communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+ likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+ subject to the limitations in paragraph 4(a), below;
+ v. rights protecting the extraction, dissemination, use and reuse of data
+ in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+ European Parliament and of the Council of 11 March 1996 on the legal
+ protection of databases, and under any national implementation
+ thereof, including any amended or successor version of such
+ directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+ world based on applicable law or treaty, and any national
+ implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+ surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+ warranties of any kind concerning the Work, express, implied,
+ statutory or otherwise, including without limitation warranties of
+ title, merchantability, fitness for a particular purpose, non
+ infringement, or the absence of latent or other defects, accuracy, or
+ the present or absence of errors, whether or not discoverable, all to
+ the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+ that may apply to the Work or any use thereof, including without
+ limitation any person's Copyright and Related Rights in the Work.
+ Further, Affirmer disclaims responsibility for obtaining any necessary
+ consents, permissions or other rights required for any use of the
+ Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+ party to this document and has no duty or obligation with respect to
+ this CC0 or use of the Work.
diff --git a/Master/texmf-dist/doc/fonts/mfb-oldstyle/MFBOldStyle-CharacterMap.pdf b/Master/texmf-dist/doc/fonts/mfb-oldstyle/MFBOldStyle-CharacterMap.pdf
new file mode 100644
index 00000000000..c6cda1793fb
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/mfb-oldstyle/MFBOldStyle-CharacterMap.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/mfb-oldstyle/README b/Master/texmf-dist/doc/fonts/mfb-oldstyle/README
new file mode 100644
index 00000000000..4b41781eab6
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/mfb-oldstyle/README
@@ -0,0 +1,9 @@
+MFB Oldstyle font family
+Version 1.0
+August 5, 2024
+
+MFB Oldstyle is a serif font family designed for body text. This typeface was originally designed by Morris Fuller Benton and released by American Type Founders in 1909 as Century Oldstyle. The family contains three fonts: regular, italic and bold. (Currently, no bold italic font is provided.) Superior and inferior figures are available for all fonts in the family. Small capitals and old-style figures are available only for the regular font.
+
+The MFB Oldstyle fonts have been placed in the public domain using the CC Zero 1.0 waiver. See COPYING for details.
+
+For any questions, email Daniel Benjamin Miller <dbmiller@dbmiller.org>.
diff --git a/Master/texmf-dist/doc/fonts/mfb-oldstyle/mfb-oldstyle-doc.pdf b/Master/texmf-dist/doc/fonts/mfb-oldstyle/mfb-oldstyle-doc.pdf
new file mode 100644
index 00000000000..300acbaa5e4
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/mfb-oldstyle/mfb-oldstyle-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/mfb-oldstyle/mfb-oldstyle-doc.tex b/Master/texmf-dist/doc/fonts/mfb-oldstyle/mfb-oldstyle-doc.tex
new file mode 100644
index 00000000000..1eac3a3fdd2
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/mfb-oldstyle/mfb-oldstyle-doc.tex
@@ -0,0 +1,50 @@
+% !TEX TS-program = lualatex
+\documentclass[12pt]{article}
+\usepackage{fontspec}\setmainfont{MFB Oldstyle}
+\usepackage{url}
+\usepackage{realscripts}
+\usepackage[main=english]{babel}
+\usepackage{hologo}
+\usepackage[autostyle=false,babel=true,english=american]{csquotes}
+\usepackage[expansion=all,protrusion,babel]{microtype}
+\usepackage{titlesec}\titleformat*{\section}{\bfseries}\titleformat*{\subsection}{\bfseries}
+\title{The \textit{MFB Oldstyle} Font Family\\\large Version 1.0}
+\date{August 5, 2024}
+\author{Daniel Benjamin Miller\thanks{dbmiller@dbmiller.org}}
+
+\begin{document}
+\maketitle
+
+\section{Description}
+
+\textit{MFB Oldstyle} is a serif font family designed for body text. This typeface design was originally created by Morris Fuller Benton and released by American Type Founders in 1909 as \textit{Century Oldstyle}.
+
+\section{Features}
+
+The font family currently includes regular, \textit{italic} and \textbf{bold} fonts; no bold italic is included (though one may be added in the future). All the fonts include superior and inferior figures, accessible both through OpenType features and the provided \texttt{mfb-oldstyle} \hologo{LaTeX} package. \textsc{Small capitals} and old-style figures ({\addfontfeatures{Numbers=OldStyle}0123456789}) are currently provided for the regular font only. For a view of character coverage, see the included character map PDF.
+
+\section{Usage with OpenType-capable \hologo{TeX} engines}
+
+I recommend using the OpenType versions of \textit{MFB Oldstyle}, along with a modern \hologo{TeX} engine (such as \hologo{LuaTeX} or \hologo{XeTeX}). If you are using \hologo{LuaLaTeX} or \hologo{XeLaTeX}, use \texttt{fontspec} to select the font and the appropriate options, e.g., by adding \texttt{\textbackslash usepackage\{fontspec\}\textbackslash setmainfont\{MFB Oldstyle\}} to your preamble. For detailed options, see that package's documentation.
+
+\section{Usage with legacy \hologo{TeX} engines}
+
+If you wish to use the fonts with a legacy \hologo{TeX} engine, Type 1 fonts and the appropriate support files are provided. To set use the Type 1 version of \textit{MFB Oldstyle} in \hologo{LaTeX}, use the following command:
+
+\begin{verbatim}
+\usepackage{mfb-oldstyle}
+\end{verbatim}
+
+By default, tabular lining figures (0123456789) are used. The package-level options \texttt{tabular} and \texttt{proportional} can be used to switch between tabular ({\addfontfeatures{Numbers=Tabular}0123456789}) and proportional ({\addfontfeatures{Numbers=Proportional}0123456789}) versions of lining figures. Old-style figures ({\addfontfeatures{Numbers=OldStyle}0123456789}) can technically be set as the default using package option \texttt{oldstyle}, but, since old-style figures are only provided for the regular font, this will disable use of the italic and bold fonts by default. (For a more graceful fallback, try using a modern \hologo{TeX} engine). When using the legacy \hologo{LaTeX} package, superior figures can be accessed on a one-off basis using the text command \texttt{textsu}, and inferior figures can be accessed using the text command \texttt{textin}.
+
+\section{Copying}
+
+The \textit{MFB Oldstyle} fonts have been placed in the public domain and can be used without restriction. For a detailed copyright waiver with explicit fallback provisions, see \texttt{COPYING}.
+
+\section{Source files and development}
+
+Source files for the \textit{MFB Oldstyle} fonts are available on GitHub.\footnote{\url{https://github.com/dbenjaminmiller/mfb-oldstyle}} Suggestions for feature additions are welcome on GitHub (preferred) or via email.
+
+
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/fonts/niceframe-type1/README.md b/Master/texmf-dist/doc/fonts/niceframe-type1/README.md
index 3a3ec238932..967151899d4 100644
--- a/Master/texmf-dist/doc/fonts/niceframe-type1/README.md
+++ b/Master/texmf-dist/doc/fonts/niceframe-type1/README.md
@@ -1,4 +1,3 @@
-
The Type1 versions of the fonts
* bbding10.mf
@@ -7,7 +6,7 @@ The Type1 versions of the fonts
* umranda.mf
* umrandb.mf
-are created using the font editor `fontforge` with a bit
-handwork for `umranda.pfb'.
+are created using the font editor "fontforge" with a bit
+handwork for "umranda.pfb".
-Rolf Niepraschk, 2023-08-17
+Rolf Niepraschk, 2024-07-19
diff --git a/Master/texmf-dist/doc/fonts/simpleicons/bindings.tex b/Master/texmf-dist/doc/fonts/simpleicons/bindings.tex
index 3419a4196dc..f475643bddb 100644
--- a/Master/texmf-dist/doc/fonts/simpleicons/bindings.tex
+++ b/Master/texmf-dist/doc/fonts/simpleicons/bindings.tex
@@ -2153,6 +2153,8 @@
\showcaseicon{glovo}{simpleicon\{glovo\}}
+ \showcaseicon{gltf}{simpleicon\{gltf\}}
+
\showcaseicon{gmail}{simpleicon\{gmail\}}
\showcaseicon{gnome}{simpleicon\{gnome\}}
@@ -3165,6 +3167,8 @@
\showcaseicon{litecoin}{simpleicon\{litecoin\}}
+ \showcaseicon{literal}{simpleicon\{literal\}}
+
\showcaseicon{litiengine}{simpleicon\{litiengine\}}
\showcaseicon{livechat}{simpleicon\{livechat\}}
@@ -3177,6 +3181,8 @@
\showcaseicon{lmms}{simpleicon\{lmms\}}
+ \showcaseicon{lobsters}{simpleicon\{lobsters\}}
+
\showcaseicon{local}{simpleicon\{local\}}
\showcaseicon{lodash}{simpleicon\{lodash\}}
@@ -3437,6 +3443,8 @@
\showcaseicon{minetest}{simpleicon\{minetest\}}
+ \showcaseicon{mingww64}{simpleicon\{mingww64\}}
+
\showcaseicon{mini}{simpleicon\{mini\}}
\showcaseicon{minio}{simpleicon\{minio\}}
@@ -3935,6 +3943,8 @@
\showcaseicon{otto}{simpleicon\{otto\}}
+ \showcaseicon{outline}{simpleicon\{outline\}}
+
\showcaseicon{overcast}{simpleicon\{overcast\}}
\showcaseicon{overleaf}{simpleicon\{overleaf\}}
@@ -6263,6 +6273,8 @@
\showcaseicon{zerodha}{simpleicon\{zerodha\}}
+ \showcaseicon{zerotier}{simpleicon\{zerotier\}}
+
\showcaseicon{zerply}{simpleicon\{zerply\}}
\showcaseicon{zettlr}{simpleicon\{zettlr\}}
diff --git a/Master/texmf-dist/doc/fonts/simpleicons/simpleicons.pdf b/Master/texmf-dist/doc/fonts/simpleicons/simpleicons.pdf
index 13f78e3cb53..43650193984 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 56df7284081..44a13befead 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{13.1.0 -- \today}\maketitle
+\date{13.4.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/generic/babel-french/frenchb-doc.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf
index 2eb2bb0a713..da0dc2cbdb4 100644
--- a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf
+++ b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex
index 701df1e8965..f3d21083b35 100644
--- a/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex
+++ b/Master/texmf-dist/doc/generic/babel-french/frenchb-doc.tex
@@ -120,7 +120,7 @@
\title{Mode d’emploi du module \ext{babel-french}}
\author{\href{mailto:daniel.flipo@free.fr}{Daniel \textsc{Flipo}}}
-\newcommand*{\latestversion}{3.6b}
+\newcommand*{\latestversion}{3.6c}
\date{Version {\latestversion} -- \today}
\begin{document}
diff --git a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
index 44cf3388f2e..7e4ce7735bf 100644
--- a/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
+++ b/Master/texmf-dist/doc/generic/babel-french/frenchb.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md b/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md
index af748dc8961..d2b576a763f 100644
--- a/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md
+++ b/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md
@@ -1,6 +1,17 @@
<!--- CircuiTikz - Changelog --->
The major changes among the different CircuiTikZ versions are listed here. See <https://github.com/circuitikz/circuitikz/commits> for a full list of changes.
+* Version 1.7.0 (2024-08-03)
+
+ There are no big changes here, but the change to the resistor code (maybe one of the most used by the package) well deserves a minor version bump. A couple of new components, and several minor fixes.
+
+ - New component: new kind of current tap (suggested by [EEpchi and Dr4UX on GitHub](https://github.com/circuitikz/circuitikz/issues/807))
+ - New arrow tip `Jack Tap` to help drawing jack connectors (suggested by [Anisio Rogerio Braga](https://github.com/circuitikz/circuitikz/issues/806))
+ - Change the drawing of the thermocouple (suggested by [Dr4UX on GitHub](https://github.com/circuitikz/circuitikz/issues/811))
+ - Change and enhancement to the drawing of the American resistors (triggered by [Dr4UX on GitHub](https://github.com/circuitikz/circuitikz/issues/814)), fixing a long-standing small asymmetry that nobody noticed
+ - Minor adjustment for joins in `viscoe` component
+ - Minor additions (`rectjoinfill`) and fixes in documentation
+
* Version 1.6.9 (2024-05-25)
Several new components and a bug fix for a nasty long-standing bug about switching diode types.
diff --git a/Master/texmf-dist/doc/generic/knuth-hint/README.md b/Master/texmf-dist/doc/generic/knuth-hint/README.md
index 2871f311770..ae25729c4d0 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/README.md
+++ b/Master/texmf-dist/doc/generic/knuth-hint/README.md
@@ -10,8 +10,8 @@ sources and their changes in parallel. Also included is the collection of
Although not all the texts here are written or maintained by Donald Knuth, it
is more convenient for everything to be collected in one place for reading and
searching. They all stem from the system that Knuth created. The central
-entry point is the ‘index’ file, with links to the individual HINT documents,
-either in HTML or in PDF format.
+entry point is the ‘index’ file, with links to the individual documents, either
+in HTML or in PDF format.
If you believe to have found anything that remains technically, historically,
typographically, or politically incorrect in any of these files, please feel
@@ -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.4†of the `knuth-hint` package — 2024-07-10, Andreas Scherer.
+This is version “2.5†of the `knuth-hint` package — 2024-08-12, 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 af386a05bdb..bb7320d22b3 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 5ab7689272b..2e70fdd291b 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 f2d9da77475..bff1a33ee24 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 24ba1efaff4..dbe5f3f8000 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 de95e4b943e..6ef86709576 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 9a96197992f..084fbabe825 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 e6287e16af7..296bf59faa6 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 bf9129299a2..79c6ac05531 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 204772d939f..d623b5327a5 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 cbc875f35e9..f50e1420b73 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 0d86f949476..9ab844070ad 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 2ec505001e6..2b1c8a8bf6e 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 0f6e69a63ac..18ba2292810 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 a1c52bc602d..1b1c06b6124 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 5c749f76221..8de68935e6a 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 d56b7dc7c93..6b332e3b205 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 25d99a83130..e0fd74b0162 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 3dbbcf25e98..4011a1fc29e 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 36c678088c6..449a9f9a044 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 995f7ee94c7..c03760085c9 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 49cd9b214c4..8cc4f643bb2 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 10923cbe630..9c8d455e046 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 ebc91808ccb..f33068e118c 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 9cc71b83163..3e54062604e 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 fcbafe804de..a12093bbb64 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 9b5a1a2d9fe..53b21ae7d12 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 8a080af0fe7..bb835f803a7 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 dcd90d53185..01779a9cf33 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 e250acf6d3e..f53c7ea79a1 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 448a2d05920..494cc3da650 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 91535effb91..2f6382278d5 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 09354d32f76..baccc773686 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 96bcc0d073a..b974bda31d7 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 c3557f37509..f92d6ca7172 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 05ff4ca503e..6e4a1732642 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 729f2c83c9b..93010187cda 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/index.html
+++ b/Master/texmf-dist/doc/generic/knuth-hint/index.html
@@ -178,9 +178,8 @@
<code>WEB</code> and <code>CWEB</code> programs in readable format. With
the exception of <code>XeTeX</code>, all documents are in the
<code>HINT</code> format and can be viewed with the
-<code>hintview</code> program; see <a
-href="https://github.com/ruckertm/HINT">the HINT homepage</a> for the
-latest version.</p>
+<code>hintview</code> program, available from <a
+href="https://github.com/ruckertm/HINT">the HINT homepage</a>.</p>
<p>The <code>NAMED</code> entries represent the unmodified base sources
as written by their respective authors, the attached <code>chg</code>
links point to only the changed sections (or modules) as applied for
@@ -247,7 +246,9 @@ href="web/weave.hnt"><code>WEAVE</code></a>+<a
href="web/weave-changes.hnt"><code>chg</code></a> <a
href="web/tangle.hnt"><code>TANGLE</code></a>+<a
href="web/tangle-changes.hnt"><code>chg</code></a> <a
-href="web/twill.hnt"><code>TWILL</code></a> <span>]</span></p></li>
+href="web/twill.hnt"><code>TWILL</code></a><a href="#fn1"
+class="footnote-ref" id="fnref1" role="doc-noteref"><sup>1</sup></a>
+<span>]</span></p></li>
</ul>
<h2 id="complementary-web-programs-by-other-authors">Complementary WEB
programs by other authors</h2>
@@ -286,7 +287,8 @@ href="cweb/ctangle.hnt"><code>CTANGLE</code></a>+<a
href="cweb/ctangle-changes.hnt"><code>chg</code></a> <a
href="cweb/cweave.hnt"><code>CWEAVE</code></a>+<a
href="cweb/cweave-changes.hnt"><code>chg</code></a><br />
-<a href="cweb/ctwill.hnt"><code>CTWILL</code></a> <a
+<a href="cweb/ctwill.hnt"><code>CTWILL</code></a><a href="#fn2"
+class="footnote-ref" id="fnref2" role="doc-noteref"><sup>2</sup></a> <a
href="cweb/refsort.hnt"><code>REFSORT</code></a>+<a
href="cweb/refsort-changes.hnt"><code>chg</code></a> <a
href="cweb/twinx.hnt"><code>TWINX</code></a>+<a
@@ -303,7 +305,9 @@ href="tie/tie-changes.hnt"><code>chg</code></a> <span>]</span></p></li>
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>
+href="mp/mpost.hnt"><code>MPOST</code></a> <span>]</span><a href="#fn3"
+class="footnote-ref" id="fnref3"
+role="doc-noteref"><sup>3</sup></a></p></li>
</ul>
<h2 id="errata-for-computers-typesetting-by-donald-e.-knuth">Errata for
“Computers &amp; Typesetting†by Donald E. Knuth</h2>
@@ -340,6 +344,24 @@ early 2014</a></p></li>
</ul></li>
</ul>
<h2 id="happy-cweb-programming">Happy C/WEB Programming!</h2>
-<p>2024-07-09 Andreas Scherer</p>
+<p>2024-08-11 Andreas Scherer</p>
+<section id="footnotes" class="footnotes footnotes-end-of-document"
+role="doc-endnotes">
+<hr />
+<ol>
+<li id="fn1"><p><code>TWILL</code> is presented here as a changed
+variant of <code>WEAVE</code>.<a href="#fnref1" class="footnote-back"
+role="doc-backlink">↩︎</a></p></li>
+<li id="fn2"><p><code>CTWILL</code> is presented here in its own format
+with a “mini-index†for every single code section.<a href="#fnref2"
+class="footnote-back" role="doc-backlink">↩︎</a></p></li>
+<li id="fn3"><p><code>MP</code> and <code>MPOST</code> have received
+quite a few changes “behind the scenes†in order to present them in this
+collection; see project <a
+href="https://github.com/ascherer/mplibdir"><code>mplibdir</code></a>
+for details.<a href="#fnref3" class="footnote-back"
+role="doc-backlink">↩︎</a></p></li>
+</ol>
+</section>
</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 69a8c3e14d7..2a06e900da1 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 e6c956616d1..bc1667bd456 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 c96e0613ff7..eb97bb443ca 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 3382522847f..3fcd741974b 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 458affe998e..f5c7cd74e59 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 dcaba4f5161..ef5608bc686 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 ffb63848324..ce113516ddf 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 1879e40b853..642a1d45693 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 324740fd5dd..fa571b7a072 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 5e3e38dd722..35f95eec400 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 7babd18f2a2..d7ebe9dcd55 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 b70f1314abd..227297db878 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
index 052014216f4..062debf19d9 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/mp/mp.hnt
+++ 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
index b9e969072dd..b36ab061084 100644
--- a/Master/texmf-dist/doc/generic/knuth-hint/mp/mpost.hnt
+++ 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 94a39fd26f8..da00d6b634d 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 ca6b0594926..f70873e733f 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 77950a826b5..4e1b58399d0 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 f3ca7c8ab8c..5bdcb12c11c 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 237e6a210ec..24517a168ca 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 39f8c4601c9..213e4904024 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 f086f5a9fc8..0ab71373a78 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 e407be00906..d7011f6ac5e 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 1440f73a23f..9213de8719d 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 666c4d4a289..662676c11f2 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 7b1a87f1853..7d11599b64f 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 4192d154c7f..fb47d0ed426 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 b3f89d8de4a..76e090eadf0 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 c8bf5c45b2c..e6bf47fd730 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 f7e1e4d709a..f2753579cf1 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 e8c992161a1..d74ee84d472 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 4124eb55b78..ffbaa0ac302 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 ae31e25182b..dc2e9231eae 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 f9eb390cafb..2553863e055 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 88faa6ec97a..25d9f9dc21b 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 3c63decdd87..6cdbb61794e 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 e44c9e2dc90..d4fe6558ee6 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 04b16f22f86..7dfe63c503e 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 ebfc9397a06..c47b75268e7 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 505d0643634..d9650623209 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 e75bbac2923..cf2e7a47b45 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 a7d0373095a..80629d0591f 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 633989f2369..30d2555d4da 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 7549cf9f8f4..0b0014bc93c 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 eec4f9a535b..633381144bb 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 b9cbe8f8c79..3163e99dd84 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 5c47d2464c7..ab14c6fd00c 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 0ae94e0eb01..e33c69526e4 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.4†of the `knuth-pdf` package — 2024-07-10, Andreas Scherer.
+This is version “2.5†of the `knuth-pdf` package — 2024-08-12, 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 51afb728285..92952fed924 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 e925af9e095..d0399eac374 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 b5d24bfff0f..760f704cf38 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 c00112ba6a3..4f77e166e89 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 8294d6721ab..0b47ef93dc3 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 fe92cb15379..b583ecc93c9 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 3fa90674ff5..b5f56741fc9 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 2321c56c31f..1cf487ec200 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 b4ec76b58b6..cd414d58803 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 0f78fcf762f..824da6b9228 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 228381d60d4..479d905a153 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 b6f051dfed0..aec9fe18850 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 a81f0164ed1..7e36960b392 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 1aed4d9b987..547a208ba00 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 42fe0976ebc..cca5496f7cf 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 bff5092b2b0..2582ef3c2d8 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 91e9da35708..74dcf5653c5 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 844cead11f7..f053598ed5f 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 d8235bb8b27..d855ebf9609 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 5d4601997bc..393192647fb 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 56ee96c487c..3ea1a98947a 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 cced6e62616..c8901565e11 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 3b55012174b..61e80920c1c 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 7c579e8629f..095acccec31 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 85c84182b37..8ceb1b7211a 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 2e787bc2e1f..d1e0e7942ed 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 2b220d18bf6..4d018dd326f 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 4cf60accb7f..6bb21cda75f 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 780eef75646..42757353ea2 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 7e67495e260..2ed6afb5b7d 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 62e8779bb5a..09b7d47904d 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 7f42019be4a..f47c22f6b9f 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 3a3d94965ca..d1ce5d4ec20 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 544bf76c1e0..8169f3d7abf 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 7b82c521de0..b4aa53714d5 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 2dc82d621bd..0e8abecfa77 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/index.html
+++ b/Master/texmf-dist/doc/generic/knuth-pdf/index.html
@@ -241,7 +241,9 @@ href="web/weave.pdf"><code>WEAVE</code></a>+<a
href="web/weave-changes.pdf"><code>chg</code></a> <a
href="web/tangle.pdf"><code>TANGLE</code></a>+<a
href="web/tangle-changes.pdf"><code>chg</code></a> <a
-href="web/twill.pdf"><code>TWILL</code></a> <span>]</span></p></li>
+href="web/twill.pdf"><code>TWILL</code></a><a href="#fn1"
+class="footnote-ref" id="fnref1" role="doc-noteref"><sup>1</sup></a>
+<span>]</span></p></li>
</ul>
<h2 id="complementary-web-programs-by-other-authors">Complementary WEB
programs by other authors</h2>
@@ -280,7 +282,8 @@ href="cweb/ctangle.pdf"><code>CTANGLE</code></a>+<a
href="cweb/ctangle-changes.pdf"><code>chg</code></a> <a
href="cweb/cweave.pdf"><code>CWEAVE</code></a>+<a
href="cweb/cweave-changes.pdf"><code>chg</code></a><br />
-<a href="cweb/ctwill.pdf"><code>CTWILL</code></a> <a
+<a href="cweb/ctwill.pdf"><code>CTWILL</code></a><a href="#fn2"
+class="footnote-ref" id="fnref2" role="doc-noteref"><sup>2</sup></a> <a
href="cweb/refsort.pdf"><code>REFSORT</code></a>+<a
href="cweb/refsort-changes.pdf"><code>chg</code></a> <a
href="cweb/twinx.pdf"><code>TWINX</code></a>+<a
@@ -297,7 +300,9 @@ href="tie/tie-changes.pdf"><code>chg</code></a> <span>]</span></p></li>
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>
+href="mp/mpost.pdf"><code>MPOST</code></a> <span>]</span><a href="#fn3"
+class="footnote-ref" id="fnref3"
+role="doc-noteref"><sup>3</sup></a></p></li>
</ul>
<h2 id="errata-for-computers-typesetting-by-donald-e.-knuth">Errata for
“Computers &amp; Typesetting†by Donald E. Knuth</h2>
@@ -334,6 +339,24 @@ early 2014</a></p></li>
</ul></li>
</ul>
<h2 id="happy-cweb-programming">Happy C/WEB Programming!</h2>
-<p>2024-07-09 Andreas Scherer</p>
+<p>2024-08-11 Andreas Scherer</p>
+<section id="footnotes" class="footnotes footnotes-end-of-document"
+role="doc-endnotes">
+<hr />
+<ol>
+<li id="fn1"><p><code>TWILL</code> is presented here as a changed
+variant of <code>WEAVE</code>.<a href="#fnref1" class="footnote-back"
+role="doc-backlink">↩︎</a></p></li>
+<li id="fn2"><p><code>CTWILL</code> is presented here in its own format
+with “mini-indexes†for every two consecutive pages.<a href="#fnref2"
+class="footnote-back" role="doc-backlink">↩︎</a></p></li>
+<li id="fn3"><p><code>MP</code> and <code>MPOST</code> have received
+quite a few changes “behind the scenes†in order to present them in this
+collection; see project <a
+href="https://github.com/ascherer/mplibdir"><code>mplibdir</code></a>
+for details.<a href="#fnref3" class="footnote-back"
+role="doc-backlink">↩︎</a></p></li>
+</ol>
+</section>
</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 cdad14512ee..85f27f46d9b 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 a16ecb16e3f..36174d09165 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 1fd069cfcda..bec4c04e240 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 b97414ec234..33cfe054a45 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 8d300e9b3a4..71c2389b79f 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 b3b2dbc463f..6452ded33d4 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 cfa20619710..f218aa113ef 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 358babf99e6..b6844b30d2d 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 bd3a31448cc..2be0eeb9829 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 99c425e27ea..f70f8ddd17e 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 741f1d3b41e..474c7e0c296 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 456b4352190..e65b9090629 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
index 8db59988efc..66ae7db9a19 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/mp/mp.pdf
+++ 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
index 7dc8cc7838e..d82fe9d9719 100644
--- a/Master/texmf-dist/doc/generic/knuth-pdf/mp/mpost.pdf
+++ 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 059c71b9f16..3594481d7d9 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 d5e6a7de1a6..e6be8cb07a0 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 9b24696e4e1..3dfd77b5656 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 b4aa6ebad87..9a0b4c723ef 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 0874fc69eae..465bcde1df0 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 7898be14054..3d821be8361 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 86078c7dee9..6f426f29833 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 9d3e2822216..35ef09e74da 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 e0d8340ff45..13207db99f0 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 42bf275b728..b1820df32ea 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 d698e786296..e4302312ba1 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 f4e81bf4d63..5c546dcb5a8 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 3068cc9edc8..c84fe305e5c 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 ac9f4eaa928..fc89c3aa729 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 fbcedb9bde7..75131be4f37 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 a8a3cfc2d2a..53c934da8b0 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 6528a5c5b3f..43d1c93be83 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 3ca3b977e71..6b64c716a4c 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 922d39d91a7..291d666c053 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 d2d46a32041..5de30fd5a11 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 9b0c58f22c1..4bb30ac134b 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 980ce9472c6..6ff2fdd7efd 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 563d5788f5a..769336535a0 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 db3830b5443..1b4062697fe 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 6f9ad6d8124..d0d4031dd86 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 0e6a77f36ca..0bf03bfcb3b 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 e360148f2d8..31fb7740ab1 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 85ee36841f7..2ac1efac3e9 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 ce2315c2ae3..d8253592804 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 eda4824bd9b..de9016752d5 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 32dd78f0502..f7288a2c973 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 9ad6e9d383e..932e5ca2eb5 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/pst-coil/Changes b/Master/texmf-dist/doc/generic/pst-coil/Changes
index d9028ebf314..c9fa1b1daeb 100644
--- a/Master/texmf-dist/doc/generic/pst-coil/Changes
+++ b/Master/texmf-dist/doc/generic/pst-coil/Changes
@@ -2,6 +2,7 @@ pst-coil.sty --------
2010-02-01 message for loading the pro file
pst-coil.tex --------
+v. 1.08 2024-08-13 - added alternative macro \psAltCoil
v. 1.07 2015-05-13 - modified psSin
v. 1.06 2011-09-18 - fix bug with \pszigzag
v. 1.05 2011-07-12 - added optional argument bow for circular
diff --git a/Master/texmf-dist/doc/generic/pst-coil/README b/Master/texmf-dist/doc/generic/pst-coil/README
index 8f8b07cfa0e..0484bb50781 100644
--- a/Master/texmf-dist/doc/generic/pst-coil/README
+++ b/Master/texmf-dist/doc/generic/pst-coil/README
@@ -9,4 +9,4 @@ pst-coil-doc.bib - The documentation, bibfile
--
-Herbert Voss 2006-11-05
+hoss@tug.org 2024-08-13
diff --git a/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.bib b/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.bib
index b29fe53b654..1281ed1318e 100644
--- a/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.bib
+++ b/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.bib
@@ -60,7 +60,7 @@
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 = second,
+ edition = 2,
year = {2007},
address = {Reading, Mass.}
}
diff --git a/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.pdf b/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.pdf
index 26f0e655ba3..13ae4342bbd 100644
--- a/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.tex b/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.tex
index 201f8298c06..ebcd0aa0519 100644
--- a/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-coil/pst-coil-doc.tex
@@ -1,9 +1,13 @@
-%% $Id: pst-coil-doc.tex 539 2011-07-12 08:22:33Z herbert $
-\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
- headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc}
+%% $Id: pst-coil-doc.tex 930 2024-08-13 18:19:44Z herbert $
+\errorcontextlines=100
+%\RequirePackage{pdfmanagement-testphase}
+\DocumentMetadata{}
+\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
+ headinclude=false,footinclude=false,twoside,english]{pst-doc}
\listfiles
-\usepackage[utf8]{inputenc}
+\addbibresource{\jobname.bib}
+\usepackage{csquotes,animate}
\usepackage{pst-plot,pst-node,pst-coil}
\SpecialCoor
\let\pstFV\fileversion
@@ -25,7 +29,7 @@
\author{Timothy Van Zandt\\Herbert Vo\ss\\Michael Sharpe}
\date{\today}
-\maketitle
+\settitle
\begin{abstract}
Coils, springs and zigzag curves
@@ -42,7 +46,7 @@ elaborated on at the corresponding places.
\vfill
\noindent
Thanks to:
-Marco Daniel, Denis Girou, Uwe Siart.
+Marco Daniel, Denis Girou, Manuel Luque, Uwe Siart.
\end{abstract}
\clearpage
@@ -561,6 +565,146 @@ Th other connections behave completely analogue to those dealt with the
package \LPack{pst-node} so that
no further explanations are needed here.
+
+\section{Alternative macro}
+
+The macro \Lcs{psAltCoil} depends on the code from Manuel Luque. It uses a different way
+to draw coils with a kind of perspective view. The possible optional parameter are:
+
+\begin{itemize}
+ \item \Lkeyword{N}\textsf{=10} : number of coils
+ \item \Lkeyword{l0}\texttt{=5} : initial length in cm
+ \item \Lkeyword{R}\texttt{=0.5} : initial radius in cm
+ \item \Lkeyword{arm}\texttt{=0} : arm length in cm
+ \item \Lkeyword{alpha}\texttt{=15} : projection angle
+ \item \Lkeyword{nS}\texttt{=25} : number of steps per coil
+\end{itemize}
+
+
+\begin{LTXexample}[pos=t]
+\begin{pspicture}[showgrid,arrowsize=0.2,arrowinset=0.1](-2,-1.4)(14,2)
+\psAltCoil[N=20,l0=10,alpha=20,arm=0.5,linewidth=0.05]{*-*}(0,0)(11,0)
+\psline[linewidth=0.5\pslinewidth](0.5,0)(0.5,1.25)
+\psline[linewidth=0.5\pslinewidth](10.5,0)(10.5,1.25)
+\psline{<->}(0.5,1)(10.5,1)
+\uput[u](5.5,1){l0=10 cm}
+\psline[linewidth=0.5\pslinewidth](0,0)(0,1.25)
+\psline{>-}(-0.22,1)(0.5,1)
+\uput[u](0.25,1){dl}
+\psline[linewidth=0.5\pslinewidth](11,0)(11,1.25)
+\psline{-<}(10.5,1)(11.25,1)
+\uput[u](10.75,1){dl}
+\end{pspicture}
+\end{LTXexample}
+
+
+\begin{LTXexample}[pos=t]
+\begin{pspicture}[showgrid,arrowsize=0.2,arrowinset=0.1](-2,-1.4)(14,2)
+\psAltCoil[N=20,l0=10,R=0.5,alpha=20,arm=0.5,linewidth=0.05]{*-*}(-2,0)(14,0)
+\psline[linewidth=0.5\pslinewidth](-1.5,0)(-1.5,1.25)
+\psline[linewidth=0.5\pslinewidth](13.5,0)(13.5,1.25)
+\psline{<->}(-1.5,1)(13.5,1)
+\uput[u](5.5,1){L=15 cm}
+\psline[linewidth=0.5\pslinewidth](-2,0)(-2,1.25)
+\psline{>-}(-2.25,1)(-1.5,1)
+\uput[u](-1.75,1){dl}
+\psline[linewidth=0.5\pslinewidth](14,0)(14,1.25)
+\psline{-<}(13.5,1)(14.25,1)
+\uput[u](13.75,1){dl}
+\end{pspicture}
+\end{LTXexample}
+
+
+
+The next animation needs Adobe Acrobat to view:
+
+\begin{minipage}{4cm}
+\psset{unit=0.5}
+\def\nFrames{44}% 44 images
+\def\calc{
+ /Z0 -16 def
+ /OMEGA 20 0.1 div sqrt def % pulsation des oscillations
+ /Period TwoPi OMEGA div def % 0.4442883
+ /ti \rt\space def
+ /ZR Z0 -5 OMEGA RadtoDeg ti mul cos mul add def }
+\newcommand\bille{%
+ \psset{linewidth=0.02,fillstyle=solid,fillcolor=yellow!50}
+ \pscircle*[linecolor=yellow](0,0){0.5}
+ \psarc[linecolor=black](0,0){0.425}{-110}{90}
+ \psarc[linecolor=black](0,0){0.3}{-90}{70}
+ \psarc[linecolor=black](0,0){0.2}{-70}{60}}
+
+\begin{animateinline}[controls,loop,%
+ begin={\begin{pspicture}(-2,1)(2,-23)},
+ end={\end{pspicture}}]{5}% 5 images/s
+\multiframe{\nFrames}{rt=0+0.01}{%
+ \psframe*(-2,1)(2,-23)
+ \psframe[fillstyle=hlines,linestyle=none,hatchcolor=white](-1,0)(1,0.2)
+ \psline[linecolor=white](-1,0)(1,0)
+ \psdot[linecolor=white](0,0)
+ \psgrid[subgriddiv=0,gridcolor=white,griddots=10,gridlabels=0pt]
+ \psAltCoil[arm=0.5,alpha=25,N=20,l0=10,linecolor=white,linewidth=0.05](0,0)(! 0 \calc ZR)
+ \rput(! 0 \calc ZR 0.5 sub){\pscircle*[linecolor=yellow](0,0){0.5}}
+}
+\end{animateinline}
+\end{minipage}%
+\begin{minipage}{\dimexpr\linewidth-4cm}
+\begin{verbatim}
+\psset{unit=0.75}
+\def\nFrames{44}% 44 images
+\def\calc{
+ /Z0 -16 def
+ /OMEGA 20 0.1 div sqrt def
+ /Period TwoPi OMEGA div def % 0.4442883
+ /ti \rt\space def % rt variable from animate
+ /ZR Z0 -5 OMEGA RadtoDeg ti mul cos mul add def }
+\begin{animateinline}[controls,loop,%
+ begin={\begin{pspicture}(-2,1)(2,-23)},
+ end={\end{pspicture}}]{5}% 5 images/s
+\multiframe{\nFrames}{rt=0+0.01}{%
+ \psframe*(-2,1)(2,-23)
+ \psframe[fillstyle=hlines,linestyle=none,
+ hatchcolor=white](-1,0)(1,0.2)
+ \psline[linecolor=white](-1,0)(1,0)
+ \psdot[linecolor=white](0,0)
+ \psgrid[subgriddiv=0,gridcolor=white,griddots=10,gridlabels=0pt]
+ \psAltCoil[arm=0.5,alpha=25,N=20,l0=10,linecolor=white,
+ linewidth=0.05](0,0)(! 0 \calc ZR)
+ \rput(! 0 \calc ZR 0.5 sub){\pscircle*[linecolor=yellow](0,0){0.5}}
+}
+\end{animateinline}
+\end{verbatim}
+\end{minipage}
+
+
+
+\begin{LTXexample}[pos=l]
+\begin{pspicture}[showgrid](0,0)(6,11)
+\psAltCoil[linecolor=blue,N=20,linewidth=0.1,
+ alpha=-20,arm=1,arrowinset=0.1]{<->}(1,2)(5,10)
+\end{pspicture}
+\end{LTXexample}
+
+
+\begin{LTXexample}[pos=l]
+\begin{pspicture}[showgrid](0,0)(4,6)
+\psAltCoil[linecolor=red,N=20](1,5)(3,1)
+\end{pspicture}
+\end{LTXexample}
+
+
+\begin{LTXexample}[pos=t]
+\begin{pspicture}[showgrid](0,-5)(16,5)
+\psAltCoil[linecolor=blue,N=25,R=1,l0=5,arm=0.5,alpha=-20,
+ doubleline=true](0,3)(16,3)
+\psAltCoil[linecolor=red,N=8,alpha=25](0,0)(4,0)
+\psAltCoil[linecolor=black,N=8,alpha=25](16,0)
+\psAltCoil[linecolor=blue,N=15.5,l0=5,arm=0.5,alpha=0](0,-2)(16,-2)
+\end{pspicture}
+\end{LTXexample}
+
+
+
\clearpage
\section{List of all optional arguments for \texttt{pst-coil}}
@@ -570,8 +714,7 @@ no further explanations are needed here.
\nocite{*}
\bgroup
\RaggedRight
-\bibliographystyle{plain}
-\bibliography{pst-coil-doc}
+\printbibliography
\egroup
\printindex
diff --git a/Master/texmf-dist/doc/generic/pst-diffraction/Changes b/Master/texmf-dist/doc/generic/pst-diffraction/Changes
index 8a8e131e986..d40c814ac75 100644
--- a/Master/texmf-dist/doc/generic/pst-diffraction/Changes
+++ b/Master/texmf-dist/doc/generic/pst-diffraction/Changes
@@ -1,5 +1,6 @@
pst-diffraction.tex --------
-2.06 2004-07-10 - fix for missing contrast option for \psdiffractionCircular (Keno Wehr)
+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
diff --git a/Master/texmf-dist/doc/generic/pst-diffraction/README b/Master/texmf-dist/doc/generic/pst-diffraction/README
index a0463526ba0..3d95ca6feb4 100644
--- a/Master/texmf-dist/doc/generic/pst-diffraction/README
+++ b/Master/texmf-dist/doc/generic/pst-diffraction/README
@@ -3,7 +3,7 @@
%% Manuel Luque (France)
%% Herbert Voss (hvoss _at_ tug.org) (Germany)
%%
-%% 2024-07-10
+%% 2024-06-29
%%
PSTricks offers excellent macros to insert more or less complex
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 2352efc2fbd..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 8cbc5b6407e..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
@@ -2,11 +2,11 @@
\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{pst-grad,pst-diffraction}
+\usepackage{xurl,pst-grad,pst-diffraction}
\let\pstDiffractionFV\fileversion
@@ -285,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]
@@ -364,11 +364,11 @@ or $d=\frac{2r}{1.22}$ (see
\url{http://www.unice.fr/DeptPhys/optique/diff/trouscirc/diffrac.html}).
\hspace*{-1cm}%
-\begin{pspicture}(-4,-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}(-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}
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/CHANGELOG.md b/Master/texmf-dist/doc/latex-dev/l3kernel/CHANGELOG.md
index 3696c567d17..76ee35a0f1b 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/CHANGELOG.md
@@ -7,6 +7,12 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2024-07-20]
+
+### Fixed
+- Implementation of deprecated `\tl_mixed_case:n(n)`
+- Redo the fix for LaTeX2e key properties (issue latex3/latex2e\#1415)
+
## [2024-06-19]
### Fixed
@@ -1747,7 +1753,8 @@ this project uses date-based 'snapshot' version identifiers.
- Step functions have been added for dim variables,
e.g. `\dim_step_inline:nnnn`
-[Unreleased]: https://github.com/latex3/latex3/compare/2024-06-19...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2024-07-20...HEAD
+[2024-07-20]: https://github.com/latex3/latex3/compare/2024-06-19...2024-07-20
[2024-06-19]: https://github.com/latex3/latex3/compare/2024-05-27...2024-06-19
[2024-05-27]: https://github.com/latex3/latex3/compare/2024-05-08...2024-05-27
[2024-05-08]: https://github.com/latex3/latex3/compare/2024-04-11...2024-05-08
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/README.md b/Master/texmf-dist/doc/latex-dev/l3kernel/README.md
index 2c0b2a04773..0afb38a9ba2 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/README.md
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/README.md
@@ -1,7 +1,7 @@
LaTeX3 Programming Conventions
==============================
-Release 2024-06-19
+Release 2024-07-20
Overview
--------
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/expl3.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/expl3.pdf
index e2e48dedf73..cf3f79416b9 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/expl3.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/expl3.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/interface3.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/interface3.pdf
index 959d7187ab8..6c4ea0a544c 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/interface3.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/interface3.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/interface3.tex b/Master/texmf-dist/doc/latex-dev/l3kernel/interface3.tex
index 9e36aa8fe8a..0219809dabd 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/interface3.tex
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/interface3.tex
@@ -58,7 +58,7 @@ for those people who are interested.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2024-06-19}
+\date{Released 2024-07-20}
\pagenumbering{roman}
\maketitle
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3doc.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/l3doc.pdf
index f417c92811d..554a61ad500 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3doc.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3docstrip.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/l3docstrip.pdf
index 2c97de0d5f7..1ec928d673c 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3docstrip.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3docstrip.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news.pdf
index 80a88e47cd9..e9e7149b0df 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news01.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news01.pdf
index 99aebce94c6..d85dfd045e7 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news01.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news01.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news02.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news02.pdf
index 8724ffc776e..7bd350172e0 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news02.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news02.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news03.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news03.pdf
index 6e02927db4b..f1f3afb7263 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news03.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news03.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news04.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news04.pdf
index ce24a41b647..4093837a055 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news04.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news04.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news05.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news05.pdf
index b4e1a4fb634..c8000e8f0fc 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news05.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news05.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news06.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news06.pdf
index 1d675540eca..1bd0875ea78 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news06.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news06.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news07.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news07.pdf
index a1c228a4412..452e18749b7 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news07.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news07.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news08.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news08.pdf
index 004c269c5e3..f985db2b445 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news08.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news08.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news09.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news09.pdf
index 33a6bde2a96..50924df70cc 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news09.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news09.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news10.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news10.pdf
index ab6903d9177..4fb21174bd7 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news10.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news10.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news11.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news11.pdf
index e5d326a4530..a06c363913c 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news11.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news11.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news12.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news12.pdf
index 83cd26364b8..09a1a6955c5 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3news12.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3news12.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3prefixes.csv b/Master/texmf-dist/doc/latex-dev/l3kernel/l3prefixes.csv
index e85412b9d80..339f6625fd1 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3prefixes.csv
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3prefixes.csv
@@ -26,6 +26,7 @@ block,latex2e,The LaTeX Project,https://www.latex-project.org/latex3.html,https:
bool,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27,
box,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27,
bxjh,BXjaholiday,Takuto Asakura,https://github.com/wtsnjp/BXjaholiday,https://github.com/wtsnjp/BXjaholiday.git,https://github.com/wtsnjp/BXjaholiday/issues,2018-02-02,2019-02-02,
+cal,spath3,Andrew Stacey,https://github.com/loopspace/spath3,https://github.com/loopspace/spath3.git,https://github.com/loopspace/spath3/issues,2024-07-18,2024-07-18,
cascade,cascade,F. Pantigny,,,,2020-07-21,2020-07-21,
catcode,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2018-05-12,2018-05-12,
cctab,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-28,2012-09-28,
@@ -135,6 +136,7 @@ keys,"l3kernel,l3keys2e,ltkeys",The LaTeX Project,https://www.latex-project.org/
keyval,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27,
kgl,kantlipsum,Enrico Gregorio,,,,2013-03-16,2013-03-16,
kivitendo,"kiviletter, kivitables",Marei Peischl for Kivitendo,https://www.kivitendo.de/,https://github.com/kivitendo/kivitendo-erp,https://forum.kivitendo.de/,2021-05-28,2021-05-28,
+knot,spath3,Andrew Stacey,https://github.com/loopspace/spath3,https://github.com/loopspace/spath3.git,https://github.com/loopspace/spath3/issues,2024-07-18,2024-07-18,
langsci,langscibook,Language Science Press,https://langsci-press.org,https://github.com/langsci/langscibook,https://github.com/langsci/langscibook/issues,2021-07-20,2021-07-21,
left,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2018-05-12,2018-05-12,
liftarm,liftarm,Matthias Floré,,,,2024-05-25,2024-05-25,
@@ -210,6 +212,7 @@ property,latex2e,The LaTeX Project,https://www.latex-project.org/latex3.html,htt
pseudo,pseudo,Magnus Lie Hetland,https://github.com/mlhetland/pseudo.sty,https://github.com/mlhetland/pseudo.sty.git,https://github.com/mlhetland/pseudo.sty/issues,2019-06-24,2019-06-24,
ptex,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2015-07-28,2015-07-28,
ptxcd,ptxcd,Marei Peischl,,,,2020-07-27,2020-07-27,Used for specific corporate design templates
+ptxtools,"depp, ptxtools",Marei Peischl,https://gitlab.com/islandoftex/texmf/depp,https://gitlab.com/islandoftex/texmf/depp.git,https://gitlab.com/islandoftex/texmf/depp,2024-07-09,2024-07-09,
qrbill,qrbill,Marei Peischl,https://github.com/peiTeX/qrbill,https://github.com/peiTeX/qrbill.git,https://github.com/peiTeX/qrbill/issues,2020-06-27,2020-06-27,
quark,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27,
rainbow,beamertheme-rainbow,samcarter,https://github.com/samcarter/beamertheme-rainbow,https://github.com/samcarter/beamertheme-rainbow,https://github.com/samcarter/beamertheme-rainbow/issues,2023-07-04,2023-07-04,
@@ -239,6 +242,7 @@ slcd,se2thesis,Stephan Lukasczyk,https://github.com/se2p/se2thesis,https://githu
socket,latex2e,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex2e.git,https://github.com/latex3/latex2e/issues,2023-10-17,2023-10-17,
sort,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2017-02-13,
space,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2018-05-12,2018-05-12,
+spath,spath3,Andrew Stacey,https://github.com/loopspace/spath3,https://github.com/loopspace/spath3.git,https://github.com/loopspace/spath3/issues,2024-07-18,2024-07-18,
starray,starray,Alceu Frigeri,https://github.com/alceu-frigeri/starray,https://github.com/alceu-frigeri/starray,https://github.com/alceu-frigeri/starray/issues,2023-05-15,2023-05-15,
statistics,statistics,Julien Rivaud,https://gitlab.com/frnchfrgg-latex/statistics,https://gitlab.com/frnchfrgg-latex/statistics.git,https://gitlab.com/frnchfrgg-latex/statistics/issues,2018-06-25,2018-06-25,
stm,lt3-stm,CV Radhakrishnan,http://www.cvr.cc/,,,2014-02-26,2014-02-26,
@@ -258,6 +262,7 @@ tex,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https:/
text,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2020-01-15,2020-01-15,
tikzfill,tikzfill,Thomas F. Sturm,https://github.com/T-F-S/tikzfill,https://github.com/T-F-S/tikzfill.git,https://github.com/T-F-S/tikzfill/issues,2022-07-19,2022-07-19,
tikzlings,tikzlings,samcarter,https://github.com/samcarter/tikzlings,git@github.com:samcarter/tikzlings.git,https://github.com/samcarter/tikzlings/issues,2023-02-17,2023-02-17,
+tikzspath,spath3,Andrew Stacey,https://github.com/loopspace/spath3,https://github.com/loopspace/spath3.git,https://github.com/loopspace/spath3/issues,2024-07-18,2024-07-18,
tikzsymbols,tikzsymbols,Ben Vitecek,https://github.com/Vidabe/tikzsymbols,https://github.com/Vidabe/tikzsymbols.git,https://github.com/Vidabe/tikzsymbols/issues,2018-09-26,2018-09-26,
tilde,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2018-05-12,2018-05-12,
tl,"l3kernel,l3tl-build",The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27,
@@ -288,6 +293,7 @@ xmarks,latex2e,The LaTeX Project,https://www.latex-project.org/latex3.html,https
xparse,xparse,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27,
xpatch,"regexpatch,xpatch",Enrico Gregorio,,,,2013-03-16,2013-03-16,
xpeek,xpeek,Joel C. Salomon,,,,2013-03-16,2013-03-16,
+xpg,polyglossia,Jürgen Spitzmüller,https://github.com/reutenauer/polyglossia/,https://github.com/reutenauer/polyglossia/,https://github.com/reutenauer/polyglossia/issues,2024-07-02,2024-07-02,
xpinyin,xpinyin,Qing Lee,https://github.com/CTeX-org/ctex-kit,https://github.com/CTeX-org/ctex-kit.git,https://github.com/CTeX-org/ctex-kit/issues,2013-03-16,2013-05-26,
xsb,xsavebox,Alexander Grahn,,https://gitlab.com/agrahn/xsavebox,https://gitlab.com/agrahn/xsavebox/issues,2016-02-26,2020-04-15,
xsim,xsim,Clemens Niederberger,https://github.com/cgnieder/xsim/,https://github.com/cgnieder/xsim.git,https://github.com/cgnieder/xsim/issues,2020-04-14,2020-04-14,
@@ -299,4 +305,5 @@ zhnum,zhnumber,Qing Lee,https://github.com/CTeX-org/ctex-kit,https://github.com/
zrefcheck,zref-check,gusbrs,https://github.com/gusbrs/zref-check,https://github.com/gusbrs/zref-check,https://github.com/gusbrs/zref-check/issues,2021-08-05,2021-08-05,
zrefclever,zref-clever,gusbrs,https://github.com/gusbrs/zref-clever,https://github.com/gusbrs/zref-clever,https://github.com/gusbrs/zref-clever/issues,2021-11-29,2021-11-29,
zrefvario,zref-vario,gusbrs,https://github.com/gusbrs/zref-vario,https://github.com/gusbrs/zref-vario,https://github.com/gusbrs/zref-vario/issues,2022-02-02,2022-02-02,
+zugferd,zugferd,Marei Peischl,https://github.com/TeXhackse/LaTeX-ZUGFeRD,https://github.com/TeXhackse/LaTeX-ZUGFeRD.git,https://github.com/TeXhackse/LaTeX-ZUGFeRD/issues,2024-07-09,2024-07-09,
zxjt,zxjatype,Takayuki Yato,,,,2013-03-16,2013-03-16,
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3prefixes.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/l3prefixes.pdf
index e9633dee241..908809cda4f 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3prefixes.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3prefixes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3styleguide.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/l3styleguide.pdf
index 80dabed6261..6d9065124dc 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3styleguide.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3styleguide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3styleguide.tex b/Master/texmf-dist/doc/latex-dev/l3kernel/l3styleguide.tex
index 1caf698e9bc..985f20a68cb 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3styleguide.tex
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3styleguide.tex
@@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2024-06-19}
+\date{Released 2024-07-20}
\begin{document}
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3syntax-changes.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/l3syntax-changes.pdf
index ef84d78a9f0..f7b4cf0d3d0 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3syntax-changes.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3syntax-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3syntax-changes.tex b/Master/texmf-dist/doc/latex-dev/l3kernel/l3syntax-changes.tex
index 5ed2fba8671..b9ffcb011af 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3syntax-changes.tex
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3syntax-changes.tex
@@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2024-06-19}
+\date{Released 2024-07-20}
\newcommand{\TF}{\textit{(TF)}}
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3term-glossary.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/l3term-glossary.pdf
index 5705a815993..bb77c0a4c2e 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3term-glossary.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3term-glossary.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/l3term-glossary.tex b/Master/texmf-dist/doc/latex-dev/l3kernel/l3term-glossary.tex
index 3221b102807..fca28863372 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/l3term-glossary.tex
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/l3term-glossary.tex
@@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2024-06-19}
+\date{Released 2024-07-20}
\newcommand{\TF}{\textit{(TF)}}
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/source3.pdf b/Master/texmf-dist/doc/latex-dev/l3kernel/source3.pdf
index c61b5e0adea..6ccc2109c22 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/source3.pdf
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/source3.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex-dev/l3kernel/source3.tex b/Master/texmf-dist/doc/latex-dev/l3kernel/source3.tex
index 4297476aabd..228d3ca93c6 100644
--- a/Master/texmf-dist/doc/latex-dev/l3kernel/source3.tex
+++ b/Master/texmf-dist/doc/latex-dev/l3kernel/source3.tex
@@ -57,7 +57,7 @@ for those people who are interested.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2024-06-19}
+\date{Released 2024-07-20}
\pagenumbering{roman}
\maketitle
diff --git a/Master/texmf-dist/doc/latex/abraces/README.md b/Master/texmf-dist/doc/latex/abraces/README.md
index b26a225d8c6..5234134d051 100644
--- a/Master/texmf-dist/doc/latex/abraces/README.md
+++ b/Master/texmf-dist/doc/latex/abraces/README.md
@@ -1,11 +1,11 @@
-`abraces` 2022/11/06 v2.1
+`abraces` 2024/08/02 v2.2
----------------------------------------
A package that provides a character key-driven interface to
supplement new constructions of the traditional `\overbrace`
and `\underbrace` pairs in an asymmetric or arbitrary way.
-Copyright (c) 2021 Werner Grundlingh
+Copyright (c) 2024 Werner Grundlingh
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/abraces/abraces-doc.pdf b/Master/texmf-dist/doc/latex/abraces/abraces-doc.pdf
index c0becaadde6..a2161dafb5b 100644
--- a/Master/texmf-dist/doc/latex/abraces/abraces-doc.pdf
+++ b/Master/texmf-dist/doc/latex/abraces/abraces-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/abraces/abraces-doc.tex b/Master/texmf-dist/doc/latex/abraces/abraces-doc.tex
index 970cf74eab0..04178c2de7d 100644
--- a/Master/texmf-dist/doc/latex/abraces/abraces-doc.tex
+++ b/Master/texmf-dist/doc/latex/abraces/abraces-doc.tex
@@ -1,4 +1,4 @@
-% $Id: abraces-doc.tex,v 2.1 2022/11/06 00:00:00 wgrundlingh stable $
+% $Id: abraces-doc.tex,v 2.2 2024/08/02 00:00:00 wgrundlingh stable $
\RequirePackage{xcolor}% http://ctan.org/pkg/xcolor (required to "overload" color package)
\documentclass[10pt]{ltxdockit}[2011/03/25]
@@ -7,7 +7,7 @@
\usepackage{booktabs,shortvrb,amsmath,xfp}
\MakeShortVerb{\|}
-\rcsid{$Id: abraces.tex,v 2.1 2022/11/06 00:00:00 wgrundlingh stable $}
+\rcsid{$Id: abraces.tex,v 2.2 2024/08/02 00:00:00 wgrundlingh stable $}
%\setcounter{secnumdepth}{2}
%\setcounter{tocdepth}{4}
@@ -305,11 +305,18 @@ This material is released under and subject to the \href{https://latex-project.o
\section{Acknowledgements}
-Thanks to Frank Mittlebach who stepped in and suggested an improvement in the original way \sty{abraces} functioned. Expansions included the use of \LaTeX3 command interface (via the \href{http://ctan.org/pkg/xparse}{\sty{xparse} package}).
+Thanks to Frank Mittlebach who stepped in and suggested an improvement in the original way \sty{abraces} functioned. Expansions included the use of \LaTeX3 command interface.
\section{Change log}
\begin{itemize}
+ \item v2.2 (2024-08-02) Minor update
+
+ \begin{itemize}
+ \item
+ Added \href{http://ctan.org/pkg/xcolor}{\sty{xcolor}} dependency to always have \lstinline|\bracecolor| available.
+ \end{itemize}
+
\item v2.1 (2022-11-06) Minor update
\begin{itemize}
diff --git a/Master/texmf-dist/doc/latex/asmeconf/README.md b/Master/texmf-dist/doc/latex/asmeconf/README.md
index 2c07a04b9b0..d01de1897fe 100644
--- a/Master/texmf-dist/doc/latex/asmeconf/README.md
+++ b/Master/texmf-dist/doc/latex/asmeconf/README.md
@@ -1,7 +1,7 @@
#asmeconf: A latex template for ASME conference papers#
- Version 1.37 dated 2024/02/06.
+ Version 1.38 dated 2024/08/01.
####Overview####
This class provides a LaTeX template for ASME Conference papers formatted according to
@@ -80,23 +80,37 @@
####Change log####
+ v1.38 (2024/08/01)
+ - Add dcolumn type ",{x.y}" to center numbers on a comma separator
+ - Change appendix section titles block format, rather than hanging indentation
+ - Replace sample French appendix by a German appendix
+ - Fix bug in \[main=\] option (for babel)
+ - Define commands \\@title and \\@author
+ - Code clean-up (compatibility code, bookmark package loading, twocolumn loading,...)
+ - Various code changes to better support future tagged pdf
+ - Update documentation for using fontspec with asmeconf
+ - Rescale Termes, Helvetica, and Inconsolata fontdimens under LuaLaTeX to match pdfTeX
+ - Add logic to asme-template.tex to test for presence of non-latin fonts under LuaLaTeX
+ - Change code for Japanese fonts to by-pass bug in luatexja-fontspec
+ - Correct typo in babel font loading for traditional Chinese
+ - Remove calls for Harfbuzz renderer since fontspec handles this internally
+
v1.37 (2024/02/06)
- - Under luaLaTeX, fontspec is now loaded by default. The option [nofontspec] will prevent this.
- - Eliminate the following long-deprecated options: [oldauthor, lang, lang-second, lang-third]
- - newtxtext has removed the superiors font options (Jan 2024). As a result, the option [nodefaultsups] has been removed from asmeconf, along with supporting code
+ - Under LuaLaTeX, fontspec is now loaded by default. The option \[nofontspec\] will prevent this.
+ - Eliminate the following long-deprecated options: \[oldauthor, lang, lang-second, lang-third\]
+ - newtxtext has removed the superiors font options (Jan 2024). As a result, the option \[nodefaultsups\] has been removed from asmeconf, along with supporting code
- Streamline code for option handling and compatibility testing; other code clean-up
- Switch code handling successive footnotes to expl3, adjust intersecting code
- Small code changes to accommodate future tagged pdf
- Refresh sample figures, edit sample bib file
- Edits to asmeconf.bst: fix punctuation and spacing in journal title macros
-
-
+
v1.36 (2023/12/28)
- Change option-passing to xcolor package to address recent changes that package's code which lead to an error message.
v1.35 (2023/10/19)
- Adjust pdf-a code to accommodate recent changes to hyperxmp package. NOTE: \\DocumentMetadata{ ..} is now preferred to using class option [pdf-a].
- - Add option to not use boldface text in captions: [unboldcaption]
+ - Add option to not use boldface text in captions: \[unboldcaption\]
- Add mathversion sans for sans-serif math and set as default in unbolded captions
v1.34 (2022/12/30)
@@ -131,7 +145,7 @@
v1.27 (2021/12/26):
- fix bug in captions that appeared in Jan. 2021 (code not uppercasing caption text)
- revise code to switch to grid-style author block through a single package option, \[grid\]; previous macros for grid-style remain active.
- - various code modifications to enable older LaTeX distributions to run this class. With pdfLaTeX, TeX Live 2016 or later should be used; with luaLaTeX, TeX Live 2021 or later should be used.
+ - various code modifications to enable older LaTeX distributions to run this class. With pdfLaTeX, TeX Live 2016 or later should be used; with LuaLaTeX, TeX Live 2021 or later should be used.
- eliminate use of \\entry{} with a single argument to produce subheadings in nomenclature; use \\EntryHeading{} instead. (**not backward compatible**)
- incorporate recent changes to LaTeX pdf management in relation to pdf-a color profile loading and recently deprecated \\pdfcatalog command
- minor edits in relation to url links
diff --git a/Master/texmf-dist/doc/latex/asmeconf/asmeconf-sample.bib b/Master/texmf-dist/doc/latex/asmeconf/asmeconf-sample.bib
index 158b0f00813..66b2a356cfd 100644
--- a/Master/texmf-dist/doc/latex/asmeconf/asmeconf-sample.bib
+++ b/Master/texmf-dist/doc/latex/asmeconf/asmeconf-sample.bib
@@ -1,6 +1,6 @@
%% Sample bibliography file for asmeconf.bst and asmeconf.cls
%%
-%% Revised 25 January 2024
+%% Revised 26 July 2024
%% Copyright John H. Lienhard, MIT
%% Offered under the MIT license: https://ctan.org/license/mit
@@ -212,6 +212,18 @@
urldate = {January 18, 2021},
}
+@article{pohlhausen1921,
+ author = {Pohlhausen, E.},
+ title = {Der {W}\"{a}rmeaustausch zwischen festen K\"{o}rpern und {F}l\"{u}ssigkeiten mit kleiner reibung und kleiner {W}\"{a}rmeleitung},
+ journal = {Zeitschrift f\"{u}r {A}ngewandte {M}athematik und {Me}chanik},
+ volume = {1},
+ number = {2},
+ pages = {115--121},
+ doi = {10.1002/zamm.19210010205},
+ year = {1921},
+}
+%url = {https://onlinelibrary.wiley.com/doi/abs/10.1002/zamm.19210010205},
+
@book{fourier1822,
author = {Jean Baptiste Joseph Fourier},
year = {1822},
diff --git a/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.pdf b/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.pdf
index 0e628963d36..8e3eefb5160 100644
--- a/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.pdf
+++ b/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.tex b/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.tex
index 84eecfb0714..a325b893575 100644
--- a/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.tex
+++ b/Master/texmf-dist/doc/latex/asmeconf/asmeconf-template.tex
@@ -4,7 +4,7 @@
%% This file is asmeconf-template.tex, a LaTeX template to format ASME Conference papers according to
%% the requirements on ASME's conference web pages, and including hypertext support for the pdf.
%%
-%% This file is version 1.37 dated 2024/02/06
+%% This file is version 1.38 dated 2024/08/01
%%
%% As of version 1.11, this template defaults to ASME's newer conference guidelines first posted July 2019.
%% Those guidelines changed the requested author block formatting to be inline.
@@ -71,8 +71,8 @@
%% * See Appendix B for details.
%% * Language support is most extensive when running LuaLaTeX, which automatically loads fontspec, but
%% * be aware that you may to install additional fonts on your system to use fontspec.
-%% *
-%% * To use LuaLaTeX without bothering about extra fonts, use the [nofontspec] option to asmeconf.
+%%
+%% * Option to use LuaLaTeX **without** bothering about extra fonts, [nofontspec]
%%
%% The use of commands defined or modified by the asmeconf class is illustrated throughout this file. In particular,
%% ASME requires capitalized, sans-serif section headings, and as a result some care is needed when using macros
@@ -93,13 +93,13 @@
%% STRONGLY RECOMMENDED new pdf management code follows.
%% This addition the LaTeX kernel was made in June 2022 by the LaTeX Project team.
%% https://www.latex-project.org/news/latex2e-news/ltnews35.pdf
-%% Uncomment the next lines and omit the option [pdf-a] from \documentclass[...]{asemconf}
+%% If this doesn't work for you, comment out the next lines and add option [pdf-a] to \documentclass[...]{asmeconf}
-%\DocumentMetadata{%
-% pdfstandard=A-3b,% A-2b, A-2u, A-3b, or A-3u (don't use u options with LuaLaTeX)
-% pdfversion=1.7,
-% lang=en-US,
-%}
+\DocumentMetadata{%
+ pdfstandard=A-3b,% A-2b, A-2u, A-3b, or A-3u (don't use u options with LuaLaTeX)
+ pdfversion=1.7,
+ lang=en-US,
+}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -108,7 +108,7 @@
%% Remove the [colorlinks] option before *final* submission to ASME, to get black text for printing,
%% but keep that option for other uses.
-\documentclass[pdf-a,balance,colorlinks,upint,subscriptcorrection,varvw,mathalfa=cal=boondoxo, spanish,french,vietnamese,russian,greek]{asmeconf}
+\documentclass[balance,colorlinks,upint,subscriptcorrection,varvw,mathalfa=cal=boondoxo, german,spanish,vietnamese,russian,greek]{asmeconf}
%%%%% pdf metadata %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -121,6 +121,7 @@
pdflicenseurl={https://ctan.org/pkg/asmeconf},% may delete
}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{document}
@@ -154,7 +155,7 @@
% \JointFirstAuthor, if applicable, follows the affiliation of the relevant authors, no spaces.
\SetAuthors{%
- John H.\ Lienhard\affil{1}\JointFirstAuthor\CorrespondingAuthor{},
+ John H. Lienhard\affil{1}\JointFirstAuthor\CorrespondingAuthor{},
Luis Hern\'andez\affil{2}\JointFirstAuthor,
Maria Silva\affil{3},
Henry Tudor\affil{4},
@@ -183,7 +184,6 @@
%%%%% End of fields to be completed. Now write your paper. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%% ABSTRACT %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
%% Abstract should be 200 words or less
@@ -314,16 +314,18 @@ Run 12 & 24 & 68.3 \\
%%%%%%%%%%%%%%% begin more complicated table %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% note column set as a 3 cm wide paragraph with 1em hanging indentation. See array package documentation.
+% note numbers centered on "." (with d{3.3}) and on "," (with ,{3.3}). See dcolumn package documentation.
\begin{table}[t]
\caption{Table with more complicated columns}\label{tab:2}%
\centering{%
-\begin{tabular}{!{\hspace*{0.5cm}} >{\raggedright\hangindent=1em} p{3cm} d{3.3} @{\hspace*{1cm}} d{3.3} !{\hspace*{0.5cm}}}
+\begin{tabular}{!{\hspace*{0.5cm}} >{\raggedright\hangindent=1em} p{3cm} d{3.3} @{\hspace*{1cm}} ,{3.3} !{\hspace*{0.5cm}}}
\toprule
Experiment & \multicolumn{1}{c@{\hspace*{1cm}}}{$u$ [m/s]} & \multicolumn{1}{c!{\hspace*{0.5cm}}}{$T$ [\textdegree C]} \\
\midrule
-The first test we ran this morning & 124.3 & 68.3 \\
-The second test we ran this morning & 82.50 & 103.46 \\
-Our competitor's test & 72.321 & 141.384 \\
+The first test we ran this morning & 124.3 & 68,3 \\
+The second test we ran this morning & 82.50 & 103,46 \\
+Our competitor's test & 72.321 & 141,384 \\
\bottomrule
\end{tabular}
}
@@ -444,7 +446,7 @@ Math italics are used for Roman and Greek letters by default. If you want an up
\begin{equation}\label{eqn:dw}
\vec{F} = m \vec{a} \quad\textrm{or}\quad \vec{\mathrm{F}} = m \vec{\mathrm{a}} \quad\textrm{or}\quad \mathbf{F} = m \mathbf{a} \quad\textrm{or}\quad \vec{\mathsf{F}} = m \vec{\mathsf{a}}
\end{equation}
-To get additional symbols in bold math, use the \verb|\bm{..}| macro from the \texttt{bm} package (which is loaded by the class) or, for longer passages, use \verb|{\mathversion{bold}|\ldots\texttt{\}}.
+To get additional symbols in bold math, use the \verb|\bm{..}| macro from the \texttt{bm} package (which is loaded by the class) or, for longer passages, use \verb|{\mathversion{bold}..|\texttt{\}}.
The class file also provides upright sans-serif Greek letters with \verb|\sfalpha| and similar expressions (e.g., $\sfalpha, \sfbeta, \sfgamma, \sfdelta$ \ldots $\bm{\sfalpha, \sfbeta, \sfgamma, \sfdelta \ldots}$), in case they are needed (but note that the \verb|newtxmath| options \verb|frenchmath| and \verb|slantedGreek| also affect how Greek letters are presented).
@@ -555,7 +557,9 @@ The \hologo{LuaLaTeX} engine is useful with \texttt{asmeconf} in two situations:
\item \textbf{Executing lua code directly in your \LaTeX\ file.} With lua code, complicated functions can be plotted or numerical integration can be executed. An example file in the distribution demonstrates this capability~\cite{lienhard2024}. In this situation, \textit{be sure to use the class option} \texttt{[nofontspec]}, so that you won't need to install additional fonts on your computer.
-\item \textbf{Using complex alphabets.} With \hologo{pdfLaTeX}, the \texttt{asmeconf} package supports Latin alphabets, as well as Cyrillic, Greek, and Vietnamese. If you need scripts such as Arabic, Chinese, or Japanese, \hologo{LuaLaTeX} with the \texttt{fontspec} package can use fonts installed in your computer operating system. See the example file in this distribution for more details~\cite{lienhard2021}.
+\item \textbf{Using complex alphabets.} With \hologo{pdfLaTeX}, the \texttt{asmeconf} package supports Latin alphabets, as well as Cyrillic, Greek, and Vietnamese. If you need scripts such as Arabic, Chinese, or Japanese, \hologo{LuaLaTeX} with the \texttt{fontspec} package can use fonts installed in your computer operating system.\footnote{For English, you \textit{must} have these fonts installed:\par \parbox{\columnwidth}{\setlength{\parindent}{12pt}TeX Gyre Termes (\hrefurl{https://ctan.org/tex-archive/fonts/newtx/opentype}{ctan.org/tex-archive/fonts/newtx/opentype}),\par TeX~Gyre~Heros (\hrefurl{https://ctan.org/tex-archive/fonts/tex-gyre/opentype}{ctan.org/tex-archive/fonts/tex-gyre/opentype}),\par
+Inconsolatazi4 (\hrefurl{https://ctan.org/tex-archive/fonts/inconsolata/opentype}{ctan.org/tex-archive/fonts/inconsolata/opentype}).}} See the example file in this distribution for more details~\cite{lienhard2021}.
+
\end{description}
@@ -572,9 +576,10 @@ abstract in another language.
When more than one language option is included in \verb|\documentclass[..]{asmeconf}|, English will be
set as the document's main language. (To choose a different main language, set \texttt{[main=..]}).
-If no language options are given, the package defaults to English. As examples, a passage in French is
-shown in \selectlanguage{french}\appendixname~\ref{app:fourier}\selectlanguage{english}, followed by
-\ifpdftex abstracts in Spanish, Greek, Russian, and Vietnamese.\else abstracts in other languages.\fi
+If no language options are given, the package defaults to English. As examples, a passage in German is
+shown in \selectlanguage{german}\appendixname~\ref{app:pohlhausen}\selectlanguage{german},
+%\selectlanguage{french}\appendixname~\ref{app:fourier}\selectlanguage{english},
+followed by \ifpdftex abstracts in Spanish, Greek, Russian, and Vietnamese.\else abstracts in other languages.\fi
The input encoding can be utf-8, as for these glyphs:
%% If you have trouble with the next line, your file may not be saved in utf-8 format. You can delete that line to resolve the issue.
@@ -588,12 +593,18 @@ The bibliography style, \texttt{asmeconf.bst}, is designed in English and aimed
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\begin{selectlanguage}{french}%
-\section{Discours Préliminaire de Fourier}\label{app:fourier}
-Les causes primordiales ne nous sont point con­nues; mais elles sont assujetties à des lois simples et constantes, que l'on peut découvrir par l'obser­vation, et dont l'étude est l'objet de la philosophie naturelle.
-
-La chale ur pénètre, comme la gravité, toutes les substances de l'univers, ses rayons occupent toutes les parties de l'espace. Le but de notre ouvrage est d'exposer les lois mathématiques que suit cet élé­ment. Cette théorie formera désormais une des branches les plus importantes de la physique gé­nérale~\cite{fourier1822}.
+\begin{selectlanguage}{german}%
+\section{Wärmeaustausch und Reibungswiderstand (\NoCaseChange{von} E. Pohlhausen)}\label{app:pohlhausen}
+In einer strömenden Flussigkeit sind Wärmeleitung und Wärmekonvektion Vorgänge, die mit der inneren Reibung (oder Impulsleitung) und mit der Impulskonvektion große Aehnlichkeit besitzen. Mathematisch findet dies seinen Ausdruck in dem gleichartigen Bau der Differentialgleichungen, die einerseits für die Temperatur und anderseits für den Geschwindigkeitsvektor in der Flüssigkeit bestehen. Man kann daraus auf eine Beziehung
+zwischen dem Wärmeaustanch und dem Reibungswiderstand schließen, die eine strömende Flüssigkeit an einem festen Körper hervorrufen. Dies ist zuerst von Prandtl ausgesprochen und durchgeführt worden, und zwar für turbulente Vorgänge, unter der vereinfachenden Annahme von Wärmequellen und -senken im Innern der Flüssigkeit~\cite{pohlhausen1921}.
\end{selectlanguage}%
+
+%\begin{selectlanguage}{french}%
+%\section{Discours Préliminaire de Fourier}\label{app:fourier}
+%Les causes primordiales ne nous sont point con­nues; mais elles sont assujetties à des lois simples et constantes, que l'on peut découvrir par l'obser­vation, et dont l'étude est l'objet de la philosophie naturelle.
+%
+%La chale ur pénètre, comme la gravité, toutes les substances de l'univers, ses rayons occupent toutes les parties de l'espace. Le but de notre ouvrage est d'exposer les lois mathématiques que suit cet élé­ment. Cette théorie formera désormais une des branches les plus importantes de la physique gé­nérale~\cite{fourier1822}.
+%\end{selectlanguage}%
\begin{selectlanguage}{spanish}%
\begin{abstract*}
@@ -625,19 +636,25 @@ Este es el resumen del artículo. Escribimos en español. Se describen el proble
\end{selectlanguage}% Checked and edited by Nguyen Le and Thao Nguyen
\fi
-\iffontspecloaded %%% requires lualatex
+\iffontspecloaded %%% These passages require using lualatex AND installing the mentioned fonts as system fonts on your computer.
%
- \begin{selectlanguage}{greek}%
- \begin{abstract*}
- Αυτή είναι η πεÏίληψη του άÏθÏου. ΧÏησιμοποιοÏμε την ελληνική γλώσσα. ΠεÏιγÏάφεται το Ï€Ïόβλημα, οι μέθοδοι και τα αποτελέσματα. ΠεÏιλαμβάνονται επίσης αναφοÏές.
- \end{abstract*}
- \end{selectlanguage}% Edited by George Barbastathis
-%
- \begin{selectlanguage}{russian}
- \begin{abstract*}
- Это резюме Ñтатьи. Пишем по руÑÑки. ОпиÑаны проблема, методы и результаты. Ð‘Ð¸Ð±Ð»Ð¸Ð¾Ð³Ñ€Ð°Ñ„Ð¸Ñ Ñ‚Ð°ÐºÐ¶Ðµ включена.%
- \end{abstract*}
- \end{selectlanguage}% edited by Steven Gerasimoff
+ \IfFontExistsTF{NotoSans}{
+ \IfFontExistsTF{NotoSerif}{
+ %
+ \begin{selectlanguage}{greek}%
+ \begin{abstract*}
+ Αυτή είναι η πεÏίληψη του άÏθÏου. ΧÏησιμοποιοÏμε την ελληνική γλώσσα. ΠεÏιγÏάφεται το Ï€Ïόβλημα, οι μέθοδοι και τα αποτελέσματα. ΠεÏιλαμβάνονται επίσης αναφοÏές.
+ \end{abstract*}
+ \end{selectlanguage}% Edited by George Barbastathis
+ %
+ \begin{selectlanguage}{russian}
+ \begin{abstract*}
+ Это резюме Ñтатьи. Пишем по руÑÑки. ОпиÑаны проблема, методы и результаты. Ð‘Ð¸Ð±Ð»Ð¸Ð¾Ð³Ñ€Ð°Ñ„Ð¸Ñ Ñ‚Ð°ÐºÐ¶Ðµ включена.%
+ \end{abstract*}
+ \end{selectlanguage}% edited by Steven Gerasimoff
+ %
+ }{\ClassWarning{\ClassName}{I can't find NotoSerif.ttf, which is needed for Greek and Russian language text. Please install that font.}}
+ }{\ClassWarning{\ClassName}{I can't find NotoSans.ttf, which is needed for Greek and Russian language text. Please install that font.}}
%
\begin{selectlanguage}{vietnamese}
\begin{abstract*}
@@ -645,24 +662,41 @@ Este es el resumen del artículo. Escribimos en español. Se describen el proble
\end{abstract*}
\end{selectlanguage}% Checked and edited by Nguyen Le and Thao Nguyen
%
-% \begin{selectlanguage}{japanese}% Use class option [japanese] if you uncomment this passage.
-% \begin{abstract*}
-% % è«–æ–‡ã®è¦ç´„ã§ã™ã€‚日本語ã§è¨˜è¿°ã—ã¾ã™ã€‚å•é¡Œã€æ–¹æ³•ã€ãŠã‚ˆã³çµæžœã«ã¤ã„ã¦èª¬æ˜Žã—ã¾ã™ã€‚ã¾ãŸã€å‚考文献もå«ã‚ã¾ã™ã€‚
-% ã“ã®è«–æ–‡ã®æ—¥æœ¬èªžã§ã®è¦ç´„ã¯ä»¥ä¸‹ã®ã¨ãŠã‚Šã§ã™ã€‚å•é¡Œã€æ–¹æ³•ã€ãŠã‚ˆã³çµæžœãŒèª¬æ˜Žã•ã‚Œã¦ã„ã¾ã™ã€‚å‚考資料も添付ã—ã¦ã‚ã‚Šã¾ã™ã€‚
-% \end{abstract*}
-% \end{selectlanguage}% Edited by Keiji Yano and Yoshiki Okamoto
%
- \begin{selectlanguage}{korean}
- \begin{abstract*}
- ì´ê²ƒì€ 한국어로 ì“°ì¸ ë…¼ë¬¸ì˜ ì´ˆë¡ìž…니다. 문제, 방법 ë° ê²°ê³¼ê°€ 설명ë˜ì–´ 있습니다. ì°¸ì¡°ë„ í¬í•¨ë©ë‹ˆë‹¤.
- \end{abstract*}
- \end{selectlanguage}% Edited by Hyung Won Chung.
+%% Use class option [japanese] if you uncomment this passage.
+% \IfFontExistsTF{NotoSerifCJKjp}{%
+% \IfFontExistsTF{NotoSansCJKjp}{%
+% %
+% \begin{selectlanguage}{japanese}
+% \begin{abstract*}
+% % è«–æ–‡ã®è¦ç´„ã§ã™ã€‚日本語ã§è¨˜è¿°ã—ã¾ã™ã€‚å•é¡Œã€æ–¹æ³•ã€ãŠã‚ˆã³çµæžœã«ã¤ã„ã¦èª¬æ˜Žã—ã¾ã™ã€‚ã¾ãŸã€å‚考文献もå«ã‚ã¾ã™ã€‚
+% ã“ã®è«–æ–‡ã®æ—¥æœ¬èªžã§ã®è¦ç´„ã¯ä»¥ä¸‹ã®ã¨ãŠã‚Šã§ã™ã€‚å•é¡Œã€æ–¹æ³•ã€ãŠã‚ˆã³çµæžœãŒèª¬æ˜Žã•ã‚Œã¦ã„ã¾ã™ã€‚å‚考資料も添付ã—ã¦ã‚ã‚Šã¾ã™ã€‚
+% \end{abstract*}
+% \end{selectlanguage}% Edited by Keiji Yano and Yoshiki Okamoto
+% %
+% }{\ClassWarning{\ClassName}{I can't find NotoSerifCJKjp, which is needed for Japanese language text. Please install that font.}}
+% }{\ClassWarning{\ClassName}{I can't find NotoSansCJKjp, which is needed for Japanese language text. Please install that font.}}
%
- \begin{selectlanguage}{chinese-simplified}
- \begin{abstract*}
- 这是文章的摘è¦ã€‚我们用中文书写,æ述了问题,方法和结果,还包括了å‚考文献。
- \end{abstract*}
- \end{selectlanguage}% edited by Zi Hao Foo
+ \IfFontExistsTF{NotoSansCJKkr}{%
+ \IfFontExistsTF{NotoSerifCJKkr}{%
+ %
+ \begin{selectlanguage}{korean}
+ \begin{abstract*}
+ ì´ê²ƒì€ 한국어로 ì“°ì¸ ë…¼ë¬¸ì˜ ì´ˆë¡ìž…니다. 문제, 방법 ë° ê²°ê³¼ê°€ 설명ë˜ì–´ 있습니다. ì°¸ì¡°ë„ í¬í•¨ë©ë‹ˆë‹¤.
+ \end{abstract*}
+ \end{selectlanguage}% Edited by Hyung Won Chung.
+ %
+ }{\ClassWarning{\ClassName}{I can't find NotoSerifCJKkr.otf, which is needed for Korean language text. Please install that font.}}
+ %
+ \IfFontExistsTF{NotoSerifCJKsc}{%
+ \begin{selectlanguage}{chinese-simplified}
+ \begin{abstract*}
+ 这是文章的摘è¦ã€‚我们用中文书写,æ述了问题,方法和结果,还包括了å‚考文献。
+ \end{abstract*}
+ \end{selectlanguage}% edited by Zi Hao Foo
+ %
+ }{\ClassWarning{\ClassName}{I can't find NotoSerifCJKsc.otf, which is needed for Korean language text. Please install that font.}}
+ }{\ClassWarning{\ClassName}{I can't find NotoSansCJK.ttf, which is needed for Korean and simplified Chinese text. Please install that font.}}
%
\fi
diff --git a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-fontspec.pdf b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-fontspec.pdf
index 05e276803f4..d5ef0f0158e 100644
--- a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-fontspec.pdf
+++ b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-fontspec.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-fontspec.tex b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-fontspec.tex
index b041b0f0ff6..406a4dd6604 100644
--- a/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-fontspec.tex
+++ b/Master/texmf-dist/doc/latex/asmeconf/examples/asmeconf-fontspec.tex
@@ -18,13 +18,36 @@
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\DocumentMetadata{%
+ pdfstandard=A-3b,% A-2b, A-2u, A-3b, or A-3u (don't use u options with LuaLaTeX)
+ pdfversion=1.7,
+ lang=en-US,
+ debug = {xmp-export},
+}
\documentclass[colorlinks,nofoot,spanish,japanese,russian,greek,ukrainian,vietnamese,french,portuguese,turkish,polish,indonesian,italian,german,latin,serbianc,bidi=basic]{asmeconf}
% note that not all languages given as examples in this file can be called as options.
+% directly add this xmp property. See l3pdfmeta.pdf. This is not automatic with \DocumentMetadata. "True" must be capitalized.
+\ExplSyntaxOn
+ \pdfmeta_xmp_add:n{<xmpRights:Marked>True</xmpRights:Marked>}
+\ExplSyntaxOff
+
\hypersetup{%
- pdftitle={Language Support in ASMECONF: Non-Latin Alphabets, Lualatex, and fontspec},
+ pdftitle={{Language Support in ASMECONF: Non-Latin Alphabets, Lualatex, and fontspec}},
pdfkeywords={asmeconf, non-Latin alphabets, fontspec, LuaLaTeX, PDFLaTeX},
- pdfauthor={John H. Lienhard, V},
+ pdfauthor={John H. Lienhard},
+ pdfsubject = {Describes font support in asmeconf LaTeX template},
+ pdfurl={https://ctan.org/pkg/asmeconf},% may delete
+ pdflicenseurl={https://ctan.org/pkg/asmeconf},
+ pdfcopyright={Copyright (c) \the\year\ by John H. Lienhard},
+ pdfcontactemail={lienhard@mit.edu},
+ pdfcaptionwriter={{John H. Lienhard, V}},
+ pdfcontactaddress={77 Massachusetts Avenue, Room 3-166},
+ pdfcontactcity={Cambridge, MA},
+ pdfcontactpostcode={02139},
+ pdfcontactcountry={USA},
+ pdfcontacturl={https://lienhard.mit.edu},
+ pdfauthortitle={Professor of Mechanical Engineering},
}
% To avoid typing these over and over, define:
@@ -33,13 +56,30 @@
\newcommand*\AC{{\upshape\texttt{asmeconf}}}
\newcommand*\PLT{{\upshape\texttt{\hologo{pdfLaTeX}}}}
+% define a unicode character by its codepoint
+\ExplSyntaxOn
+ \cs_new:Npn \MySym #1 { \codepoint_generate:nn {#1} { 12 } }
+\ExplSyntaxOff
+
+\renewcommand*{\checkmark}{\MySym{"2713}} % because default checkmark has poor glyph information
+
+%% It's necessary to force full embedding of the fonts to get valid PDF/A-3b
+\usepackage{luacode}
+\begin{luacode}
+local function embedfull(tfmdata)
+ tfmdata.embedding = "full"
+end
+luatexbase.add_to_callback("luaotfload.patch_font", embedfull, "embedfull")
+\end{luacode}
+
+
\makeatletter
\def\NotoBan@scale{0.98}% vary this if the Bengali is too small/large; the default value 0.92 matches scaling of the other Noto fonts used.
\def\NotoDev@scale{0.98}% vary this if the Devanagari is too small/large; the default value 0.92 matches scaling of the other Noto fonts used.
%\def\NotoTam@scale{0.92}% vary this if the Tamil is too small/large; the default value 0.92 matches scaling of the other Noto fonts used.
\def\NotoAra@scale{0.93}% The serif font only; the default value is 0.91
-% Noto family is not as close to Tex Gyre Termes as I'd like, so for abstract examples in Latin script [only], use Noto Serif Italic for visual consistency
+% Noto family is not as close to Tex Gyre Termes as I'd like, so for abstract examples in Latin script [only], I'm using Noto Serif Italic for visual consistency
\newfontfamily{\NotoSerif}{NotoSerif}[UprightFont=*-Regular,ItalicFont=*-Italic, BoldItalicFont=*-BoldItalic, BoldFont=*-Bold, Extension=.ttf,Scale=\Noto@scale,WordSpace={1,1.4,1}]
\newfontfamily{\NotoSerifItalns}{NotoSerif-Italic.ttf}[ItalicFont=*,Scale=\Noto@scale]% Turkish has trouble with WordSpace
\makeatother
@@ -107,10 +147,10 @@
\begin{document}
\ConfName{Proceedings of the \texttt{asmeconf} \linebreak International Examples Congress and Exposition}
-\ConfAcronym{AIECE21}
-\ConfDate{January 20, 2021}
+\ConfAcronym{AIECE24}
+\ConfDate{August 1, 2024}
\ConfCity{Cambridge, MA}
-\PaperNo{AIECE2021-0002}
+\PaperNo{AIECE2024-0002}
\title{Language Support in ASMECONF: Non-Latin Alphabets, Lualatex, and fontspec}
@@ -119,7 +159,7 @@
\maketitle
-\versionfootnote{Version~1.01, \today}
+\versionfootnote{Version~1.02, \today}
\keywords{asmeconf, language support, non-Latin alphabets, fontspec, \LLT}
@@ -183,12 +223,12 @@ The \FS\ package~\cite{robertson2020} allows \LLT\ to access fonts that are inst
When processed in \PLT, \AC\ uses the \texttt{newtxtext} and \texttt{inconsolata} fonts, a collection of eight-bit fonts, for Latin script. To use \FS, we must replace those fonts with corresponding unicode fonts (the math fonts, from \texttt{newtxmath}, are unchanged). Specialized fonts are needed for some additional scripts. Thus, the user will need to install several unicode fonts onto their own system in order to use \AC\ with \FS.
Fortunately, all these fonts are all free and easily downloaded.
-The needed fonts are listed in Table~\ref{tab:2}.
+The needed fonts are listed in Table~\ref{tab:2}. \textit{The Latin fonts are required for English when using \FS.}
%%%%%%%%%%%%%%% two column table %%%%%%%%%%%%%%%%%%
\NewDocumentCommand\R{O{11pt}}{\rule{0pt}{#1}}
\begin{table*}[t!]
-\caption{System fonts used by \NoCaseChange{\AC} with \NoCaseChange{\FS}. For all fonts, load regular and bold face. For Latin, Cyrillic, and Greek, also load italic and bold italic. For Noto Sans Arabic, install semibold instead of bold.\label{tab:2}}%
+\caption{System fonts used by \NoCaseChange{\AC} with \NoCaseChange{\FS}. For all fonts, load regular and bold face. For Latin, Cyrillic, and Greek serif and sans serif fonts, also load italic and bold italic. For Noto Sans Arabic, install semibold instead of bold.\label{tab:2}}%
\centering{%
\begin{tabular*}{\textwidth}{@{\hspace*{0.5em}}@{\extracolsep{\fill}}>{\raggedright}p{6em}>{\raggedright}p{12em}>{\raggedright}p{10em}p{23em}@{\hspace*{0.5em}}}
\toprule
@@ -196,7 +236,10 @@ The needed fonts are listed in Table~\ref{tab:2}.
\multicolumn{1}{c}{\textbf{Language}} &
\multicolumn{1}{c}{\textbf{Fonts}} &
\multicolumn{1}{c}{\textbf{Where to get the font}}\\ \midrule
-Latin$^*$ & most European languages & Tex Gyre Termes, Tex~Gyre~Heros & \url{http://www.gust.org.pl/projects/e-foundry/tex-gyre}\rule{0pt}{11pt}\\
+Latin$^*$ & most European languages & TeX Gyre Termes, & \url{https://ctan.org/tex-archive/fonts/newtx/opentype}, \rule{0pt}{11pt}\\
+& & TeX~Gyre~Heros, & \url{https://ctan.org/tex-archive/fonts/tex-gyre/opentype}\\
+%\url{http://www.gust.org.pl/projects/e-foundry/tex-gyre} \\
+& & Inconsolatazi4 & \url{https://ctan.org/tex-archive/fonts/inconsolata/opentype} \\
Arabic\R & Arabic, Punjabi, Urdu, others & Amiri,\\ Noto~Sans~Arabic & \url{https://github.com/alif-type/amiri}\hfill\hbox{} \url{https://github.com/googlefonts/noto-fonts} \\
Bengali\R & Assamese, Bengali, others & Noto Serif Bengali,\\ Noto~Sans Bengali& \url{https://github.com/googlefonts/noto-fonts} \\
Cyrillic\R & Belarusian, Bulgarian, Macedonian, Russian, Serbian, Ukrainian, others & Noto Serif,\\ Noto~Sans, Noto~Sans~Mono & \url{https://github.com/googlefonts/noto-fonts} \\
@@ -215,7 +258,9 @@ Traditional\R\ Chinese & Traditional Mandarin, Cantonese & Noto~Serif~CJK~TC, No
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Using fontspec with asmeconf}
-When running \LLT, the \texttt{[fontspec]} option should be called, to load the appropriate fonts. With \FS, \texttt{babel} will use \texttt{.ldf} files (if available) and separate initialization files (\texttt{.ini}). If a language option is called for which there is no \texttt{.ldf} file, an error will result. However, such languages may still have an \texttt{.ini} that provides necessary information. For example, Chinese and Korean do not have \texttt{.ldf} files, but they do have \texttt{.ini} files. These languages can be accessed as described in Section~\ref{sec:6}.
+%When running \LLT, the \texttt{[fontspec]} option should be called, to load the appropriate fonts.
+When running \LLT, \texttt{fontspec} is loaded by default (as of Feb.\ 2024).
+With \FS, \texttt{babel} will use \texttt{.ldf} files (if available) and separate initialization files (\texttt{.ini}). If a language option is called for which there is no \texttt{.ldf} file, an error will result. However, such languages may still have an \texttt{.ini} that provides necessary information. For example, Chinese and Korean do not have \texttt{.ldf} files, but they do have \texttt{.ini} files. These languages can be accessed as described in Section~\ref{sec:6}.
Japanese typesetting is a little more complicated. When \texttt{[japanese]} is given as an option to the class, \AC\ calls the \texttt{luatexja-fontspec} package~\cite{lua-jp}, which is a specialized module for typesetting Japanese.
@@ -225,7 +270,7 @@ What about support for scripts not shown in Table~\ref{tab:2}? Macros from \tex
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{How to call a language\label{sec:6}}
-A language is called by \verb|\begin{selectlanguage}{<lang>}|, where \texttt{<lang>} is the lower-case name of the language.
+Call a language with \verb|\begin{selectlanguage}{<lang>}|, where \texttt{<lang>} is the lower-case name of the language.
For example, suppose that a Spanish language abstract is desired. The user puts \texttt{[spanish]} as a global option (this language has an \texttt{.ldf} file), and then writes:
\begin{quotation}
\noindent\hbox{}\verb|\begin{selectlanguage}{spanish}|\\
@@ -419,10 +464,12 @@ The main language of the document is English by default. This means that secti
To chose a different main language, give the option \texttt{[main=..]}, e.g., \texttt{[main=french]}. The standard caption and section names will follow \texttt{babel}'s dictionary for the language chosen. Users may additionally change ``Keywords'', ``Nomenclature'', ``Corresponding author'', and ``Joint first authors'' by renewing the commands \verb|\keywordname|, \verb|\nomname|, \verb|\CAwords|, and \verb|\JAwords|. Changes to the page footer are described in the \AC\ documentation~\cite{lienhard2021}. The pdf bookmark for ``Appendices'' may be changed by renewing \verb|\appendicesname|. (See the \texttt{babel} documentation \cite[\S 1.15]{bezos2020} if the dictionary for the main language lacks the correct word for, say, \verb|abstractname|).
-Note that some languages make characters active, which can have unexpected effects. For example, Spanish makes ``.'' an active character, which clashes with the default \texttt{dcolumn} decimal separator, \texttt{d\{n.m\}}~\cite{dpc}. \texttt{\textbackslash spanishdeactivate\{.\}} stops this behavior. Alternatively, the decimal separator can be changed to a comma by putting \texttt{\textbackslash newcolumntype\{d\}[1]\{D\{,\}\{,\}\{\#1}\}\} in the preamble.
-
I have not explored this usage in detail, and I would welcome comments from authors who attempt such conversions.
+Note that some languages make characters active, which can have unexpected effects. For example, Spanish makes ``.'' an active character, which clashes with the default decimal separator when using \texttt{dcolumn}'s \texttt{d\{n.m\}}~\cite{dpc}. The command \texttt{\textbackslash spanishdeactivate\{.\}} stops this behavior. As of August 2024, \texttt{asmeconf} defines a \texttt{dcolumn} type \texttt{,\{n.m\}} that uses a comma (not a period) as the decimal separator.
+%Alternatively, the decimal separator can be changed to a comma by putting \texttt{\textbackslash newcolumntype\{d\}[1]\{D\{,\}\{,\}\{\#1}\}\} in the preamble.
+
+
%%% CONCLUSIONS %%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Conclusion}
diff --git a/Master/texmf-dist/doc/latex/asmejour/README.md b/Master/texmf-dist/doc/latex/asmejour/README.md
index 69fe1e00fc9..612e0b027a6 100644
--- a/Master/texmf-dist/doc/latex/asmejour/README.md
+++ b/Master/texmf-dist/doc/latex/asmejour/README.md
@@ -1,7 +1,7 @@
#asmejour: A template for ASME journal papers#
- Version 1.22 dated 2024/02/06.
+ Version 1.23 dated 2024/07/24.
####Overview####
This class provides a template to format preprints in the style of journal papers published by the American Society of Mechanical Engineers.
@@ -67,6 +67,14 @@
####Change log####
+v1.23 (2024/07/24)
+ - Add class option for single-column formatting, \[singlecolumn\], as sometimes requested for review (thanks Lennart Hultgren)
+ - Change language sample from French to German, to avoid active characters (from Fourier to Pohlhausen)
+ - Reduce size of line number font
+ - Adjust code for \\appendix to better accommodate tagged pdf
+ - Correct bug in babel main language selection
+ - Miscellaneous code clean up and simplification
+
v1.22 (2024/02/06)
- The newtx package has dropped superiors option, so asmejour has dropped the \[superiors\] option and related code.
- Dropped legacy options \[lang, lang-second, lang-third\]
diff --git a/Master/texmf-dist/doc/latex/asmejour/asmejour-sample.bib b/Master/texmf-dist/doc/latex/asmejour/asmejour-sample.bib
index 3b715d3d059..08438fd94d9 100644
--- a/Master/texmf-dist/doc/latex/asmejour/asmejour-sample.bib
+++ b/Master/texmf-dist/doc/latex/asmejour/asmejour-sample.bib
@@ -1,6 +1,6 @@
%% Sample bibliography file for asmejour.bst and asmejour.cls
%%
-%% Revised: 06 February 2024
+%% Revised: 21 July 2024
%% Copyright John H. Lienhard, MIT
%% Offered under the MIT license: https://ctan.org/license/mit
@@ -350,9 +350,22 @@
title = {Th\'{e}orie Analytique de la Chaleur},
publisher = {Firmin Didot, P\`{e}re et Fils},
address = {Paris},
- url = {https://archive.org/details/analyticaltheory00fourrich},
+ url = {https://archive.org/details/analyticaltheory00fourrich},
}
+@article{pohlhausen1921,
+ author = {Pohlhausen, E.},
+ title = {Der {W}\"{a}rmeaustausch zwischen festen K\"{o}rpern und {F}l\"{u}ssigkeiten mit kleiner reibung und kleiner {W}\"{a}rmeleitung},
+ journal = {Zeitschrift f\"{u}r {A}ngewandte {M}athematik und {M}echanik},
+ volume = {1},
+ number = {2},
+ pages = {115--121},
+ doi = {10.1002/zamm.19210010205},
+ year = {1921},
+}
+%url = {https://onlinelibrary.wiley.com/doi/abs/10.1002/zamm.19210010205},
+
+
@techreport{reynolds1958,
author = {W. C. Reynolds and W. M. Kays and S. J. Kline},
title = {Heat transfer in the Incompressible Turbulent Boundary Layer. {I}---Constant Wall Temperature},
diff --git a/Master/texmf-dist/doc/latex/asmejour/asmejour-template.pdf b/Master/texmf-dist/doc/latex/asmejour/asmejour-template.pdf
index 6fc96310102..c15cc9f7977 100644
--- a/Master/texmf-dist/doc/latex/asmejour/asmejour-template.pdf
+++ b/Master/texmf-dist/doc/latex/asmejour/asmejour-template.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/asmejour/asmejour-template.tex b/Master/texmf-dist/doc/latex/asmejour/asmejour-template.tex
index 18ae24c0572..7e3f8a29306 100644
--- a/Master/texmf-dist/doc/latex/asmejour/asmejour-template.tex
+++ b/Master/texmf-dist/doc/latex/asmejour/asmejour-template.tex
@@ -3,7 +3,7 @@
%%
%% This file is asmejour-template.tex, a template to format papers in the style of ASME journal papers.
%%
-%% This file is version 1.22 dated 2024/02/06
+%% This file is version 1.23 dated 2024/07/24
%%
%% Author: John H. Lienhard V
%% Department of Mechanical Engineering
@@ -33,8 +33,10 @@
%%
%% * Option to omit all ASME text fields from the footer [nofoot].
%%
+%% * Option for single column formatting [singlecolumn].
+%%
%% * Options for PDF/A compliance. With pdfTeX, [pdf-a] will produce PDF/A-3u compliance with sRGB OutputIntent.
-%% * [pdfapart= 1 or 2 or 3] and [pdfaconformance= b or u] can enable levels 1b, 2b, 2u, and 3b.
+%% * [pdfapart= 1 or 2 or 3] and [pdfaconformance= b or u] will select other levels: 1b, 2b, 2u, and 3b.
%% *
%% * Recently, LaTeX (2021 and later) has integrated support for pdf-a, through the \DocumentMetadata{..}
%% * command. This approach works with both pdfTeX and luaLaTeX. The asmeconf class supports this new feature,
@@ -59,8 +61,8 @@
%% * [hyphenate] allow hyphenation, with pdfTeX only (normally, the typewriter font is not hyphenated)
%%
%% * Options for the babel package to support passages in other languages (such as a translated
-%% * abstract in an appendix), e.g. [french]. The main language will default to English
-%% * unless a different main language is selected, e.g. [main=spanish]. See Appendix C for details.
+%% * abstract in an appendix), e.g. [german]. The main language will default to English
+%% * unless a different main language is selected, e.g. [main=spanish]. See Appendix B for details.
%%
%% For details of the newtx and mathalfa packages, refer to their documentation (available at CTAN: http://ctan.org).
%%
@@ -82,16 +84,16 @@
%% see https://www.latex-project.org/news/latex2e-news/ltnews35.pdf
%% Uncomment the next lines and omit the option [pdf-a], if you are using an up-to-date LaTeX platform
-%\DocumentMetadata{%
-% pdfstandard=A-3b,% A-2b, A-2u, A-3b, or A-3u (don't use u options with LuaLaTeX)
-% pdfversion=1.7,
-% lang=en-US,
-%}
+\DocumentMetadata{%
+ pdfstandard=A-3u,% A-2b, A-2u, A-3b, or A-3u (don't use u options with LuaLaTeX)
+ pdfversion=1.7,
+ lang=en-US,
+}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Class options are described above.
-\documentclass[upint,varvw,barcolor=Goldenrod3,mathalfa=cal=euler,balance,hyphenate,french,pdf-a]{asmejour}% subscriptcorrection,
+\documentclass[nocopyright,upint,varvw,barcolor=Goldenrod3,mathalfa=cal=euler,balance,hyphenate,german]{asmejour}% subscriptcorrection,french
%%%% pdf metadata %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -121,11 +123,14 @@
% Use title case (upper and lower case letters)
% Note usage below for corresponding author.
-\SetAuthorBlock{Author Name[s]}{Department of Mechanical Engineering,\\
- Institution or Company Name,\\
- Street address,\\
- City, State, Country\\
- email: xxx@yyy.zzz}
+\SetAuthorBlock{John H.\ Lienhard\CorrespondingAuthor}{%
+ Fellow ASME\\
+ Rohsenow Kendall Heat Transfer Laboratory,\\
+ Department of Mechanical Engineering,\\
+ Massachusetts Institute of Technology,\\
+ Cambridge, MA 02139 USA\\
+ email: lienhard@mit.edu
+}
% To label one or more corresponding authors put "Name\CorrespondingAuthor". No space after "Name".
% An optional argument can be added if email is not in address block as
@@ -133,14 +138,12 @@
% Can also include multiple emails and use the command more than once for multiple corresponding authors,
% "Name\CorrespondingAuthor{write@to.him, write@to.her}"
-\SetAuthorBlock{John H.\ Lienhard V\CorrespondingAuthor}{%
-Fellow ASME\\
-Rohsenow Kendall Heat Transfer Laboratory,\\
-Department of Mechanical Engineering,\\
-Massachusetts Institute of Technology,\\
-Cambridge, MA 02139 USA\\
-email: lienhard@mit.edu
-}
+\SetAuthorBlock{Author Name[s]}{Department of Mechanical Engineering,\\
+ Institution or Company Name,\\
+ Street address,\\
+ City, State, Country\\
+ email: xxx@yyy.zzz
+}
%%% Change to your paper title. Can insert line breaks if you wish (otherwise breaks are selected automatically).
\title{Preprint Template for ASME\\ Journal Papers: asmejour.cls}
@@ -164,6 +167,7 @@ This paper is an example and {\upshape\LaTeX} template for the {\upshape\texttt{
\maketitle %% This command creates the author/title/abstract block. Essential!
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%% End of fields to be completed. Now write! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -227,7 +231,7 @@ Section, subsection, and subsubsection headings should be in title case (first l
%% captions go below figures
\begin{figure}
-\centering\includegraphics[width=\linewidth]{sample-figure-1.pdf}
+\centering\includegraphics[width=\linewidth,alt={Linearization errors}]{sample-figure-1.pdf}
\caption{Caption with math, eqn.~\eqref{eqn:1}: $\Delta T/T_m$ vs.\ $\Delta T/T_1$~\cite{lienhard2019}\label{fig:1}}
\end{figure}
@@ -466,8 +470,12 @@ As of June 2022, the \LaTeX 3 team has added native support for PDF/A in the \La
\subsection{Typewriter Font Options} This font is the sans-serif, monospaced font \texttt{inconsolata}. By default, the word spacing is variable, but option \texttt{[mono]} ends this behavior. A slashed zero is the default; option \texttt{[var0]} removes the slash. Option \texttt{[hyphenate]} enables hyphenation of the typewriter font when running \hologo{pdfTeX}.
+\subsection{Single column layout} The option \texttt{[singlecolumn]} switches from two-column to single-column layout.
%%%%%%%%%%%%%%% begin two column table %%%%%%%%%%%%%%%%%%
+%
+% note: the fourth column could be a dcolumn instead of using \makebox, with d{1.4} replacing c column.
+%
\begin{table*}[t]
\caption{A table spanning two columns}\label{tab:4}%
\centering{%
@@ -478,7 +486,8 @@ As of June 2022, the \LaTeX 3 team has added native support for PDF/A in the \La
\multicolumn{1}{c!{\hspace*{3.em}}}{$\textrm{erfc}(x)$} &
\multicolumn{1}{c}{$x$} &
\multicolumn{1}{c}{$\textrm{erf}(x)$} &
-\multicolumn{1}{c@{\hspace*{1.5em}}}{$\textrm{erfc}(x)$} \\ \midrule
+\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 \\
@@ -554,7 +563,7 @@ Acknowledge individuals, institutions, or companies that supported the authors i
\entry{b}{bulk value}
\entry{$\infty$}{free stream value}
-\end{nomenclature}
+\end{nomenclature}
%%%%%%%%%%%%%%% APPENDICES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -571,31 +580,30 @@ Acknowledge individuals, institutions, or companies that supported the authors i
This text is just for illustration. The radiation fractional function may be written in terms of the incomplete zeta function for convenience:
\begin{align}
-f(\lambda T) = {}& \frac{1}{\sigma T^4} \int_0^\lambda\frac{2\pi h c_o^2}{\lambda^5 \left[ \exp (h c_o/k_B T \lambda) - 1\right] } \, d\lambda \\
- = {}& \frac{1}{\sigma T^4}\frac{2\pi k_B^4 T^4}{h^3c_o^2}\int^\infty_{c_2/\lambda T}\frac{t^3}{e^t -1}\, dt\label{eqn:zeta}
+f(\lambda T) &= \frac{1}{\sigma T^4} \int_0^\lambda\frac{2\pi h c_o^2}{\lambda^5 \left[ \exp (h c_o/k_B T \lambda) - 1\right] } \, d\lambda \\
+ &= \frac{1}{\sigma T^4}\frac{2\pi k_B^4 T^4}{h^3c_o^2}\int^\infty_{c_2/\lambda T}\frac{t^3}{e^t -1}\, dt\label{eqn:zeta}
\end{align}
When $\lambda T \rightarrow \infty$, $f = 1$ and the last equation yields the well-known result
\begin{equation}
- {\sigma T^4} =\frac{2\pi k_B^4 T^4}{h^3c_o^2} \underbrace{\int_0^\infty \frac{t^3}{e^t - 1} \, dt}_{\equiv\mspace{2mu} \zetaup(4)\Gamma(4)}
+\sigma T^4 =\frac{2\pi k_B^4 T^4}{h^3c_o^2} \underbrace{\int_0^\infty \frac{t^3}{e^t - 1} \, dt}_{\equiv\mspace{2mu} \zetaup(4)\Gamma(4)}
\end{equation}
where the Gamma function $\Gamma(4) = 3!$ and the Riemann zeta function, $\zetaup(4)$, has the indicated integral representation \cite[\S13.12]{ww1927}. A classical result due to Euler \cite{euler1740} gives $\zetaup(4) = \pi^4/90$ (see also \cite[\S167]{euler1748}), from which we recover the usual definition of the Stefan-Boltzmann constant, $\sigma$.
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\section{Language Support}
+\section{Language Support\label{app:language}}
ASME publishes in English, but the \texttt{babel} package is loaded for users who may wish to include other languages.
For example, an author might wish to include an appendix that provides the abstract in another language.
When more than one language option is included in \verb|\documentclass[..]{asmejour}|, English will be
assumed to be the main language of the document. (To choose a different main language, set \texttt{[main=..]}).
-If no language options are given, the package defaults to English. As an example, a passage in French is
-shown in \selectlanguage{french}\appendixname~\ref{app:fourier}\selectlanguage{english}.
+If no language options are given, the package defaults to English. As an example, a passage in German is
+shown in \selectlanguage{german}\appendixname~\ref{app:pohlhausen}\selectlanguage{english}.
The standard caption and section names will follow \texttt{babel}'s dictionary for primary languages other than English. Users may additionally change ``Keywords'', ``Nomenclature'', and ``Corresponding author'' by renewing the commands \verb|\keywordname|, \verb|\nomname|, and \verb|\CAwords|. Changes to the page footer were described in Sec.~\ref{sec:footer}. The pdf bookmark for ``Appendices'' by be changed by renewing \verb|\appendicesname|.
The font encoding is set to T1 and utf-8 input is supported:
-%% If you have trouble with the next line (or the French text that follows), your file may not be saved in utf-8 format. You can delete these lines to resolve the issue.
+%% If you have trouble with the next line, your file may not be saved in utf-8 format. You can delete these lines to resolve the issue.
\typeout{If you have trouble with the next line, your file may not be saved in utf-8 format. You can delete that line to resolve the issue.}
\ifluatex\typeout{Under LuaLaTeX, some of these accents must be obtained as escaped characters, with \=a, \c{e}, \l, \.o, \oe, \v{z}, \'z, etc.}\fi
Ã Ã¡Ã¢Ã¤Ã¦Ã£Ã¥Ä Ã¨Ã©Ä™Ã«ÃªÄ“Ä— îïíīįì ôöòóœøÅõ ûüùúū Ã§Ä‡Ä Å‚ ñń ßśš ÿ žźż
@@ -604,18 +612,13 @@ No effort has been made to support customization of language-specific fonts (som
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\selectlanguage{french}
-\section{Discours Préliminaire de Fourier}\label{app:fourier}
-
-Les causes primordiales ne nous sont point con­nues; mais elles sont assujetties à des lois simples et constantes, que l'on peut découvrir par l'obser­vation, et dont l'étude est l'objet de la philosophie naturelle.
-
-La chale ur pénètre, comme la gravité, toutes les substances de l'univers, ses rayons occupent toutes les parties de l'espace. Le but de notre ouvrage est d'exposer les lois mathématiques que suit cet élé­ment. Cette théorie formera désormais une des branches les plus importantes de la physique gé­nérale~\cite{fourier1822}.
+\selectlanguage{german}
+\section{Der Wärmeaustausch zwischen festen Körpern und Flüssigkeiten mit kleiner reibung und kleiner Wärmeleitung (von E. Pohlhausen)\label{app:pohlhausen}}
+In einer strömenden Flussigkeit sind Wärmeleitung und Wärmekonvektion Vorgänge, die mit der inneren Reibung (oder Impulsleitung) und mit der Impulskonvektion große Aehnlichkeit besitzen. Mathematisch findet dies seinen Ausdruck in dem gleichartigen Bau der Differentialgleichungen, die einerseits für die Temperatur und anderseits für den Geschwindigkeitsvektor in der Flüssigkeit bestehen. Man kann daraus auf eine Beziehung
+zwischen dem Wärmeaustanch und dem Reibungswiderstand schließen, die eine strömende Flüssigkeit an einem festen Körper hervorrufen. Dies ist zuerst von Prandtl ausgesprochen und durchgeführt worden, und zwar für turbulente Vorgänge, unter der vereinfachenden Annahme von Wärmequellen und -senken im Innern der Flüssigkeit~\cite{pohlhausen1921}.
\selectlanguage{english}
-% When you drop the [french] option, delete your .aux file as well, since [french] sets ":" as an active character.
-
-
%%%%%%%%%%%%% BIBLIOGRAPHY %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\nocite{*} %% <=== Delete this line - unless you wish to typeset the entire contents of your .bib file.
diff --git a/Master/texmf-dist/doc/latex/asmejour/asmewide_example/asmejour-wide-equation-examples.pdf b/Master/texmf-dist/doc/latex/asmejour/asmewide_example/asmejour-wide-equation-examples.pdf
index 5b93ad2cf97..c3b0bc535e1 100644
--- a/Master/texmf-dist/doc/latex/asmejour/asmewide_example/asmejour-wide-equation-examples.pdf
+++ b/Master/texmf-dist/doc/latex/asmejour/asmewide_example/asmejour-wide-equation-examples.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/asmejour/asmewide_example/asmejour-wide-equation-examples.tex b/Master/texmf-dist/doc/latex/asmejour/asmewide_example/asmejour-wide-equation-examples.tex
index 69b98af0b29..5a506330aa4 100644
--- a/Master/texmf-dist/doc/latex/asmejour/asmewide_example/asmejour-wide-equation-examples.tex
+++ b/Master/texmf-dist/doc/latex/asmejour/asmewide_example/asmejour-wide-equation-examples.tex
@@ -1,6 +1,6 @@
%% Examples of a widetext macro for setting wide equations in the asmejour class.
%%
-%% Copyright (c) 2022 John H. Lienhard. Use under the MIT license: https://ctan.org/license/mit
+%% Copyright (c) 2024 John H. Lienhard. Use under the MIT license: https://ctan.org/license/mit
%%
%%
%% USAGE: * \begin{widetext} ...wide material here... \end{widetext}
@@ -15,8 +15,8 @@
\documentclass[nocopyright,nolists,pdf-a]{asmejour}
%% This file's version and date are:
- \def\AJwidetextversion{1.01}
- \def\AJverdate{October 22, 2023}
+ \def\AJwidetextversion{1.02}
+ \def\AJverdate{July 24, 2024}
%
\usepackage{asmewide}
\usepackage{lipsum}% Latin filler text (lipsum generates a message about 'unused global options' - this can be ignored)
@@ -81,6 +81,8 @@ address = {New York},
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{document}
+\PreprintString{PREPRINT}
+
\SetAuthorBlock{John H.\ Lienhard V}{%
Fellow of ASME \\
Rohsenow Kendall Heat Transfer Laboratory, \\
diff --git a/Master/texmf-dist/tex/latex/beamertheme-rainbow/beamertheme-rainbow-doc-settings.sty b/Master/texmf-dist/doc/latex/beamertheme-rainbow/beamertheme-rainbow-doc-settings.sty
index 777cedba6ef..777cedba6ef 100644
--- a/Master/texmf-dist/tex/latex/beamertheme-rainbow/beamertheme-rainbow-doc-settings.sty
+++ b/Master/texmf-dist/doc/latex/beamertheme-rainbow/beamertheme-rainbow-doc-settings.sty
diff --git a/Master/texmf-dist/doc/latex/bib2qr/README.md b/Master/texmf-dist/doc/latex/bib2qr/README.md
new file mode 100644
index 00000000000..9f7bb900a11
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/bib2qr/README.md
@@ -0,0 +1,88 @@
+# bib2qr
+
+[![License](https://img.shields.io/ctan/l/bib2qr?color=blue)](https://www.latex-project.org/lppl/lppl-1-3c.txt)
+[![Latest release](https://img.shields.io/gitea/v/release/Cs137/bib2qr?gitea_url=https%3A%2F%2Fcodeberg.org%2F)](https://codeberg.org/Cs137/bib2qr/releases/latest)
+[![CTAN](https://img.shields.io/ctan/v/bib2qr.svg)](https://ctan.org/pkg/bib2qr)
+
+A LaTeX package for citing BibTeX entries with QR codes.
+
+The `bib2qr` package provides functionality to cite BibTeX entries with QR codes
+for easy sharing and referencing. The target of the QR code is the entry's DOI,
+or URL if no DOI exists. A citation generated via `\qrfullcite`, which is part
+of `bib2qr`, might look as follows:
+
+[![Example output generated with `\qrfullcite`](https://codeberg.org/Cs137/bib2qr/media/branch/main/example/qrfullcite_example.png "Example output generated with qrfullcite")](https://codeberg.org/Cs137/bib2qr/media/branch/main/example/qrfullcite_example.png)
+
+
+## Installation
+
+Skip this section, if `bib2qr` is already provided in your TeX distribution.
+You should be able to install it [from the CTAN](https://www.ctan.org/pkg/bib2qr)
+via your distribution's utility (e.g. the TeX Live Utility).
+
+### Manual installation
+
+You can get the package's source code from the
+[project repository on Codeberg](https://codeberg.org/Cs137/bib2qr).
+The repository contains a build script, which allows you to build the required
+files for the `bib2qr` package and copy them into your _TeX Directory Structure_
+(TDS) using `l3build`. Ensure that `l3build` is installed on your system and run
+it from the repository's root directory as follows:
+
+```bash
+l3build install --full
+```
+
+The `--full` option ensures that all necessary files are built and installed.
+
+If you do not want to install the package into your TDS, but use it in a
+particular LaTeX project, follow the steps listed below.
+
+1. unpack `bib2qr.sty` from the `bib2qr.dtx` file
+ - using `l3build` and the `build.lua` script: `l3build unpack`, __or__
+ - directly via the installer file: `pdflatex bib2qr.ins`
+2. copy the extracted `bib2qr.sty` file into the same directory as your LaTeX sources.
+
+
+## Usage
+
+Please consult the [package documentation](http://mirrors.ctan.org/macros/latex/contrib/bib2qr/bib2qr.pdf)
+for detailed usage information.
+
+If you have any questions or need assistance, feel free to
+[open an issue on the repository](https://codeberg.org/Cs137/bib2qr/issues).
+
+
+## Changes
+
+All notable changes to this project are documented in the file
+[`CHANGELOG.md`](https://codeberg.org/Cs137/bib2qr/src/branch/main/CHANGELOG.md).
+
+
+## Contributing
+
+Contributions to the `bib2qr` package are very welcomed. Feel free to submit a
+pull request, if you would like to contribute to the project. In case you are
+unfamiliar with the process, consult the
+[forgejo documentation](https://forgejo.org/docs/latest/user/pull-requests-and-git-flow/)
+and follow the steps using this repository instead of the `example` repository.
+
+Create your [pull request (PR)](https://codeberg.org/Cs137/bib2qr/pulls) to
+inform that you start working on a contribution. Provide a clear description
+of your envisaged changes and the motivation behind them, prefix the PR's title
+with ``WIP: `` until your changes are finalised.
+
+All kind of contributions are appreciated, whether they are
+bug fixes, new features, or improvements to the documentation.
+
+
+### Contributors
+
+- [Christian Schreinemachers](https://codeberg.org/Cs137)
+- [Markus Kohm](https://codeberg.org/komascript)
+
+
+---
+
+This package was created and is maintained by Christian Schreinemachers, (C) 2024.
+
diff --git a/Master/texmf-dist/doc/latex/bib2qr/bib2qr.pdf b/Master/texmf-dist/doc/latex/bib2qr/bib2qr.pdf
new file mode 100644
index 00000000000..fb3800eadf9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/bib2qr/bib2qr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf
index a833b32d264..43c1b531630 100644
--- a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex
index 142cfe3d76d..a089f090f75 100644
--- a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex
@@ -2,7 +2,7 @@
%% biblatex-ieee --- A biblatex implementation of the IEEE
%% bibliography style
%% Maintained by Joseph Wright
-%% E-mail: joseph.wright@morningstar2.co.uk
+%% E-mail: joseph@texdev.net
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
@@ -21,11 +21,11 @@
\addbibresource{biblatex-ieee.bib}
\author{Joseph Wright\thanks{E-mail:
- \href{mailto:joseph.wright@morningstar2.co.uk}
- {\texttt{joseph.wright@morningstar2.co.uk}}}}
+ \href{mailto:joseph@texdev.net}
+ {\texttt{joseph@texdev.net}}}}
\title{The \pkg{ieee-alphabetic} bibliography style for \pkg{biblatex}%
- \footnote{This file describes v1.3f, last revised 2021/12/06.}}
-\date{Released 2021/12/06}
+ \footnote{This file describes v1.3g, last revised 2024/08/14.}}
+\date{Released 2024/08/14}
\providecommand*{\pkg}[1]{\textsf{#1}}
@@ -55,8 +55,8 @@ of example citations.
\end{document}
%%
-%% Copyright (C) 2011-2013,2015-2021 by
-%% Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% Copyright (C) 2011-2013,2015-2021,2024 by
+%% Joseph Wright <joseph@texdev.net>
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.bib b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.bib
index 733dac91e15..c002a48e2cb 100644
--- a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.bib
@@ -2,7 +2,7 @@
%% biblatex-ieee --- A biblatex implementation of the IEEE
%% bibliography style
%% Maintained by Joseph Wright
-%% E-mail: joseph.wright at morningstar2.co.uk
+%% E-mail: joseph@texdev.net
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
@@ -168,7 +168,7 @@
title = "Modified {TCP} Congestion Avoidance Algorithm",
howpublished = "end2end-interest mailing list",
url = "ftp://ftp.isi.edu/end2end/end2end-interest-1990.mail",
- year = "1990-04"
+ urldate = "1990-04"
}
@@ -249,7 +249,7 @@
institution = "Dept. Elect. Eng., Technion",
location = "Haifa, Israel",
url = "ftp://ftp.technion.ac.il/pub/supported/ee/Network/lor.mopq98.ps",
- year = "1998-07"
+ urldate = "1998-07"
}
@book{IEEEexample:book,
@@ -350,7 +350,7 @@
title = "Cache Array Routing Protocol v1.1",
howpublished = "Internet draft",
url = "http://ds1.internic.net/internet-drafts/draft-vinod-carp-v1-03.txt",
- year = "1998"
+ urldate = "1998"
}
@inproceedings{IEEEexample:confwithpaper,
@@ -386,8 +386,8 @@
}
%%
-%% Copyright (C) 2011-2013,2015-2020 by
-%% Joseph Wright <joseph.wright at morningstar2.co.uk>
+%% Copyright (C) 2011-2013,2015-2020,2024 by
+%% Joseph Wright <joseph@texev.net>
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.pdf b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.pdf
index c5f85504c6a..a16e292683e 100644
--- a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.tex b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.tex
index 734250debfa..0a6ec934e41 100644
--- a/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-ieee/biblatex-ieee.tex
@@ -2,7 +2,7 @@
%% biblatex-ieee --- A biblatex implementation of the IEEE
%% bibliography style
%% Maintained by Joseph Wright
-%% E-mail: joseph.wright@morningstar2.co.uk
+%% E-mail: joseph@texdev.net
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
@@ -21,11 +21,11 @@
\addbibresource{biblatex-ieee.bib}
\author{Joseph Wright\thanks{E-mail:
- \href{mailto:joseph.wright@morningstar2.co.uk}
- {\texttt{joseph.wright@morningstar2.co.uk}}}}
+ \href{mailto:joseph@texdev.net}
+ {\texttt{joseph@texdev.net}}}}
\title{The \pkg{ieee} bibliography style for \pkg{biblatex}%
- \footnote{This file describes v1.3f, last revised 2021/12/06.}}
-\date{Released 2021/12/06}
+ \footnote{This file describes v1.3g, last revised 2024/08/14.}}
+\date{Released 2024/08/14}
\providecommand*{\opt}[1]{\texttt{#1}}
\providecommand*{\pkg}[1]{\textsf{#1}}
@@ -61,6 +61,19 @@ The style adds the \opt{dashed} option to those recognised: as-standard,
this is activated. The option works in the same way as that from the
core \pkg{biblatex} style \pkg{author-year}.
+As-standard, citations are compressed. If you do no wish to have compressed
+citations, add
+\begin{verbatim}
+\DeclareCiteCommand{\cite}
+ {\bibopenbracket\usebibmacro{prenote}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{cite}}
+ {\multicitedelim}
+ {\usebibmacro{postnote}\bibclosebracket}
+\renewcommand*\multicitedelim{\bibclosebracket\addcomma \space\bibopenbracket}
+\end{verbatim}
+after loading \pkg{biblatex}.
+
The appearance of URLs in the bibliography is set by the mechanism of the
\textsf{url} package. Thus to print URLs in the current roman font,
place the instruction
@@ -73,7 +86,9 @@ immediately before
\end{verbatim}
Control of the exact information in dates is best achieved by using the
-\cs{AtEveryCite} command with appropriate data manipulation.
+\cs{AtEveryCite} command with appropriate data manipulation. In particular,
+if your database includes full dates, you will likely want to drop these
+for most periodicals using \cs{clearfield}
Also include in the bundle is a style using alphabetic labels, but otherwise
following the guidelines of the \textsc{ieee}. This style should be loaded
@@ -88,8 +103,8 @@ Suggestions for improvement and bug reports can be logged in the package
issue database, found at
\url{https://github.com/josephwright/biblatex-ieee/issues/}, or can
be sent by e-mail to
-\href{mailto:joseph.wright@morningstar2.co.uk}
- {\texttt{joseph.wright@morningstar2.co.uk}}.
+\href{mailto:joseph@texdev.net}
+ {\texttt{joseph@texdev.net}}.
\nocite{*}
\printbibliography
@@ -149,14 +164,16 @@ be sent by e-mail to
\changes{v1.3f}{2021/03/30}{Use \texttt{false} as the default for \texttt{dashed} setting}
\changes{v1.3f}{2021/04/12}{Fix brackets in \cs{supercite}}
\changes{v1.3f}{2021/12/01}{Adjust printing of series for books}
+\changes{v1.3g}{2024/08/14}{Print separator between journal title and subtitle}
+\changes{v1.3g}{2024/08/14}{Correct formatting of URL for online entries}
\PrintChanges
\end{document}
%%
-%% Copyright (C) 2011-2013,2015-2021 by
-%% Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% Copyright (C) 2011-2013,2015-2021,2024 by
+%% Joseph Wright <joseph@texdev.net>
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/doc/latex/biblatex-phys/biblatex-phys.bib b/Master/texmf-dist/doc/latex/biblatex-phys/biblatex-phys.bib
index 3f6af13bdd8..6f0f9b5281c 100644
--- a/Master/texmf-dist/doc/latex/biblatex-phys/biblatex-phys.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-phys/biblatex-phys.bib
@@ -71,20 +71,20 @@
issue = {25},
pages = {254504},
year = {2008},
- month = {Jun},
+ month = jun,
publisher = {American Physical Society},
doi = {10.1103/PhysRevLett.100.254504},
}
@Book{Augustine1995,
hyphenation = {american},
- author = {Augustine, Robert L.},
+ author = {Augustine, Robert L.},
title = {Heterogeneous Catalysis for the Synthetic
Chemist},
shorttitle = {Heterogeneous catalysis},
publisher = {Marcel Dekker},
location = {New York},
- date = {1995},
+ date = {1995},
}
@Article{Booth1962,
diff --git a/Master/texmf-dist/doc/latex/biblatex-phys/biblatex-phys.pdf b/Master/texmf-dist/doc/latex/biblatex-phys/biblatex-phys.pdf
index 16758e75a70..e7e9e05d584 100644
--- a/Master/texmf-dist/doc/latex/biblatex-phys/biblatex-phys.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-phys/biblatex-phys.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-phys/biblatex-phys.tex b/Master/texmf-dist/doc/latex/biblatex-phys/biblatex-phys.tex
index 89550aed256..7224b722afc 100644
--- a/Master/texmf-dist/doc/latex/biblatex-phys/biblatex-phys.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-phys/biblatex-phys.tex
@@ -2,7 +2,7 @@
%% biblatex-phys --- A biblatex implementation of the AIP and APS
%% bibliography style
%% Maintained by Joseph Wright
-%% E-mail: joseph.wright@morningstar2.co.uk
+%% E-mail: joseph@texdev.net
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
@@ -21,12 +21,12 @@
\addbibresource{biblatex-phys.bib}
\author{Joseph Wright\thanks{E-mail:
- \href{mailto:joseph.wright@morningstar2.co.uk}
- {\texttt{joseph.wright@morningstar2.co.uk}}}}
+ \href{mailto:joseph@texdev.net}
+ {\texttt{joseph@texdev.net}}}}
\title{\pkg{biblatex-phys} -- A \pkg{biblatex} implementation of the
\textsc{aip} and \textsc{aps} bibliography style%
- \footnote{This file describes v1.1b, last revised 2019/12/03.}}
-\date{Released 2019/12/03}
+ \footnote{This file describes v1.1c, last revised 2024/07/26.}}
+\date{Released 2024/07/26}
\providecommand*{\opt}[1]{\texttt{#1}}
\providecommand*{\pkg}[1]{\textsf{#1}}
@@ -49,12 +49,12 @@ in the usual way
\end{verbatim}
Load-time options are provided to deal with the small number of variations
between the \textsc{aip} and \textsc{aps} styles.
-The References section of this document demonstrates the format
+The References section of this document demonstrates the format
generated by the package using the \texttt{biblatex-phys.bib} database
of example citations.
The styles use the standard \pkg{biblatex} database requirements. This means
-that a database designed for traditional \pkg{biblatex} use may need some
+that a database designed for traditional \BibTeX{} use may need some
editing for optimal output. The accompanying example database
\texttt{biblatex-phys.bib} shows examples of all of the supported entry types
with common fields filled in.
@@ -69,13 +69,13 @@ seen between the \textsc{aip} and \textsc{aps} styles.
\DescribeOption{eprint}
\DescribeOption{isbn}
\DescribeOption{url}
-The standard style options \opt{doi}, \opt{eprint} \opt{isbn} and
-\opt{eprint}, as described in the \pkg{biblatex} manual. However, these
+The standard style options \opt{doi}, \opt{eprint}, \opt{isbn} and
+\opt{url}, as described in the \pkg{biblatex} manual. However, these
options are turned off as standard by the \pkg{phys} style. This reflects the
fact that these entries may be present in reference databases but are not
generally included in published bibliographies. Note that \textsc{doi} values
-are printed for journal articles with no pages given, even if the \opt{doi}
-option is \opt{false}.
+are printed for journal articles with no pages or eid given, even if the
+\opt{doi} option is \opt{false}.
\DescribeOption{subentry}
In common with the standard \pkg{biblatex} numeric styles, all of the styles
@@ -93,7 +93,7 @@ patents, which are treated in the same way.)
\DescribeOption{biblabel}
The format of the numbers used in the bibliography (the \enquote{bibliography
-label}) varies. he \opt{biblabel} option allows the user to easily set the
+label}) varies. The \opt{biblabel} option allows the user to easily set the
format used. This option takes a values \opt{superscript} (the standard
setting) and \opt{brackets}.
@@ -146,7 +146,7 @@ command may be used to alter this, either for the whole document or only
for the bibliography, for example by using
\begin{verbatim}
\AtBeginBibliography{%
- \urlstyle{rm}%
+ \urlstyle{same}%
}
\end{verbatim}
@@ -164,8 +164,8 @@ Suggestions for improvement and bug reports can be logged in the package issue
database, found at
\url{https://github.com/josephwright/biblatex-phys/issues}, or can
be sent by e-mail to
-\href{mailto:joseph.wright@morningstar2.co.uk}
- {\texttt{joseph.wright@morningstar2.co.uk}}.
+\href{mailto:joseph@texdev.net}
+ {\texttt{joseph@texdev.net}}.
\nocite{*}
@@ -208,8 +208,8 @@ be sent by e-mail to
\end{document}
%%
-%% Copyright (C) 2012-2014,2016,2018,2019 by
-%% Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% Copyright (C) 2012-2014,2016,2018-2020,2022,2024 by
+%% Joseph Wright <joseph@texdev.net>
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/doc/latex/biblatex-publist/README b/Master/texmf-dist/doc/latex/biblatex-publist/README
index aed0f347740..f452a57a9f0 100644
--- a/Master/texmf-dist/doc/latex/biblatex-publist/README
+++ b/Master/texmf-dist/doc/latex/biblatex-publist/README
@@ -46,6 +46,11 @@ 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.
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 ecc06e956e3..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 5e07d272c03..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.11, 2024/07/02}
+\date{Version 2.12, 2024/07/16}
\maketitle
\begin{abstract}
@@ -411,9 +411,20 @@ since otherwise they would be too ambiguous. However, for locally numbered lists
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}
-and the \textsf{hyperref} package being loaded (the section reference of the starred command, however, is hyperlinked in
-this case).
+(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).
@@ -763,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:
+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[impactfactor] the expression \enquote{impact factor}.
-\item[openaccess:true] the expression \enquote{OpenAccess}.
-\item[openaccess:gold] the phrase \enquote{OpenAccess (gold)}.
-\item[{openaccess:green}] the phrase \enquote{OpenAccess (green)}.
-\item[{parttranslationof}] the phrase \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[{peerreview:sb}] the phrase \enquote{single blind peer review}.
-\item[{peerreview:db}] the phrase \enquote{double blind peer review}.
-\item[{peerreview:op}] the phrase \enquote{open peer review}.
-\item[{peerreview:co}] the phrase \enquote{collaborative peer review}.
-\item[{peerreview:cc}] the phrase \enquote{cascading peer review}.
-\item[{peerreview:tp}] the phrase \enquote{third-party peer review}.
-\item[{peerreview:pp}] the phrase \enquote{post-publication peer review}.
-\item[{peerreview:no}] the phrase \enquote{no peer review}.
+\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}).
+ co-authors by default (i.\,e., with \joption{plauthorhandling=omit}) (short and verbose forms identical).
\end{description}
-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.}
+%
+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}
+\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}
@@ -1027,9 +1059,18 @@ 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 Add \jcsmacro{citesecitem} and \jcsmacro{citesecitem*} commands
+ (see sec.~\ref{sec:citeitems}).
\item Support multiple sections in \jcsmacro{GetSectionCount}.
\end{itemize}
diff --git a/Master/texmf-dist/doc/latex/bxjatoucs/LICENSE b/Master/texmf-dist/doc/latex/bxjatoucs/LICENSE
index 534324b7566..aff6b30c936 100644
--- a/Master/texmf-dist/doc/latex/bxjatoucs/LICENSE
+++ b/Master/texmf-dist/doc/latex/bxjatoucs/LICENSE
@@ -1,6 +1,6 @@
The MIT License
-Copyright (c) 2019 Takayuki YATO (aka. "ZR")
+Copyright (c) 2019-2024 Takayuki YATO (aka. "ZR")
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/Master/texmf-dist/doc/latex/bxjatoucs/README.md b/Master/texmf-dist/doc/latex/bxjatoucs/README.md
index 6e2c9bb7bc9..cc3dd0a7a5b 100644
--- a/Master/texmf-dist/doc/latex/bxjatoucs/README.md
+++ b/Master/texmf-dist/doc/latex/bxjatoucs/README.md
@@ -69,6 +69,16 @@ Additional variants:
the argument is assumed to be a valid decimal string.
- `\bxjaFastCidToUcsHex{<value>}`: same for `\bxjaCidToUcsHex`.
+### Conversions from Unicode
+
+Starting from v0.3, macros for some conversions *from* Unicode (rather
+than conversions *to* Unicode) are available. The rule of input/output
+is the same as the existing macros.
+
+ - `\bxjaUcsToJis{<value>}`: converts to a jis scalar value.
+ - `\bxjaUcsToEuc{<value>}`: converts to an euc scalar value.
+ - `\bxjaUcsToSjis{<value>}`: converts to a sjis scalar value.
+
## Example
The following `\message` lines all display `23551:21496`.
@@ -89,6 +99,10 @@ The following `\message` lines all display `5BFF:53F8`.
Revision History
----------------
+ * Version 0.3a ‹2024/07/22›
+ - Renamed TFM 'bxjatoucs-fromjis' to 'bxjatoucs-tojis'.
+ * Version 0.3 ‹2024/07/20›
+ - Added “Unicode to JISâ€type conversions.
* Version 0.2 ‹2019/10/20›
- The first public version.
diff --git a/Master/texmf-dist/doc/latex/bxjscls/README-ja.md b/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
index 1b91f19f951..4d7450a19ce 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
+++ b/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
@@ -111,6 +111,9 @@ XeLaTeX / LuaLaTeX ã®ä¸Šã§ã‚‚日本語処ç†ãƒ‘ッケージã¨é€£æºã—ã¦ä½¿ç
更新履歴
--------
+ * Version 2.9c 〈2024/07/19〉
+ - bm パッケージã¨ã®ä½µç”¨ã§èµ·ã“ã‚‹ä¸å…·åˆã‚’ã»ã¼è§£æ¶ˆã—ãŸã€‚
+ - hyperref 使用時ã®ä¸å…·åˆã‚’修正ã—ãŸã€‚
* Version 2.9b 〈2024/01/22〉
- bm パッケージã¨ã®ä½µç”¨ã§èµ·ã“ã‚‹ä¸å…·åˆã‚’回é¿ã—ãŸã€‚
* Version 2.9a 〈2023/08/02〉
diff --git a/Master/texmf-dist/doc/latex/bxjscls/README.md b/Master/texmf-dist/doc/latex/bxjscls/README.md
index b42534e38c2..1f10ac7ff7f 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/README.md
+++ b/Master/texmf-dist/doc/latex/bxjscls/README.md
@@ -102,6 +102,7 @@ This package is distributed under the BSD 2-Clause License.
Revision History
----------------
+ * Version 2.9c 〈2024/07/19〉
* Version 2.9b 〈2024/01/22〉
* Version 2.9a 〈2023/08/02〉
* Version 2.9 〈2023/07/17〉
diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
index 29812903d4b..d1b16869b4a 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
+++ b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex
index aee9ffd06b6..2d69227170e 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex
+++ b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex
@@ -12,8 +12,8 @@
\bxtexlogoimport{*}
\usepackage{shortvrb}
\MakeShortVerb{\|}
-\newcommand{\PkgVersion}{2.9b}
-\newcommand{\PkgDate}{2024/01/22}
+\newcommand{\PkgVersion}{2.9c}
+\newcommand{\PkgDate}{2024/07/19}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\mbox{}\nobr#1\nobr\mbox{}$\rangle$}
\newcommand{\Note}{\par\noindent ※}
diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf b/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf
index 81899778a29..6b940a52c3e 100644
--- a/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf
+++ b/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/bxpdfver/LICENSE b/Master/texmf-dist/doc/latex/bxpdfver/LICENSE
index b6b8b923303..f6ebffefcab 100644
--- a/Master/texmf-dist/doc/latex/bxpdfver/LICENSE
+++ b/Master/texmf-dist/doc/latex/bxpdfver/LICENSE
@@ -1,6 +1,6 @@
The MIT License
-Copyright (c) 2014-2022 Takayuki YATO (aka. "ZR")
+Copyright (c) 2014-2024 Takayuki YATO (aka. "ZR")
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/Master/texmf-dist/doc/latex/bxpdfver/README-ja.md b/Master/texmf-dist/doc/latex/bxpdfver/README-ja.md
index 0f0955d3782..ea1a7e4ee11 100644
--- a/Master/texmf-dist/doc/latex/bxpdfver/README-ja.md
+++ b/Master/texmf-dist/doc/latex/bxpdfver/README-ja.md
@@ -43,16 +43,20 @@ bxpdfver パッケージ
* `objcompress`(既定): オブジェクトストリームã®ä½¿ç”¨ã‚’抑止ã—ãªã„。
* ドライãƒã‚ªãƒ—ション: 以下ã®é€šã‚Šã€‚ãªãŠã€å¾Œè¿°ã®ã€Œãƒ‰ãƒ©ã‚¤ãƒæŒ‡å®šã€ã®
節もå‚ç…§ã•ã‚ŒãŸã„。
- + PDF 出力ã®ã‚¨ãƒ³ã‚¸ãƒ³ã®å ´åˆã¯ã€æ—¢å®šã§é©åˆ‡ãªãƒ‰ãƒ©ã‚¤ãƒãŒé¸æŠžã•ã‚Œã‚‹
+ + LaTeX ã®æ–° PDF マãƒã‚¸ãƒ¡ãƒ³ãƒˆãŒæœ‰åŠ¹åŒ–ã•ã‚Œã¦ã„ã‚‹å ´åˆã¯ã€è‡ªå‹•çš„ã«
+ “latex-pdfâ€ãƒ¢ãƒ¼ãƒ‰ã«åˆ‡ã‚Šæ›¿ã‚る。ドライãƒã‚ªãƒ—ションã¯ä¸è¦ã§ã‚る。
+ + PDF 出力ã®ã‚¨ãƒ³ã‚¸ãƒ³ã®å ´åˆã¯ã€è‡ªå‹•çš„ã«é©åˆ‡ãªãƒ‰ãƒ©ã‚¤ãƒãŒé¸æŠžã•ã‚Œã‚‹
ã®ã§ãƒ‰ãƒ©ã‚¤ãƒã‚ªãƒ—ションã¯ä¸è¦ã§ã‚る。
+ `dvipdfmx`: dvipdfmx 用ã®ãƒ‰ãƒ©ã‚¤ãƒã‚’指定ã™ã‚‹ã€‚
+ `nodvidriver`ï¼`disabled`: å…¨ã¦ã®æ©Ÿèƒ½ã‚’無効化ã™ã‚‹ã€‚
※ã“ã®å ´åˆ `lenient+` ãŒæ—¢å®šã«ãªã‚‹ã€‚
+ + `ignorepdfmanagement`: “latex-pdfâ€ãƒ¢ãƒ¼ãƒ‰ã¸ã®åˆ‡æ›¿ã‚’抑止ã™ã‚‹ã€‚
* `lenient`: サãƒãƒ¼ãƒˆã—ãªã„機能ã«å¯¾ã™ã‚‹ã‚¨ãƒ©ãƒ¼ã‚’警告ã«æ ¼ä¸‹ã’ã™ã‚‹ã€‚
* `lenient+`: サãƒãƒ¼ãƒˆã—ãªã„機能ã«å¯¾ã™ã‚‹ã‚¨ãƒ©ãƒ¼ã‚’完全ã«æŠ‘æ­¢ã™ã‚‹ã€‚
* `nolenient`(既定): `lenient(+)` ã®å¦å®šã€‚
* `new-dvipdfmx`: dvipdfmx ã«å¯¾ã™ã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³æ¤œæŸ»ã‚’çœç•¥ã—ã€å¸¸ã«æœ€æ–°ã®
- ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã‚ã‚‹ã¨ä»®å®šã™ã‚‹ã€‚
+ ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã‚ã‚‹ã¨ä»®å®šã™ã‚‹ã€‚
+ ※ドライãƒã‚ªãƒ—ション㌠`dvipdfmx` ã«å¤‰æ›´ã•ã‚Œã‚‹ã€‚
`compress`ã€`objcompress` ã¯ã“ã®ãƒ‘ッケージã«ã‚ˆã‚‹æŠ‘止を行ã‚ãªã„ã¨ã„ã†æ„味
ã§ã‚ã‚Šã€æ—¢ã«æŠ‘æ­¢ã•ã‚Œã¦ã„ã‚‹å ´åˆã«ãれをå†ã³æœ‰åŠ¹åŒ–ã™ã‚‹ã‚‚ã®ã§ã¯ãªã„。
@@ -72,41 +76,61 @@ bxpdfver パッケージ
* `\preservepdfdestinations`: PDF 目的地(PDF destination)ã®åå‰ã®
短縮を抑止ã—ã€TeX 文書ã§æŒ‡å®šã•ã‚ŒãŸåå‰ã‚’用ã„る。異ãªã‚‹ PDF 文書間ã§
ã®ãƒªãƒ³ã‚¯ã‚’正常ã«æ©Ÿèƒ½ã•ã›ã‚‹ãŸã‚ã«å¿…è¦ã§ã‚る。
+ * `\setpdfpkresolution{<解åƒåº¦>}`: PDF ã«åŸ‹ã‚è¾¼ã¾ã‚Œã‚‹ PK フォントã®
+ 解åƒåº¦ï¼ˆdpi 値)を指定ã™ã‚‹ã€‚
### ドライãƒæŒ‡å®šã«é–¢ã™ã‚‹è£œè¶³
\ Drivers (engines) pdfTeX dvipdfmx
- Features / LuaTeX / XeTeX others
- --------------------------- --------- --------- ------
- \setpdfversion Yes Yes No
- \suppresspdfcompression Yes Maybe(*2) No
- \suppresspdfobjcompression Yes Maybe(*2) No
+ Features / LuaTeX / XeTeX latex-pdf
+ --------------------------- --------- --------- ---------
+ \setpdfversion Yes Yes Yes
+ \suppresspdfcompression Yes Maybe(*2) Yes(*4)
+ \suppresspdfobjcompression Yes Maybe(*2) Yes(*4)
\setpdfdecimaldigits Yes Maybe(*2) No
\preservepdfdestinations No-op(*1) Maybe(*2) No
+ \setpdfpkresolution Yes Maybe(*3) No
1. pdfTeXï¼LuaTeX ã§ã¯ PDF 目的地ã®åå‰ãŒçŸ­ç¸®ã•ã‚Œã‚‹ã‚‹ã“ã¨ã¯ãªã„。ã¤ã¾ã‚Š
`\preservepdfdestinations` ã¯å¸¸ã«æœ‰åŠ¹ã«ãªã£ã¦ã„ã‚‹ã¨è¦‹ãªã›ã‚‹ã€‚
- 2. ã“れらã®æ©Ÿèƒ½ã‚’使用ã™ã‚‹ãŸã‚ã«ã¯ã€(x)dvipdfmx ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒ 20160307
- 以上ã§ã‚ã‚‹å¿…è¦ãŒã‚る。
- - ãƒãƒ¼ã‚¸ãƒ§ãƒ³åˆ¤å®šã®ãŸã‚ã« kpsewhich 㨠extractbb ã®èµ·å‹•ã‚’利用ã™ã‚‹
- ãŸã‚ã€å°‘ãªãã¨ã‚‚ã“れらã®ãƒ—ログラムã«ã¤ã„ã¦ã€ã‚·ã‚§ãƒ«ã‚¨ã‚¹ã‚±ãƒ¼ãƒ—ãŒ
- 許å¯ã•ã‚Œã¦ã„ã‚‹å¿…è¦ãŒã‚る。
- - dvipdfmx ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±ã¯è£œåŠ©ãƒ•ã‚¡ã‚¤ãƒ«ï¼ˆ.aux)中ã«ã‚­ãƒ£ãƒƒã‚·ãƒ¥
- ã•ã‚Œã‚‹ã€‚ã“ã®ãŸã‚ã€ä½•ã‹çŠ¶æ³ãŒå¤‰ã‚ã£ãŸå ´åˆã¯ã€ä¸€æ—¦è£œåŠ©ãƒ•ã‚¡ã‚¤ãƒ«ã‚’
- 削除ã™ã‚‹å¿…è¦ãŒç”Ÿã˜ã‚‹ã€‚
+ 2. (x)dvipdfmx ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒ 20160307 以上ã§ã‚ã‚‹å¿…è¦ãŒã‚る。
+ 3. (x)dvipdfmx ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒ 20211016 以上ã§ã‚ã‚‹å¿…è¦ãŒã‚る。
+ 4. `\suppresspdfcompression` 㨠`\suppresspdfobjcompression` ã«ã¤ã„ã¦ã¯
+ 一方を実行ã™ã‚‹ã¨ä»–方も自動的ã«æœ‰åŠ¹ã«ãªã‚‹ã€‚l3pdf モジュールã§ç‰‡æ–¹ã®ã¿
+ を有効化ã™ã‚‹ã“ã¨ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œãªã„ã‹ã‚‰ã§ã‚る。
+
+dvipdfmx ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³åˆ¤å®šã«ã¤ã„ã¦ï¼š
+
+ - å¿…è¦ãŒç”Ÿã˜ãŸå ´åˆã«ã®ã¿ãƒãƒ¼ã‚¸ãƒ§ãƒ³åˆ¤å®šãŒå®Ÿè¡Œã•ã‚Œã‚‹ã€‚
+ - `new-dvipdfmx` オプションを指定ã—ãŸå ´åˆã¯ã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³åˆ¤å®šã‚’å…¨ã¦
+ çœç•¥ã—ãŸä¸Šã§ã€æœ€æ–°ã® dvipdfmx を使用ã—ã¦ã„ã‚‹ã¨è¦‹ãªã™ã€‚
+ - ãƒãƒ¼ã‚¸ãƒ§ãƒ³åˆ¤å®šã®ãŸã‚ã« kpsewhich 㨠extractbb ã®èµ·å‹•ã‚’利用ã™ã‚‹ãŸã‚ã€
+ å°‘ãªãã¨ã‚‚ã“れらã®ãƒ—ログラムã«ã¤ã„ã¦ã€ã‚·ã‚§ãƒ«å®Ÿè¡ŒãŒè¨±å¯ã•ã‚Œã¦ã„ã‚‹
+ å¿…è¦ãŒã‚る。
+ - ãƒãƒ¼ã‚¸ãƒ§ãƒ³åˆ¤å®šã¯å°‘ã—時間ãŒã‹ã‹ã‚‹ãŸã‚ã€dvipdfmx ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±ã¯
+ 補助ファイル(.aux)中ã«ã‚­ãƒ£ãƒƒã‚·ãƒ¥ã•ã‚Œã‚‹ã€‚ã“ã®ãŸã‚ã€ä½•ã‹çŠ¶æ³ãŒå¤‰åŒ–
+ ã—ãŸå ´åˆã¯ã€ä¸€æ—¦è£œåŠ©ãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã™ã‚‹å¿…è¦ãŒç”Ÿã˜ã‚‹ã€‚
以下ã®ã“ã¨ã«ã‚‚注æ„ã•ã‚ŒãŸã„。
- * 使用ä¸å¯èƒ½ãªæ©Ÿèƒ½ã‚’使ãŠã†ã¨è©¦ã¿ã‚‹ã¨ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã™ã‚‹ã€‚
+ * 使用ä¸å¯èƒ½ãªæ©Ÿèƒ½ã‚’使ãŠã†ã¨è©¦ã¿ã‚‹ã¨ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã™ã‚‹ã€‚
+ ※`lenient` オプションãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯ã‚¨ãƒ©ãƒ¼ãŒè­¦å‘Šã«å¤‰æ›´ã•ã‚Œã€
+ ã¾ãŸ `lenient+` ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯ã‚¨ãƒ©ãƒ¼ã‚‚警告も抑止ã•ã‚Œã‚‹ã€‚
* `dvips` ç­‰ã®â€œå…¨ã対応ã—ã¦ã„ãªã„â€è‹¥å¹²ã®ãƒ‰ãƒ©ã‚¤ãƒã‚ªãƒ—ションをèªè­˜
ã™ã‚‹ã€‚ã“ã®å ´åˆã€å…¨ã¦ã®æ©Ÿèƒ½ã®å‘¼å‡ºã§ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã™ã‚‹ã€‚
- * `nodvidriver` ã¯ç‰¹æ®Šã§ã€ã“れを指定ã—ãŸå ´åˆã¯ã€ã©ã®æ©Ÿèƒ½ã®å‘¼å‡ºã§ã‚‚
- エラーã¯ç™ºç”Ÿã—ãªã„ãŒã€å…¨ã何ã®å‹•ä½œã‚‚è¡Œã‚ãªã„。
+ * `nodvidriver` オプションã¯æ—¢å®šã§ `lenient+` を指定ã™ã‚‹ã€‚ã¤ã¾ã‚Šã€
+ ã©ã®æ©Ÿèƒ½ã®å‘¼å‡ºã§ã‚‚エラーã¯ç™ºç”Ÿã—ãªã„ãŒã€å…¨ã何ã®å‹•ä½œã‚‚è¡Œã‚ãªã„。
更新履歴
--------
+ * Version 0.8 ‹2024/08/03›
+ - カーãƒãƒ«ã®æ–° PDF マãƒã‚¸ãƒ¡ãƒ³ãƒˆãŒæœ‰åŠ¹ãªå ´åˆã«ã‚‚一部ã®æ©Ÿèƒ½ãŒä½¿ãˆã‚‹
+ よã†ã«ã™ã‚‹ï¼ˆâ€œlatex-pdfâ€ãƒ¢ãƒ¼ãƒ‰ï¼‰ã€‚
+ * Version 0.7 ‹2024/07/24›
+ - `\setpdfpkresolution` を(正å¼ã«ï¼‰ã‚µãƒãƒ¼ãƒˆã€‚(dvipdfmx/XeTeX
+ ã§ã‚‚使用å¯èƒ½ã«ãªã£ãŸã€‚)
* Version 0.6 ‹2022/04/28›
- `lenient+`/`nolenient` オプションを追加。
- éžã‚µãƒãƒ¼ãƒˆã®ãƒ‰ãƒ©ã‚¤ãƒã§ã‚‚読込自体ã¯ã‚¨ãƒ©ãƒ¼ã«ã—ãªã„。
diff --git a/Master/texmf-dist/doc/latex/bxpdfver/README.md b/Master/texmf-dist/doc/latex/bxpdfver/README.md
index 332b6215f17..1b78b5da1cf 100644
--- a/Master/texmf-dist/doc/latex/bxpdfver/README.md
+++ b/Master/texmf-dist/doc/latex/bxpdfver/README.md
@@ -44,11 +44,16 @@ The available options are:
* `noobjcompress`: Suppresses use of object streams.
* `objcompress` (default): Does not suppress use of object streams.
* Driver options: As below:
+ + When the new PDF management of LaTeX is activated, the package
+ will automatically switch to “latex-pdf†mode. You need not
+ give driver options.
+ When using a PDF-output engine, you need not give driver options
since the appropriate one is auto-detected.
+ `dvipdfmx`: Uses dvipdfmx driver.
+ `nodvidriver`/`disabled`: Disables all functions of the package.
NB. This option sets `lenient+` by default.
+ * `ignorepdfmanagement`: Avoids switching to “latex-pdf†mode, even
+ when the new PDF management of LaTeX is activated.
* `lenient`: Turns the errors for unsupported features into warnings.
* `lenient+`: Suppreseses the errors for unsupported features.
* `nolenient`: Negation of `lenient(+)`.
@@ -72,40 +77,61 @@ when it is already suppressed by other means.
* `\preservepdfdestinations`: Stops shortening the PDF destination
names and uses the original names given in the LaTeX documents. This
is necessary for cross-document links to work correctly.
+ * `\setpdfpkresolution{<resolution>}`: Sets the resolution (in dpi)
+ of the PK fonts embedded in the PDF file.
### NOTE ON DRIVERS
\ Drivers (engines) pdfTeX dvipdfmx
- Features / LuaTeX / XeTeX others
- --------------------------- --------- --------- ------
- \setpdfversion Yes Yes No
- \suppresspdfcompression Yes Maybe(*2) No
- \suppresspdfobjcompression Yes Maybe(*2) No
+ Features / LuaTeX / XeTeX latex-pdf
+ --------------------------- --------- --------- ---------
+ \setpdfversion Yes Yes Yes
+ \suppresspdfcompression Yes Maybe(*2) Yes(*4)
+ \suppresspdfobjcompression Yes Maybe(*2) Yes(*4)
\setpdfdecimaldigits Yes Maybe(*2) No
\preservepdfdestinations No-op(*1) Maybe(*2) No
+ \setpdfpkresolution Yes Maybe(*3) No
1. In pdfTeX and LuaTeX, PDF destination names are never shortened;
that is, it can be thought as if `\preservepdfdestinations` were
always in effect.
2. These features are available only when the version of (x)dvipdfmx
- is 20160307 or later. Also shell escape must be accepted (with or
- without restriction) so that `kpsewhich` and `extractbb` will be
- allowed to run, because those programs are used in order to detect
- the dvipdfmx version.
+ is 20160307 or later.
+ 3. These features are available only when the version of (x)dvipdfmx
+ is 20211016 or later.
+ 4. As for '\suppresspdfcompression' and '\suppresspdfobjcompression',
+ when one of them is executed, the other will be activated. It is
+ because l3pdf module does not support activating only one of them.
+
+On the detection of dvipdfmx version:
+
+ * Shell escape must be accepted (with or without restriction) so that
+ `kpsewhich` and `extractbb` will be allowed to run, because those
+ programs are used in order to detect the dvipdfmx version.
+ * The detection process is slow, so the result is cached in the
+ auxiliary file (`.aux`). When the environment is changed, you need
+ to delete the auxiliary file.
More notices:
- * If you try to use unavailable features, an error will occur.
+ * If you try to use unavailable features, an error will occur.
+ NB. Option `lenient` turns the errors into warnings, and `lenient+`
+ completely suppresses the errors.
* The package recognizes some “unsupported†driver options such as
`dvips`; when such drivers are used, use of any feature will cause
an error.
- * The use of `nodvidriver` sets `lenient*` by default; use of any
+ * The use of `nodvidriver` sets `lenient+` by default; use of any
feature will do nothing (nor issue an error).
REVISION HISTORY
----------------
+ * Version 0.8 ‹2024/08/03›
+ - Support some features even when the new PDF management of the
+ LaTeX kernel is activated (“latex-pdf†mode).
+ * Version 0.7 ‹2024/07/24›
+ - Support (officialy) `\setpdfpkresolution`.
* Version 0.6 ‹2022/04/28›
- Added the `lenient+` and `nolenient` options.
* Version 0.5a ‹2021/02/14›
diff --git a/Master/texmf-dist/doc/latex/changebar/CATALOG b/Master/texmf-dist/doc/latex/changebar/CATALOG
index 50cd35da78a..5483fa9c134 100644
--- a/Master/texmf-dist/doc/latex/changebar/CATALOG
+++ b/Master/texmf-dist/doc/latex/changebar/CATALOG
@@ -1,7 +1,7 @@
Name: ChangeBar
Problems-To: johannes.braams(at)texniek.nl
Author: J.L. Braams
-Version: 3.7d
+Version: 3.7e
Description:
diff --git a/Master/texmf-dist/doc/latex/changebar/README b/Master/texmf-dist/doc/latex/changebar/README
index 2a9c69bad71..bcd9ab0bbb5 100644
--- a/Master/texmf-dist/doc/latex/changebar/README
+++ b/Master/texmf-dist/doc/latex/changebar/README
@@ -1,6 +1,6 @@
changebar bundle
- January 9, 2024
+ July 19, 2024
This bundle contains a package that I maintain to add changebars to a
LaTeX document.
diff --git a/Master/texmf-dist/doc/latex/changebar/changebar.bug b/Master/texmf-dist/doc/latex/changebar/changebar.bug
index d6613321501..aa476a2224f 100644
--- a/Master/texmf-dist/doc/latex/changebar/changebar.bug
+++ b/Master/texmf-dist/doc/latex/changebar/changebar.bug
@@ -219,6 +219,10 @@
% v3.7d JLB: Arash Esbati reported a simlar phenomenon when \nochangebars
% is used. Similar solution was needed.
%
+% v3.7e JLB: Daniel Flipo and Bruno Winckler reported that changebar no longer
+% works when \usepackage[french]{babel} is used. This was caused by the
+% solution implemented in v3.7b. This time use "/" is chosen as separator.
+%
% Known problems
% - changebars for marginal paragraphs collide with changebars
% for the main body of text
diff --git a/Master/texmf-dist/doc/latex/changebar/changebar.pdf b/Master/texmf-dist/doc/latex/changebar/changebar.pdf
index b313fe1c531..9025ebb6248 100644
--- a/Master/texmf-dist/doc/latex/changebar/changebar.pdf
+++ b/Master/texmf-dist/doc/latex/changebar/changebar.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/circuitikz/changelog.tex b/Master/texmf-dist/doc/latex/circuitikz/changelog.tex
index 0806a20b78d..19a5cd01f35 100644
--- a/Master/texmf-dist/doc/latex/circuitikz/changelog.tex
+++ b/Master/texmf-dist/doc/latex/circuitikz/changelog.tex
@@ -5,6 +5,38 @@ full list of changes.
\begin{itemize}
\item
+ Version 1.7.0 (2024-08-03)
+
+ There are no big changes here, but the change to the resistor code
+ (maybe one of the most used by the package) well deserves a minor
+ version bump. A couple of new components, and several minor fixes.
+
+ \begin{itemize}
+ \tightlist
+ \item
+ New component: new kind of current tap (suggested by
+ \href{https://github.com/circuitikz/circuitikz/issues/807}{EEpchi
+ and Dr4UX on GitHub})
+ \item
+ New arrow tip \texttt{Jack\ Tap} to help drawing jack connectors
+ (suggested by
+ \href{https://github.com/circuitikz/circuitikz/issues/806}{Anisio
+ Rogerio Braga})
+ \item
+ Change the drawing of the thermocouple (suggested by
+ \href{https://github.com/circuitikz/circuitikz/issues/811}{Dr4UX on
+ GitHub})
+ \item
+ Change and enhancement to the drawing of the American resistors
+ (triggered by
+ \href{https://github.com/circuitikz/circuitikz/issues/814}{Dr4UX on
+ GitHub}), fixing a long-standing small asymmetry that nobody noticed
+ \item
+ Minor adjustment for joins in \texttt{viscoe} component
+ \item
+ Minor additions (\texttt{rectjoinfill}) and fixes in documentation
+ \end{itemize}
+\item
Version 1.6.9 (2024-05-25)
Several new components and a bug fix for a nasty long-standing bug
@@ -495,7 +527,7 @@ full list of changes.
Robustify some shapes: do not let arrows option pass to the inner
drawing (see
\href{https://tex.stackexchange.com/a/632084/38080}{here} and
- \href{https://matrix.to/\#/!NuxCISwYQJuyWwNsEI:matrix.org/$vQO6luq1F66LJ79dERmaqKI46qMBcjStqYCPi725uZE?via=matrix.org&via=2krueger.de&via=im.f3l.de}{here})
+ \href{https://matrix.to/\#/!NuxCISwYQJuyWwNsEI:matrix.org/$vQO6luq1F66LJ79dERmaqKI46qMBcjStqYCPi725uZE?via=matrix.org\&via=2krueger.de\&via=im.f3l.de}{here})
\item
Add warning about global draw options in the manual
\item
diff --git a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf
index 9f3d2b57e02..023c265d6ea 100644
--- a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf
+++ b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex
index ac116af09e0..e0fa8032b1d 100644
--- a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex
+++ b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex
@@ -2200,6 +2200,83 @@ For the \texttt{photoresistor} and the two ``flavors'' of the light-dependent re
\end{tikzpicture}
\end{LTXexample}
+\begingroup % protect changes to resistors
+\newcommand\showjoin[1]{%
+\begin{tikzpicture}[scale=4, transform shape]
+ \clip (0.2,-0.05) rectangle (0.6,0.3);
+ \draw[ultra thick] (0,0) to[R, resistors/thickness=#1] ++(2,0);
+\end{tikzpicture}%
+}
+\newcommand{\splat}{\begin{center}\ttfamily\scriptsize\begin{tabular}{cccc}
+ \showjoin{1}&\showjoin{2}&\showjoin{3}&\showjoin{4}\\
+ thickness=1 & thickness=2 & thickness=3 & thickness=4 \\
+ \end{tabular}\end{center}%
+}
+\newcommand{\rdivider}[1]{\begin{tikzpicture}
+ \ctikzset{resistors/thickness=#1}
+ \draw (0,0) node[ground]{} to[V] ++(0,2) to[R] ++(2,0)
+ to[R] ++(0,-2) to[short,-*] (0,0);
+\end{tikzpicture}\qquad}
+\newcommand{\divsplat}[1]{#1\par
+ \begin{center}
+ \rdivider{1}\rdivider{2}\rdivider{3}\rdivider{4}
+\end{center}}
+
+\paragraph{Details of American (``zig-zag'') resistors.\label{sec:zigzag-details}} American (zig-zag) resistors have a little joining problem\footnote{Noticed by \href{https://github.com/circuitikz/circuitikz/issues/811}{user Dr4UX on GitHub} and later \href{https://github.com/circuitikz/circuitikz/discussions/814}{discussed here}.} with the leading wires if the thickness is greater than two. In the following drawing you can see the problem when the thickness grows from 1 to 4.
+
+\splat
+
+Since \texttt{v1.7.0}, one possibility to correct the problem is to change the type of joining of the zig-zag line, using the key \texttt{resistors/zigzag join}, which is a command that by default is void. For example, the following effect is obtained by using
+
+\begin{lstlisting}[numbers=none]
+\ctikzset{resistors/zigzag hook/.code={\pgfsetroundcap}}
+\end{lstlisting}
+{\ctikzset{resistors/zigzag hook/.code={\pgfsetroundcap}}
+\splat}
+
+or you can even go full rounded
+
+\begin{lstlisting}[numbers=none]
+\ctikzset{resistors/zigzag hook/.code={\pgfsetroundcap\pgfsetroundjoin}}
+\end{lstlisting}
+{\ctikzset{resistors/zigzag hook/.code={\pgfsetroundcap\pgfsetroundjoin}}
+\splat}
+
+Another possibility is to add a little horizontal ``stub'' to the shape, with the key \texttt{resistors/zigzag stub} (default \texttt{0}), which will add a first part which is a continuation of the wire:
+\begin{lstlisting}[numbers=none]
+\ctikzset{resistors/zigzag stub=0.05}% this is relative to the resistor's length
+\end{lstlisting}
+{\ctikzset{resistors/zigzag stub=0.05}
+\splat}
+
+\dots or you can just combine all of them as you prefer. With the standard join/cap options, the look of the resistors for thickness from 1 to 4 is shown here:
+
+\ctikzset{american}
+\divsplat{Standard drawing of American resistors}
+\divsplat{With a 5\% stub: \ctikzset{resistors/zigzag stub=0.05}}
+\divsplat{With a 20\% stub: \ctikzset{resistors/zigzag stub=0.2}}
+
+
+\bigskip
+Finally, here is the detailed shape with thickness 2 (red=0, blue=0.05, green=0.2), magnified six times:
+
+\vspace*{2cm}% this vspace fences are needed because the transform canvas wreak havoc with the bbox
+\begin{tikzpicture}[transform canvas={scale=6}]
+ \ctikzset{resistors/zigzag stub=0}
+ \draw[red] (0,0.2) to [resistor, resistors/thickness=4] ++(2,0);
+ \ctikzset{resistors/zigzag stub=0.05}
+ \draw[blue] (0,0.1) to [resistor, resistors/thickness=4] ++(2,0);
+ \ctikzset{resistors/zigzag stub=0.2}
+ \draw[green] (0,0) to [resistor, resistors/thickness=4] ++(2,0);
+ % \draw [very thin](1,0.5) -- (1,-0.5);
+ % \draw [very thin](0,0) -- ++(2,0);
+ % \draw [very thin](0,0.1) -- ++(2,0);
+ % \draw [very thin](0,0.2) -- ++(2,0);
+\end{tikzpicture}
+\vspace*{2cm}
+
+\endgroup % changes to resistors stops here
+
\subsection{Capacitors and inductors: dynamical bipoles}
@@ -2852,9 +2929,9 @@ Notice that the size of the double-circle sources (and of the triple-circle one)
\end{LTXexample}
\paragraph{Waveform symbols.}
-Internal symbols of sinusoidal, triangular and square sources are drawn with the same line thickness as the component by default. You can modify this by setting the key \texttt{sources/symbols/thickness} for independent sources and the corresponding \texttt{csource/...} for dependent ones. The value used here is relative to the component (i.e. the circle) value.
+Internal symbols of sinusoidal, triangular and square sources are drawn with the same line thickness as the component by default. You can modify this by setting the key \texttt{sources/symbol/thickness} for independent sources and the corresponding \texttt{csource/...} for dependent ones. The value used here is relative to the component (i.e. the circle) value.
-Normally the symbol is oriented in the same direction as the line, and rotate rigidly with the component; you can change this orientation using the key \texttt{sources/symbols/rotate} or \texttt{csource/...}. The default value is \texttt{90} which correspond to the ``line'' direction (remember, path components are defined as horizontal ones).
+Normally the symbol is oriented in the same direction as the line, and rotate rigidly with the component; you can change this orientation using the key \texttt{sources/symbol/rotate} or \texttt{csource/...}. The default value is \texttt{90} which correspond to the ``line'' direction (remember, path components are defined as horizontal ones).
If instead of an angle value you use \texttt{auto}, the symbol will be rotated so that the waveform is always vertical, similar to what happens in instruments:
\begin{LTXexample}[varwidth=true]
@@ -3019,12 +3096,44 @@ Sometimes it is better to use a shape for instruments which is very different fr
\footnotetext{Suggested by \texttt{@nobrl} on GitHub}
\circuitdescbip{iloop}{Current loop (symbolic)}{}(left/135/0.2, right/45/0.2, center/-90/0.3, i/30/0.4)
\circuitdescbip{iloop2}{Current loop (real)}{}(left/135/0.2, right/-45/0.2, center/-90/0.3, i+/135/0.4, i-/45/0.4)
+ \circuitdescbip{currtap}{Current tap (probe)\footnotemark}{}(tap/-90/0.2)
+ \footnotetext{Suggested by \href{https://github.com/circuitikz/circuitikz/issues/807}{user EEpchi on GitHub}.}
\end{groupdesc}
\subsubsection{Instruments customizations}\label{sec:tweak-instruments}
You can change the scale of all the instruments (including the current loops) by setting the key \texttt{instruments/scale} to something different from the default \texttt{1.0}.
+\paragraph{Current probes.}
+You can change the inner dot in several way, by changing the following keys under the \verb!\ctikzset! key \texttt{bipoles/currtap}:
+\begin{center}
+ \begin{tabular}{>{\ttfamily}l>{\ttfamily}lp{0.7\linewidth}}
+ \toprule
+ parameter & default & description \\
+ \midrule
+ thickness & default & Set the thickness of the line (\texttt{default}: do not change the class thickness) \\
+ color & default & stroke color: \texttt{default} is the same as the component \\
+ dash & default & dash pattern: none means solid line, default means keep the global pattern\footnotemark \\
+ fill & default & fill the inner dot; \texttt{default} means use the wire color, \texttt{none} do not fill, other keys must be a valid color \\
+ dot size& 0.5 & relative size of the inner dot \\
+ \bottomrule
+ \end{tabular}
+ \footnotetext{Follows the syntax of the pattern sequence \texttt{\textbackslash pgfsetdash} --- see \TikZ{} manual for details; phase is always zero. Basically you pass pairs of dash-length -- blank-length dimensions, see the examples.}
+\end{center}
+
+\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily]
+\begin{circuitikz}
+ \draw (0,2) to[currtap, bipoles/currtap/fill=none, *-]
+ ++(2,0) to[currtap, bipoles/currtap/.cd,
+ fill=yellow, color=red, thickness=3,
+ dash={{1.14pt}{2pt}}] ++(2,0);
+ \draw (0,0) to[currtap=I, *-, name=ct] ++(2,0)
+ to[currtap, -*, name=ct2,
+ bipoles/currtap/dot size=0.3] ++(2,0);
+ \draw (ct.tap) -- ++(0,-1) (ct2.tap) -- ++(0,-1);
+\end{circuitikz}
+\end{LTXexample}
+
\paragraph{Oscilloscope waveform.} You can change the waveform shown in the oscilloscope ``screen''\footnote{Suggested by \href{https://tex.stackexchange.com/q/595062/38080}{Mario Tafur on TeX.SX}}. To change it, you just set the key \texttt{bipoles/oscope/waveform} to one of the available shape. You have available the shapes in the following list (the default is \texttt{ramps}):
\begin{LTXexample}[pos=t, basicstyle=\small\ttfamily]
@@ -3478,9 +3587,9 @@ While the horizontal line will be drawn with the current path values, you can ch
\end{circuitikz}
\end{LTXexample}
-\subsection{Arrows}\label{sec:arrows}
+\subsection{Arrows (fake and real)}\label{sec:arrows}
-These are pseudo-arrows used in lot of places in the packages (for transistors, flows, currents, and so on). The first three arrows are magnified by a factor~3 in the boxes below; for the \texttt{trarrow}, the anchor \texttt{tip} is exactly on the tip and \texttt{btip} is slightly receded.
+The main arrow shapes in \Circuitikz{} are really shapes, used as pseudo-arrows in lot of places in the packages (for transistors, flows, currents, and so on). The first three arrows are magnified by a factor~3 in the boxes below; for the \texttt{trarrow}, the anchor \texttt{tip} is exactly on the tip and \texttt{btip} is slightly receded.
\begin{groupdesc}
\circuitdesc[3]{currarrow}{Arrow for current and voltage}{}(center/0/0.2)
@@ -3540,6 +3649,30 @@ The arrows are the ones set with the keys \texttt{tunable start arrow} and \text
Notice also the need to force a transparency group if you want a semitransparent arrow.
+\subsubsection{Arrow tips}\label{sec:arrow-tips}
+
+In addition to the pseudo-arrows, \Circuitikz{} also adds a couple of ``real'' arrow tips.
+The package automatically loads the \texttt{arrows.meta} \TikZ{} library but \emph{not} the deprecated \texttt{arrows} library; in the first versions of the package it used quite a lot the \texttt{latex'} tip, which is not available anymore. To maintain the backward compatibility, the `latexslim` tip has been added, and used by default in several components. This is an old-style arrow tip, with no customization possible.
+
+The other tip is \texttt{Jack Tap}\footnote{Added after a suggestion from \href{https://github.com/circuitikz/circuitikz/issues/806}{Anisio Rogerio Braga} on GitHub}, which is mainly used to build jack connectors (see section~\ref{sec:jacks}). This is a new-style arrow tip, and accepts the parameter \texttt{length} (default \texttt{0.3 cm}), \texttt{width} (default \texttt{0.15 cm}), and the boolean \texttt{swap}.
+
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+ \draw (0,.25) (0,0) edge[-latexslim] ++(1,0)
+ ++(0, -0.5) edge[-{Jack Tap[swap]}] ++(1,0)
+ ++(0, -0.5) edge[-Jack Tap] ++(1,0)
+ ++(0, -0.5) edge[-{Jack Tap[fill=cyan]}] ++(1,0)
+ ++(0, -0.5) edge[-{Jack Tap[width=.3cm,fill]}]++(1,0)
+ ++(0, -0.5) edge[-{Jack Tap[width=.3cm,line join=round,
+ line cap=round]}, thick] ++(1,0)
+ ++(0, -0.5) edge[^-^f] ++(1,0)
+ ++(0, -0.5) edge[vf-v] ++(1,0);
+\end{circuitikz}
+\end{LTXexample}
+You can also have a filled version, by adding the key \texttt{fill} (without arguments\footnote{This usage of the \texttt{fill} key in arrow tips will be added to \TikZ{} in version \texttt{3.1.11}, see \href{https://github.com/pgf-tikz/pgf/pull/1352}{this PR by Henri Menke}; \Circuitikz{} will add it to older versions.}) or \texttt{fill=color} if you want a color different from the stroke ones, and they accept the \texttt{line join} and \texttt{line cap} as most of the standard \TikZ{} arrows.
+As you can see, the normal and swapped \texttt{Jack Tap} tips have the shorthands \texttt{v} and \verb|^| (and \texttt{vf} and \verb|^f| for their filled counterparts). Notice that the tips are automatically reversed when they are at the \emph{start} of the path.
+
\subsection{Terminal shapes}\label{sec:terminals}
These are the so-called ``bipole nodes'' shapes, or poles (see section~\ref{sec:bipole-nodes}). These nodes are always filled; the ``open'' versions (starting with an \texttt{o}) are by default filled with the color specified by the key \texttt{open nodes fill} (by default \texttt{white}), but you can override locally it with the \texttt{fill} parameter.
@@ -3553,6 +3686,12 @@ These are the so-called ``bipole nodes'' shapes, or poles (see section~\ref{sec:
\circuitdesc{osquarepole}{Open square-shape terminal}{}
\end{groupdesc}
+This is not a pole, but it's used to "fill" nasty corners (look closer, and see ~\ref{sec:line-joins}).
+
+\begin{groupdesc}
+ \circuitdesc{rectjoinfill}{Filling square with line width size}{}
+\end{groupdesc}
+
Since version 0.9.0, ``bipole nodes'' shapes have all the standard geographical anchors, so you can do things like these:
\begin{LTXexample}[varwidth=true]
@@ -3672,6 +3811,33 @@ You can use the \texttt{plug center} anchor to add the IEC ``multiplier'':
\end{circuitikz}
\end{LTXexample}
+\subsubsection{Jack connectors}\label{sec:jacks}
+
+There are \emph{lots} of different jack connectors symbols --- see the \href{https://github.com/circuitikz/circuitikz/issues/806}{discussion here} for examples. So instead of creating a monster component, it has been decided to add elements to simplify the drawing of such connectors. The first (and for now only) such element is the \texttt{Jack Tap} arrow tip (see section~\ref{sec:arrow-tips}) with its shorthands \texttt{v} and \verb|^|.
+
+For example, and audio jack can be drawn like this:
+
+\begin{LTXexample}[pos=t, varwidth=true]
+% drawing based on one by Anisio Rogerio Braga
+% https://github.com/circuitikz/circuitikz/issues/806
+\newcommand\dx{1.5}\newcommand\dy{1}
+\begin{circuitikz}
+ \draw[-v] (0,\dy/3*4) to[short, o-] ++(\dx,0);
+ \draw[-Triangle] (0,\dy) node[ocirc]{} -| ++(\dx/3,\dy/3);
+ \draw[-Triangle] (0,\dy/3*2) node[ocirc]{} -| ++(\dx/3,-\dy/3);
+ \draw[-^] (0,\dy/3) to[short, o-] ++(2*\dx/3,0);
+ \draw (0,0.0) to[short, o-] ++(1.75*\dx,0) rectangle ++(0.2,4*\dy/3);
+\end{circuitikz}\qquad\qquad
+%---% audio jack with an inserted plug
+\begin{circuitikz}
+ \draw[-v] (0,\dy/3*4) to[short, o-] ++(\dx,0.2);
+ \draw[-Triangle] (0,\dy) node[ocirc]{} -| ++(\dx/3,\dy/3);
+ \draw[-Triangle] (0,\dy/3*2) node[ocirc]{} -| ++(\dx/3,-\dy/3);
+ \draw[-^] (0,\dy/3) to[short, o-] ++(2*\dx/3,-0.2);
+ \draw (0,0.0) to[short, o-] ++(1.75*\dx,0) rectangle ++(0.2,4*\dy/3);
+\end{circuitikz}
+\end{LTXexample}
+
\subsection{Block diagram components}
\noindent Contributed by Stefan Erhardt.
@@ -6596,7 +6762,7 @@ with the parameter \texttt{number inputs} :
\end{circuitikz}
\end{LTXexample}
-You can suppress the drawing of the logic ports input leads by using the boolean key \texttt{logic ports draw input leads} (default \texttt{true}) or, locally, with the style \texttt{no inputs leads} (that can be reverted with \texttt{input leads}), like in the following example. The anchors do not change and you have to take responsibility to make the connection to the ``border''-anchors.
+You can suppress the drawing of the logic ports input leads by using the boolean key \texttt{logic ports draw input leads} (default \texttt{true}) or, locally, with the style \texttt{no input leads} (that can be reverted with \texttt{input leads}), like in the following example. The anchors do not change and you have to take responsibility to make the connection to the ``border''-anchors.
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}
@@ -7436,9 +7602,9 @@ External pins' length is controlled by the key \texttt{multipoles/external pins
like in chips. In addition, like in logic ports, you can suppress the
drawing of the leads by using the boolean key
\texttt{logic ports draw input leads} (default \texttt{true}) or, locally,
-with the style \texttt{no inputs leads} (that can be reverted with
+with the style \texttt{no input leads} (that can be reverted with
\texttt{input leads}).
-The main difference between setting \texttt{external pins width} to \texttt{0} or using \texttt{no inputs lead} is that in the first case the normal pin anchors and the border anchors will coincide, and in the second case they will not move and stay where they should have been if the leads were drawn.
+The main difference between setting \texttt{external pins width} to \texttt{0} or using \texttt{no input lead} is that in the first case the normal pin anchors and the border anchors will coincide, and in the second case they will not move and stay where they should have been if the leads were drawn.
You can draw only selected pins and leave out the rest by setting the keys
\texttt{multipoles/draw only \emph{side} pins} and the corresponding style
@@ -7840,7 +8006,7 @@ You can, if you want, avoid printing the numbers of the pin with \texttt{hide nu
\end{LTXexample}
-Also, you can suppress the drawing of the pins, by using the style \texttt{no inputs leads} (that can be reverted with \texttt{input leads}). The main difference between setting \texttt{external pins width} to \texttt{0} or using \texttt{no inputs lead} is that in the first case the normal pin anchors and the border anchors will coincide, and in the second case they will not move and stay where they should have been if the leads were drawn.
+Also, you can suppress the drawing of the pins, by using the style \texttt{no input leads} (that can be reverted with \texttt{input leads}). The main difference between setting \texttt{external pins width} to \texttt{0} or using \texttt{no input lead} is that in the first case the normal pin anchors and the border anchors will coincide, and in the second case they will not move and stay where they should have been if the leads were drawn.
For special use you can suppress the orientation mark with the key \texttt{no topmark} (default \texttt{topmark}).
diff --git a/Master/texmf-dist/doc/latex/citation-style-language/CHANGELOG.md b/Master/texmf-dist/doc/latex/citation-style-language/CHANGELOG.md
index 60c4ae9e823..4b1c1e6c700 100644
--- a/Master/texmf-dist/doc/latex/citation-style-language/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/citation-style-language/CHANGELOG.md
@@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
+## [0.6.0] - 2024-07-31
+
+- Add support for multiple bibliographies (`refsection` environment).
+- Add global `ref-section` option.
+
+### Fixed
+
+- Fix an error of empty locator in citation (([#70](https://github.com/zepinglee/citeproc-lua/discussions/70)))
+
+## [0.5.1] - 2024-07-10
+
+### Fixed
+
+- Fix a bug in font style flip-flopping with raw code ([#67](https://github.com/zepinglee/citeproc-lua/issues/67)).
+
## [0.5.0] - 2024-06-09
### Added
@@ -197,7 +212,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Initial CTAN release.
-[Unreleased]: https://github.com/zepinglee/citeproc-lua/compare/v0.5.0...HEAD
+[Unreleased]: https://github.com/zepinglee/citeproc-lua/compare/v0.6.0...HEAD
+[0.6.0]: https://github.com/zepinglee/citeproc-lua/compare/v0.5.1...v0.6.0
+[0.5.1]: https://github.com/zepinglee/citeproc-lua/compare/v0.5.0...v0.5.1
[0.5.0]: https://github.com/zepinglee/citeproc-lua/compare/v0.4.9...v0.5.0
[0.4.9]: https://github.com/zepinglee/citeproc-lua/compare/v0.4.8...v0.4.9
[0.4.8]: https://github.com/zepinglee/citeproc-lua/compare/v0.4.7...v0.4.8
diff --git a/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.pdf b/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.pdf
index 83d520bd1bd..604b765c1b2 100644
--- a/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.pdf
+++ b/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.tex b/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.tex
index c8af8574e16..a1a576958e3 100644
--- a/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.tex
+++ b/Master/texmf-dist/doc/latex/citation-style-language/citation-style-language-doc.tex
@@ -51,7 +51,7 @@
}%
}
-\date{2024-06-09 v0.5.0}
+\date{2024-07-31 v0.6.0}
\maketitle
@@ -212,6 +212,24 @@ The locale falls back to ``\opt{en}'' (English) if the attribute is not set.
When \pkg{babel} package is loaded, the selected main language is implicitly set
as the \opt{locale} for \pkg{citation-style-language}.
+\DescribeOption{ref-section}
+This option automatically starts a new reference section at the given document
+heading such as a chapter or a section. This is equivalent to the
+\cs{newrefsection} command. The following choices are available:
+
+\begin{description}
+ \item[\opt{none}] Disable this feature (default).
+ \item[\opt{part}] Start a reference section at every \cs{part} command.
+ \item[\opt{chapter}] Start a reference section at every \cs{chapter} command.
+ \item[\opt{chapter+}] Start a reference section at every \cs{chapter} and
+ every higher level of sectioning, i.e. \cs{part}.
+ \item[\opt{section}] Start a reference section at every \cs{section} command.
+ \item[\opt{section+}] Start a reference section at every \cs{section} and
+ every higher level of sectioning, i.e. \cs{part} and \cs{chapter}.
+ \item[\opt{subsection}] Start a reference section at every \cs{subsection} command.
+ \item[\opt{subsection+}] Start a reference section at every \cs{subsection} and every higher level of sectioning, i.e. \cs{part}, \cs{chapter} and \cs{section}.
+\end{description}
+
\DescribeOption{bib-font}
Usually, the list of references is printed in the same font style and size as
the main text.
@@ -509,6 +527,68 @@ Print only the entries assigned to the given category.
This option may be used multiple times.
+\subsection{Bibliography Sections}
+
+The \env{refsection} environment is used in the document body to mark a
+reference section.
+This environment is useful if you want separate, independent
+bibliographies and bibliography lists in each chapter, section, or any other
+part of a document.
+Within a reference section, all cited works are assigned labels which are local
+to the environment. Technically, reference sections are completely independent
+from document divisions such as \cs{chapter} and \cs{section} even though they
+will most likely be used per chapter or section.
+See the refsection package option in § 3.1.2.1 for a way to automate this.
+Also see § 3.14.3 for usage examples.
+
+\begin{function}{\begin{refsection}, \end{refsection}}
+ \begin{syntax}
+ \cs{begin}\{refsection\}
+ \cs{begin}\{refsection\}[style = \meta{style-id}, bib-resource = <datafile>, ...]
+ \end{syntax}
+\end{function}
+
+All citations given outside a \env{refsection} environment are assigned to
+the global section.
+If \cs{printbibliography} is used within a refsection, it will automatically
+select the current section.
+Note that \env{refsection} environments may not be nested.
+Beginning a new reference section automatically ends the active reference context (see § 3.8.10).
+The optional argument is a list of key-value configurations. That following options are available.
+
+
+\DescribeOption{style}
+The \opt{style} option specifies the CSL style used in this reference section.
+If this is not given, the global style will be used by default which is defined
+via package options or \cs{cslsetup}.
+
+\DescribeOption{bib-resource}
+The bibliographic data files are specified with this option.
+In case of multiple data files, remember to enclose the file with curly brackets
+so that the key-values are correctly parsed
+(e.g., \texttt{bib-resource = \{foo.json, bar.bib\}}).
+By default the global bib resources are used if no \opt{bib-resource} is given.
+
+\DescribeOption{locale}
+This option sets the locale used in this reference section.
+By default the global locale is used.
+
+
+\begin{function}{\newrefsection, \endrefsection}
+ \begin{syntax}
+ \cs{newrefsection}[style = \meta{style-id}, bib-resource = <datafile>, ...]
+ \cs{endrefsection}
+ \end{syntax}
+\end{function}
+
+The \cs{newrefsection} command is similar to the \env{refsection} environment
+except that it is a standalone command rather than an environment.
+It automatically ends the previous reference section (if any) and immediately
+starts a new one.
+The \cs{endrefsection} can terminate the current reference section and restore
+to the global section.
+
+
\subsection{Bibliography Headings}
\begin{function}{\defbibheading}
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 e28620a02d2..aa152dd5fd4 100644
--- a/Master/texmf-dist/doc/latex/cjs-rcs-article/README.md
+++ b/Master/texmf-dist/doc/latex/cjs-rcs-article/README.md
@@ -21,7 +21,7 @@ International.
## Version
-
+1.1a (2024-07-30)
## Author
@@ -133,7 +133,7 @@ licence CC BY-SA 4.0 International.
## Version
-
+1.1a (2024-07-30)
## 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 c64b7fa0a24..fd93cf709b1 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.pdf b/Master/texmf-dist/doc/latex/cjs-rcs-article/cjs-rcs-article.pdf
index 4d9c8ae4f8d..bf7f73c7c41 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 1cc15b18c7f..79fddb7248b 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/dashrulex/README.md b/Master/texmf-dist/doc/latex/dashrulex/README.md
index c0e441ac99a..3e81605ffcb 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.01a)
+## 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..f97a5ef3023 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..5469fc0c371 100644
--- a/Master/texmf-dist/doc/latex/dashrulex/dashrulex.tex
+++ b/Master/texmf-dist/doc/latex/dashrulex/dashrulex.tex
@@ -1,22 +1,22 @@
\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.01a,
+ date = 2024/07/18,
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.
},
color-scheme = blue,
- title-format = \huge\bfseries\scshape,
listings-options = {numbers = none,gobble = 2,lineskip = 1pt},
pre-output = {\parindent = 0em\setstretch{1.3}},
before-skip = \smallskipamount,
@@ -37,9 +37,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 +52,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 +61,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/doibanner/README.md b/Master/texmf-dist/doc/latex/doibanner/README.md
new file mode 100644
index 00000000000..a28fd46abd2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/doibanner/README.md
@@ -0,0 +1,91 @@
+# doibanner
+
+A LaTeX package to generate DOI banners and links.
+
+The `doibanner` package allows to generate a banner for a declared [digital
+object identifier](https://www.doi.org/the-identifier/what-is-a-doi/) (DOI).
+It provides the `\doibanner` macro, which draws the banner using
+[`TikZ`](https://www.ctan.org/pkg/tikz) and adds a link via
+[`hyperref`](https://www.ctan.org/pkg/hyperref), if desired. Its output can
+be scaled by [`adjustbox`](https://www.ctan.org/pkg/adjustbox) and it might
+look as follows:
+
+![_DOI banner generated with `\doibanner`_](./example/doibanner_example.png "Example generated with doibanner")
+
+Latest release: 2024-07-28 v0.3
+
+
+## Installation
+
+Skip this section, if `doibanner` is already provided in your TeX distribution.
+You should be able to install it [from the CTAN](https://www.ctan.org/pkg/doibanner)
+via your distribution's utility (e.g. the TeX Live Utility).
+
+### Manual installation
+
+You can get the package's source code from the
+[project repository on Codeberg](https://codeberg.org/Cs137/doibanner).
+The repository contains a build script, which allows you to build the required
+files for the `doibanner` package and copy them into your _TeX Directory Structure_
+(TDS) using `l3build`. Ensure that `l3build` is installed on your system and run
+it from the repository's root directory as follows:
+
+```bash
+l3build install --full
+```
+
+The `--full` option ensures that all necessary files are built and installed.
+
+If you do not want to install the package into your TDS, but use it in a
+particular LaTeX project, follow the steps listed below.
+
+1. unpack `doibanner.sty` from the `doibanner.dtx` file
+ - using `l3build` and the `build.lua` script: `l3build unpack`, __or__
+ - directly via the installer file: `pdflatex doibanner.ins`
+2. copy the extracted `doibanner.sty` file into the same directory as your LaTeX sources.
+
+
+## Usage
+
+Please consult the [package documentation](http://mirrors.ctan.org/macros/latex/contrib/doibanner/doibanner.pdf)
+for detailed usage information.
+
+If you have any questions or need assistance, feel free to
+[open an issue on the repository](https://codeberg.org/Cs137/doibanner/issues).
+
+
+## Contributing
+
+Contributions to the `doibanner` package are very welcomed. Feel free to submit
+a [pull request (PR)](https://codeberg.org/Cs137/doibanner/pulls), if you would
+like to contribute to the project. In case you are unfamiliar with the process,
+consult the [forgejo documentation](https://forgejo.org/docs/latest/user/pull-requests-and-git-flow/)
+and follow the steps using this repository instead of the `example` repository.
+
+Create your [pull request (PR)](https://codeberg.org/Cs137/doibanner/pulls) to
+inform that you started working on a contribution. Provide a clear description
+of your envisaged changes and the motivation behind them, prefix the PR's title
+with ``WIP: `` until your changes are finalised.
+
+All kind of contributions are appreciated, whether they are
+bug fixes, new features, or improvements to the documentation.
+
+
+### Contributors
+
+- [Christian Schreinemachers](https://codeberg.org/Cs137)
+- [Marei Peischl](https://chaos.social/@TeXhackse)
+
+
+## Changes
+
+All notable changes to this project are documented in the file
+[`CHANGELOG.md`](https://codeberg.org/Cs137/doibanner/src/branch/main/CHANGELOG.md).
+
+
+## Credits
+
+This package was created and is maintained by Christian Schreinemachers, (C) 2024.
+The source code is hosted on [Codeberg](https://codeberg.org/Cs137/doibanner).
+It is subject to the [LaTeX Project Public License 1.3c](https://www.ctan.org/license/lppl1.3).
+
diff --git a/Master/texmf-dist/doc/latex/doibanner/doibanner.pdf b/Master/texmf-dist/doc/latex/doibanner/doibanner.pdf
new file mode 100644
index 00000000000..546b0c9de1f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/doibanner/doibanner.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/easybook/README.md b/Master/texmf-dist/doc/latex/easybook/README.md
index 72378fef178..94518c744b0 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 (v2024cs)
+Easily typesetting Chinese theses or books (v2024di)
## 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.
diff --git a/Master/texmf-dist/doc/latex/easybook/easybook.pdf b/Master/texmf-dist/doc/latex/easybook/easybook.pdf
index d336c3af6dd..445fa0af4ca 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 2d98d894377..582e5af198b 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 = v2024cs,
- date = 2024/07/15,
+ version = v2024di,
+ date = 2024/08/08,
authors = 瞿毅,
info = 简便地排版中文学ä½è®ºæ–‡æˆ–书ç±,
email = toquyi@163.com,
@@ -249,8 +249,8 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
cells = {cmd = \pkg*},
cell{1}{3,4} = PaleTurquoise,
cell{2}{5} = PaleTurquoise,
- cell{3}{2} = PaleTurquoise,
cell{4}{5} = PaleTurquoise,
+ cell{5}{2} = PaleTurquoise,
cell{5}{1} = GreenYellow,
cell{1}{2} = GreenYellow,
cell{3}{1,4} = GreenYellow
@@ -259,7 +259,7 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
enumitem & etoolbox & fancyhdr & geometry & hyperref \\
imakeidx & listings & marginnote & mathtools & multicol \\
pifont & pdfpages & siunitx & spbmark & thmtools \\
- tcolorbox & titletoc & tabularray & ulem &
+ tcolorbox & titletoc & tabularray & &
\end{longtblr}
\section{全局选项}
@@ -298,6 +298,12 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\setCJKmonofont{FangSong}
\newCJKfontfamily[song]\songti{SimSun}
\end{ctexexam}
+
+ 如果用 \textsf{Overleaf} 或 \textsf{TeXPage} 等在线平å°ç¼–译文档,则åªæœ‰ \code{fandol} 字体å¯ç”¨ã€‚使用其它字体å¯å°†å­—体文件上传至项目文件夹,例如上传至 \code{font} 文件夹设置正文和无衬线字体:
+ \begin{ctexexam}
+ \setCJKmainfont{simsun.ttc}[Path = ./font/]
+ \setCJKsansfont{simhei.ttf}[Path = ./font/]
+ \end{ctexexam}
\keychoice{font}{noto,times,times*,ebgaramond,libertine,palatino,\fbox{auto}}\dtag
预置的英文字体相关é…置方案如\ref{table:english font} 所示。这些字体已ç»åŒ…å«åœ¨äº† \hologo{TeXLive} å‘行版中,所以通常ä¸éœ€è¦å†ä¸“门安装。如果您想使用默认的Latin Modern或其它英文字体,å¯ä»¥ä½¿ç”¨ \code{auto} 选项é…åˆ \pkg*{fontspec} å®åŒ…的相关命令进行设置。
\begin{longtblr}
@@ -338,7 +344,7 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\label{sec:interface options}
\begin{cnltxlist}
\command{ctexset}[\oarg{模å—å}\marg{键值列表}]
- \easybook{} 扩展了 \CTeX å®é›† \hologo{LaTeX3} 风格键值的通用控制命令 \cs{ctexset},模å—选项åŒæ ·å¯ç”¨å®ƒè®¾ç½®ï¼ŒåŽŸæœ‰çš„ \meta{键值列表} ä»ç„¶å¯ç”¨ã€‚本文档类目å‰æœ‰9个模å—用于实现常规的排版功能,如\ref{table:module List} 所示。
+ \easybook{} 扩展了 \CTeX å®é›† \hologo{LaTeX3} 风格键值的通用控制命令 \cs{ctexset},模å—选项åŒæ ·å¯ç”¨å®ƒè®¾ç½®ï¼ŒåŽŸæœ‰çš„ \meta{键值列表} ä»ç„¶å¯ç”¨ã€‚本文档类目å‰æœ‰10个模å—用于实现常规的排版功能,如\ref{table:module List} 所示。
\begin{longtblr}
[caption = 模å—功能和å称清å•,label = table:module List]
{
@@ -348,8 +354,8 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
}
\hyperref[subsec:tools]{工具} & \hyperref[subsec:font]{部件字体} & \hyperref[subsec:space]{é—´è·} & \hyperref[subsec:hyperlinks]{超链接} & \hyperref[subsec:reference]{å‚考文献} \\
tools & font & space & ref & bib \\
- \hyperref[subsec:theorem]{定ç†} & \hyperref[subsec:page margins]{页é¢å°ºå¯¸} & \hyperref[subsec:header and footer]{页眉页脚} & \hyperref[subsec:catalog]{目录} & \\
- thmt & geo & hdr & toc &
+ \hyperref[subsec:theorem]{定ç†} & \hyperref[subsec:page margins]{页é¢å°ºå¯¸} & \hyperref[subsec:header and footer]{页眉页脚} & \hyperref[subsec:contents]{目录} & \hyperref[subsec:caption]{图表题注} \\
+ thmt & geo & hdr & toc & cap
\end{longtblr}
\ref{exam:kv setting} 使用\ref{subsec:tools} 介ç»çš„å·¥å…·æ¨¡å— \module*{tools} 举例三ç§é”®å€¼åˆ—表设置方å¼ï¼š1. å„ \meta{模å—å} æ˜¯ç»Ÿä¸€æŽ¥å£ \cs{ctexset} 的键路径。2. ä¸åŒæ¨¡å—还具有å•ç‹¬çš„接å£å‘½ä»¤ \cs*{eb}\meta{模å—å}\code{\textcolor{cs}{set}}。3. \meta{模å—å} 也å¯ä»¥ä½¿ç”¨ \cs{ctexset} 命令的å¯é€‰å‚数设置。路径å与所属下级选项之间å¯ä»¥ \code{/} 或 \code{=} å·åˆ†å¼€ï¼Œæ–œçº¿ \code{/} åŽä¸èƒ½æœ‰ç©ºæ ¼æˆ–者æ¢è¡Œã€‚
@@ -404,12 +410,14 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\ctexset{tools/figurepath = path1}
\ctexset{tools/figurepath = {path2}{path3}}
\end{ctexexam}
+
+ 以下几个选项用于设置题注编å·çš„连字符,\code{chapter} 计数器的值大于0时连字符æ‰æœ‰æ„义。若需更改题注编å·çš„输出格å¼å¯åœ¨æ­£æ–‡ä¸­é‡æ–°å®šä¹‰ \cs*{the}\meta{计数器} 命令。
\keyval{hyphen-figure}{图片连字符}\Default{\Marg{.}}
设置图片题注编å·çš„连字符。
\keyval{hyphen-table}{表格连字符}\Default{\Marg{.}}
设置表格题注编å·çš„连字符。
- \keyval{hyphen-listing}{代ç è¿žå­—符}\Default{\Marg{.}}
- 设置代ç é¢˜æ³¨ç¼–å·çš„连字符。
+ \keyval{hyphen-lstlisting}{代ç è¿žå­—符}\Default{\Marg{.}}
+ 设置代ç é¢˜æ³¨ç¼–å·çš„连字符。\pkg*{listings} å®åŒ…çš„ \option{numberbychapter} 选项失效。
\keyval{hyphen-equation}{å…¬å¼è¿žå­—符}\Default{\Marg{.}}
设置公å¼é¢˜æ³¨ç¼–å·çš„连字符。
\keyval{hyphen-every}{连字符}\Default{\Marg{.}}
@@ -472,7 +480,7 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
设置表格题注的字体,包括字体æ—ã€å­—体系列ã€å­—体尺寸和字体形状命令。
\keyval{caption-figure}{字体命令}\Default{\cs*{sffamily}\cs*{small}}
设置图片题注的字体,包括字体æ—ã€å­—体系列ã€å­—体尺寸和字体形状命令。
- \keyval{caption-listing}{字体命令}\Default{\cs*{sffamily}\cs*{small}}
+ \keyval{caption-lstlisting}{字体命令}\Default{\cs*{sffamily}\cs*{small}}
设置代ç é¢˜æ³¨çš„字体,包括字体æ—ã€å­—体系列ã€å­—体尺寸和字体形状命令。
\keyval{caption-every}{字体命令}\Default{\cs*{sffamily}\cs*{small}}
åŒæ—¶è®¾ç½®å›¾ç‰‡ã€è¡¨æ ¼å’Œä»£ç é¢˜æ³¨çš„字体命令。
@@ -492,7 +500,7 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\label{subsec:reference}
\begin{cnltxlist}
\keychoice{backend}{\fbox{bibtex},biblatex}
- å‚考文献处ç†åŽç«¯ã€‚选择 \code{bibtex} 时使用传统的 \hologo{BibTeX} 引擎处ç†å‚考文献,加载 \pkg*{natbib} å®åŒ…。选择 \code{biblatex} 时使用 \hologo{biber} 引擎,加载 \pkg*{biblatex} å®åŒ…。
+ å‚考文献处ç†åŽç«¯ã€‚选择 \code{bibtex} 时使用传统的 \hologo{BibTeX} 引擎处ç†å‚考文献,加载 \pkg*{natbib} å®åŒ…。选择 \code{biblatex} 时使用 \hologo{biber} 引擎,加载 \pkg*{biblatex} å®åŒ…。若自动载入å‚考文献å®åŒ…则ä½äºŽå¯¼è¨€åŒºæœ«å°¾ï¼Œä½†åœ¨ \pkg*{hyperref} å®åŒ…之å‰ã€‚
\keychoice{bibstyle}{\fbox{numerical},authoryear,\optpath*{other sty}}
å‚考文献格å¼ä½¿ç”¨ä¸­å›½å‚考文献推è标准GB/T 7714-2015,对应顺åºç¼–ç åˆ¶å’Œè‘—者—出版年制两ç§é£Žæ ¼ã€‚若使用其它格å¼ï¼Œä½¿ç”¨ \hologo{BibTeX} 处ç†æ—¶éœ€ç¡®ä¿æ­£ç¡®çš„ \code{bst} 文件,使用 \hologo{biber} 处ç†å¯ä½¿ç”¨ \pkg*{biblatex} å®åŒ…支æŒçš„å‚考文献风格å称。
\keyval{citestyle}{标注风格}
@@ -544,11 +552,11 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\keyval{style}{定ç†æ ·å¼}\Default{default}
选项的值为使用 \cs{declaretheoremstyle} 命令新定义的定ç†æ ·å¼ã€‚
- 使用 \cs{declaretheorem} 命令以\ref{exam:new theorem sty} 中的定ç†æ ·å¼ \code{fancy} 新建一个定ç†çŽ¯å¢ƒçŒœæƒ³ï¼Œç„¶åŽç”¨ä¸€ä¸ªåŸºäºŽ \pkg*{tcolorbox} å®åŒ…çš„é¢„ç½®å½©è‰²ç›’å­ \env{easyboxi} 增加背景:
+ 使用 \cs{declaretheorem} 命令以\ref{exam:new theorem sty} 中的定ç†æ ·å¼ \code{fancy} 新建一个定ç†çŽ¯å¢ƒ \env*{lemma},然åŽç”¨ä¸€ä¸ªåŸºäºŽ \pkg*{tcolorbox} å®åŒ…çš„é¢„ç½®å½©è‰²ç›’å­ \env{easyboxi} 增加背景:
\begin{ctexexam}[labelref = exam:new theorem env]
- \declaretheorem[style = fancy,name = 猜想]{caixiang}
+ \declaretheorem[style = fancy,name = 引ç†]{lemma}
\addtotcbstyle{tc-easyboxi}{colback = GreenYellow}
- \tcolorboxenvironment{caixiang}{tc-easyboxi}
+ \tcolorboxenvironment{lemma}{tc-easyboxi}
\end{ctexexam}
\command{declaretheoremstyle}[\oarg{键值列表1}\marg{定ç†æ ·å¼}\oarg{键值列表2}]
定ç†æ ·å¼å£°æ˜Žå‘½ä»¤ï¼Œé”®å€¼åˆ—表支æŒè‡ªèº«ä»¥åŠå®šç†å£°æ˜Žå‘½ä»¤ \cs{declaretheorem} 的所有选项。å¯é€‰å‚æ•°çš„ \meta{键值列表1} 与 \meta{键值列表2} 等效,其中支æŒçš„选项如下:
@@ -591,21 +599,21 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\command{listoftheorems}[\sarg\oarg{键值列表}]\default{}
\item\key{listoftheorems}{定ç†ç›®å½•æ ‡é¢˜å}
\command{settheoremtocline}[\sarg\marg{环境å}\marg{标题定义}]\newtagv{2024bb}%
- 对 \pkg*{thmtools} å®åŒ…的定ç†çŽ¯å¢ƒç›®å½•å‘½ä»¤ \cs{listoftheorems} 进行了适é…调整,\ref{subsec:directory command} å’Œ\ref{subsec:catalog} 中的选项机制å‡å¯ç”¨ï¼Œä½†æ ‡é¢˜å®šä¹‰é€‰é¡¹ \option{tocline} 较为特殊,需用 \cs{settheoremtocline} 命令å•ç‹¬è®¾ç½®ã€‚在 \meta{标题定义} 中有三个命令 \cs{thmtname}ã€\cs{thmtenvname} å’Œ \cs{thmtnote} 分别代表定ç†åã€å®šç†çŽ¯å¢ƒå和题注用于排版目录æ¡ç›®ã€‚
+ 对 \pkg*{thmtools} å®åŒ…的定ç†çŽ¯å¢ƒç›®å½•å‘½ä»¤ \cs{listoftheorems} 进行了适é…调整,\ref{subsec:directory command} å’Œ\ref{subsec:contents} 中的选项机制å‡å¯ç”¨ï¼Œä½†æ ‡é¢˜å®šä¹‰é€‰é¡¹ \option{tocline} 较为特殊,需用 \cs{settheoremtocline} 命令å•ç‹¬è®¾ç½®ã€‚在 \meta{标题定义} 中有三个命令 \cs{thmtname}ã€\cs{thmtenvname} å’Œ \cs{thmtnote} 分别代表定ç†åã€å®šç†çŽ¯å¢ƒå和题注用于排版目录æ¡ç›®ã€‚
\end{cnltxlist}
\optpath{thmt/}\key{loeskip}{弹性长度}\Default{10pt}
定ç†ç›®å½•ä¸­æ¯ç« ç¬¬ä¸€ä¸ªæ¡ç›®ä¸Šæ–¹å¢žåŠ çš„åž‚ç›´è·ç¦»ã€‚与 \CTeX 的表格和图片目录中æ¯ç« é—´çš„æ¡ç›®è·ç¦»é€‰é¡¹ \option*{lotskip} å’Œ \option*{lofskip} 类似,在 \cls*{article} 模å¼ä¸­æ­¤é€‰é¡¹å¤±æ•ˆã€‚
\command{thmtifnote}[\marg{存在题注代ç }\marg{ä¸å­˜åœ¨é¢˜æ³¨ä»£ç }]
- 如果标题没题注å³å®šç†çŽ¯å¢ƒä¸ç”¨å¯é€‰å‚数,则标题ä¸åŠ å…¥å®šç†ç›®å½•ï¼Œè¿™æ˜¯é»˜è®¤ä¸”åˆç†çš„行为。若需è¦å°†æ— é¢˜æ³¨çš„标题加入目录å¯å°† \meta{环境å} 加入目录风格的 \option{show} 选项或使用 \cs*{settheoremtocline}\code{*} 命令。是å¦å­˜åœ¨é¢˜æ³¨éœ€è¦åœ¨ \meta{标题定义} 中使用 \cs{thmtifnote} 命令判定,从而输出ä¸åŒçš„内容。
+ 如果标题没题注å³å®šç†çŽ¯å¢ƒä¸ç”¨å¯é€‰å‚数,则标题ä¸åŠ å…¥å®šç†ç›®å½•ï¼Œè¿™æ˜¯é»˜è®¤ä¸”åˆç†çš„行为。若需è¦å°†æ— é¢˜æ³¨çš„标题加入目录å¯å°† \meta{环境å} 传给目录风格的 \option{show} 选项或使用 \cs*{settheoremtocline}\code{*} 命令。是å¦å­˜åœ¨é¢˜æ³¨éœ€è¦åœ¨ \meta{标题定义} 中使用 \cs{thmtifnote} 命令判定,从而输出ä¸åŒçš„内容。
\command{thmtifname}[\marg{存在编å·ä»£ç }\marg{ä¸å­˜åœ¨ç¼–å·ä»£ç }]
在 \meta{标题定义} 中测试当å‰å®šç†æ˜¯å¦æœ‰ç¼–å·ä»Žè€Œè¾“出ä¸åŒçš„内容,定ç†é£Žæ ¼é€‰é¡¹ \keyis{numbered}{no} 设置当å‰å®šç†çŽ¯å¢ƒæ²¡æœ‰ç¼–å·ã€‚
\begin{ctexexam}
- \contentsuse{caixiang}{loe}
- \RegisterTocName{caixiang}
- \setlisttheoremstyle{ignoreall,show = caixiang}
- \settheoremtocline{caixiang}
+ \contentsuse{lemma}{loe}
+ \RegisterTocName{lemma}
+ \setlisttheoremstyle{ignoreall,show = lemma}
+ \settheoremtocline{lemma}
{
- \listnumberline{caixiang}
+ \listnumberline{lemma}
\thmtname\thmtifnote{[\thmtnote]}{}
}
\end{ctexexam}
@@ -632,6 +640,32 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\end{ctexexam}
\end{cnltxlist}
+\subsection[图表题注]{图表题注\smodule{cap}}
+\label{subsec:caption}
+æ¨¡å— \module*{cap} 用于设置图表等浮动体的题注格å¼ã€‚题注主è¦ç”±ä¸‰éƒ¨åˆ†ç»„æˆï¼šæ ‡é¢˜æ ‡ç­¾å³å›¾è¡¨å与题注编å·çš„组åˆï¼Œæ ‡é¢˜æ–‡æœ¬æœ¬èº«é€šå¸¸æ˜¯å†…容的简短æ述,以åŠå°†æ–‡æœ¬ä¸Žæ ‡ç­¾åˆ†å¼€çš„题注分隔符。å¯ä»¥åœ¨å¯¼è¨€åŒºè®¾ç½®æ•´ä½“æ ¼å¼ï¼Œä¹Ÿå¯ä»¥åœ¨æ­£æ–‡ä½¿ç”¨å±€éƒ¨æ›´æ”¹æ ¼å¼ã€‚æ¨¡å— \module*{cap} ç”± \pkg*{caption} å®åŒ…æ供支æŒï¼ŒæŽ¥å£é€‰é¡¹ä¸Ž \pkg*{caption} å®åŒ…完全一致,但写法为 \meta{æ¡ç›®å}\code{/}\meta{选项}。\pkg*{caption} å®åŒ…æ供了多ç§æ–¹æ³•æ¥å®šåˆ¶æµ®åŠ¨çŽ¯å¢ƒï¼ˆä¾‹å¦‚ \env{figure} å’Œ \env{table})中的题注,并å¯ä¸Žè®¸å¤šå…¶å®ƒå®åŒ…é…åˆä½¿ç”¨ã€‚功能包括旋转题注ã€ä¾§å‘题注和连续题注等。下é¢åˆ—举几个题注选项的用法,\ref{exam:caption set} 中两ç§è®¾ç½®é¢˜æ³¨çš„方法是等效的,更多选项和创建方法å¯æŸ¥çœ‹å®åŒ…文档:
+\begin{cnltxlist}[itemsep = 0ex]
+ \keyval{table/labelsep}{标签分隔符}\default{}
+ \keyval{figure/format}{题注格å¼}\default{}
+ \keyval{lstlisting/font}{题注字体}\default{}
+ \begin{ctexexam}[labelref = exam:caption set]
+ \ctexset[cap]
+ {
+ table/labelsep = space,
+ figure/format = plain
+ }
+ \captionsetup[table]{labelsep = space}
+ \captionsetup[figure]{format = plain}
+ \end{ctexexam}
+ \begin{cnltxlist}
+ \command{RegisterCapOptions}[\marg{æ¡ç›®å列表}]
+ ç»™æ¨¡å— \module*{cap} 注册题注类型为 \meta{æ¡ç›®å} çš„ \pkg*{caption} 接å£é€‰é¡¹ã€‚已预注册 \module*{figure}ã€\module*{table} å’Œ \module*{lstlisting} 三ç§ç±»åž‹çš„题注选项。å¯ä»¥æ­é… \pkg*{newfloat} å®åŒ…创建更多类型的浮动环境并设置相应题注。
+ \end{cnltxlist}
+ \command{caption}[\sarg\oarg{目录标题}\marg{标题}]\default{}
+ \command{captionof}[\sarg\marg{æ¡ç›®å}\oarg{目录标题}\marg{标题}]\default{}
+ \command{bicaption}[\sarg\oarg{目录中文标题}\marg{中文标题}\oarg{目录英文标题}\marg{英文标题}]
+ 题注命令 \cs{caption} 用于在图表上下方æ’入题注,需è¦åœ¨æµ®åŠ¨çŽ¯å¢ƒ \env*{figure} å’Œ \env*{table} 中使用。在浮动环境外å¯ä»¥ä½¿ç”¨ \cs{captionof} 命令,第一个å‚数指定æ¡ç›®å。\cs{bicaption} 命令å¯ä»¥å®žçŽ°ä¸­è‹±æ–‡åŒè¯­é¢˜æ³¨ï¼Œéœ€è¦åœ¨å¯¼è¨€åŒºè½½å…¥ \pkg*{bicaption} å®åŒ…,具体用法è§å®åŒ…文档。
+\end{cnltxlist}
+
\subsection[页眉页脚]{页眉页脚\smodule{hdr}}
\label{subsec:header and footer}
æ¨¡å— \module*{hdr} 设置的命令由 \pkg*{fancyhdr} å®åŒ…æ供支æŒã€‚标题标记由标签和标题组æˆï¼Œé€‰é¡¹ä¸­å‚æ•° \code{\#1} 代表当å‰ç« ã€èŠ‚或å°èŠ‚的标题。在 \cls*{book} 模å¼æ—¶ä½¿ç”¨æ ‡é¢˜æ ‡è®°é€‰é¡¹ \option{chapter-mark} å’Œ \option{section-mark},在 \cls*{article} 模å¼æ—¶ä½¿ç”¨ \option{section-mark} å’Œ \option{subsection-mark} 选项,这与标准文档类的行为一致。é‡æ–°è®¾ç½®æ ‡é¢˜æ ‡è®°é€‰é¡¹æ—¶æ ‡è®°å¤§å°å†™é€‰é¡¹ \option{uppercase} 会失效。
@@ -708,6 +742,8 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\ebhdrset{footnotetype = plain,footnotetype = bottom}
\ebhdrset{footnotetype = {hang,bottom}}
\end{ctexexam}
+ \command{PushFntBottom}\newtagv{2024cx}%
+ 默认情况下当具有 \code{b} å‚数的底部浮动体与脚注åŒæ—¶å­˜åœ¨æ—¶ï¼Œè„šæ³¨å°†ä½äºŽæµ®åŠ¨ä½“上部。此命令å¯ä½¿è„šæ³¨å§‹ç»ˆä½äºŽé¡µé¢åº•éƒ¨ï¼Œä¸Ž \keyis{footnotetype}{bottom} 作用相åŒï¼Œåªèƒ½åœ¨å¯¼è¨€åŒºå…¨å±€ä½¿ç”¨ã€‚
\keyval{fnfirstindent}{刚性长度}\Default{1em}
æ¯ä¸ªè„šæ³¨é¦–段的首行缩进(悬挂缩进 \code{hang} 为整段缩进),等于长度 \cs{fnfirstindent} 的值。
\keyval{fnafterindent}{刚性长度}\Default{2em}
@@ -803,7 +839,7 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\end{cnltxlist}
\subsection[目录]{目录\smodule{toc}}
-\label{subsec:catalog}
+\label{subsec:contents}
æ¨¡å— \module*{toc} 将使用 \pkg*{titletoc} å®åŒ…处ç†ç›®å½•æ ·å¼ã€‚默认包括 \module*{part}$\longrightarrow$\module*{subparagraph}ã€\module*{figure}ã€\module*{table} å’Œ \module*{lstlisting} æ¡ç›®å的键路径。选项å‰å¸¦æœ‰\hface 符å·è¡¨ç¤ºæ”¯æŒæ‰€æœ‰ç›¸åº”\textbf{æ¡ç›®å}的路径,其它选项则处于 \module*{toc} 键路径下。目录选项å‡æ”¯æŒæ ‡é¢˜ç¼–å·åˆ¤å®šå‘½ä»¤ \cs{CTEXifname}\footnote{此功能需è¦\textbf{2023/06/01}以åŽçš„ \hologo{LaTeX} 内核支æŒã€‚}。目å‰æ”¯æŒå¤šæ•°å­¦æœ¯è®ºæ–‡ç›®å½•æ ·å¼ï¼Œæ›´å¤æ‚çš„æ ·å¼å¯ä»¥æŸ¥çœ‹ \pkg*{titletoc} 的相关用法。
\begin{cnltxlist}
\keyval{tocformat}{æ¡ç›®æ ¼å¼}\dtag
@@ -867,16 +903,16 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\DeclareFloatList{algorithm}{loa}
\listofalgorithms[multoc] % 在正文中输出åŒæ ç®—法目录
\end{ctexexam}
- \command{AllotCaptionExt}[\marg{æ¡ç›®å}\marg{扩展å}]
+ \command{AssignCaptionExt}[\marg{æ¡ç›®å}\marg{扩展å}]
ç»™æ¡ç›®ç±»åž‹å称为 \meta{æ¡ç›®å} 的标题分é…目录文件 \meta{扩展å}ï¼Œæ³¨æ„ \meta{扩展å} 需è¦è¢«å®šä¹‰åœ¨ \cs*{ext@}\meta{æ¡ç›®å} 命令中æ‰æœ‰æ•ˆï¼ˆ\pkg*{caption} å®åŒ…的默认定义形å¼ï¼‰ã€‚å¯ä»¥ä½¿ä¸åŒçš„ \meta{æ¡ç›®å} 共享一个目录:
\begin{ctexexam}
- \AllotCaptionExt{table}{lof}
+ \AssignCaptionExt{table}{lof}
\newcommand{\listoffiguretables}{\listoffigures} % åŒæ—¶è¾“出图表目录的命令
\end{ctexexam}
- \command{AllotPartialExt}[\marg{扩展å1}\marg{扩展å2}]\newtagv{2024bk}
+ \command{AssignPartialExt}[\marg{扩展å1}\marg{扩展å2}]\newtagv{2024bk}
给目录文件扩展å为 \meta{扩展å1} 的目录分é…扩展å为 \meta{扩展å2} 的局部目录\footnote{此功能需è¦\textbf{2023/06/01}以åŽçš„ \hologo{LaTeX} 内核支æŒã€‚},预注册的æ¡ç›®å‡æ— éœ€å†åˆ†é…。用于æ­é…题注标题 \cs{caption} 命令和 \pkg*{titletoc} å®åŒ…的局部题注目录命令。
\begin{ctexexam}
- \AllotPartialExt{loa}{pla}
+ \AssignPartialExt{loa}{pla}
\startlist[fancy]{loa}
\captionof{algorithm}{算法标题}
\stoplist[fancy]{loa}
@@ -913,6 +949,8 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
将目录页ç è£…进一个å³å¯¹é½çš„水平盒å­é‡Œã€‚这样å¯ä»¥ä½¿ç›®å½•å¼•å¯¼çº¿å³ç«¯å¯¹é½å¹¶ä¸Žé¡µç ä¿æŒä¸€å®šé—´è·ï¼Œå¦åˆ™ä¼šä¸Žé¡µç ç›¸è¿žã€‚
\keyval{pagenumwd}{刚性长度}\Default{1.55em}
è®¾ç½®å¼€å¯ \option{dotalign} 选项时页ç æ°´å¹³ç›’å­çš„宽度。
+ \keychoice{fileopen}{\fbox{once},odd}
+ 编译文档时打开目录文件进行写入æ“作的方å¼ï¼Œè¿™ä¸ªé€‰é¡¹å½±å“é‡å¤ä½¿ç”¨ç›®å½•å‘½ä»¤æ—¶çš„输出行为。默认åªåœ¨ç¬¬ä¸€æ¬¡ç¼–译时打开文件,选择 \code{odd} 将仅在奇数次编译时打开文件。
\keyval{tocafter-every}{è·ç¦»å‘½ä»¤}\Default{\cs*{hspace}\Marg{1em}}
统一设置所有类型æ¡ç›®ç¼–å·ä¸Žæ ‡é¢˜é—´çš„代ç ã€‚
\keyval{tocindent-every}{刚性长度}
@@ -925,8 +963,47 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\section{环境和命令}
-\subsection{文区命令}
+\subsection{å°é¢å’Œæ–‡åŒº}
\begin{cnltxlist}
+ \command{maketitle}[\oarg{键值列表}]\newtagv{2024dh}%
+ é‡æ–°æ”¹å†™äº†é»˜è®¤çš„å°é¢æ ‡é¢˜å‘½ä»¤ï¼Œåœ¨ä¿è¯åŽŸç”Ÿé£Žæ ¼çš„å‰æ下使用 \pkg*{xtemplate} å®åŒ…å°†å°é¢æŠ½è±¡ä¸ºç”±å®žä¾‹ç»„æˆçš„模æ¿ã€‚并为命令增加了å¯é€‰å‚数,选项的å«ä¹‰ä¸Žæ ‡å‡†æ–‡æ¡£ç±»ä¸€è‡´ï¼š
+ \keyval{title}{文档标题}
+ 设置文档的标题,å¯ä»¥åŒ…å«æ ¼å¼å‘½ä»¤ã€‚如果没有设置标题而输出å°é¢ä¼šæŠ¥é”™ã€‚
+ \keyval{author}{文档作者}
+ 设置文档的作者,å¯ä»¥åŒ…å«æ ¼å¼å‘½ä»¤ã€‚多ä½ä½œè€…之间å¯ä»¥ç”¨ \cs*{and} 命令分隔,æ¯ä¸ªä½œè€…åŽå¯ç”¨ \cs*{thanks} 命令添加致谢脚注。
+ \keyval{date}{文档日期}\Default{\cs*{today}}
+ 设置文档的日期,å¯ä»¥åŒ…å«æ ¼å¼å‘½ä»¤ã€‚默认的文档日期为当å‰æ—¥æœŸ \cs*{today}。
+ \command{DeclareInstance}[\Marg{easybook}\marg{ä½ç½®}\Marg{cover}\marg{键值列表}]
+ å°é¢æ¨¡æ¿å¯ç”¨ \pkg*{xtemplate} æ供的实例声明命令进行自由定制,\ref{exam:cover instance} 举例说明了定制页é¢ä¸­éƒ¨çš„内容。模æ¿ç”±é¡µé¢ä¸Šã€ä¸­å’Œä¸‹ä¸‰ä¸ªä½ç½®çš„实例组æˆï¼Œå®ƒä»¬çš„ \meta{ä½ç½®} å字分别为 \code{top}ã€\code{middle} å’Œ \code{bottom}。æ¯ä¸ªå®žä¾‹çš„属性å¯ç”¨ \meta{键值列表} 修改,包å«çš„选项如下:
+ \keyval{content}{实例内容}
+ 设置实例内容,å¯ä»¥åŒ…å«ä»»ä½•è®°å·åˆ—表的代ç ã€‚通常为格å¼å’ŒæŽ’版内容的命令,在局部生效。
+ \keyval{beforecode}{实例å‰ä»£ç }
+ 设置实例内容å‰çš„代ç ï¼Œå¯ä»¥åŒ…å«ä»»ä½•è®°å·åˆ—表的代ç ã€‚通常为æ¢é¡µå’Œåž‚ç›´è·ç¦»çš„命令。
+ \keyval{aftercode}{实例åŽä»£ç }
+ 与 \option{before} 选项类似,设置实例内容åŽçš„代ç ã€‚
+ \keychoice{align}{l,\fbox{c},r,n}
+ 设置实例内容的对é½æ–¹å¼ï¼Œåˆ†åˆ«ä¸ºå·¦ã€ä¸­ã€å³å’Œè‡ªç„¶å¯¹é½ï¼Œè‡ªç„¶å¯¹é½å³æ­£å¸¸çš„段è½æ–‡æœ¬ã€‚
+ \begin{ctexexam}[labelref = exam:cover instance]
+ \DeclareInstance{easybook}{middle}{cover}
+ {
+ content =
+ {
+ \thispagestyle{empty}
+ \begin{tblr}
+ {
+ columns = c,
+ hline{2-4} = {2}{0.5pt,solid},
+ column{1} = {rightsep = 0pt}
+ }
+ 标题:& 一个文档标题 \\
+ 作者:& 张三 \\
+ 日期:& \today
+ \end{tblr}
+ },
+ beforecode = \null\vspace{3cm},
+ aftercode = \clearpage
+ }
+ \end{ctexexam}
\command{frontmatter}[\sarg\oarg{ç¼–å·æ ¼å¼}]\Default{Roman}
å‰è¨€åŒºå‘½ä»¤ã€‚使部分和章标题ä¸ç¼–å·ï¼Œå¸¦æœ‰æ˜Ÿå·çš„å˜ä½“命令ä¸ä½¿ç”¨ \cs{cleardoublepage} å‘½ä»¤ã€‚é¡µç  \meta{ç¼–å·æ ¼å¼} å¯è®¾ç½®ä¸º \code{arabic}ã€\code{Alph}ã€\code{alph}ã€\code{Roman}ã€\code{roman} å’Œ \code{chinese} å½¢å¼ã€‚
\command{mainmatter}[\sarg]
@@ -941,7 +1018,7 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\subsection{目录命令}
\label{subsec:directory command}
-\easybook{} 改进了标准文档类中定制性较低的章节标题和图表标题目录命令。现在目录命令带有å¯é€‰å‚数用于设置标题格å¼å’Œæ æ•°ç­‰ï¼Œå¹¶ä¸”与标准文档类ä¸åŒçš„是目录命令å¯åœ¨æ­£æ–‡ä¸­\textbf{é‡å¤}使用\footnote{此功能需è¦\textbf{2023/06/01}以åŽçš„ \hologo{LaTeX} 内核支æŒã€‚}。更多目录命令的创建和样å¼è®¾ç½®å¯å‚考\ref{subsec:catalog}。
+\easybook{} 改进了标准文档类中定制性较低的章节标题和图表标题目录命令。现在目录命令带有å¯é€‰å‚数用于设置标题格å¼å’Œæ æ•°ç­‰ï¼Œå¹¶ä¸”与标准文档类ä¸åŒçš„是目录命令å¯åœ¨æ­£æ–‡ä¸­\textbf{é‡å¤}使用\footnote{此功能需è¦\textbf{2023/06/01}以åŽçš„ \hologo{LaTeX} 内核支æŒã€‚}。更多目录命令的创建和样å¼è®¾ç½®å¯å‚考\ref{subsec:contents}。
\begin{cnltxlist}
\command{tableofcontents}[\sarg\oarg{键值列表}\darg{代ç é’©å­}]
章节标题目录命令,支æŒä¸­è‹±æ–‡åŒè¯­æ ‡é¢˜ç›®å½•è¾“出。带有星å·å‚æ•°ä¸è¾“出目录æ¡ç›®ä¸Šæ–¹çš„标题。\meta{代ç é’©å­} 是当输出方案 \keyis{plan}{both} 时中文与英文目录之间执行的代ç ï¼Œå¯ä»¥æ’入设置目录样å¼å’Œæ¢é¡µç­‰å‘½ä»¤ã€‚
@@ -1300,30 +1377,16 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\end{ctexexam}
\end{cnltxlist}
-\subsection{图表题注}
-\pkg*{caption} å®åŒ…æ供了多ç§æ–¹æ³•æ¥å®šåˆ¶æµ®åŠ¨çŽ¯å¢ƒï¼ˆä¾‹å¦‚ \env{figure} å’Œ \env{table})中的标题,并å¯ä¸Žè®¸å¤šå…¶å®ƒå®åŒ…é…åˆä½¿ç”¨ã€‚功能包括旋转题注ã€ä¾§å‘题注和连续题注等。
-\begin{cnltxlist}
- \command{captionsetup}[\oarg{æ¡ç›®å}\marg{键值列表}]
- 这是 \pkg*{caption} å®åŒ…的接å£å‘½ä»¤ï¼Œ\meta{键值列表} æ供多个选项更改图表题注的格å¼ã€‚题注主è¦ç”±ä¸‰éƒ¨åˆ†ç»„æˆï¼šæ ‡é¢˜æ ‡ç­¾å³å›¾è¡¨å与题注编å·çš„组åˆï¼Œæ ‡é¢˜æ–‡æœ¬æœ¬èº«é€šå¸¸æ˜¯å†…容的简短æ述,以åŠå°†æ–‡æœ¬ä¸Žæ ‡ç­¾åˆ†å¼€çš„题注分隔符。å¯ä»¥åœ¨å¯¼è¨€åŒºè®¾ç½®æ•´ä½“æ ¼å¼ï¼Œä¹Ÿå¯ä»¥åœ¨æ­£æ–‡ä½¿ç”¨å±€éƒ¨æ›´æ”¹æ ¼å¼ã€‚
-\end{cnltxlist}
-
-\begin{cnltxlist}[itemsep = 0ex]
- \command{caption}[\sarg\oarg{目录标题}\marg{标题}]\default{}
- \command{captionof}[\sarg\marg{æ¡ç›®å}\oarg{目录标题}\marg{标题}]\default{}
- \command{bicaption}[\sarg\oarg{目录中文标题}\marg{中文标题}\oarg{目录英文标题}\marg{英文标题}]
- 题注命令 \cs{caption} 用于在图表上下方æ’入题注,需è¦åœ¨æµ®åŠ¨çŽ¯å¢ƒ \env*{figure} å’Œ \env*{table} 中使用。在浮动环境外å¯ä»¥ä½¿ç”¨ \cs{captionof} 命令,第一个å‚数指定æ¡ç›®å。å¯ä»¥æ­é… \pkg*{newfloat} å®åŒ…创建更多类型的浮动环境并设置相应题注。\cs{bicaption} 命令å¯ä»¥å®žçŽ°ä¸­è‹±æ–‡åŒè¯­é¢˜æ³¨ï¼Œéœ€è¦åœ¨å¯¼è¨€åŒºè½½å…¥ \pkg*{bicaption} å®åŒ…,具体用法è§è¯´æ˜Žæ–‡æ¡£ã€‚
-\end{cnltxlist}
-
\subsection{索引}
\begin{cnltxlist}
\command{indexsetup}[\marg{键值列表}]
- \pkg*{imakeidx} å®åŒ…增强了索引的功能,å¯ä½¿ç”¨æˆ·åœ¨åˆ¶ä½œå’ŒæŽ’版文档的åŒæ—¶åˆ¶ä½œä¸€ä¸ªæˆ–多个索引。这是 \pkg*{imakeidx} å®åŒ…的接å£å‘½ä»¤ï¼Œç”¨äºŽè®¾ç½®ç´¢å¼•è¡¨çš„整体格å¼ã€‚
+ \pkg*{imakeidx} å®åŒ…增强了索引的功能,å¯ä½¿ç”¨æˆ·åœ¨åˆ¶ä½œå’ŒæŽ’版文档的åŒæ—¶åˆ¶ä½œä¸€ä¸ªæˆ–多个索引。这是 \pkg*{imakeidx} å®åŒ…的接å£å‘½ä»¤ï¼Œç”¨äºŽè®¾ç½®ç´¢å¼•è¡¨çš„整体格å¼ï¼Œå®ƒçš„ \option{level} å’Œ \option{headers} 选项失效。
\command{index}[\oarg{索引å}\marg{标签}]
索引标签命令的å¯é€‰å‚æ•°å¯ä»¥ç”¨ä¸åŒçš„ \meta{索引å} 给多个索引表设置标签。
\command{makeindex}[\oarg{键值列表}]
用于导言区开å¯ç´¢å¼•æ”¶é›†çš„命令。这个命令å¯ä»¥é‡å¤ä½¿ç”¨æ”¶é›†å¤šä¸ªç´¢å¼•è¡¨ï¼Œä»¥ä¸åŒçš„ \meta{索引å} 作为区分,如果仅打å°ä¸€ä¸ªç´¢å¼•è¡¨æ²¡å¿…è¦é‡å¤ä½¿ç”¨ã€‚
\command{printindex}[\sarg\oarg{键值列表}]
- 打å°ä¸åŒç´¢å¼•è¡¨çš„命令。这个命令被é‡æ–°å®šä¹‰ï¼Œ\meta{键值列表} 中的选项与\ref{subsec:directory command} 其它目录命令相åŒï¼Œä½†æ˜¯æŽ¥å£å‘½ä»¤ \cs{indexsetup} 的部分选项失效。
+ 打å°ä¸åŒç´¢å¼•è¡¨çš„命令。这个命令被é‡æ–°å®šä¹‰ï¼Œ\meta{键值列表} 中的选项与\ref{subsec:directory command} 其它目录命令相åŒï¼Œå¹¶å¤šå‡º \option{name} 选项用于指定打å°ç´¢å¼•çš„å字。
\keyval{name}{索引å}
指定输出å为 \meta{索引å} 的索引表,如果åªä½¿ç”¨ä¸€ä¸ªç´¢å¼•è¡¨åˆ™é»˜è®¤ä¸ºé¡¹ç›®æ–‡ä»¶åä¸éœ€è¦æŒ‡å®šã€‚
\end{cnltxlist}
@@ -1379,14 +1442,6 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
该命令由文档å®åŒ… \pkg*{pdfpages} æ供。å¯ä»¥å°†å…¶å®ƒ \code{pdf} 文档æ’入当å‰æ–‡æ¡£ï¼Œæ¯”如æ’入其它软件制作的å°é¢ã€‚å¯é€‰å‚æ•°å¯ä»¥æŒ‡å®šæ’入页数ã€é€»è¾‘页和横å‘页é¢ç­‰ï¼Œè¯¦æƒ…查看å®åŒ…文档。
\end{cnltxlist}
-\subsection{下划线}
-\begin{cnltxlist}[itemsep = 0ex]
- \command{uline}[\marg{下划直线}]\default{}
- \command{uuline}[\marg{下划åŒç›´çº¿}]\default{}
- \command{uwave}[\marg{下划波浪线}]
- \pkg*{ulem} å®åŒ…æ供了多ç§ä¸‹åˆ’线命令,å¯ä»¥é‡æ–°å®šä¹‰ \cs{ULthickness} 命令控制下划线的粗细。下划线的深度由 \cs{ULdepth} 控制,默认值 \cs*{maxdimen} 是一个å…许深度根æ®å½“å‰å­—体å˜åŒ–的特殊标志,当然也å¯ä»¥ä½¿ç”¨ \cs*{setlength} 设定为指定深度。
-\end{cnltxlist}
-
\appendix
\setlist[1]{}
\begin{changelog}[title = 更新日志]
@@ -1429,7 +1484,7 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\item 新增脚注段è½æ–‡æœ¬æ ¼å¼å®šä¹‰å‘½ä»¤ \cs{deffntpara} 和脚注间è·ç¦»é€‰é¡¹ \option{footnotesep}。
\item 新增悬挂缩进命令 \cs{hangfrom}。
\item 新增行间公å¼ä¸Žæ­£æ–‡ä¸Šä¸‹é—´è·é€‰é¡¹ \option{abovedisplayskip} å’Œ \option{belowdisplayskip}。
- \item 新增目录文件扩展å分é…命令 \cs{AllotCaptionExt}。
+ \item 新增目录文件扩展å分é…命令 \cs{AssignCaptionExt}。
\end{version}
\shortversion{v = 2024aq,date = 2024/03/31,changes = ä¿®å¤å‘½ä»¤ \cs{ebifbitoc} 用于æ¡ç›®ç¼©è¿›é€‰é¡¹ \option{tocindent} 失效的问题。}
\begin{version}[v = 2024as,date = 2024/04/19]
@@ -1441,7 +1496,7 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\end{version}
\shortversion{v = 2024aw,date = 2024/04/22,changes = 新增新建章节标题命令 \cs{NewTitleCommand} 和 \cs{NewTitleEntryCommand}。}
\shortversion{v = 2024bb,date = 2024/04/26,changes = 增加对 \pkg*{thmtools} å®åŒ…定ç†çŽ¯å¢ƒç›®å½• \cs{listoftheorems} 的支æŒã€‚}
- \shortversion{v = 2024bk,date = 2024/05/07,changes = 新增局部题注目录分é…命令 \cs{AllotPartialExt}。}
+ \shortversion{v = 2024bk,date = 2024/05/07,changes = 新增局部题注目录分é…命令 \cs{AssignPartialExt}。}
\begin{version}[v = 2024bn,date = 2024/05/10]
\fixed
\item ä¿®å¤ \module*{toc} 模å—中带有 \option*{every} åŽç¼€çš„选项ä¸å¯¹æ‰€æœ‰å·²æ³¨å†Œæ¡ç›®æœ‰æ•ˆçš„问题。
@@ -1458,6 +1513,15 @@ $\blacktriangleright$需è¦æ³¨æ„正确\textbf{编译索引}è¦å¢žåŠ  \code{-she
\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}。}
+ \shortversion{v = 2024cu,date = 2024/07/20,changes = ä¿®å¤æ— ç¼–å·çš„定ç†çŽ¯å¢ƒæ ‡ç­¾å‘½ä»¤ \cs*{p@}\meta{定ç†å} 缺失导致报错的问题。}
+ \shortversion{v = 2024cx,date = 2024/07/28,changes = 新增将脚注置于页é¢åº•éƒ¨çš„命令 \cs{PushFntBottom}。}
+ \begin{version}[v = 2024dh,date = 2024/08/06]
+ \changed
+ \item å–消默认载入 \pkg*{ulem} 下划线å®åŒ…。
+ \added
+ \item 使用 \pkg*{xtemplate} å®åŒ…å°†å°é¢æ ‡é¢˜å‘½ä»¤ \cs{maketitle} 抽象为由实例组æˆçš„模æ¿ã€‚
+ \item æ–°å¢žå›¾è¡¨é¢˜æ³¨æ¨¡å— \module*{cap}。
+ \end{version}
\end{changelog}
\nocite{*}
% \AddToHook{cmd/printindex/before}{\clearpage}
diff --git a/Master/texmf-dist/doc/latex/fancyhdr/README b/Master/texmf-dist/doc/latex/fancyhdr/README
index 4a7d219fdc0..3131149015c 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.1 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..35cc4524ff6 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/fillwith/MANIFEST.md b/Master/texmf-dist/doc/latex/fillwith/MANIFEST.md
new file mode 100644
index 00000000000..4cfe5172382
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fillwith/MANIFEST.md
@@ -0,0 +1,54 @@
+# Manifest for fillwith
+
+Copyright (C) Fri Aug 9 12:12:59 2024 Clea F. Rees
+
+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.3 or later is part of all distributions of LaTeX version
+2008-05-04 or later.
+
+This work has the LPPL maintenance status `maintained'.
+
+The Current Maintainer of this work is Clea F. Rees.
+
+This work consists of all files listed in manifest.txt.
+
+This file was automatically generated by `l3build manifest`.
+
+## Source files
+
+
+### Package files
+
+
+* README.md
+* MANIFEST.md
+* fillwith.dtx
+* fillwith.ins
+
+### Development files
+
+
+* build.lua
+* manifest.lua
+* tag.lua
+* fillwith-test.lvt
+* fillwith-test.luatex.tlg
+* fillwith-test.tlg
+* fillwith-test.xetex.tlg
+
+
+## Derived files
+
+
+### Package files
+
+* fillwith.sty
+* fillwith-example.tex
+
+### Typeset documentation
+
+* fillwith.pdf
+* fillwith-example.pdf
diff --git a/Master/texmf-dist/doc/latex/fillwith/README.md b/Master/texmf-dist/doc/latex/fillwith/README.md
new file mode 100644
index 00000000000..f7f1922b89c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fillwith/README.md
@@ -0,0 +1,32 @@
+$Id: README.md 10215 2024-08-09 11:12:21Z cfrees $
+
+# fillwith
+
+A LaTeX package for filling vertical space with something rather than nothing.
+
+Currently supported somethings are solid rules and dotted lines, with or
+without numbers. The package uses a mixture of plain-ish macros, LaTeX 2e and
+expl3 methods, but a key-value approach to configuration should make the
+document-level interface relatively sane, even if nothing else is.
+
+For details, please see fillwith.pdf. The implementation is minimally
+documented because I have no idea of how to document code.
+
+## Code Repositories
+
+Code is hosted at
+ https://codeberg.org/cfr/fillwith
+For convenience, the repository is mirrored at
+ https://github.com/cfr42/fillwith
+
+## Contact Details
+
+Bug reports, feature requests etc. should be filed at
+ https://codeberg.org/cfr/fillwith/issues
+
+
+Clea F. Rees
+Version 0.3
+2024-08-09
+
+vim: et:tw=80:
diff --git a/Master/texmf-dist/doc/latex/fillwith/fillwith-example.pdf b/Master/texmf-dist/doc/latex/fillwith/fillwith-example.pdf
new file mode 100644
index 00000000000..5af411b5e05
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fillwith/fillwith-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fillwith/fillwith-example.tex b/Master/texmf-dist/doc/latex/fillwith/fillwith-example.tex
new file mode 100644
index 00000000000..29387280401
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fillwith/fillwith-example.tex
@@ -0,0 +1,71 @@
+%%
+%% This is file `fillwith-example.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fillwith.dtx (with options: `ee')
+%% Copyright (C) 2024 Clea F. Rees.
+%%
+%% 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 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% fillwith. You may however distribute the package fillwith without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\listfiles
+\documentclass[british,a6paper]{article}
+\usepackage{babel}
+\usepackage[scale=.85,marginparwidth=0pt,marginparsep=0pt]{geometry}
+\usepackage{fillwith}
+\usepackage{cfr-lm}
+\begin{document}
+\author{A. N. Author}
+\title{\texttt{fillwith} Demo}
+\maketitle
+\begin{enumerate}
+ \item What is the answer to the question?
+ \fillwithrules
+ \item How did you answer the previous question?
+ \fillwith*[style=line]
+ \item Why answer?
+
+ \fillwith*[style=rule,fillwith ht=1.25,colour=blue!40!cyan]
+ \clearpage
+ \item Evaluate your responses so far.
+ \fillwithdottedlines
+ \item Evaluate your responses so far.
+
+ {%
+ \fillwithset{dotted colour=magenta}%
+ \fillwithdottedlines[1.5]
+ }
+ \item Criticise your evaluation.
+ \fillwithdottedlines*
+ \clearpage
+ \item Assess your answers.
+ \fillwithnolines[goal ht = .33\textheight]
+ \item Assess your answers.
+
+ \fillwithnolines[style=rules,no font=\bfseries\tiny,colour=green!50!gray,goal ht = .67\textheight]
+ \item Summarise your analysis.
+ \fillwithnolines*
+\end{enumerate}
+
+\end{document}
+\endinput
+%%
+%% End of file `fillwith-example.tex'.
diff --git a/Master/texmf-dist/doc/latex/fillwith/fillwith.pdf b/Master/texmf-dist/doc/latex/fillwith/fillwith.pdf
new file mode 100644
index 00000000000..77fa2ccc000
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fillwith/fillwith.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fontscale/CHANGELOG.md b/Master/texmf-dist/doc/latex/fontscale/CHANGELOG.md
index 9706fbbe09e..46a32e8fc93 100644
--- a/Master/texmf-dist/doc/latex/fontscale/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/fontscale/CHANGELOG.md
@@ -7,6 +7,58 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v2.1.0] - 2024-08-12
+
+### Changed
+- Documentation improvements.
+
+### Added
+- `\CurrentFontSizeCommand`
+
+## [v2.0.0] - 2024-08-02
+
+### Changed
+- This update includes many changes that are backwards incompatible.
+- The documentation has been completely rewritten.
+- Package description changed from "A user interface for setting document font
+ sizes" to "A flexible interface for setting font sizes".
+- The code no longer uses `\@setfontsize`.
+- The font size commands provided by this package now do nothing, except issue
+ a warning, if used in math mode.
+- The base font size of the musical typographic scale is now set by the new key
+ `musical/base`.
+- `\PrintFontParameters` renamed to `\PrintFontSizeParameters`.
+- `\PrintAllFontParameters` renamed to `\PrintAllFontSizeParameters`.
+- `\PrintSampleText` uses a `+m`- instead of an `O`-type argument.
+- `\PrintFontSizeCommand` prints `\undefined` instead of `UNDEFINED`.
+- `\fontscalesetup` is now removed in `\text_purify:n`.
+
+### Removed
+- Keys `typographic-scale=modular` and `modular`.
+- Key `ignore-order` (no support for using `\tiny` to `\Huge` in the wrong
+ order).
+- Key `reset` (very rarely used).
+- Public `prop` variables for each font size command from `\tiny` to `\Huge`.
+ (They are redundant with the other public variables and programmers will very
+ likely prefer using their own `prop` variables.)
+
+### Added
+- `\fontscalesetup` now has an optional starred argument which first resets the
+ keys to their initial values.
+- Key `musical/base` (explained earlier).
+- The package commands now issue a user-friendly error message if the font size
+ is a zero or negative length.
+- The package commands now issue an error if the font baselineskip is less than
+ the font size.
+- The package commands that would produce a low-level error if used in math
+ mode now issue a user-friendly error message instead.
+
+### Fixed
+- Now correctly checks that the package requires `LaTeX2e` version 2023-11-01
+ or newer.
+- The keys `<font size command>` no longer incorrectly treat a `/` within a
+ brace group as the delimiter.
+
## [v1.3.0] - 2024-05-17
### Added
@@ -18,7 +70,7 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
### Changed
- The code now regularly uses `V`- and `v`-type arguments to get the value of a
variable.
-- The code now uses private `expl3` wrappers around the LaTeX2e commands
+- The code now uses private `expl3` wrappers around the `LaTeX2e` commands
`\@setfontsize`, `\fontsize`, and `\selectfont`.
## [v1.2.2] - 2024-04-29
diff --git a/Master/texmf-dist/doc/latex/fontscale/README.txt b/Master/texmf-dist/doc/latex/fontscale/README.txt
index 292cfada9ba..d6c9224ee0d 100644
--- a/Master/texmf-dist/doc/latex/fontscale/README.txt
+++ b/Master/texmf-dist/doc/latex/fontscale/README.txt
@@ -1,4 +1,4 @@
-Package: fontscale -- A user interface for setting document font sizes
+Package: fontscale -- A flexible interface for setting font sizes
Copyright: 2024 (c) Oliver Beery <beeryoliver@gmail.com>
CTAN: https://ctan.org/pkg/fontscale
Repository: https://github.com/beeryoliver/fontscale
diff --git a/Master/texmf-dist/doc/latex/fontscale/beery.cls b/Master/texmf-dist/doc/latex/fontscale/beery.cls
index 4777c06a8ef..f2fd7fd2c5f 100644
--- a/Master/texmf-dist/doc/latex/fontscale/beery.cls
+++ b/Master/texmf-dist/doc/latex/fontscale/beery.cls
@@ -1,71 +1,84 @@
-% Note: This documentclass is designed ONLY for the document 'fontscale-manual'. Compiled using LuaLaTeX.
+% Note: This class is designed ONLY for 'fontscale.tex'. Compiled with LuaTeX.
-% The 2023-06-01 LaTeX kernel update added the 'shipout' hook.
-\NeedsTeXFormat{LaTeX2e}[2023-06-01]
+% LaTeX2e version 2023-11-01 added \IfExplAtLeastTF.
+\NeedsTeXFormat{LaTeX2e}[2023-11-01]
\ProvidesExplClass
{beery}
- {2024-04-21}
+ {2024-08-12}
{}
{}
-\RequirePackage { fix-cm }
\LoadClass { article }
+
+\box_new:N \l__beery_tmp_box
+
\RequirePackage { fontscale }
\fontscalesetup { musical }
-\RequirePackage [ list-final-separator = { ,~ and~ } ] { siunitx }
+\RequirePackage { siunitx }
+\sisetup { list-final-separator = { ,~ and~ } , mode = match }
\RequirePackage { mathtools }
\RequirePackage [ shortcuts , allowbreakbefore ] { extdash }
\RequirePackage { csquotes }
+\RequirePackage { lmodern }
% CUSTOM MACROS
+\tl_const:Nn \c_beery_alphabet_tl { abcdefghijklmnopqrstuvwxyz }
+\NewExpandableDocumentCommand \alphabet { } { \c_beery_alphabet_tl }
\NewDocumentCommand \Key { m o o }
{
+ \mode_leave_vertical:
\group_begin:
\ttfamily
- \bool_case:nF
+ \IfNoValueTF {#3}
{
- {
- \bool_lazy_and_p:nn
- { \tl_if_novalue_p:n {#2} }
- { \tl_if_novalue_p:n {#3} }
- }
- {#1}
- {
- \bool_lazy_and_p:nn
- { ! \tl_if_novalue_p:n {#2} }
- { \tl_if_novalue_p:n {#3} }
- }
- { #1~ =~ #2 }
- {
- \bool_lazy_and_p:nn
- { ! \tl_if_novalue_p:n {#2} }
- { ! \tl_if_novalue_p:n {#3} }
- }
- { #1~ =~ #2 \hspace* { \fill } \makebox { initial~ =~ #3 } }
+ \IfNoValueTF {#2}
+ {#1}
+ { #1 $\,=\,$ \allowbreak #2 }
}
- { \errmessage { invalid } }
+ { #1 $\,=\,$ #2 \hspace* { \fill } \hbox:n { initial $\,=\,$ #3 } }
\group_end:
}
+\NewDocumentCommand \Value { m } { \texttt {#1} }
\NewDocumentCommand \cmd { m } { \texttt { \token_to_str:N #1 } \@ }
\NewDocumentCommand \cs { m } { \texttt { \token_to_str:c {#1} } \@ }
\NewDocumentCommand \marg { m }
- { \allowbreak \texttt { \c_left_brace_str #1 \c_right_brace_str } }
-\NewDocumentCommand \oarg { m } { \allowbreak \texttt { [ #1 ] } }
-\NewDocumentCommand \meta { m } { \texttt { \textlangle #1 \textrangle } }
+ {
+ \allowbreak
+ \texttt { \c_left_brace_str }
+ $\langle$
+ { \normalfont \itshape #1 }
+ $\rangle$
+ \texttt { \c_right_brace_str }
+ }
+\NewDocumentCommand \oarg { m }
+ {
+ \allowbreak
+ \texttt { [ }
+ $\langle$
+ { \normalfont \itshape #1 }
+ $\rangle$
+ \texttt { ] }
+ }
+\NewDocumentCommand \sarg { } { $\langle$ \texttt {*} $\rangle$ }
+\NewDocumentCommand \meta { m }
+ {
+ $\langle$
+ { \normalfont \itshape #1 }
+ $\rangle$
+ }
\NewDocumentCommand \cls { m } { \textsf {#1} }
\NewDocumentCommand \env { m } { \texttt {#1} }
\NewDocumentCommand \pkg { m } { \textsf {#1} }
-\NewDocumentCommand \filex { m } { \texttt {#1} \@ }
\NewDocumentCommand \latin { m } { \textit {#1} }
% PAGE STYLE
-\hbox_set:Nn \l_tmpa_box { abcdefghijklmnopqrstuvwxyz }
-\dim_const:Nn \c_beery_alphabet_dim { \box_wd:N \l_tmpa_box }
+\hbox_set:Nn \l__beery_tmp_box { \c_beery_alphabet_tl }
+\dim_const:Nn \c_beery_alphabet_dim { \box_wd:N \l__beery_tmp_box }
+\dim_log:N \c_beery_alphabet_dim
-\dim_const:Nn \c_beery_big_dim
- { \fp_to_dim:n { \l_fontscale_normalsize_size_dim * 10 / 7 } }
+\dim_const:Nn \c_beery_big_dim { \l_fontscale_normalsize_baselineskip_skip }
\dim_const:Nn \c_beery_medium_dim { \c_beery_big_dim / 2 }
\dim_const:Nn \c_beery_small_dim { \c_beery_big_dim / 4 }
\skip_const:Nn \c_beery_big_skip
@@ -85,12 +98,15 @@
\skip_set:Nn \topskip { \l_fontscale_normalsize_size_dim }
\skip_set_eq:NN \splittopskip \topskip
-\RequirePackage
- [
- letterpaper
- , textwidth = \dim_eval:n { \fp_use:N \c_e_fp \c_beery_alphabet_dim }
+\RequirePackage { geometry }
+\geometry
+ {
+ a4paper
+ , textwidth =
+ \dim_eval:n { \fp_to_dim:n { \c_e_fp * \c_beery_alphabet_dim } }
, textheight =
- \dim_eval:n { \fp_eval:n { \c_e_fp * 1.6180 } \c_beery_alphabet_dim }
+ \dim_eval:n
+ { \fp_to_dim:n { 1.6180 * \c_e_fp * \c_beery_alphabet_dim } }
, heightrounded
, centering
, headheight = \l_fontscale_footnotesize_baselineskip_skip
@@ -98,8 +114,7 @@
, footskip =
\dim_eval:n
{ \c_beery_big_dim + \l_fontscale_footnotesize_baselineskip_skip }
- ]
- { geometry }
+ }
\RequirePackage { fancyhdr }
\pagestyle { fancy }
@@ -111,14 +126,22 @@
% PARAGRAPH STYLE
\nonfrenchspacing
-\linespread { \fp_eval:n { 25 / 21 } }
-\RequirePackage [ skip = \c_beery_medium_skip ] { parskip }
+\linespread { 1 }
+\skip_set_eq:NN \parskip \c_beery_medium_skip
+\dim_zero:N \parindent
\RequirePackage [ raggedrightboxes ] { ragged2e }
\skip_set:Nn \RaggedRightRightskip { 0pt plus 0.5 \linewidth }
+\dim_zero:N \RaggedRightParindent
+\dim_set_eq:NN \JustifyingParindent \RaggedRightParindent
\RaggedRight
+\int_set:Nn \pretolerance { -1 }
+\int_set:Nn \tolerance { 200 }
+\dim_zero:N \emergencystretch
\int_set:Nn \widowpenalty { 10000 }
\int_set_eq:NN \clubpenalty \widowpenalty
\int_set_eq:NN \displaywidowpenalty \widowpenalty
+\int_set:Nn \hyphenpenalty { 99 }
+\int_set_eq:NN \exhyphenpenalty \hyphenpenalty
% HEADINGS, TABLE OF CONTENTS
@@ -129,32 +152,34 @@
\titlespacing* \section % section
{ 0pt } % indent
{
- \fp_eval:n { 4 / 3 } \c_beery_medium_dim
- plus \fp_eval:n { 1 / 2 * 4 } \c_beery_medium_dim
- minus \fp_eval:n { 1 / 3 / 4 } \c_beery_medium_dim
+ - \parskip
+ + \c_beery_big_dim
+ plus \fp_eval:n { 1 / 2 * 4 } \c_beery_big_dim
+ minus \fp_eval:n { 1 / 3 / 4 } \c_beery_big_dim
} % before
- { \c_beery_medium_skip } % after
+ { - \parskip + \c_beery_medium_skip } % after
\titlespacing* \subsection
{ 0pt }
{
- \fp_eval:n { 4 / 3 } \c_beery_medium_dim
+ - \parskip
+ + \fp_eval:n { 4 / 3 } \c_beery_medium_dim
plus \fp_eval:n { 1 / 2 * 4 } \c_beery_medium_dim
minus \fp_eval:n { 1 / 3 / 4 } \c_beery_medium_dim
}
- { \c_beery_medium_skip }
+ { - \parskip + \c_beery_medium_skip }
\titleformat \section % section
[ block ] % shape
{ \raggedright \large \bfseries } % format
- { \thesection . } % label
- { 0.5em } % the horizontal separation between label and title body
+ { \thesection } % label
+ { 1em } % the horizontal separation between label and title body
{ } % before code
{ } % after code
\titleformat \subsection
[ block ]
{ \raggedright \normalsize \bfseries }
- { \thesubsection . }
- { 0.5em }
+ { \thesubsection }
+ { 1em }
{ }
{ }
@@ -181,7 +206,10 @@
{
\par
\IfBooleanTF #1
- { \int_compare:nNnT { \prevgraf } = { 1 } { \nobreak \@afterheading } }
+ {
+ \int_compare:nNnT { \prevgraf } = { 1 }
+ { \nobreak \@afterheading }
+ }
{ \nobreak \@afterheading }
}
\NewDocumentCommand \listheading { m }
@@ -189,7 +217,8 @@
\par
#1
\par
- \int_compare:nNnT { \prevgraf } = { 1 } { \nobreak \@afterheading }
+ \int_compare:nNnT { \prevgraf } = { 1 }
+ { \nobreak \@afterheading }
\vspace { \skip_eval:n { \c_beery_small_skip - \parskip } }
}
@@ -215,7 +244,10 @@
\coffin_new:N \l__beery_footnote_coffin
% 1.2 = baselineskip-size-ratio
\dim_const:Nn \c_beery_footnote_baselineheight_dim
- { \fp_eval:n { 1.2 * \f@linespread - 1 } \l_fontscale_footnotesize_size_dim }
+ {
+ \fp_to_dim:n
+ { ( 1.2 * \f@linespread - 1 ) * \l_fontscale_footnotesize_size_dim }
+ }
\RenewDocumentCommand \@makefntext { +m }
{
\vcoffin_set:Nnn \l__beery_footnote_coffin { \textwidth }
@@ -224,8 +256,10 @@
{
\dim_set:Nn \leftmargin
{
- \fp_eval:n { ( 1 - \l_fontscale_footnotesize_scale_fp ) / 2 }
- \textwidth
+ \fp_to_dim:n
+ {
+ ( 1 - \l_fontscale_footnotesize_scale_fp ) / 2 * \textwidth
+ }
}
\dim_set_eq:NN \rightmargin \leftmargin
\dim_set:Nn \labelsep { 0.5em }
@@ -242,4 +276,5 @@
\AddToHook { shipout / lastpage } { \label { LastPage } }
\RequirePackage { xurl }
-\RequirePackage [ bookmarksnumbered , hidelinks , linktoc = page ] { hyperref } \ No newline at end of file
+\RequirePackage { hyperref }
+\hypersetup { bookmarksnumbered , hidelinks , linktoc = page } \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-classic.tex b/Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-classic.tex
deleted file mode 100644
index 029d304d82c..00000000000
--- a/Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-classic.tex
+++ /dev/null
@@ -1,39 +0,0 @@
-\ProvidesFile
- {fontscale-manual-table-classic.tex}
- [2024-04-15]
-
-\begin{table}
- \centering
- \caption
- {%
- The size of each font size command in \unit{pt} when using a classic typographic scale.%
- \label{table:classicscales}%
- }
- \bigskip
- \begin{tblr}
- {
- colspec=
- {
- l
- Q[si={table-format=3.2},c]
- Q[si={table-format=3.2},c]
- Q[si={table-format=3.2},c]
- }
- , cell{1}{2-Z}={guard}
- }
- \toprule
- Command & \Key{classic-10pt} & \Key{classic-11pt} & \Key{classic-12pt} \\
- \midrule
- \cs{tiny} & 6 & 7 & 8 \\
- \cs{scriptsize} & 7 & 8 & 9 \\
- \cs{footnotesize} & 8 & 9 & 10 \\
- \cs{small} & 9 & 10 & 11 \\
- \cs{normalsize} & 10 & 11 & 12 \\
- \cs{large} & 11 & 12 & 14 \\
- \cs{Large} & 12 & 14 & 16 \\
- \cs{LARGE} & 14 & 16 & 18 \\
- \cs{huge} & 16 & 18 & 21 \\
- \cs{Huge} & 18 & 21 & 24 \\
- \bottomrule
- \end{tblr}
-\end{table} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-font-steps.tex b/Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-font-steps.tex
deleted file mode 100644
index 8c5cc8c1416..00000000000
--- a/Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-font-steps.tex
+++ /dev/null
@@ -1,38 +0,0 @@
-\ProvidesFile
- {fontscale-manual-table-font-steps.tex}
- [2024-04-15]
-
-\begin{table}
- \centering
- \caption
- {%
- The step of each font size command.
- These are constants and cannot be changed.%
- \label{table:fontsteps}%
- }
- \bigskip
- \begin{tblr}
- {
- colspec=
- {
- l
- Q[si={table-format=3.2},c]
- }
- , cell{1}{2}={guard}
- }
- \toprule
- Command & Step \\
- \midrule
- \cs{tiny} & -4 \\
- \cs{scriptsize} & -3 \\
- \cs{footnotesize} & -2 \\
- \cs{small} & -1 \\
- \cs{normalsize} & 0 \\
- \cs{large} & 1 \\
- \cs{Large} & 2 \\
- \cs{LARGE} & 3 \\
- \cs{huge} & 4 \\
- \cs{Huge} & 5 \\
- \bottomrule
- \end{tblr}
-\end{table} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-modular-musical.tex b/Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-modular-musical.tex
deleted file mode 100644
index 306578ec354..00000000000
--- a/Master/texmf-dist/doc/latex/fontscale/fontscale-manual-table-modular-musical.tex
+++ /dev/null
@@ -1,38 +0,0 @@
-\ProvidesFile
- {fontscale-manual-table-modular-musical.tex}
- [2024-04-15]
-
-\begin{table}
- \centering
- \caption
- {%
- The size of each font size command when using a modular or musical typographic scale with the initial settings.
- The font sizes are in \unit{pt} and rounded to two decimal places.%
- }
- \bigskip
- \begin{tblr}
- {
- colspec=
- {
- l
- Q[si={table-format=3.2},c]
- Q[si={table-format=3.2},c]
- }
- , cell{1}{2-3}={guard}
- }
- \toprule
- Command & \Key{modular} & \Key{musical} \\
- \midrule
- \cs{tiny} & 6.24 & 5.74 \\
- \cs{scriptsize} & 7.02 & 6.60 \\
- \cs{footnotesize} & 7.90 & 7.58 \\
- \cs{small} & 8.89 & 8.71 \\
- \cs{normalsize} & 10 & 10 \\
- \cs{large} & 11.25 & 11.49 \\
- \cs{Large} & 12.66 & 13.20 \\
- \cs{LARGE} & 14.24 & 15.16 \\
- \cs{huge} & 16.02 & 17.41 \\
- \cs{Huge} & 18.02 & 20 \\
- \bottomrule
- \end{tblr}
-\end{table} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/fontscale/fontscale-manual.pdf b/Master/texmf-dist/doc/latex/fontscale/fontscale-manual.pdf
deleted file mode 100644
index 2637ef9c1fe..00000000000
--- a/Master/texmf-dist/doc/latex/fontscale/fontscale-manual.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fontscale/fontscale-manual.tex b/Master/texmf-dist/doc/latex/fontscale/fontscale-manual.tex
deleted file mode 100644
index 9917636a046..00000000000
--- a/Master/texmf-dist/doc/latex/fontscale/fontscale-manual.tex
+++ /dev/null
@@ -1,390 +0,0 @@
-\documentclass{beery}
-
-\begin{document}
-
-
-\section*
- {%
- \SetFontStep*{1}%
- The \pkg{fontscale} package%
- }
-
-A user interface for setting document font sizes
-
-Oliver Beery
-
-Version 1.3.0\quad{}17 May 2024
-
-
-\section{Introduction}
-\label{sec:intro}
-
-\subsection{About}
-\label{subsec:about}
-
-\listheading{The \pkg{fontscale} package provides the following functionalities:}
-\begin{itemize}
- \item
- Set font sizes via a classic, modular, or musical typographic scale.
- \item
- Set arbitrary sizes and baselineskips for the standard font size commands \cs{tiny}, \cs{scriptsize}, \cs{footnotesize}, \cs{small}, \cs{normalsize}, \cs{large}, \cs{Large}, \cs{LARGE}, \cs{huge}, and \cs{Huge}.
- \item
- Set the font size settings mid\-/document or within a local group.
- \item
- Set the font size by setting the font step, scale, or size.
- \item
- Set the font size relative to the current font size.
- \item
- Use the current font step, scale, size, and baselineskip directly, for example, for printing or within calculations.
- \item
- Print sample text to test different font sizes.
- \item
- For advanced users, store the step, scale, size, and baselineskip of each font size command in \pkg{expl3} variables.
-\end{itemize}
-
-\subsection{Loading the package}
-\label{subsec:loading}
-
-This package requires the 10 October 2023 \pkg{l3kernel} update.
-You may need to ensure that your \LaTeX{} installation is up\-/to\-/date before using this package.
-
-This package lets the user set arbitrary font sizes.
-This works with most fonts produced today, but, for historical reasons, the default Computer Modern font is available only in a number of fixed sizes.
-If you get a warning that Computer Modern is not available in the requested size, you may need to add the code \cs{RequirePackage{fix-cm}} before \cs{documentclass} to make Computer Modern available at arbitrary font sizes.
-
-\cs{usepackage}\marg{fontscale}
-\nopagebreak\newline
-\cs{fontscalesetup}\marg{\meta{keyval list}}
-
-Load the \pkg{fontscale} package via the usual command in the document preamble.
-This package has no package options.
-Instead, the package keys are set up via the command \cs{fontscalesetup}\marg{\meta{keyval list}}.
-\meta{keyval list} must receive a comma\-/separated list of keys and their associated values.
-The package keys are documented in \S\ref{sec:choosing} and \S\ref{sec:overwriting}.
-
-Many \LaTeX{} document classes have a font size option (\Key{10pt}, \Key{11pt}, \Key{12pt}, etc.\@) which not only changes the set of document font sizes, but also modifies additional settings such as the page layout and vertical spacing which were specifically designed to work with those font sizes.
-For this reason, you may want to set the document class font size option close to the value of \cs{normalsize} set by this package.
-
-Internally, this package sets up each font size command from \cs{tiny} to \cs{Huge} using the kernel command \cs{@setfontsize}\---they have no additional functionality beyond that of \cs{@setfontsize}.
-Unlike the standard document classes, the font size commands set up by this package do not change the vertical spacing for displayed math and list structures.
-If the user would like to add this functionality or perhaps other features to the font size commands, they can do so via hooks, which are documented in the \LaTeX{} kernel.
-
-\subsection{Terminology}
-\label{subsec:terminology}
-
-When using the \pkg{fontscale} package, each font size, including the standard font size commands from \cs{tiny} to \cs{Huge}, has a step, scale, size, and baselineskip.
-The latter two parameters are the familiar first and second arguments to the low\-/level font command \cs{fontsize}\marg{\meta{dimen}}\marg{\meta{skip}}.
-The font scale is the relative font size; the ratio of the font size to \cs{normalsize}.
-The font step is the number of font size gradations from \cs{normalsize}, which has a step of \num{0}.
-Table~\ref{table:fontsteps} lists the font step of each font size command.
-
-\input{./fontscale-manual-table-font-steps.tex}
-
-This package defines many keys and commands that take as a value or argument a \meta{dim expr}, \meta{skip expr}, \meta{fp expr}, or \meta{int expr}.
-This syntax is short for a dimen, skip, floating point, or integer expression, respectively.
-See \pkg{usrguide} \S5 for more information.%
-\footnote{\url{https://ctan.org/pkg/usrguide}}
-
-
-\section{Choosing the typographic scale}
-\label{sec:choosing}
-
-\Key{typographic-scale}
- [classic-10pt, classic-11pt, classic-12pt, modular, musical]
- [classic-10pt]
-\newline
-\Key{modular/ratio}[\meta{fp expr}][1.125]
-\newline
-\Key{musical/ratio}[\meta{fp expr}][2]%
-\nopagebreak\newline
-\Key{musical/notes}[\meta{int expr}][5]
-
-The key \Key{typographic\-/scale} sets the font sizes using a classic, modular, or musical typographic scale.
-These are common methods of choosing a set of document font sizes.
-The choice of typographic scale initializes to \Key{classic\-/10pt}.
-
-The key \Key{typographic\-/scale} can also be set in a condensed format via the keys \Key{classic\-/10pt}, \Key{classic\-/11pt}, \Key{classic\-/12pt}, \Key{modular}, or \Key{musical}, which set the key \Key{typographic\-/scale} to the corresponding value.
-
-The classic typographic scale consists of the traditional font sizes
-\numlist{6;7;8;9;10;11;12;14;16;18;21;24;36;48;60;72}.%
-\footnote{See \S{}3.1 of \textit{The Elements of Typographic Style} by Robert Bringhurst.}
-They have been used since the sixteenth century and are the default font sizes on most computer software.
-The keys \Key{classic-10pt, classic-11pt, classic-12pt} set the size of each font size command to values based on their position in the classic typographic scale.
-The size of \cs{normalsize} is the named point size.
-The sizes of the other font size commands are the adjacent font sizes in the scale.
-Table~\ref{table:classicscales} lists the size of each font size command when using a classic typographic scale.
-
-\input{./fontscale-manual-table-classic.tex}
-
-The key \Key{modular} sets the font sizes from \cs{tiny} to \cs{Huge} using a modular typographic scale.
-In a modular scale, each font size is a fixed ratio from the adjacent font sizes.%
-\footnote{\url{https://alistapart.com/article/more-meaningful-typography/}}
-Here, the base font size is the size of \cs{normalsize}, which can be set via the key \Key{normalsize/size}[\meta{dim expr}], more documented in \S\ref{sec:overwriting}.
-If not set, \cs{normalsize} initializes to \qty{10}{pt}.
-The modular ratio can be set via the key \Key{modular\slash{}ratio}.
-The initial modular ratio is \num{1.125}.
-
-\input{./fontscale-manual-table-modular-musical.tex}
-
-The key \Key{musical} sets the font sizes according to their position in a musical typographic scale.
-The font size is calculated using the formula:%
-\footnote
- {%
- I have referenced this article by Spencer Mortensen:
- \newline
- \url{https://spencermortensen.com/articles/typographic-scale/}%
- }
-\[ f_i = f_0 \times r ^ { i / n } \]
-$f_0$ is the base font size, the size of \cs{normalsize}.
-$f_i$ is the font size with font step~$i$.
-$n$ is the number of notes in the musical scale\---the number of font size gradations or steps above \cs{normalsize}.
-$r$ is the ratio of the musical scale, the ratio of the highest to the lowest note $ f_n / f_0 $.
-(The modular typographic scale is actually a special case of the musical typographic scale where $n=1$.)
-
-The musical ratio~$r$ and the number of notes~$n$ can be set via the keys \Key{musical\slash{}ratio} and \Key{musical\slash{}notes}.
-The initial musical ratio\---\num{2}\---and the initial number of notes\---\num{5}\---are the same as that of the classic typographic scale.%
-\footnote{Ibid.}
-Conveniently, \cs{Huge} is \num{5} steps above \cs{normalsize}.
-The font size of \cs{normalsize}~$f_0$ can be set using the key \Key{normalsize/size}[\meta{dim expr}], more documented in \S\ref{sec:overwriting}.
-When using a musical typographic scale, \cs{normalsize} initializes to \qty{10}{pt}.%
-\footnote {I have set the initial value to \qty{10}{pt} instead of the \qty{12}{pt} recommended by the Spencer Mortensen article because this matches the default settings of the standard \LaTeXe{} document classes.}
-
-\Key{baselineskip-size-ratio}[\meta{fp expr}][1.2]
-\KeepNextPar*
-
-The key \Key{baselineskip\-/size\-/ratio} sets the ratio of the font baselineskip to the font size.
-By default, the font baselineskip of each font size command equals its font size times \meta{fp expr}.
-Users should not set this key unless they really know what they are doing.
-When using increased line spacing, users should prefer the low\-/level font command \cs{linespread} or the \pkg{setspace} package.
-
-
-\section{Overwriting the typographic scale}
-\label{sec:overwriting}
-
-In some situations, users may need to explicitly set the scale, size, or baselineskip of a font size command, overwriting the value set by the keys in \S\ref{sec:choosing}.
-Note that the font steps and the scale of \cs{normalsize} are constants and cannot be changed.
-
-\Key{\meta{font size command}/scale}[\meta{fp expr}]
-\KeepNextPar*
-
-The keys \Key{\meta{font size command}\slash{}scale} set the scale of \meta{font size command} to \meta{fp expr}, ignoring the value set by the key \Key{typographic\-/scale}.
-The key \Key{normalsize\slash{}scale} is not defined.
-
-\Key{\meta{font size command}/size}[\meta{dim expr}]
-\KeepNextPar*
-
-The keys \Key{\meta{font size command}\slash{}size} set the size of \meta{font size command} to \meta{dim expr}, ignoring the values set by the keys \Key{typographic\-/scale} and \Key{\meta{font size command}\slash{}scale}.
-\meta{dim expr} supplies a default unit of \unit{pt}.
-
-The package will issue a warning if the user sets the keys \Key{\meta{font size command}\slash{}size} and \Key{\meta{font size command}\slash{}scale} for the same \meta{font size command} since the latter key will be ignored.
-
-\Key{\meta{font size command}/baselineskip}[\meta{skip expr}]
-\KeepNextPar*
-
-The keys \Key{\meta{font size command}\slash{}baselineskip} set the font baselineskip of \meta{font size command} to \meta{skip expr} instead of calculating it from the size of \meta{font size command} and \Key{baselineskip\-/size\-/ratio}.
-\meta{skip expr} supplies a default unit of \unit{pt}.
-
-\Key{\meta{font size command}}[\meta{dim expr}]
-\nopagebreak\newline
-\Key{\meta{font size command}}[\meta{dim expr}/\meta{skip expr}]
-
-The keys \Key{\meta{font size command}} set the keys \Key{\meta{font size command}\slash{}size} or \Key{\meta{font size command}\slash{}baselineskip} in a condensed format.
-The latter format resembles traditional typographic notation where the size and leading of a text can be expressed as, for example, $10/12$ or $11/13$.
-The number before/after the slash is the size/leading in \unit{pts}.
-
-\Key{ignore-order}[true, false][false]
-\KeepNextPar*
-
-The user should take care to ensure that the font sizes and font baselineskips remain in the correct order when directly setting the scales, sizes, or baselineskips of the different font size commands.
-The magnitudes of the font sizes and font baselineskips should be ordered from \cs{tiny} to \cs{normalsize} to \cs{Huge}.
-This is important for typographic and syntactic consistency.
-This package will issue a warning if they are not in the correct order.
-The user can disable this warning via the key \Key{ignore\-/order}[true] or just \Key{ignore\-/order}.
-
-
-\section{User commands}
-\label{sec:usercommands}
-
-\subsection{Expandable font parameters}
-\label{subsec:fontparameters}
-
-\cs{CurrentFontStep}
-\nopagebreak\newline
-\cs{CurrentFontScale}
-\newline
-\cs{CurrentFontSize}
-\nopagebreak\newline
-\cs{CurrentFontBaselineskip}
-
-These are fully expandable commands that expand to the current font step, scale, size, or baselineskip.
-They can be used for printing or within calculations.
-Caution: \cs{CurrentFontStep} will expand to nothing if the current font step is undefined.
-
-Internally, \cs{CurrentFontStep}, \cs{CurrentFontScale}, and \cs{CurrentFontSize} use the kernel command \cs{f@size}.
-\cs{CurrentFontSize} expands to \texttt{f@size pt}.
-\cs{CurrentFontBaselineskip} expands to the kernel command \cs{f@baselineskip}.
-Note that the low\-/level font command \cs{fontsize}\marg{\meta{dimen}}\marg{\meta{skip}} sets \cs{f@size} to the new font size before expanding its second argument.
-This means that \cs{CurrentFontStep}, \cs{CurrentFontScale}, and \cs{CurrentFontSize} may need to be first expanded if used in \meta{skip}.
-This package provides the command \cs{SetFontSizeBaselineskip} as an alternative to \cs{fontsize} + \cs{selectfont} that avoids this issue (\S\ref{subsec:fontsize}).
-
-\subsection{More font sizing commands}
-\label{subsec:fontsize}
-
-The \pkg{fontscale} package provides the commands \cs{SetFontStep}, \cs{SetFontScale}, \cs{SetFontSize}, \cs{ScaleFont}, and \cs{SetFontSizeBaselineskip} which set the font size in different ways.
-The first three commands have a starred version which sets the font size relative to the current font size.
-Internally, these commands all use the low\-/level font commands \cs{fontsize} and \cs{selectfont}.
-These commands should be used only in special cases.
-Generally, users should prefer the font size commands from \cs{tiny} to \cs{Huge} for typographic and syntactic consistency, although \cs{SetFontStep*}\marg{\meta{integer}} can use a font size command directly.
-
-\cs{SetFontStep}\marg{\meta{fp expr}}
-\nopagebreak\newline
-\cs{SetFontStep*}\marg{\meta{fp expr}}
-
-\cs{SetFontStep} sets the font size by setting the font step to \meta{fp expr}.
-The starred version \cs{SetFontStep*} adds \meta{fp expr} to the current font step.
-If the choice of typographic scale is not modular or musical, then the only valid values for \meta{fp expr} are the integers from \num{-4} to \num{5}, corresponding to the font size commands from \cs{tiny} to \cs{Huge}.
-\cs{SetFontStep} will issue an error if the calculated font step is invalid.
-The starred version \cs{SetFontStep*} will also issue an error if the current font step is invalid.
-\cs{SetFontStep} sets the font baselineskip to the calculated font size \texttimes{} \Key{baselineskip\-/size\-/ratio}.
-If the calculated font step matches the step of any font size command, then that font size command will be used directly.
-
-\listheading{Examples:}
-\begin{itemize}
- \item
- For example, \cs{SetFontStep}\marg{-2} and \cs{SetFontStep}\marg{2} use \cs{footnotesize} and \cs{Large}.
- Note that it is typically better to use the equivalent font size command in place of \cs{SetFontStep}\marg{\meta{integer}}.
- \item
- If the current font size is \cs{normalsize}, \cs{SetFontStep*}\marg{1} and \cs{SetFontStep*}\marg{-1} use \cs{large} and \cs{small}.
- This is useful for moving up or down a note on the typographic scale.
- \item
- If the choice of typographic scale is modular or musical, \cs{SetFontStep*}\marg{-0.5} sets the font size and font baselineskip to values between that of \cs{normalsize} and \cs{small}.
- Otherwise, it produces an error.
-\end{itemize}
-
-\cs{SetFontScale}\marg{\meta{fp expr}}
-\nopagebreak\newline
-\cs{SetFontScale*}\marg{\meta{fp expr}}
-
-\cs{SetFontScale} sets the font size by setting the font scale to \meta{fp expr}.
-The font baselineskip is set to the calculated font size \texttimes{} \Key{baselineskip\-/size\-/ratio}.
-The starred version \cs{SetFontScale*} adds \meta{fp expr} to the current font scale.
-For example, \cs{SetFontScale}\marg{1.25} makes the font size 25\% larger than \cs{normalsize}.
-If the current font size is \cs{normalsize}, \cs{SetFontScale*}\marg{0.2} is equivalent to \cs{SetFontScale}\marg{1.2}.
-
-\cs{SetFontSize}\marg{\meta{dim expr}}
-\nopagebreak\newline
-\cs{SetFontSize*}\marg{\meta{dim expr}}
-
-\cs{SetFontSize} sets the font size to \meta{dim expr}.
-\meta{dim expr} supplies a default unit of \unit{pt}.
-The font baselineskip is set to the calculated font size \texttimes{} \Key{baselineskip\-/size\-/ratio}.
-The starred version \cs{SetFontSize*} adds \meta{dim expr} to the current font size.
-For example, \cs{SetFontSize*}\marg{1} and \cs{SetFontSize*}\marg{-1pt} increase and decrease the current font size by a \unit{pt}.
-
-\cs{ScaleFont}\marg{\meta{fp expr}}
-\KeepNextPar*
-
-Scales the current font size and the current font baselineskip by a factor of \meta{fp expr}.
-For example, if the current font size and font baselineskip are \qty{10}{pt} and \qty{12}{pt}, using \cs{ScaleFont}\marg{0.8} will reduce them proportionally to \qty{8}{pt} and \qty{9.6}{pt}.
-
-\cs{SetFontSizeBaselineskip}\marg{\meta{dim expr}}\marg{\meta{skip expr}}
-\KeepNextPar*
-
-Sets the font size to \meta{dim expr} and the font baselineskip to \meta{skip expr}.
-Both arguments supply a default unit of \unit{pt}.
-\cs{SetFontSizeBaselineskip} can be used as an alternative to \cs{fontsize} + \cs{selectfont} as it avoids the issue with \cs{f@size} discussed in \S\ref{subsec:fontparameters}.
-
-\subsection{Testing and debugging}
-\label{subsec:debug}
-
-The commands documented here are intended primarily for testing and debugging.
-I have used them often when developing this package so I think users will find them helpful.
-
-\cs{PrintFontParameters}
-\nopagebreak\newline
-\cs{PrintAllFontParameters}
-
-\cs{PrintFontParameters} prints the current font step, scale, size, and baselineskip in this order in a comma\-/separated list of key = value pairs.
-If the current font step is undefined (as explained for \cs{SetFontStep} in \S\ref{subsec:fontsize}), it will be left blank.
-\cs{PrintAllFontParameters} prints the step, scale, size, and baselineskip of each font size command.
-
-\cs{PrintSampleText}\oarg{\meta{text}}
-\nopagebreak\newline
-\cs{PrintSampleText*}\oarg{\meta{text}}
-
-\cs{PrintSampleText} prints \meta{text} in each font size ordered from \cs{tiny} to \cs{Huge} each followed by a paragraph break.
-The starred version \cs{PrintSampleText*} reverses the sizing order.
-The \meta{text} can be changed via the optional argument, but cannot contain \cs{par} tokens.
-The default \meta{text} is \enquote{The \texttt{fontscale} package: A user interface for setting document font sizes}.
-One useful way of printing example text is by using
-\cs{PrintSampleText}\oarg{\cs{PrintFontSizeCommand}:\textvisiblespace{}\cs{PrintFontParameters}}.
-
-\cs{PrintFontSizeCommand}
-\KeepNextPar*
-
-\cs{PrintFontSizeCommand} tests whether the current font size and the current font baselineskip match the font size and font baselineskip of any font size command from \cs{tiny} to \cs{Huge}.
-If so, it prints the name of that font size command, including the backslash character.
-If not, it instead prints \enquote{UNDEFINED\@}.
-\vfill\pagebreak%manual
-
-\subsection
- {%
- \texorpdfstring
- {More on \cs{fontscalesetup}}
- {More on \textbackslash{}fontscalesetup}%
- }
-\label{subsec:fontscalesetup}
-
-\cs{fontscalesetup}\marg{\meta{keyval list}}
-\KeepNextPar*
-
-Sets and processes the \pkg{fontscale} package keys and then uses \cs{normalsize}.
-\cs{fontscalesetup} can be applied mid\-/document or locally within the current \TeX{} group.
-
-\Key{reset}[initial, preamble]
-\KeepNextPar*
-
-The key \Key{reset} is also available.
-Its value must be either \texttt{initial} or \texttt{preamble}.
-The key \Key{reset}[initial] or just \Key{reset} sets all the keys to their initial values.
-The key \Key{reset}[preamble] sets all the keys to their values at the end of the preamble (or does nothing if used before the end of the preamble).
-
-
-\section{Programming}
-\label{sec:programming}
-
-This section is relevant to \LaTeX3 programmers.
-
-The document commands \cs{SetFontStep}, \cs{SetFontScale}, \cs{SetFontSize}, \cs{ScaleFont}, and \cs{SetFontSizeBaselineskip} are set up to work with \cs{text_purify:n}.
-\cs{text_purify:n} will correctly remove these commands and their arguments.
-This includes the starred versions \cs{SetFontStep*}, \cs{SetFontScale*}, and \cs{SetFontSize*}.
-
-This package does not provide any public \pkg{expl3} functions.
-
-This package provides some public \pkg{expl3} variables.
-The package stores in public variables the step, scale, size, and baselineskip of each font size command.
-These variables should not be modified directly.
-Instead, they should be modified only indirectly via the command \cs{fontscalesetup}.
-
-Each takes the form:
-
-\begingroup
- \ttfamily
- \textbackslash{}c\_fontscale\_\meta{font size command}\_step\_fp
- \nopagebreak\newline
- \textbackslash{}l\_fontscale\_\meta{font size command}\_scale\_fp
- \newline
- \textbackslash{}l\_fontscale\_\meta{font size command}\_size\_dim
- \nopagebreak\newline
- \textbackslash{}l\_fontscale\_\meta{font size command}\_baselineskip\_skip
-\endgroup
-
-Exception:
-\cs{l_fontscale_normalsize_scale_fp} is not defined.
-The scale of \cs{normalsize} is instead stored as the constant \cs{c_fontscale_normalsize_scale_fp}, which always equals \num{1}.
-
-The step, scale, size, and baselineskip of each font size command are also stored in property lists, one for each font size command:
-
-\texttt{\textbackslash{}l\_fontscale\_\meta{font size command}\_prop}
-
-\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/fontscale/fontscale-table-classic.tex b/Master/texmf-dist/doc/latex/fontscale/fontscale-table-classic.tex
new file mode 100644
index 00000000000..50ff413e366
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fontscale/fontscale-table-classic.tex
@@ -0,0 +1,41 @@
+\ProvidesFile
+ {fontscale-table-classic.tex}
+ [2024-08-12]
+
+\begin{table}
+ \centering
+ \caption
+ {%
+ The font size of each font size command from \cs{tiny} to \cs{Huge} in units of \unit{pt} when using a classic typographic scale.%
+ \label{table:classic}%
+ }
+ \bigskip
+ \begin{tblr}
+ {
+ colspec=
+ {
+ l
+ Q[si={table-format=3.2},c]
+ Q[si={table-format=3.2},c]
+ Q[si={table-format=3.2},c]
+ }
+ , cell{1}{2-Z}={guard}
+ , cell{2-Z}{1}={cmd=\cs}
+ , cell{1}{2-Z}={cmd=\Key}
+ }
+ \toprule
+ font size command & classic-10pt & classic-11pt & classic-12pt \\
+ \midrule
+ tiny & 6 & 7 & 8 \\
+ scriptsize & 7 & 8 & 9 \\
+ footnotesize & 8 & 9 & 10 \\
+ small & 9 & 10 & 11 \\
+ normalsize & 10 & 11 & 12 \\
+ large & 11 & 12 & 14 \\
+ Large & 12 & 14 & 16 \\
+ LARGE & 14 & 16 & 18 \\
+ huge & 16 & 18 & 21 \\
+ Huge & 18 & 21 & 24 \\
+ \bottomrule
+ \end{tblr}
+\end{table} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/fontscale/fontscale-table-font-steps.tex b/Master/texmf-dist/doc/latex/fontscale/fontscale-table-font-steps.tex
new file mode 100644
index 00000000000..5b20f186811
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fontscale/fontscale-table-font-steps.tex
@@ -0,0 +1,39 @@
+\ProvidesFile
+ {fontscale-table-font-steps.tex}
+ [2024-08-12]
+
+\begin{table}
+ \centering
+ \caption
+ {%
+ The font step of each font size command from \cs{tiny} to \cs{Huge}.
+ These are constants and cannot be changed.%
+ \label{table:fontsteps}%
+ }
+ \bigskip
+ \begin{tblr}
+ {
+ colspec=
+ {
+ l
+ Q[si={table-format=3.2},c]
+ }
+ , cell{1}{2}={guard}
+ , cell{2-Z}{1}={cmd=\cs}
+ }
+ \toprule
+ font size command & font step \\
+ \midrule
+ tiny & -4 \\
+ scriptsize & -3 \\
+ footnotesize & -2 \\
+ small & -1 \\
+ normalsize & 0 \\
+ large & 1 \\
+ Large & 2 \\
+ LARGE & 3 \\
+ huge & 4 \\
+ Huge & 5 \\
+ \bottomrule
+ \end{tblr}
+\end{table} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/fontscale/fontscale-table-musical.tex b/Master/texmf-dist/doc/latex/fontscale/fontscale-table-musical.tex
new file mode 100644
index 00000000000..e6a6ca5ce0d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fontscale/fontscale-table-musical.tex
@@ -0,0 +1,39 @@
+\ProvidesFile
+ {fontscale-table-musical.tex}
+ [2024-08-12]
+
+\begin{table}
+ \centering
+ \caption
+ {%
+ The font size of each font size command from \cs{tiny} to \cs{Huge} when using a musical typographic scale with the initial values.
+ The font sizes are in units of \unit{pt} and rounded to two decimal places.%
+ \label{table:musical}%
+ }
+ \bigskip
+ \begin{tblr}
+ {
+ colspec=
+ {
+ l
+ Q[si={table-format=3.2},c]
+ }
+ , cell{1}{2}={guard}
+ , cell{2-Z}{1}={cmd=\cs}
+ }
+ \toprule
+ font size command & \Key{musical} \\
+ \midrule
+ tiny & 5.74 \\
+ scriptsize & 6.60 \\
+ footnotesize & 7.58 \\
+ small & 8.71 \\
+ normalsize & 10 \\
+ large & 11.49 \\
+ Large & 13.20 \\
+ LARGE & 15.16 \\
+ huge & 17.41 \\
+ Huge & 20 \\
+ \bottomrule
+ \end{tblr}
+\end{table} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/fontscale/fontscale.pdf b/Master/texmf-dist/doc/latex/fontscale/fontscale.pdf
new file mode 100644
index 00000000000..adcd8091344
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fontscale/fontscale.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/fontscale/fontscale.tex b/Master/texmf-dist/doc/latex/fontscale/fontscale.tex
new file mode 100644
index 00000000000..3737afe5b6f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fontscale/fontscale.tex
@@ -0,0 +1,409 @@
+\documentclass{beery}
+
+
+\begin{document}
+
+
+\section*
+ {%
+ \SetFontStep*{1}%
+ The \pkg{fontscale} package%
+ }
+
+A flexible interface for setting font sizes
+
+Oliver Beery
+
+Version 2.1.0\quad{}12 August 2024
+
+
+\section{Introduction}
+\label{sec:intro}
+
+\subsection{About}
+\label{subsec:about}
+
+\listheading{The \pkg{fontscale} package provides the following functionalities:}
+\begin{itemize}
+ \item
+ Set font sizes using a classic or musical typographic scale (\S\ref{subsec:typographicscale}).
+ \item
+ Set arbitrary font sizes and font baselineskips for the standard \LaTeX{} font size commands \cs{tiny}, \cs{scriptsize}, \cs{footnotesize}, \cs{small}, \cs{normalsize}, \cs{large}, \cs{Large}, \cs{LARGE}, \cs{huge}, and \cs{Huge} (\S\ref{subsec:overwriting}).
+ \item
+ Set the font sizes and font baselineskips of the standard \LaTeX{} font size commands mid\-/document or within a local group (\S\ref{subsec:fontscalesetup}).
+ \item
+ Provides expandable commands that expand to the current font step, font scale, font size, font baselineskip, or font size command (\S\ref{subsec:expandable}).
+ \item
+ Provides additional font size commands, including setting the font size by setting the font step or font scale and setting the font size relative to the current font size using more powerful tools than the \pkg{scalefnt} and \pkg{relsize} packages (\S\ref{subsec:fontsize}).
+ \item
+ For \LaTeX3 programmers, this package defines public \pkg{expl3} variables that store the font step, font scale, font size, and font baselineskip of each font size command from \cs{tiny} to \cs{Huge} (\S\ref{sec:programming}).
+\end{itemize}
+
+\subsection{Loading the package}
+\label{subsec:loading}
+
+\listheading{Requirements:}
+\begin{itemize}
+ \item \LaTeXe{} version 2023-11-01 or newer
+ \item \pkg{l3kernel} version 2023-10-10 or newer
+\end{itemize}
+
+You may need to ensure that your \LaTeX{} installation is up\-/to\-/date before using this package.
+
+This package lets the user set arbitrary font sizes.
+This works with most fonts produced today, but, for historical reasons, the default Computer Modern font is available only in a number of discrete font sizes.
+If you get a warning that Computer Modern is not available in the requested font size, you may need to add the code \cs{RequirePackage}\allowbreak\verb|{fix-cm}| before \cs{documentclass} to make Computer Modern available at arbitrary font sizes.
+Alternatively, you can use the Latin Modern font by loading the \pkg{lmodern} package.
+
+The \pkg{fontscale} package has no package options.
+Instead, this package provides the command \cs{fontscalesetup}\marg{key\-/value list} (\S\ref{subsec:fontscalesetup}) which sets the package keys (\S\ref{sec:keys}).
+
+When loaded, this package uses \cs{normalsize} after defining and initializing the font size commands from \cs{tiny} to \cs{Huge}.
+
+Many \LaTeX{} document classes have a font size option (e.g.\@ \Key{10pt}, \Key{11pt}, \Key{12pt}) which not only changes the set of document font sizes, but also modifies additional settings such as the page layout and vertical spacing which were specifically designed to work with those font sizes.
+For this reason, you may want to set the document class font size option close to the font size of \cs{normalsize} set by this package.
+
+\listheading{Internally, this package defines each font size command from \cs{tiny} to \cs{Huge} using the low\-/level font commands \cs{fontsize} and \cs{selectfont}\---they have no additional functionality beyond that of \cs{fontsize} and \cs{selectfont}, except that they:}
+\begin{itemize}
+ \item
+ Set the kernel command \cs{@currsize} equal to the font size command.
+ This is needed only for compatibility.
+ \item
+ Do nothing, except issue a warning, if used in math mode.
+\end{itemize}
+
+Unlike the standard \LaTeX{} document classes, the font size commands from \cs{tiny} to \cs{Huge} defined by this package do not change the vertical spacing for displayed math and list structures.
+If the user would like to add this functionality or perhaps other features to the font size commands, they can use hooks, which are documented in the \LaTeXe{} kernel.
+
+\subsection{The font size parameters}
+\label{subsec:fontsizeparameters}
+
+When using the \pkg{fontscale} package, each font size, including the standard \LaTeX{} font size commands from \cs{tiny} to \cs{Huge}, has a font step, font scale, font size, and font baselineskip.
+The latter two parameters are the familiar first and second arguments to the low\-/level font command \cs{fontsize}\marg{dimen}\marg{skip}.
+(The font baselineskip, stored in the kernel command \cs{f@baselineskip}, should not be confused with the paragraph baselineskip \cs{baselineskip}.)
+The font scale and font step are different ways of describing the font size.
+The font scale is the relative font size; the ratio of the font size to \cs{normalsize}, which has a font scale of \num{1}.
+The font step is the number of font size gradations from \cs{normalsize}, which has a font step of \num{0}.
+Table~\ref{table:fontsteps} displays the font step of each font size command.
+
+\input{./fontscale-table-font-steps.tex}
+
+\subsection{Syntax}
+\label{subsec:syntax}
+
+This package defines some keys and commands that take as a value or argument a \meta{floating point expression}, \meta{integer expression}, \meta{dimen expression}, or \meta{skip expression}.
+This syntax has the same representation as the arguments to \cs{fpeval}, \cs{inteval}, \cs{dimeval}, and \cs{skipeval}, documented in \pkg{usrguide}.%
+\footnote{\url{https://ctan.org/pkg/usrguide}}
+
+
+\section{Keys}
+\label{sec:keys}
+
+This section documents the keys provided by the \pkg{fontscale} package.
+This package has no package options.
+Set the package keys using \cs{fontscalesetup}\marg{key-value list} (\S\ref{subsec:fontscalesetup}).
+
+\subsection{The typographic scale}
+\label{subsec:typographicscale}
+
+The font sizes of the font size commands from \cs{tiny} to \cs{Huge} are initially set by the key \Key{typographic\-/scale}.
+
+\Key{typographic-scale}
+ [%
+ classic-10pt$\,\vert\,$\allowbreak
+ classic-11pt$\,\vert\,$\allowbreak
+ classic-12pt$\,\vert\,$\allowbreak\hspace*{1.5em}%
+ musical%
+ ]
+ [classic-10pt]
+\newline
+\Key{classic-10pt}
+\newline
+\Key{classic-11pt}
+\newline
+\Key{classic-12pt}
+\nopagebreak\newline
+\Key{musical}
+
+The value of the key \Key{typographic\-/scale} must be \Value{classic\-/10pt}, \Value{classic\-/11pt}, \Value{classic\-/12pt}, or \Value{musical}.
+The initial value is \Value{classic\-/10pt}.
+Sets the font size of each font size command from \cs{tiny} to \cs{Huge} using a classic or musical typographic scale.
+These are common methods of choosing a set of document font sizes.
+The keys \Key{classic\-/10pt}, \Key{classic\-/11pt}, \Key{classic\-/12pt}, and \Key{musical} set the key \Key{typographic\-/scale} to the corresponding value.
+
+\input{./fontscale-table-classic.tex}
+
+The classic typographic scale consists of the traditional font sizes
+\numlist{6;7;8;9;10;11;12;14;16;18;21;24;36;48;60;72}.%
+\footnote{See \S3.1 of \textit{The Elements of Typographic Style} by Robert Bringhurst.}
+They have been used since the sixteenth century and are the default font sizes on most computer software.
+Setting the value of the key \Key{typographic\-/scale} to \Key{classic\-/10pt}, \Key{classic\-/11pt}, or \Key{classic\-/12pt} sets the font size of each font size command from \cs{tiny} to \cs{Huge} to values based on their position in the classic typographic scale.
+The named point size\---\qtylist[list-final-separator={, or }]{10;11;12}{pt}\---is the font size of \cs{normalsize}.
+The font sizes of the other font size commands are the adjacent font sizes in the classic typographic scale.
+Table~\ref{table:classic} displays the font size of each font size command when using a classic typographic scale.
+
+\Key{musical/base}[\meta{dimen expression}][10pt]%
+\nopagebreak\newline
+\Key{musical/ratio}[\meta{floating point expression}][2]%
+\nopagebreak\newline
+\Key{musical/notes}[\meta{integer expression}][5]
+
+The key \Key{typographic\-/scale}[musical] sets the font size of each font size command from \cs{tiny} to \cs{Huge} using a musical typographic scale.
+The font sizes are calculated using the formula:%
+\footnote
+ {%
+ I have referenced this article by Spencer Mortensen:
+ \newline
+ \url{https://spencermortensen.com/articles/typographic-scale/}%
+ }
+\begin{equation}\label{eq:musical}
+ f_i = f_0 \times r ^ { i / n }
+\end{equation}
+$f_i$ is the font size with font step~$i$.
+$f_0$ is the base font size.
+$n$ is the number of musical notes\---the number of font size gradations or steps above $f_0$.
+$r$ is the musical ratio, the ratio of the highest to the lowest note $ f_n / f_0 $.
+
+The key \Key{musical\slash{}base} sets the base font size to the value of \meta{dimen expression}, appending a default unit of \unit{pt}.
+The base font size is the font size of \cs{normalsize}.
+The key \Key{musical\slash{}ratio} sets the musical ratio to the result of computing the \meta{floating point expression}.
+The key \Key{musical\slash{}notes} sets the number of musical notes to the value of \meta{integer expression}.
+Table~\ref{table:musical} displays the font size of each font size command when using a musical typographic scale with the initial values.
+
+\input{./fontscale-table-musical.tex}
+
+\subsection{The baselineskip-size-ratio}
+\label{subsec:baselineskipsizeratio}
+
+The font baselineskips of the font size commands from \cs{tiny} to \cs{Huge} are initially set by the key \Key{baselineskip\-/size\-/ratio}.
+
+\Key{baselineskip-size-ratio}[\meta{floating point expression}][1.2]
+\KeepNextPar*
+
+Sets the font baselineskip of each font size command from \cs{tiny} to \cs{Huge} equal to its font size \texttimes{} the result of computing the \meta{floating point expression}.
+Sets the font baselineskip set by \cs{SetFontStep}, \cs{SetFontScale}, and \cs{SetFontSize} (\S\ref{subsec:fontsize}) equal to the new font size \texttimes{} the result of computing the \meta{floating point expression}.
+The font baselineskip must be greater than or equal to the font size.
+
+
+\subsection{Overwriting the previous keys}
+\label{subsec:overwriting}
+
+This subsection documents keys for directly setting the font scales, font sizes, and font baselineskips of the font size commands from \cs{tiny} to \cs{Huge}.
+When doing so, the user should take care to ensure that the lengths of the font sizes and font baselineskips remain correctly ordered from \cs{tiny} to \cs{Huge}.
+This is important for typographic and syntactic consistency.
+If the font size commands are in the wrong order, this package will issue a warning and some package features may not work correctly.
+
+\Key{\meta{font size command}/scale}[\meta{floating point expression}][\meta{not set}]
+\KeepNextPar*
+
+Sets the font size of \meta{font size command} by setting its font scale to the result of computing the \meta{floating point expression}.
+Overwrites the font size set by the key \Key{typographic\-/scale}.
+The key \Key{normalsize\slash{}scale} is not defined.
+
+\Key{\meta{font size command}/size}[\meta{dimen expression}][\meta{not set}]
+\KeepNextPar*
+
+Sets the font size of \meta{font size command} to the value of \meta{dimen expression}, appending a default unit of \unit{pt}.
+Overwrites the font size set by the keys \Key{typographic\-/scale} and \Key{\meta{font size command}\slash{}scale}.
+
+\Key{\meta{font size command}/baselineskip}[\meta{skip expression}][\meta{not set}]
+\KeepNextPar*
+
+Sets the font baselineskip of \meta{font size command} to the value of \meta{skip expression}, appending a default unit of \unit{pt}.
+The font baselineskip must be greater than or equal to the font size.
+Overwrites the font baselineskip set by the key \Key{baselineskip\-/size\-/ratio}.
+
+\Key{\meta{font size command}}[\meta{dimen expression}]
+\nopagebreak\newline
+\Key{\meta{font size command}}[\meta{dimen expression}/\meta{skip expression}]
+
+Sets the keys \Key{\meta{font size command}\slash{}size}[\meta{dimen expression}] or \Key{\meta{font size command}\slash{}baselineskip}[\meta{skip expression}] in a condensed format.
+The latter format resembles traditional typographic notation where the size and leading of a text can be expressed as, for example, \num{10}/\num{12} or \num{11}/\num{13}.
+The number before\slash{}after the slash is the size\slash{}leading in units of \unit{pt}.
+
+
+\section{Commands}
+\label{sec:commands}
+
+This section documents the commands provided by the \pkg{fontscale} package.
+
+\subsection{Setting the keys}
+\label{subsec:fontscalesetup}
+
+\cs{fontscalesetup} \sarg{} \marg{key-value list}
+\KeepNextPar*
+
+Sets and processes the \pkg{fontscale} package keys (\S\ref{sec:keys}) in \meta{key\-/value list} and then uses \cs{normalsize}.
+Adding the optional star first resets all the \pkg{fontscale} package keys to their initial values.
+The order of the keys in \meta{key\-/value list} does not matter.
+Can be used mid\-/document.
+The effect is local to the current group.
+Does nothing, except issue a warning, if used in math mode.
+\cs{fontscalesetup} should typically be used only once in the preamble or omitted if the user is satisfied with the initial font sizes and font baselineskips.
+
+\subsection{Expandable commands}
+\label{subsec:expandable}
+
+\cs{CurrentFontStep}
+\nopagebreak\newline
+\cs{CurrentFontScale}
+\newline
+\cs{CurrentFontSize}
+\nopagebreak\newline
+\cs{CurrentFontBaselineskip}
+
+This package provides expandable commands that expand to the current font step, font scale, font size, or font baselineskip.
+They can be used for printing or within calculations.
+
+For clarity, \cs{CurrentFontStep} will be explained in detail.
+\cs{CurrentFontStep} initially tests if the current font size equals the font size of any font size command from \cs{tiny} to \cs{Huge}.
+If so, it expands to the font step of that font size command (Table~\ref{table:fontsteps}).
+If not and if the value of the key \Key{typographic\-/scale} is \Value{musical}, \cs{CurrentFontStep} expands to the current font step calculated from the musical typographic scale (Equation~\ref{eq:musical}).
+Otherwise, the current font step is undefined and \cs{CurrentFontStep} expands to nothing.
+
+Internally, \cs{CurrentFontStep}, \cs{CurrentFontScale}, and \cs{CurrentFontSize} rely on the kernel command \cs{f@size}.
+(\cs{f@size} stores the current font size in units of \unit{pt}, omitting the unit.)
+The low\-/level font command \cs{fontsize}\marg{dimen}\marg{skip} sets \cs{f@size} to the new font size before expanding its second argument.
+This means that, if used in \meta{skip}, \cs{CurrentFontStep}, \cs{CurrentFontScale}, and \cs{CurrentFontSize} will expand to the new value\---unless they are first expanded.
+This package provides \cs{SetFontSizeBaselineskip} as an alternative to \cs{fontsize} + \cs{selectfont} that avoids this issue (\S\ref{subsec:fontsize}).
+
+\cs{CurrentFontSizeCommand}
+\KeepNextPar*
+
+Tests if the current font size and current font baselineskip equal the font size and font baselineskip, respectively, of any font size command from \cs{tiny} to \cs{Huge}.
+If so, expands to the name of that font size command.
+This omits the backslash character and leaves only letters with catcode \num{11}.
+If not, expands to nothing.
+This package also provides a similar command \cs{PrintFontSizeCommand} (\S\ref{subsec:debug}), which is not expandable and includes the backslash character.
+
+\subsection{More font size commands}
+\label{subsec:fontsize}
+
+This package provides additional font size commands for use only in special cases.
+Users should prefer the standard \LaTeX{} font size commands from \cs{tiny} to \cs{Huge} for typographic and syntactic consistency.
+
+\cs{SetFontStep} \sarg{} \marg{floating point expression}
+\KeepNextPar*
+
+Sets the font size by setting the font step to the result of computing the \meta{floating point expression}.
+Adding the optional star instead increases the current font step by the result of computing the \meta{floating point expression} or issues an error if the current font step is undefined (as explained for \cs{CurrentFontStep} in \S\ref{subsec:expandable}).
+Sets the font baselineskip equal to the new font size \texttimes{} the value of the key \Key{baselineskip\-/size\-/ratio}.
+
+\listheading{Three exceptions:}
+\begin{itemize}
+ \item
+ The font step must equal the font step of any font size command from \cs{tiny} to \cs{Huge} (Table~\ref{table:fontsteps}) unless the value of the key \Key{typographic\-/scale} is \Value{musical}.
+ \cs{SetFontStep} will issue an error if the font step is undefined (as explained for \cs{CurrentFontStep} in \S\ref{subsec:expandable}).
+ \item
+ If the font step equals the font step of any font size command from \cs{tiny} to \cs{Huge}, then that font size command will be used directly.
+ \item
+ Does nothing, except issue a warning, if used in math mode.
+\end{itemize}
+
+\cs{SetFontScale} \sarg{} \marg{floating point expression}
+\KeepNextPar*
+
+Sets the font size by setting the font scale to the result of computing the \meta{floating point expression}.
+Adding the optional star instead increases the current font scale by the result of computing the \meta{floating point expression}.
+Sets the font baselineskip equal to the new font size \texttimes{} the value of the key \Key{baselineskip\-/size\-/ratio}.
+Does nothing, except issue a warning, if used in math mode.
+
+\cs{SetFontSize} \sarg{} \marg{dimen expression}
+\KeepNextPar*
+
+Sets the font size to the value of \meta{dimen expression}, appending a default unit of \unit{pt}.
+Adding the optional star instead increases the current font size by the result of \meta{dimen expression}, appending a default unit of \unit{pt}.
+Sets the font baselineskip equal to the new font size \texttimes{} the value of the key \Key{baselineskip\-/size\-/ratio}.
+Does nothing, except issue a warning, if used in math mode.
+
+\cs{ScaleFont} \marg{floating point expression}
+\KeepNextPar*
+
+Sets the font size equal to the current font size \texttimes{} the result of computing the \meta{floating point expression}.
+Sets the font baselineskip equal to the current font baselineskip \texttimes{} the result of computing the \meta{floating point expression}.
+Does nothing, except issue a warning, if used in math mode.
+
+\cs{SetFontSizeBaselineskip} \marg{dimen expression} \marg{skip expression}
+\KeepNextPar*
+
+Sets the font size to the value of \meta{dimen expression}, appending a default unit of \unit{pt}.
+Sets the font baselineskip to the value of \meta{skip expression}, appending a default unit of \unit{pt}.
+The font baselineskip must be greater than or equal to the font size.
+Does nothing, except issue a warning, if used in math mode.
+Can be used as an alternative to \cs{fontsize} + \cs{selectfont} as discussed in \S\ref{subsec:expandable}.
+
+\subsection{Testing and debugging}
+\label{subsec:debug}
+
+The commands documented here are intended primarily for testing and debugging.
+I have used them often when developing this package so I think users will find them helpful.
+
+\cs{PrintFontSizeParameters}
+\KeepNextPar*
+
+Prints the current font size parameters\---the font step, font scale, font size, and font baselineskip.
+The current font step will be left blank if it is undefined (as explained for \cs{CurrentFontStep} in \S\ref{subsec:expandable}).
+
+\cs{PrintAllFontSizeParameters}
+\KeepNextPar*
+
+Prints the font step, font scale, font size, and font baselineskip of each font size command from \cs{tiny} to \cs{Huge}.
+
+\cs{PrintSampleText} \sarg{} \marg{text}
+\KeepNextPar*
+
+Prints \meta{text} in each font size ordered from \cs{tiny} to \cs{Huge} each followed by a paragraph break.
+\meta{text} can contain \cs{par} tokens.
+Adding the optional star reverses the order of the font sizes.
+One useful way of printing example text is \cs{PrintSampleText}\allowbreak\texttt{\{\cs{PrintFontSizeCommand}:\allowbreak\textvisiblespace\allowbreak\cs{PrintFontSizeParameters}\}}.
+
+\cs{PrintFontSizeCommand}
+\KeepNextPar*
+
+Tests if the current font size and current font baselineskip equal the font size and font baselineskip, respectively, of any font size command from \cs{tiny} to \cs{Huge}.
+If so, prints the name of that font size command, including the backslash character.
+If not, prints \enquote{\string\undefined}.
+This package also provides a similar command \cs{CurrentFontSizeCommand} (\S\ref{subsec:expandable}), which is expandable and omits the backslash character.
+
+
+\section{Programming}
+\label{sec:programming}
+
+This section documents the \pkg{expl3} programming support provided by the \pkg{fontscale} package.
+
+\subsection
+ {%
+ Compatibility with
+ \texorpdfstring
+ {\cs{text_purify:n}}
+ {\textbackslash{}text\_purify:n}%
+ }
+\label{subsec:textpurify}
+
+\cs{text_purify:n} will correctly remove the formatting commands defined by this package, including \cs{fontscalesetup} and the commands documented in \S\ref{subsec:fontsize}.
+
+\subsection{Public functions and variables}
+\label{subsec:publicexpl3}
+
+This package does not define any public \pkg{expl3} functions.
+
+This package defines public \pkg{expl3} variables that store the font step, font scale, font size, and font baselineskip of each font size command from \cs{tiny} to \cs{Huge}.
+These variables should never be modified directly.
+Their values should be changed only by \cs{fontscalesetup}.
+
+Each takes the form:
+
+\verb|\c_fontscale_|\meta{font size command}\verb|_step_fp|
+\nopagebreak\newline
+\verb|\l_fontscale_|\meta{font size command}\verb|_scale_fp|
+\newline
+\verb|\l_fontscale_|\meta{font size command}\verb|_size_dim|
+\nopagebreak\newline
+\verb|\l_fontscale_|\meta{font size command}\verb|_baselineskip_skip|
+
+Exception:
+\cs{l_fontscale_normalsize_scale_fp} is not defined.
+The font scale of \cs{normalsize} is stored in \cs{c_fontscale_normalsize_scale_fp}.
+
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/hebdomon/HebdomonGuide.pdf b/Master/texmf-dist/doc/latex/hebdomon/HebdomonGuide.pdf
new file mode 100644
index 00000000000..f458c73d8ed
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hebdomon/HebdomonGuide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hebdomon/HebdomonGuide.tex b/Master/texmf-dist/doc/latex/hebdomon/HebdomonGuide.tex
new file mode 100644
index 00000000000..714857cf405
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hebdomon/HebdomonGuide.tex
@@ -0,0 +1,461 @@
+% Load the base class
+\documentclass[minted, draw]{../tex/hebdomon}
+
+\begin{document}
+
+\title{Hebdomon \\ Report and Documentation Standard}
+\author{v0.1 - Angry Avocado}
+\StudentName{D. T. McGuiness}
+\date{dtm@mci4me.at}
+
+\publishers{
+ \begin{tabular}[!b]{rl}
+ \textbf{Student Name} & xxxxx \\[3pt]
+ \textbf{Student Number} & xxxxx \\[3pt]
+ \textbf{Module Name} & xxxxx
+ \end{tabular}\\[20pt]
+ }
+
+\maketitle
+\dominitoc
+\tableofcontents
+\newpage
+
+\Chapter{The Hebdomon Template}
+\Section{Introduction}
+
+This document is designed to abstract a significant portion of the
+commands and MACROs to hide away the programming aspect and ease into
+LaTeX programming. While some commands are have been changed \hlight{NO}
+command has been overwritten so feel free to use the original ones
+if you wish.
+
+\begin{warning}
+ As to the best of the authors knowledge, the original commands should work
+ but the aesthetics may be compromised.
+\end{warning}
+
+\Section{Title Formatting}
+
+To begin a new content, always start the content with a chapter heading. To
+insert the chapter with an additional \lstinline[columns=fixed]{minitoc}
+use \lstinline[columns=fixed]{\Chapter}, which produces an heading as
+you see at the beginning of this page, to have a heading without
+a \lstinline[columns=fixed]{minitoc} use the standard
+\lstinline[columns=fixed]{\chapter}.
+
+The document relies on the user to use the \hlight{correct} title commands to
+keep the formatting consistent. The commands that starting with a
+capital letter are the overloaded commands of the standard ones.
+The following are the current ones:
+%
+\begin{code}{python}
+\Chapter{...}
+\Section{...}
+\Subsection{...}
+\Subsubsection{...}
+\end{code}
+%
+\begin{warning}
+ Unless there is a specific reason, it is suggested to use the aforementioned
+ commands. However, original LaTeX command should work as well if you want to use.
+\end{warning}
+
+\Subsection{Page Geometry}
+
+The page geometry is set to the following settings. This is done using the
+standard package \pcode{\usepackage{geometry}} which is defined in the
+\pcode{Hebdomon.cls}.
+%
+\begin{itemize}[leftmargin=!,labelindent=-29.2pt]
+ \item[\textbf{top}] 2.5cm,
+ \item[\textbf{right}] 2.0cm,
+ \item[\textbf{bottom}] 2.5cm,
+ \item[\textbf{left}] 3.0cm.
+\end{itemize}
+%
+\Section{Image Positioning}
+%
+The image positioning could be done with the following code snippet:
+%
+\begin{code}{latex}
+\begin{figure}[ht]
+ \centering
+ \includegraphics[options]{figures/path.pdf}
+ \caption{\label{fig:label} }
+\end{figure}
+\end{code}
+%
+Here there are a few options worth mentioning:
+%
+\begin{hgitemize}
+ \item[\pcode{figures/path}] The place where the image is kept. If the
+ image is in the same folder where the main.tex file resides, it is as
+ simple as writing the files name. If the file is in a folder called
+ image, just write \pcode{image/innsbruck.jpg}. Finally if the image is
+ in a higher directory (i.e., image is in folderA/innsbruck.jpg and the
+ main tex is in folderA/document/main.tex then the path becomes \pcode{../innsbruck.jpg}
+ \item[\pcode{\caption{..}}] Where you write the caption of the image.
+ For consistency make sure every image has a caption as if the image does not
+ need a caption, maybe it not be present to begin with.
+ \item[\pcode{label{}}] This is an identifier for you to use when you need
+ to cite this Figure in a place somewhere. For example if you were to have
+ and image with the following:
+\end{hgitemize}
+%
+\begin{code}{latex}
+\begin{figure}[ht]
+ \centering
+ \includegraphics[width=\textwidth]{figures/path.pdf}
+ \caption{A photo I found on the web.}\label{fig:innsbruck}
+\end{figure}
+\end{code}
+%
+\begin{hgitemize}
+ \item[] Now this image is referenced as \pcode{fig:innsbruck}, which
+ means if we write the following:
+\end{hgitemize}
+%
+\begin{code}{text}
+To see the image, have a look at Figure \ref{fig:innsbruck}
+\end{code}
+%
+This line of command will be presented as
+%
+\begin{excerpt}
+ To see the image, have a look at Figure 1.1.
+\end{excerpt}
+%
+Finally you can see the image here as well.
+%
+\begin{figure}[ht]
+ \centering
+ \includegraphics[width=\linewidth]{figures/innsbruck.jpg}
+ \caption{The famous Innsbruck houses near the river Inn. This image is
+ placed with a width value of \pcode{width=\linewidth}. This is also
+ a good opportunity to showcase the hanging behaviour of the figure
+ caption.}
+\end{figure}
+%
+\Section{Defined Environments}
+%
+\begin{hgitemize}
+ \item[\pcode{excerpt}] The template relies on the excellent \lstinline[columns=fixed]{tcolorbox}
+ package for formatting the boxes within the document and for that end different styles were created.
+ \item[] Sometimes one needs to quote either a proverb or to create drama, for this use
+ the \lstinline[columns=fixed]{excerpt} environment with the following notation and effect.
+\end{hgitemize}
+%
+\begin{code}{latex}
+\begin{excerpt}
+ To be, or not to be...
+\end{excerpt}
+\end{code}
+%
+\begin{hgitemize}
+ \item[] Compiling this code snippet would show as in the document
+\end{hgitemize}
+%
+\begin{excerpt}
+ To be, or not to be...
+\end{excerpt}
+%
+\begin{itemize}[leftmargin=!,labelindent=-29.2pt]
+ \item[\pcode{code}] During the preparation of your document, it is useful to showcase
+ some code either in the shape of all the document or a snippet of it.
+ There are two (\hlight{2}) ways of doing this where the first one will be discussed here.
+ \item[] For example to print out a hello world in python, please use the following environment
+\end{itemize}
+%
+\begin{verbatim}
+\begin{code}{python}
+print("Hello, World!")
+\end{code}
+\end{verbatim}
+%
+Producing the following:
+%
+\begin{code}{python}
+print("Hello, World!")
+\end{code}
+%
+The class also come with some predefined environments to modify the behaviour/aesthetics of the document.
+%
+Highlighting text is \hlight{very easy}, here is an example on how to write one.
+
+\begin{code}{latex}
+Highlighting text is \hlight{very easy}, here is an example:
+\end{code}
+
+\begin{itemize}[leftmargin=!,labelindent=-29.2pt]
+ \item[\pcode{example}] Sometimes you need to showcase an example or
+ need to highlight a certain idea.
+ For these things the environment Example could be useful.
+ \item[] For example to show as simple example or give a slight attention to a topic you can do the following.
+\end{itemize}
+
+\begin{example}
+ This is an example. This could be anything which you would like to have a certain amount of
+ attention but not too much as to distract from the flow of the document.
+\end{example}
+
+\begin{itemize}[leftmargin=!,labelindent=-29.2pt]
+ \item[\pcode{highlight}] Or sometimes you need to give a clear break to the flow of the
+ document and ask the reader to look at your banner. For that use highlight.
+\end{itemize}
+
+\begin{highlight}
+ Hey! Pay attention as this is a highlight box.
+\end{highlight}
+
+\Subsection{Writing Equations}
+%
+One of the strong suits of LaTeX compared to other editors and programs is
+it simplicity and ease of use methods of writing equations. Consider the
+following equation:
+%
+\begin{equation*}
+ f(x) = x^2 + 2x + 1
+\end{equation*}
+%
+In code form this would be written as:
+%
+\begin{code}{latex}
+ \begin{equation*}
+ f(x) = x^2 + 2x + 1
+ \end{equation*}
+\end{code}
+%
+All equations that has their newline and centre staged are mostly written
+in an environment where it has a \pcode{begin} and an \pcode{end}. You may
+have noticed the asterisks sign just after the equation. This implies the
+environment is \hlight{not numbered}, meaning you won't be able to
+reference it. This is used to limit the numbering of equations to just the
+essential parts in the document and not reach 3 digits by the time you are
+in page 8. For a numbered equation like the following
+%
+\begin{equation}
+ f(x) = x^2 + 2x + 1
+\end{equation}
+%
+You only need to do:
+%
+\begin{code}{latex}
+ \begin{equation}\label{eq:quad}
+ f(x) = x^2 + 2x + 1
+ \end{equation}
+\end{code}
+%
+where \pcode{\label{eq:quad}} is the equation reference label.
+%
+You could also make matrices as well as \pcode{amsmath} is preloaded into this template.
+%
+\Subsection{Designing a Table}
+%
+Finally, no template is done without someone telling you how a table should be designed.
+%
+Below is a standard table
+%
+\begin{table}[!ht]
+ \begin{NiceTabular}{rX}[rules/color=[gray]{0.9},rules/width=1pt]
+ \CodeBefore
+ \rowcolors{1}{black!5}{}
+ \rowcolors{3}{blue!5}{}
+ \Body
+ \toprule
+ \textbf{Section} & \textbf{Scientific Method Step} \\
+ \midrule
+ \textbf{Introduction} & states your hypothesis \\
+ \textbf{Methods} & details how you tested your hypothesis \\
+ \textbf{Results} & provides raw (i.e., uninterpreted) data collected \\
+ \textbf{Discussion} & considers whether the data you obtained support the hypothesis \\
+ \bottomrule
+ \end{NiceTabular}
+ \caption{A Detailed look into the scientific method.}
+\end{table}
+%
+And the code used to generate it:
+%
+\begin{code}{latex}
+\begin{table}[!ht]
+ \begin{NiceTabular}{rX}[rules/color=[gray]{0.9},rules/width=1pt]
+ \CodeBefore
+ \rowcolors{1}{black!5}{}
+ \rowcolors{3}{blue!5}{}
+ \Body
+ \toprule
+ \textbf{Section} & \textbf{Scientific Method Step} \\
+ \midrule
+ \textbf{Introduction} & states hypothesis \\
+ \textbf{Methods} & how you tested hypothesis \\
+ \textbf{Results} & provides raw data collected \\
+ \textbf{Discussion} & whether it support the hypothesis \\
+ \bottomrule
+ \end{NiceTabular}
+ \caption{A Detailed look into the scientific method.}
+\end{table}
+\end{code}
+
+\Chapter{Plotting your data using PGF/TikZ}
+
+\Section{Introduction}
+
+PGFplots and Tikz are powerful scripting languages allowing you to draw high-quality diagrams
+using only a programming language. PGFplots are generally used for plotting data from a wide
+variety of representations from simple 2D plots to complex 3D geometries.
+\\
+But wikipedia description put it best:
+
+\begin{excerpt}
+ PGF/TikZ is a pair of languages for producing vector graphics
+ (e.g., technical illustrations and drawings) from a geometric/algebraic description, with
+ standard features including the drawing of points, lines, arrows, paths, circles,
+ ellipses and polygons. PGF is a lower-level language, while TikZ is a set of higher-level
+ macros that use PGF. The top-level PGF and TikZ commands are invoked as TeX macros,
+ but in contrast with PSTricks, the PGF/TikZ graphics themselves are described in a
+ language that resembles MetaPost.
+\end{excerpt}
+
+For more info please look at the documentation \href{https://tikz.dev/pgfplots/}{here}.
+It is of course up to the user to select which graphical software to produce the necessary
+visual components but unless it requires complex functions/processing, it would be be easier
+to have it in PGF/TikZ format for easy editing/maintenance.
+
+For this manual we will be looking at the three (\hlight{3}) plot types you may
+encounter in your studies.
+%
+\Subsection{A Simple 2D Plot}
+%
+2D plots are simple yet powerful to show the relation of a single parameters
+and its related function.
+Below is an example of a simple comparison of two (\hlight{2}) functions.
+%
+\begin{figure}[!ht]
+ \centering
+ \begin{tikzpicture}
+ \begin{axis}[hebdomon, xlabel = \(x\), ylabel = {\(f(x)\)}]
+ %
+ \addplot [domain=-10:10, samples=100,red]{x^3 - 7*x - 1};
+ \addlegendentry{\(x^2 - 2x - 1\)}
+ %
+ \addplot [domain=-10:10, samples=100, blue]{x^2 + 6*x + 8};
+ %
+ \addlegendentry{\(x^2 + 2x + 1\)}
+ %
+ \end{axis}
+ \end{tikzpicture}
+ \caption{This is an example of a 2D PGF plot comparing
+ two functions where these functions are calculated using
+ PGF itself rather than entering/reading from data.}
+\end{figure}
+%
+The image above is generated using the following code:
+
+\begin{code}{latex}
+\begin{figure}[!ht]
+ \centering
+ \begin{tikzpicture}
+ \begin{axis}[hebdomon, xlabel = \(x\), ylabel = {\(f(x)\)}]
+ %
+ \addplot [domain=-10:10, samples=100,red]{x^3 - 7*x - 1};
+ \addlegendentry{\(x^2 - 2x - 1\)}
+ %
+ \addplot [domain=-10:10, samples=100, blue]{x^2 + 6*x + 8};
+ %
+ \addlegendentry{\(x^2 + 2x + 1\)}
+ %
+ \end{axis}
+ \end{tikzpicture}
+ \caption{This is an example of a 2D PGF plot comparing
+ two functions where these functions are calculated using
+ PGF itself rather than entering/reading from data.}
+\end{figure}
+\end{code}
+
+As can be seen it is relatively standard to create plots. Some aspect
+which need mentioning.
+
+\begin{hgitemize}
+ \item[\pcode{\addplot}] You invoke this command when you want to
+ create a plot. In the square brackets (i.e., []) you insert your
+ \hlight{configuration} of your plot. The most important ones are
+ \begin{itemize}
+ \item[\pcode{domain}] the range in which the function will be
+ calculated
+ \item[\pcode{sample}] the number of calculations will be done
+ within the defined domain.
+ \end{itemize}
+\end{hgitemize}
+
+\Subsection{Plotting 3D plots}
+
+Plotting data with PGFplots is also quite possible and will generate
+great plot (as long as it is not massively complicated). For more
+information on the precautions on designing 3D plots, please have a look
+at \href{https://tikz.dev/pgfplots/reference-3dplots}{here}.
+
+Below is the prototypical plot to showcase the 3D capabilities of PGF:
+
+\begin{figure}[!ht]
+ \centering
+ \begin{tikzpicture}
+ \begin{axis}[view={25}{30},mark layer=like plot]
+ \addplot3 [
+ surf,
+ shader=faceted,
+ fill opacity=0.75,
+ samples=25,
+ domain=-4:4,
+ y domain=-4:4,
+ on layer=main,
+ ] {x^2-y^2};
+ \end{axis}
+ \end{tikzpicture}
+ \caption{An example 3D plot done wit PGFplots.}
+\end{figure}
+
+And, of course the code for generating the plot is given as follows:
+
+\begin{code}{latex}
+\begin{figure}[!ht]
+ \centering
+ \begin{tikzpicture}
+ \begin{axis}[view={25}{30},mark layer=like plot]
+ \addplot3 [
+ surf,
+ shader=faceted,
+ fill opacity=0.75,
+ samples=25,
+ domain=-4:4,
+ y domain=-4:4,
+ on layer=main,
+ ] {x^2-y^2};
+ \end{axis}
+ \end{tikzpicture}
+ \caption{An example 3D plot done wit PGFplots.}
+\end{figure}
+\end{code}
+
+Some options worth mentioning are as follows:
+
+\begin{hgitemize}
+ \item[\pcode{surf}] Generates a \hlight{surface} based on the 2D
+ data it was given (in this case these are $x$ and $y$.
+ \item[\pcode{shader}] Describes, basically how each segment should be
+ filled.
+ \item[\pcode{samples}] Similar to 2D plots, tells how many data points will
+ be measured. However, make a note that 3D is significantly more taxing
+ on the TeX memory than 2D and making this sampling high may result in
+ exceeding the memory limit.
+\end{hgitemize}
+
+\end{document}
+
+%%% Local Variables:
+%%% coding: utf-8
+%%% mode: latex
+%%% TeX-command-extra-options: "-shell-escape"
+%%% TeX-master: t
+%%% TeX-engine: luatex
+%%% End:
+
diff --git a/Master/texmf-dist/doc/latex/hebdomon/README.md b/Master/texmf-dist/doc/latex/hebdomon/README.md
new file mode 100644
index 00000000000..cb581a6ab03
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hebdomon/README.md
@@ -0,0 +1,18 @@
+# Hebdomon - A Documentclass for Assignment Preparation
+
+## Description
+
+Hebdomon is a latex documentclass for streamlining document creation in latex. This
+package does not ovewrite any TeX or LaTeX commands so the user could use their own
+macros or other commands as they wish.
+
+A manual is written which can be seen in HebdomonGuide which showcases some commands written for the class.
+
+## Author
+
+This package is maintained by D. T. McGuiness: dtm@mci4me.at
+
+## Licence
+
+Released under the LaTeX Project Public License v1.3c or later.
+See https://www.latex-project.org/lppl.txt
diff --git a/Master/texmf-dist/doc/latex/hebdomon/figures/innsbruck.jpg b/Master/texmf-dist/doc/latex/hebdomon/figures/innsbruck.jpg
new file mode 100644
index 00000000000..c42a2a0580a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hebdomon/figures/innsbruck.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hypcap/README.md b/Master/texmf-dist/doc/latex/hypcap/README.md
new file mode 100644
index 00000000000..07580bcb3f4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hypcap/README.md
@@ -0,0 +1,20 @@
+# hypcap package for LaTeX
+
+* adjusting anchors of captions;
+
+Version: 2024-07-26 v1.13
+
+This package tries a solution of the problem with
+hyperref, that links to floats points below the
+caption and not at the beginning of the float.
+Therefore this package divides the task into two
+part, the link setting with `\capstart` or
+automatically at the beginning of a float and
+the rest in the `\caption` command.
+
+## Copyright (C)
+* 1999-2001, 2006-2008, 2011 Heiko Oberdiek
+* 2016-2024 Oberdiek Package Support Group
+
+## License
+LATEX Project Public License, version 1.3c or later.
diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf b/Master/texmf-dist/doc/latex/hypcap/hypcap.pdf
index 46df7e89510..bea211492fa 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf
+++ b/Master/texmf-dist/doc/latex/hypcap/hypcap.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hypdestopt/README.md b/Master/texmf-dist/doc/latex/hypdestopt/README.md
index 0610b53e582..71e1c7066e7 100644
--- a/Master/texmf-dist/doc/latex/hypdestopt/README.md
+++ b/Master/texmf-dist/doc/latex/hypdestopt/README.md
@@ -1,6 +1,6 @@
# hypdestopt package for LaTeX
-Version: 2020-09-02 v2.7
+Version: 2024-08-07 v2.8
Hyperref destination optimizer
@@ -11,7 +11,7 @@ to get smaller PDF files.
## Copyright (C)
* 2007, 2009-2011 Heiko Oberdiek
-* 2016-2020 Oberdiek Package Support Group
+* 2016-2024 Oberdiek Package Support Group
## License
LATEX Project Public License, version 1.3c or later.
diff --git a/Master/texmf-dist/doc/latex/hypdestopt/hypdestopt.dtx b/Master/texmf-dist/doc/latex/hypdestopt/hypdestopt.dtx
index 03006db27bf..f9c6af1e6d9 100644
--- a/Master/texmf-dist/doc/latex/hypdestopt/hypdestopt.dtx
+++ b/Master/texmf-dist/doc/latex/hypdestopt/hypdestopt.dtx
@@ -1,12 +1,12 @@
% \iffalse meta-comment
%
% File: hypdestopt.dtx
-% Version: 2020-09-02 v2.7
+% Version: 2024-08-07 v2.8
% Info: Hyperref destination optimizer
%
% Copyright (C)
% 2006-2008, 2011 Heiko Oberdiek
-% 2016-2020 Oberdiek Package Support Group
+% 2016-2024 Oberdiek Package Support Group
% https://github.com/ho-tex/hypdestopt/issues
%
% This work may be distributed and/or modified under the
@@ -79,7 +79,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: hypdestopt 2020-09-02 v2.7 Hyperref destination optimizer (HO)}
+\Msg{* Package: hypdestopt 2024-08-07 v2.8 Hyperref destination optimizer (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -91,11 +91,11 @@
This is a generated file.
Project: hypdestopt
-Version: 2020-09-02 v2.7
+Version: 2024-08-07 v2.8
Copyright (C)
2006-2008, 2011 Heiko Oberdiek
- 2016-2020 Oberdiek Package Support Group
+ 2016-2024 Oberdiek Package Support Group
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -152,7 +152,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{hypdestopt.drv}%
- [2020-09-02 v2.7 Hyperref destination optimizer (HO)]%
+ [2024-08-07 v2.8 Hyperref destination optimizer (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2011/11/22]
\begin{document}
@@ -166,7 +166,7 @@ and the derived files
% \GetFileInfo{hypdestopt.drv}
%
% \title{The \xpackage{hypdestopt} package}
-% \date{2020-09-02 v2.7}
+% \date{2024-08-07 v2.8}
% \author{Heiko Oberdiek\thanks
% {Please report any issues at \url{https://github.com/ho-tex/hypdestopt/issues}}}
%
@@ -177,6 +177,9 @@ and the derived files
% \xoption{pdftex} and \xoption{luatex} driver. It removes unnecessary destinations
% and shortens the destination names or uses numbered destinations
% to get smaller PDF files.
+%
+% The package is not compatible with the \LaTeX{} PDFmanagement loaded with
+% \cs{DocumentMetadata} and will do nothing if it detects it.
% \end{abstract}
%
% \tableofcontents
@@ -289,9 +292,24 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hypdestopt}%
- [2020-09-02 v2.7 Hyperref destination optimizer (HO)]%
+ [2024-08-07 v2.8 Hyperref destination optimizer (HO)]%
% \end{macrocode}
%
+% \subsection{Check for PDF management}
+% \begin{macrocode}
+\IfDocumentMetadataTF
+ {
+ \PackageWarning{hypdestopt}
+ {
+ \string\DocumentMetadata detected. \MessageBreak
+ The package will do nothing.
+ }{}
+ }{}
+\IfDocumentMetadataTF
+ {
+ \endinput
+ }{}
+% \end{macrocode}
% \subsection{Options}
%
% \subsubsection{Option \xoption{verbose}}
@@ -752,26 +770,6 @@ and the derived files
% \end{description}
%
%
-% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
-% are also available in a TDS compliant ZIP archive. There
-% the packages are already unpacked and the documentation files
-% are generated. The files and directories obey the TDS standard.
-% \begin{description}
-% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
-% \end{description}
-% \emph{TDS} refers to the standard ``A Directory Structure
-% for \TeX\ Files'' (\CTANpkg{tds}). Directories
-% with \xfile{texmf} in their name are usually organized this way.
-%
-% \subsection{Bundle installation}
-%
-% \paragraph{Unpacking.} Unpack the \xfile{oberdiek.tds.zip} in the
-% TDS tree (also known as \xfile{texmf} tree) of your choice.
-% Example (linux):
-% \begin{quote}
-% |unzip oberdiek.tds.zip -d ~/texmf|
-% \end{quote}
-%
% \subsection{Package installation}
%
% \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
@@ -956,6 +954,9 @@ and the derived files
% \begin{Version}{2020-09-02 v2.7}
% \item Adapted to the new hook management of LaTeX (github issue 1)
% \end{Version}
+% \begin{Version}{2024-08-07 v2.8}
+% \item Disable the package if \cs{DocumentMetadata} is detected (github issue 2)
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/doc/latex/hypdestopt/hypdestopt.pdf b/Master/texmf-dist/doc/latex/hypdestopt/hypdestopt.pdf
index 1835545dc89..1ca7cc4c296 100644
--- a/Master/texmf-dist/doc/latex/hypdestopt/hypdestopt.pdf
+++ b/Master/texmf-dist/doc/latex/hypdestopt/hypdestopt.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/iwonamath/README b/Master/texmf-dist/doc/latex/iwonamath/README
index 72fe9e35082..8bf59e86c3a 100644
--- a/Master/texmf-dist/doc/latex/iwonamath/README
+++ b/Master/texmf-dist/doc/latex/iwonamath/README
@@ -2,4 +2,9 @@ This package provides an interface to Iwona math fonts by Janusz
Marian Nowacki. It allows to use Iwona as math complement for sans
serif fonts without native math. The package allows font scaling, the
choice of light and condensed versions and the creation of multiple
-math versions. \ No newline at end of file
+math versions.
+
+Author: Boris Veytsman, borisv@lk.net, boris@varphi.com
+License: LPPL 1.3c, https://www.latex-project.org/lppl/lppl-1-3c/
+
+Version 1.1: Improved delimitershack as suggested by Enrico Gregorio. \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/iwonamath/iwonamath.pdf b/Master/texmf-dist/doc/latex/iwonamath/iwonamath.pdf
index fc0b5e6e2c2..e80a3e33d09 100644
--- a/Master/texmf-dist/doc/latex/iwonamath/iwonamath.pdf
+++ b/Master/texmf-dist/doc/latex/iwonamath/iwonamath.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/iwonamath/sample.pdf b/Master/texmf-dist/doc/latex/iwonamath/sample.pdf
index c64d5e078d2..342ba53f87c 100644
--- a/Master/texmf-dist/doc/latex/iwonamath/sample.pdf
+++ b/Master/texmf-dist/doc/latex/iwonamath/sample.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jigsaw/jigsaw-doc-settings.sty b/Master/texmf-dist/doc/latex/jigsaw/jigsaw-doc-settings.sty
index 13a1498c38e..13a1498c38e 100644
--- a/Master/texmf-dist/tex/latex/jigsaw/jigsaw-doc-settings.sty
+++ b/Master/texmf-dist/doc/latex/jigsaw/jigsaw-doc-settings.sty
diff --git a/Master/texmf-dist/doc/latex/jsonparse/README.md b/Master/texmf-dist/doc/latex/jsonparse/README.md
index 69258570db6..c4df9ad4193 100644
--- a/Master/texmf-dist/doc/latex/jsonparse/README.md
+++ b/Master/texmf-dist/doc/latex/jsonparse/README.md
@@ -1,6 +1,6 @@
-![Version 0.8.3](https://img.shields.io/badge/version-0.8.3-blue)
+![Version 0.8.7](https://img.shields.io/badge/version-0.8.7-blue)
-![Jason, the JSON parsing horse](https://github.com/jasperhabicht/jsonparse/assets/6378801/d6abde3a-fa12-4b63-a213-ad8332e32199)
+![Jason, the JSON parsing horse](https://github.com/jasperhabicht/jsonparse/assets/6378801/ddfddc70-bf5f-4121-ba45-4b9128875d85)
# The `jsonparse` package
@@ -46,5 +46,5 @@ We can store it in the token variable `\myJSONdata` using the command `\JSONPars
This package including all files is subject to the LPPL 1.3c license. Copyright 2024 Jasper Habicht (mail(at)jasperhabicht.de).
-Jason, the JSON parseing horse: Copyright 2024 Hannah Klöber.
+Jason, the JSON parsing horse: Copyright 2024 Hannah Klöber.
diff --git a/Master/texmf-dist/doc/latex/jsonparse/jason/jason.pdf b/Master/texmf-dist/doc/latex/jsonparse/jason/jason.pdf
index 324458e6845..44ff3db133f 100644
--- a/Master/texmf-dist/doc/latex/jsonparse/jason/jason.pdf
+++ b/Master/texmf-dist/doc/latex/jsonparse/jason/jason.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jsonparse/jason/jason.svg b/Master/texmf-dist/doc/latex/jsonparse/jason/jason.svg
index fe8793dfa8e..aff567e175a 100644
--- a/Master/texmf-dist/doc/latex/jsonparse/jason/jason.svg
+++ b/Master/texmf-dist/doc/latex/jsonparse/jason/jason.svg
@@ -1,67 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="250px" height="250px" viewBox="0 0 450 450" enable-background="new 0 0 449.5 435" xml:space="preserve">
-<circle fill="#3FA9F5" cx="239" cy="226" r="206.166"/>
-<g>
- <defs>
- <circle id="SVGID_1_" cx="239" cy="226" r="206.166"/>
- </defs>
- <clipPath id="SVGID_2_">
- <use xlink:href="#SVGID_1_" overflow="visible"/>
- </clipPath>
- <path clip-path="url(#SVGID_2_)" fill="#C69C6D" d="M418.334,389.667c0,0-10.334-12.333-36-86.667S344,189.333,333.667,163
- c-5.552-14.149-12.545-22.326-17.83-26.869c7.769-5.957,15.778-13.185,19.83-20.131c6.902-11.834,11.667-24.5,15.667-38.5
- C353.731,69.108,361,63.333,361,63.333s-55-13-78.666,29.5c-1.534,2.754-3.036,5.383-4.538,7.892l-125.587,25.33
- C141.705,137.165,130.648,151.436,126,166c-4.127,12.93-11.333,16-26.333,28s-47.398,43.774-47.398,43.774l12.106,48.851
- l56.113,69.247c13.436-9.009,28.206-20.065,46.512-27.122c13.874-5.348,33.133-8.479,51.113-12.082
- c2.555,6.323,8.828,23.014,11.387,40.332c3.25,22,4.5,91.5,4.5,91.5L418.334,389.667z"/>
- <path clip-path="url(#SVGID_2_)" fill="#F7931E" stroke="#603813" stroke-width="3" stroke-miterlimit="10" d="M465.5,307.334
- c0,0-9.667-14.833-21.667-21c-11.409-5.863-24.5-7.167-24.5-7.167s2.853-11.646,11.167-22.833C439.667,244,456,233.667,456,233.667
- l-51.499-17.5c0,0,17.166-6.5,25.166-13.833c9.095-8.336,13.333-30,13.333-30s-47.621,2.806-54.333-15.167
- C383.501,143.333,402.001,114,402.001,114s-27.334-6.333-41.167-6.167c-7.572,0.091-15.827,0.876-22.104,2.556
- c-0.978,1.889-1.986,3.764-3.063,5.611c-4.052,6.946-12.062,14.174-19.83,20.131c5.285,4.543,12.278,12.72,17.83,26.869
- c10.333,26.333,23.001,65.666,48.667,140s36,86.667,36,86.667l32.5-36.5c-15.167-3-22.334-20.5-22.334-20.5L465.5,307.334z"/>
- <path clip-path="url(#SVGID_2_)" fill="none" stroke="#603813" stroke-width="3" stroke-miterlimit="10" d="M234,448.5
- c0,0-1.25-69.5-4.5-91.5c-2.559-17.318-8.832-34.009-11.387-40.332c-0.185,0.037-0.369,0.074-0.554,0.111"/>
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- This file was generated by dvisvgm 3.2.2 -->
+<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width="250px" height="250px" viewBox='-70.503905 -70.50391 452.105105 441.67801'>
+<defs>
+<clipPath id='clip'>
+<path d='M361.3402 148.0117C361.3402 261.4457 269.3832 353.4067 155.9452 353.4067C42.5082 353.4067-49.4531 261.4457-49.4531 148.0117C-49.4531 34.5747 42.5082-57.3867 155.9452-57.3867C269.3832-57.3867 361.3402 34.5747 361.3402 148.0117Z'/>
+</clipPath>
+</defs>
+<g id='page1'>
+<path d='M361.3402 148.0117C361.3402 261.4457 269.3832 353.4067 155.9452 353.4067C42.5082 353.4067-49.4531 261.4457-49.4531 148.0117C-49.4531 34.5747 42.5082-57.3867 155.9452-57.3867C269.3832-57.3867 361.3402 34.5747 361.3402 148.0117Z' fill='#5ba3de'/>
+<path d='M334.6092 311.0627C334.6092 311.0627 324.3162 298.7777 298.7422 224.7227C273.1762 150.6637 260.5542 111.4807 250.2582 85.2457C244.7262 71.1487 237.7622 62.9997 232.4962 58.4767C240.2342 52.5387 248.2152 45.3397 252.2502 38.4217C259.1252 26.6289 263.8752 14.0117 267.8592 .0664C270.2462-8.2969 277.4922-14.0508 277.4922-14.0508S222.6952-27 199.1172 15.3398C197.5862 18.0859 196.0942 20.7031 194.5942 23.2031L69.4762 48.4377C59.0122 59.5077 48.0002 73.7227 43.3672 88.2347C39.2542 101.1167 32.0742 104.1757 17.1289 116.1287C2.1875 128.0857-30.0898 159.7387-30.0898 159.7387L-18.0273 208.4097L37.8752 277.3987C51.2622 268.4177 65.9722 257.4067 84.2152 250.3787C98.0352 245.0467 117.2222 241.9297 135.1372 238.3397C137.6832 244.6367 143.9332 261.2657 146.4802 278.5237C149.7192 300.4377 150.9652 369.6797 150.9652 369.6797Z' fill='#ba8d5d' clip-path='url(#clip)'/>
+<path d='M381.6012 229.0387C381.6012 229.0387 371.9692 214.2617 360.0122 208.1167C348.6442 202.2777 335.6052 200.9767 335.6052 200.9767S338.4452 189.3747 346.7302 178.2307C355.8592 165.9457 372.1372 155.6447 372.1372 155.6447L320.8282 138.2107C320.8282 138.2107 337.9292 131.7347 345.8982 124.4297C354.9612 116.1247 359.1832 94.5427 359.1832 94.5427S311.7422 97.3397 305.0512 79.4337C299.9062 65.6527 318.3362 36.4297 318.3362 36.4297S291.1012 30.1167 277.3242 30.2847C269.7812 30.3747 261.5542 31.1567 255.3042 32.8277C254.3282 34.7107 253.3242 36.5817 252.2502 38.4217C248.2152 45.3397 240.2342 52.5387 232.4962 58.4767C237.7622 62.9997 244.7262 71.1487 250.2582 85.2457C260.5542 111.4807 273.1762 150.6637 298.7422 224.7227C324.3162 298.7777 334.6092 311.0627 334.6092 311.0627L366.9882 274.6997C351.8752 271.7107 344.7382 254.2777 344.7382 254.2777Z' fill='#f68623' stroke='#512c15' stroke-width='2.9888' stroke-miterlimit='10' clip-path='url(#clip)'/>
+<path d='M37.8712 277.3987C51.2622 268.4177 65.9722 257.4067 84.2152 250.3787C108.1682 241.1407 148.2502 238.5427 169.8632 228.6327C191.4762 218.7307 194.1792 185.4067 194.1792 185.4067M150.9652 369.6797C150.9652 369.6797 149.7192 300.4377 146.4802 278.5237C143.9332 261.2657 137.6832 244.6367 135.1332 238.3397C134.9492 238.3747 134.7692 238.4097 134.5862 238.4497M212.7342 71.7967C212.7342 71.7967 242.9532 54.3637 252.2502 38.4217C259.1252 26.6289 263.8752 14.0117 267.8592 .0664C270.2462-8.2969 277.4922-14.0508 277.4922-14.0508S222.6952-27 199.1172 15.3398C197.5862 18.0859 196.0942 20.7031 194.5942 23.2031M69.4762 48.4377C59.0122 59.5077 47.9962 73.7227 43.3672 88.2347C39.2542 101.1167 32.0742 104.1757 17.1289 116.1287C2.1875 128.0857-30.0898 159.7387-30.0898 159.7387' stroke='#512c15' fill='none' stroke-width='2.9888' stroke-miterlimit='10' clip-path='url(#clip)'/>
+<path d='M106.4652 1.2266C106.4652 1.2266 105.9652-3.918 96.3322-13.8828C94.6292-15.6484 92.7692-17.0078 90.8672-18.0586C91.1792-11.9961 91.7852-6.9063 92.1642-4.1016C98.3012-4.2969 103.4262-2.5938 106.4652 1.2266Z' fill='#ba8d5d' stroke='#512c15' stroke-width='2.9888' stroke-miterlimit='10'/>
+<path d='M96.1722-32.6484C106.4652-33.4766 119.5822-30.9844 125.7222-21.6875C128.7112-24.8398 128.7112-39.9531 128.7112-39.9531S136.2112-20.1836 148.1132-14.75C143.5472-30.8398 127.1132-45.75 120.3282-51.2422C113.3552-56.8906 103.7652-70.50391 103.7652-70.50391S94.8202-59.2109 91.8322-41.6133C91.2892-38.4297 90.9722-35.0938 90.8042-31.7695C92.5002-32.1836 94.2892-32.4961 96.1722-32.6484Z' fill='#ba8d5d' stroke='#512c15' stroke-width='2.9888' stroke-miterlimit='10'/>
+<path d='M184.1722-2.2617C173.5472-11.8906 162.4222-13.0547 153.6172-13.3828C138.5702-13.9531 128.7112-39.9531 128.7112-39.9531S128.7112-24.8398 125.7222-21.6875C119.5822-30.9844 106.4652-33.4766 96.1722-32.6484C81.6252-31.4727 72.2622-21.0234 72.2622-21.0234S86.7072-23.8438 96.3322-13.8828C105.9652-3.918 106.4652 1.2266 106.4652 1.2266C99.3242-7.7422 80.7262-5.082 64.4532 6.543C48.1832 18.1602 52.9962 49.3787 52.9962 49.3787S56.6522 36.5937 73.5862 28.7887C80.1332 25.7734 97.4962 25.1367 97.4962 25.1367S72.7582 25.9687 67.9412 54.8597C65.0472 72.2457 71.5942 87.0707 71.5942 87.0707S73.0902 71.6287 87.8672 62.4957C98.1402 56.1487 109.6212 53.1997 109.6212 53.1997C104.4722 57.0157 106.4652 67.9767 106.4652 67.9767S115.4292 52.8667 139.1722 54.3637C169.5392 56.2737 182.0352 44.1877 194.5942 23.2031C194.0432 17.1289 191.9692 4.8008 184.1722-2.2617Z' fill='#f68623' stroke='#512c15' stroke-width='2.9888' stroke-miterlimit='10'/>
+<path d='M37.8712 277.3987C46.1912 267.0387 57.7072 251.8637 60.5542 243.9027C68.0272 222.9807 59.3082 213.2657 54.5782 206.0427C49.8442 198.8207 57.8122 194.5857 44.6132 181.8827S-8.9336 190.1017-14.4141 187.6137C-19.8945 185.1207-19.3945 181.8827-20.8906 170.9257C-22.3867 159.9647-28.0469 158.7847-37.3281 159.9647C-49.9297 161.5627-55.7617 184.3747-58.9961 200.0667C-62.23437 215.7577-70.503905 215.5117-68.71094 228.9567C-67.86328 235.3317-64.28125 241.8907-52.8711 244.2927C-53.5937 250.0317-53.8047 257.0317-52.5898 264.6597C-49.4414 284.4727-17.918 294.3787 5.5 292.1247C16.2148 291.0977 26.5742 284.9727 37.8712 277.3987Z' fill='#976d46' stroke='#512c15' stroke-width='2.9888' stroke-miterlimit='10'/>
+<path d='M159.6012 113.0977C159.6012 122.6597 150.8982 130.4097 140.1722 130.4097C129.4412 130.4097 120.7462 122.6597 120.7462 113.0977C120.7462 103.5347 129.4412 95.7887 140.1722 95.7887C150.8982 95.7887 159.6012 103.5347 159.6012 113.0977Z' fill='#fff' stroke='#512c15' stroke-width='2.9888' stroke-miterlimit='10'/>
+<path d='M146.6482 115.1327C146.6482 118.9847 143.1172 122.1097 138.7622 122.1097C134.4062 122.1097 130.8712 118.9847 130.8712 115.1327C130.8712 111.2817 134.4062 108.1597 138.7622 108.1597C143.1172 108.1597 146.6482 111.2817 146.6482 115.1327Z' fill='#341a13'/>
+<path d='M-1.9453 215.2187C-1.9453 215.2187 .4883 211.0157 4.1406 206.1677C8.5508 200.3047 16.4766 195.1837 20.4531 194.8357C27.5508 194.2107 32.6052 195.9337 29.7152 201.4997C26.8281 207.0707 17.3984 212.9567 10.4922 213.8907C3.5781 214.8167-1.9453 215.2187-1.9453 215.2187Z' fill='#341a13'/>
+<path d='M-43.0742 245.1407C-43.793 249.6797-44.1641 256.3747-41.0664 260.0897C-36.082 266.0667-26.6211 275.0347-5.1992 262.0817C12.7813 251.2107 35.8402 229.8127 42.7892 223.2227C38.7772 226.3637 28.1367 232.1247 4.0156 231.9457C-22.5469 231.7417-28.8125 244.2577-43.0742 245.1407Z' fill='#fff' stroke='#512c15' stroke-width='2.9888' stroke-miterlimit='10'/>
+<path d='M-52.8711 244.2927C-50.918 244.7027-48.7383 244.9997-46.2969 245.1487C-45.1719 245.2107-44.1055 245.2067-43.0742 245.1407' stroke='#512c15' fill='none' stroke-width='2.9888' stroke-miterlimit='10'/>
+<path d='M25.7773 230.1017C9.6211 238.6997-18.1562 252.9177-25.7695 253.2777C-33.0273 253.6167-39.2852 248.5467-42.6719 245.1057C-42.8047 245.1167-42.9375 245.1287-43.0742 245.1407' stroke='#512c15' fill='none' stroke-width='2.9888' stroke-miterlimit='10'/>
</g>
-<path fill="#F7931E" stroke="#603813" stroke-width="3" stroke-miterlimit="10" d="M267.334,75.167
- C256.668,65.5,245.5,64.333,236.667,64c-15.107-0.57-25-26.667-25-26.667s0,15.167-3,18.333c-6.167-9.333-19.333-11.833-29.667-11
- c-14.596,1.177-24,11.667-24,11.667s14.5-2.833,24.167,7.167c9.667,10,10.167,15.167,10.167,15.167
- c-7.167-9-25.834-6.334-42.167,5.333s-11.5,43-11.5,43s3.667-12.833,20.667-20.667c6.572-3.028,24-3.667,24-3.667
- S155.5,103.5,150.667,132.5c-2.909,17.455,3.667,32.333,3.667,32.333s1.5-15.5,16.333-24.667c10.31-6.371,21.833-9.333,21.833-9.333
- c-5.167,3.833-3.166,14.833-3.166,14.833s9-15.167,32.833-13.667c30.479,1.918,43.022-10.208,55.629-31.275
- C277.24,94.63,275.157,82.257,267.334,75.167z"/>
-<path fill="#A67C52" stroke="#603813" stroke-width="3" stroke-miterlimit="10" d="M120.487,355.872
- c8.348-10.395,19.908-25.626,22.763-33.622c7.5-21-1.25-30.75-6-38s3.25-11.5-10-24.25S73.5,268.25,68,265.75S63,260,61.5,249
- s-7.183-12.182-16.5-11c-12.646,1.604-18.5,24.5-21.75,40.25s-11.549,15.507-9.75,29c0.854,6.402,4.447,12.983,15.898,15.396
- c-0.721,5.758-0.935,12.787,0.283,20.442c3.164,19.888,34.804,29.832,58.308,27.572C98.749,369.626,109.143,363.479,120.487,355.872
- z"/>
-<path fill="#C69C6D" stroke="#603813" stroke-width="3" stroke-miterlimit="10" d="M189.334,78.667c0,0-0.5-5.167-10.167-15.167
- c-1.713-1.772-3.58-3.135-5.489-4.188c0.317,6.082,0.921,11.189,1.303,14.006C181.138,73.124,186.281,74.833,189.334,78.667z"/>
-<path fill="#C69C6D" stroke="#603813" stroke-width="3" stroke-miterlimit="10" d="M179,44.667c10.334-0.833,23.5,1.667,29.667,11
- c3-3.167,3-18.333,3-18.333s7.525,19.843,19.471,25.298c-4.58-16.15-21.08-31.12-27.888-36.632
- c-7-5.667-16.625-19.333-16.625-19.333s-8.979,11.333-11.979,29c-0.542,3.195-0.864,6.542-1.031,9.882
- C175.318,45.129,177.115,44.819,179,44.667z"/>
-<ellipse fill="#FFFFFF" stroke="#603813" stroke-width="3" stroke-miterlimit="10" cx="223.167" cy="190.959" rx="19.5" ry="17.375"/>
-<ellipse fill="#42210B" cx="221.751" cy="193" rx="7.917" ry="7"/>
-<path fill="#603813" d="M80.519,293.464c0,0,2.443-4.219,6.106-9.089C91.052,278.49,99.007,273.351,103,273
- c7.125-0.625,12.198,1.105,9.299,6.695S99.936,291.193,93,292.125S80.519,293.464,80.519,293.464z"/>
-<path fill="none" stroke="#603813" stroke-width="3" stroke-miterlimit="10" d="M296,149.5c0,0,30.334-17.5,39.667-33.5
- c6.902-11.834,11.667-24.5,15.667-38.5C353.731,69.108,361,63.333,361,63.333s-55-13-78.666,29.5
- c-1.534,2.754-3.036,5.383-4.538,7.892"/>
-<path fill="none" stroke="#603813" stroke-width="3" stroke-miterlimit="10" d="M120.488,355.872
- c13.437-9.009,28.207-20.065,46.512-27.122c24.045-9.269,64.273-11.878,85.969-21.821s24.408-43.392,24.408-43.392"/>
-<path fill="#FFFFFF" stroke="#603813" stroke-width="3" stroke-miterlimit="10" d="M127.5,299.5c0,0-0.749,0.729-2.083,1.995
- C126.919,300.316,127.5,299.5,127.5,299.5z"/>
-<path fill="#FFFFFF" stroke="#603813" stroke-width="3" stroke-miterlimit="10" d="M39.236,323.495
- c-0.724,4.556-1.093,11.276,2.014,15.005c5,6,14.5,15,36,2c18.048-10.912,41.196-32.388,48.167-39.005
- c-4.023,3.157-14.707,8.937-38.917,8.755C59.839,310.05,53.549,322.611,39.236,323.495z"/>
-<path fill="none" stroke="#603813" stroke-width="3" stroke-miterlimit="10" d="M29.398,322.646c1.963,0.413,4.15,0.708,6.602,0.854
- c1.129,0.067,2.202,0.06,3.236-0.005"/>
-<path fill="none" stroke="#603813" stroke-width="3" stroke-miterlimit="10" d="M108.345,308.401
- c-16.22,8.63-44.097,22.899-51.74,23.26c-7.288,0.344-13.568-4.744-16.966-8.201c-0.135,0.01-0.266,0.026-0.403,0.035"/>
-<path fill="none" stroke="#603813" stroke-width="3" stroke-miterlimit="10" d="M152.209,126.056
- C141.705,137.165,130.648,151.436,126,166c-4.126,12.93-11.333,16-26.333,28s-47.398,43.774-47.398,43.774"/>
</svg>
diff --git a/Master/texmf-dist/doc/latex/jsonparse/jason/jason.tex b/Master/texmf-dist/doc/latex/jsonparse/jason/jason.tex
new file mode 100644
index 00000000000..28e9eb1b0c6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/jsonparse/jason/jason.tex
@@ -0,0 +1,289 @@
+% File: jason/jason.tex
+% Copyright 2024 Jasper Habicht (mail(at)jasperhabicht.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/.
+%
+% This file is part of the `jsonparse' package (The Work in LPPL)
+% and all files in that bundle must be distributed together.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+\documentclass{standalone}
+\usepackage{l3draw}
+
+\begin{document}
+\ExplSyntaxOn
+
+\color_set:nnn { color_i } { rgb } { 0.356863 , 0.639216 , 0.870588 }
+\color_set:nnn { color_ii } { rgb } { 0.729412 , 0.552941 , 0.364706 }
+\color_set:nnn { color_iii } { rgb } { 0.964706 , 0.52549 , 0.137255 }
+\color_set:nnn { color_iv } { rgb } { 0.592157 , 0.427451 , 0.27451 }
+\color_set:nnn { color_v } { rgb } { 0.317647 , 0.172549 , 0.0823529 }
+\color_set:nnn { color_vi } { rgb } { 0.203922 , 0.101961 , 0.0745098 }
+\color_set:nnn { color_vii } { rgb } { 1 , 1 , 1 }
+
+\draw_begin:
+
+\cs_new:Npn \__jsonparse_jason_path_i: {
+ \draw_path_moveto:n { 433.418 , 221.836 }
+ \draw_path_curveto:nnn { 433.418 , 335.695 } { 341.117 , 428 } { 227.254 , 428 }
+ \draw_path_curveto:nnn { 113.391 , 428 } { 21.086 , 335.695 } { 21.086 , 221.836 }
+ \draw_path_curveto:nnn { 21.086 , 107.973 } { 113.391 , 15.668 } { 227.254 , 15.668 }
+ \draw_path_curveto:nnn { 341.117 , 15.668 } { 433.418 , 107.973 } { 433.418 , 221.836 }
+ \draw_path_close:
+}
+
+\cs_new:Npn \__jsonparse_jason_path_ii: {
+ \draw_path_moveto:n { 406.586 , 385.5 }
+ \draw_path_curveto:nnn { 406.586 , 385.5 } { 396.254 , 373.168 } { 370.586 , 298.836 }
+ \draw_path_curveto:nnn { 344.922 , 224.5 } { 332.254 , 185.168 } { 321.918 , 158.836 }
+ \draw_path_curveto:nnn { 316.367 , 144.684 } { 309.375 , 136.508 } { 304.09 , 131.965 }
+ \draw_path_curveto:nnn { 311.859 , 126.008 } { 319.867 , 118.781 } { 323.918 , 111.836 }
+ \draw_path_curveto:nnn { 330.82 , 100 } { 335.586 , 87.336 } { 339.586 , 73.336 }
+ \draw_path_curveto:nnn { 341.984 , 64.941 } { 349.254 , 59.168 } { 349.254 , 59.168 }
+ \draw_path_curveto:nnn { 349.254 , 59.168 } { 294.254 , 46.168 } { 270.586 , 88.668 }
+ \draw_path_curveto:nnn { 269.051 , 91.422 } { 267.551 , 94.051 } { 266.047 , 96.559 }
+ \draw_path_lineto:n { 140.461 , 121.891 }
+ \draw_path_curveto:nnn { 129.957 , 133 } { 118.902 , 147.27 } { 114.254 , 161.836 }
+ \draw_path_curveto:nnn { 110.125 , 174.766 } { 102.918 , 177.836 } { 87.918 , 189.836 }
+ \draw_path_curveto:nnn { 72.918 , 201.836 } { 40.52 , 233.609 } { 40.52 , 233.609 }
+ \draw_path_lineto:n { 52.629 , 282.461 }
+ \draw_path_lineto:n { 108.742 , 351.707 }
+ \draw_path_curveto:nnn { 122.176 , 342.695 } { 136.945 , 331.641 } { 155.254 , 324.586 }
+ \draw_path_curveto:nnn { 169.125 , 319.234 } { 188.387 , 316.105 } { 206.367 , 312.504 }
+ \draw_path_curveto:nnn { 208.922 , 318.824 } { 215.195 , 335.516 } { 217.754 , 352.836 }
+ \draw_path_curveto:nnn { 221.004 , 374.836 } { 222.254 , 444.336 } { 222.254 , 444.336 }
+ \draw_path_close:
+}
+
+\cs_new:Npn \__jsonparse_jason_path_iii: {
+ \draw_path_moveto:n { 453.754 , 303.168 }
+ \draw_path_curveto:nnn { 453.754 , 303.168 } { 444.086 , 288.336 } { 432.086 , 282.168 }
+ \draw_path_curveto:nnn { 420.676 , 276.305 } { 407.586 , 275 } { 407.586 , 275 }
+ \draw_path_curveto:nnn { 407.586 , 275 } { 410.438 , 263.355 } { 418.754 , 252.168 }
+ \draw_path_curveto:nnn { 427.918 , 239.836 } { 444.254 , 229.5 } { 444.254 , 229.5 }
+ \draw_path_lineto:n { 392.754 , 212 }
+ \draw_path_curveto:nnn { 392.754 , 212 } { 409.918 , 205.5 } { 417.918 , 198.168 }
+ \draw_path_curveto:nnn { 427.016 , 189.832 } { 431.254 , 168.168 } { 431.254 , 168.168 }
+ \draw_path_curveto:nnn { 431.254 , 168.168 } { 383.633 , 170.973 } { 376.918 , 153 }
+ \draw_path_curveto:nnn { 371.754 , 139.168 } { 390.254 , 109.836 } { 390.254 , 109.836 }
+ \draw_path_curveto:nnn { 390.254 , 109.836 } { 362.918 , 103.5 } { 349.086 , 103.668 }
+ \draw_path_curveto:nnn { 341.516 , 103.758 } { 333.258 , 104.543 } { 326.984 , 106.223 }
+ \draw_path_curveto:nnn { 326.004 , 108.113 } { 324.996 , 109.988 } { 323.918 , 111.836 }
+ \draw_path_curveto:nnn { 319.867 , 118.781 } { 311.859 , 126.008 } { 304.09 , 131.965 }
+ \draw_path_curveto:nnn { 309.375 , 136.508 } { 316.367 , 144.684 } { 321.918 , 158.836 }
+ \draw_path_curveto:nnn { 332.254 , 185.168 } { 344.922 , 224.5 } { 370.586 , 298.836 }
+ \draw_path_curveto:nnn { 396.254 , 373.168 } { 406.586 , 385.5 } { 406.586 , 385.5 }
+ \draw_path_lineto:n { 439.086 , 349 }
+ \draw_path_curveto:nnn { 423.918 , 346 } { 416.754 , 328.5 } { 416.754 , 328.5 }
+ \draw_path_close:
+}
+
+\cs_new:Npn \__jsonparse_jason_path_iv: {
+ \draw_path_moveto:n { 255.586 , 71 }
+ \draw_path_curveto:nnn { 244.922 , 61.336 } { 233.754 , 60.168 } { 224.918 , 59.836 }
+ \draw_path_curveto:nnn { 209.812 , 59.266 } { 199.918 , 33.168 } { 199.918 , 33.168 }
+ \draw_path_curveto:nnn { 199.918 , 33.168 } { 199.918 , 48.336 } { 196.918 , 51.5 }
+ \draw_path_curveto:nnn { 190.754 , 42.168 } { 177.586 , 39.668 } { 167.254 , 40.5 }
+ \draw_path_curveto:nnn { 152.656 , 41.68 } { 143.254 , 52.168 } { 143.254 , 52.168 }
+ \draw_path_curveto:nnn { 143.254 , 52.168 } { 157.754 , 49.336 } { 167.418 , 59.336 }
+ \draw_path_curveto:nnn { 177.086 , 69.336 } { 177.586 , 74.5 } { 177.586 , 74.5 }
+ \draw_path_curveto:nnn { 170.418 , 65.5 } { 151.754 , 68.168 } { 135.418 , 79.836 }
+ \draw_path_curveto:nnn { 119.086 , 91.5 } { 123.918 , 122.836 } { 123.918 , 122.836 }
+ \draw_path_curveto:nnn { 123.918 , 122.836 } { 127.586 , 110 } { 144.586 , 102.168 }
+ \draw_path_curveto:nnn { 151.156 , 99.141 } { 168.586 , 98.5 } { 168.586 , 98.5 }
+ \draw_path_curveto:nnn { 168.586 , 98.5 } { 143.754 , 99.336 } { 138.918 , 128.336 }
+ \draw_path_curveto:nnn { 136.012 , 145.789 } { 142.586 , 160.668 } { 142.586 , 160.668 }
+ \draw_path_curveto:nnn { 142.586 , 160.668 } { 144.086 , 145.168 } { 158.918 , 136 }
+ \draw_path_curveto:nnn { 169.23 , 129.629 } { 180.754 , 126.668 } { 180.754 , 126.668 }
+ \draw_path_curveto:nnn { 175.586 , 130.5 } { 177.586 , 141.5 } { 177.586 , 141.5 }
+ \draw_path_curveto:nnn { 177.586 , 141.5 } { 186.586 , 126.336 } { 210.418 , 127.836 }
+ \draw_path_curveto:nnn { 240.898 , 129.754 } { 253.441 , 117.625 } { 266.047 , 96.559 }
+ \draw_path_curveto:nnn { 265.492 , 90.465 } { 263.41 , 78.09 } { 255.586 , 71 }
+ \draw_path_close:
+}
+
+\cs_new:Npn \__jsonparse_jason_path_v: {
+ \draw_path_moveto:n { 108.738 , 351.707 }
+ \draw_path_curveto:nnn { 117.086 , 341.312 } { 128.648 , 326.078 } { 131.504 , 318.086 }
+ \draw_path_curveto:nnn { 139.004 , 297.086 } { 130.254 , 287.336 } { 125.504 , 280.086 }
+ \draw_path_curveto:nnn { 120.754 , 272.836 } { 128.754 , 268.586 } { 115.504 , 255.836 }
+ \draw_path_curveto:nnn { 102.254 , 243.086 } { 61.754 , 264.086 } { 56.254 , 261.586 }
+ \draw_path_curveto:nnn { 50.754 , 259.086 } { 51.254 , 255.836 } { 49.754 , 244.836 }
+ \draw_path_curveto:nnn { 48.254 , 233.836 } { 42.57 , 232.652 } { 33.254 , 233.836 }
+ \draw_path_curveto:nnn { 20.605 , 235.438 } { 14.754 , 258.336 } { 11.504 , 274.086 }
+ \draw_path_curveto:nnn { 8.254 , 289.836 } { -0.047 , 289.59 } { 1.754 , 303.086 }
+ \draw_path_curveto:nnn { 2.605 , 309.484 } { 6.199 , 316.066 } { 17.652 , 318.48 }
+ \draw_path_curveto:nnn { 16.93 , 324.238 } { 16.715 , 331.266 } { 17.934 , 338.922 }
+ \draw_path_curveto:nnn { 21.098 , 358.809 } { 52.738 , 368.754 } { 76.242 , 366.492 }
+ \draw_path_curveto:nnn { 87 , 365.461 } { 97.395 , 359.312 } { 108.738 , 351.707 }
+ \draw_path_close:
+}
+
+\cs_new:Npn \__jsonparse_jason_path_vi: {
+ \draw_path_moveto:n { 108.738 , 351.707 }
+ \draw_path_curveto:nnn { 122.176 , 342.695 } { 136.945 , 331.641 } { 155.254 , 324.586 }
+ \draw_path_curveto:nnn { 179.297 , 315.316 } { 219.527 , 312.707 } { 241.223 , 302.762 }
+ \draw_path_curveto:nnn { 262.918 , 292.82 } { 265.629 , 259.371 } { 265.629 , 259.371 }
+
+ \draw_path_moveto:n { 222.254 , 444.336 }
+ \draw_path_curveto:nnn { 222.254 , 444.336 } { 221.004 , 374.836 } { 217.754 , 352.836 }
+ \draw_path_curveto:nnn { 215.195 , 335.516 } { 208.922 , 318.824 } { 206.363 , 312.504 }
+ \draw_path_curveto:nnn { 206.18 , 312.539 } { 205.996 , 312.574 } { 205.812 , 312.613 }
+
+ \draw_path_moveto:n { 284.254 , 145.336 }
+ \draw_path_curveto:nnn { 284.254 , 145.336 } { 314.586 , 127.836 } { 323.918 , 111.836 }
+ \draw_path_curveto:nnn { 330.82 , 100 } { 335.586 , 87.336 } { 339.586 , 73.336 }
+ \draw_path_curveto:nnn { 341.984 , 64.941 } { 349.254 , 59.168 } { 349.254 , 59.168 }
+ \draw_path_curveto:nnn { 349.254 , 59.168 } { 294.254 , 46.168 } { 270.586 , 88.668 }
+ \draw_path_curveto:nnn { 269.051 , 91.422 } { 267.551 , 94.051 } { 266.047 , 96.559 }
+
+ \draw_path_moveto:n { 140.461 , 121.891 }
+ \draw_path_curveto:nnn { 129.957 , 133 } { 118.898 , 147.27 } { 114.254 , 161.836 }
+ \draw_path_curveto:nnn { 110.125 , 174.766 } { 102.918 , 177.836 } { 87.918 , 189.836 }
+ \draw_path_curveto:nnn { 72.918 , 201.836 } { 40.52 , 233.609 } { 40.52 , 233.609 }
+}
+
+\cs_new:Npn \__jsonparse_jason_path_vii: {
+ \draw_path_moveto:n { 177.586 , 74.5 }
+ \draw_path_curveto:nnn { 177.586 , 74.5 } { 177.086 , 69.336 } { 167.418 , 59.336 }
+ \draw_path_curveto:nnn { 165.707 , 57.562 } { 163.84 , 56.199 } { 161.93 , 55.145 }
+ \draw_path_curveto:nnn { 162.246 , 61.227 } { 162.852 , 66.336 } { 163.234 , 69.152 }
+ \draw_path_curveto:nnn { 169.391 , 68.957 } { 174.535 , 70.668 } { 177.586 , 74.5 }
+ \draw_path_close:
+}
+
+\cs_new:Npn \__jsonparse_jason_path_viii: {
+ \draw_path_moveto:n { 167.254 , 40.5 }
+ \draw_path_curveto:nnn { 177.586 , 39.668 } { 190.754 , 42.168 } { 196.918 , 51.5 }
+ \draw_path_curveto:nnn { 199.918 , 48.336 } { 199.918 , 33.168 } { 199.918 , 33.168 }
+ \draw_path_curveto:nnn { 199.918 , 33.168 } { 207.445 , 53.012 } { 219.391 , 58.465 }
+ \draw_path_curveto:nnn { 214.809 , 42.316 } { 198.312 , 27.348 } { 191.504 , 21.836 }
+ \draw_path_curveto:nnn { 184.504 , 16.168 } { 174.879 , 2.5 } { 174.879 , 2.5 }
+ \draw_path_curveto:nnn { 174.879 , 2.5 } { 165.898 , 13.836 } { 162.898 , 31.5 }
+ \draw_path_curveto:nnn { 162.355 , 34.695 } { 162.035 , 38.043 } { 161.867 , 41.383 }
+ \draw_path_curveto:nnn { 163.57 , 40.965 } { 165.367 , 40.652 } { 167.254 , 40.5 }
+ \draw_path_close:
+}
+
+\cs_new:Npn \__jsonparse_jason_path_ix: {
+ \draw_path_moveto:n { 230.922 , 186.793 }
+ \draw_path_curveto:nnn { 230.922 , 196.391 } { 222.188 , 204.168 } { 211.422 , 204.168 }
+ \draw_path_curveto:nnn { 200.648 , 204.168 } { 191.922 , 196.391 } { 191.922 , 186.793 }
+ \draw_path_curveto:nnn { 191.922 , 177.195 } { 200.648 , 169.418 } { 211.422 , 169.418 }
+ \draw_path_curveto:nnn { 222.188 , 169.418 } { 230.922 , 177.195 } { 230.922 , 186.793 }
+ \draw_path_close:
+}
+
+\cs_new:Npn \__jsonparse_jason_path_x: {
+ \draw_path_moveto:n { 217.922 , 188.836 }
+ \draw_path_curveto:nnn { 217.922 , 192.699 } { 214.375 , 195.836 } { 210.004 , 195.836 }
+ \draw_path_curveto:nnn { 205.633 , 195.836 } { 202.086 , 192.699 } { 202.086 , 188.836 }
+ \draw_path_curveto:nnn { 202.086 , 184.969 } { 205.633 , 181.836 } { 210.004 , 181.836 }
+ \draw_path_curveto:nnn { 214.375 , 181.836 } { 217.922 , 184.969 } { 217.922 , 188.836 }
+ \draw_path_close:
+}
+
+% nostril
+\cs_new:Npn \__jsonparse_jason_path_xi: {
+ \draw_path_moveto:n { 68.77 , 289.297 }
+ \draw_path_curveto:nnn { 68.77 , 289.297 } { 71.215 , 285.078 } { 74.879 , 280.211 }
+ \draw_path_curveto:nnn { 79.305 , 274.324 } { 87.262 , 269.184 } { 91.254 , 268.836 }
+ \draw_path_curveto:nnn { 98.379 , 268.211 } { 103.449 , 269.938 } { 100.551 , 275.527 }
+ \draw_path_curveto:nnn { 97.652 , 281.117 } { 88.188 , 287.027 } { 81.254 , 287.961 }
+ \draw_path_curveto:nnn { 74.316 , 288.891 } { 68.77 , 289.297 } { 68.77 , 289.297 }
+ \draw_path_close:
+}
+
+% mouth
+\cs_new:Npn \__jsonparse_jason_path_xii: {
+ \draw_path_moveto:n { 27.488 , 319.328 }
+ \draw_path_curveto:nnn { 26.766 , 323.887 } { 26.395 , 330.605 } { 29.504 , 334.336 }
+ \draw_path_curveto:nnn { 34.504 , 340.336 } { 44.004 , 349.336 } { 65.504 , 336.336 }
+ \draw_path_curveto:nnn { 83.551 , 325.422 } { 106.699 , 303.945 } { 113.672 , 297.328 }
+ \draw_path_curveto:nnn { 109.645 , 300.484 } { 98.965 , 306.266 } { 74.754 , 306.086 }
+ \draw_path_curveto:nnn { 48.09 , 305.883 } { 41.801 , 318.445 } { 27.488 , 319.328 }
+ \draw_path_close:
+}
+
+% mouth edge
+\cs_new:Npn \__jsonparse_jason_path_xiii: {
+ \draw_path_moveto:n { 17.652 , 318.48 }
+ \draw_path_curveto:nnn { 19.613 , 318.891 } { 21.801 , 319.188 } { 24.254 , 319.336 }
+ \draw_path_curveto:nnn { 25.383 , 319.402 } { 26.453 , 319.395 } { 27.488 , 319.328 }
+}
+
+% teeth
+\cs_new:Npn \__jsonparse_jason_path_xiv: {
+ \draw_path_moveto:n { 96.598 , 304.234 }
+ \draw_path_curveto:nnn { 80.379 , 312.863 } { 52.5 , 327.137 } { 44.855 , 327.496 }
+ \draw_path_curveto:nnn { 37.57 , 327.84 } { 31.289 , 322.75 } { 27.891 , 319.293 }
+ \draw_path_curveto:nnn { 27.758 , 319.305 } { 27.625 , 319.32 } { 27.488 , 319.328 }
+}
+
+\draw_transform_yscale:n { -1 }
+\draw_linewidth:n { 3pt }
+\draw_miterlimit:n { 10 }
+\color_stroke:n { color_v }
+
+\draw_scope_begin:
+
+ \color_fill:n { color_i }
+ \__jsonparse_jason_path_i:
+ \draw_path_use_clear:n { fill , clip }
+
+ \color_fill:n { color_ii }
+ \__jsonparse_jason_path_ii:
+ \draw_path_use_clear:n { fill }
+
+ \color_fill:n { color_iii }
+ \__jsonparse_jason_path_iii:
+ \draw_path_use_clear:n { fill , draw }
+
+ \__jsonparse_jason_path_vi:
+ \draw_path_use_clear:n { draw }
+
+\draw_scope_end:
+
+\color_fill:n { color_ii }
+\__jsonparse_jason_path_vii:
+\draw_path_use_clear:n { fill , draw }
+
+\__jsonparse_jason_path_viii:
+\draw_path_use_clear:n { fill , draw }
+
+\color_fill:n { color_iii }
+\__jsonparse_jason_path_iv:
+\draw_path_use_clear:n { fill , draw }
+
+\color_fill:n { color_iv }
+\__jsonparse_jason_path_v:
+\draw_path_use_clear:n { fill , draw }
+
+\color_fill:n { color_vii }
+\__jsonparse_jason_path_ix:
+\draw_path_use_clear:n { fill , draw }
+
+\color_fill:n { color_vi }
+\__jsonparse_jason_path_x:
+\draw_path_use_clear:n { fill }
+
+\__jsonparse_jason_path_xi:
+\draw_path_use_clear:n { fill }
+
+\color_fill:n { color_vii }
+\__jsonparse_jason_path_xii:
+\draw_path_use_clear:n { fill , draw }
+
+\__jsonparse_jason_path_xiii:
+\draw_path_use_clear:n { draw }
+
+\__jsonparse_jason_path_xiv:
+\draw_path_use_clear:n { draw }
+
+\draw_end:
+
+\ExplSyntaxOff
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/jsonparse/jsonparse-doc.pdf b/Master/texmf-dist/doc/latex/jsonparse/jsonparse-doc.pdf
index ed7a1dded66..e52f8631a0f 100644
--- a/Master/texmf-dist/doc/latex/jsonparse/jsonparse-doc.pdf
+++ b/Master/texmf-dist/doc/latex/jsonparse/jsonparse-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jsonparse/jsonparse-doc.tex b/Master/texmf-dist/doc/latex/jsonparse/jsonparse-doc.tex
index 1cfcde1e184..7e775f7499f 100644
--- a/Master/texmf-dist/doc/latex/jsonparse/jsonparse-doc.tex
+++ b/Master/texmf-dist/doc/latex/jsonparse/jsonparse-doc.tex
@@ -11,8 +11,8 @@
% This work has the LPPL maintenance status `maintained'.
%
\documentclass[a4paper]{article}
-\def\jsonparsefileversion{0.8.3}
-\def\jsonparsefiledate{28 April 2024}
+\def\jsonparsefileversion{0.8.7}
+\def\jsonparsefiledate{8 August 2024}
\usepackage[T1]{fontenc}
\usepackage{Alegreya}
@@ -193,10 +193,13 @@
\changes{v0.5.7}{2024/04/14}{Bug fixes, key-value option setting added.}
\changes{v0.6.0}{2024/04/15}{Bug fixes, renaming of several commands.}
\changes{v0.7.0}{2024/04/18}{Renaming and rearranging of keys, escaping of special JSON escape sequences added.}
-\changes{v0.7.1}{2024/04/20}{Access to first-level keys of object added.}
+\changes{v0.7.1}{2024/04/20}{Access to top-level keys of object added.}
\changes{v0.8.0}{2024/04/24}{Internal rewrite, escaping procedures changed.}
\changes{v0.8.2}{2024/04/26}{Bug fixes, externalizing parsed data.}
\changes{v0.8.3}{2024/04/28}{Escaping of characters with special meaning in TeX.}
+\changes{v0.8.5}{2024/05/05}{Enhanced key management.}
+\changes{v0.8.6}{2024/05/09}{Bug fix in nesting function.}
+\changes{v0.8.7}{2024/08/08}{Corrections in documentation, error messages.}
\begin{document}
\vspace*{-1cm}
@@ -225,20 +228,22 @@ The package does not load any dependencies.
\end{macrodef}
The package can be loaded with the option \macro{debug}. It will then output to the log file every instance of a string, a boolean (true or false) value, a null value, a number as well as the start and end of every object and the start and end of every array that is found while parsing the JSON string or JSON file.
+This key can be set either as package option or using \macro{\JSONParseSet}. It can also be set locally as option to the commands \macro{\JSONParse} and \macro{\JSONParseFromFile}.
+
\section{Escaping and special treatment of the input}\label{sec:escaping}
In general, the package reads the JSON source as string, which means that all characters have category code 12 (other), except for spaces which have category code 10 (space). The \macro{\endlinechar} value is set to $-1$. Furthermore, if PDFLaTeX is used, the upper-half of the 8-bit range is set to ``active''. JSON, however, defines a small set of escape sequences and in order to be able to process these, the category code of the backslash is set to 0 (escpape).
JSON strings cannot contain the two characters \macro{"} and \macro{\}. These two characters need to be escaped with a preceding backslash (\macro{\}). This package therefore redefines locally the TeX control symbols \macro{\"}, \macro{\/}, \macro{\\}, \macro{\b}, \macro{\f}, \macro{\n}, \macro{\r}, \macro{\t} and \macro{\u}. These control symbols are prevented from expanding during parsing. For example, \macro{\"} is first defined as \macro{\exp_not:N \"} and only hen typeset, \macro{\"} is expanded to \macro{"}, which ensures that strings are parsed properly.
-Similarly, the control symbol \macro{\/} expands eventually to \macro{/} and \macro{\\} to \macro{\c_backslash_str} (i.\,e. a backslash with category code 12). The escape sequence \macro{\u} followed by a hex value consisting of four digits eventually eventually expands to \macro{\char"} followed by the relevant four hex digits. The JSON escape sequences \macro{\b}, \macro{\f}, \macro{\n}, \macro{\r}, \macro{\t} or \macro{\u} (followed by a hex value) eventually expand to token variables of which the contents can be set using the relevant \macro{replacement} key. See more on setting keys below in section \ref{sec:settings}.
+Similarly, the control symbol \macro{\/} expands eventually to \macro{/} and \macro{\\} to \macro{\c_backslash_str} (i.\,e. a backslash with category code 12). The escape sequence \macro{\u} followed by a hex value consisting of four digits eventually eventually expands to \macro{\char"} followed by the relevant four hex digits. The JSON escape sequences \macro{\b}, \macro{\f}, \macro{\n}, \macro{\r}, \macro{\t} or \macro{\u} (followed by a hex value) eventually expand to token variables of which the contents can be set using the relevant \macro{replacement} key. See more on setting options below in section \ref{sec:options}.
It is possible to insert TeX macros to the JSON source that will eventually be parsed when typesetting. Backslashes of TeX macros need to be escaped by another backslash. The TeX macros \macro{\"} and \macro{\\} must be escaped twice in the JSON source, so that they become \macro{\\\"} and \macro{\\\\} respectively.
\begin{macrodef}
-|\x|[<token variable name>][<key>]
+|\x|{<token variable name>}{<key>}
\end{macrodef}
-Using the control sequence \macro{\x}, it is possible to nest JSON strings into each other. The control sequence takes two arguments delimited by square brackets. The first argument represents the name of the token variable that holds the parsed JSON data where the inserted JSON string should be taken from. The second argument sets the key that should be selected. The following example shows a simple use case:
+Using the control sequence \macro{\x}, it is possible to nest JSON strings into each other. The control sequence takes two arguments delimited by curly braces. The first argument represents the name of the token variable that holds the parsed JSON data where the inserted JSON string should be taken from. The second argument sets the key that should be selected. The following example shows a simple use case:
\begin{codeexamplecolumns}
\JSONParse{\myJSONdataA}{
@@ -246,49 +251,52 @@ Using the control sequence \macro{\x}, it is possible to nest JSON strings into
}
\JSONParse{\myJSONdataB}{
- { "d" : \x[myJSONdataA][a] }
+ { "d" : \x{myJSONdataA}{a} }
}
\JSONParseValue{\myJSONdataB}{d.b}
\end{codeexamplecolumns}
+Note that the control sequence \macro{\x} is replaced by the value exactly. Therefore, if the value happens to be a string, the control sequence \macro{\x} should be placed between quotation marks (\macro{"}) in order for the resulting string to be valid JSON.
+
\begin{macrodef}
-|escape|={<all>}
-|escape|={<none>}
-|escape|={<number sign>}
-|escape|={<dollar sign>}
-|escape|={<percent sign>}
-|escape|={<ampersand>}
-|escape|={<circumflex accent>}
-|escape|={<low line>}
-|escape|={<tilde>}
+|escape|={all}
+|escape|={none}
+|escape|={number sign}
+|escape|={dollar sign}
+|escape|={percent sign}
+|escape|={ampersand}
+|escape|={circumflex accent}
+|escape|={low line}
+|escape|={tilde}
\end{macrodef}
-The key \macro{escape} can be used to convert characters that don't require escaping in JSON but in TeX into their relevant TeX escape sequences. Apart from the backslash and curly braces that need to be escaped anyways, these are the number sign, the dollar sign, the percent sign, the ampersand, the circumflex accent, the low line and the tilde. The characters can be selected individually separated by a comma (for example \macro{escape={dollar sign, circumflex accent, low line}}. With \macro{escape={all}}, all escaping sequences are selected, with \macro{escape={none}}, none is selected.
+The key \macro{escape} can be used to convert characters that don't require escaping in JSON but in TeX into the relevant TeX escape sequences. Apart from the backslash and curly braces that need to be escaped anyways, these are the number sign, the dollar sign, the percent sign, the ampersand, the circumflex accent, the low line and the tilde. The characters can be selected individually separated by a comma (for example \macro{escape={dollar sign, circumflex accent, low line}}. With \macro{escape={all}}, all escaping sequences are selected, with \macro{escape={none}}, none is selected.
The naming of the relevant characters follows their Unicode names. However, \macro{hash} exists as alias for \macro{number sign}, \macro{dollar} as alias for \macro{dollar sign}, \macro{percent} for \macro{percent sign}, \macro{circumflex} for \macro{circumflex accent} and \macro{underscore} for \macro{low line}.
+This key can be set using \macro{\JSONParseSet}. It can also be set locally as option to the commands \macro{\JSONParseValue}, \macro{\JSONParseArrayValues} and \macro{\JSONParseArrayValuesMap}.
+
\begin{macrodef}
-replacement/|backspace|={<string>}
-replacement/|formfeed|={<string>}
-replacement/|linefeed|={<string>}
-replacement/|carriage return|={<string>}
-replacement/|horizontal tab|={<string>}
+|rescan|
+|rescan|={<boolean>}
\end{macrodef}
-These keys can be used to set the replacement text for the JSON escape sequences \macro{\b} (backspace), \macro{\f} (formfeed), \macro{\n} (linefeed), \macro{\r} (carriage return) and \macro{\t} (horizontal tab). The default replacement string is a space. Only strings can be used as replacement.
+The key \macro{rescan} can be used to activate and deactivate rescanning of the output. This key is active per default. Rescanning converts all tokens to their default category codes and TeX control sequences are expanded before typesetting. Further, during the rescanning process, JSON escape sequences are replaced and characters that don't require escaping in JSON but in TeX are replaced by the relevant TeX escape sequences.
+
+This key can be set using \macro{\JSONParseSet}. It can also be set locally as option to the commands \macro{\JSONParseValue}, \macro{\JSONParseArrayValues} and \macro{\JSONParseArrayValuesMap}.
\section{Main user commands}
\begin{macrodef}
-|\JSONParse|[<file name>]{<token variable>}{<JSON string>}
+|\JSONParse|[<options>]{<token variable>}{<JSON string>}
\end{macrodef}
The command \macro{\JSONParse} is used to parse a JSON string and store the parsed result in a token variable (a property list). The second argument takes the name of the token variable that is created by the command. The third argument takes the JSON string to be parsed.
For example, using \macro{\JSONParse{\myJSONdata}{ { "key" : "value" } }}, the relevant JSON string will be parsed and the result stored in the token variable \macro{\myJSONdata} as property list. In this case, the property list only consists of one entry with the key \macro{key} and the value \macro{value}. The command \macro{\JSONParseValue{\myJSONdata}{key}}, for example, can then be used to extract the relevant value from this property list (see the description below).
-The first optinal argument can be used to externalize the parsed JSON data to a file. See more on externalization in section \ref{sec:externalizing} below.
+The first optional argument can be used to pass options to the command that are then applied locally.
\begin{macrodef}
-|\JSONParseFromFile|[<file name>]{<token variable>}{<JSON file>}
+|\JSONParseFromFile|[<options>]{<token variable>}{<JSON file>}
\end{macrodef}
The command \macro{\JSONParseFromFile} is used to parse a JSON file and store the parsed result in a token variable (a property list). It works the same way as \macro{\JSONParse}, but instead of a JSON string, it takes as third argument the path to the JSON file relative to the working directory.
@@ -298,8 +306,7 @@ The command \macro{\JSONParseFromFile} is used to parse a JSON file and store th
The command \macro{\JSONParseKeys} is used to store all top-level keys of a parsed JSON object as array into a token variable. The command takes as first argument the token variable that holds the parsed JSON data. The second argument takes the token variable that is assigned a JSON array containing the top-level keys of the object represented by the token variable in the first argument. The token variable to store the keys as array is created if it does not exist.
\begin{macrodef}
-|\JSONParseValue|{<token variable>}{<key>}
-|\JSONParseValue*|{<token variable>}{<key>}
+|\JSONParseValue|[<options>]{<token variable>}{<key>}
|\JSONParseExpandableValue|{<token variable>}{<key>}
\end{macrodef}
The command \macro{\JSONParseValue} is used to select values from the token variable (property list) that has been created using the commands \macro{\JSONParse} or \macro{\JSONParseFromFile}. The first argument takes the token variable that holds the parsed JSON data. The second argument takes the key to select the relevant entry from the parsed JSON data using JavaScript syntax.
@@ -308,15 +315,14 @@ If the JSON string \macro{{ "key" : "value" }} is parsed into the token variable
Nested objects and arrays are assigned keys that adhere to JavaScript syntax. For example, if the JSON string \macro{{ "outer_key" : { "inner_key" : "value" } }} is parsed into the token variable \macro{\myJSONdata}, to select the value associated with the key \macro{inner_key}, the command \macro{\JSONParseValue{\myJSONdata}{outer_key.inner_key}} can be used. To give an example for an array, the command \macro{\JSONParseValue{\myJSONdata}{key[0]}} selects the first value of the array associated with the key \macro{key} in the JSON string \macro{{ "key" : [ "one" , "two" ] }}.
-The non-starred variant of this command, \macro{\JSONParseValue}, rescans the token list before it is typeset (which means that all category codes that may have been changed before are set to the default values). The starred variant, \macro{\JSONParseValue*}, does not rescan the ouput. The non-starred variants of this and similar commands should therefore not be placed in a \macro{\JSONParse} command.
+The first optional argument can be used to pass options to the command, such as \macro{escape} or \macro{rescan}, that are then applied locally. When the option \macro{rescan} is used, the token list is rescanned before it is typeset (which means that all category codes that may have been changed before are set to the default values). This is the default behaviour. If rescanning is not desired, pass the option \macro{rescan=false} to the command.
When a key is associated with an object or array, the whole object or array is output as JSON string. The special key \macro{.} (or the string defined using the key \macro{child sep}) returns the whole JSON object as string.
Whole objects or arrays can also be output as JSON string for further use in other macros using the expandable command \macro{\JSONParseExpandableValue}.
\begin{macrodef}
-|\JSONParseArrayValues|{<token variable>}{<key>}[<subkey>]{<string>}
-|\JSONParseArrayValues*|{<token variable>}{<key>}[<subkey>]{<string>}
+|\JSONParseArrayValues|[<options>]{<token variable>}{<key>}[<subkey>]{<string>}
\end{macrodef}
The command \macro{\JSONParseArrayValues} is used to select all values from an array from a parsed JSON string or JSON file. The first argument takes the token variable that holds the parsed JSON data. The second argument takes the key to select the relevant entry from the parsed JSON data using JavaScript syntax. The third argument is optional and can be used to pass a subkey, i.\,e. a key that is used to select a value for every item. The last argument takes a string that is inserted between all values when they are typeset.
@@ -339,11 +345,11 @@ For example, let us assume the following JSON data structure is parsed into the
Then, when using \macro{\JSONParseArrayValues{\myJSONdata}{array}[key_a]{, }}, `one, three' is typeset to the document.
-The starred variant, \macro{\JSONParseArrayValues*}, does not rescan the token lists before they are typeset.
+The first optional argument can be used to pass options to the command, such as \macro{escape} or \macro{rescan}, that are then applied locally.
\begin{macrodef}
-|\JSONParseArrayValuesMap|{<token variable>}{<key>}[<subkey>]{<command name>}
-|\JSONParseArrayValuesMap*|{<token variable>}{<key>}[<subkey>]{<command name>}
+|\JSONParseArrayValuesMap|[<options>]{<token variable>}{<key>}[<subkey>]
+ {<command name>}
\end{macrodef}
The command \macro{\JSONParseArrayValuesMap} takes the same first three arguments as the command \macro{\JSONParseArrayValues} and works in a similar way. However, instead of a string that is added between the array items, it takes a command name as fourth argument. This command can be defined beforehand and will be called for every array item. Inside its definition, the commands \macro{\JSONParseArrayIndex}, \macro{\JSONParseArrayKey} and \macro{\JSONParseArrayValue} can be used which are updated for each item and output the index, the key and the value of the current item respectively.
@@ -362,7 +368,7 @@ For example, let us assume the same JSON data structure as defined above parsed
\end{itemize}
\end{codeexamplecolumns}
-The starred variant, \macro{\JSONParseArrayValuesMap*}, does not rescan the token lists before they are typeset.
+The first optional argument can be used to pass options to the command, such as \macro{escape} or \macro{rescan}, that are then applied locally.
\begin{macrodef}
|\JSONParseArrayCount|{<token variable>}{<key>}
@@ -371,45 +377,89 @@ The command \macro{\JSONParseArrayCount} takes as first argument a token variabl
\subsection{Externalising parsed JSON data}\label{sec:externalizing}
-Parsing large JSON files can take quite a while. In order to speed up follow-up compilation runs, this package provides a way to store parsed JSON data for future use. The first opional argument of the commands \macro{\JSONParse} and \macro{\JSONParseFromFile} can be used to provide the name of a file (without file extension) that will be created in the working directory and which stores the relevant information. The file name will have the extension \macro{.jsonparse}. If a file with the same name and file extension already exists, an error will be issued. Once the file has been created, the package will try to load the data from this file instead of parsing the JSON data again.
+Parsing large JSON files can take quite a while. In order to speed up follow-up compilation runs, this package provides a way to store parsed JSON data for future use. Once a file for externalization has been created, the package will try to load the data from this file instead of parsing the JSON data again.
+
+\begin{macrodef}
+|externalize|
+|externalize|={<boolean>}
+\end{macrodef}
+With the key \macro{externalize} set (or set to true), a file will be created in the working directory that stores the externalization of the parsed JSON data. The file name gets the extension \macro{.jsonparse}. The file name is created automatically and consists of the name of the current file followed by an underscore and the name of the token variable where the JSON data is stored into. If a file with the same name and file extension already exists, an error will be issued.
+
+This key can be set using \macro{\JSONParseSet}. It can also be set locally as option to the commands \macro{\JSONParse} and \macro{\JSONParseFromFile}.
+
+\begin{macrodef}
+|externalize prefix|={<string>}
+\end{macrodef}
+With the key \macro{externalize prefix}, a prefix can be defined that is added to the file name. Per default this is an empty string.
+
+This key can be set using \macro{\JSONParseSet}. It can also be set locally as option to the commands \macro{\JSONParse} and \macro{\JSONParseFromFile}.
+
+\begin{macrodef}
+|externalize file name|={<token list>}
+\end{macrodef}
+The key \macro{externalize file name} sets the schema for the file name. The default schema is as follows:
+
+\begin{codeexample}
+\l_jsonparse_externalize_prefix_str \c_sys_jobname_str
+ \c_underscore_str \l_jsonparse_current_prop_str
+\end{codeexample}
+
+The token variable \macro{\l_jsonparse_externalize_prefix_str} contains the prefix that is set using the key \macro{externalize prefix}. \macro{\c_sys_jobname_str} holds the name of the current file (the current job name), \macro{\c_underscore_str} is an underscore and the token variable \macro{\l_jsonparse_current_prop_str} contains the name of the property list where the relevant JSON data is stored into.
+
+This key can be set using \macro{\JSONParseSet}. It can also be set locally as option to the commands \macro{\JSONParse} and \macro{\JSONParseFromFile}.
\begin{macrodef}
|\JSONParsePut|{<token variable>}{<key>}[<JSON string>]
\end{macrodef}
The command \macro{\JSONParsePut} is used by the externalization procedure to re-read already parsed JSON data to the main file. It just adds a key-value pair to the property list (where the value part is read as string). Hence, it can also be used to append more entries to an already existing property list containing parsed JSON data.
-\subsection{Changing separators, output and other settings}\label{sec:settings}
+\subsection{Changing separators, output and other options}\label{sec:options}
The package provides a set of keys can be set to change the separators used to select the relevant value in the JSON structure, the output that is generated from the JSON data as well as other things.
\begin{macrodef}
-|\JSONParseSet|{<key-value list>}
+|\JSONParseSet|{<options>}
\end{macrodef}
-The commands \macro{\JSONParseSet} can be used to specify settings via key-value pairs (separated by commas). Keys that are presented here as a subkey (i.\,e. preceded by another key and a slash) can also be set using the syntax \macro{key={subkey}} and multiple subkeys belonging to one key can be combined using a comma as separator. The following keys are available:
+The commands \macro{\JSONParseSet} can be used to specify options via key-value pairs (separated by commas). Keys that are presented here as a subkey (i.\,e. preceded by another key and a slash) can also be set using the syntax \macro{key={subkey}} and multiple subkeys belonging to one key can be combined using a comma as separator. Several user commands allow to pass keys directly which are then applied locally. The following keys are available:
\begin{macrodef}
separator/|child|={<string>}
+separator/|array left|={<string>}
+separator/|array right|={<string>}
\end{macrodef}
-With the key \macro{child sep}, the separator for child objects that is used in the syntax to select a specific value in the JSON data structure can be changed. Per default, the child separator is a dot (\macro{.}). Changing the separator can be useful if keys in the JSON structure already use these characters.
+With the key \macro{separator/child}, the separator for child objects that is used in the syntax to select a specific value in the JSON data structure can be changed. Per default, the child separator is a dot (\macro{.}). Changing the separator can be useful if keys in the JSON structure already use these characters.
+
+With the keys \macro{separator/array left} and \macro{separator/array right}, the separators for arrays that are used in the syntax to select a specific value in the JSON data structure can be changed. Per default, the separators are square brackets (\macro{[} and \macro{]}). Changing the separators can be useful if keys in the JSON structure already use these characters. Changing these separators to curly braces (\macro{{}}) is not supported due to their grouping function in TeX.
+
+These keys can be set using \macro{\JSONParseSet}. They can also be set locally as option to the commands \macro{\JSONParse} and \macro{\JSONParseFromFile}.
\begin{macrodef}
-separator/|array left|={<string>}
-separator/|array right|={<string>}
+|zero-based|
+|zero-based|={<boolean>}
\end{macrodef}
-With the keys \macro{array sep left} and \macro{array sep right}, the separators for arrays that are used in the syntax to select a specific value in the JSON data structure can be changed. Per default, the separators are square brackets (\macro{[} and \macro{]}). Changing the separators can be useful if keys in the JSON structure already use these characters.
+If set (or explicitly set to \macro{true}), the key \macro{zero-based} sets the numbering of the index of array items to zero-based. If set to false, the indexing starts with one instead. Per default, the package uses zero-based indexing to resemble JavaScript notation.
+
+This key can be set using \macro{\JSONParseSet}. It can also be set locally as option to the commands \macro{\JSONParse} and \macro{\JSONParseFromFile}.
\begin{macrodef}
-replacement/|true|={<string>}
-replacement/|false|={<string>}
-replacement/|null|={<string>}
+replace/|true|={<string>}
+replace/|false|={<string>}
+replace/|null|={<string>}
\end{macrodef}
-With the keys \macro{true}, \macro{false} and \macro{null}, the string that is typeset for true, false and null values can be changed. The default strings that are typeset are \macro{true}, \macro{false} and \macro{null} respectively. Only strings can be used as replacement.
+With the keys \macro{replace/true}, \macro{replace/false} and \macro{replace/null}, the string that is typeset for true, false and null values can be changed. The default strings that are typeset are \macro{true}, \macro{false} and \macro{null} respectively. Only strings can be used as replacement. These replacements take place already during parsing.
+
+These keys can be set using \macro{\JSONParseSet}. They can also be set locally as option to the commands \macro{\JSONParse} and \macro{\JSONParseFromFile}.
\begin{macrodef}
-|array index zero-based|
-|array index zero-based|={<boolean>}
+replace/|backspace|={<string>}
+replace/|formfeed|={<string>}
+replace/|linefeed|={<string>}
+replace/|carriage return|={<string>}
+replace/|horizontal tab|={<string>}
\end{macrodef}
-If set (or explicitly set to \macro{true}), the key \macro{array index zero-based} sets the numbering of the index of array items to zero-based. If set to false, the indexing starts with one instead. Per default, the package uses zero-based indexing to resemble JavaScript notation.
+These keys can be used to set the replacement text for the JSON escape sequences \macro{\b} (backspace), \macro{\f} (formfeed), \macro{\n} (linefeed), \macro{\r} (carriage return) and \macro{\t} (horizontal tab). The default replacement string is a space. Only strings can be used as replacement. These replacements take place only during typesetting.
+
+These keys can be set using \macro{\JSONParseSet}. They can also be set locally as option to the commands \macro{\JSONParseValue}, \macro{\JSONParseArrayValues} and \macro{\JSONParseArrayValuesMap}.
\subsection{L3 commands}
diff --git a/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md
index c58c1a61883..76ee35a0f1b 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md
@@ -7,6 +7,17 @@ this project uses date-based 'snapshot' version identifiers.
## [Unreleased]
+## [2024-07-20]
+
+### Fixed
+- Implementation of deprecated `\tl_mixed_case:n(n)`
+- Redo the fix for LaTeX2e key properties (issue latex3/latex2e\#1415)
+
+## [2024-06-19]
+
+### Fixed
+- Avoid a low-level error when LaTeX2e key properties are given without a value
+
## [2024-05-27]
### Added
@@ -1742,7 +1753,9 @@ this project uses date-based 'snapshot' version identifiers.
- Step functions have been added for dim variables,
e.g. `\dim_step_inline:nnnn`
-[Unreleased]: https://github.com/latex3/latex3/compare/2024-05-27...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2024-07-20...HEAD
+[2024-07-20]: https://github.com/latex3/latex3/compare/2024-06-19...2024-07-20
+[2024-06-19]: https://github.com/latex3/latex3/compare/2024-05-27...2024-06-19
[2024-05-27]: https://github.com/latex3/latex3/compare/2024-05-08...2024-05-27
[2024-05-08]: https://github.com/latex3/latex3/compare/2024-04-11...2024-05-08
[2024-04-11]: https://github.com/latex3/latex3/compare/2024-03-14...2024-04-11
diff --git a/Master/texmf-dist/doc/latex/l3kernel/README.md b/Master/texmf-dist/doc/latex/l3kernel/README.md
index 8946af12933..0afb38a9ba2 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/README.md
+++ b/Master/texmf-dist/doc/latex/l3kernel/README.md
@@ -1,7 +1,7 @@
LaTeX3 Programming Conventions
==============================
-Release 2024-05-27
+Release 2024-07-20
Overview
--------
diff --git a/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf b/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf
index a6eca24ce47..650e6999f92 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf b/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf
index 5c72322e357..1b89f2f257a 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/interface3.tex b/Master/texmf-dist/doc/latex/l3kernel/interface3.tex
index 62501cfa53f..0219809dabd 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/interface3.tex
+++ b/Master/texmf-dist/doc/latex/l3kernel/interface3.tex
@@ -58,7 +58,7 @@ for those people who are interested.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2024-05-27}
+\date{Released 2024-07-20}
\pagenumbering{roman}
\maketitle
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3doc.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3doc.pdf
index 42960f5e6f2..0d5a3494c00 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3doc.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf
index efc8882c361..07f24848e3d 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news.pdf
index 4b57ef41c84..eb4c42d8c54 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news01.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news01.pdf
index b5f45059d3c..21997cf9808 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news01.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news01.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news02.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news02.pdf
index 0ee8ffaf96a..db1ac5b85b4 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news02.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news02.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news03.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news03.pdf
index fef9bf3a7b5..6630201b1f7 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news03.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news03.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news04.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news04.pdf
index 0afbb9591e3..c74f9f0a7c9 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news04.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news04.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news05.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news05.pdf
index 0a44ce68119..18d4df32909 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news05.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news05.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news06.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news06.pdf
index 10cec7c17f3..643b8f1f685 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news06.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news06.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news07.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news07.pdf
index 6bfbab4d96a..b457fd6033a 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news07.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news07.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news08.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news08.pdf
index a0130195cc4..a5b4744d286 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news08.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news08.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news09.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news09.pdf
index 3616cc20caf..a2242937d2e 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news09.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news09.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news10.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news10.pdf
index 00ec553d1c1..17751670086 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news10.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news10.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news11.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news11.pdf
index 59a672d339e..8e14906f032 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news11.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news11.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3news12.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3news12.pdf
index 9c4f937b006..15a8332f071 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3news12.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3news12.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.csv b/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.csv
index e85412b9d80..339f6625fd1 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.csv
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.csv
@@ -26,6 +26,7 @@ block,latex2e,The LaTeX Project,https://www.latex-project.org/latex3.html,https:
bool,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27,
box,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27,
bxjh,BXjaholiday,Takuto Asakura,https://github.com/wtsnjp/BXjaholiday,https://github.com/wtsnjp/BXjaholiday.git,https://github.com/wtsnjp/BXjaholiday/issues,2018-02-02,2019-02-02,
+cal,spath3,Andrew Stacey,https://github.com/loopspace/spath3,https://github.com/loopspace/spath3.git,https://github.com/loopspace/spath3/issues,2024-07-18,2024-07-18,
cascade,cascade,F. Pantigny,,,,2020-07-21,2020-07-21,
catcode,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2018-05-12,2018-05-12,
cctab,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-28,2012-09-28,
@@ -135,6 +136,7 @@ keys,"l3kernel,l3keys2e,ltkeys",The LaTeX Project,https://www.latex-project.org/
keyval,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27,
kgl,kantlipsum,Enrico Gregorio,,,,2013-03-16,2013-03-16,
kivitendo,"kiviletter, kivitables",Marei Peischl for Kivitendo,https://www.kivitendo.de/,https://github.com/kivitendo/kivitendo-erp,https://forum.kivitendo.de/,2021-05-28,2021-05-28,
+knot,spath3,Andrew Stacey,https://github.com/loopspace/spath3,https://github.com/loopspace/spath3.git,https://github.com/loopspace/spath3/issues,2024-07-18,2024-07-18,
langsci,langscibook,Language Science Press,https://langsci-press.org,https://github.com/langsci/langscibook,https://github.com/langsci/langscibook/issues,2021-07-20,2021-07-21,
left,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2018-05-12,2018-05-12,
liftarm,liftarm,Matthias Floré,,,,2024-05-25,2024-05-25,
@@ -210,6 +212,7 @@ property,latex2e,The LaTeX Project,https://www.latex-project.org/latex3.html,htt
pseudo,pseudo,Magnus Lie Hetland,https://github.com/mlhetland/pseudo.sty,https://github.com/mlhetland/pseudo.sty.git,https://github.com/mlhetland/pseudo.sty/issues,2019-06-24,2019-06-24,
ptex,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2015-07-28,2015-07-28,
ptxcd,ptxcd,Marei Peischl,,,,2020-07-27,2020-07-27,Used for specific corporate design templates
+ptxtools,"depp, ptxtools",Marei Peischl,https://gitlab.com/islandoftex/texmf/depp,https://gitlab.com/islandoftex/texmf/depp.git,https://gitlab.com/islandoftex/texmf/depp,2024-07-09,2024-07-09,
qrbill,qrbill,Marei Peischl,https://github.com/peiTeX/qrbill,https://github.com/peiTeX/qrbill.git,https://github.com/peiTeX/qrbill/issues,2020-06-27,2020-06-27,
quark,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27,
rainbow,beamertheme-rainbow,samcarter,https://github.com/samcarter/beamertheme-rainbow,https://github.com/samcarter/beamertheme-rainbow,https://github.com/samcarter/beamertheme-rainbow/issues,2023-07-04,2023-07-04,
@@ -239,6 +242,7 @@ slcd,se2thesis,Stephan Lukasczyk,https://github.com/se2p/se2thesis,https://githu
socket,latex2e,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex2e.git,https://github.com/latex3/latex2e/issues,2023-10-17,2023-10-17,
sort,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2017-02-13,
space,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2018-05-12,2018-05-12,
+spath,spath3,Andrew Stacey,https://github.com/loopspace/spath3,https://github.com/loopspace/spath3.git,https://github.com/loopspace/spath3/issues,2024-07-18,2024-07-18,
starray,starray,Alceu Frigeri,https://github.com/alceu-frigeri/starray,https://github.com/alceu-frigeri/starray,https://github.com/alceu-frigeri/starray/issues,2023-05-15,2023-05-15,
statistics,statistics,Julien Rivaud,https://gitlab.com/frnchfrgg-latex/statistics,https://gitlab.com/frnchfrgg-latex/statistics.git,https://gitlab.com/frnchfrgg-latex/statistics/issues,2018-06-25,2018-06-25,
stm,lt3-stm,CV Radhakrishnan,http://www.cvr.cc/,,,2014-02-26,2014-02-26,
@@ -258,6 +262,7 @@ tex,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https:/
text,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2020-01-15,2020-01-15,
tikzfill,tikzfill,Thomas F. Sturm,https://github.com/T-F-S/tikzfill,https://github.com/T-F-S/tikzfill.git,https://github.com/T-F-S/tikzfill/issues,2022-07-19,2022-07-19,
tikzlings,tikzlings,samcarter,https://github.com/samcarter/tikzlings,git@github.com:samcarter/tikzlings.git,https://github.com/samcarter/tikzlings/issues,2023-02-17,2023-02-17,
+tikzspath,spath3,Andrew Stacey,https://github.com/loopspace/spath3,https://github.com/loopspace/spath3.git,https://github.com/loopspace/spath3/issues,2024-07-18,2024-07-18,
tikzsymbols,tikzsymbols,Ben Vitecek,https://github.com/Vidabe/tikzsymbols,https://github.com/Vidabe/tikzsymbols.git,https://github.com/Vidabe/tikzsymbols/issues,2018-09-26,2018-09-26,
tilde,l3kernel,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2018-05-12,2018-05-12,
tl,"l3kernel,l3tl-build",The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27,
@@ -288,6 +293,7 @@ xmarks,latex2e,The LaTeX Project,https://www.latex-project.org/latex3.html,https
xparse,xparse,The LaTeX Project,https://www.latex-project.org/latex3.html,https://github.com/latex3/latex3.git,https://github.com/latex3/latex3/issues,2012-09-27,2012-09-27,
xpatch,"regexpatch,xpatch",Enrico Gregorio,,,,2013-03-16,2013-03-16,
xpeek,xpeek,Joel C. Salomon,,,,2013-03-16,2013-03-16,
+xpg,polyglossia,Jürgen Spitzmüller,https://github.com/reutenauer/polyglossia/,https://github.com/reutenauer/polyglossia/,https://github.com/reutenauer/polyglossia/issues,2024-07-02,2024-07-02,
xpinyin,xpinyin,Qing Lee,https://github.com/CTeX-org/ctex-kit,https://github.com/CTeX-org/ctex-kit.git,https://github.com/CTeX-org/ctex-kit/issues,2013-03-16,2013-05-26,
xsb,xsavebox,Alexander Grahn,,https://gitlab.com/agrahn/xsavebox,https://gitlab.com/agrahn/xsavebox/issues,2016-02-26,2020-04-15,
xsim,xsim,Clemens Niederberger,https://github.com/cgnieder/xsim/,https://github.com/cgnieder/xsim.git,https://github.com/cgnieder/xsim/issues,2020-04-14,2020-04-14,
@@ -299,4 +305,5 @@ zhnum,zhnumber,Qing Lee,https://github.com/CTeX-org/ctex-kit,https://github.com/
zrefcheck,zref-check,gusbrs,https://github.com/gusbrs/zref-check,https://github.com/gusbrs/zref-check,https://github.com/gusbrs/zref-check/issues,2021-08-05,2021-08-05,
zrefclever,zref-clever,gusbrs,https://github.com/gusbrs/zref-clever,https://github.com/gusbrs/zref-clever,https://github.com/gusbrs/zref-clever/issues,2021-11-29,2021-11-29,
zrefvario,zref-vario,gusbrs,https://github.com/gusbrs/zref-vario,https://github.com/gusbrs/zref-vario,https://github.com/gusbrs/zref-vario/issues,2022-02-02,2022-02-02,
+zugferd,zugferd,Marei Peischl,https://github.com/TeXhackse/LaTeX-ZUGFeRD,https://github.com/TeXhackse/LaTeX-ZUGFeRD.git,https://github.com/TeXhackse/LaTeX-ZUGFeRD/issues,2024-07-09,2024-07-09,
zxjt,zxjatype,Takayuki Yato,,,,2013-03-16,2013-03-16,
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.pdf
index 602ccaaa597..ab4d18e9164 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf
index 0113bac5713..31ff7889ff0 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex
index bcea3de06e6..985f20a68cb 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex
@@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2024-05-27}
+\date{Released 2024-07-20}
\begin{document}
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf
index 99e93c2cccb..515a9eb803c 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex
index 30d8d47747d..b9ffcb011af 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex
@@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2024-05-27}
+\date{Released 2024-07-20}
\newcommand{\TF}{\textit{(TF)}}
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf
index 01598ca79ae..d1a2058e9fb 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex b/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex
index 141749aa6bb..fca28863372 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex
+++ b/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex
@@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2024-05-27}
+\date{Released 2024-07-20}
\newcommand{\TF}{\textit{(TF)}}
diff --git a/Master/texmf-dist/doc/latex/l3kernel/source3.pdf b/Master/texmf-dist/doc/latex/l3kernel/source3.pdf
index 34279f9e004..26c62e620d5 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/source3.pdf
+++ b/Master/texmf-dist/doc/latex/l3kernel/source3.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/l3kernel/source3.tex b/Master/texmf-dist/doc/latex/l3kernel/source3.tex
index 00095ad3191..228d3ca93c6 100644
--- a/Master/texmf-dist/doc/latex/l3kernel/source3.tex
+++ b/Master/texmf-dist/doc/latex/l3kernel/source3.tex
@@ -57,7 +57,7 @@ for those people who are interested.
{latex-team@latex-project.org}%
}%
}
-\date{Released 2024-05-27}
+\date{Released 2024-07-20}
\pagenumbering{roman}
\maketitle
diff --git a/Master/texmf-dist/doc/latex/lni/CHANGELOG.md b/Master/texmf-dist/doc/latex/lni/CHANGELOG.md
index 5bb6f9697cd..377ce68c438 100644
--- a/Master/texmf-dist/doc/latex/lni/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/lni/CHANGELOG.md
@@ -6,9 +6,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
## [Unreleased]
-## [1.9] - 2024-07-1
+## [1.10] - 2024-07-23
+### Changed
+- Footnotes are set as superscripts in the footer
+- URLs are set using the text font instead of a typewriter font
+
+### Fixed
+- Support for multiple affiliations (#173)
+
+## [1.9] - 2024-07-01
### Added
-- Support for multiple affiliations
+- Support for multiple affiliations (#158)
## [1.8.1] - 2024-01-08
@@ -171,7 +179,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.9...HEAD
+[Unreleased]: https://github.com/gi-ev/LNI/compare/v1.10...HEAD
+[1.10]: https://github.com/gi-ev/LNI/compare/v1.9...v1.10
[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
diff --git a/Master/texmf-dist/doc/latex/lni/README.md b/Master/texmf-dist/doc/latex/lni/README.md
index 034ef480d86..9935391e3b1 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.9
+Version: 1.10
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.pdf b/Master/texmf-dist/doc/latex/lni/lni.pdf
index c3b50c0cd12..b79a12a0915 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/magicwatermark/README.md b/Master/texmf-dist/doc/latex/magicwatermark/README.md
index db59f622e81..4bdaad4b2f8 100644
--- a/Master/texmf-dist/doc/latex/magicwatermark/README.md
+++ b/Master/texmf-dist/doc/latex/magicwatermark/README.md
@@ -3,6 +3,4 @@
- Repository: https://github.com/ljguo1020/magicwatermark
- License: The LaTeX Project Public License 1.3c
-> magicwatermark is a package based on everypage and tikz and encapsulated by LATEX3 Ä°t can
-> flexibly set and clear watermarks. All watermark content is placed in inside a node of verbtikz and
-> in the center of the page.
+> magicwatermark is based on tikz and expl3, and can flexibly set backgrounds or watermarks.
diff --git a/Master/texmf-dist/doc/latex/magicwatermark/magicwatermark-en.pdf b/Master/texmf-dist/doc/latex/magicwatermark/magicwatermark-en.pdf
deleted file mode 100644
index 5ee2d2d9f59..00000000000
--- a/Master/texmf-dist/doc/latex/magicwatermark/magicwatermark-en.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/magicwatermark/magicwatermark-en.tex b/Master/texmf-dist/doc/latex/magicwatermark/magicwatermark-en.tex
deleted file mode 100644
index 03a3e6db112..00000000000
--- a/Master/texmf-dist/doc/latex/magicwatermark/magicwatermark-en.tex
+++ /dev/null
@@ -1,212 +0,0 @@
-\documentclass{l3doc}
-\usepackage{graphicx}
-\usepackage{enumitem}
-\usepackage{listings}
-\lstset{
-frame=tb,framerule=2pt,language={[LaTeX]TeX},basicstyle={\ttfamily},
-language={[LaTeX]TeX},
-keywordstyle=\color{red!70!black}\bfseries,
-keywordstyle={[2]\color{blue!70!black}\bfseries},
-morekeywords={PageSetup,Watermark,NewWatermark,MyPageSetup,MyWatermark,EvenPageSetup,OddPageSetup,EvenWatermark,OddWatermark,ClearWatermark}}
-\usepackage{fontspec}
-\IfFontExistsTF{calibri.ttf}
-{
- \setmainfont{calibri.ttf}[
- BoldFont = calibrib.ttf,
- ItalicFont = calibrii.ttf,
- BoldItalicFont = calibriz.ttf
- ]
-}
-{}
-\usepackage{magicwatermark}
-\renewcommand*\marg[1]{\{\meta{#1}\}}
-\renewcommand*\oarg[1]{[\meta{#1}]}
-\renewcommand*\parg[1]{(\meta{#1})}
-\title{\pkg{magicwatermark}}
-\author{lijun guo \\ liguo1020@gmail.com}
-\def\version{v1.0.1}
-\date{\today\quad\version}
-\pagestyle{empty}
-\PageSetup*
-{
- \begin{tikzpicture}[remember picture,overlay]
- \node[cyan,scale = 2,shift={(-1,-1)}] at (current page.north east){--~\thepage~--};
- \end{tikzpicture}
-}
-\Watermark
-\begin{document}
-\maketitle
-\tableofcontents
-\begin{abstract}
-\pkg{magicwatermark} is a package based on \pkg{everypage} and \pkg{tikz} and encapsulated by \LaTeX3 \. It can flexibly set and clear watermarks. All watermark content is placed in \ inside a \verb|node| of \verb|tikz| and in the center of the page.
-\end{abstract}
-\section{Introduction}
-Currently the \pkg{magicwatermark} package can only implement the following functions
-\begin{itemize}
- \item Set watermark for all pages
- \item Set watermark for odd pages
- \item Set the watermark for even pages
- \item Create a new watermark and set multiple watermarks on the same page
- \item Clear watermark
-\end{itemize}
-\section{Interface}
-\subsection{Some command}
-\begin{function}[added=2021-12-21,updated=2021-12-21]{\PageSetup}
- \begin{syntax}
- \tn{PageSetup} \oarg{option} \marg{content for watermark}
- \end{syntax}
- This command is used to set the watermark content of all pages. It accepts two parameters. The first parameter is used to set some properties and is given in the form of \verb|key=value|. The second parameter is used to set the watermark content. It is text, pictures, etc.
-\end{function}
-\begin{function}[added=2021-12-21,updated=2021-12-21]{\Watermark}
-\begin{syntax}
- \tn{Watermark}
-\end{syntax}
-This command is used to display the watermark set above
-\end{function}
-\begin{function}[added=2021-12-21,updated=2021-12-21]{\EvenPageSetup}
-\begin{syntax}
-\tn{EvenPageSetup}\oarg{option}\marg{content for watermark}
-\end{syntax}
-This command is used to set the watermark content of even pages
-\end{function}
-\begin{function}[added=2021-12-21,updated=2021-12-21]{\EvenWatermark}
-\begin{syntax}
- \tn{EvenWatermark}
-\end{syntax}
-This command is used to display the even page watermark set above
-\end{function}
-\begin{function}[added=2021-12-21,updated=2021-12-21]{\OddPageSetup}
-\begin{syntax}
-\tn{OddPageSetup}\oarg{option}\marg{content for watermark}
-\end{syntax}
-This command is used to set the watermark content of odd pages
-\end{function}
-\begin{function}[added=2021-12-21,updated=2021-12-21]{\OddWatermark}
-\begin{syntax}
- \tn{OddWatermark}
-\end{syntax}
-This command is used to display the odd page watermark set above
-\end{function}
-\subsection{Add command}
-The usage of the following commands with asterisks is similar to the above. It is not so much an extension as it is a cancellation of restrictions. The above commands all write the watermark content in a \verb|node|, for users who are not familiar with TikZ , the former is more square is convenient and fast, while the latter is more flexible
-\begin{function}[added=2022-01-07,updated=2022-01-07]{\PageSetup*}
-\begin{syntax}
-\tn{PageSetup*}\marg{content for watermark}
-\end{syntax}
-\end{function}
-\begin{function}[added=2022-01-07,updated=2022-01-07]{\EvenPageSetup*}
-\begin{syntax}
-\tn{EvenPageSetup*}\marg{content for watermark}
-\end{syntax}
-\end{function}
-\begin{function}[added=2022-01-07,updated=2022-01-07]{\OddPageSetup*}
-\begin{syntax}
-\tn{OddPageSetup*}\marg{content for watermark}
-\end{syntax}
-\end{function}
-\begin{function}[added=2021-12-21,updated=2021-12-21]{\NewWatermark}
-\begin{syntax}
-\tn{NewWatermark}\marg{watermark name}
-\end{syntax}
-This command is used to create a new watermark. Note that the watermark name cannot be \verb|main|, \verb|even|, \verb|odd|.
-\end{function}
-\begin{function}[added=2021-12-21,updated=2021-12-21]{\MyPageSetup}
-\begin{syntax}
-\tn{MyPageSetup}\oarg{option}\marg{watermark name}\marg{content for watermark}
-\end{syntax}
-Used to set the new watermark content
-\end{function}
-\begin{function}[added=2021-12-21,updated=2021-12-21]{\MyWatermark}
-\begin{syntax}
- \tn{MyWatermark}\marg{watermark name}
-\end{syntax}
-This command is used to display the watermark set above
-\end{function}
-\begin{function}[added=2021-12-21,updated=2021-12-21]{\ClearWatermark}
-\begin{syntax}
- \tn{ClearWatermark}\marg{watermark list}
-This command is used to clear the set watermark, accepts a comma list as parameter, for example:
-\begin{itemize}
- \item \verb|\ClearWatermark{main}| clears the watermark set by \verb|\Watermark|
- \item \verb|\ClearWatermark{even,odd}| clears the watermark on odd and even pages
- \item \verb|\ClearWatermark{all}| Clear all watermarks
- \item \verb|\ClearWatermark{name1,name2,name3,...}|
-\end{itemize}
-\end{syntax}
-\end{function}
-\subsection{option list}
-The \textbf{option} in the above setting command is as follows
-\begin{itemize}
- \item \verb|scale = <number>| set the scale
- \item \verb|opacity = <number>| set the opacity
- \item \verb|shift = {(x,y)}| for translation by vector (x,y)
- \item \verb|color = <color expression>| set the color
- \item \verb|rotate = <angle>| Set the rotation angle
- \item \verb+align = <center|left|right>+ Set the alignment of multi-line text, the default is center
- \item \verb+showframe = <true|false>+ Set whether to display the frame, the default is false
-\end{itemize}
-\subsection{notes}
-All show and clear commands take effect only on the text following the command.
-
-\section{Examples}
-\subsection{basic}
-\begin{lstlisting}
-\documentclass{ctexart}
-\usepackage{magicwatermark}
-\PageSetup[
- rotate = 30, % set the rotation angle
- color = red!80, % set color for watermark content
- scale = 6 % set the scale
-]{
- watermark content
-}
-\Watermark
-\begin{document}
-...
-\end{document}
-\end{lstlisting}
-\subsection{Odd and Even Pages}
-\begin{lstlisting}
-\documentclass{ctexart}
-\usepackage{magicwatermark}
-\EvenPageSetup[color=cyan,showframe,scale=4]{Even page} % Even page
-\OddPageSetup[color=purple,showframe,scale=4]{Odd page} % Odd page
-\EvenWatermark % show watermark
-\OddWatermark
-\begin{document}
-...
-\end{document}
-\end{lstlisting}
-\subsection{star}
-\begin{lstlisting}
-\documentclass{ctexart}
-\usepackage{magicwatermark}
-\PageSetup*{
- \begin{tikzpicture}[remember picture,overlay]
- \node[cyan,scale = 2,shift={(-1,-1)}] at
- (current page.north east){--~\thepage~--};
- \end{tikzpicture}
-}
-\begin{document}
-...
-\Watermark % This order did not take effect before
-\end{document}
-\end{lstlisting}
-\subsection{New watermark}
-\begin{lstlisting}
-\documentclass{ctexart}
-\usepackage{magicwatermark}
-\NewWatermark{one} % new
-\NewWatermark{two}
-\MyPageSetup[scale=5,color=blue]{one}{content one} % setting
-\MyPageSetup[scale=5,color=red]{two}{content two}
-\begin{document}
-\MyWatermark{one} % use watermark one
-...
-\newpage
-\ClearWatermark{one} % clear watermark one
-\MyWatermark{two} % use watermark two
-...
-\end{document}
-\end{lstlisting}
-\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/magicwatermark/magicwatermark.pdf b/Master/texmf-dist/doc/latex/magicwatermark/magicwatermark.pdf
index 396233aba2e..04aa894cefc 100644
--- a/Master/texmf-dist/doc/latex/magicwatermark/magicwatermark.pdf
+++ b/Master/texmf-dist/doc/latex/magicwatermark/magicwatermark.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/magicwatermark/magicwatermark.tex b/Master/texmf-dist/doc/latex/magicwatermark/magicwatermark.tex
new file mode 100644
index 00000000000..9b610d9cab7
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/magicwatermark/magicwatermark.tex
@@ -0,0 +1,373 @@
+\documentclass{article}
+
+\usepackage{lipsum}
+
+\usepackage{../magicwatermark}
+
+\usepackage[margin = 2.51828cm]{geometry}
+
+
+\def\pkgname{\textcolor{teal}{\texttt{magicwatermark}}}
+\usepackage{indentfirst}
+\pagestyle{empty}
+
+\usepackage[UTF8, scheme=plain, fontset=none, heading=true, zihao=-4]{ctex}
+\setCJKmainfont[BoldFont={LXGWWenKai-Bold},ItalicFont={LXGWWenKai-Light}]{LXGWWenKai-Regular}
+\setCJKsansfont[BoldFont={LXGWWenKai-Bold}]{LXGWWenKai-Regular}
+\setCJKmonofont[BoldFont={LXGWWenKaiMono-Bold},ItalicFont={LXGWWenKaiMono-Light}]{LXGWWenKaiMono-Regular}
+
+\ctexset{
+% chapter={
+% format+=\raggedright,
+% name = {第,部分},
+% afterskip = .5cm
+% },
+ section={
+ format+=\raggedright,
+ afterskip = .5cm
+ },
+ contentsname = {目次}
+}
+
+\usepackage{fontspec}
+\IfFontExistsTF{calibri.ttf}
+{
+ \setmainfont{calibri.ttf}[
+ BoldFont = calibrib.ttf,
+ ItalicFont = calibrii.ttf,
+ BoldItalicFont = calibriz.ttf
+ ]
+}
+{}
+
+\usepackage[listings,breakable]{tcolorbox}
+
+\ExplSyntaxOn
+\clist_new:N \l_function_variant_list %fuction variant list
+\NewDocumentCommand{\function}{svo} % #1:function name #2: variant list
+{
+ \IfBooleanTF{#1}
+ {
+ \IfNoValueTF{#3}
+ {
+ \begin{tcolorbox}[width=\textwidth,left=1mm,right=1mm,top=1mm,bottom=1mm,sharp~corners,colback=white,boxrule=.5pt,colback=lime!30]
+ \texttt{Function}\hskip -2pt \Triangle\hskip -3pt \texttt{#2}\hfill \examplelabel*
+ \end{tcolorbox}
+ }
+ {
+ \clist_gset:Nn \l_function_variant_list {#3}
+ \begin{tcolorbox}[width=\textwidth,left=1mm,right=1mm,top=1mm,bottom=1mm,sharp~corners,colback=white,boxrule=.5pt,colback=lime!30]
+ \texttt{Function}\hskip -2pt \Triangle\hskip -3pt \texttt{#2\textcolor{gray}{(\clist_use:Nn \l_function_variant_list{|})}} \hfill \examplelabel*
+ \end{tcolorbox}
+ }
+ }
+ {
+ \IfNoValueTF{#3}
+ {
+ \def\functionn{
+ \texttt{#2}
+ }
+ }
+ {
+ \clist_gset:Nn \l_function_variant_list {#3}
+ \def\functionn{
+ \texttt{
+ #2
+ \textcolor{gray}{(\clist_use:Nn \l_function_variant_list{|})}
+ }
+ }
+ }
+ }
+
+}
+\NewDocumentCommand{\examplelabel}{s}
+{
+ \IfBooleanTF{#1}{
+ \raisebox{-0.5ex}{
+ \tikz{
+ \node[ball~color=purple,circle,outer~sep=0pt,scale=0.5] {\phantom{2}};
+ }}
+ }{
+ \raisebox{-0.5ex}{
+ \tikz{
+ \node[ball~color=cyan,circle,outer~sep=0pt,scale=0.5,font=\bfseries] {\theexample};
+ }}
+ }
+}
+\ExplSyntaxOff
+\def\Triangle{ % triangle icon
+ \raisebox{-0.3ex}{
+ \tikz{
+ \fill[scale=2,outer sep=0pt] (240:0.5ex) -- (0:0.5ex) -- (120:0.5ex);
+ }
+}}
+\newcounter{example}
+\tcbset{
+ example style/.style={
+ sharp corners,
+ colback=white,
+ boxrule=.5pt,
+ breakable,
+ left=1mm,right=1mm,top=1mm,bottom=1mm,
+ fonttitle=\bfseries,
+ colbacktitle=lime!30,
+ coltitle=black,
+ % title={MagicWatermark},
+ listing only
+ }
+}
+
+\newtcblisting[use counter=example]{example}[1][]{
+ listing options={
+ style=tcblatex,
+ tabsize = 1,
+ language={[LaTeX]TeX},
+ classoffset=0,
+ morekeywords = {MagicWatermark, foreach, includegraphics},
+ keywordstyle={\color[RGB]{178,34,34}\bfseries},
+ commentstyle={\color[RGB]{102,205,170}\itshape},
+ classoffset=1,
+ morekeywords = {setup, pages, content, is, append, style},
+ keywordstyle=\color{cyan!50!green}\bfseries,
+ },
+ example style,
+ #1
+ }
+
+
+\MagicWatermark{
+ setup = {
+ pages = {*},
+ content = {P-\thepage},
+ style = {shift = {(.5\textwidth, .5\textheight + \headheight + \headsep)}, scale = 3, text = cyan, font = \ttfamily}
+ },
+ setup = {
+ pages = {even},
+ style = {scale = 5, text = pink},
+ content = {Watermark},
+ is append
+ },
+ setup = {
+ pages = {1},
+ style = {text width = 1.7\paperwidth, rotate = 45, align = left, font = \Large\linespread{1}\selectfont, opacity = .1},
+ content = {
+ \foreach \x in {0, ..., 500} {Magic Watermark }
+ },
+ is append
+ }
+}
+
+
+\def\opt#1{\textcolor{magenta}{\texttt{#1}}}
+\def\para#1{\textcolor[rgb]{0.13, 0.67, 0.8}{\texttt{#1}}}
+
+\usepackage[hidelinks]{hyperref}
+\begin{document}
+
+
+\vspace*{\fill}
+\begin{center}
+ {\Huge \textcolor{teal}{\texttt{magicwatermark}} å®åŒ…\footnote{\url{https://github.com/ljguo1020/magicwatermark}}} \\[.5cm]
+ {\Large 郭æŽå†›<ljguo1020@gmail.com>} \\[.5cm]
+ {\Large V1.2A}\\[1cm]
+\begin{example}[]
+\MagicWatermark{
+ setup = {
+ pages = {*},
+ content = {P-\thepage},
+ style = {shift = {(.5\textwidth, .5\textheight + \headheight + \headsep)}, scale = 3, text = cyan, font = \ttfamily}
+ },
+ setup = {
+ pages = {even},
+ style = {scale = 5, text = pink},
+ content = {Watermark},
+ is append
+ },
+ setup = {
+ pages = {1},
+ style = {text width = 1.7\paperwidth, rotate = 45, align = left, font = \Large, opacity = .1},
+ content = {
+ \foreach \x in {0, ..., 500} {Magic Watermark }
+ },
+ is append
+ }
+}
+\end{example}
+\end{center}
+
+\vspace*{\fill}
+
+\newpage
+
+
+\linespread{1.3}\selectfont
+\tableofcontents
+
+\section{介ç»}
+
+\pkgname{} 是一个全新的水å°å®åŒ…, 在 2022 å¹´ 6 月 17 æ—¥å‘布了第一版, 本次更新并ä¸æ˜¯åŸºäºŽç¬¬ä¸€ç‰ˆ, 而是进行了é‡æž„.
+
+\pkgname{} 基于 \texttt{tikz} å’Œ \texttt{expl3}, å¯ä»¥çµæ´»çš„设置背景或水å°.
+
+\section{使用}
+\pkgname{} 的使用, 相比于其它åŒç±»åŠŸèƒ½çš„包æ¥è¯´, å¯ä»¥è¯´æ˜¯æ˜“用性最高的, 它åªæ供了一个命令 \verb|\MagicWatermark|, 命令å‚数由多个 \opt{setup} 规则组æˆ.
+\begin{example}[]
+\MagicWatermark{
+ setup = {},
+ setup = {},
+ ...
+}
+\end{example}
+
+\opt{setup} 内部接å—四个键值选项, 用于é…置水å°çš„表现形å¼.
+
+\subsection{pages}
+\opt{pages} 接å—一个逗å·åˆ†å‰²åˆ—表, 用于é…置水å°ä½œç”¨èŒƒå›´, 例如 \verb|pages = {2, 4, 5, 8-10}|, 表示选中页ç ä¸ºç¬¬ 2, 4, 5, 8, 9, 10 这些页é¢.
+
+\opt{pages} å…±æŽ¥å— 4 ç§é…置规则,
+\begin{itemize}
+ \item \para{*}, 表示所有页é¢;
+ \item \para{odd} å’Œ \para{oven}, 表示奇å¶é¡µ;
+ \item 范围, 形如 \para{3-5}, \para{12-ii};
+ \item 表达å¼, 形如 \para{2X+1}, \para{2X\^{}2+X+1}, 但是å˜é‡å¿…须为 \para{X}.
+\end{itemize}
+
+这里å‡å®šé¡µé¢æ€»é¡µæ•°ä¸º 24 页,
+\begin{example}[title = pages é…置规则]
+pages = {*} => 1, 2, 3, ..., 24
+pages = {odd} => 1, 3, 5, ..., 23
+pages = {1, 3, 5-10} => 1, 3, 5, 6, 7, ..., 10
+pages = {1-5, 8, 20-ii} => 1, 2, ..., 5, 8, 20, 21, ..., 23
+pages = {3X + 1} => 1, 4, 7, 10, ..., 22
+\end{example}
+
+\subsection{tikz}
+\opt{tikz} 用于设置是å¦å°†æ°´å°å†…容放置在 \texttt{tikz} çš„ \texttt{node} 中, è§ä¸‹æ–‡, å¯é€‰å€¼ä¸º \para{true} å’Œ \para{false}, 默认为 \para{true}. 当你需è¦ä½¿ç”¨ \opt{tikz} æ—¶, 需è¦æ‰‹åŠ¨åŠ è½½ \texttt{tikz} å®åŒ….
+
+\subsection{content}
+\opt{content} 用æ¥è®¾ç½®æ°´å°çš„内容, 当 \opt{tikz} 被å¯ç”¨æ—¶, 它被放在了 \texttt{tikz} çš„ \texttt{node} 中, 为此, 想è¦çµæ´»çš„设置它, 您需è¦å¯¹ \texttt{node} 有一些了解.
+
+\subsection{style}
+\opt{style} 用于设置容纳水å°å†…容的 \texttt{node} çš„æ ·å¼, 默认为 \para{inner~sep = 0pt, outer~sep = 0pt, opacity = .5, align = left}, 当 \opt{tikz} 被ç¦ç”¨æ—¶, 它会被忽略.
+
+\subsection{is append}
+\opt{is append} 用于设置是å¦è¦†ç›–当å‰é¡µå·²æœ‰çš„æ°´å°, å¯é€‰å€¼ä¸º \para{true} å’Œ \para{false}, 默认为 \para{false}.
+
+\section{使用案例}
+\begin{example}[title = 为所有页é¢å³ä¸Šè§’添加页ç ]
+% \usepackage{tikz}
+\MagicWatermark{
+ setup = {
+ pages = {*},
+ content = {P-\thepage},
+ style = {shift = {(.5\textwidth, .5\textheight + \headheight + \headsep)}, scale = 3, text = cyan, font = \ttfamily}
+ }
+}
+\end{example}
+
+\begin{example}[title = 为å¶æ•°é¡µé¡µé¢ä¸­å¿ƒæ·»åŠ æ–‡å­— Watermark]
+% \usepackage{tikz}
+\MagicWatermark{
+ setup = {
+ pages = {even},
+ style = {scale = 5, text = pink},
+ content = {Watermark},
+ is append
+ }
+}
+\end{example}
+
+\begin{example}[title = 为第二页到最åŽä¸€é¡µè®¾ç½®é“ºæ»¡æ•´ä¸ªé¡µé¢çš„文字]
+% \usepackage{tikz}
+\MagicWatermark{
+ setup = {
+ pages = {2-i},
+ style = {text width = 1.7\paperwidth, rotate = 45, align = left, font = \Large, opacity = .1},
+ content = {
+ \foreach \x in {0, ..., 500} {Magic Watermark }
+ },
+ is append
+ }
+}
+\end{example}
+
+\begin{example}[title = 为奇å¶é¡µè®¾ç½®ä¸åŒæ°´å°]
+% \usepackage{tikz}
+\MagicWatermark{
+ setup = {
+ pages = {even},
+ style = {scale = 8, rotate = 45, text=red, align = center,font = \linespread{2}\selectfont},
+ content = {
+ Even MagicWatermark\\
+ Even MagicWatermark\\
+ Even MagicWatermark\\
+ Even MagicWatermark
+ }
+ },
+ setup = {
+ pages = {odd},
+ style = {scale = 6, rotate = -45, text = cyan, text width = 1.7\paperwidth, font = \linespread{1.5}\selectfont, align = center},
+ content = {
+ \foreach \x in {0,...,5}{
+ Odd MagicWatermark
+ }
+ }
+ }
+}
+\end{example}
+
+\begin{example}[title = 设置图片为水å°]
+% \usepackage{tikz}
+\MagicWatermark{
+ setup = {
+ pages = {even},
+ style = {opacity = 0.3},
+ content = {
+ \includegraphics{example-image-a}
+ }
+ },
+ setup = {
+ pages = {odd},
+ style = {opacity = .3, rotate=45, text width = 3\paperwidth},
+ content = {
+ \foreach \x in {0, ..., 20}{
+ \foreach \y in {1, 2, 3} {
+ \includegraphics{example-image-b}
+ } \\
+ }
+ }
+ }
+}
+\end{example}
+
+\begin{example}[title = ç¦ç”¨ tikz]
+\def\addhead#1#2{%
+ \expandafter\gdef\csname head@content@#1\endcsname{#2}%
+}
+
+\def\printhead#1{%
+ \csname head@content@#1\endcsname%
+}
+
+\addhead{2}{The only way to do great work is to love what you do.}
+\addhead{3}{Success is not final, failure is not fatal: It is the courage to continue that counts.}
+\addhead{4}{In the end, we will remember not the words of our enemies, but the silence of our friends.}
+\addhead{5}{It does not matter how slowly you go as long as you do not stop.}
+
+\NewDocumentCommand{\mywatermark}{}{%
+ \begin{tikzpicture}[remember picture, overlay]
+ \node[yshift = -\headheight - \headsep, text = teal, font = \large] at (current page.north) {\printhead{\thepage}};
+ \end{tikzpicture}
+}
+
+\MagicWatermark{
+ setup = {
+ pages = {2-5},
+ tikz = false,
+ content = \mywatermark
+ }
+}
+\end{example}
+
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/mailing/CATALOG b/Master/texmf-dist/doc/latex/mailing/CATALOG
new file mode 100644
index 00000000000..bfc37ff238b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/mailing/CATALOG
@@ -0,0 +1,15 @@
+Name: mailing
+Problems-To: texniek at texniek.nl
+Author: J.L. Braams
+Version: 1.0c
+
+Description:
+
+The mailing package implements support for producing letters to
+multiple people.
+
+Keywords: latex mailing
+
+Address:
+TeXniek
+The Netherlands
diff --git a/Master/texmf-dist/doc/latex/mailing/manifest.txt b/Master/texmf-dist/doc/latex/mailing/MANIFEST
index b0653434c7f..b93e68a619f 100644
--- a/Master/texmf-dist/doc/latex/mailing/manifest.txt
+++ b/Master/texmf-dist/doc/latex/mailing/MANIFEST
@@ -2,11 +2,11 @@
% CONTENTS OF THE MAILING PACKAGE
% ===============================
%
-% manifest.txt -- This file
+% MANIFEST -- This file
%
% mailing.dtx -- A package to produce a `mailing' ie a large number
% of letters with (almost) identical text.
-% mailing.pdf -- The `printed´ version of mailing.dtx
+% mailing.pdf -- The `printed´ version of mailing.dtx
%
% Installation script for the various parts:
% -------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/mailing/README b/Master/texmf-dist/doc/latex/mailing/README
new file mode 100644
index 00000000000..6dccf798b90
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/mailing/README
@@ -0,0 +1,14 @@
+ mailing bundle
+
+ July 2024, 2024
+
+This bundle contains a package that provides functionality to
+produce multiple letters with the same text to different addressses.
+It provides three commands \addressfile, \mailingtext and \makemailing.
+
+Copyright (C) 2024 Johannes L. Braams texniek(at)texniek.nl
+
+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; either
+version 1.3c of the License, or any later version.
diff --git a/Master/texmf-dist/doc/latex/mailing/mailing.pdf b/Master/texmf-dist/doc/latex/mailing/mailing.pdf
index 1625f90e04e..109c5c3de06 100644
--- a/Master/texmf-dist/doc/latex/mailing/mailing.pdf
+++ b/Master/texmf-dist/doc/latex/mailing/mailing.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mathastext/ChangeLog.md b/Master/texmf-dist/doc/latex/mathastext/ChangeLog.md
index 30f4113e968..8e2c1387e84 100644
--- a/Master/texmf-dist/doc/latex/mathastext/ChangeLog.md
+++ b/Master/texmf-dist/doc/latex/mathastext/ChangeLog.md
@@ -1,6 +1,98 @@
MATHASTEXT CHANGE LOG
=====================
+1.4b \[2024/07/27\]
+----
+
+* Fix a regression at `1.4` regarding option `nodigits`.
+
+* New option: `noletters`. I am in old age now so I can provide an option
+ completely antithetical to my life work.
+
+* Option `everymath` which is destined to be removed at next major
+ release warns user about it. As major releases tend to happen once
+ per decade I think the constant nagging will become insufferable
+ and you will adapt to the `1.4` changes rather than persisting into
+ using this option.
+
+1.4a \[2024/07/20\]
+----
+
+* There was a documentation glitch in 1.4 and also a problem with the
+ `\MTprimeskip` feature being lost under the emergency fall-back
+ `everymath` option.
+
+1.4 \[2024/07/20\]
+---
+
+* Since 1.2 of 2012/12/20, mathastext has used mathematically active
+ characters to propose certain advanced functionalities. For reasons half
+ lost in the mists of time but whose main one was surely to keep the
+ meaning of the active shape of characters unchanged outside of math mode,
+ this mathematical activation, and (in most cases) the definitions of what
+ active characters do, were done again at *each* entrance into math mode.
+ At this 1.4 release, mathastext does not inject *any* code whatsoever into
+ the `\everymath` and `\everydisplay` toks registers anymore (except for
+ one font-related hack needed under LuaLaTeX, see below). Your documents
+ will compile a tiny bit faster.
+
+* In (unsual) documents where users play with catcodes and mathcodes it is
+ impossible to keep exact backward compatibility, because documented user
+ commands which acted formerly a toggles with delayed action now will enact
+ changes immediately if in the document body. In practice consequences are
+ expected to be few, because catcode active characters are (as was already
+ the case with earlier releases) hacked only when they are Babel shorthands
+ and they are then modified in a way altering only their action in math
+ mode. The precise description of what mathastext does when mathematically
+ activating (or not) a character, depending on circumstances, is to be
+ found among small-print comments in the section "Extended scope of the
+ math alphabets commands". See also the documentation of the
+ `\MTmathactiveletters` command for some specifics regarding ascii letters.
+
+* New option: `everymath`. It instructs mathastext to revert (partially)
+ to its legacy code which uses `\everymath/\everydisplay`. This reversal
+ is partial, the handling of ascii letters not being included into it. The
+ `everymath` option is there only to try as a quick fix in case transition
+ to this release causes a major problem in a user document and time is
+ lacking to investigate. Please report to the author such issues. Option
+ `everymath` is destined to be removed at next major release.
+
+* New option: `activedigits`. Enjoy.
+
+* It is now easier to hook into the mathastext architecture for
+ mathematically activated ascii letters. See the new section "Hacking
+ letters (and even digits) for special tasks".
+
+* Bugfix: do not override special behavior of the math mode dot in
+ babel-spanish.
+
+* Bugfix: A desperate hack related to LuaLaTeX font matters and dating
+ back to 1.3o 2016/05/03 had been for some years in dire need of an update
+ regarding fonts using `Renderer=HarfBuzz`. This is done now. Thanks to
+ tex.sx `user691586` for report. This is currently the sole remaining
+ usage of `\everymath/\everydisplay`.
+
+* Bugfix: an optional feature related to `\{` and `\}` was broken since an
+ upstream LaTeX change at its 2020-02-02 release.
+
+* With option symbolmisc, those math symbol macros formerly defined via
+ `\DeclareRobustCommand` are now declared via `\protected\def`.
+
+* Removal of legacy branches previously kept to support LaTeX earlier than
+ 2020-02-02.
+
+* Removal of support for EU1 and EU2 font encodings.
+
+* Option `noasterisk` deprecated at 1.2d 2013/01/02 has (finally) been removed.
+
+* Four test files previously included and auto-extracted from the
+ distributed dtx have been dropped. One of them is still available
+ on the package homepage.
+
+* Some parts of the documentation have been massively re-ordered and even to some
+ extent improved. But there may be some occasions where obsolete statements will
+ be found having the legacy `\everymath/\everydisplay` situation as background.
+
1.3zb \[2023/12/29\]
-----
@@ -156,7 +248,7 @@ been pushed to CTAN, hence the version increase to 1.3y)
to some other (robust) math alphabet macros, but were not
robust in the strict sense. This does cause some issues for
moving arguments in the context of multiple math versions,
- hence it was a bug. The special behaviour of the math
+ hence it was a bug. The special behavior of the math
alphabet commands (they redefine themselves and other macros
on first use) makes is somewhat problematic for mathastext
to keep them updated across math versions and at the same
@@ -400,16 +492,14 @@ been pushed to CTAN, hence the version increase to 1.3y)
* bugfix: under option nosmalldelims, `\lbrace` and `\rbrace` were
redefined as math symbols and could not be used as delimiters.
-1.3d \[2015/02/26\]
+1.3d \[2014/05/23\]
----
-* the documentation mentions the improved compatibility of mathastext
+* A 2015/02/26 edit to the documentation mentions the
+ improved compatibility of mathastext
with the latest (3.34) beamer release: no more need for
`\usefonttheme{professionalfonts}`.
-1.3d \[2014/05/23\]
-----
-
* new commands `\MTstandardgreek` and `\MTcustomgreek`.
* The Greek letters, in case of use of one of the package related
@@ -540,6 +630,8 @@ use of mathematically active characters in versions 1.2 and 1.2b.
mechanism of letting non-letter symbols obey the math alphabet
commands.
+* the `noasterisk` option is deprecated and made a no-op.
+
* documentation extended and improved.
1.2c \[2012/12/31\]
@@ -684,6 +776,11 @@ use of mathematically active characters in versions 1.2 and 1.2b.
complete manner to adapt the math configuration to fonts
provided with no math support.
+1.13d
+----
+
+* new macros `\MTstandardgreek` and `\MTcustomgreek`
+
1.13b
----
diff --git a/Master/texmf-dist/doc/latex/mathastext/README.md b/Master/texmf-dist/doc/latex/mathastext/README.md
index 44b778b7288..f2c55cf1490 100644
--- a/Master/texmf-dist/doc/latex/mathastext/README.md
+++ b/Master/texmf-dist/doc/latex/mathastext/README.md
@@ -8,13 +8,13 @@
+-------------------------------------------+
This Work may be distributed and/or modified under the conditions
-of the [LPPL1.3c](http://www.latex-project.org/lppl/lppl-1-3c.txt)
+of the [LPPL 1.3c](https://www.latex-project.org/lppl/lppl-1-3c.txt)
The Author of this Work is Jean-Francois Burnol (`jfbu at free dot fr`)
-Copyright (C) 2011-2019, 2022, 2023 Jean-Francois Burnol
+Copyright (C) 2011-2019, 2022-2024 Jean-Francois Burnol
- Source: mathastext.dtx 1.3zb 2023/12/29
+ Source: mathastext.dtx 1.4b 2024/07/27
DESCRIPTION
@@ -82,6 +82,98 @@ Main options: `italic`, `frenchmath`, `subdued`, `LGRgreek`.
RECENT CHANGES
==============
+1.4b \[2024/07/27\]
+----
+
+* Fix a regression at `1.4` regarding option `nodigits`.
+
+* New option: `noletters`. I am in old age now so I can provide an option
+ completely antithetical to my life work.
+
+* Option `everymath` which is destined to be removed at next major
+ release warns user about it. As major releases tend to happen once
+ per decade I think the constant nagging will become insufferable
+ and you will adapt to the `1.4` changes rather than persisting into
+ using this option.
+
+1.4a \[2024/07/20\]
+----
+
+* There was a documentation glitch in 1.4 and also a problem with the
+ `\MTprimeskip` feature being lost under the emergency fall-back
+ `everymath` option.
+
+1.4 \[2024/07/20\]
+---
+
+* Since 1.2 of 2012/12/20, mathastext has used mathematically active
+ characters to propose certain advanced functionalities. For reasons half
+ lost in the mists of time but whose main one was surely to keep the
+ meaning of the active shape of characters unchanged outside of math mode,
+ this mathematical activation, and (in most cases) the definitions of what
+ active characters do, were done again at *each* entrance into math mode.
+ At this 1.4 release, mathastext does not inject *any* code whatsoever into
+ the `\everymath` and `\everydisplay` toks registers anymore (except for
+ one font-related hack needed under LuaLaTeX, see below). Your documents
+ will compile a tiny bit faster.
+
+* In (unsual) documents where users play with catcodes and mathcodes it is
+ impossible to keep exact backward compatibility, because documented user
+ commands which acted formerly a toggles with delayed action now will enact
+ changes immediately if in the document body. In practice consequences are
+ expected to be few, because catcode active characters are (as was already
+ the case with earlier releases) hacked only when they are Babel shorthands
+ and they are then modified in a way altering only their action in math
+ mode. The precise description of what mathastext does when mathematically
+ activating (or not) a character, depending on circumstances, is to be
+ found among small-print comments in the section "Extended scope of the
+ math alphabets commands". See also the documentation of the
+ `\MTmathactiveletters` command for some specifics regarding ascii letters.
+
+* New option: `everymath`. It instructs mathastext to revert (partially)
+ to its legacy code which uses `\everymath/\everydisplay`. This reversal
+ is partial, the handling of ascii letters not being included into it. The
+ `everymath` option is there only to try as a quick fix in case transition
+ to this release causes a major problem in a user document and time is
+ lacking to investigate. Please report to the author such issues. Option
+ `everymath` is destined to be removed at next major release.
+
+* New option: `activedigits`. Enjoy.
+
+* It is now easier to hook into the mathastext architecture for
+ mathematically activated ascii letters. See the new section "Hacking
+ letters (and even digits) for special tasks".
+
+* Bugfix: do not override special behavior of the math mode dot in
+ babel-spanish.
+
+* Bugfix: A desperate hack related to LuaLaTeX font matters and dating
+ back to 1.3o 2016/05/03 had been for some years in dire need of an update
+ regarding fonts using `Renderer=HarfBuzz`. This is done now. Thanks to
+ tex.sx `user691586` for report. This is currently the sole remaining
+ usage of `\everymath/\everydisplay`.
+
+* Bugfix: an optional feature related to `\{` and `\}` was broken since an
+ upstream LaTeX change at its 2020-02-02 release.
+
+* With option symbolmisc, those math symbol macros formerly defined via
+ `\DeclareRobustCommand` are now declared via `\protected\def`.
+
+* Removal of legacy branches previously kept to support LaTeX earlier than
+ 2020-02-02.
+
+* Removal of support for EU1 and EU2 font encodings.
+
+* Option `noasterisk` deprecated at 1.2d 2013/01/02 has (finally) been removed.
+
+* Four test files previously included and auto-extracted from the
+ distributed dtx have been dropped. One of them is still available
+ on the package homepage.
+
+* Some parts of the documentation have been massively re-ordered and even to some
+ extent improved. But there may be some occasions where obsolete statements will
+ be found having the legacy `\everymath/\everydisplay` situation as background.
+
1.3zb \[2023/12/29\]
-----
@@ -133,63 +225,3 @@ RECENT CHANGES
* Fix long-standing hyperlink problems in the documentation:
blue color words should now all be functioning hyperlinks.
-1.3z \[2023/09/01\]
-----
-
-Fix 1.3y regression which broke `selfGreek` option due to internal
-renamings. Thanks to Stephan Korell for report.
-
-1.3y \[2022/11/04\]
-----
-
-(the 1.3x had an annoying documentation bug, and had already
-been pushed to CTAN, hence the version increase to 1.3y)
-
-* mathastext now requires the `\expanded` primitive (which is
- available with all major engines since TeXLive 2019).
-
-* Revisit parts of the documentation (mainly
- the Examples, and the section on Greek letters) and shuffle
- the other parts to surely improve things. Mention
- the [mathfont](https://ctan.org/pkg/mathfont)
- and [frenchmath](https://ctan.org/pkg/frenchmath) packages.
-
-* Add the `ncccomma` option which loads the
- [ncccomma](https://ctan.org/pkg/ncccomma)
- package to allow the comma as decimal separator.
-
-* Add the `binarysemicolon` option to let the semi-colon
- be of type `\mathbin`, not `\mathpunct`.
-
-* Add the `frenchmath*` option which does all three of
- `frenchmath`, `ncccomma` and `binarysemicolon`.
-
-* Under the `LGRgreek` and `LGRgreeks` options only:
-
- - make available upright and italic Greek letters in math mode
- via `\alphaup`, `\alphait`, ... control sequences, in
- addition to those not using such postfixed-names.
-
- - add `\mathgreekup` and `\mathgreekit` math alphabets.
-
- - add `\MTgreekupdefault` and `\MTgreekitdefault`. The former
- replaces `\updefault` which was used in some places and since
- LaTeX 2020-02-02 caused systematic Font Warnings about the
- substitution of `up` by `n`.
-
- These new features required an extensive internal refactoring
- which is expected to not induce changes to most existing
- documents. But it may induce changes to those using some
- unusual configuration in the preamble, as made possible via the
- package macros; this can apply only to documents authored by
- those few people who actually read the documentation. For full
- details make sure to read the PDF documentation about this
- change.
-
-* Fix "`\Digamma` under `LGRgreek` option uses the shape for
- lowercase not uppercase Greek".
-
-* Fix some incongruities in log messages related to Greek
- letters and emitted during math version creation in the
- preamble.
-
diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastext.pdf b/Master/texmf-dist/doc/latex/mathastext/mathastext.pdf
index 6e952274102..635b6149fb7 100644
--- a/Master/texmf-dist/doc/latex/mathastext/mathastext.pdf
+++ b/Master/texmf-dist/doc/latex/mathastext/mathastext.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastext.tex b/Master/texmf-dist/doc/latex/mathastext/mathastext.tex
index 8ba1503a8a3..8fd899e4bc1 100644
--- a/Master/texmf-dist/doc/latex/mathastext/mathastext.tex
+++ b/Master/texmf-dist/doc/latex/mathastext/mathastext.tex
@@ -1,12 +1,12 @@
-\def\MSTpkgdate {2023/12/29}
-\def\MSTpkgversion {1.3zb}
+\def\MSTpkgdate {2024/07/27}
+\def\MSTpkgversion {1.4b}
%%----------------------------------------------------------------
%% Package: mathastext
%% Info: Use the text font in math mode (JFB)
-%% Version: 1.3zb 2023/12/29
+%% Version: 1.4b 2024/07/27
%% License: LPPL 1.3c (http://www.latex-project.org/lppl/lppl-1-3c.txt)
-%% Copyright (C) 2011-2019, 2022, 2023 Jean-Francois Burnol
-%% <jfbu at free dot fr>
+%% Copyright (C) 2011-2019, 2022-2024 Jean-Francois Burnol
+%% <jfbu at free dot fr>
%% Examples of use of mathastext:
%% http://jf.burnol.free.fr/mathastext.html
%% http://jf.burnol.free.fr/showcase.html
diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.tex b/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.tex
deleted file mode 100644
index e31202c079a..00000000000
--- a/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.tex
+++ /dev/null
@@ -1,265 +0,0 @@
-\def\testfileincipit{Test file to accompany \texttt{mathastext}
-version \texttt{1.3zb} of \texttt{2023/12/29}}
-%%----------------------------------------------------------------
-%% Package: mathastext
-%% Info: Use the text font in math mode (JFB)
-%% Version: 1.3zb 2023/12/29
-%% License: LPPL 1.3c (http://www.latex-project.org/lppl/lppl-1-3c.txt)
-%% Copyright (C) 2011-2019, 2022, 2023 Jean-Francois Burnol
-%% <jfbu at free dot fr>
-%% Examples of use of mathastext:
-%% http://jf.burnol.free.fr/mathastext.html
-%% http://jf.burnol.free.fr/showcase.html
-%%----------------------------------------------------------------
-%% This file `mathastexttestalphabets.tex' is for testing the extended
-%% scope of the math alphabet commands with package `mathastext', via
-%% the package command \MTnonlettersobeymathxx.
-%%
-%% Compile either with latex, pdflatex, lualatex (pdf output) or xelatex.
-%%
-%% See `mathastext.dtx' for the copyright and conditions of distribution or
-%% modification.
-%%
-\documentclass{article}
-\usepackage[hscale=0.66, vscale=0.72]{geometry}
-\usepackage{amsmath}
-\usepackage{mathtools}\mathtoolsset{centercolon}
-%% WARNING THIS IS INCOMPATIBLE WITH BABEL+FRENCHB
-%% BUT WITH MATHASTEXT LOADED THIS IS CORRECTED
-%% *IF* \MTnonlettersobeymathxx IS MADE USE OF.
-\usepackage{iftex}
-\ifXeTeX
-\expandafter\def\expandafter\testfileincipit\expandafter
- {\testfileincipit\ (compiled with \XeLaTeX)}
-\usepackage[no-math]{fontspec}
-\setmainfont[ExternalLocation,
- Mapping=tex-text,
- BoldFont=texgyretermes-bold,
- ItalicFont=texgyretermes-italic,
- BoldItalicFont=texgyretermes-bolditalic]{texgyretermes-regular}
-\setmonofont[ExternalLocation,
- Mapping=tex-text]{texgyrecursor-regular}
-\setsansfont[ExternalLocation,
- Mapping=tex-text]{texgyreheros-regular}
-\else
-\ifLuaTeX % for pdf output
-\expandafter\def\expandafter\testfileincipit\expandafter
- {\testfileincipit\ (compiled with \LuaLaTeX)}
-\usepackage[no-math]{fontspec}
-\setmainfont[Ligatures=TeX]{TeX Gyre Termes}
-\setmonofont[Ligatures=TeX]{TeX Gyre Cursor}
-\setsansfont[Ligatures=TeX]{TeX Gyre Heros}
-\else
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{tgtermes}
-\usepackage{tgcursor}
-\usepackage{tgheros}
-\fi\fi
-\usepackage{metalogo} % must be loaded /after/ [no-math]fontspec
-\usepackage[french]{babel}
-\usepackage[italic,asterisk]{mathastext}
-\MTlettershape{n}\Mathastext[upright]
-\MTnonlettersobeymathxx
-\MTexplicitbracesobeymathxx
-\delimitershortfall-1pt
-\usepackage{color}
-\begin{document}
-\testfileincipit
-
-\begin{center}
- \bfseries Two features of \texttt{mathastext}:\\
-extended scope of the math alphabets and added italic corrections\par
-\end{center}
-
-The package makes
-${!}\,{?}\,{,}\,{:}\,{;}\,{+}\,{-}\,{=}\,{(}\,{)}\,{[}\,{]}\,{<}\,{>}\,{\{}\,{\}}$,
-the asterisk $*$, and $.\,/\,\vert\,\backslash\,{\#}\,{\$}\,{\%}\,{\&}$ obey the
-math alphabet commands (this is the maximal list, some characters may have been
-excluded by the corresponding package options). For the characters listed first
-the mechanism involves a `mathematical activation'.
-
-As this process may create incompatibilities, it will be put into action
-for
-${!}\,{?}\,{,}\,{:}\,{;}\,{+}\,{-}\,{=}\,{(}\,{)}\,{[}\,{]}\,{<}\,{>}$
-only if the user makes use of the package command
-\verb|\MTnonlettersobeymathxx| (and the braces necessitate
-\verb|\MTexplicitbracesobeymathxx|).
-
-It could be that one such character has been made `active' in the entire
-document by some other package, typically a language definition file for the
-\verb|babel| system. Here for example we have used \verb|babel| with the
-\verb|french| option, which makes the high punctuation characters !?:; active
-throughout the document (extra spacing is put in front of the character when
-used in text; no change in math but perhaps for other languages and characters
-this could happen, it is up to the language definition file to decide).
-
-When \verb|mathastext| detects that a character it wants to `mathematically
-activate' is already `active', it does not go further except if it seems that
-the activation was done by Babel. If the activation was done by Babel, then
-\verb|mathastext| replaces the expansion of the active character in math mode by
-what is necessary to achieve its goal. It does not additionally mathematically
-activate the character; rather it makes sure that the character is \emph{not}
-mathematically active. In the present document the colon was made mathematically
-active by \verb|mathtools| but this was already canceled in the preamble by
-\verb|mathastext| as it was loaded later. And it is better so, because the
-combination \verb|babel| (with option \verb|frenchb|) +\verb|mathtools| (with
-\verb|centercolon|) makes \verb|$:$| create an infinite loop!
-
-But even if someone had mathematically activated the colon after the preamble,
-or after the loading of \verb|mathastext|, this would be canceled again
-automatically for each inline or displayed mathematical formula (if the user
-does \verb|\MTnonlettersobeymathxx|).
-
-The conclusion with \verb|\MTnonlettersobeymathxx| is: if some package has tried
-to make the character mathematically active, this will be overruled by
-\verb|mathastext|; if some package has made the character globally active, then
-the package wins except if it is Babel, as \verb|mathastext| may in the latter
-case safely modify the action in math mode (paying attention to the fact that
-the character should be usable in \verb|\label| and \verb|\ref| in and outside
-of math mode).
-
-The displayed equations next illustrate the extended scope of the math alphabets
-which now apply to $=$, $-$, $($, $)$, $[$, $]$ (but not to the large delimiters
-of course). Furthermore, for testing purposes the equations were labeled using
-such characters, for example the last one has label \verb|eq=7|, to check that
-the mathematical activation of $=$ does not cause problems with
-\verb|\label/\ref|.
-
-\def\testformula{\quad\Biggl\lbrace\biggl(\left(\left[[\sin(a) + \cos(b) - \log(c) =
-\sec(d)]\right]\right)\biggr)\Biggr\rbrace}
-\begin{equation}\testformula\label{eq:1}\end{equation}
-\begin{equation}\mathnormalbold{mathnormalbold:\testformula}\label{eq;2}\end{equation}
-\begin{equation}\mathrm{mathrm:\testformula}\label{eq?3}\end{equation}
-\begin{equation}\mathbf{mathbf:\testformula}\label{eq!4}\end{equation}
-\begin{equation}\mathit{mathit:\testformula}\label{eq(5}\end{equation}
-\begin{equation}\mathtt{mathtt:\testformula}\label{eq)6}\end{equation}
-\begin{equation}\mathsf{mathsf:\testformula}\label{eq=7}\end{equation}
-
-Equations above are numbered \ref{eq:1}, \ref{eq;2}, \ref{eq?3}, \ref{eq!4}, and
-$\ref{eq(5}$, $\ref{eq)6}$, and $\ref{eq=7}$.
-
-\def\testline#1{$#1$&$\mathnormalbold{#1}$&$\mathrm{#1}$&$\mathbf{#1}$&$\mathit{#1}$&$\mathtt{#1}$&$\mathsf{#1}$}
-
-\centerline{\begin{tabular}{ccccccc}
-\testline{a!b}\\
-\testline{a?b}\\
-\testline{a,b}\\
-\testline{a;b}\\
-\testline{a:b}\\
-\testline{a:=b}\\
-\testline{a\vcentcolon= b}\\
-\testline{a\colon b}\\
-\testline{a.b}\\
-\testline{a-b}\\
-\testline{a+b}\\
-\testline{a=b}\\
-\testline{a<b}\\
-\testline{a>b}\\
-\testline{<x,y>}\\
-\testline{\mathopen{<} x,y\mathclose{>}}\\
-\testline{\left< x,y\right>}\\
-\testline{a/b}\\
-\testline{a\backslash b}\\
-\testline{a\setminus b}\\
-\testline{a|b}\\
-\testline{a\mid b}\\
-\testline{(a,b)}\\
-\testline{[a,b]}\\
-\testline{\{a,b\}}
-\end{tabular}}
-
-The question mark has been made active by \verb|babel+frenchb|.
-\verb|mathastext| has imposed in math mode its ways (now \verb|$\mathbf{???}$|
-gives $\mathbf{???}$). As the extra spacing is added by \verb|frenchb| only in
-text, we had to use the math alphabet to check that indeed \verb|mathastext|
-overruled Babel.
-
-To double-check we will now make \string? mathematically active:
-\verb|\mathcode`?="8000|\mathcode`?="8000. This is a sure cause for disaster
-normally with Babel (don't do this at home without \verb|mathastext|!). But here
-with \verb|$?$| no bad surprise (infinite loop!) awaits us: just $?$.
-
-Let's take some other character, for example the opening parenthesis, and make
-it catcode active:
-\verb|\catcode`(=\active \def ({X}|.
-Let's try the input
-\verb|( and $($|.
-\begingroup
-\catcode`(=\active \gdef ({X}
-This gives ( and $($. We see that \verb|mathastext| does not attempt to modify
-the definition of the active character, as this activation was not done via the
-\verb|babel| services. \catcode`\(=12 \mathcode`(="8000 We now revert the
-parenthesis to catcode other (but maintain \verb|\def ({X}| as definition of its
-active version), and then make it mathematically active using the command
-\verb|\mathcode`(="8000|. If we try \verb|$((($| we see that the parenthesis is
-not converted into an $X$: $((($. The mathematically active character was
-overruled by \verb|mathastext|.
-
-Issuing \verb|\MTnonlettersdonotobeymathxx|\MTnonlettersdonotobeymathxx\ we do
-get the $X$'s from the input \verb|$((($|: $((($
-\endgroup
-This shows that \verb|mathastext| now does not modify in math mode the
-non-letter \verb|(|.
-
-\MTversion{upright}\MTnonlettersobeymathxx
-We defined in the preamble of the document a \verb|mathastext|-enhanced
-math version (named \verb|upright|) having the Latin letters upright in
-math mode. Let's switch to
-it: \newline
-\hbox to\linewidth{\hss\verb|\MTversion{upright}|\hss}
-
-With a font which is neither italic nor slanted, \verb|mathastext| automatically
-inserts italic corrections for better positioning of the subscript:
-\verb|$f_i^i$| gives
-$f_i^i$.
-After \verb|\MTnoicinmath| which turns off this feature\MTnoicinmath{}, the same
-input gives $f_i^i$, which is different.
-\footnote{last time I tried, this only worked with PDF\LaTeX{}, not with
- \LuaLaTeX{} or \XeTeX{}.}
-
-Again with italic corrections on (\verb|\MTicinmath|)\MTicinmath{}
-\verb|$f_{abc}^{def}$| gives $f_{abc}^{def}$, and here is another one:
-$f^{f_{abc}^{def}}_u$. Without italic corrections\MTnoicinmath: $f_{abc}^{def}$,
-and respectively $f^{f_{abc}^{def}}_u$.
-
-\MTicinmath
-
-\verb|mathastext| does not add these italic corrections inside arguments of
-math alphabets, as this would prevent the formation of ligatures:
-$\mathnormal{ff}$, $\mathrm{ff}$, $\mathit{ff}$, $\mathbf{ff}$, $\mathtt{ff}$
-(no ligature in teletype) and $\mathsf{ff}$.\footnote{\llap{\textcolor{magenta}{\bfseries Changed!\kern3em}}Prior to 1.3i,
- italic corrections were added to the \string\mathnormal\ arguments.}
-
-\centerline{\begin{tabular}{ccccccc}
-\testline{a!b}\\
-\testline{a?b}\\
-\testline{a,b}\\
-\testline{a;b}\\
-\testline{a:b}\\
-\testline{a:=b}\\
-\testline{a\vcentcolon= b}\\
-\testline{a\colon b}\\
-\testline{a.b}\\
-\testline{a-b}\\
-\testline{a+b}\\
-\testline{a=b}\\
-\testline{a<b}\\
-\testline{a>b}\\
-\testline{<x,y>}\\
-\testline{\mathopen{<} x,y\mathclose{>}}\\
-\testline{\left< x,y\right>}\\
-\testline{a/b}\\
-\testline{a\backslash b}\\
-\testline{a\setminus b}\\
-\testline{a|b}\\
-\testline{a\mid b}\\
-\testline{(a,b)}\\
-\testline{[a,b]}\\
-\testline{\{a,b\}}
-\end{tabular}}
-
-\end{document}
-\endinput
-%%
-%% End of file `mathastexttestalphabets.tex'.
diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastexttestmathversions.tex b/Master/texmf-dist/doc/latex/mathastext/mathastexttestmathversions.tex
deleted file mode 100644
index d5f4447d3ba..00000000000
--- a/Master/texmf-dist/doc/latex/mathastext/mathastexttestmathversions.tex
+++ /dev/null
@@ -1,43 +0,0 @@
-\def\testfileincipit{Test file to accompany \texttt{mathastext}
-version \texttt{1.3zb} of \texttt{2023/12/29}}
-%%----------------------------------------------------------------
-%% Package: mathastext
-%% Info: Use the text font in math mode (JFB)
-%% Version: 1.3zb 2023/12/29
-%% License: LPPL 1.3c (http://www.latex-project.org/lppl/lppl-1-3c.txt)
-%% Copyright (C) 2011-2019, 2022, 2023 Jean-Francois Burnol
-%% <jfbu at free dot fr>
-%% Examples of use of mathastext:
-%% http://jf.burnol.free.fr/mathastext.html
-%% http://jf.burnol.free.fr/showcase.html
-%%----------------------------------------------------------------
-%% This file `mathastexttestversions.tex' is for testing the enhanced
-%% concept of math versions provided by the package `mathastext'.
-%%
-%% See `mathastext.dtx' for the copyright and conditions of distribution or
-%% modification.
-%%
-\documentclass{article}
-\usepackage[T1]{fontenc}
-\usepackage{newcent}
-\usepackage[subdued]{mathastext}
-\Mathastext[newcent]
-\renewcommand\familydefault\ttdefault
-\Mathastext[courier]
-\renewcommand\familydefault\sfdefault
-\Mathastext[avantgarde]
-\renewcommand\familydefault\rmdefault
-\begin{document}
-\testfileincipit
-
-text in NewCentury and $math\ as\ in\ default$,%
-\MTversion{courier} text in Courier and $math\ in\ Courier$,%
-\MTversion{avantgarde} text in AvantGarde and $math\ in\ AvantGarde$,%
-\MTversion[newcent]{courier} text in NewCentury and $math\ in\
-Courier$,\MTversion{bold} text in bold NewCentury and $math\ as\ in\
-bold\ default$,\MTversion[courier]{avantgarde} text in Courier and
-$math\ in\ AvantGarde$.
-\end{document}
-\endinput
-%%
-%% End of file `mathastexttestmathversions.tex'.
diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodelinux.tex b/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodelinux.tex
deleted file mode 100644
index 3a22a6e0f2b..00000000000
--- a/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodelinux.tex
+++ /dev/null
@@ -1,120 +0,0 @@
-\def\testfileincipit{Test file to accompany \texttt{mathastext}
-version \texttt{1.3zb} of \texttt{2023/12/29}}
-%%----------------------------------------------------------------
-%% Package: mathastext
-%% Info: Use the text font in math mode (JFB)
-%% Version: 1.3zb 2023/12/29
-%% License: LPPL 1.3c (http://www.latex-project.org/lppl/lppl-1-3c.txt)
-%% Copyright (C) 2011-2019, 2022, 2023 Jean-Francois Burnol
-%% <jfbu at free dot fr>
-%% Examples of use of mathastext:
-%% http://jf.burnol.free.fr/mathastext.html
-%% http://jf.burnol.free.fr/showcase.html
-%%----------------------------------------------------------------
-%% This file `mathastexttestunicodelinux.tex' is for testing the use
-%% of the package `mathastext' with the unicode engines XeTeX or LuaLaTeX.
-%%
-%% Fonts which were available on a Linux machine are used. Beware that
-%% compilation with LuaLaTeX will abort with errors if specified fonts do not
-%% exist on your system.
-%%
-%% See `mathastext.dtx' for the copyright and conditions of distribution or
-%% modification.
-%%
-\documentclass{article}
-\usepackage[hscale=0.8]{geometry}
-\usepackage{multicol}
-\usepackage[no-math]{fontspec}
-\usepackage{lmodern}
-\usepackage{metalogo}
-\usepackage{iftex}
-\ifXeTeX
-\expandafter\def\expandafter\testfileincipit\expandafter
- {\testfileincipit\ (compiled with \XeLaTeX)}
-\else
-\ifLuaTeX
-\expandafter\def\expandafter\testfileincipit\expandafter
- {\testfileincipit\ (compiled with \LuaLaTeX)}
-\fi\fi
-\usepackage[subdued,italic,asterisk]{mathastext}
-\setmainfont[Color=999999]{Verdana} \Mathastext[Verdana]
-\setmainfont[Color=0000FF]{Arial} \Mathastext[Arial]
-\setmainfont[Color=00C000]{DejaVu Serif} \Mathastext[DejaVu]
-\setmainfont[Color=FF0000]{Andale Mono} \Mathastext[Andale]
-%% commented out as these fonts do not exist anymore on the Linux box
-%% I have access to (test last done 2016/01/15)
-%%\setmainfont[Color=C000C0]{URW Chancery L} \Mathastext[Chancery]
-%%\setmainfont[Color=800080]{URW Palladio L} \Mathastext[Palladio]
-\setmainfont[Color=808000]{Liberation Serif} \Mathastext[Liberation]
-\MTDeclareVersion{Times}{T1}{ptm}{m}{n}
-\begin{document}
-\MTversion{normal}
-\testfileincipit
-
-This test uses \verb|mathastext| with its \emph{italic}, \emph{asterisk}, and
-\emph{subdued} options. The base document fonts are the Latin Modern ones (in
-OpenType format). The other OpenType fonts were chosen from those available on
-a Linux machine. We also used the Times font in traditional \TeX\ font T1
-encoding, to demonstrate the removal since release \texttt{1.3u} of a former
-limitation that all math versions had to share the same font encoding, else
-some characters such as the dotless \texttt{i} ($\imath$), or the minus sign
-could well vanish from the output in the non-normal math versions.
-
-Furthermore we test (last line of each block, on the left) if the non-letter
-characters obey the math alphabet \verb|\mathbf|. In the normal and bold math
-versions, this feature is de-activated, as option \emph{subdued} was used; and
-if activated we should then use in these math versions the package
-\verb|\Mathbf| rather than \verb|\mathbf| which is there still the original
-one, which will use encoding \verb|OT1| in the normal and bold versions, as we
-loaded \verb|fontspec| with its option \emph{no-math}.
-
-Some among the fonts tested have no bold variant or no italic variant.
-
-Note: the two unicode engines \XeLaTeX\ and \LuaLaTeX\ give likely not fully
-identical results particularly for the math mode. At least this is what I
-observed regularly over the years with the variant of this file prepared for
-fonts available on Mac OS, which is my main system where I develop
-|\mathastext|. Lastly for example (TL2019, august 2019), \LuaLaTeX\ could not
-find the bold variant of some system font, but \XeLaTeX\ did. And the spacing
-for the letters of the Didot font was vastly different between the two
-engines.
-
-\newcommand\TEST[1]{\MTversion{#1}\def\tmpa{#1}%
- \def\tmpb{normal}\def\tmpc{bold}%
- \ifx\tmpa\tmpb\else\ifx\tmpa\tmpc\else \MTnonlettersobeymathxx
- \MTexplicitbracesobeymathxx\fi\fi
-\begin{multicols}{2}
-\hbox to\columnwidth{\hbox to\columnwidth{\hfil
- $abcdefghijklmnopqrstuvwxyz$\hfil}\kern-2.5em{#1}}
- \centerline{ $ABCDEFGHIJKLMNOPQRSTUVWXYZ$ }
- \centerline{ $0123456789$ }
- \centerline{ $!\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\backslash$ }
- \centerline{ $\mathbf{!\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\backslash}$ }
-\columnbreak
- \centerline{ abcdefghijklmnopqrstuvwxyz }
- \centerline{ ABCDEFGHIJKLMNOPQRSTUVWXYZ }
- \centerline{ 0123456789}
- \centerline{ !\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\char92 }
- \centerline{\bfseries !\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\char92 }
-\end{multicols}}
-\begin{multicols}{2}
- \centerline{\textbf{math mode}}
-\columnbreak
- \centerline{ \textbf{text} }
-\end{multicols}
-\TEST{DejaVu}
-\TEST{Verdana}
-\TEST{Andale}
-%%\TEST{Palladio}
-\TEST{Arial}
-%%\TEST{Chancery}
-\TEST{Liberation}
-\TEST{bold}\TEST{normal}\TEST{Times}
-\end{document}
-\endinput
-%%
-%% End of file `mathastexttestunicodelinux.tex'.
diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodemacos.tex b/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodemacos.tex
deleted file mode 100644
index ed6a3c2560e..00000000000
--- a/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodemacos.tex
+++ /dev/null
@@ -1,124 +0,0 @@
-\def\testfileincipit{Test file to accompany \texttt{mathastext}
-version \texttt{1.3zb} of \texttt{2023/12/29}}
-%%----------------------------------------------------------------
-%% Package: mathastext
-%% Info: Use the text font in math mode (JFB)
-%% Version: 1.3zb 2023/12/29
-%% License: LPPL 1.3c (http://www.latex-project.org/lppl/lppl-1-3c.txt)
-%% Copyright (C) 2011-2019, 2022, 2023 Jean-Francois Burnol
-%% <jfbu at free dot fr>
-%% Examples of use of mathastext:
-%% http://jf.burnol.free.fr/mathastext.html
-%% http://jf.burnol.free.fr/showcase.html
-%%----------------------------------------------------------------
-%% This file `mathastexttestunicodemacos.tex' is for testing the use
-%% of the package `mathastext' with the unicode engines XeTeX or LuaLaTeX.
-%%
-%% Mac OS X specific fonts are used (initially tested on 10.8.2).
-%%
-%% See `mathastext.dtx' for the copyright and conditions of distribution or
-%% modification.
-%%
-\documentclass{article}
-\usepackage[hscale=0.85]{geometry}
-\usepackage{multicol}
-\usepackage[no-math]{fontspec}
-\usepackage{lmodern}
-\usepackage{metalogo}
-\usepackage{iftex}
-\ifXeTeX
-\expandafter\def\expandafter\testfileincipit\expandafter
- {\testfileincipit\ (compiled with \XeLaTeX)}
-\else
-\ifLuaTeX
-\expandafter\def\expandafter\testfileincipit\expandafter
- {\testfileincipit\ (compiled with \LuaLaTeX)}
-\fi\fi
-\usepackage[subdued,italic,asterisk]{mathastext}
-\setmainfont[Color=FF0000]{Hoefler Text} \Mathastext[Hoefler]
-\setmainfont[Color=336633]{American Typewriter}\Mathastext[Typewriter]
-\setmainfont[Color=0000FF]{Herculanum} \Mathastext[Herculanum]
-\setmainfont[Color=FF00FF]{Didot} \Mathastext[Didot]
-\setmainfont[Color=999999]{Comic Sans MS} \Mathastext[Comic]
-\MTDeclareVersion{Times}{T1}{ptm}{m}{n}
-\begin{document}
-\MTversion{normal}
-\testfileincipit
-
-This test uses \verb|mathastext| with its \emph{italic}, \emph{asterisk}, and
-\emph{subdued} options. The base document fonts are the Latin Modern ones (in
-OpenType format). The other OpenType fonts were chosen from those available on
-a Mac OS machine. We also used the Times font in traditional \TeX\ font T1
-encoding, to demonstrate the removal since release \texttt{1.3u} of a former
-limitation that all math versions had to share the same font encoding, else
-some characters such as the dotless \texttt{i} ($\imath$), or the minus sign
-could well vanish from the output in the non-normal math versions.
-
-Furthermore we test (last line of each block, on the left) if the non-letter
-characters obey the math alphabet \verb|\mathbf|. In the normal and bold math
-versions, this feature is de-activated, as option \emph{subdued} was used; and
-if activated we should then use in these math versions the package
-\verb|\Mathbf| rather than \verb|\mathbf| which is there still the original
-one, which will use encoding \verb|OT1| in the normal and bold versions, as we
-loaded \verb|fontspec| with its option \emph{no-math}.
-
-Some among the fonts tested have no bold variant or no italic variant.
-
-Note (tested 2013/09/03): for some reason the \verb|Color| specifications in the
-\verb|\setmainfont| commands work only
-with \XeLaTeX{}, not with \LuaLaTeX{}; a few months back I had not noticed
-such a difference between the two engines.
-
-Update (tested 2016/01/15 with reasonably up-to-date TL2015): \verb|Color|
-spec in use of \verb|\setmainfont| command now functional again with
-\LuaLaTeX.
-
-Note (tested 2019/08/11, reasonably up-to-date TL2019): spacing with the Didot
-font differs widely between \XeLaTeX\ and \LuaLaTeX{} (perhaps related to
-italic corrections, see the package documentation), and also it seems
-\LuaLaTeX{} will not find (from our generic usage of the \verb|fontspec|
-interface, at least) bold variants of the Hoefler Text and American Typewriter
-fonts, contrarily to \XeLaTeX. Also, the \emph{italic} option remains
-seemingly without effect with \LuaLaTeX{} in the case of the Hoefler Text font
-(see the package source code comments on some problems with the two ``modes''
-for text fonts under \LuaLaTeX, which may be related with this specific issue
-here).
-
-Update (tested 2022/10/29, with 1.3x and up-to-date TL2022): it appears that
-most, perhaps even all, of the remarks in the preceding note are now obsolete
-as I do not see obvious differences between outputs from \XeLaTeX{} versus
-\LuaLaTeX{} but I did not seriously compare, only quickly done.
-
-\newcommand\TEST[1]{\MTversion{#1}\def\tmpa{#1}%
- \def\tmpb{normal}\def\tmpc{bold}%
- \ifx\tmpa\tmpb\else\ifx\tmpa\tmpc\else \MTnonlettersobeymathxx
- \MTexplicitbracesobeymathxx\fi\fi
-\begin{multicols}{2}
-\hbox to\columnwidth{\hbox to\columnwidth{\hfil
- $abcdefghijklmnopqrstuvwxyz$\hfil}\kern-2.5em{#1}}
- \centerline{ $ABCDEFGHIJKLMNOPQRSTUVWXYZ$ }
- \centerline{ $0123456789$ }
- \centerline{ $!\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\backslash$ }
- \centerline{ $\mathbf{!\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\backslash}$ }
-\columnbreak
- \centerline{ abcdefghijklmnopqrstuvwxyz }
- \centerline{ ABCDEFGHIJKLMNOPQRSTUVWXYZ }
- \centerline{ 0123456789 }
- \centerline{ !\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\char92 }
- \centerline{\bfseries !\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\char92 }
-\end{multicols}}
-\begin{multicols}{2}
- \centerline{\textbf{math mode}}
-\columnbreak
- \centerline{ \textbf{text} }
-\end{multicols}
-\TEST{Didot}\TEST{Comic}\TEST{normal}\TEST{Herculanum}
-\TEST{Hoefler}\TEST{Typewriter}\TEST{bold}\TEST{Times}
-\end{document}
-\endinput
-%%
-%% End of file `mathastexttestunicodemacos.tex'.
diff --git a/Master/texmf-dist/doc/latex/mercatormap/CHANGES.md b/Master/texmf-dist/doc/latex/mercatormap/CHANGES.md
new file mode 100644
index 00000000000..49ef66fb7a9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/mercatormap/CHANGES.md
@@ -0,0 +1,176 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on
+[Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to
+[Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+
+
+
+## [1.2.0] - 2024-08-05
+
+### Added
+- Command `\ifmrcNPexists` to test existence of a named position
+- Macros `\mrcAnimAngle` and `\l_mermap_anim_angle_fp` to measure
+ the current orthodrome angle
+- Animation example for static maps
+
+### Changed
+- `\mrcNPlat` and `\mrcNPlon` result to 0 now, if named position does not exist
+- `\ifmrcNPinmap` and `\ifmrcNPinvicinity` result to `false` now, if named position does not exist
+- Point definitions on an orthodrome now take an optional angle as result:
+ - Command `mrcNPfromOrthoFraction`
+ - Command `mrcNPfromOrthoFractionNamed`
+ - Command `mrcNPfromOrthoDistance`
+ - Command `mrcNPfromOrthoDistanceNamed`
+
+### Fixed
+- Documentation contained dates from `2023` instead of `2024`
+
+
+
+## [1.1.0] - 2024-08-01
+
+### Added
+- New supply sources (web tile servers):
+ - `thunderforest atlas`
+ - `topplusopen web light`
+ - `topplusopen web light grau`
+- Needed LaTeX version 2023-11-01
+- Point definitions on an orthodrome:
+ - Command `mrcNPfromOrthoFraction`
+ - Command `mrcNPfromOrthoFractionNamed`
+ - Command `mrcNPfromOrthoDistance`
+ - Command `mrcNPfromOrthoDistanceNamed`
+- Animation support:
+ - Environment `mrcAnimation`
+ - Command `\mrcTimewarpIdentity`
+ - Command `\mrcTimewarpSlowStart`
+ - Command `\mrcTimewarpSlowFinal`
+ - Command `\mrcTimewarpSlowStartFinal`
+ - Command `\mrcAnimFrame`
+ - Command `\l_mermap_anim_frame_int`
+ - Command `\mrcAnimTime`
+ - Command `\l_mermap_anim_time_fp`
+ - Command `\mrcAnimScaleDenom`
+ - Command `\l_mermap_anim_scaledenom_fp`
+ - Command `\mrcAnimLatitude`
+ - Command `\l_mermap_anim_lat_fp`
+ - Command `\mrcAnimLongitude`
+ - Command `\l_mermap_anim_lon_fp`
+ - Option `start-position`
+ - Option `named-start-position`
+ - Option `final-position`
+ - Option `named-final-position`
+ - Option `position`
+ - Option `named-position`
+ - Option `frames`
+ - Option `drop-first-frame`
+ - Option `drop-last-frame`
+ - Option `drop-no-frame`
+ - Option `scale-denominators`
+ - Option `common-scale-denominator`
+ - Option `timewarp`
+ - Option `timewarp-identity`
+ - Option `timewarp-slow-start`
+ - Option `timewarp-slow-final`
+ - Option `timewarp-slow-start-final`
+
+### Changed
+- Version history moved from documentation Chapter 11 to this changelog
+- Versioning changed to [Semantic Versioning](http://semver.org/spec/v2.0.0.html)
+ starting with 1.1.0
+- `README` changed to `README.md`
+- Key names start with `mermap` instead of `/mermap` now
+- All common scratch variables like `\l_tmpa_tl` replaced by package variables
+- Orthodrome code
+- Several code further revisions
+
+### Deprecated
+- Stamen Design has discontinued to server map tiles since 2023-07-31.
+ Therefore, all `supply/source` options based on Stamen Design are
+ deprecated now, namely
+ - `stamen terrain`
+ - `stamen terrain-background`
+ - `stamen terrain-labels`
+ - `stamen terrain-lines`
+ - `stamen toner`
+ - `stamen toner-lite`
+ - `stamen toner-hybrid`
+ - `stamen toner-background`
+ - `stamen toner-labels`
+ - `stamen toner-lines`
+ - `stamen watercolor`
+ All these options are now not documented any more, but for some time
+ are still available for old documents with cached map tiles.
+
+### Removed
+- Requirement for packages `expl3`, `xparse`, and `pdftexcmds`
+
+### Fixed
+- Links to the WMS maps of Bundesamt für Kartographie und Geodäsie changed
+- Overwrite warning while generating `maptiles.texpy`
+- Orthodrome drawing with identical starting and final point is now silently ignored
+
+
+
+## [1.02] - 2020-08-06
+
+### Added
+- New options
+ `/mermap/supply/area from marker input` and
+ `/mermap/supply/add area from marker input`
+ which allow to fit a map to a given external list of marker positions.
+- New option `/mermap/fail on missing resource` to control
+ compilation behavior for missing resource files.
+- New marker option `/mermap/marker/distance` with corresponding
+ macro `\mrcmarkerdistance` (issue #2)
+
+### Deprecated
+- Openrouteservice has discontinued mapsurfer tiles since June 2020.
+ Therefore, `/mermap/supply/source=openrouteservice mapsurfer`
+ is deprecated now. It is not documented any more, but
+ for some time it is still available for old documents with
+ cached map tiles.
+
+
+
+## [1.01] - 2020-05-05
+
+### Added
+- New general marker option
+ `/mermap/marker/generic` with corresponding macros
+ `\mrcmarkergeneric` and `\l_mermap_marker_generic_tl`.
+ Also, the marker uuid is made expl3 accessible as `\l_mermap_marker_uuid_tl`.
+- New hyper marker options:
+ - `/mermap/marker/url`
+ - `/mermap/marker/link`
+ - `/mermap/marker/use urls`
+ - `/mermap/marker/ignore urls`
+ - `/mermap/marker/use links`
+ - `/mermap/marker/ignore links`
+
+### Changed
+- User messages for failed Python script calls are changed from warnings to
+ errors to fail fast and to provide more information and hints about
+ possible reasons.
+
+### Fixed
+- Sorting of index key entries fixed for the documentation.
+
+
+
+## [1.00] - 2020-04-20
+
+### Added
+- Initial public release
diff --git a/Master/texmf-dist/doc/latex/mercatormap/README b/Master/texmf-dist/doc/latex/mercatormap/README
deleted file mode 100644
index c33ea991128..00000000000
--- a/Master/texmf-dist/doc/latex/mercatormap/README
+++ /dev/null
@@ -1,43 +0,0 @@
-%% The LaTeX package mercatormap - version 1.02 (2020/08/06)
-%%
-%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
-%% -------------------------------------------------------------------------------------------
-%%
-%% 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 2005/12/01 or later.
-%%
-%% This work has the LPPL maintenance status `author-maintained'.
-%%
-%% This work consists of all files listed in README
-%%
-
-The package ...
-
-Contents of the package
-=======================
- 'README' this file
- 'mercatormap.sty' LaTeX package file (style file)
- 'mercatorsupplier.def' LaTeX package file (include file for style)
- 'mercatorpy.def' LaTeX package file (Python generator)
- 'mercatormap.pdf' Documentation
- 'mercatormap.tex' Source code of the documentation (main file)
- '*.doc.*' Source code of the documentation (include files)
- 'mercatormap-example.tex' Source code of an example
- 'mercatormap.bib' Bibliography of the documentation
-
-Installation
-============
-Copy the contents of the 'mercatormap.tds.zip' from CTAN to your local TeX file tree.
-
-Alternatively, put the files to their respective locations within the TeX installation:
- 'mercatormap.sty' -> /tex/latex/mercatormap
- 'mercatorpy.def' -> /tex/latex/mercatormap
- 'mercatorsupplier.def' -> /tex/latex/mercatormap
-
- all other files -> /doc/latex/mercatormap
diff --git a/Master/texmf-dist/doc/latex/mercatormap/README.md b/Master/texmf-dist/doc/latex/mercatormap/README.md
new file mode 100644
index 00000000000..b7b4be29abd
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/mercatormap/README.md
@@ -0,0 +1,50 @@
+# The LaTeX package mercatormap - version 1.2.0 (2024/08/05)
+
+
+> Copyright (c) 2020-2024 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+
+> 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-05-04 or later.
+
+> This work has the LPPL maintenance status `author-maintained`.
+
+> This work consists of all files listed in README.md
+
+
+The mercatormap package extends TikZ with tools to
+create map graphics. The provided coordinate system relies on the
+Web Mercator projection used on the Web by OpenStreetMap and others.
+The package supports the seamless integration of graphics
+from public map tile servers by a Python script. Also, common map
+elements like markers, geodetic networks, bar scales, routes, orthodrome
+pieces, and more are part of the package.
+
+
+## Contents of the package
+
+- `README.md` this file
+- `CHANGES.md` log of changes (history)
+- `mercatormap.sty` LaTeX package file (style file)
+- `mercatorsupplier.def` LaTeX package file (include file for style)
+- `mercatorpy.def` LaTeX package file (Python generator)
+- `mercatormap.pdf` Documentation
+- `mercatormap.tex` Source code of the documentation (main file)
+- `*.doc.*` Source code of the documentation (include files)
+- `mercatormap-example.tex` Source code of an example
+- `mercatormap.bib` Bibliography of the documentation
+
+
+## Installation
+
+Copy the contents of the `mercatormap.tds.zip` from CTAN to your local TeX file tree.
+
+Alternatively, put the files to their respective locations within the TeX installation:
+- `mercatormap.sty` -> /tex/latex/mercatormap
+- `mercatorpy.def` -> /tex/latex/mercatormap
+- `mercatorsupplier.def` -> /tex/latex/mercatormap
+- all other files -> /doc/latex/mercatormap
diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap-example.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap-example.tex
index 0951bf14d11..333a2495906 100644
--- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap-example.tex
+++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap-example.tex
@@ -1,11 +1,11 @@
% \LaTeX-Main\
% !TeX encoding=UTF-8
%%
-%% The LaTeX package mercatormap - version 1.02 (2020/08/06)
+%% The LaTeX package mercatormap - version 1.2.0 (2024/08/05)
%% mercatormap-example.tex: Example document with a map
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2020-2024 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.bib b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.bib
index ef2e9b62131..36a3e976ec5 100644
--- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.bib
+++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.bib
@@ -1,4 +1,5 @@
% Encoding: UTF-8
+
% include file of mercatormap.tex (manual of the LaTeX package mercatormap)
@Report{Sturm:2020,
@@ -14,35 +15,27 @@
}
-@manual{package:tikz,
- author = {Till Tantau},
- title = {The TikZ and PGF Packages},
- subtitle = {Manual for version 3.1.5b},
- url = {http://mirrors.ctan.org/graphics/pgf/base/doc/pgfmanual.pdf},
- date = {2020-01-08},
+@Manual{package:tikz,
+ author = {Till Tantau},
+ date = {2023-01-15},
+ title = {The TikZ and PGF Packages},
+ subtitle = {Manual for version 3.1.10},
+ url = {https://mirrors.ctan.org/graphics/pgf/base/doc/pgfmanual.pdf},
}
-@manual{package:xparse,
- author = {{The \LaTeX3 Project}},
- title = {The xparse package},
- subtitle = {Document command parser},
- url = {http://mirrors.ctan.org/macros/latex/contrib/l3packages/xparse.pdf},
- date = {2020-03-06},
+@Manual{l3kernel:interfaces,
+ author = {{The \LaTeX3 Project}},
+ date = {2024-05-27},
+ title = {The \LaTeX3 Interfaces},
}
-@manual{package:siunitx,
- author = {Joseph Wright},
- title = {siunitx -- A comprehensive (SI) units package},
- url = {http://mirrors.ctan.org/macros/latex/contrib/siunitx/siunitx.pdf},
- date = {2020-02-25},
+@Manual{package:siunitx,
+ author = {Joseph Wright},
+ date = {2024-06-24},
+ title = {siunitx -- A comprehensive (SI) units package},
+ url = {https://mirrors.ctan.org/macros/latex/contrib/siunitx/siunitx.pdf},
}
-
-@manual{package:expl3,
- author = {{The \LaTeX3 Project}},
- title = {The expl3 package and \LaTeX3 programming},
- url = {http://mirrors.ctan.org/macros/latex/contrib/l3kernel/expl3.pdf},
- date = {2020-04-06},
-}
+@Comment{jabref-meta: databaseType:biblatex;}
diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.animations.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.animations.tex
new file mode 100644
index 00000000000..022b856a61b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.animations.tex
@@ -0,0 +1,538 @@
+% !TeX root = mercatormap.tex
+% !TeX encoding=UTF-8
+% !TeX spellcheck=en_US
+% include file of mercatormap.tex (manual of the LaTeX package mercatormap)
+\clearpage
+\section{Animations}\label{sec:animations}%
+
+An animation in the context of map drawing is considered to be a direct movement
+from a starting position to a final position with possible adaption of
+scale denominators.
+
+This package does not provide animation production, but allows to create a
+PDF with a sequence of maps (frames) following such an animation path.
+
+
+%-------------------------------------------------------------------------------
+\subsection{Animation Environment}
+
+\begin{docEnvironment}[doc new=2024-07-31]{mrcAnimation}{\marg{options}}
+ According to the given \meta{options}, the environment loops over the
+ \meta{environment content} several times generating \textit{frames}
+ for an external animation program.
+ A detailed description for the \meta{options} is found in \Fullref{ref:animOptions}.
+ \begin{itemize}
+ \item Basically, the position is moved from
+ a given \refKey{mermap/anim/start-position} with time index |0|
+ following an orthodrome
+ to a \refKey{mermap/anim/final-position} with time index |1|.
+ \item
+ This time interval $[0,1]$ is divided into \refKey{mermap/anim/frames}.
+ The current frame number is denoted by \refCom{mrcAnimFrame},
+ the current time is denoted by \refCom{mrcAnimTime}, and
+ the current position is denoted by
+ \refCom{mrcAnimLatitude} and \refCom{mrcAnimLongitude},
+ alternatively by the named positon \docValue{AnimNP}.
+ \item
+ During movement, a time dependent sequence of \refKey{mermap/anim/scale-denominators}
+ defines the current scale denominator \refCom{mrcAnimScaleDenom}.
+ \item
+ The frames may have an equal time distance or have different time
+ distances using a \refKey{mermap/anim/timewarp}. This could be used
+ to slow down movement near ground and to speed up with more height.
+ \end{itemize}
+ The generated sequence of frames is applicable for
+ \begin{itemize}
+ \item Movement along an orthodrome from starting to final position with an unchanged
+ common scale denominator.
+ \item Zoom in or out on a fixed position.
+ \item Combination of both animations.
+ \item Animated orthodrome drawing on a static map.
+ \end{itemize}
+ For more complex animations, several \refEnv{mrcAnimation} environments may be
+ used consecutively.
+\end{docEnvironment}
+
+\clearpage
+\begin{dispExample*}{breakable}
+ \mrcNPdef{heathrow}{51.4678}{-0.4548}
+ \mrcNPdef{fiumicino}{41.8151}{12.2508}
+
+ \begin{tcbraster}[raster height=22cm,raster columns=4,raster rows=7,
+ tile,size=minimal,boxsep=1pt,colback=black!20 ]
+ \begin{mrcAnimation}
+ {
+ named-start-position = heathrow,
+ named-final-position = fiumicino,
+ frames = 36,
+ scale-denominators = 0/1000000 - 0.3/8000000 - 0.7/8000000 - 1/1000000,
+ timewarp-slow-start-final = 1.5,
+ }
+ \begin{tcolorbox}
+ \begin{tikzpicture}
+ \mermapset
+ {
+ named flex scale = \mrcAnimScaleDenom:AnimNP,
+ }
+ \mrcmap
+ [
+ type = reference,
+ named position = AnimNP,
+ source = topplusopen web,
+ tex width = \tcbtextwidth,
+ tex height = \tcbtextheight
+ ]{london-roma-\mrcAnimFrame}
+ \mrcdrawmap
+ \node[above left,font=\fontsize{3.5pt}{3.5pt}\sffamily]
+ at (mrcmap.south east) {\mrcmapattribution};
+ \mrcclipmap
+ \end{tikzpicture}
+ \end{tcolorbox}
+ \end{mrcAnimation}
+ \end{tcbraster}
+\end{dispExample*}
+
+
+
+\clearpage
+\begin{dispExample*}{breakable}
+ % \usepackage{fontawesome5}
+ \mrcNPdef{heathrow}{51.4678}{-0.4548}
+ \mrcNPdef{lax}{33.9421}{-118.4088}
+ \mrcNPdef{reykjavik}{64.1289}{-21.9369}
+
+ \begin{tcbraster}[raster height=22cm,raster columns=2,raster rows=4,
+ tile,size=minimal,boxsep=1pt,colback=black!20 ]
+ \begin{mrcAnimation}
+ {
+ named-start-position = heathrow,
+ named-final-position = lax,
+ frames = 8,
+ }
+ \begin{tcolorbox}
+ \begin{tikzpicture}
+ \mrcmap
+ [
+ type = areafit,
+ area = {heathrow,lax,reykjavik},
+ source = topplusopen web,
+ tex width = \tcbtextwidth,
+ tex height = \tcbtextheight,
+ flex area fit = 8mm,
+ ]{london-lax-\mrcAnimFrame}
+ \mrcdrawmap
+ \node[above left,font=\fontsize{3.5pt}{3.5pt}\sffamily]
+ at (mrcmap.south east) {\mrcmapattribution};
+ \mrcclipmap
+ \mrcNPdraworthodrome[red,very thick]{heathrow}{AnimNP}
+ \node[red!70!black,rotate=\mrcAnimAngle]
+ at (\mrcNPcs{AnimNP}) {\large\faPlane};
+ \end{tikzpicture}
+ \end{tcolorbox}
+ \end{mrcAnimation}
+ \end{tcbraster}
+\end{dispExample*}
+
+
+\clearpage
+%-------------------------------------------------------------------------------
+\subsection{Animation Options}\label{ref:animOptions}
+
+\begin{docMrcKeys}[
+ doc keypath = anim,
+ doc new = 2024-07-31,
+ ]{
+ {
+ doc name = start-position,
+ doc parameter = {=\meta{latitude}/\meta{longitude}},
+ doc description = initially |51.4779/0|
+ },
+ {
+ doc name = named-start-position,
+ doc parameter = {=\meta{name}},
+ }
+ }
+ Starting position of the animation given by
+ \meta{latitude} and \meta{longitude} or by a named position using \meta{name}.
+\end{docMrcKeys}
+
+
+\begin{docMrcKeys}[
+ doc keypath = anim,
+ doc new = 2024-07-31,
+ ]{
+ {
+ doc name = final-position,
+ doc parameter = {=\meta{latitude}/\meta{longitude}},
+ doc description = initially |51.4779/0|
+ },
+ {
+ doc name = named-final-position,
+ doc parameter = {=\meta{name}},
+ }
+ }
+ Final position of the animation given by
+ \meta{latitude} and \meta{longitude} or by a named position using \meta{name}.
+\end{docMrcKeys}
+
+
+\begin{docMrcKeys}[
+ doc keypath = anim,
+ doc new = 2024-07-31,
+ ]{
+ {
+ doc name = position,
+ doc parameter = {=\meta{latitude}/\meta{longitude}},
+ doc description = initially |51.4779/0|
+ },
+ {
+ doc name = named-position,
+ doc parameter = {=\meta{name}},
+ }
+ }
+ Fixed position of the animation given by
+ \meta{latitude} and \meta{longitude} or by a named position using \meta{name}.
+ This sets \refKey{mermap/anim/start-position} and
+ \refKey{mermap/anim/final-position} to the identical value.
+\end{docMrcKeys}
+
+
+
+\begin{docMrcKeys}[
+ doc keypath = anim,
+ doc new = 2024-07-31,
+ ]{
+ {
+ doc name = frames,
+ doc parameter = {=\meta{frame number}},
+ doc description = initially |20|
+ },
+ }
+ Integer \meta{frame number} for the animation, at least |2|. For maps made with tiles,
+ even a large \meta{frame number} typically results in limited downloads,
+ because the tiles a reused as far as possible. For WMS maps, every frame
+ could give another download!
+\end{docMrcKeys}
+
+
+\begin{docMrcKeys}[
+ doc keypath = anim,
+ doc new = 2024-07-31,
+ doc parameter = {\colOpt{=true\textbar false}},
+ doc description = {default |true|, initially |false|},
+ ]{
+ {
+ doc name = drop-first-frame,
+ },
+ {
+ doc name = drop-last-frame,
+ },
+ }
+ If several \refEnv{mrcAnimation} environments are used consecutively,
+ the end frame of one animation is identical to the start frame of the
+ next animation. These options allow to remove one superfluous connecting frame.
+\end{docMrcKeys}
+
+
+\begin{docMrcKeys}[
+ doc keypath = anim,
+ doc new = 2024-07-31,
+ ]{
+ {
+ doc name = drop-no-frame,
+ doc description = {no value, initially set},
+ },
+ }
+ Reset to drop no frames.
+\end{docMrcKeys}
+
+
+\begin{docMrcKeys}[
+ doc keypath = anim,
+ doc new = 2024-07-31,
+ ]{
+ {
+ doc name = scale-denominators,
+ doc parameter = {=\marg{time and scale sequence}},
+ doc description = {initially |0/25000-1/25000|},
+ },
+ }
+ The \meta{time and scale sequence} has to obey the following pattern:
+ \par
+ \meta{time$_1$}|/|\meta{scale$_1$} |-|
+ \meta{time$_2$}|/|\meta{scale$_2$} |-| $\ldots$ |-|
+ \meta{time$_n$}|/|\meta{scale$_n$}
+ \par
+ The time values have to be taken from the interval $[0,1]$ and have to be
+ strictly monotonically increasing, i.e.
+ \par
+ $0\le$ \meta{time$_1$} $<$
+ \meta{time$_2$} $<$ $\ldots$ $<$
+ \meta{time$_n$} $\le 1$
+ \par
+ If not given, time and scale for time $0$ and $1$ are automatically added
+ as constant continuation.\par
+ Depending on the current time value \refCom{mrcAnimTime}, the current
+ scale denominator \refCom{mrcAnimScaleDenom} is interpolated from this
+ sequence using a logarithmic approach.
+\end{docMrcKeys}
+
+
+\begin{docMrcKeys}[
+ doc keypath = anim,
+ doc new = 2024-07-31,
+ ]{
+ {
+ doc name = common-scale-denominator,
+ doc parameter = {=\marg{scale denominator}},
+ doc description = {initially |25000|},
+ },
+ }
+ This is a shortcut for\par
+ \refKey{mermap/anim/scale-denominators} |=|\\
+ \hspace*{5mm} |0/|\marg{scale denominator} |- 1/|\marg{scale denominator}
+ \par
+ Thereby, a fixed \marg{scale denominator} is set for the animation.
+\end{docMrcKeys}
+
+
+\clearpage
+\begin{docMrcKeys}[
+ doc keypath = anim,
+ doc new = 2024-07-31,
+ ]{
+ {
+ doc name = timewarp,
+ doc parameter = {=\meta{macro}},
+ doc description = initially \texttt{\textbackslash mrcTimewarpIdentity}
+ },
+ }
+ \meta{macro} has to be a fully expandable \LaTeX\ macro with one parameter.
+ The expansion has to be a valid |expl3| \meta{floating point expression}
+ denoting a strictly monotonically increasing function mapping from
+ the interval \mbox{$[0,1]$} into \mbox{$[0,1]$} again.
+ This timewarp may slow down and accelerate time over the span from $0$ to $1$.
+\end{docMrcKeys}
+
+
+\begin{docCommands}[
+ doc new = 2024-07-31,
+ ]{
+ {
+ doc name = mrcTimewarpIdentity,
+ doc parameter = {=\marg{time}},
+ },
+ }
+ Identity function from \mbox{$[0,1]$} into \mbox{$[0,1]$}.
+\end{docCommands}
+
+
+\begin{docMrcKeys}[
+ doc keypath = anim,
+ doc new = 2024-07-31,
+ ]{
+ {
+ doc name = timewarp-identity,
+ doc description = {no value, initially set}
+ },
+ }
+ Sets \refKey{mermap/anim/timewarp} to \refCom{mrcTimewarpIdentity}.
+ This means that time flows constantly.
+\end{docMrcKeys}
+
+
+\begin{docCommands}[
+ doc new = 2024-07-31,
+ ]{
+ {
+ doc name = mrcTimewarpSlowStart,
+ doc parameter = {=\marg{exponent}\marg{time}},
+ doc description = {default |2|}
+ },
+ }
+ Function term $t^{\text{\meta{exponent}}}$
+\end{docCommands}
+
+
+\begin{docMrcKeys}[
+ doc keypath = anim,
+ doc new = 2024-07-31,
+ ]{
+ {
+ doc name = timewarp-slow-start,
+ doc parameter = \colOpt{=\meta{exponent}},
+ doc description = {default |2|}
+ },
+ }
+ Sets \refKey{mermap/anim/timewarp} to \refCom{mrcTimewarpSlowStart}\marg{exponent}.
+ \par
+ If $\text{\meta{exponent}}>1$ is used, time flows slower at the begin of the
+ interval \mbox{$[0,1]$}. This can be used, if a low scale denominator is
+ present at begin of a movement and is becoming larger later. Here, for smoothness,
+ you may want this to have slower speed near ground and larger speed later.
+\end{docMrcKeys}
+
+
+\begin{docCommands}[
+ doc new = 2024-07-31,
+ ]{
+ {
+ doc name = mrcTimewarpSlowFinal,
+ doc parameter = {=\marg{exponent}\marg{time}},
+ doc description = {default |2|}
+ },
+ }
+ Function term $1 - (1-t)^{\text{\meta{exponent}}}$
+\end{docCommands}
+
+
+\begin{docMrcKeys}[
+ doc keypath = anim,
+ doc new = 2024-07-31,
+ ]{
+ {
+ doc name = timewarp-slow-final,
+ doc parameter = \colOpt{=\meta{exponent}},
+ doc description = {default |2|}
+ },
+ }
+ Sets \refKey{mermap/anim/timewarp} to \refCom{mrcTimewarpSlowFinal}\marg{exponent}.
+ \par
+ If $\text{\meta{exponent}}>1$ is used, time flows slower at the end of the
+ interval \mbox{$[0,1]$}. This can be used, if a large scale denominator is
+ present at begin of a movement and is becoming lower later. Here, for smoothness,
+ you may want this to have slower speed near ground at the end.
+\end{docMrcKeys}
+
+
+\begin{docCommands}[
+ doc new = 2024-07-31,
+ ]{
+ {
+ doc name = mrcTimewarpSlowStartFinal,
+ doc parameter = {=\marg{exponent}\marg{time}},
+ doc description = {default |2|}
+ },
+ }
+ Combination of \refCom{mrcTimewarpSlowStart} and \refCom{mrcTimewarpSlowFinal}
+ using case discrimination for the first and the second half of the intervall.
+\end{docCommands}
+
+
+\begin{docMrcKeys}[
+ doc keypath = anim,
+ doc new = 2024-07-31,
+ ]{
+ {
+ doc name = timewarp-slow-start-final,
+ doc parameter = \colOpt{=\meta{exponent}},
+ doc description = {default |2|}
+ },
+ }
+ Sets \refKey{mermap/anim/timewarp} to \refCom{mrcTimewarpSlowStartFinal}\marg{exponent}.
+ \par
+ If $\text{\meta{exponent}}>1$ is used, time flows slower at the begin and at the end of the
+ interval \mbox{$[0,1]$}. This can be used, if a low scale denominator is
+ present at begin of a movement, becomes larger in the middle, and finally
+ is becoming lower later. Here, for smoothness,
+ you may want this to have slower speed near ground at the begin and the end.
+\end{docMrcKeys}
+
+
+\clearpage
+%-------------------------------------------------------------------------------
+\subsection{Macros inside the Animation Environment}\label{ref:animMacros}
+
+\begin{docCommands}[
+ doc new = 2024-07-31,
+ ]{
+ {
+ doc name = mrcAnimFrame,
+ },
+ {
+ doc name = l_mermap_anim_frame_int,
+ },
+ }
+ The current frame number ranging from $1$ to \refKey{mermap/anim/frames}.
+\end{docCommands}
+
+
+\begin{docCommands}[
+ doc new = 2024-07-31,
+ ]{
+ {
+ doc name = mrcAnimTime,
+ },
+ {
+ doc name = l_mermap_anim_time_fp,
+ },
+ }
+ The current time ranging from $0$ to $1$.
+\end{docCommands}
+
+
+\begin{docCommands}[
+ doc new = 2024-07-31,
+ ]{
+ {
+ doc name = mrcAnimScaleDenom,
+ },
+ {
+ doc name = l_mermap_anim_scaledenom_fp,
+ },
+ }
+ The current scale denominator according to \refKey{mermap/anim/scale-denominators}.
+\end{docCommands}
+
+
+\begin{docCommands}[
+ doc new = 2024-07-31,
+ ]{
+ {
+ doc name = mrcAnimLatitude,
+ },
+ {
+ doc name = l_mermap_anim_lat_fp,
+ },
+ }
+ The latitude of the current position.
+\end{docCommands}
+
+
+\begin{docCommands}[
+ doc new = 2024-07-31,
+ ]{
+ {
+ doc name = mrcAnimLongitude,
+ },
+ {
+ doc name = l_mermap_anim_lon_fp,
+ },
+ }
+ The longitude of the current position.
+\end{docCommands}
+
+
+\begin{docCommands}[
+ doc new = 2024-08-05,
+ ]{
+ {
+ doc name = mrcAnimAngle,
+ },
+ {
+ doc name = l_mermap_anim_angle_fp,
+ },
+ }
+ Current angle between the tangent vector to the orthodrome and
+ the current parallel circle.
+\end{docCommands}
+
+
+
+
+\docValue{AnimNP}\tcbdocmarginnote{\tcbdocnew{2024-07-31}}:
+ The current named position.
+
+
+
+
diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.definition.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.definition.tex
index ad285fb7c90..01667cd1d32 100644
--- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.definition.tex
+++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.definition.tex
@@ -23,14 +23,14 @@
\subsection{Option Setting}
\begin{docCommand}{mermapset}{\marg{options}}
Sets \meta{options} for all following maps inside the current \TeX\ group.
- All options share the common prefix |/mermap/|, e.g. for setting
- \refKey{/mermap/vicinity} use
+ All options share the common prefix |mermap/|, e.g. for setting
+ \refKey{mermap/vicinity} use
\begin{dispListing}
\mermapset{vicinity=3cm}
\end{dispListing}
Also see \refCom{mrcdefinemap}, \refCom{mermapsetsupply},
and \refCom{mermapsetmarker}.\par
- Note that the options by \refCom{mermapset} are |expl3| \cite{package:expl3}
+ Note that the options by \refCom{mermapset} are |expl3| \cite{l3kernel:interfaces}
keys while \tikzname\ \cite{package:tikz} uses its own key management.
\end{docCommand}
@@ -45,7 +45,7 @@ See \Fullref{sec:automated_map} for script aided map definitions.
\begin{docCommand}{mrcdefinemap}{\marg{options}}
Establishes a map inside a |tikzpicture| environment following
and applying the given \meta{options}.
- All options share the common prefix |/mermap/mapdef/|.
+ All options share the common prefix |mermap/mapdef/|.
After \refCom{mrcdefinemap} is applied, map drawing and map coordinates
can be used.
\begin{itemize}
@@ -60,25 +60,25 @@ See \Fullref{sec:automated_map} for script aided map definitions.
\begin{docMrcKey}[mapdef]{north}{=\meta{map north latitude}}{no default, initially 50}
Northern latitude degree of the visible map, possibly negative for the southern hemisphere,
- lower than $90$ but always larger than \refKey{/mermap/mapdef/south}.
+ lower than $90$ but always larger than \refKey{mermap/mapdef/south}.
It is accessible as \docAuxCommand{mrcmapnorth} (use read-only).
\end{docMrcKey}
\begin{docMrcKey}[mapdef]{south}{=\meta{map south latitude}}{no default, initially 48}
Southern latitude degree of the visible map, possibly negative for the southern hemisphere,
- larger than $-90$ but always lower than \refKey{/mermap/mapdef/north}.
+ larger than $-90$ but always lower than \refKey{mermap/mapdef/north}.
It is accessible as \docAuxCommand{mrcmapsouth} (use read-only).
\end{docMrcKey}
\begin{docMrcKey}[mapdef]{west}{=\meta{map west longitude}}{no default, initially 11}
Western longitude degree of the visible map, possibly negative for the western hemisphere,
- possibly shifted periodically, but always lower than \refKey{/mermap/mapdef/east}.
+ possibly shifted periodically, but always lower than \refKey{mermap/mapdef/east}.
It is accessible as \docAuxCommand{mrcmapwest} (use read-only).
\end{docMrcKey}
\begin{docMrcKey}[mapdef]{east}{=\meta{map east longitude}}{no default, initially 13}
Eastern longitude degree of the visible map, possibly negative for the western hemisphere,
- possibly shifted periodically, but always larger than \refKey{/mermap/mapdef/west}.
+ possibly shifted periodically, but always larger than \refKey{mermap/mapdef/west}.
It is accessible as \docAuxCommand{mrcmapeast} (use read-only).
\end{docMrcKey}
@@ -149,7 +149,7 @@ information.
\begin{docMrcKey}[mapdef]{attribution print}{=\meta{attribution text}}{no default, initially empty}
Attribution text for the map source.
- In contrast to \refKey{/mermap/mapdef/attribution} it is intended for media
+ In contrast to \refKey{mermap/mapdef/attribution} it is intended for media
that does not support hyperlinks like printed posters, books, etc.
It is accessible as \docAuxCommand{mrcmapattributionprint} (use read-only).
\end{docMrcKey}
@@ -166,7 +166,7 @@ information.
\end{docMrcKey}
\begin{docMrcKey}[mapdef]{tile size}{=\meta{length}}{no default, initially |32.512mm|}
- Typically set computationally. It is identical to \refKey{/mermap/tile size}
+ Typically set computationally. It is identical to \refKey{mermap/tile size}
which is the recommended user option for manual setup.
\end{docMrcKey}
@@ -204,7 +204,7 @@ The border of the visible map is denoted by a \tikzname\ node \docNode{mrcmap}.
\medskip
The |mrc cs| coordinate system defines a map point by
-\refKey{/mermap/cs/latitude} and \refKey{/mermap/cs/longitude}
+\refKey{mermap/cs/latitude} and \refKey{mermap/cs/longitude}
\begin{docMrcKey}[cs]{latitude}{=\meta{latitude}}{no default}
Sets the \meta{latitude} of a map point.
@@ -220,7 +220,7 @@ The |mrc cs| coordinate system defines a map point by
\medskip
A map point can also be defined by shorter variants
-\refKey{/mermap/cs/lat} and \refKey{/mermap/cs/lon}
+\refKey{mermap/cs/lat} and \refKey{mermap/cs/lon}
\begin{docMrcKey}[cs]{lat}{=\meta{latitude}}{no default}
Sets the \meta{latitude} of a map point.
@@ -298,9 +298,10 @@ A map point can be defined even quicker by
\end{docCommand}
-\begin{docCommand}{mrcNPlat}{\marg{name}}
+\begin{docCommand}[doc updated=2024-08-02]{mrcNPlat}{\marg{name}}
Inserts the \emph{latitude} of a \emph{named position} with given \meta{name}.
\refCom{mrcNPlat} is expandable and may be used in floating point expressions.
+ If the \meta{name} does not exist, the macro expands to |0|.
\begin{dispExample}
\mrcNPdef{nuremberg}{49.45522}{11.07631}
Latitude: \mrcNPlat{nuremberg}\\
@@ -309,9 +310,16 @@ A map point can be defined even quicker by
\end{docCommand}
-\begin{docCommand}{mrcNPlon}{\marg{name}}
+\begin{docCommand}[doc updated=2024-08-02]{mrcNPlon}{\marg{name}}
Inserts the \emph{longitude} of a \emph{named position} with given \meta{name}.
\refCom{mrcNPlon} is expandable and may be used in floating point expressions.
+ If the \meta{name} does not exist, the macro expands to |0|.
+\end{docCommand}
+
+
+\begin{docCommand}[doc new=2024-08-02]{ifmrcNPexists}{\marg{name}\marg{true}\marg{false}}
+ If the given \emph{named position} with given \meta{name} exists, the \meta{true} code is executed, otherwise
+ the \meta{false} code.
\end{docCommand}
@@ -356,7 +364,7 @@ Very similar to \refCom{ifmrcinmap} is \refCom{ifmrcinvicinity}.
\begin{docCommand}{ifmrcinvicinity}{\marg{latitude}\marg{longitude}\marg{true}\marg{false}}
If the given \meta{latitude} and \meta{longitude} describes a point
- inside a vicinity of the visible map, i.e. the map \emph{plus} a margin of \refKey{/mermap/vicinity},
+ inside a vicinity of the visible map, i.e. the map \emph{plus} a margin of \refKey{mermap/vicinity},
the \meta{true} code is executed, otherwise
the \meta{false} code.\par
Inside the \meta{true} code a \tikzname\ coordinate \docNode{mrcpos}
diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.drawing.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.drawing.tex
index dd86fcedbdc..0b484da09bb 100644
--- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.drawing.tex
+++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.drawing.tex
@@ -11,7 +11,7 @@
\begin{docCommand}{mrcdrawmap}{\oarg{options}}
Inside a |tikzpicture| environment, \refCom{mrcdrawmap} draws a map
prepared by \refCom{mrcdefinemap}, \refCom{mrcapplymap}, or \refCom{mrcmap}.
- All \meta{options} share the common prefix |/mermap/|.
+ All \meta{options} share the common prefix |mermap/|.
This is the principal macro to draw a prepared map respectively
the background of the map. The background consists of downloaded map tiles
or just a color rectangle.
@@ -19,10 +19,10 @@
\begin{docMrcKey}{draw}{=\meta{tile draw}}{no default, initially |auto|}
\begin{itemize}
- \item\docValue{auto}: Draws the map according to \refKey{/mermap/mapdef/resource},
+ \item\docValue{auto}: Draws the map according to \refKey{mermap/mapdef/resource},
i.e. downloaded maps or tiles are used, if available.
\item\docValue{path}: Draws the map according to the style given by
- \refKey{/mermap/map path}. Existing map tiles or merged maps are ignored
+ \refKey{mermap/map path}. Existing map tiles or merged maps are ignored
\item\docValue{tiles}: Draws the map with downloaded map tiles, if
available.
\item\docValue{mergedmap}: Draws the map with a merged picture, if
@@ -75,24 +75,24 @@
Typically, the pixel size of a map tile is fixed and a map tile is a
pixel graphics file. The actual size of such an included picture inside
the document is freely selectable. Note that a very small
-\refKey{/mermap/tile size} results in very small map lettering,
-while a very large \refKey{/mermap/tile size} results results in
+\refKey{mermap/tile size} results in very small map lettering,
+while a very large \refKey{mermap/tile size} results results in
very blurred images.
The general idea of a \emph{flexible} tile size is to specify an aspired
-tile size called \refKey{/mermap/flex tile size} and to give \LaTeX\
-the freedom to select \refKey{/mermap/tile size} in \emph{about the same size}
-as \refKey{/mermap/flex tile size}.
+tile size called \refKey{mermap/flex tile size} and to give \LaTeX\
+the freedom to select \refKey{mermap/tile size} in \emph{about the same size}
+as \refKey{mermap/flex tile size}.
This freedom is used to achieve a \emph{pseudo zoom} called
-\refKey{/mermap/flex zoom} which is a nearly arbitrary rational number instead
-of \refKey{/mermap/supply/zoom} which is a natural number.
+\refKey{mermap/flex zoom} which is a nearly arbitrary rational number instead
+of \refKey{mermap/supply/zoom} which is a natural number.
This \emph{pseudo zoom} is applied by several options which share \emph{flex}
in their names, e.g.
-\refKey{/mermap/flex scale}, \refKey{/mermap/named flex scale},
-\refKey{/mermap/supply/flex reference scale},
-\refKey{/mermap/supply/flex area scale},
-\refKey{/mermap/supply/flex area fit}.
+\refKey{mermap/flex scale}, \refKey{mermap/named flex scale},
+\refKey{mermap/supply/flex reference scale},
+\refKey{mermap/supply/flex area scale},
+\refKey{mermap/supply/flex area fit}.
@@ -101,30 +101,30 @@ in their names, e.g.
For standard tiles with 256 times 256 pixels a tile size of
\SI{32.512}{mm} = \SI{1.28}{in} results in an approximate
\SI{200}{dpi} output for the document.
- For a |beamer| document, consider to use a \refKey{/mermap/tile size} of
+ For a |beamer| document, consider to use a \refKey{mermap/tile size} of
\SI{21.333333}{mm} to get approximate 1:1 pixel input and output (depending on |beamer| settings
- and used hardware). Also see \refKey{/mermap/mapdef/tile size}.
+ and used hardware). Also see \refKey{mermap/mapdef/tile size}.
\end{docMrcKey}
\begin{docMrcKey}{flex tile size}{=\meta{length}}{no default, initially |32.512mm|}
Aspired width and height of a tile picture are set to \meta{length}.
- This value is used while applying \refKey{/mermap/flex zoom}.
+ This value is used while applying \refKey{mermap/flex zoom}.
\end{docMrcKey}
\begin{docMrcKey}{flex zoom}{=\meta{pseudo zoom}}{style, no default}
- This style sets \refKey{/mermap/supply/zoom} and \refKey{/mermap/tile size} in combination.
+ This style sets \refKey{mermap/supply/zoom} and \refKey{mermap/tile size} in combination.
\begin{itemize}
\item
If \meta{pseudo zoom} is a natural number,
- \refKey{/mermap/supply/zoom} is set to \meta{pseudo zoom} and
- \refKey{/mermap/tile size} is set to \refKey{/mermap/flex tile size}.
- \item Otherwise, \refKey{/mermap/supply/zoom} is set to the natural number
- closest to \meta{pseudo zoom} and \refKey{/mermap/tile size} is such
+ \refKey{mermap/supply/zoom} is set to \meta{pseudo zoom} and
+ \refKey{mermap/tile size} is set to \refKey{mermap/flex tile size}.
+ \item Otherwise, \refKey{mermap/supply/zoom} is set to the natural number
+ closest to \meta{pseudo zoom} and \refKey{mermap/tile size} is such
enlarged or reduced that the \meta{pseudo zoom} value is simulated,
i.e. the \emph{impression} of a rational zoom factor is given.
\end{itemize}
- Note that \refKey{/mermap/flex zoom} has to be used \emph{before}
+ Note that \refKey{mermap/flex zoom} has to be used \emph{before}
\refCom{mrcsupplymap} or \refCom{mrcmap}, because the zoom setup is
adapted.
\end{docMrcKey}
@@ -133,12 +133,12 @@ in their names, e.g.
\clearpage
\begin{docMrcKey}{flex scale}{=\meta{scale denominator}:\meta{latitude}}{style, no default}
For different latitude scopes, an identical zoom factor produces maps of
- different scale. With \refKey{/mermap/flex scale}, a \refKey{/mermap/flex zoom}
+ different scale. With \refKey{mermap/flex scale}, a \refKey{mermap/flex zoom}
is computed to achieve the given \meta{scale denominator} at a given \meta{latitude}.
Note that this only applies to the center of a map. If the produced
map is not centered at \meta{latitude}, the produced scale may
differ from the intended one.
- Also see \refKey{/mermap/supply/flex reference scale}.
+ Also see \refKey{mermap/supply/flex reference scale}.
\tikzsetnextfilename{drawing_flex_scale}%
\begin{dispExample}
@@ -162,7 +162,7 @@ in their names, e.g.
\begin{docMrcKey}{named flex scale}{=\meta{scale denominator}:\meta{name}}{style, no default}
- Identical to \refKey{/mermap/flex scale}, but used the \emph{named position}
+ Identical to \refKey{mermap/flex scale}, but used the \emph{named position}
\meta{name} to provide a \emph{latitude}, see \Fullref{sec:names_positions}.
\begin{dispListing}
\mrcNPdef{munich}{48.137222}{11.575556}
@@ -179,12 +179,12 @@ in their names, e.g.
\begin{docCommand}{mrcdrawnetwork}{\oarg{options}}
Draws a geodetic network with meridians and parallels.
- All \meta{options} share the common prefix |/mermap/|.
+ All \meta{options} share the common prefix |mermap/|.
The displayed lines are selected automatically according to some tuning
parameters.
- The map is sliced in \emph{about} maximal \refKey{/mermap/network pieces} in each
+ The map is sliced in \emph{about} maximal \refKey{mermap/network pieces} in each
direction. Meridians and parallels share a minimal distance of
- \emph{about} \refKey{/mermap/network distance}. The algorithm is
+ \emph{about} \refKey{mermap/network distance}. The algorithm is
allowed to violate these conditions \emph{somewhat}.
Note that oversized maps are not supported, i.e. maps which are wider
@@ -213,7 +213,7 @@ in their names, e.g.
\begin{docMrcKey}{network pieces}{=\meta{number}}{no default, initially |8|}
The map is sliced in \emph{about} maximal \meta{number} pieces in each
direction. \meta{number} may be exceeded \emph{somewhat}.
- It is underrun to comply with \refKey{/mermap/network distance}.
+ It is underrun to comply with \refKey{mermap/network distance}.
\end{docMrcKey}
@@ -221,7 +221,7 @@ in their names, e.g.
Meridians and parallels share a minimal distance of
\emph{about} \meta{mesh width}.
\meta{mesh width} may be underrun \emph{somewhat}.
- It is exceeded to comply with \refKey{/mermap/network pieces}.
+ It is exceeded to comply with \refKey{mermap/network pieces}.
For parallels on small scale maps, it refers to an averaged mesh width.
\end{docMrcKey}
diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.examples.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.examples.tex
index 7eb5b5f86e2..11c3068f311 100644
--- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.examples.tex
+++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.examples.tex
@@ -14,13 +14,13 @@ Note to do all preparations documented in \Fullref{sec:python}.
%-------------------------------------------------------------------------------
\subsection{Reference Position}
-With \refKey{/mermap/supply/type}|=|\docValue{reference} a map with a
+With \refKey{mermap/supply/type}|=|\docValue{reference} a map with a
\emph{reference position} is constructed. Here, Munich is taken as
reference position and center of the map. Since the position is used
more than once, it is stored with \refCom{mrcNPdef} for further reference.
-With \refKey{/mermap/supply/flex reference scale} the scale
+With \refKey{mermap/supply/flex reference scale} the scale
is set to 1:6\,000\,000. For the background map tiles, a
-\refKey{/mermap/supply/source} is selected for download.
+\refKey{mermap/supply/source} is selected for download.
This setup is done by \refCom{mrcmap} while \refCom{mrcdrawmap} draws
the downloaded map tiles.
@@ -84,10 +84,10 @@ the downloaded map tiles.
%-------------------------------------------------------------------------------
\subsection{Fitting Area}
-With \refKey{/mermap/supply/type}|=|\docValue{areafit} a map is constructed
+With \refKey{mermap/supply/type}|=|\docValue{areafit} a map is constructed
where a given area is fitted in. The following example lists some
-US-American cities and constructs an \refKey{/mermap/supply/area} which
-contains all of them. With \refKey{/mermap/supply/flex area fit}|=15mm| a
+US-American cities and constructs an \refKey{mermap/supply/area} which
+contains all of them. With \refKey{mermap/supply/flex area fit}|=15mm| a
border region is added.
@@ -102,7 +102,7 @@ border region is added.
\mrcNPdef{denver}{39.7372435}{-104.997378}
\mrcmap[type=areafit,
area={honolulu,fairbanks,sandiego,miami,boston,denver},
- source=stamen terrain,
+ source=topplusopen web,
tex width=15cm, tex height=11cm,
flex area fit=15mm,
]{examples_fitting_area}
@@ -122,12 +122,12 @@ border region is added.
%-------------------------------------------------------------------------------
\subsection{Fixed Boundaries}
-With \refKey{/mermap/supply/type}|=|\docValue{boundaries} a map is constructed
+With \refKey{mermap/supply/type}|=|\docValue{boundaries} a map is constructed
with fixed boundaries. In contrast to the other map types, the document
map size cannot be given directly but derives from the map setup. This bears
the risk of too large maps. The following example is a map with exact
boundaries \mrcformlat{-45} to \mrcformlat{-10}
-and \mrcformlon{110} to \mrcformlon{155}. A decent \refKey{/mermap/supply/zoom}
+and \mrcformlon{110} to \mrcformlon{155}. A decent \refKey{mermap/supply/zoom}
is 5 (every zoom step doubles the map size in each direction).
\tikzsetnextfilename{examples_boundaries}%
@@ -160,7 +160,7 @@ is 5 (every zoom step doubles the map size in each direction).
\subsection{Map Without Map Tiles}
There is no coercion to use downloaded map tiles, if they are not needed or
-wanted. With \refKey{/mermap/supply/target}|=none| no map tiles are downloaded.
+wanted. With \refKey{mermap/supply/target}|=none| no map tiles are downloaded.
The following example draws a rough polygon shape of Germany using
\refEnv{mrcroute*}.
@@ -299,7 +299,7 @@ The following example draws a rough polygon shape of Germany using
%-------------------------------------------------------------------------------
\subsection{Alignment of the Reference Position}
-With \refKey{/mermap/supply/align} the reference position can be aligned
+With \refKey{mermap/supply/align} the reference position can be aligned
at different map positions.
\tikzsetnextfilename{examples_alignment}%
@@ -332,13 +332,13 @@ at different map positions.
\subsection{Flexible Zoom}
Map tiles are only provided at fixed zoom levels with natural numbers,
-but the package allows a \refKey{/mermap/flex zoom} with rational numbers.
+but the package allows a \refKey{mermap/flex zoom} with rational numbers.
The flexible zoom is realized by combining a suitable fixed zoom with
an adapted document tile scaling, see \Fullref{sec:flexible_tile_size}.
The following example shows a more or less smooth zoom increase.
The same technique is used by all options starting with |flex|, e.g.
-\refKey{/mermap/supply/flex reference scale}
-or \refKey{/mermap/supply/flex area fit}
+\refKey{mermap/supply/flex reference scale}
+or \refKey{mermap/supply/flex area fit}
as seen in the examples before.
\tikzexternaldisable
diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.intro.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.intro.tex
index 294f5e278fc..29514fb0f03 100644
--- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.intro.tex
+++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.intro.tex
@@ -18,9 +18,7 @@ and the algorithms of this packages, you are invited to read
\enquote{\fullcite{Sturm:2020}}.
With very few exceptions, the package is programmed with the
-|expl3| \cite{package:expl3} programming interface for \LaTeX3
-and loads the packages
-|xparse| \cite{package:xparse} and |siunitx| \cite{package:siunitx}.
+|expl3| programming interface for \LaTeX3 \cite{l3kernel:interfaces}.
\medskip
@@ -103,7 +101,7 @@ This should give a version number starting with 3. Otherwise, try
\begin{dispListing}
python3 --version
\end{dispListing}
-If this is successful, \refKey{/mermap/python} has to be adapted to |python3|
+If this is successful, \refKey{mermap/python} has to be adapted to |python3|
\subsubsection{Python Packages}
The Python packages |Pillow| (\url{https://pypi.org/project/Pillow/})
diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.limitations.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.limitations.tex
index 0c44427ca54..70a08de273a 100644
--- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.limitations.tex
+++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.limitations.tex
@@ -42,8 +42,8 @@
remember that the eastern hemisphere lies \emph{west} and
the western hemisphere lies \emph{east} for your map.
Consider the following example displaying Vladivostok and Anchorage.
- Here, \refKey{/mermap/supply/west} is set to \ang{130}\,E (|130|)
- and \refKey{/mermap/supply/east} is set to \ang{149}\,W (|211| instead of |-149|).
+ Here, \refKey{mermap/supply/west} is set to \ang{130}\,E (|130|)
+ and \refKey{mermap/supply/east} is set to \ang{149}\,W (|211| instead of |-149|).
There is some automatic correction for positions to fit inside the
defined map (see Anchorage in the example below), but
@@ -123,7 +123,7 @@
\tikzsetnextfilename{limit_zoom_scale_1}
\begin{dispExample}
- \mermapsetsupply{source=stamen terrain, type=reference, zoom=12,
+ \mermapsetsupply{source=topplusopen web, type=reference, zoom=12,
tex width=7cm, tex height=5cm}
\begin{tikzpicture}
\mrcmap[latitude=59.91,longitude=10.75]{oslo1} \mrcdrawmap
@@ -133,12 +133,12 @@
\begin{center}\fontsize{7pt}{7pt}\sffamily\mrcmapattribution\end{center}
\end{dispExample}
- Same example again, but with \refKey{/mermap/flex scale} which gives
+ Same example again, but with \refKey{mermap/flex scale} which gives
1:150000 for both cities and comparable maps.
\tikzsetnextfilename{limit_zoom_scale_2}
\begin{dispExample}
- \mermapsetsupply{source=stamen terrain, type=reference}
+ \mermapsetsupply{source=topplusopen web, type=reference}
\begin{tikzpicture}
\mrcmap[latitude=59.91,longitude=10.75, flex reference scale=150000,
tex width=7cm, tex height=5cm]{oslo2} \mrcdrawmap
diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.maptiles.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.maptiles.tex
index 9786414753f..aa306f59627 100644
--- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.maptiles.tex
+++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.maptiles.tex
@@ -73,7 +73,7 @@ accompanying Python script. The technical background is documented in
\cite[Section~5]{Sturm:2020}.
\begin{enumerate}
-\item \refKey{/mermap/supply/type}|=|\docValue{reference}:
+\item \refKey{mermap/supply/type}|=|\docValue{reference}:
\tcbsidebyside[sidebyside adapt=left,blankest,grow to left by=1cm]
{
\tikzexternaldisable
@@ -85,12 +85,12 @@ accompanying Python script. The technical background is documented in
}{
The default method determines the map dimensions from a reference
position and given document map dimensions.
- Also, a zoom level \refKey{/mermap/supply/zoom}
+ Also, a zoom level \refKey{mermap/supply/zoom}
is required which relates to the Web Mercator map tile covering of the Earth.
A higher zoom level gives a growing number of smaller map tiles.
Alternative to the zoom level, a \meta{scale denominator} can be provided
- by \refKey{/mermap/supply/flex area scale}, \refKey{/mermap/flex scale}
- or \refKey{/mermap/supply/flex reference scale} which determines
+ by \refKey{mermap/supply/flex area scale}, \refKey{mermap/flex scale}
+ or \refKey{mermap/supply/flex reference scale} which determines
the zoom level implicitly.
As default, the reference position is the center of the map, but can be
aligned at the map borders. This method is quite safe to use and could
@@ -100,7 +100,7 @@ accompanying Python script. The technical background is documented in
be more tricky.
}
-\item \refKey{/mermap/supply/type}|=|\docValue{areafit}:
+\item \refKey{mermap/supply/type}|=|\docValue{areafit}:
\tcbsidebyside[sidebyside adapt=left,blankest,grow to left by=1cm]
{
\tikzexternaldisable
@@ -114,7 +114,7 @@ accompanying Python script. The technical background is documented in
The map dimensions are determined by an area with
latitude and longitude boundaries which is fitted into given
document map dimensions. The zoom level is computed accordingly
- for a fixed document tile size or by \refKey{/mermap/supply/flex area fit}.
+ for a fixed document tile size or by \refKey{mermap/supply/flex area fit}.
In any case, the map contains the target area plus some protrusion.
This method is also quite safe to use and may be
the preferred one for many applications like showing a map which contains
@@ -123,7 +123,7 @@ accompanying Python script. The technical background is documented in
the third method can be regarded.
}
-\item \refKey{/mermap/supply/type}|=|\docValue{boundaries}:
+\item \refKey{mermap/supply/type}|=|\docValue{boundaries}:
\tcbsidebyside[sidebyside adapt=left,blankest,grow to left by=1cm]
{
\tikzexternaldisable
@@ -134,11 +134,11 @@ accompanying Python script. The technical background is documented in
}{
The most obvious method determines the map dimensions from
latitude and longitude boundaries. For this, a corresponding zoom level
- \refKey{/mermap/supply/zoom}
+ \refKey{mermap/supply/zoom}
is required which relates to the Web Mercator map tile covering of the Earth.
Alternative to the zoom level, a \meta{scale denominator} can be provided
- by \refKey{/mermap/supply/flex area scale}
- or \refKey{/mermap/supply/flex reference scale} which determines
+ by \refKey{mermap/supply/flex area scale}
+ or \refKey{mermap/supply/flex reference scale} which determines
the zoom level implicitly.
Note that a too high zoom level imposes the risk of downloading an unwanted
high quantity of map tiles resulting in a much too large document map.
@@ -156,9 +156,9 @@ accompanying Python script. The technical background is documented in
\begin{docCommand}{mrcsupplymap}{\oarg{options}\marg{definition}}
The \meta{options} provide parameters for the Python~3 script to supply all
materials for a map.
- All options share the common prefix |/mermap/supply/|.\par
+ All options share the common prefix |mermap/supply/|.\par
The map is identified by\\
- \meta{id}=\refKey{/mermap/definition prefix}+\meta{definition}\\
+ \meta{id}=\refKey{mermap/definition prefix}+\meta{definition}\\
for later drawing.
This identifier \meta{id} has to be unique for the document.
It corresponds to generated files \meta{id}|.def|, \meta{id}|.md5|, and
@@ -172,8 +172,8 @@ accompanying Python script. The technical background is documented in
\begin{docCommand}{mermapsetsupply}{\marg{options}}
Sets \meta{options} for all following maps inside the current \TeX\ group.
- All options share the common prefix |/mermap/supply/|, e.g. for setting
- \refKey{/mermap/supply/type} use
+ All options share the common prefix |mermap/supply/|, e.g. for setting
+ \refKey{mermap/supply/type} use
\begin{dispListing}
\mermapsetsupply{type=reference}
\end{dispListing}
@@ -184,7 +184,7 @@ accompanying Python script. The technical background is documented in
\begin{docMrcKey}{definition prefix}{=\meta{definition prefix}}{no default, initially |maps/|}
Prefix for map identifiers and generated map files, see \refCom{mrcsupplymap}
and \refCom{mrcapplymap}.
- Note that \refKey{/mermap/definition prefix} is not to be used inside
+ Note that \refKey{mermap/definition prefix} is not to be used inside
the option list for \refCom{mrcsupplymap}.
\end{docMrcKey}
@@ -193,30 +193,30 @@ accompanying Python script. The technical background is documented in
\begin{itemize}
\item\docValue{reference}: \flqq map with reference position\frqq\\
The map is constructed from a given reference position
- \refKey{/mermap/supply/latitude},\\
- \refKey{/mermap/supply/longitude},\\
- a zoom level \refKey{/mermap/supply/zoom},\\
+ \refKey{mermap/supply/latitude},\\
+ \refKey{mermap/supply/longitude},\\
+ a zoom level \refKey{mermap/supply/zoom},\\
map dimensions\\
- \refKey{/mermap/supply/width},\\
- \refKey{/mermap/supply/height},\\
- and alignment \refKey{/mermap/supply/align}.
+ \refKey{mermap/supply/width},\\
+ \refKey{mermap/supply/height},\\
+ and alignment \refKey{mermap/supply/align}.
\item\docValue{areafit}: \flqq map fitting an area\frqq\\
The map is constructed from a given area boundaries\\
- \refKey{/mermap/supply/west},\\
- \refKey{/mermap/supply/east},\\
- \refKey{/mermap/supply/north},\\
- \refKey{/mermap/supply/south},\\
+ \refKey{mermap/supply/west},\\
+ \refKey{mermap/supply/east},\\
+ \refKey{mermap/supply/north},\\
+ \refKey{mermap/supply/south},\\
map dimensions\\
- \refKey{/mermap/supply/width},\\
- \refKey{/mermap/supply/height},\\
- and alignment \refKey{/mermap/supply/align}.
+ \refKey{mermap/supply/width},\\
+ \refKey{mermap/supply/height},\\
+ and alignment \refKey{mermap/supply/align}.
\item\docValue{boundaries}: \flqq map with boundaries\frqq\\
The map is constructed from given boundaries\\
- \refKey{/mermap/supply/west},\\
- \refKey{/mermap/supply/east},\\
- \refKey{/mermap/supply/north},\\
- \refKey{/mermap/supply/south},\\
- and zoom level \refKey{/mermap/supply/zoom}.
+ \refKey{mermap/supply/west},\\
+ \refKey{mermap/supply/east},\\
+ \refKey{mermap/supply/north},\\
+ \refKey{mermap/supply/south},\\
+ and zoom level \refKey{mermap/supply/zoom}.
\end{itemize}
\end{docMrcKey}
@@ -229,25 +229,25 @@ accompanying Python script. The technical background is documented in
\begin{docMrcKey}[supply]{north}{=\meta{setup north latitude}}{no default, initially |50|}
Northern latitude degree, possibly negative for the southern hemisphere,
- lower than $90$ but always larger than \refKey{/mermap/supply/south}.
+ lower than $90$ but always larger than \refKey{mermap/supply/south}.
Used for map types \docValue{boundaries} and \docValue{areafit}.
\end{docMrcKey}
\begin{docMrcKey}[supply]{south}{=\meta{setup south latitude}}{no default, initially |48|}
Southern latitude degree, possibly negative for the southern hemisphere,
- larger than $-90$ but always lower than \refKey{/mermap/supply/north}.
+ larger than $-90$ but always lower than \refKey{mermap/supply/north}.
Used for map types \docValue{boundaries} and \docValue{areafit}.
\end{docMrcKey}
\begin{docMrcKey}[supply]{west}{=\meta{setup west longitude}}{no default, initially |11|}
Western longitude degree, possibly negative for the western hemisphere,
- possibly shifted periodically, but always lower than \refKey{/mermap/supply/east}.
+ possibly shifted periodically, but always lower than \refKey{mermap/supply/east}.
Used for map types \docValue{boundaries} and \docValue{areafit}.
\end{docMrcKey}
\begin{docMrcKey}[supply]{east}{=\meta{setup east longitude}}{no default, initially |13|}
Eastern longitude degree, possibly negative for the western hemisphere,
- possibly shifted periodically, but always larger than \refKey{/mermap/supply/west}.
+ possibly shifted periodically, but always larger than \refKey{mermap/supply/west}.
Used for map types \docValue{boundaries} and \docValue{areafit}.
\end{docMrcKey}
@@ -262,19 +262,19 @@ accompanying Python script. The technical background is documented in
{ doc name = add area },
}
Sets
- \refKey{/mermap/supply/north}, \refKey{/mermap/supply/south},
- \refKey{/mermap/supply/west}, \refKey{/mermap/supply/east}
+ \refKey{mermap/supply/north}, \refKey{mermap/supply/south},
+ \refKey{mermap/supply/west}, \refKey{mermap/supply/east}
according to the given \meta{comma separated list of named positions}, i.e.
the described area contains all these positions.\\
- \refKey{/mermap/supply/area} resets the current area which requires
+ \refKey{mermap/supply/area} resets the current area which requires
at least two points inside the list.\\
- \refKey{/mermap/supply/add area} does not reset the current area,
+ \refKey{mermap/supply/add area} does not reset the current area,
i.e. the positions are added to the
current area which possibly grows to fit all positions.\\
Also note to take special care, if the international dateline is on your
resulting map, see \Fullref{sec:dateline}.
Used for map types \docValue{boundaries} and \docValue{areafit}
- or in combination with \refKey{/mermap/supply/area to reference} also
+ or in combination with \refKey{mermap/supply/area to reference} also
for for map type \docValue{reference}.
\end{docMrcKeys}
@@ -290,19 +290,19 @@ accompanying Python script. The technical background is documented in
{ doc name = add area from marker input },
}
Sets
- \refKey{/mermap/supply/north}, \refKey{/mermap/supply/south},
- \refKey{/mermap/supply/west}, \refKey{/mermap/supply/east}
+ \refKey{mermap/supply/north}, \refKey{mermap/supply/south},
+ \refKey{mermap/supply/west}, \refKey{mermap/supply/east}
according to the given \refCom{mrcmarker} positions contained in a
file with the given \meta{file name}.\\
- \refKey{/mermap/supply/area from marker input} resets the current area which requires
+ \refKey{mermap/supply/area from marker input} resets the current area which requires
at least two marker positions inside the file.\\
- \refKey{/mermap/supply/add area from marker input} does not reset the current area,
+ \refKey{mermap/supply/add area from marker input} does not reset the current area,
i.e. the positions are added to the
current area which possibly grows to fit all positions.\\
Also note to take special care, if the international dateline is on your
resulting map, see \Fullref{sec:dateline}.
Used for map types \docValue{boundaries} and \docValue{areafit}
- or in combination with \refKey{/mermap/supply/area to reference} also
+ or in combination with \refKey{mermap/supply/area to reference} also
for for map type \docValue{reference}.
\end{docMrcKeys}
@@ -310,10 +310,10 @@ accompanying Python script. The technical background is documented in
\begin{docMrcKey}[supply]{area to reference}{}{no value, initially unset}
The map settings
- \refKey{/mermap/supply/north}, \refKey{/mermap/supply/south},
- \refKey{/mermap/supply/west}, \refKey{/mermap/supply/east}
+ \refKey{mermap/supply/north}, \refKey{mermap/supply/south},
+ \refKey{mermap/supply/west}, \refKey{mermap/supply/east}
are taken to compute the map center. This center position is saved
- to \refKey{/mermap/supply/latitude} and \refKey{/mermap/supply/longitude}.
+ to \refKey{mermap/supply/latitude} and \refKey{mermap/supply/longitude}.
Used for map type \docValue{reference}.
\end{docMrcKey}
@@ -352,8 +352,8 @@ accompanying Python script. The technical background is documented in
\begin{docMrcKey}[supply]{tex width}{=\meta{width}}{style, no default}
Width of the map as \TeX\ dimension.
- This is a style to compute \refKey{/mermap/supply/width} according to
- the current \refKey{/mermap/tile size}.
+ This is a style to compute \refKey{mermap/supply/width} according to
+ the current \refKey{mermap/tile size}.
\end{docMrcKey}
\begin{docMrcKey}[supply]{height}{=\meta{setup height in tiles}}{no default, initially |4|}
@@ -363,8 +363,8 @@ accompanying Python script. The technical background is documented in
\begin{docMrcKey}[supply]{tex height}{=\meta{width}}{style, no default}
Height of the map as \TeX\ dimension.
- This is a style to compute \refKey{/mermap/supply/height} according to
- the current \refKey{/mermap/tile size}.
+ This is a style to compute \refKey{mermap/supply/height} according to
+ the current \refKey{mermap/tile size}.
\end{docMrcKey}
\begin{docMrcKey}[supply]{align}{=\meta{setup alignment}}{no default, initially |center|}
@@ -379,12 +379,12 @@ accompanying Python script. The technical background is documented in
\begin{itemize}
\item\docValue{none}: No tiles are downloaded and no merged map is generated, just map computation.
This is the fastest method and needs no tile supplier.
- \item\docValue{tiles}: Download map tiles from a tile map service (TMS) \refKey{/mermap/supply/url}.
+ \item\docValue{tiles}: Download map tiles from a tile map service (TMS) \refKey{mermap/supply/url}.
Compilation of a document with map tile takes longer than compilation
with a merged map and transparency should not be used with tiles,
but the resulting document is smaller than a document with merged maps.
\item\docValue{mergedmap}: Download map tiles from a tile map service (TMS)
- \refKey{/mermap/supply/url} and merge them into a single map picture.
+ \refKey{mermap/supply/url} and merge them into a single map picture.
This speeds compilation and allows transparency effects, but
the resulting document is possibly larger than a document with map tiles,
because map tiles often are optimized 8-bit image files while the merged
@@ -394,7 +394,7 @@ accompanying Python script. The technical background is documented in
may differ (shift/size) from the more accurate tile representation by
one pixel.
\item\docValue{wmsmap}: Download a single map from a web map service (WMS)
- \refKey{/mermap/supply/url}. Internally, the package treats a WMS like
+ \refKey{mermap/supply/url}. Internally, the package treats a WMS like
a tile map service including all tile calculations. Actually, a single
file is downloaded.
\end{itemize}
@@ -404,7 +404,7 @@ accompanying Python script. The technical background is documented in
\begin{docMrcKey}[][doc new=2020-08-06]{fail on missing resource}{\colOpt{=true\textbar false}}{default |true|, initially |true|}
If set to |true|, compilation stops with an error, if
- \refKey{/mermap/supply/target} and \refKey{/mermap/mapdef/resource} are different.
+ \refKey{mermap/supply/target} and \refKey{mermap/mapdef/resource} are different.
Typically, this means that something went wrong while trying to download
map tiles. Set this option temporarily to |false|,
if the map tile service or the internet
@@ -427,7 +427,7 @@ accompanying Python script. The technical background is documented in
\begin{docMrcKey}[supply]{url with api key}{=\marg{prefix}\marg{name}\marg{postfix}}{no default}
- This is an alternative version of \refKey{/mermap/supply/url}.
+ This is an alternative version of \refKey{mermap/supply/url}.
The URL is constructed from some fixed \meta{prefix} and \meta{postfix} with
an API key in between. The API key is retrieved by \meta{name} from a
repository filled by \refCom{mrcsetapikey}.
@@ -442,7 +442,7 @@ accompanying Python script. The technical background is documented in
Stores an API key \meta{value} for access with the given \meta{name}.
Typically, \meta{value} is a received ID from a map tile service provider
after personal registration. \meta{name} is a placeholder which is used
- inside \refKey{/mermap/supply/url with api key} to mark the insertion
+ inside \refKey{mermap/supply/url with api key} to mark the insertion
point for the API key.
\begin{dispListing}
\mrcsetapikey{myservice}{....K942XY....}
@@ -454,7 +454,7 @@ accompanying Python script. The technical background is documented in
\begin{docMrcKey}[supply]{attribution}{=\meta{attribution text}}{no default, initially empty}
Attribution text for the map source. Typically, it acknowledges the copyright
of the map data provider. It may contain hyperlinks.
- It is used to set up \refKey{/mermap/mapdef/attribution} afterwards
+ It is used to set up \refKey{mermap/mapdef/attribution} afterwards
and it is accessible as \docAuxCommand{mrcmapattribution} (use read-only).\par
For technical reasons, do not use \verb+"+. \docAuxCommand{mrcumlaut}
may be used for masking umlauts, e.g. use \verb+\mrcumlaut{u}+ instead of
@@ -463,9 +463,9 @@ accompanying Python script. The technical background is documented in
\begin{docMrcKey}[supply]{attribution print}{=\meta{attribution text}}{no default, initially empty}
Attribution text for the map source.
- In contrast to \refKey{/mermap/supply/attribution} it is intended for media
+ In contrast to \refKey{mermap/supply/attribution} it is intended for media
that does not support hyperlinks like printed posters, books, etc.
- It is used to set up \refKey{/mermap/mapdef/attribution print} afterwards
+ It is used to set up \refKey{mermap/mapdef/attribution print} afterwards
and it is accessible as \docAuxCommand{mrcmapattributionprint} (use read-only).
\end{docMrcKey}
@@ -477,10 +477,10 @@ accompanying Python script. The technical background is documented in
\clearpage
\begin{docMrcKey}[supply]{flex reference scale}{=\meta{scale denominator}}{no default}
- With the given \meta{scale denominator}, an appropriate \refKey{/mermap/supply/zoom}
- and \refKey{/mermap/tile size} is computed. Note that
+ With the given \meta{scale denominator}, an appropriate \refKey{mermap/supply/zoom}
+ and \refKey{mermap/tile size} is computed. Note that
the \meta{scale denominator}
- always applies to the current \refKey{/mermap/supply/latitude}
+ always applies to the current \refKey{mermap/supply/latitude}
and is used for map type \docValue{boundaries} and \docValue{reference}.
For example, if the reference point is on the north side of the map,
also the \meta{scale denominator}
@@ -489,16 +489,16 @@ accompanying Python script. The technical background is documented in
Note to take special care to the order of the options.
\begin{itemize}
\item The reference point has to be set \emph{before}
- \refKey{/mermap/supply/flex reference scale}, e.g. by
- \refKey{/mermap/supply/latitude}, \refKey{/mermap/supply/position},
- \refKey{/mermap/supply/named position}.
- \item \refKey{/mermap/supply/tex height}, \refKey{/mermap/supply/tex width}
+ \refKey{mermap/supply/flex reference scale}, e.g. by
+ \refKey{mermap/supply/latitude}, \refKey{mermap/supply/position},
+ \refKey{mermap/supply/named position}.
+ \item \refKey{mermap/supply/tex height}, \refKey{mermap/supply/tex width}
(only for map type \docValue{reference})
- have to be set \emph{after} \refKey{/mermap/supply/flex reference scale},
- because the \refKey{/mermap/tile size} is adapted.
+ have to be set \emph{after} \refKey{mermap/supply/flex reference scale},
+ because the \refKey{mermap/tile size} is adapted.
\end{itemize}
- Also see \refKey{/mermap/flex tile size}, \refKey{/mermap/flex zoom},
- and \refKey{/mermap/flex scale}.
+ Also see \refKey{mermap/flex tile size}, \refKey{mermap/flex zoom},
+ and \refKey{mermap/flex scale}.
\tikzsetnextfilename{maptiles_flex_reference_scale}%
\begin{dispExample}
\begin{tikzpicture}
@@ -519,17 +519,17 @@ accompanying Python script. The technical background is documented in
\begin{docMrcKey}[supply]{flex area scale}{=\meta{scale denominator}}{no default}
- This is a shortcut for setting \refKey{/mermap/supply/area to reference}
- and \refKey{/mermap/supply/flex reference scale}=\meta{scale denominator}.
+ This is a shortcut for setting \refKey{mermap/supply/area to reference}
+ and \refKey{mermap/supply/flex reference scale}=\meta{scale denominator}.
Used for map type \docValue{boundaries} and \docValue{reference}.
Note to take special care to the order of the options.
\begin{itemize}
\item The reference point has to be set \emph{before}
- \refKey{/mermap/supply/flex area scale}.
- \item \refKey{/mermap/supply/tex height}, \refKey{/mermap/supply/tex width}
+ \refKey{mermap/supply/flex area scale}.
+ \item \refKey{mermap/supply/tex height}, \refKey{mermap/supply/tex width}
(only for map type \docValue{reference})
- have to be set \emph{after} \refKey{/mermap/supply/flex reference scale}.
+ have to be set \emph{after} \refKey{mermap/supply/flex reference scale}.
\end{itemize}
\end{docMrcKey}
@@ -538,13 +538,13 @@ accompanying Python script. The technical background is documented in
\begin{docMrcKey}[supply]{flex area fit}{\colOpt{=\meta{size}}}{default |0pt|}
This key can be used for map type \docValue{areafit} as \emph{final}
option \emph{after} all other options.
- It applies a fine tuning to \refKey{/mermap/tile size},
- \refKey{/mermap/supply/width}, and \refKey{/mermap/supply/height} such
+ It applies a fine tuning to \refKey{mermap/tile size},
+ \refKey{mermap/supply/width}, and \refKey{mermap/supply/height} such
that the defined area fits exactly into the map region.
If a \meta{size} is specified, width and height are reduced for the
calculation by this \meta{size}, e.g. \meta{size}|=1cm| ensures a
border of |5mm| on each side.
- Also see \refKey{/mermap/flex tile size} and \refKey{/mermap/flex zoom}.
+ Also see \refKey{mermap/flex tile size} and \refKey{mermap/flex zoom}.
\tikzsetnextfilename{maptiles_flex_area_fit}%
\begin{dispExample}
@@ -580,24 +580,24 @@ accompanying Python script. The technical background is documented in
\begin{docMrcKey}[supply]{dpi}{=\meta{dpi value}}{style, no default}
- This style sets \refKey{/mermap/supply/pixel} such that the given \meta{dpi value}
+ This style sets \refKey{mermap/supply/pixel} such that the given \meta{dpi value}
is resulting (approximately).
\begin{itemize}
\item Note that this only applies for WMS Servers and not for
TMS (Tile Map Service) Servers,
- because there \refKey{/mermap/supply/pixel} is a fixed number depending on
+ because there \refKey{mermap/supply/pixel} is a fixed number depending on
Server settings and cannot be chosen arbitrarily.
\item A high \meta{dpi value} results in large downloaded map files.
If the server does not provide a high resolution map, you will get
unnecessary large files with blurred content.
\item The \meta{dpi value} for TMS data can be changed by adapting
- \refKey{/mermap/tile size} or \refKey{/mermap/flex tile size}.
+ \refKey{mermap/tile size} or \refKey{mermap/flex tile size}.
\end{itemize}
\tikzsetnextfilename{maptiles_dpi_value}
\begin{dispExample}
\begin{tikzpicture}
- \mrcmap[type=reference,latitude=48.14,longitude=11.57,
+ \mrcmap[type=reference,latitude=48.14,longitude=11.57,
flex reference scale=250000,
source=topplusopen p250, target=wmsmap, dpi=300,
tex width=\linewidth,tex height=5cm]{dpi_value}
@@ -654,7 +654,7 @@ map data is free for everyone to use.
\textbf{But, map tile servers based on OpenStreetMap are not necessarily free}.
A list of online raster tile servers based on OpenStreetMap data is found here:\\
-\url{https://wiki.openstreetmap.org/wiki/Tile_servers}
+\url{https://wiki.openstreetmap.org/wiki/Raster_tile_providers}
\begin{itemize}
\item\bfseries I do not run a map tile server.
@@ -681,8 +681,8 @@ want to add more to avoid any legal uncertainties.
\medskip
\begin{docMrcKey}[supply]{source}{=\meta{source}}{style, no default}
- This style sets \refKey{/mermap/supply/url}, \refKey{/mermap/supply/attribution},\\
- \refKey{/mermap/supply/attribution print} and \refKey{/mermap/supply/basename}.\\
+ This style sets \refKey{mermap/supply/url}, \refKey{mermap/supply/attribution},\\
+ \refKey{mermap/supply/attribution print} and \refKey{mermap/supply/basename}.\\
Feasible values for \meta{source} are:
%\mermapset{tile size=3.2512cm}
\newcommand{\mapexample}[3][]{%
@@ -690,10 +690,10 @@ want to add more to avoid any legal uncertainties.
\mermapset{supply/source=#2}%
\begin{itemize}
\item Required attribution (\docAuxCommand{mrcmapattribution}):
- \begin{tcolorbox}[sharp corners,size=fbox,colback=yellow!8,colframe=yellow!80!gray,halign=flush left]
+ \begin{tcolorbox}[sharp corners,size=fbox,colback=yellow!8,colframe=yellow!80!gray,halign=flush left,before skip=2pt]
\mrcmapattribution\end{tcolorbox}
\item Required attribution for media without hyperlinks (\docAuxCommand{mrcmapattributionprint}):
- \begin{tcolorbox}[sharp corners,size=fbox,colback=yellow!8,colframe=yellow!80!gray,halign=flush left]
+ \begin{tcolorbox}[sharp corners,size=fbox,colback=yellow!8,colframe=yellow!80!gray,halign=flush left,before skip=2pt]
\mrcmapattributionprint\end{tcolorbox}
%\par\smallskip\
\end{itemize}
@@ -713,71 +713,13 @@ want to add more to avoid any legal uncertainties.
Dummy tile server at loopback |127.0.0.1| for test purposes.
\item\docValue{opentopomap}:\\
- Tile server (TMS) of \href{http://opentopomap.org/}{OpenTopoMap}.
+ Tile server (TMS) of \href{https://opentopomap.org/}{OpenTopoMap}.
\begin{itemize}
\item Usage (German language): \url{https://opentopomap.org/about#verwendung}
\end{itemize}
\mapexample{opentopomap}{opentopomap}
\clearpage
- \item\docValue{stamen terrain}:\\
- Tile server of \href{http://stamen.com}{Stamen Design}.\\
- Usage: \url{http://maps.stamen.com/#terrain}
- \mapexample{stamen terrain}{stamen_terrain}
-
- \item\docValue{stamen terrain-background}:\\
- Tile server of \href{http://stamen.com}{Stamen Design}.\\
- Usage: \url{http://maps.stamen.com/#terrain-background}
- \mapexample{stamen terrain-background}{stamen_terrain-background}
-
- \item\docValue{stamen terrain-labels}:\\
- Tile server of \href{http://stamen.com}{Stamen Design}.\\
- Usage: \url{http://maps.stamen.com/#terrain-labels}
- \mapexample{stamen terrain-labels}{stamen_terrain-labels}
-
-\clearpage
- \item\docValue{stamen terrain-lines}:\\
- Tile server of \href{http://stamen.com}{Stamen Design}.\\
- Usage: \url{http://maps.stamen.com/#terrain-lines}
- \mapexample{stamen terrain-lines}{stamen_terrain-lines}
-
- \item\docValue{stamen toner}:\\
- Tile server of \href{http://stamen.com}{Stamen Design}.\\
- Usage: \url{http://maps.stamen.com/#toner}
- \mapexample{stamen toner}{stamen_toner}
-
- \item\docValue{stamen toner-lite}:\\
- Tile server of \href{http://stamen.com}{Stamen Design}.\\
- Usage: \url{http://maps.stamen.com/#toner-lite}
- \mapexample{stamen toner-lite}{stamen_toner-lite}
-
-\clearpage
- \item\docValue{stamen toner-hybrid}:\\
- Tile server of \href{http://stamen.com}{Stamen Design}.\\
- Usage: \url{http://maps.stamen.com/#toner-hybrid}
- \mapexample{stamen toner-hybrid}{stamen_toner-hybrid}
-
- \item\docValue{stamen toner-background}:\\
- Tile server of \href{http://stamen.com}{Stamen Design}.\\
- Usage: \url{http://maps.stamen.com/#toner-background}
- \mapexample{stamen toner-background}{stamen_toner-background}
-
- \item\docValue{stamen toner-labels}:\\
- Tile server of \href{http://stamen.com}{Stamen Design}.\\
- Usage: \url{http://maps.stamen.com/#toner-labels}
- \mapexample{stamen toner-labels}{stamen_toner-labels}
-
-\clearpage
- \item\docValue{stamen toner-lines}:\\
- Tile server of \href{http://stamen.com}{Stamen Design}.\\
- Usage: \url{http://maps.stamen.com/#toner-lines}
- \mapexample{stamen toner-lines}{stamen_toner-lines}
-
- \item\docValue{stamen watercolor}:\\
- Tile server of \href{http://stamen.com}{Stamen Design}.\\
- Usage: \url{http://maps.stamen.com/#watercolor}
- \mapexample{stamen watercolor}{stamen_watercolor}
-
\item\docValue{thunderforest opencyclemap}:\\
Tile server of \href{https://www.thunderforest.com}{Thunderforest}.\\
A registered \meta{api-key} is needed (free plan available)
@@ -789,7 +731,6 @@ want to add more to avoid any legal uncertainties.
\end{itemize}
\mapexample{thunderforest opencyclemap}{thunderforest_opencyclemap}
-\clearpage
\item\docValue{thunderforest transport}:\\
Tile server of \href{https://www.thunderforest.com}{Thunderforest}.\\
A registered \meta{api-key} is needed (free plan available)
@@ -812,6 +753,7 @@ want to add more to avoid any legal uncertainties.
\end{itemize}
\mapexample{thunderforest landscape}{thunderforest_landscape}
+\clearpage
\item\docValue{thunderforest outdoors}:\\
Tile server of \href{https://www.thunderforest.com}{Thunderforest}.\\
A registered \meta{api-key} is needed (free plan available)
@@ -823,7 +765,17 @@ want to add more to avoid any legal uncertainties.
\end{itemize}
\mapexample{thunderforest outdoors}{thunderforest_outdoors}
-\clearpage
+ \item\docValue{thunderforest atlas}:\tcbdocmarginnote{\tcbdocnew{2024-07-29}}\\
+ Tile server of \href{https://www.thunderforest.com}{Thunderforest}.\\
+ A registered \meta{api-key} is needed (free plan available)
+ which is applied by\\
+ \refCom{mrcsetapikey}\brackets{\docValue{thunderforest}}\marg{api-key}.
+ \begin{itemize}
+ \item Usage: \url{https://www.thunderforest.com/terms}
+ \item API documentation: \url{https://www.thunderforest.com/maps/atlas}
+ \end{itemize}
+ \mapexample{thunderforest atlas}{thunderforest_atlas}
+
\item\docValue{thunderforest transport-dark}:\\
Tile server of \href{https://www.thunderforest.com}{Thunderforest}.\\
A registered \meta{api-key} is needed (free plan available)
@@ -835,6 +787,7 @@ want to add more to avoid any legal uncertainties.
\end{itemize}
\mapexample{thunderforest transport-dark}{thunderforest_transport-dark}
+\clearpage
\item\docValue{thunderforest spinal-map}:\\
Tile server of \href{https://www.thunderforest.com}{Thunderforest}.\\
A registered \meta{api-key} is needed (free plan available)
@@ -857,7 +810,6 @@ want to add more to avoid any legal uncertainties.
\end{itemize}
\mapexample{thunderforest pioneer}{thunderforest_pioneer}
-\clearpage
\item\docValue{thunderforest mobile-atlas}:\\
Tile server of \href{https://www.thunderforest.com}{Thunderforest}.\\
A registered \meta{api-key} is needed (free plan available)
@@ -869,6 +821,7 @@ want to add more to avoid any legal uncertainties.
\end{itemize}
\mapexample{thunderforest mobile-atlas}{thunderforest_mobile-atlas}
+\clearpage
\item\docValue{thunderforest neighbourhood}:\\
Tile server of \href{https://www.thunderforest.com}{Thunderforest}.\\
A registered \meta{api-key} is needed (free plan available)
@@ -880,31 +833,49 @@ want to add more to avoid any legal uncertainties.
\end{itemize}
\mapexample{thunderforest neighbourhood}{thunderforest_neighbourhood}
-\clearpage
\item\docValue{topplusopen web}:\\
- Tile server (TMS) of \href{http://www.bkg.bund.de}{Bundesamt f\"{u}r Kartographie und Geod\"{a}sie}.
+ Tile server (TMS) of \href{https://www.bkg.bund.de}{Bundesamt f\"{u}r Kartographie und Geod\"{a}sie}.
\begin{itemize}
\item Covers world / Europe / Germany depending on zoom level
- \item Usage (German language): \url{https://gdz.bkg.bund.de/index.php/default/webdienste/topplus-produkte/wmts-topplusopen-wmts-topplus-open.html}
+ \item Usage (German language): \url{https://gdz.bkg.bund.de/index.php/default/digitale-geodaten/topplusopen-produkte.html}
\end{itemize}
\mapexample{topplusopen web}{topplusopen_web}
\item\docValue{topplusopen web grau}:\\
- Tile server (TMS) of \href{http://www.bkg.bund.de}{Bundesamt f\"{u}r Kartographie und Geod\"{a}sie}.
+ Tile server (TMS) of \href{https://www.bkg.bund.de}{Bundesamt f\"{u}r Kartographie und Geod\"{a}sie}.
\begin{itemize}
\item Covers world / Europe / Germany depending on zoom level
- \item Usage (German language): \url{https://gdz.bkg.bund.de/index.php/default/webdienste/topplus-produkte/wmts-topplusopen-wmts-topplus-open.html}
+ \item Usage (German language): \url{https://gdz.bkg.bund.de/index.php/default/digitale-geodaten/topplusopen-produkte.html}
\end{itemize}
\mapexample{topplusopen web grau}{topplusopen_web_grau}
+\clearpage
+ \item\docValue{topplusopen web light}:\tcbdocmarginnote{\tcbdocnew{2024-07-29}}\\
+ Tile server (TMS) of \href{https://www.bkg.bund.de}{Bundesamt f\"{u}r Kartographie und Geod\"{a}sie}.
+ \begin{itemize}
+ \item Covers world / Europe / Germany depending on zoom level
+ \item Usage (German language): \url{https://gdz.bkg.bund.de/index.php/default/digitale-geodaten/topplusopen-produkte.html}
+ \end{itemize}
+ \mapexample{topplusopen web light}{topplusopen_web_light}
+
+ \item\docValue{topplusopen web light grau}\tcbdocmarginnote{\tcbdocnew{2024-07-29}}:\\
+ Tile server (TMS) of \href{https://www.bkg.bund.de}{Bundesamt f\"{u}r Kartographie und Geod\"{a}sie}.
+ \begin{itemize}
+ \item Covers world / Europe / Germany depending on zoom level
+ \item Usage (German language): \url{https://gdz.bkg.bund.de/index.php/default/digitale-geodaten/topplusopen-produkte.html}
+ \end{itemize}
+ \mapexample{topplusopen web light grau}{topplusopen_web_light_grau}
+
\end{itemize}
-\clearpage
+
+\vfill
\begin{tcolorbox}[spartan,colback=white]
The following sources are Web map server (WMS). Therefore,
-\refKey{/mermap/supply/target} can only be set to \docValue{wmsmap}
+\refKey{mermap/supply/target} can only be set to \docValue{wmsmap}
or \docValue{none}.
\end{tcolorbox}
+\clearpage
\begingroup
\ExplSyntaxOn
@@ -928,19 +899,19 @@ or \docValue{none}.
{
\cleanstep
\item\docValue{topplusopen \name}:\\
- Web map server (WMS) of \href{http://www.bkg.bund.de}{Bundesamt f\"{u}r Kartographie und Geod\"{a}sie}.
+ Web map server (WMS) of \href{https://www.bkg.bund.de}{Bundesamt f\"{u}r Kartographie und Geod\"{a}sie}.
\begin{itemize}
\item 1:\scdenom, covers Europe / Germany depending on zoom level
- \item Usage (German language): \url{https://gdz.bkg.bund.de/index.php/default/webdienste/topplus-produkte/wmts-topplusopen-wmts-topplus-open.html}
+ \item Usage (German language): \url{https://gdz.bkg.bund.de/index.php/default/digitale-geodaten/topplusopen-produkte.html}
\end{itemize}
\mapexample[target=wmsmap]{topplusopen \name}{topplusopen_\name}
\cleanstep
\item\docValue{topplusopen \name\ grau}:\\
- Web map server (WMS) of \href{http://www.bkg.bund.de}{Bundesamt f\"{u}r Kartographie und Geod\"{a}sie}.
+ Web map server (WMS) of \href{https://www.bkg.bund.de}{Bundesamt f\"{u}r Kartographie und Geod\"{a}sie}.
\begin{itemize}
\item 1:\scdenom, covers Europe / Germany depending on zoom level
- \item Usage (German language): \url{https://gdz.bkg.bund.de/index.php/default/webdienste/topplus-produkte/wmts-topplusopen-wmts-topplus-open.html}
+ \item Usage (German language): \url{https://gdz.bkg.bund.de/index.php/default/digitale-geodaten/topplusopen-produkte.html}
\end{itemize}
\def\grau{ grau}%
\mapexample[target=wmsmap]{topplusopen \name\grau}{topplusopen_\name_grau}
@@ -954,16 +925,16 @@ or \docValue{none}.
\begin{docCommand}{mrcnewsupplysource}{\marg{source}\marg{options}}
- Adds a new \meta{source} value to \refKey{/mermap/supply/source}.
+ Adds a new \meta{source} value to \refKey{mermap/supply/source}.
The \meta{options} should set the keys
- \refKey{/mermap/supply/url}, \refKey{/mermap/supply/attribution},\\
- \refKey{/mermap/supply/attribution print} and \refKey{/mermap/supply/basename}.
+ \refKey{mermap/supply/url}, \refKey{mermap/supply/attribution},\\
+ \refKey{mermap/supply/attribution print} and \refKey{mermap/supply/basename}.
It is recommend to use |x ...| for \meta{source} to avoid conflicts
- with future official additions to \refKey{/mermap/supply/source}.
+ with future official additions to \refKey{mermap/supply/source}.
\begin{dispListing}
\mrcnewsupplysource{x example}
{
- url = http://127.0.0.1/dummy/{z}/{x}/{y}.png,
+ url = https://127.0.0.1/dummy/{z}/{x}/{y}.png,
attribution = {Dummy tile server},
attribution print = {Dummy tile server},
basename = tiles/dummy,
diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.marker.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.marker.tex
index dcd0e072b86..fb206c339eb 100644
--- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.marker.tex
+++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.marker.tex
@@ -14,8 +14,8 @@ may be helpful which provides some predefined marker types.
\begin{docCommand}{mrcmarker}{\marg{options}}
Places a marker according to the given \meta{options} on the map.
- All \meta{options} share the common prefix |/mermap/marker/|.
- Different \refKey{/mermap/marker/type} settings are available which are
+ All \meta{options} share the common prefix |mermap/marker/|.
+ Different \refKey{mermap/marker/type} settings are available which are
more or less customizable.
\tikzsetnextfilename{marker_mrcmarker}%
@@ -48,8 +48,8 @@ may be helpful which provides some predefined marker types.
\begin{docCommand}{mermapsetmarker}{\marg{options}}
Sets \meta{options} for all following markers inside the current \TeX\ group.
- All options share the common prefix |/mermap/marker/|, e.g. for setting
- \refKey{/mermap/marker/type} use
+ All options share the common prefix |mermap/marker/|, e.g. for setting
+ \refKey{mermap/marker/type} use
\begin{dispListing}
\mermapsetmarker{type=pin}
\end{dispListing}
@@ -74,7 +74,7 @@ may be helpful which provides some predefined marker types.
\end{docMrcKey}
\begin{docMrcKey}[marker]{lat}{=\meta{latitude}}{no default, initially |12|}
- Alias for \refKey{/mermap/marker/latitude}.
+ Alias for \refKey{mermap/marker/latitude}.
\end{docMrcKey}
\begin{docMrcKey}[marker]{longitude}{=\meta{longitude}}{no default, initially |49|}
@@ -83,7 +83,7 @@ may be helpful which provides some predefined marker types.
\end{docMrcKey}
\begin{docMrcKey}[marker]{lon}{=\meta{longitude}}{no default, initially |49|}
- Alias for \refKey{/mermap/marker/longitude}.
+ Alias for \refKey{mermap/marker/longitude}.
\end{docMrcKey}
\begin{docMrcKey}[marker]{position}{=\meta{place latitude}:\meta{place longitude}}{no default, initially |12:49|}
@@ -100,7 +100,7 @@ may be helpful which provides some predefined marker types.
given \meta{area}. Feasible values for \meta{area} are:
\begin{itemize}
\item\docValue{map}: Use inside map.
- \item\docValue{vicinity}: Use inside map plus vicinity, see \refKey{/mermap/vicinity}.
+ \item\docValue{vicinity}: Use inside map plus vicinity, see \refKey{mermap/vicinity}.
\end{itemize}
\end{docMrcKey}
@@ -157,36 +157,36 @@ may be helpful which provides some predefined marker types.
\begin{docMrcKey}[marker]{hide}{\colOpt{=true\textbar false}}{default |true|, initially |false|}
If set to |true|, the marker is not used.
- \refKey{/mermap/marker/hide} is inverse to \refKey{/mermap/marker/show}.
+ \refKey{mermap/marker/hide} is inverse to \refKey{mermap/marker/show}.
\end{docMrcKey}
\begin{docMrcKey}[marker]{show category}{=\meta{category}}{style, no default}
- Sets \refKey{/mermap/marker/show} to |true|, if \refKey{/mermap/marker/category} equals \meta{category}.
+ Sets \refKey{mermap/marker/show} to |true|, if \refKey{mermap/marker/category} equals \meta{category}.
Otherwise, nothing happens.
- \refKey{/mermap/marker/category} has to be set \emph{before}.
+ \refKey{mermap/marker/category} has to be set \emph{before}.
\end{docMrcKey}
\begin{docMrcKey}[marker]{show all but category}{=\meta{category}}{style, no default}
- Sets \refKey{/mermap/marker/show} to |true|, if \refKey{/mermap/marker/category} does not equal \meta{category}.
+ Sets \refKey{mermap/marker/show} to |true|, if \refKey{mermap/marker/category} does not equal \meta{category}.
Otherwise, nothing happens.
- \refKey{/mermap/marker/category} has to be set \emph{before}.
+ \refKey{mermap/marker/category} has to be set \emph{before}.
\end{docMrcKey}
\begin{docMrcKey}[marker]{hide category}{=\meta{category}}{style, no default}
- Sets \refKey{/mermap/marker/show} to |false|, if \refKey{/mermap/marker/category} equals \meta{category}.
+ Sets \refKey{mermap/marker/show} to |false|, if \refKey{mermap/marker/category} equals \meta{category}.
Otherwise, nothing happens.
- \refKey{/mermap/marker/category} has to be set \emph{before}.
+ \refKey{mermap/marker/category} has to be set \emph{before}.
\end{docMrcKey}
\begin{docMrcKey}[marker]{hide all but category}{=\meta{category}}{style, no default}
- Sets \refKey{/mermap/marker/show} to |false|, if \refKey{/mermap/marker/category} does not equal \meta{category}.
+ Sets \refKey{mermap/marker/show} to |false|, if \refKey{mermap/marker/category} does not equal \meta{category}.
Otherwise, nothing happens.
- \refKey{/mermap/marker/category} has to be set \emph{before}.
+ \refKey{mermap/marker/category} has to be set \emph{before}.
\tikzsetnextfilename{marker_hide}%
\begin{dispExample}
\begin{tikzpicture}
@@ -206,10 +206,10 @@ may be helpful which provides some predefined marker types.
\clearpage
The following options require the package |hyperref| to be loaded.
-If |hyperref| is not loaded, \refKey{/mermap/marker/url} and
-\refKey{/mermap/marker/link} are ignored.\\
-Note that if \refKey{/mermap/marker/url} and \refKey{/mermap/marker/link}
-are applied concurrently, then \refKey{/mermap/marker/link} will win.
+If |hyperref| is not loaded, \refKey{mermap/marker/url} and
+\refKey{mermap/marker/link} are ignored.\\
+Note that if \refKey{mermap/marker/url} and \refKey{mermap/marker/link}
+are applied concurrently, then \refKey{mermap/marker/link} will win.
\begin{docMrcKeys}[
@@ -279,9 +279,9 @@ are applied concurrently, then \refKey{/mermap/marker/link} will win.
doc description = {default |true|, initially |false|},
},
}
- If \refKey{/mermap/marker/use urls} is set to |false|, external links
- with \refKey{/mermap/marker/url} are ignored.\\
- \refKey{/mermap/marker/ignore urls} is inverse to \refKey{/mermap/marker/use urls}.
+ If \refKey{mermap/marker/use urls} is set to |false|, external links
+ with \refKey{mermap/marker/url} are ignored.\\
+ \refKey{mermap/marker/ignore urls} is inverse to \refKey{mermap/marker/use urls}.
\end{docMrcKeys}
@@ -299,9 +299,9 @@ are applied concurrently, then \refKey{/mermap/marker/link} will win.
doc description = {default |true|, initially |false|},
},
}
- If \refKey{/mermap/marker/use links} is set to |false|, internal links
- with \refKey{/mermap/marker/link} are ignored.\\
- \refKey{/mermap/marker/ignore links} is inverse to \refKey{/mermap/marker/use links}.
+ If \refKey{mermap/marker/use links} is set to |false|, internal links
+ with \refKey{mermap/marker/link} are ignored.\\
+ \refKey{mermap/marker/ignore links} is inverse to \refKey{mermap/marker/use links}.
\end{docMrcKeys}
@@ -596,7 +596,7 @@ The different marker types can be customized by some additional options:
\subsection{New Marker Types}
\begin{docCommand}{mrcnewmarkertype}{\marg{type name}\marg{\tikzname\ code}}
- Creates a new \refKey{/mermap/marker/type} value \meta{type name} using the
+ Creates a new \refKey{mermap/marker/type} value \meta{type name} using the
given \meta{\tikzname\ code} for drawing a place marker.
To avoid future name clashes, you should start a private \meta{type name}
with letter |x|. For \meta{\tikzname\ code} settings like
@@ -630,9 +630,9 @@ The different marker types can be customized by some additional options:
\subsection{New Marker Styles}
\begin{docCommand}{mrcnewmarkerstyle}{\marg{style name}\marg{options}}
- Creates a new \refKey{/mermap/marker/style} value \meta{style name} using the
+ Creates a new \refKey{mermap/marker/style} value \meta{style name} using the
given \meta{options} for drawing a place marker.
- All \meta{options} share the common prefix |/mermap/marker/|. Here, a \emph{style}
+ All \meta{options} share the common prefix |mermap/marker/|. Here, a \emph{style}
has the same concept as a \tikzname\ style.
\tikzsetnextfilename{marker_markerstyle}%
diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.orthodromes.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.orthodromes.tex
index cddb277c86b..6f9620fae0c 100644
--- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.orthodromes.tex
+++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.orthodromes.tex
@@ -26,7 +26,7 @@ The mathematical background and further information are found in \cite{Sturm:202
\begin{docTikzKey}{mermap samples}{=\meta{number}}{style, no default}
- \tikzname\ variant to set \refKey{/mermap/samples}.
+ \tikzname\ variant to set \refKey{mermap/samples}.
\end{docTikzKey}
\enlargethispage*{1cm}
@@ -56,7 +56,7 @@ The mathematical background and further information are found in \cite{Sturm:202
\mrcclipmap
\draw (mrcmap.south west) rectangle (mrcmap.north east);
\mrcdraworthodrome[red,very thick,mermap samples=100]
- {48.14}{11.58}{40.71}{-74.01}
+ {48.14}{11.58}{40.71}{-74.01}
\node[red,fill=white] at ([above=1.3cm]mrcmap) {
\mrcprettyorthodistance{48.14}{11.58}{40.71}{-74.01} };
\end{tikzpicture}
@@ -99,6 +99,120 @@ The mathematical background and further information are found in \cite{Sturm:202
\clearpage
%-------------------------------------------------------------------------------
+\subsection{Orthodrome Points}
+
+\begin{docCommands}[
+ ]{
+ {
+ doc new and updated = {2024-08-01}{2024-08-05},
+ doc name = mrcNPfromOrthoFraction,
+ doc parameter = \marg{name}\oarg{\textbackslash angle}\marg{lat1}\marg{lon1}\marg{lat2}\marg{lon2}\marg{fraction},
+ },
+ {
+ doc name = mrcNPfromOrthoFractionNamed,
+ doc parameter = \marg{name}\oarg{\textbackslash angle}\marg{name1}\marg{name2}\marg{fraction},
+ },
+ }
+ Defines a new named position \meta{name} which is located on a \meta{fraction}
+ from the starting point of the orthodromic curve
+ from a point with
+ latitude \meta{lat1} and longitude \meta{lon1} (or described by a named position \meta{name1})
+ to a point with
+ latitude \meta{lat2} and longitude \meta{lon2} (or described by a named position \meta{name2}).
+ The given starting and final point of the orthodrome need to have a distance of more than
+ \SI{1}{\meter}.
+ If \meta{\textbackslash angle} is given, this macro is set to the
+ angle between the tangent vector to the orthodrome and
+ the current parallel circle.
+
+\tikzsetnextfilename{ortho_orthodrome3}%
+\begin{dispExample}
+ \begin{tikzpicture}
+ \mrcNPdef{munich}{48.14}{11.58}
+ \mrcNPdef{newyork}{40.71}{-74.01}
+ \mrcmap[type=areafit, area={munich,newyork},
+ source=topplusopen web,
+ tex width=\linewidth,tex height=6cm,
+ ]{ortho_orthodrome3}
+ \mrcdrawmap
+ \node[below,font=\fontsize{7pt}{7pt}\sffamily] at (mrcmap.south)
+ {\mrcmapattribution};
+ \mrcclipmap
+ \draw (mrcmap.south west) rectangle (mrcmap.north east);
+ \mrcmarker{type=pin,named position=munich,contents={M\"unchen}}
+ \mrcmarker{type=pinflip,shift=5mm,named position=newyork,
+ contents={New York City}}
+ \mrcNPdraworthodrome[red,very thick] {munich}{newyork}
+ \foreach \fraction in { 0.1,0.3,0.5,0.7,1.0,1.1 }
+ {
+ \mrcNPfromOrthoFractionNamed{waypoint}[\myangle]
+ {munich}{newyork}{\fraction}
+ \mrcmarker{type=pin,named position=waypoint,
+ contents={\fraction: \fpeval{round(\myangle)}\textdegree }}
+ }
+ \end{tikzpicture}
+\end{dispExample}
+\end{docCommands}
+
+\clearpage
+
+\begin{docCommands}[
+ ]{
+ {
+ doc new and updated = {2024-08-01}{2024-08-05},
+ doc name = mrcNPfromOrthoDistance,
+ doc parameter = \marg{name}\oarg{\textbackslash angle}\marg{lat1}\marg{lon1}\marg{lat2}\marg{lon2}\marg{distance},
+ },
+ {
+ doc name = mrcNPfromOrthoDistanceNamed,
+ doc parameter = \marg{name}\oarg{\textbackslash angle}\marg{name1}\marg{name2}\marg{distance},
+ },
+ }
+ Defines a new named position \meta{name} which is located on a \meta{distance}
+ from the starting point of the orthodromic curve
+ from a point with
+ latitude \meta{lat1} and longitude \meta{lon1} (or described by a named position \meta{name1})
+ to a point with
+ latitude \meta{lat2} and longitude \meta{lon2} (or described by a named position \meta{name2}).
+ The given starting and final point of the orthodrome need to have a distance of more than
+ \SI{1}{\meter}. The unit for the \meta{distance} is kilometer.
+ If \meta{\textbackslash angle} is given, this macro is set to the
+ angle between the tangent vector to the orthodrome and
+ the current parallel circle.
+
+\tikzsetnextfilename{ortho_orthodrome4}%
+\begin{dispExample}
+ \begin{tikzpicture}
+ \mrcNPdef{munich}{48.14}{11.58}
+ \mrcNPdef{newyork}{40.71}{-74.01}
+ \mrcmap[type=areafit, area={munich,newyork},
+ source=topplusopen web,
+ tex width=\linewidth,tex height=6cm,
+ ]{ortho_orthodrome4}
+ \mrcdrawmap
+ \node[below,font=\fontsize{7pt}{7pt}\sffamily] at (mrcmap.south)
+ {\mrcmapattribution};
+ \mrcclipmap
+ \draw (mrcmap.south west) rectangle (mrcmap.north east);
+ \mrcmarker{type=pin,named position=munich,contents={M\"unchen}}
+ \mrcmarker{type=pinflip,shift=5mm,named position=newyork,
+ contents={New York City}}
+ \mrcNPdraworthodrome[red,very thick] {munich}{newyork}
+ \foreach \distance in { 1000,2000,3000,4000,5000,6000 }
+ {
+ \mrcNPfromOrthoDistanceNamed{waypoint}{munich}{newyork}{\distance}
+ \mrcmarker{type=pin,named position=waypoint,
+ contents={\SI{\distance}{\kilo\meter}}}
+ }
+ \end{tikzpicture}
+\end{dispExample}
+\end{docCommands}
+
+
+
+
+\clearpage
+%-------------------------------------------------------------------------------
\subsection{Orthodromic and Loxodromic Distances}
\begin{docCommand}{mrcprettyorthodistance}{\marg{lat1}\marg{lon1}\marg{lat2}\marg{lon2}}
diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.scales.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.scales.tex
index 6efc4fe0d09..9e210c2a240 100644
--- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.scales.tex
+++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.scales.tex
@@ -164,7 +164,7 @@ but not for critical navigation purposes etc.
\begin{docCommand}{mrcdrawscalebar}{\oarg{options}}
Draws a scale bar according to the given \meta{options}.
- All \meta{options} share the common prefix |/mermap/scalebar/|.
+ All \meta{options} share the common prefix |mermap/scalebar/|.
The most essential option is the \emph{width} of the scale bar.
\tikzsetnextfilename{scales_scalebar1}
@@ -216,7 +216,7 @@ but not for critical navigation purposes etc.
\end{docMrcKey}
\begin{docMrcKey}[scalebar]{width-in-kilometer}{=\meta{number}}{no default, initially |0|}
- Alias for \refKey{/mermap/scalebar/width-in-km}
+ Alias for \refKey{mermap/scalebar/width-in-km}
\end{docMrcKey}
\begin{docMrcKey}[scalebar]{width-in-meter}{=\meta{number}}{no default, initially |0|}
@@ -247,7 +247,7 @@ but not for critical navigation purposes etc.
\begin{docMrcKey}[scalebar]{at}{=\marg{\tikzname\ coordinate}}{no default,
initially \texttt{\brackets{(0,0)}}}
The scale bar is positioned at the given \meta{\tikzname\ coordinate}.
- The placement is done with the \refKey{/mermap/scalebar/placement} option.
+ The placement is done with the \refKey{mermap/scalebar/placement} option.
Both option correspond to the \tikzname\ options for positioning nodes.
The scale bar can be positioned outside the map (e.g. below), but
remember to use \refCom{mrcclipmap} \emph{after} the scale bar
@@ -285,7 +285,7 @@ but not for critical navigation purposes etc.
\begin{docMrcKey}[scalebar]{placement}{=\meta{\tikzname\ positioning}}{no default, initially empty}
\meta{\tikzname\ positioning} of a scale bar in combination with
- \refKey{/mermap/scalebar/at}. All \tikzname\ placement options for nodes
+ \refKey{mermap/scalebar/at}. All \tikzname\ placement options for nodes
can be used, e.g. \texttt{above left} or \texttt{anchor=mid west}, etc.
Actually, \emph{any} node option could be applied here, but the intended use
is for placement options only.
@@ -298,7 +298,7 @@ but not for critical navigation purposes etc.
absolute shift values in each direction, i.e. the algebraic sign is
automatically complemented.
If only \meta{x shift} is given, then \meta{y shift} is set
- to the same value. \refKey{/mermap/scalebar/at} and \refKey{/mermap/scalebar/placement}
+ to the same value. \refKey{mermap/scalebar/at} and \refKey{mermap/scalebar/placement}
are set by this option.
\end{docMrcKey}
@@ -349,8 +349,8 @@ but not for critical navigation purposes etc.
The \emph{minor} part of the scale bar is a single \tikzname\ path object
which can be customized by the given \meta{\tikzname\ options}.
The \emph{minor} part is seen as holes in the default case.
- \refKey{/mermap/scalebar/minor style} has only an effect, if
- the minor part is drawn \refKey{/mermap/scalebar/solid}.
+ \refKey{mermap/scalebar/minor style} has only an effect, if
+ the minor part is drawn \refKey{mermap/scalebar/solid}.
\tikzsetnextfilename{scales_scalebar5}
\begin{dispExample}
\begin{tikzpicture}
@@ -369,7 +369,7 @@ but not for critical navigation purposes etc.
\begin{docMrcKey}[scalebar]{single}{\colOpt{=true\textbar false}}{default |true|, initially |false|}
If set to |true|, the scale bar is drawn as a single ruler.
- \refKey{/mermap/scalebar/single} is inverse to \refKey{/mermap/scalebar/double}.
+ \refKey{mermap/scalebar/single} is inverse to \refKey{mermap/scalebar/double}.
\tikzsetnextfilename{scales_scalebar6}
\begin{dispExample}
\begin{tikzpicture}
@@ -387,8 +387,8 @@ but not for critical navigation purposes etc.
\begin{docMrcKey}[scalebar]{solid}{\colOpt{=true\textbar false}}{default |true|, initially |false|}
If set to |true|, the \emph{minor} part of the scale bar is drawn opaque.
- It is drawn white or according to \refKey{/mermap/scalebar/minor style}.
- \refKey{/mermap/scalebar/solid} is inverse to \refKey{/mermap/scalebar/transparent}.
+ It is drawn white or according to \refKey{mermap/scalebar/minor style}.
+ \refKey{mermap/scalebar/solid} is inverse to \refKey{mermap/scalebar/transparent}.
\end{docMrcKey}
diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.sty b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.sty
index 80b38241ce2..95b45544d7e 100644
--- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.sty
+++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.sty
@@ -4,10 +4,9 @@
\renewcommand*\l@subsubsection{\@dottedtocline{3}{4.2em}{3.2em}}
\RequirePackage[T1]{fontenc}
-\RequirePackage[utf8]{inputenc}
\RequirePackage[english]{babel}
\RequirePackage{lmodern,parskip,array}
-\RequirePackage[svgnames,table,hyperref]{xcolor}
+\RequirePackage[svgnames,table]{xcolor}
\RequirePackage{tikz}
\RequirePackage{varioref}
\RequirePackage[makeindex]{imakeidx}
@@ -31,15 +30,17 @@
\RequirePackage{array,tabularx,booktabs}
\RequirePackage{lipsum}
\RequirePackage[extendedchars,encoding,filenameencoding=utf-8]{grffile}
-\RequirePackage{siunitx,xfp}
+\RequirePackage{xfp}
\RequirePackage{tcolorbox}
-\tcbuselibrary{skins,xparse,minted,breakable,documentation,raster}
+\tcbuselibrary{skins,minted,breakable,documentation,raster}
\providecommand\mrcpkgprefix{}
\RequirePackage{\mrcpkgprefix mercatormap}
\IfFileExists{../private/privatekeys.tex}{\input{../private/privatekeys.tex}}{}
+\RequirePackage{fontawesome5}
+
\RequirePackage{csquotes}
\RequirePackage[%style=authoryear,
style=numeric-comp,
@@ -96,8 +97,8 @@
borderline horizontal={0.3mm}{0pt}{red!50},
#1}{#2}
-\tcbmakedocSubKey{docMrcKey}{mermap}
-\tcbmakedocSubKeys{docMrcKeys}{mermap}
+\tcbmakedocSubKey[doc key prefix=]{docMrcKey}{mermap}
+\tcbmakedocSubKeys[doc key prefix=]{docMrcKeys}{mermap}
\tcbmakedocSubKey{docTikzKey}{tikz}
\def\tikzname{\textup{Ti\textit{k}Z}}
diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.versionhistory.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.versionhistory.tex
deleted file mode 100644
index bcdf2fd322e..00000000000
--- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.doc.versionhistory.tex
+++ /dev/null
@@ -1,50 +0,0 @@
-% !TeX root = mercatormap.tex
-% !TeX encoding=UTF-8
-% !TeX spellcheck=en_US
-% include file of mercatormap.tex (manual of the LaTeX package mercatormap)
-\clearpage
-\section{Version History}%
-
-\section*{v1.00 (2020/04/20)}
-\begin{itemize}
-\item Initial public release.
-\end{itemize}
-
-\section*{v1.01 (2020/05/05)}
-\begin{itemize}
-\item Sorting of index key entries fixed for the documentation.
-\item User messages for failed Python script calls are changed from warnings to
- errors to fail fast and to provide more information and hints about
- possible reasons.
-\item New general marker option
- \refKey{/mermap/marker/generic} with corresponding macros
- \docAuxCommand*{mrcmarkergeneric}
- and \docAuxCommand*{l_mermap_marker_generic_tl}. Also, the marker uuid is
- made |expl3| accessible as \docAuxCommand*{l_mermap_marker_uuid_tl}.
-\item New hyper marker options
- \refKey{/mermap/marker/url},
- \refKey{/mermap/marker/link},
- \refKey{/mermap/marker/use urls},
- \refKey{/mermap/marker/ignore urls},
- \refKey{/mermap/marker/use links},
- \refKey{/mermap/marker/ignore links}.
-\end{itemize}
-
-
-\section*{v1.02 (2020/08/06)}
-\begin{itemize}
-\item New options
- \refKey{/mermap/supply/area from marker input} and
- \refKey{/mermap/supply/add area from marker input}
- which allow to fit a map to a given external list of marker positions.
-\item New option \refKey{/mermap/fail on missing resource} to control
- compilation behavior for missing resource files.
-\item Openrouteservice has discontinued mapsurfer tiles since June 2020.\\
- Therefore, \refKey{/mermap/supply/source}=\docValue{openrouteservice mapsurfer}
- is deprecated now. It is not documented any more, but
- for some time it is still available for old documents with
- cached map tiles.
-\item\issuetracker{2}
- New marker option \refKey{/mermap/marker/distance} with corresponding
- macro \docAuxCommand{mrcmarkerdistance}.
-\end{itemize}
diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.pdf b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.pdf
index d90d7496174..1c0c7dc3d83 100644
--- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.pdf
+++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.tex b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.tex
index 882587a3d2a..a904cce2f98 100644
--- a/Master/texmf-dist/doc/latex/mercatormap/mercatormap.tex
+++ b/Master/texmf-dist/doc/latex/mercatormap/mercatormap.tex
@@ -2,11 +2,11 @@
% !TeX encoding=UTF-8
% !TeX spellcheck=en_US
%%
-%% The LaTeX package mercatormap - version 1.02 (2020/08/06)
+%% The LaTeX package mercatormap - version 1.2.0 (2024/08/05)
%% mercatormap.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2020-2024 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -32,8 +32,8 @@
% The following personal API-keys are needed for compilation
% \mrcsetapikey{thunderforest}{YOUR-API-KEY} % registered key
-\def\version{1.02}%
-\def\datum{2020/08/06}%
+\def\version{1.2.0}%
+\def\datum{2024/08/05}%
\mrcactivatescript% activates Python script
@@ -54,9 +54,14 @@
\tikzexternaldisable% for final version
\tcbset{shield externalize}
-\nocite{Sturm:2020,package:tikz,package:xparse,package:siunitx,package:expl3}
+\nocite{Sturm:2020,package:tikz,package:siunitx}
-\pdfsuppresswarningpagegroup=1
+\ExplSyntaxOn
+\cs_if_exist:NT \pdfsuppresswarningpagegroup
+ {
+ \pdfsuppresswarningpagegroup=1
+ }
+\ExplSyntaxOff
%\includeonly{mercatormap.doc.intro}
%\includeonly{mercatormap.doc.examples}
@@ -67,8 +72,8 @@
%\includeonly{mercatormap.doc.marker}
%\includeonly{mercatormap.doc.routes}
%\includeonly{mercatormap.doc.orthodromes}
+%\includeonly{mercatormap.doc.animations}
%\includeonly{mercatormap.doc.limitations}
-%\includeonly{mercatormap.doc.versionhistory}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{document}
@@ -83,8 +88,8 @@
\include{mercatormap.doc.marker}
\include{mercatormap.doc.routes}
\include{mercatormap.doc.orthodromes}
+\include{mercatormap.doc.animations}
\include{mercatormap.doc.limitations}
-\include{mercatormap.doc.versionhistory}
\clearpage
\phantomsection
diff --git a/Master/texmf-dist/doc/latex/mitthesis/MIT-Thesis.pdf b/Master/texmf-dist/doc/latex/mitthesis/MIT-Thesis.pdf
index fffb7fbf43b..e7f9b4a01ac 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 4311237b489..fc7e8a88f15 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
@@ -3,7 +3,7 @@
% This file is MIT-Thesis.tex, a LaTeX template for formatting an MIT thesis with the mitthesis class.
%
-% Version: 1.13, 2024/07/03
+% Version: 1.14, 2024/07/19
%
% Author: John H. Lienhard, copyright 2024. Reuse under the MIT license: https://ctan.org/license/mit
@@ -182,13 +182,13 @@
% 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{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
- \Acceptor{Primus Castor}{Professor of Wetlands Engineering}{Undergraduate Officer, Department of Physics}
+ \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, {}.
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 481e96a4c4e..1f2acd20a6d 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.05, 2023/11/03
+% Version: 1.06, 2024/07/09
% Documentation: https://ctan.org/pkg/mitthesis
@@ -7,7 +7,7 @@
\lipsum[1-2] Postremo aliquos futuros suspicor, qui me ad alias litteras vocent, genus hoc scribendi, etsi sit elegans, personae tamen et dignitatis esse negent~\cite{DKE1969,ww1920,kirk2288a,churchill1948,gibbs1863}.
-\section[A section discussing the first issue: \(J/\psi\)]{A section discussing the first issue: \ifpdftex\(\bm{J}/\bm{\psi}\)\else{\(\symbfup{J/\psi}\)}\fi}
+\section[A section discussing the first issue: \(J/\psi\)]{A section discussing the first issue: \ifpdftex\(\bm{J}/\bm{\psi}\)\else{\(\symbfit{J/\psi}\)}\fi}
We begin with some ideas from the literature \cite{Fong2015,sharpe1}.
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 bc7ba62c916..8795eb547e0 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}[2024/06/28 v1.04 Load Computer/Latin Modern text and math fonts]
+\ProvidesFile{mitthesis-defaultfonts.tex}[2023/09/12 v1.03 Load Computer/Latin Modern text and math fonts]
%% Default fonts
%
\ifpdftex
- \ClassNoteNoLine{\ClassName}{Loading Computer Modern text and math fonts (default for pdftex)}
+ \typeout{^^JLoading Computer Modern text and math fonts (default for pdftex).^^J}
\RequirePackage[T1]{fontenc}
\RequirePackage{bm}
\else
- \ClassNoteNoLine{\ClassName}{Loading Latin Modern text and math fonts (default for unicode engines)}
+ \typeout{^^JLoading Latin Modern text and math fonts (default for unicode engines).^^J}
%
\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 ebba9ab190a..01fa981d78b 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}[2024/06/28 v1.05 Load Fira Sans text font with newtx sans serif math font and Inconsolata typewriter font]
+\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]
%% Fira Sans text font with newtx sans serif math font and Inconsolata typewriter font
%
\ifpdftex
- \ClassNoteNoLine{\ClassName}{Loading Fira sans text font with newtx sans serif math font and Inconsolata typewriter}
+ \typeout{^^JLoading Fira sans text font with newtx sans serif math font and Inconsolata typewriter^^J}
\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{\ClassName}{The fira-newtxsf font set requires pdflatex. Defaulting to LMR fonts}
+ \ClassWarning{mitnewthesis}{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 1535771f11f..26ee2ab07bc 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}[2024/06/28 v1.03 Load TeX Gyre Heros (sans serif) text font with STIX Two Math font and Inconsolata monospaced font]
+\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]
%% 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{\ClassName}{The heros-stix2 fontset requires a unicode engine. Defaulting to CMR fonts}
+ \ClassWarning{mitnewthesis}{The heros-stix2 fontset requires a unicode engine. Defaulting to CMR fonts.}
\RequirePackage[T1]{fontenc}
\RequirePackage{bm}
\else
- \ClassNoteNoLine{\ClassName}{TeX Gyre Heros (sans serif) text font with STIX2 math font and Inconsolata monospaced font}
+ \typeout{^^JTeX Gyre Heros (sans serif) text font with STIX2 math font and Inconsolata monospaced font.^^J}
%
\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 41b2f561dff..57cf26f915b 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}[2024/06/28 v1.03 Load Libertine and related fonts]
+\ProvidesFile{mitthesis-libertine.tex}[2023/09/12 v1.02 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
- \ClassNoteNoLine{\ClassName}{Loading newtx-libertine text and math fonts with Insolata typewriter font}
+ \typeout{^^JLoading newtx-libertine text and math fonts with Insolata typewriter font^^J}
\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
- \ClassNoteNoLine{\ClassName}{Loading Linux Libertine (serif) text font with Libertinus math font}
+ \typeout{^^JLoading Linux Libertine (serif) text font with Libertinus math font^^J}
%
\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 e18c72fd924..6466c369294 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}[2024/06/28 v1.03 Load Lucida fonts]
+\ProvidesFile{mitthesis-lucida.tex}[2023/09/12 v1.02 Load Lucida fonts]
%% Lucida Bright and Lucida Bright Math fonts (available from the TeX Users Group)
-\ClassNoteNoLine{\ClassName}{Lucida Bright and Lucida Bright Math fonts}
+\typeout{^^JLucida Bright and Lucida Bright Math fonts^^J}
\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 b76428f383f..03d62286e2c 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,12 +1,11 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mitthesis-newtx-sans-text.tex}[2024/06/68 v1.04 Load newtx sans-serif text and regular math fonts]
+\ProvidesFile{mitthesis-newtx-sans-text.tex}[2023/10/03 v1.03 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
\AtEndPreamble{% added to accommodate v1.731 of newtx, 2023/11/03
@@ -18,7 +17,7 @@
% \DeclareFontFamily{\encodingdefault}{\ttdefault}{\hyphenchar\font=`\-} %
\RequirePackage{bm}% bold math
\else
- \ClassWarning{\ClassName}{The newtx font set requires pdflatex. Defaulting to LMR fonts}
+ \ClassWarning{mitnewthesis}{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 b1541bbd051..cc43427055b 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}[2024/06/28 v1.04 Load newtx text and math fonts]
+\ProvidesFile{mitthesis-newtx.tex}[2023/09/12 v1.03 Load newtx text and math fonts]
\ifpdftex
- \ClassNoteNoLine{\ClassName}{Loading newtx fonts with inconsolata typewriter}
+ \typeout{^^JLoading newtx fonts with inconsolata typewriter^^J}
\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{\ClassName}{The newtx font set requires pdflatex. Defaulting to LMR fonts}
+ \ClassWarning{mitnewthesis}{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 c178ff233fa..de3983fe4ee 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}[2024/06/28 v1.04 Load STIX Two text and math fonts]
+\ProvidesFile{mitthesis-stix2.tex}[2023/09/12 v1.03 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{\ClassName}{The stix2 fontset requires a unicode engine. Defaulting to CMR fonts.}
+ \ClassWarning{mitnewthesis}{The stix2 fontset requires a unicode engine. Defaulting to CMR fonts.}
\RequirePackage[T1]{fontenc}
\RequirePackage{bm}
\else
- \ClassNoteNoLine{\ClassName}{Loading STIX Two text and math fonts with Heros sans serif font and Inconsolata monospaced font}
+ \typeout{^^JLoading STIX Two text and math fonts with Heros sans serif font and Inconsolata monospaced font.^^J}
%
\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 ed2abc16557..1e65724cc0b 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}[2024/10/28 v1.04 Load TeX Gyre Termes text font with STIX2 math font, Heros sans serif font, and Inconsolata monospaced font]
+\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]
%% 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{\ClassName}{The termes-stix2 fontset requires a unicode engine. Defaulting to CMR fonts.}
+ \ClassWarning{mitnewthesis}{The termes-stix2 fontset requires a unicode engine. Defaulting to CMR fonts.}
\RequirePackage[T1]{fontenc}
\RequirePackage{bm}
\else
- \ClassNoteNoLine{\ClassName}{Loading TeX Gyre Termes text font with STIX2 math font, Heros sans serif font, and Inconsolata monospaced font}
+ \typeout{^^JLoading TeX Gyre Termes text font with STIX2 math font, Heros sans serif font, and Inconsolata monospaced font.^^J}
%
\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 fd1e15bab87..64fffb92643 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}[2024/06/28 v1.04 Load TeX Gyre Termes text and math fonts, Heros sans serif font, and Cursor monospaced font]
+\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]
%% 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{\ClassName}{The termes fontset requires a unicode engine. Defaulting to CMR fonts.}
+ \ClassWarning{mitnewthesis}{The termes fontset requires a unicode engine. Defaulting to CMR fonts.}
\RequirePackage[T1]{fontenc}
\RequirePackage{bm}
\else
- \ClassNoteNoLine{\ClassName}{Loading TeX Gyre Termes text and math fonts, Heros sans serif font, and Cursor monospaced font}
+ \typeout{^^JLoading TeX Gyre Termes text and math fonts, Heros sans serif font, and Cursor monospaced font^^J}
\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 ef715210744..1d9184e9730 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,7 +1,7 @@
% From mitthesis package
% Documentation: https://ctan.org/pkg/mitthesis
-\ProvidesFile{mydesign.tex}[20234/06/28 v1.04 Typographic design options for thesis]
+\ProvidesFile{mydesign.tex}[2024/06/28 v1.04 Typographic design options for thesis]
%%%%%%%%%% Color support %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/doc/latex/mitthesis/README.md b/Master/texmf-dist/doc/latex/mitthesis/README.md
index c7035183044..9d2918ca360 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/README.md
+++ b/Master/texmf-dist/doc/latex/mitthesis/README.md
@@ -1,11 +1,11 @@
#mitthesis --- A LaTeX template for an MIT thesis#
- v1.13 dated 2024/07/03
+ v1.14 dated 2024/07/19
####Overview####
This class provides a LaTeX template to format an MIT thesis according to
- the requirements of the Massachusetts Institute of Technology Libraries (as posted in 2023):
+ the requirements of the Massachusetts Institute of Technology Libraries (as posted in 2024):
[https://libraries.mit.edu/distinctive-collections/thesis-specs/](https://libraries.mit.edu/distinctive-collections/thesis-specs/)
@@ -53,6 +53,12 @@
---
####Change log####
+ v1.14 (19 July 2024)
+ - add backward compatibility code for \\text_titlecase_all:n
+ - adjust supervisor and acceptor titles used on sample cover pages
+ - format J/psi as \\symbfit in sample chapter 1 and regenerate font samples
+ - edit documentation
+
v1.13 (03 July 2024)
- same as v1.12, except now includes the correct documentation
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/No_cc_license.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/No_cc_license.pdf
index 304d89113b8..159f037a4d0 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/No_cc_license.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/No_cc_license.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/One_author_one_degree.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/One_author_one_degree.pdf
index 737603f89c9..8b4d3e09429 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/One_author_one_degree.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/One_author_one_degree.pdf
Binary files differ
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/One_author_one_degree_two_departments.pdf
index c10db9e046e..e7e2f13e887 100644
--- 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/One_author_one_degree_two_departments.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/One_author_two_degrees.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/One_author_two_degrees.pdf
index 7ab9882820a..1adb097a705 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/One_author_two_degrees.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/One_author_two_degrees.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/One_author_two_degrees_from_one_department.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/One_author_two_degrees_from_one_department.pdf
index 8950c7ed3c6..0617a275f80 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/One_author_two_degrees_from_one_department.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/One_author_two_degrees_from_one_department.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/Two_authors_one_degree.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/Two_authors_one_degree.pdf
index 61a2b631153..7e4300d5b67 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/Two_authors_one_degree.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/Two_authors_one_degree.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/Two_authors_two_degrees.pdf b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/Two_authors_two_degrees.pdf
index c9ccbd8a9a5..299acda3388 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/Two_authors_two_degrees.pdf
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/Two_authors_two_degrees.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/One_author_one_degree_two_departments.tex
index cf4fce672e8..6c1f5c39827 100644
--- 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/One_author_one_degree_two_departments.tex
@@ -3,7 +3,7 @@
% !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
+% Version 1.02, 2024/07/08
% Documentation: https://ctan.org/pkg/mitthesis
@@ -75,7 +75,7 @@
% 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{Silas W. Holman}{Department of Nuclear Science and Engineering}%[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 {}.
@@ -83,23 +83,17 @@
\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{Edward C. Pickering}{Professor of Nuclear Science and Engineering}
+%\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{Primus Castor}{Professor and Graduate Officer}{Department of Nuclear Science and Engineering}
+\Acceptor{Tertius Castor}{Professor and Graduate Officer}{Center for Computational Science and 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.
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/One_author_two_degrees.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/One_author_two_degrees.tex
index 6334a228aef..f8ebb1b9650 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/One_author_two_degrees.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/One_author_two_degrees.tex
@@ -85,8 +85,7 @@
% 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}
+\Supervisor{Secunda Castor}{Professor of Mechanical Engineering}
% 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
diff --git a/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/Two_authors_one_degree.tex b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/Two_authors_one_degree.tex
index e5e2618b691..a757806b010 100644
--- a/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/Two_authors_one_degree.tex
+++ b/Master/texmf-dist/doc/latex/mitthesis/examples/cover_page_samples/latex_sources/Two_authors_one_degree.tex
@@ -2,7 +2,7 @@
% !BIB TS-program = biber
% !BIB program = biber
-% Author: John H. Lienhard (c) 2023. Reuse under the MIT license: https://ctan.org/license/mit
+% Author: John H. Lienhard (c) 2024. Reuse under the MIT license: https://ctan.org/license/mit
% Documentation: https://ctan.org/pkg/mitthesis
@@ -75,7 +75,7 @@
% 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]
+\Author{Luisa Hernández}{Department of Physics}[B.S. Mechanical Engineering, UCLA, 2018][M.S. Stellar Interiors, Vulcan Science Academy, 2020][MBA, Ferengi School of Management, 2022]
% Use once for each degree fulfilled by thesis
% For two degrees from one department, leave the department argument blank for the second degree {}.
@@ -85,20 +85,11 @@
% 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 of Wetlands Engineering}{Graduate Officer, Department of Physics}
\Acceptor{Quintus 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 your title page is overflowing (from too many names, degrees, etc.), you can scale
-% down the Signature block at the bottom with this command, or use another creative solution...
-%\SignatureBlockSize{\small} %\SignatureBlockSize{\footnotesize}
% Usage: \DegreeDate{Month}{year}
% Valid degree months are September, February, or June.
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 fd9fc21485e..57a957b6ba5 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
@@ -2,8 +2,8 @@
% !BIB TS-program = biber
% !BIB program = biber
-% Author: John H. Lienhard (c) 2023. Reuse under the MIT license: https://ctan.org/license/mit
-% Version 1.01, 2023/10/27
+% Author: John H. Lienhard (c) 2024. Reuse under the MIT license: https://ctan.org/license/mit
+% Version 1.02, 2024/07/08
% Documentation: https://ctan.org/pkg/mitthesis
@@ -82,19 +82,16 @@
% 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 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}
-\Supervisor{Secunda Castor}{Professor of Research}
-%\Supervisor{Quintus Castor}{Professor of Log Dams}
+\Supervisor{Secunda Castor}{Professor of of Mechanical Engineering}
% 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,
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 c32bcc359c0..97243bde84e 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 f78b32a6d95..cc3e40ce75e 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 0262aabdef1..c09afd43ee7 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 44d54df9460..418bf7e8d3a 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 d667a4bed4c..43081a36f02 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 9f22058aa02..d21ca4d0578 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 fabf8cd29a6..45952c0c528 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 7c38f1d8287..0792ee30f92 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 c7993b99aa9..80b8e07d107 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 4affab86130..90dfd3ab31a 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/mitthesis-doc/mitthesis-doc.pdf b/Master/texmf-dist/doc/latex/mitthesis/mitthesis-doc/mitthesis-doc.pdf
index 94724d1eec4..ab61cf59e59 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 6f8954813b3..4e5e739585b 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,7 +1,7 @@
% !TEX TS-program = lualatex
% !TEX encoding = UTF-8 Unicode
-% Version date: 1 July 2024
+% Version date: 19 July 2024
\DocumentMetadata
{
@@ -24,6 +24,8 @@
\usepackage[x11names,svgnames,dvipsnames,table]{xcolor}
\usepackage{luacolor} % load AFTER xcolor
+\usepackage{mathtools}
+
\usepackage[en-US]{datetime2} %% change default date format
\makeatletter
\newcommand{\daymonthyeardate}{%
@@ -191,7 +193,7 @@
\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.
+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}
\tableofcontents
@@ -220,7 +222,7 @@ If the most current version of \texttt{mitthesis.cls} is installed in your syste
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{\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.
+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 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,
@@ -242,7 +244,7 @@ Note that third, fourth, fifth, and sixth arguments are optional [..] and may be
\item \verb|\Degree{name of degree}{department giving degree}|. Use once for each degree fulfilled by the thesis.
-If two departments jointly issue a single degree, leave the degree argument blank for the \textit{second} degree:
+If two departments jointly issue a single degree, leave the degree name 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}{}|.
@@ -312,7 +314,7 @@ twoside & gives facing-page behavior for two-sided printing; omitting it will e
\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 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.
+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. For unicode engines, you must have the relevant fonts installed as system fonts on your computer.
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.
@@ -351,7 +353,7 @@ termes-stix2 & no & yes & serif & serif & \url{http://www.gust.org.pl/projects/
\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.
+With \texttt{mydesign.tex}, you can set options for packages that manage color, e.g.\ \texttt{\hrefurl{https://ctan.org/pkg/xcolor}{xcolor}}, 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 change the margins with \verb|\newgeometry{..}| from the \texttt{\hrefurl{https://ctan.org/pkg/geometry}{geometry}} package. 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.
@@ -367,15 +369,15 @@ have one nomenclature list for whole thesis or one for each chapter (the default
For example, the following code
\begin{center}
-\begin{minipage}{0.8\textwidth}
+\begin{minipage}{0.85\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}$]}
+\entry{$\mathbf{u}$}{velocity [m s$\cramped{^{-1}}$]}
\EntryHeading{Greek letters}
-\entry{$\Gamma$}{circulation [m$^2$ s$^{-1}$]}
-\entry{$\rho$}{mass density [kg m$^{-3}$]}
+\entry{$\Gamma$}{circulation [m$\cramped{^2}$ s$\cramped{^{-1}}$]}
+\entry{$\rho$}{mass density [kg m$\cramped{^{-3}}$]}
\end{nomenclature}
\end{verbatim}
\end{minipage}
@@ -386,13 +388,14 @@ produces the nomenclature list below
\begin{nomenclature}[2em][Nomenclature for Chapter 1][section]
\EntryHeading{Roman letters}
\entry{$\mathcal{C}$}{material curve}
-\entry{$\mathbf{u}$}{velocity [m s$^{-1}$]}
+\entry{$\mathbf{u}$}{velocity [m s$\cramped{^{-1}}$]}
\EntryHeading{Greek letters}
-\entry{$\Gamma$}{circulation [m$^2$ s$^{-1}$]}
-\entry{$\rho$}{mass density [kg m$^{-3}$]}
+\entry{$\Gamma$}{circulation [m$\cramped{^2}$ s$\cramped{^{-1}}$]}
+\entry{$\rho$}{mass density [kg m$\cramped{^{-3}}$]}
\end{nomenclature}
\end{minipage}
\end{center}
+%% \cramped is from the mathtools package, and moves the superscript a bit lower
\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
@@ -458,13 +461,13 @@ unicode-math & --- & load in a fontset file if using a unicode engine\\
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.
\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
+When a thesis supervisor has multiple titles (which 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.
-\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|.
+\subsection{Overflowing title page: managing space} If your title page overflows the vertical space (from too many authors, degrees, previous degrees, etc.), you can use 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
diff --git a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
index a02c0ed4510..bcfdad1373e 100644
--- a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
+++ b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
@@ -1,3 +1,6 @@
+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).
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 c0fc87708ed..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 ada0536fa7d..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,4 +1,4 @@
-%% moderncv_userguide.tex as shipped with 2024-07-08 v2.4.0 modern curriculum vitae and letter document class (moderncv)
+%% 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
@@ -9,7 +9,7 @@
\title{%
\texttt{moderncv} User Guide\\
- {\small Package v2.4.0}%
+ {\small Package v2.4.1}%
}
% Cristina Sambo,
\author{%
diff --git a/Master/texmf-dist/doc/latex/oberdiek/README.md b/Master/texmf-dist/doc/latex/oberdiek/README.md
index 4a2250cf370..b455eff334b 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/README.md
+++ b/Master/texmf-dist/doc/latex/oberdiek/README.md
@@ -1,6 +1,6 @@
# Oberdiek bundle
-Version: 2023-12-04
+Version: 2024-07-26
This file describes the directory
CTAN:macros/latex/contrib/oberdiek/
@@ -11,7 +11,7 @@ It contains several packages:
## Copyright (C)
* 2007, 2009-2011 Heiko Oberdiek
-* 2016-2023 Oberdiek Package Support Group
+* 2016-2024 Oberdiek Package Support Group
## License
LATEX Project Public License, version 1.3c or later.
@@ -48,7 +48,6 @@ Other files in the CTAN directory:
* flags: setting and clearing flags in bit fields and converting the bit field into a decimal number;
* holtxdoc: extra documentation macros;
* hypbmsec: bookmarks in sectioning commands;
-* hypcap: anjusting anchors of captions;
* hypgotoe: experimental package for links to embedded files;
* hyphsubst: substitute hyphenation patterns;
* ifdraft: switch for option draft;
@@ -66,6 +65,5 @@ Other files in the CTAN directory:
* stampinclude: selects the files for \include by inspecting the timestamp of the .aux file(s);
* tabularht: tabulars with height specification;
* tabularkv: key value interface for tabular parameters;
-* telprint: print German telephone numbers;
* thepdfnumber: canonical numbers for use in PDF files and elsewhere;
* twoopt: commands with two optional arguments;
diff --git a/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf b/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf
index 5978332f27d..cac6636ab96 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf b/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf
index ecd47adb939..b376afc96a7 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/centernot.pdf b/Master/texmf-dist/doc/latex/oberdiek/centernot.pdf
index 344a2454332..a0984732eaf 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/centernot.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/centernot.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf b/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf
index c745f155827..7a39e48a3ef 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf b/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf
index 40ef460d948..365627fee6d 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf b/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf
index 1b4e949c6b8..3446b595397 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf b/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf
index 21243da3b15..3ff66c8e895 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/engord.pdf b/Master/texmf-dist/doc/latex/oberdiek/engord.pdf
index 0bd217efbac..49c876e5b6b 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/engord.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/engord.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/enparen.pdf b/Master/texmf-dist/doc/latex/oberdiek/enparen.pdf
index d4de5125ba9..284b88c5c15 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/enparen.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/enparen.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/eolgrab.pdf b/Master/texmf-dist/doc/latex/oberdiek/eolgrab.pdf
index 23c097b5711..24a22d462cc 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/eolgrab.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/eolgrab.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/fibnum.pdf b/Master/texmf-dist/doc/latex/oberdiek/fibnum.pdf
index 2d2510854e7..7a143ac3b67 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/fibnum.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/fibnum.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/flags.pdf b/Master/texmf-dist/doc/latex/oberdiek/flags.pdf
index f0c8b76d544..17c5868612d 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/flags.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/flags.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf b/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf
index 67d630bd545..f2825ebf65f 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf
index 45e3ce42c29..9e75d5e8fee 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypgotoe.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypgotoe.pdf
index 98d7d1dd4b6..a6203e57a11 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/hypgotoe.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/hypgotoe.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/hyphsubst.pdf b/Master/texmf-dist/doc/latex/oberdiek/hyphsubst.pdf
index 4c390bfdd9e..0d559684d12 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/hyphsubst.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/hyphsubst.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf
index 35e257d875a..7e6a2510923 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/iflang.pdf b/Master/texmf-dist/doc/latex/oberdiek/iflang.pdf
index 98cb0644a32..c1941fa6eea 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/iflang.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/iflang.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf b/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf
index 16e08d826a8..31c3efdda72 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.pdf
index 90a3b348a0a..d97c8441f43 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcolparcolumns.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcolparcolumns.pdf
index a49189ba4aa..8afe31978aa 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdfcolparcolumns.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcolparcolumns.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf
index 1de22245d4b..eabda461d72 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/protecteddef.pdf b/Master/texmf-dist/doc/latex/oberdiek/protecteddef.pdf
index cabaa32c497..c5d984bf5e8 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/protecteddef.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/protecteddef.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/resizegather.pdf b/Master/texmf-dist/doc/latex/oberdiek/resizegather.pdf
index 11d07da19cc..5bf853391cd 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/resizegather.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/resizegather.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/rotchiffre.pdf b/Master/texmf-dist/doc/latex/oberdiek/rotchiffre.pdf
index 7deae8d7561..5504f90b564 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/rotchiffre.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/rotchiffre.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/scrindex.pdf b/Master/texmf-dist/doc/latex/oberdiek/scrindex.pdf
index 0ca63d3e6d2..a2e2cba8255 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/scrindex.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/scrindex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf b/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf
index dbdb939c6e2..03757dc214d 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/settobox-example.tex b/Master/texmf-dist/doc/latex/oberdiek/settobox-example.tex
index 521074c5cca..33454e19f33 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/settobox-example.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/settobox-example.tex
@@ -60,7 +60,7 @@
% c) Print #1 commands.
% d) Print box with frame
%
-% The implemenation looks more weird:
+% The implementation looks more weird:
\makeatletter
\newcommand*{\test}[1]{%
\par
diff --git a/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf b/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf
index a2f1c8d1790..ef92916de2e 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf b/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf
index df11fd28ddd..4edbb64c31c 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/stampinclude.pdf b/Master/texmf-dist/doc/latex/oberdiek/stampinclude.pdf
index 55b57219a3c..b98bf15bb16 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/stampinclude.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/stampinclude.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf b/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf
index 893fe33acf1..3a70cec6a2c 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf b/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf
index e6ea130064b..dedc3251c06 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/thepdfnumber.pdf b/Master/texmf-dist/doc/latex/oberdiek/thepdfnumber.pdf
index 8d4b73d65fa..61d98f6985c 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/thepdfnumber.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/thepdfnumber.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf b/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf
index 6a144a8368a..071dd4d2b25 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pagelayout/README.md b/Master/texmf-dist/doc/latex/pagelayout/README.md
index dec375b5d39..8d08f566f73 100644
--- a/Master/texmf-dist/doc/latex/pagelayout/README.md
+++ b/Master/texmf-dist/doc/latex/pagelayout/README.md
@@ -1,4 +1,4 @@
-![The pagelayout LaTeX class](banner.svg)
+![The pagelayout LaTeX class](https://raw.githubusercontent.com/friedemannbartels/latex-pagelayout/1.1.1/doc/banner.svg)
The pagelayout class enables you to design pages declaratively using simple macros for pages, covers, grids, templates, text, and graphics to create graphic rich, perfectly typeset, and print ready PDFs.
@@ -26,7 +26,7 @@ Create a page with the `\page` command. A grid with rows and cells helps you to
}
```
-![A page with a two column layout](quickstart-1.svg)
+![A page with a two column layout](https://raw.githubusercontent.com/friedemannbartels/latex-pagelayout/1.1.1/doc/quickstart-1.svg)
### Templates
@@ -44,7 +44,7 @@ You can set width relations between grid cells and height relations between grid
\template{my template}{}
```
-![A template with two placeholders](quickstart-2.svg)
+![A template with two placeholders](https://raw.githubusercontent.com/friedemannbartels/latex-pagelayout/1.1.1/doc/quickstart-2.svg)
You can set margin and gutter at grid, page, or document level.
@@ -72,17 +72,17 @@ You can scale and position a graphic. And you can add borders and box shadows to
}
```
-![Photo with border and shadow](quickstart-3.svg)
+![Photo with border and shadow](https://raw.githubusercontent.com/friedemannbartels/latex-pagelayout/1.1.1/doc/quickstart-3.svg)
-Have a look at the [examples](doc) to learn how to create double pages, covers, and more.
+Have a look at the [examples](https://github.com/friedemannbartels/latex-pagelayout/tree/1.1.1/doc) to learn how to create double pages, covers, and more.
-For a complete reference, read the [manual](pagelayout-manual.pdf).
+For a complete reference, read the [manual](https://raw.githubusercontent.com/friedemannbartels/latex-pagelayout/1.1.1/doc/pagelayout-manual.pdf).
## Installation
In general, you should use the package manager shipped with your TeX distribution to install the pagelayout package.
-To install manually, copy the contents of [pagelayout.tds.zip](https://github.com/friedemannbartels/latex-pagelayout/releases/download/1.1.0/pagelayout-1.1.0.tds.zip) to your local TeX directory tree and run the command `texhash`.
+To install manually, copy the contents of [pagelayout.tds.zip](https://github.com/friedemannbartels/latex-pagelayout/releases/download/1.1.1/pagelayout.tds.zip) to your local TeX directory tree and run the command `texhash`.
To enable image optimization, shadow creation, and preflight, perform these installation steps:
diff --git a/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.pdf b/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.pdf
index 6913eb17ce8..a8ec76cc089 100644
--- a/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.pdf
+++ b/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.tex b/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.tex
index 460f1170d08..df37ebaa6fc 100644
--- a/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.tex
+++ b/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.tex
@@ -18,7 +18,7 @@
\usepackage{tikz}
\OnlyDescription
\hypersetup{pdfborder={0 0 0}}
-\def\pagelayoutversion{1.1.0}
+\def\pagelayoutversion{1.1.1}
\begin{document}
diff --git a/Master/texmf-dist/doc/latex/pagelayout/tests.zip b/Master/texmf-dist/doc/latex/pagelayout/tests.zip
index 8f90ec375db..407a787619a 100644
--- a/Master/texmf-dist/doc/latex/pagelayout/tests.zip
+++ b/Master/texmf-dist/doc/latex/pagelayout/tests.zip
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/passopt/README.md b/Master/texmf-dist/doc/latex/passopt/README.md
index 3b819c42b41..f8eb8f4c437 100644
--- a/Master/texmf-dist/doc/latex/passopt/README.md
+++ b/Master/texmf-dist/doc/latex/passopt/README.md
@@ -1,5 +1,5 @@
# The `passopt` package
-Passing options to packages or classes (v1.01)
+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.
diff --git a/Master/texmf-dist/doc/latex/passopt/passopt.pdf b/Master/texmf-dist/doc/latex/passopt/passopt.pdf
index d6c865c112e..ce6e437c651 100644
--- a/Master/texmf-dist/doc/latex/passopt/passopt.pdf
+++ 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
index 76568eeff16..fb4473e3567 100644
--- a/Master/texmf-dist/doc/latex/passopt/passopt.tex
+++ b/Master/texmf-dist/doc/latex/passopt/passopt.tex
@@ -5,8 +5,8 @@
\setcnltx
{
package = passopt,
- version = v1.01,
- date = 2024/07/15,
+ version = v1.01a,
+ date = 2024/07/17,
authors = Qu Yi,
info = Passing options to packages or classes,
email = toquyi@163.com,
@@ -42,7 +42,6 @@
\setlist{nosep,topsep = \smallskipamount}
\setlist[description,1]{leftmargin = \parindent}
\setlist[itemize,1]{leftmargin = *}
-\deffootnote{2em}{1em}{\llap{\color{red}\thefootnotemark.\space}}
\makeatother
\begin{document}
@@ -60,7 +59,7 @@ For a developer, there are some cases where packages and classes may load other
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.
+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.
@@ -95,7 +94,7 @@ Thanks Jonathan P. Spratte for the improvement suggestions.
\appendix
\begin{changelog}[simple]
\begin{version}[v = 1.01,date = 2024/07/15]
- \item Synchronization modifier for lists of \code{@raw@opt@} and \code{opt@}.
+ \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}
diff --git a/Master/texmf-dist/doc/latex/pgf-periodictable/README b/Master/texmf-dist/doc/latex/pgf-periodictable/README
index b1a6ef2279d..f761cd24392 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.1 (2024/07/07).
+This is pgf-PeriodicTable, version 2.1.3 (2024/08/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,14 @@ ____________________________________________________________
Major changes:
+*** v2.1.3 (07/08/2024) ***
+The engine's detection mechanism (pdfLaTeX, LuaLaTeX or XeTeX) has been changed to prevent erroneous detection when the packages 'hyperref' or 'bookmark' are loaded and the document is compiled with LuaLaTeX - in this case, pgf-PeriodicTable disturbs the selection of the document font.
+Fixed an issue with the Chemical Symbol color when a non-rgb color is used, such as cyan or yellow , which are defined in the xcolor package using the cmyk model (when loaded without options).
+
+*** v2.1.2 (01/08/2024) ***
+Fixed incorrect Spanish translations of some element names.
+Minor code improvements to eliminate runtime warnings («LaTeX Font Warning: Font shape `TU/TeXGyreHeros(0)/l/n' undefined» or «Missing character: There is no m (U+006D) in font nullfont!» ... )
+
*** v2.1.1 (07/07/2024) ***
New keys:
- group numbers (to display group numbers in arabic numerals, Roman numerals or both)
diff --git a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_name.tex b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_name.tex
index 78f81788265..0fcc955dd20 100644
--- a/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_name.tex
+++ b/Master/texmf-dist/doc/latex/pgf-periodictable/manualfiles/pgf-PeriodicTableManual_name.tex
@@ -11,7 +11,7 @@ Sets the color of the element name.
\\ [5pt]\makebox[\linewidth][c]{\scalebox{.6}{\pgfPT[Z list={1,...,36},name color=red]}}%
\\ [0pt]\pgfPTendoption%
% name font
-\pgfPTMoption{4}{name font}{\string\fontseries\{l\}\string\selectfont\string\tiny}{%
+\pgfPTMoption{4}{name font}{\string\tiny}{% \string\fontseries\{l\}\string\selectfont (removed @v2.1.2)
Sets the font of the element name.
}
\\ [5pt]\pgfPTMmacrobox{pgfPT}[Z list={1,...,36},name font=\string\itshape\string\tiny]%
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 ddaee71477b..f53b6659cee 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,5 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Definitions for pgf-PeriodicTable Manual
+% Hugo Gomes @ 07/08/2024 v2.1.3
+% Hugo Gomes @ 01/08/2024 v2.1.2
% Hugo Gomes @ 07/07/2024 v2.1.1
% Hugo Gomes @ 03/04/2024 v2.1.0a
% Hugo Gomes @ 14/02/2024 v2.1.0
@@ -7,7 +9,7 @@
% 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.1}%
+\def\pgfPTversion{2.1.3}%
\def\pgfPTnewinversion#1{new in v#1}%
\def\pgfPTchangedinversion#1{changed in v#1}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -22,31 +24,6 @@
\setcounter{secnumdepth}{1}%
\setcounter{tocdepth}{4}
%
-\makeatletter%
-\global\renewcommand\thesection{}%
-\renewcommand\thesubsection{\@arabic\c@subsection}%
-\renewcommand\section{\@startsection{section}{1}{\z@}%
- {-3.5ex \@plus -1ex \@minus -.2ex}%
- {2.3ex \@plus.2ex}%
- {\hskip-1.4395em\normalfont\Large\bfseries}}%
-\renewcommand*\l@section[2]{%
- \ifnum \c@tocdepth >\z@%
- \addpenalty\@secpenalty%
- \addvspace{1.0em \@plus\p@}%
- \setlength\@tempdima{0em}%
- \begingroup%
- \parindent \z@ \rightskip \@pnumwidth%
- \parfillskip -\@pnumwidth%
- \leavevmode \bfseries%
- \advance\leftskip\@tempdima%
- \hskip -\leftskip%
- #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par%
- \endgroup%
- \fi}%
-\renewcommand*\l@subsection{\@dottedtocline{2}{1.5em}{1.5em}}%
-\renewcommand*\l@subsubsection{\@dottedtocline{3}{3.0em}{2.4em}}%
-\renewcommand*\l@paragraph{\@dottedtocline{4}{4.25em}{1.35em}}%
-\makeatother%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\pgfdeclarelayer{back}%
\pgfsetlayers{back,main}%
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 c588490c487..e8c9672259b 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/pgfornament/README.md b/Master/texmf-dist/doc/latex/pgfornament/README.md
index 737ee2acc25..901d6554ccf 100644
--- a/Master/texmf-dist/doc/latex/pgfornament/README.md
+++ b/Master/texmf-dist/doc/latex/pgfornament/README.md
@@ -1,6 +1,6 @@
# pgfornament – Drawing of Vectorian ornaments with PGF/TikZ
-Release 1.2 2020/05/28
+Release 1.3 2024/08/14
## Description
@@ -55,6 +55,9 @@ your LaTeX document.
Documentations for `pgfornament` and `tikzrput` are available on CTAN and in your TeX distribution.
## History
+
+- v 1.3 Correction of bug (spurious space) by Tibor Tómács and correction of the documentation.
+
- v 1.2 Correction of bug (spurious space) by LianTze Lim.
- v 1.00 Add the Han ornanments and some new macros. Add some examples to the documentation. Thanks to Pablo Gonzáles L to help me with "Git".
diff --git a/Master/texmf-dist/doc/latex/pgfornament/ornaments.pdf b/Master/texmf-dist/doc/latex/pgfornament/ornaments.pdf
index 6486f4e2539..46f3fe8feff 100644
--- a/Master/texmf-dist/doc/latex/pgfornament/ornaments.pdf
+++ b/Master/texmf-dist/doc/latex/pgfornament/ornaments.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pgfornament/ornaments.tex b/Master/texmf-dist/doc/latex/pgfornament/ornaments.tex
index c52dd63e919..2a7f4b0fc15 100644
--- a/Master/texmf-dist/doc/latex/pgfornament/ornaments.tex
+++ b/Master/texmf-dist/doc/latex/pgfornament/ornaments.tex
@@ -8,7 +8,7 @@
% of this license or (at your option) any later version and/or
% 2. under the GNU Public License.
%---------%---------%---------%---------%---------%---------%---------%---------
-% Version 1.2 2020/0 5/26
+% Version 1.3 2024/08/14
\RequirePackage{luatex85}
\RequirePackage{silence}
\WarningsOff[latex]
@@ -137,7 +137,7 @@ urlcolor=orange}
\bigskip
-\noindent\pgfornament[width=0.75 cm]{152}\ (Version 1.2 2020/05/26)
+\noindent\pgfornament[width=0.75 cm]{152}\ (Version 1.3 2024/08/14)
\begin{abstract}
This document describes the \LaTeX\ package \emph{\docpkg{pgfornament}} and presents the syntax and parameters of the macro "pgfornament".
diff --git a/Master/texmf-dist/doc/latex/pgfornament/usefulcommands.tex b/Master/texmf-dist/doc/latex/pgfornament/usefulcommands.tex
index 4af2421923c..4a54f9ea45a 100644
--- a/Master/texmf-dist/doc/latex/pgfornament/usefulcommands.tex
+++ b/Master/texmf-dist/doc/latex/pgfornament/usefulcommands.tex
@@ -5,11 +5,11 @@
\setlength{\@tempdimb}{\paperwidth-\@tempdima-1cm}%
\setlength{\@tempdimc}{\paperheight-\@tempdima}%
\put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimc}){%
- \pgfornament[color=Maroon,anchor=north west,width=1cm]{39}}
-\put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdima}){%
- \pgfornament[color=Maroon,anchor=south west,width=1cm,symmetry=h]{39}}
+ \pgfornament[color=Maroon,anchor=north west,width=1cm]{39}}
\put(\LenToUnit{\@tempdimb},\LenToUnit{\@tempdimc}){%
\pgfornament[color=Maroon,anchor=north east,width=1cm,symmetry=v]{39}}
+\put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdima}){%
+ \pgfornament[color=Maroon,anchor=south west,width=1cm,symmetry=h]{39}}
\put(\LenToUnit{\@tempdimb},\LenToUnit{\@tempdima}){%
\pgfornament[color=Maroon,anchor=south east,width=1cm,symmetry=c]{39}}
\endgroup
diff --git a/Master/texmf-dist/doc/latex/pgfplotsthemebeamer/DEPENDS.txt b/Master/texmf-dist/doc/latex/pgfplotsthemebeamer/DEPENDS.txt
new file mode 100644
index 00000000000..1c4fa2d5936
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplotsthemebeamer/DEPENDS.txt
@@ -0,0 +1,3 @@
+hard beamer
+hard tools
+hard pgfplots \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/pgfplotsthemebeamer/README.md b/Master/texmf-dist/doc/latex/pgfplotsthemebeamer/README.md
new file mode 100644
index 00000000000..47c815caaf9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplotsthemebeamer/README.md
@@ -0,0 +1,39 @@
+# pgfplotsthemebeamer
+
+[![License](https://img.shields.io/github/license/samcarter/pgfplotsthemebeamer.svg?color=blue)](http://www.latex-project.org/lppl.txt)
+[![GitHub tag](https://img.shields.io/github/tag/samcarter/pgfplotsthemebeamer.svg?label=current%20version&color=blue)](https://github.com/samcarter/pgfplotsthemebeamer/releases/latest)
+[![CTAN](https://img.shields.io/ctan/v/pgfplotsthemebeamer.svg?color=blue)](https://ctan.org/pkg/pgfplotsthemebeamer)
+
+A package for using colours from the current beamer theme in pgfplots diagrams.
+
+This project is licensed under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt .
+
+The project repository, including a bug tracker, can be found at https://github.com/samcarter/pgfplotsthemebeamer/issues .
+
+### Usage
+
+```latex
+\documentclass{beamer}
+
+\usetheme{moloch}% just as an example for a colour theme
+\usepackage{pgfplotsthemebeamer}
+
+\begin{document}
+
+\begin{frame}[plain]
+\centering
+\begin{tikzpicture}
+ \begin{axis}[
+ beamercolors
+ ]
+ \addplot {x}; \addplot {x-1}; \addplot {x-2};
+ \addplot {x-3}; \addplot {x-4}; \addplot {x-5};
+ \addplot {x-6}; \addplot {x-7}; \addplot {x-8};
+ \end{axis}
+\end{tikzpicture}
+\end{frame}
+
+\end{document}
+```
+
+For more details, please consult the [package documentation](https://github.com/samcarter/pgfplotsthemebeamer/blob/main/DOCUMENTATION.pdf).
diff --git a/Master/texmf-dist/doc/latex/pgfplotsthemebeamer/pgfplotsthemebeamer-doc-settings.sty b/Master/texmf-dist/doc/latex/pgfplotsthemebeamer/pgfplotsthemebeamer-doc-settings.sty
new file mode 100644
index 00000000000..cd57229fcf4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplotsthemebeamer/pgfplotsthemebeamer-doc-settings.sty
@@ -0,0 +1,200 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Personal helper theme for package documentations
+% Copyright samcarter
+%
+% This file may be distributed and/or modified
+% under the LaTeX Project Public License 1.3c or later
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% Usage:
+% ln ~/Life/latex/beamertheme-sam/themesam.sty package-doc-settings.sty
+% \usepackage[
+% themecolor=samdblue
+% ]{\jobname-settings}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Colours
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\RequirePackage{xcolor}
+\definecolor{samyellow}{RGB}{246,193,65}
+\definecolor{samorange}{RGB}{241,147,45}% pgfplotsthemebeamer
+\definecolor{samred}{RGB}{191,26,46}% TikZbricks
+\definecolor{sammagenta}{RGB}{170,42,104}% TikZmarmots
+\definecolor{samviolet}{RGB}{136,46,114}% TikZlings
+\definecolor{samlila}{RGB}{101,67,159}% Rainbow beamer theme
+\definecolor{samdblue}{RGB}{0,51,134}% beamer theme
+\definecolor{samlblue}{RGB}{22,89,155}% TikZducks
+\definecolor{samteal}{RGB}{25,143,157}% Tcolorbox beamer theme
+\definecolor{samlgreen}{RGB}{68,170,153}% Jigsaw
+\definecolor{samdgreen}{RGB}{78,178,125}
+\definecolor{samlgray}{RGB}{160,160,185}
+\definecolor{samdgray}{RGB}{60,60,85}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Package options
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\RequirePackage{xkeyval}
+\DeclareOptionX{themecolor}[samdblue]{\colorlet{themecolor}{#1}}
+\DeclareOptionX{listingcolor}[samlblue]{\colorlet{listingcolor}{#1}}
+\ExecuteOptionsX{themecolor,listingcolor}
+\ProcessOptionsX
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Packages
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\@ifclassloaded{beamer}{}{%
+ \RequirePackage[english]{babel}
+ \RequirePackage[paper=a4paper,margin=2.9cm]{geometry}
+ \RequirePackage{scrlayer-scrpage}
+ \let\hrulefillx\hrulefill
+ \RequirePackage[bitstream-charter]{mathdesign}
+ \let\hrulefill\hrulefillx
+ \RequirePackage[hang,flushmargin,bottom]{footmisc}
+ \RequirePackage{footnotehyper}
+ \makesavenoteenv{tcolorbox}
+ \RequirePackage[all]{nowidow}
+ \RequirePackage[colorlinks=true,breaklinks=true,allcolors=themecolor,hyperfootnotes=false]{hyperref}
+}
+\RequirePackage[T1]{fontenc}
+\RequirePackage{xspace}
+\RequirePackage{inconsolata}% mono font with bold, but italic is missing
+% \RequirePackage[scale=0.85]{cascadia-code}
+% \AddToHook{cmd/ttfamily/before}{\fontseries{sl}}
+\RequirePackage{iexec}
+\usepackage{synthslant}% to fake slented comments in inconsolata
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Listings
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\RequirePackage[
+ cachedir=$TMPDIR/minted/
+]{minted}
+
+% smuggling custom pygmentize style in cache folder
+% (a real pygmentise style would need installtion in some python folder)
+\begin{filecontents*}[noheader,overwrite]{./sam.pygstyle}
+\makeatletter
+\def\PYG@reset{\let\PYG@it=\relax \let\PYG@bf=\relax%
+ \let\PYG@ul=\relax \let\PYG@tc=\relax%
+ \let\PYG@bc=\relax \let\PYG@ff=\relax}
+\def\PYG@tok#1{\csname PYG@tok@#1\endcsname}
+\def\PYG@toks#1+{\ifx\relax#1\empty\else%
+ \PYG@tok{#1}\expandafter\PYG@toks\fi}
+\def\PYG@do#1{\PYG@bc{\PYG@tc{\PYG@ul{%
+ \PYG@it{\PYG@bf{\PYG@ff{#1}}}}}}}
+\def\PYG#1#2{\PYG@reset\PYG@toks#1+\relax+\PYG@do{#2}}
+
+% optional arguments
+\expandafter\def\csname PYG@tok@na\endcsname{\def\PYG@tc##1{\textcolor{black}{##1}}}
+
+% macros
+\expandafter\def\csname PYG@tok@k\endcsname{\def\PYG@tc##1{\textcolor{listingcolor}{\bfseries ##1}}}
+% curly brakets
+\expandafter\def\csname PYG@tok@nb\endcsname{\def\PYG@tc##1{\textcolor{listingcolor}{\bfseries ##1}}}
+
+% comments (italics won't work with the inconsolata font)
+\expandafter\def\csname PYG@tok@c\endcsname{\def\PYG@tc##1{\textcolor{gray}{\textsynthslant{##1}}}}
+
+\def\PYGZbs{\char`\\}
+\def\PYGZus{\char`\_}
+\def\PYGZob{\char`\{}
+\def\PYGZcb{\char`\}}
+\def\PYGZca{\char`\^}
+\def\PYGZam{\char`\&}
+\def\PYGZlt{\char`\<}
+\def\PYGZgt{\char`\>}
+\def\PYGZsh{\char`\#}
+\def\PYGZpc{\char`\%}
+\def\PYGZdl{\char`\$}
+\def\PYGZhy{\char`\-}
+\def\PYGZsq{\char`\'}
+\def\PYGZdq{\char`\"}
+\def\PYGZti{\char`\~}
+% for compatibility with earlier versions
+\def\PYGZat{@}
+\def\PYGZlb{[}
+\def\PYGZrb{]}
+\makeatother
+\end{filecontents*}
+
+\iexec{mkdir -p $TMPDIR/minted && mv sam.pygstyle $TMPDIR/minted/.}
+
+\usemintedstyle{sam}
+\setminted{
+ breaksymbolleft={},
+ tabsize=2,
+ breaklines=true,
+}
+\newminted[samcode]{latex}{}
+\newmintinline[saminline]{latex}{}
+
+% use non-bold and all coloured for inline code in articles
+\ifdefined\insertaspectratio\else
+ \patchcmd{\minted@inputpyg@inline}{\minted@input}{\color{listingcolor}\renewcommand\textcolor[3][]{##3}\renewcommand\bfseries{}\minted@input}{}{}
+\fi
+
+\RequirePackage[most]{tcolorbox}
+\tcbuselibrary{minted}
+\tcbset{%
+ colframe=themecolor,
+ fonttitle=\bfseries,
+ sidebyside,
+ center lower,
+ righthand width=5.7cm,
+ bottom=2pt,
+ top=2pt,
+ left=3pt,
+ right=3pt,
+ sidebyside gap=10pt,
+ lower separated=false,
+ listing engine=minted,
+ minted language=latex,
+ colback=themecolor!10,
+ sharp corners,
+ boxrule=0pt,
+ before title={\strut}
+}
+
+% avoid page breaks right in front of the tcolorbox
+\@ifclassloaded{beamer}{}{
+ \tcbuselibrary{hooks}
+ \tcbset{before pre={\nopagebreak[4]}}
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% document settings
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\@ifclassloaded{scrartcl}{%
+ \KOMAoptions{parskip=half}
+ \addtokomafont{sectioning}{\color{themecolor}}
+ \addtokomafont{date}{\normalsize}
+ \addtokomafont{author}{\normalsize}
+ \setlength{\footnotemargin}{0.7em}
+}{}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Custom macros
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\providecommand*{\CTAN}{\textsc{CTAN}\xspace}
+\providecommand*{\TikZ}{Ti\emph{k}Z\xspace}
+\providecommand*{\miktex}{MiK\TeX\xspace}
+\providecommand*{\texlive}{\TeX{}Live\xspace}
+\providecommand*{\tikzbrick}{Ti\emph{k}Zbrick\xspace}
+\providecommand*{\tikzducks}{Ti\emph{k}Zducks\xspace}
+\providecommand*{\tikzlings}{Ti\emph{k}Zlings\xspace}
+\providecommand*{\tikzmarmots}{Ti\emph{k}Zmarmots\xspace}
+\providecommand*{\ConTeXt}{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/pgfplotsthemebeamer/pgfplotsthemebeamer-doc.pdf b/Master/texmf-dist/doc/latex/pgfplotsthemebeamer/pgfplotsthemebeamer-doc.pdf
new file mode 100644
index 00000000000..a312a05245a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplotsthemebeamer/pgfplotsthemebeamer-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pgfplotsthemebeamer/pgfplotsthemebeamer-doc.tex b/Master/texmf-dist/doc/latex/pgfplotsthemebeamer/pgfplotsthemebeamer-doc.tex
new file mode 100644
index 00000000000..3beb6c99b66
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplotsthemebeamer/pgfplotsthemebeamer-doc.tex
@@ -0,0 +1,119 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Documentation for the pgfplotsthemebeamer package
+% Using colours from the current beamer theme in pgfplots
+% Maintained by samcarter
+%
+% Project repository and bug tracker:
+% https://github.com/samcarter/pgfplotstheme-beamer
+%
+% Released under the LaTeX Project Public License v1.3c or later
+% See http://www.latex-project.org/lppl.txt
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% !TeX program = txs:///arara
+% arara: latexmk: {
+% arara: --> engine: pdflatex,
+% arara: --> options: [
+% arara: --> '-shell-escape',
+% arara: --> '-synctex=1',
+% arara: --> '-interaction=nonstopmode',
+% arara: --> ]
+% arara: --> }
+\documentclass{scrartcl}
+
+% meta %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\title{The pgfplotsthemebeamer package}
+\subtitle{Using colours from the current beamer theme in pgfplots}
+\author{%
+ \texorpdfstring{
+ \texttt{samcarter}\\
+ \url{https://github.com/samcarter/pgfplotsthemebeamer}\\
+ \url{https://ctan.org/pkg/pgfplotsthemebeamer}
+ }{samcarter}}
+\date{Version v0.2 \textendash{} 2024/08/02}
+
+\usepackage[
+ themecolor=samorange
+]{\jobname-settings}
+
+% customisation %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newcommand{\prefix}{./include}
+\tcbset{
+ compilable listing/.style={listing file={\prefix/\jobname-listing-\thetcblistingcount.tex}},
+ run pdflatex/.style={run@system@command={cd\space \prefix;\space pdflatex}{\jobname-listing-\thetcblistingcount.tex}},%
+}
+
+\begin{document}
+\maketitle
+
+\section{Introduction}
+\label{intro}
+
+Beamer themes often use carefully composed colour schemes. The \saminline|pgfplotsthemebeamer| package allows to reuse these colours in diagrams created with \saminline|pfgplots|. This ensures a consistent colour scheme throughout the presentation and avoids unsightly colour clashes.
+
+The package is included in \TeX{}Live
+%and MiK\TeX\
+and available from \textsc{CTAN} (\url{https://www.ctan.org/pkg/pgfplotsthemebeamer}).
+The development version of this package is located at \url{https://github.com/samcarter/pgfplotsthemebeamer}. If you have any problems, ideas or other feedback, please make constructive use of the issue tracker.
+
+Copyright \raisebox{0.2em}{\tiny\fontfamily{cmr}\selectfont\textcopyright} \texttt{samcarter}. Permission is granted to copy, distribute and\slash or modify this software under the terms of the LaTeX project public licence, version 1.3c or later \url{http://www.latex-project.org/lppl.txt}.
+
+\section{Usage}
+
+The basic usage is fairly simple. After loading the \saminline|pgfplotsthemebeamer| package, plots can use the \saminline|beamercolor| option to use the colours from the current beamer theme in the diagram:
+\begin{tcolorbox}[title={Usage}]
+\begin{samcode}
+\usepackage{pgfplotsthemebeamer}
+
+\begin{axis}[
+ beamercolors
+]
+...
+\end{axis}
+\end{samcode}
+\end{tcolorbox}
+The graphs will be coloured in the beamer colours \saminline|structure|, \saminline|alerted text| and \saminline|example text|. In most beamer themes, these three colours form an easily distinguishable set of colours.
+
+Users who would like to use the \saminline|beamercolors| scheme for all \saminline|pgfplots| diagrams in the presentation, can load the package with the \saminline|all| option, which will make this colour scheme the default.
+\begin{tcolorbox}[title={Usage}]
+\begin{samcode}
+\usepackage[all]{pgfplotsthemebeamer}
+\end{samcode}
+\end{tcolorbox}
+
+\section{Full example}
+\begin{tcblisting}{
+ listing only,
+ freeze pdf,
+ compilable listing,
+ run pdflatex,
+ title={Basic example},
+ righthand width=0pt
+}
+\documentclass{beamer}
+
+\usetheme{moloch}% just as an example for a colour theme
+\usepackage{pgfplotsthemebeamer}
+
+\begin{document}
+
+\begin{frame}[plain]
+\centering
+\begin{tikzpicture}
+ \begin{axis}[
+ beamercolors
+ ]
+ \addplot {x}; \addplot {x-1}; \addplot {x-2}; \addplot {x-3}; \addplot {x-4}; \addplot {x-5}; \addplot {x-6}; \addplot {x-7}; \addplot {x-8};
+ \end{axis}
+\end{tikzpicture}
+\end{frame}
+
+\end{document}
+\end{tcblisting}
+\vfill
+\centering
+\setlength{\fboxsep}{0pt}%
+\fbox{\includegraphics[width=.75\textwidth]{pgfplotsthemebeamer-doc-listing-1.pdf}}%
+
+\end{document}
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..119574f6191 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/polyomino/README.md b/Master/texmf-dist/doc/latex/polyomino/README.md
new file mode 100644
index 00000000000..7f3c8023ad0
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/polyomino/README.md
@@ -0,0 +1,25 @@
+# `polyomino`
+
+## Polyominoes using Ti*k*Z and LaTeX3
+
+Version 1.0 (2024/08/01)
+
+This package is based on the package [Ti*k*Z](https://ctan.org/pkg/pgf) and can be used to draw polyominoes. It is possible to define custom styles, pics and grids.
+
+%% README.md
+%% Copyright 2024 Matthias Floré
+%
+% 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
+% 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 Matthias Floré.
+%
+% This work consists of the files polyomino.pdf, polyomino.sty,
+% polyomino.tex and README.md. \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/polyomino/polyomino.pdf b/Master/texmf-dist/doc/latex/polyomino/polyomino.pdf
new file mode 100644
index 00000000000..597c00c4db5
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/polyomino/polyomino.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/polyomino/polyomino.tex b/Master/texmf-dist/doc/latex/polyomino/polyomino.tex
new file mode 100644
index 00000000000..c512cec8959
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/polyomino/polyomino.tex
@@ -0,0 +1,278 @@
+%% polyomino.tex
+%% Copyright 2024 Matthias Floré
+%
+% 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
+% 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 Matthias Floré.
+%
+% This work consists of the files polyomino.pdf, polyomino.sty,
+% polyomino.tex and README.md.
+\documentclass[a4paper,english,dvipsnames]{ltxdoc}
+\usepackage[english]{babel}
+\usepackage{graphicx}
+\usepackage[a4paper,left=2.25cm,right=2.25cm,top=2.5cm,bottom=2.5cm,nohead]{geometry}
+\usepackage{parskip}
+\usepackage{iftex}
+\ifluatex
+\else
+\usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenc}
+\fi
+\usepackage{mathtools}
+\usepackage{amssymb}
+\allowdisplaybreaks
+\usepackage{pdflscape}
+\usepackage{polyomino}
+\input{pgfmanual-en-macros.tex}
+\usepackage{codehigh}
+\usepackage{fancyhdr}
+\pagestyle{fancy}
+\renewcommand{\headrulewidth}{0pt}
+\fancyhead{}
+\ExplSyntaxOn
+\NewExpandableDocumentCommand \repeatnumber {}
+ { \prg_replicate:nn { \thepage } { * } }
+\ExplSyntaxOff
+\fancyfoot[C]{\IfRefUndefinedExpandable{Thesourcecode}{}{\begin{tikzpicture}[scale=0.9]
+\polyomino[
+ grid,
+ p={*}{style={teal,draw=black}}
+]{\repeatnumber}
+\end{tikzpicture}}}
+\usepackage[nottoc]{tocbibind}
+\usepackage{imakeidx}
+\makeindex[program=makeindex,columns=2,intoc=true]
+\indexsetup{othercode={\thispagestyle{fancy}}}
+\AtEndPreamble{\hypersetup{%
+linktoc=all,
+pdfstartview=FitH,
+colorlinks=true,
+linkcolor=Mahogany,
+citecolor=ForestGreen,
+urlcolor=MidnightBlue,
+bookmarksnumbered=true,
+pdftitle={The polyomino package},
+pdfauthor={Matthias Floré},
+pdfsubject={Manual},
+pdfkeywords={polyomino}}}
+\setcounter{tocdepth}{2}
+\setcounter{secnumdepth}{2}
+\title{The \texttt{polyomino} package\\[12pt]\large Polyominoes using \tikzname{} and \LaTeX3}
+\author{Matthias Floré}
+\date{Version 1.0 (2024/08/01)}%\\[12pt]
+\begin{document}
+\maketitle
+\thispagestyle{fancy}
+\begin{abstract}
+\noindent This package is based on the package |tikz| (see \cite{TtTaPGFp}) and can be used to draw polyominoes. It is possible to define custom styles, pics and grids.% This is the manual for version .
+\end{abstract}
+\tableofcontents
+\section{Usage}
+The package |polyomino| can be used by putting the following in the preamble.
+\begin{codeexample}[code only]
+\usepackage{polyomino}
+\end{codeexample}
+The package |polyomino| loads the package |tikz|.
+\section{The command \textbackslash polyomino}
+\begin{command}{\polyomino\opt{\oarg{options}}\marg{polyomino specification}}
+This command can be placed inside a |tikzpicture| environment. The \meta{polyomino specification} is a token list. Spaces in this list are ignored. With the initial settings, a |,| starts a new row. Otherwise each element in this list corresponds to a cell. An element can consist of multiple characters by surrounding it with braces. The \meta{options} can be given with the keys described in Section \ref{Keys}.
+\begin{codeexample}[width=8cm]
+\pgfkeys{
+ /polyomino,
+ p={F}{style={blue,draw=black,ultra thick}},
+ p={I}{style={brown,draw=black,ultra thick}},
+ p={L}{style={cyan,draw=black,ultra thick}},
+ p={N}{style={gray,draw=black,ultra thick}},
+ p={P}{style={lime,draw=black,ultra thick}},
+ p={T}{style={magenta,draw=black,ultra thick}},
+ p={U}{style={olive,draw=black,ultra thick}},
+ p={V}{style={orange,draw=black,ultra thick}},
+ p={W}{style={pink,draw=black,ultra thick}},
+ p={X}{style={purple,draw=black,ultra thick}},
+ p={Y}{style={red,draw=black,ultra thick}},
+ p={Z}{style={teal,draw=black,ultra thick}}
+}
+\begin{tikzpicture}
+\polyomino[
+ grid
+]{
+ UUUVVV,
+ UXUZZV,
+ XXXFZV,
+ IXFFZZ,
+ ILLFFT,
+ ILNTTT,
+ ILNWWT,
+ ILNNWW,
+ PPPNYW,
+ PPYYYY
+}
+\end{tikzpicture}
+\end{codeexample}
+The algorithm constructs the border of each polyomino. It does not consider holes determined by empty cells. Although it does detect a cell inside a polyomino which has a different style. This is illustrated in the example below.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}[scale=0.8]
+\polyomino[
+ p={a}{style={gray,draw=black,thick}}
+]{
+ aaaaa,
+ a.a.a,
+ aaaaa
+}
+\polyomino[
+ at={(0,-4)},
+ p={a}{style={gray,draw=black,thick}},
+ p={*}{style={white,draw=black,thick}}
+]{
+ aaaaa,
+ a*a*a,
+ aaaaa
+}
+\end{tikzpicture}
+\end{codeexample}
+\end{command}
+\section{Keys}\label{Keys}
+The keys in this Section can be given as \meta{options} to the command |\polyomino|.
+
+There are two key families: |/polyomino| and |/polyomino/p_2|. The key family |/polyomino| is intended for usage in documents whereas |/polyomino/p_2| is not. In the key family |/polyomino|, also keys from the key family |/polyomino/p_2| will be looked up. The second argument from the key |p| only accepts keys from the key family |/polyomino/p_2|.
+\begin{key}{/polyomino/at=\marg{point} (initially (0,0))}
+This key defines the bottom left coordinate of the polyomino.
+\end{key}
+\begin{key}{/polyomino/p\_2/connected}
+This key sets the |pic| type (which is activated by the key |pic|) to false. This is the initial setting.
+\end{key}
+\begin{key}{/polyomino/p\_2/discrete}
+This key sets the |pic| type (which is activated by the key |pic|) to true.
+\end{key}
+\begin{key}{/polyomino/empty cell=\marg{token list} (initially .)}
+A cell corresponding to the \meta{token list} in the \meta{polyomino specification} will be left empty.
+
+A cell corresponding to the empty token list will always be left empty.
+\end{key}
+\begin{key}{/polyomino/grid=\opt{\meta{boolean}} (default true, initially false)}
+If true then a grid is drawn. The grid does not apply to borders of polyominoes. The style of this grid is determined by the key |grid style|. A grid does not apply to a cell with a |pic|.
+\end{key}
+\begin{stylekey}{/polyomino/grid style=\marg{options} (initially \normalfont empty)}
+This key determines the style of the grid.
+\begin{codeexample}[width=6.5cm]
+\begin{tikzpicture}[rotate=90]
+\polyomino[
+ grid,
+ grid style={gray,dash pattern=on 3mm off 4mm on 3mm off 0mm},
+ p={L}{style={darkgray,draw=black}},
+ p={P}{style={green,draw=black}},
+ p={T}{style={violet,draw=black}},
+ p={V}{style={yellow,draw=black}}
+]{
+ LTVVV,
+ LTTTV,
+ LTPPV,
+ LLPPP
+}
+\end{tikzpicture}
+\end{codeexample}
+\end{stylekey}
+\begin{stylekey}{/polyomino/p\_2/p=\marg{name}\marg{options} (initially \normalfont empty)}
+This key determines the style of the polyomino with \meta{name} in the \meta{polyomino specification}.
+
+The \meta{options} only accept keys from the key family |/polyomino/p_2|.
+
+In the example below, the polyominoes have the same shape but are differentiated by using different names.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\pgfkeys{
+ /polyomino,
+ p={a}{},
+ p={b}{},
+ style={fill=none,draw}
+}
+\def\example{
+ aa,
+ ab,
+ ab,
+ bb
+}
+\polyomino{\example}
+\polyomino[
+ at={(2,0)}
+]{\example}
+\end{tikzpicture}
+\end{codeexample}
+\end{stylekey}
+\begin{key}{/polyomino/p\_2/pic=\marg{code}}
+The \meta{code} defines the |pic| which is used for each cell of the polyomino.
+
+A grid does not apply to a cell with a |pic|.
+\begin{codeexample}[width=7cm]
+\begin{tikzpicture}
+\polyomino[
+ empty cell=*,
+ grid,
+ p={a}{style={red,draw=black}},
+ p={b}{style={blue,draw=black}},
+ p={c}{style={orange,draw=black}},
+ p={circle}{pic={\fill[green] (0,0) circle[radius=0.4];}},
+ row sep=;
+]{
+ {} * * b {} c ;
+ a a b b {circle} c ;
+ {circle} a a b c c
+}
+\end{tikzpicture}
+\end{codeexample}
+\begin{codeexample}[width=5cm]
+\begin{tikzpicture}
+\polyomino[
+ p={circle}{
+ pic={\path[pic actions] (0,0) circle[radius=0.45];},
+ style={right color=cyan,left color=red,draw,dashed}
+ },
+ p={L}{
+ pic={
+ \fill[yellow!80!black] (-0.5,-0.5) rectangle +(1,1);
+ \fill[yellow!50,rounded corners] (-0.4,-0.4) rectangle +(0.8,0.8);
+ }
+ },
+ p={square}{
+ pic={\path[pic actions] (-0.45,-0.45) rectangle +(0.9,0.9);},
+ style={fill=magenta,draw,rounded corners}
+ }
+]{
+ L {circle} {square} {square} ,
+ L {circle} {circle} {square} ,
+ L L {circle} {circle}
+}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/polyomino/row sep=\marg{token list} (initially ,)}
+The \meta{token list} in the \meta{polyomino specification} will start a new row.
+\end{key}
+\begin{stylekey}{/polyomino/p\_2/style=\marg{options} (initially \normalfont empty)}
+This key determines the style of the polyomino.
+\end{stylekey}
+\begin{thebibliography}{9}
+\bibitem{TtTaPGFp}
+Till Tantau,
+\emph{The \tikzname{} and {\upshape\pgfname} Packages},
+Manual for version 3.1.10,
+\url{https://ctan.org/pkg/pgf},
+2023.
+\end{thebibliography}
+\printindex
+\newgeometry{left=2.25cm,right=2.25cm,top=2.25cm,bottom=2.25cm}
+\pagestyle{plain}
+\appendix
+\begin{landscape}
+\section{The source code}\label{Thesourcecode}
+\dochighinput[language=latex/latex3]{polyomino.sty}
+\end{landscape}
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf b/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf
index 1ae91515fbc..fc1cf0d3af0 100644
--- a/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf
index 58f1d6981d2..7454d1cce01 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
index ea2f749d324..51238cf5712 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
index 2d7130fcb9c..fa4b8cdbb5e 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
index d7a945978b7..80a889d85b0 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf
index 75b679b50df..4881557ce02 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
index e1d1b6af197..3caf07a14ac 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf
index f7b843c631f..7c94d43d135 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
index 1c53f875a00..0278d89b9f0 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
index c9e6daca454..542174e6f05 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
index f702632cf35..3ecab9d63bb 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
index ca3b90abcc8..607860d6e6f 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
index 95a09523d9a..26e21be7b93 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
index 0021b1cbd3b..b1dca2b1174 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
index 67424c3e0ca..499104658be 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
index 362ff7012a3..f5f58e81d62 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf
index 0fe795532ad..abaf67b4f6f 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
index ad48933ba24..3cda9762d0e 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
index e68f4f3b491..c543daa1685 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
index ed0755c95b9..9030d23e946 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf
index a0e92d1b909..53b0429efc5 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
index 22f3ac9ed37..7872a6a918e 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
index 6edc466546e..d751ef78ffe 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
index ae6daea2f39..d05683ac0ac 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
index 65e77b6045b..71adb5d7bb3 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
index 7864905fc58..3d12b5b07bb 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
index 147ece90398..36e59042160 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
index bc2e485aa77..df79382ca80 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
index a53aafd3657..d68d98ff29c 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
index b873ef26349..448dea3da89 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
index 4437bcd188e..37ac4daee67 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
index 0c36cb95649..d69077e19b3 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
index 073be3c769d..692832cc520 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
index 7a13994ca43..bf85737443f 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
index 5dbce101618..e9fb82d3458 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
index 4c574e496bc..6136c9957b8 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
index 012bb74b4e6..0fea810dc61 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
index fc67986e5af..b492f691216 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf
index 58d08bf3bdd..d4643edcb39 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
index 36f63213865..09f3b726021 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
index db1ccbc5a7c..4ccf4308cd4 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
index d71f06d80e9..000ffd301c6 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
index c6186efd4de..3baa1de9869 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
index a36ab701dd8..7a63bced17a 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
index 33338d8f638..e68462600d2 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
index c8200f5ff5f..120bdeb43a4 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf
index 50d46b721ed..1512a20fea9 100644
--- a/Master/texmf-dist/doc/latex/reledmac/migration.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/migration.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
index bc1f8b20f92..bf4c1a04d6d 100644
--- a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
index 84a3fd4ec0c..09730ec178a 100644
--- a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reptheorem/reptheorem.pdf b/Master/texmf-dist/doc/latex/reptheorem/reptheorem.pdf
index 31caef6e5df..cb574aa07cc 100644
--- a/Master/texmf-dist/doc/latex/reptheorem/reptheorem.pdf
+++ b/Master/texmf-dist/doc/latex/reptheorem/reptheorem.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/rpgicons/README.md b/Master/texmf-dist/doc/latex/rpgicons/README.md
index e889b70b03d..6de01a25869 100644
--- a/Master/texmf-dist/doc/latex/rpgicons/README.md
+++ b/Master/texmf-dist/doc/latex/rpgicons/README.md
@@ -1,4 +1,4 @@
-![Version 1.8.3](https://img.shields.io/badge/version-1.8.3-blue)
+![Version 1.8.4](https://img.shields.io/badge/version-1.8.4-blue)
<img width="200" alt="rpgicons-example" src="https://github.com/jasperhabicht/rpgicons/assets/6378801/81a1d0aa-7a4f-4f83-bbdc-3bc3332023b2" />
diff --git a/Master/texmf-dist/doc/latex/rpgicons/rpgicons-doc.pdf b/Master/texmf-dist/doc/latex/rpgicons/rpgicons-doc.pdf
index 7fa0c036d70..dc0bce82b90 100644
--- a/Master/texmf-dist/doc/latex/rpgicons/rpgicons-doc.pdf
+++ b/Master/texmf-dist/doc/latex/rpgicons/rpgicons-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/rpgicons/rpgicons-doc.tex b/Master/texmf-dist/doc/latex/rpgicons/rpgicons-doc.tex
index 7eef59a1a40..9aebfdcd528 100644
--- a/Master/texmf-dist/doc/latex/rpgicons/rpgicons-doc.tex
+++ b/Master/texmf-dist/doc/latex/rpgicons/rpgicons-doc.tex
@@ -11,8 +11,8 @@
% This work has the LPPL maintenance status `maintained'.
%
\documentclass[a4paper]{article}
-\def\rpgiconsfileversion{1.8.3}
-\def\rpgiconsfiledate{15 May 2024}
+\def\rpgiconsfileversion{1.8.4}
+\def\rpgiconsfiledate{8 August 2024}
\usepackage[T1]{fontenc}
\usepackage{Alegreya}
@@ -262,6 +262,7 @@
\changes{v1.8.0}{2024/03/24}{Unified wrapper to load either package variant.}
\changes{v1.8.2}{2024/04/28}{Roll dice syntax for PGF variant.}
\changes{v1.8.3}{2024/05/15}{Minor compatibility fix. Example of how to use pics added to ducumentation.}
+\changes{v1.8.3}{2024/05/15}{Bug fix in evocation spellschool shape. Unification of frames in PGF and L3 variants.}
\begin{document}
diff --git a/Master/texmf-dist/doc/latex/se2thesis/CHANGELOG.md b/Master/texmf-dist/doc/latex/se2thesis/CHANGELOG.md
index fa60e6d1b07..2d81b57f6fb 100644
--- a/Master/texmf-dist/doc/latex/se2thesis/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/se2thesis/CHANGELOG.md
@@ -7,6 +7,36 @@ and this project adheres to
## [Unreleased]
+## [v4.3.2] – 2024–08–12
+
+### Fixed
+
+- Prevent line break in the lower back title if one added a manual line break
+ using `\\` to the title in order to layout it properly for the front title
+ page.
+
+## [v4.3.1] – 2024–07–31
+
+### Added
+
+- Add a hint on the usage of `scrreprt` as the base class if one wants to have
+ numbered bibliography or appendices.
+- Add section in the documentation on the usage of babel, its shorthands for
+ German and English to re-enable hyphenation of compound words, and the
+ conflicting package `hyphenat`.
+
+### Fixed
+
+- Fix list of implicitly loaded packages.
+
+## [v4.3.0] – 2024–07–23
+
+### Fixed
+
+- The spelling bachelor thesis and master thesis are widely used but seem to be
+ wrong. According to the Oxford English Dictionary, the spelling shall be
+ bachelor's thesis and master's thesis.
+
## [v4.2.0] – 2024–06–25
### Fixed
@@ -237,7 +267,10 @@ These changes might be breaking changes!
### Added
- First official release
-[Unreleased]: https://github.com/se2p/se2thesis/compare/v4.2.0...HEAD
+[Unreleased]: https://github.com/se2p/se2thesis/compare/v4.3.2...HEAD
+[v4.3.2]: https://github.com/se2p/se2thesis/compare/v4.3.2...v4.3.1
+[v4.3.1]: https://github.com/se2p/se2thesis/compare/v4.3.1...v4.3.0
+[v4.3.0]: https://github.com/se2p/se2thesis/compare/v4.3.0...v4.2.0
[v4.2.0]: https://github.com/se2p/se2thesis/compare/v4.2.0...v4.1.0
[v4.1.0]: https://github.com/se2p/se2thesis/compare/v4.1.0...v4.0.3
[v4.0.3]: https://github.com/se2p/se2thesis/compare/v4.0.3...v4.0.2
diff --git a/Master/texmf-dist/doc/latex/se2thesis/se2thesis-master-thesis-example.pdf b/Master/texmf-dist/doc/latex/se2thesis/se2thesis-master-thesis-example.pdf
index 703086bd373..4d224fe981f 100644
--- a/Master/texmf-dist/doc/latex/se2thesis/se2thesis-master-thesis-example.pdf
+++ b/Master/texmf-dist/doc/latex/se2thesis/se2thesis-master-thesis-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/se2thesis/se2thesis.pdf b/Master/texmf-dist/doc/latex/se2thesis/se2thesis.pdf
index 84789f2fc38..e37c07abf4f 100644
--- a/Master/texmf-dist/doc/latex/se2thesis/se2thesis.pdf
+++ b/Master/texmf-dist/doc/latex/se2thesis/se2thesis.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/sillypage/sillypage-example.pdf b/Master/texmf-dist/doc/latex/sillypage/sillypage-example.pdf
index 3d8180932bc..5fa9dd30481 100644
--- a/Master/texmf-dist/doc/latex/sillypage/sillypage-example.pdf
+++ b/Master/texmf-dist/doc/latex/sillypage/sillypage-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/sillypage/sillypage.pdf b/Master/texmf-dist/doc/latex/sillypage/sillypage.pdf
index 3efa13e7d7d..60305403ac9 100644
--- a/Master/texmf-dist/doc/latex/sillypage/sillypage.pdf
+++ b/Master/texmf-dist/doc/latex/sillypage/sillypage.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
index 1c81cd5e7a5..e5e9b95b0dc 100644
--- a/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/siunitx/CHANGELOG.md
@@ -7,6 +7,12 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v3.3.20] - 2024-08-01
+
+### Fixed
+- Avoid rounding up when residual is exactly zero (see issue
+ [\#742](https://github.com/josephwright/siunitx/issues/742))
+
## [v3.3.19] - 2024-06-24
### Fixed
@@ -2120,7 +2126,8 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
### Added
- First public testing release (as `si`)
-[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.3.19...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.3.20...HEAD
+[v3.3.20]: https://github.com/josephwright/siunitx/compare/v3.3.19...v3.3.20
[v3.3.19]: https://github.com/josephwright/siunitx/compare/v3.3.18...v3.3.19
[v3.3.18]: https://github.com/josephwright/siunitx/compare/v3.3.17...v3.3.18
[v3.3.17]: https://github.com/josephwright/siunitx/compare/v3.3.16...v3.3.17
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
index 5f4841816e6..95f55e6cac8 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx-code.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
index 9d1c9d36dbf..93a003d7f5c 100644
--- a/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
+++ b/Master/texmf-dist/doc/latex/siunitx/siunitx.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/subeqn/CATALOG b/Master/texmf-dist/doc/latex/subeqn/CATALOG
new file mode 100644
index 00000000000..9d420c825f1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/subeqn/CATALOG
@@ -0,0 +1,17 @@
+Name: subeqn
+Problems-To: texniek at texniek.nl
+Author: J.L. Braams, Donald Arsenau, Stephen Gildea
+Version: 2.0c
+
+Description:
+
+The subeqn package implements an extension to LaTeXs's equation
+and eqnarray environments in order to be able to put labels on
+individual expressions. To this end two now environments are defined:
+subequations and subeqnarray.
+
+Keywords: latex equations,
+
+Address:
+TeXniek
+The Netherlands
diff --git a/Master/texmf-dist/doc/latex/subeqn/MANIFEST b/Master/texmf-dist/doc/latex/subeqn/MANIFEST
new file mode 100644
index 00000000000..4fe2a9a1565
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/subeqn/MANIFEST
@@ -0,0 +1,19 @@
+%
+% CONTENTS OF THE SUBEQN PACKAGE
+% ==============================
+%
+% README -- A short introduction
+% MANIFEST -- A list of files
+% CATALOG -- An entry for the macro catalog
+%
+% subeqn.dtx -- A package to number subexpressions of an equation;
+% originally by Stephen Gildea,
+% rewritten by Donald Arsenau,
+% updated for LaTeX2e by Johannes Braams
+% subeqn.pdf -- A `printed´ version of subeqn.dtx
+% subeqn-sample.pdf -- The `printed' version of the sample file
+%
+% Installation script for the various parts:
+% -------------------------------------------
+%
+% subeqn.ins -- produces subeqn.sty and subeqn-sample.tex
diff --git a/Master/texmf-dist/doc/latex/subeqn/README b/Master/texmf-dist/doc/latex/subeqn/README
new file mode 100644
index 00000000000..25f16dbe879
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/subeqn/README
@@ -0,0 +1,14 @@
+ subeqn bundle
+
+ July 20, 2024
+
+This bundle contains a package that extends the functionality
+of LaTeX's equation and eqnarray environments.
+It provides the environments subequations and subeqnarray.
+
+Copyright (C) 2024 Johannes L. Braams texniek(at)texniek.nl
+
+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; either
+version 1.3c of the License, or any later version.
diff --git a/Master/texmf-dist/doc/latex/subeqn/manifest.txt b/Master/texmf-dist/doc/latex/subeqn/manifest.txt
deleted file mode 100644
index 58e7cdb2219..00000000000
--- a/Master/texmf-dist/doc/latex/subeqn/manifest.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-%
-% CONTENTS OF THE SUBEQN PACKAGE
-% ==============================
-%
-% manifest.txt -- This file
-%
-% subeqn.dtx -- A package to number subexpressions of an equation;
-% originally by Stephen Gildea,
-% rewritten by Donald Arsenau,
-% updated for LaTeX2e by me
-% subeqn.pdf -- A `printed´ version of subeqn.dtx
-%
-% Installation script for the various parts:
-% -------------------------------------------
-%
-% subeqn.ins -- produces subeqn.sty and subeqn.tex
diff --git a/Master/texmf-dist/doc/latex/subeqn/subeqn-sample.pdf b/Master/texmf-dist/doc/latex/subeqn/subeqn-sample.pdf
new file mode 100644
index 00000000000..ae4bd5c4670
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/subeqn/subeqn-sample.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/subeqn/subeqn.tex b/Master/texmf-dist/doc/latex/subeqn/subeqn-sample.tex
index 6e2f67a639b..a169b7a658a 100644
--- a/Master/texmf-dist/doc/latex/subeqn/subeqn.tex
+++ b/Master/texmf-dist/doc/latex/subeqn/subeqn-sample.tex
@@ -1,23 +1,24 @@
%%
-%% This is file `subeqn.tex',
+%% This is file `subeqn-sample.tex',
%% generated with the docstrip utility.
%%
%% The original source files were:
%%
%% subeqn.dtx (with options: `sample')
+%% This is a generated file.
%%
-%% Copyright (C) 1999-2004 Johannes Braams. All rights reserved.
+%% Copyright (C) 1999-2024 Johannes Braams. All rights reserved.
%%
%% This file was generated from file(s) of the subeqn package.
%% -----------------------------------------------------------
%%
%% It 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.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.
+%% and version 1.3Ñ or later is part of all distributions of LaTeX
+%% version 2008 or later.
%%
%% This work has the LPPL maintenance status "maintained".
%%
@@ -28,23 +29,25 @@
%% without such generated files.
%%
%% The list of all files belonging to the subeqn package is
-%% given in the file `manifest.txt.
+%% given in the file `MANIFEST'.
%%
%% The list of derived (unpacked) files belonging to the distribution
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
-%% File: `subeqn.dtx'
-%% Copyright (C) 1999-2004
-%% Donald Arsenau (asnd at reg.triumf.ca),
-%% Johannes Braams (TeXniek at braams.cistron.nl)
-%%
-\ProvidesFile{subeqn.tex}
- [2004/04/15 v2.0b subnumbering of equations]
+\ProvidesFile{subeqn-sample.tex}
+ [2024/07/21 v2.0c subnumbering of equations]
\documentclass{article}
\usepackage{subeqn}
\begin{document}
-This is an example ot the use of the \texttt{subeqations} package.
+\title{Sample sub-equations}
+\author{Johannes L. Braams}
+\date{\today}
+\maketitle
+
+\noindent
+This is an example of the use of the \texttt{subeqations}
+package. First we have a normal \textsf{equation} environment.
\begin{equation}
\label{a}
a^2 + b^2 = c^2
@@ -71,6 +74,7 @@ Now we start sub-numbering.
and~\ref{c2}.
\end{subequations}
+\noindent
Now lets start a \textsf{subeqnarray} environment.
\begin{subeqnarray}
\label{d}
@@ -81,4 +85,4 @@ This was equation~\ref{d}, with parts~\ref{d1} and~\ref{d2}.
\end{document}
\endinput
%%
-%% End of file `subeqn.tex'.
+%% End of file `subeqn-sample.tex'.
diff --git a/Master/texmf-dist/doc/latex/subeqn/subeqn.pdf b/Master/texmf-dist/doc/latex/subeqn/subeqn.pdf
index e2247d3fdc1..bf29789b713 100644
--- a/Master/texmf-dist/doc/latex/subeqn/subeqn.pdf
+++ b/Master/texmf-dist/doc/latex/subeqn/subeqn.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/subeqnarray/CATALOG b/Master/texmf-dist/doc/latex/subeqnarray/CATALOG
new file mode 100644
index 00000000000..5e037823f88
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/subeqnarray/CATALOG
@@ -0,0 +1,17 @@
+Name: subeqnarray
+Problems-To: texniek at texniek.nl
+Author: J.L. Braams, Donald Arsenau, Stephen Gildea
+Version: 2.1e
+
+Description:
+
+The subeqnarray package provides two new environments subeqnarray and
+subeqnarray* which behave like LaTeX's eqnarray and subeqnarray environments
+except the individual lines are numbered like 1a, 1b, 1c etc.
+This package is not compatible with the package subeqn.
+
+Keywords: latex equations,
+
+Address:
+TeXniek
+The Netherlands
diff --git a/Master/texmf-dist/doc/latex/subeqnarray/manifest.txt b/Master/texmf-dist/doc/latex/subeqnarray/MANIFEST
index f54bba3c8a8..7c253639719 100644
--- a/Master/texmf-dist/doc/latex/subeqnarray/manifest.txt
+++ b/Master/texmf-dist/doc/latex/subeqnarray/MANIFEST
@@ -2,14 +2,18 @@
% CONTENTS OF THE SUBEQNARRAY PACKAGE
% ===================================
%
-% manifest.txt -- This file
+% README -- A short introduction
+% MANIFEST -- A list of files
+% CATALOG -- An entry for the macro catalog
%
% subeqnarray.dtx -- Numbering of individual lines of an eqnarray
% environment as subexpressions; not compatible
% with subeqn.dtx
-% subeqnarray.pdf -- A `printed´ version of subeqnarray.dtx
+% subeqnarray.pdf -- A `printed´ version of subeqnarray.dtx
+% subeqnarray-sample.pdf -- The `printed' versino of the sample file
%
% Installation script for the various parts:
% -------------------------------------------
%
% subeqnarray.ins -- produces subeqnarray.sty and subeqnarray.tex
+
diff --git a/Master/texmf-dist/doc/latex/subeqnarray/README b/Master/texmf-dist/doc/latex/subeqnarray/README
new file mode 100644
index 00000000000..e52f27f0bb9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/subeqnarray/README
@@ -0,0 +1,16 @@
+ subeqnarray bundle
+
+ July 20, 2024
+
+This bundle contains a package that provides two new environments
+subeqnarray and subeqnarray* which behave like LaTeX's eqnarray and
+subeqnarray environments except the individual lines are numbered like
+1a, 1b, 1c etc.
+This package is not compatible with the package subeqn.
+
+Copyright (C) 2024 Johannes L. Braams texniek(at)texniek.nl
+
+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; either
+version 1.3c of the License, or any later version.
diff --git a/Master/texmf-dist/doc/latex/subeqnarray/subeqnarray-sample.pdf b/Master/texmf-dist/doc/latex/subeqnarray/subeqnarray-sample.pdf
new file mode 100644
index 00000000000..2345c08f589
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/subeqnarray/subeqnarray-sample.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/subeqnarray/subeqnarray.tex b/Master/texmf-dist/doc/latex/subeqnarray/subeqnarray-sample.tex
index c119fe16b10..b2a63516d3f 100644
--- a/Master/texmf-dist/doc/latex/subeqnarray/subeqnarray.tex
+++ b/Master/texmf-dist/doc/latex/subeqnarray/subeqnarray-sample.tex
@@ -1,23 +1,23 @@
%%
-%% This is file `subeqnarray.tex',
+%% This is file `subeqnarray-sample.tex',
%% generated with the docstrip utility.
%%
%% The original source files were:
%%
%% subeqnarray.dtx (with options: `sample')
%%
-%% Copyright (C) 1999-2004 Johannes Braams. All rights reserved.
+%% Copyright (C) 1999-2024 Johannes Braams. All rights reserved.
%%
%% This file was generated from file(s) of the subeqnarray package.
%% ----------------------------------------------------------------
%%
%% It 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
-%% version 2003/12/01 or later.
+%% 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".
%%
@@ -33,20 +33,20 @@
%% The list of derived (unpacked) files belonging to the distribution
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
-%% Copyright (C) 1988--2004 by Johannes Braams,
-%% all rights resserved
%%
%% Error reports please to: J. Braams
%% TeXniek
-%% Kooienswater 62
-%% 2715 AJ Zoetermeer
-%% The Netherlands
-%% Email: texniek at braams.cistron.nl
-\ProvidesFile{subeqnarray.tex}
- [2004/04/15 v2.1c subeqnarray package]
+%% Email: texniek at texniek.nl
+\ProvidesFile{subeqnarray-sample.tex}
+ [2024/07/20 v2.1e subeqnarray package]
\documentclass[fleqn]{article}
\usepackage{subeqnarray}
\begin{document}
+\title{Sample subeqnarray}
+\author{Johannes L. Braams}
+\date{\today}
+\maketitle
+
This document shows an example of the use of the \emph{subeqnarray}
environment. Here is one:
\begin{subeqnarray}
@@ -76,4 +76,4 @@ These are equations~\ref{eq10},~\ref{eq11} and~\ref{eq12}.
\end{document}
\endinput
%%
-%% End of file `subeqnarray.tex'.
+%% End of file `subeqnarray-sample.tex'.
diff --git a/Master/texmf-dist/doc/latex/subeqnarray/subeqnarray.pdf b/Master/texmf-dist/doc/latex/subeqnarray/subeqnarray.pdf
index 937120f21dc..d69c2335130 100644
--- a/Master/texmf-dist/doc/latex/subeqnarray/subeqnarray.pdf
+++ b/Master/texmf-dist/doc/latex/subeqnarray/subeqnarray.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/supertabular/CATALOG b/Master/texmf-dist/doc/latex/supertabular/CATALOG
index 8c582730505..b6438f4bcfc 100644
--- a/Master/texmf-dist/doc/latex/supertabular/CATALOG
+++ b/Master/texmf-dist/doc/latex/supertabular/CATALOG
@@ -1,7 +1,7 @@
Name: supertabular (also called supertab)
-Problems-To: texniek@braams.xs4all.nl
+Problems-To: texniek@texniek.nl
Author: J.L. Braams and T. Jurriens
-Version: 4.1g
+Version: 4.2c
Description:
@@ -23,6 +23,4 @@ ISBN 0-201-54199-8.
Address:
TeXniek
-Kersengaarde 33
-2723 BP Zoetermeer
The Netherlands
diff --git a/Master/texmf-dist/doc/latex/supertabular/MANIFEST b/Master/texmf-dist/doc/latex/supertabular/MANIFEST
index bcd27adbf44..3015e0edd5a 100644
--- a/Master/texmf-dist/doc/latex/supertabular/MANIFEST
+++ b/Master/texmf-dist/doc/latex/supertabular/MANIFEST
@@ -1,6 +1,6 @@
-README - A short introduction
-MANIFEST - A list of files
-CATALOG - An entry for the macro catalog
+00readme.tx - A short introduction
+manifest.txt - A list of files
+catalog.txt - An entry for the macro catalog
Changelog - An overview of the changes to the package
supertabular.dtx - The documented version of the code, including a couple
of examples of how to use it. Needs supertabular.sty
diff --git a/Master/texmf-dist/doc/latex/supertabular/README b/Master/texmf-dist/doc/latex/supertabular/README
index ccd7c596a50..9de0746460e 100644
--- a/Master/texmf-dist/doc/latex/supertabular/README
+++ b/Master/texmf-dist/doc/latex/supertabular/README
@@ -13,9 +13,9 @@ The files contained in this bundle are listed in the file MANIFEST
Supertabular can be used with LaTeX2e as a package.
-Copyright (C) 1989 - 2020 Johannes L. Braams texniek at braams.xs4all.nl
+Copyright (C) 1989 - 2024 Johannes L. Braams texniek at texniek.nl
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; either
-version 1 of the License, or any later version.
+version 1.3c of the License, or any later version.
diff --git a/Master/texmf-dist/doc/latex/supertabular/ChangeLog b/Master/texmf-dist/doc/latex/supertabular/supertabular.bug
index 1dedbe6cd47..7c340f0a997 100644
--- a/Master/texmf-dist/doc/latex/supertabular/ChangeLog
+++ b/Master/texmf-dist/doc/latex/supertabular/supertabular.bug
@@ -1,8 +1,29 @@
-2020-02-02 Johannes Braams <texniek at braams.xs4all.nl>
+2021-02-14 Johannes Braams <texniek at texniek.nl>
+
+ * supertabular.dtx: Issue a \penalty-\@M instead of \newpage when
+ moving the first part of a supertabular to the next page to
+ prevent the first two rows from opverlapping.
+
+2021-02-14 Johannes Braams <texniek at texniek.nl>
+
+ * supertabular.dtx: When the tablehead and/or tabletail are not
+ defeined the internal macros that store their arguments need to
+ remain empty as well. Otherwise the algorithm will always think
+ there's a head and tail with a height of 2.5 pt.
+
+2020-06-27 Johannes Braams <texniek at texniek.nl>
+
+ * supertabular.dtx: the new algorithm for calculating the height
+ of the row broke old documents, especially when small font sizes
+ are used. Made the new algorithm optional (calculate versus
+ estimate) and make sure the row height covers super- and
+ subscripts.
+
+2020-02-02 Johannes Braams <texniek at texniek.nl>
* supertabular.dtx: Replaced the way the height of normal tabular
lines is calculated by basing it on the height and depth of
- \strutbox. This also ment being able to take the \extrarowheight
+ \strutbox. This also meant being able to take the \extrarowheight
from the array package into account.
Also the height of the first and subsequent heads was not taken
into account in the calculation of the available pageheigt. This
@@ -14,25 +35,25 @@
\pagesofar. Therefore we substract a little extra from
\ST@pageleft.
-2020-01-26 Johannes Braams <texniek at braams.xs4all.nl>
+2020-01-26 Johannes Braams <texniek at texniek.nl>
* supertabular.dtx: Updated the copyright year and rearranged the
text around the examples in order to get the first table to split
accross a page boundary again.
-2019-01-18 Johannes Braams <texniek at braams.xs4all.nl>
+2019-01-18 Johannes Braams <texniek at texniek.nl>
* supertabular.dtx: The linenumber in the tracing information, that
is reported from within \\, is off by one when the optional
argument is missing. Therefore the input linenumber is now saved
before TeX starts scanning. Problem reported by Frank Mittelbach.
-2019-01-16 Johannes Braams <texniek at braams.xs4all.nl>
+2019-01-16 Johannes Braams <texniek at texniek.nl>
* supertabular.dtx: The option "pageshow" didn't work as it set a
too low value in \c@tracingst. Problem reported by Frank
Mittelbach.
-2019-01-12 Johannes Braams <texniek at braams.xs4all.nl>
+2019-01-12 Johannes Braams <texniek at texniek.nl>
* supertabular.dtx : The definition for the first table head was
different from the definition of the regular table heads.
This problem was reported by FMi as it produced an extra table in
@@ -44,7 +65,7 @@
themselves although this couteracts the change that was introduced
on 08-08-1999.
-2001-08-21 Johannes Braams <texniek at braams.xs4all.nl>
+2001-08-21 Johannes Braams <texniek at texniek.nl>
* supertabular.dtx : The macro \ST@next needs to be defined when
\ST@skippage was called. Therefore I moved the default definition
@@ -52,7 +73,7 @@
is called; possibly defined by \ST@newpage. This problem was
reported by Andrew Dorrell <dorrell@research.canon.com.au>.
-1999-08-08 Johannes Braams <texniek at braams.xs4all.nl>
+1999-08-08 Johannes Braams <texniek at texniek.nl>
* supertabular.dtx : No longer re-initialize the internal variable
\@table@first@head and \@table@last@tail. This made it impossible
@@ -61,20 +82,20 @@
redeclaring the firsthead and/or lasttail. Reported by Christian
Matuszewski <matuszew@informatik.uni-halle.de>.
-Fri Nov 7 20:27:27 1997 Johannes Braams <texniek at braams.xs4all.nl>
+Fri Nov 7 20:27:27 1997 Johannes Braams <texniek at texniek.nl>
* supertabular.dtx : For standard LaTeX we need to change
\@@startpbox not \@startpbox. Found by Peter R Wilson
- <Peter.Wilson@PSS.Boeing.com>
+ <Peter.Wilson@PSS.Boeing.com>.
-Wed Oct 8 22:35:40 1997 Johannes Braams <texniek at braams.xs4all.nl>
+Wed Oct 8 22:35:40 1997 Johannes Braams <texniek at texniek.nl>
* supertabular.dtx: Running the documentation revealed a loop;
inside the table tail and head \\ was reset to \@tabularcr instead
of to \@@tabularcr (now: \org@tabularcr). First found by Thomas
- Esser <te@informatik.uni-hannover.de>
+ Esser <te@informatik.uni-hannover.de>.
-Sat Sep 27 21:35:29 1997 Johannes Braams <texniek at braams.xs4all.nl>
+Sat Sep 27 21:35:29 1997 Johannes Braams <texniek at texniek.nl>
* supertabular.dtx: Added the mpsupertabular and mpsupertabular*
environments provided by Axel Kielhorn <A.Kielhorn@tu-bs.de>;
@@ -84,14 +105,14 @@ Sat Sep 27 21:35:29 1997 Johannes Braams <texniek at braams.xs4all.nl>
The calculation of the available height still missed the case
where TeX has already begun the second column.
-Thu Sep 18 00:31:55 1997 Johannes Braams <texniek at braams.xs4all.nl>
+Thu Sep 18 00:31:55 1997 Johannes Braams <texniek at texniek.nl>
* supertabular.dtx : The \tablehead and \tabletail commands reset
the command \\; they used \cr for it. That should have been
\@tabularcr to properly deal with it's optional argument.
Found by Axel Kielhorn <A.Kielhorn@tu-bs.de>
-Wed Sep 17 23:59:13 1997 Johannes Braams <texniek at braams.xs4all.nl>
+Wed Sep 17 23:59:13 1997 Johannes Braams <texniek at texniek.nl>
* supertabular.dtx : In two column mode the parameters that
determine how much space is left on the page were not correctly
@@ -99,7 +120,7 @@ Wed Sep 17 23:59:13 1997 Johannes Braams <texniek at braams.xs4all.nl>
completely.
Found by Jeffrey Spielberg <jspielberg@infinet-software.com>
-Tue May 20 23:46:08 1997 Johannes Braams <texniek at braams.xs4all.nl>
+Tue May 20 23:46:08 1997 Johannes Braams <texniek at texniek.nl>
* supertabular.dtx : \shrinkheight didn't shrink the available
height for a part of the tabular (as documented); it just *set* it
@@ -109,26 +130,26 @@ Tue May 20 23:46:08 1997 Johannes Braams <texniek at braams.xs4all.nl>
\@table@last@tail are undefined; this shoud be done globally.
Found by Axel Kielhorn <A.Kielhorn@tu-bs.de>
-Sat Apr 12 23:37:33 1997 Johannes Braams <texniek at braams.xs4all.nl>
+Sat Apr 12 23:37:33 1997 Johannes Braams <texniek at texniek.nl>
* supertabular.dtx : Added \ST@stretchht and \ST@prevht to improve
decision process. \estimate@lineht now also computes the
difference between a normal line height and when \arraystretch is
in effect.
-Thu Apr 10 23:33:07 1997 Johannes Braams <texniek at braams.xs4all.nl>
+Thu Apr 10 23:33:07 1997 Johannes Braams <texniek at texniek.nl>
* supertabular.dtx: Had to repaire some documentation errors.
(found by Thomas Esser <te@informatik.uni-hannover.de>)
-Wed Apr 9 00:29:36 1997 Johannes Braams <texniek at braams.xs4all.nl>
+Wed Apr 9 00:29:36 1997 Johannes Braams <texniek at texniek.nl>
* supertabular.dtx : Only the first part of a supertabular can be
moved to the next page. Therefore we need to change the definition
of \ST@skippage in the middle of processing the supertabular data.
-Thu Mar 6 21:56:18 1997 Johannes Braams <texniek at braams.xs4all.nl>
+Thu Mar 6 21:56:18 1997 Johannes Braams <texniek at texniek.nl>
* supertabular.dtx : Using a tabular environment in the cells of a
supertabular gives `interesting' results when the algorithm
@@ -136,14 +157,14 @@ Thu Mar 6 21:56:18 1997 Johannes Braams <texniek at braams.xs4all.nl>
tabular. A number of changes were necessary to make this work.
Found by Axel Kielhorn <i0080108@ws.rz.tu-bs.de>
-Thu Feb 20 23:29:18 1997 Johannes Braams <texniek at braams.xs4all.nl>
+Thu Feb 20 23:29:18 1997 Johannes Braams <texniek at texniek.nl>
* supertabular.dtx: Renamed \tableformat into \ST@tableformat
because the KOPMA-packages also use \tableformat and therefore
clashed with babel.
Found by Axel Kielhorn <i0080108@ws.rz.tu-bs.de>
-Tue Feb 4 23:50:50 1997 Johannes Braams <texniek at braams.xs4all.nl>
+Tue Feb 4 23:50:50 1997 Johannes Braams <texniek at texniek.nl>
* supertabular.dtx (section{The Implementation}): Removed the use
of the page height correction for p-columns; the current algorithm
@@ -155,7 +176,7 @@ Tue Feb 4 23:50:50 1997 Johannes Braams <texniek at braams.xs4all.nl>
page on a calculated minimum height of the table. The minimum is
the head, the tail and 1 line of tabular data.
-Thu Nov 28 20:38:53 1996 Johannes Braams <texniek at braams.xs4all.nl>
+Thu Nov 28 20:38:53 1996 Johannes Braams <texniek at texniek.nl>
* supertabular.dtx: Started a cleanup of the code, made source
file a full fledged .dtx file
@@ -168,7 +189,7 @@ Thu Nov 28 20:38:53 1996 Johannes Braams <texniek at braams.xs4all.nl>
% jurriens at fwn.rug.nl P.O Box 800, 9700 AV Groningen
%
% revised by: Johannes Braams
-% texniek at braams.xs4all.nl TeXniek (NL)
+% texniek at texniek.nl TeXniek (NL)
% \def\fileversion{3.7c}
% \def\filename{supertabular sty}
% \def\filedate{1995/10/16}
diff --git a/Master/texmf-dist/doc/latex/supertabular/supertabular.pdf b/Master/texmf-dist/doc/latex/supertabular/supertabular.pdf
index 444cbfdcd75..a24a8c865c4 100644
--- a/Master/texmf-dist/doc/latex/supertabular/supertabular.pdf
+++ b/Master/texmf-dist/doc/latex/supertabular/supertabular.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tablvar/README.md b/Master/texmf-dist/doc/latex/tablvar/README.md
index 565ed9c0499..0be4d44111f 100644
--- a/Master/texmf-dist/doc/latex/tablvar/README.md
+++ b/Master/texmf-dist/doc/latex/tablvar/README.md
@@ -6,8 +6,8 @@
- A complete and easy to use package for typesetting pretty tables of signs and variations according to French usage.
- The syntax is similar to that of the array environment and uses intuitive position commands.
- Arrows are automatically drawn (with PSTricks or TikZ).
-- Macros are provided for drawing double bars, single bars crossing the zeros, intervals where a function is not defined or for placing special values.
-- Several features of variations tables can be customized.
+- Macros are provided for drawing double bars, single bars crossing zero values, intervals where a function is not defined or for placing special values.
+- Many features of variations tables can be customized.
## Documentation
@@ -18,7 +18,7 @@ The documentation is in French.
## Installation
- run LaTeX on tablvar.ins, you obtain the file tablvar.sty,
-- if then you run XeLaTeX or LaTeX + dvips + ps2pdf on tablvar.dtx you get the file tablvar.pdf which is also in the archive,
+- if then you run LaTeX + dvips + ps2pdf on tablvar.dtx you get the file tablvar.pdf which is also in the archive,
- put the files tablvar.sty and tablvar.pdf in your TeX Directory Structure.
diff --git a/Master/texmf-dist/doc/latex/tablvar/tablvar.pdf b/Master/texmf-dist/doc/latex/tablvar/tablvar.pdf
index 7f5962d8fc7..d949a47be31 100644
--- a/Master/texmf-dist/doc/latex/tablvar/tablvar.pdf
+++ b/Master/texmf-dist/doc/latex/tablvar/tablvar.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tagpdf/README.md b/Master/texmf-dist/doc/latex/tagpdf/README.md
index 9602302c2a2..edcdc6b5e6e 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/README.md
+++ b/Master/texmf-dist/doc/latex/tagpdf/README.md
@@ -1,6 +1,6 @@
#tagpdf — A package to create tagged pdf
-Packageversion: 0.99c
-Packagedate: 2024/06/20
+Packageversion: 0.99d
+Packagedate: 2024/08/02
Author: Ulrike Fischer, LaTeX Project Team
## License
diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-AF-file.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-AF-file.pdf
index 37673eac26e..9ba962e1e33 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/ex-AF-file.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/ex-AF-file.pdf
@@ -1,11 +1,11 @@
%PDF-2.0
%ÌÕÁÔÅØÐÄÆ
22 0 obj
-<< /Subtype /application#2Fx-tex/Type /EmbeddedFile /Params<</ModDate (D:20240620175033+02'00') /Size 151 /CheckSum (4C0D15859D9BA750E65BE6F420DEA972) >> /Length 151 >>
+<< /Subtype /application#2Fx-tex/Type /EmbeddedFile /Params<</ModDate (D:20240802125547+02'00') /Size 151 /CheckSum (D4716966C44F441B4E4C1D2DD929683B) >> /Length 151 >>
stream
%% LaTeX2e file `example-input-file.tex'
%% generated by the `filecontents' environment
-%% from source `ex-AF-file' on 2024/06/20.
+%% from source `ex-AF-file' on 2024/08/02.
%%
Additional info!
@@ -15,7 +15,7 @@ endobj
<< /Type /Filespec /AFRelationship /Unspecified /F (example-input-file.tex) /UF <FEFF006500780061006D0070006C0065002D0069006E007000750074002D00660069006C0065002E007400650078> /EF<</F 22 0 R/UF 22 0 R>> >>
endobj
25 0 obj
-<< /Subtype /text#2Fplain/Type /EmbeddedFile /Params<</ModDate (D:20240620) >> /Length 19 >>
+<< /Subtype /text#2Fplain/Type /EmbeddedFile /Params<</ModDate (D:20240802) >> /Length 19 >>
stream
Bär with teh shirt
endstream
@@ -24,7 +24,7 @@ endobj
<< /Type /Filespec /AFRelationship /Supplement /F (tag-AFfile1.txt) /UF <FEFF007400610067002D0041004600660069006C00650031002E007400780074> /EF<</F 25 0 R/UF 25 0 R>> >>
endobj
28 0 obj
-<< /Subtype /text#2Fplain/Type /EmbeddedFile /Params<</ModDate (D:20240620) >> /Length 4 >>
+<< /Subtype /text#2Fplain/Type /EmbeddedFile /Params<</ModDate (D:20240802) >> /Length 4 >>
stream
Duck
endstream
@@ -242,17 +242,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2024-06-20T17:50:54+02:00</rdf:li>
+ <rdf:li>2024-08-02T12:56:09+02:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-AF-file.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2024-06-20T17:50:54+02:00</xmp:CreateDate>
- <xmp:ModifyDate>2024-06-20T17:50:54+02:00</xmp:ModifyDate>
- <xmp:MetadataDate>2024-06-20T17:50:54+02:00</xmp:MetadataDate>
+ <xmp:CreateDate>2024-08-02T12:56:09+02:00</xmp:CreateDate>
+ <xmp:ModifyDate>2024-08-02T12:56:09+02:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2024-08-02T12:56:09+02:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:38d5a844-2217-4081-87cc-b2129dc357a6</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:9859f422-c856-46c6-8928-4dfab5f8790c</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:3ff2b426-7c06-4861-8f14-4e8e04ac9b4c</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>1</prism:pageCount>
</rdf:Description>
@@ -347,7 +347,7 @@ endobj
<< /Type /Namespace /NS (https://www.latex-project.org/ns/book/2022) /RoleMapNS 18 0 R >>
endobj
19 0 obj
-<< /Type /Namespace /NS (data:,15379C35-DB3-5B3E-89A5-42149DCFB2F) >>
+<< /Type /Namespace /NS (data:,BBA64916-90D9-A0B9-F592-8E68FD20F532) >>
endobj
8 0 obj
[ 9 0 R 11 0 R 13 0 R 15 0 R 17 0 R 19 0 R ]
@@ -449,7 +449,7 @@ endobj
<< /Type /Catalog /Pages 36 0 R /MarkInfo 37 0 R/Lang (de-DE)/Metadata 31 0 R/StructTreeRoot 5 0 R >>
endobj
46 0 obj
-<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240620175054+02'00')/ModDate (D:20240620175054+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
+<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240802125609+02'00')/ModDate (D:20240802125609+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
endobj
xref
0 47
@@ -458,10 +458,10 @@ xref
0000000003 00000 f
0000000004 00000 f
0000000010 00000 f
-0000016360 00000 n
+0000016362 00000 n
0000013627 00000 n
0000013838 00000 n
-0000015790 00000 n
+0000015792 00000 n
0000014417 00000 n
0000000012 00000 f
0000014485 00000 n
@@ -474,34 +474,34 @@ xref
0000015425 00000 n
0000015703 00000 n
0000000000 00000 f
-0000015851 00000 n
+0000015853 00000 n
0000000020 00000 n
0000000382 00000 n
-0000015964 00000 n
+0000015966 00000 n
0000000603 00000 n
0000000758 00000 n
-0000016096 00000 n
+0000016098 00000 n
0000000943 00000 n
0000001083 00000 n
-0000016228 00000 n
+0000016230 00000 n
0000001268 00000 n
0000013481 00000 n
0000013346 00000 n
0000012740 00000 n
-0000020113 00000 n
-0000020467 00000 n
+0000020115 00000 n
+0000020469 00000 n
0000013591 00000 n
0000013684 00000 n
0000013801 00000 n
-0000016480 00000 n
-0000018929 00000 n
-0000016666 00000 n
-0000019150 00000 n
-0000020267 00000 n
-0000020529 00000 n
-0000020647 00000 n
+0000016482 00000 n
+0000018931 00000 n
+0000016668 00000 n
+0000019152 00000 n
+0000020269 00000 n
+0000020531 00000 n
+0000020649 00000 n
trailer
-<< /Size 47 /Root 45 0 R /Info 46 0 R /ID [ <CB0601DB4D9A68774E7E29190E0D5823> <CB0601DB4D9A68774E7E29190E0D5823> ] >>
+<< /Size 47 /Root 45 0 R /Info 46 0 R /ID [ <E2F9D94DBDFC11D2EE5801BA51FD5C99> <E2F9D94DBDFC11D2EE5801BA51FD5C99> ] >>
startxref
-20870
+20872
%%EOF
diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-alt-actualtext.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-alt-actualtext.pdf
index 8bbbbcc16c0..f64d4e66bfe 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/ex-alt-actualtext.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/ex-alt-actualtext.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-attribute.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-attribute.pdf
index 172ce029909..feda9e252ac 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/ex-attribute.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/ex-attribute.pdf
@@ -216,17 +216,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2024-06-20T17:51:49+02:00</rdf:li>
+ <rdf:li>2024-08-02T12:57:08+02:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-attribute.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2024-06-20T17:51:49+02:00</xmp:CreateDate>
- <xmp:ModifyDate>2024-06-20T17:51:49+02:00</xmp:ModifyDate>
- <xmp:MetadataDate>2024-06-20T17:51:49+02:00</xmp:MetadataDate>
+ <xmp:CreateDate>2024-08-02T12:57:08+02:00</xmp:CreateDate>
+ <xmp:ModifyDate>2024-08-02T12:57:08+02:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2024-08-02T12:57:08+02:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:7a9cf910-1c19-429a-8f24-339c62d8a57f</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:d4b89449-5e1d-43cf-83af-3903105d1b3f</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:b262e437-7e89-4c42-8e29-bedae4c498b6</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>1</prism:pageCount>
</rdf:Description>
@@ -450,7 +450,7 @@ endobj
<< /Type /Catalog /Pages 26 0 R /MarkInfo 27 0 R/Lang (de_DE)/Metadata 21 0 R/StructTreeRoot 5 0 R >>
endobj
38 0 obj
-<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/Title (Title)/CreationDate (D:20240620175149+02'00')/ModDate (D:20240620175149+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
+<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/Title (Title)/CreationDate (D:20240802125708+02'00')/ModDate (D:20240802125708+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
endobj
xref
0 39
@@ -494,7 +494,7 @@ xref
0000017721 00000 n
0000017839 00000 n
trailer
-<< /Size 39 /Root 37 0 R /Info 38 0 R /ID [ <658202793A4D39DC44497E1203173F04> <658202793A4D39DC44497E1203173F04> ] >>
+<< /Size 39 /Root 37 0 R /Info 38 0 R /ID [ <2033D8BFB67E1F1EDFB190E1DEC10A2C> <2033D8BFB67E1F1EDFB190E1DEC10A2C> ] >>
startxref
18076
%%EOF
diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-formula-problem.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-formula-problem.pdf
index 9ac7a851bc9..637338d16f2 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/ex-formula-problem.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/ex-formula-problem.pdf
@@ -239,17 +239,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2024-06-20T17:52:18+02:00</rdf:li>
+ <rdf:li>2024-08-02T12:57:37+02:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-formula-problem.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2024-06-20T17:52:18+02:00</xmp:CreateDate>
- <xmp:ModifyDate>2024-06-20T17:52:18+02:00</xmp:ModifyDate>
- <xmp:MetadataDate>2024-06-20T17:52:18+02:00</xmp:MetadataDate>
+ <xmp:CreateDate>2024-08-02T12:57:37+02:00</xmp:CreateDate>
+ <xmp:ModifyDate>2024-08-02T12:57:37+02:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2024-08-02T12:57:37+02:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:8eb2ce1d-b2ec-440a-8bc2-73733eb3eeb0</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:b48ac58a-5b57-46ab-8ab8-087479364eeb</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:8fbc3896-5f57-401a-81d8-1fdb02abac8a</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>2</prism:pageCount>
</rdf:Description>
@@ -425,7 +425,7 @@ endobj
<< /Type /Catalog /Pages 16 0 R /MarkInfo 23 0 R/Lang (de-DE)/Metadata 19 0 R/StructTreeRoot 5 0 R >>
endobj
33 0 obj
-<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240620175218+02'00')/ModDate (D:20240620175218+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
+<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240802125737+02'00')/ModDate (D:20240802125737+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
endobj
xref
0 34
@@ -464,7 +464,7 @@ xref
0000018886 00000 n
0000019004 00000 n
trailer
-<< /Size 34 /Root 32 0 R /Info 33 0 R /ID [ <4A2EBD4B9A1971E2BAF6A530303DF07B> <4A2EBD4B9A1971E2BAF6A530303DF07B> ] >>
+<< /Size 34 /Root 32 0 R /Info 33 0 R /ID [ <84EDE341B761805B059537E407E8C0CD> <84EDE341B761805B059537E407E8C0CD> ] >>
startxref
19227
%%EOF
diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-list.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-list.pdf
index 2346b0398a9..381477d8292 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/ex-list.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/ex-list.pdf
@@ -210,17 +210,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2024-06-20T17:52:47+02:00</rdf:li>
+ <rdf:li>2024-08-02T12:58:08+02:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-list.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2024-06-20T17:52:47+02:00</xmp:CreateDate>
- <xmp:ModifyDate>2024-06-20T17:52:47+02:00</xmp:ModifyDate>
- <xmp:MetadataDate>2024-06-20T17:52:47+02:00</xmp:MetadataDate>
+ <xmp:CreateDate>2024-08-02T12:58:08+02:00</xmp:CreateDate>
+ <xmp:ModifyDate>2024-08-02T12:58:08+02:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2024-08-02T12:58:08+02:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:4c749825-1de7-414c-879f-29e4d0bef66e</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:843c5ce9-108a-49d8-86ef-881382f178ee</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:0803684d-fad7-4d08-8dc2-c5108f24d889</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>1</prism:pageCount>
</rdf:Description>
@@ -654,7 +654,7 @@ endobj
<< /Type /Catalog /Pages 54 0 R /MarkInfo 55 0 R/Lang (en)/Metadata 48 0 R/StructTreeRoot 5 0 R >>
endobj
72 0 obj
-<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240620175247+02'00')/ModDate (D:20240620175247+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
+<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240802125808+02'00')/ModDate (D:20240802125808+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
endobj
xref
0 73
@@ -732,7 +732,7 @@ xref
0000029590 00000 n
0000029705 00000 n
trailer
-<< /Size 73 /Root 71 0 R /Info 72 0 R /ID [ <14B40F363BE2C4EFB96EAE91DC2CE4F7> <14B40F363BE2C4EFB96EAE91DC2CE4F7> ] >>
+<< /Size 73 /Root 71 0 R /Info 72 0 R /ID [ <0EE2DD31789AD5C7E80F8407D72CF075> <0EE2DD31789AD5C7E80F8407D72CF075> ] >>
startxref
29928
%%EOF
diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-mc-manual-para-split-obsolete.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-mc-manual-para-split-obsolete.pdf
index 70cfe5e7937..6d60e107364 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/ex-mc-manual-para-split-obsolete.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/ex-mc-manual-para-split-obsolete.pdf
@@ -243,17 +243,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2024-06-20T17:53:22+02:00</rdf:li>
+ <rdf:li>2024-08-02T12:58:35+02:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-mc-manual-para-split-obsolete.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2024-06-20T17:53:22+02:00</xmp:CreateDate>
- <xmp:ModifyDate>2024-06-20T17:53:22+02:00</xmp:ModifyDate>
- <xmp:MetadataDate>2024-06-20T17:53:22+02:00</xmp:MetadataDate>
+ <xmp:CreateDate>2024-08-02T12:58:35+02:00</xmp:CreateDate>
+ <xmp:ModifyDate>2024-08-02T12:58:35+02:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2024-08-02T12:58:35+02:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:c33d64b4-96ec-4e48-8f27-0b3edc831547</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:36712ce3-22f3-4c4a-8418-0427448d178a</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:075c36f4-757d-4e0f-8258-3c0a3e372d69</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>2</prism:pageCount>
</rdf:Description>
@@ -413,7 +413,7 @@ endobj
<< /Type /Catalog /Pages 14 0 R /Lang (de)/Metadata 15 0 R >>
endobj
25 0 obj
-<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240620175322+02'00')/ModDate (D:20240620175322+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
+<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240802125835+02'00')/ModDate (D:20240802125835+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
endobj
xref
0 26
@@ -444,7 +444,7 @@ xref
0000023894 00000 n
0000023972 00000 n
trailer
-<< /Size 26 /Root 24 0 R /Info 25 0 R /ID [ <2A141E41EDA78C2ADA31A952D041C439> <2A141E41EDA78C2ADA31A952D041C439> ] >>
+<< /Size 26 /Root 24 0 R /Info 25 0 R /ID [ <1A7EFBAD198841A82D20467F858B3B6C> <1A7EFBAD198841A82D20467F858B3B6C> ] >>
startxref
24195
%%EOF
diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-softhyphen.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-softhyphen.pdf
index 5f96db2bdbf..09a8d8aca07 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/ex-softhyphen.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/ex-softhyphen.pdf
@@ -210,17 +210,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2024-06-20T17:53:55+02:00</rdf:li>
+ <rdf:li>2024-08-02T12:59:01+02:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-softhyphen.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2024-06-20T17:53:55+02:00</xmp:CreateDate>
- <xmp:ModifyDate>2024-06-20T17:53:55+02:00</xmp:ModifyDate>
- <xmp:MetadataDate>2024-06-20T17:53:55+02:00</xmp:MetadataDate>
+ <xmp:CreateDate>2024-08-02T12:59:01+02:00</xmp:CreateDate>
+ <xmp:ModifyDate>2024-08-02T12:59:01+02:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2024-08-02T12:59:01+02:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:aa82e685-4098-469d-861c-3c45dfc700c7</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:9c8a342f-f758-4367-8d05-7621809f3e05</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:994c7ab3-d509-4a5b-88b5-92bca5031c75</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>1</prism:pageCount>
</rdf:Description>
@@ -393,7 +393,7 @@ endobj
<< /Type /Catalog /Pages 19 0 R /MarkInfo 20 0 R/Lang (de)/Metadata 14 0 R/StructTreeRoot 5 0 R >>
endobj
30 0 obj
-<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240620175355+02'00')/ModDate (D:20240620175355+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
+<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240802125901+02'00')/ModDate (D:20240802125901+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
endobj
xref
0 31
@@ -429,7 +429,7 @@ xref
0000018113 00000 n
0000018228 00000 n
trailer
-<< /Size 31 /Root 29 0 R /Info 30 0 R /ID [ <5BCC76B86A64606D9B117AF50FFA18AE> <5BCC76B86A64606D9B117AF50FFA18AE> ] >>
+<< /Size 31 /Root 29 0 R /Info 30 0 R /ID [ <EECF5F575625EC21F0BEE870E572FEB1> <EECF5F575625EC21F0BEE870E572FEB1> ] >>
startxref
18451
%%EOF
diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-spaceglyph-listings.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-spaceglyph-listings.pdf
index 21b11b9346f..35e1d0609af 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/ex-spaceglyph-listings.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/ex-spaceglyph-listings.pdf
@@ -210,17 +210,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2024-06-20T17:54:22+02:00</rdf:li>
+ <rdf:li>2024-08-02T12:59:25+02:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-spaceglyph-listings.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2024-06-20T17:54:22+02:00</xmp:CreateDate>
- <xmp:ModifyDate>2024-06-20T17:54:22+02:00</xmp:ModifyDate>
- <xmp:MetadataDate>2024-06-20T17:54:22+02:00</xmp:MetadataDate>
+ <xmp:CreateDate>2024-08-02T12:59:25+02:00</xmp:CreateDate>
+ <xmp:ModifyDate>2024-08-02T12:59:25+02:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2024-08-02T12:59:25+02:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:acdc2435-bf29-4e54-8d09-1c9b6dc32038</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:ad8487cb-8dcc-4cab-8542-55106010deec</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:c59181fc-bb69-430b-8f90-90206d3ba579</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>1</prism:pageCount>
</rdf:Description>
@@ -354,7 +354,7 @@ endobj
<< /Type /Catalog /Pages 15 0 R /MarkInfo 16 0 R/Lang (de)/Metadata 10 0 R/StructTreeRoot 5 0 R >>
endobj
26 0 obj
-<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240620175422+02'00')/ModDate (D:20240620175422+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
+<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240802125925+02'00')/ModDate (D:20240802125925+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
endobj
xref
0 27
@@ -386,7 +386,7 @@ xref
0000015485 00000 n
0000015600 00000 n
trailer
-<< /Size 27 /Root 25 0 R /Info 26 0 R /ID [ <50A5738B4CABF76A4CC27558811B7E58> <50A5738B4CABF76A4CC27558811B7E58> ] >>
+<< /Size 27 /Root 25 0 R /Info 26 0 R /ID [ <EC0A5DEABF5EE1A293FAD60891A0BF63> <EC0A5DEABF5EE1A293FAD60891A0BF63> ] >>
startxref
15823
%%EOF
diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-structure-obsolete.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-structure-obsolete.pdf
index 7c9c135bf7a..73ce1c06022 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/ex-structure-obsolete.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/ex-structure-obsolete.pdf
@@ -210,17 +210,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2024-06-20T17:54:47+02:00</rdf:li>
+ <rdf:li>2024-08-02T12:59:50+02:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-structure-obsolete.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2024-06-20T17:54:47+02:00</xmp:CreateDate>
- <xmp:ModifyDate>2024-06-20T17:54:47+02:00</xmp:ModifyDate>
- <xmp:MetadataDate>2024-06-20T17:54:47+02:00</xmp:MetadataDate>
+ <xmp:CreateDate>2024-08-02T12:59:50+02:00</xmp:CreateDate>
+ <xmp:ModifyDate>2024-08-02T12:59:50+02:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2024-08-02T12:59:50+02:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:bf5e4a2b-cfa9-4fc5-878c-8f9d2ee95445</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:971e1e25-37c4-4af9-8523-72714a87dea7</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:2ccba557-e5ae-4703-80db-28b73a88c1cd</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>1</prism:pageCount>
</rdf:Description>
@@ -526,7 +526,7 @@ endobj
<< /Type /Catalog /Pages 26 0 R /MarkInfo 27 0 R/Lang (de)/Metadata 20 0 R/StructTreeRoot 5 0 R >>
endobj
43 0 obj
-<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240620175447+02'00')/ModDate (D:20240620175447+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
+<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240802125950+02'00')/ModDate (D:20240802125950+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
endobj
xref
0 44
@@ -575,7 +575,7 @@ xref
0000023423 00000 n
0000023538 00000 n
trailer
-<< /Size 44 /Root 42 0 R /Info 43 0 R /ID [ <ADB87D57539D5CE2A8FC3A4721B94DA0> <ADB87D57539D5CE2A8FC3A4721B94DA0> ] >>
+<< /Size 44 /Root 42 0 R /Info 43 0 R /ID [ <AE5400E970AB8EBE6C04A229EBA70E89> <AE5400E970AB8EBE6C04A229EBA70E89> ] >>
startxref
23761
%%EOF
diff --git a/Master/texmf-dist/doc/latex/tagpdf/ex-tagpdf-template.pdf b/Master/texmf-dist/doc/latex/tagpdf/ex-tagpdf-template.pdf
index 81423fede4f..7147cd1e913 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/ex-tagpdf-template.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/ex-tagpdf-template.pdf
@@ -210,17 +210,17 @@ stream
</dc:language>
<dc:date>
<rdf:Seq>
- <rdf:li>2024-06-20T17:55:14+02:00</rdf:li>
+ <rdf:li>2024-08-02T13:00:16+02:00</rdf:li>
</rdf:Seq>
</dc:date>
<dc:format>application/pdf</dc:format>
<dc:source>ex-tagpdf-template.tex</dc:source>
<xmp:CreatorTool>LaTeX</xmp:CreatorTool>
- <xmp:CreateDate>2024-06-20T17:55:14+02:00</xmp:CreateDate>
- <xmp:ModifyDate>2024-06-20T17:55:14+02:00</xmp:ModifyDate>
- <xmp:MetadataDate>2024-06-20T17:55:14+02:00</xmp:MetadataDate>
+ <xmp:CreateDate>2024-08-02T13:00:16+02:00</xmp:CreateDate>
+ <xmp:ModifyDate>2024-08-02T13:00:16+02:00</xmp:ModifyDate>
+ <xmp:MetadataDate>2024-08-02T13:00:16+02:00</xmp:MetadataDate>
<xmpMM:DocumentID>uuid:f320abfc-f6ab-4d12-8719-d176f4d947cf</xmpMM:DocumentID>
- <xmpMM:InstanceID>uuid:898c4009-cc18-43c3-8fda-44ab8e28318c</xmpMM:InstanceID>
+ <xmpMM:InstanceID>uuid:3b4409f1-f3e5-4c01-86c4-a0bcea68ea38</xmpMM:InstanceID>
<prism:complianceProfile>three</prism:complianceProfile>
<prism:pageCount>1</prism:pageCount>
</rdf:Description>
@@ -307,7 +307,7 @@ endobj
<< /Type /Namespace /NS (https://www.latex-project.org/ns/book/2022) /RoleMapNS 18 0 R >>
endobj
19 0 obj
-<< /Type /Namespace /NS (data:,69C62BB9-6D5A-6FC9-FD75-56BC71E087F4) >>
+<< /Type /Namespace /NS (data:,25352333-84F8-941A-42AB-414B46468294) >>
endobj
8 0 obj
[ 9 0 R 11 0 R 13 0 R 15 0 R 17 0 R 19 0 R ]
@@ -399,7 +399,7 @@ endobj
<< /Type /Catalog /Pages 31 0 R /MarkInfo 32 0 R/Lang (en)/Metadata 26 0 R/StructTreeRoot 5 0 R >>
endobj
42 0 obj
-<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240620175514+02'00')/ModDate (D:20240620175514+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
+<< /Producer (luahbtex-1.18.0)/Creator (LaTeX)/CreationDate (D:20240802130016+02'00')/ModDate (D:20240802130016+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.0 (TeX Live 2024)) >>
endobj
xref
0 43
@@ -447,7 +447,7 @@ xref
0000017842 00000 n
0000017957 00000 n
trailer
-<< /Size 43 /Root 41 0 R /Info 42 0 R /ID [ <E36FE13F3FA0066C1F9796E38E50018C> <E36FE13F3FA0066C1F9796E38E50018C> ] >>
+<< /Size 43 /Root 41 0 R /Info 42 0 R /ID [ <42D962292B4982520E998D32C837DE43> <42D962292B4982520E998D32C837DE43> ] >>
startxref
18180
%%EOF
diff --git a/Master/texmf-dist/doc/latex/tagpdf/link-figure-input.tex b/Master/texmf-dist/doc/latex/tagpdf/link-figure-input.tex
index ef07c33e95b..1a1036d282d 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/link-figure-input.tex
+++ b/Master/texmf-dist/doc/latex/tagpdf/link-figure-input.tex
@@ -27,7 +27,7 @@
\NewDocumentCommand\balloon{m}{%
\node[fit={(pic cs:#1-first) (pic cs:#1-end)
([yshift=7pt]pic cs:#1-end)},balloon](#1){};}
-\begin{tikzpicture}[overlay,remember picture]
+\begin{tikzpicture}[overlay,remember picture,alt={Illustration of link annotation structure}]
\balloon{link}
\balloon{structparent}
\balloon{OBJR}
@@ -45,7 +45,7 @@
\draw[ref] (kid)--(OBJR);
\draw[ref] (OBJR)--(linkref);
\end{tikzpicture}
-\begin{lstlisting}[name=OBJR]
+\begin{taglstlisting}[name=OBJR]
*\tikzmark{link-first}*18 0 obj*\tikzmark{link-end}* %Link Object
<< /Type /Annot /Subtype/Link
/Rect [ 196.109 494.573 399.167 506.831 ]
@@ -67,4 +67,4 @@ endobj};
<< /Nums
[... *\tikzmark{pnum-first}*16*\tikzmark{pnum-end}* *\tikzmark{pref-first}*17 0 R*\tikzmark{pref-end}* ...] >>
endobj
-\end{lstlisting}
+\end{taglstlisting}
diff --git a/Master/texmf-dist/doc/latex/tagpdf/pac2024-report.png b/Master/texmf-dist/doc/latex/tagpdf/pac2024-report.png
new file mode 100644
index 00000000000..4474bc989f1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/tagpdf/pac2024-report.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tagpdf/pac2024-version.png b/Master/texmf-dist/doc/latex/tagpdf/pac2024-version.png
new file mode 100644
index 00000000000..1bc12bdafe4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/tagpdf/pac2024-version.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.pdf b/Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.pdf
index 4dd216d1a95..76e839d0d50 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tagpdf/tagpdf.pdf b/Master/texmf-dist/doc/latex/tagpdf/tagpdf.pdf
index 04d46c2fbfc..f7c6ea02a36 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/tagpdf.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/tagpdf.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tagpdf/tagpdf.tex b/Master/texmf-dist/doc/latex/tagpdf/tagpdf.tex
index ac1c33fa4a8..10d36d09a0d 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/tagpdf.tex
+++ b/Master/texmf-dist/doc/latex/tagpdf/tagpdf.tex
@@ -16,8 +16,8 @@
}
\DebugBlocksOff
\makeatletter
-\def\UlrikeFischer@package@version{0.99c}
-\def\UlrikeFischer@package@date{2024-06-20}
+\def\UlrikeFischer@package@version{0.99d}
+\def\UlrikeFischer@package@date{2024-08-02}
\makeatother
\documentclass[bibliography=totoc,a4paper]{article}
@@ -338,13 +338,15 @@ improvements and new features in the \LaTeX\ kernel, the latex-lab bundle and
the \PDF\ management code and is now much better. Only a few
structures---mostly some from currently unsupported packages--- still need
manual tagging. But sadly the output of the validators don't quite reflect
-the improvements. The documentation uses now \PDF~2.0 and PAC~2024 can't handle
-this, it claims that the file is damaged. The Adobe validator has a bug and
+the improvements. The documentation uses now \PDF~2.0 and while the newest
+PAC~2024 can at least open the file it can not validate properly the file. For example
+it complains about the tabular header cells as it doesn't follow attribute classes.
+The Adobe validator has a bug and
doesn't like the (valid) use of the \texttt{Lbl} tag for the section numbers
(see figure~\ref{fig:adobe}).
-But even if the documentation passed the tests of the validators: as
+But even if the documentation would pass all the tests of the validators: as
mentioned above passing a formal test doesn't mean that the content is really
good and usable. The user commands used for the tagging and also some of the
patches used are still rather crude. So there is lot space for improvement.
@@ -354,8 +356,9 @@ Be aware that to create the tagged version a current lualatex-dev and a
current version of the pdfmanagment-testphase package is needed.
\end{tcolorbox}
-\includegraphics[alt=PAC 3 report]{pac3}
+\includegraphics[alt=PAC 2024 complains about PDF version]{pac2024-version}
+\includegraphics[alt=PAC 2024 complains about table header cells]{pac2024-report}
\begin{figure}
@@ -504,6 +507,10 @@ The key-val list understands at least the following keys. More keys are defined
least \PrintKeyName{activate/mc} has been used.
The old name of the key |interwordspace| is still supported but deprecated.
+\item[\PrintKeyName{activate/softhyphen}] Boolean. luamode only.
+ The key activates/deactivates the replacing of hard hyphens from hyphenation
+ by soft hyphens. By default this is activated.
+
\item[\PrintKeyName{role/new-tag}] Allows to define new tag names, see
section \ref{sec:new-tag} for a description.
@@ -721,11 +728,8 @@ To tag a \PDF{} three tasks must be carried out:
\minisec{Page stream with marked content}
-\tagpdfparaOff
-
-\tagstructbegin{tag=Figure,alt={Illustration of page stream with marked content},attribute=bbox}%
-\tagmcbegin{tag=Figure}%
-\begin{tikzpicture}[baseline=(a.north),node distance=2pt,remember picture]
+\begin{tikzpicture}[baseline=(a.north),node distance=2pt,remember picture,
+alt={Illustration of page stream with marked content}]
\node(start){\ldots~\ldots~\ldots};
\node[draw,base right = of start](a) {mc-chunk 1};
\node[draw,base right = of a](b) {mc-chunk 2};
@@ -733,20 +737,13 @@ To tag a \PDF{} three tasks must be carried out:
\node[draw,base right = of c](d) {mc-chunk 3};
\node[base right = of d] {\ldots~\ldots};
\end{tikzpicture}
-\tagmcend\tagstructend
-
-\tagpdfparaOn
\minisec{Structure}
-\tagpdfparaOff
\newlength\ydistance\setlength\ydistance{-0.8cm}
-\tagstructbegin{tag=Figure,alt={Illustration of structure},attribute=bbox}%
-\tagmcbegin{tag=Figure}%
-\begin{tikzpicture}[remember picture,baseline=(root.north)]
-
+\begin{tikzpicture}[remember picture,baseline=(root.north),alt={Illustration of structure}]
\node[draw,anchor=base west] (root) at (0,0) {Sect (start section)};
\node[draw,anchor=base west] at (0.3,\ydistance) {H (header section)};
\node[draw,anchor=base west](aref) at (0.6,2\ydistance){mc-chunk 1};
@@ -758,17 +755,12 @@ To tag a \PDF{} three tasks must be carried out:
\node[draw,anchor=base west] at (0.3,8\ydistance){/P (end paragraph)};
\node[draw,anchor=base west] at (0,9\ydistance){/Sect (end section)};
\end{tikzpicture}
-
\begin{tikzpicture}[remember picture, overlay]
\draw[->,red](aref)-|(a);
\draw[->,red](bref)-|(b);
\draw[->,red](cref)-|(c);
\draw[->,red](dref)-|(d);
-
\end{tikzpicture}
-\tagmcend\tagstructend
-
-\tagpdfparaOn
\end{tcolorbox}
@@ -1108,8 +1100,8 @@ the command, as the effect of the begin command ends with a new
\begin{docCommands}
{
- {doc name=tagmcuse},
- {doc name=tag_mc_use:n}
+ {doc name=tagmcuse,doc parameter=\marg{label}},
+ {doc name=tag_mc_use:n,doc parameter=\marg{label}}
}
\end{docCommands}
@@ -1283,13 +1275,8 @@ add the needed code.
\begin{figure}
-\tagpdfparaOff
-\tagstructbegin{tag=Figure,alt={Illustration of link annotation structure},attribute=bbox}\tagmcbegin{tag=Figure}
-\tagstop
\input{link-figure-input}
-\tagstart
-\tagmcend\tagstructend
\caption{Structure needed for a link annotation}\label{fig:linkannot}
@@ -2661,7 +2648,8 @@ already mentioned there are more requirements:
is normally not a problem. With pdflatex it could need additional
\verb+\pdfglyphtounicode+ commands.
- \item Hard and soft hyphen must be distinct.
+ \item Hard and soft hyphen must be distinct. In luamode this is now handled through
+ the \texttt{activate/softhyphen} key. For pdftex no solution is known.
\item Spaces between words should be space glyphs and not only a
horizontal movement. See section~\ref{sec:spacechars}.
@@ -3061,10 +3049,7 @@ examples and remarks easier to understand.
\item[postfix notation] \PDF{} uses in various places postfix
notation. This means that the operator is behind its arguments:
-\tagpdfparaOff
-
-\tagstructbegin{tag=Figure,alt={Illustration of postfix notation},attribute=bbox}\tagmcbegin{tag=Figure}
-\begin{tikzpicture}[baseline=(c.base)]
+\begin{tikzpicture}[baseline=(c.base),alt={Illustration of postfix notation}]
\node[arg](a1) {18};
\node[arg,right=of a1.east](a2) {0};
\node[operator,right= of a2.east](c) {obj};
@@ -3072,7 +3057,7 @@ examples and remarks easier to understand.
\draw[->] (c.south) --++(0,-2mm) -| (a2);
\end{tikzpicture}
-\begin{tikzpicture}[baseline=(c.base)]
+\begin{tikzpicture}[baseline=(c.base),alt={Illustration of postfix notation}]
\node[arg](a1) {18};
\node[arg,right=of a1.east](a2) {0};
\node[operator,right= of a2.east](c) {R};
@@ -3081,7 +3066,7 @@ examples and remarks easier to understand.
\end{tikzpicture} (a reference (operator R) to an object
-\begin{tikzpicture}[baseline=(c.base)]
+\begin{tikzpicture}[baseline=(c.base),alt={Illustration of postfix notation}]
\node[arg](a1) {1};
\node[arg,right = of a1.east](a2) {0};
\node[arg,right = of a2.east](a3) {0};
@@ -3097,19 +3082,15 @@ examples and remarks easier to understand.
\draw[->] (c.south) --++(0,-2mm) -|(a1);
\end{tikzpicture}
-\begin{tikzpicture}[baseline=(c.base)]
+\begin{tikzpicture}[baseline=(c.base),alt={Illustration of postfix notation}]
\node[arg](a1) {/P};
\node[arg,right = of a1.east](a2) {<</MCID 0>>};
\node[operator,right = of a2.east](c) {BDC};
\draw[->] (c.south) --++(0,-2mm) -| (a1);
\draw[->] (c.south) --++(0,-2mm) -| (a2);
\end{tikzpicture}
-\tagmcend\tagstructend
-
-\tagpdfparaOn
-
\item[Names] \PDF{} knows a sort of variable called a
\enquote{name}. Names start with a slash and may include any regular
characters, but not delimiter or white-space characters. Uppercase
@@ -3152,19 +3133,13 @@ examples and remarks easier to understand.
\mbox{\texttt{[0 15 0 R (hello) <</Type /X>> [1 2 3]]}}
-\tagpdfparaOff
-
- \tagstructbegin{tag=Figure,alt={Illustration of array},attribute=bbox}\tagmcbegin{tag=Figure}
- \begin{tikzpicture}[baseline=(c.base)]
+ \begin{tikzpicture}[baseline=(c.base),alt={Illustration of array}]
\node[arg](a1) {0};
\node[arg,right = of a1.east](a2) {15 0 R};
\node[arg,right = of a2.east](a3) {(hello)};
\node[arg,right = of a3.east](a4) {<</Type /X>>};
\node[arg,right = of a4.east](a5) {[1 2 3]};
\end{tikzpicture}
-\tagmcend\tagstructend
-
-\tagpdfparaOn
\item[Dictionaries] Dictionaries are enclosed by double angle
diff --git a/Master/texmf-dist/doc/latex/tagpdf/tagpdfsetup-keys.tex b/Master/texmf-dist/doc/latex/tagpdf/tagpdfsetup-keys.tex
index 04f8b88aec6..a02411c31fd 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/tagpdfsetup-keys.tex
+++ b/Master/texmf-dist/doc/latex/tagpdf/tagpdfsetup-keys.tex
@@ -12,7 +12,8 @@ new key name & old key name & value &type & defined in \\\midrul
activate & activate & boolean &meta & tagpdf \\
activate/all & activate-all & boolean &meta & tagpdf\\
-activate/mc & activate-mc & boolean &bool & tagpdf\\
+activate/mc & activate-mc & boolean &bool & tagpdf\\
+activate/softhyphen & --- & boolean &bool & tagpdf \\
activate/spaces & interwordspace & boolean &code & tagpdf-space\\
activate/struct & activate-struct & boolean &bool & tagpdf\\
activate/struct-dest & no-struct-dest&boolean &bool & tagpdf\\
diff --git a/Master/texmf-dist/doc/latex/telprint/README.md b/Master/texmf-dist/doc/latex/telprint/README.md
new file mode 100644
index 00000000000..de7d729ad61
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/telprint/README.md
@@ -0,0 +1,13 @@
+# telprint package for LaTeX
+
+Version: 2024-07-26 v1.12
+
+Format German phone numbers
+
+## Copyright (C)
+* 1996, 1997, 2004-2008 Heiko Oberdiek
+* 2016-2024 Oberdiek Package Support Group
+
+
+## License
+LATEX Project Public License, version 1.3c or later.
diff --git a/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf b/Master/texmf-dist/doc/latex/telprint/telprint.pdf
index f8027491c86..49a2968f35a 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf
+++ b/Master/texmf-dist/doc/latex/telprint/telprint.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/tikzbricks/tikzbricks-doc-settings.sty b/Master/texmf-dist/doc/latex/tikzbricks/tikzbricks-doc-settings.sty
index 777cedba6ef..777cedba6ef 100644
--- a/Master/texmf-dist/tex/latex/tikzbricks/tikzbricks-doc-settings.sty
+++ b/Master/texmf-dist/doc/latex/tikzbricks/tikzbricks-doc-settings.sty
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/tramlines/README b/Master/texmf-dist/doc/latex/tramlines/README
index b252d9323ac..0dcd98c4a0d 100644
--- a/Master/texmf-dist/doc/latex/tramlines/README
+++ b/Master/texmf-dist/doc/latex/tramlines/README
@@ -1,6 +1,6 @@
tramlines - make tramlines
-version: 1.1.0
+version: 1.1.1
This package automatically creates tramlines (lines above and below a title used by lawyers in the UK and the Commonwealth).
@@ -12,6 +12,9 @@ For suggestions, feature requests, and bug reports, please use the project's
GitHub site: https://github.com/ezgranet/tramlines
Version history:
+18/07/2024: Change erroneous left alignment to centre alignment
+
+
29/01/2023: Updates to float composition and fixed bug with global commands. Thanks to GitHub user niruvt
diff --git a/Master/texmf-dist/doc/latex/tramlines/tramlines-documentation.pdf b/Master/texmf-dist/doc/latex/tramlines/tramlines-documentation.pdf
index e9d9c9d6d9e..1ccb2be9655 100644
--- a/Master/texmf-dist/doc/latex/tramlines/tramlines-documentation.pdf
+++ b/Master/texmf-dist/doc/latex/tramlines/tramlines-documentation.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tramlines/tramlines-documentation.tex b/Master/texmf-dist/doc/latex/tramlines/tramlines-documentation.tex
index f39e7ba70cc..ba560093467 100644
--- a/Master/texmf-dist/doc/latex/tramlines/tramlines-documentation.tex
+++ b/Master/texmf-dist/doc/latex/tramlines/tramlines-documentation.tex
@@ -74,9 +74,9 @@ breaklines,
firstnumber=last
]
{latex}
-\def\tramlinesversionnumber{1.1.0}
+\def\tramlinesversionnumber{1.1.1}
\ProvidesPackage{tramlines}
-[2023/01/29\tramlinesversionnumber\
+[2024/07/18\tramlinesversionnumber\
Tramlines]
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -112,7 +112,7 @@ firstnumber=last
\centering
{%notglobal
\setlength\doublerulesep{\tramlinesep}% <-- set distance between double rule
-\begin{tabular}[t]{l c c }
+\begin{tabular}[t]{c c c }
\toprule\toprule
& #1 & \\
\bottomrule\bottomrule
@@ -129,8 +129,19 @@ firstnumber=last
%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%\end{minted}
+\section{Version History}
+\subsection*{\ttfamily 1.1.1}
+\ttfamily 18 July 2024: Change erroneous left alignment to centre alignment
+\subsection*{\ttfamily 1.1.0}
+
+\ttfamily 29 October 2023: Updates to float composition and fixed bug with global commands. Thanks to GitHub user `niruvt'
+
+\ttfamily 29/01/2023: Updates to float composition and fixed bug with global commands. Thanks to GitHub user niruvt
+
+
\subsection*{\texttt{1.0.0}}
+
\ttfamily 27 January 2023: Package creation
diff --git a/Master/texmf-dist/doc/latex/univie-ling/README b/Master/texmf-dist/doc/latex/univie-ling/README
index b90c86e8cc3..c73460f0b42 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/README
+++ b/Master/texmf-dist/doc/latex/univie-ling/README
@@ -97,6 +97,19 @@ also have a look at the example files.
== CHANGES ==
+V. 2.7 (2024-07-23):
+ - univie-ling-wlg: Use proper spacing with covington's
+ reflist environment.
+ - univie-ling-poster: add smallmargins option.
+ - univie-ling-thesis: fix running headers in twoside mode.
+ - univie-ling-handout:
+ - univie-ling-expose:
+ - univie-ling-paper:
+ - univie-ling-thesis:
+ - univie-ling-wlg:
+ * Fix empty argument check in \weblink.
+ * Fix spacing after \weblink.
+
V. 2.6 (2024-06-27):
- univie-ling-poster: add smallmargins option.
- univie-ling-thesis: fix running headers in twoside mode.
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-deutsch.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-deutsch.pdf
index 1773af1838e..8652b32a5b1 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-deutsch.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-deutsch.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-english.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-english.pdf
index 2f632ebda3c..a8ac59e821b 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-english.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-expose-english.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-deutsch.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-deutsch.pdf
index 484e4365b5d..48b41cac878 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-deutsch.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-deutsch.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-english.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-english.pdf
index b61d77074dc..608e203154b 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-english.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-handout-english.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-deutsch.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-deutsch.pdf
index 37e2bc3e004..5ac9aba1d19 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-deutsch.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-deutsch.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-english.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-english.pdf
index d4885d07435..49efca45fac 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-english.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-paper-english.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-poster-deutsch.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-poster-deutsch.pdf
index 76ab0629d54..f2260ffeb4c 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-poster-deutsch.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-poster-deutsch.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-poster-english.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-poster-english.pdf
index 0b9643c0bd7..b16ccfe334f 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-poster-english.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-poster-english.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.pdf
index 34ac74afc76..9673abfdb0f 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.tex b/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.tex
index 527f8d0498d..7b01c0a88f3 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.tex
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.tex
@@ -2,9 +2,7 @@
% Ãœbersetzen mit pdflatex -- biber -- pdflatex
% Verwende den vom Hochschulschriftenservice verlangten Standard PDF/A1-b
% (siehe http://e-theses.univie.ac.at/elektronische_einreichung.html)
-% pdfx is currently broken
-%\documentclass[naustrian,pdfa]{univie-ling-thesis}
-\documentclass[naustrian]{univie-ling-thesis}
+\documentclass[naustrian,pdfa]{univie-ling-thesis}
\usepackage{babel}
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.pdf
index 800946d7c88..0d550fa2862 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.tex b/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.tex
index c2f7c5f4a03..0be7edb6006 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.tex
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.tex
@@ -2,9 +2,7 @@
% Run pdflatex -- biber -- pdflatex
% Use the PDF/A1-b standard as required by the Hochschulschriften-Service
% (see http://e-theses.univie.ac.at/elektronische_einreichung.html)
-% pdfx is currently broken
-%\documentclass[naustrian,english,pdfa]{univie-ling-thesis}
-\documentclass[naustrian,english]{univie-ling-thesis}
+\documentclass[naustrian,english,pdfa]{univie-ling-thesis}
\usepackage{babel}
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.pdf
index b65b92ef1b1..8a1d9155c6a 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-review.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-review.pdf
index 2e8562ef5df..f811c049e47 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-review.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-review.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdf
index d47fcaaa0bb..7efd2c2f362 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.tex
index fcb89d9727e..c3d1c668055 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.tex
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.tex
@@ -63,7 +63,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 2.6, 2024/06/27}
+\date{Version 2.7, 2024/07/23}
\maketitle
@@ -370,6 +370,11 @@ Templates are provided as well:
\section{Release History}
\begin{itemize}
+ \item 2024/07/23 (v.\,2.7)
+ \begin{itemize}
+ \item Fix spacing after \jfcsmacro{weblink}.
+ \item Fix empty argument check in \jfcsmacro{weblink}.
+ \end{itemize}
\item 2024/06/27 (v.\,2.6)
\begin{itemize}
\item Provide \jcsmacro{weblink}, \jcsmacro{SetURLDate} and \jcsmacro{urldate} macros.
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.pdf
index bb7dfd5c25d..a253d4003ef 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.tex
index 8fbb627024a..bdd72da44e1 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.tex
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-handout.tex
@@ -63,7 +63,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 2.6, 2024/06/27}
+\date{Version 2.7, 2024/07/23}
\maketitle
@@ -415,6 +415,11 @@ Templates are provided as well:
\section{Release History}
\begin{description}
+ \item 2024/07/23 (v.\,2.7)
+ \begin{itemize}
+ \item Fix spacing after \jfcsmacro{weblink}.
+ \item Fix empty argument check in \jfcsmacro{weblink}.
+ \end{itemize}
\item 2024/06/27 (v.\,2.6)
\begin{itemize}
\item Provide \jcsmacro{weblink}, \jcsmacro{SetURLDate} and \jcsmacro{urldate} macros.
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdf
index 9f7f328fbb0..e04efcd52f7 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.tex
index 6ade5e4b726..d6f5293a898 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.tex
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.tex
@@ -63,7 +63,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 2.6, 2024/06/27}
+\date{Version 2.7, 2024/07/23}
\maketitle
@@ -411,6 +411,11 @@ Templates are provided as well:
\section{Release History}
\begin{itemize}
+ \item 2024/07/23 (v.\,2.7)
+ \begin{itemize}
+ \item Fix spacing after \jfcsmacro{weblink}.
+ \item Fix empty argument check in \jfcsmacro{weblink}.
+ \end{itemize}
\item 2024/06/27 (v.\,2.6)
\begin{itemize}
\item Provide \jcsmacro{weblink}, \jcsmacro{SetURLDate} and \jcsmacro{urldate} macros.
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-poster.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-poster.pdf
index 204245e59f2..06d64c7638a 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-poster.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-poster.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-poster.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-poster.tex
index c8580538c3e..1985658b786 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-poster.tex
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-poster.tex
@@ -65,7 +65,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 2.6, 2024/06/27}
+\date{Version 2.7, 2024/07/23}
\maketitle
@@ -577,6 +577,11 @@ Templates are provided as well:
\section{Release History}
\begin{description}
+ \item 2024/07/23 (v.\,2.7)
+ \begin{itemize}
+ \item Fix spacing after \jfcsmacro{weblink}.
+ \item Fix empty argument check in \jfcsmacro{weblink}.
+ \end{itemize}
\item 2024/06/27 (v.\,2.6)
\begin{itemize}
\item Provide \jcsmacro{weblink}, \jcsmacro{SetURLDate} and \jcsmacro{urldate} macros.
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdf
index 4c9fb2a37c5..b77ad97265c 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.tex
index 92d06ea9528..2feb157bce8 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.tex
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 2.6, 2024/06/27}
+\date{Version 2.7, 2024/07/23}
\maketitle
@@ -433,6 +433,11 @@ Templates are provided as well:
\section{Release History}
\begin{itemize}
+ \item 2024/07/23 (v.\,2.7)
+ \begin{itemize}
+ \item Fix spacing after \jfcsmacro{weblink}.
+ \item Fix empty argument check in \jfcsmacro{weblink}.
+ \end{itemize}
\item 2024/06/27 (v.\,2.6)
\begin{itemize}
\item Provide \jcsmacro{weblink}, \jcsmacro{SetURLDate} and \jcsmacro{urldate} macros.
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdf
index 62765185465..f2a5a48dc28 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.tex
index a12fccdeac2..6ca75cc0ed0 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.tex
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 2.6, 2024/06/27}
+\date{Version 2.7, 2024/07/23}
\maketitle
@@ -263,6 +263,10 @@ If the class option \joption{biblatex=true} is set, the \uvlt\ class loads a bib
\emph{Unified Style Sheet for Linguistics} of the LSA (\emph{Linguistic Society of America}).
In order to conform to this style, the \uvlt\ class uses the \textsf{biblatex} package with the \textsf{univie-ling} style that is included in the \textsf{univie-ling} bundle.
+If, for some reason, you do not want to use \textsf{biblatex} and prefer to have a manually constituted bibliography\footnote{A reason might be that you transform
+a paper submitted in a an office file format to \LaTeX.}, use the \texttt{reflist} environment
+and separate each entry by a blank line. Since this environment is provided by \textsf{covington}, the \joption{covington} options must not be \joption{false}.
+
\section{\LyX\ layouts and templates}
A layout for \LyX\footnote{See \url{https://www.lyx.org}.}\ can be retrieved from \url{https://github.com/jspitz/univie-ling/raw/master/lyx/layouts/univie-ling-wlg.layout}.
@@ -274,6 +278,12 @@ A template is provided as well: \url{https://github.com/jspitz/univie-ling/raw/m
\raggedright
\begin{itemize}
+ \item 2024/07/23 (v.\,2.7)
+ \begin{itemize}
+ \item Use proper spacing with \textsf{covington}'s \texttt{reflist} environment.
+ \item Fix spacing after \jfcsmacro{weblink}.
+ \item Fix empty argument check in \jfcsmacro{weblink}.
+ \end{itemize}
\item 2024/06/27 (v.\,2.6)
\begin{itemize}
\item Provide \jcsmacro{weblink}, \jcsmacro{SetURLDate} and \jcsmacro{urldate} macros.
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling.pdf
index b0f3e13826a..394cddb6923 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling.pdf
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling.tex
index 34435a38765..f88f1fcea48 100644
--- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling.tex
+++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling.tex
@@ -42,7 +42,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 2.6, 2024/06/27}
+\date{Version 2.7, 2024/07/23}
\maketitle
diff --git a/Master/texmf-dist/doc/latex/ut-thesis/README b/Master/texmf-dist/doc/latex/ut-thesis/README
index 785d74c6061..ed1db06b9db 100644
--- a/Master/texmf-dist/doc/latex/ut-thesis/README
+++ b/Master/texmf-dist/doc/latex/ut-thesis/README
@@ -5,8 +5,8 @@ as of Fall 2020:
[https://www.sgs.utoronto.ca/academic-progress/program-completion/formatting]
Copyright (c) 1998-2013 Francois Pitt <fpitt@cs.utoronto.ca>,
- 2020-2023 Jesse Knight <jesse.knight@mail.utoronto.ca>
-last updated at 13:00 (EST) on Wed 08 Feb 2023
+ 2020-2024 Jesse Knight <jesse.x.knight@protonmail.com>
+last updated at 09:00 (BST) on Fri 26 July 2024
This work may be distributed and/or modified under the conditions of
the LaTeX Project Public Licence, either version 1.3c of this licence
@@ -22,7 +22,7 @@ and is not covered by the licence.
This work has the LPPL maintenance status "maintained".
The Current Maintainer of this work is
-Jesse Knight <jesse.knight@mail.utoronto.ca>.
+Jesse Knight <jesse.x.knight@protonmail.com>.
This work consists of the files:
- README
@@ -31,12 +31,13 @@ This work consists of the files:
- ut-thesis.pdf (derived user manual)
- ut-thesis.cls (derived class file)
-To generate ut-thesis.cls (class file), run: pdflatex ut-thesis.ins
-To generate ut-thesis.pdf (documentation), run: pdflatex ut-thesis.dtx
-To use the class, make ut-thesis.cls visible to your LaTeX distribution,
-by placing ut-thesis.cls either in your working directory,
-or in your texmf tree, perhaps: $texmf/tex/latex/ut-thesis/ut-thesis.cls
-and the documentation: $texmf/doc/latex/ut-thesis/ut-thesis.pdf
+Install ut-thesis from your favourite LaTeX distribution.
+Alternatively, or to use the latest version:
+- generate ut-thesis.cls (class file) using: pdflatex ut-thesis.ins
+ and copy to: $texmf/tex/latex/ut-thesis/ut-thesis.cls
+- generate ut-thesis.pdf (documentation) using: pdflatex ut-thesis.dtx
+ and copy to: $texmf/doc/latex/ut-thesis/ut-thesis.pdf
+or simply copy ut-thesis.cls to your working directory.
See version history on GitHub:
-[https://github.com/jessexknight/ut-thesis] \ No newline at end of file
+[https://github.com/jessexknight/ut-thesis]
diff --git a/Master/texmf-dist/doc/latex/ut-thesis/ut-thesis.pdf b/Master/texmf-dist/doc/latex/ut-thesis/ut-thesis.pdf
index 8f055d54d09..fdf74d5a9a4 100644
--- a/Master/texmf-dist/doc/latex/ut-thesis/ut-thesis.pdf
+++ b/Master/texmf-dist/doc/latex/ut-thesis/ut-thesis.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/wheelchart/README.md b/Master/texmf-dist/doc/latex/wheelchart/README.md
index ec414f34409..df9f81a74dd 100644
--- a/Master/texmf-dist/doc/latex/wheelchart/README.md
+++ b/Master/texmf-dist/doc/latex/wheelchart/README.md
@@ -2,9 +2,11 @@
## Diagrams with circular or other shapes using Ti*k*Z and LaTeX3
-Version 3.0 (2024/03/08)
+Version 4.0 (2024/07/28)
-This package is based on the package [Ti*k*Z](https://ctan.org/pkg/pgf) and can be used to draw various kinds of diagrams such as a bar chart, doughnut chart, infographic, pie chart, ring chart, square chart, sunburst chart, waffle chart and wheel chart with Ti*k*Z. It provides several options to customize the diagrams. It is also possible to specify a plot for the shape of the chart. Furthermore a legend can be added and the table of contents can be displayed as one of these diagrams.
+This package is based on the package [Ti*k*Z](https://ctan.org/pkg/pgf) and can be used to draw various kinds of diagrams such as bar charts, doughnut charts, infographics, pie charts, ring charts, square charts, sunburst charts, waffle charts and wheel charts.
+
+It provides several options to customize the diagrams. It is also possible to specify a plot for the shape of the chart. Furthermore a legend can be added and the table of contents can be displayed as one of these diagrams.
%% README.md
%% Copyright 2022-2024 Matthias Floré
diff --git a/Master/texmf-dist/doc/latex/wheelchart/wheelchart.pdf b/Master/texmf-dist/doc/latex/wheelchart/wheelchart.pdf
index 2cfa0dd1be1..808551f33c5 100644
--- a/Master/texmf-dist/doc/latex/wheelchart/wheelchart.pdf
+++ b/Master/texmf-dist/doc/latex/wheelchart/wheelchart.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/wheelchart/wheelchart.tex b/Master/texmf-dist/doc/latex/wheelchart/wheelchart.tex
index 5f0857f1a68..952fc93a818 100644
--- a/Master/texmf-dist/doc/latex/wheelchart/wheelchart.tex
+++ b/Master/texmf-dist/doc/latex/wheelchart/wheelchart.tex
@@ -137,7 +137,7 @@
\setcounter{secnumdepth}{2}
\title{The \texttt{wheelchart} package\\[12pt]\large Diagrams with circular or other shapes using \tikzname{} and \LaTeX3}
\author{Matthias Floré}
-\date{Version 3.0 (2024/03/08)}%\\[12pt]
+\date{Version 4.0 (2024/07/28)}%\\[12pt]
\begin{document}
\iftotalpages%
\newsavebox{\fancyfootdefaultbox}%
@@ -155,7 +155,11 @@
\maketitle
\thispagestyle{fancy}
\begin{abstract}
-\noindent This package is based on the package |tikz| (see \cite{TtTaPGFp}) and can be used to draw various kinds of diagrams such as a bar chart, doughnut chart, infographic, pie chart, ring chart, square chart, sunburst chart, waffle chart and wheel chart with \tikzname. It provides several options to customize the diagrams. It is also possible to specify a plot for the shape of the chart. Furthermore a legend can be added and the table of contents can be displayed as one of these diagrams. Other tools for creating wheel charts or pie charts can be found in \cite{MpMP}, \cite{JhcIparowcltopotPGFm}, \cite{Tumfdb}, \cite{XdPCbupp} and \cite{RSVpaaMfp}.% This is the manual for version .
+\noindent This package is based on the package |tikz| (see \cite{TtTaPGFp}) and can be used to draw various kinds of diagrams such as bar charts, doughnut charts, infographics, pie charts, ring charts, square charts, sunburst charts, waffle charts and wheel charts.
+
+\noindent It provides several options to customize the diagrams. It is also possible to specify a plot for the shape of the chart. Furthermore a legend can be added and the table of contents can be displayed as one of these diagrams.
+
+\noindent Other tools for creating wheel charts or pie charts can be found in \cite{MpMP}, \cite{JhcIparowcltopotPGFm}, \cite{Tumfdb}, \cite{XdPCbupp} and \cite{RSVpaaMfp}.% This is the manual for version .
\end{abstract}
\section*{\contentsname}
\iftotalpages
@@ -257,7 +261,7 @@ The default wheelchart with these data is shown below.
\end{tikzpicture}
\end{codeexample}
\end{command}
-\newpage%such that this section has its own block in the header
+\newpage%so that this section has its own block in the header
\section{Additional macros}
\begin{command}{\WCangle\opt{\oarg{number}}\marg{angle pos}\marg{angle shift}\marg{pos}\marg{sep}}
This command gives the angle in degrees of the point which is constructed as follows.
@@ -670,6 +674,11 @@ In the example below, it is necessary to use |arc data expand=e| and to place |\
\begin{key}{/wheelchart/arc data line sep factor=\marg{factor} (initially 1)}
The contents of the key |arc data| can consist of multiple lines separated by |\\|. The \meta{factor} determines the spacing between these lines.
\end{key}
+\begin{key}{/wheelchart/arc data lines pos=\marg{factor} (initially 0.5)}
+\end{key}
+\begin{key}{/wheelchart/arc data lines shift=\marg{value} (initially 0)}
+The positioning of the lines of the key |arc data| is determined by the index $k-1-\text{|arc data lines pos|}\cdot(N-1)+\text{|arc data lines shift|}$ where $N$ is the number of lines and $k\in\{1,\dots,N\}$.
+\end{key}
\begin{key}{/wheelchart/arc data pos=\marg{value} (initially 1)}
\end{key}
\begin{key}{/wheelchart/arc data sep=\marg{value} (initially 1ex/1cm)}
@@ -738,7 +747,6 @@ This key accepts a list of keys which will be applied to the node where the cont
\begin{codeexample}[width=10cm]
\begin{tikzpicture}
\wheelchart[
- at={(5,2)},
caption=Caption,
caption style={font=\scshape},
caption left=Caption left,
@@ -2909,6 +2917,11 @@ The following example is an answer to the question on \url{https://tex.stackexch
\item In v2.0, the key |arc data angle shift| was not taken into account for the key |arc| in combination with the key |arc around text|. This is fixed in v3.0.
\item In v2.0, the number of items for each slice in the \meta{wheelchart data} which can be accessed with the macros |\WCvarA| and so on was determined by the number of items for the last slice. For example, |data{1}=\WCvarD| in combination with the \meta{wheelchart data} |1/black/A/a,2/gray/B| was not possible with v2.0. This is not a limitation anymore with v3.0.
\end{itemize}
+\item[] \textbf{Version 4.0 (2024/07/28)}
+\begin{itemize}
+\item Added the keys |arc data lines pos| and |arc data lines shift|.
+\item Solved an incompatibility if |\\| is used in a key such as |data| inside an environment such as |center|.
+\end{itemize}
\end{itemize}
\begin{thebibliography}{9}
\bibitem{JhcIparowcltopotPGFm}
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/luacensor/OFL.txt b/Master/texmf-dist/doc/lualatex/luacensor/OFL.txt
new file mode 100644
index 00000000000..fe1a1a6cac4
--- /dev/null
+++ b/Master/texmf-dist/doc/lualatex/luacensor/OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2013 The Redacted Project Authors (https://github.com/christiannaths/redacted-font)
+
+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:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+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/lualatex/luacensor/README b/Master/texmf-dist/doc/lualatex/luacensor/README.txt
index 1e1d26990a1..e7c99c552aa 100644
--- a/Master/texmf-dist/doc/lualatex/luacensor/README
+++ b/Master/texmf-dist/doc/lualatex/luacensor/README.txt
@@ -1,6 +1,6 @@
luacensor - redacting sensitive information with Lua
-version: 1.1.0
+version: 1.1.1
luacensor is a package that takes advantage of Lua to securely redact documents, both by hiding all characters and by slightly varying the length of strings to prevent jigsaw identification. It also is friendly to screen readers by adding alt-text indicating redacted content.
@@ -14,4 +14,7 @@ LaTeX Project Public License (LPPL), version 1.3 or later.
For suggestions, feature requests, and bug reports, please use the project's
GitHub site: https://github.com/ezgranet/luacensor
-Version history: 23/02/2022: new `warning' option added to allow for printing a warning with redacted text
+Version history:
+07/04/2024: fixed issue with luaotfload
+
+ 23/02/2022: new `warning' option added to allow for printing a warning with redacted text
diff --git a/Master/texmf-dist/doc/lualatex/luacensor/luacensor.pdf b/Master/texmf-dist/doc/lualatex/luacensor/luacensor-documentation.pdf
index f2f27f9805a..29a01a9575d 100644
--- a/Master/texmf-dist/doc/lualatex/luacensor/luacensor.pdf
+++ b/Master/texmf-dist/doc/lualatex/luacensor/luacensor-documentation.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/lualatex/luacensor/luacensor.tex b/Master/texmf-dist/doc/lualatex/luacensor/luacensor-documentation.tex
index 10bcc0d18b3..e399824c5ba 100644
--- a/Master/texmf-dist/doc/lualatex/luacensor/luacensor.tex
+++ b/Master/texmf-dist/doc/lualatex/luacensor/luacensor-documentation.tex
@@ -161,10 +161,9 @@ firstnumber=last
]
{latex}
%luacensor.sty
-%luacensor.sty
-\def\luacensorversionnumber{1.1.0}
+\def\luacensorversionnumber{1.1.1}
\ProvidesPackage{luacensor}
-[2022/02/22 \luacensorversionnumber\
+[2024/04/06 \luacensorversionnumber\
Redact sensitive information using Lua]
% !TeX program = lualatex
% !TeX encoding = utf8
@@ -654,7 +653,7 @@ firstnumber=last
%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newfontface\wrnstncl{QT Military}
\newcommand{\warnword}{WARNING}
-\newfontface\smbl{Deja Vu Sans Bold}
+\newfontface\smbl{DejaVuSans-Bold}
\newcommand{\danger}{\smbl ⚠︎\normalfont}
\newcommand{\warnformat}{\sffamily\bfseries \color{red}}
\newcommand{\textwarn}{This document is {\underline{NOT}} redacted. It contains private and confidential personal data, and may {\underline{NOT}} be distributed, published, or shown to those without the right to view such information. The publication of the information in this document may constitute a contempt of court, punishable by a term of imprisonment.}
@@ -716,6 +715,9 @@ firstnumber=last
\AtBeginDocument{\confwarning}
\end{minted}
\section{Version History}
+\subsection{\texttt{1.1.1}}
+\ttfamily 6 April 2024: Fixed an issue with OTF for dejavusans not loading by using the postscript name.
+
\subsection{\texttt{1.1.0}}
\ttfamily 22 February 2022: Added the `warning' option and fixed a few errors in the code resulting from \TeX\ primitives causing issues.
\subsection{\texttt{1.0.0}}
diff --git a/Master/texmf-dist/doc/lualatex/piton/piton-french.pdf b/Master/texmf-dist/doc/lualatex/piton/piton-french.pdf
index 8ad40b754cc..01ebbefd715 100644
--- a/Master/texmf-dist/doc/lualatex/piton/piton-french.pdf
+++ b/Master/texmf-dist/doc/lualatex/piton/piton-french.pdf
@@ -277,1223 +277,1206 @@ endobj
<< /S /GoTo /D (subsection.8.3) >>
endobj
163 0 obj
-(\376\377\000N\000o\000t\000e\000s\000\040\000d\000a\000n\000s\000\040\000l\000e\000s\000\040\000l\000i\000s\000t\000i\000n\000g\000s)
+(\376\377\000U\000n\000\040\000e\000x\000e\000m\000p\000l\000e\000\040\000d\000e\000\040\000r\000\351\000g\000l\000a\000g\000e\000\040\000d\000e\000s\000\040\000s\000t\000y\000l\000e\000s)
endobj
164 0 obj
-<< /S /GoTo /D (subsection.8.4) >>
+<< /S /GoTo /D (section.9) >>
endobj
167 0 obj
-(\376\377\000U\000n\000\040\000e\000x\000e\000m\000p\000l\000e\000\040\000d\000e\000\040\000r\000\351\000g\000l\000a\000g\000e\000\040\000d\000e\000s\000\040\000s\000t\000y\000l\000e\000s)
+(\376\377\000U\000t\000i\000l\000i\000s\000a\000t\000i\000o\000n\000\040\000a\000v\000e\000c\000\040\000p\000y\000l\000u\000a\000t\000e\000x)
endobj
168 0 obj
-<< /S /GoTo /D (section.9) >>
+<< /S /GoTo /D (subsection.9.1) >>
endobj
171 0 obj
-(\376\377\000U\000t\000i\000l\000i\000s\000a\000t\000i\000o\000n\000\040\000a\000v\000e\000c\000\040\000p\000y\000l\000u\000a\000t\000e\000x)
+(\376\377\000U\000t\000i\000l\000i\000s\000a\000t\000i\000o\000n\000\040\000s\000t\000a\000n\000d\000a\000r\000d\000\040\000d\000e\000\040\000p\000y\000l\000u\000a\000t\000e\000x)
endobj
172 0 obj
-<< /S /GoTo /D (subsection.9.1) >>
+<< /S /GoTo /D (subsection.9.2) >>
endobj
175 0 obj
-(\376\377\000U\000t\000i\000l\000i\000s\000a\000t\000i\000o\000n\000\040\000s\000t\000a\000n\000d\000a\000r\000d\000\040\000d\000e\000\040\000p\000y\000l\000u\000a\000t\000e\000x)
+(\376\377\000U\000t\000i\000l\000i\000s\000a\000t\000i\000o\000n\000\040\000d\000e\000\040\000l\000'\000e\000n\000v\000i\000r\000o\000n\000n\000e\000m\000e\000n\000t\000\040\000\173\000p\000y\000t\000h\000o\000n\000r\000e\000p\000l\000\175\000\040\000d\000e\000\040\000p\000y\000l\000u\000a\000t\000e\000x)
endobj
176 0 obj
-<< /S /GoTo /D (subsection.9.2) >>
+<< /S /GoTo /D (section.10) >>
endobj
179 0 obj
-(\376\377\000U\000t\000i\000l\000i\000s\000a\000t\000i\000o\000n\000\040\000d\000e\000\040\000l\000'\000e\000n\000v\000i\000r\000o\000n\000n\000e\000m\000e\000n\000t\000\040\000\173\000p\000y\000t\000h\000o\000n\000r\000e\000p\000l\000\175\000\040\000d\000e\000\040\000p\000y\000l\000u\000a\000t\000e\000x)
+(\376\377\000L\000e\000s\000\040\000s\000t\000y\000l\000e\000s\000\040\000p\000o\000u\000r\000\040\000l\000e\000s\000\040\000d\000i\000f\000f\000\351\000r\000e\000n\000t\000s\000\040\000l\000a\000n\000g\000a\000g\000e\000s\000\040\000i\000n\000f\000o\000r\000m\000a\000t\000i\000q\000u\000e\000s)
endobj
180 0 obj
-<< /S /GoTo /D (section.10) >>
+<< /S /GoTo /D (subsection.10.1) >>
endobj
183 0 obj
-(\376\377\000L\000e\000s\000\040\000s\000t\000y\000l\000e\000s\000\040\000p\000o\000u\000r\000\040\000l\000e\000s\000\040\000d\000i\000f\000f\000\351\000r\000e\000n\000t\000s\000\040\000l\000a\000n\000g\000a\000g\000e\000s\000\040\000i\000n\000f\000o\000r\000m\000a\000t\000i\000q\000u\000e\000s)
+(\376\377\000L\000e\000\040\000l\000a\000n\000g\000a\000g\000e\000\040\000P\000y\000t\000h\000o\000n)
endobj
184 0 obj
-<< /S /GoTo /D (subsection.10.1) >>
+<< /S /GoTo /D (subsection.10.2) >>
endobj
187 0 obj
-(\376\377\000L\000e\000\040\000l\000a\000n\000g\000a\000g\000e\000\040\000P\000y\000t\000h\000o\000n)
+(\376\377\000L\000e\000\040\000l\000a\000n\000g\000a\000g\000e\000\040\000O\000C\000a\000m\000l)
endobj
188 0 obj
-<< /S /GoTo /D (subsection.10.2) >>
+<< /S /GoTo /D (subsection.10.3) >>
endobj
191 0 obj
-(\376\377\000L\000e\000\040\000l\000a\000n\000g\000a\000g\000e\000\040\000O\000C\000a\000m\000l)
+(\376\377\000L\000e\000\040\000l\000a\000n\000g\000a\000g\000e\000\040\000C\000\040\000\050\000e\000t\000\040\000C\000+\000+\000\051)
endobj
192 0 obj
-<< /S /GoTo /D (subsection.10.3) >>
+<< /S /GoTo /D (subsection.10.4) >>
endobj
195 0 obj
-(\376\377\000L\000e\000\040\000l\000a\000n\000g\000a\000g\000e\000\040\000C\000\040\000\050\000e\000t\000\040\000C\000+\000+\000\051)
+(\376\377\000L\000e\000\040\000l\000a\000n\000g\000a\000g\000e\000\040\000S\000Q\000L)
endobj
196 0 obj
-<< /S /GoTo /D (subsection.10.4) >>
+<< /S /GoTo /D (subsection.10.5) >>
endobj
199 0 obj
-(\376\377\000L\000e\000\040\000l\000a\000n\000g\000a\000g\000e\000\040\000S\000Q\000L)
+(\376\377\000L\000e\000\040\000l\000a\000n\000g\000a\000g\000e\000\040\000\253\000m\000i\000n\000i\000m\000a\000l\000\273)
endobj
200 0 obj
-<< /S /GoTo /D (subsection.10.5) >>
+<< /S /GoTo /D (subsection.10.6) >>
endobj
203 0 obj
-(\376\377\000L\000e\000\040\000l\000a\000n\000g\000a\000g\000e\000\040\000\253\000m\000i\000n\000i\000m\000a\000l\000\273)
+(\376\377\000L\000e\000s\000\040\000l\000a\000n\000g\000a\000g\000e\000s\000\040\000d\000\351\000f\000i\000n\000i\000s\000\040\000p\000a\000r\000\040\000l\000a\000\040\000c\000o\000m\000m\000a\000n\000d\000e\000\040\000\134\000N\000e\000w\000P\000i\000t\000o\000n\000L\000a\000n\000g\000u\000a\000g\000e)
endobj
204 0 obj
-<< /S /GoTo /D (subsection.10.6) >>
+<< /S /GoTo /D (section*.1) >>
endobj
207 0 obj
-(\376\377\000L\000e\000s\000\040\000l\000a\000n\000g\000a\000g\000e\000s\000\040\000d\000\351\000f\000i\000n\000i\000s\000\040\000p\000a\000r\000\040\000l\000a\000\040\000c\000o\000m\000m\000a\000n\000d\000e\000\040\000\134\000N\000e\000w\000P\000i\000t\000o\000n\000L\000a\000n\000g\000u\000a\000g\000e)
+(\376\377\000I\000n\000d\000e\000x)
endobj
208 0 obj
-<< /S /GoTo /D (section*.1) >>
-endobj
-211 0 obj
-(\376\377\000I\000n\000d\000e\000x)
-
+<< /S /GoTo /D [ 209 0 R /Fit ] >>
endobj
212 0 obj
-<< /S /GoTo /D [ 213 0 R /Fit ] >>
-endobj
-216 0 obj
-<< /Filter /FlateDecode /Length 3586 >>
-stream
-xÚ½\K¯[¹ ÞçWœåEIÔp/Çõ
-'¥¢Ìâ,Õ¥âp)÷‰ök®u!MOÒ÷>–¿ëV.ADç +ø(
-Áé¦ÞÆíFh°L·GÀÀ&¢4+)"zú™G
-îé+ò¼âÃ#,ço•‘´ÃË®˜L›œo%?p]Vã4÷»jz˜4¹žpÁßApS}H/y$Gh¡MJ:ô§Q×è »Ë*Gvhüe?¢ƒçh=}?â³nøŒ3nÇ<‘6kG0¨vŸN21×-U~$£¤!¿ÖP±a´Ð}ñˆ=©
-l«¡McLÐsŸ0´¶ZYL‰…ºô꜆¤e ÿøDrÿhcÎÉ®zQË86¤A„îYe…¼Þ­ÇÏþ­ªip‹1š<›Ï'{ÑYX·Ã PçYU•
-‹iuÍ+ÿäˆf‘õ‘Þ fM1˜ Í? m«°n
-‰•õŠËd
-šÏÓ§‡dª`ÎËó“Š^9Îù@y*;Ë9ۢئšíܺ½ ¹s£Ú ÒÆ}˜ÇPÝQq׺¹îP„”îÆW_åBd‡ÊlîrU}L”8‡SMQíœÆpà{5 …­š!Çüü UŠ4§Wˆ0TF@ÙLØâ ëÛ ÅÝ_\:¨—ˆ4
-ˆTo¶ä–J4^ø'hìPŠùˆÝ+ž²ø=;íÖgÝ)ª’´0÷6’Hgí{ž(u©5 ²Ã2Js¶$Ð
-\Ù£®ÛÇ5Ò
-Ï^l< %ˆ&íÛˆi¤Ý-îþdî½Ç£ ±76çZ©Tdê ÞreçŸAGã1fOüœRÌÄÓ)ê8uE
-S±qð&Œét*Ͷޞ¥G­„V°Z‹\+vp2çLŽ‚ÒŠû§¼´&ÚFŸL£÷òÆ(œ‹'9ÔÒˆW£ LZu=Ãt%]Ù€a£Zqpïá!çzìŒÈÕœ8…
-]TË>àÒÕjƒâ› ÍDØ)ÓYØ!{_sù<Ü©x0s{;„GgÇxn5×êí•È3ÇÑÛØ“DÞi­'`Ïš{^‘|Ÿvk<¯áÎ諦¿óÜ붾|Þlèâ» ¢3í=$­ ø†\_AÓcyh º˜vÍtí3ô”º“tÐ;zZ!±Q¨™Õh–0Oþá0‹ÓñÿÆ…EXÐKq‘ásö’½_ª—Œ+¦t~<Õ*pðËá^ñ“½U'L¿ÕÐ
-»%ðÇ;¨ÍhdUA(ÆýO•V¾/³´Þže…6ã¤ÿ½?\‡F€Õ:êý­õOxtì¤}ù)iñ7l0 §è?ïV}<Ü/¨ ¬öl´Z«Í {ÿÓ×Ck¿âÔñ’mŒrã¬úP´€c]t+ëŽoìpq‡áÜý¸PÞêË!Óéè35D 3åûãÓRDxµæÙv`¹ Ab¹êØÆöWr'Dðæmr§‘vËýôéb·!ÑHi;H9:‰Tž?%÷*eÜ´~=[}5S›¹=•{Õ¼mœ»SöU© ÓFTÓɪƵzÍ9]“dÖ›^™ìò@yØ8»óÿ¢M5Û¼î#‡Œ”¡M4dÏN`}ÄÓ+8ô_ÌŽ§Ù)Þæ¼fïÐe.¤ §-þÍ<€d?òcã¾Ì×;xNMLYïH¿æš¯eÌ5žv³£;Êj§Ñî)sÍGÚ:%;Y3Lû~7íä`ÒÙNv«¤H0‰åTŠ®,&p«u®ÏØTÌÝÞƒ¶ÕÛH“êÙgNÕ0µÎ8e¡­Îx ÕÆ¡¯ÀYybfŽIÌ<ºö}''Ö£¯À¾’.®8 ßd¢X³…hÞÆF”¶geŠøÖ¾¬‚û6 ‚rgmq yÞ±Ñ)êÉä9?(£™ÖzÂ9Ñ÷úDK{ŠJRñžöÞã¬ä‰{ ‰_ô´:ºõ£Ü¦óW9÷Éò5z”œÚQ¾£¯^;ÌjqgÓìãÐÁåKj×yè7'šzïë¸:ê–qê‚¥.g$0Hzç^éJ›5ÒÖ;Íwû`‚Ï—¨f9îz?asΡ­z^¿µ¢mN¢1¬&š+ÿ½½v5Ý{
-î%Ö!h >ý\©YÛÊ eÀÙ¹99?qü*O~r㈞çñNsž¨±w>›_R)?ëÒ¥0˱ÝÉMxÌ&£ŸE`èn,”/Ö¦yÖ`•±îÎ#ô¡!
+<< /Filter /FlateDecode /Length 3593 >>
+stream
+xÚ½\Ic¹ ¾÷¯xÇi­–D­€S@»0·dú6™S‚ä’9$—äç‡Z(QzK=W»æ`”ý,Q—¤L•\þ¹ÈåDzþ½~ûðù®ü¢¼Ðʳ|ûÇ…ßÈE-Z)¡¬[¼ŠøeX¾ý¶ür‘Òx©îNJÐRz#¥‹å½¹áûô_V¥Ï/Ÿ@ê2Cª¯ømxñáRgÂ˯ß~J‹‡ÍÅÁx!½ž·¦,­‹T2qAv£µ¸N&¡Š¶Â8KT®×<«mÔyQ-HT€v4
+p“6à&´K+Ëö—²\5¿O\$nàÚŸyW92z“# NàÄÅy'À·/›+ägÒ‰¬”7ìu“þê{D~…BÇÉc¡hg„÷È‚Õ":Ýd›äz¥ý&âHTÃ=1CO²ãcù ±.cåƒ0¬â£
+²XÔc^>éx)ƒ Q¬Q]Šë®=Éc˜˜0|;ºe•©kå÷º¹" Õ›«–ÉuÒúkS¥›U•¥u²sWFíµp4ÎT__tr}/_2íô­N¶%ç9tºÍ.ÿ&oi„ö~±ÝÉ
+­ü7t É:¹K¥,×3Ò70H˜?±P´_²=Tœ€E&Ac÷ðgÈ‹ŽÂIÓ1óåN——B*‰“À­
+3à ƒF”¶KL8ìÌz9°oŠ½u+f‹¶-|Ð3õýàºÉ¡² –ÕLeOíY.rÓoŸHäøyN5M6«ÐËê¢v%Ì㻂I"vq"zvÈ0Að6,h:B0õI
+©–H§o}f:kF“Ÿÿfζ¿âœZ-ltó:`›“¬-z;Ìõ"èÕÜtšîãö®p¤kÅ|­;ÑU·¦pß?òU="›ZÑ ªßí¬¢Ð˜£Ï¼º¶úd:]GEnýÕ- ±Øl (FiA`¤moý•â"Už-Ç¥Z×¾D ;Ôd~c÷ʈgç-~ÏR»ýYwÊ…ª,mL¾“,GÚÙ<ϘºÜš ÙÑå;[2hµ®ìÑ×mŒã:i5h¯:“–ÂZó>riw›{„?‰õb<Ôãã!…øi›ó0­”Þê-îr•çŸ’H'.ã1vÏÁTÌË£\ÍÝÃS£…¼l½‰h‹>Ç~/òG¯·jS+¡1íš×"‹¥Ì9Ë£ø´âþ)±¯Ä¯‰¶‘;±«¤*Óè}¤|‡1
+çâIµ4"ÄÕè‚׃V]O6]É\öðC'܈jÅÁ½Ç‰œö±3#WÓãs(†Qmû€_W« F¸Þs&ÚÀNÎbÙûšËçaOE„™ÛÛ!"¬8:ƒ=Æ p«¹Vo¯Dž9ŽÞƯ…‡ß {¦µž€=kîyqò}Ú­ñ¼†;£¯š Ïs¯ÛúòAx³¡‹gì"€ˆ>Ì´÷´æâr}Må¡1îbö5ÓµÏÐSj^ÒAïèi…ÄF¡fV£Yæ<ù‡ÃƇüCaA/ÅE†ÏÙKö~-¨^2®˜òúñ«thÀÁ¯‰w~–ÅOúV0ýzC+ìVßï 6£‘U¡÷?üUZù±ÌÒz{–ÚŒ“þ÷ñpV먟´Ö?üáãÑ”öåÇ¥IÄoØ.`@OÑÞ­ú|¸_P˜ jÿȆA¡µÚÜ°÷?üñx=´vð+>A/‰ÑÆ(7Îú¬E é·¥èVÖ»ÑvpÈ0†,mWÊ[}9d:„j˜ P~<>;E„WkžÝa[†Q€UMnX„¸í¯¤N&`z ï“:´[ê§O—¼ ˆFJÛé‚op'á‘Šô§¤^¥›Ö¯‡c벯&j3·§R¯š¶swʾ*ôÙ¨ôï“TkõÖšsº&ɬ96î{¸£m¤[Ž:^qöÈ$¥p ÙÓXõÏqžrN|ö(µÒ"ZÚ'ÞÍGH#?6îû É|½ƒçÍ”ôk2úZJ]“äi7;º£´wíž’R×$y¤­S±“VÓaÁ´ïgpÓŽ&í¤¿*õ®Är*‡W3¼Õ:×gìŽ2f‰nïA[ŒKê}¤I…Êì3§ŠœZˆœ²ÐVˆ¼ƒ…j“Zà¬<1uÇ,g]›Š¾“ëÑWà_I_†‚7™(u!š÷±QÄ¥íY™"þ€µïc£‹ˆàÞf£DPî¬"n!Ï;6:E=©ø%“÷Íy¦µžp´Á½>Ñ ¯¼ÇŠÒ±^øÞ­ä‰ ‰_ô´:ºõ¯Ü¦Z97×ò5zË”œÚW¾£_;Ì{Ÿ¦>Øô¡ƒË—Ü&*®óЯ\4 ôf;Ö¢uÔf,ãÔ8 J]ÎH`"ôV¿ÒÆ6k¤­9¶§ïvÍŸ¯_Í6rÜ*ÂæœXÂó
+¯µms%2°šh®ü·ùÚu?nT1ÿš5QÚìS¡FÂè(V«‡Kô¤±ÕÜ "ëV³p9yÅ3Ó¨!c×ÀÑåÓaÐÄ磮Ah³¦âˆ‹|Z—ßݯÔÙÚwY ª5²µÛ\4¢õÑ•ÑiJi*èKÔó+Ö>6·
+îúŽU¼ÐRKf¾µâ{.0üêj¬²¸nasš)9c5G´VR¹e@˜‹ãyAÐuè lºí`”µìò&¿ñŠWù%´ÃÑë|I¤7¦Öý”'×ÇúÕ’Öø¯›ƒüéۇϛ”!düí·¿üŠÏÿŽ¯ŸRÔaùoùˆN¥yÿZ~þðçrAs‹i[º ÄÌKëRÕù¦òx·'é±ÈK$Æá„Çœ
+Yù]kæΟøåLþSewõ¬ï/妱Õ|n…”zE6lm=E¹Ç­ï"À¶ôt@tµ“ôn¯í+ñÖ[øùS×掛SMW>”÷årô
+~í%–!h
+>ZÞú•š»m¾8ÝBûÎÎÍÌù‰ã×ò“s7ãô<w¦ó<¸óÙüZKùÙ—.’YíNnªÄc2ý,C·yx\¡t±6Ù³N¬ uw í
endstream
endobj
-213 0 obj
-<< /Type /Page /Contents 216 0 R /Resources 215 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 240 0 R /Annots 241 0 R >>
+209 0 obj
+<< /Type /Page /Contents 212 0 R /Resources 211 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 236 0 R /Annots 237 0 R >>
endobj
-241 0 obj
-[ 214 0 R ]
+237 0 obj
+[ 210 0 R ]
endobj
-214 0 obj
+210 0 obj
<< /Type /Annot /Border[0 0 1]/H/I/C[0 1 1] /Rect [ 222.163 76.495 393.939 87.952 ]
/Subtype/Link/A<</Type/Action/S/URI/URI(http://www.inf.puc-rio.br/~roberto/lpeg/)>>
>>
endobj
-217 0 obj
-<< /D [ 213 0 R /XYZ 78.37 808.885 null ] >>
+213 0 obj
+<< /D [ 209 0 R /XYZ 78.37 808.885 null ] >>
endobj
-218 0 obj
-<< /D [ 213 0 R /XYZ 79.37 771.024 null ] >>
+214 0 obj
+<< /D [ 209 0 R /XYZ 79.37 771.024 null ] >>
endobj
5 0 obj
-<< /D [ 213 0 R /XYZ 79.37 545.899 null ] >>
+<< /D [ 209 0 R /XYZ 79.37 545.797 null ] >>
endobj
-215 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F17 219 0 R /F18 220 0 R /F19 221 0 R /F42 222 0 R /F50 223 0 R /F49 224 0 R /F51 225 0 R /F53 226 0 R /F15 227 0 R /F54 228 0 R /F55 229 0 R /F62 230 0 R /F63 231 0 R /F65 232 0 R /F31 233 0 R /F22 234 0 R /F33 235 0 R /F32 236 0 R /F48 237 0 R /F60 238 0 R /F61 239 0 R >> /ProcSet [ /PDF /Text ] >>
+211 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F17 215 0 R /F18 216 0 R /F19 217 0 R /F42 218 0 R /F50 219 0 R /F49 220 0 R /F51 221 0 R /F53 222 0 R /F15 223 0 R /F54 224 0 R /F55 225 0 R /F62 226 0 R /F63 227 0 R /F65 228 0 R /F31 229 0 R /F22 230 0 R /F33 231 0 R /F32 232 0 R /F48 233 0 R /F60 234 0 R /F61 235 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-248 0 obj
-<< /Filter /FlateDecode /Length 3540 >>
-stream
-xÚµ\K“#· ¾Ï¯ÐX†ïGÕÔTF+Wù–do.Ÿœ8—ì!¾äï d³[­Éú°©›A><dyù×E^~z¹~{ùËÝ™‹²ÂX¯/ß~QðB^Ô%$aÂ%¸(lP—oß/¿¼Jé¯o_””>ZøkoðHÿ$¥ú€ï±üÃÏøÌÂ;—ǽýúígXJ¹KÉkoKi/”K´” Rݽ”h[èágZsCÛÙme”0ÑÎÔ-ê •³"é ä§ìÿí‹Öžèk¥‡-<Ňø
-¨bqTìšêk“Sˆ¶§²ªîªŠßµ©*>1¢3Ýpç|±WZ•Ý¾W©¹yn¹
-TQ.0ì`‡›ŽOâÔ#_t„Šæ‡c`#Hg¢þ4¼à7T€—Æ#aakIU÷$‹ÊIÚZT
-wÍ32-¼aq¬%u*^vßÜ
-«ÜˆÈk›CêèjQŽ„‰ìuº€ÅÈL3 ¨Ùái²õÛ^Øe*Cصƒ¢.èy×Oc#1Ðœ‰%é,³Ë Wè|g«sœÑ¨‘(³š]™˜õ,Òš’ v#´1€“šØU
-Lº+É$ºakgÎ\rLØÌh1ìÙyxB~ÒUŒÈ5ƒx{]&Ï:{¦þKÀƒãþžÆƒI ³%RUÖöMwOR6ÚØ-ž¬‰ðF¾¥ŒË€°ú·2¾!™<^_û%r×öÌþÊ`Æ¢Ö{¸n+:YLF>¸ª}ý­‡ñî½\p=‚>%!Fg
-·¾ÝüÖÊñòvª_!Ó ÖË3w)ã¶q5a:ÚG½m‡ù&§D—8J*çäìGuõºÜÄ9ÿDH˜$Fù„X ÁûfÑ*\}eÞ±ÆÝe£(`LXU!|m‚wÑ®.º×ôP#¯ê5?
-"Y5óž¯ã•_ÇcݳA,ˆ<Ξi¯r…f1ó™å#,¿¡±ru&áÝÆAeݸÉDÅá=G)‘€N½õáu†‹Usâ>ÂÌ:äh+*n°¢š VcÏßøè]7‹  å`+‹a°yžo©9*d[OY?šŒÈ»©ka«Eƒ<+R•öÆ¥^£Ø(ÅH¾ÅÕ{0«"¿sÒŸ_¦þfÌÑ5JÅf/F>qå@ç!jŸøÔ”BøºF©øüØ«–1½òö VV0òÌÅúÖ8 ¶1:[S80ó‘´ä6†ie\ƒƒ>¼öªs™Uúš^U,¯Ì{ÿÊŠa™
-#)r°È&RìKœ£Ô¼©Ü‘6‘醛­?îÆŸ‚Wq´¶OudÏ”VHJn·Ê°*MS=ŠHNÞDŠ^û÷œ+µY5Çæ阄PjCmìÃØÖ°>Y ‡¯ÂK¿á}§fC?’£<WÖ'ßüAšÝX¼¼j^mŠ§jw…rJéÝ6¯Îml=þ>þûÓË×o/ÿam3Q¸€mÖˆxâå·ï/øL ØEtJÅËÿ¼üþòWxÁ~b¸£> ª9rþeG˜­í–k],Ê°¬Ò÷qÐÔYFé];´ì¾2j(ÐêM½7õûÆܽU]×Ù¹>²“V»&.¿Ê2¯O×ÝND×aÙΡ è cboîq,œZ#NŸñ¹·ÞÕVR_ó÷KFSó¡.«±-ÜUAÚ€v‡x¬‚ÅF‘%7*©­xV[GpïS#—9Fü ‘-Ó—¸Ó¤·9‘õo±zÀ¥°ðÏ_þÀëD_þ–wdÖurì/µ›u® Ýr;w#+ìŠö~¦âëló(ä©~Žx´hÓfîVJ'ýw¥QxçÙ£<;'OËÇ€ßPß9—S’J>cî¤ZX¢y=ÿÍÒ[¿bÒ´Òç΂Yšr)= F8†Íè‡? ¨·
-X˜ˆ±ìÓÜ÷äìô뇎DémŽãäì”ó«í be?oì#[làÚo7™ßkHBv§j†žÄBä£}ªíf¥%²nɺ£w,Ä°ø{¯ëÉ e±ç¤Ùÿ†¡*×ÿ
+244 0 obj
+<< /Filter /FlateDecode /Length 3539 >>
+stream
+xÚµ\ɲc· Ý÷Wèšá<T½êª§§–«¼KÒ;WVIœM¼ˆ7ùý
+ÔåÛo—_Þ¤ô×/Ÿ•”>ZøkoðHÿ$¥ú€ï±üÃÏøÌÂ;—Ç}ùÛ·Ÿa)å.I$¯½Ý,¥½P.ÑR6Hu÷R l¡‡ŸiÍ…¶³;ÚÊ(a¢©;[( Õ'8TΊ¤*ÈOÙÿ—ÏZGx¢¯•þµðâv¿âšpè}ýãn¸]znHò‹¸Ø½°œGI¤Øý¨Ìà n˜×щhãcÀßØ4øS‘ã„–j+’tʱN„§ÙA}B¡¨sv’ʬçì
+Ó„u,RšW48~‰ºn)˜Ó-YE4ú‹¸Þ ¸œZZ¢‰¼ÇÊ{æTÁ\Q¹¾|6ÁÖUË›Sž•NB[½Ð·E޾ʅ¨¡f[_>›¢È§7&Iᔚ©ùÅù·|šÀ­ƒOï‘øöýF×w$·Ì¤§üô¸è 5:õ2çäÔOUdd½›wñÿêjð™´PõH…8F-,ö¥í{2ãÎâ‰ès3§:ŸA­iùŒ,ËMIUö•¥ZÎxÒG©Ao"—ŽEãF:Ó©V3Må!{‰=ͧ~+'^Æ¥f;ÛVRß@e­€§º8¸¼õíh’o•´,úX Ä.÷Êa•ÍAùƚ΋knÒ£$cB•ì^L“;x(>Ž4^¾Ù‘¾.Kœš®èEB9+¹[t½6oàT¥2`~ý¢q£@@Zèd˜£/Õ aÀµš
+“¢ç7|…»6çV„Kâ³×®+$Î2„œA…ÕÇàe0 {PfSÄæ¼*´ÂÆ…
+¨bqTìšêk“Sˆ¶§²ªîªŠßµ©*>1¢3Ýpç|±WZ•Ý¾W©¹yn¹
+TQn0ì`‡›Ž/âÔ3_t„Šæ‡c`#Hg¢þ2¼à*ÀKã‘°°µ¤ªG’Eå$m-*…»æ™^°¹Ö’:/{lî 
+€ªíØ*ESÎÏQ:á´ž©èÛ9ZTJx™æY¸Ó,‡ð:΋°l†Y„CV‚Vâ</ˆÑ/³¡e
+=¨Öu—ÿ^P¬ÓÍ8ê÷*t´Üú3‚ÍûšëÓABeÃXa•ñ
+»Ì@e»°CTÂ=ïúEcl$š3‘¢$evôluŽ35eV³+³žEZSÄn„ƒ6PbR»JIw%™Ä@7lí™3—63Z {vžŸt#rMà Þ^7‚ɳž=Sÿ%àÁq/ãÁ¤…Y‰T•µ}ÓÝ“”6v‹'k"¼‘o)ã2 ¬þ­ŒoH&××~‰Üµ=Ec#³¿2˜±¨†õÞ®ÛŠN“‘®j_ëa¼{/\ OIˆ„Ñ€1úÍ'½·Ëåšk`×âmàH½p†™Õ…„ ¹¨Ì
+•' ëEbh²ÆƒJç^+‚óñ3£“·H£xlÇÚˆÛî×™=+¡YvŒVwh›Opù‚‰nLuhxvIÁ#GʧvH£ ¼Ù]›
+õmQ¸õíæ·VŽ—·SÍøò ™.X/Ï<D¤ŒÛÆÕ„éhõ¶æ›œ\â(©œ“³ÕÕërçü!a’!ä'Ü0ÀjÞ—E«põ•yÇw—¢€1aU…ðµ Þ Gº»è\ÐCB¼ª×ü
+áë¥âós¯ZÆôÊÛƒXY ÀÈ3û[ã$ØÆèlM}àÀÌGÒ’Û¦•q úðÖ«ÎeVé hzUI°H ¼1?îý+†e<rëÕSbl\>Â䶥9¬ÊsËÇQŽ—jÜ3&¢8§÷‰EB$®Zj"[²ÓÀ)Éæý‘Ã𑽩‡éDM±ŸúZtz>ãýl~ß`¥ÇØ9¿Ïšø(¿?·Ñ0 0ªµ‡üÁÅOÌf¥¤~xñSg¨7Q¹øéavš©Ì ÷G5â{†:ÛØû,6;µvÁ‚}‰3¯Ï7v•xbgÄÛàœ[d½³p:HgÜ$Y+LÙΨDaŠCÕò-PNU%dî¾ ˜"1êƒ`¥Jߣ½GÁDÆ«yGH±¥3j©g+t…8!uš©Ù^¯Ü7Ë«éÉýJ–®Iç UŽ:QŠ”\gÉÒ"ËïI–VÎ(Q?òÙÞ•Ñüäɘ4ÈEˆôãÆHò?i‡l‚äPϧ 4’&…&aÞ~ `‚±!eâõÕ@ÓHa¥{vÇ}'?HÃÒ “j^ÿ;5ÜX)TZdò–Îx½•Ë‹–nÝGm±;·v"©—}¤Tƒê©5èK´låoëÜ:jµÔÖ e÷6C‹àоÒе –&µÏa¨aàó³ZE¡lL<¿ªéÑ̲óqOÇ À8ÂO¶±Î¹w¼77û”÷Ï¥fï$d¥lf8äçÆ’úæʽÚÐ(4鋱BEÍ{ñiG÷ëTª¯AèsH&ˆ¤ô‚${ݦ]ù´ ÆG¶”PûF¸3°´
+Çö{ŒÊi¾Ç±7…ã×–ÀŠbÅRÔg{þ^pá/V–O@ïŸô õ—á/\î¤f*­Õ¦*S«Áâa¦0Wéõª~ùÀÒbòdo7 Þúêô'7­0’"‹l"žtÀé4JÍ›Ê-i‰Ln´þ¼|
+^ÅQÐÚ¾|dÔ‘=SÚ!)¸Ý*ê4Mõ("yò&RôrÚ¿ç4X©eÕs˜—c@B©…Ú؇±Ö°¾³@_…—~áý fC?’£<WÖ'ßüAšÝX¼¼j^mŠ§jw…rJé7Ý6¯žÛ<Øzü} ü÷§O_¿}úk›‰Âl³FÄ/ÿí¾
+´z©÷¦¾qߘ»·ªë>;×GvÒêÐÄåWÙAæõéºÛ‰è2lÛ9”tLìÍ=Ž…Bk„Àé3¾3÷Ö»ÚJê»bþqÉhj>”Âe5v …‡*HÐNøÏU°Ø(²ä&P%µÏjëîcjä2Lj4²eúwšô6Ç!²þ-V¸þùËïxèË_òŽÌ¾NŽý¥vÙQçºÐ-·ó0²Â®hïg*¾Î1BžêGàˆG‹6-sW) œôß•Fámœgò으,|¡~p.OI*ùŒ¹Iµ<°Dó zþ›¥·Ťi¥Ï³4åVzŒp Ëè‡? ¨·
endstream
endobj
-247 0 obj
-<< /Type /Page /Contents 248 0 R /Resources 246 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 240 0 R /Annots 252 0 R >>
+243 0 obj
+<< /Type /Page /Contents 244 0 R /Resources 242 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 236 0 R /Annots 248 0 R >>
endobj
-252 0 obj
-[ 243 0 R 242 0 R ]
+248 0 obj
+[ 239 0 R 238 0 R ]
endobj
-243 0 obj
+239 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 490.557 488.192 497.531 500.147 ]/A << /S /GoTo /D (section.5) >> >>
endobj
-242 0 obj
+238 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 358.563 75.592 369.02 87.049 ]/A << /S /GoTo /D (subsection.10.5) >> >>
endobj
-249 0 obj
-<< /D [ 247 0 R /XYZ 78.37 808.885 null ] >>
+245 0 obj
+<< /D [ 243 0 R /XYZ 78.37 808.885 null ] >>
endobj
9 0 obj
-<< /D [ 247 0 R /XYZ 79.37 771.024 null ] >>
+<< /D [ 243 0 R /XYZ 79.37 771.024 null ] >>
endobj
13 0 obj
-<< /D [ 247 0 R /XYZ 79.37 650.318 null ] >>
+<< /D [ 243 0 R /XYZ 79.37 650.318 null ] >>
endobj
17 0 obj
-<< /D [ 247 0 R /XYZ 79.37 566.415 null ] >>
+<< /D [ 243 0 R /XYZ 79.37 566.415 null ] >>
endobj
21 0 obj
-<< /D [ 247 0 R /XYZ 79.37 317.43 null ] >>
+<< /D [ 243 0 R /XYZ 79.37 317.43 null ] >>
endobj
25 0 obj
-<< /D [ 247 0 R /XYZ 79.37 214.75 null ] >>
+<< /D [ 243 0 R /XYZ 79.37 214.75 null ] >>
endobj
-246 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 226 0 R /F15 227 0 R /F54 228 0 R /F62 230 0 R /F67 250 0 R /F55 229 0 R /F16 251 0 R /F63 231 0 R /F32 236 0 R /F61 239 0 R >> /ProcSet [ /PDF /Text ] >>
+242 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 222 0 R /F15 223 0 R /F54 224 0 R /F62 226 0 R /F67 246 0 R /F55 225 0 R /F16 247 0 R /F63 227 0 R /F32 232 0 R /F61 235 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-257 0 obj
-<< /Filter /FlateDecode /Length 4386 >>
-stream
-xÚÅÉn$·õ®¯è0CòqÔjõ
-N•·²aâºì®TÙ¢RË·[yÑ2xbÑ´à‹.é– Ý CØEÝòNÞ%.‰ZãV}FPœanäˆéε秲[E©÷IO¥Ýܳ“_*öÒö¤rV¡­Ò‘V“@Ñ*›¼÷ÇìAèiÁ)—¥O„œ`˜’¼ª¤[=Q!»§€$Œù/  øš`R3áu!XïÀséภ2ô4õ×Ñm3ð*ë›ÕØp¿ •òv<`¸¦ÂHý!¡Îx«”3D–Èl‘+›À›
-Ý‹ËZ~m3
-=šbRlRéJU‰¼ pqº Ä`_èø6’:¡2–½'ã-szé<EÒü0éŒcÊ8ÜI1£d!º;J¹H;ñíŒÇåTx¤ÝŠ^*ÿö4ó.˜Æ¿øM:iÉ„Ñãfƒq4™¨„¹mEG-=©t«©î4©*‰:(ç<¯[íô+hKyÍðN©8¾h@«23ó­7pW‘WãÑñoÆ\$GãJb
-×
-IËð
-Dz²>ÇAÍu[fPõ¢g<ìdFšƒÌ„`
-Ɖ'Š79˜+³Üò@LµaNN¨Úî X¯yÛ.<(Ì3’Ú–q/’Ò2#%Ò"þVY «’iÂ6äÝ
-F;|(ÿµ›j/W)†î¦­'™\ÝŠJšªôHÑr !ù)Õ‚j_ð±.O
-bê6q<ÍüÔDWj²vü ýÆ5Á¬ð#xQxÍ;(Œž‡™Ÿ`{Gw­g´å’gq‡k%ŒàB[ü ôº£b:PÒBجL
-ò×æíTÒµ=­ÙbàŽL‰r `†ü~ Ói3Í’û^:1h¶Ô8K¼íïes¨lÜËrTRrœeö²†I.ÝËIí§sí§¹¤³L?¼•‡Ø´3Ì~Њ!šžPxÂìƒ@ÅlÅ¥8ˆ^<ã3[=ÿ£¹§•bèsNK¥ýå°-òÜ"Ë´èC´l:Í ‚þš¬tl°ÒÑûßHu‹àý+¤¼bÜÊ3©îš‘{Ëü=ûà²)KºðUù¦ßŠÏÍUoSš¼Å#ax?Bt¼+ÞË+†’Àeü
- ·~þÚu iãþ Öi
-Œ¿-L£+$·82î]~ÐÝP¼™ð_ð•pÕíL©:QU…ö ‹[¶Òhˆb×Ë-Wi_Ë(šÑkŽr¹W±ujñ•>ÖOôFÈ™ÂÉžü#y ¬#ÕÌÃ)ÛIúxw«€ô%X®9寄X`qŽãÜqk¦ö!¾‘ÓÌÅ Š‡Q£P%
-?1À±Î I¡G¢QMxj+|LÌÂãÞ0­Ÿ“":¬U¾vsÑŽ7Ávý ¸¬ˆÏ4 k'F>› YY^ˆÑ·æ”*–YÄtðSƒÑ %(‘´{•ØÛ¨—³†`lŸã˜•-3Žtõ
-3ív{Ä÷..Î|ÎÄë‹óñÞsZìœøüz·âN »í'ÅKôÞ­xg|”6öy¤sÚ8Äœ×G7NìˆÔ0®´õ˜L‚¼ë§…³/–ØíV¬ëgãÅvRT,“
-âÌãõ —rˆ)Û.Î?–²J)HîwSøôHñ#y~úÃ:ןE’YÞªHûyäFBòb•üp#a¿ÎG ‡Õì=ÛH¤2<Ô¹×HXûtbSž²Ô^3^Ñïü= ‘è¦3¬úðƪ|åT3¤2{ ŽÊ,z[–Î$Ï3†Ow,çfÉúÚ™Rˆ9}¦•ˆ ô`…PËž…Ú7§ðÝúÕŽ©Vk¦7rÈÖ¨9mNŒw†¾ö8¢oN<|ýŒñzÜ=¶3Æ“È·¼çôE\LÒä®6γ}±«Ç0Ó‹©V±sq¢Ã¹íP;XøŸP¨¥ïé|EÂÀĵÀÅ·Þu¶û¦…P
-€Ý[&‡.Ë„Ú—þ–0¹=ʦ¨Ò-” ã)zß^½ |_0ô2ÕÔ2Ó{_îUÝJÊó5Bç_À³ä¡z|vØlWi¯y$<Zjì¸PÐÒ5œ©ÑGºkznxˆ¼/æsÄ"ü}*ÜJŸŠ©=^©¯/ôtJ8QZçj®pÓýr6¸¶§XÓ:ۅѺÒë.Ábë¹Ðl>­¨ˆì
+253 0 obj
+<< /Filter /FlateDecode /Length 4384 >>
+stream
+xÚÅIn$ÇñÎWô”Î}Ølö
+Æ­¸|û~ùå âúüƒáü çÚqq·œ+ ßoÏÒÃ5Çá;ü†Ë܈x=Ò˜ë8Ö†ç_¿ýøÄYˆ°Àÿ_ŸÞ¾=ý§í/
+L•·ºaæ¶ì ¯ÔØ¢Q+ô[eÑ:xbѼà‹.é¦f†¸‹¾•‚Ï\’´Æ)¬†‚ 4ÃÞÐóëÈOu·†Ò²žÊ»ùg/ >œÊ|©CÜ˨¼'–³m“Ž¼šT­²ËûxÌ„‘sYþ$Ȇ1É›JºµU² HÆXø²Ðš¯ & ÁT‚UñŽ<— j‹OÓ~ÝÝ®
+}yü»ÅÛš"ÞŹZ‰¸‘ùþ!g†7nâ­«Ÿ±[ü¦mQVš /Ö:&¥«¢,% BÃV Ò#¢¬ <PØ."›ÝwåSXÐ"ÒдGV¨Ÿõ@•mÁ+¼jÚmC÷^ôñ“ì¾ÎQ`ÓÀqš±B\4ÂŽr´áØÉ…«“¢,Èâr¸âÌ<´ËA9¿_z ¬=šòRkY5ìûJ11S}+"…Ý¥âÄ*]üa™X;pEÐ{)Æ3aqu(‹vÀrÛt-†¼EÏøÇdþ¥Ég…¾ÊZO‘î1sL‚5M1/aÐ{ÀÑA]i<é„׬ozŒÙâÒ~ç~õUÒ³ :jM<{O-¾ò(d±ÛzLkæ‘AA9lš4Ê”“dž4z©G€/tõ”[¤z_yÐv¹Jõ9E-Œ¿a³ïH‚ÀreW‰5³©È•T,ºdZ0
+x¯ÆO;Þö­…c\†Ï:·–3ŸynewÏm¸K1Ù±˜S”•9Pâåì'ÆÜ /!”U`ü¥üšž_D?\º+hû’Ý}n&RÆ4¥u4ƒhí©Œ]…-ùfi),ËUúh Œ6,Ù„ T;tÀQr6D-À€Š‹b^y: ±Í6‹kæ‚fî“ ¨
+‚á&渽
+Tp˜f‹0pNnü ´š{fÍ´ïG
+
+aIJã¸R¹Ÿêi ¯è*ÍžW˜Oó™‡g>i©NUé­!x³öžïq(Âd÷);+d•‡anRŽ¸¶¤¼( ‰ºÞ)…Ìå\mFÚ5ZlÞ/xD &½§~VORÊ×}ÛÁa¾ôtMy1D^̾= ßÁÆdõâT¯„Éh>`õĪùÀj½xyWtUý¨þS)-©#§DI¥jK¹TÙò“lµ†EmÇp èÄÅ!¦!ü^Æþüu;+RÜçqnEhô}Ç€Ú%]íAeXCÓM"˜µ÷̘z˜—ŒÖ®VÀîÒ\W¹rF¸¥’D¸e#!.§f¥w:¯tlrJøÔŠ¨:ec¤wªNec<M‘õ_MƒäÌÉJÕ¹’Jm4µÈ):ø
+*5íYŠ´Bˆf&ž0ûJ€bŽ
+š@)¢—ÀøŒÆ^Ïÿhîi¥ÆœÓRi@9l‹<wÀ2=ú=›ŽsDDÐ_Kƒ•I V&yÿ©n½ ”׌;y&ÕÝ2ro%€¿\veir¾®ßÌ[Õ᥹êmJ“÷x"Œ(Dǻ½²b,)(u¡c!aãÖÏ_‡$ÃÝ_éušâo§¦Ñ [H™ö®?ðn ÁNø¯øʸvÆT¨ªBw†ŠÕ-S®ÑˆÄF©ëåVª´¯uÎèuG¹ÞM«§Ø:·ø+?.LôÈ™†-žò#y¬ZGª…3È)ûIÆxw«
+Üœö6c GòûJæ+C5{™©ã­d‰ß¯å%×4‘7ªè•|”cŽa߆ï“üÑæ:Œûnø£ÞãèHÛ’»=á“VŸv\£cv£`§ÓŽ”¶Ý­90œ*âò—õn´ª°Ón·G|ïêâÌçÌܱ޹:ï=§³ÌɉTXïVÝ ²Û~R¼FñÝ:‘w裴©Ïû#ÓÖæ]ÿÝ8©#Ò(ºÒÖc2ò¡ŸV}±ŒR»ÝŠmãl¼ØNŠŠeRAœy¼^Éå£bʶ‹ó¥¬R
+’Æý>=’EüHž?Æ°Îõ+€Ïh ÉïU¤ý‡<J#¡
+ÔŠ.Ù\k&LG¡…Ý}Xòðq‰©ä»Ñå6ÛOÚaPß®@Cªb‡§¡óó
+"> èm|ú—_áú?àóc ‚¿ü7ü~dEÄyÿ¾üíé§üL´’6ÆyààÈTå7½ÿ+¿›©–øã+•D¯Æ
+6K@CTíÄY;Ëëà†w“wÒ}X¬6à=»Úëí,é÷ÉkŒ/ºs¤F/à‚ˆB•5,Lm%ë5LEgÑ6Ÿ|¸ÄÅ×þ~;Ú0¢bø3¬shäÜ©y©1g,
+¿Ò§bjDOWÚë Þ£NÔÖ¹Ö…+üt¿žM]ûS¬yíÂh[éu—`©õ\4ÛO+*;(N—ߪ)ÆWÿ(Jòói q¸Ð„cÀO²¯(Ûr
endstream
endobj
-256 0 obj
-<< /Type /Page /Contents 257 0 R /Resources 255 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 240 0 R /Annots 260 0 R >>
+252 0 obj
+<< /Type /Page /Contents 253 0 R /Resources 251 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 236 0 R /Annots 256 0 R >>
endobj
-260 0 obj
-[ 244 0 R 245 0 R 253 0 R 254 0 R ]
+256 0 obj
+[ 240 0 R 241 0 R 249 0 R 250 0 R ]
endobj
-244 0 obj
+240 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 261.657 708.966 276.381 722.147 ]/A << /S /GoTo /D (subsection.4.3) >> >>
endobj
-245 0 obj
+241 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 289.333 708.966 296.307 722.147 ]/A << /S /GoTo /D (subsection.4.3) >> >>
endobj
-253 0 obj
+249 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 384.516 681.248 399.241 692.197 ]/A << /S /GoTo /D (subsection.6.2) >> >>
endobj
-254 0 obj
+250 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 414.962 681.248 426.917 692.197 ]/A << /S /GoTo /D (subsection.6.2) >> >>
endobj
-258 0 obj
-<< /D [ 256 0 R /XYZ 78.37 808.885 null ] >>
+254 0 obj
+<< /D [ 252 0 R /XYZ 78.37 808.885 null ] >>
endobj
29 0 obj
-<< /D [ 256 0 R /XYZ 79.37 599.153 null ] >>
+<< /D [ 252 0 R /XYZ 79.37 599.153 null ] >>
endobj
-255 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 227 0 R /F62 230 0 R /F68 259 0 R /F54 228 0 R /F53 226 0 R /F55 229 0 R /F63 231 0 R /F65 232 0 R /F32 236 0 R /F61 239 0 R >> /ProcSet [ /PDF /Text ] >>
+251 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 223 0 R /F62 226 0 R /F68 255 0 R /F54 224 0 R /F53 222 0 R /F55 225 0 R /F63 227 0 R /F65 228 0 R /F32 232 0 R /F61 235 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-267 0 obj
-<< /Filter /FlateDecode /Length 5225 >>
-stream
-xÚµ<ɮ丑÷úŠ<Ž%s nÀÃ^Vvðm<ukødû2m`ú2¿?Á=¤¤Ì¬W T¿”D‘ÁØ7J\~»ˆË_¾\¿ùó]šKØ‚U.ßÿõEâq‘)`SÎ]œ…MŠpùþûå×7!´ÂþUBÀUƒ¿Áçk«Þ¿j­q”úöþ÷ïý"6Âÿÿ×±j¹Ž›2pqFlÁ麎‚2wœ7ào\nxßäuå7¼ÿ ^ão}O×Ò¨<F#F™-Ô_æ—<g|ž~› aAD…F¹É84ç+â3Wö¬ãþ÷ß.{þÖס7#4_÷±‚„ßœžF7H<.¡pdZ»^ÐÕ¤F‚L¸q5¬L):QP‡MHFAT÷Œ3í} c8xmÊú6qSŸè2Ÿ½åk¸Õ§i¼Ã»‘Bÿ¹W÷€ðþ³ /íâo‰GõŠGW°ö]Ðù÷8][»ùiJ,TI…? ¡´S›T’¿;"mÍÐAoø|zs@o‡âiÔ€ ˆš‰ø;„zM€Ìh¢âáxê3ü˜ˆY¹!É&Œd ȼé8Wý9¼k7eýÛõ3àrrƒ0Íùؼ܂™øË…ÇX¹MØSlBQ‚ñ9^Ã=þ}ÿªðy”Â{“Ö×Ç‘Yµ+ÿTž&NtkÈKåeš^Çzšü„ÐÆn ùÔUŸ*Uüe- j¹ç6Ü+2ýø¯‰©-Ê¢üÌ"º´äͦŒsGhÒœ7jÞ¡gf®S{/ ú§ÖÂ|ËÖ×Ùb}ïyL†j¶óÊfû¡Mv¬ÛŽ¼º þ€æctdmW=æºö}ø>É+hJ|\wÇ+ÐÁ£ç¦ùèH[eõ ªg1ÎÑ1»öGl ÌDÛn`NT˜†Íûé}û±^ Ä&¥V»=ãUc3ï3sÇzåj^ݧ³›Séµ®kŠ­–WúóÝè‹„MÊ‘364rHôÍ
- +|EÁŠjÚèw-ߊ؋è¼w¡‹ÿ’_á‹@ª¥ŠÎ˯Dz¼F6Ù@þ Žüµ¯ÝÖ»½+ÿ–@½eä·xʨ’ÊÚʽex¢qÉc³;VǪ겋ü·¤”†x'mtòQÊîè®ïW¾B†“¾Kß~§ÎÐf*öJGEu—\]‰¶Ó—é“6®ŽÓ04o† FÞm^8Æc´™På.-Œò$§Ó¬ˆi Îl0ûÖ`MHm¨Vòdg®u¡*5”yJ‰·M ”]ñ¨®uçyTfÂ
-€°’:d¥ü4­Q-Pü+’o‘F–Ø/WÕ·Ta¹8º:¼•¥çù9¤Šr~“Ús <I-äæQs<î°z‡îL»ÓånÅžâûîbNp<Уâ.®Q£í¤&FÿÄúw¯ÊºN¯x5¢×’òNõaê¬U9¨{Á⎿¢bl |FUd.í¯@׎Ugi#­G‹îù¬13¾fQPE'Žî<UŸTÜ•lË5ÓD=i¢^£$ö÷tËÒTxÓ¸[Ô#õ‰nÊ«­qÏR»Ï=-ÝÑÖÊ`–˜T=\ä²×%µé‰]E$mÊYñ2êA6c¦7ǵ‹‘„¢®³s| ‘Èì‰éŽÆÝH7Oã1è=
-¢§M¸b­—"hÔ%Ó=.Ä—6‡èQ-¤ÔcÈ÷@X¨,r˜ ·ãõ1`Qz^_dôµðǯ`Óž\÷¸“3ÙNÂ_³9!Ÿ] ýqçË"^Md“•©&Óê\óƒÚ@N˜i!å­‡ä™!OT(*p¤VÓëU³ž±zO`¨J£^ø0G{‡Á¯6ŸÀËFÄš_ìsaf ˜-ˆ3ý’s3ãР@P›ÕÍÌ NÉKfÆMPv½˜rlVL¼éù ÜàS]¿rm¸ýî,Ø4›DþF5 Ü® '@Œ÷FÿoVî6ŽEÓÖœE+ýìmÇa?dM•U Ãá^ð5ˆ„žѶgGN~ ÊM4_³¯—$•¿ò’¬xŠ}Õ†4 £FUQØ™#þWØÃ
-dH GTÊ^vù´l…¬+-Ÿñ£9ÏÝ”œ¯~§õËÓúÅyv`(Ê©ýü>¢0¦rˆb¡ø6v,“0›tê1ˤ•£uP埲L
-›êd>˜fšÖðJv9y)ŠÁß”}’”WÍÂbÂjæVgJxxÀ,7«Hô× _çI#ƒÈCr:6ªUÞKù¡’ ^Rñ>¶› ÄM«£–ºŽ¼OÆý î*ͪ8ò,ùi»Ô*±áSÅž€Œ…_ZîÔÙ‹ pI$7íªb{LÕ<Ðîô´þå!KèÑåq^XúMú b4RYÇF(«<Ÿ]+
-å#ŽHÞ}­v\p—Ÿ¬ø£`d˜o,=,ŠÕ3)ÈËÄÏ“¸K&ÁÈ\Y5ô8ÝÆ¢^ê ”ðxþKÆg
-Ñip§¬+Í$èïä{¢ÙSCc=1qCoLÏ‚{n`¬Òª4Ï æ±k G§©û ÐT‡kŸUÉKžñLè„L
-c°îŸ;ýQ3­/0C­I‡QÇ(™À»
-&»öBp›¦/²H×ÅN1f 0q
-—
-NïmáÇ _>šèV{]LðÅvzÂUì40ói•åqžš/á¸]Öcw,9AâHóÆÐøÑ›Çã™ëÆó6Rð5óV¥D«+CcNuÐIòµŒøõ譠Dz¡GZÕr¼m1¾ÇE¥÷Ïèe ò Ê'Õ2þ+•"(ü’0+F› +Ji.6ÿ‰j×"l>%U‹ófÉó4 y¯V»³ÒÒù)¯¼÷'Q5jªû ‚ß±þÞCÛtˆWI@ãÙÓ’ÔÓ<m¤Sší°ÝÈÖQ­)J-Âmá:šBWö;¢zLýÝ(”F•:䧳7¹&‰ÖúŒR£?ßû«j\ñ¨À+‰•NB¡ÙêE"žâ#ôðÍ.¶#?½–fivquRk·v¨¢›('ËÇ!R¶Âê‰8qººubÚ¹v»òèõpôˆ¶—]é¡ÌTf2ÕÓõðÞK¤j ‡û‰º®ò’ "õßõ¾§ò!tÖ”`m‹ùMŽ»R/R‹¤ÉqÙa¤é9 ?ÉsP±!o±Õêç2ô-ˆI;=¬eWöä Mljîø[•m”äe›4öÑÓ7)¯­ùÞêÉΡV·ãWyÜ7ÍP£‡L_1j×ãOlþr~3¤SÅuüOêøø‹ŠAâ³c€{)JiÅfºÈøÁßËUúx½âMI£Òo
-ìS©ts?&õI Ý›ò©‚û‚7p>æKîT=kZŸÿ\—JÉÍiÅ!=r©2j©ó‘ï Ÿd²êÂN+hž‰ü»îÑÙïÀÙ]ŽZìµeŽþ1ôÏòLv½Ç“…†C Ÿ®|ÄüäÈ¿ÊkE4¹ëª“ˆ¢ÎS[5kÏX3 5‘â˜øÉÖ
-âZå®ñ€¢]×®PSž¨h1|VO(åç«ì•§ƒŸ.‰z©Îã‰ÒÐÚ€$)æ÷iV!ŒEâL±}¯ÃÉË´áN(3] žÚüÓjYW§«¨£üng—|£m²¼ª‘…gmþÛ¾I”Þ>Ö8ìH‰žjjeˆ¿<*€Ôõgèײr[{Uor)æ6ß]~gד!…ü-ÛjŠ,¹W ÝŽ}˜ä¦dÖªýÕMJà@ÐÌÈB.‹4}
-+߉9°o˜n³´dx"=ÏOò¬Ñ÷ ôc‚}+Ê Ö)CüÀÏYkùAkÕoîÔUO-ÙM3äâwµѺ@u–)Z¦<»æã/>“RT”);Ó¢!ª£0Ê‘Ò‘hý)†ö¹ö«½oÔЖŸ~ ÀÏäÚs€+kÌp~Â>†’#V\‹V>9§#Tî½}`J2+¼‰„1{êÙää<(3só·pèŽFÁÙýÎ’ÈNlÞö ä—Áþ¯ŽÎ˜˜pvz—ºH±*€qÉšne¬q5ÍÿŠï»Æzl©MR
+263 0 obj
+<< /Filter /FlateDecode /Length 5020 >>
+stream
+xڵɮä¶ñ>_ÑÇä02Y܇¼žvÈ-ÎÜ Ÿ’8—8@rÉ笠‹”ÔÝ36ð<-‰"‹µo”¸üó".útýú釻4—° V_¾þúIâq‘)ôÎ]œÕ›áòõ·ËÏoB()„Óø/¡¯Bü­}¾¶ðþY)…£àËû/_ÿüIl&.„ÿÿ®ca¹Ž}qFlÁ©ºè2wœ7ào\Wßð¾ÉëÊ/xÿG¼Æßêž®¥<F!L„V×_æÇ<g|ž~› aAD…F¹É84ç+â3Wö¬âþïÿyÙ{ôS__ µ¡øú¸´ZøÍ©itƒÄã€#ÓÚõ‚®&dÂýˆ«aeJщ‚*lBú3
+*¤ Ü3ΔkôÑÃi´ÀkSÖ·‰›Ê¨øD•ùì-_ë[}šÆ;¼)¤óŸ qÅq¿Æ?›ðÒ.~J<ªV<Ú¸‚í°ï‚οÇéÊÚÍO“Pbá J*üI¥l$wDÚš¡ƒÚðùôæ€ÞÅÓ¨Ñ2 j&âïê4idFÇSŸáÛDÌÊ I6a$c@æMǹêÏá]»õl×ï—“›ÓÜ™‘ÍË-˜‰¿\x\€Ámžª`ŠŒÏñZßã¿ïŸŸG)¼7i½q}™U¹òyš8uÒ­!/•—iz!ëiò÷ „2vÓŠO]Uð©RUÈ_Öò× ¢–ûqnÃ=ñ·"ÓMLmQågÑ¥%o6eœ;B“æ¼Qö <3sÚ{iЯ8µæK¶¾Îë{Ïc2T³›íW„6Ù±n;>ðê6øŠQ‘µ]\õ˜ëFØ÷áûN^ASâãº;^
+=7ÅGGÚ‚}Ô3¨žÅ8GÇìÚ½i0m»9QaJoÞOïÛõjZlRÚiµÛ3P56ó>3w¬W®fàÕ}:»9˜øH­u]Sìlµ¼Òw£.RoJ£¼9saC#‡DG™²Âg¬¨¦zWò­ˆ½ˆÎ{ºø—ü
+_–*:/¿ÊòÊ£Àt?ˆ#ík·õnïàß²`k où%^Å°"ª¤²6¸· O4.ylvÇêX¨.»Èÿ”Òï¤N>JÙÝõýÊWÈpÒwiøÓïÔÚ¬QÅ^騨+Ñvú2}ÒÆÕq†æÍÄÈ»Í Çx,£¢‚¶ ªÜ¥³…Qžätšñ!­µ3›ž‰}k°&¤6TC†<Ù™k]¨J e@)ÓÝ–]ñ¨S_ëÎ;ó@f 5a%8d¥ü4­Q-PüW$ß",±_&.Ô· °\]ÞÊÒóüÆRbRyŽ'É¢„Ü<jcŽÇVïÐ=‚i7`ºÜ­Ø¾ï.æÇ=*îâ5ÚNjb¤añO¬÷PÖujÅ;¨Á{Ê;Õ‡©³Vå
+;ñŠ 4mª¨‰–QuËȖ瞉/º+$TÏ1ŒAعt)Ò2Ð/i$³æ!Wv3ÖЀÕ
+¸Ê*È%Z6'ñÞ®©«—‡':ܺS¦ëDRÈBAÑ”‚XÝ¥"ÉýµSyñ£™ä,‹”^'HòšÄQ;.ê¡¡Tn3&ÔÙµþjàŽèp6˜fÓÐ90þ®ð× D§½ÃðpŒÂ•G3Ä+iBÍÇ¡’êCÌy\Œ ›F#œ!”òúþÙ4;—\Åà†)A~HI§€!ó_?ý§›¥PÑ ×¢W ]¸üí·˜8»hµye/RlÊÊËÿqùõÓ_ZÌ
+b;VEiœŽCÙ´H‹ïnT«;(!ÑAg3NFdF(~š«þsBCU ýŠ‚A@Àž¼ú4É#¿²ÀþZ‰O‘Ý bg‘ûµ*Ó:2•ªO< Ái„‘¡½õèµ*¼üNSªml5¨zš¥Emµªb ‰ˆüVk›F hˆfL©&)·Ô@IÛ8îp§%¡#'Y§HˆÞt†S£±j³uâ˜+y{‡ ôÝŠœÄ&…,®h=Ž4Ç:̆¦rB‰*©Í@v{v´ ŠO·ãå­Ú´\R$ZŒ]ùã¥Q‘ëŸ];Ø Ñ3½õqìÆ “Þ<¹–ÆÑÎIþ–E´š¨èŽ×´ÃnÚŸ‚S“¢U,ÓMTÑ„õjğݹӄv¢–mÌ–|ÆàªÇ™…y¸$êÙÏR¥JâÔš…¹®¢Q}£âµlï1Ùwæ¨ø®"Þª7‰ÛÛœ‹ê¼ÏâJÜ?†¦ ©
+ÿ¥xs°6ÿ5'ò‚JÜè_5jò
+{SobÆTÇ qQ=Í7$«9úÇCmóÜÞiæw‚:;áã
+W½p±CÈàR.“Áô‚:ÀøÃËi¦¥ Ú«}ˆ»ÌçC_G£v”×âlAê×< 7AÙ"!åØã1ñ¦ç3p_”º!+¿›»–]5Æ“(;íª'¨zÒwŒ&gUŒ÷Æàdnxr·q¼ZYá,Zégo;ñä¡*‡7KŽÃ½ì†®YÝU™²]©ˆà·
+¡v›—}‘©•3¯°/JAРʤ'#²¢•J–ê)1{ ‘ãL«ÔOß1 ÿ“keÑkfG¯åw+ëçñŠåÖ;£ÕñcÂF…¨ªƒ;^ GÞòÃÆþðï?ú\¬¢V縀/â)é´³4ºRÃSK[ÔGpL†ë,‹$Ôó&Z"_±RÐ6¥Ù«£òL·ÆP“É‹n™Ê\?§f¯%ÁâJÞ±N«š¨Ú*ˆæ<º$Ž›Ñi•½Ðp&Óœ9KЮ®¬Š™ã.:˜–Mó]ªDóÊÛÏ¥ShJöz`däÒá/¦Tâ,Î>[ôtÊŽ?âùh—]ç9áyí`³8”oä1n^ò` *ˆ-í.ìYL¨w7½¦+š›c[ç^Á¶»çs&6çCú¾Ú½µ ’qº°A1¾²7šz}ÿ¬•§M*<cÐ"J‘[e «X'ôp ÚËç­“E=ƒ¿'6C¯D¿`±
+­ÕƒÊ4ª D® `¤_MÂ^©|$7üMÙ'IyÕ,!,&¬fnuЄ‡ÌÒqCêMkø:OD"Ó±Q­ò^Jդ؊Š÷±%
+! ~ZµÔuä}2îuWIØAñäYa&Òv­U¬ØŒjU«_ÚäîÔÛ‹ÅI$7íª®b WÕ<ºÝé%§9Ìb–ÐÃËC­;5¤Ÿ MCõ—õqlÖ³àùì
+(”8"y÷µzÝqÁ5^~²â‚‘a¾±,¶è¥˜IA^&yžüÀ=X2Iì¾èz±º´àœº\¥~<&c¾Ö|îïENtç-zglöÔž’ ´2(_ÍŸRÃhãZ-ôLYyŒU£Ma<Ûýé7íÄ%â§B½RvEG7:Ž‡Ù4y.ŒX<Ëæ ?ÄLÖ;G£˜æÈ_%#B½úï§2µ²(ñî[¼Ÿ˜@ˆÁ8Óž÷ƒ!æŽ.Ð"œ$Ë»x?JnoQ˜Î¼…^Ö|IV`¹A±]‘:^¾Óˆ+Âá‰ãÓ¶¼6
+‹íZ¿n‹±è>ˉ˜Ô©ÉyU#߈½’(7ÔxñÐÖlÊO¸‹yÓ‚-¿ƒ»•N,
+µ˜$BtÜu¥Õ ýàÄbÏ4{jh¬'&nè›èipÏ ŒõC^•á”ÃDv ôè4uš*âúÚßïâqš7Œ\âô„N   aH;}1¨Ý¦Å´Ê#e}ã7åä
+¾ï`
+3I '¤åy,“¿Þ ·.Ap›{P õðT5)V N«Së}-†úäL¼PM28‡2Ué[·Rx ’„ÒZ€Í²ª$©vâ!%8¼z°‰8¿×
+¨éjè¨ðô¬L¾ªåL7•3ë µ¨° Öýs'”Jb¦õ­f¨é~ë%³xW!ÃÀd·ÃþVØ·Ñô äÝÄÈê“DŒÁÑÛÃ)zv!Ð.—oØas~ò(Ž’‹:Lo?ËþpHùÒÉ‘F}¸ú«&PëÒÛÚ:x;﨡ú½7Íå~"8ãÎ4bŠ$öN¿¹t“Ñåéão~ ~šn”:5ø­ÑO>Q–"‰%§8@%%— ‘¡E½Zñdy×jÔ Š1ò@Zõ¤UÊã´± ¯¾9·„jT)Í d=%]ϪÖ
+uþνÉ5ɱÖg”ýùÞ'Z\UߊG?/"V:Ùè}ô£o<»Gš5è™°]l'ÑzÍÒÄâê
endstream
endobj
+262 0 obj
+<< /Type /Page /Contents 263 0 R /Resources 261 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 236 0 R /Annots 266 0 R >>
+endobj
266 0 obj
-<< /Type /Page /Contents 267 0 R /Resources 265 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 240 0 R /Annots 270 0 R >>
+[ 257 0 R 258 0 R 259 0 R 260 0 R ]
endobj
-270 0 obj
-[ 261 0 R 262 0 R ]
+257 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 459.435 492.059 466.409 504.015 ]/A << /S /GoTo /D (section.5) >> >>
endobj
-261 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 475.636 85.96 481.861 97.417 ]/A << /S /GoTo /D (section.7) >> >>
+258 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 482.13 492.059 489.104 504.015 ]/A << /S /GoTo /D (section.5) >> >>
endobj
-262 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 494.916 85.96 505.373 97.417 ]/A << /S /GoTo /D (section.7) >> >>
+259 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 475.636 84.676 481.861 96.133 ]/A << /S /GoTo /D (section.7) >> >>
endobj
-268 0 obj
-<< /D [ 266 0 R /XYZ 78.37 808.885 null ] >>
+260 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 494.916 84.676 505.373 96.133 ]/A << /S /GoTo /D (section.7) >> >>
+endobj
+264 0 obj
+<< /D [ 262 0 R /XYZ 78.37 808.885 null ] >>
endobj
33 0 obj
-<< /D [ 266 0 R /XYZ 79.37 684.154 null ] >>
+<< /D [ 262 0 R /XYZ 79.37 683.611 null ] >>
endobj
37 0 obj
-<< /D [ 266 0 R /XYZ 79.37 593.56 null ] >>
+<< /D [ 262 0 R /XYZ 79.37 592.475 null ] >>
endobj
-265 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 227 0 R /F62 230 0 R /F63 231 0 R /F65 232 0 R /F53 226 0 R /F54 228 0 R /F69 269 0 R /F55 229 0 R /F22 234 0 R /F68 259 0 R /F32 236 0 R /F61 239 0 R /F60 238 0 R >> /ProcSet [ /PDF /Text ] >>
+261 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 223 0 R /F62 226 0 R /F63 227 0 R /F65 228 0 R /F53 222 0 R /F54 224 0 R /F69 265 0 R /F55 225 0 R /F22 230 0 R /F68 255 0 R /F32 232 0 R /F61 235 0 R /F60 234 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-283 0 obj
-<< /Filter /FlateDecode /Length 4917 >>
-stream
-xÚÍɲ·í®¯˜C‚{ÕÔ«R{4®ò-‰n.Ÿ’Ø—ø_òû ›Ý3ó$%9<º›ÄFòòÛE^~ü°}ù𧻲—(¢g._~ý ðƒ¼¨‹RJ€Uï”N]¾ü~ùù*•ÚÞ>Z)¯R/¥úáí#x…O°á› å}{ûåËO¤ˆiü÷ÇŸ¿|øWk0úâ­>èËß~ÿßã`A§A…
-áòÇ?.¿~ø3~aX:Xbi­0à&,3&ðï&¥N¿²üßáŸALA—÷ß»ôë-å}z¶ªÀHí]Lm3UG¼ðå ¸×Ñ·=a@ïàFœ³ÿ®eÐ< LŸ ’‘ÑjL„e¤##r£V©_zºoåKúMdÞ‡Ö”p¬BØš½FáÂŽ.ìluE$Vn%ÎÖß¼qÎU$ÃC.Z¥…Ò{.Þr¯6ãà„ŠöâMJ:je·2&ŽñÑh51¯¾¹½¿v) ÖdÆçV²Í‡’ð×[—¦1±Ð'yÚ
-d}ïŒ.К4A•Â!R‹C¹k£X›×—º;¿N>âþ)”ß„µ©ݱO«2÷@xÞ¤·P)t7jão#þ„iÃÆ‘<væ“dü`+̦ïa=SÚ eÛ|êJc•ˆÚù<7eŒ¤Q´ lT3p­Íš’ªp±ôçó_Þ$. hEFé‰F#
-°­R¶so€™[f™iðð„úRì_‰ÇÒëX¶Î–Ï||j gS[üÝŠ>©Ì
-”Å(s0¿T¡Û¾¦ž ô•Ñ"ê0÷~m¾ÏçW:á¥Þáç¸/Þ=ø½¯~È©æñ»i1W-Ò^À9ž‰Ä6i†¦eªÿRz:{ðƳQrÉ0¯h²Nö@º5¬3C˜²í5‰4¸ÖýÅi+LlÕo‹t’ã.l~šÞÀ/Âù¾QªÊ3/¦`Ko§²9ÑÚ
-e#$p…üëû˜®ÒÍVëÇh…Ë7òr›G±Báló—,=`‚¶ËTZLñ¥”8Ÿc
-OÀLnõðÏK;ŒK{I§5hR»Äåý
-„W|RîŽWïr¢š(ïžYjÊÝ[Ý\»y#!“‘Û~jC6‚¼aùX%’Žžhù6:Z+héWÐ ¢®@ö(
-<D¯Ûª nX% ʬÔêÐÁ^:Áû¼¼}™rÚ`w<ÿvöÆ¢EsèˆN#LÉû h™+a˜Ö]¥¥ïÛœŽp÷· ¯]ﳤõmVÅŵê>ù˜‚’ãL·î>¸º¤),ðö ¿­ì>OZ˜\`场À^¿è[£ó‚æô§Ú½ê[œÂË, ”°HQ˜æò}ë>9¾ÞúVx1wçÎ
-FéÑÀ<âàûaŠ¼™ö^öJX6É\{Ö«­'Ö¦®Q¯§Ôç7Þ7Ê
-ÂŽ·ïÛ7RØñ­%è{PGµ\¨é—ÙCai3ÇÒ}¥~'¼ƒu)5ó@ß©Ú
-0zvRïȲ=w^°ŸE¦¼M"XþÇýÄò†²ÝŽu¡¬ªµÂ"ÍDœ[„YåS_ðQ ‚ÊŸ­ÒöY»ËÛ£<y÷ÊúûyØ[¥HGôHºqhž1O˜‘£áZ8=g§ÙŽ~³ÉÀ |†\µÓ¯í¡k
-ñ7^ãP¿**=²Ûú©s1p.&™ò×N_«§HšUùVÂß›¹gs´: çƒù?ÉÑ2}õ؇8(ïšß‰º¯”§]VCåk«‰FüƒX,
-í¥ØœnéÏéW‡þ®ýúçV±3<uÛʪâ œÒZ Ž3¬ïéc¨ˆîG<[m…¢J
-KýªÅÍžß“õ~Tã-ÆÊzÇé;§ñXTý¨eší–̉ádk²´w0o6s¾ö¹;ô<´¾°Ÿõ2:…ã¦(Ó¬ Ý̯mÛ4­ ’à1LìU6T09…̬.bÀâ1gÏd qAÇ, ¬ŒøT%¬`ƒÐäZÝ–:.‡ÙöϽ^ÞŠ*Zé›k@#—¤§gË4ô²ã²^’¦{¨íj¨¦Áˆ¨ô>TËɵ’
-5À¾Xlj-*)P¹P“ªMpÔ;B9T!©žd¤‚¹ïãNUfùwTÁ¨Š‚q36@ù8k–½‚!ódGÃ(zœ-'P¡ÎPJæþÚ·Xáv»–PhtC ÙæwÖJ÷& dAÒ!„.Ër°CƸãStWסHÇì¬@/ÌYkÒ”°á\0>¶x„ç%3A·ƒ©oôw®‡œâÔ;y‘eôˆQk¤kðô½oâô%c%Úª€â)ÚÀƒ ~ú;ò”·Õ ÚJ¹O¡X²“Ü·±dŸ®l`Q}‡Éu-Éco•9«‹†,QçŒ;‹ eηè)Jj­™/O˜T¯ÊÎÍ9SDÔ‚µçÆÌä:ìÆ}³*W~óÜûÞ½—¬HYö…ҲΑö5Ër³²òäQ•Ÿò¨{ÔŽ
-
-^óù¤TÁä申†!³ Oe6é ÑQVu]
-;×i¹ ÇÝÎúé]¨œ‚ža…‡Vó™Î÷ðöc†U‡£ +'Œ;É°š_Ê°:´\Áj¡b+2€ Ð¥zO†Õ#83aùrVÅá¢pn…eM •-óÞT…+tD®µ_g ©ÅÃl`š5åA™Aùò­tNí^Ï[eY0kG½´æF·¼MwUŠM öæû0$^•öÔ—;}þÆNžf"¹½†Fv˜ä´¨d“U¡¼›ú®.\ݨiDýø|àÊŒf×ó䊚|ÜöˆŽ:9¦ÜÆmÎeTâÁŽ]ó`# “ç×ñôöî¤Çs››c,ü|Añ¾.÷è8÷};Hžîm£n¢ÚQ®»SÇ8.œ;?.h…6z†¾;dZ̈í9²á8ébS/·98îKsiÐþ°•¸¬ªò/VU-æñ
-«°<ÀA_N+ŽŠÍB×”ší”efäp=Lªo,!kBCBfÃAbm.`{’‚¯¬µ0ãcçÙ3ÏŒÐÑý©÷‘„ í×]*ÓÁù^ùËÃŒ0¤!ØÓÚÆêà®üïL òZ¼¶øsß¼uÛ¯<»>Fó.' ÝC -“%oú™©á`A˜Ã£y©ðÂp.%¸õ Šãù+L?¶§6¶÷û˳W?,OçUéÕÛ^Ÿ;æÏÏøÚ%1¥¤`&ß<[c¥„žû¶xpëÞc«>Ù¢–PÙ`£ÌP“¥}M<;ÔÒLv­¼v¡T–dí¦)3e/ND²2¨ t†R/`t*U74©çù@¼€`f‰˜B7Ïžžqy_íËû"D&ˆçEzRÈ0#¿qR.÷iÁ˜®ÓÐ3Ô1ø Ë ÷”÷¸í¼sï5­ÎN9¿\,”jÆØ}(ÛŽ”ƒ¾Ži¤|pûÀ+Û``¼Th„á¯×€(ô°|¿ÀÈçZã×ãà`„‡0‘XŒPÍMùºûï ÏYße©þ!5“=Jå ½=ö¥>ÎÌ.3»ÙιW GX5¶Îqä~#¤Âþ^•í•õsVxÐý`Ž3ˆl_‹Ñ| ¾‚ Ñë‘J€áÚË>8Þ…L
-N¯¦’²UÚVÚL庴]Ùç”ýä·´2Ïì î6émŸzzÌÚò9Ã3}K©…X“Kõ×}jP8Ms*õT9Xò‚}³Øäµ›Bô0 {~çYCÔt˜ÁRÒ°`Cù{}‹|}çG%¾‚Sxsg:7Ö·óq¥8xÔ)ÊÎù€2ßG…ñÇWÜ°âx?‹ã¼Üv,åz =ÝL1žÀ¢@õlÅA”Ââ‚Qc
-94Qe†Ód½qÈr26nx
-°Ôœ!
-ò© Q^wZ¿äÊ9ù±-ª7‚z1
-ílÁºCÒ;ŠžBw:©P$¤š¡e—äpÂYÜʤ¤œµë“dw;sR!ÝIé
-g§«ä(ŒhdßiÈ÷¯‰”®f š%ÞÊh=¼’¸d `Ø‚ÉkgãWå1¬­áZÆš—Sûè,kßE?-ÝòÃM÷b¨®åªÃà…µ˜€üÍöZö§T{,÷îy”B1Hï ;ØYžžÝF+Ç7¦æ©D‡6ñqh³»Dk
-š)äyéÐ(WËÍAÕü™m¼þc ùöÛkn^º8lŽÏçj=ÅT2L}2ONÇJGñ5ÀÔïv:VJXÛTl5ô ‹e–ªÿÙµ”¤¥óúIJ&é]ºw,Ûý_]ƒ$ÚAíK’hÍtÔ˜Þ¬$ÑN’X¹'—zWG6t$“†¦k³RHÉ'Ch®O$´|T¡ÍíôJ*×jŒ&§®­oxª¹ÑªâLXa¤ŒÏ[ÓpG¥uk²R‚çã+æ†v;°Y¤ÊV£ô a*O<À‹,À«m¼xàYˆ MDÙ³8¹¶ÜM¬Ë.NÇTíµ`“~AïWhP,›ÎóÝå w¿ípOñƒ«ýÎtIYó^æªVåÛºÇ=[yQE«
+278 0 obj
+<< /Filter /FlateDecode /Length 4447 >>
+stream
+xÚÍ<ÉŽ,¹÷÷ù-KÔ
+¨ìêl çdøÝ Ÿ<Ós÷Ás™ß7µP¢–ˆ¬ÌW…ñ!++#IQÜòòßyùõÛõû·?Ý”½D8sùþû7…7äE]”R¬ºx§„têòýË__¤R×ן¬”/R/¥úùõ'ã
+%][k’Ùª2»u/:Æ„<Côlõu`p½ëe¹»>—áªú,0L#Í•Øä“\Ë}«˜¥'Cƒ“aÐ3…½to’õ#ÑÔÆ íaæDµ4—qË$VŸ(fÆà¾Õažµ¯8çC¢$Ë
+T]¡¸†U‹Ûd÷’«vÚês ™cX–nç’d£"iý¤£TŽ‡=§¤j¯<Ž8]~}P3ú’.íŽ=f_,Týåõ<{§¢Ø¢âŠApúÉŽeËU8÷ÁØB"JÍX<AÁØÂùRd.j$jÒ
+uÇ•îDfѪ›IW‹låÊJ!!6ÝfXò¤MšÔv5ýÌ\kꮨyxö˜ hæ¼ +àf”›É!âR@^V3°s|H k »¬?ÖÃK8yG[Œ¦ ‚ÕBúHŠ8"÷t|F;7!ùÜž¦÷$“Ô#%l‹¤N3·œ‡€¯ðàä5“Þ9ùŒbîk¯\G‚+Ÿ­ËÑxýlÞ#Ù
+ð@‰ ÷‰zBí33d.æFÔqjb(tT¶(>ÓÁkú6–×t‡@KÕžã.A…Ë»Ž| µYøÚü¿
+h$X
+ë¶Iÿ‘£ÑÏBÏ@jÖØl2ðnä¡´îôc=Z‡ǯÓzi×:Ô³ÓŒ4¹_”ë\{Çõ=MèxâßyOf½«ôÊ©o‹s‘Î}½ÄŠšUùZ‚ßw¶rÍ8ƒWh¨Ü¿IÆ™é«û>Ä©@y'ÐüNÔý <­©ÂPa]kÚ4%úb±(Ôúas®¥ÿNß:ôkíÛl£Õ‘=Tn­!L=‡ÂM°¾ÒÇP×ÁÎ3ží¶BQ %€¥O¢gq>Äp§øÚÒq–ÏÓÁ6³ò{-6ß+º‚Ó §oœÆcýÑOΖ‘iµ[2'†“N*Oì\ð,x¤tÈ‘çaPRÜ’» c"wpø’WÚÍ|8§UÄsµõÚIZ•M2±a1G<—jÿ cÏD 10p`Q•º£‘6°AhrVklÇÍ›R@4ËS×ÕzâSà¦b®-SpÐHQíüÇ•JÙ^.¢ƒã’.(¿>ªúpTT dèëhؼæñ~â1j "ø0c0"—ñn<N£’×<¸ä”nxtU›”‡*nHˆµAÑ||ÉÆöc•\}å¹æ8¹&}l~@ùõãê%ÇôÎV)ÉT$Ÿ5òÚu C‡.¥ÕoבÛ6r›Ã½g^¨£¦Ý®¼ ²œÎÜÍ¿ïe5÷Nù–ƒoÔÀ-9Âù4¡û>8jÍh3Wvˆ/Á;#g´}Æ$™µ+t·Š*˜a½vùúký1oô™/pï»lT=—RlØÒ‰·÷E£ŠtN/ŠŸ
+é¹Ûa„Szžqsº¥æÄ”×€]sb9K­v܇¡ìƒg­µ8«
+},êÕ@[§žÈ™¡¯f­š¨`y’Qqgãö…¾nj´3nÆhɬÙ>•$3OF#'ªM§pÌ ¥H_zÅ•ç­k×2·­¯cØïm}·ûìˤüàô@Ø¡4×ñ¡îà¦ÀÌšú½^qŠ•\÷2Ì-&ïÜYÀíãfú>ç>Œó¸q|8Ä2wVº|×ÎDÓý^(ï§V ŒÇ“v¶ëC”ONȬ@ŸsOÅ1½RVß:$©|Å•\‡óþKtHËI;¿·Hº©u€ŸMï£2_uqÍJfŒóÅeédÎië©äD­ix/ÏüUeâPÇfG‘Í9OÓi‹ ÖžG(È»뼯V•îmK/¶ e–ó)’\•}“4Û©q¤ìôÞù}ïà—ò"*µPA Â|Z$u½ú¹¬§a¨Á‡ªGôR‰#OyB>ør Ñªé5½¤ã€Sн¸[Å2¿Ð øø©Še-¶Æ@fg±Û»ãB|¨Š•ÊÔ¿e>Ð_M24Ðæ™*–G0fÂòá̵ÃMáÜ…U¦
+•-Ìa¿Š
endstream
endobj
-282 0 obj
-<< /Type /Page /Contents 283 0 R /Resources 281 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 240 0 R /Annots 286 0 R >>
+277 0 obj
+<< /Type /Page /Contents 278 0 R /Resources 276 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 236 0 R /Annots 281 0 R >>
endobj
-286 0 obj
-[ 263 0 R 264 0 R 271 0 R 272 0 R 273 0 R 274 0 R 275 0 R 276 0 R 277 0 R 278 0 R ]
+281 0 obj
+[ 267 0 R 268 0 R 269 0 R 270 0 R 271 0 R 272 0 R 273 0 R 274 0 R 275 0 R ]
endobj
-263 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 437.011 733.664 451.736 745.619 ]/A << /S /GoTo /D (subsection.6.2) >> >>
+267 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 437.011 696.081 451.736 708.036 ]/A << /S /GoTo /D (subsection.6.2) >> >>
endobj
-264 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 468.149 733.664 480.104 745.619 ]/A << /S /GoTo /D (subsection.6.2) >> >>
+268 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 468.149 696.081 480.104 708.036 ]/A << /S /GoTo /D (subsection.6.2) >> >>
+endobj
+269 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 262.513 320.003 277.238 330.882 ]/A << /S /GoTo /D (subsection.8.1) >> >>
+endobj
+270 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 290.19 320.003 302.145 330.882 ]/A << /S /GoTo /D (subsection.8.1) >> >>
endobj
271 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 262.513 427.854 277.238 438.734 ]/A << /S /GoTo /D (subsection.8.1) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 483.103 209.239 495.058 221.194 ]/A << /S /GoTo /D (subsubsection.6.1.1) >> >>
endobj
272 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 290.19 427.854 302.145 438.734 ]/A << /S /GoTo /D (subsection.8.1) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 474.51 146.028 489.234 157.983 ]/A << /S /GoTo /D (subsection.9.2) >> >>
endobj
273 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 474.51 297.516 489.234 309.471 ]/A << /S /GoTo /D (subsection.9.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 502.177 146.028 514.132 157.983 ]/A << /S /GoTo /D (subsection.9.2) >> >>
endobj
274 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 502.177 297.516 514.132 309.471 ]/A << /S /GoTo /D (subsection.9.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 401.781 106.727 424.257 118.682 ]/A << /S /GoTo /D (subsubsection.6.1.2) >> >>
endobj
275 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 401.781 259.072 424.257 271.027 ]/A << /S /GoTo /D (subsubsection.6.1.2) >> >>
-endobj
-276 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 439.978 259.072 451.933 271.027 ]/A << /S /GoTo /D (subsubsection.6.1.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 439.978 106.727 451.933 118.682 ]/A << /S /GoTo /D (subsubsection.6.1.2) >> >>
endobj
-277 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 362.08 209.23 376.805 220.069 ]/A << /S /GoTo /D (subsection.8.2) >> >>
-endobj
-278 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 466.03 209.23 477.985 220.069 ]/A << /S /GoTo /D (subsection.8.2) >> >>
-endobj
-284 0 obj
-<< /D [ 282 0 R /XYZ 78.37 808.885 null ] >>
+279 0 obj
+<< /D [ 277 0 R /XYZ 78.37 808.885 null ] >>
endobj
-281 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 227 0 R /F62 230 0 R /F68 259 0 R /F54 228 0 R /F70 285 0 R /F55 229 0 R /F32 236 0 R /F61 239 0 R /F60 238 0 R /F48 237 0 R >> /ProcSet [ /PDF /Text ] >>
+276 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 223 0 R /F62 226 0 R /F55 225 0 R /F16 247 0 R /F68 255 0 R /F54 224 0 R /F70 280 0 R /F32 232 0 R /F61 235 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-290 0 obj
-<< /Filter /FlateDecode /Length 3196 >>
-stream
-xڽɮä¶ñþ¾B?04Éâ
- ˜çvàœ2™›áSçø_òû).Å]ÝÒ{_K"kßH±†oÿÚøöååõÛËw¡7ϼ‘Fmß~{ø‚obsžÀf`܈íÛïÛ/¹¯Ÿ>hÎ?rŽ¿„øÃòOÒá_œK|­”Á;åpÈt'_Ó“ûë§_¿ýü™àÿ¿¼üôí忩Ж +6‹­ƒíï¿¿„Ú3-í&8$ån¿½ü_4<¹âAhÇ„±Ü ¥pç\ ¤+žžihNÔnŒŒÔîIH
-ÃŒw#ty#®O8Ì-Âj$“¡ç'én‰Ÿ ÉIÝ>I!‡7:@{Ms®;þ6È‹’éYÀ¤2ìø®ÀÓ:cðô$¸%Ü᯺…­þˆ“@eäˆw#îía†×R¾ r-ZâŠI‹ZRž nHŽZ}úP +"DbÁ艄€‚›ž„U@yï 4 "áa–Ê¢MìœVüéÉ#eܧԌ¤Ì\$Pà…1ªBÏÎTékœiÏøÁ¡yZ5ŠU©.Sg’•IAñk½æ-8ÝBGëcÎxôTɬ,ƯÃÌÏÝF¡oû‰,qU2 :ˆ4ÖªQ#ÑÚññ¹µM]È[-=Ú>'›¼gFÉÖNâˆ~ãYeÁuã½ÎÙ¬ÒÈú”žt~Ÿ<ôû2BÝèÎÞÚ»âqúäq‰æUìàËøTÆ“ŸG_Ϧx.Q$Î'º‘ël*j©p L*9ê":±¬T }ÍÆ+¦ù Å ØÎp'Kš ¯KðYæ㫬ŠÄ²‹4ò®wA4?ÚíbÜJ/éM«÷±…@VFÒ§ ‘­!NÏKŠ3tÔ´cìO˜ÆuÌÕÉŸî%ºœŸ­Žé9ˆðß[wûÔfh‡2àZ Y¬ìfêÇÔp£’Œ€d}J†Ñð9jQºª(³ìKá2Ïà~t]1œÝ²^_+~Ã)ø¶Q ãæ vøƇ‹<6Œ÷ä£!dBòä?‘ö{‚CÙ2ÌïQZÆD¢Ê¯<?À´žNÁpŽôY :VI‹’±wLnÆ&¹%[^Õ¼2Ì‘#ˆ¨Ì¼n§ÙÜÂ%#I)g¥·óøp§MÁmz–!„ÍÀÝ3ÊÚ1
-cQ‘÷}˜
-°ÞmóD¯¹µ˜BŠ5k}D2P°‚Äd ­PµÏ×®(Ó®v›‰Î&ÛŠvÍð.}K¨R0%ÎKA=•‚ZI¡üâ iUœ½”Ô)¡‡üàŠAaRj lËËhæº,ÂmÏ*?Ú·tʇTaÔÂâjÆ3Õg¢jô³$×4Î:$èÎ1 %þ>áP½…Ã=ÌÖ2¼ö1ïAœ©y£ÁW¸·xA¶ª•Õh­™Ñ%¼H»ô­³ÏÆ
-Ã1¬PFMFXbvèh—“öÊŒFFG¨’XÙk̅稒J0i`EU*fÒïØ3
-X˜K­Û÷5É¿vŒ<³×a²m¯3:'+îá=Ó¹DI-X°»±ýˆ„5Òȯ ë1&ú>Ÿñ0ùÝ"îáñ‚Šçõïq¦
-å/7VÙÜÕíJÜý䕸³tMv¹IÁ–;Ä$ú°Zù!°¨b¦ð\|¬¿Qœg† pÅ‘g=&g2EÿmãßHÍúÕ×Eöä¤vrMÎ#ETfÖfúÙb
-»EfškwxÇè­üŒ ®æ?ÔìrRÌNjáXHê¥>nÐ"…F}Oþ øéJ´T˜
-¥)³îI÷
-n(Å5Þš*-°ž˜¼í [&½º4À¡ YwµÝ©
-Ï÷_ɬÄå3´¼žûÖÏÿ®û„=ª3+L”“ÑzAkÙ!|W6ÌKà<èu)ž·Zž¸yìr¦î°Í'w‰±„©žôãQŠfÕµ®*’Թ김·»¦Äõ˜uöJæ$êÎßÅ¡S›ø€ÌÌÞqö̇Ź¦P´¹ÏCɦé&”/ªiOÈÌõ~˜{õ?œáZÙÒ<Hóá÷Ç P¸Âõ#:µ€”žø‰Aæã;wÓÄ&71²•Aêu¡§Ð4W¨2ŽŽÇâ¶Ù”hì7Ý9¥K¨B;‹"t:È;ŒòÓ°_šRìÇú6¼ø ŒíæW)—V+jå3Ì`%¸þR¼žw¦n tÀÿAkÖ^
-+Cj¦\èØ(\àÔí›×oÛ4ÉY)ħä]’ÇÐÕˆ¥´¶¹OŽòŒ…U£¦¨¶Ñ­fe/ªÄ O§@ˆÅêêIÔU‹I=a`Þ_„Y3‚ÿñ*î€1Q!VOíS¥6Ó4jP›Ýìa¤M̧ê›Ú¹j Ÿ²´ñËHêü… ›Ø±
-ÓÄI|kSwZJª2z’›+ܵÕ˜U=
-{íùIbŸƒáIÇ\]bߪ¥™Å{·ö«"n~¿/®Ϻ?u†¨šª„
-ùò¯ ìvÔ*Ú5_…®v/ÍÔ2v
-&ÏÃØi†FØÅÒ3œ6:.=ùŸÿ¯ŸÃF…wÛÿâÈß1yb`aÞ¶¿áJ4®>q¹X}ºÐ)´y;¤»=°dˆéÛˆá6›¦Žÿl¦µÖÈéM)ÂÓá}|Bë z—íf‹Vó'JÞn™„ C¡Ä•0EX›î÷<¹í5÷ô4‡™ÉÒ¢Œ÷¹“vðÛ±BkC¾µ¡ŸlRÞ¬¼Ž-ÍZæÖÂXe¾"ž’½v¢·ÇÂ:…ãhn8@ˆø'à7
+289 0 obj
+<< /Filter /FlateDecode /Length 4154 >>
+stream
+xڽˎ¹íî¯è°¢÷ 0ívØœ²ñ-ØS’ÝC²‡ì%¿Rõ*©ºj¦íé®’(¾I©Šä—ß.üòíÓõû§?Ý…¹¬´úòý×Onð‹¸®™tîâ¬`ÜŠË÷ß/{á\¾q®$ç6¤’¯Ÿ•qxçʹöœß¯xÅã_?Kü'ÜpB½¿xº£áŽ¼ÓoàŒ€»×ô©w5þŠ/iÁ*ø ¡Ö98.Bë×4¢ŸGx:°ÃZf²dKl„wÍëãr¯Dˆ2}t·¾ør‚Ù°ï~­hÔ)¯¿|ÿ ¤gåLz:8¦µ¥§3}˳ç²7B1¡ì8Ûø8k£!:0Á-×W!D¢²H_¢Rx“åºQ xg͘u£Q…“ͯ¬;דÞfNÆ«¼'¯u™õ!)/a„sß<G uë(÷²jo¥£bhbh]B͋¹vb&Œïy®l!ãx„ªoí]Óád‹5e}"P+y*Ç„<ã¬*°¨?å¢L S
+á¡o€¢¸ÛjH–"§±÷î×L9âT»2™8â£&#ƒdðÉ?h2J¦Æ¹äá iX£‹Ñ6,H#œnYAþÏf.ulÏRO w N¤ÙåÑþÕ+òn*SaÌŲà@W:·á<óMš3g‹Iœvé×Þ1é7Ü[©˜T,¨
+_%uBz¡ÞZÅ"ÿ¬dÃ?¨SU¸P¹¦eUÀ…ÒÞkˆáŒûy's ¸gE@ú°âÈ€ S#Tyk4¿0§¸²®äh⯙‹ªŒQ
+…w®­½ôÌ.v%3<ͯXâã lTø·ø}`pÿâx`º„æ³á—#‰H•M=úæLLŠ¢Ñ…RõÉ"ÀYÀŒþÿöéë÷Oÿ©
+és%Ëàûåï¿Š7„‹Op¦àÏÿ¼üúé/p§Éšæ*"¼fN†Ä„îI†Q_8ù«J&ñïéœѸè›ë1…‘û‰ƒ =b"o-Ê´¥~©l±*l½ûÛy=¤ÄþW‰iŒJã…qCˆ’ïP($§@]D/„©Ž´Ð¼p_Þ2É!ëü…ƒ›iÜ—ÙçæKÞª™Ü²› u›¹3 ³MÍ€(€£Ô0‘ä(‘3º_)yìí—®×fÔ!þä‘@Z‰÷`¬ É&U Û,P¿d¾8>õNàÖ­#…È£K.ðYGó•*&2&z_;•bRù \›½HÂMÖÝ‚É~Kª{“~„W¸soünÈWÕ"sÈØh„7Ì4a0ow’ÄǪ AuM¼¼r£F¶^^_kRÿòd‹¾ÚbÙœÔY«`y¿vyâÊêdàÌH4Ã> OìuW
+·œ„ÀPfbxæ¿ìjH@À›‹.Âr˜|Ýñª. …ÿ.ãß?~»¬nýü­r„+¦I#]É&(ŒÔÑž9±]0ñ°„„‘qmúÑ®Þ.h;Î7H¥
+‘âˆ4od¥9¾$Ÿ¯Gý´9’—Ä2kÀ×ó•<s|·é$¾/·†ZÛFÓÓ¯Ã!V„m43^S7”Ò½#‚Zì"NDðýlOXfƒ¡£KT£N–4X¶œ¡Ø™®ìÅê ©‰].û­Í;âS‚‡±DI‚c›ãŽ²ÎG.U~DIô·ê{óˆ{ûk»-wnk?« Mü˜ž8YÚÁãÄØt5'è™AuwÖ*¨¾5‰·Õcêl»Sy7™²çŃÍŒA¨œ‹Å«åÄÉv§¿Æ˜Vʯ ²ÎŒlE—A)XÄÎæ4Õ7Îó@zP½å×h›² oûé˜ ä²ZÄâ*äÉ–¡ˆ±ä‰=ȾùæÔBnjìV®9ØCÝ礓÷k×%òÊ¿5wÍ!€nrÓArY¯Ò•Îîã•]»/#RN†¿Ü­ýU,®@ßXw+ßÁ§þ©Œ';§\‡Ž²Š‰ó›,7«Šž
+ÜA~¨å( :!,ì­u€À·P|á€ëw£ R°jD™çªîÇ §[÷|0¥ç47“KsÆ%f¹c9jÚÍ4kNWqìöýT=}ûšrç6—,šès|¿áYø¯K÷óϸ¿€ô
+&fI¦É/ƒ‡ŒÑ8L΋Ïu¼º+y§H1Gb¬ ¤2ñ¦qtf—Ã'žÄû‚³ÒÝíø¸I±emÛ› žÀÈp1°çª¤ð(åH:o¬šÃ"µÞ#Sb‡TSt¬·€©-“âj èE7çÆèQ´.ÄU6#tÇ-T”-UËUܾÆÏ’—
+â®ñ•´mJ;§x‰ßªÔb»Ó\й g\(ßø„[uÍžKú—`ÿ`½¿4÷­¦(×Ò2ê9B—Cu[ÙC¥Ç„O¹‹B#ÀErÉ´m(ªZ¿åäÇ­ 3t«À¨ßCàja¾JÉõÊ+ˆ[l9ZÑBòéÔ{Œ +ÕLi4ì­(îEº©©hí˜5æÑ(…{D»V@ôû{îªQ¦Iâ¾pfZæ”[àcˆš9çCR(×\1/BÊÛgüëN›|™þ6úiÜÌÛ|døµ  ›Å²ÏoÂ`ÚëÃtØ@Óf·úv=&šæ¸¸;ìˆç-LÇO<‚©?þ¶ÜIHeÄz»³Ó Á äžjœÙžÁ(: ‚¯ÍI@2ßÌ=ÖçØXÉ<w™ŒÍk* Ï Ga4!aº2>™½Üða•h4<:‚•}7NžÄJjÁ¤U3¬R:“¾g'~D­›zª6;É,/.5ÁÖ£»}}&»ösFæ¤Å=¼G2—À© néÝpØ€[Ïu–3««ôßN±x˜üa÷ðŽ²x‚Åã ø»5
+§¸ÝOžq;3×F^—É·«ùc‹Ìù±šùA°Hb‹á9÷ª wi pé¤"BØÙê16?ã1H Ÿô"Ôä01bDY’Ž+Ó×v%<.²›¹nA»óínWRϦ?ÌF0‹ÈÂ!“4SyÜžñHJ÷Æ4?À] šª¶„ yÒ&°®¸û j( Å=Þ+# ØXÛ;6˜[àÏ '
+^†Ê×gŒæ”à‡É»‚o¤“–‰`ƵÎF:°V9Áãs‘ÎHðCn„ó(Ò‘BnWǃç(=)×À§…Ò{Ï‚ [ŒŽ(}Ð ‘qêJçs
+Õz7Toézð(çˆð€iÜ?Õ JLaDõ%_Ïo˜üQáý?ÜÏ€òòMÎä~&þp÷3¬ùÀýl0<á~Æ•öÝÏ0ú¤æB.#ä“ÜÖ×H
+÷à•™§äù¸qÀe÷Å›ð.Çënµí <‡ØXÜTúq/{FežkªÂÅ|°UßS:
+á%x®ò¢U*öý ¡lÒ<…ÞŠ>Pä.ðù=°y€/rÍ^Ü2<§GÛwà÷ë €à0.B/¯§òÒ\Ê4P½b¢.ù·ïc7 ¨¥Gºª^ÚV 4®m2Ö<(-Ú÷ö›"R,T!Fzi<C5¬ñ*žšamŠëúãz¥ÞU¯êúÛ–%µ©Ääu<á m^{îjI÷*´V•
+vmæLlÙãë—0Dø~˜pKEŒÅÒ<ØÞ…jï"ÆZ¦8ïq‹þÒÖ PóÑ5á]C>¶^JÕ}]t‚p¢ýHjÎÃ_VVB0í–7¾ÅÓÝR…IÈ&ƒf¯|°.ºQräJ%ú\êZ fa·6Ì®4‘e”VOñj©±Ù­&Ê·Râ}Ë‘A±%¾'¬6Vkõ)É´…D6Ñ𵉆â͛ө:N·]¾x­zj+ÛÒ¨RÖÐ_Ë' ¼ö¤ˆ§K+Ò+ŠŽ«Ø]¡ÆC'.Fh±ÂR`…¬¶ *ÕŽæŠÐðRÙB/ÑFgè V…—ôæu-ÿtoTáœcÔ­øöÌwZrSYtäÙÔ êk­ê
+”Ò,Ç–òš+­VSÉ™Æ Ú$7Úε¶Íé°6ºõ2FŸnX´í “¼/ÖÂKÝt´Þר„E×*Hv JO’u-ÂŒ&vµº»x4Ùv¤ªíeôKS•'s9pÉGÌÐ>®­éLû+:W-OˆZ·V [«\[hmºBÄe‘EÄkðI5Fo>¥Ý)5µK&øåd©Ø5ýóºâC©gå  x,ÄÕãë¾kǦ.°gE¾ì®g8X…”›™·Ýõ°rȽ™å'›=Ù5¼H Ntö6耣úfNÊ[kfBšN!Í)…4 š+3…4ƒBfò©VR³žJZÙˆ’˜Ô©b©«ßku´ðöA0€6¬6s/>07]‡Ü®„Óm¿;*¯ꎵŸ!”—[/Ï©6Ä÷z{ «ð…â4É?Ëjxm¿®YÜH3H•Ò¯¶ÃLh:Ì䱋3aÑaÆÄ;£;¢^aÈ>Œ¹\´/Á©˜Š­+,êB!:Ÿ†&6¤yä’Ú¦{éN›…'z5”;Ÿ&ƒ÷xÕ•8—éaËÖ*„ò^ÛRO”Œéï°@»Ó_i©Žç±ýÄ~åÚV1éFêײ‹ŽSzéêÔaoê‡~Ao­5FWç¨#Tt&u±K9AîfWœX×Xö~ï=»c,Z:üð&l8ÿ¿Sªi
endstream
endobj
-289 0 obj
-<< /Type /Page /Contents 290 0 R /Resources 288 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 240 0 R /Annots 293 0 R >>
+288 0 obj
+<< /Type /Page /Contents 289 0 R /Resources 287 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 236 0 R /Annots 292 0 R >>
endobj
-293 0 obj
-[ 287 0 R 279 0 R 280 0 R ]
+292 0 obj
+[ 282 0 R 283 0 R 286 0 R 284 0 R 285 0 R ]
endobj
-287 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 239.659 258.922 251.614 270.877 ]/A << /S /GoTo /D (subsection.6.1) >> >>
+282 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 362.08 721.007 376.805 731.846 ]/A << /S /GoTo /D (subsection.8.2) >> >>
endobj
-279 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 111.179 92.406 130.57 103.863 ]/A << /S /GoTo /D (subsubsection.6.1.2) >> >>
+283 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 466.03 721.007 477.985 731.846 ]/A << /S /GoTo /D (subsection.8.2) >> >>
endobj
-280 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 141.274 92.406 151.731 103.863 ]/A << /S /GoTo /D (subsubsection.6.1.2) >> >>
+286 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 239.659 166.657 251.614 178.612 ]/A << /S /GoTo /D (subsection.6.1) >> >>
endobj
-291 0 obj
-<< /D [ 289 0 R /XYZ 78.37 808.885 null ] >>
+284 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 111.179 67.03 130.57 78.488 ]/A << /S /GoTo /D (subsubsection.6.1.2) >> >>
endobj
-41 0 obj
-<< /D [ 289 0 R /XYZ 79.37 240.596 null ] >>
+285 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 141.274 67.03 151.731 78.488 ]/A << /S /GoTo /D (subsubsection.6.1.2) >> >>
endobj
-45 0 obj
-<< /D [ 289 0 R /XYZ 79.37 216.366 null ] >>
+290 0 obj
+<< /D [ 288 0 R /XYZ 78.37 808.885 null ] >>
endobj
-288 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 227 0 R /F62 230 0 R /F55 229 0 R /F54 228 0 R /F71 292 0 R /F61 239 0 R /F63 231 0 R /F53 226 0 R /F16 251 0 R /F69 269 0 R /F32 236 0 R >> /ProcSet [ /PDF /Text ] >>
+287 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 223 0 R /F62 226 0 R /F55 225 0 R /F70 280 0 R /F54 224 0 R /F71 291 0 R /F61 235 0 R /F63 227 0 R /F32 232 0 R /F60 234 0 R /F48 233 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-298 0 obj
-<< /Filter /FlateDecode /Length 3781 >>
-stream
-xÚÕ[K$· ¾ï¯è?°ŠÞRƒ¦·· 8''{ |JââKþ~¨)êUÝ3b£=V•DQI•¼üã"/?|º~ûô‡»r—C^{{ùöË'/äE]Â!L¸¯„ôêòí×Ë_^¤ÔoR-¥×¯ŸTðÄBËÞÒøð“ðƒ¶¾–vzïö¡QAJõžÄר_
-Í`Ò[™f¹×1é©|Õ¡ö°·W_ÝÚSÁ¿4«!êi|ãR˜ËB[&”>i¬½Vþò×\Çùý [Àm^A€Î¾~®Ë&ùùÛp^¯ŽÂª(¬=¦Ã°ð3…±´°¼dYS—_¨®Øz'œÖÕÛ9/A }˜/‰+/÷²1βխùpÊeü;ù¨âi¡¤ïväZ2¶ãÒiëcûépÊp#i'êp¤V¹*Œéèó\1=õðÔ¹2+Š^éKü\›Ø$1ãBZ{Vq+Ôô[îLˆêk’ßÒ-iHy“ Kªll»iݵèBf,V­ƒöýºa°K\Š‡”"D3nŠgÞ„ôWÁCÒæÕ%e@ž_„RzœÉy<’ı͂€[Z¨òÝÉ;ƒv!ñUæ„ÌÀLŽ3o2CYºh`ÑÅÂ<足܀䖽6ÉiF‹KúrKè©7qdã –eb2—iNõ%µÒ¦£³7|Gäw}O<l4Š¥_¥îþÝfó츌ôÂûi3“N•Ýñ·B‡íÞ©æЮî\‰3UüqŸ-
-9S’Ò+©Š‚kCqEÇÓ(Ü®„E;¡‡ë#Õ«JÆ)W–ÅuAG‚DÇß_£yiꫳ"g‡Y¹©-\ ® íÊ¥Í>U¾QÐ×êfïmŸÉ©ÇËH¡ªÙ$’ûÜ7«T•.e÷+Î×+Qê.‘t›( ÷ …
-í¦Ú"9h]ëÿ‡¾ Òqî½¼PÖ-·®tv¿¤ðGfØ…æ­iÏ98
-,æÒÆ. ÃBÛc`7¡…w„:ÛÀL–€¬'¾DŽ^¶b´ÔŒG‰ Ê;äc)9ŽýœºÂQÛ\ñRfP<oF‘ÕuìBòS’%’iÀà¦" _—9)ƒ;õGCq£8x4•vÞqçFûXÄôX’"Ö\éIì§Ü4ªÇGrÓH—E”ùMªã×ê7 ®zRq0žkÅ<$uSzSÆi¢¢â6W[J._Ž+­NnXU/ ['GR“Í+õÑÈK’=JÆ7š D}:ýaìlRRûw&UçžWôÒßVéJσf•¾{‚è¥ONBl“µß8À­û8rL
-W²éÝéPIInÒÀâxé=Ï91¹§LìC¨üÒŽh3ÎŽ³œïÅS‰å¬
-ïYÓôZf1g|â …ÊëiÍØG¡ã4kËvð"=^ mLÃÖÃÕÇ»’c+@ò<ÄÖ )ÏA}c¢šÀ¶/äFj« Fò“Å-Îúæ©»š¥+â‡ÖšngI|‹rT[ˆ¡ƒb:2(¶*áÜÖf2­f§LöšÞzœÉ9Ûàw$æÛA´YÈóH°-kqôÒ
-#Õ&Âs§äÛýí±g^ ãã:=¯’b ɳE–*ðÔÓÍõwÂB¤;E³èüÛ…&ªÊé}úñÝÎs[ÍN€K©qÓ”K4ÌD!s€¡!ÝdéFá|€Ïf¨’yŠO„ Â7ãÿk8£!hLÉ—ï?)‚Ë5›DþŸ—®ùG–ÐK70ý4o,tÝ[q=õZ_QH5g;sþ AÛn=ªÒª¾¦„}ñ…£2Gª¼¥Ÿwåg¿–
-ìc´Ù§icÁŒž ´ÜCT‚Ÿþ¸ÜòX]ç]ýƒß×'aΆÎ2¼Žy³'º³vylŽèÞ{iûRöŠ%lúëeîeu¡­÷…·-·~‰Ý¢Oʬ×Ï¿úª.‹à ïkôp¯ÀLß ¬µð2válüCüîªr»I} kðnJSܺ§×þ"ü
-=V«–ZYååÒ«9/Ç'ªŽ³±‚¸,×pü&Ð
-ÿÂ?äLq‘¥n)fRPiLýêÅwßÍ„˜²ô/Nn³l¿W(\ݺœ z{šTµÒ1+}g~èËÂ'hÙÛøÝ Ñm
-5Ÿ¨:´hÉ¥eìG‚£2l]O
-]â"Ø ¼l{pÌ´Èò†´:SëR¡²Y 2—¹×ib9L—˜ÃÓ–>ç×rkâ£pÿÖ»S¶ú³ ŸüsÓÒÚqv¢~
-4shéùÇ Õ±N)Z½Žo–®5«™É÷@òí¢7á•Õ½×ïûŸèfEÝÅ*¾‡1smÈ«»µ³›¨³®Û Ëj!tlšEcy÷DŒ¥¼ÑtåöÞkìÐ,Cz`B©ýѤ>ëúÁ6"¨c\÷„ì*Ķ<n£ÐÇ´u  , ËäRwö»bðÉç£Ýå¼z`:ˆ mºš÷—Ÿáùßà÷cºózÄËrÏ_!„ß«Ò¸]þüé§rE–axðœ­>:ò¤TJ)}„^ì‘+}ÉS¹£†¹%ë;‚ÇU&·+“\Ç&w‡¼^¦–Zv¢Ò8ê³ï¶ËVñ§ÝU]gŸ©'9ûÑzñÑö“‰eÞõ–¹ïÌ2õ}
+297 0 obj
+<< /Filter /FlateDecode /Length 3627 >>
+stream
+xÚÕ\K$· ¾Ï¯è?0ŠD½Æ
+ÓË/iêô뽪Âjye†Äh^»›fñUƒí­ðÔéûv&ùŒ|áM鹕(Í–×pïÛh€×y®wï? É°qŒÅÛÄPié>nØYHÞoÃ*³Údpª¥£$iÓ4å´"yL]^Ç]骩¤$L,4Ä…—l#³MÓôk›¹š‘b^ò³ù ²pöâDD³mÓ ­ˆ2 ÒJº+m:hñ„Ýu„—žÙÝl²´vßf²”Ñ»™ü°X€–Jk3Ï”L|·´oîÚ[½Ê»(ëþ½­ŽcigÌÏ·ªßiNqcÑ‹…Ÿvqi‹£~!Cf<4RóòÅÒJåb¦ŽäfŒÆÙÜB[Çm4sÿµŸ÷YbÓ:'ÅsRx MñÞºª¹vdC¦ÀÈÇc¶÷õ$ñ ¯«ûûòšç¡U…ë1EÀI6ß²PLòZZºò”¯Ú·6 wn:öMú«o|ä; ÙÖÖ´ÁaµaÚ!4h6zõ1”§˜€‹AÈÏ@Þ¸¬`t<Û¶¤‘Jª>«nÔGOæ²mG¾:µí¹ì$ò*yCüuËì¡Y5*câf3Ѐ.ŒuŒU3Fk[à,¢=ØP};æÅ+Q¯xqke^ª¢%Ë÷À–[¥…Òî|Tõ#B<Ms_¡o¸ßÔøcèœDi6ÔqK²×îÉò\!ýšl‹µ£(cÝé0²ª[¡7º²GJTo/Ìq¹“6 ¹;ßÏUŸ–‡lþpÕ‚Áº-a©ˆH|гèH=³Òßê|i“@¿X5›çêk½P
+晬£-ÉÎ(+‰T7·M÷ œ«¿ÂjT ¢VëÐ
+]§{¨B<
+ÀÝÈ(ÞÜæQ<¼)Æ’ŒÔÙD!Û 9â&
+«Üf5LŽ#œ¬sȇzíµ©V½NO⬩F€ÿÿéÀµá¶þÉ_¢¢:¡nTëÐRGà^ž-ØšøÏ
+T›ð²fæveXË“Úз‘ 9£LÝoƒÀ0SÚ\TRÄ+Ò§{±Q,FGÖ"Ìq"ÌD/´³mãyÖ‡ñGtB38g.å08‰Z¤tà<3‹™óHˆw+Ï­!««7J#“›Öj• ì4Ú -WÌK×'^ºŒ}ä¥+Å=X7Ä,¦Q]¦þ”?wra×L°Âtƒºk\q±¬ð”mtfõ­;-žÎï£ÈØ;â4ª;ÄGs£‡lÌëÙ«—ôçС–œ|iÙ8†Úaxæ&¹~Ÿc’­V™Û¯s87l6•ö¿T“!Õ
+ ²îÎÀNwŠL××Ój÷ÞqœŸª•ÂàÇ]þH¦”.þ’]–^:>i…u›eMp°[æP èò’ÐG*Γ
+ßBy»ÝŠzz*§B§ÿ.óßÄ÷Î-\E/>[4n#Z9pØF#’ÑýXŽŒ>ø³YR…5G'jqÆh<4nî ¬Ô]6vÎn÷Žâ¹6æAñ¼Ìà ;¨T8¡LÙ`*2­æVŒ»v3DɃ-ï­½“K«Ûm}gðŠ±³ck²¡È„ èx—8îëoi²<†gP»á¤±©æêÉåæñ¯KKzëX|µ ™{e ÆMÛPjàÑzÏËH/P«6Õ^w²AmfŽVâe2²Ê$ãªq# h2²6
+ >µ=)4™K#»S=¶LœùM`á{”Œ‘ªN¶l¤¾ÄNò’qˤ<,;ÉÏDɳpdì¶ù+zj7¡Öx)3¨U÷EÏ,³I„È_5ÜZdýr'åáÁlKÍ£®éh…7Žû·^z׬—e ;†sß4[j×OPa“^ŸÀ xí£—gѪ²µ¬.Ïmj•ÅÝ„mµ+¹†Ù \¹tàŠ¢êº0wr&µ1{¥Hx]r„ÉtšW|>#™*ˆ³dR‰îüI/ãMÕ®ô»Vî»'^ÆäÄnꢎ{
+8 ‡­Þ P´> U–iŒSi‡³EÒ”[ ßú†L…v¯3L­ããN•s§ÛÞ È`Ó °ë\eÀ€pÖTkfMµv ³·à—Ç„åI=•üõ@¯_µ6Cr™‹àç1Gí5eDoªµÙ»ge¹Oõè´Þq,ï¬ó«Ú|Û:ð†H×ZrXû(mÙ¨lüM…-Õ©¯ˆÕýU–ƒƒ¤K©òžO¬u–Òíž·×â1†k6³ö„¯Ò¯;àGx=µ@Þos3¾Ù¼$cŽúÌUŽ{Ì+SÕ„ïÀ\›©WC<’YtsÖ;§z6ËPBýjÓ¤%é.éQ½Ú914¡±U·!nл/á-foA˜Ozq¤çLÀïHÏ÷è³4õÁ¾¬ÅÖ)d€TOŸ6ßÞßÀ:<» e|\©çµR
+#Íôv›®ŠXGÚm¾a¡vvÊÉjûß;šZmö3ïvž»m‰?*5 ýGÀÌP¢ i¦o¶™à…EB
+ŸvÑo¶…Qˆr ”‰ÿ×pFÐ_Òþ†½I/[åÂM"ÿ¯Ëpùg–ÓK}˜n3o(tíkq=µ/‰¯£QH•g³åüAŽ¶·
endstream
endobj
-297 0 obj
-<< /Type /Page /Contents 298 0 R /Resources 296 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 240 0 R /Annots 301 0 R >>
+296 0 obj
+<< /Type /Page /Contents 297 0 R /Resources 295 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 236 0 R /Annots 300 0 R >>
endobj
-301 0 obj
-[ 294 0 R 295 0 R ]
+300 0 obj
+[ 293 0 R 294 0 R ]
+endobj
+293 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 493.753 440.518 505.708 451.586 ]/A << /S /GoTo /D (section.10) >> >>
endobj
294 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 493.753 564.737 505.708 575.806 ]/A << /S /GoTo /D (section.10) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 154.259 428.563 166.214 439.522 ]/A << /S /GoTo /D (section.10) >> >>
endobj
-295 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 154.259 552.782 166.214 563.741 ]/A << /S /GoTo /D (section.10) >> >>
+298 0 obj
+<< /D [ 296 0 R /XYZ 78.37 808.885 null ] >>
endobj
-299 0 obj
-<< /D [ 297 0 R /XYZ 78.37 808.885 null ] >>
+41 0 obj
+<< /D [ 296 0 R /XYZ 79.37 771.024 null ] >>
+endobj
+45 0 obj
+<< /D [ 296 0 R /XYZ 79.37 748.289 null ] >>
endobj
49 0 obj
-<< /D [ 297 0 R /XYZ 79.37 449.94 null ] >>
+<< /D [ 296 0 R /XYZ 79.37 325.721 null ] >>
endobj
-296 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 227 0 R /F62 230 0 R /F68 259 0 R /F54 228 0 R /F72 300 0 R /F63 231 0 R /F16 251 0 R /F55 229 0 R /F32 236 0 R /F48 237 0 R /F61 239 0 R >> /ProcSet [ /PDF /Text ] >>
+295 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 222 0 R /F16 247 0 R /F15 223 0 R /F54 224 0 R /F62 226 0 R /F55 225 0 R /F69 265 0 R /F68 255 0 R /F72 299 0 R /F63 227 0 R /F32 232 0 R /F48 233 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-305 0 obj
-<< /Filter /FlateDecode /Length 3986 >>
-stream
-xÚÅËr$·í®¯˜XšßU*Ui$k«œ“½¥|rb’=Ä—ü~ÀHÍîéÑjW5= ’
-„NP8\»§èÒ﯉¸¦Ñøß[•~{úõËO U{€ª–ø*ª& ¸b e%oÊŒ·ŠOŒmÝöTp?ã}}kÍÓ'HÓ¾] ²iZõB ¦Iõkù¼]+ V$
-]M ËMP$’ï"4 árÑ
-%›Á ÃfÃhÜ#©™Ž,DÕkå^ƒ·UÕµI4,‰‰þ¢d ·úĹ®ê™àÆ®ŒôeuKeuƒ²ºÓÊêÖÊZé¤9ÒÞ›k7~oãº×ñÐd˜¿%ZÚ:±›Ãv’3y y>0.h¡L?m“ÅOÚ{Ρz“djŸ²—Bé )<I #ã\ ¡ºyæAVòûæWdêë,š Ž÷|‹ò@´ð™Dý6Zôâ74RBQ£òt¤Fóž ¡ß÷ˆØÝÍ,c#Û¤öká­H~C‚ÏÞpø= *Ë[í•Ph«ÓIV'¥ÖœWùi¦…x\9täÙ)BÆyqH’«*±XM²VM¯êÁÁ¬Ì¡ƒ§­ÐøjZ euÁ
-«…±aóãhù (æÀì;é€,Ò$VÍ‘*‚ïû‰` Et„êë<+¶ÎrËkäš‘™ê¤»˪() ù=,au˜W);|ˆŸ¶Nà)0ü@çY-b´›}øÍíTÇFrˆç@ßÈ”§~Òì©žQ …$“¾«QšÉ²A&dV”·Ž¬òK—Ÿñl£Ù‘Þæ’›a®ã3Ž ö|›úöÈ·™Â :^‹ð¢ñ„…Î;C Ò?·áq;³aï„„(ŒïR)Ç ‰Ì§Uä=ÕÐ'˜ÉÀ¦ÑÙ„ƒáFö‚¬y
-d:¥›ç¹ãYŒ2“Îm¾Žn84Ÿ(2_Î)Ù (s<ïÍA2‘Æ$ ×|’ëÛƽ½Õ÷Ú‘'ê#;T÷[yaAó“*Éz’{kØ.Æ45W#Z!e¬0æNXHe1Rqñ,nį,EîøÔT ósݚ݌͆[›êÉ5vÉ!DÛEÇF¬ž§­‡¸6…vøÿÏ76ÑF)dPœQé¸ËG9”? P(ÑLS=¬Ÿ÷ýpu¾çBjš«PvëˆÂß|Ÿæ?Œ²R¢Ñú ؆¸»WËk¶þ$"’Õ†ŽHš»9w¡[Hº…„¹PM(Ô¹sÒÇÇòID§O#Ž¯á7„Ö rN(ÿ¿ØŸû܈yŽ·`T´ûX?²iÅ"Ü·yÌu©û=½O6Ÿ½Úзw‹ükU]oQsc¦ðŸ—áñ/ÝD£¢b˜H‡#È-E›<b¨õ4ùšÂû…fÈ<ݟت[ŽfÏu3¯µ6}dBÆI\,BJÕ¯¿tÞ 0hšÇFžF äÏëAˆõƒÎ íì<[r[|vÅjTŸþššìyYi€´Â‡.~üäôQ§Ó—ùo¦výŠS¯’<¼ŠÆ’:…'_Ð+ì|5™º•3iPƒV» ã?Š:pÂ3¯½GVÂy³Â´agö¨ JïnRg¾uãÚ·¨ÛbêÍ;sÒ•vtÑ¢³ß¦ºÓ$w©î4¶EMp¬ªÄ¾itUÕ]Õ4cö9~'!ÃÔ=¾9ÅHRÎ?r¯×+ƒ æAå`?öËIœîZM;¥yÇjÕ¬.WCÞU&›"(ý‘ ‹a£›§sÚt-+è›z3ï½µ$i¹´6}åëÑB˜†ú¸^'DrnŽÄ):£FǙǡÅî«utMø
-PÄ Ìª´¯ÌÚàÜvÏnŒv“Žk™ó6²)ÛÛïsn:ë¸y=½å²Üc÷X‘rŒëØxF I+¦±;ê£pnÃÀ¥uN†Ÿ›žæŽÿ¢–)D5RpŠ£M¡‡‘{JY5x€u'Z{Œí`’ZÊ%zÑWqJ]g›íPC¶ÇË¥îù¤ qƒ‰©£³:u “NöqtÂÙ_Kõ.ÔäѦÿ$cØ”Z5*ÍEÑš /oxŬ—A9®ÍÒ{Ž‹F aÆýdd´[,‰Jxµáç*áŸ)åõÏŒ½ÎJìïV ů<yËdÏÄK@[ÙÓéOÃzïOÞS+‘ ßzš]›È“ÛíiÓ|f6]O&.‹òa(ÊŸîŒÊ{E‹úöŽ¢Eï‰
-7{¢Â¦"c}í);ÏhŽ™¡.®ëX€Ÿ9G«¥]+*Õ†ž‚¥Þ)½°ÙÚ¡KiÌ`Y¨-$˜E1(s_{ê0É)¯§'i(ó o[1µ5ÏÈTR«Ao#…en²hÄ«œVî¬b=;;[AO"Ö‘¦ºDbÚ0qKüs¬-§ðÆb²°d6ÅITô…ž™"íí^lòˆ‡Új0“Fϳ´ð©Zý^X"*x1°P}¢Ú?I‘µ¼¬ÊtLÔ3{eß«\Œš×bóÓÜ”kQïÔ«L4;&¦Žy!˜­ ™«¾Ê ¤ìå9‡ùùáÇ/ÿî¶ãXçrp'âå·¯ù…2¸kÃÜ”}üó—ß~n>BnDöKñÐ2¹½039e+W9àäú‘©¹7›Ùêd;¢†1¶3v³í¸lŸõíHÇïë¿Ž»±Wý{ÛëRKݬÂNUàÞ$ cµd,+Œ}x:ïUFó<7¤£Bo†Ú[PÇÍíAùסÚÙ~Y·¯PwÖ‰ûÈã=àC³.ávóoyåM¨«F7šÕã[5_«¡y­"¥o\Sãºe6&ƒÒA\žnKM‚¤Îk¶úd^Iòžv+y­×$Ï턪(Ï^rR ûeÈÐÖ¡ÕžIÌoš¹mpG¢T¡Þ!JŒ…¯å”äiÝ5‡ÅÖ«(,p%?¡`ÝO¯UäÞ0úKÅkoÃœ_OPÐ)DìÑÎ`è×hÇÑc·©v9»ÊœÐ2n.‹ôK"©pv³ÅÃÛ¡÷Ð28óP>5n 7 ¼í¢›!è%GgÅë[¤éD,šš§½ëeÉçm—cqºxûµüœÄˆÔê0¼ðr‹Û9oô€ʨy¶Üt]\HÍ€w¹2/³‰cr„ *;ûÃpICXÃ0Mr[ˆ'®dHØiæ:ã³ëÛ—x8h²TÏ¡= }¯ýçá.ÀVsÁ¢«†8wÛè†Fç°ÛèLmWž9”y´ÃæÊ›È=o>6õÎÆìa)œ칶ä)HÝ Ë…–-ì¤â¸AÅ[Xù>…"¢¨¹¹\cŠhÑ©·ØRƒæÒ:žÌÉ¢(y¼ÅºÓÊvh«¶þû›‰”Ów
-aKûN+5QØý%ëoú3$Î\ò¦cö0…†éÝpÀtžzèë’÷CûÍq§­‹†Î‹ñ¼Be
-ËPÀQ†
-€AN_M—-£(‚:qå¶@í]¹-oé|ç7Â(Úu;½‡eä™[5#&í®fYyÇ£2Ù›•ßÍçH)ØÔ:5ñ˜|Žå…âc¿Ã(ƇyFžÓ+¡ŠZz§wªúý§t_y)tÐ+—~´ÌríXŽ¾¥UÃðÁŽ!Z
-ÜŽÙ½J“uÉ9½¸1ÏY<, ;&ÊúyONÜ61Þˆ¨6Í2=\_¨û#‡E«ñ0‡,¶J 6›¶ºÏ§
-L>`äå_—¿>ü\J|.èÃ{™RatïÑ» QøhÇ´sñòmN[Y·ÖÖ³Yßø«\”×
-èt=µþ:)o-ø…~*‚Ÿ1Ü‹èÖDBju1ó$Ÿ1M²ü—T¬™ûE¬9S+Pï)„5<:7YζT]bã3Ï6ØYò{ÒCf½·Ã¥PkX¯ÿ÷X¦ø¾JOêkScÀ¥çì¿Ô`Üp“Ø9–.ÎôÎ¥3¸®ËyÆù¹3i§ˆ‡U-…Ç‚ð å £ª¨õ<¨‘8t)42{OQ/};ÇöÂ2›V(YÆS|Ž<¤¶J«¼9·ðrãu’¾ŽÝœS¯tUŸ§`v°4ãê_¡—Ex*²SæUz}GI6M{r¬5·HxÇ5Jÿ>MêJ—¹ÃœŠoš,÷î}ä\
+304 0 obj
+<< /Filter /FlateDecode /Length 3962 >>
+stream
+xڽɎc·ñ>_¡šKq ôY8§8s |Jb’K~?ÜŠ,nORO;äi½Ç¥öEñËo~ùúéøö釛Ðϼ‘.ß~ý$ ~뙲kãF\¾ý~ùë çà8W’s#_?+åⓃs-Ÿ†ïœsyä‘·ƒŽ”7ÎÅ—ðæÚÍŸW O@æÕâªñï8Gu«™°§~ ol|â_òø´ÏÁõU¦‘¾BP`M0Ãëçô:/G`UÚtÒ—ŽKGä4à}A¶¢Æ\ Ñ/€¨†’äâf
+ÂW÷ä î?ñïGÚÉ%+äÒVÔmÃç—o? Ï7•Á¼ïZ`?òß=»ô’­ºR ¿Ùk\!äny‡Ìª8
+ó'®+yÐù` ¾îÕÉ‚U8WëÊð2é’iU­
+Y{ÐtALUéŽýº“5:f&Õ…µ¤QWº?"Þ³,¡…LîÆ*‰¤Îd”ªƒdÁ`e™ÐUƒß\\MøÅü†ÜÄßdÁ¯ãnob)Ž±óÊ:d®¢”ºvO&¸ýn™òê!µÂ‘›ÓFrÒ´¦µÃFiN€¾‚—¦&2M‡)Ú­ˆ*<3\!Qå[3,¨ÓÀÍK“Kà–è1"™Ç I3ÔMëœ
+ôÚUèßzJ°¿ÚÁ‰¾¦Á´ƒ ÅíXðÙxÍŒ—Õß]ѳ6CBÍ®¢»¦oKß‚ªÕìdX°˜–×j–š½ìmïéÅöˆ uûýøÝ`¼ªê¼ª*^õÀRxÆ›|ƒ¼Þ¨3¯?Ü´¾æ­ršF¡
+{Ô¢×µ]Zjï¨Ñ¸‡íRä}|€Èn™iÝ*ºµS:íØ¢ö¡Ü{
+A!ù‚ÕZ0§k™õ™ìpÄi\(tÙ ³§qs ¹¤‰x´š}B‘ßÇïÄÊœxJ3^ ;-kgZMåä½å)H
+ Ð ´wxÀB
+mYó(lH¯$EæÜk
+É S¿¾« jæ'j5hèQojSR´-8Úç­Æe‹çLÇÔ.üÿë=&—ç<PBEw—\¹Ì?Õ 1•8È©¦ŸÓh¼#MYï-£×ʘÝsQá™ÍóãšÒvÆÆëÔä
+¸yVóœ¹@žG$n¹p€ÄµkpçÈjÔ­c¹<#šŽËÚ‘8ñc}þD¤ã§"G÷°¢…A`™wÿ=GŒL:çA¯iÏѾ§ÓŠF·êûbæ²×ó±Þg¼¯üëÝB-ÊkuÐ]ŸPüç¥ûú§ ³"‚·pG,HE]Ý«°ºW_ãø¼ÜtÕ§ç‹[…ë<ÄRÜ­m­Íš‘~S&3—E€ÊŸ?7â4˜ôršëi)
+Ê`y‚ Э9%ƒ¨I7ªÂ^…aFmíîÇh§Œ­jÜ ·qÕöÎÐþ1^Ϩ@q3î§ÖÂ#Œ $·çÐ}T¨ý>Ú?¢…¨Ãܺǣ~3NyÜRŠ8þøǤhñ¹(nÂ?ù!ŠÜ—#Qµ*õ0w§šE‡Ñæé4³ÎPÓTkgSß*mnª¹Ü1W6§.Á ‡åK´Q'ü ”Ùçå™;1z˜a¶G>†s¥
+45’äƮ몵:nvÑôè«ëV­xš+mâÎMç§ B"âFØLo¶§^¤¹aÕUå>aªÆ>È©µ½6-þºfÍ\…%²þâŒF¹…ìÉ 4ekãIr¨(Õ­UÌxZ§®ß¦>2˜˜À/Ï×]w¾þp“S¹;(oŸ8híMîn{“›úüKkJ”ÂVˆ“¤6dýYúH9Ü-VÛêù¹w¢[‡ìl½¥æ±’KM 6x8¸s¼%¾ÓA…!¯3·}çÞž7Wz|n=‚ym4iHªT n”"Ý7NI§ k@O=¿þeÉgæ¾_¤ízÑÄÒ[.Ý1c°ÿ E®˜›Y±k–]k+„„ŒƒÙv
+[”[²Õׇýv –ÊØ5+i%'‰"§¹é5Œ;ë®9ZÛ?ÞLľ
+=@û^32+ëåŒû¦!1lá’¶wÃÇq$úf*yƒ—=­^Cð(
+[P%òµ6•œ´h?¬_8RÏêÉ
+c¯°pzo½£»L4®1Ý›6bET%EºéÜ“õ»n=¬¹§œbRŒü#ÉÀš•ô5¥žR1c©)Ìø;BíŠ,C–3×zarÄMeHógH†1¨¬în‰e¢?SJ¥Ã­¨$\H6!ÜæÖ¤Ži‹‡q‘S«ßÉ¿[È£ÞS¨p•Ù
+G4Õ±w~L…ÝuµkXþ¨½z¿6¡^å‰p©å
endstream
endobj
-304 0 obj
-<< /Type /Page /Contents 305 0 R /Resources 303 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 240 0 R /Annots 309 0 R >>
+303 0 obj
+<< /Type /Page /Contents 304 0 R /Resources 302 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 236 0 R /Annots 308 0 R >>
endobj
-309 0 obj
-[ 302 0 R ]
+308 0 obj
+[ 301 0 R ]
endobj
-302 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 141.139 417.517 190.205 431.465 ]/A << /S /GoTo /D (piton:transpose) >> >>
+301 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 141.139 300.097 190.205 314.044 ]/A << /S /GoTo /D (piton:transpose) >> >>
endobj
-306 0 obj
-<< /D [ 304 0 R /XYZ 78.37 808.885 null ] >>
+305 0 obj
+<< /D [ 303 0 R /XYZ 78.37 808.885 null ] >>
endobj
53 0 obj
-<< /D [ 304 0 R /XYZ 79.37 771.024 null ] >>
+<< /D [ 303 0 R /XYZ 79.37 651.117 null ] >>
endobj
-307 0 obj
-<< /D [ 304 0 R /XYZ 100.292 517.741 null ] >>
+306 0 obj
+<< /D [ 303 0 R /XYZ 100.292 400.321 null ] >>
endobj
-308 0 obj
-<< /D [ 304 0 R /XYZ 100.292 457.965 null ] >>
+307 0 obj
+<< /D [ 303 0 R /XYZ 100.292 340.545 null ] >>
endobj
57 0 obj
-<< /D [ 304 0 R /XYZ 79.37 298.517 null ] >>
+<< /D [ 303 0 R /XYZ 79.37 181.973 null ] >>
endobj
-303 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F16 251 0 R /F15 227 0 R /F62 230 0 R /F63 231 0 R /F54 228 0 R /F70 285 0 R /F49 224 0 R /F51 225 0 R /F71 292 0 R /F33 235 0 R /F53 226 0 R /F55 229 0 R /F32 236 0 R /F48 237 0 R /F61 239 0 R >> /ProcSet [ /PDF /Text ] >>
+302 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 223 0 R /F55 225 0 R /F54 224 0 R /F16 247 0 R /F62 226 0 R /F63 227 0 R /F70 280 0 R /F49 220 0 R /F51 221 0 R /F71 291 0 R /F33 231 0 R /F53 222 0 R /F32 232 0 R /F61 235 0 R /F48 233 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-312 0 obj
-<< /Filter /FlateDecode /Length 3183 >>
-stream
-xڽˎ·ñ¾_Ñ?°Y|‹E<ø$C· ‡@ˆ V;‡ü~Š"‹lvÏHVlc4ÓÕd±^¬¹RØíó&ñߟ.žÞÜlQDÎl>=©MâÿjóQh¿y§„tjûðeûË‹”`¤4o¥Ô ¥ÇÕøŒß.âo…¿¯ø®~{YßÉþÎ\ÊÜô;ÍWpxWžõ­_Þƒýë‡?7ºBA#y&
-%]#Ìâ@—ô¥,žUäp©ÈCùN„¥ñé·7uÁõbÚ eÕ¼q·oZD&5 ÞÜ”=Ñ€Ô| µÕåU)õ’Äû
-ᥗ×g­õKY^=%â2×q¼ 4¢°PÞ,v­c.ãX3 GÆJ‹àÝLü¹º+Ƶ0ÀZáUÜa¼'O{2¯Ï]—­^Ý.ELŽ±ÛEo‹n„·¸Gb^ýŸÛðøÓ=ã‚Úñ-sd•wd!ÙN–pQiÛ·Šß¿>[°ÕÔÛÂ\úÜÒj¶˜ uMŠë
-ˆ°9ë…1‘ðÚkÿÀc2ì,¾kùDWÖŸö´7‰Ówõͮ¶š,-É«¨…Ó°¦ØXa¢!ŠiV’hV»äkä (Ó÷Jž$®µ°:r­ÎÛÿž6ëv÷aBmήìã—§_7öã–Ç"y:»ýwË`ÉžÞüûó§?}üzåíóXn_©¶/åÑj×fû¥>;”uaS"JkƒP1â
-ÚúŽŸYt%‰¨¾Dc(!
-¹-O“Ÿ¬E ó“aU—ëÞñ“˜
-IeßwðÏ)ÐGËÌ×WZ¦÷"b;aAZ2'©Mµˆ°´å„ qOÛkí ÜMµÐ
-ŽãÑE—¼yäêšÏq‚kXâ@óݵ× ªã³xº‚«X÷²ßÆS"m÷›n•nò–̾kM&}ûšz²ò–_–ysój ([§Ã¾8‡¨rô]SÎrkI‰e-HRG{ºR„GõBù@ÝŒ2—ÞþÎ R¾çjQH×ÉnÕ›2*®Î »P—¬_A£«iX¶sOT3Üux ÷Pa—^Uì`õ
-\ò×·;F¤xà“ ”ôÂ)ƒžwIþ-gcLXœm9:4€ë¨ZÚòYõ±¿O8øowëJ`æÀ%°ÊÌISpe½Ëy3³vn~"Ôé÷V³ÓÇ;†½^Elú™ŽZ€"’ê
-ÛeË Ïµwmè™Ìª©Òôõ›¼Æµ8ÂÍÕø{RP)ôÙïÛ¹€ÒíU~ô3µ©Øàzt[¡¾ƒžñs•rU’„¾3¬éÚ ¸ÖÈg.£·:|¸’šÞ‡‘sªF s'£¹þŽ›'”k‰Õj6ÇLN–àz2X[õ4—6¨'Î7 F©rä¡sÜà~ÉaÔÂ`ÆÊ
-­ùç`ßAXø2™N² ¯xèš k.™¶hw$i¸ò9^L¥Þk¿Þñ-‹eÕÕ çy1É.˜Ë
-;ŸJ·ÀÁƒ/Ïöˆ€´ÛözºˆOW‡ýï^äÝr‘šz('…‘ý*«¯ú¸“n Aörìþˆ,*øŠ›ïéþ…Uz.ýÆ>}Ö¬–š=åéNãG™åÚyù˜lb±<Q<fƒw®·k4ó¼h=ö÷|@W¿ÝWö÷"Ê?ì°@bý‚*àêäý…Ôë BîS]·ïêèO‹{"ó"T}ØEõÑNv×בÒ{+,kn È^²ÊnY¬0Ù+`õaû_jÔ”—¬ŒõÕò§$*ëÜËCH”A Uóßÿ„v)9ÀÕ5ÄÝêWâ€7
-„7¬ó/3ïݪ .k±Þƒ ¨7ån,%ZÔÖSÞ‚úV“!ܦO<xz5læƒóÜi™Ùá6B„£ÛÆ’{a&é.Їsºs)† šmù Ñ¡u€A©µ=ÿ“¥e¾Ÿ7ÏÚû–îÀÁ R>/âj›k=Ìí…}£€§¾5aÍ×ßh3-η!Z¡Œß Øý…Ì;ºªú? +¦
+311 0 obj
+<< /Filter /FlateDecode /Length 3539 >>
+stream
+xÚÅÙŽ·ñ}¿¢`iÞ°XD£Ñ°ŸäèÍðC D)ˆÿ~ªHYdszFÖÊ1<Úi6º/ÖÈí—MnoNï¾»(·%‘¼öv{ÿñAÁ ¹©-$a¼ҫíýçí§')õ+©.^J£¥ôøIÏ&)xãìó£ŽøEÁð>¾ŸÊw³úùç÷ßÃqήŽS6
+åÔ| ³¸ª»œë.k U0¨å.5ªÂAµg>¢OõØSù¨×e†¾äY¯W è(… zGADèu¡`€33‚ð®þ ²¾“ýBkñ;Pÿˆ&:¡âŽ±!÷ª22•OA[ßF»®W¯i¾ô„ã°BIE f'¡²I(é "dBð™·™1 žl=͘§.K}¤šŸnÂÜf•uU€u!1Ûý©Æ «ÕŒÁÌTý¦À¢ë®#Ó^ŽÁÎ ”°`pU4·y‘ˆÁ°ÄAÙ´§aq Ôsx\ežvÂÁִΦe‚JT-L[9U5ŽåYŸi0O‡'$CÙ#¿=Ñ[˜Ÿm%b¨ÊBÔLÜTÙWLC]™gžËØÛ¹'‡.`#$EóÛÉçnƶPa³gHz:ô &ž;î4·œ|(^Æši¬}±¨$öK?I‡CžY¥… qޱؽ3ªPÁU凊˜ì{9•U¬>ÝTe„K©aÇw4β³jAÈ#»ÐœÍA&¡ ðèc&4üÚ˜ß`^8»ßíu^.=5üûö*<•¨R oí·q3·D°¾—åo~®cÇêlœ›½ò ÀE0q½“4ìU()kìrl¦|ˆB&Ó¾D Æ›§n.Ê“×]ݯl*4ó‰eÖ™¯ùF@ë ŒK3ô_a
+9Üö…—î ýDâá
+|ÀMêR|„å´ñßi*¬úçöðq{xWé—VôSª
+lš ÇÞ¬lsM“÷–stÉk¯
+¯‰Y£Í´÷Ú1Ý%s6 ŒX@Û™Áÿ¶ùoæçú—KDлýµ\Ë¡×`Gý<»Bœۤo œïº5x¬æà±Ûƒw[ýÿßÛ0³8ÉGæ%³’;°EV 4Û`V‚C²š`3í‚Ì`+àc)q_¬5Nñ²Óû@ÚP±5Ëí9£_×Q?ÎU²Í‰®¦hd¥yÜKñ žíAg³{ˆ¼fwáäÞXqcøD^“hçÈ2‡>íûÈÂ_'z´™ö8ŒOÈ‚ õöÛ?¶ïšœ”«;¿ä¨sÉ%\hɦ“œ´z - s æÞ ÀŒtÇ]€{
+<(Jà¼ûmR_½ô6Ëé´ãp‹iv¨–ç]J ,7†<³»-e‰¡R;>ǶÒì2©~ƒÚŽ=Ç¥»-:ŽÕW.LúÍ•úÝ(xeûñb¬J㢪e ÆL]kZNyŠÕþžKX›«©œeá×\ÂJ0{O
+gò)8¶K¦4*N+-»Ç%KZêÝ7/D2xw4±Ñs
+Ñ~¡o‰"–ò«mÙ”cä•ß!äɧül!|:Šh+ÑêöšÝ´ËÁ{کѪ6[Ç<6÷%WË:Â,ÍÕVßäïiõM~Ñð¥Sà£yN8—¡P{„l§ÚqbBß ZîÍfõwº9é}ðÇv×á“ŸOèØqÙéT¡BGÁµµ7z‰º…=ŸE7îrTXWÌŽDúrº"À
+‚ Õ»&X½…s9?¬”¸ÐÞQŸQÖå˜~:íkjÁæ;”iÇk½/Ô¾ïü¹äÞßÍÎWÍíþJG»Zw]–‹“±d`ö•kRüjøÉRܱÍ-¨-m=öÅÍ º
+Qxç^6ì¬-æ†Å²&%XÕžºÌ¢È^²>³f){ê%ð| Å|¾&†Ôav©6Ø–u”ýpvæ±UÊzWu«Í"žóx¿šÇ}o_×±SÏ,vcµ+­ó^K}^ÿþÇ'B) RvSØ8a®UŸ 0íÚÆ™ÊÑÅ>¬%•Ï¬Oý}þÍ ûîÏcn©™8p
+¬¢sâ”>³ú弎‰Y»E? œZ4´ZŸàÙîµ;±ñgºnÑä‘TÏtUtœ§YÜÃ=ëÜßI˜ò¹ü7íã\“ÁºÎÎ<÷µ×(b¬ˆª_1òß8QÇ_èAto%aÓùIã­»õTÇv3ÛçÌ~suî2GœÈÛ~¾õ“Ù8wG{ó»5þž8T²}öýrL!mDB9.Ô¶n¦Ï×:ê;݃~ÎRÎJ"PÛ¯ú g;3h<hVÌg&£—úøÐ¥Šïãˆ8%$–™£µá†™Á+n©x§ö¼šïLF–'áfXî[Í´–4ÈÞ¦NØ´±8R•›  ;Æm< ²&Äù’?&H’sŸÆO?Ãðßáóý–{·ßóÄÏ9ÁŸaÞ_Þ•Â&„¸þ ãü®ß ðhÛM¦ßò•»=W.^—x‹¨F„œyÏÂòò”Ól»Oc&L¾§ç%¸4 ¿ èÝþãï!ŸsâÔsCµÂ1×&5ýVqM Ž+3/j(Ù^C³A‰0À_U”÷„©³ãÝûL²Àü¤§_9µSZÂH«†_ª¥û›Ãk‡
+‡ŽWTûjÞQ ;àí¸øÁžÆ»<ZCj] 5Jv–¤†þŠü¦EöšFzôÏzØM¯;NôurBYìDèW´o¨IêicÊ|
endstream
endobj
-311 0 obj
-<< /Type /Page /Contents 312 0 R /Resources 310 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 240 0 R >>
+310 0 obj
+<< /Type /Page /Contents 311 0 R /Resources 309 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 236 0 R >>
endobj
-313 0 obj
-<< /D [ 311 0 R /XYZ 78.37 808.885 null ] >>
+312 0 obj
+<< /D [ 310 0 R /XYZ 78.37 808.885 null ] >>
endobj
61 0 obj
-<< /D [ 311 0 R /XYZ 79.37 535.196 null ] >>
+<< /D [ 310 0 R /XYZ 79.37 420.588 null ] >>
endobj
-310 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F62 230 0 R /F15 227 0 R /F63 231 0 R /F65 232 0 R /F53 226 0 R /F16 251 0 R /F54 228 0 R /F68 259 0 R /F67 250 0 R /F71 292 0 R >> /ProcSet [ /PDF /Text ] >>
+309 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 223 0 R /F54 224 0 R /F62 226 0 R /F55 225 0 R /F63 227 0 R /F65 228 0 R /F53 222 0 R /F16 247 0 R /F68 255 0 R /F67 246 0 R /F71 291 0 R /F32 232 0 R /F61 235 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-316 0 obj
-<< /Filter /FlateDecode /Length 3727 >>
-stream
-xÚÝËŽä¸í>_Q?°Z‰zÆ]]6§læ¶ØS‚äì!¹ä÷CÉ¢$K²\®ªÝ ‚AMÛ²ER$ŇL‰3«/œù ÇÿÀ«êö_–o_¾¿YqqÌ#ÝåÛß¾ˆøH\¬gÒ^¬ŒqùöËå§7ÎAq®>8—À¹ÅŸ–xÇk×WüYÎÅÇz-|v]ïõ„÷Ÿ¿ýð…3}ùû%üÿ‡ŒOhDèu‡Ñ $¹B@Àñ/à…¶õvŽY‡5g‚æ󲒆—‘leù& !=ƒþÅ{©Ö~‘\ÛÂð !_Ö{¸®ÏCÿ8t·Â¥¡ÓsÂÛMiøœð,¶-ë;‘†¶Í¯×òVÚÃu|ÆK[ `˜£a”à–¡.Vz&”ÌœZŠ
-'ÔRFõúw áÍRI’Ë:˜`…÷78¯¥ïG„e
-£VÛ2#ˆï¤A¶$Oj'=
-\‰m×½
-εº'½Ê²T¿2µ‘)Ï›pµÏIB±}©®osqÃÀâP„ViµJвQžéžlDÔÚ[/ÓZ–Ä¡ V8'IƒÚÇÈ$×6Ã$›§*ûA£WI/¬ÛŽ<râ–àÁ¶úÚ¹1^3É-qiÔ»†LV–´YÁv6ÔïÕ6ˆÚh†ZY5šÜæ¶\­m…2âÜn‡#ô’)ã“ÊçÖW¢h|˜•èó¤k\W6ÆKo&¢Û¢É˜aÖß—¦¤xY”œ_ýeDÆ·Òul›sO ¦,ìQ;_2AqŠ'Âd èë‰ÂPCȧ‘|‘¤ÐÀgZgëK<Ä9å|úâ1Ê£ú(ËpÍœÌ}u4ïßI)£ayÿÜ[¢5J€‘oʶ艹nõ›fðj-è­UÃë»IàFoÅ`ì=Rdù»6‘zÚkMîwåâfj?–†U¾òº^ÊW®°©¦û>ñ=ádîoËjÂ_{%ã—pËQê÷7ç@fÊ8†JÑIMµ±p‚2–¼ržë¡¸r­ú¡Q‘-6æöîä[eà–u…Ýä•î(€’]¨Ao¤Ó]`ÍöÑžä¢*öQUÜz[jDŶw Gbhí¥®m”´¾‹sbe¶³%æ(ß–‘ÁNR˜4y÷D'QtÊwb©x“ç+äѯ
-îô[‰Ö‘;3º•Ô c›Ó|¦®–k›4MÇ£¹D,¢Å’T§Z7æ­D+·éeÑt‡^ø×çHQ©|&ãǙŸ¹ü;XAºù1˜C#÷“N^P˜GVy'±…4}>„Á$@ ¯Ï½î£¥ë´ë©Cˆ_×qÆïV¢<“¼k5ƒýár¥^ñ9`^vÔS¨a/%ŽÒªD ¤Yኻ‰Š“¨?ÅOÁ"„_ö³¶äŠ4Æà ¼»¸–t£¡eͳò{PºÞ1h?£|`˜Rª'õQå“áˆÞ0Q¸Â´æò2
-b‚ËÞ6¿2RÕ^Ìä\(TÓ.1ဢa[T6Ì0µHåÍÈãb\*¼«×à·ƒ?>«ÂËpŒ3q˜9d) ÞÀá|ócµ*f]LÃzB¼k™†÷ï4è*fÊ1¡'´E)Wp¸ërÛVQKpÊRL”á% äÚJi]¡…Ì¡Ë&™ŽÏ´`_7š«WÌ¢zµ#)a`Òœ‘’5E"9&reQ*†n»x¿\¥q#­]µX•b2|Ô·ÖŠ˜Àæ¤"L³ tYiƒÄXQbäÙŒ;¸\³Œ¹)›8µœ
-úçÀ³˜Í€µÿ‹œ%Nîqö·—ŠÕh«d˳™TÊQ¹®‡9ƒÕcjO UÜ1‡!Ü@´sUŽIáöTì ƃh¶õë½søÞ¹#õIïÜÂ{Þ;˜9ñ7Óù1éWÏJ ÏsrÖwœ-óý®Ñ£D1t7£ÑÓr¶´Õ¢†?ðèÊalâïô§–a¼Ñá.ÿÞ§Jãd•#êg¶lG–s‹åfzêƒ~è¡I Œë¨Sü@F#3£0)iÏ™Lë1rùÌÌð+ÌLKê³f¦÷33`ææâ÷53[º53ýè33ỪÐ÷N{8J¢0GÛ»'·À°ZtôÍ&7jš5£i/V@óåݬV!»C“¾Újól’PÒ&U˜9aÛÑôøºIèÎk±D½ãºKùþy—ƒB nÈ‘Fæð¾¡F''¼ýméWYc¾s}-ÙÊžb­¥,|K2¦…¹­È8gw{ê­} 4ÐUõ_·u "­ÞÑWÔ¸Š§«ø~×j…oÙÒÝ=“^"ã´úÙà^WÏG=õaÔw>¶ß÷))¤ocÊV¶Õogƒ‚;¸ˆÒDzüc\|Wµbƹ––3\M‹xƒÑ<ÂUó‘jVêZ…¯ÛZ§û9>¶ÃkÜÿf†^§õ¬z(TŒ§Ø£¦åR7C{Àž€±ÌÕ
->l§¬uà BaߘÈlÄ4¯[|]Á]ñjg"b&øè-|óI‹o{Þ÷:˜´Ò \L×ë6Ç…\“ÞœÅòíÛ^GÆH&]7®•¯s|Æ1au'§åÀø¡fð®×Z«2Çç0kÃ\¥ÃwïF“cÃŒMC׾ƶZõR<®—Rhf{½Tîã§õR‚›Íº9vj@,T?‰K: –ÎêeȶÕCz)u(Hêõr¾c¦ÒK‰´¹C/o%ì\7­Ì-høÔù{ª£ÂF 8©Žš dÆYu µÿ¾gþ:j!Ø“¸’sÁÔO*¸SÑg.ÚNˆ<_NÚN|ŠÉûXWÙtºÇ Î\HIZt‡(Z)dÛó‹ŒQØŽÚ‘æÓÆ›zSl½‡ñ(,åavž•
-²ù…z••yèÁG¾f²ªÎŠ’ãƒ/9q<Iÿö!Õ‰nXD#Òœ@•ÏŸàIÏÑ-–wLgÆk„ûŸPµnÅñ¤Eš¯qbL.:ù_³ìË¡ Æ`¾ì€Úpqu8Õ"pIœš#%6.¬v|处êÄ(^bÅJu–åhãóÛ—5ƒ _”¾üå—/?ýŒÍÅßèú¤w—ÿÄÁ¨Ógºýóòç/ZO‰“pÁœß¢%Ý$Ú¡†óâÂé
-b{ÀªhuëM¬x+sjýü­¼úŸý½…æÈ
-ŽÅDÝŽíõ‰vål¶Ì‡e$h•ñç“ÝÈ‚5
-1˜§–£#­ó˜xàL6ÓZÕF™7àãÓu£O÷.=YME­‡‡îèíçL1Ö3Í´–ý`ŽOüPƒ?v”Ùð¸x¾E¢ÝÁç=`FÌò «g»õdmþ 3ÄÚ
+315 0 obj
+<< /Filter /FlateDecode /Length 3194 >>
+stream
+xÚÝÉŽã¸õ^_á(6ù¸…Úår€É)“¾ æ” 9$}H.ùý<.¤HJ²l÷L 4eQ"ß¾ŠlÎôéï'ŽÿÿÃËùÛË—«'Ǽ1Ò¾ýíEœ8þ'N^2åád`܈ӷï§_Þ87À¹ÄK]Òo…—ñé¯åéà3mßýöÓ°˜æLp ÅÔ_¸
+Ÿ;¼Ç ðÞ˜tm
+pøû«âò-axEö’ EU.OM¥» uâ£Áê’î#!¼¥ÞÒÓ–Îë9âýåj`†/ nx[‡±’ií`Nâ#¯0§´d‡zšÕûkOtZF«é2•FÖ©jß‘¬Ë62ùï†U 21ˆÕCÂÍvzb!
+E\MLPR‡¤Ë­8ê]R¯Lrj}D@’{z×ú䘴"…,3#K¡Ï7òýXÔ³@Ȩ‚CF>CO÷ ÃÊújоl±«€]$6kYµ—w o‰UÚ˜Jé–† …ƒZô0@%ŒÉæ@Tœ¥mìv5‹s€Ð%øú…(ÐD#ÐHuWaľõ´WEÈ<È*Ä_ó»a‰ ¸˜0%‰Ÿ–¾žÓs4Ó¼©KÐüpgÔó\ûQ˜A_Ü«u!á]õ[bpd(õËO’,fj¢ s°ˆÃÁåªsRdÉw ­jæ„è—ÎîP!9“Ú³FŸ“.¢5s!›ŠK¢á.–b£;rˆ„5o’zÖQšp Ñ "„®Æ¤ñ¡v)¨0«1ò‘ºœ·\MŽ²L¤eÚé…Y}äp ÈÞâew͉7ùYaºF€^M.R`žGp”$Ãk1¹Kö¢yLL$—Q;ŽI©Óó0¿ÕH"žÜ8nêx€±&ƒˆž&c>ý&Oãá7yR#Of f£·ÌôõB3cláÔ¹
+°øÌK7î«ß4—ËƯFè—ì{}}Õ´ùm.EmË:ä‹[DI©Ê)uYæ]ÅÕôóOÏ·¸Á³Ü7f³ÃeM³ºK”ùäñ¢OYýµ¨æ)mýõSUN¬eí»ƒà*XJ®è 9ÑÁ¼Ô¹+јx[åKÆÖ–”¬ØjÄwÒÀ [’'“®À¥rwV\Ql¶Í=éU‘¥ªð•iL}Nn•\Gkq­ -ãçæ÷u›C˜õm&Ù*µÊ‹Á¥©R|ä"¢Ò^G‘¶¢$•õšØA qÛT¬­Ë(Ñ´qD<%pÖ- Œ¸æõ`9Fsí¶›ÑpM)g³Û•K4mjoÙ),½×º #µDYCMsK®¶.ÈB¥¸ŒoV¿g™³ðœæɬP¿Mó@KŒúZÿ¾Í –yo~ló@ ËÐ[ýØæ憡ÕæÁ‚…Ætíãhž²iÊôrÚ)³Ù—ԲĦâ<jÒxY*8™p®Ñò[TÓÕ»­@~+&c)É õ¦ÉGz:jM™wIeocm6ÍÉíªÏÕÂCE] 6—Y>Ý#?"Nî>ÖÝCc¤Жœó^‚Âú•bÚ±^‚r‹îq7©ŒD튛뻓o‡;'
+
+ƒÚ:éŽ(9¤ôµòݬÓ‘äm'yˆ=‡6÷QMÞJÏ
+¨-dÖÐ %T‚Q#%L]ú,©”[[u ÔXÑIÝ32ø©Y Ûõ¡DÑ)ïúÕ«(ö
+…ú¤ -›ÃÈNÿLIÍð½Ò¶¥&Ïu Ç¦¹D(²‡’UÍ
+üø¬I/Ã}pÎÄa楀p‡ËÍÏMW̺øÝ«Ã'ä»Æ‘kxÕ Íf*Šé 5¢¨æ
+7=¡°m„ÀAmyª0QjCÔB&$’i”꺊 ¹CÛ&ÏÜŒk_šP‚«WÌ¢zõ3) É<7G¤dM•Hɉ\ÓÓõù^-¥-Ë5·á¤µkšU9!&ÇGs[­ˆl)*‚™} Ÿ6H®1üÈžîrÍyÎMÜDÓšp*vˆÍg9ÚŸ²ÿ‹œ%N®qö·—ŠÕè«dϳ-©8”cHëºæTI¨=
+ÌÎÜ€â;2šº,J<·ÇÜ „? è~†›éQ}ÔÍtë=ÁÍL˜y£»ø}ÝÌï{ÝÌHý}nF@lߘ8­Á¨…Âö;ÚÞlÜÓj1à·eܨiÖÌ(ÒþV¨€îË»#P%&¬B3¦.ir`-Ò ÙA¥ÜroÓ–¦ÇïÐ]Aw\‹%g¸lOKýþy“ƒÂÂÜ”#wPlxÕQc=ÎÞý&´ƒU{Ì7ö×’¯œ`¬õ½˜)Î4†ºnÍ厌C~w‚¢ÙÇD]³Ÿàërˆ8/7%Å.žnòû5¯øÇs³%=EƹûÙÁNÃCÉÑû@õÀå÷}*
+éÛ˜²oõKkPp Mø¢zŸÅT­˜Ábm‰ÊžæÞHË=,5u‡[Ù©ðu¹Ñévöêð­X<‡¿ãµåæuîfµ´ÐV¤h`÷ºPXÝHÝÓv‡;c™1ª_‰8JîvÁa¢àÌ°Îgr/ús¶½Ft3i_õ‡›âz RJt¹ö FR!?œßÄh'Á»9¹¢ÖJk=ÍQÂ19Åm«*ld€gY
+«¶ Ïb6ˆñý zN1îÕžzQ$ì·…}' B{Ò¸ƒ¸¨p>ÎØ]\¦›Ú·ñ‰Ûå5
+AlekkXíóÛË¿:«ŽVéÓ_¾¿üò+ÿ¯Ÿ0ªKT¶ÿÄ¿£a(fD˜öÏÓŸ_þ”þ• ¾X[Žã Z.´ O.làËM¦q‹ê+¢×î™·â­ö¦Rn…£¼IË®w ÝFs( ”IÃùråfH
+ÄÒ¨͵-ásJCòiy¿HEª9ôš‘oã§Qцn ›;ãÛ9EGV¶qÇl´aÕYÖi]¸'žYJ}¿öÝÞÕ´‡+Œ¯®åALD,¼-MÖã…ç™ U¿<§<*Ä$³|ñ¡Û¥3 ™àW©U{HwËǧé[òð.õ ž€\*Σ»ç:ô2ZŠ¹žaö¡åHÌþ¦r5ÙT¾¢Ì†3` ¤ì)_‹ÀŒ6XHã‚®µvëÉÛü1Æ
endstream
endobj
-315 0 obj
-<< /Type /Page /Contents 316 0 R /Resources 314 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 240 0 R >>
+314 0 obj
+<< /Type /Page /Contents 315 0 R /Resources 313 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 236 0 R >>
endobj
-317 0 obj
-<< /D [ 315 0 R /XYZ 78.37 808.885 null ] >>
+316 0 obj
+<< /D [ 314 0 R /XYZ 78.37 808.885 null ] >>
endobj
-314 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F71 292 0 R /F15 227 0 R /F54 228 0 R /F62 230 0 R /F55 229 0 R /F63 231 0 R /F65 232 0 R /F32 236 0 R /F48 237 0 R /F61 239 0 R >> /ProcSet [ /PDF /Text ] >>
+313 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F71 291 0 R /F15 223 0 R /F62 226 0 R /F54 224 0 R /F16 247 0 R /F55 225 0 R /F63 227 0 R /F65 228 0 R /F32 232 0 R /F48 233 0 R /F61 235 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-320 0 obj
-<< /Filter /FlateDecode /Length 4358 >>
-stream
-xÚ½\9d·ÎçWthK“Å °­V Pfx3A‘l9± ؉ÿ¾‹wñzÝofwƒ9ºb±Ž¯ŠÅÇ/ÿ¼ðËO/×//¹kyŠIeàòå÷øE\¬gÒ^¬vLYqùòÇå—WÎ~û$8çø¯4o^á_ŸÕs¸âcÿCû.üˆð¯K߇ç÷ÐÞ>I«_ÃÓ7)ð¯åoF¾æÖy´ÐRBlýë—Ÿ3¡‚y­…]P
-’9c¥HN«¡R ŸeÇ×*ý5<ÌQ¨{1Úšäu|?ù}ϲæÐ3¬¨[‰0ϼ£ á‚Y9¯ãÜzœ©Šß,Ö“)Ò{ŠŒ“LJUHÒò \Þ+Ãqdîó\qÇl~rKû ·Ò"p¤R#8á‘&;‘WEFb¿¸6Öúö)N¦
-Ñê›V²ÊânÒÄêö6
-[îË{Qm®­m˜ ·81µcÁ ÉQ?ŒY&°©QX•Ä²[*ÇÄ4X•´y‰•¯¨GyÁAsât×ôS5*ÊÂáb”´Léi-j½•ÿVÑóÁ(äMtd²CѲÿø*íÕxTî’2nÐ"ˆ䥤‚t$Î:Ì¢=SPW¤~HcÖ¨Â22G[š°Wù{…· %`¤fÇ_Í3o£ú@eÁxHÀ0KS¢ðV¤h= YŒ¶Ø¢£mÁáÛl·•A¤j˜:n‹ê½€¢ªÇ›ê•[“¾/}f º\¼Ò‚q#G
-²ʾ‘Ìpx†öðÓ‹Þ3‚®P·ŒoÛA·à–ÕYXô)>åÍHÆ…Ô–Yæò§¨Y÷:S›Ú^wÎb©7‰–ÈGÉ™³&S-Äõí“Ž¾GÙ¬Úw2áÌ|¿zùñËËšHƒ²y1`™öîòÛ/ñ{n˜ÁßLqùï?.¿¿ü¿'
-QöÞ”ú@™Dš<„›¥ÍôV1à8‹E1Žy¨ôu`Ô3`#µ*ßZ²{ÙÎWK|M{Pt'Bœ:ÇzÖq/ÒÓÅ^ä'ÅÏ5wßc˜è#dÎ&(÷+¢onãhE¶jÇ”ÓFû`g3JR°ôI¤uß¿pr$ìö­‚7UjÎïK±|>5áºgÝó@£¶ÚÖnÅ¿4~ÖÜ0NÜÙkÞÿ¬·V­­÷äÊ4˜³ßŠÜ­÷ ÉUšò®QÊû=-py¸–âÉk”½Ó^¢³kØãs"¶a%Ôkk)¶²nv#[ÃoÐð#ffùž†ß¢ÇRn¤€JSZ_„ Dæ‹î•Ð6¢Ì¸ö¢Å©_„<ò&G,oÚ”ð8KpjF±Ÿóhy¦Àkäa9ôÍ¡6é£êÌ%`S•ò(Ñ7Ú¦3òugl–¢àÓÜS³Ü 6ŽÃ!l| æ'=Û:³øte@ÓHÅQ•
-tú¡[Ñz‰!
-ŒS5R†pEÆ‘N3ƒfá4\(ãBwö¤àð‘½_;¶¯FØÃŒ;kª ñª-á¾í´›(O‰'„!ž“úíÖºŒS=@út-ŸÜs‚“û xdÁCŒ*¼W"aËç‹ŠDÛfÒótEZ€D;Ð{%•³a °Ç^"ç×®•®yˆ…¾ÈO0¬ä6s2|*Em“}ñrïCs •ò¸vHªFÿ!Ì9µ ]lVÃôŸ© °òÍluËD½Å-훲gKVGimB’#
-©ÀŠ©pï;ý$_a ³f¤¾eW\PÍÊLÍ=[õ´UU QújåGÈ(·/Êwk0¾Øú–KÈ˃uÊÛ*f…¢ËûÓ¿ÿ|xÆãdÜìa;5…ÀšŒ¨¬r++ãhÀ–>õ©"’‚ ‹o°•¦7®LáBׄުiøFf
-\ê¨wJWy5[*KûG¶€›öù_÷J‹!IÖseŒrÓh«(7ó‰È 1‡'N1 rÜѵ^Ë‚AXS;~-œ`ªa¢.YgÜC£‘0MJÎú·ÌY–4à¤Z©ã2á€`¢Õ€àuœ‡7çžÉT¢‚Es ‹–†n¨w%æ}Tk1Ÿ–1²xD („kú—›¬yŒÑÆ°Ul
-‘è"¶c6,'C!JLéH£|Òñ|[ªúŸ`‚8s0Nv ÕÍKÇøj6%)2ëã4žmÕµååµkOÇ^TVÑò‡n„(²¦¤è9±w2@æ-ÛµbfÜ+SÊ‘N«üÉGg·¾h¦k²»–5cú e˜n¤þ+ Rɉ-“s‰§o$_³Â“-·Y˜–+‡eÖ1/Å;—6 ²~T|¨gƒêd·êþüÏ=>7]Šœ
-‚‰O(àä,N‚zhu{TQ\h
-g87¡ß. DÓ£g
-Dédõ¼bS ÚÈ8*?ÌdéUßþq!ÿéX£'ç(£>žôbä<fr‡iâ¹íúð°úÄy¿±uì- ÕXÕßÔÝ E‹’´åìÔ›vq×f$ÈG‰9*´Ê “¯•ÉF nû3?p2žéLg~øŸbç´ ‹ó3'6ˆž¬÷8+ºùѺ`ÞÑëa QfŠ<GÎn1Aþž8mOɸœž‚åR«ùyªø7µ*gîœïÎè§*&W«˜øÛÑW"ñÕ©þfß{!"‡‹û2™ãùRk?J3„Aߨä8z´`WšUA›`Æj1+]?Ô’Þx̔ڼý€Q¢à§×¯‡õë—‰,3ÒL£ßÊzçså$íŸ]îíš”¬«ßÁ9ñ&Œ±7q?)XúŒ¥µÄÇ“À~o©PÝ 7',Uó ©xÁž²TÀ,(œU2 ¾Â€£X–ð1K%ÏY*LŒËé)¸­=§}
-'Ì®~e©R»µÏ6',UC:¦ê¿åå¿j¿…->xùOÄëÓh1K•«|úüU_<YwÊOûÂGËœsÓŒòቾ
-veXu¶}Ôrue†q ­zªˆÊlÊøÝ®D}{½£æñžÁä*Û]šÄ@ÀɉßæÖ¤æ¡rÔO[¶6àQ«Õ¾pë\Ùm¨Ü²aãÁ Ñ¨e·hB4Ø÷Üß
- é‘ÊÖïX›¼aÚ‰qô9[2— ×­RGWúªº»/®{ a^/%ÕÿÞW‡ ×[;æ­%ÂÕêYEëÃ[Õù†unAH`(fãè'±p@ãf¥^ã¹uç‰i_„¦ö¿Æ}åIë ¿^S„^ñ<÷_ݽzSZŽÍ?Ó¢Úº¸—böæ»Z´þwzM€ÐO¸SÚÌ;¹ÓiƒÓ
-9’ؤûÈ@”÷)}Ò
-
-a™
-Ö–1œî*ðg@£ê ¿R§@£`Bé‹°È$4Ú4Š¸ çQc¨*Ã"*ïšùh¾ìCä£iÏß“ÇÙ5>f±ð¨ÉÝzsFƒ€Ñœfžà8ð{'÷m'–YÄÖ¤+9ŒÃ-Ëäé=ª~€P.Ÿ:ž)z8XõðV5h„7¬Tµ»³Ib®dƒ
-ö \ÛŠxÐ 8R‡ÁªòExÇŒ—mœóú’9a*›¹¼·Óœà#Î ï±àJ‘ÒÍ|êâDb])ÁÏ•«%ÈÍR«úík;>”µžs¾ûUžDáŠX-Ék×zPRíOG^ª†³Çª‘Òàyb¬5ëÚÙ¥ +AßôðÆÑîîíÇ>‘¦ØÏv,Ã_Ýîá)³>¥L¤k^¹TàQJã)±¶i1Å~?N» J8#•YW;ÕÊnX¸¨J¨X¿üŠßÿ~FM”Þ]þ[þOBýþuù*ZT0 ‹˜
-UœÎï4shnYò‹ká5ÕÓëÛêZ À¸¦áï­fºCz•“õÉòÖ»V}:@òržTG[¾Ý">¥¥Óy57:cŸ¤/ΙjDV“RÞšH>:I tÜÞÏÒŸªÒ‰$ë`$§"îÆtú4S‰•L…2éí0õ™鵬 'ב€µ´$Þ:ÿ|¦lÇÑÚ T^?Ðð(³^šBfµìÇꀃµ‡µIu—®}eMÞ­1I5pÉ}ŒK8‚yÏÊ­Ö
-;e8ÃïäÁU/ydž|ZÖ™ô%ƵGŒ 5æÞ„LVôsÖî«Iæ0aM8ÎßQúªÌÄ—ÁIÉWn_Ž.â§gµÇ Èáz$dÚœPoy[-îÁÖ¿‡~‹­KlÈ[©î<KÕñÖòñµ:ý ý%Iñdí}|Kl­y¾ï/Ä"ëѽ§n„qè̴ëž}\¹+è‹Åy·¸qÝ»³¡½ýëKèhï5`ƒT‡“Nqbã½`\ª¡ß×ÔY†Y>ΠHƒ¾W¦½` ? ʶئ«oãô˜ò#¶®ÍÿHa¬Ž÷­¾ã¤ ƒ‹‘q‹ZÒD4=glçµ»bW¨oÉJíºx¹
-ykĸ]43Ù¶k¥É“ANáyZÞlÉœ1_É€†Œ“Ò~´Ö¶mb@Ì„bh tm=˜
->ÿ?,`]à
+319 0 obj
+<< /Filter /FlateDecode /Length 4440 >>
+stream
+xÚÅ\9d¹ ÎçWTh#ë>€F]ó¶ØláÉŒl¯¯;ñß7uP¢ŽwTOï8è£ÞÓA‘ù‘¢Šßþqã·?Ý¿~úÓC˜[`ÁJ«o_ý$࿉› L¹›³‚q+n_»ýå…sí9W’s+_?+Ãé“P~xmñËן`t+W£ ©™uj_ªÒkM“ðϽ¶ã¹”eÂÚ©×ãx.-˜
+öÙ¹´cÖ„±WåÆÎ\Æ2å§ue¾Ïg=ÎLrºÏçÓ|êeìùú¼bFëy>è-šôeùŸÇŸøLod5kº¤ÖÌ81Ñe8_^¥‡ÿÏó,“&½ï×K% s³^êcù) ­ŸÖK%“³^j<—’L÷ì\Ê3÷´^*Ðfý.½T&0¹ÐËíx> ò—^*öä‚^>Š.ú(ÓÓ}¢¥aòÿ©Ž:X¦…|R ÀŒgÕÑpÆÕ<©ŽF(öɹŠsÑ n/*£ s1v:™(pf½Ÿ:ñÙèn\RßéŠ5œy#çéN§`A”PcÏ+Y Øiµ+ÍO-tTÄøÌʸcyÜÏJ@OÌ,‚8·øóï@)-¬.<;'ØHe'žÄùâF´2óy¢î…7'Þ ´6š˜çHñ†éÎHíCúŸŸgÁ„ïPSe$s֜єÔ'Òò¸Fl¯&A›l?†¯¦YT•­hšqK3}ÖB» ¶¶|BómQyœÑM™7·ØC×µÿ½ÙåòþžçxÜ˨¶íÇÁmO:»ŸZI:Ç›ŸiGJŒxýœº%â7Š^¥#»b^Œl‹ÉB0zÏ-G£¿³²ñ˜ºŸîz nÁÀ£Qd¦QktYV§%; €ˆ?1 ‡:ï4r*ûÓÆÉw’_ô ¹¦Aÿ¢í[ñÑ*Î’²ÕOu[æÄ]MóZ·Áû®u;‰•ãè¸Ö$ü{Ö`´²ÒPK7FÀ5û@­)"(­âBm.£rTÁ²3ò+íÊþÕWúTG‹ ÜYP–¢Â·Ùâ“Ç}¤*/”~Ba¨²/²g ­’è7ôW¯Æ¢Á*LÎû% ¼N rá÷'0Äzð½ÍžGI|)ˆ[P¡s@4n­I†1,å(á¦+ïlyfËEI\hϊʼn‚N‹Ži¢lê²ý·á=Ë<V¤á‡úÉe&–<Áñî²€ý´ÒÕØ —ÈnEªPß©-m’žy;bçôD¢zóü·@!Ìe -Rx0P*Å à ÌɱÓ+Íy;Mì=œNqT˜z5?Ð4Ý›ÎRV¡’Æ~º ¿Ù‹‹Ö5J¯o¦‘˜ILý(u„ g˾–ÛFÙ²‚çun­"èArh@‰Ä¼§y¥xi›)έîMpÕ+«¤U1=Im·f €X9úñ؃¯\ÍÎȯ‡"9>‚\OÑ¿ý‘hœKpE2"‘Sh¼OÖ[&‡Vè÷Wˆfæ÷зKP`cFq|£E:'€9µ˜ä¿UÙ‹šs4à‡‘z™×Ìþ†7"[ÜDýêèÁ¨ßCþ&ßwïue…κ¿Ë*Ø
+é´ƒ{&¦ÁªªÍK¬|Mö"-xôÂuKÑho/˜r ¦×¢wPkù[U/Ú^[„èÉd‡ª“@á›dK&
+‰Z†V1zý¦W;!”’YUáøƒp}%#îÒа[Úoã®`¡äDÍ{ _%"γj60  ³PÔÒ[˜m¨‹­º`÷‚–LUÃÔP/ éÎã}ÜßÇH&>¯‰õí’¹Ò&fÕHÁˆ­­b–Ë+´cš¢©Þ=‡†Ì6Hq‰ŸaÂ>'m gþ@½}Årßx Z©Ä!K¦Z
+ö=˜ ϱJ1®Í0ê÷M_rfåDÁÄÔ¥)‚
+$ËŒâ°B‚‹Þ™æv¦ǽíî›ÆŽQiÔÈØIëòÈËò1tA–9jí˜rvæÄx,s¼g`–ûÕ(‡G/…;Ù.­0Øê`4 À.¥ÛE`RÄšaË<¬®ÄI ïÉ·R–|¢æŽHâý!3¼“[Š¹ÝjV¹%éinIú§rK‚`Ï0ˬR
+Ëœèï´9Ñ}lÓq=$3Ô]Y­ýT—ö¸ÿ¶–ШåÐ5«ZÖ'wïÌ8¡»õýá_<<ïŽ×¿¬˜Dj(€DÇà6-m65ž&¯ò§U馸üæ豋ÞQÁx±H¶£†­•zI#Gv¦êÞøF)ÍY%²¬£e«†Ÿ&#l²s,°ª`W"´23uz uÔ¥ ágYÍ.•Øsj-ùHûü¯²"á|FÚ=WÆŒ_m•ñ+|"zCÌÁṯ’T£D×^x­ F¦K†¨»暈L8=ÎÔ/ë/€Árý§f#Žj®íjs•,Óêø!¼D‚C]WOçá»e2´•¨Ý‹pÖï!ÀšYJÅþ÷–›ª0sŽ&+H"qƽ»IЖÚéâþYm­›Üè§cf—bÐÞ wç>RÐ}Qrð¹ßÞîj}:[oéxÊÒÓežïxIJ1r†›—‹ci5©5])ÉòPË]¨æ ž~f¡ñÃX5©ÀƒÜèØV ÅXYŠæ-š«Å·9¾C ‚Š)==&½T¦êXNlg^Ž“h5IBÇÐk6%«;2¼•¸â ÉpmƒŽ½¨4¥å`{ð¤IìDÏy#Š²¯Å®u‰`9”_ÛVÙîn¬®ae»K¡Y3¦`©Ô–)áGê?
+íQé¦0LoMçè·ìÌê '¼È°ŒÆj GåÂ
+´FNä<Æ¡Ë„pWhçÁœšhš}ÛiíËe#žâ扥a´Z¶ “.G[4F
+á«nšü™­µÖ·ø-^‚“aä”ÀtŽ¦ciõ¡ ׯb¡PŽÖ'£7a¢âì*ÖzMÒ;æâÃ~´.[Ÿ×¶‹]ª´î=b(RŠ FNùoãŒ`ÇïøÐ~µRmÀÐ;éEýy›çÃþ²òC§™³¬!LSDøë6òÒwüäì_ã—0I?Ý&bÇ,ãœ=¥}ýRñÄN²<}ßÝ@¹€žkŸÚD’ƒZ-îD|R(fÄÐo!¼Ì†"<™3¯E³Ž…'uH÷lúºRçļ+Ùçt¡#µÆ¹òI7‚óõºL ÿ&0ª3µdFô¿…GÐÂçLq‘V «|wû¸ÝÇØ¿EÓÑÞkÈz­ŽIþK.>Æ•ú}ä®Å"Ž3 Ľ‚÷LZÁqW:•K§‘m\ ÷£j¹ÿF†’ùÏ6Œ3)´þý§bÅ£gXeS2Ñ4 nUè{±¬Uó£c)£Ý—-¸œj뻳·r1¥‰kµ“'ƒÊ95¡¹’ÿš -ßm$˜ რ(„ LÇï¤ì5Çå¿2Þ÷4P; Øî«HŠÖÿ"¨ÀJ
endstream
endobj
-319 0 obj
-<< /Type /Page /Contents 320 0 R /Resources 318 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 322 0 R >>
+318 0 obj
+<< /Type /Page /Contents 319 0 R /Resources 317 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 321 0 R >>
endobj
-321 0 obj
-<< /D [ 319 0 R /XYZ 78.37 808.885 null ] >>
+320 0 obj
+<< /D [ 318 0 R /XYZ 78.37 808.885 null ] >>
endobj
65 0 obj
-<< /D [ 319 0 R /XYZ 79.37 771.024 null ] >>
+<< /D [ 318 0 R /XYZ 79.37 607.562 null ] >>
endobj
69 0 obj
-<< /D [ 319 0 R /XYZ 79.37 734.627 null ] >>
+<< /D [ 318 0 R /XYZ 79.37 567.837 null ] >>
endobj
73 0 obj
-<< /D [ 319 0 R /XYZ 79.37 711.095 null ] >>
-endobj
-77 0 obj
-<< /D [ 319 0 R /XYZ 79.37 350.645 null ] >>
+<< /D [ 318 0 R /XYZ 79.37 544.306 null ] >>
endobj
-318 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 226 0 R /F16 251 0 R /F15 227 0 R /F62 230 0 R /F55 229 0 R /F54 228 0 R /F22 234 0 R /F68 259 0 R /F32 236 0 R /F61 239 0 R /F48 237 0 R >> /ProcSet [ /PDF /Text ] >>
+317 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 223 0 R /F62 226 0 R /F54 224 0 R /F53 222 0 R /F16 247 0 R /F55 225 0 R /F68 255 0 R /F22 230 0 R /F32 232 0 R /F61 235 0 R /F48 233 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-325 0 obj
-<< /Filter /FlateDecode /Length 3798 >>
-stream
-xÚÍË®$;m?_Ñ츓›ÄyJGGšžžFbÇÕì+¬XÀÿ/pNœTªºú<#鮪Äqü¶ËiyùçE^þøåúó˯we/QD§¹üüÇ…äE]B
-œP.LXfl¬BŒnRºˆŸº~¿%œû=c$ÞÃkïð;ÎÕPŸ…¼›=i#…õnou'Ëèݚׯ:¼ôeõÈ—‘ºÑUGåUûp¢§‰!A¤¡Ö”; @Zé_Ÿ| 7 ÜË8{-”(PÌ Ã2VÌ­d›ç+¦ÕíàZ6ÑŸè
-?Szr’èظ&ÐÞ_¼‰BIGtK”Ï„z‚Œ"øR®
-‰ÊnBÝMÂÙåT‘Èråå«u•´…f}_eI…Ñ]"úè¶våž‹tG¯R±–Ií‚ÐRÏ»³¸
-Œtp,SÁ ­Ôf¶m”$,HƯrE¨2öG‚U"Ú0¯q;pVxpΑ~i´–ä©ñ%ÑøFWM €‘½·+KjÆŒ{W­4ÏÒ¦" ±Ðº,\ðȦ¯Ü¾Mž²i(Î6•Â@h6ÍG´{‹Q³B›8¡ùF­<ãã–®JEkl዇òÂY³‡ù)ƒXhOl<kËЕA,O’A,ߎ bY~Ç .˜VÂ÷­V[©£Ü±•:*¶¿rEVmVALór€«
-\uw+¶•ù;¬«°’-):YŸ¶íA!q ¸uo˜°ýj²Óí9®¬ÍNúU®&ýÚSƒ±A[3zOb“4'Iw$á®?Ï’úÜ"‡‡m%Ô´8ó K‘¨ùÒÒhEâFâ2Àj¤þÏ<!‘Ó>@AF˜ÈKÆ8ûì;“>ÙÙà5ù—ç؈€a^}2åh\1`tA
-ot
-Ï÷]ÌN51¤@•Ð•”•ÌÍÐÈÎŽ{ea¶(<ز¾Cù ç»nOG^%z¥…àÚÍØ G½rcÔì·,z=ŽWjÚ€ËðxÀB—.²ÒV3;;œ„™v…×é¾®²#µ+Á¹V½OŸ·®ªdñ’<­Õ´Œÿ8µïë“~æ9׃ldZ+ÿv‡Cî,í‹æ$8ÉK-{§=źp!}ÎñƒöÂÚxq …ô–â-”ŤÈcÜ?àað¤tñE°Ž,´@÷ì0kŠÒ> ÿ×'¸õëoû’£,ƒ0³ T¥q?
-ÍÀ—ïÄWe«F¬´»f‰Ðì¤Á¢áB±¦MêÏP\LÍLqíÐál"¶L ¡ñ;Q&_4ŠÛCòhƒ!wKí­ÿéo]…<ÅrŒ­¶/] “1(wd¬OÈÞÕ™ÕhŠ¸ö†ÆY$ŽY ýZù'³éiî£Û#NѦ:ÀÌIDaù@GŒ,c@APZÄÈ’ª:K '›õû?üR§ì0Ìëâ8åw¿4ÅX
-À.÷&s1ÎX“qOÆšžÊŽ\IaS§(W¦!ʯѿÑÝvé”ê”JØè0{'P"@¶<¦Ð¤_þvœâc0¶“F­­F!Hÿ.óg^nýè·.l)sÊÌë€YZe6À3Vî9;nCÊÍgÚñJ>‹ ­ ]®<9¦a{»LðF@€ÊÊ°’ɦœ(ÿI^h€uLc\6+h–Iî„ Š ½?Ú3öÞzõñ9C4õ^(P|Çä^q¥
-áaÏåísIÓBæ„{Ú}e*¢ˆ ¾>®Ý± Ânëxv)Ð ª³‹%5B»>¯öýÌJ(7Ænæºoë•¢Á$o»ÒGX V(³¡YŽÍë±[i04Þ³‰5ƾ7b,wc'Ô¡y6‹•²`+’s×"¾ ³ÜYÄï<Ø0=¸LyÊÙuˆòÇåúæ¤Õ=rMÑ
-dÂKo*ºé¹Q®÷B¡:Yíç5vÜ’ÆxÔ…Íèϱ¤
-ãZ{*‘€
-æѧ ¤Ú¨7:¬W…‘£ÜŒnà]jJ*6ÑXžÙòGºÄì
- §O¿OÒB*²Äyk;"
-¶ÛMQ²âOˆ &Ñàý”qgy¹4ñ"q`Jô
-ßé©`LãÃÇ9swŸâ†%¹ƒŸOõÃRœÁ0øy_0L·úØŒk}¨'Éû”#¦>ò¹Þ‘¡’xëf”ß­«oÌ”VÃÿÊ[)/ÀÚ·º«iöÓþjšÿ.‡µÃ
-œ áô®6™Áëë×ä+[Ùëìù]5Ò€¯.8·áð÷rå u¯ñ¹ýé8îúÒܪv&™¶þa»DÝZ9¥,o„È î­‚Ê˜RNà÷:ˆtÙÔ7ó@}J-¶Óûˆ ÉÓjcÇ ìMJ¹Õ¡ìð>6D• &©eÆ™ZGO ~Õ‘auÿÂZR#oÅÈ­ŽnízïÑëXÔN•›3n3ÆMòÝ*­;Í0ÌmBC’¼&øÑ{ëÛ¢Q¢Fgxƒ7Û7ɵ„½¬-+×B]Íd‰æ6ÞèuÃçÀ>Ö°¹í^vp‰Ç .Ë•n¶­bVdv³­éZ§ªŸº™B2±ÎVÖGçôöUíºÐV{·Í¨”8¬¨xã”Z)‰/¹=è6#<¶ã[˜ÛÌˆÞ mMƒÔ4èÔZmôÛWhg¦Ý¶%®šª3’´‘÷ÃulÚï'—N/¼‡…ÔÜîtÏÖÿ™»6 ´Ú ·ÞpR7»Á¡0—}~`,FÆÝýÿ˜˜.Õ,rùNÃ3µÖ˜v·u©fcYï6²KõÂ}{FaÔ4̳÷º>ý•€GFU)—Øî
-»T/NkÚ6šæ œ<E³ùjß]1økí°À‰ºµtXÜÍ–ÎʾöÒ“4oÐçYÆr¤E'{”SÒo0韱žºs'"{Å^E´3}ºZ½.sY/nC—Ünç¬L`ƶSLn?€„Ô
-§a—OÌW(>F󦨟4—Ä°1ü¡þ<nWÃ`øáád.—4Ò'BåÔൟCe+ã{CåtrføŸ+Cê|6ójTïÌýÙsKr.æmr&õAodÜ=ð2õˆ¥:L([;5BÇ|ÞÅègλ€Ä¤7Æy+)®5\9⪕÷áq%ë7DÍÚËöö˜zUL˜÷h¢@-}þL†nƒ µx¿q@ȶBÀ_O TÆŸˆ£ËHv(fkSÂ{=nãõ«9Œ<Ìc€Ä,šì»qÔùô Õ¼M¶<\Ü ˜û2®yâÀRO_x¾W™
-Î|ç¨6ò4døÉ.Ê> zß}› g×$Ù±°béèºVb€ú”çý#×FRÞ…ãPº•Mï~õ¼
- fÖ"ó»ŽhYv<¨ ‡.â&LŠ‡aRÔ 7BG¾ßén†—òáT¹JG<ìÞ! †ï¾_ùÎ;\=¥Ý0`Ë$eⱜæ}ˆ=íµÃñN÷Ò*ÃÝñÞ9G!G˜WxKÐô¤diÚ‚7{ãzب%y Á¢ã©Á&Íâ\k#4Í›ÌëÑQ]#7˜~€oD¨B&½Ÿ kF½‹¡‚pÑ®øö_æ¢PJ=Ç“A“²kRñwÌeç7Îc‡®Æ,ÿ8`ÖÊòžþ9`fåó`[Âéd:<N¦OÃ*zÑOSÀë&lèöó0u:°0Šá9¸úÅñÓœŽ—£³”ð5ȼ®º›ð‘?È|.i…d=cÌÜFCñT¡e8ôZ®ÖõâÙ71Ïq†»Ù.¯FŽÑF£VØ ÔT°Â±I÷º7`(#Ù9 rÕlœ¡4?[xÃ"—g}¤<*:™¡xÇ Ø.«ènZ²'Ù@̾uéïØ»†ƒÜTËiÌnqæl©ïd(,ùd•Œ¨Ì$‚ÆT¢½ªKìò1½¿RןÏ/ŒŠf~s ¢#‘™7®ûQ^Ž1ìˆ%\œŒFË!7v&·ª¢é1QTzΟÝyH©Îó \<³ohGH£Ïtä0˜ 0§fR7~~~û>c]¨þßôÐHÔÔ*1¢ûüÞã|Úx\dC·SµUÖbjÑwvÖ·5ÃܦâÿýøAòD~úØ+&+ðü˜³SìÅ\2á8šRÓ~=‡ßzu˜Ñæå—yä¡Y£«Š†…ØfÀ„;›rgUE4Ë}u¬F(j"±“Ý5êë¼^ÿ­ 9U£ø)i.ßó«uÓ*îýWˆŽ]œÆôpT}~ê?ÿ ÍtÈþ}Gè=Ô aOI“ËF­³tY¥7¶ûl­y:·yP«à}Ìs8‘j»`ÕjêTçäôr‡\†7)ýì7uÖÔ‚~.&7q݆óB0¡/„„éœë¦/RÓpžN{[÷‰Ô§>n—ñél¼Zw”³ƒLÔ²“÷E-œu˜ûˆèCïÅÉáz€nê¿ë¿¦¯
+324 0 obj
+<< /Filter /FlateDecode /Length 3877 >>
+stream
+xÚÍÉ®·ñþ¾br‹ˆæ¾
+F0ño±Ò2=#22ø£ó›†êÛB "bŸšZÆŒ­¼Â§æýbô”pÉôð+0ÖÂØeVc;`õ‚ÿep8Û b0Ñ cˆÓKµ‚[3·çÅiṯʳoÉk}'o«ýž9SdÃYäÕ ·\·»A=z•¡vW/³Þ+3íÍ$¯IðTê/ŒëÔbîeBœ9àNT‚_%¡ÅÖ¶
+TWL¡–ˆè
+JÛD  !>'ñ'JŸtlFÅzª¬×à, ÿ{úúãé¿eQa s!Àªœqï.ÿúã)6pË,ü —ÿýûòûÓ?à}c†@ó-Ô™0f3‘iˆ¡#iáAóª*Ùòûüÿ>­P%SŸ‚[K&Ú¢Jª=ñ˽²ÕYzņ-bÒËiÌžò¸_Wëµl¸µÉ$
+oÓTꜦ2@ĈNÁmm:Ý!Ga¶õ+M•ú­¶=¡©ª«ÓI*A_8œVp¼r5IQ´õß³Þ<¤¿@ÓðFÏÛÕ><ÖWàÌK>͆ú
+°‹xÀL2¹¹­¬ ÎAèüì]ýÃóÞO+ª}ž–iÔ+ÖY÷µš+îˆ'gü‘cSžnKe;§)l»BÄcE“‘¤\;WèX ¦V1Øšˆ"ëÕD½fM¾—®ì­l×7[¶&¾á ¦-[«Fí™ujVÚµœsX÷)ÐV¸ñÚ€{cI÷
+1Ò½Bù) ÓPžÐ~ûÒ,3^Œ³W[·–¢bÍq«t#»×ÊUY_5=;ï%JÖ3•Wüˆo±Gü½Z¨ ü"8±Ò1Åm‰F]ÕzhiKàw«!TgÖÉ¡$“Z³Ÿô…Ñ·ó,˜a©¡m¦7í‹0­þ/µD|mÕ²Òç²¥çDó<~[×½9ŠSŠ—/Ê)½É¼Ú«£<Åveþ–Yº·Ìi;®Yw2§Ñ£©ùŠmÈq iG»zJ
+á˜a˜òg:2R$ÝÔ°V‹&x`luÆcÔ߯õ)Q0¡ ¬ªlS=F{ð
+—QÂtb@¢®êŽêÏÓ6D2ÚÚþ
+­*au#̸zô‰FQ$fxú`Ô¥™¦ä5ôÞbúºËbíÒªý4]•±!·Iš¾ŸàÅÓ@L¹¸šráæšVN}U;uèTLˉä9o™ôŽèøâ·}»E
+sÅÛŽ3ܶɇÕN™|ɼn³KJâ]0­èƒ
+µïæo `â\¨LÈA‹­ÿUqH AŸ¼MR4÷¹6‡S±’Áµw:γ€mæ.9 Ù‘Ò?)˜4\1ëŸzcV\¡ƒd2 n¤ýhC÷¬§þdFLyÆ ŠWoiKô%}Íö½á?^÷ÁI218ϾQŽ© ÆÕ—iEm“J5iÅ6‘’èU’5¥Þ‘¹«RŸÛí¸—¨{]X1T‚Ônxé)›ÕÁ%ZÕµj²Þ:zÞepS£é2`x¶v<SSƒ#.Ì£ó“Ë F›+SlÚëXs¯õJ§ú:›“ÈÑ&ÝÎåßäí=å¾®ßFSñ(†W½ßýe»}µhˆ‰ÇÆ8‡I¸ªZ
+È™ýZø‡9FÕS#MtŠH‚’Ç‚Ï|ÌÞï`Ç Ó¾‰«ò(¹Ëœí¨¿þí—<dcÃPC?ä/¿ÁX2Àæî[ˆçB¡&åŽÊÂèÍö»‚ŽS¥h+L£kê„2÷Tîê„ê˜H8ÏÜA„èG½£Eêã÷‡5%q[¼bFɵÎÈ ¤ð¿Ëø—[7}¯¬†A˜z\G饮  ¸3TöœWÖ2§ÍGjq"Ÿƒ8ܹ鼒wèmn‚Ó PgY©URصÛHla µÃOkËd>‚^pQÝàOÙ~>rëˆè8Svi²¾¶¸´ŸaË"noP¦xÔ;¢A62$ÁÞàuam­­É;Ëpt)P=!ˆ£‹y¶ ×¸Ú—#+ù
+‚Ày¥÷PQŠ&ôD³èVêç}«SæðZé‰%¾ÖÒ¡xôÿu‰Ò,«F7®TdlA|n‹C¸‘%”Ì‚HŽ,~o}]½…k‚´ R[ogíÁ¼Â®Êñê ZÞ³]`ÊaÓRéªuíõŠ
+¾S`ùš”n\cÃnIpW­ŸzŒ6 Qè×ÚÑ
+ýZ¬Bßû¼Uèǹo†ÕÞÕ* 4>eú±¬ÂH³×8hZDq¡~£ƒ¶NjœwÔ
+ÚK´ ¡áŽL©gõ;W’…ô¬ZlùuØr.F†‹o¦›Ó\t¥¯ùKlå7ºŒ,F¾ûþMõ>Gøy}Rø+ö Q§oöTø—¬ÎÅÎwR6gÛƒFÒ¸n#@QÔc|Ú6UÍüÅjm¬„…€N¯­Ukb}ó ŽùÛq£™-åø~þÈÙÖýý…ϘÐÜLP…Œš÷gxvQÜKüÍ—¿ã™†¬ŒÅÚ÷ð|oÑP %ƒ7ÀBÈ ±g­Ò‹õž±#ÿº—º
endstream
endobj
-324 0 obj
-<< /Type /Page /Contents 325 0 R /Resources 323 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 322 0 R >>
+323 0 obj
+<< /Type /Page /Contents 324 0 R /Resources 322 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 321 0 R >>
endobj
-326 0 obj
-<< /D [ 324 0 R /XYZ 78.37 808.885 null ] >>
+325 0 obj
+<< /D [ 323 0 R /XYZ 78.37 808.885 null ] >>
+endobj
+77 0 obj
+<< /D [ 323 0 R /XYZ 79.37 771.024 null ] >>
endobj
81 0 obj
-<< /D [ 324 0 R /XYZ 79.37 435.417 null ] >>
+<< /D [ 323 0 R /XYZ 79.37 217.908 null ] >>
endobj
-85 0 obj
-<< /D [ 324 0 R /XYZ 79.37 319.251 null ] >>
+322 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F16 247 0 R /F15 223 0 R /F54 224 0 R /F62 226 0 R /F63 227 0 R /F65 228 0 R /F32 232 0 R /F22 230 0 R /F25 326 0 R /F53 222 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-89 0 obj
-<< /D [ 324 0 R /XYZ 79.37 225.461 null ] >>
+329 0 obj
+<< /Filter /FlateDecode /Length 3385 >>
+stream
+xÚ½Én\¹ñ®¯èMw@àv»HN1| rdræùÿCŠ{qyÔkI3d©ß#‹µ¯l~ùÏ…_~yºþ|úræâ™7`ÔåçoO_ð‹¸XϤ½X#7âòó÷Ë?_87šsíð÷5ýÖðú,8çøJ\_8üÃòW ø[çp}}–Nâ'åÒõÉ-­37üáÝñÇ ,-è*¸‡}ŠB(òöÅ7\/Ó%¬ÐqÅ¿~þ-Pª7”*`ÆèB©²Þë³æ>`qͯé'œÎÏØ%èVÐ…² „áƒBˆ2Qc|†8‘k•qÇwÒ¤u‰‡[Z|f•O‹Ð2oµz}Ž‚JŒNìMdR!5ÂÃÓ(œt4g>hþÿËÓ÷ŸOÿ«gKnp¤T"C½üúûSx¡o.‚3âòÇ¿/¿=ý_\3NrË„÷#)Òf¦ñ„}`RWU#©Å–IÒh¦íĤH¹ƒFë˜Wn¤Qy´’H£4шºçgqZ‚Š½“>%%ãÎÍJ@t‹WÁ߸¸›v@8¸ØcdK]©¯ioFa°¡ }¢§âõÑÉ*i♦¬yém0$s+Ÿì-º°A*÷²6¡‘׃,ʵ¢ƒ*#9 N83‘Þ íJª{éÏŒÆÀÀ×â’‡hG×Å®€Sß(ª•=™Jâ-)=…ÞI~/ƒž7âQ<o#³‰¡ôÖk)ç™Õr!ѦƒA/WJ nmº|k.>8gIm×4oº±Õm¡Äy8¥¨¥
+ÁÀ‹8–î:¯ˆëoåSÖ*eü‚^¤ýœœ`*ÄÃðäaDdæä7¢..ªK÷ÕQÈAˆé
+Zëðªgƒn¸ÕrKÔ4Ê\¸¿WÔ”bKe1ºz‹¾¹p_W[{–RSÞJóR¬²¸–}¸”À0O˜5ïÓ5 À3#&Ú¨Vnñê‡3½U>•Þê)ˆ¯Kk‹Ôê
+(ûçz5П0ý„ȈPf?@½‡öh¼^Éí#‘Ìx&„xL&%ͺk¼bcnÃ0†¾~_‚wÏ°µ‰Ž;cºI— ¿äQºl®gÓåη¤Ô÷Ú4¹éI±{º²„«2%…+îd*Œh3omµnù:¥ ̓ý.R5$Vï|Œ ˜v±þ–àPáVüZ:‰BNzP`ËfoŠ<’NeÍ…xxÙŽŠ" ðA¢_„”£ôtæô<*!;êe‘£‰gä=ójeŸnTn¹ƒDÍ`úʪ=Ý3m²È!(Þ,?ª^N‰œ¥E¯8e›êâU|w”û¥µ%÷Kkw¹Ÿ”¾D¯t
+4P‹½œ™iW1ûÚô¿ao*<K+ò°Ò+6‰U£+iU'Õ[°¾zþ5Tp£ZŽu\®/œfÆú‹L`^¾¾PÂ#89Ê›j2$ršIåµñ·Ødô¯×­ÑA Ÿ4ìLm•U$³ÎÕ㣔»PŠ!ÁÆÊìá%AAO°M@¥aÞ©rHL®œ¨Ã-JÒ>â–jéSÔ”
+È.¡ë?
+b$°j©0BŒˆ­DÍÕT~ˆÞ1@çn¾Õ¬¨ž*ýX÷ê8Éo%³/o­_œ#9CFÒ`“’ݲ{Ô„@þ¢18r[}¹dÖ«¹ÃR¤êRd¢ŠðÕjå-ú7EK³ä¬š€¨¨yÕn¥ÝÐØŠ' Kv Ìœvå ¾¶El=EªzB˜ê½„`5º@Ó¸2C8Úi0V·²ÁòÅÎniɤhnw¯
+æ$LLPcµ¯’°¶å^ŽP ¾j¦›0߶×èTge-š»&ábÄê/h 'žðÕYfWçÚ§«z…ɹ!WãE3åm¤Gºc1Q*´´~,&ôTLÐÕš#ñ tE×u{èIÛÊß­'ní9’E§çלÈ9¨ÃqV«Ek;O;;®†ÚßšÌ{³Ìƒò¤ä5á©à¢èfù,¦×÷kTý@³öA«0óÆŽãëÜJÚ¹Í '×Eä>’å¶ Èáš ¨…ФyC\c”rzÜI¼x_¡nÍJkf½~‹÷˜|¦Õ±ÅÀÿ÷Ò}ü;™åbÊf<÷¥¹å†Y%ÇÓZq’¸ÒÒ𻯹áö
+™˜›5D
+¡«5ãø€ùÔ“)åY¢NÞ–h \I]D¦'´÷žyP2.M%]´J^ÛEš>‹ ;ø´9Ðקü.Fo«¶U7«Éèxá}03Õºu !å4›%=«yÛ½Ý V0_ˆèÛÿ}1nÜ««c$I´,­ýÞî×”•ö¹áêÊå~XÇ™ã0’ú N(=7#äe¥Ö1ãô®Òé^ö×E!ÎÈiÌLOŽzéíÊÙ•P:³ ˤ/í;­%ÿKðu·2©¿&õKkV·³ÒzzòîÖ ÔÛÁ å½ýmºãûÅ>¤xE ã¯<Ç„Rï¸_Œ% 0Jt2ì—
+(ü6ç5–þä“eb¥¢‡­Î³Pˆ`°ÂN•Ú[†—ñwäëúÕ·zøi]¸ ðÊŸt¿ÌX5îÏãâI6᚟V÷ð8'¿#‡ÖãÒS<GWiÕB#ÎðÃIæ­;ɬyÜ1íáÏѼv à7Š†ô–6$°Þ3Ò®)Yü|Ž¦BПýö{·Ò.Do8KcÌýÙÑØïÕ°£Ñ³pRŽïÕЬWÃYäRÈ)íÌeqLMÞÆè®Xöpóµ”S˜åÄeÂ,ëd4TÒö‘ÊÎ8n–Ç:S¼­WLa†:ìN‘ð´¸bÎOðÛ÷Ÿ6Z áªã$ü¥¡ÑÅO‹"¹03íi ,–èÍǬ¶èPO¶ÚIZ¹ï¿ÂþSüdÑ¥¾>ˆÔV2-¦ÕËkF"Ü-ö½üŽÑùSùÝãó¿gì×TÊÔË|¯VñϦ²Çç-*gìíª™- Œ|Í_ãù‡³>±žÌØ[~â»=Ibü–»ª}½3M
+oãGˆº}GApÌ,¿¨/0LCGÄ6¯Õí•úmO>Wð«ë
+4®)ÌÂ]aÛ“añ׸uïÿ£“Ø
+endstream
endobj
-323 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 227 0 R /F62 230 0 R /F63 231 0 R /F65 232 0 R /F32 236 0 R /F22 234 0 R /F25 327 0 R /F53 226 0 R /F16 251 0 R /F71 292 0 R >> /ProcSet [ /PDF /Text ] >>
+328 0 obj
+<< /Type /Page /Contents 329 0 R /Resources 327 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 321 0 R >>
endobj
330 0 obj
-<< /Filter /FlateDecode /Length 3065 >>
-stream
-xÚÍ[K¹¾Ï¯ÐXš,¾Á
-²9{ÈþÿCŠâ»[jÆö.Ú£î&ëÅb±êk’3}úωã¿y9ùtµâä˜7FºÓ÷ß_ĉãÿâ$„eüÉÁ¸§ïœþñʹ¹p.çÖ¿ýóû_çÖš3ÁZ[žZkX·–ž %©µÄæZ þö›OÔ_x]èÎ ]ñ%<Á^g¼ð­ÖéÙ!?¼°|éùJÍœv' Ž §Š”…‹T…RÒ>h°¦€
-êŠö–hs«25¤çdoˆ–%ŠÁ¦ò©òà@è>Ÿ®BŸ<úÕúNæf4Ӿȫl急çáÉ9bà©ÏÙ· jS[Â5I"½ÈwWl2·õs;¾Ù.PHv[÷²—dÇtg ù$>ûÚöRnÔΩ¼F½„¶ÙCS«`¹OW+‹I¥ñ¡Ÿl†”À!ð™Ïzdú’Órä“í±'¡’œq%V>äC›zǸ4#íŠÝm°îÊ»µdF•ØFÃ-G)IùÊ…¼îj,„c`ÝH÷^MwµV2Zv´…âY¶èwĵÍOÃlÑ!žb¬HÊArÄë¹Q,»&)çV€rÉzåBÏÀä›…þ®*`Ãp8™ÿ:H$®&ÑÛ3^jBy\.ôd¢Ö%„ÂH†
-Ú¶¡g¥&w몘™Z|v… $‡‰2º–d^\´[9¡̸ê¶2ñJÚ$>ª pÆ¥²)쥊¤¤*ʧH“:ß9Û¾ÔÎÍšáéjâQvh­-QL«eã‚9 “TÒ,ÐͱtÏ¡$Hƽ©À…´È4HòKö0L‘Ó0{T3-:ëœëô¹¡•ðÌp1JÕŽ„2•«1iÝ ÷ò\)^@™Ë®4·Èqr©;buvEðÌJ¸GRI®~ÝZR1ÏÝH¹LNPíäLyÛ¹zê-„¦IDíMöÛèûüMëWꑦycj³<GOtCÒ+†®sìÓrÚ³x` õd­}KàÈbÐókKäœ
-™ÆÍ¢ “F}X•/”Eúzä“—»ßd,írﶱ‹}gá’ ÌÝr…€jÍ2˜þ$zšJÁtô¤ó87uo–s“qéÖ;²}òH“WIšÇSzð©ÿªÖJonÆ!M“ßo+aV׈°Š>8}/S+ô
-yc›M’Ÿ•¼íJñ¥.A4ƒbMåÆ’ºÞ÷æ$…ÙxYjûµ+ÜÏ)+ísÃnló„Ýu:Ë™ã0ªú„'”ž‚›‘ò²ÒסL•b¯Òé6n*ðAúaÍLO¶0ôvìJ<qˆ¢ã˜ f¦~„~Ø ýHñ·‘×Ùrµçä~©M Œ®™ªE¶–óvY^4É tî[ÊñœÝù˜ÝyÌþ~ù_&R<&¬É­V§ýñ^T_©“àPÄéÏŸ~ù{Iä⧎ ðK@'`Ñù#Ã>p À¤ô#•<Yö¡U…þÔq£°PT`¨jdiª¡oˆ©º¸4“û.ƒ¸`þvt[Ú°ö)‡ Ê­ÍÈ1XÓw•C)̲8ÂR W¼Iw_JºOW»YÆ2ƒ†ž5ïC‰¾RÖ—~‡U¢H×C•û_º¿›dìËlË^æôgx@7ßâ¨ËíQWÖaá1ár,šÖ²y?%DLîÌ\lÊ?¿UÓ£‘xû#ɸê·B”ž 9ö¤Ï…‹Ï„YUc˜n>·ÙöÊœŽ±hÑÓV÷›Pˆ0/`%¢Ú[†ÿNãßh×õ«o kõôÃG\œHÙJAÑ@~¶ý¥`ëáþ\<4Ìó©5|ysò;Zhý¹ô.›£çXµðˆ{ìá$óÖÝiìy:T`ð1ž×Ó¦/­Ì÷Yƒ<¤§´žC
-Úx½&‹ë9l˜Â4`à}Ì{û¾û£%yûÝë–ŽùÃü“tìyÓ±ï«aOGáÚOû:>ê¡äW=¯fSÈ]ÞIe–8¦&–ϵ :Œ»{çÍ'ûˆ\JK&¾y´!›@¥®·íÈÇÀÍÖ^ç¡S,õX³`þ9ôNëÜ|¸bÎOô¿Ãç
-lw!„`ÂÈHcb' ƒ8ƒÌ)¾s !€aš9‰¶i­¶§P=ö@è2í@ÛÀc`Å=HP(6ßñ ŠžpÊú-$?éöY”'Š>>]Æ·åyó]œ
-´fJÈÁÚ R 鞊H ô#RCÿˆÔÐú)ˆÔh¡÷#R“Í R÷Ù#{ž’Li÷1ž×Ó~"5PZÏ!ô†®ý Djà}Ì{û¾û£%<ÓÊþDjà}LǾï."b?¤rx=ˆH-$>€H ½ Rß©‘Æ1DjèýtDj´ÍDjm‘o­Ó³
-#í/ƒH òÜÀVÒ?‘èß@¤†ÖK¬&¬hÆÁ/ƒH òܲ÷,ýZËpÎì/ƒH òÜÒr–~‰H 홵?&®¼ÞH-¤§ÕõB-äa›Ë¡£vµP;tXS
-qªRšÅ8àÊøCöõ
-endstream
+<< /D [ 328 0 R /XYZ 78.37 808.885 null ] >>
endobj
-329 0 obj
-<< /Type /Page /Contents 330 0 R /Resources 328 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 322 0 R >>
+85 0 obj
+<< /D [ 328 0 R /XYZ 79.37 771.024 null ] >>
endobj
-331 0 obj
-<< /D [ 329 0 R /XYZ 78.37 808.885 null ] >>
+89 0 obj
+<< /D [ 328 0 R /XYZ 79.37 678.837 null ] >>
endobj
-328 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F71 292 0 R /F15 227 0 R /F62 230 0 R /F68 259 0 R /F54 228 0 R /F72 300 0 R /F63 231 0 R /F65 232 0 R >> /ProcSet [ /PDF /Text ] >>
+327 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F16 247 0 R /F15 223 0 R /F62 226 0 R /F71 291 0 R /F68 255 0 R /F54 224 0 R /F72 299 0 R /F63 227 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-336 0 obj
-<< /Filter /FlateDecode /Length 2971 >>
-stream
-xÚÅÉŽã6ö^_¡(ù¸íx\@rJ§nANYæ0Ó‡Ée~ÉÇU”,·Nn•$òíù(¾ükáËûËùãåW-!˜×ZØåãoø"ë™´‹5‚q#–/ËÏoœ͹vxýtzœs|¤>áðþ$œ^¥Õoá/|zÉw×3ç–§qpÍoñïs;߈«G¤ˆ}zni–ø.= c >ÃiHÁé—ï‘#¡ϼ£& I¼8È )`!R¾%ÈùRçô X"‘š3„‡ÿ¿¿üóã忼P’ïa‚«å×//ñ-JX8·üùûòÇËø¢‘¿µB)§GzA!Ÿ‚øFþµ$é{¢©U¢—r–´t ãù®¬@9ÄjFìZ^Á½eIH‰”"Â+©”zJã¯U˜ò\H Qʵs™• ?«:\幃>àªtåñ*‹ ŒŒ+Rw̸‚åG¡ š)©Š‚>Uå$‹Fi•ð¹æ7"'ÐòéåI:Þ¬•–¿:Š¹Ç±—‚Yv’F1§ AsEC'hVµÐ@&ÝF£käZ8 >'²u([)+ÐÓ¸$á
-q>½êulŠ·Y?½ªAŽ°G#u…aÁ%)ÉI•IäÁÎ-ÙyÑ~@b2PUÛ=œ€ŠÆ ê]ë1­õ+ Df†ºå3=¦–žb—ÞsÂýÅ,Ld]æñíìl‰š¬Å;=b$d`íb¼c^¹ì%{êÂxóVí"=ÉV,ÊÀZ=pÉó’ÉÞã¼@UH@g–j‰Ae”´5bqÙ#w2çœbÎù‘Óo°¥sŒ;1bGY7 |„_öÈÖ.J\Yéá“+r$ŠÍ¥•ÎZÞ­ånYƒ3Ì{ÙZC¯•°<Ñ ¶Òé.=J@^93¼òø9ïJ‰¢Š±’I˜•è_àô‰Ï&hÄ^ð±$E4‹»¢a†ÝÚzbJ°
-OÌ[…f æš46ç”tfåÌcÚ1³r«øÔr‹¸ øƒ‡UOI÷¦“%ùÑ^²F“ ÄN¢îV†0Ú3£ì¶2·«$ ¡³ÊÂ(wP¡ Þ=
-M°[…¦'­BÓ“™BÓ›VY© ©yÉ’ÆÌf
-÷Š‚›q§\­ìeSè<P~šw¡ý̱Ö-º½²XÓ–j%ƒ5]eY*ˆ&CæÚˆ•04”m™C².Ö#²ƒS ò‹×kãð³äTJž¸¦! öåXHÌ1AÚh´¹hò´t:Sº*4Ô1qyešàgÜöJÆHÉD]š¡åë¼RÊ®Ú&
-ï{áQ
-ŒÇj˜ÔšO¡A†ËxôÌ_µ´iL[ÞŒ´¥¬7¥ËH†èçò‰ý€;ÿÙâÂ"ܨf½á=V²ÐìÏ]uÌå†Ë<ËŽrtpÍ£ó!ÃÊ’_S¯f­´©ú—8Gº/;ŽñBÒéM•%­a¸´?¦,Š-O1tò§ÿ–•KÃ<W3jSpÄÜIÁ ëçµeV£‡"dhÆßaði~¢s 2«®‡Iõß^dZQñ-‘Ü{Ø[ZRÀºÎD¡Ø ×°½úõþAk¤¦‹‡œÃaÖµnFeCÝ& Þ3ƒ³Fý@³¶ÑÂ̵Vì]&  Ñ(ÅcÃ0
-.™;j}å»±™Ȇ¶$ã+¥šn¶oFê|øFê¹q8Œ¤~×Á°¢rÑ4ÇUëÕumÊI¸ä/0fï½ä¤#¿Ó‚¬}öDßü@èHVE”AwXñv³¶íÙgK‹¶L­‹þÈ‚êN!l°êÎdí·­Ðõy…î šV3+U
-½è™Ï ¬«šs­ÅЖÖì4†€›à{ Á·O7» pÂ+f½jIjÍ3î…s"'~²Çay!»í›Ñ
-ŽÎFMáXÎœSSßKhÙZîÍáP NÛ½¤f‘à¨Fv 0¾¶š;˜ß´ü†p@í`½siBû#%s“?$jilPøØâ€öØÐïë#‘¨Ðµ£N¥OÏaRõèg°H²‡1GöÈ©56ÎÝØz¢Uéȹ£GB”¡éb‡ª}Óî¡ÕÒçÙŒJÜn?bÄôœ‹Ð¢yPãÎa£ŸI\>h;9¬ô°ëIý]Û!»ëçÖt°¯³›¯$»V6¤I÷³ÙLæxÀ\×>ÇÆÄq÷Ù`bÌq&lüfðç_ðñoøû>(Ï»åqàL…
-Ë0í?ËO/?¦oq1j™·Ÿ·Ÿ9hæôbå¾ÿ:"YMä5kÁµí3Õ¯Dð)_­öòÐöÃ(
+335 0 obj
+<< /Filter /FlateDecode /Length 2932 >>
+stream
+xÚÅ[É’$· ½÷WÔ Å}‰è舮)•"ä“Æ}Sèd{|°ç`_üûH€[2³ª—IQSY™ <‚Ø’-…;ýó$áß_Î/?]½>%‘¼ööôòõA$ü¯N! NÁ+!½:½|;ýþ(¥¶R:#¥ÕRú×
+®/ð¡oÏý¥<3¾ÐÙ×ð­ãÓ/¿>HÌžò4ÿ: ?ÿRgWÞéü<¿=K©> ×¾ðÅkÏsÁÜú\æD9ôµÐXYî1M§IžÏ®}à˜µ¿”ÙP‚Ì匜ž>9íੱõ
+жI—%Òå»Ñ;¼8iŸåøé–ë`BNê BxúŸ‹¦y¸6¡›ïZ®‹,4ÓzÅ­SBË æ:œ%Àh…êÿâÏrùåäé¬È$¡¬©²_Ñná÷BC ¯ýµ[q]hÙ}hVyõmð7އLjý¬‰Í*.åGÑÆh£ƒP1V|H*3â´‡rr܉‰§Á"f"ˆ.¿4³U…Nz[—Û ƒu¤†¥Ufé ¥?ç‘“ªÊ mL“²ÿÐL¯±j1ò¶÷C¨z ½’Î^GƒÿæïŒëúÑ—Z#có&'”PQäÇ—ýx£„vÒzmŒIn¨õç÷`lƒ0°#g„$m DÎB6Äna¢va÷àH!Þ‰Yž4B‡ø},oäm(Hy½q»h°…Œœ–{È'%ŒÖkMŸ±`/¬µóܯ²Þiìájyüòá^ƒüHǹ_§ã8Öé#!)°êÎu|«…’]Ms¡‡Ç@Gü¦u’GYHœC䛥sZ¸äg¾%©ºO2Jë6’‘=hÃh?ûµóQè¸]mb¶ô¶É
+kÒ<ºD°J-­ˆiÃßÊ;¬RC\Û.þŽQjp¦fƒän$÷Î ëîÞ¡›ÛÙÍûv-ÛÐ(íÚÍj¹ ¢öKé?ÄO²-üÝN¤F8µ¡r…·59m#Þ9:(Þ£<·ðÞJ¿Öü¨³o·*ùÑZŽòÜÒr+}Ð+-UîêÇxþi®wdlŒÉVzŽ¿o(弄ÒüNWÊÙt)gfÙÕÁ\.j|ªsa©Ÿ>™¤)kÃsD#„°¸6IqNw©´bC¦ã»¹<¼Ðè\NònYøz‡›
+×s×8H¹q@Ÿ_þ3ºñèO´°nþí"}r° :@
+n0ÿÇéëÃoˆƒFŒV
+Øé ¬örÙynm lsìÄÁ=¤5ø4¯6X›»¡gt°Ô¬§MPàú7轈kI,µrÞ Ÿ1P·¤ zÎ>}Òñ‘Òª¼±ØtL4‰¼Ü²vOÈ°ËÅ&îCdŠ ÷&z³)Š'ÙHËoœ½p¨3wÝ-w.O;ƒ›6G
+¼ð¬ûí·….lPû=î HçÆ£3'»Éaº¿1.›”ªöhª±x V¢äÏ-1ÉIIp}R’¡7ä ê{ŠKûPÁuõ3Õ“Q]o›Fq¿{ŠEGá‘‚XˆVÜCñZã¶ç¡l}·rœ"(¨#<TÃÖ{Ø/‰S%N››øŠAY ìÜ,/în¯Z¢¼·Ó{”;¶£ÁvvR%…›™f¯ŽŸ7;µæ0 ª
+hqvh¶ã¦¤$#S±/¿Z¨K(´ó†^ÏÕ½2I- æ8IsÆUƒÛƵ“<X¨ej½ì箊I³|ÆETÙ=ËÞ­ÕPDa¨©:†)Cáq•ø4j]Í=Ó^êÌŠfŸr ~‰˜ë‘²B‹/Ü‚í¹a(àW‘¦ÃµjÀÐÛ˜°ò=YÀw9W)ˆ¶®xP|ÅmÕŸ>ÙìAîQ(]ã:àq‘¬‘-³qŠöCŸtÔÕ×%¬¦V NŸÊEœõ;¦·~k4÷ñø%ïΞgêå’®nç”äS“¬ºaz®Ûh¶‚"M}U=¦ZJZB°K´GR ƒÕ2‘K^ÏfÙÈÑ ¼Þ®feÜPÎæq%K£|$ö@öTcÙÜ?A›¡Jà(ÚêhEŒiRô¹k£QM“Ru \±ÌFQÊf0G'S—íWl¶h÷f»g
+;Éàz[פ:ÈMÜ ’ô`Ð|^i¤S­Îõ¨Òù'ò*2#¿ãUJ5ÝìŠÏÃbÅ‘÷ „$Æ«Ü!óîw@¹ã«·Â;þ±që›B…–ƒJù5d—=Í*ߪ»êŽ|‹´ã’¶í•ZÍwXÖz:Ë>¬™&ôµâ¹ÕõÇ!ìNèt°˜V†M”ÊAÏK†TñÎ-ü^³ …w¿ åN¿ åÎjAË“~±¸‹°*Lçî@‘Ö’{óñ©º×`Flªœwä_U&|7Á²Ÿ%$»ÑÕÖ7’aÓvl*'ø!µ¬)D"99Zµ²ÌÆu¥{›aKÁœ›ùûÚmøUxª9O.jhÇ| #sŽ!-gM‰j§3¬*C£ñ¶¼×ªÐÇýRÆ8@ÕÔ7`ùŽK¥Ö|Û´RŽü£‚R1Ê4sÆŒÑûWm•sü¤G—î¼Ã­@ Û”—ÜÌ/iÖœáer~Ú¶?©Â]øn¸×Ð3%Þ ÏcO'û»X• õ¹D© •›Ö:ËÁNaÈÑ{oKc5l/?žÒ‚ÑÉwZÚ#'‘¼^¥Ê|«ãÊc½ÞÏ%
+}
+_Õµ£3Ùš·œtä«ÐzØí ÔæSšä(8fY:º¶&ÝøJz)érÓcG€1ÊЫàϾ
+æÒÏÞ–gG ñ ¾Ï–ÛR÷ìRÓ›ZiûlŘó g¡‚1 àþÕÇ ÇóÞƒàØ݆9ßw|bòªƒàóØ
+ÝúØ‹r"ï™FøPRÓàßÅEñ´^•7ÿ88LR5y¯½3éêè<÷û<ó­å!ÝUJ}Ÿðï7€ßH÷šc”l “5íV/g§Q½ }è®Yº´¨‹Þ¼®1¹q˜ŽÎZéÃc€õzïÈ ”‹?äèØ<×ûŽ-¤§|axËWTøªÏã+¾ßÿ€Û‡Ï¯¸´)žþ— ¿rVx…Ãþ}úëÃoåU”ÔA¤ á~ß•tzN@¯£›™¥Â,í,G!jóîpéëÂ]Ù¥.õ}Z&í[½º2˜
+ R@~»OåÖv˜$tv6Äd­¤–Z$;3iò Ý™rgjZ6¹'ºÝ7%Õ+ß”Œr44}ë¤dÌsO¨àܸÖtý:þË¥­®¹ÑÞiSµe uãV{C;¯n“œƒ•ùQêþÆÛóÿ=¤–<
endstream
endobj
-335 0 obj
-<< /Type /Page /Contents 336 0 R /Resources 334 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 322 0 R /Annots 338 0 R >>
+334 0 obj
+<< /Type /Page /Contents 335 0 R /Resources 333 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 321 0 R /Annots 337 0 R >>
endobj
-338 0 obj
-[ 332 0 R 333 0 R ]
+337 0 obj
+[ 331 0 R 332 0 R ]
endobj
-332 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 324.092 644.205 338.817 656.16 ]/A << /S /GoTo /D (subsection.4.2) >> >>
+331 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 324.092 367.853 338.817 379.808 ]/A << /S /GoTo /D (subsection.4.2) >> >>
endobj
-333 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 354.538 644.205 361.512 656.16 ]/A << /S /GoTo /D (subsection.4.2) >> >>
+332 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 354.538 367.853 361.512 379.808 ]/A << /S /GoTo /D (subsection.4.2) >> >>
endobj
-337 0 obj
-<< /D [ 335 0 R /XYZ 78.37 808.885 null ] >>
+336 0 obj
+<< /D [ 334 0 R /XYZ 78.37 808.885 null ] >>
endobj
93 0 obj
-<< /D [ 335 0 R /XYZ 79.37 771.024 null ] >>
+<< /D [ 334 0 R /XYZ 79.37 503.382 null ] >>
endobj
-334 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 226 0 R /F15 227 0 R /F62 230 0 R /F55 229 0 R /F68 259 0 R /F63 231 0 R /F65 232 0 R /F54 228 0 R /F32 236 0 R /F48 237 0 R >> /ProcSet [ /PDF /Text ] >>
+333 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F62 226 0 R /F72 299 0 R /F65 228 0 R /F63 227 0 R /F15 223 0 R /F53 222 0 R /F55 225 0 R /F68 255 0 R /F32 232 0 R /F48 233 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-345 0 obj
-<< /Filter /FlateDecode /Length 3773 >>
-stream
-xÚÍÉŽc·ñÞ_¡†û ´FÖ
-'íýÌq$Œ´‘Û¦{Nnjԛ6Ù%@ñ%êy`$iõÖŽ¨·î4êÓPŠz·D=Œ‰ð[SÐ|lëyEúd‹(n(é0 t¶¨‡
-3Â`—»EŒÇ§ÝÚêÓ›´QV®T…þ×f$W|WÁh¥„nœuŽq(¨ˆâ4±LÈBÐqŒàšIç.68漬J·èÄ&bŸ%¥{Ëš«Gòí9žµ^2äÏš‰gÍyž5>ò­+q ª Ž£>ü®Y‘Ê2 têÁÖ¬H0ÞJ™q•ÞDêb
-1í÷tL8+Yå´Æ„¥ô´JOƒÔ'€/yàðK§Àá×ã9ŸÕÌÁ3
-l7#Šôcý*j@ÿˆXKc"Äå·ME>-·•5éì,5
-•EMáùÈ°iÜK‰ˆLœe…¢¾5ëÄj<â:O,!5 RÐÌä R2ðņÉ&OHǤÓ–K“·–¯¾!a[mwÒ^2O¯g‚änö©äær¦e5jnA8÷ÊÊz*îéóÅ=Ý9
-åù4'pkmˆÙþ÷óÈžC…á}ÁÅTF3®ÍˆKÜ£6Åð"‚÷–—'7v-‹
-ØDÒõŠœ'3Á¤ô¼Ûu„sL5bBê–BrkÌÏ+ºÒtáíd—ûÎÕçÙÉžwfÍŲàT¬ñ† ’) k/­U‘ý8Ñ=%•cÖȭêH÷TÎô UË©—j¼åñ¨¿*ëÓSR&›3QS2Y”:©ôç¥ÒMêë°Ó? ýØŸZçv¼RbS«/ß\Éûn峪Zx)¹Ù£ƒòÖ.ÉÕ^k5F!ÜcàÖz¶ƒ¼ea†“¹I
+342 0 obj
+<< /Filter /FlateDecode /Length 3275 >>
+stream
+xÚ½Én+¹ñî¯Ð<YÜÁ€eœøä4ÈäÌ!óÿ‡p+²¸t«e y€Ÿ¥n²XûJóÓ¿OüôóíòõöËÍÀÉ3oÀ¨Ó×ïo"¼à'q²žI{²F0nÄéëÓ?ÎœKÞÿùõ—·°š©ðcNF˜øåï?#d¹‚,8gàa„-så\ˆŸ ìŒæŽ!GHð™v”(Ï7kJæñÙ(d2þ;¿#½¯õG)˜±j<_ªŽÂ¶Ú0ÏÕ
+ÛÈpHYdsÄ
+â<ˆþL fòœ2¢)Â+¸epð¬lÀ
+î¼h©V+-U
+qwo»º®”dFÌP\qV×çÓâÿœº¯½Ó‘1Z1EJ˜Úotåq¿5…Ÿ7¢yÅÿ2=aø¿ù¦œ'r^ER'ÓÜ*€]„ŠFžzâÎêSYR¾ ±½…"dU̪‡–\ÒµN{«‹Û°^RL©âÛö4™ë„SŠx—ÆfŒ4‰‚ˆ‰í Y$çTÇ!µ™)æEÎ"®WŸåŒBy4
+åWWŒT»½Tv/*oõ)/¢;£1óÕi˜…J
+A.…t•á¶¯VÑòy0³¥.¹ïuê䛚I¿‚D.Œgs¤·.t`‹œön4¤J):Rc
+Ç™¨BáVwU»ª=@kåÑåEGLÜîc<é”[Ë„0k§º>»¸ag¡òIÝ)ne€­ø!ÝÉz7ìmá`_f5ßà¤Ñ¬˜£Ê3 ÁÝæcƒôöçÖ¨µOnÖZ°Ìk-ìqTH¯@5ÆêzÒ@ r²¤*°1·HµÒå]Æ
+<æ»Ñz’KŽÕÀ’ •îšæBA„⨮,epy£°æ޽ Sè(î™å5= pÄÍ´ ‹\þÑrp·´2dè Fè–6BÓYÅ
+Æ÷ZºcJ&»*,%©õZàsZ¯E¦gé´Â ¡IÒV‡„&±¨È3W«ƒ<k Kä9”“´ÐÐi²t²Éÿóýè8dȈ¥@ ³à¬‡"y/ZEcb ²*&é¹ Ÿs¤ I²¶CZyß1mh'õ<)lÒ<Š2]V…ÐØVns˜ž9‘™»Ã!»¨5õÈz똇=Ö3²ÞØìOK)ëí’õ¥ïa°;„zl* Ò B¨B±{BIÄlÖîW\1Ÿv#}šÕi úô†ßí9*ÐLéQ\òýÞI([dp‚îcŠCQE§e锶§Øpž Ž­õjúR¡qh»¸è¡=¦³Z0mÝžÎêIgõqíz”äÛª—\‡)}Ô½°{ð*Ê«CÿÑ°F&èÊŒïªÛ×ãWQ ¡«f»É,s!Öì,õ«ÍÜïÂÓ•Tþ@ƒF:qô¥ó¿ÔMé™ “‰5QÛrw3wpRCháÒ74Â1þ/J‘Ä%É’Ó¾=ÚéJ/Ì÷PLþp¤•ÝŽžÜGíûй[ßG£‚'^Þ¶iƒÄbeÑ©K=oÃo²Ê©¡äŽ9Õ_ch~,oêbÖ¬¯_ôÜ«•8Úï§+»˜W9Òca€ÌqÊ¡õëIÇzÚ…Ï@‡6g<­é;ªì’—à%s¾úš-ÓŸû4q Z‘tÕò?q†„t­}Œ4+EåcâRzZ­'¯ALê“À/¸“ðƒ•!áW#zfïX@„Ò‡!nS¸ªЬœP²ImšsVjqJ‡^¥æs›P?a ’äý´snî$!
+wz·Ïp¥\lð?Ço¥æÌtôfìCþ.ôÜ…šYõ_©Áz+;^*,c™ï­
+Ë[\®³©ëVÁ0úâ`)ÎVŠ­|[·¦MÕ·¼Nç‰kÝ…íG§›©Ö¬1CG(-ß 7ÛE?„Âš× LÚeN
+ë6FŒ|"ŽR$7ÛåCí[,ˇ”œÐn…¦Ñ”‡oBñ} –Ùšu¿ŽîßÔD«~»Ñð¾È\°Þ€:¿or@?WøŽ¦¦pŒ{¸ÀªW6R9ˆGäNXg'Ó1ß-èòˆn n‰ˆé½ôÐ…©Wãî-Y:¼$§"wÜTlí†òlØ™•?Òœj4V®)”ˆ†ÌŠn(1Ò¯„B~¤5?’Ö”'·– Ç‹
+m:;Ò>ï:8«Î;dwN¼n‚N¢à–¾˜ifŒÑ±äõ¶$‚§
+«[‰á2 _I‚ШÆÒ$ïÑ÷ bJt¯~!sí× yvÁn­û i
+É,‹À0׿5þ'»_&e\0ÛF}bM+v¦`Õ]J¡×‚êdÖuKWEõ÷Žx ®0ÕS@%Cå³]¶­2M8ÅŒÙij¥í÷P™¶ÒÒØJµ¤•ŠW¦æ¦õD[I3½bÕt:Ýn<¡Usk%Ÿ²^V2õÊgÄÒ@ŸÛÅ¥ÌzÍK‘ÒìN"¿ëK OÚß‹é/µ‚ gÇñ®§®bÕ2cAU¶y‚¦–°À,wãà°kÄPªä¹ÕÊ7œ6Ðâ5ÅC¥ÎífM~"ÏôÊWMùtUÈŸ~¾ýúõö_r—”§»QÂx’ÒßþˆCõSøâ x‡ZCœþü×é÷·¿ÕéÐÎß©Ewa„ ]]3'Õ…GB÷k pæ0‚b5n½Ë0ëå´ëÖ˜,S‹3q0S×Îf÷†1R†«çN³?ó¸æ]ç6ã€ù4&m‡£]™zFˆš/³6b*k~ê(DHÖüœ”8–nf1Ýœ|v- üF AFDµ<€U™0ûòûÄö…F¼ÈP¯i^úëš;××êƒ!AY¤n»ì&ÌtdÿÀX³ºx9—m«K˜²k@-›&]˜¥þßíúÿ)VµP–5݉îÑÕ.(­?­jÖ‚µ¯ìóv[žÇ>&ŠN’E»=|¬/EÕ¡sÉþHçluß7Ûn†?Ù磌z¯ìª c3Ì8·ok©HÉ·ôÖÙê–™.-¾ù:swôŽ÷3맖·¶ÑK¹Ý¶9ÝF*„gVê©áþ‚ÙéIòÝt<±¶Âƒ#¶óÀú‰ÂÛŠ_û^â_ÀiËZ¹a µ6Å/ZOKzÇ«rÒ®«›´®3®q$’×cævzémš,à™Ì&' 0©FÂ^œyHÉÓ\l<动×û_è)6­ûV" g9Ÿ¨oõº-$ΣJxÅDóõW
endstream
endobj
+341 0 obj
+<< /Type /Page /Contents 342 0 R /Resources 340 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 321 0 R /Annots 344 0 R >>
+endobj
344 0 obj
-<< /Type /Page /Contents 345 0 R /Resources 343 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 322 0 R /Annots 347 0 R >>
+[ 338 0 R 339 0 R ]
endobj
-347 0 obj
-[ 339 0 R 340 0 R 341 0 R 342 0 R ]
+338 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 409.333 279.014 424.058 289.853 ]/A << /S /GoTo /D (subsection.6.5) >> >>
endobj
339 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 409.333 609.828 424.058 620.668 ]/A << /S /GoTo /D (subsection.6.5) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 439.779 279.014 451.734 289.853 ]/A << /S /GoTo /D (subsection.6.5) >> >>
endobj
-340 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 439.779 609.828 451.734 620.668 ]/A << /S /GoTo /D (subsection.6.5) >> >>
+343 0 obj
+<< /D [ 341 0 R /XYZ 78.37 808.885 null ] >>
endobj
-341 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 470.992 301.652 485.716 312.491 ]/A << /S /GoTo /D (subsection.8.2) >> >>
+97 0 obj
+<< /D [ 341 0 R /XYZ 79.37 441.006 null ] >>
endobj
-342 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 498.668 301.652 510.623 312.491 ]/A << /S /GoTo /D (subsection.8.2) >> >>
+101 0 obj
+<< /D [ 341 0 R /XYZ 79.37 266.055 null ] >>
endobj
-346 0 obj
-<< /D [ 344 0 R /XYZ 78.37 808.885 null ] >>
+340 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F62 226 0 R /F63 227 0 R /F15 223 0 R /F54 224 0 R /F53 222 0 R /F16 247 0 R /F68 255 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-97 0 obj
-<< /D [ 344 0 R /XYZ 79.37 771.024 null ] >>
+349 0 obj
+<< /Filter /FlateDecode /Length 3512 >>
+stream
+xÚÍËŽ·ñ¾_1Gû šdñ ,P«5œ“Ý Ÿœ8‡D‡ø’|~Šïâ£{zW`£™&‹õ~±†ßþyã·Ÿ¶OO?Ü…¾yæ4êöé÷'øMÜœg
+|Ê0ñP™fw@súœž7ööôgÖG¼­©OýôÊW«•|WLZ{³Ê3ÁM0Š-Sì3gö ÅÈ%é˜Óz„"߯øš¡:ÊÁʽtÊZ…7xÊ„ª‹›&‚@3…š[VAb]<.ª."S±-“‘‘Q,&îÉ,åY<2Šê”!ÎàénÄB"|#²&ÀÈæô<|nÄ}æMÌ|§e¤R•wáü°g4’xŽ%8ø´¶†k{".Ð<âgÃëTxÊ*”šŸ8²YZ,|ïÌ’¯¥,)ë
+4j¼ni¼>À`À@ Š1AÞ—M Œncòs÷Uí<mBî~¬ÂÜ3Çu!.(†
+­z®(åOáÄxòN¼GV,h{¶¸BÜMöMu ¥J¼tÀ²¿­ÖúTù¥ÒL€ñW÷S‘š30fÜ¥ÍH£*&~(µ[/î[xÚñ=QyOr ü7;…RcOåÆ«â-1¥xí(yÛÔ:SnùÒ4´càÜD¹Êx=2,Í4Wãn¹¯5¥*jQ>dÂJùŒ·ÁÙÝã‰s!UÍåç.$Ã… ¯$øh8¤HJŒD^>mMJ(C!4‘c5ü¹Ñåkó<F_ºZ~ˆr¦C2…ÿÿxÌ‘ÂZëÐié?SP8rôýB´2“}"÷דh¿*­‘9 Ê$ ç9=Œÿ…Ú3îýÚ‹ÿ‹á²EF_91™ÃÀYÐVõ:Õ['ÎiO¯ÂˆâLK*ª$1H¸;êÀý¼5¢egW”¦:R¾6“"¨H[Æ»‘ÔËlt½vÕ„‚Ú¼Ÿ›ÅbÅœq0SXã6aQÃS9wÅÇê½þ<evFá(5uYÂB\[NY®Xàf”PÚ_‚ÁžN¹“ði†}äÌÄÅ-'ö•æ7ä— ãJ¼,g¨œ—ÅÂcox†À×4ö<¬L¶1_Nˆš”$%såÇÝXùÅç×*¿¸¹1Êæ*nˆ° %Žq'¦ød›0Š/,¾&©æ{GÍŒD‰b`“H×`)Îø$ˆÓÍâ\šÙhêT]kÖpeaÈFNHUÎhâVîTÔ
+†é@ÕŒèŠ
+ýfEÒ(û…m¥“‹ß\’Â+‚ˆ®+D6Eï¾p/€6!‚o öxÀ™)É`XŠŸŠ-£mÙ–LÔ~L2¥Î*Ýu«´“û:rªµ“Œ~#EáN÷vºRbs«öÕy7Ýr¦ŸF×›\Õ"K X†¨O°ÜRPhLK{ï²àVÚúš¢e‹¶”‹QZH=µkD”è(Øûe0hɲ°.IåË;%=aD`~)Š9«†BûyÏkAÀZpÀÌ$Æg¬ˆ"$¬îÕ¦ÖŠWƽ+'ÕàLû²èTrA2'Ô9úKLŽã›’ g¤N±
+_æöGø¢|øk”œH.ÄLç\ké{/Ì &of..
+å·ˆÎ$ŽI¨"í.Ö0ä¸ûDü‰\ðŽ!æô•Oz-# %#ìµb]a«
+¶³¾eÑ;ˆCƒV†ðà ßÜ k =Ò5\e¬†Ò#R2w–Ãl¿KÊå³Û„>c§5À·ÎïGáóà]Vã–´.c?Úvú¶öÜ´¼fÛÚÁŒ¡Ò¼R5çCç°¶RÚrHü‹ùÆÐÕ¥ª¥ÒHX—›«LÑÖ|Dß^Mªž•;…©‡!”ö´ÍWÇî‡Sc å” ~¾“ÈcY¹HÌÒ•5«6Å*s˜&'LýŽt –A²K›#[,í0ÿp6e¥±]´³ºJŠasâ«b¤.ªb¼º¤læìêþ·ž}8jáÄ+ݸ®^?¦O²9®t'¦ž›úàXJǤÂ@*m~‚ÒxtßÐN–¡û@)CÇ ©v½Ý˜æDèý½Ò¦k¦3¡òuÏGáüª3éÇkJãMÉ–T]K†1íªg=÷0¤&(Žšˆ®6¥Z4õQQÊ1õŠû»›Ú±K/i
+KcƪÝÿöª2€\‡‚º~n¡ÈËÎxÇÞâJCïqæiæWŽz˜pß¡ºb;ìÞXßÛþóƒ+
+yŠQI.ÌÞ_Lö,øfóÛIšá§=Ò˜/»ËgZ†ü¿nÝÇ¿ž°du{<÷ë´(Ýí÷&6,‡[Ýó8ê\žéÎ<5†:°ã&D²®WÉU¬5Bó•[zc+©J×ÜÍø+`ÒÅÖî/¿â÷Ç×OázÁ»ÛãÊÏ7a3"ìû÷íoO?§/V²–y‹5Z÷£K~Ì 0$:+ûAÆ”_wžÒP¿Ÿ e1¡ž¯lÛìPÉEóüÐ÷ŽsYþ™6ô*Ý RåuÎþì^„Q‹™z’1«ÚíZÀ—“c#KdO)¤œ°£³*F¬¤Þ3'Å(—·G2F²&†´Ò³Gà—³Ç%ÞÊa=if¼Ï…×8kLcâ2@Z=!SÜs©J”ÙpGqÒ£Z†î)SHßÚ0”"ò˜ný!ƒã¸~Ú­È$xCé & C×Ò“‘ºåÉ%—I§vª(ì¥4•B§%aÚÅ`z,¸ÄÆÀÖ\cF« îÂtãذω·°_¨„cŒ€Q-Þ „Y½„b^ÁX0ô³-Žr+8BŒ9f„dcQýR]V’ÖKçÂàÜ´X&¥!Ëý%c¼vµ3³dî-d)sŽ‡èbÄkñ°㔚ðe²:ñÂJ*9ŒÐžTRÕ“®“èG,,ðzº6C|–¨‹ºy~#™Ñsr<ª < ºDìÿ×xAâ
+endstream
endobj
-101 0 obj
-<< /D [ 344 0 R /XYZ 79.37 596.869 null ] >>
+348 0 obj
+<< /Type /Page /Contents 349 0 R /Resources 347 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 321 0 R /Annots 352 0 R >>
endobj
-105 0 obj
-<< /D [ 344 0 R /XYZ 79.37 247.555 null ] >>
+352 0 obj
+[ 345 0 R 346 0 R ]
endobj
-343 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 226 0 R /F15 227 0 R /F54 228 0 R /F62 230 0 R /F16 251 0 R /F68 259 0 R /F70 285 0 R /F55 229 0 R /F32 236 0 R /F61 239 0 R /F48 237 0 R >> /ProcSet [ /PDF /Text ] >>
+345 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 470.992 656.17 485.716 667.01 ]/A << /S /GoTo /D (subsection.8.2) >> >>
endobj
-350 0 obj
-<< /Filter /FlateDecode /Length 3177 >>
-stream
-xÚ͹®$·1߯˜P
-–"‹Å xxÀÎÎŽ
-ìÈŸïâQ¼šÝ¯ç²µÍôÁbݬëIa.ÿ¸HúÿÏŸ®ß?ýt·p "X°xùþÛ'u‘ôO]\Ú]œUBZuùþûå×')飥Ô@Ÿ«”Hßx£{VJ£óµ ô[•ûîù¯ßÿ4ÃÄ ”´æ½ÀsÏŸ ˜x‡ «¯IæÏ=B7R:ÚÝÐoø:@¥½¸8í„2׸R|ì-_ã÷ˆ°è!}ó¼ó/^)p²P1~CË A}£·¯ñzE'¡‚éyÇP#Í/ðLF!‘ˆ¢@úØË¿ã ¾øËÏQrú@rR p~ÁåúžôƒIbŸ€Ø²XøôRD¨ü$t6â˜Øu@¤®+q^} þL® Jh€†iÿ);=ÊH¦d†½V¬3lUZ ëp…-)bæ­Žÿ]æïÄëõ£ž÷Bi3ùæ5:¡íæíÈçŽg¶HºüÌü2KêŒì ïE»fU÷ûéK¾’D×
-IÙ}û±V 媄HÿŒ'\Cþ¶_ž?ú2’ç¢b?Ö^5Gzá~-w”&¿¢¥íl0*NüŽïÖßôŒøžî%Æ\ó'š { ’BYإ̈‘²±Oð#žYíB:ñåÛ÷OÿêlÀ ‡ÄzTƒ»üí÷¨—@¯Ê@OIH=þ~ùíÓŸ+cN%ƒp:̸½gŽøDˆŠ¹Úµ¬´;Šg…²z³×¾ÛDµÆ|/>ãû/áç@ ó.†Î¦$¬Ä™ÉÎlªbÌ$ÐUˆZ
-Ý¢ûµH™nºá…Ñqá­_µ!ÑSåÀOÚ&qe¢³ÈÁ.Þ ODzJxÀÊ…k^…Q_é]ÿœ,+®sšvÐñÊ\ Àw,4Fe¾?gJ¿‘4 š#굌Y»^u¿nuó~­´0NÈG\‘¶Á¥´–Ôm¢7®õéXg¢cƒ-?pÖ‡xH\,yC§84RŠœ“IÎ ¾tg ]ë­ƒØ5h´BÓöãnÐÚ cfºšBqôæsëdªè_&Yö ò;%ªí¬!KzÖ¼ŽU÷†|Ó†Aº‘Â&ôšõ,FÓIý ÑÞú+£
-1ÀŠ¿QØ]áS£a!üha¬ÁhÔ¶ó]¶m4pζZgÁÐY0Y©*þI>ƒ{ÚZ`†aDþ5ûJßnŒRÌoG‰õÒÈXGþÆÓ¯Ptm>Â=õP²jÆgQ2¬½Ì3„&z0±á~=4´^øè牜0–)ßA
-ÝÅxO§¯íì£È¡d.5ß[ïÿù«k5Wb\\9ÙRز5wlªF
-~Æ6òku5Žkg|U
-ƒð¤*jiN*[‚¹u uýk÷Þ3ƒ ç‹ç÷ò‘\¯ 9.ôü6«¿^x×Ó±QaÍùWhœiáôOyg¸vtï(e,4ÕÎf7q%;DÓÅ2õÄßÙì¹ m–¯Ú;ÎÏ:“üv5qlœä ê\èðÒÁ0‡]\R‰òZI•Œv”Õ´Ò·i(U,0 ½™W
-e)W¤[#]©vo,I¿ÝxMêtt²hå„“À=Fë
-i³w9.f(:Q”×3Tc×qþœ&ëÁ,˜Âp –£"#Ø(pí¡$×R³OgG—¡fÇ{h Q}°3+ IÒmï¥Z²oŸb2”J–®Ž AH_tSªèê(ÚÁã$¯
-Ç)k\õ­Ìp~Îgìÿ[’U7>¬N0yØ.@Ãa7p”b»8Š;¾–ê]ké÷s¾”±¯¯c¥¼!ïéL*Fðÿ¼ —¿t%a†t{Þ÷}Ê=Ýõ¸A›
-–ÓŽ-ïyùÔÙô`Žë¬H§
-^Í ª?
-‘ÙÑæ·˜ïùê컳Â?£÷ÑSìÖ§1Œy×M2Óód÷°¼®5#¯ÜEwXhåj-ŒÇX¯+ðÅÂ…~è \ýÛÐTF»WF,È–Wb1Ó± h€² ï?Æò¿?9{ˆ¿uåá±%AxÄ?|ÀdÞ÷¡ä³t ãÜÞíl2ÇköQ‚^m1{d´ÄÁÛ(üãFKÆ®ÖØ ÝŸâÆe™lÊ´ÿ Ÿ—¯Ã
-endstream
+346 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 498.668 656.17 510.623 667.01 ]/A << /S /GoTo /D (subsection.8.2) >> >>
endobj
-349 0 obj
-<< /Type /Page /Contents 350 0 R /Resources 348 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 322 0 R >>
+350 0 obj
+<< /D [ 348 0 R /XYZ 78.37 808.885 null ] >>
endobj
-351 0 obj
-<< /D [ 349 0 R /XYZ 78.37 808.885 null ] >>
+105 0 obj
+<< /D [ 348 0 R /XYZ 79.37 602.074 null ] >>
endobj
109 0 obj
-<< /D [ 349 0 R /XYZ 79.37 672.535 null ] >>
+<< /D [ 348 0 R /XYZ 79.37 379.645 null ] >>
endobj
-113 0 obj
-<< /D [ 349 0 R /XYZ 79.37 281.041 null ] >>
-endobj
-348 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F62 230 0 R /F63 231 0 R /F65 232 0 R /F22 234 0 R /F59 352 0 R /F16 251 0 R /F15 227 0 R /F54 228 0 R /F68 259 0 R >> /ProcSet [ /PDF /Text ] >>
+347 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 223 0 R /F54 224 0 R /F62 226 0 R /F70 280 0 R /F55 225 0 R /F16 247 0 R /F68 255 0 R /F63 227 0 R /F65 228 0 R /F22 230 0 R /F59 351 0 R /F32 232 0 R /F61 235 0 R /F48 233 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
355 0 obj
-<< /Filter /FlateDecode /Length 3179 >>
-stream
-xÚ½¹n$¹5×Wt8
-†&o@ šžÀŽ<Pf;2¼x#¾Ç«XÕUR¯w¡é:øß}°HÎôå× Ç<-ïOº¸xæ uyÿåI\8þ/.Ö3i/ÖƸ¼ÿvùÛ ç ðOr.ÿÎþª+>3œk™îÇk‘ŸÛ×¼ÿyÄ©<Üœ·ŒÏ¾~Õ _Âçâ¾Y26°iœ¾uq.VZ&t¡Suø¬TéÏú5 „¼XÐLxM8p²HW À\Ó½ºN s:„d E
-fÔ¡Í&)ÊðßeüR¿ú9V?…’R`4à£Ë^
-f¬áí†j¤až¯FÏõ¡4ÅTÒñÞÍ4‡t¥ioFÊHåá`€Ìáz”a–Ž”Ì)õÇXk»ÏÇ$A’í1ÍõŒcCl<®é @+ [C­ÃïïOÿY#ØpùçoA6¯˜PöüKêËïÿºüòôס¥²cߎN`IkÙ<Æëd GüÀç^kf­•¦æòÔy5̧øO®˜ó+Ø _ÔþZq9µ£rÜvVÔÞ2°ÅYÅòªÅKV¶¯ù9\‡pŸrrÆ+ôÜŒÓ GÌè4_¥w/±,7´¢Û„þ
-ö%•GA Z…¿×¯éa˜|!"Ò@L–ˆ&\YþZF›4@oTÖ¨q¯ò+iúˆÞ5€*WÓ A’ðB³Ëã˘`.áiàÂ
-Gtâi1¹—bžƒ²­dÒ Æ‚B€øpØHà³°v;làdejÉ`»É;Þ\ú…Û ‚Êw>ˆ}É‚.OZOHK®©]n ­Ìi2U£EF4ïT2x%ä ¯@~DõÖí„]
-‰¬»(¢…|§ZŽÊ¦§–fd4ÉÍË,ìãҭʹ3J+È‘À„â»È|Ë„­’³dKö ±Ñê±{zÂØä—ãló|6åiW—¡ðR0`üg>Ö¾++žƒbñÈÔZ$ØóÜË"e%"=LNÒ
-[BnFAë"NG8)±i?ÎÚt›ìK ½˜–Fþ6»Êç5‚èôŒ’ûÊi¾•”Ì{·2K½ÛS+i™³rÕÔ|2E8Š/±P«îš]5>MFÿªyêV¢Awu¡u!'˜¬_w(§ é ÙQN»II™ž–ÊJS†•Q¤å–iŠ0MMÕC¬æÚÞa).ÛW¤M·º‘o v«fd´)É4”qê-ë’»„t+j¯Ú¤ï£‘ØTŸ ƒ %XùRËȶ/¡˜ÓF¾ØJ”ÙJûæ©û
-* Êe|KbÌÐGÒ¾×Ò¾L«QPŠ>T¸~Àž*Är“¦J/âÛÜ“Æuõ¼Ï¬åµ‚ZX×
-k^ÔfºÊ 0Æèñ#Q¨jeI1¹ …0‡Ö¾ùáÄÃåºÕaõ„Af èõ
-:~ æi9V&Çzgb0ÒcÙ\#ÌÉJ(U)ß´¼˜Ò{".ÝÕ&µâ-áÔå%±ÜÖ&ˆ»2ÈÆžÒÂP&e¡Ð˜Þ4µk–
- >è{,€ˆ÷ÄëªûœðüI’Øw:¹b”ß©à‚æÝU6SÕ>û{ÙìºÝù3ÛéšþXxw_³*ÎlT¢Ï㼟î•ó–’°ÖýLïIx67LI4L+ÆÝ6{ ¬Øq1Swié[õW²£¶i–À7Àd‰À)ãGúîÅrí¿Xq¥®ãò~‰0~·UË)Á²!©ÚÓš;uµ&”0.ÚŒÞ~U(5SÎærÉÕçøÝa¨
-$„ZîÇGnfƒA$1Réý h˜ ÀŸÞ¥fÔlB³?¡’ Íl
-]+*ZÜh®©1/ÌRÁéÜ(/þãûØófjWÇí]ë
-"áLßôÃÆêI¼‹kèVm林F)°`[Aîp­{ÚÃöé°§}go< ‹ûªévÃì1§AóXµ xÈÚÃ*TÞîíé*î²ß·`Ú7bïÍOëGêÈvÀƒ mðOq…Ú×DcU–ü^IØrîÇÍ ç5†)¥F|kÈæ¼Â}*±Ì³Ê®°Î5"°G}¸F¼%¦ªLˆ,K±:NW÷4¦3ìI­ ‡)λ;‡:Vò±˜ •¬ßAŠNÔ©(¬ï¤±Mð3¢Ç&œk7œ¦.ÿ#Ôô¸Š×)ò¡±€0(hPIß®xi}‚ÎàÕÚ‹M:¯wé¤ã.†e‰Î¢SíOêœÃüm¶( ¿¦m“ U%´×6>1oéö@ ¾ûž5bÓ{³¤û@kŒ%ߣç£òßA+SžA=]³<húõCÈ~ê¹ó9X "æ-6‚m€ÉF`˜\¡+ÃÆNæê°~ìTÏ€äÔ±žv7‘¤#'£`ºJãÛÐsá=ÌsìX e†QyÛGcrm1B˜­ÊqÏf|ˆyõ{örH©É0ÐGž+éQàÔH[vØ
+<< /Filter /FlateDecode /Length 3252 >>
+stream
+xÚÝËŽ$·í>_Ñ?°²D½Á
+bâÿ?„’H½JUÓ=Óã
+íOÞ)!:ýøýôg)ÁàŸ–Rþ¥4øi.øÎIiuyv¿+zï_þùão3L…’®Â¼<ÿòÅ‚}NߤT_ñ—3A³šÅSàë
+ŒZzãé©È¶4:íu EÄÄ»²"PR¢5>0ýäcÀé $²jв'ÎU I<VàF·'È4†—¬ Œ×¼ñ5lðÊçtèæÓ•²™Ä­Û´É CËà/R]QpžÉ•ÄÄÀ”·x%9·eSÖNâ|YWRÎ"µìÕd…ÓÂÄNoø-ËÏ›‚¾9wú\ÏJ^é„óú”×QgC…ñÚùÛ¾ä©jJ|nZÃïÒ_¦6´úzf¸ÌÌÞ@ˆo†¤
+¼¶÷‡ ’—ûë™ñÑý>Yq¿Òß™]\ Ú*¡ šp©˜¿5Ë.ôo‹ÍãáЇ(ŒŸ`¶PBrF2›\!¶·)­bQ‚ÌÂBéegÆŪŠBXe?Ml¡·igÕlö©™ë—f¨®ó"åͬ­ím‚ÄÈ™sc‘î|WƒÃ–’ÞÚsYQü:ëíÌ„‚éèû’(2)žÕþ<«?ƒÉæI.–ønšob„Wä¯ÔIG÷YŽÿgR„s€”_¯¦ÀÈ€b7UŸZ°ápF«ó
+ƒ]Ph-mra½)"ó²ä”òhSË`KBæ€ju.®dM³¡Æ…[t¬|Öx²ÉH#óNÆD×7pm™c[Wí¨ìÊ.¡œs¥óòžs9'Óf¨)áhO˜ÊX¶‰¼¾ó¤1{‚И…«¸á ÇkÌ÷k^L4ä7Ÿ\ßÞ쓵ÞfQ% ‡.¡¨N,-WRé ¡ ¡¶‡‡*xX)†DÅ
+µfg© htì.‡ƒïÎÚ+ŒìÂ%OÕ»ç¨Í)¶éý?‡ÀüyÝÆ£‡Ä”OAÅà§Í•ŽÒÅšš…ùl
+4cöpŸÈp]X¿çîAÎ/Rq<RW!´?ê&ì±=Š|F,û{•¯Ç?S„ÉOc]CŒGõéXV~ëÝœƒÎer>9Ap“éq}aŒe}zíÈ…å“wD¶W¢`ç6¬•å¨)û‚@—ò×k*]‚ÛѦ>í&ÆkÌrvÔ™²j¾Ÿ†£ü˜mYÅ|/O-'>TKå6ÌèAG®†æ€5´Tïȃ¹ã”\6ÀæÔÍM¦çÉn°<¯5£ìÜÔD2wXhô´Æ}¬×ø ÅÂ…~8%ŒcÌeDp{eDB––¤2b¡c•Ðã„UaNhJºÄa|p}|¦Ô¬OgKž†ß;ñ”„µøÒMÒZSCwéŸ:sÛZúöÝÄ+šw'tÎ×M?ù ×F¸Þ±¯Z»‰û+?•ìîé”S¯a<õ®k'u
+mrf·^äxÏn¯¢AÍxÍýÒ£r·‘ \€µ¾.-µüÄ¥ÀZ,­úVÓ39Æÿw
+Zȵ‚G·`\AÂCçCðN(‚ñšÑè<B„͇hmDlý‹‡ ˆh
+D%ð>ÿ±I• È]“*ÓÞ;&U¦oNª
+ÐCÓÝžV-ì0(£7²ßË)¸ûñZõÙÇBp»^ö;“×ZÎ.•Ÿç
+t>ú¹$ry"¼k^Åý~a*¢l…­0š;)cr
+m˜ãn£l_¹ ðûnƒ&‘<Ùü¤»Å:^Õ*¯Kx=Å©{\Þ ³Cž;‹f åMuZõfÍ«qÆs1ô{DïÃÛ…4}Q«‡pY <€01ôw
+æê¡?ºë~¡pÕ†ûÅ\2l3%}‘q˜šÚéŽ)-<¦¸3æ «ãøUØÐLýï·‡K•u†°;\þœáÒ¢ñuÂ)ORÞ5pªtÀËA-ú0²d‹7 ›µ.!{Øy°˜–E=Ÿ¶Ww\ÐtÜÖ¼ËÀ=ÑOtlm›êÂ<®Éoaœ_(]–•••Q·jsâ“v œ2·ñ鸳ÞÔ>OreºÃ³/ûUÜcª¼áBlmxWÈ3}¯ãn×ù[ø@üÆBaÍCÛs±—³¿mHëWÖ´®HL-à랧ßmKì
+—_Ótrs™cûbÓØ8/Z1”Ë.17«æöS3˜Æ~7OÅ,HJ¼»¨MAÞÂÁèlQR]äÓöf_G×}ùu¹Òw¦ëXHe/%pS½©ãJƒB¼ðOŒº·s§‡ÓhÅ
endstream
endobj
354 0 obj
-<< /Type /Page /Contents 355 0 R /Resources 353 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 322 0 R >>
+<< /Type /Page /Contents 355 0 R /Resources 353 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 321 0 R >>
endobj
356 0 obj
<< /D [ 354 0 R /XYZ 78.37 808.885 null ] >>
endobj
+113 0 obj
+<< /D [ 354 0 R /XYZ 79.37 602.797 null ] >>
+endobj
117 0 obj
-<< /D [ 354 0 R /XYZ 79.37 545.032 null ] >>
+<< /D [ 354 0 R /XYZ 79.37 166.052 null ] >>
endobj
353 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F62 230 0 R /F63 231 0 R /F68 259 0 R /F15 227 0 R /F16 251 0 R /F61 239 0 R /F22 234 0 R /F31 233 0 R /F25 327 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F62 226 0 R /F63 227 0 R /F16 247 0 R /F15 223 0 R /F54 224 0 R /F68 255 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
359 0 obj
-<< /Filter /FlateDecode /Length 4080 >>
-stream
-xÚÍ\ËÎ\¹Þû)jÙA`Y¢¨ðÃ@W—k€Ìj&Þ%Y%H`²É<þPwêrNUýméF¹\çèB‘ù‘¢,…¹üí"éÏÿøpýúáÓݪ‹ÁI¥._ÿúA]$ý¯.Ö eñ⬒Z|ýåò‡7)µÿü§¯¿û ãÔŸ:Ã%ˆ`š²Î.íæ¾Ö}ʸR }ìåq‚úã¿ÓLz7“%@ée.I´}úÜòo¼=E»2 L°+õ©÷§;ôrÂÃØë‡?J­~“{iµíeµðDÆÐë”>`¶}œR‡y&)K/µïå©—„yUê§Ì¸f^Åß…OG4·…“~žßHõé7gp ûýß){@këRMfªdŠüH‹1%m“¥yE‹§¾ßDk¥`;j,zâߟÓÖªÿãHðÓçWY¤P¦«;¾Â¢©¯{ðÎ:¡ã—ù;2òà±µ-^+aÝB»iï­­r]©;Uw… ”6C¯äË
-F¨`…úîŽ}¿¯è¤1Š&â9e¬ž)>7•Ã¬×?Ãp0:a§.|¢ƒE’e÷vé…ÀlÞÁ|d§u´îÛùh/cVÜþ“++©‚1«8eµºÄîë²ï[ï€Ùꎽ9gm ‡Ñ€rÖþÏ)kATX&²Ñ¨|ãý „tj™+îa ]1oÂ…TÐio†5¡!²^K!Áu—U8A¯v½L¡nìÕíÁ\Æ“iŸæRÍi}º#^P¯h¼›5B{Z¹<Z<ß_¾~øßu)äM­·—?ÿòá¢7¡Ïï"ƒ¿ü3µý…D)œ§¿ýýòûÿ•±ÞÍR(Õ[ —}È„»ïBz?ôøù!_0¨¡ÇoÕ9bp’´w4J 1ÌBàÈBd^©§–âÉ‚?vy°o2˜â]~û:*!$ØÌЗW|ÂÐõûº„qªo
-I>’‹’õü˜Ý’5øù£VoÕeŠÀº–ïÛçôÞjèLì~輦H*O# S?µ6×ú¤ØÁ Õê[Èc§QÊ<ÅwWü±<-…ÎëfuêgÔ[§™Ü”R†?§Y[[fPŸŸ™k–“®,Þ‡…
-4ÄøFÅ}³—Ø\ø„F3nñ©*üª"ɩ퉋ên›,ÀÑ3'³;N3•ð¶È |–Û©³A AºiM`3w±èpÜ)´’Éï̾#Ò(÷ºº¨yìʉÊA]øÄ×ãŠ"†·ªSYÏÆ1R¿[ã`âíç‰p¯ÌU‰‘yP]˜ º
-Þ¹&!Å%O*@þÇ;=`#Ú`¨ æ$®Q,EüÊ–‰ªÔ¿ªB}OLkJ¶S¨o"kó&«OÒûbrfÆ—¸µ0²R`8_ò|EéÒ8•¾¨´ [©Ÿ Bšé­OÞ¯ÂÌöíÕÉÏG?É%ªqç =–‘¨1’ç!ó»ŒvçR:1b“®‡jÙ ÉàÒÊî׬ìñ;™S­¹\e}Ò lúU ìýú
-Ïø'© 9÷8áÇÌÖºE£õ%è=ù‡Ì÷ß²ø°[çB/î•Œ
-Ã7²O
-ªT Ls¿ (å I:¿Po+ð+—å!”wï›ä}^QÜÜ«LNJŸŽæš½n“²«÷*öÊkn.ý©¹ÌhLVœÀM~Af·ÝÈCf7?ý×aÈÇnSÓžóø~L§„ jåULGð`…c:-ýL—[,OO[ªG¾7LÅt<0Sø8L=ðÛŽÀ.lKÑQ#¸©’ôÁoYó•)î’Ÿy[£¢ÞÃ=’i×&|+DóáÕÂOcöÒ¹_w‹œsÕënéCM®Ãû¹ê©Â5³'%ÍŠïStêIpXR#¦â©8VÕS}í©ð4°S­@líÉ"¾ž80îmN÷õò©ÃtCêu`³ÀM6«Ï1$z̬ùÉ÷L>§‚ ˜%õÎÈcz‚‚‘i´¨k=‘08ñI_¬IÇÁµ_?Ùú¨ ìlŽYpq{‚<‘ ½üÂöÑsKÀrÚf™fÈi/C½ÀAÐdØüøïäŠ4ÙC Ã3Ïv«+!ê•T,SdjjÛ¯5W^{[Ø (r¡=ÛLSZ˜Œ„*™\SŠ9í‚^ÉÞÅb­½0¾BK¥È™„Z*¬„k?uc€óéÐô9Ë3E‡Ê 5Q ÕYp„ÂÝló³`cíE$Ë!oÍ—i…S~¦Áê-{)nSaÃÞ–*/¬ö¥‰¥5s1fΙc íµŒv{pTM>ý˜†fÀ$KUÌO&ÖÁ«Ó/¼t»éëÆk~¥œT<2'F B¦/Ò£)8RaËŽfæ| YÎç¦
-{ëy‹1Eò`™u1%°8u¾h(ÜÑòNqÄ°ÞQP7x°u¥KZ±lÝt£^àó[x8~ “=m)z‰Ú?P>l£GÛÇxŠ×—ö Š{ ÕζÀ†ü[0‰
-x¶·GÅüg¯‹F ùÿ~Ù¨e7éÿ¹,—hM`7êó±ÏƒˆVQ8K¤gÊ^ð½_Öö„C­È»ànî_czO‰ó¨·ÊÃ]$“yÉkyù©Sî÷£¯íÚid“I5‹UïJ»öËOf,K´×6Ö6ÜU&<1”-ò‘†2¼Y76šâ;_s{ÎñNÇv×eW<ÔÁ£ý ”€^vgïŸ}uô5A}!Òãs«yw6þ„ýºÜm´ˆó‰bÃýƒ¼EÆT8½} 
-«Ôxÿ ^ÝXëá½dLUÔdiƪ°Äɬڱ"»8“öKÄ¡’Ý k¬IM‡TQ~R; §­yÜÊw4Ìñ†ç³kZ5Û
-öãíÒi¾Ãó»½)«}ª+g*mý´‚|©äå£ù×é¹Üž~b:¡¢°Ì¥ÂÙ±ÔA£aºV$%ßUä»']+Hµ%Ï“ž+Ö*‚ªz_¹öÀli«Éu®šURèyi³ëO[m´%¢ =¢i§– çV<š‚òØÝŽ†¿@‘zóBOÛ5¦—VM&ÌHJmÏŽÁì 6è]œò6¿Uì{hìÜŒ^z¥×lM‹‡ª½€r„W –ŽÑt÷Õ²¿ÖoᲚD 8UrGn`·{ˆŸNž:OªšÃÛÈà
-Wº¹å”™°æ¸Á¾à¸fáÖB¦v6‚!”h瑲RtìÕú
-|óŠ·À~õôùÕζ”Ï/|*¿Ô‚D53éôÔíÀök ¹Ž4ǷljþXËɶìX°?¢©f±
->Ì£a±kÖö5»çtÙ:±D3=…&âW/<e.ëþO)LŠ d¿'4×XÆò˜ÐËcž‰ bÅSâå82ÞSÙÜG“îö¾CF
-ƒ@Ôó¸¦a`ukê9Gáø6#q(72´\@éazo€Â Ò^{å3»Ó‘§-·6zãä¾Z5 O»UbgKÛj‡cê 5á-cÆ#gœ u/qñ˜³$nk«ÃÄ-µ`õUå×Ïóh<‰Zýk~3”àäqÒgJ(ÅcP^v’ŠŽ÷k7Råêw¿Q9ÌÌe‘ŸŒÔU¾T+ÍàÈp¿¨§M÷±¯4Ÿeg¾<ˆÐA
+<< /Filter /FlateDecode /Length 3538 >>
+stream
+xÚ½\K#·¾ï¯ÐqÆpÉbñ ­VœSœ½9>%HŽ$—äç§ø(¾šÝ’ÆãGêf‘õüªÈ®^yúûIž¾ÿpþöáóU™SÁ‚ÅÓ·¿}PtCžÔÉ¡ÝÉY%¤U§o¿ž~z–ÏRª/RÚ ¥¾Jy=פ4ôÛ^è>}‡ËËbxÎwÐÇ_þ9ß³ñø~¼‚u´Á2§lóB™}þæL1øòq™x!.s=×a×<1^⾚¦­‹ës^8Q_ºét#ð/
+×NÇ«Ž¥ªᥧyºÑdä¦ç-‰p‰âlTѯÂÓâ2+£)âÕ¿üüí‡ÙŒ„’–ÍH³g:mD©Y¥Zëç¬è(@þ¥]á]Ž&3-$9ÔÕ–—<*Re£ó¨¬óÂ}È®ÔîæµI>lÆOœúæ<f)©VB9]%ý:Ú['¹Û,ñJ(WzM4©z:’¢Ÿ4]ï1‡Ù¦Å]ƒTÊ°ô‰ÛÏW «p0ÂÃ̾–…h£ QhÐ3{^›Óé*pïVyAùE·_¿ôB²ë9›ÆAôxv
+gí,‡Ï½!É(gŒ?ô?-­ÆL³+ìdϲö2Gh[ÉüH)¼Þz@:DËû™
+¾$*)LÌ“ôÿïw—Í®ci ubÈé†mŒêFfU×T©™ˆÆ–5¡%Cšþ—ÓðóuUe@˜`7ëê¬âˆ\)ð.Ù¤÷››>ñžŒ±ÈnŸ3ÓÛæÙè±jžSÁF
+íèì4-K­
+xl‡8ÆaÑû IÙàDЦ‡èz^ò=À
+DœçÛÚC_ø[ô’[\:/ºÍ¬;öH>ñþö¦­ˆŠ lD•sõ8ÉßnÙËÚGm&‘ÒëÆfœÖw´ƒ„¬‰1ÖÅ øˆNj<2Ä8YµòÆÜx)”Â*C=,z 3ã\5bîШÓÂP =Í€ål1+ˆ«úþЫ@÷ñ @«µËçå&ŸiWŽ­|e>«IMxЬà=ån»Çaükûäª
+¿aO}zÔ=Uî¶:µøãHû®€2óµØ™Üò;öä™Ëc`);™žŠååXÐ$S ”êY iDÂJ‘o@‡¢žhÿˆ!ÒßWÆ¥ÞV&ޭ˨҈(j´:6l<!&z¢ÏpŒÎ
+Š¥i[àE^ %L½»HÏÂI?­n¤ú| C´Í6h²(¤5Áí,æ@È’-MÝÒZóˆïN´ï
+BãÜãVû1gzCt›È3 ‰(h t7>ÐUû¿©Æ.µü°ºÆºßŠ gÝq~.»ÿFSª¸Gtª½°íœOëG´:Òþ¾˜9ñ9–ÜrAÖîÌñ1R²~;ª¿g3tÂN$ýB;BŽ{»¡*‡0‡ë.ëæËõ(‚‹Ž1»lûùã¸93fkÎÍ¡ÏÚq©HL@;R×çc;ª t1¢f¯Ú~:~FLÛ6 ¥=ä;G.èx¸§6k…Ýøò•øÌgÏð&œÈöf|âìEˆªG-йM…M·VT¦p7RÕÔº³–¡=x˜ÖR5U}¾RÅGõ¾WñÉUÿLÛí!u ×}|ýöá_ Q=ýå×?ýLwþJŸ¢Žƒ?ý'ý•LŸ³ËÓ?NúðÇÜQ¹Çs<‹îmÈ|Šõ‘Ëc×$(¤÷#É/75ƒA$ß©ãBÁIrà—j¥°³ D¢†hßbï’ÅÇcS?PÜÅ›\?uß=^‹ÐÀÖ3CüúHNHß”0.õeô–wî÷0ú¤TlÜRn+3%\w(Ÿkø´ýx¢%c­ó:¶Új5µõM]sé~jepfÑ‚›¯æÌ:æÜZ2[w_½[žŒ¤YÎsóƒß·'8R¶®ÝFñ¤—èRC óLiªôùðuZÕäŽÈqdifI׺§ÇG‚Â… œ¿§o©õ!¼<¡‘Ï‹îê´~ßýÌýy<i1=%ç¶÷Ü7 ·êÓæm·ãa³A V³L7ÏÑwº>”LygÖvm@餞¥³Ý³}lM²4q_FyÜsߟÍÏ×j×f£¶ƒg &Ý–Ô|úÎc[cmü–ùÑ|ßv×_!€*+ 0ÔF±9^™© ª7×h–b~e Eâ*ѳ‹ ð}RZu‚ÚvŸî Ýå銅9³âWýº…gÖK^ÏßÕ­ÄÜÏ=ùõ*w_ç+owáûÖnŒñ´ÙØ%ºqÿ0Œg¾áÆñ1•#LŸg»öV:
+«Ô¸Ÿ%.öWpä±çFvOÊ$.žLÚ.˜Ò•¡»ƒƒeó û‡AÜà™†-™ù
+´—èê¼Ü=Š¦+Âý¥Bš·U»Ë%%¬V³Ì7Ë„µþÀãf¦k/îN‰0©¡×ÁºÜâµ@³,–Rkïh#=³z³X M¥œp[·KÇbJ*}O>¿zäÏ›¶Þ#æ‘6(ÚÀf½EãÏLXâÊêtæر{Iƒ¶¸zoÂ`ÿ.ç¥óþz§º¸Áù} ÃæD®F†;±ÅæÕwã†D Üö†‹éDÁÍÕ–h—Ó¢´JÛ†æ'(LYßÎÄÖ@Vߢ¬#†•¦ê­¿s$k>.Þû( ÏÍŒ ±%t–.èWöWñ-&£æõv³ÖÚ‹b“š ׬æ Îí”}9’–#kþIéÂû°Y9–#á¨ÙA4Ú·‡­ õ½hù¦ªqͺV <m²îg=¿Žž·¯•ß[šbÔÖ³ ì³¥[ä±vµîº¥-ï_‡îýk>°à4â—éowXÔ×*¡ß‘'ê¾l°ÍcòIö¦QHyüªbÒí…Kó¬”vÀn²24+ò«Z|V¥K_fOÜÞ/6Åzkêáã”ó‰þ@«FìnÒvßCG·Ñ—™9œÞ]Ÿ_Ú ýK»`ºs—ök8•7Šäð<*˜ë•·é]Y27Ø2w `‘a6.obˆlÚ/;Ï”¢)`íÖ;•S]oÂTlOßHñ È“4ntñåPƒ%8h·DI¾/8ô”êÐŽÿx@<
+¤kì iëÜ”B}èMåÿÿ
endstream
endobj
358 0 obj
-<< /Type /Page /Contents 359 0 R /Resources 357 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 322 0 R >>
+<< /Type /Page /Contents 359 0 R /Resources 357 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 321 0 R >>
endobj
360 0 obj
<< /D [ 358 0 R /XYZ 78.37 808.885 null ] >>
endobj
121 0 obj
-<< /D [ 358 0 R /XYZ 79.37 689.086 null ] >>
-endobj
-125 0 obj
-<< /D [ 358 0 R /XYZ 79.37 576.152 null ] >>
-endobj
-129 0 obj
-<< /D [ 358 0 R /XYZ 79.37 417.923 null ] >>
+<< /D [ 358 0 R /XYZ 79.37 302.535 null ] >>
endobj
357 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F61 239 0 R /F62 230 0 R /F63 231 0 R /F22 234 0 R /F31 233 0 R /F25 327 0 R /F15 227 0 R /F59 352 0 R /F57 361 0 R /F44 362 0 R /F56 363 0 R /F53 226 0 R /F68 259 0 R /F55 229 0 R /F54 228 0 R /F16 251 0 R /F32 236 0 R /F48 237 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 223 0 R /F62 226 0 R /F68 255 0 R /F61 235 0 R /F63 227 0 R /F22 230 0 R /F31 229 0 R /F25 326 0 R /F59 351 0 R /F57 361 0 R /F44 362 0 R /F56 363 0 R /F53 222 0 R /F55 225 0 R /F54 224 0 R /F32 232 0 R /F48 233 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
366 0 obj
-<< /Filter /FlateDecode /Length 2801 >>
-stream
-xڽɎãºñ>_áY,.ŒÚ­Ö’kß‚\“Cÿ¿¾âRÜDÉv?ÏÃÀ#[¢jg­l)Ìå¿Iÿÿñãöõã×æÔÅ‹ÅZí/_ÿù¡.’þ©‹[„vg•V]¾þù×UJ@úlRE×›”v•骮ôÝ.é>z)Õý†ôKÖ…ûüÝ–àÞþýõ¯‘BIhñ\VxÏ`‚qÙô]g˜WxŽè ´Úæxô"ꎿLg€‡™¯Hÿ=¾§ðÁ åñøÚ%y´òº¾VÞóyÍ2ëœ
-`S…¸5|g$£>I¬•ukÆqKB´Œ§¬HfPÞÊÛ¢²”a1@KwdQ
-gh.‘Óÿ]ºŸÿàQh\Zm2Ó Ga{Ðl .k¶!ù›a­rÍ2Óë$XŸ Ö½dý¸‰~œú>uï=uÁÂ:+¿+Tb'P¦#>-d'…ê=—õ^å.r¾>ƹÃn-Ôê»z¹¯ŒC2_³¥TÝ“b”@W¼d1Ì%{KÙJ‘í÷´E«:ÿÇ>-l‚§üƒ…Eƒg°æ>nKyasëA,ƒèHp¿6e. Å9°¸sðUßö™i\“’pd‡j³ ‹cŠn9Úøä2pÑ×t'ð¹Ý}ñºGîši\ØÅ©$ßÂ'Ê=ÇT†SWžÜYÓ®Êwo sqN®:§Ê%;¿üë–#¹¬åJ™Þf¾uÚ
-.œ ­ém'ߌ¹²¸†Õ‘Š/Ò¯ƒM‘èký£ËÎ,á P˜ZÞ6(gÞP€.îóÌM}²þl
-$G¨ØTCºS%û";›‚Ÿ:e…§;*!‡Æˆ¨-¹Q^û¶­Ê5Õ›‘×f¥^Úd “
-¶Bb¦éy6ZvcÇ™¸rHUʉàx¾_¦ò†FEfHX •£®¾PûÞR{"’£ä£®`+lA}«NÈšÕ”Úõ}Pip§>~wýï{•J
-G7ýN&!Â`(ýîºC=ó»Ö£­ƒf0£ö9>Éý,ü¥2 ÿÅ™ ûb%û#yÇ++¡¼Úɳl{¼ÄR* a_Tb=_"Õ¢'bÊEOùúŠÁªL:~çŽJRÖ¥»^qÙ½¶r=-¯È½‡zÿýìDåó¶ác3y:ÿBŠÍu\híA`íA;»gÏ/Âkº@¬›
+<< /Filter /FlateDecode /Length 3269 >>
+stream
+xÚÍ[ÍŽ$· ¾ÏSô Œ"QÔ0`z{Ú€}2²7ç$Î!ÞƒsÉë‡õ_ªêš±ø0ÛÛUE‘ù‘bËË?/òòÝÓõëÓ_îÊ^‚,^¾þò¤è…¼¨‹ B»‹³JH«._¿]~z‘Ò)—R{þ4ðú¬¤”ô
+,}ÕR"а@ÿ§çx£çîõY{M#tzS¾®Çcþ4ôÞÞø¶<ãÒP(X(³^5¼t´Õ]Ç7üÔIþL«K¦¡¾äw‘®ì¾ª/<–æ¨;¾þüõû(&s &a­)b2oÌ{¤“dpÏ4 ®h("(ÜPÁY:‡œ(í…¶a¦’ö% ^šT‹D1¸_Ë’x–]úŒ4 ¾à'iw×&Y¸•DUÝ-¿!®Á%Zy%Ùéú–Ç\ÛXÏšäZXíTƒ6ò:°À#¹i Bkµ”[èv¥R$pÍÔ¯ü×ôœìóˆwÔN Ù°þùÃpÂ8µ®áÈkä²Ìé°‘ÿ³ÖºÓd=Wfd¡±<#²^h",tíåÊ GÜŽLcÈþ&ÿéã£
++ƒÕ†oÍÒ
+·è ²we]M椼p¦y©4g#·Dî63*Oâ‡Í$‡ç{%ݳ¡ÚÎyt*ü’Ø“ÂÄpFÿ~·kV̺ VxúìNh^?vÕì±#!yZ.$Òÿº _hî˜lPÓ ŸÖŒ–l¯vt³ä~Ï…÷PÅ]OÁB5ÖQ ÛïOwÖúh_{kÈШ­êOú½å€W†j‚AýA~ñ¤¦Œž¤6­ýM)¯Ep~ýÍv¹µïDÅ1—éÈeRŽ^Ò+òáÞêä
+\Ù[1<»÷Pk×Y2“"ôî>ƒ²ÛŠrY·{úÿƒ#¦¡3ç<~Î)áÈ
+f*…sV(€™Jç´ôàØH<=-&¹¶àRNo•ÕzŸaE @0qº “Ámr^7b‹¨²1\M©2ýÐœYH9Eáª5楌.ø¥Ÿá^&,·
+EšTäxæÕne'Ľ’ªSÙmVYþF»­™x i¶…•‚¢jÊzºÈTÓX™zT5§94¥|ÓnÀ«§¹Z_ŒÖ”Ö—ÉJQü2 µT ÅÇŒxótZzÎóLÙÅ®1Dn —\³1àˆ„[¡t€€¢öf d­°÷èˆ=­y2-åvvæÁê¥x)oSÚoÅûç)qh‰Ã‘Ó$ÒRµ«
+ÇÂ1†ÎÚP»ó`)¦ïóP˜ìªT;ë“‹uðÑåƒ^ºÕòåàÕ¸9“ÐçÜ åm„L?ȦÜH…¥8ª›ó1c9^›ò#m>º4Ù-ê¥(ì­Õ-Æ
+ÉC€e¶›É‰ÅaðE+@ኗOªiwéèŽóÑcbŠ™²ÖúÿžÞ¿>ýÖ2‰ ˆ`hÀpùÛ·4ÏzR_bM™Ò‡ÿãòËÓ5<(ø+é¹""gTŽðK‹}-\Mßê…ÀaRãÈœ”›×(`ÑìÕø•åb=¿FœcG}R½}óeR­n…ÓøÍ >øíÒß<î6È Á»&ƒXÄšGbÆ$™ƒÚ™¬…¹ˆux·ªÃ#ö5éJ5>¡´Ë!•))}i5Ñ
+²ç5TÙ*®éóÞÀõJ.Å
+;2t²ÍB@EOu#ð§RÖë&î„ñæ 9hY„w,8#¦š©.kê”Òø†ïߺسî\[{Î0ÍÍåùû•¾y¥£Ó<Ž¬UU^a(“uÕé~)¡¬IC£-ó©—‹¾Œ@7Sê/"“Tr}k-·!UeŠ~Eq°×U¥ •R×,k·^eÕ'l,ô^ÒB?†'ã‰=A˜Ó­WO󣾋í­¦ÔóîÞJµ‘¯†; V,UÓââc=‚…5W 'Uœ—í ¶–1»UÚhµ5ˆ…’#¾taFšÛÉ…MÍ””q­8×ê/€NŽze5¹O\P
+`#ùGW\ñrc/IÌÓº`èÃ͵¢âÏzx‚ùòJgšé"w/R¦u
+TáL#ÉÃ}/éK-FÇ°G>š`ue+ô üø®ÎËÆ
+Ø¡^ÐEÿ‚t›—QáTï?Ùh6Ñ’8\h/h­Ü‚VDuÞ©#Z'ýñ¹f8åb Lõ1ð>á“
+ª¨å|±–^-w á¢ãpßjÕJDÅ’ž…tØ"±¶Ö ´ÙRšóÁÐçK‰ÿØvÿ¬Á.ÊnY€ºÁKãS±J¦ —‰Sÿê‹ñ9iî§OOáÖ¼åÜqÃýÍç‹­û¼
+6,¸8õÒc*|žâc/ch½Œy/‡Z‰í©I–#e¼§çg£Õçt¤0òÊ3ÝT6ÉÆ®scYéf¡o _ºŒ6}cÍeã­Ékzµ[38wËv¤Zª—Zdz‘ïÏ.®3<pÉÑé~ÛÖ´}î· RÉ×+¤wc5±w5}‰¼Í‘;Dî2j·ÊI#\_ÐNßöDÎÔúXJ‰ÚÏûL÷!¦‹:«$15ˆVï×æ£ðÚðçPææ=tªà'#wö<†9:k±’ëÀOª3ï‡ ÀYßù‡‡«A¬l&ÞŽW‚”&“jöÚôÚI¿ ×îwBYŠºÎqæ +Oç¹ ®00tŠòÉe÷¶[²çQ÷Ùqœ¡£oX„|þoƒï™ãiì‘/sdiûš{ñyñ´ßàå&Ù/e¡ûZ¥–ªÔ7m-ÞÓ›:í±À&O[½ÑQ£›5–Œ=ý¦˜]äé½€±ÿv<VŽ
endstream
endobj
365 0 obj
-<< /Type /Page /Contents 366 0 R /Resources 364 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 322 0 R >>
+<< /Type /Page /Contents 366 0 R /Resources 364 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 321 0 R >>
endobj
367 0 obj
<< /D [ 365 0 R /XYZ 78.37 808.885 null ] >>
endobj
-133 0 obj
-<< /D [ 365 0 R /XYZ 79.37 564.05 null ] >>
+125 0 obj
+<< /D [ 365 0 R /XYZ 79.37 771.024 null ] >>
+endobj
+129 0 obj
+<< /D [ 365 0 R /XYZ 79.37 612.864 null ] >>
endobj
364 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F71 292 0 R /F15 227 0 R /F62 230 0 R /F16 251 0 R /F54 228 0 R /F68 259 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F16 247 0 R /F15 223 0 R /F54 224 0 R /F62 226 0 R /F68 255 0 R /F55 225 0 R /F71 291 0 R /F32 232 0 R /F61 235 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-375 0 obj
-<< /Filter /FlateDecode /Length 3829 >>
-stream
-xÚí¹n$»1×WLhKó( 4šØ‘ÍŒ~ŒgÀþÿÀÅ£ÈâÑ=3«Ùh¥f³‹dÝWžþy’§_^Îß^þtUö´‰Íi§o¿½(|!Oêä7aüÉ;%¤S§o¿Ÿþö*¥~—Òè·/Æ»øt–Òª·/:ć+åd|Ê£Wœæ/RBüÁ1·ÅYgAà
-
-¸z¿!ƒ¨I>»7ÍÛž!⪽<õ†h9omŒÒd†*S$úLÇå<Á04Çu;±chÛM„ÌìÄ:ñÔ=žƒ–ÂzS9ˆŒNöGG£C~ø3Ž¥³©qw 6ÞMJôXžµÆ  ¦/eFFKµ þÔÑi6‰ÀÍøáƒÞ€JÉ´<;]"öÌwæÚÔYäÌkáN\É=îÔ]ŒšT4ÅÍö)Å øï//_¿½ü‡áR‰
-ÄÔu“A‡Ý:Xžåø 6ámxÇp}Ê/ôBÁÕ¥*ÊAhœž)ÖÿkªŸ¡©lÔ<5y®Î²s&ncŒ‘ñè)óAo{Ö5‹u,5xßõ±7ô±ç}~6tЉ(7ƒÕ,p]oH£‹ÓÃoèû„ÔHr—s5ÅR¨PðÌ« U`¶1X-£áSœ,@wÂOC’•èRµ$g#éÀùfÁ[žJÌÁ2¯lD,֚ϑ´èmxž1ЙX|5ìóÓœJ€
-XÒÁ°´xL=wêk+‡TRét¸Go¦Y”“M£¾ÕÍPk¬{X§fH)Ù@û~û–|Å“Q_øN{±Õ„WJǺ¾\XÊÑì9åJ·tq/I¤/­ƒ
--bÄÐÜšvfH÷VEpne“Zѕųq°²áu”rK~Bx"C¸é=8ýÚ
-1èT–ŸøYqŸ²BcÜ£?¬š2÷
-jCªå8}6Á Hê&ážJ}3•Zóü0ÎûþÚ3óæ÷Ò^È
-^zS«íõÄÚ©’øŽÕ®Ó¥âM}4Ò1&S ›±Ž6S ¦Òeƒ¡tSd]ðySe1ï莦•TÆ·zjZÚ´âÂÛÅRGKA~· SPwäò¢I%¼gŽ*
-×>„»p I›UMèK²Îv©-;Ž\ÏÇ% 8DTI¡Œž‹±Æ=Rˆ½¡ˆ’\Ìc_9éþv#ľ3À»£MÀ
-…_ ît‹Y¹r£oS‹\£ŒYFFÆ®¶´¦ö´¨Z6Çœ nÔ’ÂØü+Ë5hVuLoºf¨í²«¸ƒüîM!ÙƒÎo“]á!ÁŒ‡ì´{i)㉓„åüÄ¿ã<ß*Ñ£§4®HzB®-£¸—üô†:ϳù‰"™é ¤Ç7ûÚCÖ–Éê¹uÙü#v2“vm%Œåœ°dô¦Ž
- aRÖg¬tw&Í­Í!}pEÐ…F)`!ç)™c§9"œþñwLÌ65"æ;ã –í
-ÈìÖÏhæT/é‘tõŸU>¡:–MºZapÝ‘<Z˜·´®­^i¬/•÷UT¦‹:=táz¦CÕj¡+ÃÄ…WâŸp‰¶o ;ì>4F„Èÿ=¬ÄtÄ¥ÏG¤’A-oñj¨7“P=[9õ’¥²C¥ÖÖËc›]ÀüWÍBÕ§1„ÌoÒ%EÖŒâôì gø+RVèŸ $ü¶7r&ƶÔ_ 1ôíßãë©Àª$ýª=ÞWÎÝ rJ*R>ç7–y]ÀC×C¡`‚’®(û
-TÊ'_–ZÈPÝÍŽ|l¿ãyç¾ÌîVpø»ò&¹}tá`ë¯ÁÅ+=Ûž à\Zª¤\[Ú)z{ïýÖ3r~ØÎM‘9w£åNØÆ]ì:| 5-x¯é0®Hf‹³¾¨±÷­XU]ƒÞI¶Tþ-=­žÖë<0„§$a„Óð‰,2è[Ïƺaë nOf;ä`´Ú˜cUn´î"Úý>”ö…âÞºÞ7Ìš’‚]þUëE‚£H1:|ëËÊù«N ¤‘”Ô6\ÿ#Úñ~^‘ ‚³™¯ü¨£/¼Ú´7¼ H‡ï¶Ùõöh=˜JRn×óx˜Û8]êx­ðw8öŽcþÐ:çAÿd¥¯=+\}ÜE ÃPÞ«6~d·dñ¥,2°%]O9%êáCÉxØåø–÷…’B!Yêè>… ‡„Lä–(ÝÚp?úu¥PÉ€ž¾¾ö×Ä5+‰$C,ñáneÚ¤ØdWT›t;Ý°¹ïͱö—¤òb`û^äPº®Ì4M#׊¥m y±™z¤›#Ú ïuàYGHªÔËñT¯;³™Ê\oüÏJNX°#&k>ùÜøÝÜ*NÆ*ž ©ró89ܶIKÂeÏk ÜŽÍÒ›ÎÆ4†uA–‰üúíåµL¤Ì
+370 0 obj
+<< /Filter /FlateDecode /Length 3310 >>
+stream
+xÚ½[ÉŽ3¹ ¾÷SøZ£}ŒÚíßdNúädræyÿÃP %j©r¹ÛÝvU©(Šâò‘”ùé?'~úõåòùòËMØS`ÁJ«OŸ¿¿xÀOâäSîä¬`ÜŠÓ秜9·†sã9W>Ú÷·WÁ9‡G
+>õõMIøîà––ð>MºŸÿÜÓ—òYÆÚ
+R€o+€{q>ù œ•©¼ûÊ"¥Ð¼sái«í ð^#À÷y9
+4—ÒY€yŒo5mUK;Ô‚¼¬j£rXNŠ|;–\ƒ1ñèoJ¾Z°k¼–;$@Õ°×5²»“ö ½Ÿ=¢n4¾$Ù2c‚ ¾ýÝ í@«‘ú‘У+¾pOãž<È0#ý¼ÚA­ýB­“äSn€Wu?¬l¦gíiòãœúä8y·³KmÞrGJ2!¡UÉáZMéªyµÓͤú§KŒ^,©§Å‚V>J81)œ¿Ü ñõ°Vùy[@>ÊõêV6A–<xô᫪PÜþ­QTa˜— ¦…¢óÚkÛ@”Lš«ä&ªÐLª¦7Ký<À“6úˆ9Ý]÷’>|hÈ+ÐW.˃ÊGÂ=éûgõ½¢œ2¬æàJœï®›PGee3θ@¹·W#M‰fY_ó_„^±–5Öت}H5
+€)QVcþç°nÝ ˜zδâkæç×!¥‡ÍõzZû÷Q¯RŽç)'\è¾RŽÈòh¢wÿ‡*-(ÖJ:_(Gd-!:!Cãw‰±Ë“k•$åoA·icå¹…Z)trØ»_(Ôƃb¦t¬,;€h`gH!ž*ïX0j’ÀÂ@ͬ
+ z
endstream
endobj
-374 0 obj
-<< /Type /Page /Contents 375 0 R /Resources 373 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 322 0 R /Annots 377 0 R >>
+369 0 obj
+<< /Type /Page /Contents 370 0 R /Resources 368 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 321 0 R >>
endobj
-377 0 obj
-[ 368 0 R 369 0 R 370 0 R ]
+371 0 obj
+<< /D [ 369 0 R /XYZ 78.37 808.885 null ] >>
endobj
-368 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 167.041 145.137 174.015 157.092 ]/A << /S /GoTo /D (subsection.4.1) >> >>
+133 0 obj
+<< /D [ 369 0 R /XYZ 79.37 771.024 null ] >>
endobj
-369 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 255.622 105.836 278.098 117.791 ]/A << /S /GoTo /D (subsubsection.6.4.3) >> >>
+137 0 obj
+<< /D [ 369 0 R /XYZ 79.37 156.194 null ] >>
endobj
-370 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 149.527 93.881 172.003 105.836 ]/A << /S /GoTo /D (subsubsection.6.4.4) >> >>
+368 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F16 247 0 R /F15 223 0 R /F54 224 0 R /F62 226 0 R /F68 255 0 R /F71 291 0 R /F53 222 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
376 0 obj
-<< /D [ 374 0 R /XYZ 78.37 808.885 null ] >>
+<< /Filter /FlateDecode /Length 3579 >>
+stream
+xÚí\K$· ¾Ï¯è?°²D½Á
+ž~ûòÎÓj5Ïs¦¤'jE‘€ÇïDä9Y/.„bJMËK¢¨<}
+\ŸÀÒçâÞáøýÊùíJ£i”~¤;q”åOàœ™h(ÇÅÍD¾ˆOâ‘xmøäÌ“ÄðÿŸ~üòð¯Â(€`N¡´´eÖÉË_¾>Ð %™“æ"P .ÿþÛå÷‡ŸñF#t«}
+oIfÕ“PˆÝ@„[L‹·"hÍ´ßb»t¤Lù¶=¦u íV6"“^‚¾Grœ÷bðµ ŒTZE(q|ã¨-ðw_¾’3
+áÑ8g>8Å~’% 3“V°Ç`¦ú[ú6/•\1îÇåLÕCÒMÑB’3eraĵq˜¤A„áÆö‚eTž’k)ÌŠ•{7!i.™qb©ÎªÒÞò 惣N…›è;N&ùš$E¸6”’Ïowªõ»ðë¤p
+ºÌ¹UeVo£DUæHzüJÈ.Ÿœ'ˆûùIŠÇc'
+rO2ªH¢‰M/^ucÿ±¡´‚c©4ˆÖ+‚ýÛMYÅ[ÅH 9óv<…‘0‰Î|
+<ú&ÚÅ·Ü+m ¤ÃÒrØÇk-Éy¦¼ˆ,î™/¿TÉsAÅÇ8EcÅMæ͸õQ#f­ã^2‘HZ‹ÇËï= Ð~oÉÒìï[Iüw=⦊AèTuÛTÜ%3™ë—*£i,^ññ¯ù`ea‰ŽptžÂñÌ %³sÚÐS¤zücï‹*T`P*Wbp²ÖRp-\1]öÄ#àL;52ýˆ Ê0Í'*±p%noÉJnײå»%ŸÝ{ÎÐÉ`ç9Ö¯J, "óÀñÉÑ1”€0-R*:Û
+2ŸZëáKr ¨‰uUC®bd:LŠw™Š"!_ƒ,ݘ-ܤWŒÖŒÛ®¬Q/$+ã°­ Œ×BÔPÉ‘H4ת·#V¨Ó¼—kP*f‘ÃÓoSaA¿çÈ îF^NÌÞGR2¹é Æ|`¹¥(
+”ŠÁÚq Ð‡žÄ‰¤ÿ.ãßÀÙúVË)µY;®ƒiH² 8ÑÊ_Û¹˜ãÓÜ
+×»²Xc*>ΨAó¾õ åà˜õìtteÁJB
+UµÛ~Ò¶,pËüŠö{Úê¶'°Ò“jÅ](Òíš—‚)З~ßGŽŽØ æí«¬aî–(‹!i}Ø>Œ`ìiö)ŽÔnmgÙ ˜…ƵÖÑèýd¯¹?Ãn²×÷´S#ó¤Mã0Etãèí¤æ+´Õƒ UEnRt“QýpC»ÇìÝbàò½&A lu
+¶ò ±*z§«Æ‰Mep*˜õ´‡<ùQf3Ÿ¹<Ô2Ô Ü>ïCÍÈÑPÓÀ¤²ã\ 땲Cö£ƒš´Ì £gÙ‰œøN 6¬u¨ÍÜÇê ûÉ Ê°†9b°”Ÿç^×Aí<X‚L»9cΡ)M´· Úc èWb½ƒÒûâÀ
+‘_Žtõj¢ÖB0rCMÄ+~ £@¼F|6$Ü‹‘-Ä«º.hfÌy/yØË›@|O»¯¡_ñ=¥Ã0'Ð'øy0'Î'˜Ö:æFî“ !±¥¢¯ÔŸ«m QN06ª³`ý¬p*aOÊÍ2ØôKÔ·àöðÕ{,X&î`#­‹9à0Øœ’^¦Œ±§qÖÌ
+Ñ1Ÿ…ø"@Vºž è£L÷ý-ä©Æe5IÈ‘Æ¢ÕQE'îlÔX¦„>*O ̨i´Ugpb-sÖ¼Ä[0{‘Ò~›ÒKÈƾzêQ³eÞ¦÷&6*@»o²QIÑÔ¹ƒ6*éͽ¯éÀî›C&%bb 9Ù>%¥ÒhV˯^Å™ªápü–èLä«â·D§-WYE¦¿T˜XdêU§ÿ)ž›M¦ä¾R o@³h{ëÄ~¿xÑöåýôÞOn
+ÌÔóæ‹»}s£‚SËwžVìµ"Õ#±¡7¢î¼Ê¡åøÄÝIM¯:¬v§šà
+æ·1ïý«(6)Ìb§æ–­©Ë?ë¶6Æ+«vá—¯n4ÐÑLºÊÓÐÓ N?νmí£ªðb]©¦×QÚ·«Ê‹cùÒòàµ,“ÛêýÒ`~½±qS8Ñ
+Åáñ)nF×cî Õ—•v[çd†¿Å¶“…i„JðcgõðÖu×-,WïŸõï;ÑØ2y|“»vª×7Àk‡¾áý˜ã¯[®gÝßU'ºëéÑtzÁ¬tæÇþ;}B÷í'íRÕx–צ1>®»æV`:¡Ä©}K8†iïÓ·$œgä)}Kt¾`Œú?h\8ù>;—Öx–ëS;—«Ìwй4púýv. ¬d¬³/ì\(îÎ¥H暎Ÿ—u. ´0/öHÌ@ry¶8ðFpµJÓy÷¯¿áå¿âç'*ø½»ü' üŠP¥˜4ퟗ??ü½%\,óµ;öÆ’X_ˆþitLçP†Ùês³5„Õ@9퓼µN[À×ÆÊY±Æ‚Î;ÊÙÎPôÆÍ[Þ¶8Çç4[›_:¿n^$þŸ €Â•£uªÛÕ €Í
+Ö3Ú`}‡–âZ‘¤³´Çÿ:æ¢K
+endstream
endobj
-137 0 obj
-<< /D [ 374 0 R /XYZ 79.37 703.382 null ] >>
+375 0 obj
+<< /Type /Page /Contents 376 0 R /Resources 374 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 378 0 R /Annots 379 0 R >>
endobj
-141 0 obj
-<< /D [ 374 0 R /XYZ 79.37 454.69 null ] >>
+379 0 obj
+[ 372 0 R 373 0 R ]
endobj
-145 0 obj
-<< /D [ 374 0 R /XYZ 79.37 300.244 null ] >>
+372 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 491.656 591.723 514.132 603.678 ]/A << /S /GoTo /D (subsubsection.6.4.3) >> >>
endobj
373 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 227 0 R /F62 230 0 R /F53 226 0 R /F54 228 0 R /F22 234 0 R /F16 251 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 90 579.768 101.955 591.723 ]/A << /S /GoTo /D (subsubsection.6.4.3) >> >>
endobj
-380 0 obj
-<< /Filter /FlateDecode /Length 2985 >>
-stream
-xÚí[ÉŽÉ ½÷WÔ( c ¨T*öɃ¾>Œ9ÌüÿÁdì[feIÙÂ<€¦+3# .d$“_þsá—o/×÷—¿Ü…¾xæ4pyÿõEà~ç™Rêb`܈Ëûo—¼r!®oÿ|ÿ+N2r5Ip`ÒÚa×À9HÎÇßßð¯ã\]ñ_ºo¾â}¼'¾àïæž¼Æ9òNcÓêk–%·Ly=®Vß>)«ñŽ¹E^º£låŒV¤Õ‰ãxF6Î_ʼB7<¿µ3æ•hŒ¼¾IK3ïa¯BÛv¼––ñI&<þMÜ ¡ã½¸»¼žüRxqã³ ÑD%kƒF@Òr8 㢤'½‚g‚›V¯Dñ~ÎT\¢ïãúN £iáï½ò0ó‘gšª‰á ·Pi’¼ç•I4ŸV´ÒÈ e¯ÙòòÕCk(k»
-óH²´K oŸ‚Âv\d‡~k—‡Ê¯íòòÚ^Ñò­’dY½<®[&î<=\T}« ]*Ë„.^iFhb d¥mq1eTkŸ&ë&úub† œþ‚y«Ìñ<¼:\Yþ¦u\1Ø[/_«‰gÕãŒ@— mZåž%f‘¢Óì•ôÀ¼S£(΃+ünªÍ.lw ”¹÷$—[2å(îPŠ Ík â<
-¾¯yÆEšTÕ¨Uæ²ÆT…9ƒqrÍ”¹ì*ÁŒi£G*)ß+UË8ï½iÊÛÃÔÏ.ÿRת•¶ªr¥°Ó/¼ºæµÒÜ…õP °Õ†‡¥ ¥J6©LL“Ô¨¿;ö+b«˜ÕfäBB…¸ˆ*[Ťœ©Ü;ž³å»·ZQ@0[~¥5㢨݄åípÝ$|ñ*K'^夦EXàКo›y¬WOStáSK¤¥ iWM
-¾Üó!!l(
-I¢ AµôÈHŸ´0Í¡"oN)l9Óéea,•€]å¶eÒ°"·e¢ SΓIIÿ¨ð¿VIQ¼Nó²ÌÒܥȲs¤Óņú‰ÂÖÂ̈·%. JËÈê¸Z·{$Û!y£çñÁÉ'\ë=íû±ÁÒœí±Ål·"ñ*ûžÊÉý­D^o-½A’@bš/:ðV²‚ípÁÑË|}}ù} ¯¼aֈ˿~{¡Û”§h¥é<Ðþø÷å×—¿wÞ:ዹ,'¾š·NXws.˜öµ*Œi Oo­p(ü‡ÄéF¾øå‘U«ÜÉ#9+G² 2¶ä·_nÙ
-˜šØBªBÖ¾4$æ_RÃHWŸ¡%I§ã6´4íF‰it wç„´aŸgõ ú§;DïÎ v€i‡¨¸«Ÿ¡aò©Á®§ÝŸî<ìzJ‡_jÆÕ©²–ž¹úšÄÀS²&(àk
-÷öoñšim¿ËFçÌ:÷!6ª¨Oà˜L"ÿ!6ª„a`ýwÙ¨’‚YîÚ¨’Ô:›èM¬^Ñì'hnÞÛ ””{r¿ óP¹ÛäÁ84“ A>îRAW‘
-kJ3ËPÚ_ô­ªÑúÔÆ/:V4ÞüœÆ¯P+{Jã—ÀüßZ÷“¿¾·Oi!CßÚï%´Ä<Iü9ú½ÎïõZÈ0ÝãòÉ>/¡xøúëÿ^
-endstream
+377 0 obj
+<< /D [ 375 0 R /XYZ 78.37 808.885 null ] >>
endobj
-379 0 obj
-<< /Type /Page /Contents 380 0 R /Resources 378 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 382 0 R /Annots 383 0 R >>
+374 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 223 0 R /F54 224 0 R /F62 226 0 R /F16 247 0 R /F68 255 0 R /F71 291 0 R /F63 227 0 R /F55 225 0 R /F32 232 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-383 0 obj
-[ 371 0 R 372 0 R ]
+387 0 obj
+<< /Filter /FlateDecode /Length 3909 >>
+stream
+xÚÅ\Ë®$· ÝÏWô2YX–¨7p1Àôô´g•dv†WIœEâ
+iô$ÄÕÎ"äFiNõWœQïjø¹«úˆÝ%Î㊟±<›Û0—&
+þ¹ÌŸy^ë¯ø<­ÇðÓ0ÚdѪè:‰¢_yW"ȹ«Eõú¸^’×\˜; Bàc]
+·™OŸ·fcŒp Ï™M182…±¦o,ÿ©KØ3½=»k?Ê6OX²Âk³š]Úúf~_´í·
+×3% R%”p·ò<!Å®ýKϳ…Ýϲ\ï¦ Bê0·^£`·Ì$B„=9As³ÑÉͬË=¾¿ûxq"z,W2
+½}¡w·-||›Çúr|Û̾êê´Lq’þ¸ f³ (³1;XT‘kꕲ̌®¯ de¦!*$=
+£ìY}zL”ͦµ7¯˜‰÷"x÷Œ· mÑÚÿ6#µÿ:6ƒðÑŸÔ©F
+“ôY&ŽÌèj óSç¢@b2G¾¿kXuBž€¦:w²áýw¸Œ¤‹ªÊûˆq™k­F@yG LjcÍûï´äÌÖ—F÷kÍn*UKD‰—4¾òXô8¿XÊdNKåE”˜Ø ¦ ÁgL=)oì´V‚¤µûœ@£0[™ßÿ߈!yÔf9£Ña”Â
+Kᤛ÷ªT’ʪꊎöÛxò
+r©o«Ô)žÉ“U+Z°¢Õ`@<Æ8ÙóÆ­æS?÷áØÌR _©i@¨áÈ}ZUaÊû†Tºu<ÉëýÔ‰}ËÓw Ë|9¯ºYY‹£C4éÜŽÙQ{êT–lö^षæ“ïŸmœ¶mÃ(µfaºäF‘kÛj©T˜íV4
+ӘъZe¼±s—µW¦TÏŸY]ÙÍy-sMÇÞ‘=•„ÀcdˆqÝA÷™Œ
+¬Xki9‡$;܈cÒ6vk‰TV s˜1×>¹ µÚL(iàœË^eZ!GÑSíÐÆäŒnlU­º3MÜøyµà²ŸL‡1ýæ«“îžt¤”3¦²Ð,edG!ÕŒ46¹,[)u¥±äí !ñ+\Ü#{‹DÄËo­ØžæL¾|“0›+³EÀ6')òW[Ù¤i>Ïä÷¹£è9X]»£<÷æ¸ÕÑ`ëUöth5Ž:ê}E°'—SÒðèt&]Ödõ¯™…ÒLR”™…€yHÒåòdCcÇz.5ÙB•?„ò™Ëó¹Éo?U»*¤u‘áÀ§eŽ@^ •°Áìy
+.ÇsK<*ç“Ë0EßnÎHvv ¤ª¨Ÿ¦óÂPSÎãGJFBœg±Kù˜jzÒJ:FotE[éz‹CËÝý-Eà›°*x5û˜=žÇˆ‚y*ÿ«î¥¢p¿ R¦4ÂíVÒ|†Û“½þ¤ã¡§)8Æq 0”¶g?ÄzÅù:ìGe ÂìPX™ª#ác Ì-
+æ³ðò¦Ü©'L©]y¹¬ÔqÜÜ(v•o ÝëïMÚk~´KtÃÓ¤â~9…)N¸Ý¯óbëtðA@x@ŽS ß<:ù/vfÑßtòÝO6³´ª=³(oé²Èƒ*x=2¡ªž7MêÁå‘~ bví#}«ù¹Ç•idÞ÷ySHrh9Èf»Cºý3è3p¥d æÞ÷¾stq¦ý~¯ù@îQ­SŠ(Ã<êÚ¤{ÛrªXè[º‹”!/¥¶ªJÇÏ?¤›÷4¿¹7- ä§þÉv)¹_©…;8õ®ýŸµ¹v ½$Ž—[*}?>—ñNXcgM¶šþµÛ»~tBœNRÝ$Ií°Ç”éjï¥åÎê5íÜqÐDžög¥)f ÂC§o•†ƒôùœw|¨Ïæ*ä@1ò›‡µïÆZõkrÝÛtÚ¹Émïq°ðšZ¬½{†T—úêÇ6—Mí•õ¶±xi{˜CHmù¶®rB¢‡ÍKƒžZyá]]ÕAJñ q=hv'b¸È¹™*ÌtÅsˆ9gÂåé¡5„ù²cé7PÀÊÛ`²ƒæ¦)ÓéÃÕ?i?n´!é¶ei·¼;”¿Ê6i¿÷H
+DIW+2š"ƒ’=à’ ¹Ý&8Ú›âÖÄ‹ê•ã8‰£æMÑN"×cævä{!‡+Už:Êý:\=8Ç©0s1èYߘT™òÉ0ÏbS+êæ€âNn8=ÃWÛ<³céF¡g·Š—ìÛ!1L
+-ƒk7oÙmܱVG$б*ötêC9•g£ÁÎ bº®î]Ÿ¯&;á—eÓ`zR @ækå:¡šòÒÕªVmÐä'{õolþmý2ž<ØЮap@âUйܤ?9k+ß …ñO¦%žyïs¢^šïç!ÑwÈw; Y•]9öç>ëYjÑücæûÀ¡üŸ~ê]ëÉž‚A˜ÐéU:ÍÑáäaªÒ§ßé´n‡©éê÷Úø?üó
+endstream
endobj
-371 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 499.407 700.341 514.132 712.296 ]/A << /S /GoTo /D (subsection.9.1) >> >>
+386 0 obj
+<< /Type /Page /Contents 387 0 R /Resources 385 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 378 0 R /Annots 390 0 R >>
endobj
-372 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 90 688.943 101.955 699.613 ]/A << /S /GoTo /D (subsection.9.1) >> >>
+390 0 obj
+[ 380 0 R 381 0 R 382 0 R 383 0 R 384 0 R ]
endobj
-381 0 obj
-<< /D [ 379 0 R /XYZ 78.37 808.885 null ] >>
+380 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 167.041 316.142 174.015 328.097 ]/A << /S /GoTo /D (subsection.4.1) >> >>
endobj
-149 0 obj
-<< /D [ 379 0 R /XYZ 79.37 662.029 null ] >>
+381 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 255.622 276.845 278.098 288.8 ]/A << /S /GoTo /D (subsubsection.6.4.3) >> >>
endobj
-153 0 obj
-<< /D [ 379 0 R /XYZ 79.37 622.186 null ] >>
+382 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 149.527 264.889 172.003 276.845 ]/A << /S /GoTo /D (subsubsection.6.4.4) >> >>
endobj
-157 0 obj
-<< /D [ 379 0 R /XYZ 79.37 293.752 null ] >>
+383 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 499.407 192.277 514.132 204.232 ]/A << /S /GoTo /D (subsection.9.1) >> >>
endobj
-378 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 227 0 R /F62 230 0 R /F54 228 0 R /F53 226 0 R /F71 292 0 R /F61 239 0 R /F63 231 0 R >> /ProcSet [ /PDF /Text ] >>
+384 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 90 180.88 101.955 191.44 ]/A << /S /GoTo /D (subsection.9.1) >> >>
endobj
388 0 obj
-<< /Filter /FlateDecode /Length 3376 >>
-stream
-xÚÅ[Ën+¹Ýû+ô—Ã7Ù€aÀº ¬xdd²f‘üÿ"ÅG‘ì"»ÕmQν0lµÈb±ÞÅ>äl1—]xøõÛË^Ä…Ãqq SîâŒeR.—üñke™Qæ"4ÓÚ^þûÏËï/o`>L†LÃ|à‡¿þörý|ùåfÕea‹•V_>/ëxÍ”å¬`ÜŠËç—¿½r.oœ+ ?îíïŸ*+
-Š5†R0†s§ÂGÉTøw¡¿#gã¯ZNcÆ9ºŽÒ‘¶H´ðÏv®•Ìón®»e¼+§˜´¾›B‘?ónZÓùõ³·­A´ú˜õ$‘{6¢&¸­Úmò¶,pËüŠö×´õ Û†9¥GÜí|HóJ0-MÇå²o”£#v¢óÞÒ¹[6¢¢}Ø>”dJ,ÓìC7FŒíc–½HË쇮ÅS¼
-‘Â~¤Ï$ZlÚz5å~†Ý ×¯ik>Ö¦õŒ+OG#aˆo8”\ƒ­dPòŒ³Stp³–Ž(œ%‹4Q!ÂŒ¢dB™‘LXI¿ýþ5é[û·°£l·k–R¶
-êrˆ¶ :¸¦ãiL™/’Š2úȦÍÄ7æ»ÀͼüÁA¾þIùcMóGع’çòÇšÒÑja“ÁE'ÉÊz ª¾%†’¥¡”÷,@™™ÒÉëÇA¡IHÈÄ‹Þx9:®'…¶9ÆïåeŽeërÜ»º—Z.ʛܨKcKÆÚ)åqªxפeÂ%r(;¾õ^ H1Ž’Þ
-³ŠƒAtò;“)È:׉™‚Šs7S<C”F@ª×T:Ëé ±L4LpKáŸc™Ö1-ÌAQ:ɬ¦ƒžÁ‡sÌ;{ÂC RÊ}É2ÅŒuO±ÌÅ3·¸câTo¸ôÏ°LGÿËT!gzÌ2•X˜ë"s[‚΋
-BŽ Ë«IDH‡‡R¡Ò¬i”Æuem“+À<ºØ+K"Þ\܃KõHVàÒ¨AQ€Uººv%U)e¹‚>Ò q,ïóÑJ[õp.§´gBÉB#U!?´‘¯¤ôMUrøJµu³Ä²¿Q¹órÄŠºÎq±d~“.ŒÌ/ @×0B¼¦R2>)sByìA_ÓJÚ‰óKO#›rJ"óá•ʲҋåÍr%›Wá{P.„ÁÕ:>|þ½¢F¼û2ö–ø‰ãr‰WÇUiE ¸z­G1q·ÝÌð­ø‰žÝ*2°põ˜Ù×ÞO]í9s‹†U¹+{˪NâÀ¡­àßJŽTÑ’N¬ã`9Žqü­˜@þ6o
-g_Ó“Ûu×ehñ•¦w¹ÿŠÛ ¢»íz€„’QyK©_ó+1!äXÜlÚG0”G<Àð(½0ßäÞP—¹¥ÂÎÊ•E ÅҸܒêæ|.÷Xyü—ä¦!`¸u’[6:©™”ÍqkÒ.Õrê–‘Ûô Æ›Bqùl ¹»–MôÁ6;°X§ìn4´*ÎuL¢_•ø>Þ`èB´]èlSš£rÛûÑ4ý²=À‘müJ'\fc<©³lyš„œ) ò£ÊCÉû8ùíG YzرU~ RÈ+µ–ÑyŸÙT‘Ë"b(踇9vdLá•g+ûdöFš°ŠJ¼GýÚ¯0à`¬Ž!…÷18îU×91¿_”ÂLÊ΄C…¸Ý_VÿL¤`–p$,Z9èŸÙÝe
-
-au<ø©¡0»ôû:ca
-¢Ó29P@É ¼xNzYÓ~
-áµ·;» €¥b9T¨e„+]i
-À/b;™nÀgsÉø ybÉH}戄°€<d¡s}†‰"ö <3–Œžƒ@ÍHØÞ’1«_²Qˆ/áªíSl4CcÊ4£aŸb£ûEtì1EÀë†δ¤Œœ]´Å{ ßT´‘µ&œN ¸—Ã’ø—›Q!@¸F¸FÐyº9ÐR €aßß~@YÉ_žÆÄ7fäS|oOQ›éi‹ ­OW€r¹\³ò
-‹_!­À;ËPDâ»s
-ƒM£V›IO>âH‹›R Èk‚GS® 9[´èjºÆ£}8¥‡†Fd_êæf
-¨òôW•Ê1Ð*‡p+4ferè5H%íš2_å …<W ¨ DÊ%6á¿áÅX„óôÖäOˆ7ï`”8<‹ñÃçÂTš#£26¶O„‰Pì/ÐÉ*ß|Ë
-¹]+ x/,Xq ×CÜôAÓW`Œ®ÛädË×`ù¾¢¢ô#+ °#_½£ALG[µèmškáD6c†ÓÈöGzB½¬ÅeÞAŠ“€‡å>èטÕÝÎ×\¯×(«Öí~C©F’N"”}(=Q£2ª\sêjM˜CAžùÆTáĬn= L&*Ö1ðá쪾“ˆw?^¾H
-Ä)J;ãwÓ´ÖÎw3C‰oˆDæ›éÓR߉$.ÏÊ÷6º[%ÚØž>ïåÛ<‘Ô{aµÜ
-XZQŠÆgÚ,S¿}À4ßhÕ)ö1ÿÑÎ3+zsùØúÀØT…©ÖØVN1L-£ë<õVÖÚ«+,MÊ:}çB8 ý¬xôÖÅ7Ý£ ¼[Áä"§"Ú…‰Ç ߃h*¬©§ ÚÁL™óíǯ¯HÑÌ
-ÊIŠƒG\2©
-ã]Å›··þÊU'þ(.<•¦ñjȲyu"© D¬Í\нà6b¾tBÐ?;¡(§©sxÛ•×ÞdŽJ÷Õ¹fÔrþï53þ(`½¶Æ|3ÜmpÒ%ƒÂ½ÄJE¦_Åà—ü­Û±’Yc/±®’¿–³ë_?_þ¨Ð}E
-endstream
+<< /D [ 386 0 R /XYZ 78.37 808.885 null ] >>
endobj
-387 0 obj
-<< /Type /Page /Contents 388 0 R /Resources 386 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 382 0 R /Annots 390 0 R >>
+141 0 obj
+<< /D [ 386 0 R /XYZ 79.37 637.537 null ] >>
endobj
-390 0 obj
-[ 384 0 R 385 0 R ]
+145 0 obj
+<< /D [ 386 0 R /XYZ 79.37 471.443 null ] >>
endobj
-384 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 439.062 237.726 453.786 248.944 ]/A << /S /GoTo /D (subsection.6.6) >> >>
+149 0 obj
+<< /D [ 386 0 R /XYZ 79.37 153.967 null ] >>
+endobj
+153 0 obj
+<< /D [ 386 0 R /XYZ 79.37 114.124 null ] >>
endobj
385 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 466.514 237.726 478.469 248.944 ]/A << /S /GoTo /D (subsection.6.6) >> >>
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F63 227 0 R /F62 226 0 R /F79 389 0 R /F60 234 0 R /F32 232 0 R /F53 222 0 R /F15 223 0 R /F54 224 0 R /F22 230 0 R /F16 247 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-389 0 obj
-<< /D [ 387 0 R /XYZ 78.37 808.885 null ] >>
+393 0 obj
+<< /Filter /FlateDecode /Length 3437 >>
+stream
+xÚí\ËŽ» ÝÏWô\Eê ¸ÝÉ*ÞY]äfÜEòÿ‹z?ªzªzÔŽ10žé*‰E‘Ô!U:-~ùç…_¾½\¿¿üéMè‹gÞH—ï¿¿¼Á/âb=Söb`܈Ë÷?.{å\«OÒáoñ…sÃ?ý¢ŒÂOòó·+çʦ;7üñxýF-
+o)U¦R¯‡¾;ÑÛeTŽ‹7Å’æ¹G7u¶ýªÀ1n´aÆB¡ ׈¡aÔÉžÐ#•wc
+²Ý–½“üA¦“Ìù!I%ºñ% “´£4,ip«
+æñ¡Mv­²Å¤àË5? Â2.ýÅ GëJ>Ê0å“;xë.à÷B÷i0Ú È¡êB–(¨QF*ú‰Hï´0Iô­zRL¡ØÙš3.|WF¹}›4ªÈ}›(Ïj¿o’Rýáes­†:âwúe“¥¾›Ës#jÓJ_hKé°Ò£-3àíY  ÇÌed¸Z·ƒ¤Ø!ƒ„ çñ‡àŠ D÷͵^Ó¾o&Pê³ß¶Ä€ÍàVL^ßÁS†¼01S‘t½µòS&@àX9¸¼•¬`û¸àœŒèå ¾¾~ù÷ ^ã/oÕå·?^è2Õ)Zé‹
+ý2µ®ynM.ƹóö¢¾™þáYNr&¼]
+BR‡!Ùþú —æ¹^vÿ>ç\¢ë%F|µˆ/à-ö‚SÆ:?ñ‡g-@üQûä™Ô‚ˆõãVÕ>È(¯ãvÞ$,ï{…WlvUµž‘·FÂéwЕ\
+H‚JŒ*aXÿPŒ*)˜åþ`Œ*ihõ7…è’&.^1ì'hnvjŽ$J…Àýfš‡igÐ §p…“I|(…+‡e“…­Â¢ß£Út¤4[©<îf¥”n2NaI/°…™ ` ³eoKßÉÅíOtíú*óÉCÃ4*,€´~*¼ «›=!S¯ ä¯Ä·PâµYƒÉ¦ª*=BVÐ ²î’|Ò˜€–‹eS]§mKiÌë)Þ
+;™"Ý<
+zâ­²}R³Äu‘ƾžK`[Ÿ"ݽKjs” õ¨§ü¼e©´©èZ{²…Ôž \íÖë¸Èw!"Z6…¼ÞÕYbÈ
+/&!ßr=¼µJ÷éódV¥¶¡êõ6“3í¥º&³Wk@å;îrÙ“³[c
+ MÖÑÚU]SÞ'Yâ¡ÿÓ“¬ì:Ù02N”$ñ±I—Fwd&‚W`@¼ÅÙV¢®½ì<$Œ …m4ô‰°µaCifJ{€¦<ñ©äRB˜r<4~!LÑê^ÀB˜Â ÀµþA„°G L6ÀÕ"¯ ¼%D0*KE%Úýo™`ëY`FÄÒ^T6àA˜šÉÊÁû?,"
+c~•­„è¾ÿT<žµ
+_rxJŒzǬ·mJ/…‰‡ùŒUˆ@¸8~(FeSçÆ(fãÀ bôC NtýAäYè@ñÜÈñd
+endstream
endobj
-161 0 obj
-<< /D [ 387 0 R /XYZ 79.37 284.251 null ] >>
+392 0 obj
+<< /Type /Page /Contents 393 0 R /Resources 391 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 378 0 R >>
endobj
-386 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F63 231 0 R /F62 230 0 R /F15 227 0 R /F71 292 0 R /F68 259 0 R /F53 226 0 R /F54 228 0 R >> /ProcSet [ /PDF /Text ] >>
+394 0 obj
+<< /D [ 392 0 R /XYZ 78.37 808.885 null ] >>
endobj
-396 0 obj
-<< /Filter /FlateDecode /Length 3273 >>
-stream
-xÚÍ\Ën+¹Ýû+ô—ÃGñ,ëj€É*‰wƒY%™,’»H6ùý_M²šÝê–ZNf`Ø’Èb=«ŠÍ£Ë™×§¿ŸxøõóË¿^ĉãÿâd=SödµaRúÓ_~¼„·A¦•> `
-(DŽ„ÎE¥˜<›¹8*h•ÿDê\ͤÍ8Ÿ£&güíÓk¸tÚLÐ+Fk*AkÎ- „KÉTøïDGÍƵšjË´µtQ¶H²ÊŸí\#™ã³¹}lýØ*«˜4n6"?²5-t¾ÎÑ€®…mèI‘kÏ75ºíO¶a Kð›¢ßˆØšY#íBô' >y%H=ÓÒ¯ã‘j´' ˜s†Î]ÂX&Älôf|(É”ð‡áC¡6ZŒñq^¤aí¡kñ”¯B¦0—ôšd‹Eü”]Mµ?7e×÷²£iãÊÑÑãLòÛJˆÕ
-J@‡m¦MœÁ
-v"÷ S…šéÜ6d*á™eæðdï0庼
-•D„r¸©*Ј¦Q‡ªÚ¢F <f¹WN…xqUÜ\ªG
-°Âm µ4¥ËVçYKU&WxÔƒBÛs“ ²ÉF஑Û)pL`¯[ñõ Ãýš®È¯b—ⳃò™?÷}y¾+®&w…—7iCÒày$/ò²ya̹Žua¿êvÉ1Á; :K­U^Å×U¤]µ?” iõLÚµ†ÀÈÖöê‰VçíSk°Ú$%`¦ßá°´Ty…¶zN 3²µ‰^9ò¹7§²•V…ˈ&¾©g­s.y»zúI@FÆO¶=JÊi©E ¶ÂÖÁ9’ÙoßðˆðÚ#ª¬c|M±‘q$¼¦Ãj\7ü†ðnrPèz®j&ÁÑài™°x|gú¼¸(½z2ÀCÐRÎ\ò8
-ÀÂØirV•Yž”w¦ü‘^ɼf¹º;ÅR Uª.éx¬cQÄÊçÐj£ÜÀj,µ1qŽÔ<­TòztòÙÁèPQƒ6è%îAoàÍÎs¥„‡‹Æ:'ȱA†.—ˆSüz͵ÏTE«{ÙLAWu-›4c
-ÄR¢Â¯IÙ³$¿òI˜¥<WYü¶ö‚v{÷!R–i0 ÷.³P©ª¸\•4L;»-Téñzx~OPS
-6Úd•¼ë/
-§ÐÌà‰pøu9`á¹ÕÆxÕgyñ°\¢˜7UˆHÌ<ýÄÓ’ÉóÎõ=íû±1³ä9Ëc'ÖÃ\ÁËôY>f5>í>íyfÒÞ 2%à!ߊyµÈ•iWÖ'ˆrMÖÆŽäæslК)®žO“ÂÐ`ϯ¤I)»hRdî4)"ái4)²Î.šÕñ6MŠÎØA“Àæ»p.´þ)7FDö4©v‡Ó¤¨–ë4©™F;hRdî š½h–òò0|¨Àéüª
-M
-®ÐX¾ï†žPð÷QxOÌ“ò]/û†Ô@ËÃRTÛu†ÔL£ )2÷CŠŒÞœ÷¸Å£ø¨.jåïÀ‰¸¾&íõKõfºÎ"KìaH‘©ë )jÊ ©^ô:CjîÑCR½ØCRÃ
-"†&zt^èÈð<
-L ;'`(ùêa@¥«Aåß¾…ëÆÖ[8N–p2{&˜"V7ÚFŽko¡úñ™•e§[Aÿ¦Äkâb4Œ®Û<šP0£¼’
-l#}âµ ôÄ‹3„/G´\Â刷hÙãýèž?VÞ½æÃöõÜreŠ7Œ¤”«ò~ýîÊ_ÉksÖNåÃT>Žò)|ñÆóÒÎÑ“<£'ŒÏáÙ
-˜÷sçBݘçÖim†çW0ng°ètÃãÐh¦df3ûµ‰ST.*Ø!KCÅŽ³˜&`Êbò=‡(Õ²µÜ“F¬í*.Ú@ÆñR
-ƒ'Ò¹ÆMʼnº]Sk_ß ŒÍ-Ì$ß t.G'Æǃ—lÏ)Эsy±å`¨¤ÐàN Ý7¥ƒó¦¹hÉÓ¥µ™hþq$\ênT9Ded•)^)Å7銼YèBßò¦oh±æ CLx5ò`OAÍI•¯zS 7µóTj8& )·cÀeÍ$_)¸+oàx—Ò´,`Ï~ N›ÛÐEª@0ó™¸:Kü)égZIú™zõÞë1¤B o˜2½-¢Ú2¢T™L»«C':N…›<X×g=¥+Ф—x¾’Xlê­õGm
-µ¶’ÊÔD{$_0˜¤<_zß~É¥ðº'Âïy ª1ŽMÛS‰‚Kkö)Àúš™,ø=ÇaA‡±Zš9±ZÚc4—ηÍj!A–ÕJÔ÷Ä@â‰YÁ6©É/V4ö^|£Ò>šöoŽ·ÔÒrpú1i=çÐ?>Ü:Í°»ò¢=½§9æŠïut²=~§ÝàÿëÞ닉ÃדVêN;}¯onún[ç=Y¹1
-Y
-endstream
+157 0 obj
+<< /D [ 392 0 R /XYZ 79.37 477.489 null ] >>
endobj
-395 0 obj
-<< /Type /Page /Contents 396 0 R /Resources 394 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 382 0 R /Annots 399 0 R >>
+391 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 223 0 R /F54 224 0 R /F62 226 0 R /F71 291 0 R /F61 235 0 R /F63 227 0 R /F53 222 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+400 0 obj
+<< /Filter /FlateDecode /Length 2922 >>
+stream
+xÚ½[K“·¾ï¯à4ÞU[[µÍTùæD7—Ov”KtH.ùûéÁ`†³ÚYÙEq9ýøÐ/€RØË¿.ÿýÛÓõëÓç»W— ¢s:\¾~{R‰ÿ«‹R^Hˆï”N]¾~¿üþ,¥“RjÀ÷ˆ¯[þln/Ÿ,XüÖà'õ%?…kEŸ Ž´6ïñë^>içÓ”;¬h°5ùE˘P¾!’wÇdyaG#ð¥ýË_­¬Ç àâ­JBá;«Ã™¨7å¯Æ‚ÅðeA°êBG¡Œ>¦ VsøØ]›†zQ·ôdy^ÑÏ]©*­ ' DB3*‘¦è5á;€­jªŒéªnç3¥à\]Ï£ŠØ¬*hÊ€^ÙN6êkæ.ŽêÖœÄ?®ã¢Zú5§6öÜè’Y5™_Æe3Ñ÷îÚžÑì~,™±ÌÙ;Õˆ FhAùïiø(´¿8¯…® `'â ˆÍHYÝ黌)bö‘ÜÅ/_Ÿþ3R7N8sùóû=Eê‚´+Œq—ÿþóòíé7|Žóqr{—Âà Ѓòáï윾DôF€D;oDZ°êâ¬Æ×MMèݲMHܾWD iqÅ"Om®àWsç›xÁM¥ QSÖŽ ·6Shúï2¾'Îæ_õœZ/¬÷ã:ˆfÆ)œh•?û¹D«¹„OÞ±+©]àÂjFÛsÕpÁ¾K1°‡tÙVµîûó·…Ç-0V,,i›7 QYáµ™qGX¨ˆ|4Z½ðÈeÜGçÈÑÔ%BpãÜ-Ä/”Z~3Z
+…ך;öC`*~äþ ‡°¤YÌÔ´.‰iä0z;Ó9Cè5ìAAFDêÊÐ9Ízhl4@˜@ân Ÿ–†½XõÜR1mC2x~z¿æ÷”ìøžPRxoNÞè«œtãA—´‡$ýøËvZsyž'-þmàö¶ïßFŽŽxR ˜íùq®…ùJeã/G¿Õ“ZLõƒŠ'£FjÜ–êç¸Òa­\éšû\Φ’1 k¸#øðA˜¸ž{ã#hᩆ¥9CŠP+Ú[!´ÔL­bþ:
+Ãú\`®Ãaž+n9”s‡Ââ¸0™ölü:/|p?%Ð kuí±CX.–XslÜ{¸ã 9ÐåÝ!θnXqÆhfÃd„¶“°:ÒX57TÄbyœ<é ›ÅïâÙ[ÞZôñ-ÿ¡n€KÃ'îœîõŠ&RœR
+–|g Ï9ÉWÃùÌ( ìå3ã`w†ŒÄ%éÜ=Þ­iG©Ï`°²Pj»$Äš÷c©Xt"«¹%³}ŸZ"R':KÁIå‡è““ÊÕž9¢!N1!¬Â½`>¢`]Š£õ‰~B;Žöæ NÐ_eß²[¼Á»Ã(ú%ÝÇ`ýÖþ¨N£«>£1ýaTK#$„ƒÕè¹À†-ŒŽ´:¦cs#­ÑˆûsÒºa­÷÷/fÜÃ4iþ|·ú¢*7õâ¿ º5Ñ Ùµ¼4š‡*¨×—O˜xJ¢O¼>étšO|ûrÄxå®Ià²5ÈgvåS:¾æÔŒÆQªÆiÚb|>›å9I7/šÊZï
+ý*áç;:„‰nX ^ÔÕ#|ã;êZ7êÖÔyñWÒÊtÄ~ÏÉ®å{9:¨fzH—ŸÞ¹Ýåygš6Êùz›Wž—ѯ¡ü•µÖS)-še€u™9l>:¾õsl¥çò§õ9²qJXU’-Ÿ<kv¸÷Ì}â!$Ž¨aÒ“øœu–)ÅGˆH*‚Òx¸vÏØ‚~fAUZ'D¥X°Z"Í·æåSR{ª­nùú3ÆňŒU<¡4YÌu­¶:ÃR}¡ø
+®«™Ëµ¥v¨ÜdÉæºÙ¹Ó^8ٮü²‰r,Ûó=yÄÞ®’ª7dÿC‚r˜Á¯9î"Nâ힣XÿùÁfifEù±³£Ɖ©§zcá$»À°Ë‚Æ”Ca~6P¢†Kuè± I™%¹ÈO‹àà«Ø ¦‘æÖv£f•‘¦êÙ³ÿh(%Uqã•&;Ö\ì©aˆå®³f¦Á
+™Üp7O›X¢ âH•ÚV¼ dwés pÌ™ÔÂk÷c~LJ즡€õª ¹Øœ~P©ñb¾¶vüÙéó¥¶Áéóõ¿×%à'›]ã[€¥,ªÉ2»÷FßÓç–8,膘*í¨Š¬t‡«{R
+ˆpAO'¢ªI¸ùÒ’
+èú‹í²!ÜæÔ0¥ïŽIT»øi ´7'ÄL1™±ËzÚ…Ñ­%5ú i÷×Ì&%&3lð°5ù¹e.M*ç Ecœ¤r¶,Vlþ È d<H5«Å«NÜû†jtÞEu—É’¶÷xßà "–ív'a,í•r–LŒ»rúÇ˳%'·ß]ž­¢]IäÛYnï—ß!ù¡€—=Ï'Í—mÉó@|$%†E€EjЇîêëãißàÃá»7ùÈš7å=­×nàÖø2½w^f~?$Ѷ,&ÝŠFc™GºÛ½7´Úí¢v|–3χ5ß#t†/ÃîN|mi¥ƒùÅø-ê
+°pÑ{ÔÉþ¤×¥ƒ|LßéJI¡ÌH(®—Þ Rܽûû6Zá‡wÃ$¾ÒiŒm?´€ñ.Ø^‡G9'\ûõE¦>}0Ñ>7ãšèvóþÜ'É£Jß!ªuû5WÑÕÚ¹»uM3L.ülùyFm$Ô+…³z¨[;KÈçÕËÕú sǼ—>Q¦æš æNDùÆóVjýµ…¬ ý”Ζiƒæ€ ‡þVæØç¾V5:Ÿvi&Iœ²F¸–k]žªºahÚ”
+‹oã×ÞÖŸÙr)‘7-yWÊväd®àŒêfS{;E&Õ~…R¤a¶6B`žQQ¤Öîœr¹U*Ï<2Es rïl½î59{§Ùäé+Òe§ r¬±¹Ø6YÜ0#•ë½Ð33^Ù¾qÒß÷*ëåhÀíIžûöqi4ÿãêÓó´%dVÄØ@Í}߀Ëô ¸~åR'
+°lÒæhs3îþâóÐ>·¦ÝÏCu©y…¹š¢&ÈbRH$ÃqÛ¾ð8]ÓBiSøÒêÂelõ1¹*©§;>IËb!„³îb$JÚ©3ç{üŠØ ³
+endstream
endobj
399 0 obj
-[ 391 0 R 392 0 R 393 0 R ]
+<< /Type /Page /Contents 400 0 R /Resources 398 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 378 0 R /Annots 402 0 R >>
endobj
-391 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 298.339 289.954 313.064 300.953 ]/A << /S /GoTo /D (subsection.4.2) >> >>
+402 0 obj
+[ 395 0 R 396 0 R 397 0 R ]
endobj
-392 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 328.785 289.954 335.759 300.953 ]/A << /S /GoTo /D (subsection.4.2) >> >>
+395 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 298.339 473.415 313.064 484.413 ]/A << /S /GoTo /D (subsection.4.2) >> >>
endobj
-393 0 obj
-<< /Type /Annot /Border[0 0 1]/H/I/C[0 1 1] /Rect [ 123.166 69.122 252.62 80.579 ]
+396 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 328.785 473.415 335.759 484.413 ]/A << /S /GoTo /D (subsection.4.2) >> >>
+endobj
+397 0 obj
+<< /Type /Annot /Border[0 0 1]/H/I/C[0 1 1] /Rect [ 123.166 94.346 252.62 105.803 ]
/Subtype/Link/A<</Type/Action/S/URI/URI(https://dejavu-fonts.github.io)>>
>>
endobj
-397 0 obj
-<< /D [ 395 0 R /XYZ 78.37 808.885 null ] >>
+401 0 obj
+<< /D [ 399 0 R /XYZ 78.37 808.885 null ] >>
endobj
-165 0 obj
-<< /D [ 395 0 R /XYZ 79.37 324.305 null ] >>
+161 0 obj
+<< /D [ 399 0 R /XYZ 79.37 507.766 null ] >>
endobj
-394 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F63 231 0 R /F62 230 0 R /F55 229 0 R /F15 227 0 R /F71 292 0 R /F79 398 0 R /F60 238 0 R /F32 236 0 R /F53 226 0 R /F68 259 0 R /F54 228 0 R /F61 239 0 R >> /ProcSet [ /PDF /Text ] >>
+398 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F71 291 0 R /F63 227 0 R /F62 226 0 R /F68 255 0 R /F53 222 0 R /F15 223 0 R /F55 225 0 R /F54 224 0 R /F32 232 0 R /F61 235 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-404 0 obj
-<< /Filter /FlateDecode /Length 2802 >>
+407 0 obj
+<< /Filter /FlateDecode /Length 2709 >>
stream
-xÚµËn$¹íî¯èã ‚‘%ê 8¦Üî
-ˆpñN éÔåÇï—¿=Ii^¤Tøg6)5Hiƒ”€ŸîŠ¿á§Ágéûõù›‹PÚð7¸>ÿãÇŸ÷»˜(”tg»hG»àlm«v2ø§ñk¡àA&‡~¥¾Ñ›¾ûñ9í¡<',‰:_´Ågüͧ÷ñ-.µÊVYÂw¢~kœ&î\<àf£õ¡|&:Àíiÿ`…Šöm:Šä“,nÊ;¯×ô%¦+áÉ EEK=o÷qtÌ‹ÒL5K$"‡éí§ ä`k©{f´óoikÊo{·‹¸…Ö§~ø½H2ëj`àmäÞ íOYIÚObMäßC¶³Â@ELfdÌÌfânÝ÷묃»BOŠ0huqV ãªÑÐ"™Â"ÅÇ›²«ˆèQþþâ´Öø
-ûJD_ ±&fIµ&º§BÐm+ı~4I¥F«àÖð/™íüS1Ô„GS¬u‘šhp…—Ï6í]½ŽWÊž2öE~ÃÊh¸áH+¼©Ô퉆͵ø›©LÞ]Þxr¤ÂUYÙñ:ÈÇnœ?ªÄ E_¦Ð_Æv0Ä ól`…ªdô¶7Ò§ŠÂÆ“·fPUÞÙiŸ¿Axj ØZ‘õÀ¬+ST§nŽS`WÊvè²}¦Õ¶5l-½e6òÛGö—LÖA,ՌԠî.$'¸f‚¼ÒÚ,¤Lù­SvKŠ3Ÿ}ÌlüTÏÜ&¡¥å·­'sð›ÂnX¡Êb,z¥Gé…Óµ‚`ñ¼_Iŵݔ§Ý8
- ÊÓtÐû$l½Þ7Vb‰_6K— ð…Gª&x©âAÁZ_LVê32”–BÛ¢T7%DV1‰(FrRD³¦H'„ï†ñ"´£“'—§r0 ³ ”XF‚ò1b-ôúãáß;á™dOþòËïéw”„…U‘—ÿüzùí᯵”ÊçË%é×@»¡<äHéYŠõ02²•AÞ*¼ìN½ØJáÍ,@Hé,•èz¨
-›Âœ@{wLóu¦´QÚ^¯íoGr 'špÙö—jßbýd|$ȖȪëó`íÏŠâåðóKQDz67‹íÙ†'Lß‹ ÊA^^¦‚{©[ ZVŒŸ$ÀW&I“׺A)¦,‡Ë,%;s¹eyg§— eF¯Ð;F‡Dðd%ÍçdDU êýĘ„ gê9
-¤Pv‡Ð²xR®}3ŒQ$ZP¦äQ\,þ”>ŠO-õ_Ó·òB‚Ýíà:§åœ:‡Ç]¿o´3³â=Í’dìŒPÞ|Ü.Fx¦éöÁ:ÙÀäŒ9Ê/ Ä‚
-5jì]kLU±¶7Pß’|S~Ygaõ²¿ŠÖ¾Ü1>kUîÞòg»‰´%b–·®Ý¸2®ÜÂ3¹xn³Vù=½Óõ}k‹½’ à'è>¿;æUõ&ð>nÎzK€í|o|» ó¦¡â~@GøÙ%¢ÒÖˆéî(ï¤Wy¬ò¼›vW‰ß0? /žßÁ ­ìÛBô 'ÙÚªåû×ÈK¸…ÁÛðýr_CŽÛT=ÚÖs mÚ«ÄK*´“¸2å·Í÷ШlæÂ[ækæ~;ºj]ÖÆ2™Í¡ÓRíòÞe]€Ýí‡]V-åBÖegPsÙìáLy}m °Z2ÌÜÇb&J—©‡­—òŽ/ñó{î`5Eyh£Z˜WOAjúÕ€výª&Öáá˜Ã¬†ïä¨Aså Ã4gÞe £ú~Þ¬Ê ®O ‰X „.eF#©H7ø¬XÓõO¹?CÓ§±Oî `Úˆšcû Ï í&ÈÝžƒ~jÊkn>[Ožj,·íL×YÍÝм½t#™­­µõ€±D9Æڷ鸹‘°sçØ\¾±‰x*~H77nf7_ü깄ˆU#¼ùÙŸ÷i¬Æ²æ†.}fû¨¹ÜÄ8
-¦Ï¾mF,5¢yýQh)ð)b:Ð:’™h%@°…–†Yœžq¸zá°¼h0ÃEƒßJÜ
-Oì(ü–GCúÖäÂ6†dk–ÖÈ ëËnslå½¢¬u[ó®$zØíŸö)•ïxJ2÷ª‹ —ÖPÃÀxÛ´vÒ½ÄU‡ò¬Ú ±Çþc®<ÍȤ…·¹m–¶þ×exüK3¥ñàfšîóáãk^‹•²×;Ž=E
-“ÊÏËÑ(¬ýñ íûðfM^î˜Ù"(Ü;:àÃéfµæÍòPOÿœó»Iî\NȣͫÊk<mº^ép êM—KFÜŽ cG…ã
+xÚµZKoݺÞûWh™ C߀k ²}´«Þµ]½]wÑ®úó;Crć(ùçÄ€¬#‰3œç7CJrù×"—ïëÛÃ×KTKƽ¼ýö ð¾\Ôâ£Ð~ñN éÔòöûò×G)M”ÒZ<
+2Ê©!ŒpÎŽ´Ei‰ÿ¿?¼¾=ügg>­…ó~ùÇïtma㢔°>,ÿýçòÛÃ_ðþ{žÜxõÒ›l5ãŠ+èZZ]1¨‚>´äÇËÆ
+'xÙz€ã(!ŠC‰¨ÛÛuóOê1?ên?g_е¹²X¯iŠäT¤ßÙ™eçÊÆ3ÏmÜ[ (•€p'ö¼’Hºä®;0”*Æ$ËØb%;j´e{§Ô—•eb¯Ø;f½E\À“¾‹AV[@Ý Œ÷x:sÏ9 ô)èNáKÉ(¢›Í›" Ϫ«Ò9‰ð'0…§"ߢ‚‰0ò³%¾¸Ö¾‹c‰ör)y„‹9™è”jê|ž
+Î{sØ–V8s%`ÕÞ $÷
+ž6b„;–‚aZ¼¦µâù*‹¶…™4æõÝ™Kíg~~·è”ÕédÖTTJ11ßJ/»–âr´²A Ôµ^ï/ùZ}Æ 2©ýN=ÐK>È0TßÒ[ï9Õ>›ê_¡éÇf–Ûð™FÃsñ~ÑÑ3üx£0‘¬äû׋Ջ2Áö‰n…Mð[¼>}!ûR~žWaÕÜß*¸·¹‚k2¡—ù¬j?EÄÌO]æG É¼h¤7¸JDk•ßËkB!Ô>ñµ
+~Bnm}D™/Mí¼ð(º›z‰Û´™#tQÆtK»—£.Žé+/’‰dl$/–2ÓŽKCªXw”8¬J¬<öyÞ\5°ýÐ2Ö”îÍpßeíãUú”‘ܳ™v«³i"™WÒz›ÐæâÒ™í²––çeâpÛ¹2_%+ÓÔG¤ õÚd¯$ùedó-T)kÄð”ØôÓeëºi{`¼h“]D4~¢ß·G˜ÅŽ§Ùý°ÓÎ…R–~Sp«±uöpfˆ4Þ±…Ù/‰Æ4®ÞÒ«l ¥V~£-ýÓ…²HÏÉßD‰@þ1ÏÎœ³| 5uæ^~Õñ„Íã™7¹Ž¡bÇ&7|c Ë´4ïemçÆy“ä‹[$£6W…C゚c„Ñ]îÆSA"va¤£êHE_JNÇÒ}Æ(®#oñ€.ÎP0L”wÊ&uØ Ä™ºä.OA?VÑÄéŒþ3Ö—T5–¬¿¥g,›!Àc0M;Ijq„„â·c†9æšaýÌ
+Þ`ºöOç«­Œ3µxœÕ¦µvYS3Ï17L[·ªL²®<þZ2=!ÖiÍk` ì²lݤ3£ÉÎCRJ,£#·m:L7L·Ùà׌[á‘…Ÿ&„Xk&ÄF —¦ÐBƒÜ0ß!çÐ Œ­ 7";«çÚp¸¾ŠNèa¯ö5•÷yrÒ{“ 9† ú§yÒdßë„“›ãÀäPRŽó‡ÎÓ^›Þ%Ry0YèÕMý糧üs ¥qñF™nËáã^‹Ý²×;}A
+™ÏéÚw`ŠbM{×Ѿ…0sñÒ›3FD{Wùp:–6aœ tÖY¯#Ò³ÁîÜÌ£MïSµ\qúÖép©Îlët[K“™ÌYkœWme6·V‹…¬”æšóÚÔîæ÷$œë¼óNÇ‚m·9C)½Ð>åzæ^Æ'·ÑÙ*vn`ZnÕ˜½C‚Àc×sàº4å0x©¥†Ñmž„v¤c;Y'”ö½Î:$­œˆÍνü™-ê:žËf’i=BTz™Ÿcï¼+Z`g°“õnÑwÞ*H‹p3N¾õeA‘0º’p©+l·+;j-€£†òrVåikÔÿ¾!N2à…vväÏ]iK;2[•š¬÷šòkr‚Õ±•Ò­ù˜¶µAĸmâÀ·¦Íò×µ™ôƒŽn7ÿýûL0Z¬„ÃL©¤ti;h\®ØæšÛ­µ·I^šÅ²˜ªÍByÐö<ê óJ:ʶ¡iÖ¢[fAé ÷t)Ðó4ê¨rn#LãL9  „lVGÝBxÙÙfWÓ9,µ aîæ6ßÙ±P´7Št{Ûp-¸üõÑ¤—k
+l×Lû[z:…0ôÈûN=ò!m뎒S[²ô\é]¯^kèðþ[j|dããДSSiÒB…x”Oê4ñ³ð3^¨Ú[•Øמ; ^î»ò™Á:%Wêž\Ô–)­¯Ð—þÕ€/õ
endstream
endobj
-403 0 obj
-<< /Type /Page /Contents 404 0 R /Resources 402 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 382 0 R /Annots 409 0 R >>
+406 0 obj
+<< /Type /Page /Contents 407 0 R /Resources 405 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 378 0 R /Annots 412 0 R >>
endobj
-409 0 obj
-[ 400 0 R 401 0 R ]
+412 0 obj
+[ 403 0 R 404 0 R ]
endobj
-400 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 474.827 124.341 481.801 135.748 ]/A << /S /GoTo /D (section.7) >> >>
+403 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 474.827 313.631 481.801 325.038 ]/A << /S /GoTo /D (section.7) >> >>
endobj
-401 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 497.522 124.341 509.477 135.748 ]/A << /S /GoTo /D (section.7) >> >>
+404 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 497.522 313.631 509.477 325.038 ]/A << /S /GoTo /D (section.7) >> >>
endobj
-405 0 obj
-<< /D [ 403 0 R /XYZ 78.37 808.885 null ] >>
+408 0 obj
+<< /D [ 406 0 R /XYZ 78.37 808.885 null ] >>
endobj
-169 0 obj
-<< /D [ 403 0 R /XYZ 79.37 347.746 null ] >>
+165 0 obj
+<< /D [ 406 0 R /XYZ 79.37 537.036 null ] >>
endobj
-173 0 obj
-<< /D [ 403 0 R /XYZ 79.37 310.353 null ] >>
+169 0 obj
+<< /D [ 406 0 R /XYZ 79.37 499.643 null ] >>
endobj
-402 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F62 230 0 R /F15 227 0 R /F54 228 0 R /F68 259 0 R /F91 406 0 R /F90 407 0 R /F92 408 0 R /F31 233 0 R /F22 234 0 R /F53 226 0 R >> /ProcSet [ /PDF /Text ] >>
+405 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F91 409 0 R /F90 410 0 R /F92 411 0 R /F15 223 0 R /F31 229 0 R /F22 230 0 R /F53 222 0 R /F54 224 0 R /F62 226 0 R /F63 227 0 R /F65 228 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-412 0 obj
-<< /Filter /FlateDecode /Length 2816 >>
-stream
-xÚµZÉŽ½ ¾ÏSô X–(j¸§§ $§s r
-òçü‡äý¡j+UuÏضÑS›DQùq‘¤0—_$ýýþt}úºY¸,X¼¼ÿñ¤.’þ«‹ B»‹³JH«.ï^þþ,% ý´”èw•éŠ7zg_þñþ—')œ!Ê!‘øÏexük¥¬”Á뙶љž t¯2]MW‡y< ñì-×PÆkS©Ô÷œ;úù̽zÍÔÐæYÐ%©§Ùlt•¹MâÄ—ïôNcëé¸HÃÐ÷(‘H?$Î&)bJÚÊËV$è^¾0Ïy¤H-R¿þ“çnè^ªÄ‹€
-D{ùß¿.<ý¾ êO-Ò>ÄüðƒL¯Ì£ÐdÖI‚›½ñ%NËG0V¢ž©Xž§O­"WåöÇ÷aÀíú.´®ç¤öÖJ Ioê½€…G¤mœ°Á>&í¯À2µ@ºå›4ú_“Œ
->“û¡¥™I•ûD{ ÉÙ ÍÒ³â¶@¸:þ»Ìפ+ëO½]!¹=egú ×vd@htsëÊÉý5ÔZ8ÿ í$5OBÇ<›öøã¡Ö^XåýÙzŽŠæ&õ®·¹c‹}Hæ4Îý“×Ì<YúçÒø‰«öØñ&3_°FLŠí„—ûÖKÏÌÞ7.Nä€oûÑ ‰ù¶Yªy^K2ù]û‘9;'¼³»Y¸×¼NÁæÌCº5×A cÝ×MºŽü¿P ¡Cmõ{"ªN‡ü3>ññu3šUc”Ûg*Æ"ÅA5Æ·<å8ùpñç5£Y²%_¢ (ü–÷9"zù¢]Ïs~¢>*êNö /ZE)¶É)–"µ¹Žmãì
-ݨX(Økmco´þäëÜš£žFlqšgûŒûº)sœâD²_Ï~–àŸej[ìûÐ7#$E3Ó¨Y"KãlV
-Ÿ“2ýd7{¢…HQ¸¨àìs~b5$,xîòP±{nW‘߸ï7Ïw1Ìß “)êbleDÙè¹´Ü™nê3ðW~ŠíL —Úw6‘q´øón6²~,»Ê—¦…¼×&ôœ
-‘óÜ™kzJîJõá
-§:±EÏnŸåJ\úÞ² 27²U×k7]ºðX©–à;õrr©FEÄŸg7ª÷U"¦Xh–a“óË^^ -Ã~Ü£’.äkªŠ”ÊGRkÙ‚íønŠ|Ѹ& ^Œ,21ç¡-n? [¼õâ^krr e±ŒìµàŽ¶ ËZ5Fëª!WÚ ±†Ñ
-jZŠ÷•È;±¶”©˜ÝôF’gÓà ¾$“€¦ô+9¬ŠþX²}úA‰ «$Šað-”(nSPÎÅ@ZT!ºb–q2ÐÎHóW[¡ßpàÃÁQy{mÜÇ>Ñ }ßà­½AÞÔ¹Í_Y&œÕ±’ŠËX“q§ù["[%2MÁ2ùA/ˆ
-%ù@ÑÜžP³d~²ä¦É¹§j+_]™Z¹WƒÒ–æ Ñ¢§¶×¦›Õª\®¢ôî¶ÑzÊm‡ tU CK’vW5”§¸¼ÁÌaUY#”ñ;öz„O•iØ:àåí.ùÄœœ‡ †Kj›)í¦~PÃu `)·Ñ©Ç3qCDïˆxæÞ˜oÕû(½Ë3BV™Ü®z¨ÔŽÁ'kÙ[ &Æ¢4)<*"W›ºSŠºL]î>é åäÚU+²]e¥÷xý&úT2‡µƒó­-¬‡yüÊk‡t?ǯ×}-äN¬hDPv5Û†×†Ô<£jÁõó9îšyÄ1ª;J¸g@o;Þm_£<Ãb6‹ªx “û“@ç5ö q8ÉTN1ÆXÅùó˜;y`éx戒žŽ&¾‡
-Ö{8¹}â(«–>¿øýi8¯>Ö»ƒÃ¨.žÝOÜz;s ·¥Ü!Xa°mwD¾^G U2AO'&JG$´ŸU(A<ÆakÎÅU#ÖkoÈË,ÁiwÚîðÈò‡£¡Éb
+415 0 obj
+<< /Filter /FlateDecode /Length 2716 >>
+stream
+xÚÍZËŽ,· ÝÏWô\E¢ÞÀ`€[·§ $«³ ²
+â,/ìÿ_˜”D½JUÝópzºK%‘ÅÇ!«äå?yùéi{{úËÍê‹R"Z«üåí—'…wäE]|Ú_¼SB:uyûõòg)Í«”6H鶗oJJ‰Cî~"Þü„üíð£ºq‹sÍõå›öWÀMJ |…kÔÍÑHš£ŽyYèH^›?iÎ6Îu±ÒÅéÖ
+.s×·F¨ÑJk²¤à×õ4hž»¶ÝÐzo^þùöWÔœ²—(¢gŠ3RXªâü°Kï2ÍÅ]fžV<•µB=sÍyXg»ÂI³ã5—WZ³\©µÐ°“ µœµð1-ƒ—„=ÑB¤!*x÷œ¯Ø Á{}«#àŸãªò+¯ýø—Õ+e2EZMæX8ÊFϧãÎtÓšA6ØøŠæÙ-+£Ýg¹Ñèæd=¯b.“IBÖ骫­) nè
+ï÷»pUÁ·^ÝkK¦è·eeow¬m8Öj90zWõ¹²Nå0À´€Šî¶Ã€øMkÈûJÞQ5Ûјˆh­ÖÏMÿ·-ÏLß·üüy˜™b‹ä‘b¥Äc+×ça¢!¨yïúÊŸóWW‡yu=礣ˆ•e戕¯òÊ~ϳÒI²Å¦»%¸Ê£taˆtâó÷¨SXêô@Þ…½H#œ…æ­ëÝÔ«m8«ûLQ?ø×­ØËm›õB§Ú¢å4ƒlPIÕ[z£{Jö•õ ‡µÈyÐq‚mq&¤)à‚‰/}~G×]þüÓ¡i‰1Rîu¶=‰GA‡‡v§z7Sõ}_\Š1ûót!ÍÿUŠÛ˜ªrv­#ÕÛkF*Y3˜ 0º„RÐ4
+c캙‹Î g‘ ´Ìå@²ÑäÑÒj½˜
+Cœ/G€K§¸ž
+ÕT
+ˆíã¬~$‹À탮"+0la7†ds·­EjÃÙÁ›“ZwÙï´Öµy¥]œIºÃÚÌ[{GTéurâsËÕ}m‘«¢ <Ò,e$ó| é†iO¨Y3Ÿl¹iÌGV*×ÖÉÝÚ½z蔹¸g žænÍ6«Wq›¸;É
+—â‡òÜ”®:aNPfß5”§q#bÜv^ü…=Vå¬PZfñúŸ:ÓpëG,£»âÓäâ<Na¸”¶™Ònë=\–z“Ú9ž‰ˆ®ôŽH`Iá•åV}ŽÒ»:#f“Éój†Jó8øä{­z+`bl:@ÓÂ¥¢ánSÇà°¤¨ÇÔÕî“ J‰è®¡¡®³Òg<ö'½ïGÙÃÞÁù£-\€™•5ŽÀ!ýžñë¶ï…ÜÁŠ`¬ˆÊÍ\³ï®ûifk‘š9qT-qý¼D–˜åí̱"†B•ŒAßÁ¹ʶ“Ýõ=š!3,v³èŠW˜,…¥– þ?nád£±RIÐzBTsŒqŠëç±v.IzoˆÖK¦'i~”|
+kXgþ58Ÿ½©¿º
+“\ISÙCþwîÚ*î lp³Ôp]ªÝ ”°2Ö^'¥óõ1šà„µž_ñFØg JQ
+·öîŒèº£—5Œÿˆ+ªÅŠ´ÑXžÀy¤ G7JûÁh»B äµ=>„å‚–ÐxßîmJYù«VÔ;’,ƒ-½
+'‹.¦üWpòñ˜‹!0_ÁE‡Êå±Ò!{¾ÒxGúSä÷Ùå#ùüëÛÓo»¸Ë¿~}¢AƒÖaµE-cÜå÷_~yú{MIéuÛuÐ
+I‹¦OâíE ”•Ó[~ßÃ¥×?êE~ùC/>
endstream
endobj
-411 0 obj
-<< /Type /Page /Contents 412 0 R /Resources 410 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 382 0 R >>
-endobj
-413 0 obj
-<< /D [ 411 0 R /XYZ 78.37 808.885 null ] >>
-endobj
-177 0 obj
-<< /D [ 411 0 R /XYZ 79.37 578.639 null ] >>
-endobj
-410 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F62 230 0 R /F63 231 0 R /F65 232 0 R /F53 226 0 R /F15 227 0 R /F54 228 0 R /F70 285 0 R /F68 259 0 R >> /ProcSet [ /PDF /Text ] >>
+414 0 obj
+<< /Type /Page /Contents 415 0 R /Resources 413 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 378 0 R >>
endobj
416 0 obj
-<< /Filter /FlateDecode /Length 2183 >>
-stream
-xÚÕËnÜ6ðî¯Ð„!gøv½Þ
-g:)B'éÿŸôV}þtwzº{±Ð,XÝ=}½S±Ku.t³JH«º§oÝ烔 é‡R"Ðï$¥¦§>S›•Ò`ú¶ÞUj7§rŸ£qîþËÓÇ;)L÷GÇ?ôøh”€
-«Ìnš¢ÂñD³©QJØý<TY$̧™/IÛ÷PrQۘƬä++eDÁLæÚãBÒ¨)†´ƒû c˜Õ…¦dÓÉ–1OðIMPÝ WíE{Ç»¤ì…Ä#Œ-{¹¦Ód KÙE¶€fô¥:#\xe¥ó‚[àáºR-
-a7­R&fú¾ZmhðëZÞ UÃë›~e­+œ² <¼¿Ð"²X¥ÔÈe™~ªJe#­cÌeä•bÍ[ íûqaCé7úþøCÒÍÝ<‰u–ôY&—\|®ûhåŒؾD’¬Çr«;¼Ó=8™w¢¼›L#z;Á·e—zÊßa„/ÛÀE£”Ì£X†qKu±µ@Ò¬£OOæuL¹¥«æø¢½Q‘ÌhÔ¥Ï1Á†Ô)K1ûeJ™*ÑJp–‹/FX²Ûòà±yö¼¥)Mv
-8™Lf¯!¼´D63›äe/míQM&Û8ñJUY<Ùe&ɇÜ
-cFÏ!
-‰ƒÉ_æ|Kat¨‹˜, —¢Ps¨ÄQ½ ÁÆz×½)Ѫ­yᨢ•¿NåË®iÚ0Œ}u-FÝ Uvw¤<˜†þf\Œq…[(sÏ5Ä*ÎD¦¸Y’ɹ“e^t@dZ 3ŒËTc©ÕæÇ,™¯; 1>Í­¸Ÿêƒ& </ÙJÈz+Å|ŠßïåªÄ%ì!Ó2T ʼBS]OˆV{û •¾\íЉ úõ8¥÷4xŽ.ÒðÖm4}hÐç½ã$H$HPCéiªôÔ†„Zây.`\"ɱ»RÜŒ’=/o½S—Å ¹3Ñ/ºâ¡fMlKÖ[ºŠêSÑÉЖåQGß﵂ï鑽à¡ÖÖÌBKø@æY¥–ÚRýÈR«"Ápö¼~ö†k«X‚é‡ì݇³®&ÎÂ=Žm³– ÅCµcÑwŽm.õñøòm5ܘΊàO[ë…rHTá]¶¼„nåœsékέŠ¹£?îçï!¢3õ7<*Z)­iq/¬åt»?çžJsñ¦ðñª‚ —î†Òæ'àPWqÃZàôà!1‰ò#È QYâó²dáu<{G‰k1fÊÚúšëšÔ×õAÆÞÛÝú
-7^û
-0#4O1#Ýeùü…š£ßG¶ÿ¿qà7
-‘”6)žöW÷ É0ÊŽÒwGû(IíµìŒ •K~:ÚD¥â…I•Âœ¢ Ñ‡\‹o¥”æÎ¥„Qzb ëT·Œ
-±åJ"—ÕÙ )¢M͘ð…]Ñï
-¨f¤™€g¬
-endstream
-endobj
-415 0 obj
-<< /Type /Page /Contents 416 0 R /Resources 414 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 382 0 R >>
+<< /D [ 414 0 R /XYZ 78.37 808.885 null ] >>
endobj
-417 0 obj
-<< /D [ 415 0 R /XYZ 78.37 808.885 null ] >>
+173 0 obj
+<< /D [ 414 0 R /XYZ 79.37 771.024 null ] >>
endobj
-414 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F62 230 0 R /F63 231 0 R /F15 227 0 R /F54 228 0 R /F55 229 0 R /F32 236 0 R /F61 239 0 R >> /ProcSet [ /PDF /Text ] >>
+413 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 222 0 R /F15 223 0 R /F62 226 0 R /F54 224 0 R /F70 280 0 R /F68 255 0 R /F63 227 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-420 0 obj
-<< /Filter /FlateDecode /Length 444 >>
+419 0 obj
+<< /Filter /FlateDecode /Length 2136 >>
stream
-xÚ½UËNÄ0 ¼÷+òÆql'‘°€Ä Ôâ„XN{€ÿ?àv¡/¶‡Â®¢¶©=Ï8*B÷æ°\îš÷Æ;´¿w1Cˆ.ŠQv/‡¦lsP Î30«ûxuûæÁÞX¾%_µÍÙ­’Ë•”]»?¢%† ªP½kîéQãÏuñÜÞ—*À¶ ¼€öw:ÌA{ ÆØ9.•û»ò\"éIÁ› #$º®Ù¡nÚ©VÌF„7ÓŠ3xÔy­¶Ð¬Û×Áªf[»úÌ»uú Aà8eÞéÊϯ…ïÂ+cÿAâ›qÀì­ 'Ñ‘W:¬¿rêñ÷d*3`«¡ ùѾ!3Ç_×Aÿ2­3Loê>…z
-AÒ_›¨L -œÝz™Ë¥L ¢ŽÍÞ˜ŽÇøÊVý\X7Ÿ¾2Ö
+xÚÍZÉ’7 ½ÏWô M‚àV¥rÕȲ\•œ’Ì-åS¶CâCrÉïàÒ\º[ê÷$ñX%u“±)E0Óo“ä¯O>¨IÒŸš\ÚMÎX¦Ÿ¾<ðkÔVm&…ÑNý2ýúðµÐx|~~xwµ0,Xœž©yÚQ«„´jzþ2ýx’Òøú±nü¼ÿüü sHbÆLÊÃ÷Ÿ˜•^c¥À
+E“xi™ðïL;áÞ­Ð ¥ìH >¤Ñà>>/e‡(Àáa²Ã ”´ûdw„Q ïíÈ×Ê$KèsIÏxÙ'O§X¿ ˜
+Íÿ¦ñ›ñn4úJÛ Ú(;dso¯…#³z;Ü©Y B«ã¼B“™¯Ø‰H¤Ã£Ð€‰þSüæR?lOô_ªÉ—¢d°Ó{ÐÉÇŒÊþvIýŒ9BËEo=Ƭe•Ìši•ŸÝXO"\ŒµOëzÍŒ˜Ãº2$Ù¡ôû”±x‡Š9nÌ஽Ø`šãìE*þ­ìåžN³=ô\Øðúl}ïûJµ4U.oªT뉗ޘÂ}¥:SªuŽ¨þ·J1ø›JzïPª•Âø·Vª5ac
+ï®Ê¬ÍøP
+eg/×*®³ˆ†Ÿ\V@^‰!¶ØSzƒ~îI6”vƒïÁŸ’nlnæA¬³¤Ï2®å)¾´m
+Üy8°},“jKúFmIkÚCÃZtÙuCÚ‘¨G*óaŒ½bY>ýl+tÒp‹±¯ÓìzU/ç VâÞ}uäYUFµ"ªÖUy-ÚX`Rµ°>¬É¯§õ¿ŠÑ»+ÏZ‚0þ0ñJ'PÁ-ñ¾ü$³ˆ»§/pe„Ó¸†ŽEvÌ &™:‚yè˺ƒœ­1KD{
+ìùdw»uj’OÁ‡Þ{Ýis?F Ùp¿CnÐTèÕÈç+N½ ï`Ýò½çÍ@ÑÂÄQ"ôZù6.6Ð~Í¥‹|}c ´ÛܬNgnŽvUø/˜ÛÀç
+Axõïjqà¹ué!kqè}_‹|·BÂ_zPÞ ¿5…Pžë éÇÏôögú|ᎶÇ~_(ö °ŠGý1ý@# “ÁIzßb0›ÉQÈq¦/§c“ÎDs1F<åCÀø«ºK9¬)-ñ°îܾéŽZâ›;G-ù U­Á‰¤I€oÔ·æà…£(Ö™ËôÐœ '¼ÐJaíNIÓÏ7Eßù­Ãæ@+´­E’ˆùàd…#WU(RyBsXVåÞñŒu™X4¿)M¤`eµZ‘f"žøcCðRj{ªÖ¥ŒF åG)ß¹ð
endstream
endobj
-419 0 obj
-<< /Type /Page /Contents 420 0 R /Resources 418 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 382 0 R >>
+418 0 obj
+<< /Type /Page /Contents 419 0 R /Resources 417 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 378 0 R >>
endobj
-421 0 obj
-<< /D [ 419 0 R /XYZ 78.37 808.885 null ] >>
+420 0 obj
+<< /D [ 418 0 R /XYZ 78.37 808.885 null ] >>
endobj
-418 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F62 230 0 R /F63 231 0 R /F15 227 0 R >> /ProcSet [ /PDF /Text ] >>
+417 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F62 226 0 R /F63 227 0 R /F15 223 0 R /F54 224 0 R /F55 225 0 R /F32 232 0 R /F61 235 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-425 0 obj
-<< /Filter /FlateDecode /Length 3644 >>
-stream
-xÚå\¹Ž$¹õû+ê†"#xƒ:§¦¬'h¼ÅZ$Gc¬¥ßWð>ó¨žÞÕ
-2U]É3"øâdòÛ?oüöç—íÛËŸ
-oB2”nßþñ"迉›q ÍÍ(ˤ·oßo?æ\çƽ~œsúWΑ~Òðú úì¿ÑŸ{EAߦvl¡$}ó ¢ïôÇó£¹1<èW?ççÍ·-ä=N¡]ÛÚ÷_üSjµÅïþ³SBjaÒhL™ZûñüsµÅµ¥ž¿|û)ÑI0§”0 B2«MO(ú´þû@°óõba$£_>âziïq=BÝs´\,‡#Cy9y^©Ìɼ±…’‰<ÿâ9á9ਫ਼ܣ›§Ýøâ¡#õŒL«OT÷(ÜîDÉÕN@ZF}ǽøµIˆ£^ bŒ…q”ÈÙvkZ{æÚÿRv øú l3Tè…35©“Póð«ý\]HÝÓQ5K»á¯‡ó+
-»œÑŸ37.ðÖS©—íC¢p¦ìZÚ>!b˜ç5¬Ó¯&¯¶D{ÂŽíj¦„ççê¹HŸ<r·œBQeô¼7O­öŒ£Üç"˜c)qÈ$̱+ªÁh-ýÙŠCÃ$¾…³²Õ5·8N68”©à?óÉ22·Â„~‘Ú ñî ËŒÍy=<Q`˜A;îàÙ¥é$ £x ÈÜ)˜¹– 0’YTçëˆ
-FÉ8ܯԜ7+>ÔÕåódq+Ú3¬6iÏ…„+ǸÃBÁŒß6cAÒåe÷¤ÅÕŒ‘†Â¶×¯­m¥ ÖjFÄS¬jyÖ·é` Êi'®‘h2G'Eõòåµ?QG3¼ÊNqðë·—_+øqÁ„£ÃFÝ,àíoß_~þ…žüþ~ºqfH
-Èf,ŸIa¡:4­«^ym¡Ôâ ðÞÖD$Ê€¬åaêë1|ÃÈpœz…ÏGJ[£›z«1ôŒ0S'}M>h‹Ø ä|HSµn—d£ü¿!~κèÎúAÙ0œ¡çU¿Gõ5ÿó̺À¬±÷¹ŒH2ÿ…ÕSÏ{þ;VµÂ’¬˜©·ÎÔÐñ†¦¥âSœkUqe˜ÄI»W+‘Ø*¢ŽœéœÛ^UªªŽ%´û¦¤à·êŠ?¶I*FCt!hSfÜÛÑ)‚¯qA°0Ê1c&ª]=ÕR1I¾âáz.à~ ÈtreÛS饤BææÚæÍöfQá„©>ç™ÁMêšk¼¶Áw©5T– ©Æâ®Oµ…Ñ♵- ub%"S`>P´2kû?œ?æûS›Ãyaó(­©þ$zKL‹‰ºWQ”,aM½FÞäÇPG j4+^á" ¦ ´± þ³@˜ß¸dyýüsGÛ»$42Ç&²Ñ”b)ö’ õ“Í‚ô(Ø°ç²´hŒþARŒ\†3;<Ý0kÈôñ($yuÒGbõÉv æ¾÷›Ÿ9à›dqÖ£ IÎ0­;°½`èÂ¥ôÑ 5¬Ïã"Ç^ 4ë¦ùNbVšŒ;y›Dh†4¶Z;iY,è)$Þgýžƒ1xÀÿõh§$Fkéøêqõ¨‘¤’L+ûvd¹²Šü|óÁ6>e¢GÏð}„KC`_㔣'8´‘Ü‘iNJè×ÍQã; °T´Kú*BÞJ7]^iUÒLÇà:
-Ÿ6Œ¡ø›µ½ª1-Ü÷¹˜p!bÈÝH'.%³ÖŒ£ !s:ß\dZ-™‚††ÑmT_Bwb†Ó9Â@!8ïa¤7ô½ÇÒìÕ$¸,Aö
-üè>ÅYÿ“ž…®<ó,»—g<üM•¶ZçoPÚ)Sg©3ÔÑËxå›O§½©LK\
-$ãX_ãgÔðFÔÿáq‰Çý$³Ê|ŽÇÕ¾=4Ê:Ý}Îc£Ô´P8Å
-Ë »rýTöW>àôü–§ ³Î¶j¥åôà~Šðw:?­9­Ö•TsÍÐ>v¾˜]µv
-l‡€ïT%ƒ‹ÍŒr>…Læ²Gû¸ô2ÖôÛE½ÌÖ§RôjAVp’ɾ.¾f
-ŠBCX!¶ÖŸÖ÷•á3no_FYZ‡µÛLFù®™:­®8^7Š€L^Yk½}öØ›]™)s%ú•c= ºˆÚÃÙ4?àX©:¾²Wc>ºˆ0®Ü§»bN¹Ï'cξñk>¶FFâ8úUΔÀ1/´:ÑúÑ|¯î³l˜dbÙ>ÔÌÙŸ=¸Y±©ÏçáœÎ/õ«Cþè,¹!u(Ö6F¾ÉqôE1.õØkNÕ ê$ b‰îê}…•‘ê[v0ÊçATWº:6¹Ê&ˆÀÓé´+>Á^ýÎ]<&å—ÜÍŠ˜$º–Oï¦u†üþÿ_î†ì^.&z=›»Ñdþ;GIæÿŠ=Ǻ»Ò¦ušüè7w
-ãž—uÁ‰"W¯¶ª¸o³Ô*¢ækFýá%ÔZÂÓºT0(Ë=™4û2¹@Ta飩ØÝÙg˜RH~l7ÀöTÝn^éE{Wø‹‘µ¨Uf{ž6h Í†Ö˜m{I¶f"=„[ç)rZá$b„bìa!')8ð—ßå´|ÔIçs+d(æQ®ÔOJæPNäûÒTå­žBsMî.Á/Éa0»N$Ô ‡},ì7Ë:a…_×°¾)äÎëMõTÐ\œ ³ëîéVÇÈa}¢š¾’ãºO-7`i‘wáwÔÅ'’]ìͽ:TµüÇIö\î¹EÎ6OL]~–ålŽö­Š¬t¿f7Yö£nõŠ•'ry‡è¯¥¢óÖ[|­Õ±] [#ù~ nM‹{½QPûÄ{Ýsí‡ì%¨>)aX1£`µ«NtN·¤ɨM$^ 㵂ӟT|TŸ©ŸÐ@SÈüèžèD ›{´ò Ý…v‡“¼¼V+|-†tOÝþu¸˜í³óMbl.æzÔBôsn†9Ã}´Â‚U̪›%Ë©þ2sŒ©¨<¯Ö}î€ kÄjP!ÓzÕ“=ß}Š÷ <fù*¤øç›/g·³«\‡èn_
-Ð"m¨lŠë[oÐ2¡Ü°ÀðŽôÀúfò·ò®™æ>A—°å¹eûkxÍGüµ}‡
-ÚÝw¨ä>îà–ºk _¢i‚0¹¢ ycž†W±¤E´îíj²_˜v›Ü|·z‹©ö)¥LŽ´ûƒ5;×d¨‹Q
-ïÅ îåßúË£µ4®ºÐ™D×ЄàF|Z«K]‚ÙéT‰îFYF¢C‹.ä~yz„¯Ñ6“>õnhÅ8=‚'¤ã›†BFê-ŸçC ÃX!^·!Ò v¶9‰[)ÁÇ&Ú©cSQ²økéYr
- êOQ‹]¿ƒdIQ© I”¨à_3³z5M)ÔÞcN¨26îºycÎø¶&fu[¶Ø\¼¸RäSò³×ØŒÀ¸ƒaº÷¾'Û-Á€M˜ÕÖìÇSYÜþL’z oð
-¥¦áØñDÐo.εrÏ– oö¦‰5’ÌHS¯{Á¬¬ÿ$¹ÆÍ
+424 0 obj
+<< /Filter /FlateDecode /Length 3642 >>
+stream
+xÚå9Ž$¹ÑïWÔ†"#xƒ:§¦¬'h¼ÅZ$Gc¬¥ï+xŸyTOïjª®äŒûbòÛ?oüöç—íÛËŸ
+oB2”nßþñ"迉›q ÍÍ(ˤ·oßo?æ\çƽ~œsúWΑ~Òðú úì¿ÑŸ{EAߦv¡$}ó-¢ïôÇó£y0<èW¿ççÍ#ä=n¡];ÚÏ_üSµÅïþ³_SBa ´¦L£ýzþ¹Ú"liæ/ß~JxÌ)%ÌQ€ÌjÓ#Š>­ÿ> ìÞ‚,Œhôpá#ÂKgðusÌiÐrG† 38y_©Ìɾq„’ <ÿâ)á)౞ܡ›§Ýúâ¡#öŒLÐ'¬{ nO¢äê$ -£¹ãY<lâªð†ca\%R¶=Ãמ„y„ö¿”S¾~Û,&DæLCê&4<üj?  ªÛe:¬fn7üòr¢pú@ý9Sãm=–z.ÑN0$ gÌ®¹í"†}^œš /l ÷¤;¸¨™zÜdÜ«§"}òHÝ"…¢ò èùl[­Œ£Ü§"˜c.qÈ$̱+¬Á–^¶¢†¡eÝ‚¬læV“ÊXðŸY²ŒÌ£0i¿ˆí¤ñîI–y=”(0Ì Oð¬D)Ò‚$IÃ*^dê¹æ 0’YTçpDšEÈèC¸HºiÕ .]µMà[/_k²ÑIeoÞâVº0QÎFm—¨µHÐjòé Q0ëfNÚ*#gžWj΀›*tY/nÅzh“õ\p¸rŒ;,ÌúÛf]ìcÐò²{ÒêÕ¬7"†mo_[;J]shOuUK³~üˆ[ðP¤¨F¬ÉIŠêù+Xÿ›ÖÀ ¯üEÒ©£üúíåתü¸`‘°Ñ4 xûÛ÷—Ÿ¡'§¿Ÿnœb€‡±ßoè€Yãèû¿n}ùKôËÖT/Ë
+¢¾V
+¹Ðö\øÉÈp|ý%q0k€¹dFÀ°¤g‡
+WÑo0ðÕªP&mÛz´BÙåñ3 !T‡€ftu«˜×J-…7êmD2  È[Ψ¾«oc9ŽÓ¬
+MaÝ´ßIÎJ“Sã$ï“íeHcke°ã–E‚žB¢}¶ï9ƒô_¯vŠb´–ÄWРE’J2­ì;È‘ùÊ*ŠóÍûø@ž‰vb\=«ïE¸tö-N=Á¡ÍäÖŒL#)a^·GÍï4Š¥j»d¯¢Ê[٦ˊWdF•2Ó±rp*($ƒzAñŽ›ÙÑ!ëßAñÞ÷Eá‡0ÕëØ&‘ºKü4¯Ì81yÝ`­ŽFE¥ãäôD[søGQP
+:ïl«^Z.î—'ùiÝ¡èµ®¸šk†¦Ð±‹Åì2©µÓ`;$|§.\®èÁÈçSÊdn{4¼ËK/sM¿]ÖËl}Y e¯h'™ìûâk¥ ð!4ˆbkãi}_žâööeä¥uZ»­dԜcÓÚŠãu§È啵×ÛW½Û•‰2w¢_ëaÑEÖζùÀJÕõ•½š“ðÙE„r_îŠ5從Œ¹úƯÅØ9‰ãêWId8SǺÐJ¢õ£ù>^Ý9&Ù°ÉD²}U3WöÔÍŠL}=çr~é_êGgÅ ©C³îp0ŠMŽ³/Šq©ÇYs©f0'A#–ì®Þ7XY“âAËŽŽòuÕµ„®Ä&wÙxºœv%&Øëß¹b‹Ç¢üïR»Y!“¸C×öéݲÎPßÿÿ«ÝßËÅ„¯gk7šÜã*Éý_‘‡Ô±îî„´e¦>úÇ­Ý
+%Ñ“‡™¾Ã¸§Áe±.z¢ðÕ«-Ž*îû,µ‹¨¹Àšµ~¯á%Ô^ÂÓ¾TZ0Ë=ž4û<¹Ð¨ÂÒGÓ±»sΰ¥üØo€í©¾Ý éEWø‹‘µ©Ufžh ­†Öœm{I¶V">„[ç^Sä²ÂIÆ„ ÍØ '%8ð—ßå>êÆ%‡ó½2ó*Wú'%s('ô}iºòÖ O¡¹¦ wá—drXÌ® õÂaŸ ûͪÎ@ºÂÃ5À7¥Üy½©žzš‹sawÝ=ÝêÙ#¬OTÓÃWj\÷iä£ê XúC]øuù‰ä{w¯.U=ÿq“½{‘«„ÍSÁϼœÝÑ~Tá•î×&Ë~Õ­^±òHÎ+ï 
+äx ‘^ñ°s̉ÝJS>6ù‡Œíœ­ŠœÅ_ËÌReX`ʃ\Äèú­$KŒJmˆ£ô€ÿâ™ÕËjJëösÒ*ãbã©›wèŒïobV·ŒÍUŒ+½B¾X,;Ïp­›w0l÷Þ÷ódO&¸´Igµ]üQ*«ÛÛË$™—ðN¯Ð|¾%‚~sq¯5“{²\x×0M¤‘äXšzùØ3fcýcÊ‚
endstream
endobj
-424 0 obj
-<< /Type /Page /Contents 425 0 R /Resources 423 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 382 0 R /Annots 427 0 R >>
+423 0 obj
+<< /Type /Page /Contents 424 0 R /Resources 422 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 378 0 R /Annots 426 0 R >>
endobj
-427 0 obj
-[ 422 0 R ]
+426 0 obj
+[ 421 0 R ]
endobj
-422 0 obj
+421 0 obj
<< /Type /Annot /Border[0 0 1]/H/I/C[0 1 1] /Rect [ 118.663 86.982 239.156 98.036 ]
/Subtype/Link/A<</Type/Action/S/URI/URI(https://pygments.org/styles/)>>
>>
endobj
-426 0 obj
-<< /D [ 424 0 R /XYZ 78.37 808.885 null ] >>
+425 0 obj
+<< /D [ 423 0 R /XYZ 78.37 808.885 null ] >>
endobj
-181 0 obj
-<< /D [ 424 0 R /XYZ 79.37 771.024 null ] >>
+177 0 obj
+<< /D [ 423 0 R /XYZ 79.37 771.024 null ] >>
endobj
-185 0 obj
-<< /D [ 424 0 R /XYZ 79.37 734.627 null ] >>
+181 0 obj
+<< /D [ 423 0 R /XYZ 79.37 734.627 null ] >>
endobj
-423 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 226 0 R /F15 227 0 R /F54 228 0 R /F62 230 0 R /F55 229 0 R /F68 259 0 R /F32 236 0 R /F61 239 0 R /F48 237 0 R >> /ProcSet [ /PDF /Text ] >>
+422 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 222 0 R /F15 223 0 R /F54 224 0 R /F62 226 0 R /F55 225 0 R /F68 255 0 R /F32 232 0 R /F61 235 0 R /F48 233 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-430 0 obj
+429 0 obj
<< /Filter /FlateDecode /Length 3014 >>
stream
xÚ½[Í®©Þû)ú†Àáp
@@ -1507,19 +1490,19 @@ vÌEw[7®t®íY×`×æ2Ás¦_ŵ´¨„qPï809ro·^]lxíÇÐr,:x÷£%Ë©…­‘³
š¬;÷Úk†' ‡l“ƒkh®LúPjîT;L5wÜîä\+\ñŒþ{Þe¦ÝÌÅWè-vð1g€×¿ÿ ÀýúÁjø•bÞƒ¶Pó}IDü ‹ìÿ
endstream
endobj
-429 0 obj
-<< /Type /Page /Contents 430 0 R /Resources 428 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 382 0 R >>
+428 0 obj
+<< /Type /Page /Contents 429 0 R /Resources 427 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 378 0 R >>
endobj
-431 0 obj
-<< /D [ 429 0 R /XYZ 78.37 808.885 null ] >>
+430 0 obj
+<< /D [ 428 0 R /XYZ 78.37 808.885 null ] >>
endobj
-189 0 obj
-<< /D [ 429 0 R /XYZ 79.37 771.024 null ] >>
+185 0 obj
+<< /D [ 428 0 R /XYZ 79.37 771.024 null ] >>
endobj
-428 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 226 0 R /F15 227 0 R /F62 230 0 R /F68 259 0 R >> /ProcSet [ /PDF /Text ] >>
+427 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 222 0 R /F15 223 0 R /F62 226 0 R /F68 255 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-434 0 obj
+433 0 obj
<< /Filter /FlateDecode /Length 3134 >>
stream
xڽɮ·ñ®¯˜0Cw@xÀ›7Î)ˆn†O’C¢CNùý÷uš¤!ùð4Kw³ö½Fôö¯½ýüéþõÓ_ž’ß#VJ¦o_ÿù‰ázc7m ×7­¡ŠÝ¾~»ýú™R ”j‹¯†Rõþö£”â×BSÊáí'®¥û„Ù¾>ðÛ{xï^ËðžÞIé¾ÇÃluí·¯¿ ^Jß±†q¨ÑPD DOqŒȈ9¤l|òEÀ áÔ 4©ø“7K¬%&|”Hfò3Ô‘‡(sî>‰·ŸÀ|Ž”<"5þð@¿Â+pWü4Ý¥é[yžº»Ó•poýég#Ï`F€ ©ëˆÈœžœ®xÿû¸Ö8Ãý¾”à dòGxùã{(sÌ•"|箥ï=ÕÈÇÓZÇ$8=â"½ƒwüÓ;BfŠ(z.d/àˆ ûY`ȘðÌ3’‘ï¨Åÿ„ÌÓ±2X¢­HOÄ:¤=iY¯Á™+Žø)jD"¬ÈÌáî¹·÷*{I ç’PÎbÔ\cÒåZ¸/ûÓħŸá}Âß}V o“Eùáa ;ç‰ÿþüû MÊ"4µ¶;oàNuâÌЯi¢DKgýÑÿ¾5ÿš!2¡ÑVå
@@ -1533,19 +1516,19 @@ xڽɮ·ñ®¯˜0Cw@xÀ›7Î)ˆn†O’C¢CNùý÷uš¤!ùð4Kw³ö½Fôö¯½ýüéþõÓ_ž’ß#VJ¦o_ÿù‰á
µvD±Ø9ј힪F²ŒÜÒ6kmJWm#éÎA°=i7vðm˜™Õ…ŽoÃ}©WpRí¹"¨ûZâÅ)'ÌéÙk¼zá¸1¯çΞÁÆÊXÌ —\³îH-BzŽœ‘öj
endstream
endobj
-433 0 obj
-<< /Type /Page /Contents 434 0 R /Resources 432 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 382 0 R >>
+432 0 obj
+<< /Type /Page /Contents 433 0 R /Resources 431 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 378 0 R >>
endobj
-435 0 obj
-<< /D [ 433 0 R /XYZ 78.37 808.885 null ] >>
+434 0 obj
+<< /D [ 432 0 R /XYZ 78.37 808.885 null ] >>
endobj
-193 0 obj
-<< /D [ 433 0 R /XYZ 79.37 771.024 null ] >>
+189 0 obj
+<< /D [ 432 0 R /XYZ 79.37 771.024 null ] >>
endobj
-432 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 226 0 R /F67 250 0 R /F15 227 0 R /F62 230 0 R /F68 259 0 R /F54 228 0 R >> /ProcSet [ /PDF /Text ] >>
+431 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 222 0 R /F67 246 0 R /F15 223 0 R /F62 226 0 R /F68 255 0 R /F54 224 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-438 0 obj
+437 0 obj
<< /Filter /FlateDecode /Length 3058 >>
stream
xÚµ\Ë®¹ Ýû+ú¬HõŒ ¸Ýî&« Þ f5A²H¼È*¿J¥·ªKÒÍÍâN»«K:$ER|HÃoÿ¸ñÛ/Ÿî?>ýé©äMæ”æöãïŸýÂoâf“æf´`\‹ÛŸ·ß¾p®€sãèÓr.ÝÛgÁ9§Çhè+¼}–Fùoô£øFŸzz?þí?˚Ʃ¯~ÜÛï?~%„º9æ4h<!9SÂf¸Ÿ™f’Ò÷Ï`¿øÉiZÔ.ýò€Öô Ü_=iáMžÞ2ü­ŒçþíôËñnýíS ÎX
@@ -1563,19 +1546,19 @@ sÊNöˆjwA?¿ßâ[WJ–©U–¡­xY’ãôrô‹ï•")¼¯qÐÎÞppPL”›¸Óš b9oeÕ[Ïhóà¾a_p"üø a ãB¨†
¼bmáJá(|÷Š#öŸøJ 0wqñ8Aw‚xÕóCËd¸Ríª³$ÉͰ÷T}™ô‘S6¡}¿YŠ˜Ê!fYˆÕ(2°£à¦þ’ŠÑŠ)áŸÄgGWhS ¦>ÃL·¡&ÙR¶£GªW}%Q-œ¬ëÓ³jÅÏvä ‚–Àçˆ7õÇ– ïܶð@`(OŸâUáŸ^ô‘#ÕÓÆ>eYVža¾˜5†~çÞÃ52ÜÿéF¥†Üâi 8G’›†—Šoq6´aõJX)IÅ6>JŠu^âÏ0• ·3615R*;XÂxpW’%Ž’›a“=°gØò¹”½£¿™²+f2+0g°!¸yô‡›æ®ZkÆw­;{/¿êÒÖ-ÙtqÁ“ÅH¯c5Ò‘}¥~ãSŠôöàS¤×Ž2¼*Ì=ºc§×ðMü·uø°¬v’»pór7Çm¯q›6é«( áœn–•&¼"—â ?5¢&Çj¤ñWŸu‹møÓ;MÞ*©>êÖqñO’Ò çê;B¾·¡ë’n²ßR§/hÔ³jÊÆÜ“Î¥'uÏŽ( =“³j‹Ç~CW]ƒº ˜ áÐ69ó%EWZcÉHƒ«¸WWWOúPð8—Ïé%ç(‚¾gz@%m$•¤;9ýu¸ëëWõulê-§BøÔ¬ZvIà—]É« ÑË·¸S/­Ü̾¾sSf ²:¯w©ñxû»¯,eKR¸új§§6UÏ®y¦›yÝ*/^[V@‰•píò•da,38R®§š3üoòmÓ–9êK
endstream
endobj
-437 0 obj
-<< /Type /Page /Contents 438 0 R /Resources 436 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 440 0 R >>
+436 0 obj
+<< /Type /Page /Contents 437 0 R /Resources 435 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 439 0 R >>
endobj
-439 0 obj
-<< /D [ 437 0 R /XYZ 78.37 808.885 null ] >>
+438 0 obj
+<< /D [ 436 0 R /XYZ 78.37 808.885 null ] >>
endobj
-197 0 obj
-<< /D [ 437 0 R /XYZ 79.37 771.024 null ] >>
+193 0 obj
+<< /D [ 436 0 R /XYZ 79.37 771.024 null ] >>
endobj
-436 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 226 0 R /F15 227 0 R /F62 230 0 R /F68 259 0 R /F54 228 0 R >> /ProcSet [ /PDF /Text ] >>
+435 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 222 0 R /F15 223 0 R /F62 226 0 R /F68 255 0 R /F54 224 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-445 0 obj
+444 0 obj
<< /Filter /FlateDecode /Length 1380 >>
stream
xÚ­XÉŽ#7 ½û+êZ©h»ã&§ }Ì)ArHúS~?¤$JªÅUîFìZ¤¢ÈÇGŠ”žþšôôõty=ýtsfPÉ9ÓëŸ' =Á’2a
@@ -1590,28 +1573,28 @@ _¹ƒkní°@ê‡peZI!«È«äâZŽ2¡JÒÅÒ;p Qo0$'ôP©å¤„dƒt‰·1ß”™||ÖÇgUja~[c‘_$&êÚ»ýŸw´
¹¹¯€xW*O)
endstream
endobj
-444 0 obj
-<< /Type /Page /Contents 445 0 R /Resources 443 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 440 0 R /Annots 447 0 R >>
+443 0 obj
+<< /Type /Page /Contents 444 0 R /Resources 442 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 439 0 R /Annots 446 0 R >>
endobj
-447 0 obj
-[ 441 0 R 442 0 R ]
+446 0 obj
+[ 440 0 R 441 0 R ]
endobj
-441 0 obj
+440 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 382.728 459.129 397.453 471.085 ]/A << /S /GoTo /D (subsection.6.3) >> >>
endobj
-442 0 obj
+441 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 411.735 459.129 423.691 471.085 ]/A << /S /GoTo /D (subsection.6.3) >> >>
endobj
-446 0 obj
-<< /D [ 444 0 R /XYZ 78.37 808.885 null ] >>
+445 0 obj
+<< /D [ 443 0 R /XYZ 78.37 808.885 null ] >>
endobj
-201 0 obj
-<< /D [ 444 0 R /XYZ 79.37 771.024 null ] >>
+197 0 obj
+<< /D [ 443 0 R /XYZ 79.37 771.024 null ] >>
endobj
-443 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 226 0 R /F15 227 0 R /F62 230 0 R /F54 228 0 R >> /ProcSet [ /PDF /Text ] >>
+442 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 222 0 R /F15 223 0 R /F62 226 0 R /F54 224 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-451 0 obj
+450 0 obj
<< /Filter /FlateDecode /Length 1346 >>
stream
xÚµX¹Ž#7ÍõýC“Å0LOOØÌðd‹¼°OàÈ¿ïâ}õ…’xÔùøXE:ý=Ñé·Ûüqûe•|bŒX)™ž>þº1œ¡›´%\OZ1B›>>§ï¿R*RmñÛPªäý…QJqXhJ9N)¸¿p-Ý.`oø½àÌ~»ïv¬”®8ª—°R4³R„}Š¶RónÜ)Ñ1‡OÒç¤ò¢¥ˆ· YãGò¨ÇÆÝK°¿¶V-µÅ÷ß0NLN–XJl„‰a:‡)È»¿
@@ -1623,283 +1606,281 @@ xÚµX¹Ž#7ÍõýC“Å0LOOØÌðd‹¼°OàÈ¿ïâ}õ…’xÔùøXE:ý=Ñé·Ûüqûe•|bŒX)™ž>þº1œ¡›´
•_•°!AX&PȘ’²t&©š‹ugÝÄÐöeŠ'¢9†!¦ZìAŒ¯(P©èC@ç(GQ.v·LÐú¨"ØF·Äs.eBoŽT—®r‰•Õú1°®HÒP.¬×ÎQ+l«~ "mL­Ù%Œ•Žäa\ Vâ`oÞ³KpWzSè”nsíÈ6t/q.`›Ïv9W¨½´žö 4wú[ ñôFÉÇ`Çyb[ê]· ç},§í<Á÷¤©W;;æ_»ñ¸ÕD˜ÁÃÒ!ÂIݺ¦*7åâèa¹I6’QÂd©y t¨þÍ!îæöz'gõüFÛŠ„k7Fm¯f?,¶gIÚEfÃŽ  ÈÇý½¥çØ
endstream
endobj
-450 0 obj
-<< /Type /Page /Contents 451 0 R /Resources 449 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 440 0 R /Annots 453 0 R >>
+449 0 obj
+<< /Type /Page /Contents 450 0 R /Resources 448 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 439 0 R /Annots 452 0 R >>
endobj
-453 0 obj
-[ 448 0 R ]
+452 0 obj
+[ 447 0 R ]
endobj
-448 0 obj
+447 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 255.32 697.168 262.294 708.167 ]/A << /S /GoTo /D (section.5) >> >>
endobj
-452 0 obj
-<< /D [ 450 0 R /XYZ 78.37 808.885 null ] >>
+451 0 obj
+<< /D [ 449 0 R /XYZ 78.37 808.885 null ] >>
endobj
-205 0 obj
-<< /D [ 450 0 R /XYZ 79.37 771.024 null ] >>
+201 0 obj
+<< /D [ 449 0 R /XYZ 79.37 771.024 null ] >>
endobj
-449 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 226 0 R /F15 227 0 R /F62 230 0 R /F54 228 0 R >> /ProcSet [ /PDF /Text ] >>
+448 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 222 0 R /F15 223 0 R /F62 226 0 R /F54 224 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
524 0 obj
-<< /Filter /FlateDecode /Length 1963 >>
+<< /Filter /FlateDecode /Length 1965 >>
stream
-xÚ½ZÉn$7 ½û+êF‘HŠ’€À€ÛmÈÙ· ×ä”ÿ¿†R•–R©–næ`Œ§íâÎÇG–õô蠟?^n_/¿}Zœ )$†éëŸ#?Г™\Pè&‡ZYž¾þ›þú]k2òu×>µFÐÚÑëß_ŠÃSP©aÈ)ë'¬œ¥,ÄÜòCvôЬ—=)Byæ]kÅ´¶Ñ-Üæïç/ò³Qpýˆò†S󅉕vÅI€+öY£ ˜ò Î6Âí| ÏöÉ?ÉÆh{\´Û£Íéçze·_, í[€An¬ž½VÐmþžõ¡'F²>ô’¬í‹¶¥¸Ãü%Zní´ñSL::ÛÀ)0Mt^¤°D1,s8RñQeTg©ùåµ.¶#]Æ*¨%ú¼®ø ´ü Ö~nôÓH¿F…úš¯1Í)A÷ùgß*l0Òž¶-6ÖMºy1ÞWmÅÓ•t +é!(v²QKxFzú¼ñÏâüÿÒ¦÷‹°S„ö§˜@M8DÍ“%«œÁbÓÛT°ˆ‚t¾<“»üV{’î3BDû²O¥â¤n:ÌJŒò®jJQ„U†¬Ü¢ß¿z\ÊÖáÖ†ôÉöøTžMoßÚˆÅNåÉm<jãÕzu¯q‹Ÿç\§6‹>ÄšYиôd†Ü®çnƒ
-O¢¦àë#Q›Óšà²Íýñ')PìÕýähÊf¡€ñAg–68ôx¨÷Ç„ ² „sÖ¥¯Ð;°Và·ÐÔ‡›xa»@¨j`¾µÚö’ÑšÚŸ‚<ûñ JKÕ€ðµ`¡ž.Щ
-¡ŒÙ#žó âï.<Gg„ÎáBPãFîŠ/B†°ºï×£"óÁyl\-ÞA
-™Z=©S\³Bd”×ëssPè$
-­ä6˜IrÃn7ìµ2›aõ`¸"K½j†–X/<› F™`z‰Ïa}œT +/‹²šäšÔ_¡9®ž˜ÚŒµ…ÂÉGG„û::¡8¾ªÎ4·è‚pa:ž/»U
-sin{ÿR?w| 5(6¡¿0ö´g´ˆl™û /ºÖ—Ij³Í’ãWËMh02ú~
-‡b–‚ðµ ÞóVç²×V«PWˆW–÷¥Ç`|øÁå_§ëí¡l¹·¦'Ãaÿv
-Àm,¨ˆƒ×<@¯BÝ4®x7µP?²ƒ‘…’7Z¬Ùäo§¶AèwÝQzÊT÷Jø¬Ö6Û¦ß\|ÑöôÎCe-€Þ®È¼øø²_<2VéÆ¡vÆÌs±œÍ‡Öá±k 2ï£
-‡[寉õõÄÆÑG÷fù,±¥–S¬6´Ñnó2V‡ñ¸¿"üeÈ;X³N|£È¬³0‚ÚªÛfÊàÏáV:D ïµ£'ËbC–Ï,¶Ëˆþ{BXã昕NË£½ïÓV›3+yAÑt¾GÖÊXÜH¯™§!—͘¸­ð2îoMœô/~UZìs¨l0Õ¾zgÈDtýæ8J²9!úÔ§(WsβÞ#¯ð•f/2–—¼/÷Ú„5þsÙ+'ùî4dVG„žÊÝ÷ÎáÝÜ=ÊY™‹h7ú¿—'ò.‘°^ê6þþtzËäžH&“«36ײ&DÉÕ{OìÔØ•é÷аE*ƤS8\ºñ‘6*Þh_¯8ëNèŽ×þÅ'Èn4Õ,Ù1îõõÅ»`©¨oà2ëÛh¹Ü‘i¼¯«Gå÷/§Ë$×CÚ=¾Ö[då´ò5wwŽ~ÿ"1÷匿M/=ó×Åv*xwfGù“ªGó——{:-+‡¾ç]a|Ô<’MÂòÜÊŸU¬6 T¾âµ *{úê¡—ù!ÓYð K%=ß–z)<¨ï#„: Ë•ù_Žì/í'²é+Ðåü²Ê„®óÏm²2xyeBð
-Èd&†àÇÕÄðàë€t‘èc™ée–óû%Ï!ëá˜ßkݧ Ìó+ÞÂiv¹v¬©½Ê[g²œ;vü‘]ϱøß‚×?Eqæš?ñ=¸.ÓÂ-™Koë·Ûæ§ ¾¤®Èqi³Ì2 ˆ aÅB°‚«É+¿øñõò?r{TÞ
+xÚ½ZËn+7 Ýç+æ®*‘%E€8N
+t]Ñm»êÿoKiFѼdßà.‚$¶‡âóð²žþôôÇËíëå·O‹“!…Ä0}ýóbä =™É…nr¨•åéë¿é¯ßµ&#?w­áSk­½þýõ§ˆ0<˜Z†œ²~âÀÊYÊBÌ-?d÷šÏeOÊ…Pžyךå`ZÛ¨„nó߀óùY)¸¿þ@Dy
+Ã¥zŽÂÄŒJ»b$Àˆ~Ö(¦<ƒ³Žp{ų~ò+éuÏŽ‹ºÃ¢{Ô9½¯WzûEqÚ±”áFëÙú¨Ýæ¿YŸZb$êàC/ÉÚY¿¨[ò;Ì?Q¢åVO_ÅtF§8¦ñÎëä–("º…`vG
+ã">³Ô|x}ÓÞYÆ*¨)úüYñ´¼ó ?ÇÎרPÙÃœtŸßÛš¸¤ìúŒ”§m“un^”÷õ´béÚ€ÛJz
+‚l<%<#=½ÞØgqþ¿”é}PvŠÐ~‹
+4¨Â)*hž,Yå ÞPÁ"
+ÒùòL®ò[­IºÏõË6•ŒKºI ¿—`”×0zRò"T¯2äÈ-çûWKÚ:Üê^™=À~×o•gÓkƇ|§ƒòä6µþj­ºW¿Å×s¬S™EbÎ,h\j2CîiNÎêPpÊø%ê^?ó9·Ù>’ý!ç·:V¦ºûc DÄÒ0LiäY½œºÑGåïÜèZ8\÷¦®Þ*úfÛ·
+® ñX£òÜIʾ~wÓ’Ï(#{F—jK(sïß?_þ»5.‹ºX®‘´X™ zÒrí*UÙ5MÖËïJ,žû|q™e¡DXèIœÞ÷'¡ŽI•ç­$œsGÏÇâsyëÒî@¶}ð<!㲡nëø`}NIgk{i=µ¸ÔQˆkëc»–¾ÐD(ž6IMšiF‘Yů÷‰õu,OàýÑ]ý,¯eÐ_’ùfĆ6§Û<ÀÔÖµ_`-2BlG“Ñ(è ”o…R»È”ý@u‚ÀÜ`ý5:I]i™fúÓö ô¹Æqçl›«¤írÍѯ/8^lZ,QéOy´ÖÈ[ሗ~åFÓæ{ÀBŒÅôyÚEr¨l0m†—æxkü¤ñ%mÑeÚÅz¹Ju6Ï´m}ýs;F¿‘úôÒ¡XqsWÙ›¾ÒlEÆò÷eÇ™°Æ_c.{å´éOÈîàïG+ä®ñžÅ‰¬tT´›ó.Nä]â,½Ô-–ÙËîmƒTÄ•DÙ³°‹š0&_WS±RcUf¤?BúH¨“ÖÇ0´#mT¼9}oå{ið_×_#<Š;N´$»9é
+w"+õ¡tf†\KÞ@½ûˬn{£ØÁh„2ñ†ºzT~-^:¹î÷#º°SÁ¯lÍÕ½ß_a溜ñ·©¥¡ÑÔ¾–•F¸Ò£|Y…ê}}mzt& s§¶çaax&¡ýÑ£5¼øjT¶ô!ÔC/]S §ÓàA–Jš”s[)¼S?g't’ WA½e?4Ÿ@ð
+¨`Ì*ºö?·‰JÃ#72=+¸'31¿ŸM ‡<õd‰ Þ“—Ö}8¿YnA5ðð^Ó>5`žoE ¥9¤Ú1¥ŽoȲ80GFEÇbNüÆ .îsfÌœxÝ\¿ýá–À¥ îí°é÷§Yš%´2.Ë,‚Èú.ü*¸šOoåƒ_/ÿƨmB
endstream
endobj
523 0 obj
-<< /Type /Page /Contents 524 0 R /Resources 522 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 440 0 R /Annots 526 0 R >>
+<< /Type /Page /Contents 524 0 R /Resources 522 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 439 0 R /Annots 526 0 R >>
endobj
526 0 obj
-[ 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 493 0 R 494 0 R 495 0 R 496 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R 513 0 R 514 0 R 515 0 R 516 0 R 517 0 R 518 0 R 519 0 R 520 0 R 521 0 R ]
+[ 453 0 R 454 0 R 455 0 R 456 0 R 457 0 R 458 0 R 459 0 R 460 0 R 461 0 R 462 0 R 463 0 R 464 0 R 465 0 R 466 0 R 467 0 R 468 0 R 469 0 R 470 0 R 471 0 R 472 0 R 473 0 R 474 0 R 475 0 R 476 0 R 477 0 R 478 0 R 479 0 R 480 0 R 481 0 R 482 0 R 483 0 R 484 0 R 485 0 R 486 0 R 487 0 R 488 0 R 489 0 R 490 0 R 491 0 R 492 0 R 493 0 R 494 0 R 495 0 R 496 0 R 497 0 R 498 0 R 499 0 R 500 0 R 501 0 R 502 0 R 503 0 R 504 0 R 505 0 R 506 0 R 507 0 R 508 0 R 509 0 R 510 0 R 511 0 R 512 0 R 513 0 R 514 0 R 515 0 R 516 0 R 517 0 R 518 0 R 519 0 R 520 0 R 521 0 R ]
endobj
-454 0 obj
+453 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 135.39 681.75 142.364 692.709 ]/A << /S /GoTo /D (page.4) >> >>
endobj
-455 0 obj
+454 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 159.251 648.073 166.224 659.032 ]/A << /S /GoTo /D (page.5) >> >>
endobj
-456 0 obj
+455 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 151.579 635.679 163.535 647.634 ]/A << /S /GoTo /D (page.18) >> >>
endobj
+456 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 139.305 624.162 151.261 635.121 ]/A << /S /GoTo /D (page.17) >> >>
+endobj
457 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 139.305 624.162 151.261 635.121 ]/A << /S /GoTo /D (page.16) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 165.318 612.207 177.273 623.166 ]/A << /S /GoTo /D (page.17) >> >>
endobj
458 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 165.318 612.207 177.273 623.166 ]/A << /S /GoTo /D (page.17) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 135.141 600.252 147.096 611.211 ]/A << /S /GoTo /D (page.14) >> >>
endobj
459 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 135.141 600.252 147.096 611.211 ]/A << /S /GoTo /D (page.13) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 131.315 588.426 143.271 599.256 ]/A << /S /GoTo /D (page.12) >> >>
endobj
460 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 131.315 588.426 143.271 599.256 ]/A << /S /GoTo /D (page.11) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 190.135 576.471 202.09 587.301 ]/A << /S /GoTo /D (page.12) >> >>
endobj
461 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 190.135 576.471 202.09 587.301 ]/A << /S /GoTo /D (page.11) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 188.889 564.506 200.845 575.345 ]/A << /S /GoTo /D (page.12) >> >>
endobj
462 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 188.889 564.506 200.845 575.345 ]/A << /S /GoTo /D (page.11) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 148.65 530.838 160.606 541.668 ]/A << /S /GoTo /D (page.15) >> >>
endobj
463 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 148.65 530.838 160.606 541.668 ]/A << /S /GoTo /D (page.15) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 176.815 518.883 188.77 529.603 ]/A << /S /GoTo /D (page.15) >> >>
endobj
464 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 176.815 518.883 188.77 529.603 ]/A << /S /GoTo /D (page.15) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 192.865 518.883 205.039 529.603 ]/A << /S /GoTo /D (page.23) >> >>
endobj
465 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 192.865 518.883 205.039 529.603 ]/A << /S /GoTo /D (page.21) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 172.81 506.809 184.765 517.758 ]/A << /S /GoTo /D (page.12) >> >>
endobj
466 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 172.81 506.809 184.765 517.758 ]/A << /S /GoTo /D (page.12) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 239.52 494.853 251.475 505.802 ]/A << /S /GoTo /D (page.12) >> >>
endobj
467 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 239.52 494.853 251.475 505.802 ]/A << /S /GoTo /D (page.12) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 205.457 461.295 217.413 472.125 ]/A << /S /GoTo /D (page.19) >> >>
endobj
468 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 196.023 460.728 207.978 472.683 ]/A << /S /GoTo /D (page.16) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 217.393 449.34 229.348 460.17 ]/A << /S /GoTo /D (page.20) >> >>
endobj
469 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 198.454 427.608 210.409 438.487 ]/A << /S /GoTo /D (page.15) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 196.023 436.817 207.978 448.772 ]/A << /S /GoTo /D (page.16) >> >>
endobj
470 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 131.276 415.653 143.231 426.492 ]/A << /S /GoTo /D (page.16) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 198.454 403.697 210.409 414.577 ]/A << /S /GoTo /D (page.15) >> >>
endobj
471 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 157.288 403.697 169.243 414.537 ]/A << /S /GoTo /D (page.17) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 131.276 391.742 143.231 402.582 ]/A << /S /GoTo /D (page.17) >> >>
endobj
472 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 162.817 391.752 174.772 402.691 ]/A << /S /GoTo /D (page.11) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 157.288 379.787 169.243 390.626 ]/A << /S /GoTo /D (page.17) >> >>
endobj
473 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 127.111 379.668 139.066 390.626 ]/A << /S /GoTo /D (page.13) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 162.817 367.842 174.772 378.781 ]/A << /S /GoTo /D (page.12) >> >>
endobj
474 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 130.957 367.712 137.931 378.671 ]/A << /S /GoTo /D (page.4) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 127.111 355.757 139.066 366.716 ]/A << /S /GoTo /D (page.14) >> >>
endobj
475 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 138.469 355.877 150.424 366.716 ]/A << /S /GoTo /D (page.17) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 130.957 343.802 137.931 354.761 ]/A << /S /GoTo /D (page.4) >> >>
endobj
476 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 171.305 321.641 183.261 333.596 ]/A << /S /GoTo /D (page.20) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 138.469 331.966 150.424 342.806 ]/A << /S /GoTo /D (page.17) >> >>
endobj
477 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 143.131 309.686 155.086 321.641 ]/A << /S /GoTo /D (page.20) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 171.305 297.731 183.261 309.686 ]/A << /S /GoTo /D (page.20) >> >>
endobj
478 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 194.309 297.731 206.264 309.686 ]/A << /S /GoTo /D (page.20) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 143.131 285.776 155.086 297.731 ]/A << /S /GoTo /D (page.20) >> >>
endobj
479 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 167.799 285.776 179.754 297.731 ]/A << /S /GoTo /D (page.20) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 194.309 273.821 206.264 285.776 ]/A << /S /GoTo /D (page.20) >> >>
endobj
480 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 112.695 252.537 119.669 263.495 ]/A << /S /GoTo /D (page.4) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 167.799 261.865 179.754 273.821 ]/A << /S /GoTo /D (page.20) >> >>
endobj
481 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 155.315 240.581 162.289 251.54 ]/A << /S /GoTo /D (page.4) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 112.695 228.626 119.669 239.585 ]/A << /S /GoTo /D (page.4) >> >>
endobj
482 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 150.882 228.626 157.856 239.585 ]/A << /S /GoTo /D (page.4) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 155.315 216.671 162.289 227.63 ]/A << /S /GoTo /D (page.4) >> >>
endobj
483 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 167.3 195.078 179.256 205.908 ]/A << /S /GoTo /D (page.11) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 150.882 204.716 157.856 215.675 ]/A << /S /GoTo /D (page.4) >> >>
endobj
484 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 145.343 160.833 152.317 172.788 ]/A << /S /GoTo /D (page.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 167.3 171.168 179.256 181.997 ]/A << /S /GoTo /D (page.12) >> >>
endobj
485 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 132.371 149.316 139.345 160.384 ]/A << /S /GoTo /D (page.5) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 145.343 136.922 152.317 148.877 ]/A << /S /GoTo /D (page.2) >> >>
endobj
486 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 140.172 137.49 147.146 148.32 ]/A << /S /GoTo /D (page.4) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 132.371 125.406 139.345 136.474 ]/A << /S /GoTo /D (page.5) >> >>
endobj
487 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 164.77 124.967 171.744 136.922 ]/A << /S /GoTo /D (page.9) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 140.172 113.58 147.146 124.409 ]/A << /S /GoTo /D (page.4) >> >>
endobj
488 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 162.299 91.29 174.254 103.245 ]/A << /S /GoTo /D (page.12) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 164.77 101.057 171.744 113.012 ]/A << /S /GoTo /D (page.9) >> >>
endobj
489 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 135.44 79.334 147.395 91.29 ]/A << /S /GoTo /D (page.12) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 162.299 67.379 174.254 79.334 ]/A << /S /GoTo /D (page.13) >> >>
endobj
490 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 173.686 67.379 185.642 79.334 ]/A << /S /GoTo /D (page.13) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 358.689 693.267 370.644 705.222 ]/A << /S /GoTo /D (page.13) >> >>
endobj
491 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 377.209 693.835 389.165 704.664 ]/A << /S /GoTo /D (page.15) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 396.935 681.312 408.891 693.267 ]/A << /S /GoTo /D (page.13) >> >>
endobj
492 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 441.994 681.312 453.95 693.267 ]/A << /S /GoTo /D (page.32) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 377.209 669.925 389.165 680.754 ]/A << /S /GoTo /D (page.16) >> >>
endobj
493 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 412.318 648.007 419.292 658.836 ]/A << /S /GoTo /D (page.8) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 441.994 657.402 453.95 669.357 ]/A << /S /GoTo /D (page.32) >> >>
endobj
494 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 396.627 635.693 403.6 646.881 ]/A << /S /GoTo /D (page.9) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 412.318 624.097 419.292 634.926 ]/A << /S /GoTo /D (page.8) >> >>
endobj
495 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 407.695 635.693 419.65 646.881 ]/A << /S /GoTo /D (page.33) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 396.627 611.783 403.6 622.971 ]/A << /S /GoTo /D (page.9) >> >>
endobj
496 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 402.066 623.967 414.241 634.926 ]/A << /S /GoTo /D (page.22) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 407.695 611.783 419.65 622.971 ]/A << /S /GoTo /D (page.33) >> >>
endobj
497 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 447.317 612.012 459.491 623.011 ]/A << /S /GoTo /D (page.21) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 447.317 600.057 459.491 611.055 ]/A << /S /GoTo /D (page.22) >> >>
endobj
498 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 327.645 578.258 334.619 589.098 ]/A << /S /GoTo /D (page.4) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 327.645 566.303 334.619 577.143 ]/A << /S /GoTo /D (page.4) >> >>
endobj
499 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 353.13 566.303 360.104 577.143 ]/A << /S /GoTo /D (page.4) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 353.13 554.348 360.104 565.187 ]/A << /S /GoTo /D (page.4) >> >>
endobj
500 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 344.323 554.358 351.297 565.187 ]/A << /S /GoTo /D (page.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 344.323 542.403 351.297 553.232 ]/A << /S /GoTo /D (page.2) >> >>
endobj
501 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 339.092 542.114 346.066 553.232 ]/A << /S /GoTo /D (page.3) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 339.092 530.159 346.066 541.277 ]/A << /S /GoTo /D (page.3) >> >>
endobj
502 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 473.379 529.88 485.334 541.835 ]/A << /S /GoTo /D (page.20) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 473.379 517.925 485.334 529.88 ]/A << /S /GoTo /D (page.22) >> >>
endobj
503 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 386.166 518.204 398.121 529.322 ]/A << /S /GoTo /D (page.12) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 386.166 506.248 398.121 517.367 ]/A << /S /GoTo /D (page.12) >> >>
endobj
504 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 375.705 506.248 382.679 517.367 ]/A << /S /GoTo /D (page.4) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 375.705 494.293 382.679 505.412 ]/A << /S /GoTo /D (page.4) >> >>
endobj
505 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 365.244 494.234 372.218 505.412 ]/A << /S /GoTo /D (page.7) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 365.244 482.278 372.218 493.456 ]/A << /S /GoTo /D (page.7) >> >>
endobj
506 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 417.957 482.498 424.93 493.456 ]/A << /S /GoTo /D (page.5) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 417.957 470.542 424.93 481.501 ]/A << /S /GoTo /D (page.5) >> >>
endobj
507 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 393.917 470.104 405.872 482.059 ]/A << /S /GoTo /D (page.24) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 393.917 458.149 405.872 470.104 ]/A << /S /GoTo /D (page.25) >> >>
endobj
508 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 496.502 458.149 508.457 470.104 ]/A << /S /GoTo /D (page.25) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 496.502 446.194 508.457 458.149 ]/A << /S /GoTo /D (page.26) >> >>
endobj
509 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 407.087 424.844 419.043 435.673 ]/A << /S /GoTo /D (page.14) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 407.087 412.889 419.043 423.718 ]/A << /S /GoTo /D (page.14) >> >>
endobj
510 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 380.935 412.54 387.909 423.718 ]/A << /S /GoTo /D (page.6) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 380.935 400.585 387.909 411.763 ]/A << /S /GoTo /D (page.7) >> >>
endobj
511 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 359.605 400.923 366.579 411.763 ]/A << /S /GoTo /D (page.6) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 359.605 388.968 366.579 399.808 ]/A << /S /GoTo /D (page.6) >> >>
endobj
512 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 403.471 388.849 410.445 399.808 ]/A << /S /GoTo /D (page.5) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 403.471 376.894 410.445 387.852 ]/A << /S /GoTo /D (page.6) >> >>
endobj
513 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 393.608 376.904 405.563 387.852 ]/A << /S /GoTo /D (page.11) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 393.608 364.948 405.563 375.897 ]/A << /S /GoTo /D (page.11) >> >>
endobj
514 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 374.828 365.058 386.783 375.897 ]/A << /S /GoTo /D (page.11) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 374.828 353.103 386.783 363.942 ]/A << /S /GoTo /D (page.11) >> >>
endobj
515 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 348.178 353.103 360.133 363.942 ]/A << /S /GoTo /D (page.11) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 348.178 341.148 360.133 351.987 ]/A << /S /GoTo /D (page.11) >> >>
endobj
516 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 413.742 340.59 420.716 352.545 ]/A << /S /GoTo /D (page.6) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 413.742 328.635 420.716 340.59 ]/A << /S /GoTo /D (page.7) >> >>
endobj
517 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 340.965 307.285 352.92 318.114 ]/A << /S /GoTo /D (page.20) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 340.965 295.329 352.92 306.159 ]/A << /S /GoTo /D (page.22) >> >>
endobj
518 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 356.487 295.329 368.442 306.159 ]/A << /S /GoTo /D (page.20) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 356.487 283.374 368.442 294.204 ]/A << /S /GoTo /D (page.22) >> >>
endobj
519 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 396.826 260.889 403.8 272.844 ]/A << /S /GoTo /D (page.8) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 396.826 248.933 403.8 260.889 ]/A << /S /GoTo /D (page.8) >> >>
endobj
520 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 332.627 227.583 339.6 238.413 ]/A << /S /GoTo /D (page.5) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 332.627 215.628 339.6 226.458 ]/A << /S /GoTo /D (page.5) >> >>
endobj
521 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 329.877 215.628 336.851 226.288 ]/A << /S /GoTo /D (page.4) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 329.877 203.673 336.851 214.333 ]/A << /S /GoTo /D (page.4) >> >>
endobj
525 0 obj
<< /D [ 523 0 R /XYZ 78.37 808.885 null ] >>
endobj
-209 0 obj
+205 0 obj
<< /D [ 523 0 R /XYZ 79.37 706.717 null ] >>
endobj
522 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 226 0 R /F16 251 0 R /F15 227 0 R /F54 228 0 R /F68 259 0 R /F62 230 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 222 0 R /F16 247 0 R /F15 223 0 R /F54 224 0 R /F68 255 0 R /F62 226 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
566 0 obj
-<< /Filter /FlateDecode /Length 2344 >>
-stream
-xÚí\Ënë6Ý߯ð„%‡ä‚
-?ýuâ§_¿-ïß~¹jyŠI…pzÿó›ð7øIœŒcÒœŒ¶Lqzÿûôû3çby‘ÂâÅÿ9ÿÇ9—ðò$öWáʹþWK¦–0Ä^ò£þ1ñš>„â½?ÞóKúä˜C@5Y
- Ú•¥(“§VŠL v>5˜8užÆït2ŽiŽë‰´J N‹õŸ6]ÓJ³»xá8ãª:<™(ÆÓ䉲ª[¯iÕ†¿Ä]…ÀRî*ËÅÓU£ÒêÒ^ýw˜­V³ÕS̘;ö¼»G)q9RÁ
-ÏRéd$ý‚ŽMèäÑ» …·ðZ`œpæaDD¹g"?Z?§Qñù%žSú é\z–I¿ôs·ÏN<Š+½è
-€²Ì>ï©TÓ›Ô¿!FÙQÃSwj³òá•CçWú¸<·…Ê·¬œåšx'ÕO÷uWùf”%2Ãá^ÑŠžHY[ñ_dâ.jQãXÓªº_iI¿ nqkwÇŸ×Þµ¶zh^á8•O¢iSêÏW»¯„5wF]b€8*3nŸ›VŽyÕV™ËSv(k9u|$ì9QZZ‘¨Œ–^ƒñ¾hÓÒK™I¡PŽêËnÌ‚\òDa2 × üg™å\fAB©(Ç0ãtÛ µý P?‘Ÿó
-7-g
-¡NÊI/çM2ÏYÛû©‡è¤œ—Fúq~*‚x¡âI}íð]foQ÷}°'Ï"Ç·ïôÍ
-&Á¬!HÊŠ’oWÀýO,Ó“t\_ ? 6è Â2ü4<šGEúÇ­þ(³˜ç†ªÞüe‹±(ͳí5eºi Pxl}Ïy/ûŠ›„
-^ñ∫6L‰A¬¥ëpm§ÝzSA`×1øÆùïrE¥¦>Ë“ŽžÅ!²·á>ßá`)©™rÕÁ ¨+9S4³AůºA{ŽŠTQKKw—£’iÕR np4æ
-&¬"¹f>9 ïxvØݘç1
-ÖK¬—_,ÓÖ®&Äpòº³%À>cS2éúŸJ+éŽ5„0 Àž¤s ¥yƒ(‘*¯ÙXßa¤çÜóò„üˆ6~
-L´GŒ®\Ì¥¥ÒB*ƒŽWÎ ~l5Ûhf`SÀc‘ÜÜ#ÂùîkŸ —˜2â%‡<+úwØéGØx9³ñ%38Êt‹á-ç´/­2sWÀui¥%šŸ ú¿‰>¬Cò~ !•`­D%m !îBz–Ëì‘®aH‡´ÝÏ(fÛ`SÙ;Ñ ´bg„í»Šn»\rnç¹×®ÎTJì2%¸
-ygõ6ÉKáÏU¶´Š.§çUYRTbK•M1GB¡õÞQ‘^‡@íJN
-¬KØCÍß×$7Ì™–7ÐÓ¼pÁ1MÒ´Q©/•ŒʼnùŸ,gPêµÊkÍ¡¼?.ÿ<Ê?a‡µA‡Ìã<â?xìâ„C/œ­bÍÎÄKÿ Î[R«<Pú2¬³JL±†š&hH1´f·œ·šW]{Vëþ¡}óçjWî|²cç“7tGè,°ªTqG΄Ƒµ.–¯†ŽSÒŒÑÉzñ³s¯môTx)½l'ogú¡54†à½&§s7OLÇ‚=@ÞYY\lLtú '
-}iÒÝZ3›1 ©]×WzËÈbpIñëÏ]ºDjfR³=¯zi¥´ÜCym%ùU§oVÜý¨YÇÎ Iι‘1RÇåïÁŸ—[bƒž„|UØí¥÷ºôv6
-° 8ï³QÄÚè2,YÖšDì‚­Çx|ùv` q•±!&Áû,³Që©àä7¤ÏÚÞ–
-Ívúÿƒ(X†Êm!:)iÜn`_õn_F7Ÿ«•r[rt¤<ª‚/å5å¾ ÚÄ¥ù¹R<âGbö#á…?ͪK¡Ø;®˜‘ƒÈ„v…’L"}™{¢QzúS ±=†¾vË&ŽfŽÙ›æ§é?Îð†ü¾™æ
-0cÁó®OA·äìjÅå²õd®ÕËÃüù¸b¿ÏËpf±ù¼ªt*‰%«*QºŽ‚ÃíAÐf©¾=‹¼ä^Û³Ö/¹·WQHµ
+<< /Filter /FlateDecode /Length 2347 >>
+stream
+xÚí\Koã6¾ï¯ðKÉ! ¬x] çÜŠ^ÛSÿÿµ|s(R²“õ¦@‡À¶D ß¼g~úçÄO¿[Þ¾ývÕò$“
+áôö÷7áoð“8Ǥ9m™2âôöïéÏgÎÅò"…ÿÄ‹ÿsþs.áåIí¯Â•s-ü¯0–4L-aˆÿ¼äGýcâ5}*Ä{½ýá—"ôÉ1‡€j²@&´+KQ&O­™ì|j0qê<ßéd!Ó×i•œë?mº¦•fwñÂqÆ Tux2QŒ§ÉeU·$^Óª ‰»
+;¥ÜU–‹+¦«F¥Õ¥½úï09Z­f«§˜1wìywR ãr¤‚ž¥ÒÉH$ú›ÐÉ£#v
+oáµÀ8áÌȈrÏD~´~N£âóK<§ôÒ¹ô,“~éç2nŸx<„WzÑ®*W.ëMM¹ýIJùœ®êôx%|Øèu)ËíiE&¨Ï—5Ð+¼fY¯„ ¶_ ²Á+½…Ðs%,ãƒi£³Í^—2RBÆ4Q½ÐËkC¤ðX”
+¤dìj3[zªœ±Á]ëYˆѹŠZï*L¹œ×Ó±/òîL'ÝŸ
+=Ç^5„;"ŸUa­2¯–EÑ‘…­Ëb$¦-¦°~»_àíྃ7|Û¡?)iu9"ŒÛº©#c
+õúá•èùS“7N-‹ÄkY¨8Y?J;Y(ú9M+pXT¤.ë™p„5Ì. Þ’ \Êð;Þ¯mã‹ù G¬òýx˜Ø”vQç*ϣΙ[ ÑˆãÖ4—Ä^ï>i½bˆH|õ@$nÓ„Q5Ú¦|阙¤l]‡åCׂ¡·÷k7¥j² Ú©rPù¨Ãì•Íãeb ‰B$šý!®
+ËðÓðhýé#´>ú£Ìbrœªzó—-Æ¢4϶×<”é¦Bá±yô=çU¼ì+n*xÅ‹¿ ®Ú0%±–®Ãµ^tëqLY]Çàç¿Ëu”šú,O:z‡ÈÞ†û|‡ƒ¥¤fÊU/ ^¬äLÑÌ¿êí9*RE--Ý]ŽH¦UK%¸Áј+˜°Šä>˜ùä$¼ãÙawcžÇ(<X/±^| °L[»˜8#ÀÉëΖ
+/¥—íäíL?´†Æ¼×ätîæ‰éX°ȹ0€¬,.¶@&:ýÈ…¾4én­™ÍÔ®ë+½ed1¸¤xÈõG.
+]"5
+3©ÙžW½Î4‚οRZ¶’üªÓ7+î~T‹¬cgÈ…$çÜÈ©ãò€÷àÏË-±AÏ B¾*ìöÒ{]z;€º£Ñp¿×ºª†ÜÆ×·­ú»pDhâ;×÷˜”8²ÂX]Y³„× Šq§—ß<Iɵ5°Bò€ÚÏv <ðAl9gÒnAKLyßÆÑ*ç#дm3zÛü6øÉb8Ók1ˆïµâz
+±°–)ЛŸ?€qõÜÊ[B ù¾9í•HxcÆPˆ~ [ƒL™-h£±ž•ÅJü–âÇ)ê—ÈË+GåbÔ)–!; ü
+oLüµÿA›¥úö,ò’{mÏZ¿äÞ^E!Õ0†Ã°ùkæžÁÑûëÞ•s­ã8¼ë”³jßß¾ý]aÝ8
endstream
endobj
565 0 obj
-<< /Type /Page /Contents 566 0 R /Resources 564 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 440 0 R /Annots 568 0 R >>
+<< /Type /Page /Contents 566 0 R /Resources 564 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 439 0 R /Annots 568 0 R >>
endobj
568 0 obj
[ 527 0 R 528 0 R 529 0 R 530 0 R 531 0 R 532 0 R 533 0 R 534 0 R 535 0 R 536 0 R 537 0 R 538 0 R 539 0 R 540 0 R 541 0 R 542 0 R 543 0 R 544 0 R 545 0 R 546 0 R 547 0 R 548 0 R 549 0 R 550 0 R 551 0 R 552 0 R 553 0 R 554 0 R 555 0 R 556 0 R 557 0 R 558 0 R 559 0 R 560 0 R 561 0 R 562 0 R ]
@@ -2016,21 +1997,22 @@ endobj
<< /D [ 565 0 R /XYZ 78.37 808.885 null ] >>
endobj
564 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 226 0 R /F15 227 0 R /F62 230 0 R /F54 228 0 R /F70 285 0 R /F71 292 0 R /F16 251 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F53 222 0 R /F15 223 0 R /F62 226 0 R /F54 224 0 R /F70 280 0 R /F71 291 0 R /F16 247 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-586 0 obj
-<< /Filter /FlateDecode /Length 871 >>
+585 0 obj
+<< /Filter /FlateDecode /Length 838 >>
stream
-xÚíXÉŽÛ0 ½ç+üQEJ¢$`` N&zέèµ=õÿ¯µX–£™fŒv:|0¼h£üÉGÉáÇ ‡Ï‡évøt¼ð„¤‡Û÷„9À`½Pv°B ·ŸÃ×')• ?”V‡;J©')MxÖ.½ŽGEÊÉи Ço·/¼’é­äµP «½
-ìvÖ—Ž‘—…ù"ét†+!LUçR~®Õlkm© 
-u½ƒŽÝ#g:Æ€pz>ëÕ°ü]©LTa§>Ïù›“ô(ÈР¥ðvÑ>ß¿
+xÚíXÉŽÛ0 ½ÏWø¢R”HIÀÀ€L
+ôœ[Ñk{êÿ_+j±ìDÓf‚.SÀËhŠö{â#÷†OóåéÃYóT`d;\¾>é8
+¼œPƒ¯s!ÇœDÞÓˆþ¹ùbˆï+ʸ2“ÏȨ‹‹Áé°Cü °§.ØHJº{ZÀæãz§ÞÍ7[¸ë@(9"­q=XîB¦ƒãm>swxß¾ 5õÿLdÀ(t¾rÁ¾T‘áUR¯I[@ê&û´.õq4”ƒ|øp®£dËhWĤúÊè™]Þß#\´2ˆ-üázÓw¬¨X2Ò)“5Yƒ\÷)¿nCÝÞ×ãw¢>@cßËa,ôew üJ°ÞüÒøŽ>óV¨4‘Êï¶*æVÔ¿¼%H"Źy¨’Wó*ºÇIFÈÿ¡LÑ™ŠÉ)kCEœäƒå”a¿”MÎÙZÄßyHé¤I8Ô¡[cABwS« Úɇ`Ь«ê%nÌkÜXa±pý²*1tαÕ75êº2Ì])Ò’²Ánÿ[K“”Ë{wEýWÂ_¨hzTŽe¼ÛËø÷3M7g£È„$o>ÈQÅ©X¥‚O
+6³ãòïY‹¹ P+òÝ| Àc,Àiá•dÕä/²ƒB98ÖAVïxýqü§$=ü!(ÆnˆÃøsÌÿ4É{²ý´÷åï”Qð;Œ àTî.#üƒŒÐ&vJÈ2qR…RêXl%Ž(E²Ð$J½·G…ý@ò¤œö]Y - ®÷sZé.}ŒTÍîÔhÀ«¾¦6Ø[¯¯m®ó•Ù¼K:!Ì%ª-­üÒ«¹m´µƒªÔ ^¿sì¦;:%b£bóºôÆzý»r›hâ—†â³íuÛ ¨˜x° BÛ(JÁä¶íåòô@¬+
endstream
endobj
-585 0 obj
-<< /Type /Page /Contents 586 0 R /Resources 584 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 440 0 R /Annots 588 0 R >>
+584 0 obj
+<< /Type /Page /Contents 585 0 R /Resources 583 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 439 0 R /Annots 587 0 R >>
endobj
-588 0 obj
-[ 563 0 R 569 0 R 570 0 R 571 0 R 572 0 R 573 0 R 574 0 R 575 0 R 576 0 R 577 0 R 578 0 R 579 0 R 580 0 R 581 0 R 582 0 R 583 0 R ]
+587 0 obj
+[ 563 0 R 569 0 R 570 0 R 571 0 R 572 0 R 573 0 R 574 0 R 575 0 R 576 0 R 577 0 R 578 0 R 579 0 R 580 0 R 581 0 R 582 0 R ]
endobj
563 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 78.374 758.132 143.002 768.971 ]/A << /S /GoTo /D (section.8) >> >>
@@ -2042,49 +2024,46 @@ endobj
<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 93.318 734.102 277.208 745.061 ]/A << /S /GoTo /D (subsection.8.2) >> >>
endobj
571 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 93.318 722.147 214.513 733.106 ]/A << /S /GoTo /D (subsection.8.3) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 93.318 722.147 261.178 733.146 ]/A << /S /GoTo /D (subsection.8.3) >> >>
endobj
572 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 93.318 710.192 261.178 721.19 ]/A << /S /GoTo /D (subsection.8.4) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 78.374 700.289 219.843 711.188 ]/A << /S /GoTo /D (section.9) >> >>
endobj
573 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 78.374 688.334 219.843 699.233 ]/A << /S /GoTo /D (section.9) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 93.318 688.284 259.525 699.233 ]/A << /S /GoTo /D (subsection.9.1) >> >>
endobj
574 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 93.318 676.329 259.525 687.278 ]/A << /S /GoTo /D (subsection.9.1) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 93.318 675.88 364.391 687.835 ]/A << /S /GoTo /D (subsection.9.2) >> >>
endobj
575 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 93.318 663.925 364.391 675.88 ]/A << /S /GoTo /D (subsection.9.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 78.374 654.451 355.794 665.459 ]/A << /S /GoTo /D (section.10) >> >>
endobj
576 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 78.374 642.496 355.794 653.504 ]/A << /S /GoTo /D (section.10) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 93.318 642.446 200.147 653.405 ]/A << /S /GoTo /D (subsection.10.1) >> >>
endobj
577 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 93.318 630.491 200.147 641.449 ]/A << /S /GoTo /D (subsection.10.1) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 93.318 630.491 199.161 641.559 ]/A << /S /GoTo /D (subsection.10.2) >> >>
endobj
578 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 93.318 618.535 199.161 629.604 ]/A << /S /GoTo /D (subsection.10.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 93.318 618.097 220.74 630.052 ]/A << /S /GoTo /D (subsection.10.3) >> >>
endobj
579 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 93.318 606.142 220.74 618.097 ]/A << /S /GoTo /D (subsection.10.3) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 93.318 606.58 187.684 617.649 ]/A << /S /GoTo /D (subsection.10.4) >> >>
endobj
580 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 93.318 594.625 187.684 605.694 ]/A << /S /GoTo /D (subsection.10.4) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 93.318 594.625 219.981 605.584 ]/A << /S /GoTo /D (subsection.10.5) >> >>
endobj
581 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 93.318 582.67 219.981 593.629 ]/A << /S /GoTo /D (subsection.10.5) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 93.318 582.232 375.36 594.187 ]/A << /S /GoTo /D (subsection.10.6) >> >>
endobj
582 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 93.318 570.276 375.36 582.232 ]/A << /S /GoTo /D (subsection.10.6) >> >>
-endobj
-583 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 78.374 550.74 108.74 559.756 ]/A << /S /GoTo /D (section*.1) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 1]/H/I/C[1 0 0] /Rect [ 78.374 562.695 108.74 571.711 ]/A << /S /GoTo /D (section*.1) >> >>
endobj
-587 0 obj
-<< /D [ 585 0 R /XYZ 78.37 808.885 null ] >>
+586 0 obj
+<< /D [ 584 0 R /XYZ 78.37 808.885 null ] >>
endobj
-584 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F16 251 0 R /F15 227 0 R >> /ProcSet [ /PDF /Text ] >>
+583 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F16 247 0 R /F15 223 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
1 0 obj
<< /pgf@ca1.0 << /ca 1.0 >>>>
@@ -2095,16 +2074,16 @@ endobj
3 0 obj
<< /pgfprgb [/Pattern /DeviceRGB] >>
endobj
-589 0 obj
+588 0 obj
[ 3 [ 602.1 ] 5 [ 602.1 ] 11 [ 602.1 602.1 ] 38 [ 602.1 ] 68 [ 602.1 602.1 602.1 ] 72 [ 602.1 602.1 ] 75 [ 602.1 602.1 ] 79 [ 602.1 602.1 602.1 602.1 602.1 ] 85 [ 602.1 602.1 602.1 602.1 602.1 ] 91 [ 602.1 ] ]
endobj
-591 0 obj
+590 0 obj
<< /Filter /FlateDecode /Length 20 >>
stream
xÚ›"ÁÀÀÄÀÀÀwóû
endstream
endobj
-592 0 obj
+591 0 obj
<< /Filter /FlateDecode /Length 11571 >>
stream
xÚí| |UÖï­ºU½%étv¶î®î& ˜&Av"J  IL¡“î,’¤cºC@DÜ ""âÂ(.ƒ(ã‚{TÔ™qG™‡apFÒè'ƒ>Ÿ£Pýþ÷Vu6Pç›÷¾÷~ßï÷Òž>·nÝ{ösî©J„xr%¡¤ ¼*oܱÇ?ý3oÔµøÚFŽ{÷1B„‘„¤¤×­+¯8šEHê4̽PßÖÐrôÖÿ±Ÿ´ï°~cCóªú;ÞzêEBÒ¯%$éÚƀϯvTÜMÈ(îOjÄ„e†èÅu®G6¶„WÆ¿.Íŵ×Ï7ë| T%2Za×-¾•m’O2àú/¸VZ}-Zóòq}’W}[{ mJtÃZBæb¿tœÒûÂMD&D/ßA& †£Åô¤^U1Î`¦TŠ¥1D+ɪDPeRQ_ì'Q¢QCªš*l3¶Ÿ,#Â/ÿ‘h?  Ù‰DˆáÂìF’â1+ðyJ,|^2ü¶y “FË‘+„ׄCÂ'·Â?E§è Åbqž¸G|EüøøWñ3ñ¸ø5NgÒEÔG;èeô
@@ -2140,10 +2119,10 @@ R ¸kBXäæ±_"‘öPS°U—;~Â@Ž1~1ncÎÌ1c¼ÆüˆØõ|»$a= b‚Ö[á¬0\Hx …ù$¿Nchäbo
å ßÓëâi×ÂL¹ËOׯÛ+¯Wéºk—ÈëöÒuWJ×^“)_»„^[ ]“I¯VéU[é•Ø´V¥W
endstream
endobj
-590 0 obj
-<< /Type /FontDescriptor /FontName /GMFTGJ+DejaVuSansMono-Oblique /Flags 4 /FontBBox [ 0 -208 1000 760 ] /Ascent 760 /CapHeight 729 /Descent -208 /ItalicAngle 0 /StemV 86 /XHeight 547 /FontFile2 592 0 R /CIDSet 591 0 R >>
+589 0 obj
+<< /Type /FontDescriptor /FontName /GMFTGJ+DejaVuSansMono-Oblique /Flags 4 /FontBBox [ 0 -208 1000 760 ] /Ascent 760 /CapHeight 729 /Descent -208 /ItalicAngle 0 /StemV 86 /XHeight 547 /FontFile2 591 0 R /CIDSet 590 0 R >>
endobj
-593 0 obj
+592 0 obj
<< /Filter /FlateDecode /Length 477 >>
stream
xÚ“Ooâ0ÅïùÞ=¤8!h…"µ¡T¬D©
@@ -2154,22 +2133,22 @@ xÚ“Ooâ0ÅïùÞ=¤8!h…"µ¡T¬D©
Ÿ1|¦ðÃg:Ë0[7K»{»>w_öZ›Å»+èöj7ZIú¼¥jl”{Üõþ|–6Kï/õ?'ä
endstream
endobj
-408 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /GMFTGJ+DejaVuSansMono-Oblique /DescendantFonts [ 594 0 R ] /ToUnicode 593 0 R >>
+411 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /GMFTGJ+DejaVuSansMono-Oblique /DescendantFonts [ 593 0 R ] /ToUnicode 592 0 R >>
endobj
-594 0 obj
-<< /Type /Font /Subtype /CIDFontType2 /CIDToGIDMap /Identity /BaseFont /GMFTGJ+DejaVuSansMono-Oblique /FontDescriptor 590 0 R /W 589 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+593 0 obj
+<< /Type /Font /Subtype /CIDFontType2 /CIDToGIDMap /Identity /BaseFont /GMFTGJ+DejaVuSansMono-Oblique /FontDescriptor 589 0 R /W 588 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-595 0 obj
+594 0 obj
[ 3 [ 602.1 ] 6 [ 602.1 ] 11 [ 602.1 602.1 602.1 602.1 602.1 602.1 ] 18 [ 602.1 602.1 602.1 602.1 ] 29 [ 602.1 ] 31 [ 602.1 602.1 602.1 ] 68 [ 602.1 ] 70 [ 602.1 ] 72 [ 602.1 602.1 602.1 602.1 602.1 ] 78 [ 602.1 602.1 602.1 602.1 ] 83 [ 602.1 ] 85 [ 602.1 602.1 602.1 602.1 ] 91 [ 602.1 ] 171 [ 602.1 ] ]
endobj
-597 0 obj
+596 0 obj
<< /Filter /FlateDecode /Length 24 >>
stream
xÚ›$¿‡õ
endstream
endobj
-598 0 obj
+597 0 obj
<< /Filter /FlateDecode /Length 12999 >>
stream
xÚí| \TUúÿ9÷Ü{ç †Áf.3Âø2á»Y¼‰Š"à[åËÀ B
@@ -2231,10 +2210,10 @@ ffäÏRò'(y³”)9yã½JöÌ‚Âì¢"%¿PÉ™Z›“±œ¼¬Üiãsò&*™X——_¬äæLÍ)Óâ|¾4Ä*'»Hc65»0k.32
•ÝnÏ”n/b·©lùvë-ˤ[UvË2¶ÌÁnVÙR+»Ie‹U¶HeõuaR}«o¤$ý±.ŒÕk#YmºX£²UV­²`U‘\Ϫ*JUE¬r [¨²©ì•U¤²òïÙüý¬Le•ùUVZâJUVBlR‰ƒùT6OesU6çZ‹4ÇÊfûÙõo±ëpq]»Ö€è™Ql†Ê¦«lZ¿>Ò´TV¬²"•ªìše¬@eùQ,OeSéPiªÊr÷³)ÙäœXiò(–“)åIJIÙ±Ò$•MÄÕD?›€« ûYv,ñ£XV¦]ÊŠdYBzºIÌ̈2í,³Q ¸ÊH·J,£‘ÂUzZ˜”neét9®ÒÂLRZKk¤éé~ñj•]®úžSÙ•ÙX•ÇøÙè+úJ£§°Q*94J©²SØð”¾Òð)lša*KÅÄT•]ÛWôe)}Y2zɱ,ÉÔ[JÚφz{IC£ØÐFAÛÖk³KÞ^Ì«‰»^28A¢²Á˜98 ÆJƒT6Pe•%F°„Þ™RB6ÁÜ*sEDH.•Å+C¥øeLÊœS˜;;T§²þ°m•õƒWúõa}UÖGe±*‹‡˜ ¬wôP©w&‹Ž²IÑCY”õ¼^Q,ë#Uf‡æöLfÃ6;³é¶‹°†I,B·5Ü,YØU·]8lnfá°Ý‹b˜‰…iØ%ZTf†&f•™z3£T&ƒµ¬2)Š1(Ǿg„±ŒB
endstream
endobj
-596 0 obj
-<< /Type /FontDescriptor /FontName /TNBLMB+DejaVuSansMono /Flags 4 /FontBBox [ 0 -208 1000 760 ] /Ascent 760 /CapHeight 729 /Descent -208 /ItalicAngle 0 /StemV 86 /XHeight 547 /FontFile2 598 0 R /CIDSet 597 0 R >>
+595 0 obj
+<< /Type /FontDescriptor /FontName /TNBLMB+DejaVuSansMono /Flags 4 /FontBBox [ 0 -208 1000 760 ] /Ascent 760 /CapHeight 729 /Descent -208 /ItalicAngle 0 /StemV 86 /XHeight 547 /FontFile2 597 0 R /CIDSet 596 0 R >>
endobj
-599 0 obj
+598 0 obj
<< /Filter /FlateDecode /Length 512 >>
stream
xÚ}“[kã0…ßý+´öÁ|oJ0ä
@@ -2242,22 +2221,22 @@ xÚ}“[kã0…ßý+´öÁ|oJ0ä
ñ3(M@)hÊ@˜DŠIĘDŠIÄðžÂ{ e)”%P–BYe)”%ðžÁ{·Ü&ЙAg’bTgP@Ye3Ðj’ã­»·lÄîù÷6V½ÖfÝepgw­–ô}_ÕØSîë.ÚpÝ-½®½/„87D
endstream
endobj
-407 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /TNBLMB+DejaVuSansMono /DescendantFonts [ 600 0 R ] /ToUnicode 599 0 R >>
+410 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /TNBLMB+DejaVuSansMono /DescendantFonts [ 599 0 R ] /ToUnicode 598 0 R >>
endobj
-600 0 obj
-<< /Type /Font /Subtype /CIDFontType2 /CIDToGIDMap /Identity /BaseFont /TNBLMB+DejaVuSansMono /FontDescriptor 596 0 R /W 595 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+599 0 obj
+<< /Type /Font /Subtype /CIDFontType2 /CIDToGIDMap /Identity /BaseFont /TNBLMB+DejaVuSansMono /FontDescriptor 595 0 R /W 594 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-601 0 obj
+600 0 obj
[ 68 [ 602.1 ] 70 [ 602.1 602.1 602.1 602.1 ] 76 [ 602.1 ] 79 [ 602.1 602.1 602.1 602.1 602.1 ] 85 [ 602.1 602.1 602.1 602.1 ] ]
endobj
-603 0 obj
+602 0 obj
<< /Filter /FlateDecode /Length 15 >>
stream
xÚk`€
endstream
endobj
-604 0 obj
+603 0 obj
<< /Filter /FlateDecode /Length 10706 >>
stream
xÚí{ xTÕ¹öÚ{í=3™I& ¹.3³g†d ¡( $@$7“pS&™I2dâÌ„-
@@ -2313,10 +2292,10 @@ L‹/ª´ø"àhéˆB¸_él÷ë
_Q ‡UzEíÀÛŽÍ4”CÛÛŽÈí*mk]#·¡m[¤Ö`®Üº†¶K6ÐõxX„‹ã¹´kZü´M³Ÿ6AR“Ò¨_¥*mP©o3]§ÒËýô²K3åËTzi&½¤ˆ®ž6F^MWeÓ•dŒ¼R¥+Šèr•Ö×Yäú4Zg¡µg˵{èÅ5iòÅÙ´&V«´ªÒ/Wí¡•~Z¡Òe*½¨<C¾h-Ï KÏÐ%gèâÍ´¬4C.ÛLK3è¢Zb¥ Šè…éô‚ùVù•ÎÿšEžo¥_³ÐysÇÊóöйç[ä¹céÜ-Òùz~±4ç¼yÎz”;/‡Îž•#Ï^FgÍÌ”gåЙ™´hFŽ\ä§3ðzF^˜Sœ-O/¥…9´
endstream
endobj
-602 0 obj
-<< /Type /FontDescriptor /FontName /WYCBGG+DejaVuSansMono-Bold /Flags 4 /FontBBox [ 0 -207 1000 760 ] /Ascent 760 /CapHeight 729 /Descent -207 /ItalicAngle 0 /StemV 150 /XHeight 547 /FontFile2 604 0 R /CIDSet 603 0 R >>
+601 0 obj
+<< /Type /FontDescriptor /FontName /WYCBGG+DejaVuSansMono-Bold /Flags 4 /FontBBox [ 0 -207 1000 760 ] /Ascent 760 /CapHeight 729 /Descent -207 /ItalicAngle 0 /StemV 150 /XHeight 547 /FontFile2 603 0 R /CIDSet 602 0 R >>
endobj
-605 0 obj
+604 0 obj
<< /Filter /FlateDecode /Length 434 >>
stream
xÚ…’Mo›@†ïû+¦KΰØÆ4‘…Tã8â+mxwìnevÑÿûîî˜DŠš Äü3¼3;“/ÏUôMš=Fók/Ø™Á
@@ -2324,22 +2303,22 @@ xÚ…’Mo›@†ïû+¦KΰØÆ4‘…Tã8â+mxwìnevÑÿûîî˜DŠš Äü3¼3;“/ÏUôMš=Fók/Ø™Á
wX´qû==mÙRl Á
endstream
endobj
-406 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /WYCBGG+DejaVuSansMono-Bold /DescendantFonts [ 606 0 R ] /ToUnicode 605 0 R >>
+409 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /WYCBGG+DejaVuSansMono-Bold /DescendantFonts [ 605 0 R ] /ToUnicode 604 0 R >>
endobj
-606 0 obj
-<< /Type /Font /Subtype /CIDFontType2 /CIDToGIDMap /Identity /BaseFont /WYCBGG+DejaVuSansMono-Bold /FontDescriptor 602 0 R /W 601 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+605 0 obj
+<< /Type /Font /Subtype /CIDFontType2 /CIDToGIDMap /Identity /BaseFont /WYCBGG+DejaVuSansMono-Bold /FontDescriptor 601 0 R /W 600 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-607 0 obj
+606 0 obj
[ 28 [ 603 ] 35 [ 544 ] ]
endobj
-609 0 obj
+608 0 obj
<< /Filter /FlateDecode /Length 13 >>
stream
xÚc``à
endstream
endobj
-610 0 obj
+609 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 748 >>
stream
xÚmRmHqÿß^¢òš½°¢Ýý͌޶‰QQ¢1«tQQ~¸¹ÛvîÜÙÝ­µJIËÔÝæœQ,S|ÉXïöb®È¾ô‚EDз>ùñxBÝŠ¾DÏÏûÃóÂÀ0lÕ!GMMÝÍÎÚ:¾™m³:$šcs©Z¥PY+ã¤R
@@ -2349,10 +2328,10 @@ xÚmRmHqÿß^¢òš½°¢Ýý͌޶‰QQ¢1«tQQ~¸¹ÛvîÜÙÝ­µJIËÔÝæœQ,S|ÉXïöb®È¾ô‚EDз>ùñ
BEæt›|.ë:ÉC­§öû¾ëæà œHQïÑ 19 '’–ÑÓÏ4µ³Ý1rRð ø Õ¤®P Õõp¦îóÛé©‘aêhz*2Aܺ>01J]{xåu¯EÝŽÊÌ´ºã¥ðj¿‡»p†hž¼x<Žt™—Ô«ÛÙ{ˆ™ty{w¬«ç<eR&/‡<Y ïQ·¶ßºežu¾ÙynŠJä”1Æ“‰þ¤eàtìlŒTA‡±-Ö;aiMËé¬|¾£Sîéj%7ͯ4vøe©ÍRøÎý å£å¨“»&Í ¼jŽ‘•¾#ǃÝ<ñnú>²¤.QÙ›ÓÏžS# G)SºK_¯!lÍ¡ðÇòÈ°Rq ‰ñ¡ádµ›³ã‹d</³øc^&ï÷i|è2ŽOö'RñD¢/™ÊàK~ô}.
endstream
endobj
-608 0 obj
-<< /Type /FontDescriptor /FontName /WIKKRQ+LMRoman7-Italic /Flags 4 /FontBBox [ -528 -292 1571 1123 ] /Ascent 1123 /CapHeight 683 /Descent -292 /ItalicAngle -15 /StemV 123 /XHeight 431 /FontFile3 610 0 R /CIDSet 609 0 R >>
+607 0 obj
+<< /Type /FontDescriptor /FontName /WIKKRQ+LMRoman7-Italic /Flags 4 /FontBBox [ -528 -292 1571 1123 ] /Ascent 1123 /CapHeight 683 /Descent -292 /ItalicAngle -15 /StemV 123 /XHeight 431 /FontFile3 609 0 R /CIDSet 608 0 R >>
endobj
-611 0 obj
+610 0 obj
<< /Filter /FlateDecode /Length 365 >>
stream
xÚ}R]kƒ0}ϯ¸{(´ÖhaƒR„Í® ]?f˶W›\»@M$Ƈþû%±¶0º ŠÇsÎõÜ£ƒ‡í.xæê€ÁdL!ÇFµša®Šš sÅÚ
@@ -2360,37 +2339,37 @@ xÚ}R]kƒ0}ϯ¸{(´ÖhaƒR„Í® ]?f˶W›\»@M$Ƈþû%±¶0º ŠÇsÎõÜ£ƒ‡í.xæê€ÁdL!ÇFµša®Šš sÅ
úÛ¸gØw¡Ýœ(µs(}Œ‡âI‡â¤3y•›ïŠºnÃZ­í*¾MØE¯…תv.ú/Õÿ2mä!ƒß
endstream
endobj
-398 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /WIKKRQ+LMRoman7-Italic /DescendantFonts [ 612 0 R ] /ToUnicode 611 0 R >>
+389 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /WIKKRQ+LMRoman7-Italic /DescendantFonts [ 611 0 R ] /ToUnicode 610 0 R >>
endobj
-612 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /WIKKRQ+LMRoman7-Italic /FontDescriptor 608 0 R /W 607 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+611 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /WIKKRQ+LMRoman7-Italic /FontDescriptor 607 0 R /W 606 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-613 0 obj
+612 0 obj
[607.3 ]
endobj
-614 0 obj
+613 0 obj
[758.1 ]
endobj
-615 0 obj
+614 0 obj
[892.9 ]
endobj
-616 0 obj
+615 0 obj
[446.4 446.4 0 877 0 0 0 0 0 569.4 569.4 ]
endobj
-617 0 obj
+616 0 obj
[777.8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1000 ]
endobj
-618 0 obj
+617 0 obj
[ 43 [ 525 ] 47 [ 525 ] 50 [ 525 ] 55 [ 525 ] 63 [ 525 ] 66 [ 525 ] 72 [ 525 ] 75 [ 525 ] 77 [ 525 ] 81 [ 525 ] 96 [ 525 ] 98 [ 525 ] 105 [ 525 ] 109 [ 525 525 ] 116 [ 525 ] 118 [ 525 ] ]
endobj
-620 0 obj
+619 0 obj
<< /Filter /FlateDecode /Length 21 >>
stream
xÚc`
endstream
endobj
-621 0 obj
+620 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 2073 >>
stream
xÚV TWžÌˆQ2ÆãîUf–UʪŠÖg×E]¬+ѵêV I$d „Gâ#Ês0E”·[Ö×z\µÕֳǰõÔQQëi»ÕöØzZÝíY︷gÏΊ¤Ýöôžyþ{ïÿ}ÿwÿ{qL&ÃpŸ‘øZÊê ê9ëÖ¯gMlš1Ãd}9.fƒVW`Ì0K)Â/„HN!LÇ„¸$ÐÁ#«‘ãŸwd²ò ´TÌËeßä#þy×jˆ†Ÿ™$=?
@@ -2411,26 +2390,26 @@ _õ`4ñÒ€½p A]|Ø|ñüp´¡dínZƒDÑrï|Ïÿ§xâÕócê øãnWsÖ÷´!Eþ´AõüTuøë’ÀA£†{—}…d
‰R`#™w_î#‡Ðsµ§º’û9§YXbŽÐª³«ìÕ!Üúý‡#¨¬£ÖÞjÔ9&ÏVœ_Agìëʺž¼§5ˆûo©°•è%)lòHÁ•Ž¤“ Ï“ØélyM±»AXÙ
endstream
endobj
-619 0 obj
-<< /Type /FontDescriptor /FontName /HKOFRT+LMMonoSlant10-Regular /Flags 4 /FontBBox [ -477 -316 786 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle -10 /StemV 175 /XHeight 431 /FontFile3 621 0 R /CIDSet 620 0 R >>
+618 0 obj
+<< /Type /FontDescriptor /FontName /HKOFRT+LMMonoSlant10-Regular /Flags 4 /FontBBox [ -477 -316 786 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle -10 /StemV 175 /XHeight 431 /FontFile3 620 0 R /CIDSet 619 0 R >>
endobj
-622 0 obj
+621 0 obj
<< /Filter /FlateDecode /Length 449 >>
stream
xÚ“Akã0…ïþÚC =¸–ÆnK0´IÍšmš‡e¯Ž4I¶ddù¿’Æn¡,aù<ožžFÊìÇ{>qu„pqKÉz5ház[wÁl¶QlhAš7
ûÉü[b×ñ„hÓÏ8›Jì£ÖÎ(y¶F”¦‹ÜStçi‘ -‘2¤iTÞ{º•H÷Hk¤q… ÒéÅÓ2F*<¥ÔS– ¡g†É¬µ'L–¢K†É¬™£%ºX‰¯a²,EzÈq~ßndî|´¶gä/‹?7}!áó>uªs]þñqú8ÚÁ_ÒÏ"
endstream
endobj
-300 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /HKOFRT+LMMonoSlant10-Regular /DescendantFonts [ 623 0 R ] /ToUnicode 622 0 R >>
+299 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /HKOFRT+LMMonoSlant10-Regular /DescendantFonts [ 622 0 R ] /ToUnicode 621 0 R >>
endobj
-623 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /HKOFRT+LMMonoSlant10-Regular /FontDescriptor 619 0 R /W 618 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+622 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /HKOFRT+LMMonoSlant10-Regular /FontDescriptor 618 0 R /W 617 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-624 0 obj
+623 0 obj
[ 27 [ 525 525 ] 32 [ 525 ] 34 [ 525 525 525 ] 38 [ 525 525 525 525 525 525 525 525 525 525 ] 49 [ 525 525 ] 52 [ 525 525 525 525 525 525 ] 59 [ 525 ] 61 [ 525 ] 63 [ 525 525 ] 66 [ 525 525 525 ] 70 [ 525 525 525 525 525 525 525 525 ] 79 [ 525 525 525 525 525 525 525 525 525 525 525 ] 91 [ 525 ] 93 [ 525 525 ] 96 [ 525 525 525 525 ] 101 [ 525 525 525 525 525 525 525 525 525 525 525 525 ] 114 [ 525 525 525 ] 118 [ 525 ] 120 [ 525 525 ] 246 [ 525 ] 272 [ 525 ] 338 [ 525 ] ]
endobj
-626 0 obj
+625 0 obj
<< /Filter /FlateDecode /Length 34 >>
stream
xÚc``Øý?ÿêî¿ÿ¯}ÿ¿ë
@@ -2438,7 +2417,7 @@ xÚc``Øý?ÿêî¿ÿ¯}ÿ¿ë
endstream
endobj
-627 0 obj
+626 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 6614 >>
stream
xÚ½zt×ÖîyFŒ1CÑ3
@@ -2476,10 +2455,10 @@ y€ªDöi:Ъä¡:Ǥ4]R¤­áRó¤ ’ÖB6Ÿ¿
¸­™æ4sld¼¯¬Àh4™²Œå¦<'§ŽZSfv–©Ì˜ßÍNCøšá¿ÑÿVG¿
endstream
endobj
-625 0 obj
-<< /Type /FontDescriptor /FontName /XMTOPM+LMMono9-Regular /Flags 4 /FontBBox [ -451 -318 734 1016 ] /Ascent 1016 /CapHeight 611 /Descent -318 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 627 0 R /CIDSet 626 0 R >>
+624 0 obj
+<< /Type /FontDescriptor /FontName /XMTOPM+LMMono9-Regular /Flags 4 /FontBBox [ -451 -318 734 1016 ] /Ascent 1016 /CapHeight 611 /Descent -318 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 626 0 R /CIDSet 625 0 R >>
endobj
-628 0 obj
+627 0 obj
<< /Filter /FlateDecode /Length 698 >>
stream
xÚ}•Koâ0…÷ùžE¥v‘’Ä/Z!$ABJUШ[H  œ( þýØ>—V1S©U?|í{α{ûðã}OÊzobþœ°ÓÕ—¶0ñlµk¢‡‡y]\ÎÆöoÆ”¦¼­v¯ì½­‹éÙãl9_ÚªrÅK[œ.¥¹UÝ/ššce¿K|ö¸5Ÿñçj»~_Å?W«ÚÖ/ñ‡9^N»6Nü¦mÕŸ\ñë˜[d÷Y8ä—i»ª¶¯,}N’Ä}ÛrVŸ½½.D6¸‰>T¶lI'Û{ÕQš±²*z¢ð³8»œüæ͵ëÍyiu4±ë\u}{ šŸ¢Áº-M[Ù#{¼/Ñ•l.Ms2^K¢ñ˜•æàNvù¼íΆ ¼÷eéV«þú¾·l¯aYàr‹º4]³+L»³G\ɘîk[þµž`×þ
@@ -2487,22 +2466,22 @@ xÚ}•Koâ0…÷ùžE¥v‘’Ä/Z!$ABJUШ[H  œ( þýØ>—V1S©U?|í{α{ûðã}OÊzobþœ°ÓÕ—¶0ñl
tj"$Ï©TsÒ‚ä%Ü*xÐDð ©îAB‹&GDän5%t5%OD›ÈZCµÆËÒô^àhÊ<T¦)úåá””n:Ïǘ.ašøAä'ê×Ø+.mëf^»a²ù™VYó5™›ºñ»Âwé·ÿ-žÖ‹èY°;
endstream
endobj
-292 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /XMTOPM+LMMono9-Regular /DescendantFonts [ 629 0 R ] /ToUnicode 628 0 R >>
+291 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /XMTOPM+LMMono9-Regular /DescendantFonts [ 628 0 R ] /ToUnicode 627 0 R >>
endobj
-629 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /XMTOPM+LMMono9-Regular /FontDescriptor 625 0 R /W 624 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+628 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /XMTOPM+LMMono9-Regular /FontDescriptor 624 0 R /W 623 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-630 0 obj
+629 0 obj
[ 35 [ 580 ] 47 [ 624 ] 50 [ 558 ] 55 [ 536 ] 72 [ 513 ] 77 [ 613 ] 81 [ 636 ] 84 [ 558 ] 96 [ 602 ] 98 [ 458 ] 112 [ 613 ] 116 [ 613 ] ]
endobj
-632 0 obj
+631 0 obj
<< /Filter /FlateDecode /Length 23 >>
stream
xÚc````Td`hñ`XÀÐ
endstream
endobj
-633 0 obj
+632 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 1806 >>
stream
xÚ}U}Pçßå¸Û$¬g“;Ø]‰ebŽ’˜ÔÖ/D b4aR‰‡·|Èqw섯Óûð¸½;îdîäøO‰L¬ÅViꘙª¥ÔÖi›f’tš¦ZÿHÞ%/ýØãh;I3ywçÙwžçýý~ÏǼ(‹ (šºÿµ’¢²W3ŠöÔשuyjƒñ;ٙ骭š‰8äóëø4VFð)ŸŠòD OŠx*¦ËD²Ø%¼š"þà‹yq*‚ c«#vú)'Kþ°¿ÈÖG6nɾHcIEÒ'¨ÅÑgPMÿ&蜬ììóô†f¦¦ªÚDådg¿°1b7S;³¨½êcµúFcm ¥Öi¨½YÔ¾,ªXß(ìÖPÏéuT]­ÖVRúJª”~j0ÒŒ‘ªbô ã†,ª´ºÆH5ê™ZJø2´–Vi Õ ÓÐ eª¦©=‡JJ©|½ÎDÕ£uFšÊ̤(#MSÕ&“á{*•©¡*KÏT©*£Ju2ª"q™ùû‹K3‹
@@ -2517,33 +2496,33 @@ $Áçà“›`<Hž2ˆMA9,ƒ1wí‚1·@™Ðl’ë3÷€¸ î'¢@Ÿ­:)¤‰[“Âwñqò¹í÷!FÀ _í7 ^€
Èdœð\Ðëõvuy½²„>cŠ-
endstream
endobj
-631 0 obj
-<< /Type /FontDescriptor /FontName /OWSLYP+LMRomanCaps10-Regular /Flags 4 /FontBBox [ -496 -290 1501 1100 ] /Ascent 1100 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 106 /XHeight 514 /FontFile3 633 0 R /CIDSet 632 0 R >>
+630 0 obj
+<< /Type /FontDescriptor /FontName /OWSLYP+LMRomanCaps10-Regular /Flags 4 /FontBBox [ -496 -290 1501 1100 ] /Ascent 1100 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 106 /XHeight 514 /FontFile3 632 0 R /CIDSet 631 0 R >>
endobj
-634 0 obj
+633 0 obj
<< /Filter /FlateDecode /Length 422 >>
stream
xÚ’Ëjƒ@†÷ó§‹@º°Ž&¥¡5 mbèeifNÒ8#£.òö‹¦PJ¨ øyþsûÑÕº¸Úa0¹¡°ÁFuša½”5ŠuÊö‘#¢Í=¬µb¶0ÎòE.E{mĹdÇŽã ú[ôˆ!$¶Œ·ø¬Þ‹çÏuðü²QU)³²n"lðÐKP›ºíѤüC F—$à
¾¡n„’÷ÝPJ͇'É3UÙ…öCC8¬±’ë~rØÙ=H¬íÉ=Yeœ³ÉÅ©i±Êå^‘ùBÓY4­>¹ù¯I¸Òµ_Ô‹®®h‡JÒ8îM}ãÛkY!„Öœ›¨hOmùIÜžj„ØqäGgŠcS— u)HæÆšÂ|i®” ä¿âÔgíö`x5†ô!öUj[(ž˜B”ÎâÔÑÒÓÔÑ$ötë)ñ4s4½ó”yZxzrtyZzš:J¨£õäûÍ|‡dâ(éc¾CÒçÝ¥~7±]ÖþÁ³Á¬ÓÚ¸ë~³sÏú&$žOB­j›ånw„†Ómiµ$ß±I
endstream
endobj
-285 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /OWSLYP+LMRomanCaps10-Regular /DescendantFonts [ 635 0 R ] /ToUnicode 634 0 R >>
+280 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /OWSLYP+LMRomanCaps10-Regular /DescendantFonts [ 634 0 R ] /ToUnicode 633 0 R >>
endobj
-635 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /OWSLYP+LMRomanCaps10-Regular /FontDescriptor 631 0 R /W 630 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+634 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /OWSLYP+LMRomanCaps10-Regular /FontDescriptor 630 0 R /W 629 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-636 0 obj
+635 0 obj
[ 28 [ 500 ] 43 [ 444 ] 50 [ 444 ] 52 [ 778 ] 72 [ 278 ] 96 [ 392 ] 109 [ 556 ] 112 [ 528 ] 251 [ 444 ] ]
endobj
-638 0 obj
+637 0 obj
<< /Filter /FlateDecode /Length 24 >>
stream
xÚc``à`Ð``h

endstream
endobj
-639 0 obj
+638 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 1371 >>
stream
xÚµTmLSg¾-ÜZµvÒ»ñEÞ«C"J ¢ÄÈ¢AP"ÔÍáG¡¨ôúÁ‡+RÊ•Û–
@@ -2555,10 +2534,10 @@ xÚµTmLSg¾-ÜZµvÒ»ñEÞ«C"J ¢ÄÈ¢AP"ÔÍáG¡¨ôúÁ‡+RÊ•Û–
…õ»á1)çD(.øcà𲞚F(]èG‘“H9){¸ ømÅ‚‚¸·0€~‘¸k˜:°ø\TWÃTÓ°šîgz
endstream
endobj
-637 0 obj
-<< /Type /FontDescriptor /FontName /UHLNIO+LMRomanSlant10-Regular /Flags 4 /FontBBox [ -457 -290 1446 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle -10 /StemV 93 /XHeight 431 /FontFile3 639 0 R /CIDSet 638 0 R >>
+636 0 obj
+<< /Type /FontDescriptor /FontName /UHLNIO+LMRomanSlant10-Regular /Flags 4 /FontBBox [ -457 -290 1446 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle -10 /StemV 93 /XHeight 431 /FontFile3 638 0 R /CIDSet 637 0 R >>
endobj
-640 0 obj
+639 0 obj
<< /Filter /FlateDecode /Length 412 >>
stream
xÚ’]KÃ0†ïó+ŽƒyQ›v:?ít“uŠ·]r6mRÒôbÿÞ|¬
@@ -2566,70 +2545,71 @@ xÚ’]KÃ0†ïó+ŽƒyQ›v:?ít“uŠ·]r6mRÒôbÿÞ|¬
\0s$ÿe5Ï%—‡Î`SÈ"³Ķ²èŒ>ø ÎI¼Òµ{ŸìÔ*˾mkt]%Yw¶€õnY5±3¤à6*Ìá´3?™›C‹zNBóLqìÚŠ¡®äÉÌB3˜-ì“”üWœ†¬í.  ËÛ!Â>+íöIr»¥Ó$s”>šxš¤®]zšÌ=]Þ„XîiJ=]§æBÞõ16õ´o³Ð–ïÃMàæÛ6Ökm=ó§ç-qf‰ßܪÖeù×ߌáÞ:Z-ÈÄgÿî
endstream
endobj
-269 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /UHLNIO+LMRomanSlant10-Regular /DescendantFonts [ 641 0 R ] /ToUnicode 640 0 R >>
+265 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /UHLNIO+LMRomanSlant10-Regular /DescendantFonts [ 640 0 R ] /ToUnicode 639 0 R >>
endobj
-641 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /UHLNIO+LMRomanSlant10-Regular /FontDescriptor 637 0 R /W 636 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+640 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /UHLNIO+LMRomanSlant10-Regular /FontDescriptor 636 0 R /W 635 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-642 0 obj
-[ 27 [ 743 511 ] 35 [ 460 ] 43 [ 460 ] 46 [ 755 511 ] 49 [ 678 460 ] 55 [ 307 ] 59 [ 460 ] 63 [ 511 358 ] 66 [ 307 ] 68 [ 307 ] 72 [ 256 ] 74 [ 897 818 ] 77 [ 562 ] 81 [ 511 511 678 511 ] 91 [ 460 ] 95 [ 729 422 562 409 ] 105 [ 332 ] 107 [ 511 ] 109 [ 537 ] 111 [ 743 460 ] 116 [ 464 ] 118 [ 486 ] 125 [ 562 ] 168 [ 511 ] 251 [ 460 ] 257 [ 460 ] 277 [ 460 ] 502 [ 307 ] ]
+641 0 obj
+[ 27 [ 743 511 ] 35 [ 460 ] 43 [ 460 ] 46 [ 755 511 ] 49 [ 678 460 ] 55 [ 307 ] 59 [ 460 ] 63 [ 511 358 ] 66 [ 307 ] 68 [ 307 ] 72 [ 256 ] 74 [ 897 818 ] 77 [ 562 ] 81 [ 511 ] 83 [ 678 511 ] 91 [ 460 ] 95 [ 729 422 562 409 ] 105 [ 332 511 511 ] 109 [ 537 ] 111 [ 743 460 ] 116 [ 464 ] 118 [ 486 ] 125 [ 562 ] 168 [ 511 ] 251 [ 460 ] 257 [ 460 ] 277 [ 460 ] 502 [ 307 ] ]
endobj
-644 0 obj
+643 0 obj
<< /Filter /FlateDecode /Length 38 >>
stream
-xÚc``N\±¥BðAh 40À€€ nÀ
+xÚc``N\±%BðAi 40À€€ nÀ
endstream
endobj
-645 0 obj
-<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 4771 >>
-stream
-xÚÅY XSgº>OD¥Ø‚iåœzN\ªØV´­ÕVë´.TÅ*U°¸]d $ìù³‡$ìÙ²‰€ bk­ëTíbgô¶.3ít–ÎÜi§óæpgî èèôiç:sï<“<$á$'ç[Þ÷ýßï ™<a±X³6íLX·kË3olÙžŸ—*xnéâM…©¹üôà{ñÔj.#¨'j6‹"&QdÅLÜn
-IëýKØ$zAXÈá°ÉcÉôÀ“èþ?¢³„åŸ|üÓc›Ë¼ÂBÃæ|ö: a!³ÙÈo1ÊšÎzô/ÿ|ÌÒ¥ËÖå ‹Eü¬ìBîóK—¾ðlðñeîÚn\jzN¾¤ ‡ÏMdpãb¸[b¸[ó%ÌQ>7:_ÀMãe§æfró3¹‰¼Ü¢ž¨€›%Ê/,Šá&fó ¸’|Q—yñry©¼ n‘ ƒ'âfó¸v$$r_Ïrßà§ó<îâÅ\nÇÍ.,®\²¤°(+&_”µ$“ùLÁ’܉, ž·øõø­‰‹ßØ´.vkBlL¡´›™/âfð
-Sù¹1ßÍñ¯ÿoÍå¥æ®ÉÈOãmÊà
-ù…ÅsÑ'‘yÈ3H ²yyY¬B^E^CÖ"ë‘H²Ù‚lC¶# H"²Ù‡¤ ©HÂGr<$"…ˆ‘#mÍ´’ÃúcS|æ¶YlÃd¤’õk`Òã“\!±“çM¶¡O¡ƒìlvÔ§§t‡Î ýÃÔ/¦y§ýbúžé¿ó?òzøœðúy3î<ºç±YD¬ŒÌšùÈÌÛœæÇ_üÚÅO E… pw€Ú+a½7úHÈèÆZN…È’Œîf‘2ÊFýf³M†Ë Z•Ž¤o}šòjŠ!Û¥2›‹f´”y‰¦6[s ÃØŽ;*@W4Rgɲ°r‡¯¼†øF PÊöÒ+QI2E¥R¥؈žÃ¶Þ®nã!Üéµ$½ê94 ·Âh¸ÊO-ö³¾ºBùá<ŽG´J³¹HG$È¥oðñ ¥Òª]­äeØ„Ú+Õ5”8Ô9Z¾ÞL Hsªsp:„žF?K/X~4öZ÷`ÉÃäno¸ ïih
-T‘µ½¾³
-So…PÙßp¯Æ`6«5Äâ5ÏJð¢¡3§ZþÐ|œ¼Ô=Ü5„{‡LiUä.H˜Ì+;ØÒèï=‘Ò³™~”æÐséÑïmúœùÙ愈ðÛ 0Ê
-°F7~2ZMÅq༕¿§9}‰-S1½sƒº@ (1“ANÒøØa”¯Ñi6àão–ƒjžeÃm0òaùR/çM¿|!±}÷úÔUø|v.°¹œ6ÅIB‚F»Ê]–Nü7ìÿ¼žL?A†ß/5Â4¿ã›_ål$á<êòC~­@¥Â–Ô‡ÃÅF1'W³uÕ÷àÂ}Ðœ_Kzd3š &^Îèlàv
-˚ؖG¿€Óá¤~¶¢wØ—]2¡Ö\ªÀ¤1bJpzmÖZ;ñÞM̧0ŠuÄz©´h%¾’}šÑNw°hð16DšòÖ M
-ci֛˘ïð{¥Å^k%ÂX´Ù¦b|,‹]¢Å
-¨?4e
-¯p¸¼N’š:ÊbÓsÆ.<¨j^`#{úl½½ýÆÜôápÑ„¹ rgô³‡áÎÍmõ{cwíÛ—G\Ñ$Õ%ãñ»÷ÿŸ<¡å·§àY’Â<)MWlØØ,~qµ¶îD
-Àg'pÏ8X×]»;%‹/ Î(“}¢ÿµÉ: Óæ“4{,Y“«1f˜£Ê+¯uè]dK›­µãP²LîLå;Óãt5Û«Én¸
-ýA×ü8"³¿ f|êû~x\‚Õ(DØGFdëäÆ2y©ÚkK±Èþ5çr.ÜlÿÖM<Kert†˜;Aޮ ø6sŽ«ÝmuY£¬®P‡_ü
-,fê<bøùõ*5‹+&§fpFâ¼û_ÏÚU$#N©2êöÿSÒÐîjs[‰K°
-µY† ç6îhòz2[eÌa<@¹´¹6PÙÇWQ`ti+ î¹ ÷1ï‚eœ6mÿBPÚžm•:rËõÖP~UIG?öéO~~ë—­Ö0k E„YŽcñÚ,5vb¦£»Åiǀ٣֛ͪ2"9}?c½E‚3`d1S’üo’N£_We8!Ÿ5Rê6Ö‡zåÞ¢,léê…Ï¿öZ÷7-6/aq¢Þ2 Sš‚ú™DóP“Öl4b:‡Áé²X=nÂëkîðT„îè¹XÊ >†@ F0µ¬Pùß½c.3XŽ9 #Þ ¡fÃç8wVצ•ùÎ,÷
-qa~IòÖ3YÀ§{aøQÆ·|ΨiT
-cî|qr08eõÛ«éè—éä8‰3eèúÖ[[Ö¥Ðéó áTÚJL9g«Ríh½t ¾ Ãû _¢ŸZ¶"úM"Y˜Zš»Bµ~£>«•1²­îÚîv¼£URÒD7ŠãpÊQ¸ÖË´jÖÝ5hɹªÓ!Ô™¿»ñ!ìG­N‹Ã†y5U’<­@c"ÖÒCúb`*SDåKyûðä²ÁÎsŸ7]&Ý ŽÊ:lx %&›ŽÖÝ·§w˯‚öÔx @-”gb¬I–¼}êP{{#±£v@W÷7cjøÇfñèò
+644 0 obj
+<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 4832 >>
+stream
+xÚÅY XSgº>OD¥ØBÓÊ9ã9©ZŶ¢m­Z¯µJU¬¢¢Åm-@’B!ûú'! IØ!²dqEm-uª]tFo«v›¶ÓÎÜé2ÿaw枀ŽNŸv®3÷Î3É“íœü9ßò¾ß÷~XÈøñ‹Åšº~åºÍñIO¿º~³0?Mðìü¹k%iyüŒÐ¹Dê j:ˆ ¨Ÿ!Ô4EŒ£È0Š;ž¸Ý–Þû—ˆqô¬ˆ°ãGR蟡{þ4ŒNCV`JèùOP b:ó[13tà›ˆ'‘ðq ™ŠLC¾BFX(k2ë៼üsqóç/X)‰ùÙ9îsóç?ÿLèy1÷å8nBZF®PVËç¦ 2¹ qÜõqÜ Bs”Ï
+¸é¼œ´¼,®0‹»…·[XÀp³ÅÂBQÁœ8î–~W&çr™W1/—VÀËä
+2yb®$‡Ç]½5i ÷¡@Â}•ŸÁð¸sçr¹<7G"-™7OR˜'gÏËb¾S0/oìKóBëæ¾’¸aËÜW×®Œß'‘K¸YB17“'IãçÄýÐÇ¿~Þ ç§å­È¦óÖfò¾¤an8ò3dò4‡ÌCžEžC!K‘åÈKÈËÈ*d ’€¬CÖ#›$d ²Ù¤"iH:ÂGö ¹H>"DDˆ‘"J¤ ¡™TrX c‚ÏÜæ sBiT²žd Œ{lœ;,~üŒñôIô;‡Ý0á© Ýá3¿›øÙ$ߤßL–EÌxç¡ý‘OGOLùÍÃöGùC”$ê‹èÊG—s¢9ד?þxÇã_ŽÄD¾‚pGÚ%c½5üPØðšZN…(’Ížf ‘:ÌFV«C+Lzµ¤o|º<Õ”c‰Q[­E
+PçÓ4زíA¬Üé/¯!Þ…Q(”³}ôTV JU«€\å¢ç€£·«Û¼wùA-I¯‚FÍcà ð©Ps¬¯/…Q8ƒãÕ½Êj-4IJù«||/h©tƒjw+y 6¡e•ÀîÄŠš\=ßh%ä¹Õ¹8FO¢Ÿ¡g-<µûPÃñä_´ ïih
+V‘µ½þ3
+ä˜Ùj²ˆÈr†@g‚·ƒpQunxyØðJ8>03‘h šØ”“@?Ó‘÷¹~¶¢±/¹"½µD' EgÆT^àò9ìµeÄPtÇ1¿
+˜JYj VÉå…Kð%ì³ÐŠvzBAƒ°!Ò”¿Jd)5V£UËü†”UÚÊjíÄ>6; @Šd³‹5 ¨Ô ꇀN €ÎTBÒØHçG°ëm¶*7ù ¢6»ƒ¹þØD¸”Aû24öþ(ÚÔïôõz»[È>vûÛŽºcäõpÑÉê[7ž1‹ŽöØÂ/Çð•
+=œ'èÅ`!eþqxñûD|צÓu7(yÎýuC€%¾ ÏÝ £¶ GsÒ÷¥ÏÓñõ„”‡® !QÆd¸Š<Ç~yd¢j½&Ý áëJ“³qÜQ¥&Û•õX È«‹e9)ÒžoûaV·›a+~À®ñ‚Z¦Î“ËØp!ÚãñêÆ= E™oTÈ°ÂZMuSS}ÁD€1 ® PÓC„cP9éUdQ hY°—•D'0mJQk*N§'бô ®¾zb ßï'¥‹TÛ R!?fWF(ÁKó€ODÖ{ü 5X…¶noQž23£§èæw×~y­ŽPÀd¦&mX¶ßj¹æ;Ö'6%_o:t¸?S¾HGš•è}$¹uºöì=š”K‰‰éDs6áRkUe“·ÙÓHÖŸê‡ã‡°¶v¬ÉÉÉÏ#Þƒ‡6tìÈG¨ÕbUL]^R×PQãsp…3àjpbÊ»möÚŽðŽúóWðCöéúÝôdeYÊ7k¥ØîÖìcŸï‡sœL/ÀÄÓ¬ÛÐo»Ë(ÃüZ  èd¶ÌJM¤Å`”±R¨%àvø!DŒºúý÷QðÑÓG߈þ³ü~W:ÑÓ›pÒÖÒ\ÑYÑC^€ËQo›ÝS‡½Ákʚ˧ç5^ରÙ+ˈÎòæχpŸÏ()P ôr2ÿ…¬XTÉ3©eXfcúÉ/:áSeD4·…Êá4”òssór «¥mÁb ›ÔïC¦äÜ„9gS
+¶p>§&1‘,«®ÄŽæ$žFÏÖ^ت]Äù¦çNâMöÂ"…YnROpPƒ5~èeÜX ¼Ed—ÏÖ F! 礜PvxùêÕ:ƈÇýˆ#ϪÃœƒ¬/΄ÁÎ;0€ÑLèÅh|±<MøÏUGú‘3j5e%ØkÝYÇzë[š*ˆš®Ê ,ÊǺÁ/ÿôbØð Fèlð”à)«" Nõ¢ç<ÞP~‡Qô£ìB3(R“ôç#ç’¨!4`±€œŽù±öñèˆ_™ÄS¥Xbtjk‘Öev“íûÁŽ.spTøõ6¹Ùni®ÂÀUVMÀªµ±ÏŽ|ƒÛ¾
+¯pº}.’š8ÌbÓOŒœ¿¿ªù€ƒìésôöö›{pwHgDÂ9câb8:Äá„;77ÕïŠß¾{w>qY—\—‚'îØó >y\ÏoOųe’|)Ï(Ý
+z%çî5Üv§ÍEÀiÔÀݲ£³›ÕÙ9BѦÚÛµóo¤WOsK+)[f²Õ©VÓ:kx)ìÑÐÑåèìì6wŒz@®€ƒÿ€;S`’}*
+â”:³nÏ?EÓvw›ÇN\„U¨ÃvrnãÎV ¬'sÔæ\¦—Ë›kƒ•}L) ÏoeÁ—àn&ñ]PËiÓ÷ïí ÄA•ã™V¹3¯ÜhçWwôcüê“[_´®^±×ª7V%²Åç°Õ”'aj+³¹Ê0`õjŒV«ZK¤$¡og®²ÉpŒ,æ1!9ðÚˆt™†*ÓqåÔ“%sMQ¸Oé+ÌÆæ/›ýÜK/u»ÏÙâð6êӃʪeÉ4µè­f3fpš\n›Ýë!|þæoEøÖž % ê£`Ä`Ë
+uàÍ0îÒ ƒå¸Ó0êÍ0j|–óѲÚôrBèÊö ` —n´ôh2}D®I'Ò`jWqcM³àHzßZzbúÓÉÿqQÙj ik¶b¹¢¥3 79O(ˆNp`u¥R‰°8eÃPö;ð©^y„ÑŸ2•-&“e û˜NÝn€µHGì,Êxi3.MÕc£íûp½Å®ñ1$f„¹”Ýcï›uÅ)ãr&ý<º]|WÀß`¯¤0ܤPbÛ;3Nþ׉тZ€ïÏ1Š1w¶g8råÝÀ™èb5%»9u¦÷–wßv }v »•p|=yÖô…9u‚žž#]ƒuê Ê`4Ì6‹Ã@
+2C]íõϾøªçXÑJ…†ÞH/&$ìè!¤X ¤¨![ÙuC–%EÚØäD’/ü…8ß¾½ý} 9`ªè©ÂªÕÕ’m–Ä¢ÕÇo1I‰úF0V^q ?
+‘®Ì\³fzʤ';³<Wk-V 9xû½þ`m8Œûè³sƒÁ Ë^_FÇ.¦Sd®ÔÃ׈ÞZmWiÈ
+wxÄøì­ôã’»ºßIÞn9Ùw
+*êw§ƒ©è¯¨çÍœ¯)µ¹ì?@ÎQT ÏHÜøÃÌ‘`cEA/æ­Ø½ß©ìu›Ým#ƒNK5Ö ðÑNU¦!)¹ŸÿÆ·Ÿ}ó»&2’;:¯¿7ZÔfÜhØ??sòÖ=‘ùãø¿ß yá˜OŠ ZÇ®ýým}Åy‰·5‹›ÈÝZ1ð@kmïUzÓá+2é'DDÑ\4á^Å;Ç~…ÞCÏF÷êK_ËÆÁ^PZKüíì¿ë¼ëÓCp|²•8ßFá®ûªdhÞeq‡!£à¼)…I²¨¯/EŸý÷ï?FÏ?y»Ãf7zWÁéSË&WI5EZRWìÒº ¿§§LÕ9íÀ»+Ê=eä}{6cŽŒmÜDö¯Ú¹‰žú1<Ç©UxUJN«%™>Õh€ÅŒéʵn‡QCü9œ‚–»|å5÷o*ݱíñ•i×`<g.œi.Ó£)†^BÏTk¼J¿'ÆþîëX®¦Rïù7LÏ´µ,§¦HáÖïY°¢a̸;™Ó`<˜š!ÎäîÓ4ÔÔ–{½„:‘·jíÖðR¬&Ììлë˜Ii2œHD†þz˜Â#fMCäÅÐ_<¢
+ÔJ,°WØD–¼yAÄäÀ¤Ó“F¢1÷¾š2WDDo óÞm¯´9먆ˆ‡(Ï£ÃÏrþ®¿‹
endstream
endobj
-643 0 obj
-<< /Type /FontDescriptor /FontName /IXSCYM+LMRoman10-Italic /Flags 4 /FontBBox [ -458 -290 1386 1125 ] /Ascent 1125 /CapHeight 683 /Descent -290 /ItalicAngle -15 /StemV 102 /XHeight 431 /FontFile3 645 0 R /CIDSet 644 0 R >>
+642 0 obj
+<< /Type /FontDescriptor /FontName /MCKRES+LMRoman10-Italic /Flags 4 /FontBBox [ -458 -290 1386 1125 ] /Ascent 1125 /CapHeight 683 /Descent -290 /ItalicAngle -15 /StemV 102 /XHeight 431 /FontFile3 644 0 R /CIDSet 643 0 R >>
endobj
-646 0 obj
-<< /Filter /FlateDecode /Length 541 >>
+645 0 obj
+<< /Filter /FlateDecode /Length 542 >>
stream
-xÚ}”]‹â0…ïû+²‚sÑ1im;Rpj …T–ÙËšD·`ÓÒÖ ÿý&9Ña]AñéûurxÓÉ­¿í^úá#%9´çžK?{­:o2Y·üÜH5¾I)¤¸F‡gòÑ·|+G2ÍÊu©êñA'—ŠŸÎB^³þô"µúJ1sÈt'?ýòs›ý~õ¾nÚ¦RŒúåXjîSSµ«Ç“Îþ"ÑQr'Jl›_²êV=öH)Õr%²¶1'¼™SIfW݇Z‰ÞI%{#Üc5Ù_Þh«Lñö2Œ²)Õ¡õ–K2Ûèà0ö«úÁ›½÷Böµ:’é:g{4zõÒ”yЭµGoU#ÉÌ_èh=^îùðU³»t’–óVÈ¡«¸ì+u”ÞR›@S²,ô'õ¤ßâUûP'\ÿÎo!þ§êM#ö¢Q:g©¥ÌR
-BP
-Ö ×ešƒV 'PZaº«s­A¹¥:ã„ !Îáìa^â=— Õ\Š¡:q„ <‹1!q´
+xÚ}”]¢0…ïùÝ 炱qbH„„ì:3Q³Ù[l«K"…
+b(@ÌQŠA®gr]^,Í©¥` r] 9hze ¦»:7ÁÑ”[Š 3.@8mDA˜8B—¾DÐÁ—:GèÁ¥ªG \Š¡3t1L]èLàYìæÁ³ÄÍsätÂ3ýÐ\JÜiã»o+8•ãTfæ6Æ(”çÖSÆ"íË
+Ó7 l‘b›ìö˜Å3wè¾çüÒ÷zÉíE³›lv¸Vò~»¶3Uök/ñí…bè£ðþ
endstream
endobj
-259 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /IXSCYM+LMRoman10-Italic /DescendantFonts [ 647 0 R ] /ToUnicode 646 0 R >>
+255 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /MCKRES+LMRoman10-Italic /DescendantFonts [ 646 0 R ] /ToUnicode 645 0 R >>
endobj
-647 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /IXSCYM+LMRoman10-Italic /FontDescriptor 643 0 R /W 642 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+646 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /MCKRES+LMRoman10-Italic /FontDescriptor 642 0 R /W 641 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-648 0 obj
+647 0 obj
[ 27 [ 869 559 ] 34 [ 818 639 575 ] 38 [ 575 575 ] 42 [ 831 511 ] 45 [ 319 882 639 ] 49 [ 756 527 575 ] 54 [ 724 351 575 575 904 575 ] 63 [ 639 383 436 319 ] 71 [ 692 319 ] 74 [ 1092 958 900 639 575 ] 81 [ 575 575 786 639 ] 88 [ 319 ] 91 [ 607 ] 95 [ 863 474 639 454 ] 100 [ 575 575 ] 104 [ 800 447 575 575 885 639 ] 112 [ 607 1189 831 869 607 ] 118 [ 607 ] 121 [ 575 671 ] 125 [ 639 ] 168 [ 559 ] 251 [ 527 ] 319 [ 639 639 ] 499 [ 571 571 ] 502 [ 319 ] 589 [ 639 ] ]
endobj
-650 0 obj
+649 0 obj
<< /Filter /FlateDecode /Length 41 >>
stream
xÚc``°6/þøp_ÅÄ7~¥0€@ @iF„2B0Y
endstream
endobj
-651 0 obj
+650 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 6693 >>
stream
xÚµZ XǶîfzT¥Ôií7„¸Äh4"®qWQA@A”}aXf¦†aßAAQZÜ·¸F“è‹ÑÍMŒšs‹·Ô€šäÞÜ÷¾ûÝïñAtWWúëœÿü§
@@ -2657,32 +2637,32 @@ inÞ]ÓtÑçÒP<O™„³§å¿ß:—›!|qƒþñW äñàLÅ4sÄêÐæÒTn[=ºY®„þ§„Ó? g{âD­„
yp³û·ûxc‘XjE–.KkäæŸwû,è®<G—nÔ°©²T&™ßñAÍ̆¹sÃf&Ì«s4y\ž,';+;“¯¿{òókçåÆÌ̬,%v³û·û°?†'àn1’+àü%8“rMœªh mrŠIMØF„ŠùÓ•eò,c–1WY .HÝŽ%ïbÕ܃®çÚëH%ÙvÿBk2ž(é9QùêÕx¹âUÅuÿ3oNU*wåí(å4Ø|Îʨxy†6C›Ö}ªR’¯Aeï_hMêÐ×ãÝ1 –ó¯ öZ§|ÙíØo6K®üÛj…qò;ÿ<¦Lÿ,ÑOd-F ¡(ê]Ó?xÙ¨ Åeù°¾¢ PÆ-X¹ÅÑ¢7²è+ôYßýF£Á™eÈÍ=pÁÂBÈ9TœShÌËÊ,4ZXþO¤ =
endstream
endobj
-649 0 obj
-<< /Type /FontDescriptor /FontName /MMPGKS+LMRoman10-Bold /Flags 4 /FontBBox [ -486 -295 1607 1133 ] /Ascent 1133 /CapHeight 686 /Descent -295 /ItalicAngle 0 /StemV 106 /XHeight 444 /FontFile3 651 0 R /CIDSet 650 0 R >>
+648 0 obj
+<< /Type /FontDescriptor /FontName /MMPGKS+LMRoman10-Bold /Flags 4 /FontBBox [ -486 -295 1607 1133 ] /Ascent 1133 /CapHeight 686 /Descent -295 /ItalicAngle 0 /StemV 106 /XHeight 444 /FontFile3 650 0 R /CIDSet 649 0 R >>
endobj
-652 0 obj
+651 0 obj
<< /Filter /FlateDecode /Length 652 >>
stream
xÚ}”]‹â0†ïû+²‚sÑ1ýJÆA¿ºÈ®3¢²ì­6q¶ iië…ÿ~“¼G…EV™Çóõæœäô¾­·áDU&¯œmt[]šB‡³Õ¾z½yU\ÎÚtZ+­nÖö­›ªØêŽõgËùҔ݋u^šâtQúæõÜiª¿JópquX§‡«Õúûmøsµ©Î{ñpZTÈ]Ì®ìNÖ÷nÌÚØSó)~é¦-+ó΢WιýaaÔ¬:»³µÁ€ô±ÁMñ±4ª!‘ìà$QÌTYtDþ»8Û&¹àíµíôyiŽU0±ÁÆÛ®¹zÅ/Áà³Qº)Íë?Uh=¶—º>i§†ñ`<fJmbÛ›ýY³;øRYkÙ]Ÿw౻֚Ş#ˆ-*¥Ûz_èfo¾t0² àc6Êígh£þ±sDŽ@ëpûWÈ›©ø³o\¢hjqžFcO3OÇ°Å 6¢ÔS6 Or
’ 9h‚, õÑÜSLYðLA9<AI[‚2AeÉZR‚AôOŠ‚¨é” ÒIDZP!åPó¥¤l"eD¨žâ|)ª "ªGY¨æ.@è’ B—TÈP]ä TO0¿ }É8“DÐ#g†ê’âpÚ “8­$B½ ó¨'‰P!AÏìpÆ u "´ÇÇ¡ e–„ê¡&&Ð ’¤ $)CuIʈ¨˜Ÿ¤NÑÝE?%Ý tINèöÜoœ?~AÄ'[ "‡ú…·Eto&þ]Dto¦ ÜiŠÝ“ó”‚æ òYbš>ã-û·ëž½Û^÷S\šÆ.¿âüq¤4ú¾ëªvQþϯÏÛwô™ Å
endstream
endobj
-251 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /MMPGKS+LMRoman10-Bold /DescendantFonts [ 653 0 R ] /ToUnicode 652 0 R >>
+247 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /MMPGKS+LMRoman10-Bold /DescendantFonts [ 652 0 R ] /ToUnicode 651 0 R >>
endobj
-653 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /MMPGKS+LMRoman10-Bold /FontDescriptor 649 0 R /W 648 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+652 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /MMPGKS+LMRoman10-Bold /FontDescriptor 648 0 R /W 647 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-654 0 obj
+653 0 obj
[ 89 [ 1161 ] ]
endobj
-656 0 obj
+655 0 obj
<< /Filter /FlateDecode /Length 12 >>
stream
xÚc`€
endstream
endobj
-657 0 obj
+656 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 514 >>
stream
xÚmQÏkQ~/YlžõÝ€š&£¨(šÝPõ x1%- i”4J=%ÛîKvɺ/ìnŒõ–ƒ nl¢%(µ("^=&±‚GÁ‹Ðƒˆx7Ϧw‚s˜™o憙#A@cq1_¼9[8››/°ÛŠy1™f†ê72ø1—Äy ñIÌãžò !M‚}"ìŽ>ÅÂc‚»g!|¿ï»¿ã~ò•œðÃr…#AßÐô qäû¦¤TêÂ4«¯XzUs`*•:Î÷— -AVY®±¦]ÓA1UÈJ0/Až5½ª§™ KTSŒ
@@ -2690,31 +2670,31 @@ xÚmQÏkQ~/YlžõÝ€š&£¨(šÝPõ x1%- i”4J=%ÛîKvɺ/ìnŒõ–ƒ nl¢%(µ("^=&±‚GÁ‹Ðƒˆx7Ϧ
é"4ljÙPµX£nŸ‘ ¨é64™U/ZÔ ŠMUh˜*µÀÑ(ÌÞX( 3ÈéËÔ´)$“
endstream
endobj
-655 0 obj
-<< /Type /FontDescriptor /FontName /XNTVGR+LMRoman5-Bold /Flags 4 /FontBBox [ -630 -325 2006 1163 ] /Ascent 1163 /CapHeight 686 /Descent -325 /ItalicAngle 0 /StemV 145 /XHeight 444 /FontFile3 657 0 R /CIDSet 656 0 R >>
+654 0 obj
+<< /Type /FontDescriptor /FontName /XNTVGR+LMRoman5-Bold /Flags 4 /FontBBox [ -630 -325 2006 1163 ] /Ascent 1163 /CapHeight 686 /Descent -325 /ItalicAngle 0 /StemV 145 /XHeight 444 /FontFile3 656 0 R /CIDSet 655 0 R >>
endobj
-658 0 obj
+657 0 obj
<< /Filter /FlateDecode /Length 358 >>
stream
xÚ}’Qkƒ0Çßó)n…öÁ;ú°"ÂÚ®CXÛa¥ôÕ&gÐD¢>øí—ÄÚ /ÿÿ¿»dòò}òÞ¹º¢÷:§`­ZÍÐÛ쳊L&[ÅÚes@äȵ^Á·Vì„ L7ñ6–¢™s,YÑr\ã¦5Þ„|Zì`šâÅ»Òógâ}íUfré­UÁ=jSRÑÆú Œc¸gÔµPrÁœRj6>$ߨÒ6Vÿþ€› Éõ®–— à‚5÷ȽYi&d“O]Ý`Ë\‘0?1bÝèÎñΈÔµ7˜Žé­ª- PEÀ17uÍ\Y‰àÛ®cnTÑt£í?Ò®BX¸8èQ™âXWCÉ’дO#wæ‰JþG§}Ö5ïCc>ƒAa?™¶u–o¦¥‹uÔÛܾ­hÇò g­ÖÝÍÎ!Z8!ñ1ÞJU6Ë-w.ÃÕ°ÑqG~:TÙ
endstream
endobj
-250 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /XNTVGR+LMRoman5-Bold /DescendantFonts [ 659 0 R ] /ToUnicode 658 0 R >>
+246 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /XNTVGR+LMRoman5-Bold /DescendantFonts [ 658 0 R ] /ToUnicode 657 0 R >>
endobj
-659 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /XNTVGR+LMRoman5-Bold /FontDescriptor 655 0 R /W 654 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+658 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /XNTVGR+LMRoman5-Bold /FontDescriptor 654 0 R /W 653 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-660 0 obj
+659 0 obj
[ 28 [ 531 ] 31 [ 531 ] 35 [ 531 531 ] 38 [ 531 531 531 531 ] 43 [ 531 531 ] 47 [ 531 ] 50 [ 531 531 531 ] 54 [ 531 531 531 531 531 531 ] 61 [ 531 531 531 531 ] 66 [ 531 ] 68 [ 531 ] 70 [ 531 531 531 ] 74 [ 531 531 ] 77 [ 531 531 531 531 531 531 531 531 531 531 ] 88 [ 531 ] 93 [ 531 531 ] 96 [ 531 531 531 ] 100 [ 531 531 531 531 531 531 531 531 531 531 531 ] 112 [ 531 ] 114 [ 531 ] 116 [ 531 ] 118 [ 531 ] 121 [ 531 ] 338 [ 531 ] ]
endobj
-662 0 obj
+661 0 obj
<< /Filter /FlateDecode /Length 28 >>
stream
xÚc``à”¾iý}õömïÿ­r`À 
endstream
endobj
-663 0 obj
+662 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 5615 >>
stream
xÚY X×Úž2¡ŠcT2öLª­¶âBÕV»¨,î.E\Z–°IH ì«Â ; «€`QPÜ°¢^k‹5­µh°¶ÞÖZí½xkÛÛ{ÏØcŸÿŸ!hè­½ÏÿüO™9ç;ß9çûÞï}áà@‚I«½ýüVø¸zûø(£•‹fo”‡Æ)Tü£Uì ìTèØ)û¼€#XFÈÊ Nìâ$üÈÉáñ{¸ïQâ¯y¢ç B`Ë}Ž
@@ -2738,10 +2718,10 @@ AÅ€hàY7ûlÀ†=Ð
3K9V¼^šåG íUÀð áïw/ 17o´µ9–•WHmGÒÄç³|m“Å‹65Ú$AÂyßarÿ{ÙY
endstream
endobj
-661 0 obj
-<< /Type /FontDescriptor /FontName /ILTTFM+LMMono8-Regular /Flags 4 /FontBBox [ -456 -320 743 1014 ] /Ascent 1014 /CapHeight 611 /Descent -320 /ItalicAngle 0 /StemV 177 /XHeight 431 /FontFile3 663 0 R /CIDSet 662 0 R >>
+660 0 obj
+<< /Type /FontDescriptor /FontName /ILTTFM+LMMono8-Regular /Flags 4 /FontBBox [ -456 -320 743 1014 ] /Ascent 1014 /CapHeight 611 /Descent -320 /ItalicAngle 0 /StemV 177 /XHeight 431 /FontFile3 662 0 R /CIDSet 661 0 R >>
endobj
-664 0 obj
+663 0 obj
<< /Filter /FlateDecode /Length 643 >>
stream
xÚ}”Ûnâ0†ïóÞ $z‘’ĉM+‰rJ[´ÚÛ68‘.xûuüOZiÅ.‡Ÿ9}3vfôãcÎU}Ð!ŒØ§në«-u¸ØM0-ëòzѦ{ÓZi5XÛgöaër§;6^l–SuÎycÊóUéÁë¾Ó‹>UæÛ¥¯ÃÆ{ý+ܼî÷ëmøºÝÖ¦ž†Ÿút=6Œú }Õóý˜3²ûFæ“üÔ¶­jóÌâÇ(ŠÜ+£õ¥o¯ &„È&ô±2Ê';ôÔAœ0U•)ÿY^ÜœúàÝ­íôecŽu0›±‰«\µ½yæ‡`òn•¶•9±ñ}Dç²»6ÍY÷8,
@@ -2754,22 +2734,22 @@ xÚ}”Ûnâ0†ïóÞ $z‘’ĉM+‰rJ[´ÚÛ68‘.xûuüOZiÅ.‡Ÿ9}3vfôãcÎU}Ð!ŒØ§në«-u¸Ø
œ´$…yrª€yrbÁÌpCz¤ÐC†z’z
endstream
endobj
-239 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ILTTFM+LMMono8-Regular /DescendantFonts [ 665 0 R ] /ToUnicode 664 0 R >>
+235 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ILTTFM+LMMono8-Regular /DescendantFonts [ 664 0 R ] /ToUnicode 663 0 R >>
endobj
-665 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ILTTFM+LMMono8-Regular /FontDescriptor 661 0 R /W 660 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+664 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ILTTFM+LMMono8-Regular /FontDescriptor 660 0 R /W 659 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-666 0 obj
+665 0 obj
[ 28 [ 549 ] 35 [ 494 ] 43 [ 494 ] 47 [ 549 ] 50 [ 494 ] 59 [ 494 ] 63 [ 549 384 ] 66 [ 329 ] 75 [ 878 ] 77 [ 603 ] 81 [ 549 ] 84 [ 549 ] 91 [ 494 ] 96 [ 453 ] 98 [ 439 ] 105 [ 357 ] 109 [ 576 ] 116 [ 495 ] ]
endobj
-668 0 obj
+667 0 obj
<< /Filter /FlateDecode /Length 23 >>
stream
xÚc``àT\ â!°À…
endstream
endobj
-669 0 obj
+668 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 2457 >>
stream
xÚ­W PgÞÁ¦Ôª±Cw·¢m=Ô¶¶wÞÕZ@±-t @BB $äH€@B’Í?BLÂQJ¤ÖÖS”¯=ñìÝØ›žíõfî:×ε×û¶®3½ÔzvÚžswûÍ|û÷í|Ïó¼ïû|û1 %K ƒñЮŒÒ3SvïÙ/©âŠŸÞ”)çV
@@ -2781,10 +2761,10 @@ tª·qk¼Šj©’{àlÉG`ËX6ƒ&€¯è,]ùJXA»õ
°ŽíÑm f£Ö€®/*TV"Ò¶PhñGæ=pþsl‡ÎŽF¢{*v¬ƒíÝ„ÕÁéU:t¢–* -£Òà-±j:&š.¢û 6ƒŠÀ%¡oæäNV¼öó
endstream
endobj
-667 0 obj
-<< /Type /FontDescriptor /FontName /GESSBI+LMRoman8-Italic /Flags 4 /FontBBox [ -489 -292 1472 1124 ] /Ascent 1124 /CapHeight 683 /Descent -292 /ItalicAngle -15 /StemV 110 /XHeight 431 /FontFile3 669 0 R /CIDSet 668 0 R >>
+666 0 obj
+<< /Type /FontDescriptor /FontName /GESSBI+LMRoman8-Italic /Flags 4 /FontBBox [ -489 -292 1472 1124 ] /Ascent 1124 /CapHeight 683 /Descent -292 /ItalicAngle -15 /StemV 110 /XHeight 431 /FontFile3 668 0 R /CIDSet 667 0 R >>
endobj
-670 0 obj
+669 0 obj
<< /Filter /FlateDecode /Length 449 >>
stream
xÚ}“Ëjë0†÷~
@@ -2793,22 +2773,22 @@ uH®e'Ó '·bè8”ni’#ˆ%#Ë‹¼}%ÜBÉ9žf~äÑÍ{ÿáê
sùÇ~Rö—Hæ9E»LqèÚš®å ¢…-Èbk¯"ÉÅ)fŽˆV0¼¦Cˆý­µ+”®l!Jgiá(› eHK¤ Òiêi’!Ý#eŽ”sOSê)[#…¼¤bk¤§ûi‹4õ”S$ÌËÑõ ;äèz†rtmyB×3ì£ë<Ôœ8#?7Nw.¾7õZÛó‡ÇïÛ!áû|µªuYþösøC½m£/«« Á
endstream
endobj
-238 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /GESSBI+LMRoman8-Italic /DescendantFonts [ 671 0 R ] /ToUnicode 670 0 R >>
+234 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /GESSBI+LMRoman8-Italic /DescendantFonts [ 670 0 R ] /ToUnicode 669 0 R >>
endobj
-671 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /GESSBI+LMRoman8-Italic /FontDescriptor 667 0 R /W 666 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+670 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /GESSBI+LMRoman8-Italic /FontDescriptor 666 0 R /W 665 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-672 0 obj
+671 0 obj
[ 28 [ 510 ] 35 [ 549 ] 43 [ 472 ] 50 [ 472 ] 55 [ 325 ] 63 [ 549 ] 66 [ 253 ] 70 [ 519 ] 72 [ 253 ] 75 [ 844 ] 77 [ 549 ] 81 [ 531 ] 84 [ 549 ] 96 [ 363 ] 98 [ 407 ] 105 [ 384 ] 112 [ 490 ] 114 [ 726 ] 116 [ 490 ] ]
endobj
-674 0 obj
+673 0 obj
<< /Filter /FlateDecode /Length 23 >>
stream
xÚc``àPdTšâÁ°Àa
endstream
endobj
-675 0 obj
+674 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 1660 >>
stream
xÚmUqPWK²»ØÆX ‰Hp³ÇUJK œâÏbT BÔ"Õk ‰ $HïP‘¢Ô€Žk)¥6å<îD­µE‹:ÚCé@c©B™&œgoü£zSï[îáÝm°w×éôÍî·ûÞ~ßïû}¿÷í<‰Åˆ ˆ%9™yëòt9F»+51Ÿ+«²¡OëùŸñ±^ ÃÇ ~Á3a¼Jijb¼@":!Ïåã«1ä_cÄûÈem‹BöÏ‹a$Vx£þ%y2´0 YŽÂÖ týS€¥ ùÓYW¨““SÖ9*jœ–2³›]‘œ¼òÙ]Íf¨Ùlc‰ÕáqY-¬Ñnb³ÕlŽšÍux„U ﰳŜÙh+e¥¬{‰­rqN[ætTU¸žV³³ÅÅzN++<œ3º8[e7qNÖmæØõ› l–Ãîfu–ÎîâØÄD–uqkv»+~™”ä®*S;œeI¥‚+ÉöÈÉ•ŠKÌÊË5$ê6®ËÌ-ÈT»w¹ÙR‡“5qn£ÅæRÿ¨Ä粒çN£-Ýä(æ6š8»Ûâ®AˆA?G hÒ çQÊBÐ&”ƒ^Dô
@@ -2820,10 +2800,10 @@ Y %Ÿ¡p9.!ùíi³Ç¥§¿†ÕØIÎc†Ü‘€6›J-ž§IÜ
^ÆV\ŒkÈ¿Pð,èaÖ“ÒÐñö¯”Ä gZ%:"¢ÚÇë; Ð×飘lƒ-I²À+yÜÿXðñ+MÍBÞCÂýF»Dr£éÐáæ¦CóV²ð?¬Ô<—
endstream
endobj
-673 0 obj
-<< /Type /FontDescriptor /FontName /MBEOCR+LMSans8-Regular /Flags 4 /FontBBox [ -446 -314 1510 1154 ] /Ascent 1154 /CapHeight 694 /Descent -314 /ItalicAngle 0 /StemV 98 /XHeight 444 /FontFile3 675 0 R /CIDSet 674 0 R >>
+672 0 obj
+<< /Type /FontDescriptor /FontName /MBEOCR+LMSans8-Regular /Flags 4 /FontBBox [ -446 -314 1510 1154 ] /Ascent 1154 /CapHeight 694 /Descent -314 /ItalicAngle 0 /StemV 98 /XHeight 444 /FontFile3 674 0 R /CIDSet 673 0 R >>
endobj
-676 0 obj
+675 0 obj
<< /Filter /FlateDecode /Length 448 >>
stream
xÚ}“Án£0†ï~
@@ -2834,78 +2814,80 @@ QµWbO²–‚ òök{ •ª´H >柙ßc3ùõV¿…>A0{dô
E¹-ÄXeŽâRŒ´BšyšÅHOH)R‚´EZxšÊg¤i…´@Ê‘†k¤5ÒÆÓS„´Eš{J™§„!¡Ïû¥èÓ¶õ4÷”Jô™Êi¨¹ÈpF~&nœî\|lï±;çß·3RÁÇùjtã²üíæø‡8ÚoÉPæ ñ
endstream
endobj
-237 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /MBEOCR+LMSans8-Regular /DescendantFonts [ 677 0 R ] /ToUnicode 676 0 R >>
+233 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /MBEOCR+LMSans8-Regular /DescendantFonts [ 676 0 R ] /ToUnicode 675 0 R >>
endobj
-677 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /MBEOCR+LMSans8-Regular /FontDescriptor 673 0 R /W 672 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+676 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /MBEOCR+LMSans8-Regular /FontDescriptor 672 0 R /W 671 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-678 0 obj
-[ 27 [ 796 531 ] 34 [ 752 590 ] 42 [ 767 472 295 295 811 590 ] 49 [ 723 472 531 ] 55 [ 325 531 531 834 531 ] 62 [ 796 590 354 383 295 ] 68 [ 325 ] 71 [ 664 295 ] 74 [ 973 885 796 590 531 ] 80 [ 826 531 531 723 590 413 413 ] 88 [ 295 826 826 561 ] 96 [ 414 ] 98 [ 419 ] 100 [ 531 531 531 ] 104 [ 767 413 531 531 796 590 ] 111 [ 796 561 ] 115 [ 796 561 ] 118 [ 561 ] 121 [ 531 620 885 ] 125 [ 590 ] 167 [ 796 531 ] 207 [ 472 ] 251 [ 472 ] 257 [ 472 ] 277 [ 472 ] 319 [ 590 590 ] 343 [ 295 ] 502 [ 295 ] 575 [ 590 ] 589 [ 590 ] ]
+677 0 obj
+[ 27 [ 796 531 ] 34 [ 752 590 ] 42 [ 767 472 295 295 811 590 ] 49 [ 723 472 531 ] 55 [ 325 531 531 834 531 ] 62 [ 796 590 354 383 295 ] 68 [ 325 ] 71 [ 664 295 ] 74 [ 973 885 796 590 531 ] 80 [ 826 531 531 723 590 413 413 ] 88 [ 295 826 826 561 ] 96 [ 414 ] 98 [ 419 ] 100 [ 531 531 531 354 767 413 531 531 796 590 ] 111 [ 796 561 ] 115 [ 796 561 ] 118 [ 561 ] 121 [ 531 620 885 ] 125 [ 590 ] 167 [ 796 531 ] 207 [ 472 ] 251 [ 472 ] 257 [ 472 ] 277 [ 472 ] 319 [ 590 590 ] 343 [ 295 ] 502 [ 295 ] 575 [ 590 ] 589 [ 590 ] ]
endobj
-680 0 obj
+679 0 obj
<< /Filter /FlateDecode /Length 49 >>
stream
-xÚc``0°/üürß¿ëþÎ*a
+xÚc``0°/üürß¿ëÿÎ*a
endstream
endobj
-681 0 obj
-<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 7215 >>
-stream
-xÚÅz \W×þL‘*0ÆêŒÎÄ})¢ÒÚºU­û^­.€( û@@vInaßw!€âŽ".ÕZµ¶ÚëV[µZkk­­¶gèåý¾ÿ Xk[Û÷ý¿÷ý¾À/ÀäÎsÎ}î9ÏsªGJ"‘ô_°rþìu _Z²ô­ 
-§ñã_v0¿OVÌrT,rßâæç£pôP,rT,uT, Š$W}£‚›=½Ýý½A^ŠUžÎŠð0ÏÐ0ÅÖРðà°ÑŽŠUÞ>aŠÈ P?ùêéïéæé¡ôð U(½=óW¯\¥˜¨T,ñÙâæ©;V¡óôTx+•ÁSÆS†ou
-Ý:΋Œ çß=(lœù¾±óÞ\¶jì’…³ç.[9×Q¹M©ð
-
-Uxx*Ý}üÃÿèã¯/
- p÷Ã#h³çBÏ@¥2Š"/ŽH ¡†Rc¨—(j,åH£&PNÔËÔkÔ$j25…šJM§fP3©7¨YÔj>µ€ZD-¦–PK©eÔrjõµ’ZE­¦ÖPÎÔ:j=µÚDm¦<(OÊ‹ò¦|(_Êò§¨ *˜
-£”TEES1T,e¤ê¨ó&K/—ÌÌ”¬•ül1Ãb©%Y?òZL-6¯d*Yò‚¤ÄBa‘cñ³å8KËÏz¸öøT:]zI6_öúMú±Õµž®=oöüÙú5ëÂ^½Þì•a#Ø\|aà Wz{÷ní3¨GŸ/l}mÛìäví’íÛŸ`Æ3—ûÎé{]ÎÊõò›ýâúu¾èóâ±þŽýˬd-Ù,Κûdà±AyKþ€0Y8­xSq}päÅä!LJ¾>ô˜zw4#8›DçHIêgŠ¦—$æìŒpœø_Ò•:'š‹R'ǪÖySœ±i2çKëwC¥ÜÎz¤>,˜h7]Hy›…Ò ùü!°“ÂÙ <JjˆG©ˆ X‹‚x_†è¥'J‘ú]W@‘#ØÂ5ioјhTî‚-µ¦»5FûÆëx©½qóîÈßñ_EoÞá…æñàAçÐ6~Ò~ *¢jŒeåµÕÛK üŽæã(‹;qÂc²àO¯P/PÏ ´zÙ3z…/Ë$L|r¡½eïžJžyÃÓPãy€Ë½‘ñ•€‘3µc&‡lYëÖÔúÁ™ó0ÞÀ÷îH!8m„F“}ëCtr†ÜŸóéѱ
-¹”U&@<]ŒrãR´Ú¸$Þù éî­ ¿Äa< O$ï®0O7˜0
-£`ØÅãí9ÇPT“””¦ŒgƒË"<³·¦¢´þÌüú±X‹-q/Ì<ö0¸ ¬ó…ÞЊÀ<ÁRr,-ÁMì%o ® ò ò© 76VÖyÜÞãO×ÈøXCn„^Æ=FKðË¿ytƒoxH`@EHSea¾^Ï É3æðjµZ“Ê&å¤
->¿6^G‘Iü‡ÉþàCt[tzÈ|Ý‘ _Êa5ãðüçCÉV `8Œ¥ÂÜ^ò¿Ù{±‡‡iãÜq'Ý+ZvåœßºÂû3b=Û…Ÿ(“hKÐcò=`¦{»¾Y(ég¢ç'gÄhæÀ3ØÁ[é]ÞË×rØ[ŽÁrÜçûá`ê°±É$,¡™™ÀöˆBiÛ#y¦vKKØFÎeKus˜¼[uøûnÎÞª&¾¹ºÅx„km [[/ôîØJ6ÔIÔ›ìaø]ðj
-Ågë3² |Qþ®#7¸µ.Ûr„’­é.¬—vu°m‹ÿnÑâ½ç”s,A¯Í"·+Kš "£ü7M¸2hQ(Àî§û`k^>ÏMbh¤>ùÔRTÃ$¹i°¸†.GÙqZml"?éÜ"õ…¦I´—š
-&{’1×Ý xÄÌ騂4¹‰V;¡·¸MSÞCðm¢™–oôñ^Âb:m^È­[‰â¹áxÁ¨€jXüîÝï¡Ç,<y‡¨Ó¥þ>‘’ìÖ•K’KnZ¸o‡7â×»r阄'Çå›U§öA¥¾¹c•òŠ˜I3söd>2/v¯ƒçö ¬—ºÌ:ûúS¡§–_½yµüjã)f,%æ‹Ãå%qnÑÒÜ]øÒP’ܨYó^ßXã])„‡&û…±›Ëý+£yæã൱›=\ØÙ?®„þ`G®÷Ûç[Â7,_Fs+eþúÐÚ·ÙêÌœ¬>tßnU5÷ ý•]Ñ;Ãj„Â|SÅaUšZ¥Ša£
-âJ Krªxü¦Bî¥
-!i&(Ü/%ŠctŽèÛÊfCMQ¹PUb̯å¾F/… í”ÉWOwÅ3³lGÎ8x¼¢øÔuá[Y-¼ˆ¦
-Ý´æ” Lsò¹xײ#¹Ÿ)œž®!Ë&–ÒÍéy—ùJ“ Tã‘z©o%Ý•Kp4¾Ñõéo©Y#õ0’
-( ^-J3ìDŠf<ð³ï礒ÒRÒm“`N5'PWðR7 Œõ[â¹)¤*00DéX²³¡º¦ŽTÚ+x“Qü¨kú­÷ªÚ½ÀbV;3 "]äb '˜'þ4Ç 4Sœ6bÞöð CŸ™^Q`dk·•…†Gû;Ÿ:Ã3×νO`†u ìñçu8ü ñ¿»êÒÐøí¸^Ì9v—%±šnB…÷ø&™ÚuÚÈaÇçBÜ/ëŠ ™Ì¼ÔÖíL3”ÿºÈb'Í\xþ²’`”påÇ‘z·Ðû÷'ÆŒi]·üeÜs
-’ä9¨0–gÔŠxmBŠVX–º>Ôƒs©¾è'0CgÞm[°‚ìŸv”+¼‚` ÏäWìl4ä4Ã+J_ýš{T}O
+680 0 obj
+<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 7223 >>
+stream
+xÚÅz \W÷öLcuFgâ¾7Z­[Õº/hµî(
+ȾM $¹!„}ß…
+Çñã_q0¿OQÌ«Xì¾Å/(2ÌÏGáè¡X<V±t¬bYP$¹ê£¨Øìéíîï¥òR¬ò\§ó Sl
+5V±ÊÛ'Lê§ ?C=ý=ÝÃ<=áž¡
+¥·§bÁê•«óƒ•
+'Ÿ-žažŠ1cŠ0OO…·R<uÜ8eøÖ±A¡[Çy‘1aãü»…3ß7fþ›ËVqZ4gÞ²•óÆ*·)^A¡
+O¥»ØØ?úøëßË‚BÜýßðÚì¹ÈÃ3P飌¢È‹£Pƒ©!ÔhêeÊC¥ÆQ(Gêê5j25…šJM£fP3©YÔÔlj.µ€ZH-¦–PNÔRjµœZA½E­¤VQ«©5Ô:j=åLm 6Q›)Ê“ò¢¶RÞ”åKùQþT
+¸
+åÉÀnHmDc¢Q¹¶Ô˜îUínBà•¶zÆM̽+ǽy{L„:”˃ýCëøÉoø-
+(ª6––ÕTm/7ð;›N LîäI)‚?½B½P=/ÐêÏè¾,“0ñQÈŶæ}{+xæ OCµçA.çVúW^xTÎÔŒž²e­[cËg.ÀxoÓžLñ¾Lö-Ð-È~ò`î#¦[ûBX"ÿtÆulWÀ3{@Ryöƒ ì70ËwØúVÈ®¦%x %´—&aî+:Èà¿ûò3ð¹|Á›3°ŒÇ YÖ–yˆAÆœ}Ø<c¹P?“O]8o2Mfƒ
+þr°úÛLwÞÍÇ4• õ¥/d%; _ÕÓoŸ‘2{|ª{^à€‹ï à¨“+ÑÜ­y×­ã|¹ [vî âK‘®”…µt)J+,á›j—7sÇöø” ÅÁÞ³Y›ö¬Sû“äôc1³Á²}-ÄÉsPvL‚Z•¨åñØ$l;g7 ¿u ꡾÷Í}°ZˆgU I:]rWŒ2Kˆ§‹PN\²V·ƒ_÷†tÏÖEG^æ° žŽ'’wW˜†'‚L è6ÄoÿÄzØ}·´Þ¾ñxßq¼ÏˆâR°–çÅ!u²J›¨æ#’ƒ¦à–:¶ÀHzéD[öqÕ(íHUƳÁ¥‘FžÙW]^RwfAÝ,ŒÁ–¸'f{Ô=òhA` ž`)¹––à&ö”7Wù„ùÔ„*jŒ<nëö§käFüF¬!7BOã^£%ø¥Ë߉<¶Á7<$0 <¤±¢ O¯çД™syµZ­Iawd§ò?»Ö^ÇIü‡ÉþÐ#tGt|Ä|Ýž_Êa5ãð‚CÉV aŒ†¥Âp|åô¿Ù{‰‡#‡i³®4â.º W´ìÚy¿õ…s3‘™íÄO”I´%è1ù4Ó½MßÆ,ö5Ñ ’2â4sð9ìà­ônïek9l‡-Gc9îýý0°?}ÄØhœhf°Ý¢PêöHž©Ù䶑sÙRÕ&ïQ9̾›½¯²‘oªj6åZZÂÖÖ 6í[Ɇ:e‚:“= »^õ0¶^SÏüB6T¾Ü_†G‡DÌÀ 9<ê)ú‹Ð ^ê¡Ì_öjlÀH~4$<Ý4ƒeÌ>˜Zþ&fK„zY DJ;n? Xá³€=’1]ÚR “’º;yÁ²?éꜸMrŠ†½u¢:Šsu)? BçêX8,«È@•wœƒ°íè¡ØËA ôþ\),
+2ÚC6t7ã.sUìÕn-?à^»f–ãj»Mñ½‰Ûh×x´„¤gýžwPw: ©Ï ¦Hz¶&÷m>kî RšésûHóAž\”ªM¢v¨¢ãØÒmÕ5%¥Õ|g ž<u ¤u-FßÚiÿ³)ï^ݽÒ{̱[bl”ƒÕk?âë7Æøxò°šNÍß›¸Ÿ»+_æ&ëUJE;Tüv—øÕÜrçÂ<!Ñ FˆC Q>DG¡ø¢,}z–/ÌÛ}ôw²Æe[¶P¼5ÍŃõÒ®rã¶mñ_Ã-^²ï¼R`Ž'èµ™ävcEI}S`~d”_⦠×Æ-0
+Øýô
+rç·»F¹q«Ý«Ã…Ð}ê#­ìnô^ý¾±z?1úØPïJ¡Æ]·z ÛÉÄ]¦s„Ä_·Wö5yÓê<²Ñ5]0¿eóš0"†kN šw…ŽBâxo_™~ߨ™k¾ÔûºXp@쪃÷ "GÜAW>†™™uí/‹ÉòïÝÁCùË?‘™9UÎM
+ Sý»J‹iè =¯?†ôe¦¹!lgòØʺ¸òcÌDXâj–x ^6¢zxdŠ¬'ò
+Ôßa¬º4¤Ýðïq/‰k×ñghf_WzúØâ.txþþ¦Ð̲u‡&íúM]öÅôœÉS½]
+[ýøøâNUéCï­lm:Ë]=? Kˆ)pTÄ/Û#%?ž·„ŸðyºV—Ïã ÷e0Ž…}и£‡ø‚|ÎÀR3cÖ¯Û‘Äc+‚ðBlÍbå}¼¼Ìg塼ç¦5™ó èåßÄ€l)ôàï9ÿ4ŠK$r1iòâPàþ»ð<–Å{‰°Î…#OŪôÉ9E­G³³x`Aa$bËší’‡O¥á;V†Ì“#àóCðy¤Dd™Ñ¬—W†£X†YªP*Q8ù«·Ð±áH©¬@‘Ž-²X^Y‰*
+xhÃtAª$ðø¯yŒ{×G×E¢{O?‚)F8ÿ(ÜÈÌ¢ÚówȳQA,ϨñÚ„d­°,Å9Ôƒs©ºä'0CfÝk[°‚…ìŸv”+¼Ša Ïä•ïj0d× ÃÊK&}Í=®†>§‘ØÎSãÞäïylÈ÷áÖ{z¸lËŒIOí›÷Lg!} –Deø—ñ¿†ÏÊ·û¤†rk“ä+kw©Úº¢¬Æ»]XÔKàÆÓŒ'Ãkä¿ÖÀA´×«Ò㾜Ì
+Ó¬0í~½?9´·®JÀs_:<
+îÈcPÊö~™×ší>Ü4§;$È.}zýÓ–©«Ès;ó¬o× ‰åBbÑFÞègt[ìæ¼2‚×>‘1mxð‹Òë‹TÏHúr=Pߦ‘Ä–’š˜¤dý«b˪ʋ[_K4Š#vJO@ò K‘¹¼%ð#ܳ‚OKZ™“Êùgn,ßËÖUìÿº¦¥ñIºLu&Wd¦ï÷;Ù»Jbbx­fÇ5‡Ô(%Ï Ìuå°Âæ†õMzµ°7 2õÃx«Ã;®Æ.`=B\Æ ¼v<ŽÏOÕâ¹”´MÀ¶t JÌÏÐéJKxƒ!7ß`°ÚÜ|XSMväÁ¶:¥M„xã&Ña`{?ð>,æµ÷3ë”P]Z¨°6]›­.²ò—ùà­ÒzYZaîÅ‚,+CîeÂËÀ[6óRæ}LX`vœÎ&"—ÇQsßBÃÐ*èqä<£ÁYš‹Ò*ØÎRƒªáŸÆOïí5›1@I*ÓJ‘jã&‡—FÞÖs6¹8+ùÏ2ÛÞ~Ÿo­;ºï,WvHMR­«&Õ' ¨Œ®*©ÍÝýžë‘ X ¼öÇU`¿ðÏlNh9– YØ»§aÿmvŒùÄ-r+ïâMòøß&ãvAÙ¬¹°›}xâÒÕÖºïR¾Ü ¹®3ö4?œÇ[Š~í~òüÄœ¸˜ÔøxñÿL“ª:Ï'ãró‹Ò âÿ2MjÈCˆ$ŸmÚ³²ž4ú’¬}÷3«Ý_\-„Hé?xY$Ž$qcðzAåNÃ1Kë‘&K(MÕ%†²Å´7ŠÂ{’JÐ:À ïê&ÁäIA‚XLW¢¼òtžQ¤e×¢RÆT†â× Ì9Tµ^&p"+gqÅ¿þ½+¨žù~;ùIÿÕô|/Ï…è‹"Œ0ÊDö†ÍxûË´ã7;ŒU[ÑLÛ]\-ÃÝïF"¼÷ýï]î¢dcÀî×€%ª¶¿ôÃŒÇÎu?”?flÍK4SþÙ¢+Ã*øëÆÓn°ŒC §†(¦®˜éµ3¦º¾¬¢¶É¯ \Ç¿³ÿª¾„cìW_I:/Ð=6FðWj–¥ZmÓ&iãØØlTÌ·Ê®·®,0'HýëµfÕ¬²ãÞ„TšæY»”•~ÁAÑ[~X
+2èÿõ½ïÍUÝ„ïŸ|g²?þdé7nO ï7L WG&­ßf•”2Åpx¾ 8°)*Üo**èæÔéw¾b¡çˆ«ØŽg–cëéã÷$”×îßcëQ<ßVûáÎ#Ü×-Ó_2{&î{ Ø÷•2™ñ HÊŠ‚Œ0EBKì;É¿hk²|F]Q0èöMÄßÑxÀ°ÉÃVc›zX‹Ö)»ÓxØ*`0°O  äáÑ3B˜xàÚAP”<#„t°ó(žÐØá·5›ž¸ÖiÖÄÔ­<|öô“+Hí(àÑô4^½ÿö'Ù^7ÕìÙêL»M’ö‚.óסmÜ6—.óV…'iÕª;wlÞ¢Ašš£IOgk£¼‰Æ
+µtC
+2H¯K?¨9«+ãH–ÏL±Ql~–·mævFíOîoÔd‡G³‰Uêž00îUÒ”|”…Øotñ›6Û"6 ½ÿ¾!ŧP€Ñø¡t{fFrW™e#á㪓 ùMºþ]\ž(¢ö,sgbYlvM¤€·Á .Òs‡¯ê*9³«‘’[½é—™=ÖäDz‰ê¤db…-žŽÁj©:=5ÃÀæ•–ì5û<D-]‡ô+ßbú½Â!¥lÄF¼
+wêÌ‘Û²%pQë>€ ¾ Ó.;&üˆíÆ+Bƒ¼6ÏÔô'7e¢ý:‹v©Éø¸´„̶$¯@oà¯Ý¹9JZ¦Dšd6)96LÛYb›IÚ)9ŠÔu¥›ˆm½q¯IRþ”~aùÜêºs©k><³VS£dS´Éªx^UØ
-"1°¦Æ½ÉßõØPàíóôpÙ–“‘" Þ;÷'˜ÆB* þ,‰Ê84ð/á$¿†ÏÊ·û¤…rk“÷«êv®Þº¢ˆ¬Æ»ÝX6HàÚ“Œ'Åkä¿ÖÀãA´×+Òc¾—˜¦…YaÚý8ú|rpO}µ€ç<tx4Ü–Ç Ôí!ü2¯5Û}¸©Kn“ »øÙÕÏZ§¬"Ïuêʳ¾Ý'$–· MPˆ}ÅÞò&?£Û"·õ+#xícÓŽ‡</½>OõŒ¢?m
-³­ yŸ^Þ²a˜—2§1aaØi›ˆ\B-ù|+ êÁúð9ÆÀziNJ¯d»J ªÿ6~vw¹ØŒ½JRq˜6ŠT79¼8ê.¶œ½Ée½’ÿ<«ýíÓ|[ý‘½g¹òƒj’j]5i> l@Utui]Þ®÷\OÀ‘àý±?®û÷yfsBëÑ‚ý-žÝûn±cͧ n‘[y—o’Ç×ø6· ÊÍù]ìƒã/·Õ‡x—ñ^ÈÕÙlØ“üpJo)úuøÉ sãbÒâãU<Æÿ5Uªê:ŸŒËM,(Î ,ˆüËT©!e"óÉÕã&_’²ïÜefvø‹«å‘)ý/‹Ä‘$hŒ^/¬Úc9æBYÒd eiºÄP¶³„öF±CyORšBû¹ýä]Ý,˜<顨°IKè*”_‘Á3Šôœ:TÆÁتPüz¡9¡‘’ö‚ –e³¸äßðÞ%ÔÀü?ü„ÿjzž¿—çt³˜#Œ6‘±„f¼ýeÚñ›ÕVA4Ó~×ÈpÏ;Q éýpÏ{Ÿvó
-2ðõÝïÍ%]‡ïg²?öxé7n¡ß7L­ó WG&¯‹ßf•œ:Åpxž 8è]\´ÏT\8àÌÉSï|ÅB¯‘—±Ï,Ç6ÓÆ;­ßRXÑP´K`|®Cñ|{݇;s_·N{mè¬Ø¿ `{ÜOÊdÅ' M(+
-2B '±ïbþ¢­Éò)GtEÁ\ Û3GãÃ' _{7Àb^´ùKuØ“ÆCÁVC€} =`Ÿ²ÁÄýW€ê€ä)ìâ‚]çpð˜Æ¿e§YôĵKfNLÛßÆÃçO>¹„ÔNCÏFŽðʽ·?É1ðº)fÈ>¿oÚe’tv›茶qÛ\ºÍ?Pœ¬U«¼¾sö Ò´\MF[w íàM4V¨¥Þ™Œ}¯y  ïé¶ìluWªÏ.Ì Y¼*ý ö¬®œ#)>/Bt0IÄ&qˆùYÞ´™K"tÚŸÜß¤É f5ª´$žÐ/¶†jijÊF쎷 :ÈøM‰mÞŒ?mHõ)` ~ Ýž•™RÈfe›•È ø¸úDcA³n@7‘'r¨#ÛÜ–X›S)àmpF‹ôýC—uUœÙŠÕHÉ­NBúef5yÁ±l¢:9…Xa‹§áÁ°ZªÎHË4°ùe¥{Ì>UK—Å!ý
-Á·„~¯()¤L€Øˆçã4éâÓP„¹»ÑtUpmH}š°ž éÉ ¹¬åæ“­7¶À4+Í!8R³qÛb¶hÍÍ¡zi›©›ë`×Ù›DÜK–wi¢¡
-º¸G 5ž%8á_¤ƒ]æÎåBcò‘•^•WÇ#ŠÂ#•qþnû½Žßný97ƒ‡%âÄ'›sMdÍIÂ2vX%{oC¡õ±ð‰üç„s¾ïó_ºM©\Åa{—±A±ÂÖYšQkÙ…ú­Sù7^ÜvŒk½Yô MhþDûë”/_Ž&įä‡DÌ‹õå|æ?ŽN¢{G٠裼wø*®äîà/D/òW¡™óI¾§ºL]Œy]‡¦„K„´ß¿Ã|Ø1öÉ©©×¦¸@_~·ïr}073ë°TÀ8CýMËÿJ–É4ÿôõ¶…ô¶ýx&LŸT…<bÅ™FyH¢:<‘MN¯JäÕñ(JÅâX šuÿÖîó9»P ¡(]š]bÊ¿_p¿Æ(1ûjvŲãÎÓà _LJЪF;@«Ñ X÷‰ìÁ×ÍgêëS¶íàÑæäͬ_MLeacÎÞck[_u›—䲌¯‰ò¨[ÈÚ¶Ëþ5ßCÿÙ€™ô¾¬xw—=oXç,’ÓÐæwV™[œÂ“NÜ}ðUóÙúúä¨ê'"ûwÎO»ÿSOGã~ëÍíºÅ»¿5þ™¾êÇ09Òž¹ñÐ^eúÿ
-Ÿ&S©Ô*­àÿêºé‹–X©5ZµšMÓ©õþÜ’¶é ¯Z©tµËe YÌí÷o™ç©e¢?¨äz­^“Î/<»îrÀ +ƒF¥Wqi²ÔTUŠiuZ¡ljãô–y®s}¦o›j¥%×´lJ¦*“Ï zCºP£íòg­ÒÓuú  ÿÓ={ÐÿM°ZÚÑŸÎù7ÿ+çü6{ÄšçbZEǧ=õýFK?—Ÿ
-;¼Ñ7<4ÀÜT¯ÍÉËÌäGouqsçU*¤B]MõÂWÁú^ÝmÞ^¬að¥K—˜/þE~ÍÜNø;ŠÍô§šÄ·Ÿö_Ÿ}« ìÿ‘g¯›ÿâæÿ6³9›ƒ(Ššhþÿ±*ûˆ
-qvåfWÈøE«üÇÙôD6½LÖ—zuæ—Á KÏ>iccÔÕê3³ôéC¦Í ÿ.‘†®
+¥É…(-­ª×U˜Mt݄Ÿ-î±g±
+ÁhÆÔ$ì€'åÇ‚@4™€)éÿë¨ÌÚ¿EÉíò12R-yr=yÃ÷ªËG‡.š®–Ý°ÒÓ™*C2Ÿ*S©Ô*­à?iýŒÅNVjV­fSuj½†?ïÔ:£~’•JgP¸tY¦Á)À¼¾ÿ‘yžY&úƒJ®×ê5iü¢³ë¯ܲ2hTz—*KIQ%k‘V§J§5Ìhžï:ÏgƶiVZrMË&g¨2øt™Á 7¤ u·Z¯~pÖ*-M§Og1±ð?8Ýógýßt«¹ ýé¨ó¿sÔo½W¬~!f Eû¬­~Àh âgòÓaG6ú†‡˜ûê5Ù¹ü¨­.nî¼J…T¨³¯^pë:ôxŽWw™·0ktåÊæË„“_3wþŽb3ý¨Fñí£ý×gßîûåÙkŦ¿ƒ¸ùŸÎlEÎzø@Š¢&šÿ¬Î>¢\œSA9Yå2~ñ*ÿqÖÝ‘uOS+=:óË`Ð¥e²¶6ê kô™ú4ƒ!ú×ÿÛ‰õ
endstream
endobj
-679 0 obj
-<< /Type /FontDescriptor /FontName /HSGCYI+LMRoman8-Regular /Flags 4 /FontBBox [ -456 -292 1497 1125 ] /Ascent 1125 /CapHeight 683 /Descent -292 /ItalicAngle 0 /StemV 98 /XHeight 431 /FontFile3 681 0 R /CIDSet 680 0 R >>
+678 0 obj
+<< /Type /FontDescriptor /FontName /EZOSYT+LMRoman8-Regular /Flags 4 /FontBBox [ -456 -292 1497 1125 ] /Ascent 1125 /CapHeight 683 /Descent -292 /ItalicAngle 0 /StemV 98 /XHeight 431 /FontFile3 680 0 R /CIDSet 679 0 R >>
endobj
-682 0 obj
-<< /Filter /FlateDecode /Length 698 >>
+681 0 obj
+<< /Filter /FlateDecode /Length 702 >>
stream
-xÚ}•MoÛ0 †ïþÚ¡@wp#ùCj‹ €ãØ[€õM1lG×V2‰lØÎ!ÿ~’^&†uô)ò%E0WŸž7aÖto:Œo8{ÑcwjæU\]­ºúxÐfzÔºÑÍÙ:޳硫7zb×ùzµ6íôÙ:¯M½?6úìõo§¥ÞµæÝÅåaׯúGøuó%ÿ¹¿=¼t‡Ê܆/zwÜWCÈÝ­×vÚ[ïÿ;2keX™ó]cÛ™{&n8çö 0MÞ\…c0#•lvÖ½mM3Töæ„"bM[ODþ»>ØV¹Ë›Ó8éÃÚl»`>g3›¹§áäUfOC£‡ÖìØõ­ÏæØ÷{íô0,¬Ñ[Úöè±:h6så¯km§ÓG}x¿ózê5‹< ®»F}Uë¡2;Ìmø‚ÍKûYÚ4Ù9n½mÖáü¯JΦúW5¸@biqžˆ…§Ü“El(†(ƒ-!Š$B”8­<ÙCOî% ÷@±€-!»$Böø¤`“ [ØÈóD1I§‘N"ÒB1I (áP½‘²;)#J@¨6²Õ&P&‰H Å$-DèYR€Ð3I1ò¥P–” (“DPãýRôÌ^ðŠ(E}¨6• Ê
+xÚ}•ßkÛ0ÇßýWh…öÁäR[BÀIl¬MiÂØöæÚJfHdc;ùï'é{IÇXhèGwºûÞé¸Ü|yÝ„Yݾë0¾çìMí©¯t¸x.»àæfÙV§£6ã‹Öµ®/ÖችömµÑ#»]¬–+ÓŒwÖyeªÃ©Ö¯;Íõ¾1..»Ýêïaþs½ù± ¿>¿µÇÒ<„oz:”}ÈÝ­m3¬÷ÿ™µ²O¬Ì‡ù¦û¡iÍ÷œs{›zÑ]…C0!•lrѽkLÝ“Töî„"buSDþ»:ÚV¹Ë›ó0êãÊìÚ`:e›¹ÆþìUß“u_ë¾1{vû‰Fë³9uÝA;=Œ³«õΆ¶=z)šM\ù«ÚZ›ñüY>îlÏf‘gÁU[ë¡++Ý—f¯ƒ©mŸ±ia?³@›ú/;Ç­÷Ð:\þUéÅTý*{HÌm Î1ó´ð$AQ[Ša#Ê`‹Aˆ"‰%Î@KOöÐSŽ{ ¨À=P,`KAÈ.‰=~
+"¡Ea&$²Çè¼Döï');jè`ZR¼¦„E-1e€–˜²£Ÿ)fB¢ŸŠ/"»"ÕDÔ3ôEQψ S¡KŠæ :UFyJ5ÿãä:-jùqŠ“ õ.'C½9h¥9ºV bîï Ž—ÏýÜ Žæ^© YÎü› šå9(E¾Ü¿®(\M>fD÷
+ïÑ3ì¿3ܺq›óºÝªSßÛÕæ׫ß_ns5F_7p×vî–ÿó«ûò3âh]¿;U®&
endstream
endobj
-236 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /HSGCYI+LMRoman8-Regular /DescendantFonts [ 683 0 R ] /ToUnicode 682 0 R >>
+232 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /EZOSYT+LMRoman8-Regular /DescendantFonts [ 682 0 R ] /ToUnicode 681 0 R >>
endobj
-683 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /HSGCYI+LMRoman8-Regular /FontDescriptor 679 0 R /W 678 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+682 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /EZOSYT+LMRoman8-Regular /FontDescriptor 678 0 R /W 677 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-684 0 obj
+683 0 obj
[ 82 [ 611 ] 100 [ 611 ] 187 [ 611 ] ]
endobj
-686 0 obj
+685 0 obj
<< /Filter /FlateDecode /Length 18 >>
stream
xÚc`€8›A
endstream
endobj
-687 0 obj
+686 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 801 >>
stream
xÚuRKlkþG(`ëëÆŠ`‡ÿ6õ-ÐÔGâÝÝ6Õk¯©˜Ý8t~–ò×™¡ õ^¼W¯3Ó¦E(…Š5•‹ëÂçB]Ww£îtg2¿NÎĸ1ñ,Îó;çäœ|0›EQö¿Ï×ݵ£çPdc{Ý}(²¼Që"¿‘‰fÈF@š)Â,#.æ]´ém^šÔžl´à/Ÿš 
@@ -2915,37 +2897,37 @@ xÚuRKlkþG(`ëëÆŠ`‡ÿ6õ-ÐÔGâÝÝ6Õk¯©˜Ý8t~–ò×™¡ õ^¼W¯3Ó¦E(…Š5•‹ëÂçB]Ww£
sõRåÒ4sþÓ=¡ŽNoȧFÊÎJ±Rv­4(¿š8éÍ:sÁƒÅ[ÖÏÎ’Šó¹ ãóG½ôr‰^Qo|»â¶¬È£²2!+¹EšžSîŽÉcòØ%Oÿò¦ƒG1
endstream
endobj
-685 0 obj
-<< /Type /FontDescriptor /FontName /BTJJIE+LMRoman6-Regular /Flags 4 /FontBBox [ -515 -298 1647 1125 ] /Ascent 1125 /CapHeight 683 /Descent -298 /ItalicAngle 0 /StemV 117 /XHeight 431 /FontFile3 687 0 R /CIDSet 686 0 R >>
+684 0 obj
+<< /Type /FontDescriptor /FontName /BTJJIE+LMRoman6-Regular /Flags 4 /FontBBox [ -515 -298 1647 1125 ] /Ascent 1125 /CapHeight 683 /Descent -298 /ItalicAngle 0 /StemV 117 /XHeight 431 /FontFile3 686 0 R /CIDSet 685 0 R >>
endobj
-688 0 obj
+687 0 obj
<< /Filter /FlateDecode /Length 375 >>
stream
xÚ}R]kƒ0}ϯ¸{(´Öh·ŠëXÖZ{µÉµ ÔD¢>ôß/‰µ…±NP<žsî=÷ÆÞËþè½suBo4¤pÀJ5š¡7ßd%éõŠ5Êz‹È‘wl5…½Vìˆ5ôçÉ"‘¢q"Ù¥áØ©þÍð,äCbû@?Å/o–®×ÉÒûØT‘ɱwÀssÉ´G­+õŨÿ‚aá ®Ì'êJ(9…`H)5–’ÏUa'¬ˆK ~—;’ë[T8Ùà$ Vß{²Â¬Êš×ªÆ"‘¹"Q¾é,ªZ_]êñwš£ò ý'æØ”åm $ŽcnJ›m³Á·ã'Ü°¢¾>ÛÃÓ^K„Ðá  ÌǪÌêLž‘Df 4†he®˜ ä¿xÚºNy  {u ûδ­óš:”Ž‚Ø¢ñk‹&Íf…a0‰ÛÎc»ÙÅ݇cÖf2·]ßïPªÒºÜíN®û‹,Ú­Èc¹ä
endstream
endobj
-235 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /BTJJIE+LMRoman6-Regular /DescendantFonts [ 689 0 R ] /ToUnicode 688 0 R >>
+231 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /BTJJIE+LMRoman6-Regular /DescendantFonts [ 688 0 R ] /ToUnicode 687 0 R >>
endobj
-689 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /BTJJIE+LMRoman6-Regular /FontDescriptor 685 0 R /W 684 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+688 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /BTJJIE+LMRoman6-Regular /FontDescriptor 684 0 R /W 683 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-690 0 obj
+689 0 obj
[570 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 277.8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 777.8 0 777.8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 520.6 0 0 600.2 0 0 0 0 0 0 0 0 0 571.5 ]
endobj
-691 0 obj
+690 0 obj
[388.9 388.9 0 777.8 0 0 0 500 500 500 500 0 0 0 0 0 0 0 0 0 0 777.8 ]
endobj
-692 0 obj
+691 0 obj
[ 28 [ 525 ] 35 [ 525 525 ] 40 [ 525 525 525 525 ] 47 [ 525 ] 49 [ 525 525 ] 55 [ 525 ] 59 [ 525 ] 61 [ 525 ] 63 [ 525 ] 66 [ 525 ] 72 [ 525 525 ] 75 [ 525 ] 77 [ 525 ] 79 [ 525 ] 81 [ 525 525 ] 84 [ 525 525 525 ] 91 [ 525 ] 93 [ 525 525 ] 96 [ 525 ] 98 [ 525 ] 102 [ 525 525 525 525 ] 109 [ 525 ] 111 [ 525 525 ] 116 [ 525 ] 118 [ 525 ] 246 [ 525 ] ]
endobj
-694 0 obj
+693 0 obj
<< /Filter /FlateDecode /Length 27 >>
stream
xÚc``àø˜(ªp5OlñÑ.TÀ
endstream
endobj
-695 0 obj
+694 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 4172 >>
stream
xÚ½XyTW—¯ªEEò)é,U¦ª»F4fÑ,žÄ=˜ˆÑ¥Ù¥¡Wz¡÷nª÷¦éh¶¤AŒFˆ‰š(ÑŽYÄ$f™ÌÉ>ÆÉ2Iη¼"Ïœ™jPa¾Iæ¯9S}N/¯Þ{uïïþ×,$) a±XwïܲgýúMËŸÛ¾_ÉpÕŠ Q^EiAüV=¾ŸJ!è¹}‹&h2‘æ&YRXÄW‰ùÇþ3%>‘’8š’tCGÇ>úÍ‚Þ‡ ¬Ö;âïôl@¥ÜÏ|»ó‰”ñ_R"É  ¹™‹ü€üÆJ`%³f±8üüÕé«V=¼‘_%”—ˆ¸«W­zèøûcÜ éÜmyå|©°¼”›WYÈÝ–ÎÝžÎÍäK™ÑRî~%7ŸW’WQÄåq³y{¹b!O ä øâ*áÒtnvI©+å ʹ̧€WÁËò
@@ -2970,10 +2952,10 @@ HhFyÐuŒü|˹¼)ºAö<•µ›8¢,‹äàËp‘q¢
.WºýF²Õom³Ëj!¿vßÁþ½—»Nz¢}DQt@ß…Ö» éØøãç5WÂw—Ó^£·)9?ÒØT¦èr#Q³…)•Åpþj|¯ùdK_ã`ßפ§ËmÅÎç÷ä-?g ƉÂd³ƒ8ˆ vã>{}½Ú¤U ȢŊý9ØÊKå#CÑ6«X,Ùòè¼Nå èÉp€ê °´X'#<5y¦Ì¬¡Â‹`ú— í›6âöÙë À¤s&`i×þŸN`iØ(hä„ë¼µ:£Ù¤%àÒ¨\¯2È0­"â´YmXvmotùXjü¿Á¿ÐxÊ¢ûy<þߎ9õMt†¬óÚ,lb[vÅÊ”éTÊÌ،љÃKü²[šÜŽ””ó»ÃÊü´YB®”YtÛÿàükt Î
endstream
endobj
-693 0 obj
-<< /Type /FontDescriptor /FontName /PFVAAD+LMMono10-Italic /Flags 4 /FontBBox [ -491 -316 834 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle -15 /StemV 175 /XHeight 431 /FontFile3 695 0 R /CIDSet 694 0 R >>
+692 0 obj
+<< /Type /FontDescriptor /FontName /PFVAAD+LMMono10-Italic /Flags 4 /FontBBox [ -491 -316 834 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle -15 /StemV 175 /XHeight 431 /FontFile3 694 0 R /CIDSet 693 0 R >>
endobj
-696 0 obj
+695 0 obj
<< /Filter /FlateDecode /Length 540 >>
stream
xÚ}”[‹â@…ßó+zç!cçÖ x vfd”a_cºtÚ I|ðßowŸÖÅ]Añ³ªO*«3ú±ÙúsÙìÉž9û¤¾¹tùË·²õF£US]Τ†w"Iòí_Ù¦kª- l¼,V…ª‡'\¨êt‘tËzœ´ c­¾SL6ÞÑ/“Íç+ÿçÛ[£š€ûÅPžêÊçæЮN:ù¿yLÙã ³"_Ôõu£^YðÌ9×?¬•\6gÓ^ïMœE6¹™>ÔJvÎ'Û×^2YWƒ#ûYõœÌáíµè\¨CãÍflò©ƒýÐ]­ç'oòÑIêjudãÇuÊöÒ¶'2v÷²ŒI:he=Ÿ÷òLlbz/¤ŽÖÃõCø>²»¶ÄBËìV¤¾-+êJu$o¦GÀ36Ëõ+óHÉ¿â§ö N¸}ï¡êwÙ¡`©…8Af(Œ@!(¶”,A/ h
@@ -2984,22 +2966,22 @@ ZYŠÖ §ùb)v*S|
ô—`º©«çÈu„RÔKÑCZO3l’ݳtæöÜW¼ºtÞo{Åì›ý­ÝoaÛ´æ”}Ûë{{ŽúȽ?¯gEÀ
endstream
endobj
-232 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /PFVAAD+LMMono10-Italic /DescendantFonts [ 697 0 R ] /ToUnicode 696 0 R >>
+228 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /PFVAAD+LMMono10-Italic /DescendantFonts [ 696 0 R ] /ToUnicode 695 0 R >>
endobj
-697 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /PFVAAD+LMMono10-Italic /FontDescriptor 693 0 R /W 692 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+696 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /PFVAAD+LMMono10-Italic /FontDescriptor 692 0 R /W 691 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-698 0 obj
+697 0 obj
[ 28 [ 525 ] 35 [ 525 ] 43 [ 525 ] 47 [ 525 ] 50 [ 525 ] 55 [ 525 ] 63 [ 525 ] 66 [ 525 ] 70 [ 525 ] 72 [ 525 ] 75 [ 525 ] 77 [ 525 ] 81 [ 525 ] 84 [ 525 ] 96 [ 525 ] 98 [ 525 ] 105 [ 525 ] 109 [ 525 ] 112 [ 525 ] 114 [ 525 ] ]
endobj
-700 0 obj
+699 0 obj
<< /Filter /FlateDecode /Length 23 >>
stream
xÚc``àTdTšâÁ°Àe
endstream
endobj
-701 0 obj
+700 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 2256 >>
stream
xÚ•VkTSW¾äF4Eåíòê¹·õQ¨<âk)ºZ‹À}ˆ¯Öº ’@Hb QPK¢ $<åH[y”uVÕŽ¥PÓ±¤u¦«N­Õ:SzîôðcÎ (¬¶æd­›œ{wÎÞûÛßþöB!!fÆîÚº+!aáæ-[tZÝfÓ"Yø&™DZÜK6 àfÜü8ÆŸ Ú%´\â?$Ž¼‹>û¯á—:Ñ‚”N寧C±äeükr­d£W2Ÿûb&1›øžøE ¦ÿ¾ÓÅ2ÙÒµ:½Å VªLìb™lIb×D°åIiº,cšš•k“Ùì–6^—…ïªÙ–MT¨äšV—Â&(v²F…ÁÈ* º ½14‚MP©l–ÎÆâoƒB£Él†6Ya`M*»mk£ÓšØÍê$…Ö¨`ÃÃYÖ¨P°*“I¿22Ò”¡ŒÐ”‘)ØÆ©52Fòÿ y3>!|ó†µëã·®0™MlŠÎÀ&+LrµÆñ«Ç·ÑɺDņd…Ö¤6Y¼fs‰…D$±˜XN¬&Ö1D±‰ØB¼M${‰DBM¤zÂà±ÄKJHyT…DñP-èõ›ægòöOð2Â+¢Q>@fŠÄÉâÛ“d“Ü0:0ßã}ž O†(=WÕ%uiímNqq€rñçÛî£{æ~°Z]git´•Ÿ³[kqå>Ã[Å
@@ -3014,10 +2996,10 @@ F…=F"$
$I*øþùB¢PëŒNKCƒ³ªÅ'^Ç<:OÐ-<ê¡Þâá é0šéL- ªDûŽé+œ³(ÖÙR÷5'·OMÅL–½8«“þÈ^çdnâHª ›Ty¹yGCžd³ÐÔßÐêŒeÊ🲾Ëaºx홥Vé£öî,4Úü‚“:Ñj42áb³]ë*wØÚNM_a# —µþ£ßWÂÜ+¯x!ƒ•oœ)=c«“'[Y`›uWn&gë=ÃÀ &~Þ|(ìs²ÖZŸ„O6µ¯‹}”â;ù ´Ÿ Pܽ;Ôó`lD¸1°×1;w{qeså¾q
endstream
endobj
-699 0 obj
-<< /Type /FontDescriptor /FontName /GYSYTT+LMMonoLt10-Bold /Flags 4 /FontBBox [ -454 -308 734 1039 ] /Ascent 1039 /CapHeight 611 /Descent -308 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 701 0 R /CIDSet 700 0 R >>
+698 0 obj
+<< /Type /FontDescriptor /FontName /GYSYTT+LMMonoLt10-Bold /Flags 4 /FontBBox [ -454 -308 734 1039 ] /Ascent 1039 /CapHeight 611 /Descent -308 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 700 0 R /CIDSet 699 0 R >>
endobj
-702 0 obj
+701 0 obj
<< /Filter /FlateDecode /Length 453 >>
stream
xÚ}“Án£0†ï~
@@ -3027,22 +3009,22 @@ uÐdµ¢á» v½9{Ï7$|5ŒTG:¿nÑJÊ¡mOàìPF²Œ
8Øʶ?/u4t{/„Êþü&|¥Tçhì9B»\ èÚšƒ©ÕÈʶ€etµµWF@‰oq†Yû¢L¯ñ%ÄÿÔÆŠr[ˆ±$ÊÅ ¤i´@Ú"-=-b¤;¤)A•÷ž–£ò)AZ#Ý#åHãz¤ Ò“§»i‹´ô”2O CB× ®—¢k»¬'t`Í]§cºNǼ4ÃŽù¹æº)¹%Œ±çèGÉŸ–;'©à2m­n]–¿ý˜Nÿ‹£×-ù yí
endstream
endobj
-231 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /GYSYTT+LMMonoLt10-Bold /DescendantFonts [ 703 0 R ] /ToUnicode 702 0 R >>
+227 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /GYSYTT+LMMonoLt10-Bold /DescendantFonts [ 702 0 R ] /ToUnicode 701 0 R >>
endobj
-703 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /GYSYTT+LMMonoLt10-Bold /FontDescriptor 699 0 R /W 698 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+702 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /GYSYTT+LMMonoLt10-Bold /FontDescriptor 698 0 R /W 697 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-704 0 obj
+703 0 obj
[ 27 [ 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 ] 61 [ 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 ] 92 [ 525 525 525 525 525 525 525 525 ] 101 [ 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 ] 118 [ 525 ] 120 [ 525 525 ] 246 [ 525 ] 272 [ 525 ] 338 [ 525 ] 602 [ 525 ] ]
endobj
-706 0 obj
+705 0 obj
<< /Filter /FlateDecode /Length 36 >>
stream
xÚc``ÿÿÿÿw ~ÿýÿ¯ (€ ˆ l@
endstream
endobj
-707 0 obj
+706 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 8223 >>
stream
xÚ½z\W×÷¬°³¨•qwÌì‰=¶;ØPAQzYX–²´¥3Kï½wDì +–EM²51ÑÅhš¦>g’Ëó~ßì‚@Þ$Ï÷þ¾ßïû`ÙåÞ¹sï¹÷œó?ÿsfE„±1!‰,ÖïÜìè¸yÚ;;™ŸìÙ3¶ººùì—믭ãÇñã9SÄ%ø7E<ijF¼¥±ÆT„›éL»w`Ýï²?4â7 BT8Lxä4‚e:^øoêÓ‰úŽí¦““A„ˆ° Þ$¾'ºEÆ¢!¢a¢Ñÿ°îœ™³gÏ[%ó•{º{(,çÌž=wºþý=Ë•3-m÷ð–)½=-÷û´´ii7Ór£L)ôzZ¾%ó³tqõØïãf)s³tpÝiè*´t—Ë‚üßžiéàáh©”ɽ-…O¹«ëþ@׃–A~]å–
@@ -3077,10 +3059,10 @@ qeУÌ*®Š]'/Ò£ò*ÁTä=—^ûJ ¦8Á%â ’ªèÓ •ô‹Ð4LÈ)Øç°]L%½Ä»ZÔ;æ—Õ$ABGì
¤`‹¬óhü–-²t©- ·`²îåý{wÞÆSPÿsA]0H•ÿR¦ÐE—«Š”ˆ‹å¢…$jÌ&qD|tB¨46Ë»6+#5Môc®‹«óÒ ò¤ÿ?’C#]‘)ÈrCËqR¥J¥ŒN¬ŽfaÌfqRfFrS›ÕœýÚ N7úÿ®¾…Ï¡±éÇêÌ(N?YáÜäØR>æçΟíZ”Mç¼*Ƙa‹“¢S'áç“B²?•†I)WÌ……!|ÿ ç´;$¾ ˆD6fd–¦ÿVèpž1ü&A‹ôßò´5ÎãWåÁÒ¼ô<Ù:øÌ2Ì™ÕÑ =Rœ©Ñÿd”§gšš¶V¤¦giÊ4¹—[rMßà+Gþ‹þ߉–_m
endstream
endobj
-705 0 obj
-<< /Type /FontDescriptor /FontName /KXPZZP+LMMono10-Regular /Flags 4 /FontBBox [ -451 -316 731 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 707 0 R /CIDSet 706 0 R >>
+704 0 obj
+<< /Type /FontDescriptor /FontName /KXPZZP+LMMono10-Regular /Flags 4 /FontBBox [ -451 -316 731 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 706 0 R /CIDSet 705 0 R >>
endobj
-708 0 obj
+707 0 obj
<< /Filter /FlateDecode /Length 750 >>
stream
xÚ}•]OÛ0†ïó+¼ $všø+€ªJЩڀŠ¢ qW·‹Ô&Q’^ôßÏñû¤i ÄSûœÇǵ/¾­Öñ]Q¿»X]%âÙuõ±Í]<}Ø4ÑÅŬÎWõή8v·bÕÖùÚõârºœ-«²ÿU¾?îõï {·+«Ï!¸|q¯ñ×ÕÛÛ*þùðPWušÄÏnwÜoÚ8f½”ýÞGÿ?PøQñŨËürmWÖÕ­H¯’$ñÌ«bZÃ.±J1:×½-«¢e©â}(<J¥(ʼ'…¿ùÁoÕ0y}êzwXVÛ:ÅÈg.»¾=…ª¿G£§¶pmYíÄå5ú˜õ±iön¨G$Ñd"
@@ -3088,23 +3070,23 @@ xÚ}•]OÛ0†ïó+¼ $všø+€ªJЩڀŠ¢ qW·‹Ô&Q’^ôßÏñû¤i ÄSûœÇǵ/¾­Öñ]Q¿»X]%âÙuõ±Í]<
]Q4b-4i¡2M£H0ÒØ3 #K‚‘F4Œ, F»«adI4"шµÐˆ„ŽiiøYüë„ŸD§ üü‡àgIðS胟Ái5ðËHìöÌÀO"ŸŸD ü$*3ð“Ø ?Ã|<ƒ¬…gß#‰nŒYe$ØZe$žAd·pP8Y–Èné
endstream
endobj
-230 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /KXPZZP+LMMono10-Regular /DescendantFonts [ 709 0 R ] /ToUnicode 708 0 R >>
+226 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /KXPZZP+LMMono10-Regular /DescendantFonts [ 708 0 R ] /ToUnicode 707 0 R >>
endobj
-709 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /KXPZZP+LMMono10-Regular /FontDescriptor 705 0 R /W 704 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+708 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /KXPZZP+LMMono10-Regular /FontDescriptor 704 0 R /W 703 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-710 0 obj
+709 0 obj
[ 51 [ 569 ] 56 [ 569 569 ] 78 [ 569 ] 82 [ 569 ] 100 [ 569 569 ] 106 [ 569 569 ] 121 [ 569 ] ]
endobj
-712 0 obj
+711 0 obj
<< /Filter /FlateDecode /Length 21 >>
stream
xÚc`
< 
endstream
endobj
-713 0 obj
+712 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 1685 >>
stream
xÚuUkPTG¾óȆë(uGû^QWÂCÅøZ·`‰¸ òô±™Ë0Ì0çሠjÒ3GAŠG@^òX"")E0‚kŠZ]CP*–•X,PšÑ¾nócg´öÏVmwÕéîÓ§«¿ï;Ýu„XLÿÄÈÝá »¢câ¹Lµqs`<«µÔ&ïÞN~9¿*
@@ -3114,31 +3096,31 @@ GK›êtôËdžïýmšBó—áExáæÐà}½gËZªÝ5g:÷‚\þû¥~ÕóÛBc"õZŠOI
NÁbŽâC¤^ú®×r—`à)ê|*â+Ð%æM¤Ü× 1=ÛU8⦈ˆkQʨöR¡ ‡áyÑ Ä¶ËšªJ‰mž´Ñ¹ÃprŒú~_9&꾩ûR58WCW%Ù#B)_o-ZÈ««=%…Øä-/7ýlµ|D%2–]¨•‚¨DC°bTø¸ß™ðir8ö‡ÓálkQ(\ç-µ—:KÏ—:óÿàY
endstream
endobj
-711 0 obj
-<< /Type /FontDescriptor /FontName /TFIASI+LMRoman7-Regular /Flags 4 /FontBBox [ -483 -292 1562 1124 ] /Ascent 1124 /CapHeight 683 /Descent -292 /ItalicAngle 0 /StemV 108 /XHeight 431 /FontFile3 713 0 R /CIDSet 712 0 R >>
+710 0 obj
+<< /Type /FontDescriptor /FontName /TFIASI+LMRoman7-Regular /Flags 4 /FontBBox [ -483 -292 1562 1124 ] /Ascent 1124 /CapHeight 683 /Descent -292 /ItalicAngle 0 /StemV 108 /XHeight 431 /FontFile3 712 0 R /CIDSet 711 0 R >>
endobj
-714 0 obj
+713 0 obj
<< /Filter /FlateDecode /Length 405 >>
stream
xÚ}’]KÃ0†ïó+ŽwQ›îSeætPp›¬C¼í’³X“’¶û÷ž$ëQ ýxzÞ“¼y“ÞÍ[Í¥Ùc4¼ã°ÅÚ´V`´XëõžhKÔÍQ¢ìªõ#¼Y#rlàv‘=gZ5}gZœZ‰êwÑ•þ–¸yàv‡Ñn™Íó,z]mMYèi´Åc{*lÄ]×N5'Rÿ/ªÂUðü£­•ÑÜqÎéÇ‹– SºÖ,¾¸„¸ó}PZÚ‹UØ;ã,€T¢¹Š’¢rÍù¹n°ÌôÁ°Ù bšYÕ={×}o¬D«ô‘øw¤ÉÛª:¡óœ¥)H<ÐДѺ(b·üLRU5ç¿røîÙ+„ç$Fb]m¡ÈfOa¶¤+e¨å:]ûC@tŸÉµ$> ëi zݧ,¼<=y½zð4J<MF¦Æ&憞 <M/3ð4¸ô®Ü‚ÜÞ\󭵞ß@ŸËFi¼îqe*×åo8ºƒêh³d_K}÷O
endstream
endobj
-229 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /TFIASI+LMRoman7-Regular /DescendantFonts [ 715 0 R ] /ToUnicode 714 0 R >>
+225 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /TFIASI+LMRoman7-Regular /DescendantFonts [ 714 0 R ] /ToUnicode 713 0 R >>
endobj
-715 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /TFIASI+LMRoman7-Regular /FontDescriptor 711 0 R /W 710 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+714 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /TFIASI+LMRoman7-Regular /FontDescriptor 710 0 R /W 709 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-716 0 obj
+715 0 obj
[ 28 [ 481 ] 34 [ 667 517 ] 43 [ 444 ] 47 [ 517 ] 50 [ 444 ] 55 [ 306 ] 59 [ 500 ] 63 [ 517 333 ] 66 [ 239 ] 72 [ 239 ] 75 [ 794 ] 77 [ 517 ] 81 [ 500 ] 84 [ 517 ] 86 [ 389 ] 96 [ 342 556 383 ] 105 [ 361 ] 109 [ 517 ] 116 [ 461 ] 118 [ 461 ] ]
endobj
-718 0 obj
+717 0 obj
<< /Filter /FlateDecode /Length 23 >>
stream
xÚc``à0T\0Å‹á 
endstream
endobj
-719 0 obj
+718 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 2227 >>
stream
xÚuV PWîf.Ô•v§µ»!xÁDÅPAι\—g€aFæ`$@ÄõB&`4ˆ XP¼‘Åx#Ž@Á‰Š¯$jÔTôo÷aÕöhR[›ª}õª»ÿ×ïýïûþÿû_=ãó1ÇÝÃåa‰q13FÇ+rŒ3}½©3Í:…Áñ/‚õ`=­bŠ€±q–rbiËðÑd1¯EÌšƒ.NlÀÿ§`"†áգϞ10BìÉ} {9.Š'aÎNŽ¹c±§ØÎLJã£ðqÿg[?_ßY!ú܃&3ËÄøùúúèxÎe‚}˜(Å2­ÞbÔjEŽŠ‰òa¢}˜½…Õ0Sõ9ŒR¥Ðe0ú &A½˜1Õ#“iЛsÓ|˜„,‘±è Z†{Ô:µÂ¨V1æ•ÚÀ˜²ÔLDb|®Ï11 5ËÔ9F5ãíÍ0FµšÉ2™rd2“9ÓGoÈ”epsŒ2ÝûIF™cwxlL‚÷ÂÈ°˜ø0Ó
@@ -3152,32 +3134,32 @@ D÷…!õ©ƒm½Û[OQ©œÞï
‡Í™â‘ÿ¿íV8
endstream
endobj
-717 0 obj
-<< /Type /FontDescriptor /FontName /FPEUQN+LMSans10-Regular /Flags 4 /FontBBox [ -420 -309 1431 1154 ] /Ascent 1154 /CapHeight 694 /Descent -309 /ItalicAngle 0 /StemV 93 /XHeight 444 /FontFile3 719 0 R /CIDSet 718 0 R >>
+716 0 obj
+<< /Type /FontDescriptor /FontName /FPEUQN+LMSans10-Regular /Flags 4 /FontBBox [ -420 -309 1431 1154 ] /Ascent 1154 /CapHeight 694 /Descent -309 /ItalicAngle 0 /StemV 93 /XHeight 444 /FontFile3 718 0 R /CIDSet 717 0 R >>
endobj
-720 0 obj
+719 0 obj
<< /Filter /FlateDecode /Length 472 >>
stream
xÚ}“Mo£0†ïü
÷)=P !ÐTÒ– ©M³%»Ú+±'YKÁ ‡üûµ=¦•ªf‘@<̼óåav·¯ü¼=‚¿x äúvT üüµî¼ÙlÓ²±9ì
endstream
endobj
-228 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /FPEUQN+LMSans10-Regular /DescendantFonts [ 721 0 R ] /ToUnicode 720 0 R >>
+224 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /FPEUQN+LMSans10-Regular /DescendantFonts [ 720 0 R ] /ToUnicode 719 0 R >>
endobj
-721 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /FPEUQN+LMSans10-Regular /FontDescriptor 717 0 R /W 716 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+720 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /FPEUQN+LMSans10-Regular /FontDescriptor 716 0 R /W 715 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-722 0 obj
+721 0 obj
[ 27 [ 750 500 ] 34 [ 708 556 500 ] 38 [ 500 500 ] 42 [ 722 444 278 278 764 556 ] 49 [ 681 444 500 778 278 653 306 500 500 785 500 ] 62 [ 750 556 333 361 278 514 306 778 528 625 278 ] 74 [ 917 833 750 556 500 ] 80 [ 778 500 500 681 556 389 389 ] 88 [ 278 778 778 528 ] 95 [ 736 392 556 394 278 500 500 500 ] 104 [ 722 389 500 500 750 556 ] 111 [ 750 528 ] 114 [ 722 750 528 ] 118 [ 528 ] 120 [ 444 500 583 833 ] 125 [ 556 556 ] 144 [ 500 ] 167 [ 750 500 ] 207 [ 444 ] 251 [ 444 ] 257 [ 444 ] 277 [ 444 ] 283 [ 1000 500 ] 319 [ 556 556 ] 343 [ 278 ] 428 [ 500 ] 499 [ 472 472 ] 502 [ 278 ] 575 [ 556 ] 589 [ 556 ] 612 [ 500 ] ]
endobj
-724 0 obj
+723 0 obj
<< /Filter /FlateDecode /Length 59 >>
stream
xÚc``°¶¯ÿüß¿ÿþîúÆÀÐÀÀØÀÀÀÀÈ
endstream
endobj
-725 0 obj
+724 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 8767 >>
stream
xÚÍ{t׺îȲ4ŒD`†Ì˜zï$L ½ƒé¸WÜ‹\±-Ye«¸Ê½È– ²±±é½7'@HB HBIHȱ}³ÞH‡sBrîyïÜ»žä%ì™Ñì¿ÿß÷φ‡ÙÚb<¯ÿ’ë—Ì[<jÙò5!AîÁÆYãí+ t·œ\Àd;š€±ïñXÚ†eø¬£-jÇßcgÛ1í P¾D‚÷0ŒWô÷iãÕ›5Û â~¿ÄnˆåÀV»÷1‘ ÆÃúc4öû‡ózòxä_-;qìøñ“煄ƆûûúE:N?~ÒhËç ǹc—¸{„DGø;º{9.ë¸|¬ãŠhãð`Go?÷@ÇÇuÞ%ÞᎾá!’Јc×ùùG8F‡„8rÿ†{z»Gx{9J‚½¼Ã#ý¼:¯]ç¸ $8Òq™¿§wp„·ã˜1ŽŽÞÞŽ~‘‘¡Œ)ñî;·»&b\`çEã,ß³`åŠuc–-ž÷ñŠµŒ‰tô wôòŽt÷Œû'%»¬ rœãâá½ØË;8Ò?2ã^6
@@ -3218,10 +3200,10 @@ TJ%Hàü§÷÷\ØÙ˜YF{(e!ñäöªÄÒŠŠ¢g׵Ι´ÆsG,Ýé^¶‰ƒºmD¼©©ïßœ›ˆÈJô`PÅ›ƒ6´ßL‰½”)
NJ¼Húœx·ô¯Hq7ÌŠwcK‹1Bˆ5³»ßî¿7…h·V¨ÿ9!6²Û¶ƒŠx­ElŸ">ë2R â¹ñ ™D_wô_¿úý!.×Éu4;„Ë4Ž±·üG^,e7ô= æX¶þ»8H ì¼b¬Ï4é%ëÇÙuv=Lݯô0¨5¯di4ÚóvvÆm¦&S«Õfdêìzþþ¸è
endstream
endobj
-723 0 obj
-<< /Type /FontDescriptor /FontName /JXVJCI+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 725 0 R /CIDSet 724 0 R >>
+722 0 obj
+<< /Type /FontDescriptor /FontName /JXVJCI+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 724 0 R /CIDSet 723 0 R >>
endobj
-726 0 obj
+725 0 obj
<< /Filter /FlateDecode /Length 788 >>
stream
xÚ…•[kã0…ßý+´…öÁlÉRSBÀqlHÙ^HJé«k+YCbÛyÈ¿_Yg’,Ë–-´ôÓeæœÑXºùñ¶ñã²ù2¾¸çlmúæØÆOžóÖ»¹Y6Åñ`êáŘҔçÙþ‘½uM±1»MVËU] wvñª.öÇÒœWý{ÑÂìªúºdÌÃnßͧÿôùñ”¬üŸÏëæ×÷×fwÜçÏÇmïÕ°·Ëÿ³’ÙiöÝ4s>L×WMýÈ‚{ιHë2i£ÉÞ›P69KßVuÙ‘Zö5j÷‚•U1¹¿ÅÁVkܼ9õƒ9¬êmãÍflb3WýÐœî;oòÚ•¦«ê»ýN¤]´9¶íÞŒ‚÷æsVš­mëô’ ›ŒX•v¶Nß–âºéýÔ: ¹hJÓ·yaº¼ÞofËÀçl–ÙŸ¹gêò¯yŽ]_[ ]pþwªÎSů¼ ˆsÌ%Ž( 1‚戤£()GzÒ %(FB>E„|"-…3Å> Ê°$ÌE èTDÐ)@Ð) EDÈ
@@ -3230,22 +3212,22 @@ xÚ…•[kã0…ßý+´…öÁlÉRSBÀqlHÙ^HJé«k+YCbÛyÈ¿_Yg’,Ë–-´ôÓeæœÑXºùñ¶ñã²ù2¾¸çlmúæØÆO
Jà2…“ S7à8©Ô© Ô?}
endstream
endobj
-227 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /JXVJCI+LMRoman10-Regular /DescendantFonts [ 727 0 R ] /ToUnicode 726 0 R >>
+223 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /JXVJCI+LMRoman10-Regular /DescendantFonts [ 726 0 R ] /ToUnicode 725 0 R >>
endobj
-727 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /JXVJCI+LMRoman10-Regular /FontDescriptor 723 0 R /W 722 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+726 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /JXVJCI+LMRoman10-Regular /FontDescriptor 722 0 R /W 721 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-728 0 obj
+727 0 obj
[ 27 [ 850 547 ] 34 [ 800 625 575 ] 38 [ 575 575 ] 42 [ 813 500 ] 46 [ 862 625 ] 49 [ 738 513 563 ] 54 [ 707 344 563 563 ] 59 [ 563 ] 63 [ 625 ] 65 [ 419 313 ] 71 [ 676 313 ] 74 [ 1067 938 880 625 563 ] 80 [ 845 563 563 769 625 438 438 ] 88 [ 313 ] 90 [ 845 594 ] 96 [ 460 625 444 ] 100 [ 563 563 ] 104 [ 782 438 563 563 865 625 ] 112 [ 594 ] 114 [ 813 850 594 ] 118 [ 594 ] 121 [ 563 656 ] 125 [ 625 ] 168 [ 547 ] 251 [ 513 ] 277 [ 513 ] 319 [ 625 625 ] 502 [ 313 ] ]
endobj
-730 0 obj
+729 0 obj
<< /Filter /FlateDecode /Length 42 >>
stream
xÚc``°6.¾˜¸ï߆7v¥0€@ 00°€hF„2`
endstream
endobj
-731 0 obj
+730 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 6476 >>
stream
xÚÅy \SWúö܈ˆ–xsõÞà¾ãVwêŽ*î¸dße ‚ìBHröD@Ä
@@ -3268,10 +3250,10 @@ qla1É^5Ùy{òyR
H‘ß@— Îp/Ênæ×°M—§”ñ…^húr¹–ýÔBzý|;›HíAï›H¡k²Â6r·¯D ,‰ß¡¸?ôçŽÒÏ—ÐÓwàûÕh§[˜Tu\B˜<>oWY*‡iô’êÏågíÛ­)àºÄ×;‹òÌ-°b¹gå2ÄPYµê.Œ¥ñµXæ‘…“ÛÄ`Wt´¸Å5p¡iÉÑ;ä²ÞþõÑ9ÙuÓÚ#ç¶~>Kðè Üóßìc]—§ äñ_ ùŸžÄ|­‚µq?=Ž©ÿ÷8Æý?=Ž‘9ëà2ƒÅÐ_œŸ™TÆE„……×&—fð0jŠøÕ.j¯^øOíÕïþ«öªÌ¹Hà˜†ˆ†°˜¤„ŒL‹qÿú`õH\š_[j”ÿ4l9´þ;À&T«„PBµ®”1‰wwܸÑ|cÿòßI Õ¹\ºD¥ÉÒò!“×Ï^´BªÕj5Yr!Ë å®­83»iŠTmÈÑä²…’üÜ\’ô=þë9~²HÐ@*“£ÍÖ¸E×ß y,ÍÑfe«ÙtI†ZΗ´vó‚€;æ$ºIÓsÕù\¡$7';×À7=:sçÚE©Á`ÈÉ–cO§ÿz"Ê„ž*X×)Ì&Ù€F¸Á\ >·z[d°o@]@«qOyA§u ^¶z«4}·UÛ¥—¤å•ýéôã¬í{ ¬ýÐEÍ´>‡ÿƒcJ‰àYÛö•H¸%kB]í»#û;õ0fë³³õ}A~ñ{{sÎÉ’\Ca~¶¡0Ǿ§p±Oû>æ̃Ú
endstream
endobj
-729 0 obj
-<< /Type /FontDescriptor /FontName /CXYYVI+LMRoman12-Bold /Flags 4 /FontBBox [ -476 -289 1577 1137 ] /Ascent 1137 /CapHeight 686 /Descent -289 /ItalicAngle 0 /StemV 104 /XHeight 444 /FontFile3 731 0 R /CIDSet 730 0 R >>
+728 0 obj
+<< /Type /FontDescriptor /FontName /CXYYVI+LMRoman12-Bold /Flags 4 /FontBBox [ -476 -289 1577 1137 ] /Ascent 1137 /CapHeight 686 /Descent -289 /ItalicAngle 0 /StemV 104 /XHeight 444 /FontFile3 730 0 R /CIDSet 729 0 R >>
endobj
-732 0 obj
+731 0 obj
<< /Filter /FlateDecode /Length 644 >>
stream
xÚ}”[‹ê0…ßû+r„™‡Ž½&ã ‚—
@@ -3280,22 +3262,22 @@ g.¨ 3ÚDOÁ¦¥­þû“dm8È¿î½³VvÒ=úõ±ñç²Ù+?~
Dèn’Vˆ¡1Ò
endstream
endobj
-226 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /CXYYVI+LMRoman12-Bold /DescendantFonts [ 733 0 R ] /ToUnicode 732 0 R >>
+222 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /CXYYVI+LMRoman12-Bold /DescendantFonts [ 732 0 R ] /ToUnicode 731 0 R >>
endobj
-733 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /CXYYVI+LMRoman12-Bold /FontDescriptor 729 0 R /W 728 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+732 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /CXYYVI+LMRoman12-Bold /FontDescriptor 728 0 R /W 727 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-734 0 obj
+733 0 obj
[ 66 [ 245 ] 77 [ 531 ] 81 [ 514 ] 84 [ 531 ] 105 [ 371 ] ]
endobj
-736 0 obj
+735 0 obj
<< /Filter /FlateDecode /Length 17 >>
stream
xÚc`€
endstream
endobj
-737 0 obj
+736 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 764 >>
stream
xÚmRkHQ¾ã®NÑÌmµZ›½‰VfûÀ,ìaàc·²Õ6Ý !
@@ -3304,31 +3286,31 @@ J‘j¨íB.Ô¨+S- ¥%—§E…h/ºŠ€(Ð~¥UvFÀ˜ÈšLOéÁúlÙ¹iÖIê¬ä}¢¨ˆÌûUÐÒQâuöÅ5²;
­KŠóWV¸Wv^wï¥Þ4ºÚÅZ¨¹ÔüÑy‰ùƒbÑÎX4=ÓÝMQ#§»c±Îh´3z6F¥ÿçE:’
endstream
endobj
-735 0 obj
-<< /Type /FontDescriptor /FontName /BLRUUF+LMSans9-Regular /Flags 4 /FontBBox [ -433 -313 1466 1155 ] /Ascent 1155 /CapHeight 694 /Descent -313 /ItalicAngle 0 /StemV 95 /XHeight 444 /FontFile3 737 0 R /CIDSet 736 0 R >>
+734 0 obj
+<< /Type /FontDescriptor /FontName /BLRUUF+LMSans9-Regular /Flags 4 /FontBBox [ -433 -313 1466 1155 ] /Ascent 1155 /CapHeight 694 /Descent -313 /ItalicAngle 0 /StemV 95 /XHeight 444 /FontFile3 736 0 R /CIDSet 735 0 R >>
endobj
-738 0 obj
+737 0 obj
<< /Filter /FlateDecode /Length 382 >>
stream
xÚ}R]kÂ0}ϯ¸{ô¡6uº¡”Âü‚‚_X{­ÉÕÚ¤¤íƒÿ~Ij†[!¥'÷Ü“sOÚyÙ%ÞW'ô^ûöXªZ3ôfë´ Î\±:GYm9ò¶ZN`§K°‚î,žÇRT=CŽ%ËjŽ-ë9iŠ!{tøåMWûãqé­ÖI*˱·ÇK¥Ú£¶é ªÌÿå)Âó"8‘OÔ¥PrAŸRj6’ÏTnÇ+‰³~kú,$×7Ÿp²®I0
endstream
endobj
-225 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /BLRUUF+LMSans9-Regular /DescendantFonts [ 739 0 R ] /ToUnicode 738 0 R >>
+221 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /BLRUUF+LMSans9-Regular /DescendantFonts [ 738 0 R ] /ToUnicode 737 0 R >>
endobj
-739 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /BLRUUF+LMSans9-Regular /FontDescriptor 735 0 R /W 734 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+738 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /BLRUUF+LMSans9-Regular /FontDescriptor 734 0 R /W 733 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-740 0 obj
+739 0 obj
[ 28 [ 514 ] 34 [ 728 571 ] 43 [ 457 286 286 ] 47 [ 571 ] 49 [ 699 457 ] 55 [ 314 ] 58 [ 807 514 ] 63 [ 571 343 ] 66 [ 286 ] 71 [ 642 286 ] 75 [ 856 ] 77 [ 571 ] 81 [ 514 ] 83 [ 699 571 400 400 ] 88 [ 286 ] 90 [ 799 542 ] 96 [ 402 ] 98 [ 405 ] 104 [ 742 400 ] 109 [ 571 ] 112 [ 542 ] 115 [ 771 542 ] 118 [ 542 ] 125 [ 571 ] 168 [ 514 ] 251 [ 457 ] 277 [ 457 ] 502 [ 286 ] 575 [ 571 ] ]
endobj
-742 0 obj
+741 0 obj
<< /Filter /FlateDecode /Length 41 >>
stream
xÚc``à0M4\8%nÂ#³X@ Xp&ƒ
endstream
endobj
-743 0 obj
+742 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 4412 >>
stream
xڽX X纞
@@ -3349,32 +3331,32 @@ VOô| yâ=.j´XÅw¡Xþlo{z:
ì;lå……EÅžÿ7®qª
endstream
endobj
-741 0 obj
-<< /Type /FontDescriptor /FontName /IUSWHX+LMRoman9-Regular /Flags 4 /FontBBox [ -443 -292 1454 1128 ] /Ascent 1128 /CapHeight 683 /Descent -292 /ItalicAngle 0 /StemV 95 /XHeight 431 /FontFile3 743 0 R /CIDSet 742 0 R >>
+740 0 obj
+<< /Type /FontDescriptor /FontName /IUSWHX+LMRoman9-Regular /Flags 4 /FontBBox [ -443 -292 1454 1128 ] /Ascent 1128 /CapHeight 683 /Descent -292 /ItalicAngle 0 /StemV 95 /XHeight 431 /FontFile3 742 0 R /CIDSet 741 0 R >>
endobj
-744 0 obj
+743 0 obj
<< /Filter /FlateDecode /Length 558 >>
stream
xÚ}”[oâ0…ßó+¼Hô!Å IÜV‰Ñ"m/v·¯!ØHĉryà߯íãP©Z Ä—™9sf°}{ßù YÈŸÞs¶¥¶ê›œüåKV{£ÑªÊû’T÷J$IÑö‰½7U¾£Ž—›ÕFÝNÞ¨üÜK²þôL§B}¦˜>l¼§ós÷ûû‡ÿãe[•™zô·têÏYãsSµ/º³Îþ"ÓQv#ʬÌ/jÚ¢RO,¸çœëk%—Ui&l½‰sÉ&ƒïc¡d㬲ƒ1î!“EÞ9²Ÿy©WeŠw—¶£r£Ž•7›±‰î\´]s±®ï¼É[#©)Ô‰oxÔ9»¾®Ïdü0îÍçLÒQKë½f%±‰_êhÑ]níá³f©‰…–Î+ImåÔdêDÞL/ÏÙ,Õ¯¹GJ~‰sTŽ@0|Â!”ÿÉ#,µçI07†–¢4EÌÑ3h
BÝtZYÒ-¥ÈŒ,MhÆ tH PZ S€\?GNóÁRÄÑorš hFð= æÈiº:¸NÖ–bøLRf9(²$Åè/qB÷ýB§‰‰bl7FwJ0ƒÀvÌ °Ý*16¨³1Gp-°AáT°Aá\Ùp®Á§€OáfO®{[ ç3¦ðº¶± ÀÄk«¤F)ä…î—Ñ8iöd™Ciî×õä}Óè `/¡=åæ|Š®÷´®jSeßö‚6†ÞRï/¸³Pî
endstream
endobj
-224 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /IUSWHX+LMRoman9-Regular /DescendantFonts [ 745 0 R ] /ToUnicode 744 0 R >>
+220 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /IUSWHX+LMRoman9-Regular /DescendantFonts [ 744 0 R ] /ToUnicode 743 0 R >>
endobj
-745 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /IUSWHX+LMRoman9-Regular /FontDescriptor 741 0 R /W 740 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+744 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /IUSWHX+LMRoman9-Regular /FontDescriptor 740 0 R /W 739 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-746 0 obj
+745 0 obj
[ 75 [ 986 ] 95 [ 887 ] 98 [ 467 ] 109 [ 657 ] 251 [ 543 ] ]
endobj
-748 0 obj
+747 0 obj
<< /Filter /FlateDecode /Length 20 >>
stream
xÚc`€Ft
endstream
endobj
-749 0 obj
+748 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 1088 >>
stream
xÚ…TmLSW¾J/w•Q*Ò‹÷˜ŸÛhAŒ]@EatåcÀ&vFRè¥t”ÞÚ{k%J„AÕriùP œŽ­H™cKƒh4ML–ýÂÄlf¸es&îã‡ó\9ĬY¶%Kö&ç=ç¼Ïóæä<oòà˜L†á8®ª2”ë‹ßyE_RÁ5m¹™{8«)I@JIZJ䵸DGIL´”,C)dôMR¶âA×Òä‡Ódö˜µ†ŸZÉg_„=dFø$;H®‹úÈõ…á˜
@@ -3385,10 +3367,10 @@ W-`gµlƒÑZ¸zPÅV'Ï:x`vpN;¿Yª,<pqŽFÞ¬•5ò¬ 8m&Ö„½]Y
yäŸ{{`,$(×u^F¹fHJU}l½ÔÄ·µZ9z’_®…Ù_ÇŒôM O©ûH”(rCØ°m?°'’Ê`ÍØàœÖUYµdœH&Ãr$ø»}Þ._W_Ÿwø.IÎ÷z¯õûú»Ït#_øa­èT
endstream
endobj
-747 0 obj
-<< /Type /FontDescriptor /FontName /TZPLIV+LMRoman9-Bold /Flags 4 /FontBBox [ -501 -299 1649 1136 ] /Ascent 1136 /CapHeight 686 /Descent -299 /ItalicAngle 0 /StemV 110 /XHeight 444 /FontFile3 749 0 R /CIDSet 748 0 R >>
+746 0 obj
+<< /Type /FontDescriptor /FontName /TZPLIV+LMRoman9-Bold /Flags 4 /FontBBox [ -501 -299 1649 1136 ] /Ascent 1136 /CapHeight 686 /Descent -299 /ItalicAngle 0 /StemV 110 /XHeight 444 /FontFile3 748 0 R /CIDSet 747 0 R >>
endobj
-750 0 obj
+749 0 obj
<< /Filter /FlateDecode /Length 381 >>
stream
xÚ}R]‹‚@}Ÿ_q÷!¨s²­¥aû¡/*bÙ7›¹¶:#£>ôïwfÌ‚EVP<žs®ç\í¼NÞ'WWô†}
@@ -3396,23 +3378,23 @@ G,T¥z‹mœ“Ng©X•¡,wˆyÃS8hÅNXBw-#)ÊžG’¥ÇFÕ.šãMȗľºgüòÎ߇Mtñ6Û£Êb9ñæ*åµ–³(S
Ü€ êB(9…AŸRj¬$_¨Ì+ˆÿ~7’ëGB¸Ú¼d
endstream
endobj
-223 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /TZPLIV+LMRoman9-Bold /DescendantFonts [ 751 0 R ] /ToUnicode 750 0 R >>
+219 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /TZPLIV+LMRoman9-Bold /DescendantFonts [ 750 0 R ] /ToUnicode 749 0 R >>
endobj
-751 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /TZPLIV+LMRoman9-Bold /FontDescriptor 747 0 R /W 746 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+750 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /TZPLIV+LMRoman9-Bold /FontDescriptor 746 0 R /W 745 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-752 0 obj
+751 0 obj
[ 28 [ 515 ] 33 [ 515 ] 47 [ 515 ] 55 [ 515 ] 59 [ 515 ] 66 [ 515 ] 77 [ 515 ] 81 [ 515 ] 84 [ 515 ] 88 [ 515 ] 96 [ 515 ] 105 [ 515 ] 114 [ 515 ] 118 [ 515 ] ]
endobj
-754 0 obj
+753 0 obj
<< /Filter /FlateDecode /Length 23 >>
stream
xÚc``àp`dP`ñhhpP
D)
endstream
endobj
-755 0 obj
+754 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 1845 >>
stream
xÚuV}TWŸ!É@5ÊšiZ©3£K- ˆ_EÛAE¥ž%1„L˜BD<u¡¼
@@ -3427,69 +3409,70 @@ oŒRWƒÉ§Ç<ï§|â Ơ‡ùP"‚{än£ËPÂq%e}åGÜ®þ©”Â(ï¼WÈ—N˜)QuoY—U–O&¿˜Pn^
g÷žÇ4úÊ8Ô‚û¼ÁE>*Ó`¨ÜzŠK@E%µ¡1«Î¬xŒºhàÒà@á,ý+ñ&p–³•Š_(½›ÈN(/è?=ûuÿ0Ý•ÂLïªDB½0O>`ôåRì ±ñ’F¢¾o§§n0Äkmè(V”Ô×®·Ò–ä× ÖF"ò’3Dg¿Ï·Ñïûñö^à¢?@·%ºÖî§âxSÛEÝþV÷ûÍý!6¶ËÎúMÈ:GÓž·`xý¼#qõNfª‚Ó4¼ áe'¯Ö_%#…ÚÁÀõl|ZQ“åñ»žúýuýJØæœeŠq?ôHÒR@8(«f©½u\Þoí!d¦­¹¹u8iwîì6sÕ;ÌÚÁí£YpoÊÛši¸PÐHú&N¥gúŸ ¿Òy¾«[â”Èj;„¤ørg³ RsJc¤Oét~šwú@û[“Ífk¶9ìR©ÛéúýMíÒÿ®ÌÞÀ
endstream
endobj
-753 0 obj
-<< /Type /FontDescriptor /FontName /CKBVSC+LMMono12-Regular /Flags 4 /FontBBox [ -444 -311 715 1019 ] /Ascent 1019 /CapHeight 611 /Descent -311 /ItalicAngle 0 /StemV 172 /XHeight 431 /FontFile3 755 0 R /CIDSet 754 0 R >>
+752 0 obj
+<< /Type /FontDescriptor /FontName /CKBVSC+LMMono12-Regular /Flags 4 /FontBBox [ -444 -311 715 1019 ] /Ascent 1019 /CapHeight 611 /Descent -311 /ItalicAngle 0 /StemV 172 /XHeight 431 /FontFile3 754 0 R /CIDSet 753 0 R >>
endobj
-756 0 obj
+755 0 obj
<< /Filter /FlateDecode /Length 428 >>
stream
xÚ}’]Oƒ0†ïû+êŽ`Dpf!qÌ%D§f,Æ[ÖžÍ&£%.öïm{†&F%ðpÞóõÒÉÅkÜ ½ƒàzÊè:=A±®[2™,5Pý3€
endstream
endobj
-222 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /CKBVSC+LMMono12-Regular /DescendantFonts [ 757 0 R ] /ToUnicode 756 0 R >>
+218 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /CKBVSC+LMMono12-Regular /DescendantFonts [ 756 0 R ] /ToUnicode 755 0 R >>
endobj
-757 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /CKBVSC+LMMono12-Regular /FontDescriptor 753 0 R /W 752 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+756 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /CKBVSC+LMMono12-Regular /FontDescriptor 752 0 R /W 751 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-758 0 obj
-[ 28 [ 490 ] 54 [ 639 ] 57 [ 490 ] 59 [ 490 ] 66 [ 272 ] 75 [ 816 ] 77 [ 544 ] 83 [ 666 ] 88 [ 272 ] 105 [ 381 490 490 ] 118 [ 517 ] 121 [ 490 ] 187 [ 489 ] ]
+757 0 obj
+[ 28 [ 490 ] 54 [ 639 ] 57 [ 490 ] 59 [ 490 ] 66 [ 272 ] 77 [ 544 ] 81 [ 490 490 666 ] 88 [ 272 ] 105 [ 381 ] 107 [ 490 ] 118 [ 517 ] 121 [ 490 ] 187 [ 489 ] 575 [ 544 ] ]
endobj
-760 0 obj
-<< /Filter /FlateDecode /Length 27 >>
+759 0 obj
+<< /Filter /FlateDecode /Length 31 >>
stream
xÚc``à```
-Ph`(`r`€
+P`)h``r`€
endstream
endobj
-761 0 obj
-<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 2199 >>
+760 0 obj
+<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 2256 >>
stream
-xÚ­V{PSW¿’+¦6×´5Wï½v¬ë£<|?WT*"*k©/ p¹y
-NŒH2!çÈ?D¨h˜H.RþžÛ)¡ááÓ¢µ¹ºLµFOM ŸúÉà:›Š
-¥bS7fiMLV&•J§S±¡Ô²P*^k¤™Ôx-M¥©4©Ù”6ƒJR­¦ ŒJÇPjÖËL¥’4™ eÒê²(á«Se«RU:e ÓU:J¯QQ1ɉIÔb-­§â27ªhFE…„P£RQ½>wNX˜Þ ÕêÔa‚–ýF‰ ´ Y¼<>)$nIô¢øÄE¡ú|=•¡ÕQé*}jf6ú_—|+ˆ×êrR³#Óµiª%é*ZŸ©/@„1
-™ÌFæ"QÈRd’ˆ¬F2‘MHbD
-ÓB0…1>Ö d;‹VDÔ®¼¤ :.^'¾!É’ô¡-ü?e¥ì#ÜánºÏ$?ôLëéõbû8ú±â‚!M`lf8WKÀh´ t¬?JЬs­ÇgÇ%ÇÒns£¯¾ÞwL ŠÈ/O7tà'/©&“Q~myÄÌùJlÁ¼Ÿt__ýªã´›ÀZÖTîWÇ=Ý®{$?ó¬bBÔ¦ )ií§á‡pþžv!+,<38EpÔ0É ÇzG<äú¹uŠ<Ȉšé}’›;¬ä€Í(·F&Zâð=­x[°³$›ƒN³ïi'¡£í¯Þ4“ôÂ:ƒd¦uS1VK:v à{8–]Åq‘2ÁÁrŒIO_ äÒà\;Žûuƒ*³­Û¾k@-¦a]8ša·Fýê®ñ.hÁ[î{#ÉšÐèòêÃät «àË$°Œ&–ñ©˜|þ¯èðÈ›;‹nÀè ÓÚ©îÄF,à´ÜDEƒ¹EóYzV‘™hÌÑìUá“?™ŸÐ–Q]Bb³ÐéÊ•m:g)±vËZõgÊÅý ð]8ôŹÛM[/-ßOøW¦ãñ[»€´V—¸=ÊúõÕ."ûT¨Á¼výN³íHÖ²ãè)P…WV{%‰M_`-+µZ”æêâ:gC•—àçóŠV˜KÐù9V#>¼ll
-d¯‡Ë!Ò7Î2ìÁ«C‚ƒÏu µ‚„qèSТ?@¥×ìÌÄg¥.OßLÞ1'{ãð‰ªY&Yñ³{ñÂuçV‚ï-—@%Ûì~’E—ƒ¯HþrãÂåË®Õñ_ü?)ÊÆÿ'xì×ð{¸ÿõÙÿ«¬Q€ð¥öå4úîɧpæÓ@r¥Šgûxœà|[N-¿)§û/­÷Ý÷6¿a)ü#
-‡üýîK2ôýTÀKø™O¦7Õ/3
+xÚuV Tgž’‰mL5cº5ƒ3Cõøâ¡V¬µ+
+V*Dk­¢ y 0< )Ä "h ˜ ƒ"(h}€T\kik[+­®[í®li·ÇÓ³ÿÔáìîÐîº{ÎîþgÎ?sþÿÞû¹ßwï¹$4Ó“7nH]7/)9M—ŸI/X‘¦Ò˜ò2õ—«Ùpöe %Ø0„!`‰–²T(/ž‘†Ž¿Îu†‰ôO9Ñ 4¿0±_™ÊÞ”¾ÌMZ+9qÐ/}‘„ d:B ß# ‚ɹ@ùÿ`FFG¿¯+(Ñçh´Fjatô¢ùûR*.’JÌÜ‘«3rs¨L:›JŒ¤’#©™?Í¡fëh*K¥ÍÌSS:5•®ÚD™ *½Òèu¦ÃœH*]›c Ì:}.Å¿õª<U¦A•M™èl•ž2jUT†õéÔjm¤’rv¨hƒŠŠˆ (ƒJEiƂף¢Œ&M¤N¯‰Ró6†¨¼_ Q~«ßNIHZÿfÊú7#ÅFJ­ÓSÙ*cfNž!ò¿~òÙAŠNŸŸ™·2[—¥Z“­¢9Æ„_aH ²Y†Ä!ÉH*’†¬G6!9H.R„” }!±B>üšŠLHl(R‹p‚u!±!MÂÂ]ÂШÐäÐfÑd#¦ÄÐLîï²*æý"¸ÏÝvï®Y~ü ˜5<âÅŽ°ô#ÅeÓz4Í`³¨À@ãÑAл­‡8¦Ípm×&mH¤ÝŸ¿¥ÅJÊÈÓ¾¾Ö^üÜUÕrÊm­‰]²\‰­xãOúkŸœíísXû–º£špÏë.É-¹¨˜·sûæ¬î>ø\~¨ÛAȪ/L<ö5L÷™ÞiØQ6CQ ¢ñ }Düå>«š êk<a¦Åÿ#Ðw=v†dòÑW퇺IèxˆŽ6ì\Bza³I¼Äº3‚XÄŽg8U g2¹p)ãц5˜°ï!›—)˜Yì{¨Ô[l5 ÜFpƒã ›£QµÝ÷ œïhÇÛï»dÌh|Mà òèFÁU‹a5;Y$ã2=pÃ¥?x Ã#ö—Ý€ñ7@¿µ_ÓM[ÁêعŠVK»öìÜ2 áË×Vá ÞJXžÖ¥nØMb®(/+¡³•©]zg±õý­šw”«GÓà ðùnµU^}û(Øô.XŒ§Tw imØíö([ö·4¸ˆ¼ó½ ÿöÓÏnm's‘½=çA=^Wìu$¶x…µºÊZ¡´4”7;[ë½·œ Q”€¬Ò‚.ηá‹À¾Vpª%H2]¯xfIˆŒ?§X»%j^\ÿ§£çd€py‚ÏñûP^%eã(`X C÷BtLþp,ö:Ö÷¼È ‰Õõ=$ŠbW¸°
+~|pÏf’kC3*@"A£Žö>ÀàCÀ~œÄ^ZÏþ¨è0¸ º"SA¡×èpûý„l6ÏO's-‡È0Ü1ŒÝd[ùÐïêAÇ^&¡A»ñÑCoÙŸƒÏU½f¶‘{Ÿˆ±±_?sVò€þg€Až8fØ$ƒ®-gI˜‚þtãòG¹6¥\ùÿ2”Y½ìj³ cvŒÙmp§*æ<á$œt~8'ç¦ýeÃçƾ‡r"ö B ’ ·ï鶫puFs?MœÝ{õ´ò$¸vô,ñAû™æ.¼çtIv<º$©•¼þØ^æc^~ºB6òE&]TÃË—½†ú@­™(0¼«ž‰Ó¨ï\"Ç[QMMù""ap tâß{”ùø,öÃa¾ffÜ9÷.y,d![¥›ûà îÛg5Óþ5sO~Ç=`÷?1¬‚¿E᤿Þù‘Œ|1pbn Á‘°íתÃÀ‰¶ÿÂ÷˜à›1!LêW=m6êóÛŠ}A¯§qM|Æ” L2ËŸ ›¼0Ì‹ýïÀ)Š+¦t4žÎÌN
+HÐU×¥ô.!°¦Ò"+­:¡¸|ªÿz€„+Ùå¢Oƒçkݸ ýgœN^Šéð¦â~Õךâ~V¼w3žºŠ~MM꒬ɢœ{ ®{ÛsÃpÿæÂÅ!†ì¾åø~H{Hñˆ­àÅRœT¬Ås[¡ ˜¬øù\y|Õ|•ø´åãà'‡Œ‹Ýäá4ðF‚RÆE^)bãÌr¨» ñbSØep¡âˆ¹n×AbcÀØhrœÓ¨ßéuù%MW[‚ÊC¶¦]‹ÅVAh stƒÛ>躤l¬n)*©´XlJº+uƒRãÏi×$Î
+‹Ë‚ﲕ•›T7ï&
+}^‹ß6ÝŽl&‹±B’_¶®´@Yî,kv¹\ÎF¢+p¼½›gÛ³Á’š®¬¨+õ´p¹ø°—,CƒÊnÃq]W¡ÄÖ貸ðfgÓ!R6ÛÚÃJz¿+‚«Ìÿj%ÿ´’Û~²(þï–‘€Æd¬Z±´êü
endstream
endobj
-759 0 obj
-<< /Type /FontDescriptor /FontName /VDLIBI+LMRoman12-Regular /Flags 4 /FontBBox [ -422 -280 1394 1127 ] /Ascent 1127 /CapHeight 683 /Descent -280 /ItalicAngle 0 /StemV 91 /XHeight 431 /FontFile3 761 0 R /CIDSet 760 0 R >>
+758 0 obj
+<< /Type /FontDescriptor /FontName /MVUQSB+LMRoman12-Regular /Flags 4 /FontBBox [ -422 -280 1394 1127 ] /Ascent 1127 /CapHeight 683 /Descent -280 /ItalicAngle 0 /StemV 91 /XHeight 431 /FontFile3 760 0 R /CIDSet 759 0 R >>
endobj
-762 0 obj
-<< /Filter /FlateDecode /Length 440 >>
+761 0 obj
+<< /Filter /FlateDecode /Length 449 >>
stream
-xÚ…’Mkã0†ïþ³‡@zp-Û‰½-ÁÐÄ-úEJ¯Ž4I±ddû¿’ÆnaÙ°?žwf^föë}>}À0½e°ÅN†c¸y©Û`6+5Tý+¢@1E»{x7šï°‡ù¦*+%û+®?'Õ¿Ek<Iõ#q}`¾ÇÏð£|®ÖUøü²ÕM­â$Üâi8×&d.m/û³•ÿG 6 ×Âà } é¤V÷ß2Æì‡G%6ºq‡ì‚h4
-Ñdý(•0£[88ïAœ€¼ÉÿóÆNË%ï.]M¥Ž:X­ ²e×›‹÷}DoF ‘êók&­h7´í!`AQ€À£­mçôZ7‘›@%lTö—«£øIÚ_Z„ÄsL–¹ص5GS«+;VÀêÉþŠ
+xÚ…“Án£0†ï<…÷)=PŒI ­"¤%)Ҧ톴Ú+±'YKÁFyûµ=¡•V-ˆùgæ÷Ø̾½Õáw¡&÷”ì ×£á®·MÌfÍÇÔð @LÑþ‰¼ÍkÈ|]m*%‡;+®?&Õ¿Eœ¤ú’¸>d¾‡_áöãýg]„?¶;Ý6*fáNã¹1!ui{9œ­ü?JbÃäV˜øB`z©Õ‰ï)¥öókݺEöAt5J¢ÉúQ*a®nÉÁybF„äÕü“·vZ.¹¾ô´•:ê`µ"‘í,ûÁ\¼ï» z5ŒT'2¿eÒŠê±ëÎà ä9p´µíœ^šHä&P •Ãåæ(¾’ö—ó£e®ô]ÃÁ4êÁÊŽædUÚ+@‰¿â³GD+˜^ãt
+ñßq…âµ-Di玒ÔÓ"Ezô”,
+Tfž éiƒôìi#•H¨L°Ã2ñ´¤Hžæ¥Ø/Ã~)öK˜§ eØ/»:Ã*…S2{g,)}¬,r\¹_©’ÛñÏMá£1vGü±ðSwó–
+>ON§;—åoä¦?ÀÑküAª ‘
endstream
endobj
-221 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /VDLIBI+LMRoman12-Regular /DescendantFonts [ 763 0 R ] /ToUnicode 762 0 R >>
+217 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /MVUQSB+LMRoman12-Regular /DescendantFonts [ 762 0 R ] /ToUnicode 761 0 R >>
endobj
-763 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /VDLIBI+LMRoman12-Regular /FontDescriptor 759 0 R /W 758 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+762 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /MVUQSB+LMRoman12-Regular /FontDescriptor 758 0 R /W 757 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-764 0 obj
+763 0 obj
[ 66 [ 223 ] 77 [ 484 ] 81 [ 470 ] 84 [ 484 ] 105 [ 340 ] ]
endobj
-766 0 obj
+765 0 obj
<< /Filter /FlateDecode /Length 17 >>
stream
xÚc`€
endstream
endobj
-767 0 obj
+766 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 759 >>
stream
xÚuR]HQ¾×uM'×´Ý$uö&JîìfšôâØZù³¦n¡c;îŽN;23»«E˜ýàƒÙöPaPQ½(ê*YØßFB>ô¢XD܉1h†è%è»ðÝû{¾{¸‡A
@@ -3498,10 +3481,10 @@ xÚuR]HQ¾×uM'×´Ý$uö&JîìfšôâØZù³¦n¡c;îŽN;23»«E˜ýàƒÙöPaPQ½(ê*YØßFB>ô¢
Û'5;¶îÕ¬{ßk—-MW<sÏžŒŒ>¢ÒyÎPsÈ-úT‚2LDf_Le†qgìF,™ªñ .rÍ
endstream
endobj
-765 0 obj
-<< /Type /FontDescriptor /FontName /BTPEXR+LMSans17-Regular /Flags 4 /FontBBox [ -395 -305 1355 1159 ] /Ascent 1159 /CapHeight 694 /Descent -305 /ItalicAngle 0 /StemV 87 /XHeight 431 /FontFile3 767 0 R /CIDSet 766 0 R >>
+764 0 obj
+<< /Type /FontDescriptor /FontName /BTPEXR+LMSans17-Regular /Flags 4 /FontBBox [ -395 -305 1355 1159 ] /Ascent 1159 /CapHeight 694 /Descent -305 /ItalicAngle 0 /StemV 87 /XHeight 431 /FontFile3 766 0 R /CIDSet 765 0 R >>
endobj
-768 0 obj
+767 0 obj
<< /Filter /FlateDecode /Length 383 >>
stream
xÚ}R]kÂ0}ϯ¸{ô¡6u:™”Âü‚ÂüÀ–ákMn]À&%mü÷KR«0æ
@@ -3509,22 +3492,22 @@ xÚ}R]kÂ0}ϯ¸{ô¡6u:™”Âü‚ÂüÀ–ákMn]À&%mü÷KR«0æ
Oªàd¾PWBÉCJ©ÙXI¾P…°"þÍ%øï\H®oVád“`\°ú†Ü›&*Ûœ\«‹X抄!øædQÕúê\ˆ¿Óµgè?ñh8IS–´~€’(Ž¹‘6m³Á·ãÇÜTE}}–ã'½–#‡ƒÖ0S«2c¨3yFšháÚ<AÉÕiÛuÊ[hÝ礫°ïL[ñÈèPúö9´lÑÊ¡IТu‹ÆM©C¦Á¡qÔÊ;=ëĆzœ5Z›©]òn4;”x¿œR•¶Ë-w«ÝfÑnM~
endstream
endobj
-220 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /BTPEXR+LMSans17-Regular /DescendantFonts [ 769 0 R ] /ToUnicode 768 0 R >>
+216 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /BTPEXR+LMSans17-Regular /DescendantFonts [ 768 0 R ] /ToUnicode 767 0 R >>
endobj
-769 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /BTPEXR+LMSans17-Regular /FontDescriptor 765 0 R /W 764 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+768 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /BTPEXR+LMSans17-Regular /FontDescriptor 764 0 R /W 763 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-770 0 obj
+769 0 obj
[ 28 [ 459 ] 50 [ 406 ] 66 [ 250 ] 71 [ 576 ] 77 [ 511 ] 81 [ 459 ] 98 [ 359 ] 104 [ 668 354 ] 115 [ 693 485 ] 502 [ 250 ] ]
endobj
-772 0 obj
+771 0 obj
<< /Filter /FlateDecode /Length 27 >>
stream
xÚc``à``P`Pdq`P8 Á@`
endstream
endobj
-773 0 obj
+772 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 1830 >>
stream
xÚuUkP×ÝEUm™8Ú(wÝM†ÆNmvhº™v‚k<<Ñıc ŒÐ[æ%@Z]-ÄÓBc&Pœ4&'㌧vÇž>ÆN§išdÒIjÏ4¾K×Óé*™ôG÷ÇÝ;ßýÎÜs¾{ö~("—#(ŠnÉË{UŸS´#/ÿ­Ú`ݵ'õ±Òc18›YÂSÂÓ@M [áIT ’Z&0r1¬–½§–?L¶*öþc]ñ$‚ ÑGóÛ
@@ -3541,23 +3524,23 @@ jq½èS”žßMÿ‚üõ›¹¢<D'ÃNÀ yÇðÑ»š?ÞÉ[ÆÇáñÇy‰~÷-(1üŠˆ5+ØZ¤ý-NaFG.åÀ¸±E0NŽ]
…Â!ŽëîœëU«c±N®;Ìq]]aõ¦-H]:
endstream
endobj
-771 0 obj
-<< /Type /FontDescriptor /FontName /LLXTJU+LMRoman17-Regular /Flags 4 /FontBBox [ -400 -286 1338 1125 ] /Ascent 1125 /CapHeight 683 /Descent -286 /ItalicAngle 0 /StemV 83 /XHeight 431 /FontFile3 773 0 R /CIDSet 772 0 R >>
+770 0 obj
+<< /Type /FontDescriptor /FontName /LLXTJU+LMRoman17-Regular /Flags 4 /FontBBox [ -400 -286 1338 1125 ] /Ascent 1125 /CapHeight 683 /Descent -286 /ItalicAngle 0 /StemV 83 /XHeight 431 /FontFile3 772 0 R /CIDSet 771 0 R >>
endobj
-774 0 obj
+773 0 obj
<< /Filter /FlateDecode /Length 425 >>
stream
xÚ…’Kkã0…÷þ·‹@ºp-åÙ”`˜qpI$™¡[GºÉbÉÈö"ÿ~®$»…ÒЀƒ?Ÿså£c nÞvñ/iïl±6­gÏE +#Úuó‚(Qöjý
Ú£§)´ö4 sóq {OÓI EБÅk÷&AóÄ×3¢ã‹4ìÀ'v›u_î£\ÑZKÍúÏëÛs½)' 2•›ò—?:ýIvôºŽþÁ°þ©
endstream
endobj
-219 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /LLXTJU+LMRoman17-Regular /DescendantFonts [ 775 0 R ] /ToUnicode 774 0 R >>
+215 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /LLXTJU+LMRoman17-Regular /DescendantFonts [ 774 0 R ] /ToUnicode 773 0 R >>
endobj
-775 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /LLXTJU+LMRoman17-Regular /FontDescriptor 771 0 R /W 770 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+774 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /LLXTJU+LMRoman17-Regular /FontDescriptor 770 0 R /W 769 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-777 0 obj
+776 0 obj
<< /Length1 1524 /Length2 7052 /Length3 0 /Filter /FlateDecode /Length 8075 >>
stream
xÚwT”]×6Ò©”R#Ò ÝÝ]CI0ÀP3 #1„tƒt—’
@@ -3589,10 +3572,10 @@ lN¶IúóŽÔ2º¥›ð*ʪŒŽ°)q»œ2DÀnŽWtÏx8Ó¸‘ºÂ©tç§ÙTªº[máˆ9Î=¹Y2›ñˈ¥rv»•M‚»_]
z ˨i¡ØBÁ|)h×CߤöAÀfh¹br@Ótq+ÞãöêÉPÿþâçš“éÒz}‹ðØ«Ôd•¡[ŸÞw¼D}KÏ]~ø*Ê× –þ#­Ž
endstream
endobj
-776 0 obj
-<< /Type /FontDescriptor /FontName /FJNSRO+CMMI10 /Flags 4 /FontBBox [ -32 -250 1048 750 ] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 72 /XHeight 431 /CharSet( /arrowhookleft /greater /k /less /n /pi /x) /FontFile 777 0 R >>
+775 0 obj
+<< /Type /FontDescriptor /FontName /FJNSRO+CMMI10 /Flags 4 /FontBBox [ -32 -250 1048 750 ] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 72 /XHeight 431 /CharSet( /arrowhookleft /greater /k /less /n /pi /x) /FontFile 776 0 R >>
endobj
-779 0 obj
+778 0 obj
<< /Length1 1407 /Length2 6115 /Length3 0 /Filter /FlateDecode /Length 7068 >>
stream
xÚtT”kÛ.Ý©€lr
@@ -3621,10 +3604,10 @@ q=4¾ãæ8EKhž×H:óaa¤(Š?³ÿã$OÔ3“‰¬Ë`Znï[‚«wѳ=ðÖÃொüÁˉä“ÌeÚ‰{Û…÷¶öÙ§“
-”˜‘¿<ãRë׿̫Oi_\Â|e3*Ñ3I(• k`y“±õ£PƸë‘ãÃWˆÅ¢÷>AÒ¸‘øx!¢‘ÜFß­ã;æ® ¬ŽŸ¯Ì“Ç!ËuöD#Bøx\nðÒÑ=xŸˆÁñÃ2BGâÒò™†g_^änŠ33x}`èK/;«"U 25ø¦éP&B:s/¶r*,ªRªO±1<êü…Æüû'Ä€âZ~"EåíúiB)8zôþñåíó*”0SÍ'¼´ÑG%ÎÄ:Nè~<½+h9ÇFNµ´ÆÕà-R·Y檲§Id ŸÀh–\Ibîfàå…FF—&¡1}ó¢§ÜdO¦Á5ß´ŽÃSNi®BÀoDÅãÉî‚e²EðqcÔZ*ð6àEŸd%=ÛYñeú)’¤1ÚæؾèXÈï†ãíVñŸÏaí’aç¿šEŒ­EÈ~×Øä8˵ã'BŒÏÔî¹|¹pÃ+D|Ž*Â|’x@Sùà:~×MzÔv]ô¨Û»ºO`˜_xà}>ЊQIÀ‡x{sᦟ?“˜xÛT´Q²gKݼÁ¾6æ+qd†«u¿U6Qýq÷BÜìÝWSY*é X§ˆ)Z31·=AYÁ§jåBnÝÃãðôïó?̆ïÙñ¥8ÓÜ/zÚ™ôüýöV~8kÑœÃ7QÅkœÛ:ª+ çÛ¡µÉ´.ýëÉaäžÿ^7Œí/Ú;È581/Þƒ‘øÝ׺–!ü” =ËB’pßò×X¡™T•‹°q7é†*KªÌêO_£3±ê*‡T[$bd¹F*z7F²„7µû_$¼+Þ»ã«a¿²hó$ËŠÌ"åÈÒ‡Yœx­ÒB)UØR¬žT g'ŸU”»6縠 IJivŸ6ylÍzWÚw²â]«qÒ×Ô<E'¦ò*¸x€õÉ©ïÉ )Ÿ¶üD:êAŠûøöh“ÛÓéÙ—¡Y|CHd.™Õ¦—h·–>YzaJDr*°(N€vb€žüpn‰O§úpçU¢fÞBðëÍý”bÏŠ«û#YFá’çw8 1Rá³>4Z°'@l»ÎÌ»ôÁ¯Ðœ:/ËôwM,VƒžŸtÝöY±´™z _-H/=å4îcU}m•`@BÐóõë%†nD8_3ÃʈÅ“ö§ÕdåZ ¦ßòüˆäŠƒ‡a³k)¹Ì!¿¤Áùïî÷<4"~ÀI Ì^ô]¾‚z{o}cÞàצx…1•6†bv¼D¾!d¡ÞwçyÝ¢ÍàIFõ§Vë'©}mzÒÄHgLåõ×ÇÒ’øŠZÉ´Ü7 WuÛÕ¯ZŠy:Ùré'S<¼]½’3ˆÚÿi
endstream
endobj
-778 0 obj
-<< /Type /FontDescriptor /FontName /YJUITE+CMMI5 /Flags 4 /FontBBox [ 37 -250 1349 750 ] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 90 /XHeight 431 /CharSet( /k) /FontFile 779 0 R >>
+777 0 obj
+<< /Type /FontDescriptor /FontName /YJUITE+CMMI5 /Flags 4 /FontBBox [ 37 -250 1349 750 ] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 90 /XHeight 431 /CharSet( /k) /FontFile 778 0 R >>
endobj
-781 0 obj
+780 0 obj
<< /Length1 1407 /Length2 6093 /Length3 0 /Filter /FlateDecode /Length 7053 >>
stream
xÚtT”kÛ.)8Ò5ÈCÇ ]Ò t—"0  1C "H#-% ‚t§„„”4"­(R’"Í?êÞßþ÷wÎZç¬Yë÷îçzîëzÁ¬z†Š¶h„…€
@@ -3657,10 +3640,10 @@ h²U$}'P:o~]Mæö*QŸß¤§Ï;È}åXÙ®9“Ù€QÉp¿›X7åN@{¥Ijúãp›$O y‚½pìzÑñ
}›I­!·Enb”ð)”÷Ë8¸~j ¿y@_·/búÜ‹€ò
endstream
endobj
-780 0 obj
-<< /Type /FontDescriptor /FontName /NAZTKW+CMMI7 /Flags 4 /FontBBox [ -1 -250 1171 750 ] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 81 /XHeight 431 /CharSet( /k) /FontFile 781 0 R >>
+779 0 obj
+<< /Type /FontDescriptor /FontName /NAZTKW+CMMI7 /Flags 4 /FontBBox [ -1 -250 1171 750 ] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 81 /XHeight 431 /CharSet( /k) /FontFile 780 0 R >>
endobj
-783 0 obj
+782 0 obj
<< /Length1 1518 /Length2 7335 /Length3 0 /Filter /FlateDecode /Length 8348 >>
stream
xÚtTÓoû7ÒHw ¤kŒÒÝ’LÇFŒƒAIAºAB@bHH
@@ -3690,10 +3673,10 @@ U¨ß U>×} ò,·–®öùô4"ˆ&ªƒ …½ÙˆÅáÊàã鸳VUèY ­¤:‹5
¥°À4”ûNÂCŸßÇ ¼4¿ïJ!h©®KúõÃɲþ·†X-¤GìL#Ëy °üAêva‘á§Sô,`ë¶üÁ€7åNÉTk&2xùÇàݲR0ëŒðû] ]S(E¸ÅY¬¾g“‘:9çaƒ[‚»¸áШ€…›•v±âlŒúÔ&ËŽÔðÛE¾“Üâ·ëvH쓉±
endstream
endobj
-782 0 obj
-<< /Type /FontDescriptor /FontName /NTKKEA+CMR10 /Flags 4 /FontBBox [ -40 -250 1009 750 ] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle 0 /StemV 69 /XHeight 431 /CharSet( /equal /one /parenleft /parenright /plus /slash /two /zero) /FontFile 783 0 R >>
+781 0 obj
+<< /Type /FontDescriptor /FontName /NTKKEA+CMR10 /Flags 4 /FontBBox [ -40 -250 1009 750 ] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle 0 /StemV 69 /XHeight 431 /CharSet( /equal /one /parenleft /parenright /plus /slash /two /zero) /FontFile 782 0 R >>
endobj
-785 0 obj
+784 0 obj
<< /Length1 1457 /Length2 6431 /Length3 0 /Filter /FlateDecode /Length 7408 >>
stream
xÚvTnû6%1VF)½”î”.©1 Øcä
@@ -3732,10 +3715,10 @@ Pè)m\Çž/kÌq'ý}®Dû(h¶.91V²•@ ;súÚ®â.弄ã¿
ò½¶O[ÌDÿ™Ííø›&$%úiëÒÖïÞ§)ãì§w{ŠÝYÚ6{ÃëÂK£²#¶•âûù%š·w»Ê'}cnÉóMÚ<²äʃ„¥žI« \¿1«ŒƒG²Ô G¸õur R…ñ’”h;ÂìÄ‹ò“Á©ÝŠôˆ~dÜ“sIèÏ»*áy'exp‹úÀ‡vÏ$Ç–÷ãþÆ°1ÈïH %à᫃ÚFU¡ÄáOî×È&¢Ôy¥[èXïØÀ]bK(Ú•:¸=x—ú³ß‡iÝïõ˜÷|8ÅÑGú‚Œ¡ºZ4#;ˆ›`%.•Yƒ#¯aé±é’f´¾Ÿ´¥ôc²B}ƒµ3ÁhÅ,ù燕õqU÷î=@³>‰Ö£®'6ß͈åJ,©ADoÛtn3Ó§’hœ€J aî•HÄͬ:Ò…¾bî ð¬ôË&kߤ ó#›aý7PéÒ{¡ÖO<^¯Òœ_ÿl‡h!ì:á¥è$gªç«õaŒhœè,¯tK˜3©Ík“ëNsµŒK@e8­*õïX@^xÄÜ
endstream
endobj
-784 0 obj
-<< /Type /FontDescriptor /FontName /JLMYRF+CMR7 /Flags 4 /FontBBox [ -27 -250 1122 750 ] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle 0 /StemV 79 /XHeight 431 /CharSet( /one /parenleft /parenright /plus /two) /FontFile 785 0 R >>
+783 0 obj
+<< /Type /FontDescriptor /FontName /JLMYRF+CMR7 /Flags 4 /FontBBox [ -27 -250 1122 750 ] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle 0 /StemV 79 /XHeight 431 /CharSet( /one /parenleft /parenright /plus /two) /FontFile 784 0 R >>
endobj
-787 0 obj
+786 0 obj
<< /Length1 1424 /Length2 6044 /Length3 0 /Filter /FlateDecode /Length 7012 >>
stream
xÚxT“ÛÒ6 M¤Wéé5é½÷ÞAj ’Ð{/Ò¤#(¤HGº€té
@@ -3762,10 +3745,10 @@ R”^D/z<÷Þsÿ­ï[Y+y÷Ì33ûÙóÌNVØYôøUÅ
}ï$YÁÜŠ‹}û¢1†ÚÂxß`6Iùí±Qࡪ›]ˆ¢¨¡ÌÜ\Q³´Ñ¢åÕb\ñ^)#ü£‚z!?‰*5†êòU}ÕÊv\átß?æ"nÊ-ûô˾g!ÅñÐÈD³±8‘ÎXÕó;[éêrewçɬ-rg›û¾c‘Ñ4ÿúŸX
endstream
endobj
-786 0 obj
-<< /Type /FontDescriptor /FontName /KAYNOZ+CMSY10 /Flags 4 /FontBBox [ -29 -960 1116 775 ] /Ascent 750 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 40 /XHeight 431 /CharSet( /arrowright /minus) /FontFile 787 0 R >>
+785 0 obj
+<< /Type /FontDescriptor /FontName /KAYNOZ+CMSY10 /Flags 4 /FontBBox [ -29 -960 1116 775 ] /Ascent 750 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 40 /XHeight 431 /CharSet( /arrowright /minus) /FontFile 786 0 R >>
endobj
-789 0 obj
+788 0 obj
<< /Length1 1393 /Length2 5904 /Length3 0 /Filter /FlateDecode /Length 6854 >>
stream
xÚtT”kÛ.]‚Ò 
@@ -3794,86 +3777,83 @@ p\ÿgì±4¾=}M%±è:ó{•œö(âV‡1„äpýà]J9‰©‹Â»$˜çʃï|»GB»Hëú§Ceº|/Ž#>üèÆÌIú‚¤ó´ <º
â7é²fTcVõkY“Ü\ç5£½ÄÃÓÁ-{e-=?ó„+â
endstream
endobj
-788 0 obj
-<< /Type /FontDescriptor /FontName /PXBGHL+CMSY7 /Flags 4 /FontBBox [ -15 -951 1251 782 ] /Ascent 750 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 49 /XHeight 431 /CharSet( /minus) /FontFile 789 0 R >>
+787 0 obj
+<< /Type /FontDescriptor /FontName /PXBGHL+CMSY7 /Flags 4 /FontBBox [ -15 -951 1251 782 ] /Ascent 750 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 49 /XHeight 431 /CharSet( /minus) /FontFile 788 0 R >>
endobj
-234 0 obj
-<< /Type /Font /Subtype /Type1 /BaseFont /FJNSRO+CMMI10 /FontDescriptor 776 0 R /FirstChar 25 /LastChar 120 /Widths 690 0 R >>
+230 0 obj
+<< /Type /Font /Subtype /Type1 /BaseFont /FJNSRO+CMMI10 /FontDescriptor 775 0 R /FirstChar 25 /LastChar 120 /Widths 689 0 R >>
endobj
362 0 obj
-<< /Type /Font /Subtype /Type1 /BaseFont /YJUITE+CMMI5 /FontDescriptor 778 0 R /FirstChar 107 /LastChar 107 /Widths 614 0 R >>
+<< /Type /Font /Subtype /Type1 /BaseFont /YJUITE+CMMI5 /FontDescriptor 777 0 R /FirstChar 107 /LastChar 107 /Widths 613 0 R >>
endobj
363 0 obj
-<< /Type /Font /Subtype /Type1 /BaseFont /NAZTKW+CMMI7 /FontDescriptor 780 0 R /FirstChar 107 /LastChar 107 /Widths 613 0 R >>
+<< /Type /Font /Subtype /Type1 /BaseFont /NAZTKW+CMMI7 /FontDescriptor 779 0 R /FirstChar 107 /LastChar 107 /Widths 612 0 R >>
endobj
-233 0 obj
-<< /Type /Font /Subtype /Type1 /BaseFont /NTKKEA+CMR10 /FontDescriptor 782 0 R /FirstChar 40 /LastChar 61 /Widths 691 0 R >>
+229 0 obj
+<< /Type /Font /Subtype /Type1 /BaseFont /NTKKEA+CMR10 /FontDescriptor 781 0 R /FirstChar 40 /LastChar 61 /Widths 690 0 R >>
endobj
-352 0 obj
-<< /Type /Font /Subtype /Type1 /BaseFont /JLMYRF+CMR7 /FontDescriptor 784 0 R /FirstChar 40 /LastChar 50 /Widths 616 0 R >>
+351 0 obj
+<< /Type /Font /Subtype /Type1 /BaseFont /JLMYRF+CMR7 /FontDescriptor 783 0 R /FirstChar 40 /LastChar 50 /Widths 615 0 R >>
endobj
-327 0 obj
-<< /Type /Font /Subtype /Type1 /BaseFont /KAYNOZ+CMSY10 /FontDescriptor 786 0 R /FirstChar 0 /LastChar 33 /Widths 617 0 R >>
+326 0 obj
+<< /Type /Font /Subtype /Type1 /BaseFont /KAYNOZ+CMSY10 /FontDescriptor 785 0 R /FirstChar 0 /LastChar 33 /Widths 616 0 R >>
endobj
361 0 obj
-<< /Type /Font /Subtype /Type1 /BaseFont /PXBGHL+CMSY7 /FontDescriptor 788 0 R /FirstChar 0 /LastChar 0 /Widths 615 0 R >>
-endobj
-240 0 obj
-<< /Type /Pages /Parent 790 0 R /Count 10 /Kids [ 213 0 R 247 0 R 256 0 R 266 0 R 282 0 R 289 0 R 297 0 R 304 0 R 311 0 R 315 0 R ] >>
+<< /Type /Font /Subtype /Type1 /BaseFont /PXBGHL+CMSY7 /FontDescriptor 787 0 R /FirstChar 0 /LastChar 0 /Widths 614 0 R >>
endobj
-322 0 obj
-<< /Type /Pages /Parent 790 0 R /Count 10 /Kids [ 319 0 R 324 0 R 329 0 R 335 0 R 344 0 R 349 0 R 354 0 R 358 0 R 365 0 R 374 0 R ] >>
+236 0 obj
+<< /Type /Pages /Parent 789 0 R /Count 10 /Kids [ 209 0 R 243 0 R 252 0 R 262 0 R 277 0 R 288 0 R 296 0 R 303 0 R 310 0 R 314 0 R ] >>
endobj
-382 0 obj
-<< /Type /Pages /Parent 790 0 R /Count 10 /Kids [ 379 0 R 387 0 R 395 0 R 403 0 R 411 0 R 415 0 R 419 0 R 424 0 R 429 0 R 433 0 R ] >>
+321 0 obj
+<< /Type /Pages /Parent 789 0 R /Count 10 /Kids [ 318 0 R 323 0 R 328 0 R 334 0 R 341 0 R 348 0 R 354 0 R 358 0 R 365 0 R 369 0 R ] >>
endobj
-440 0 obj
-<< /Type /Pages /Parent 790 0 R /Count 6 /Kids [ 437 0 R 444 0 R 450 0 R 523 0 R 565 0 R 585 0 R ] >>
+378 0 obj
+<< /Type /Pages /Parent 789 0 R /Count 10 /Kids [ 375 0 R 386 0 R 392 0 R 399 0 R 406 0 R 414 0 R 418 0 R 423 0 R 428 0 R 432 0 R ] >>
endobj
-790 0 obj
-<< /Type /Pages /Count 36 /Kids [ 240 0 R 322 0 R 382 0 R 440 0 R ] >>
+439 0 obj
+<< /Type /Pages /Parent 789 0 R /Count 6 /Kids [ 436 0 R 443 0 R 449 0 R 523 0 R 565 0 R 584 0 R ] >>
endobj
-791 0 obj
-<< /Type /Outlines /First 6 0 R /Last 210 0 R /Count 11 >>
+789 0 obj
+<< /Type /Pages /Count 36 /Kids [ 236 0 R 321 0 R 378 0 R 439 0 R ] >>
endobj
-210 0 obj
-<< /Title 211 0 R /A 208 0 R /Parent 791 0 R /Prev 182 0 R >>
+790 0 obj
+<< /Type /Outlines /First 6 0 R /Last 206 0 R /Count 11 >>
endobj
206 0 obj
-<< /Title 207 0 R /A 204 0 R /Parent 182 0 R /Prev 202 0 R >>
+<< /Title 207 0 R /A 204 0 R /Parent 790 0 R /Prev 178 0 R >>
endobj
202 0 obj
-<< /Title 203 0 R /A 200 0 R /Parent 182 0 R /Prev 198 0 R /Next 206 0 R >>
+<< /Title 203 0 R /A 200 0 R /Parent 178 0 R /Prev 198 0 R >>
endobj
198 0 obj
-<< /Title 199 0 R /A 196 0 R /Parent 182 0 R /Prev 194 0 R /Next 202 0 R >>
+<< /Title 199 0 R /A 196 0 R /Parent 178 0 R /Prev 194 0 R /Next 202 0 R >>
endobj
194 0 obj
-<< /Title 195 0 R /A 192 0 R /Parent 182 0 R /Prev 190 0 R /Next 198 0 R >>
+<< /Title 195 0 R /A 192 0 R /Parent 178 0 R /Prev 190 0 R /Next 198 0 R >>
endobj
190 0 obj
-<< /Title 191 0 R /A 188 0 R /Parent 182 0 R /Prev 186 0 R /Next 194 0 R >>
+<< /Title 191 0 R /A 188 0 R /Parent 178 0 R /Prev 186 0 R /Next 194 0 R >>
endobj
186 0 obj
-<< /Title 187 0 R /A 184 0 R /Parent 182 0 R /Next 190 0 R >>
+<< /Title 187 0 R /A 184 0 R /Parent 178 0 R /Prev 182 0 R /Next 190 0 R >>
endobj
182 0 obj
-<< /Title 183 0 R /A 180 0 R /Parent 791 0 R /Prev 170 0 R /Next 210 0 R /First 186 0 R /Last 206 0 R /Count -6 >>
+<< /Title 183 0 R /A 180 0 R /Parent 178 0 R /Next 186 0 R >>
endobj
178 0 obj
-<< /Title 179 0 R /A 176 0 R /Parent 170 0 R /Prev 174 0 R >>
+<< /Title 179 0 R /A 176 0 R /Parent 790 0 R /Prev 166 0 R /Next 206 0 R /First 182 0 R /Last 202 0 R /Count -6 >>
endobj
174 0 obj
-<< /Title 175 0 R /A 172 0 R /Parent 170 0 R /Next 178 0 R >>
+<< /Title 175 0 R /A 172 0 R /Parent 166 0 R /Prev 170 0 R >>
endobj
170 0 obj
-<< /Title 171 0 R /A 168 0 R /Parent 791 0 R /Prev 150 0 R /Next 182 0 R /First 174 0 R /Last 178 0 R /Count -2 >>
+<< /Title 171 0 R /A 168 0 R /Parent 166 0 R /Next 174 0 R >>
endobj
166 0 obj
-<< /Title 167 0 R /A 164 0 R /Parent 150 0 R /Prev 162 0 R >>
+<< /Title 167 0 R /A 164 0 R /Parent 790 0 R /Prev 150 0 R /Next 178 0 R /First 170 0 R /Last 174 0 R /Count -2 >>
endobj
162 0 obj
-<< /Title 163 0 R /A 160 0 R /Parent 150 0 R /Prev 158 0 R /Next 166 0 R >>
+<< /Title 163 0 R /A 160 0 R /Parent 150 0 R /Prev 158 0 R >>
endobj
158 0 obj
<< /Title 159 0 R /A 156 0 R /Parent 150 0 R /Prev 154 0 R /Next 162 0 R >>
@@ -3882,10 +3862,10 @@ endobj
<< /Title 155 0 R /A 152 0 R /Parent 150 0 R /Next 158 0 R >>
endobj
150 0 obj
-<< /Title 151 0 R /A 148 0 R /Parent 791 0 R /Prev 146 0 R /Next 170 0 R /First 154 0 R /Last 166 0 R /Count -4 >>
+<< /Title 151 0 R /A 148 0 R /Parent 790 0 R /Prev 146 0 R /Next 166 0 R /First 154 0 R /Last 162 0 R /Count -3 >>
endobj
146 0 obj
-<< /Title 147 0 R /A 144 0 R /Parent 791 0 R /Prev 66 0 R /Next 150 0 R >>
+<< /Title 147 0 R /A 144 0 R /Parent 790 0 R /Prev 66 0 R /Next 150 0 R >>
endobj
142 0 obj
<< /Title 143 0 R /A 140 0 R /Parent 66 0 R /Prev 138 0 R >>
@@ -3945,10 +3925,10 @@ endobj
<< /Title 71 0 R /A 68 0 R /Parent 66 0 R /Next 82 0 R /First 74 0 R /Last 78 0 R /Count -2 >>
endobj
66 0 obj
-<< /Title 67 0 R /A 64 0 R /Parent 791 0 R /Prev 62 0 R /Next 146 0 R /First 70 0 R /Last 142 0 R /Count -7 >>
+<< /Title 67 0 R /A 64 0 R /Parent 790 0 R /Prev 62 0 R /Next 146 0 R /First 70 0 R /Last 142 0 R /Count -7 >>
endobj
62 0 obj
-<< /Title 63 0 R /A 60 0 R /Parent 791 0 R /Prev 34 0 R /Next 66 0 R >>
+<< /Title 63 0 R /A 60 0 R /Parent 790 0 R /Prev 34 0 R /Next 66 0 R >>
endobj
58 0 obj
<< /Title 59 0 R /A 56 0 R /Parent 34 0 R /Prev 42 0 R >>
@@ -3969,7 +3949,7 @@ endobj
<< /Title 39 0 R /A 36 0 R /Parent 34 0 R /Next 42 0 R >>
endobj
34 0 obj
-<< /Title 35 0 R /A 32 0 R /Parent 791 0 R /Prev 14 0 R /Next 62 0 R /First 38 0 R /Last 58 0 R /Count -3 >>
+<< /Title 35 0 R /A 32 0 R /Parent 790 0 R /Prev 14 0 R /Next 62 0 R /First 38 0 R /Last 58 0 R /Count -3 >>
endobj
30 0 obj
<< /Title 31 0 R /A 28 0 R /Parent 14 0 R /Prev 26 0 R >>
@@ -3984,838 +3964,837 @@ endobj
<< /Title 19 0 R /A 16 0 R /Parent 14 0 R /Next 22 0 R >>
endobj
14 0 obj
-<< /Title 15 0 R /A 12 0 R /Parent 791 0 R /Prev 10 0 R /Next 34 0 R /First 18 0 R /Last 30 0 R /Count -4 >>
+<< /Title 15 0 R /A 12 0 R /Parent 790 0 R /Prev 10 0 R /Next 34 0 R /First 18 0 R /Last 30 0 R /Count -4 >>
endobj
10 0 obj
-<< /Title 11 0 R /A 8 0 R /Parent 791 0 R /Prev 6 0 R /Next 14 0 R >>
+<< /Title 11 0 R /A 8 0 R /Parent 790 0 R /Prev 6 0 R /Next 14 0 R >>
endobj
6 0 obj
-<< /Title 7 0 R /A 4 0 R /Parent 791 0 R /Next 10 0 R >>
+<< /Title 7 0 R /A 4 0 R /Parent 790 0 R /Next 10 0 R >>
+endobj
+791 0 obj
+<< /Names [ (Doc-Start) 214 0 R (page.1) 213 0 R (page.10) 316 0 R (page.11) 320 0 R (page.12) 325 0 R (page.13) 330 0 R (page.14) 336 0 R (page.15) 343 0 R (page.16) 350 0 R (page.17) 356 0 R (page.18) 360 0 R (page.19) 367 0 R (page.2) 245 0 R (page.20) 371 0 R (page.21) 377 0 R (page.22) 388 0 R (page.23) 394 0 R (page.24) 401 0 R (page.25) 408 0 R (page.26) 416 0 R (page.27) 420 0 R (page.28) 425 0 R (page.29) 430 0 R (page.3) 254 0 R (page.30) 434 0 R (page.31) 438 0 R (page.32) 445 0 R (page.33) 451 0 R (page.34) 525 0 R (page.35) 567 0 R (page.36) 586 0 R (page.4) 264 0 R ] /Limits [ (Doc-Start) (page.4) ] >>
endobj
792 0 obj
-<< /Names [ (Doc-Start) 218 0 R (page.1) 217 0 R (page.10) 317 0 R (page.11) 321 0 R (page.12) 326 0 R (page.13) 331 0 R (page.14) 337 0 R (page.15) 346 0 R (page.16) 351 0 R (page.17) 356 0 R (page.18) 360 0 R (page.19) 367 0 R (page.2) 249 0 R (page.20) 376 0 R (page.21) 381 0 R (page.22) 389 0 R (page.23) 397 0 R (page.24) 405 0 R (page.25) 413 0 R (page.26) 417 0 R (page.27) 421 0 R (page.28) 426 0 R (page.29) 431 0 R (page.3) 258 0 R (page.30) 435 0 R (page.31) 439 0 R (page.32) 446 0 R (page.33) 452 0 R (page.34) 525 0 R (page.35) 567 0 R (page.36) 587 0 R (page.4) 268 0 R ] /Limits [ (Doc-Start) (page.4) ] >>
+<< /Names [ (page.5) 279 0 R (page.6) 290 0 R (page.7) 298 0 R (page.8) 305 0 R (page.9) 312 0 R (piton:passe) 307 0 R (piton:transpose) 306 0 R (section*.1) 205 0 R (section.1) 5 0 R (section.10) 177 0 R (section.2) 9 0 R (section.3) 13 0 R (section.4) 33 0 R (section.5) 61 0 R (section.6) 65 0 R (section.7) 145 0 R (section.8) 149 0 R (section.9) 165 0 R (subsection.10.1) 181 0 R (subsection.10.2) 185 0 R (subsection.10.3) 189 0 R (subsection.10.4) 193 0 R (subsection.10.5) 197 0 R (subsection.10.6) 201 0 R (subsection.3.1) 17 0 R (subsection.3.2) 21 0 R (subsection.3.3) 25 0 R (subsection.3.4) 29 0 R (subsection.4.1) 37 0 R (subsection.4.2) 41 0 R (subsection.4.3) 57 0 R (subsection.6.1) 69 0 R ] /Limits [ (page.5) (subsection.6.1) ] >>
endobj
793 0 obj
-<< /Names [ (page.5) 284 0 R (page.6) 291 0 R (page.7) 299 0 R (page.8) 306 0 R (page.9) 313 0 R (piton:passe) 308 0 R (piton:transpose) 307 0 R (section*.1) 209 0 R (section.1) 5 0 R (section.10) 181 0 R (section.2) 9 0 R (section.3) 13 0 R (section.4) 33 0 R (section.5) 61 0 R (section.6) 65 0 R (section.7) 145 0 R (section.8) 149 0 R (section.9) 169 0 R (subsection.10.1) 185 0 R (subsection.10.2) 189 0 R (subsection.10.3) 193 0 R (subsection.10.4) 197 0 R (subsection.10.5) 201 0 R (subsection.10.6) 205 0 R (subsection.3.1) 17 0 R (subsection.3.2) 21 0 R (subsection.3.3) 25 0 R (subsection.3.4) 29 0 R (subsection.4.1) 37 0 R (subsection.4.2) 41 0 R (subsection.4.3) 57 0 R (subsection.6.1) 69 0 R ] /Limits [ (page.5) (subsection.6.1) ] >>
+<< /Names [ (subsection.6.2) 81 0 R (subsection.6.3) 93 0 R (subsection.6.4) 97 0 R (subsection.6.5) 121 0 R (subsection.6.6) 137 0 R (subsection.6.7) 141 0 R (subsection.8.1) 153 0 R (subsection.8.2) 157 0 R (subsection.8.3) 161 0 R (subsection.9.1) 169 0 R (subsection.9.2) 173 0 R (subsubsection.4.2.1) 45 0 R (subsubsection.4.2.2) 49 0 R (subsubsection.4.2.3) 53 0 R (subsubsection.6.1.1) 73 0 R (subsubsection.6.1.2) 77 0 R (subsubsection.6.2.1) 85 0 R (subsubsection.6.2.2) 89 0 R (subsubsection.6.4.1) 101 0 R (subsubsection.6.4.2) 105 0 R (subsubsection.6.4.3) 109 0 R (subsubsection.6.4.4) 113 0 R (subsubsection.6.4.5) 117 0 R (subsubsection.6.5.1) 125 0 R (subsubsection.6.5.2) 129 0 R (subsubsection.6.5.3) 133 0 R ] /Limits [ (subsection.6.2) (subsubsection.6.5.3) ] >>
endobj
794 0 obj
-<< /Names [ (subsection.6.2) 81 0 R (subsection.6.3) 93 0 R (subsection.6.4) 97 0 R (subsection.6.5) 121 0 R (subsection.6.6) 137 0 R (subsection.6.7) 141 0 R (subsection.8.1) 153 0 R (subsection.8.2) 157 0 R (subsection.8.3) 161 0 R (subsection.8.4) 165 0 R (subsection.9.1) 173 0 R (subsection.9.2) 177 0 R (subsubsection.4.2.1) 45 0 R (subsubsection.4.2.2) 49 0 R (subsubsection.4.2.3) 53 0 R (subsubsection.6.1.1) 73 0 R (subsubsection.6.1.2) 77 0 R (subsubsection.6.2.1) 85 0 R (subsubsection.6.2.2) 89 0 R (subsubsection.6.4.1) 101 0 R (subsubsection.6.4.2) 105 0 R (subsubsection.6.4.3) 109 0 R (subsubsection.6.4.4) 113 0 R (subsubsection.6.4.5) 117 0 R (subsubsection.6.5.1) 125 0 R (subsubsection.6.5.2) 129 0 R (subsubsection.6.5.3) 133 0 R ] /Limits [ (subsection.6.2) (subsubsection.6.5.3) ] >>
+<< /Kids [ 791 0 R 792 0 R 793 0 R ] /Limits [ (Doc-Start) (subsubsection.6.5.3) ] >>
endobj
795 0 obj
-<< /Kids [ 792 0 R 793 0 R 794 0 R ] /Limits [ (Doc-Start) (subsubsection.6.5.3) ] >>
+<< /Dests 794 0 R >>
endobj
796 0 obj
-<< /Dests 795 0 R >>
+<< /Type /Catalog /Pages 789 0 R /Outlines 790 0 R /Names 795 0 R /PageMode/UseOutlines /OpenAction 208 0 R >>
endobj
797 0 obj
-<< /Type /Catalog /Pages 790 0 R /Outlines 791 0 R /Names 796 0 R /PageMode/UseOutlines /OpenAction 212 0 R >>
-endobj
-798 0 obj
-<< /Author(\376\377\000F\000.\000\040\000P\000a\000n\000t\000i\000g\000n\000y)/Title(\376\377\000L\040\031\000e\000x\000t\000e\000n\000s\000i\000o\000n\000\040\000p\000i\000t\000o\000n)/Subject(\376\377\000U\000n\000e\000\040\000e\000x\000t\000e\000n\000s\000i\000o\000n\000\040\000L\000a\000T\000e\000X)/Creator(LaTeX with hyperref)/Keywords() /Producer (LuaTeX-1.18.1) /CreationDate (D:20240523184955+02'00') /ModDate (D:20240523184955+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.1 (MiKTeX 24.4)) >>
+<< /Author(\376\377\000F\000.\000\040\000P\000a\000n\000t\000i\000g\000n\000y)/Title(\376\377\000L\040\031\000e\000x\000t\000e\000n\000s\000i\000o\000n\000\040\000p\000i\000t\000o\000n)/Subject(\376\377\000U\000n\000e\000\040\000e\000x\000t\000e\000n\000s\000i\000o\000n\000\040\000L\000a\000T\000e\000X)/Creator(LaTeX with hyperref)/Keywords() /Producer (LuaTeX-1.18.1) /CreationDate (D:20240812173749+02'00') /ModDate (D:20240812173749+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.1 (MiKTeX 24.4)) >>
endobj
xref
-0 799
+0 798
0000000000 65535 f
-0000174798 00000 n
-0000174843 00000 n
-0000174863 00000 n
+0000178379 00000 n
+0000178424 00000 n
+0000178444 00000 n
0000000020 00000 n
-0000016546 00000 n
-0000410266 00000 n
+0000016348 00000 n
+0000413906 00000 n
0000000065 00000 n
0000000155 00000 n
-0000021159 00000 n
-0000410180 00000 n
+0000020960 00000 n
+0000413820 00000 n
0000000200 00000 n
0000000288 00000 n
-0000021219 00000 n
-0000410055 00000 n
+0000021020 00000 n
+0000413695 00000 n
0000000334 00000 n
0000000498 00000 n
-0000021280 00000 n
-0000409981 00000 n
+0000021081 00000 n
+0000413621 00000 n
0000000549 00000 n
0000000663 00000 n
-0000021341 00000 n
-0000409894 00000 n
+0000021142 00000 n
+0000413534 00000 n
0000000714 00000 n
0000000873 00000 n
-0000021401 00000 n
-0000409807 00000 n
+0000021202 00000 n
+0000413447 00000 n
0000000924 00000 n
0000001304 00000 n
-0000027058 00000 n
-0000409733 00000 n
+0000026857 00000 n
+0000413373 00000 n
0000001355 00000 n
0000001561 00000 n
-0000033205 00000 n
-0000409608 00000 n
+0000033124 00000 n
+0000413248 00000 n
0000001607 00000 n
0000001715 00000 n
-0000033266 00000 n
-0000409534 00000 n
+0000033185 00000 n
+0000413174 00000 n
0000001766 00000 n
0000002000 00000 n
-0000044746 00000 n
-0000409410 00000 n
+0000049820 00000 n
+0000413050 00000 n
0000002051 00000 n
0000002132 00000 n
-0000044807 00000 n
-0000409336 00000 n
+0000049881 00000 n
+0000412976 00000 n
0000002188 00000 n
0000002297 00000 n
-0000049531 00000 n
-0000409249 00000 n
+0000049942 00000 n
+0000412889 00000 n
0000002353 00000 n
0000002510 00000 n
-0000054301 00000 n
-0000409175 00000 n
+0000054702 00000 n
+0000412815 00000 n
0000002566 00000 n
0000002705 00000 n
-0000054490 00000 n
-0000409101 00000 n
+0000054891 00000 n
+0000412741 00000 n
0000002756 00000 n
0000002981 00000 n
-0000058305 00000 n
-0000409013 00000 n
+0000059062 00000 n
+0000412653 00000 n
0000003027 00000 n
0000003377 00000 n
-0000067463 00000 n
-0000408886 00000 n
+0000067821 00000 n
+0000412526 00000 n
0000003423 00000 n
0000003580 00000 n
-0000067524 00000 n
-0000408775 00000 n
+0000067882 00000 n
+0000412415 00000 n
0000003631 00000 n
0000003829 00000 n
-0000067585 00000 n
-0000408701 00000 n
+0000067943 00000 n
+0000412341 00000 n
0000003885 00000 n
0000004004 00000 n
-0000067646 00000 n
-0000408627 00000 n
+0000072400 00000 n
+0000412267 00000 n
0000004060 00000 n
0000004184 00000 n
-0000072024 00000 n
-0000408503 00000 n
+0000072461 00000 n
+0000412143 00000 n
0000004235 00000 n
0000004450 00000 n
-0000072085 00000 n
-0000408429 00000 n
+0000076413 00000 n
+0000412069 00000 n
0000004506 00000 n
0000004722 00000 n
-0000072146 00000 n
-0000408355 00000 n
+0000076474 00000 n
+0000411995 00000 n
0000004778 00000 n
0000004950 00000 n
-0000079598 00000 n
-0000408268 00000 n
+0000080318 00000 n
+0000411908 00000 n
0000005001 00000 n
0000005211 00000 n
-0000084643 00000 n
-0000408141 00000 n
+0000084531 00000 n
+0000411781 00000 n
0000005262 00000 n
0000005437 00000 n
-0000084704 00000 n
-0000408063 00000 n
+0000084592 00000 n
+0000411703 00000 n
0000005494 00000 n
0000005655 00000 n
-0000084766 00000 n
-0000407971 00000 n
+0000089000 00000 n
+0000411611 00000 n
0000005712 00000 n
0000005866 00000 n
-0000088524 00000 n
-0000407879 00000 n
+0000089062 00000 n
+0000411519 00000 n
0000005923 00000 n
0000006097 00000 n
-0000088586 00000 n
-0000407787 00000 n
+0000092934 00000 n
+0000411427 00000 n
0000006154 00000 n
0000006303 00000 n
-0000092320 00000 n
-0000407709 00000 n
+0000092996 00000 n
+0000411349 00000 n
0000006360 00000 n
0000006534 00000 n
-0000096955 00000 n
-0000407579 00000 n
+0000097050 00000 n
+0000411219 00000 n
0000006586 00000 n
0000006797 00000 n
-0000097017 00000 n
-0000407500 00000 n
+0000100978 00000 n
+0000411140 00000 n
0000006854 00000 n
0000007149 00000 n
-0000097079 00000 n
-0000407407 00000 n
+0000101040 00000 n
+0000411047 00000 n
0000007206 00000 n
0000007570 00000 n
-0000100552 00000 n
-0000407328 00000 n
+0000104905 00000 n
+0000410968 00000 n
0000007627 00000 n
0000008011 00000 n
-0000105443 00000 n
-0000407236 00000 n
+0000104967 00000 n
+0000410876 00000 n
0000008063 00000 n
0000008389 00000 n
-0000105505 00000 n
-0000407158 00000 n
+0000114726 00000 n
+0000410798 00000 n
0000008441 00000 n
0000008525 00000 n
-0000105566 00000 n
-0000407066 00000 n
+0000114788 00000 n
+0000410706 00000 n
0000008572 00000 n
0000008738 00000 n
-0000109433 00000 n
-0000406934 00000 n
+0000114850 00000 n
+0000410574 00000 n
0000008785 00000 n
0000008854 00000 n
-0000109495 00000 n
-0000406855 00000 n
+0000114912 00000 n
+0000410495 00000 n
0000008906 00000 n
0000009059 00000 n
-0000109557 00000 n
-0000406762 00000 n
+0000118917 00000 n
+0000410402 00000 n
0000009111 00000 n
0000009309 00000 n
-0000113833 00000 n
-0000406669 00000 n
+0000122927 00000 n
+0000410323 00000 n
0000009361 00000 n
-0000009514 00000 n
-0000118193 00000 n
-0000406590 00000 n
-0000009566 00000 n
-0000009773 00000 n
-0000121950 00000 n
-0000406458 00000 n
-0000009820 00000 n
-0000009980 00000 n
-0000122012 00000 n
-0000406379 00000 n
-0000010032 00000 n
-0000010230 00000 n
-0000125396 00000 n
-0000406300 00000 n
-0000010282 00000 n
-0000010607 00000 n
-0000133314 00000 n
-0000406168 00000 n
-0000010655 00000 n
-0000010970 00000 n
-0000133376 00000 n
-0000406089 00000 n
-0000011023 00000 n
-0000011143 00000 n
-0000136945 00000 n
-0000405996 00000 n
-0000011196 00000 n
+0000009568 00000 n
+0000126565 00000 n
+0000410191 00000 n
+0000009615 00000 n
+0000009775 00000 n
+0000126627 00000 n
+0000410112 00000 n
+0000009827 00000 n
+0000010025 00000 n
+0000129924 00000 n
+0000410033 00000 n
+0000010077 00000 n
+0000010402 00000 n
+0000136921 00000 n
+0000409901 00000 n
+0000010450 00000 n
+0000010765 00000 n
+0000136983 00000 n
+0000409822 00000 n
+0000010818 00000 n
+0000010938 00000 n
+0000140552 00000 n
+0000409729 00000 n
+0000010991 00000 n
+0000011106 00000 n
+0000144176 00000 n
+0000409636 00000 n
+0000011159 00000 n
0000011311 00000 n
-0000140569 00000 n
-0000405903 00000 n
+0000147750 00000 n
+0000409543 00000 n
0000011364 00000 n
-0000011516 00000 n
-0000144143 00000 n
-0000405810 00000 n
-0000011569 00000 n
-0000011674 00000 n
-0000146397 00000 n
-0000405717 00000 n
-0000011727 00000 n
-0000011868 00000 n
-0000148431 00000 n
-0000405638 00000 n
-0000011921 00000 n
-0000012244 00000 n
-0000161740 00000 n
-0000405559 00000 n
-0000012292 00000 n
-0000012346 00000 n
-0000016066 00000 n
-0000016232 00000 n
-0000016606 00000 n
-0000012398 00000 n
-0000016422 00000 n
-0000016484 00000 n
-0000349089 00000 n
-0000345798 00000 n
-0000343694 00000 n
-0000339985 00000 n
-0000336651 00000 n
-0000334220 00000 n
-0000327942 00000 n
-0000325841 00000 n
-0000317326 00000 n
-0000306201 00000 n
-0000302352 00000 n
-0000299261 00000 n
-0000288914 00000 n
-0000285074 00000 n
-0000404254 00000 n
-0000403822 00000 n
-0000278773 00000 n
-0000276656 00000 n
-0000267286 00000 n
-0000264058 00000 n
-0000260037 00000 n
-0000404819 00000 n
-0000016203 00000 n
-0000020940 00000 n
-0000020786 00000 n
-0000026360 00000 n
-0000026519 00000 n
-0000021461 00000 n
-0000020612 00000 n
-0000016990 00000 n
-0000021097 00000 n
-0000252440 00000 n
-0000250663 00000 n
-0000020749 00000 n
-0000026678 00000 n
-0000026837 00000 n
-0000027119 00000 n
-0000026170 00000 n
-0000021702 00000 n
-0000026996 00000 n
-0000241927 00000 n
-0000026307 00000 n
-0000032841 00000 n
-0000032992 00000 n
-0000038843 00000 n
-0000039002 00000 n
-0000033326 00000 n
-0000032667 00000 n
-0000027360 00000 n
-0000033143 00000 n
-0000235307 00000 n
-0000032804 00000 n
-0000039161 00000 n
-0000039320 00000 n
-0000039478 00000 n
-0000039636 00000 n
-0000039795 00000 n
-0000039959 00000 n
-0000040123 00000 n
-0000040280 00000 n
-0000044359 00000 n
-0000044521 00000 n
-0000040499 00000 n
-0000038605 00000 n
-0000033606 00000 n
-0000040437 00000 n
-0000232493 00000 n
-0000038742 00000 n
-0000044200 00000 n
-0000044868 00000 n
-0000044018 00000 n
-0000040740 00000 n
-0000044684 00000 n
-0000229217 00000 n
-0000044155 00000 n
-0000049159 00000 n
-0000049314 00000 n
-0000049591 00000 n
-0000048985 00000 n
-0000045122 00000 n
-0000049469 00000 n
-0000220502 00000 n
-0000049122 00000 n
-0000054079 00000 n
-0000054551 00000 n
-0000053913 00000 n
-0000049845 00000 n
-0000054239 00000 n
-0000054362 00000 n
-0000054426 00000 n
-0000054050 00000 n
-0000058366 00000 n
-0000058122 00000 n
-0000054857 00000 n
-0000058243 00000 n
-0000062599 00000 n
-0000062416 00000 n
-0000058607 00000 n
-0000062537 00000 n
-0000067707 00000 n
-0000067280 00000 n
-0000062840 00000 n
-0000067401 00000 n
-0000404971 00000 n
-0000072207 00000 n
-0000071841 00000 n
-0000067961 00000 n
-0000071962 00000 n
-0000404537 00000 n
-0000075778 00000 n
-0000075595 00000 n
-0000072448 00000 n
-0000075716 00000 n
-0000079220 00000 n
-0000079378 00000 n
-0000079659 00000 n
-0000079046 00000 n
-0000075993 00000 n
-0000079536 00000 n
-0000079183 00000 n
-0000083945 00000 n
-0000084104 00000 n
-0000084263 00000 n
-0000084422 00000 n
-0000084828 00000 n
-0000083755 00000 n
-0000079900 00000 n
-0000084581 00000 n
-0000083892 00000 n
-0000088648 00000 n
-0000088341 00000 n
-0000085082 00000 n
-0000088462 00000 n
-0000404396 00000 n
-0000092382 00000 n
-0000092137 00000 n
-0000088876 00000 n
-0000092258 00000 n
-0000097141 00000 n
-0000096772 00000 n
-0000092610 00000 n
-0000096893 00000 n
-0000404679 00000 n
-0000403966 00000 n
-0000404110 00000 n
-0000100613 00000 n
-0000100369 00000 n
-0000097486 00000 n
-0000100490 00000 n
-0000104895 00000 n
-0000105054 00000 n
-0000105218 00000 n
-0000109058 00000 n
-0000109217 00000 n
-0000105628 00000 n
-0000104713 00000 n
-0000100802 00000 n
-0000105381 00000 n
-0000104850 00000 n
-0000109619 00000 n
-0000108884 00000 n
-0000105817 00000 n
-0000109371 00000 n
-0000405123 00000 n
-0000109021 00000 n
-0000113453 00000 n
-0000113612 00000 n
-0000113895 00000 n
-0000113279 00000 n
-0000109821 00000 n
-0000113771 00000 n
-0000113416 00000 n
-0000117634 00000 n
-0000117793 00000 n
-0000117952 00000 n
-0000118255 00000 n
-0000117452 00000 n
-0000114097 00000 n
-0000118131 00000 n
-0000216650 00000 n
-0000117589 00000 n
-0000121580 00000 n
-0000121734 00000 n
-0000122074 00000 n
-0000121406 00000 n
-0000118522 00000 n
-0000121888 00000 n
-0000214584 00000 n
-0000202423 00000 n
-0000187696 00000 n
-0000121543 00000 n
-0000125458 00000 n
-0000125213 00000 n
-0000122315 00000 n
-0000125334 00000 n
-0000128121 00000 n
-0000127938 00000 n
-0000125673 00000 n
-0000128059 00000 n
-0000129032 00000 n
-0000128849 00000 n
-0000128323 00000 n
-0000128970 00000 n
-0000133074 00000 n
-0000133438 00000 n
-0000132908 00000 n
-0000129182 00000 n
-0000133252 00000 n
-0000133045 00000 n
-0000137007 00000 n
-0000136762 00000 n
-0000133666 00000 n
-0000136883 00000 n
-0000140631 00000 n
-0000140386 00000 n
-0000137170 00000 n
-0000140507 00000 n
-0000144205 00000 n
-0000143960 00000 n
-0000140820 00000 n
-0000144081 00000 n
-0000405275 00000 n
-0000146017 00000 n
-0000146176 00000 n
-0000146459 00000 n
-0000145843 00000 n
-0000144381 00000 n
-0000146335 00000 n
-0000145980 00000 n
-0000148216 00000 n
-0000148493 00000 n
-0000148050 00000 n
-0000146622 00000 n
-0000148369 00000 n
-0000148187 00000 n
-0000151403 00000 n
-0000151552 00000 n
-0000151703 00000 n
-0000151855 00000 n
-0000152007 00000 n
-0000152159 00000 n
-0000152311 00000 n
-0000152463 00000 n
-0000152614 00000 n
-0000152766 00000 n
-0000152917 00000 n
-0000153068 00000 n
-0000153220 00000 n
-0000153371 00000 n
-0000153522 00000 n
-0000153674 00000 n
-0000153826 00000 n
-0000153978 00000 n
-0000154130 00000 n
-0000154282 00000 n
-0000154434 00000 n
-0000154585 00000 n
-0000154737 00000 n
-0000154889 00000 n
-0000155041 00000 n
-0000155193 00000 n
-0000155345 00000 n
-0000155496 00000 n
-0000155646 00000 n
-0000155797 00000 n
-0000155947 00000 n
-0000156098 00000 n
-0000156249 00000 n
-0000156398 00000 n
-0000156548 00000 n
-0000156698 00000 n
-0000156846 00000 n
-0000156996 00000 n
-0000157148 00000 n
-0000157299 00000 n
-0000157450 00000 n
-0000157599 00000 n
-0000157750 00000 n
-0000157902 00000 n
-0000158054 00000 n
-0000158205 00000 n
-0000158355 00000 n
-0000158506 00000 n
-0000158657 00000 n
+0000011469 00000 n
+0000150004 00000 n
+0000409450 00000 n
+0000011522 00000 n
+0000011663 00000 n
+0000152038 00000 n
+0000409371 00000 n
+0000011716 00000 n
+0000012039 00000 n
+0000165515 00000 n
+0000409292 00000 n
+0000012087 00000 n
+0000012141 00000 n
+0000015868 00000 n
+0000016034 00000 n
+0000016408 00000 n
+0000012193 00000 n
+0000016224 00000 n
+0000016286 00000 n
+0000352822 00000 n
+0000349531 00000 n
+0000347427 00000 n
+0000343635 00000 n
+0000340301 00000 n
+0000337870 00000 n
+0000331592 00000 n
+0000329491 00000 n
+0000320976 00000 n
+0000309851 00000 n
+0000306002 00000 n
+0000302911 00000 n
+0000292564 00000 n
+0000288724 00000 n
+0000407987 00000 n
+0000407555 00000 n
+0000282423 00000 n
+0000280306 00000 n
+0000270928 00000 n
+0000267700 00000 n
+0000263679 00000 n
+0000408552 00000 n
+0000016005 00000 n
+0000020741 00000 n
+0000020587 00000 n
+0000026159 00000 n
+0000026318 00000 n
+0000021262 00000 n
+0000020413 00000 n
+0000016792 00000 n
+0000020898 00000 n
+0000256082 00000 n
+0000254305 00000 n
+0000020550 00000 n
+0000026477 00000 n
+0000026636 00000 n
+0000026918 00000 n
+0000025969 00000 n
+0000021503 00000 n
+0000026795 00000 n
+0000245569 00000 n
+0000026106 00000 n
+0000032451 00000 n
+0000032605 00000 n
+0000032758 00000 n
+0000032910 00000 n
+0000033246 00000 n
+0000032261 00000 n
+0000027159 00000 n
+0000033062 00000 n
+0000238888 00000 n
+0000032398 00000 n
+0000038285 00000 n
+0000038444 00000 n
+0000038603 00000 n
+0000038762 00000 n
+0000038920 00000 n
+0000039084 00000 n
+0000039242 00000 n
+0000039401 00000 n
+0000039565 00000 n
+0000039791 00000 n
+0000038055 00000 n
+0000033526 00000 n
+0000039729 00000 n
+0000236074 00000 n
+0000038192 00000 n
+0000044453 00000 n
+0000044611 00000 n
+0000044928 00000 n
+0000045088 00000 n
+0000044769 00000 n
+0000045311 00000 n
+0000044255 00000 n
+0000040019 00000 n
+0000045249 00000 n
+0000232798 00000 n
+0000044392 00000 n
+0000049448 00000 n
+0000049603 00000 n
+0000050003 00000 n
+0000049274 00000 n
+0000045565 00000 n
+0000049758 00000 n
+0000224083 00000 n
+0000049411 00000 n
+0000054480 00000 n
+0000054952 00000 n
+0000054314 00000 n
+0000050270 00000 n
+0000054640 00000 n
+0000054763 00000 n
+0000054827 00000 n
+0000054451 00000 n
+0000059123 00000 n
+0000058879 00000 n
+0000055258 00000 n
+0000059000 00000 n
+0000062862 00000 n
+0000062679 00000 n
+0000059403 00000 n
+0000062800 00000 n
+0000068004 00000 n
+0000067638 00000 n
+0000063116 00000 n
+0000067759 00000 n
+0000408704 00000 n
+0000072522 00000 n
+0000072217 00000 n
+0000068258 00000 n
+0000072338 00000 n
+0000408270 00000 n
+0000076535 00000 n
+0000076230 00000 n
+0000072763 00000 n
+0000076351 00000 n
+0000079938 00000 n
+0000080097 00000 n
+0000080379 00000 n
+0000079764 00000 n
+0000076750 00000 n
+0000080256 00000 n
+0000079901 00000 n
+0000084151 00000 n
+0000084310 00000 n
+0000084654 00000 n
+0000083977 00000 n
+0000080620 00000 n
+0000084469 00000 n
+0000084114 00000 n
+0000088624 00000 n
+0000088781 00000 n
+0000089124 00000 n
+0000088450 00000 n
+0000084856 00000 n
+0000088938 00000 n
+0000408129 00000 n
+0000088587 00000 n
+0000093058 00000 n
+0000092751 00000 n
+0000089417 00000 n
+0000092872 00000 n
+0000097112 00000 n
+0000096867 00000 n
+0000093247 00000 n
+0000096988 00000 n
+0000408412 00000 n
+0000407699 00000 n
+0000407843 00000 n
+0000101102 00000 n
+0000100795 00000 n
+0000097444 00000 n
+0000100916 00000 n
+0000105029 00000 n
+0000104722 00000 n
+0000101330 00000 n
+0000104843 00000 n
+0000109066 00000 n
+0000109230 00000 n
+0000109451 00000 n
+0000108892 00000 n
+0000105231 00000 n
+0000109389 00000 n
+0000408856 00000 n
+0000109029 00000 n
+0000113868 00000 n
+0000114027 00000 n
+0000114189 00000 n
+0000114353 00000 n
+0000114512 00000 n
+0000114974 00000 n
+0000113670 00000 n
+0000109679 00000 n
+0000114664 00000 n
+0000220231 00000 n
+0000113807 00000 n
+0000118979 00000 n
+0000118734 00000 n
+0000115215 00000 n
+0000118855 00000 n
+0000122367 00000 n
+0000122526 00000 n
+0000122685 00000 n
+0000122989 00000 n
+0000122185 00000 n
+0000119181 00000 n
+0000122865 00000 n
+0000122322 00000 n
+0000126195 00000 n
+0000126349 00000 n
+0000126689 00000 n
+0000126021 00000 n
+0000123230 00000 n
+0000126503 00000 n
+0000218165 00000 n
+0000206004 00000 n
+0000191277 00000 n
+0000126158 00000 n
+0000129986 00000 n
+0000129741 00000 n
+0000126943 00000 n
+0000129862 00000 n
+0000132589 00000 n
+0000132406 00000 n
+0000130188 00000 n
+0000132527 00000 n
+0000136681 00000 n
+0000137045 00000 n
+0000136515 00000 n
+0000132791 00000 n
+0000136859 00000 n
+0000136652 00000 n
+0000140614 00000 n
+0000140369 00000 n
+0000137273 00000 n
+0000140490 00000 n
+0000144238 00000 n
+0000143993 00000 n
+0000140777 00000 n
+0000144114 00000 n
+0000147812 00000 n
+0000147567 00000 n
+0000144427 00000 n
+0000147688 00000 n
+0000409008 00000 n
+0000149624 00000 n
+0000149783 00000 n
+0000150066 00000 n
+0000149450 00000 n
+0000147988 00000 n
+0000149942 00000 n
+0000149587 00000 n
+0000151823 00000 n
+0000152100 00000 n
+0000151657 00000 n
+0000150229 00000 n
+0000151976 00000 n
+0000151794 00000 n
+0000155020 00000 n
+0000155169 00000 n
+0000155320 00000 n
+0000155472 00000 n
+0000155624 00000 n
+0000155776 00000 n
+0000155928 00000 n
+0000156080 00000 n
+0000156231 00000 n
+0000156383 00000 n
+0000156534 00000 n
+0000156685 00000 n
+0000156837 00000 n
+0000156988 00000 n
+0000157139 00000 n
+0000157291 00000 n
+0000157441 00000 n
+0000157593 00000 n
+0000157745 00000 n
+0000157897 00000 n
+0000158049 00000 n
+0000158201 00000 n
+0000158353 00000 n
+0000158504 00000 n
+0000158656 00000 n
0000158808 00000 n
0000158960 00000 n
-0000159111 00000 n
-0000159262 00000 n
-0000159412 00000 n
-0000159564 00000 n
+0000159112 00000 n
+0000159264 00000 n
+0000159415 00000 n
+0000159565 00000 n
0000159716 00000 n
-0000159868 00000 n
-0000160018 00000 n
-0000160169 00000 n
-0000160320 00000 n
-0000160472 00000 n
-0000160624 00000 n
-0000160776 00000 n
-0000160926 00000 n
-0000161077 00000 n
-0000161229 00000 n
-0000161378 00000 n
-0000161527 00000 n
-0000161802 00000 n
-0000150701 00000 n
-0000148656 00000 n
-0000161678 00000 n
-0000150838 00000 n
-0000164863 00000 n
-0000165016 00000 n
-0000165169 00000 n
-0000165320 00000 n
-0000165478 00000 n
-0000165635 00000 n
-0000165793 00000 n
-0000165950 00000 n
-0000166103 00000 n
-0000166261 00000 n
-0000166418 00000 n
-0000166582 00000 n
-0000166745 00000 n
-0000166909 00000 n
-0000167067 00000 n
-0000167219 00000 n
-0000167372 00000 n
-0000167530 00000 n
-0000167694 00000 n
-0000167858 00000 n
-0000168016 00000 n
-0000168180 00000 n
-0000168343 00000 n
-0000168501 00000 n
-0000168658 00000 n
-0000168821 00000 n
-0000168984 00000 n
-0000169147 00000 n
-0000169310 00000 n
-0000169474 00000 n
-0000169629 00000 n
-0000169793 00000 n
-0000169957 00000 n
-0000170121 00000 n
-0000170279 00000 n
-0000170436 00000 n
-0000172090 00000 n
-0000170649 00000 n
-0000164417 00000 n
-0000161991 00000 n
-0000170587 00000 n
-0000164554 00000 n
-0000172243 00000 n
-0000172401 00000 n
-0000172559 00000 n
-0000172717 00000 n
-0000172874 00000 n
-0000173027 00000 n
-0000173185 00000 n
-0000173342 00000 n
-0000173496 00000 n
-0000173655 00000 n
-0000173814 00000 n
-0000173972 00000 n
-0000174131 00000 n
-0000174289 00000 n
-0000174447 00000 n
-0000174661 00000 n
-0000171804 00000 n
-0000170851 00000 n
-0000174599 00000 n
-0000171941 00000 n
-0000174916 00000 n
-0000186898 00000 n
-0000175143 00000 n
-0000175245 00000 n
-0000187137 00000 n
-0000187858 00000 n
-0000188089 00000 n
-0000201598 00000 n
-0000188411 00000 n
-0000188517 00000 n
-0000201829 00000 n
-0000202577 00000 n
-0000202800 00000 n
-0000213831 00000 n
-0000202946 00000 n
-0000203043 00000 n
-0000214068 00000 n
-0000214743 00000 n
-0000214971 00000 n
-0000215963 00000 n
-0000215014 00000 n
-0000215109 00000 n
-0000216203 00000 n
-0000216805 00000 n
-0000217006 00000 n
-0000217032 00000 n
-0000217058 00000 n
-0000217084 00000 n
-0000217144 00000 n
-0000217239 00000 n
-0000219726 00000 n
-0000217444 00000 n
-0000217547 00000 n
-0000219971 00000 n
-0000220663 00000 n
-0000220870 00000 n
-0000228200 00000 n
-0000221364 00000 n
-0000221480 00000 n
-0000228437 00000 n
-0000229372 00000 n
-0000229573 00000 n
-0000231745 00000 n
-0000229728 00000 n
-0000229833 00000 n
-0000231989 00000 n
-0000232654 00000 n
-0000232861 00000 n
-0000234567 00000 n
-0000232984 00000 n
-0000233090 00000 n
-0000234813 00000 n
-0000235469 00000 n
-0000235677 00000 n
-0000241063 00000 n
-0000236066 00000 n
-0000236186 00000 n
-0000241304 00000 n
-0000242083 00000 n
-0000242285 00000 n
-0000249692 00000 n
-0000242770 00000 n
-0000242893 00000 n
-0000249929 00000 n
-0000250817 00000 n
-0000251017 00000 n
-0000251764 00000 n
-0000251050 00000 n
-0000251144 00000 n
-0000252000 00000 n
-0000252593 00000 n
-0000252792 00000 n
-0000259075 00000 n
-0000253244 00000 n
-0000253354 00000 n
-0000259312 00000 n
-0000260192 00000 n
-0000260393 00000 n
-0000263287 00000 n
-0000260619 00000 n
-0000260724 00000 n
-0000263527 00000 n
-0000264213 00000 n
-0000264414 00000 n
-0000266519 00000 n
-0000264648 00000 n
-0000264753 00000 n
-0000266756 00000 n
-0000267441 00000 n
-0000267642 00000 n
-0000275638 00000 n
-0000268186 00000 n
-0000268317 00000 n
-0000275876 00000 n
-0000276812 00000 n
-0000277014 00000 n
-0000278077 00000 n
-0000277070 00000 n
-0000277170 00000 n
-0000278316 00000 n
-0000278929 00000 n
-0000279131 00000 n
-0000279369 00000 n
-0000279457 00000 n
-0000284213 00000 n
-0000279826 00000 n
-0000279935 00000 n
-0000284452 00000 n
-0000285229 00000 n
-0000285430 00000 n
-0000288142 00000 n
-0000285675 00000 n
-0000285780 00000 n
-0000288379 00000 n
-0000289069 00000 n
-0000289270 00000 n
-0000298191 00000 n
-0000289744 00000 n
-0000289862 00000 n
-0000298429 00000 n
-0000299417 00000 n
-0000299619 00000 n
-0000301626 00000 n
-0000299732 00000 n
-0000299835 00000 n
-0000301865 00000 n
-0000302508 00000 n
-0000302710 00000 n
-0000305409 00000 n
-0000302971 00000 n
-0000303076 00000 n
-0000305647 00000 n
-0000306357 00000 n
-0000306559 00000 n
-0000316217 00000 n
-0000307203 00000 n
-0000307344 00000 n
-0000316456 00000 n
-0000317483 00000 n
-0000317686 00000 n
-0000324878 00000 n
-0000318172 00000 n
-0000318296 00000 n
-0000325115 00000 n
-0000325995 00000 n
-0000326195 00000 n
-0000327241 00000 n
-0000326272 00000 n
-0000326371 00000 n
-0000327478 00000 n
-0000328097 00000 n
-0000328298 00000 n
-0000333342 00000 n
-0000328701 00000 n
-0000328824 00000 n
-0000333580 00000 n
-0000334376 00000 n
-0000334578 00000 n
-0000335952 00000 n
-0000334656 00000 n
-0000334758 00000 n
-0000336188 00000 n
-0000336804 00000 n
-0000337003 00000 n
-0000339237 00000 n
-0000337181 00000 n
-0000337286 00000 n
-0000339475 00000 n
-0000340141 00000 n
-0000340343 00000 n
-0000342933 00000 n
-0000340519 00000 n
-0000340628 00000 n
-0000343172 00000 n
-0000343851 00000 n
-0000344054 00000 n
-0000345095 00000 n
-0000344131 00000 n
-0000344230 00000 n
-0000345333 00000 n
-0000345954 00000 n
-0000346156 00000 n
-0000348343 00000 n
-0000346298 00000 n
-0000346407 00000 n
-0000348582 00000 n
-0000349246 00000 n
-0000357645 00000 n
-0000349449 00000 n
-0000365098 00000 n
-0000357909 00000 n
-0000372494 00000 n
-0000365320 00000 n
-0000381185 00000 n
-0000372716 00000 n
-0000388991 00000 n
-0000381462 00000 n
-0000396380 00000 n
-0000389247 00000 n
-0000403595 00000 n
-0000396620 00000 n
-0000405394 00000 n
-0000405483 00000 n
-0000410338 00000 n
-0000410979 00000 n
-0000411746 00000 n
-0000412571 00000 n
-0000412674 00000 n
-0000412712 00000 n
-0000412840 00000 n
+0000159866 00000 n
+0000160017 00000 n
+0000160168 00000 n
+0000160318 00000 n
+0000160468 00000 n
+0000160618 00000 n
+0000160770 00000 n
+0000160922 00000 n
+0000161074 00000 n
+0000161225 00000 n
+0000161376 00000 n
+0000161525 00000 n
+0000161676 00000 n
+0000161828 00000 n
+0000161979 00000 n
+0000162129 00000 n
+0000162280 00000 n
+0000162431 00000 n
+0000162582 00000 n
+0000162734 00000 n
+0000162885 00000 n
+0000163036 00000 n
+0000163186 00000 n
+0000163338 00000 n
+0000163490 00000 n
+0000163642 00000 n
+0000163793 00000 n
+0000163944 00000 n
+0000164095 00000 n
+0000164247 00000 n
+0000164399 00000 n
+0000164551 00000 n
+0000164701 00000 n
+0000164852 00000 n
+0000165004 00000 n
+0000165153 00000 n
+0000165302 00000 n
+0000165577 00000 n
+0000154310 00000 n
+0000152263 00000 n
+0000165453 00000 n
+0000154447 00000 n
+0000168641 00000 n
+0000168794 00000 n
+0000168947 00000 n
+0000169098 00000 n
+0000169256 00000 n
+0000169413 00000 n
+0000169571 00000 n
+0000169728 00000 n
+0000169881 00000 n
+0000170039 00000 n
+0000170196 00000 n
+0000170360 00000 n
+0000170523 00000 n
+0000170687 00000 n
+0000170845 00000 n
+0000170997 00000 n
+0000171150 00000 n
+0000171308 00000 n
+0000171472 00000 n
+0000171636 00000 n
+0000171794 00000 n
+0000171958 00000 n
+0000172121 00000 n
+0000172279 00000 n
+0000172436 00000 n
+0000172599 00000 n
+0000172762 00000 n
+0000172925 00000 n
+0000173088 00000 n
+0000173252 00000 n
+0000173407 00000 n
+0000173571 00000 n
+0000173735 00000 n
+0000173899 00000 n
+0000174057 00000 n
+0000174214 00000 n
+0000175827 00000 n
+0000174427 00000 n
+0000168195 00000 n
+0000165766 00000 n
+0000174365 00000 n
+0000168332 00000 n
+0000175980 00000 n
+0000176138 00000 n
+0000176296 00000 n
+0000176454 00000 n
+0000176607 00000 n
+0000176765 00000 n
+0000176922 00000 n
+0000177076 00000 n
+0000177235 00000 n
+0000177394 00000 n
+0000177552 00000 n
+0000177710 00000 n
+0000177869 00000 n
+0000178027 00000 n
+0000178242 00000 n
+0000175549 00000 n
+0000174629 00000 n
+0000178180 00000 n
+0000175686 00000 n
+0000178497 00000 n
+0000190479 00000 n
+0000178724 00000 n
+0000178826 00000 n
+0000190718 00000 n
+0000191439 00000 n
+0000191670 00000 n
+0000205179 00000 n
+0000191992 00000 n
+0000192098 00000 n
+0000205410 00000 n
+0000206158 00000 n
+0000206381 00000 n
+0000217412 00000 n
+0000206527 00000 n
+0000206624 00000 n
+0000217649 00000 n
+0000218324 00000 n
+0000218552 00000 n
+0000219544 00000 n
+0000218595 00000 n
+0000218690 00000 n
+0000219784 00000 n
+0000220386 00000 n
+0000220587 00000 n
+0000220613 00000 n
+0000220639 00000 n
+0000220665 00000 n
+0000220725 00000 n
+0000220820 00000 n
+0000223307 00000 n
+0000221025 00000 n
+0000221128 00000 n
+0000223552 00000 n
+0000224244 00000 n
+0000224451 00000 n
+0000231781 00000 n
+0000224945 00000 n
+0000225061 00000 n
+0000232018 00000 n
+0000232953 00000 n
+0000233154 00000 n
+0000235326 00000 n
+0000233309 00000 n
+0000233414 00000 n
+0000235570 00000 n
+0000236235 00000 n
+0000236442 00000 n
+0000238148 00000 n
+0000236565 00000 n
+0000236671 00000 n
+0000238394 00000 n
+0000239050 00000 n
+0000239258 00000 n
+0000244704 00000 n
+0000239646 00000 n
+0000239766 00000 n
+0000244945 00000 n
+0000245725 00000 n
+0000245927 00000 n
+0000253334 00000 n
+0000246412 00000 n
+0000246535 00000 n
+0000253571 00000 n
+0000254459 00000 n
+0000254659 00000 n
+0000255406 00000 n
+0000254692 00000 n
+0000254786 00000 n
+0000255642 00000 n
+0000256235 00000 n
+0000256434 00000 n
+0000262717 00000 n
+0000256886 00000 n
+0000256996 00000 n
+0000262954 00000 n
+0000263834 00000 n
+0000264035 00000 n
+0000266929 00000 n
+0000264261 00000 n
+0000264366 00000 n
+0000267169 00000 n
+0000267855 00000 n
+0000268056 00000 n
+0000270161 00000 n
+0000268290 00000 n
+0000268395 00000 n
+0000270398 00000 n
+0000271083 00000 n
+0000271284 00000 n
+0000279284 00000 n
+0000271824 00000 n
+0000271955 00000 n
+0000279522 00000 n
+0000280462 00000 n
+0000280664 00000 n
+0000281727 00000 n
+0000280720 00000 n
+0000280820 00000 n
+0000281966 00000 n
+0000282579 00000 n
+0000282781 00000 n
+0000283019 00000 n
+0000283107 00000 n
+0000287863 00000 n
+0000283476 00000 n
+0000283585 00000 n
+0000288102 00000 n
+0000288879 00000 n
+0000289080 00000 n
+0000291792 00000 n
+0000289325 00000 n
+0000289430 00000 n
+0000292029 00000 n
+0000292719 00000 n
+0000292920 00000 n
+0000301841 00000 n
+0000293394 00000 n
+0000293512 00000 n
+0000302079 00000 n
+0000303067 00000 n
+0000303269 00000 n
+0000305276 00000 n
+0000303382 00000 n
+0000303485 00000 n
+0000305515 00000 n
+0000306158 00000 n
+0000306360 00000 n
+0000309059 00000 n
+0000306621 00000 n
+0000306726 00000 n
+0000309297 00000 n
+0000310007 00000 n
+0000310209 00000 n
+0000319867 00000 n
+0000310853 00000 n
+0000310994 00000 n
+0000320106 00000 n
+0000321133 00000 n
+0000321336 00000 n
+0000328528 00000 n
+0000321822 00000 n
+0000321946 00000 n
+0000328765 00000 n
+0000329645 00000 n
+0000329845 00000 n
+0000330891 00000 n
+0000329922 00000 n
+0000330021 00000 n
+0000331128 00000 n
+0000331747 00000 n
+0000331948 00000 n
+0000336992 00000 n
+0000332351 00000 n
+0000332474 00000 n
+0000337230 00000 n
+0000338026 00000 n
+0000338228 00000 n
+0000339602 00000 n
+0000338306 00000 n
+0000338408 00000 n
+0000339838 00000 n
+0000340454 00000 n
+0000340653 00000 n
+0000342887 00000 n
+0000340831 00000 n
+0000340936 00000 n
+0000343125 00000 n
+0000343791 00000 n
+0000343993 00000 n
+0000346657 00000 n
+0000344182 00000 n
+0000344295 00000 n
+0000346896 00000 n
+0000347584 00000 n
+0000347787 00000 n
+0000348828 00000 n
+0000347864 00000 n
+0000347963 00000 n
+0000349066 00000 n
+0000349687 00000 n
+0000349889 00000 n
+0000352076 00000 n
+0000350031 00000 n
+0000350140 00000 n
+0000352315 00000 n
+0000352979 00000 n
+0000361378 00000 n
+0000353182 00000 n
+0000368831 00000 n
+0000361642 00000 n
+0000376227 00000 n
+0000369053 00000 n
+0000384918 00000 n
+0000376449 00000 n
+0000392724 00000 n
+0000385195 00000 n
+0000400113 00000 n
+0000392980 00000 n
+0000407328 00000 n
+0000400353 00000 n
+0000409127 00000 n
+0000409216 00000 n
+0000413978 00000 n
+0000414619 00000 n
+0000415386 00000 n
+0000416186 00000 n
+0000416289 00000 n
+0000416327 00000 n
+0000416455 00000 n
trailer
-<< /Size 799 /Root 797 0 R /Info 798 0 R /ID [ <BAED7C336B1B3BB8FDEEEB3D3DB34A65> <BAED7C336B1B3BB8FDEEEB3D3DB34A65> ] >>
+<< /Size 798 /Root 796 0 R /Info 797 0 R /ID [ <4EF0D81DD2719819B024D64DF5F98F0C> <4EF0D81DD2719819B024D64DF5F98F0C> ] >>
startxref
-413388
+417003
%%EOF
diff --git a/Master/texmf-dist/doc/lualatex/piton/piton-french.tex b/Master/texmf-dist/doc/lualatex/piton/piton-french.tex
index 2794f5acdac..24da3454743 100644
--- a/Master/texmf-dist/doc/lualatex/piton/piton-french.tex
+++ b/Master/texmf-dist/doc/lualatex/piton/piton-french.tex
@@ -15,7 +15,7 @@
end-escape = ! ,
begin-escape-math = \( ,
end-escape-math = \) ,
- detected-commands = highLight
+ detected-commands = { highLight , footnote }
}
@@ -107,21 +107,25 @@ version~\PitonFileVersion\space de \pkg{piton}, à la date du~\PitonFileDate.}}
\maketitle
\begin{abstract}
-L'extension \pkg{piton} propose des outils pour composer des codes informatiques avec coloration syntaxique. Elle
-nécessite l'emploi de la LuaLaTeX car le travail principal est fait en utilisant la bibliothèque Lua LPEG.
+L'extension \pkg{piton} propose des outils pour composer des codes informatiques avec
+coloration syntaxique. Elle nécessite l'emploi de la LuaLaTeX car le travail principal est
+fait en utilisant la bibliothèque Lua LPEG.
\end{abstract}
\section{Présentation}
-L'extension \pkg{piton} utilise la librairie Lua nommée LPEG\footnote{LPEG est une librairie de capture de motifs
- (\emph{pattern-matching} en anglais) pour Lua, écrite en C, fondée sur les PEG (\emph{parsing expression
- grammars}): \url{http://www.inf.puc-rio.br/~roberto/lpeg/}} pour «parser» des listings informatiques avec
-coloriage syntaxique. Comme elle utilise le Lua de LuaLaTeX, elle fonctionne uniquement avec |lualatex|
-(et ne va pas fonctionner avec les autres moteurs de compilation LaTeX, que ce soit |latex|, |pdflatex| ou
-|xelatex|). Elle n'utilise aucun programme extérieur et la compilation ne requiert donc pas |--shell-escape|. La
-compilation est très rapide puisque tout le travail du parseur est fait par la librairie LPEG, écrite en C.
+L'extension \pkg{piton} utilise la librairie Lua nommée LPEG\footnote{LPEG est une
+ librairie de capture de motifs (\emph{pattern-matching} en anglais) pour Lua, écrite en
+ C, fondée sur les PEG (\emph{parsing expression grammars}):
+ \url{http://www.inf.puc-rio.br/~roberto/lpeg/}} pour «parser» des listings informatiques
+avec coloriage syntaxique. Comme elle utilise le Lua de LuaLaTeX, elle fonctionne
+uniquement avec |lualatex| (et ne va pas fonctionner avec les autres moteurs de
+compilation LaTeX, que ce soit |latex|, |pdflatex| ou |xelatex|). Elle n'utilise aucun
+programme extérieur et la compilation ne requiert donc pas |--shell-escape|. La
+compilation est très rapide puisque tout le travail du parseur est fait par la librairie
+LPEG, écrite en C.
\bigskip
Voici un exemple de code Python composé avec l'environnement |{Piton}| proposé par \pkg{piton}.
@@ -149,40 +153,42 @@ def arctan(x,n=10:int):
\end{Piton}
\bigskip
-Les principaux concurrents de l'extension \pkg{piton} sont certainement les extensions bien connues \pkg{listings}
-et \pkg{minted}.
+Les principaux concurrents de l'extension \pkg{piton} sont certainement les extensions
+bien connues \pkg{listings} et \pkg{minted}.
\bigskip
-Le nom de cette extension (\pkg{piton}) a été choisi un peu arbitrairement en référence aux pitons d'alpinisme qui
-servent à gravir les montagnes.
+Le nom de cette extension (\pkg{piton}) a été choisi un peu arbitrairement en référence
+aux pitons d'alpinisme qui servent à gravir les montagnes.
\section{Installation}
-L'extension \pkg{piton} est composée de deux fichiers : |piton.sty| et |piton.lua| (le fichier LaTeX |piton.sty|
-chargé par |\usepackage| va à son tour charger le fichier |piton.lua|). Les deux fichiers doivent être présents
-dans un répertoire où LaTeX pourra les trouver, de préférence dans une arborescence |texmf|. Le mieux reste néanmoins
+L'extension \pkg{piton} est composée de deux fichiers : |piton.sty| et |piton.lua| (le
+fichier LaTeX |piton.sty| chargé par |\usepackage| va à son tour charger le fichier
+|piton.lua|). Les deux fichiers doivent être présents dans un répertoire où LaTeX pourra
+les trouver, de préférence dans une arborescence |texmf|. Le mieux reste néanmoins
d'installer \pkg{piton} avec une distribution TeX comme MiKTeX, TeX~Live ou MacTeX.
\section{Utilisation de l'extension}
-L'extension \pkg{piton} n'est utilisable qu'avec LuaLaTeX : si un autre moteur de compilation (comme |latex|,
-|pdflatex| ou |xelatex|) est utilisé, une erreur fatale sera levée.
+L'extension \pkg{piton} n'est utilisable qu'avec LuaLaTeX : si un autre moteur de
+compilation (comme |latex|, |pdflatex| ou |xelatex|) est utilisé, une erreur fatale sera
+levée.
\subsection{Choix du langage}
Les langages informatiques pris en charge par \pkg{piton} se classent en deux catégories :
\begin{itemize}
-\item les langages reconnus nativement par \pkg{piton} qui sont au nombre de cinq : Python, OCaml, SQL, C (ou
-plutôt \CC) et un langage nommé |minimal|\footnote{Le langage |minimal| peut servir pour formater du pseudo-code
- : cf.~p.~\pageref{minimal}.} ;
+\item les langages reconnus nativement par \pkg{piton} qui sont au nombre de cinq :
+Python, OCaml, SQL, C (ou plutôt \CC) et un langage nommé |minimal|\footnote{Le langage
+ |minimal| peut servir pour formater du pseudo-code : cf.~p.~\pageref{minimal}.} ;
\item les langages définis par l'utilisateur avec la commande |\NewPitonLanguage| décrite
-p.~\pageref{NewPitonLanguage} (les parseurs de ces langages ne pourront jamais être aussi précis que ceux proposés
-nativement par \pkg{piton)}.
+p.~\pageref{NewPitonLanguage} (les parseurs de ces langages ne pourront jamais être aussi
+précis que ceux proposés nativement par \pkg{piton)}.
\end{itemize}
@@ -197,15 +203,16 @@ On peut changer de langage avec la clé |language| de |\PitonOptions| :
|\PitonOptions{language = OCaml}|
\smallskip
-En fait, le nom des langages, pour \pkg{piton}, est toujours \textbf{insensible à la casse}. Dans cet exemple, on
-aurait tout aussi bien pu écrire |Ocaml| ou |ocaml|.
+En fait, le nom des langages, pour \pkg{piton}, est toujours \textbf{insensible à la
+ casse}. Dans cet exemple, on aurait tout aussi bien pu écrire |Ocaml| ou |ocaml|.
\smallskip
-Pour les développeurs, précisons que le nom du langage courant est stocké (en minuscules) dans la variable publique
-L3 nommée |\l_piton_language_str|.
+Pour les développeurs, précisons que le nom du langage courant est stocké (en minuscules)
+dans la variable publique L3 nommée |\l_piton_language_str|.
\smallskip
-Dans la suite de ce document, on parlera de Python mais les fonctionnalités s'appliquent aussi aux autres langages.
+Dans la suite de ce document, on parlera de Python mais les fonctionnalités s'appliquent
+aussi aux autres langages.
@@ -215,21 +222,21 @@ Dans la suite de ce document, on parlera de Python mais les fonctionnalités s'a
L'extension \pkg{piton} se charge simplement avec |\usepackage{piton}|.
\smallskip
-Si, à la fin du prambule, l'extension \pkg{xcolor} n'a pas été chargée (par l'utilisateur ou par une extension
-chargée dans le préambule), \pkg{piton} charge l'extension \pkg{xcolor} avec |\usepackage{xcolor}|, c'est-à-dire
-sans aucune option. L'extension \pkg{piton} ne charge pas d'autre extension. Elle n'utilise pas de programme
-extérieur.
+Si, à la fin du prambule, l'extension \pkg{xcolor} n'a pas été chargée (par l'utilisateur
+ou par une extension chargée dans le préambule), \pkg{piton} charge l'extension
+\pkg{xcolor} avec |\usepackage{xcolor}|, c'est-à-dire sans aucune option. L'extension
+\pkg{piton} ne charge pas d'autre extension. Elle n'utilise pas de programme extérieur.
\subsection{Les commandes et environnements à la disposition de l'utilisateur}
\indexenv{Piton}
-L'extension \pkg{piton} fournit plusieurs outils pour composer du code Python: les commandes |\piton|,
-l'environnement |{Piton}| et la commande |\PitonInputFile|.
+L'extension \pkg{piton} fournit plusieurs outils pour composer du code Python: les
+commandes |\piton|, l'environnement |{Piton}| et la commande |\PitonInputFile|.
\begin{itemize} \setlength{\fboxsep}{1pt}
-\item La commande \colorbox{gray!20}{\ttfamily \textbackslash piton} doit être utilisée pour composer de petits éléments de code à l'intérieur d'un
-paragraphe. Par exemple :
+\item La commande \colorbox{gray!20}{\ttfamily \textbackslash piton} doit être utilisée
+pour composer de petits éléments de code à l'intérieur d'un paragraphe. Par exemple :
{\color{gray}\verb|\piton{def carré(x): return x*x}|}\qquad
\piton{def carré(x): return x*x}
@@ -237,26 +244,28 @@ paragraphe. Par exemple :
La syntaxe et les particularités de la commande sont détaillées ci-après.
-\item L'environnement \colorbox{gray!20}{\ttfamily \{Piton\}} doit être utilisé pour composer des codes de
-plusieurs lignes. Comme cet environnement prend son argument selon un mode verbatim, il ne peut pas être utilisé
-dans l'argument d'une commande LaTeX. Pour les besoins de personnalisation, il est possible de définir de nouveaux
-environnements similaires à |{Piton}| en utilisant la commande \DefinitionCommand{NewPitonEnvironment} : cf. partie
-\ref{NewPitonEnvironment} p.~\pageref{NewPitonEnvironment}.
+\item L'environnement \colorbox{gray!20}{\ttfamily \{Piton\}} doit être utilisé pour
+composer des codes de plusieurs lignes. Comme cet environnement prend son argument selon
+un mode verbatim, il ne peut pas être utilisé dans l'argument d'une commande LaTeX. Pour
+les besoins de personnalisation, il est possible de définir de nouveaux environnements
+similaires à |{Piton}| en utilisant la commande \DefinitionCommand{NewPitonEnvironment} :
+cf. partie \ref{NewPitonEnvironment} p.~\pageref{NewPitonEnvironment}.
-\item La commande \colorbox{gray!20}{\ttfamily \textbackslash PitonInputFile} doit être utilisée pour insérer et
-composer un fichier externe.
+\item La commande \colorbox{gray!20}{\ttfamily \textbackslash PitonInputFile} doit être
+utilisée pour insérer et composer un fichier externe.
Il est possible de n'insérer qu'une partie de ce fichier : cf. partie~\ref{part-of-a-file},
p.~\pageref{part-of-a-file}.
-La clé \Definition{path} de la commande |\PitonOptions| permet de spécifier une \emph{liste} de chemins où sera
-recherché le fichier à inclure (dans cette liste, les chemins sont séparés par des virgules).
+La clé \Definition{path} de la commande |\PitonOptions| permet de spécifier une
+\emph{liste} de chemins où sera recherché le fichier à inclure (dans cette liste, les
+chemins sont séparés par des virgules).
-L'extension \pkg{piton} propose aussi des commandes \colorbox{gray!20}{\ttfamily\textbackslash PitonInputFileT},
-\colorbox{gray!20}{\ttfamily \textbackslash PitonInputFileF} et
-\colorbox{gray!20}{\ttfamily \textbackslash PitonInputFileTF} avec des arguments correspondant aux lettres |T| et
-|F|, arguments qui seront executés dans le
-cas où le fichier a été trouvé (lettre |T|) ou pas (lettre |F|).
+L'extension \pkg{piton} propose aussi des commandes
+\colorbox{gray!20}{\ttfamily\textbackslash PitonInputFileT}, \colorbox{gray!20}{\ttfamily
+ \textbackslash PitonInputFileF} et \colorbox{gray!20}{\ttfamily \textbackslash
+ PitonInputFileTF} avec des arguments correspondant aux lettres |T| et |F|, arguments qui
+seront executés dans le cas où le fichier a été trouvé (lettre |T|) ou pas (lettre |F|).
\end{itemize}
@@ -265,19 +274,23 @@ cas où le fichier a été trouvé (lettre |T|) ou pas (lettre |F|).
\indexcommand{piton}
-La commande |\piton| possède en fait une syntaxe double. Elle est peut être utilisée comme une commande standard de
-LaTeX prenant son argument entre accolades (|\piton{...}|), ou bien selon la syntaxe de la commande |\verb| où l'argument est
-délimité entre deux caractères identiques (par ex. : \verb!\piton|...|!). On détaille maintenant ces deux syntaxes.
+La commande |\piton| possède en fait une syntaxe double. Elle est peut être utilisée comme
+une commande standard de LaTeX prenant son argument entre accolades (|\piton{...}|), ou
+bien selon la syntaxe de la commande
+|\verb| où l'argument est délimité entre deux caractères
+identiques (par ex. : \verb!\piton|...|!).
+On détaille maintenant ces deux syntaxes.
\bigskip
\begin{itemize}
\item {\color{blue} \textsf{Syntaxe} \verb|\piton{...}|}\par\nobreak
-Quand son argument est donné entre accolades, la commande |\piton| ne prend pas son argument en mode verbatim. Les
-points suivants doivent être remarqués :
+Quand son argument est donné entre accolades, la commande |\piton| ne prend pas son
+argument en mode verbatim. Les points suivants doivent être remarqués :
\begin{itemize}
-\item plusieurs espaces successives sont remplacées par une unique espace, ainsi que les retours à la ligne
+\item plusieurs espaces successives sont remplacées par une unique espace, ainsi que les
+retours à la ligne
{\color{cyan} mais la commande |\|⣠est fournie pour forcer l'insertion d'une espace} ;
@@ -287,7 +300,8 @@ points suivants doivent être remarqués :
\item les accolades doivent apparaître par paires correctement imbriquées,
-{\color{cyan} mais les commandes |\{| et |\}| sont aussi fournies pour insérer des accolades individuelles} ;
+{\color{cyan} mais les commandes |\{| et |\}| sont aussi fournies pour insérer des
+ accolades individuelles} ;
\item les commandes LaTeX\footnote{Cela s'applique aux commandes commençant par une contre-oblique |\| mais
également aux caractères actifs, c'est-à-dire ceux de catcode~13.} sont complètement développées sans être
@@ -316,16 +330,16 @@ et |@|) doivent être insérés sans contre-oblique.
\end{tabular}
\bigskip
-La commande |\piton| avec son argument entre accolades peut être utilisée dans les arguments des autres commandes LaTeX.\footnote{La commande
- |\piton| peut par exemple être
+La commande |\piton| avec son argument entre accolades peut être utilisée dans les
+arguments des autres commandes LaTeX.\footnote{La commande |\piton| peut par exemple être
utilisée dans une note de bas de page. Exemple : \piton{s = 'Une chaîne'}.}
\bigskip
\item {\color{blue} \textsf{Syntaxe} \verb!\piton|...|!}\par\nobreak
-Quand la commande |\piton| prend son argument entre deux caractères identiques, cet argument est pris \emph{en mode
- verbatim}. De ce fait, avec cette syntaxe, la commande |\piton| ne peut \emph{pas} être utilisée dans l'argument d'une
-autre fonction.
+Quand la commande |\piton| prend son argument entre deux caractères identiques, cet
+argument est pris \emph{en mode verbatim}. De ce fait, avec cette syntaxe, la commande
+|\piton| ne peut \emph{pas} être utilisée dans l'argument d'une autre fonction.
\medskip
\begin{tabular}{>{\color{gray}}w{l}{75mm}@{\hspace*{1cm}}l}
@@ -347,85 +361,108 @@ autre fonction.
\section{Personnalisation}
-Concernant la fonte de caractères utilisée dans les listings produits par l'extension \pkg{piton}, il s'agit
-simplement de la fonte mono-chasse courante (\pkg{piton} utilise simplement en interne la commande LaTeX standard
-|\ttfamily|). Pour la changer, le mieux est d'utiliser |\setmonofont| de \pkg{fontspec}.
+Concernant la fonte de caractères utilisée dans les listings produits par l'extension
+\pkg{piton}, il s'agit simplement de la fonte mono-chasse courante (\pkg{piton} utilise
+simplement en interne la commande LaTeX standard |\ttfamily|). Pour la changer, le mieux
+est d'utiliser |\setmonofont| de \pkg{fontspec}.
\subsection{Les clés de la commande \textbackslash PitonOptions}
\indexcommand{PitonOptions}
-La commande |\PitonOptions| prend en argument une liste de couples \textsl{clé=valeur}. La portée des réglages
-effectués par cette commande est le groupe TeX courant.\footnote{On rappelle que tout environnement LaTeX est, en
- particulier, un groupe.}
+La commande |\PitonOptions| prend en argument une liste de couples \textsl{clé=valeur}. La
+portée des réglages effectués par cette commande est le groupe TeX courant.\footnote{On
+ rappelle que tout environnement LaTeX est, en particulier, un groupe.}
-Ces clés peuvent aussi être appliquées à un environnement |{Piton}| individuel (entre crochets).
+Ces clés peuvent aussi être appliquées à un environnement |{Piton}| individuel (entre
+crochets).
\begin{itemize}
-\item La clé \Definition{language} spécifie le langage informatique considéré (la casse n'est pas prise en compte).
-Cinq valeurs sont possibles : |Python|, |OCaml|, |C|, |SQL| et |minimal|. La valeur initiale est |Python|.
+\item La clé \Definition{language} spécifie le langage informatique considéré (la casse
+n'est pas prise en compte). On peut choisir l'un des cinq langages prédéfinis (|Python|,
+|OCaml|, |C|, |SQL| et |minimal|) ou bien le nom d'un langage défini par l'utilisateur
+avec |\NewPitonLanguage| (voir partie~\ref{NewPitonLanguage}, p.~\pageref{NewPitonLanguage}).
+
+La valeur initiale est |Python|.
\item \index{path} La clé \Definition{path} indique un chemin où seront cherchés les fichiers inclus par
|\PitonInputFile|.
-\item \index{gobble}\label{gobble} La clé \Definition{gobble} prend comme valeur un entier positif $n$ : les $n$
-premiers caractères de chaque ligne sont alors retirés (avant formatage du code) dans les environnements |{Piton}|.
-Ces $n$ caractères ne sont pas nécessairement des espaces.
-
-\item \index{auto-gobble}\index{gobble!auto-gobble} Quand la clé \Definition{auto-gobble} est activée, l'extension \pkg{piton} détermine la valeur minimale $n$
-du nombre d'espaces successifs débutant chaque ligne (non vide) de l'environnement |{Piton}| et applique |gobble|
-avec cette valeur de~$n$.
-
-\item \index{env-gobble}\index{gobble!env-gobble} Quand la clé \Definition{env-gobble} est activée, \pkg{piton}
-analyse la dernière ligne de l'environnement, c'est-à-dire celle qui contient le |\end{Piton}| et détermine si
-cette ligne ne comporte que des espaces suivis par |\end{Piton}|. Si c'est le cas, \pkg{piton} calcule le nombre
-$n$ de ces espaces et applique |gobble| avec cette valeur de~$n$. Le nom de cette clé vient de \emph{environment
- gobble}: le nombre d'espaces à retirer ne dépend que de la position des délimiteurs |\begin{Piton}| et
-|\end{Piton}| de l'environnement.
-
-\item \index{write} La clé \Definition{write} prend en argument un nom de fichier (avec l'extension) et écrit le
-contenu\footnote{En fait, il ne s'agit pas exactement du contenu de l'environnement mais de la valeur renvoyée par
- l'instruction Lua
- |piton.get_last_code()| qui en est une version sans les surcharges de formatage LaTeX (voir la partie \ref{API}, p.~\pageref{API}).} de l'environnement courant dans ce fichier. À la première utilisation du fichier par \pkg{piton}, celui-ci
-est effacé.
-
-\item \index{path-write} La clé \Definition{path-write} indique un chemin où seront écrits les fichiers écrits par
-l'emploi de la clé |write| précédente.
-
-\item \index{line-numbers} La clé \Definition{line-numbers} active la numérotation des lignes (en débordement à
-gauche) dans les environnements |{Piton}| et dans les listings produits par la commande |\PitonInputFile|.
+\item \index{gobble}\label{gobble} La clé \Definition{gobble} prend comme valeur un entier
+positif $n$ : les $n$ premiers caractères de chaque ligne sont alors retirés (avant
+formatage du code) dans les environnements |{Piton}|. Ces $n$ caractères ne sont pas
+nécessairement des espaces.
+
+\item \index{auto-gobble}\index{gobble!auto-gobble} Quand la clé \Definition{auto-gobble}
+est activée, l'extension \pkg{piton} détermine la valeur minimale $n$ du nombre d'espaces
+successifs débutant chaque ligne (non vide) de l'environnement |{Piton}| et applique
+|gobble| avec cette valeur de~$n$.
+
+\item \index{env-gobble}\index{gobble!env-gobble} Quand la clé \Definition{env-gobble} est
+activée, \pkg{piton} analyse la dernière ligne de l'environnement, c'est-à-dire celle qui
+contient le |\end{Piton}| et détermine si cette ligne ne comporte que des espaces suivis
+par |\end{Piton}|. Si c'est le cas, \pkg{piton} calcule le nombre $n$ de ces espaces et
+applique |gobble| avec cette valeur de~$n$. Le nom de cette clé vient de \emph{environment
+ gobble}: le nombre d'espaces à retirer ne dépend que de la position des délimiteurs
+|\begin{Piton}| et |\end{Piton}| de l'environnement.
+
+\item \index{write} La clé \Definition{write} prend en argument un nom de fichier (avec
+l'extension) et écrit le contenu\footnote{En fait, il ne s'agit pas exactement du contenu
+ de l'environnement mais de la valeur renvoyée par l'instruction Lua
+ |piton.get_last_code()| qui en est une version sans les surcharges de formatage LaTeX
+ (voir la partie \ref{API}, p.~\pageref{API}).} de l'environnement courant dans ce
+fichier. À la première utilisation du fichier par \pkg{piton}, celui-ci est effacé.
+
+\item \index{path-write} La clé \Definition{path-write} indique un chemin où seront écrits
+les fichiers écrits par l'emploi de la clé |write| précédente.
+
+\item \index{line-numbers} La clé \Definition{line-numbers} active la numérotation des
+lignes (en débordement à gauche) dans les environnements |{Piton}| et dans les listings
+produits par la commande |\PitonInputFile|.
Cette clé propose en fait plusieurs sous-clés.
\begin{itemize}
-\item La clé \Definition{line-numbers/skip-empty-lines} demande que les lignes vides (qui ne contiennent que des
-espaces) soient considérées comme non existantes en ce qui concerne la numérotation des lignes (si la clé
-|/absolute|, décrite plus bas, est active, la clé |/skip-empty-lines| n'a pas d'effet dans |\PitonInputFile|). La
-valeur initiale de cette clé est |true| (et non |false|).\footnote{Avec le langage Python, les lignes vides des \emph{docstrings} sont
- prises en compte.}
-
-\item La clé \Definition{line-numbers/label-empty-lines} demande que les labels (c'est-à-dire les numéros) des
-lignes vides soient affichés. Si la clé |/skip-empty-lines| est active, la clé |/label-empty-lines| est sans effet.
-La valeur initiale de cette clé est |true|.\footnote{Quand la clé |split-on-empty-lines| est activée, les labels des
+\item La clé \Definition{line-numbers/skip-empty-lines} demande que les lignes vides (qui
+ne contiennent que des espaces) soient considérées comme non existantes en ce qui concerne
+la numérotation des lignes (si la clé |/absolute|, décrite plus bas, est active, la clé
+|/skip-empty-lines| n'a pas d'effet dans |\PitonInputFile|). La valeur initiale de cette
+clé est |true| (et non |false|).\footnote{Avec le langage Python, les lignes vides des
+ \emph{docstrings} sont prises en compte.}
+
+\item La clé \Definition{line-numbers/label-empty-lines} demande que les labels
+(c'est-à-dire les numéros) des lignes vides soient affichés. Si la clé |/skip-empty-lines|
+est active, la clé |/label-empty-lines| est sans effet. La valeur initiale de cette clé
+est |true|.\footnote{Quand la clé |split-on-empty-lines| est activée, les labels des
lignes vides ne sont jamais imprimés.}
-\item La clé \Definition{line-numbers/absolute} demande, pour les listings générés par |\PitonInputFile|, que les
-numéros de lignes affichés soient absolus (c'est-à-dire ceux du fichier d'origine). Elle n'a d'intérêt que si on
-n'insère qu'une partie du fichier (cf. partie~\ref{part-of-a-file}, p.~\pageref{part-of-a-file}). La clé
-|/absolute| est sans effet dans les environnements |{Piton}|.
+\item La clé \Definition{line-numbers/absolute} demande, pour les listings générés par
+|\PitonInputFile|, que les numéros de lignes affichés soient absolus (c'est-à-dire ceux du
+fichier d'origine). Elle n'a d'intérêt que si on n'insère qu'une partie du fichier (cf.
+partie~\ref{part-of-a-file}, p.~\pageref{part-of-a-file}). La clé |/absolute| est sans
+effet dans les environnements |{Piton}|.
-\item La clé \Definition{line-numbers/resume} reprend la numérotation là où elle avait été laissée au dernier
-listing. En fait, la clé |line-numbers/resume| a un alias, qui est |resume| tout court (car on peut être amené à
-l'utiliser souvent).
+\item La clé \Definition{line-numbers/resume} reprend la numérotation là où elle avait été
+laissée au dernier listing. En fait, la clé |line-numbers/resume| a un alias, qui est
+|resume| tout court (car on peut être amené à l'utiliser souvent).
-\item La clé \Definition{line-numbers/start} impose que la numérotation commence à ce numéro.
+\item La clé \Definition{line-numbers/start} impose que la numérotation commence à ce
+numéro.
-\item La clé \Definition{line-numbers/sep} est la distance horizontale entre les numéros de lignes (insérés par
-|line-numbers|) et les lignes du code informatique. La valeur initiale est 0.7~em.
+\item La clé \Definition{line-numbers/sep} est la distance horizontale entre les numéros
+de lignes (insérés par |line-numbers|) et les lignes du code informatique. La valeur
+initiale est 0.7~em.
+
+\item \colorbox{yellow!50}{\bfseries Nouveau 3.1}\enskip
+La clé \Definition{line-numbers/format} est une liste de tokens qui est insérée avant le
+numéro de ligne pour le formater. Il est possible de mettre \emph{en dernière position} de
+cette liste une commande LaTeX à un argument comme |\fbox|.
+
+La valeur initiale est |\footnotesize \color{gray}|.
\end{itemize}
-Pour la commodité, un dispositif de factorisation du préfixe |line-numbers| est disponible, c'est-à-dire que l'on
-peut écrire :
+Pour la commodité, un dispositif de factorisation du préfixe |line-numbers| est
+disponible, c'est-à-dire que l'on peut écrire :
\begin{Verbatim}
\PitonOptions
@@ -434,53 +471,71 @@ peut écrire :
{
skip-empty-lines = false ,
label-empty-lines = false ,
- sep = 1 em
+ sep = 1 em ,
+ line-format = \footnotesize \color{blue}
}
}
\end{Verbatim}
-\item \index{left-margin} La clé \Definition{left-margin} fixe une marge sur la gauche. Cette clé peut être utile, en particulier, en
-conjonction avec la clé |line-numbers| si on ne souhaite pas que les numéros de ligne soient dans une position en
-débordement sur la gauche.
+\item \index{left-margin} La clé \Definition{left-margin} fixe une marge sur la gauche.
+Cette clé peut être utile, en particulier, en conjonction avec la clé |line-numbers| si on
+ne souhaite pas que les numéros de ligne soient dans une position en débordement sur la
+gauche.
-Il est possible de donner à la clé |left-margin| la valeur spéciale~|auto|. Avec cette valeur, une marge est
-insérée automatiquement pour les numéros de ligne quand la clé |line-numbers| est utilisée. Voir un exemple à la
-partie \ref{example-numbering} p.~\pageref{example-numbering}.
+Il est possible de donner à la clé |left-margin| la valeur spéciale~|auto|. Avec cette
+valeur, une marge est insérée automatiquement pour les numéros de ligne quand la clé
+|line-numbers| est utilisée. Voir un exemple à la partie \ref{example-numbering}
+p.~\pageref{example-numbering}.
-\item \index{background-color} La clé \Definition{background-color} fixe la couleur de fond des environnements |{Piton}| et des listings
-produits par |\PitonInputFile| (ce fond a une largeur que l'on peut fixer avec la clé |width| décrite ci-dessous).
-La clé |background-color| accepte une couleur définie «à la volée», c'est-à-dire que l'on peut écrire par exemple
-|background-color = [cmyk]{0.1,0.05,0,0}|
+\item \index{background-color} La clé \Definition{background-color} fixe la couleur de
+fond des environnements |{Piton}| et des listings produits par |\PitonInputFile| (ce fond
+a une largeur que l'on peut fixer avec la clé |width| décrite ci-dessous). La clé
+|background-color| accepte une couleur définie «à la volée», c'est-à-dire que l'on peut
+écrire par exemple |background-color = [cmyk]{0.1,0.05,0,0}|
\smallskip
-La clé |background-color| accepte aussi en argument une \emph{liste} de couleurs. Les lignes sont alors coloriées
-de manière cyclique avec ces couleurs.
+La clé |background-color| accepte aussi en argument une \emph{liste} de couleurs. Les
+lignes sont alors coloriées de manière cyclique avec ces couleurs.
\emph{Exemple} : |\PitonOptions{background-color = {gray!5,white}}|
-\item \index{prompt-background-color} Avec la clé \Definition{prompt-background-color}, \pkg{piton} ajoute un fond coloré aux lignes débutant par
-le prompt «|>>>|» (et sa continuation «|...|») caractéristique des consoles Python avec boucle \textsc{repl}
-(\emph{read-eval-print loop}). Pour un exemple d'utilisation de cette clé, voir la partie \ref{pythonrepl}
-p.~\pageref{pythonrepl}.
-
-\item \index{width} La clé \Definition{width} fixe la largeur du listing produit. Cette largeur s'applique aux fonds colorés
-spécifiés par les clés |background-color| et |prompt-background-color| et également quand une coupure automatique
-des lignes est demandée par |break-lines| (cf.~\ref{line-breaks}, p.~\pageref{line-breaks}).
-
-Cette clé peut prendre comme valeur une longueur explicite mais aussi la valeur spéciale~|min|. Avec cette valeur,
-la largeur sera calculée à partir de la largeur maximale des lignes de code. Attention : l'usage de cette valeur
-spéciale~|min| requiert deux compilations LuaLaTeX\footnote{La largeur maximale est calculée lors de la première
-compilation, écrite sur le fichier~|aux|, puis réutilisée lors de la compilation suivante. Certains outils comme
-|latexmk| (utilisé par Overleaf) effectuent automatiquement un nombre suffisant de compilations.}.
-
-Pour un exemple d'utilisation de |width=min|, voir la partie~\ref{example-comments} sur les exemples, p.~\pageref{example-comments}.
-
-\item \index{show-spaces-in-strings} En activant la clé \Definition{show-spaces-in-strings}, les espaces dans les
-chaînes de caractères\footnote{Pour le language Python, cela ne s'applique que pour les chaînes courtes, c'est-à-dire
-celles délimitées par~\verb|'| ou~\verb|"|. En OCaml, cela ne s'applique pas pour les \emph{quoted strings}.} sont
-matérialisés par le caractère ⣠(U+2423 : \textsc{open box}). Bien sûr, le caractère U+2423 doit être présent dans la fonte mono-chasse utilisée.\footnote{L'extension \pkg{piton} utilise
- simplement la fonte mono-chasse courante. Pour la changer, le mieux est d'utiliser |\setmonofont| de
+\smallskip
+Si la clé |split-on-empty-lines| est utilisée (voir la partie «Coupure de pages»,
+p.~\pageref{coupure-de-pages}), les lignes de séparation entre morceaux de code générés
+par cette clé n'ont pas de fond coloré (au moins avec la valeur initiale du paramètre
+|split-separation|).
+
+\item \index{prompt-background-color} Avec la clé \Definition{prompt-background-color},
+\pkg{piton} ajoute un fond coloré aux lignes débutant par le prompt «|>>>|» (et sa
+continuation «|...|») caractéristique des consoles Python avec boucle \textsc{repl}
+(\emph{read-eval-print loop}). Pour un exemple d'utilisation de cette clé, voir la partie
+\ref{pythonrepl} p.~\pageref{pythonrepl}.
+
+\item \index{width} La clé \Definition{width} fixe la largeur du listing produit. Cette
+largeur s'applique aux fonds colorés spécifiés par les clés |background-color| et
+|prompt-background-color| et également quand une coupure automatique des lignes est
+demandée par |break-lines| (cf.~\ref{line-breaks}, p.~\pageref{line-breaks}).
+
+Cette clé peut prendre comme valeur une longueur explicite mais aussi la valeur
+spéciale~|min|. Avec cette valeur, la largeur sera calculée à partir de la largeur
+maximale des lignes de code. Attention : l'usage de cette valeur spéciale~|min| requiert
+deux compilations LuaLaTeX\footnote{La largeur maximale est calculée lors de la première
+ compilation, écrite sur le fichier~|aux|, puis réutilisée lors de la compilation
+ suivante. Certains outils comme |latexmk| (utilisé par Overleaf) effectuent
+ automatiquement un nombre suffisant de compilations.}.
+
+Pour un exemple d'utilisation de |width=min|, voir la partie~\ref{example-comments} sur
+les exemples, p.~\pageref{example-comments}.
+
+\item \index{show-spaces-in-strings} En activant la clé
+\Definition{show-spaces-in-strings}, les espaces dans les chaînes de
+caractères\footnote{Pour le language Python, cela ne s'applique que pour les chaînes
+ courtes, c'est-à-dire celles délimitées par~\verb|'| ou~\verb|"|. En OCaml, cela ne
+ s'applique pas pour les \emph{quoted strings}.} sont matérialisés par le caractère â£
+(U+2423 : \textsc{open box}). Bien sûr, le caractère U+2423 doit être présent dans la
+fonte mono-chasse utilisée.\footnote{L'extension \pkg{piton} utilise simplement la fonte
+ mono-chasse courante. Pour la changer, le mieux est d'utiliser |\setmonofont| de
\pkg{fontspec}.}\par\nobreak
%
\begingroup
@@ -488,10 +543,12 @@ matérialisés par le caractère ⣠(U+2423 : \textsc{open box}). Bien sûr, le
Exemple : \piton{my_string = 'Très bonne réponse'}
\endgroup
-\item \index{show-spaces} Avec la clé \Definition{show-spaces}, tous les espaces sont matérialisés (et aucune
-coupure de ligne ne peut plus intervenir sur ces espaces matérialisés, même si la clé |break-lines|\footnote{cf.
- \ref{line-breaks} p.~\pageref{line-breaks}.} est active). Il faut néanmoins remarquer que les espaces en fin de
-ligne sont tous supprimés par \pkg{piton}. Les tabulations de début de ligne sont représentées par des flèches.
+\item \index{show-spaces} Avec la clé \Definition{show-spaces}, tous les espaces sont
+matérialisés (et aucune coupure de ligne ne peut plus intervenir sur ces espaces
+matérialisés, même si la clé |break-lines|\footnote{cf. \ref{line-breaks}
+ p.~\pageref{line-breaks}.} est active). Il faut néanmoins remarquer que les espaces en
+fin de ligne sont tous supprimés par \pkg{piton}. Les tabulations de début de ligne sont
+représentées par des flèches.
\end{itemize}
\bigskip
@@ -544,8 +601,8 @@ ligne sont tous supprimés par \pkg{piton}. Les tabulations de début de ligne s
\bigskip
-La commande |\PitonOptions| propose d'autres clés qui seront décrites plus loin (voir en particulier la coupure des
-pages et des lignes p.~\pageref{breakable}).
+La commande |\PitonOptions| propose d'autres clés qui seront décrites plus loin (voir en
+particulier la coupure des pages et des lignes p.~\pageref{breakable}).
\subsection{Les styles}
@@ -555,32 +612,35 @@ pages et des lignes p.~\pageref{breakable}).
\subsubsection{Notion de style}
-L'extension \pkg{piton} fournit la commande |\SetPitonStyle| pour personnaliser les différents styles utilisés pour
-formater les éléments syntaxiques des listings Python. Ces personnalisations ont une portée qui correspond au
-groupe TeX courant.\footnote{On rappelle que tout environnement LaTeX est, en particulier, un groupe.}
+L'extension \pkg{piton} fournit la commande |\SetPitonStyle| pour personnaliser les
+différents styles utilisés pour formater les éléments syntaxiques des listings Python. Ces
+personnalisations ont une portée qui correspond au groupe TeX courant.\footnote{On
+ rappelle que tout environnement LaTeX est, en particulier, un groupe.}
\bigskip
-\indexcommand{SetPitonStyle}
-La commande |\SetPitonStyle| prend en argument une liste de couples \textsl{clé=valeur}. Les clés sont les noms des
-styles et les valeurs sont les instructions LaTeX de formatage correspondantes.
+\indexcommand{SetPitonStyle} La commande |\SetPitonStyle| prend en argument une liste de
+couples \textsl{clé=valeur}. Les clés sont les noms des styles et les valeurs sont les
+instructions LaTeX de formatage correspondantes.
\bigskip
-Ces instructions LaTeX doivent être des instructions de formatage du type de |\bfseries|, |\slshape|,
-|\color{...}|, etc. (les commandes de ce type sont parfois qualifiées de \emph{semi-globales}). Il est aussi
-possible de mettre, \emph{à la fin de la liste d'instructions}, une commande LaTeX prenant exactement un argument.
+Ces instructions LaTeX doivent être des instructions de formatage du type de |\bfseries|,
+|\slshape|, |\color{...}|, etc. (les commandes de ce type sont parfois qualifiées de
+\emph{semi-globales}). Il est aussi possible de mettre, \emph{à la fin de la liste
+ d'instructions}, une commande LaTeX prenant exactement un argument.
\bigskip
-Voici un exemple qui change le style utilisé pour le nom d'une fonction Python, au moment de sa définition
-(c'est-à-dire après le mot-clé |def|). Elle utilise la commande |\highLight| de \pkg{lua-ul} (qui nécessite
-lui-même le chargement de \pkg{luacolor}).
+Voici un exemple qui change le style utilisé pour le nom d'une fonction Python, au moment
+de sa définition (c'est-à-dire après le mot-clé |def|). Elle utilise la commande
+|\highLight| de \pkg{lua-ul} (qui nécessite lui-même le chargement de \pkg{luacolor}).
\begin{Verbatim}
\SetPitonStyle
{ Name.Function = \bfseries \hightLight[red!50] }
\end{Verbatim}
-Ici, |\highLight[red!50]| doit être considéré comme le nom d'une fonction LaTeX qui prend exactement un argument,
-puisque, habituellement, elle est utilisée avec |\highLight[red!50]{|\texttt{\slshape text}|}|.
+Ici, |\highLight[red!50]| doit être considéré comme le nom d'une fonction LaTeX qui prend
+exactement un argument, puisque, habituellement, elle est utilisée avec
+|\highLight[red!50]{|\texttt{\slshape text}|}|.
\medskip
\begingroup
@@ -591,57 +651,62 @@ Avec ce réglage, on obtient : \piton{def cube(x) : return x * x * x }
\bigskip
-L'usage des différents styles suivant le langage informatique considéré est décrit dans la partie \ref{Semantic}, à
-partir de la page \pageref{Semantic}.
+L'usage des différents styles suivant le langage informatique considéré est décrit dans la
+partie \ref{Semantic}, à partir de la page \pageref{Semantic}.
\bigskip
-\indexcommand{PitonStyle}
-La commande \DefinitionCommand{PitonStyle} prend en argument le nom d'un style et permet de récupérer la valeur (en
-tant que liste d'instructions LaTeX) de ce style.
+\indexcommand{PitonStyle} La commande \DefinitionCommand{PitonStyle} prend en argument le
+nom d'un style et permet de récupérer la valeur (en tant que liste d'instructions LaTeX)
+de ce style.
\smallskip
-Par exemple, on peut écrire, dans le texte courant, |{\PitonStyle{Keyword}{function}}| et on aura
-le mot {\PitonStyle{Keyword}{function}} formaté comme un mot-clé.
+Par exemple, on peut écrire, dans le texte courant, |{\PitonStyle{Keyword}{function}}| et
+on aura le mot {\PitonStyle{Keyword}{function}} formaté comme un mot-clé.
\smallskip
-La syntaxe |{\PitonStyle{|\textsl{\texttt{style}}|}{...}}| est nécessaire pour pouvoir tenir compte à la fois des commandes
-semi-globales et des commandes à argument présentes dans la valeur courante du style \texttt{\textsl{style}}.
+La syntaxe |{\PitonStyle{|\textsl{\texttt{style}}|}{...}}| est nécessaire pour pouvoir
+tenir compte à la fois des commandes semi-globales et des commandes à argument présentes
+dans la valeur courante du style \texttt{\textsl{style}}.
\subsubsection{Styles locaux et globaux}
-Un style peut être défini de manière globale avec la commande |\SetPitonStyle|. Cela veut dire qu'il s'appliquera
-par défaut à tous les langages informatiques qui utilisent ce style.
+Un style peut être défini de manière globale avec la commande |\SetPitonStyle|. Cela veut
+dire qu'il s'appliquera par défaut à tous les langages informatiques qui utilisent ce
+style.
\medskip
Par exemple, avec la commande
\begin{Verbatim}
\SetPitonStyle{Comment = \color{gray}}
\end{Verbatim}
-tous les commentaires (que ce soit en Python, en C, en OCaml, etc. ou dans un langage défini avec
-|\NewPitonLanguage|) seront composés en gris.
+tous les commentaires (que ce soit en Python, en C, en OCaml, etc. ou dans un langage
+défini avec |\NewPitonLanguage|) seront composés en gris.
\bigskip
-Mais il est aussi possible de définir un style localement pour un certain langage informatique en passant le nom du
-langage en argument optionnel (entre crochets) de la commande |\SetPitonStyle|.\footnote{On rappelle que, dans
- \pkg{piton}, les noms des langages informatiques ne sont pas sensibles à la casse.}
+Mais il est aussi possible de définir un style localement pour un certain langage
+informatique en passant le nom du langage en argument optionnel (entre crochets) de la
+commande |\SetPitonStyle|.\footnote{On rappelle que, dans \pkg{piton}, les noms des
+ langages informatiques ne sont pas sensibles à la casse.}
\medskip
Par exemple, avec la commande
\begin{Verbatim}
\SetPitonStyle~emphase#[SQL]@{Keywords = \color[HTML]{006699} \bfseries \MakeUppercase}
\end{Verbatim}
-les mots-clés dans les listings SQL seront composés en lettres capitales, même s'ils s'apparaissent en minuscules
-dans le fichier source LaTeX (on rappelle que, en SQL, les mot-clés ne sont pas sensibles à la casse et donc forcer
-leur mise en capitales peut être envisagé).
+les mots-clés dans les listings SQL seront composés en lettres capitales, même s'ils
+s'apparaissent en minuscules dans le fichier source LaTeX (on rappelle que, en SQL, les
+mot-clés ne sont pas sensibles à la casse et donc forcer leur mise en capitales peut être
+envisagé).
\medskip
-Comme on s'en doute, si un langage informatique utilise un certain style et que ce style n'est pas défini
-localement pour ce langage, c'est la version globale qui est utilisée. Cette notion de globalité n'a pas de
-rapport avec la notion de liaison locale de TeX (notion de groupe TeX).\footnote{Du point de vue des groupes de
- TeX, les liaisons faites par |\SetPitonStyle| sont toujours locales.}
+Comme on s'en doute, si un langage informatique utilise un certain style et que ce style
+n'est pas défini localement pour ce langage, c'est la version globale qui est utilisée.
+Cette notion de globalité n'a pas de rapport avec la notion de liaison locale de TeX
+(notion de groupe TeX).\footnote{Du point de vue des groupes de TeX, les liaisons faites
+ par |\SetPitonStyle| sont toujours locales.}
\medskip
Les styles fournis par défaut par \pkg{piton} sont tous définis globalement.
@@ -652,16 +717,19 @@ Les styles fournis par défaut par \pkg{piton} sont tous définis globalement.
\index{UserFunction (style)}
\bigskip
-Il existe un style spécial nommé |UserFunction|. Ce style s'applique aux noms des fonctions précédemment définies
-par l'utilisateur (par exemple, avec le langage Python, ces noms de fonctions sont ceux qui apparaissent après le
-mot-clé \piton{def} dans un listing Python précédent). La valeur initiale de ce style est nulle (=vide), ce qui
-fait que ces noms de fonctions sont formatés comme du texte courant (en noir). Néanmoins, il est possible de
-changer la valeur de ce style, comme tous les autres styles, avec la commande |\SetPitonStyle|.
+Il existe un style spécial nommé |UserFunction|. Ce style s'applique aux noms des
+fonctions précédemment définies par l'utilisateur (par exemple, avec le langage Python,
+ces noms de fonctions sont ceux qui apparaissent après le mot-clé \piton{def} dans un
+listing Python précédent). La valeur initiale de ce style est nulle (=vide), ce qui fait
+que ces noms de fonctions sont formatés comme du texte courant (en noir). Néanmoins, il
+est possible de changer la valeur de ce style, comme tous les autres styles, avec la
+commande |\SetPitonStyle|.
\medskip
-Dans l'exemple suivant, on règle les styles |Name.Function| et |UserFunction| de manière à ce que, quand on clique
-sur le nom d'une fonction Python précédemment définie par l'utilisateur, on soit renvoyé vers la définition
-(informatique) de cette fonction. Cette programmation utilise les fonctions |\hypertarget| et |\hyperlink| de \pkg{hyperref}.
+Dans l'exemple suivant, on règle les styles |Name.Function| et |UserFunction| de manière à
+ce que, quand on clique sur le nom d'une fonction Python précédemment définie par
+l'utilisateur, on soit renvoyé vers la définition (informatique) de cette fonction. Cette
+programmation utilise les fonctions |\hypertarget| et |\hyperlink| de \pkg{hyperref}.
\begingroup
@@ -698,7 +766,8 @@ def passe(v):
\end{Piton}
\medskip
-(Certains lecteurs de \textsc{pdf} affichent un cadre autour du mot |transpose| cliquable et d'autres non.)
+(Certains lecteurs de \textsc{pdf} affichent un cadre autour du mot |transpose| cliquable
+et d'autres non.)
\endgroup
@@ -707,12 +776,14 @@ def passe(v):
\bigskip
\begin{small}
-Bien sûr, la liste des noms de fonctions Python précédemment définies est gardée en mémoire de LuaLaTeX (de manière
-globale, c'est-à-dire indépendamment des groupes TeX). L'extension \pkg{piton} fournit une commande qui permet de
-vider cette liste : c'est la commande \DefinitionCommand{PitonClearUserFunctions}. Quand elle est utilisée sans argument, cette
-commande s'applique à tous les langages informatiques utilisées par l'utilisateur mais on peut spécifier en
-argument optionnel (entre crochets) une liste de langages informatiques auxquels elle s'appliquera.\footnote{On
- rappelle que, dans \pkg{piton}, les noms des langages informatiques ne sont pas sensibles à la casse. }
+Bien sûr, la liste des noms de fonctions Python précédemment définies est gardée en
+mémoire de LuaLaTeX (de manière globale, c'est-à-dire indépendamment des groupes TeX).
+L'extension \pkg{piton} fournit une commande qui permet de vider cette liste : c'est la
+commande \DefinitionCommand{PitonClearUserFunctions}. Quand elle est utilisée sans
+argument, cette commande s'applique à tous les langages informatiques utilisées par
+l'utilisateur mais on peut spécifier en argument optionnel (entre crochets) une liste de
+langages informatiques auxquels elle s'appliquera.\footnote{On rappelle que, dans
+ \pkg{piton}, les noms des langages informatiques ne sont pas sensibles à la casse. }
\end{small}
@@ -722,24 +793,26 @@ argument optionnel (entre crochets) une liste de langages informatiques auxquels
\label{NewPitonEnvironment}
\indexcommand{NewPitonEnvironment}
-Comme l'environnement |{Piton}| a besoin d'absorber son contenu d'une manière spéciale (à peu près comme du texte
-verbatim), il n'est pas possible de définir de nouveaux environnements directement au-dessus de l'environnement
-|{Piton}| avec les commandes classiques |\newenvironment| (de LaTeX standard) et |\NewDocumentEnvironment| (de
-LaTeX3).
+Comme l'environnement |{Piton}| a besoin d'absorber son contenu d'une manière spéciale (à
+peu près comme du texte verbatim), il n'est pas possible de définir de nouveaux
+environnements directement au-dessus de l'environnement |{Piton}| avec les commandes
+classiques |\newenvironment| (de LaTeX standard) et |\NewDocumentEnvironment| (de LaTeX3).
-C'est pourquoi \pkg{piton} propose une commande |\NewPitonEnvironment|. Cette commande a la même syntaxe que la
-commande classique |\NewDocumentEnvironment|.\footnote{Néanmoins, le spécificateur d'argument~|b|, qui sert à
- capter le corps de l'environnement comme un argument LaTeX, n'est pas autorisé.}
+C'est pourquoi \pkg{piton} propose une commande |\NewPitonEnvironment|. Cette commande a
+la même syntaxe que la commande classique |\NewDocumentEnvironment|.\footnote{Néanmoins,
+ le spécificateur d'argument~|b|, qui sert à capter le corps de l'environnement comme un
+ argument LaTeX, n'est pas autorisé.}
\bigskip
-Par exemple, avec l'instruction suivante, un nouvel environnement |{Python}| sera défini avec le même comportement
-que l'environnement |{Piton}|:
+Par exemple, avec l'instruction suivante, un nouvel environnement |{Python}| sera défini
+avec le même comportement que l'environnement |{Piton}|:
{\color{gray}|\NewPitonEnvironment{Python}{O{}}{\PitonOptions{#1}}{}|}
\bigskip
-Si on souhaite un environnement |{Python}| qui compose le code inclus dans une boîte de \pkg{tcolorbox}, on peut
-écrire (à condition, bien entendu, d'avoir chargé l'extension \pkg{tcolorbox}):
+Si on souhaite un environnement |{Python}| qui compose le code inclus dans une boîte de
+\pkg{tcolorbox}, on peut écrire (à condition, bien entendu, d'avoir chargé l'extension
+\pkg{tcolorbox}):
\begin{Verbatim}
\NewPitonEnvironment{Python}{}
@@ -780,21 +853,25 @@ def carré(x):
L'extension \pkg{listings} est une célèbre extension LaTeX pour formater des codes informatiques.
\medskip
-Elle propose une commande |\lstdefinelanguage| pour définir de nouveaux langages. Cette commande est aussi
-utilisée en interne par \pkg{listings} pour sa définition des languages (en fait, pour cela, \pkg{listings} utilise
-une commande nommée |\lst@definelanguage| mais celle-ci a la même syntaxe que |\lstdefinelanguage|).
+Elle propose une commande |\lstdefinelanguage| pour définir de nouveaux langages. Cette
+commande est aussi utilisée en interne par \pkg{listings} pour sa définition des languages
+(en fait, pour cela, \pkg{listings} utilise une commande nommée |\lst@definelanguage| mais
+celle-ci a la même syntaxe que |\lstdefinelanguage|).
\medskip
-L'extension \pkg{piton} propose une commande \DefinitionCommand{NewPitonLanguage} pour définir de nouveaux
-langages (utilisables avec les outils de \pkg{piton}) avec quasiment la même syntaxe que |\lstdefinelanguage|.
+L'extension \pkg{piton} propose une commande \DefinitionCommand{NewPitonLanguage} pour
+définir de nouveaux langages (utilisables avec les outils de \pkg{piton}) avec quasiment
+la même syntaxe que |\lstdefinelanguage|.
\medskip
-Précisons tout de suite que l'extension \pkg{piton} n'utilise \emph{pas} cette commande pour définir les langages
-qu'elle propose nativement (Python, C, OCaml, \CC\ et |minimal|), ce qui permet de proposer des parseurs plus puissants.
+Précisons tout de suite que l'extension \pkg{piton} n'utilise \emph{pas} cette commande
+pour définir les langages qu'elle propose nativement (Python, C, OCaml, \CC\ et
+|minimal|), ce qui permet de proposer des parseurs plus puissants.
\medskip
-Par exemple, dans le fichier |lstlang1.sty|, qui est un des fichiers de definition des langages proposés par défaut
-par \pkg{listings}, on trouve les instructions suivantes (dans la version 1.10a).
+Par exemple, dans le fichier |lstlang1.sty|, qui est un des fichiers de definition des
+langages proposés par défaut par \pkg{listings}, on trouve les instructions suivantes
+(dans la version 1.10a).
\begin{Verbatim}[formatcom=\small\color{gray}]
\lst~@definelanguage{Java}%
@@ -813,9 +890,10 @@ par \pkg{listings}, on trouve les instructions suivantes (dans la version 1.10a)
\end{Verbatim}
\medskip
-Pour définir un language nommé |Java| pour \pkg{piton}, il suffit d'écrire le code suivant,
-{\bfseries où le dernier argument de |\lst@definelanguage|, qui est entre crochets, a été supprimé}
-(en fait, les symboles \verb+%+ pourraient être supprimés sans problème).
+Pour définir un language nommé |Java| pour \pkg{piton}, il suffit d'écrire le code
+suivant, {\bfseries où le dernier argument de |\lst@definelanguage|, qui est entre
+ crochets, a été supprimé} (en fait, les symboles \verb+%+ pourraient être supprimés sans
+problème).
\begin{Verbatim}[formatcom=\small\color{gray}]
~emphase#\NewPitonLanguage@{Java}%
@@ -850,11 +928,13 @@ Pour définir un language nommé |Java| pour \pkg{piton}, il suffit d'écrire le
\medskip
-On peut alors utiliser le language Java comme n'importe quel autre langage prédéfini de \pkg{piton}.
+On peut alors utiliser le language Java comme n'importe quel autre langage prédéfini de
+\pkg{piton}.
-Voici un exemple de code Java formaté dans un environnement~|{Piton}| avec la clé~|language=Java|.\footnote{On
- rappelle que, pour \pkg{piton}, les noms de langages informatiques ne sont pas sensibles à la casse, ce qui fait
- que l'on aurait pu aussi bien utiliser : |language=java|.}
+Voici un exemple de code Java formaté dans un environnement~|{Piton}| avec la
+clé~|language=Java|.\footnote{On rappelle que, pour \pkg{piton}, les noms de langages
+ informatiques ne sont pas sensibles à la casse, ce qui fait que l'on aurait pu aussi
+ bien utiliser : |language=java|.}
\bigskip
\begingroup
@@ -893,12 +973,14 @@ public class Cipher { // cryptage par le chiffre de César
\endgroup
\bigskip
-Les clés de la commande |\lstdefinelanguage| de \pkg{listings} prises en charge par |\NewPitonLanguage| sont :
-|morekeywords|, |otherkeywords|, |sensitive|, |keywordsprefix|, |moretexcs|, |morestring| (avec les lettres |b|,
-|d|, |s| et |m|), |morecomment| (avec les lettres |i|, |l|, |s| et |n|), |moredelim| (avec les lettres |i|,
-|l|, |s|, |*| et |**|), |moredirectives|, |tag|, |alsodigit|, |alsoletter| et |alsoother|.
+Les clés de la commande |\lstdefinelanguage| de \pkg{listings} prises en charge par
+|\NewPitonLanguage| sont : |morekeywords|, |otherkeywords|, |sensitive|, |keywordsprefix|,
+|moretexcs|, |morestring| (avec les lettres |b|, |d|, |s| et |m|), |morecomment| (avec les
+lettres |i|, |l|, |s| et |n|), |moredelim| (avec les lettres |i|, |l|, |s|, |*| et |**|),
+|moredirectives|, |tag|, |alsodigit|, |alsoletter| et |alsoother|.
-Pour la description de ces clés, on renvoie à la documentation de \pkg{listings} (taper |texdoc| |listings| dans un terminal).
+Pour la description de ces clés, on renvoie à la documentation de \pkg{listings} (taper
+|texdoc| |listings| dans un terminal).
\bigskip
Par exemple, pour formater du code LaTeX, on pourra créer le language suivant :
@@ -907,10 +989,9 @@ Par exemple, pour formater du code LaTeX, on pourra créer le language suivant :
\begin{verbatim}
\NewPitonLanguage{LaTeX}{keywordsprefix = \ , alsoletter = @_ }
\end{verbatim}
-}
-Initialement, les caractères |@| et |_| sont des considérés comme des lettres car de nombreux langages de
-programmation les autorisent dans les mots-clés et les identificateurs. Avec \verb|alsoletter = @_|, on les retire
-de la catégorie des lettres.
+} Initialement, les caractères |@| et |_| sont des considérés comme des lettres car de
+nombreux langages de programmation les autorisent dans les mots-clés et les
+identificateurs. Avec \verb|alsoletter = @_|, on les retire de la catégorie des lettres.
\section{Fonctionnalités avancées}
@@ -922,88 +1003,111 @@ de la catégorie des lettres.
\subsubsection{Coupure des pages}
+\label{coupure-de-pages}
+
\index{splittable}
\index{split-on-empty-lines}
\index{split-separation}
-Par défaut, les listings produits par l'environnement |{Piton}| et par la commande |\PitonInputFile| sont
-insécables.
+Par défaut, les listings produits par l'environnement |{Piton}| et par la commande
+|\PitonInputFile| sont insécables.
-Néanmoins, la commande |\PitonOptions| propose les clés |split-on-empty-lines| et |splittable| pour autoriser de
-telles coupures.
+Néanmoins, la commande |\PitonOptions| propose les clés |split-on-empty-lines| et
+|splittable| pour autoriser de telles coupures.
\begin{itemize}
-\item La clé \Definition{split-on-empty-lines} autorise les coupures sur les lignes vides\footnote{Les lignes considérées
- comme vides sont celles qui ne comportent que des espaces.} du listing. Dans les listings informatiques, les
-lignes vides séparent le plus souvent les définitions des fonctions informatiques et il est donc souvent judicieux
-de pouvoir couper au niveau de ces lignes.
-
-Quand la clé |split-on-empty-lines| est activée, le travail effectué va en fait un peu plus loin : les lignes vides
-successives sont supprimées et remplacées par le contenu du paramètre correspondant à la clé
-\Definition{split-separation}.
+\item La clé \Definition{split-on-empty-lines} autorise les coupures sur les lignes
+vides\footnote{Les lignes considérées comme vides sont celles qui ne comportent que des
+ espaces.} du listing. Dans les listings informatiques, les lignes vides séparent le plus
+souvent les définitions des fonctions informatiques et il est donc souvent judicieux de
+pouvoir couper au niveau de ces lignes.
+
+Quand la clé |split-on-empty-lines| est activée, le travail effectué va en fait un peu
+plus loin : les lignes vides successives sont supprimées et remplacées par le contenu du
+paramètre correspondant à la clé \Definition{split-separation}
+\begin{itemize}
+\item Ce paramètre doit contenir du matériel à insérer en \emph{mode vertical} de TeX. On
+peut, par exemple, mettre |\hrule|.
-La valeur initiale de ce paramètre est |\vspace{\baselineskip}\vspace{-1.25pt}|, ce qui, au final, correspond à une
-ligne vide dans le PDF produit (cet espace vertical est supprimé s'il tombe au niveau d'un saut de page).
+\item La valeur initiale de ce paramètre est |\vspace{\baselineskip}\vspace{-1.25pt}|, ce qui,
+au final, correspond à une ligne vide dans le PDF produit (cet espace vertical est
+supprimé s'il tombe au niveau d'un saut de page). Si la clé |background-color| est
+utilisée, aucun fond n'est affiché au niveau de cette ligne de séparation.
+\end{itemize}
\medskip
-\item La clé |split-on-empty-lines| peut bien sûr être insuffisante et c'est pourquoi \pkg{piton} propose la clé
-\Definition{splittable}.
+\item La clé |split-on-empty-lines| peut bien sûr être insuffisante et c'est pourquoi
+\pkg{piton} propose la clé \Definition{splittable}.
-Quand la clé |splittable| est utilisée avec la valeur numérique $n$ (qui doit être un entier naturel non nul) le
-listing, ou bien chaque partie de ce listing située entre des lignes vides (quand |split-on-empty-lines| est
-utilisée), pourra être coupé n'importe où avec cette exception qu'aucune coupure ne pourra avoir lieu entre les
-$n$~premières lignes, ni entre les $n$~dernières. Par exemple, |splittable = 4| pourrait être un réglage raisonnable.
+Quand la clé |splittable| est utilisée avec la valeur numérique $n$ (qui doit être un
+entier naturel non nul) le listing, ou bien chaque partie de ce listing située entre des
+lignes vides (quand |split-on-empty-lines| est utilisée), pourra être coupé n'importe où
+avec cette exception qu'aucune coupure ne pourra avoir lieu entre les $n$~premières
+lignes, ni entre les $n$~dernières. Par exemple, |splittable = 4| pourrait être un réglage
+raisonnable.
-Employée sans argument, la clé |splittable| est équivalente à |splittable = 1|, et les listings sont alors sécables
-n'importe où (ce n'est pas recommandable).
+Employée sans argument, la clé |splittable| est équivalente à |splittable = 1|, et les
+listings sont alors sécables n'importe où (ce n'est pas recommandable).
+La valeur initiale de la clé |splittable| vaut 100, ce qui fait que listings ne sont pas
+sécables.
\end{itemize}
\medskip
\emph{Remarque}\par\nobreak
-Même avec une couleur de fond (fixée avec |background-color|), les sauts de page sont possibles, à partir du moment
-où |split-on-empty-lines| ou |splittable| est utilisée.\footnote{Avec la clé |splittable|, un environnement
- |{Piton}| est sécable même dans un environnement de \pkg{tcolorbox} (à partir du moment où la clé |breakable| de
- \pkg{tcolorbox} est utilisée). On précise cela parce que, en revanche, un environnement de \pkg{tcolorbox} inclus
- dans un autre environnement de \pkg{tcolorbox} n'est pas sécable, même quand les deux utilisent la clé
- |breakable|.}
+Même avec une couleur de fond (fixée avec |background-color|), les sauts de page sont
+possibles, à partir du moment où |split-on-empty-lines| ou |splittable| est
+utilisée.\footnote{Avec la clé |splittable|, un environnement |{Piton}| est sécable même
+ dans un environnement de \pkg{tcolorbox} (à partir du moment où la clé |breakable| de
+ \pkg{tcolorbox} est utilisée). On précise cela parce que, en revanche, un environnement
+ de \pkg{tcolorbox} inclus dans un autre environnement de \pkg{tcolorbox} n'est pas
+ sécable, même quand les deux utilisent la clé |breakable|.}
\subsubsection{Coupure des lignes}
\label{line-breaks}
-Par défaut, les éléments produits par \pkg{piton} ne peuvent pas être coupés par une fin de ligne. Il existe
-néanmoins des clés pour autoriser de telles coupures (les points de coupure possibles sont les espaces, y compris
-les espaces dans les chaînes Python).
+Par défaut, les éléments produits par \pkg{piton} ne peuvent pas être coupés par une fin
+de ligne. Il existe néanmoins des clés pour autoriser de telles coupures (les points de
+coupure possibles sont les espaces, y compris les espaces dans les chaînes Python).
\begin{itemize}
-\item \index{break-lines!break-lines-in-piton} Avec la clé \Definition{break-lines-in-piton}, les coupures de ligne sont autorisées dans la commande
-|\piton{...}| (mais pas dans la commande \verb+\piton|...|+, c'est-à-dire avec la syntaxe verbatim).
-
-\item \index{break-lines!break-lines-in-Piton} Avec la clé \Definition{break-lines-in-Piton}, les coupures de ligne sont autorisées dans l'environnement
-|{Piton}| (d'où la lettre |P| capitale dans le nom) et les listings produits par |\PitonInputFile|.
-
-\item \index{break-lines} La clé \Definition{break-lines} est la conjonction des deux clés précédentes.
+\item \index{break-lines!break-lines-in-piton} Avec la clé
+\Definition{break-lines-in-piton}, les coupures de ligne sont autorisées dans la commande
+|\piton{...}| (mais pas dans la commande \verb+\piton|...|+, c'est-à-dire avec la syntaxe
+verbatim).
+
+\item \index{break-lines!break-lines-in-Piton} Avec la clé
+\Definition{break-lines-in-Piton}, les coupures de ligne sont autorisées dans
+l'environnement |{Piton}| (d'où la lettre |P| capitale dans le nom) et les listings
+produits par |\PitonInputFile|.
+
+\item \index{break-lines} La clé \Definition{break-lines} est la conjonction des deux clés
+précédentes.
\end{itemize}
\medskip
-L'extension \pkg{piton} fournit aussi plusieurs clés pour contrôler l'apparence des coupures de ligne autorisées par |break-lines-in-Piton|.
+L'extension \pkg{piton} fournit aussi plusieurs clés pour contrôler l'apparence des
+coupures de ligne autorisées par |break-lines-in-Piton|.
\begin{itemize}
-\item \index{indent-broken-lines} Avec la clé \Definition{indent-broken-lines}, l'indentation de la ligne coupée est respectée à chaque retour
-à la ligne.
+\item \index{indent-broken-lines} Avec la clé \Definition{indent-broken-lines},
+l'indentation de la ligne coupée est respectée à chaque retour à la ligne.
-\item \index{end-of-broken-line} La clé \Definition{end-of-broken-line} correspond au symbole placé à la fin d'une ligne coupée. Sa valeur initiale est :
+\item \index{end-of-broken-line} La clé \Definition{end-of-broken-line} correspond au
+symbole placé à la fin d'une ligne coupée. Sa valeur initiale est :
|\hspace*{0.5em}\textbackslash|.
-\item \index{continuation-symbol} La clé \Definition{continuation-symbol} correspond au symbole placé à chaque retour de ligne dans la marge
-gauche. Sa valeur initiale est : |+\;| (la commande |\;| insère un petit espace horizontal).
+\item \index{continuation-symbol} La clé \Definition{continuation-symbol} correspond au
+symbole placé à chaque retour de ligne dans la marge gauche. Sa valeur initiale est :
+|+\;| (la commande |\;| insère un petit espace horizontal).
-\item \index{continuation-symbol-on-indentation} La clé \Definition{continuation-symbol-on-indentation} correspond au symbole placé à chaque retour de ligne
-au niveau de l'indentation (uniquement dans le cas où la clé |indent-broken-lines| est active). Sa valeur initiale
-est : |$\hookrightarrow\;$|.
+\item \index{continuation-symbol-on-indentation} La clé
+\Definition{continuation-symbol-on-indentation} correspond au symbole placé à chaque
+retour de ligne au niveau de l'indentation (uniquement dans le cas où la clé
+|indent-broken-lines| est active). Sa valeur initiale est : |$\hookrightarrow\;$|.
\end{itemize}
\bigskip
@@ -1039,21 +1143,25 @@ def dict_of_liste(liste):
\indexcommand{PitonInputFile}
-La commande |\PitonInputFile| permet d'insérer (avec formatage) le contenu d'un fichier. En fait, il existe des
-mécanismes permettant de n'insérer qu'une partie du fichier en question.
+La commande |\PitonInputFile| permet d'insérer (avec formatage) le contenu d'un fichier.
+En fait, il existe des mécanismes permettant de n'insérer qu'une partie du fichier en
+question.
\begin{itemize}
-\item On peut spécifier la partie à insérer par les numéros de lignes (dans le fichier d'origine).
+\item On peut spécifier la partie à insérer par les numéros de lignes (dans le fichier
+d'origine).
\item On peut aussi spécifier la partie à insérer par des marqueurs textuels.
\end{itemize}
-Dans les deux cas, si on souhaite numéroter les lignes avec les numéros des lignes du fichier d'origine, il
-convient d'utiliser la clé |line-numbers/absolute|.
+Dans les deux cas, si on souhaite numéroter les lignes avec les numéros des lignes du
+fichier d'origine, il convient d'utiliser la clé |line-numbers/absolute|.
\subsubsection{Avec les numéros de lignes absolus}
-La commande |\PitonInputFile| propose les clés \Definition{first-line} et \Definition{last-line} pour n'insérer que
-la partie du fichier comprise entre les lignes correspondantes. Ne pas confondre avec la clé |line-numbers/start|
-qui demande un numérotage des lignes commençant à la valeur donnée à cette clé (en un sens |line-numbers/start|
-concerne la sortie alors que |first-line| et |last-line| concernent l'entrée).
+La commande |\PitonInputFile| propose les clés \Definition{first-line} et
+\Definition{last-line} pour n'insérer que la partie du fichier comprise entre les lignes
+correspondantes. Ne pas confondre avec la clé |line-numbers/start| qui demande un
+numérotage des lignes commençant à la valeur donnée à cette clé (en un sens
+|line-numbers/start| concerne la sortie alors que |first-line| et |last-line| concernent
+l'entrée).
\subsubsection{Avec des marqueurs textuels}
@@ -1062,15 +1170,17 @@ concerne la sortie alors que |first-line| et |last-line| concernent l'entrée).
\index{marker/end}
-Pour utiliser cette technique, il convient d'abord de spécifier le format des marqueurs marquant le début et la fin
-de la partie du fichier à inclure. Cela se fait avec les deux clés \Definition{marker/beginning} et
-\Definition{marker/end} (usuellement dans la commande |\PitonOptions|).
+Pour utiliser cette technique, il convient d'abord de spécifier le format des marqueurs
+marquant le début et la fin de la partie du fichier à inclure. Cela se fait avec les deux
+clés \Definition{marker/beginning} et \Definition{marker/end} (usuellement dans la
+commande |\PitonOptions|).
\medskip
Prenons d'abord un exemple.
\medskip
-Supposons que le fichier à inclure contienne des solutions à des exercices de programmation sur le modèle suivant :
+Supposons que le fichier à inclure contienne des solutions à des exercices de
+programmation sur le modèle suivant :
\begin{Verbatim}[formatcom=\small\color{gray}]
~#[Exercice 1] Version itérative
@@ -1087,25 +1197,27 @@ def fibo(n):
~#<Exercice 1>
\end{Verbatim}
-Les marqueurs de début de début et de fin sont les chaînes |#[Exercice 1]| et |#<Exercice 1>|. La chaîne
-«|Exercice 1|» sera appelée le \emph{label} de l'exercice (ou de la partie du fichier à inclure).
+Les marqueurs de début de début et de fin sont les chaînes |#[Exercice 1]| et
+|#<Exercice 1>|. La chaîne «|Exercice 1|» sera appelée le \emph{label} de l'exercice (ou
+de la partie du fichier à inclure).
-Pour spécifier des marqueurs de cette sorte dans \pkg{piton}, on utilisera les clés |marker/beginning| et |marker/end|
-de la manière suivante (le caractère |#| des commentaires de Python doit être inséré sous la forme échappée |\#|).
+Pour spécifier des marqueurs de cette sorte dans \pkg{piton}, on utilisera les clés
+|marker/beginning| et |marker/end| de la manière suivante (le caractère |#| des
+commentaires de Python doit être inséré sous la forme échappée |\#|).
\begin{Verbatim}
\PitonOptions{ ~emphase#marker/beginning@ = \~#[~#1] , ~emphase#marker/end@ = \~#<~#1> }
\end{Verbatim}
-Comme on le voit, |marker/beginning| est une expression correspondant à la fonction mathématique qui, au nom du
-label (par exemple |Exercice 1|), associe le marqueur de début (dans l'exemple |#[Exercice 1]|). La chaîne |#1|
-correspond aux occurrences de l'argument de cette fonction (c'est la syntaxe habituelle de TeX). De même pour
-|marker/end|.
+Comme on le voit, |marker/beginning| est une expression correspondant à la fonction
+mathématique qui, au nom du label (par exemple |Exercice 1|), associe le marqueur de début
+(dans l'exemple |#[Exercice 1]|). La chaîne |#1| correspond aux occurrences de l'argument
+de cette fonction (c'est la syntaxe habituelle de TeX). De même pour |marker/end|.
\bigskip
-Pour insérer une partie marquée d'un fichier, il suffit alors d'utiliser la clé \Definition{range} de
-|\PitonInputFile|.
+Pour insérer une partie marquée d'un fichier, il suffit alors d'utiliser la clé
+\Definition{range} de |\PitonInputFile|.
\smallskip
\begin{Verbatim}
@@ -1126,9 +1238,8 @@ def fibo(n):
return v
\end{Piton}
-\vspace{1cm}
-\index{marker/include-lines}
-La clé \Definition{marker/include-lines} demande que les lignes contenant les marqueurs soient également insérées.
+\vspace{1cm} \index{marker/include-lines} La clé \Definition{marker/include-lines} demande
+que les lignes contenant les marqueurs soient également insérées.
\begin{Verbatim}
\PitonInputFile[~emphase#marker/include-lines@,range = Exercice 1]{~textsl#nom_du_fichier@}
@@ -1151,13 +1262,12 @@ def fibo(n):
\bigskip
-\index{begin-range}
-\index{end-range}
-Il existe en fait aussi les clés \Definition{begin-range} et \Definition{end-range} pour insérer plusieurs
-contenus marqués simultanément.
+\index{begin-range} \index{end-range} Il existe en fait aussi les clés
+\Definition{begin-range} et \Definition{end-range} pour insérer plusieurs contenus marqués
+simultanément.
-Par exemple, pour insérer les solutions des exercices 3 à 5, on pourra écrire (à condition que le fichier soit
-structuré correctement!):
+Par exemple, pour insérer les solutions des exercices 3 à 5, on pourra écrire (à condition
+que le fichier soit structuré correctement!):
\begin{Verbatim}
\PitonInputFile[~emphase#begin-range = Exercice 3, end-range = Exercice 5@]{~textsl#nom_du_fichier@}
@@ -1171,27 +1281,31 @@ structuré correctement!):
\indexcommand{SetPitonIdentifier}
\label{SetPitonIdentifier}
-La commande \DefinitionCommand{SetPitonIdentifier} permet de changer le formatage de certains identificateurs.
+La commande \DefinitionCommand{SetPitonIdentifier} permet de changer le formatage de
+certains identificateurs.
\smallskip
Cette commande prend trois arguments : un optionnel et deux obligatoires.
\begin{itemize}
-\item L'argument optionnel (entre crochets) indique le langage (informatique) concerné ; si cet
-argument est absent, les réglages faits par |\SetPitonIdentifier| s'appliqueront à tous les langages.\footnote{On rappelle que, dans \pkg{piton}, les noms des langages informatiques ne sont pas
- sensibles à la casse.}
+\item L'argument optionnel (entre crochets) indique le langage (informatique) concerné ;
+si cet argument est absent, les réglages faits par |\SetPitonIdentifier| s'appliqueront à
+tous les langages.\footnote{On rappelle que, dans \pkg{piton}, les noms des langages
+ informatiques ne sont pas sensibles à la casse.}
-\item Le premier argument obligatoire est une liste de noms d'identificateurs séparés par des virgules.
+\item Le premier argument obligatoire est une liste de noms d'identificateurs séparés par
+des virgules.
-\item Le deuxième argument obligatoire est une liste d'instructions LaTeX de formatage du même type que pour les
-styles précédemment définis (cf. \ref{styles}, p.~\pageref{styles}).
+\item Le deuxième argument obligatoire est une liste d'instructions LaTeX de formatage du
+même type que pour les styles précédemment définis (cf. \ref{styles},
+p.~\pageref{styles}).
\end{itemize}
-\emph{Attention} : Seuls les identificateurs peuvent voir leur formatage affecté. Les mots-clés et les noms de
-fonctions prédéfinies ne seront pas affectés, même s'ils figurent dans le premier argument de
-|\SetPitonIdentifier|.
+\emph{Attention} : Seuls les identificateurs peuvent voir leur formatage affecté. Les
+mots-clés et les noms de fonctions prédéfinies ne seront pas affectés, même s'ils figurent
+dans le premier argument de |\SetPitonIdentifier|.
\begin{Verbatim}
~emphase#\SetPitonIdentifier{l1,l2}{\color{red}}@
@@ -1230,8 +1344,9 @@ def tri(l):
\endgroup
\bigskip
-Avec la commande |\SetPitonIdentifiers|, on peut ajouter à un langage informatique de nouvelles fonctions
-prédéfinies (ou de nouveaux mots-clés, etc.) qui seront détectées par \pkg{piton}.
+Avec la commande |\SetPitonIdentifiers|, on peut ajouter à un langage informatique de
+nouvelles fonctions prédéfinies (ou de nouveaux mots-clés, etc.) qui seront détectées par
+\pkg{piton}.
\begin{Verbatim}
@@ -1272,16 +1387,18 @@ floor(5.4)
L'extension \pkg{piton} propose plusieurs mécanismes d'échappement vers LaTeX :
\begin{itemize}
\item Il est possible d'avoir des commentaires entièrement composés en LaTeX.
-\item Il est possible d'avoir, dans les commentaires Python, les éléments entre \texttt{\$} composés en mode
-mathématique de LaTeX.
-\item Il est possible de demander à \pkg{piton} de détecter directement certaines commandes LaTeX avec leur argument.
+\item Il est possible d'avoir, dans les commentaires Python, les éléments entre
+\texttt{\$} composés en mode mathématique de LaTeX.
+\item Il est possible de demander à \pkg{piton} de détecter directement certaines
+commandes LaTeX avec leur argument.
\item Il est possible d'insérer du code LaTeX à n'importe quel endroit d'un listing Python.
\end{itemize}
Ces mécanismes vont être détaillés dans les sous-parties suivantes.
\smallskip
-À remarquer également que, dans le cas où \pkg{piton} est utilisée dans la classe \cls{beamer}, \pkg{piton} détecte
-la plupart des commandes et environnements de Beamer : voir la sous-section \ref{beamer}, p.~\pageref{beamer}.
+À remarquer également que, dans le cas où \pkg{piton} est utilisée dans la classe
+\cls{beamer}, \pkg{piton} détecte la plupart des commandes et environnements de Beamer :
+voir la sous-section \ref{beamer}, p.~\pageref{beamer}.
\subsubsection{Les «commentaires LaTeX»}
@@ -1289,14 +1406,16 @@ la plupart des commandes et environnements de Beamer : voir la sous-section \ref
\index{comment-latex}
\index{commentaires LaTeX}
-Dans ce document, on appelle «commentaire LaTeX» des commentaires qui débutent par |#>|. Tout ce qui suit ces deux
-caractères, et jusqu'à la fin de la ligne, sera composé comme du code LaTeX standard.
+Dans ce document, on appelle «commentaire LaTeX» des commentaires qui débutent par |#>|.
+Tout ce qui suit ces deux caractères, et jusqu'à la fin de la ligne, sera composé comme du
+code LaTeX standard.
Il y a deux outils pour personnaliser ces commentaires.
\begin{itemize}
-\item Il est possible de changer le marquage syntaxique utilisé (qui vaut initialement~|#>|). Pour ce faire, il
-existe une clé \Definition{comment-latex}, \emph{disponible uniquement dans le préambule du document}, qui permet de choisir les
+\item Il est possible de changer le marquage syntaxique utilisé (qui vaut
+initialement~|#>|). Pour ce faire, il existe une clé \Definition{comment-latex},
+\emph{disponible uniquement dans le préambule du document}, qui permet de choisir les
caractères qui (précédés par~|#|) serviront de marqueur syntaxique.
Par exemple, avec le réglage suivant (fait dans le préambule du document) :
@@ -1305,18 +1424,18 @@ Par exemple, avec le réglage suivant (fait dans le préambule du document) :
les commentaires LaTeX commenceront par~|#LaTeX|.
-Si on donne la valeur nulle à la clé |comment-latex|, tous les commentaires Python (débutant par~|#|) seront en
-fait des «commentaires LaTeX».
+Si on donne la valeur nulle à la clé |comment-latex|, tous les commentaires Python
+(débutant par~|#|) seront en fait des «commentaires LaTeX».
\smallskip
-\item Il est possible de changer le formatage du commentaire LaTeX lui-même en changeant le style \pkg{piton}
-|Comment.LaTeX|.
+\item Il est possible de changer le formatage du commentaire LaTeX lui-même en changeant
+le style \pkg{piton} |Comment.LaTeX|.
-Par exemple, avec |\SetPitonStyle{Comment.LaTeX = \normalfont\color{blue}}|, les commentaires LaTeX seront composés
-en bleu.
+Par exemple, avec |\SetPitonStyle{Comment.LaTeX = \normalfont\color{blue}}|, les
+commentaires LaTeX seront composés en bleu.
-Si on souhaite qu'un croisillon (|#|) soit affiché en début de commentaire dans le \textsc{pdf}, on peut régler
-|Comment.LaTeX| de la manière suivante :
+Si on souhaite qu'un croisillon (|#|) soit affiché en début de commentaire dans le
+\textsc{pdf}, on peut régler |Comment.LaTeX| de la manière suivante :
\begin{Verbatim}
\SetPitonStyle{Comment.LaTeX = \color{gray}\~#\normalfont\space }
@@ -1328,11 +1447,12 @@ p.~\pageref{example-comments}.
\bigskip
-Si l'utilisateur a demandé l'affichage des numéros de ligne avec |line-numbers|, il est possible de faire référence
-à ce numéro de ligne avec la commande |\label| placée dans un commentaire LaTeX.\footnote{Cette fonctionnalité est
- implémentée en redéfinissant, dans les environnements |{Piton}|, la commande |\label|. Il peut donc y avoir des
- incompatibilités avec les extensions qui redéfinissent (globalement) cette commande |\label| (comme
- \pkg{varioref}, \pkg{refcheck}, \pkg{showlabels}, etc.)}
+Si l'utilisateur a demandé l'affichage des numéros de ligne avec |line-numbers|, il est
+possible de faire référence à ce numéro de ligne avec la commande |\label| placée dans un
+commentaire LaTeX.\footnote{Cette fonctionnalité est implémentée en redéfinissant, dans
+ les environnements |{Piton}|, la commande |\label|. Il peut donc y avoir des
+ incompatibilités avec les extensions qui redéfinissent (globalement) cette commande
+ |\label| (comme \pkg{varioref}, \pkg{refcheck}, \pkg{showlabels}, etc.)}
@@ -1341,15 +1461,17 @@ Si l'utilisateur a demandé l'affichage des numéros de ligne avec |line-numbers
\index{math-comments}
-Il est possible de demander que, dans les commentaires Python normaux, c'est-à-dire débutant par~|#| (et non par
-|#>|), les éléments placés entre symboles \texttt{\$} soient composés en mode mathématique de LaTeX (le reste du
-commentaire restant composé en verbatim).
+Il est possible de demander que, dans les commentaires Python normaux, c'est-à-dire
+débutant par~|#| (et non par |#>|), les éléments placés entre symboles \texttt{\$} soient
+composés en mode mathématique de LaTeX (le reste du commentaire restant composé en
+verbatim).
-La clé \Definition{math-comments} (\emph{qui ne peut être activée que dans le préambule du document}) active ce
-comportement.
+La clé \Definition{math-comments} (\emph{qui ne peut être activée que dans le préambule du
+ document}) active ce comportement.
\bigskip
-Dans l'exemple suivant, on suppose que |\PitonOptions{math-comments}| a été utilisé dans le préambule du document.
+Dans l'exemple suivant, on suppose que |\PitonOptions{math-comments}| a été utilisé dans
+le préambule du document.
\begin{Verbatim}
\begin{Piton}
@@ -1369,23 +1491,25 @@ def carré(x):
\index{detected-commands (key)}
\label{detected-commands}
-La clé \Definition{detected-commands} de |\PitonOptions| permet de spécifier une liste de noms de commandes LaTeX
-qui seront directement détectées par \pkg{piton}.
+La clé \Definition{detected-commands} de |\PitonOptions| permet de spécifier une liste de
+noms de commandes LaTeX qui seront directement détectées par \pkg{piton}.
\begin{itemize}
-\item Cette clé |detected-commands| ne peut être utilisée que dans le préambule du document.
+\item Cette clé |detected-commands| ne peut être utilisée que dans le préambule du
+document.
-\item Les noms de commandes LaTeX doivent apparaître sans la contre-oblique
-(ex. : |detected-commands = { emph , textbf }|).
+\item Les noms de commandes LaTeX doivent apparaître sans la contre-oblique (ex. :
+|detected-commands = { emph , textbf }|).
-\item Ces commandes doivent être des commandes LaTeX à un seul argument obligatoire entre accolades (et ces
-accolades doivent apparaître explicitement dans le listing).
+\item Ces commandes doivent être des commandes LaTeX à un seul argument obligatoire entre
+accolades (et ces accolades doivent apparaître explicitement dans le listing).
\end{itemize}
\medskip
-Dans l'exemple suivant, qui est une programmation récursive de la factorielle, on décide de surligner en jaune
-l'appel récursif. La commande |\highLight| de \pkg{lua-ul} (cette extension requiert elle-même l'extension
-\pkg{luacolor}) permet de le faire avec la syntaxe |\hightLight{...}|.
+Dans l'exemple suivant, qui est une programmation récursive de la factorielle, on décide
+de surligner en jaune l'appel récursif. La commande |\highLight| de \pkg{lua-ul} (cette
+extension requiert elle-même l'extension \pkg{luacolor}) permet de le faire avec la
+syntaxe |\hightLight{...}|.
\smallskip
On suppose que l'on a mis dans le préambule du document LaTeX l'instruction suivante :
@@ -1419,16 +1543,19 @@ def fact(n):
\index{end-escape}
\label{escape}
-Il est aussi possible de surcharger les listings Python pour y insérer du code LaTeX à peu près n'importe où (mais
-entre deux lexèmes, bien entendu). Cette fonctionnalité n'est pas activée par défaut par \pkg{piton}. Pour
-l'utiliser, il faut spécifier les deux délimiteurs marquant l'échappement (le premier le commençant et le deuxième
-le terminant) en utilisant les clés \Definition{begin-escape} et \Definition{end-escape} (\emph{qui ne sont accessibles
-que dans le préambule du document}). Les deux délimiteurs peuvent être identiques.
+Il est aussi possible de surcharger les listings Python pour y insérer du code LaTeX à peu
+près n'importe où (mais entre deux lexèmes, bien entendu). Cette fonctionnalité n'est pas
+activée par défaut par \pkg{piton}. Pour l'utiliser, il faut spécifier les deux
+délimiteurs marquant l'échappement (le premier le commençant et le deuxième le terminant)
+en utilisant les clés \Definition{begin-escape} et \Definition{end-escape} (\emph{qui ne
+ sont accessibles que dans le préambule du document}). Les deux délimiteurs peuvent être
+identiques.
\medskip
-On reprend l'exemple précédent de la factorielle et on souhaite surligner en rose l'instruction qui contient l'appel
-récursif. La commande |\highLight| de \pkg{lua-ul} permet de le faire avec la syntaxe |\highLight[LightPink]{...}|.
-Du fait de la présence de l'argument optionnel entre crochets, on ne peut pas utiliser la clé |detected-commands|
+On reprend l'exemple précédent de la factorielle et on souhaite surligner en rose
+l'instruction qui contient l'appel récursif. La commande |\highLight| de \pkg{lua-ul}
+permet de le faire avec la syntaxe |\highLight[LightPink]{...}|. Du fait de la présence de
+l'argument optionnel entre crochets, on ne peut pas utiliser la clé |detected-commands|
comme précédemment mais on peut utiliser le mécanisme «escape».
\smallskip
@@ -1460,10 +1587,10 @@ def fact(n):
\bigskip
-\emph{Attention} : L'échappement vers LaTeX permis par les clés |begin-escape| et |end-escape| n'est pas actif dans
-les chaînes de caractères ni dans les commentaires (pour avoir un commentaire entièrement en échappement vers
-LaTeX, c'est-à-dire ce qui est appelé dans ce document «commentaire LaTeX», il suffit de le faire débuter par
-|#>|).
+\emph{Attention} : L'échappement vers LaTeX permis par les clés |begin-escape| et
+|end-escape| n'est pas actif dans les chaînes de caractères ni dans les commentaires (pour
+avoir un commentaire entièrement en échappement vers LaTeX, c'est-à-dire ce qui est appelé
+dans ce document «commentaire LaTeX», il suffit de le faire débuter par |#>|).
\subsubsection{Le mécanisme «escape-math»}
@@ -1472,24 +1599,27 @@ LaTeX, c'est-à-dire ce qui est appelé dans ce document «commentaire LaTeX»,
\index{begin-escape-math}
\index{end-escape-math}
-Le mécanisme «|escape-math|» est très similaire au mécanisme «|escape|» puisque la seule différence est que les
-éléments en échappement LaTeX y sont composés en mode mathématique.
+Le mécanisme «|escape-math|» est très similaire au mécanisme «|escape|» puisque la seule
+différence est que les éléments en échappement LaTeX y sont composés en mode mathématique.
-On active ce mécanisme avec les clés \Definition{begin-escape-math} et \Definition{end-escape-math} (\emph{qui ne sont
-accessibles que dans le préambule du document}).
+On active ce mécanisme avec les clés \Definition{begin-escape-math} et
+\Definition{end-escape-math} (\emph{qui ne sont accessibles que dans le préambule du
+ document}).
\medskip
-Malgré la proximité technique, les usages du mécanisme «|escape-math|» sont en fait assez différents de ceux du
-mécanisme «|escape|». En effet, comme le contenu en échappement est composé en mode mathématique, il est en
-particulier composé dans un groupe TeX et ne pourra donc pas servir à changer le formatage d'autres unités lexicales.
+Malgré la proximité technique, les usages du mécanisme «|escape-math|» sont en fait assez
+différents de ceux du mécanisme «|escape|». En effet, comme le contenu en échappement est
+composé en mode mathématique, il est en particulier composé dans un groupe TeX et ne
+pourra donc pas servir à changer le formatage d'autres unités lexicales.
\medskip
-Dans les langages où le caractère |$| ne joue pas un rôle syntaxique important, on peut assez naturellement
-vouloir activer le mécanisme «|escape-math|» avec le caractère |$|:
+Dans les langages où le caractère
+|$| ne joue pas un rôle syntaxique important, on peut assez naturellement vouloir activer
+le mécanisme «|escape-math|» avec le caractère |$|:
\begin{Verbatim}
\PitonOptions{~emphase#begin-escape-math=$,end-escape-math=$@}
\end{Verbatim}
-Remarquer que le caractère |$| ne doit \emph{pas} être protégé par une contre-oblique.
+Remarquer que le caractère |$| ne doit \emph{pas} être protégé par une contre-oblique. % $
\bigskip
Néanmoins, il est sans doute plus prudent d'utiliser |\(| et |\)|.
@@ -1538,25 +1668,29 @@ def arctan(x,n=10):
\index{Beamer@\cls{Beamer} (classe)}
-\emph{Première remarque}\par\nobreak
-Remarquons que, comme l'environnement |{Piton}| prend son argument selon un mode verbatim, il convient, ce qui
-n'est pas surprenant, de l'utiliser dans des environnements |{frame}| de Beamer protégés par la clé |fragile|,
-c'est-à-dire débutant par |\begin{frame}[fragile]|.\footnote{On rappelle que pour un environnement |{frame}| de Beamer qui
- utilise la clé |fragile|, l'instruction |\end{frame}| doit être seule sur une ligne (à l'exception d'éventuels
- espaces en début de ligne).}
+\emph{Première remarque}\par\nobreak
+
+Remarquons que, comme l'environnement |{Piton}| prend son argument selon un mode verbatim,
+il convient, ce qui n'est pas surprenant, de l'utiliser dans des environnements |{frame}|
+de Beamer protégés par la clé |fragile|, c'est-à-dire débutant par
+|\begin{frame}[fragile]|.\footnote{On rappelle que pour un environnement |{frame}| de
+ Beamer qui utilise la clé |fragile|, l'instruction |\end{frame}| doit être seule sur une
+ ligne (à l'exception d'éventuels espaces en début de ligne).}
\medskip
-Quand l'extension \pkg{piton} est utilisée dans la classe \cls{beamer}\footnote{L'extension \pkg{piton} détecte la
- classe \cls{beamer} et l'extension \pkg{beamerarticle} si elle est chargée précédemment, mais il est aussi
- possible, si le besoin s'en faisait sentir, d'activer ce comportement avec la clé |beamer| au chargement de
- \pkg{piton} : |\usepackage[beamer]{piton}|}, le comportement de \pkg{piton} est légèrement modifié, comme décrit
-maintenant.
+Quand l'extension \pkg{piton} est utilisée dans la classe
+\cls{beamer}\footnote{L'extension \pkg{piton} détecte la classe \cls{beamer} et
+ l'extension \pkg{beamerarticle} si elle est chargée précédemment, mais il est aussi
+ possible, si le besoin s'en faisait sentir, d'activer ce comportement avec la clé
+ |beamer| au chargement de \pkg{piton} : |\usepackage[beamer]{piton}|}, le comportement
+de \pkg{piton} est légèrement modifié, comme décrit maintenant.
\subsubsection{\{Piton\} et \textbackslash PitonInputFile sont ``overlay-aware''}
-Quand \pkg{piton} est utilisé avec Beamer, l'environnement |{Piton}| et la commande |\PitonInputFile| acceptent
-l'argument optionnel |<...>| de Beamer pour indiquer les «\emph{overlays}» concernés.
+Quand \pkg{piton} est utilisé avec Beamer, l'environnement |{Piton}| et la commande
+|\PitonInputFile| acceptent l'argument optionnel |<...>| de Beamer pour indiquer les
+«\emph{overlays}» concernés.
On peut par exemple écrire :
@@ -1575,27 +1709,37 @@ ou aussi
\subsubsection{Commandes de Beamer reconnues dans \{Piton\} et \textbackslash PitonInputFile}
-Quand \pkg{piton} est utilisé dans la classe \cls{beamer}, les commandes suivantes de \cls{beamer} (classées selon
-leur nombre d'arguments obligatoires) sont directement reconnues dans les environnements |{Piton}| (ainsi que dans
-les listings composés par la commande |\PitonInputFile|, même si c'est sans doute moins utile).
+\index{detected-beamer-commands}
+
+Quand \pkg{piton} est utilisé dans la classe \cls{beamer}, les commandes suivantes de
+\cls{beamer} (classées selon leur nombre d'arguments obligatoires) sont directement
+reconnues dans les environnements |{Piton}| (ainsi que dans les listings composés par la
+commande |\PitonInputFile|, même si c'est sans doute moins utile).
%
\begin{itemize}
-\item aucun argument obligatoire : |\pause|\footnote{On remarquera que, bien sûr, on peut aussi utiliser |\pause|
- dans un «commentaire LaTeX», c'est-à-dire en écrivant |#> \pause|. Ainsi, si le code Python est copié, il est
- interprétable par Python.} ;
-\item un argument obligatoire : |\action|, |\alert|, |\invisible|, |\only|, |\uncover| et |\visible| ;
-\item deux arguments obligatoires : |\alt| ;
+\item aucun argument obligatoire : |\pause|\footnote{On remarquera que, bien sûr, on peut
+aussi utiliser |\pause| dans un «commentaire LaTeX», c'est-à-dire en écrivant
+|#> \pause|. Ainsi, si le code Python est copié, il est interprétable par Python.} ;
+\item un argument obligatoire : |\action|, |\alert|, |\invisible|, |\only|, |\uncover| et
+|\visible| ; \newline
+\colorbox{yellow!50}{\bfseries Nouveau 3.1} on peut rajouter à cette liste de
+nouveaux noms de commandes avec la clé \Definition{detected-beamer-commands} (les noms de
+commandes ne doivent \emph{pas} être précédés de la contre-oblique) ;
+\item deux arguments obligatoires : |\alt| ;
\item trois arguments obligatoires : |\temporal|.
\end{itemize}
\medskip
-Les accolades dans les arguments obligatoires de ces commandes doivent être équilibrées (cependant, les accolades
-présentes dans des chaînes courtes\footnote{Les chaînes courtes de Python sont les chaînes (string) délimitées par
- les caractères \texttt{'} ou \texttt{"} non triplés. En Python, les chaînes de caractères courtes ne peuvent pas
- s'étendre sur plusieurs lignes de code.} de Python ne sont pas prises en compte).
+Ces commandes doivent être utilisées précédées et suivies d'un espace. Les accolades dans
+les arguments obligatoires de ces commandes doivent être équilibrées (cependant, les
+accolades présentes dans des chaînes courtes\footnote{Les chaînes courtes de Python sont
+ les chaînes (string) délimitées par les caractères \texttt{'} ou \texttt{"} non triplés.
+ En Python, les chaînes de caractères courtes ne peuvent pas s'étendre sur plusieurs
+ lignes de code.} de Python ne sont pas prises en compte).
\medskip
-Concernant les fonctions |\alt| et |\temporal|, aucun retour à la ligne ne doit se trouver dans les arguments de ces fonctions.
+Concernant les fonctions |\alt| et |\temporal|, aucun retour à la ligne ne doit se trouver
+dans les arguments de ces fonctions.
\medskip
@@ -1618,22 +1762,29 @@ def string_of_list(l):
\end{document}
\end{Verbatim}
-Dans l'exemple précédent, les accolades des deux chaînes de caractères Python |"{"| et |"}"| sont correctement
-interprétées (sans aucun caractère d'échappement).
+Dans l'exemple précédent, les accolades des deux chaînes de caractères Python |"{"| et
+ |"}"| sont correctement interprétées (sans aucun caractère d'échappement).
\bigskip
\subsubsection{Environnements de Beamer reconnus dans \{Piton\} et \textbackslash PitonInputFile}
-Quand \pkg{piton} est utilisé dans la classe \pkg{beamer}, les environnements suivants de Beamer sont directement
-reconnus dans les environnements |{Piton}| (ainsi que dans les listings composés par la commande |\PitonInputFile|
-même si c'est sans doute moins utile) : |{actionenv}|, |{alertenv}|, |{invisibleenv}|, |{onlyenv}|, |{uncoverenv}|
-et |{visibleenv}|.
+Quand \pkg{piton} est utilisé dans la classe \pkg{beamer}, les environnements suivants de
+Beamer sont directement reconnus dans les environnements |{Piton}| (ainsi que dans les
+listings composés par la commande |\PitonInputFile| même si c'est sans doute moins utile)
+: |{actionenv}|, |{alertenv}|, |{invisibleenv}|, |{onlyenv}|, |{uncoverenv}| et
+|{visibleenv}|.
+\smallskip
+\index{detected-beamer-environments} \colorbox{yellow!50}{\bfseries Nouveau 3.1}\enskip On
+peut ajouter de nouveaux environnements à cette liste d'environnements reconnus avec la
+clé \Definition{detected-beamer-environments}.
\medskip
-Il y a néanmoins une restriction : ces environnements doivent englober des \emph{lignes entières de code Python}.
+Il y a néanmoins une restriction : ces environnements doivent englober des \emph{lignes
+ entières de code Python}. Les instructions |\begin{...}| et |\end{...}| doivent être
+seules sur leurs lignes.
\medskip
@@ -1657,25 +1808,29 @@ def carré(x):
-\vspace{1cm}
-\textbf{Remarque à propos de la commande \textbackslash alert et de l'environnement \{alertenv\} de Beamer}\par\nobreak
+\vspace{1cm}
+\textbf{Remarque à propos de la commande \textbackslash alert et de
+ l'environnement \{alertenv\} de Beamer}\par\nobreak
\smallskip
-Beamer propose un moyen aisé de changer la couleur utilisée par l'environnement |{alertenv}| (et par la commande
-|\alert| qui s'appuie dessus). Par exemple, on peut écrire:
+Beamer propose un moyen aisé de changer la couleur utilisée par l'environnement
+|{alertenv}| (et par la commande |\alert| qui s'appuie dessus). Par exemple, on peut
+écrire:
\begin{Verbatim}
\setbeamercolor{~emphase#alerted text@}{fg=blue}
\end{Verbatim}
-Néanmoins, dans le cas d'une utilisation à l'intérieur d'un environnement |{Piton}| un tel réglage n'est sans doute
-pas pertinent, puisque, justement, \pkg{piton} va (le plus souvent) changer la couleur des élements selon leur
-valeur lexicale. On préfèrera sans doute un environnement |{alertenv}| qui change la couleur de fond des
-éléments à mettre en évidence.
+Néanmoins, dans le cas d'une utilisation à l'intérieur d'un environnement |{Piton}| un tel
+réglage n'est sans doute pas pertinent, puisque, justement, \pkg{piton} va (le plus
+souvent) changer la couleur des élements selon leur valeur lexicale. On préfèrera sans
+doute un environnement |{alertenv}| qui change la couleur de fond des éléments à mettre en
+évidence.
\smallskip
-Voici un code qui effectuera ce travail en mettant un fond jaune. Ce code utilise la commande |\@highLight| de
-l'extension \pkg{lua-ul} (cette extension nécessite elle-même l'extension \pkg{luacolor}).
+Voici un code qui effectuera ce travail en mettant un fond jaune. Ce code utilise la
+commande |\@highLight| de l'extension \pkg{lua-ul} (cette extension nécessite elle-même
+l'extension \pkg{luacolor}).
\begingroup
\fvset{commandchars=\~\#\+,formatcom=\color{gray}}
@@ -1688,8 +1843,9 @@ l'extension \pkg{lua-ul} (cette extension nécessite elle-même l'extension \pkg
\end{Verbatim}
\endgroup
-Ce code redéfinit localement l'environnement |{alertenv}| à l'intérieur de l'environnement |{Piton}| (on rappelle
-que la commande |\alert| s'appuie sur cet environnement |{alertenv}|).
+Ce code redéfinit localement l'environnement |{alertenv}| à l'intérieur de l'environnement
+|{Piton}| (on rappelle que la commande |\alert| s'appuie sur cet environnement
+|{alertenv}|).
@@ -1707,33 +1863,122 @@ que la commande |\alert| s'appuie sur cet environnement |{alertenv}|).
\label{footnote}
-Si vous voulez mettre des notes de pied de page dans un environnement de \pkg{piton} (ou bien dans un listing
-produit par |\PitonInputFile|, bien que cela paraisse moins pertinent dans ce cas-là) vous pouvez utiliser une
-paire |\footnotemark|--|\footnotetext|.
+\smallskip
+Si vous voulez mettre des notes de pied de page dans un environnement de \pkg{piton} (ou
+bien dans un listing produit par |\PitonInputFile|, bien que cela paraisse moins pertinent
+dans ce cas-là) vous pouvez utiliser une paire |\footnotemark|--|\footnotetext|.
\smallskip
-Néanmoins, il est également possible d'extraire les notes de pieds de page avec l'extension \pkg{footnote} ou bien
-l'extension \pkg{footnotehyper}.
+Néanmoins, il est également possible d'extraire les notes de pieds de page avec
+l'extension \pkg{footnote} ou bien l'extension \pkg{footnotehyper}.
\smallskip
-Si \pkg{piton} est chargée avec l'option \Definition{footnote} (avec |\usepackage[footnote]{piton}|) l'extension
-\pkg{footnote} est chargée (si elle ne l'est pas déjà) et elle est utilisée pour extraire les notes de pied de
-page.
+Si \pkg{piton} est chargée avec l'option \Definition{footnote} (avec
+|\usepackage[footnote]{piton}|) l'extension \pkg{footnote} est chargée (si elle ne l'est
+pas déjà) et elle est utilisée pour extraire les notes de pied de page.
\smallskip
-Si \pkg{piton} est chargée avec l'option \Definition{footnotehyper}, l'extension \pkg{footnotehyper} est chargée
-(si elle ne l'est pas déjà) et elle est utilisée pour extraire les notes de pied de page.
+Si \pkg{piton} est chargée avec l'option \Definition{footnotehyper}, l'extension
+\pkg{footnotehyper} est chargée (si elle ne l'est pas déjà) et elle est utilisée pour
+extraire les notes de pied de page.
\smallskip
Attention : Les extensions \pkg{footnote} et \pkg{footnotehyper} sont incompatibles.
-L'extension \pkg{footnotehyper} est le successeur de l'extension \pkg{footnote}
-et devrait être utilisée préférentiellement. L'extension \pkg{footnote} a quelques défauts ;
-en particulier, elle doit être chargée après l'extension \pkg{xcolor} et elle n'est pas parfaitement
-compatible avec \pkg{hyperref}.
+L'extension \pkg{footnotehyper} est le successeur de l'extension \pkg{footnote} et devrait
+être utilisée préférentiellement. L'extension \pkg{footnote} a quelques défauts ; en
+particulier, elle doit être chargée après l'extension \pkg{xcolor} et elle n'est pas
+parfaitement compatible avec \pkg{hyperref}.
+
+
+\medskip
+\textbf{Remarque importante} : Si vous utilisez Beamer, il faut savoir que Beamer a son
+propre système d'extraction des notes de pied de page et vous n'avez donc pas à charger
+\pkg{piton} avec la clé |footnote| ou bien la clé |footnotehyper|.
+
+\bigskip
+Par défaut, une commande |\footnote| ne peut apparaître que dans un «commentaire LaTeX».
+Mais on peut aussi ajouter la commande |\footnote| à la liste des
+``\emph{detected-commands}'' (cf.~partie~\ref{detected-commands},
+p.~\pageref{detected-commands}).
\medskip
-Dans ce document, l'extension \pkg{piton} a été chargée avec l'option |footnotehyper| et c'est pourquoi des notes
-peuvent être mises dans les environnements |{Piton}| : voir un exemple sur la première page de ce document.
+Dans ce document, l'extension \pkg{piton} a été chargée avec l'option |footnotehyper| et
+on rajouté la commande |\footnote| aux ``\emph{detected-commands}'' avec le code suivant
+dans la préambule du document LaTeX :
+
+\qquad \verb|\PitonOptions{detected-commands = footnote}|
+
+\begingroup
+\fvset{commandchars=\~\&\@,formatcom=\small\color{gray}}
+\begin{Verbatim}
+\PitonOptions{background-color=gray!10}
+\begin{Piton}
+def arctan(x,n=10):
+ if x < 0:
+ return -arctan(-x)~emphase&\footnote{Un premier appel récursif.}@
+ elif x > 1:
+ return pi/2 - arctan(1/x)~emphase&\footnote{Un deuxième appel récursif.}@
+ else:
+ return sum( (-1)**k/(2*k+1)*x**(2*k+1) for k in range(n) )
+\end{Piton}
+\end{Verbatim}
+\endgroup
+
+\begingroup
+\PitonOptions{background-color=gray!10}
+\begin{Piton}
+def arctan(x,n=10):
+ if x < 0:
+ return -arctan(-x)\footnote{Un premier appel récursif.}
+ elif x > 1:
+ return pi/2 - arctan(1/x)\footnote{Un deuxième appel récursif.}
+ else:
+ return sum( (-1)**k/(2*k+1)*x**(2*k+1) for k in range(n) )
+\end{Piton}
+\endgroup
+
+
+\vspace{1cm}
+
+Si on utilise l'environnement |{Piton}| dans un environnement |{minipage}| de LaTeX, les
+notes sont, bien entendu, composées au bas de l'environnement |{minipage}|. Rappelons
+qu'une telle |{minipage}| ne peut être coupée par un saut de page.
+
+
+\begingroup
+\fvset{commandchars=\~\&\@,formatcom=\small\color{gray}}
+\begin{Verbatim}
+\PitonOptions{background-color=gray!10}
+\emphase\begin{minipage}{\linewidth}
+\begin{Piton}
+def arctan(x,n=10):
+ if x < 0:
+ return -arctan(-x)~emphase&\footnote{Un premier appel récursif.}@
+ elif x > 1:
+ return pi/2 - arctan(1/x)~emphase&\footnote{Un deuxième appel récursif.}@
+ else:
+ return sum( (-1)**k/(2*k+1)*x**(2*k+1) for k in range(n) )
+\end{Piton}
+\end{minipage}
+\end{Verbatim}
+\endgroup
+
+\begingroup
+\PitonOptions{background-color=gray!10}
+\begin{minipage}{\linewidth}
+\begin{Piton}
+def arctan(x,n=10):
+ if x < 0:
+ return -arctan(-x)\footnote{Un premier appel récursif.}
+ elif x > 1:
+ return pi/2 - arctan(1/x)\footnote{Un deuxième appel récursif.}
+ else:
+ return sum( (-1)**k/(2*k+1)*x**(2*k+1) for k in range(n) )
+\end{Piton}
+\end{minipage}
+\endgroup
+
+
\subsection{Tabulations}
@@ -1741,15 +1986,20 @@ peuvent être mises dans les environnements |{Piton}| : voir un exemple sur la p
\index{tab-size}
\smallskip
-Même s'il est recommandé d'indenter les listings Python avec des espaces (cf. PEP~8), \pkg{piton} accepte les
-caractères de tabulations (U+0009) en début de ligne. Chaque caractère U+0009 est remplacé par $n$ espaces. La
-valeur initiale de~$n$ est~4 mais on peut la changer avec la clé \Definition{tab-size} de |\PitonOptions|.
+Même s'il est recommandé d'indenter les listings Python avec des espaces (cf. PEP~8),
+\pkg{piton} accepte les caractères de tabulations (U+0009) en début de ligne. Chaque
+caractère U+0009 est remplacé par $n$ espaces. La valeur initiale de~$n$ est~4 mais on
+peut la changer avec la clé \Definition{tab-size} de |\PitonOptions|.
\smallskip
-Il existe aussi une clé \Definition{tabs-auto-gobble} qui détermine le nombre minimal de caractères U+0009 débutant
-chaque ligne (non vide) de l'environnement |{Piton}| et applique |gobble| avec cette valeur (avant le remplacement
-des caractères U+0009 par des espaces, bien entendu). Cette clé est donc similaire à la clé |auto-gobble| mais agit
-sur des caractères U+0009 au lieu de caractères U+0020 (espaces).
+Il existe aussi une clé \Definition{tabs-auto-gobble} qui détermine le nombre minimal de
+caractères U+0009 débutant chaque ligne (non vide) de l'environnement |{Piton}| et
+applique |gobble| avec cette valeur (avant le remplacement des caractères U+0009 par des
+espaces, bien entendu). Cette clé est donc similaire à la clé |auto-gobble| mais agit sur
+des caractères U+0009 au lieu de caractères U+0020 (espaces).
+
+\smallskip
+La clé |env-gobble| n'est pas compatible avec les tabulations.
\section{API pour les développeurs}
@@ -1764,22 +2014,24 @@ La variable L3 |\l_piton_language_str| contient le nom du langage courant (en mi
\colorbox{yellow!50}{\textbf{Nouveau 2.6}}\par\nobreak
-L'extension \pkg{piton} fournit une fonction Lua |piton.get_last_code| sans argument permettant de récupérer le
-code contenu dans le dernier environnement de \pkg{piton}.
+L'extension \pkg{piton} fournit une fonction Lua |piton.get_last_code| sans argument
+permettant de récupérer le code contenu dans le dernier environnement de \pkg{piton}.
\begin{itemize}
-\item Les retours à la ligne (présents dans l'environnement de départ) apparaissent comme des caractères |\r|
-(c'est-à-dire des caractères U+000D).
+\item Les retours à la ligne (présents dans l'environnement de départ) apparaissent comme
+des caractères |\r| (c'est-à-dire des caractères U+000D).
-\item Le code fourni par |piton.get_last_code()| tient compte de l'éventuelle application d'une clé |gobble| (cf.
-p.~\pageref{gobble}).
+\item Le code fourni par |piton.get_last_code()| tient compte de l'éventuelle application
+d'une clé |gobble| (cf. p.~\pageref{gobble}).
-\item Les surcharges du code (qui entraînent des échappements vers LaTeX) ont été retirées du code fourni par
-|piton.get_last_code()|. Cela s'applique aux commandes LaTeX déclarées par la clé |detected-commands| (cf.
-partie~\ref{detected-commands}) et aux éléments insérés avec le mécanisme «|escape|» (cf. partie~\ref{escape}).
+\item Les surcharges du code (qui entraînent des échappements vers LaTeX) ont été retirées
+du code fourni par |piton.get_last_code()|. Cela s'applique aux commandes LaTeX déclarées
+par la clé |detected-commands| (cf. partie~\ref{detected-commands}) et aux éléments
+insérés avec le mécanisme «|escape|» (cf. partie~\ref{escape}).
-\item |piton.get_last_code| est une fonction Lua et non une chaîne de caractères : les traitements présentés
-précédemment sont exécutés lorsque la fonction est appelée. De ce fait, il peut être judicieux de stocker la valeur
-renvoyée par |piton.get_last_code()| dans une variable Lua si on doit l'utiliser plusieurs fois.
+\item |piton.get_last_code| est une fonction Lua et non une chaîne de caractères : les
+traitements présentés précédemment sont exécutés lorsque la fonction est appelée. De ce
+fait, il peut être judicieux de stocker la valeur renvoyée par |piton.get_last_code()|
+dans une variable Lua si on doit l'utiliser plusieurs fois.
\end{itemize}
\medskip
@@ -1794,12 +2046,15 @@ partie~\ref{pyluatex}, p.~\pageref{pyluatex}.
\label{example-numbering}
\index{numérotation des lignes de code|emph}
-On rappelle que l'on peut demander la numérotation des lignes des listings avec la clé |line-numbers|.
+On rappelle que l'on peut demander la numérotation des lignes des listings avec la clé
+|line-numbers| (utilisée sans valeur).
-Par défaut, les numéros de ligne sont composés par \pkg{piton} en débordement à gauche (en utilisant en interne la commande |\llap| de LaTeX).
+Par défaut, les numéros de ligne sont composés par \pkg{piton} en débordement à gauche (en
+utilisant en interne la commande |\llap| de LaTeX).
-Si on ne veut pas de débordement, on peut utiliser l'option |left-margin=auto| qui va insérer une marge adaptée aux
-numéros qui seront insérés (elle est plus large quand les numéros dépassent 10).
+Si on ne veut pas de débordement, on peut utiliser l'option |left-margin=auto| qui va
+insérer une marge adaptée aux numéros qui seront insérés (elle est plus large quand les
+numéros dépassent 10).
\begingroup
@@ -1841,8 +2096,8 @@ def arctan(x,n=10):
\label{example-comments}
\index{commentaires LaTeX|emph}
-On peut modifier le style |Comment.LaTeX| (avec |\SetPitonStyle|) pour faire afficher les commentaires
-LaTeX (qui débutent par |#>|) en butée à droite.
+On peut modifier le style |Comment.LaTeX| (avec |\SetPitonStyle|) pour faire afficher les
+commentaires LaTeX (qui débutent par |#>|) en butée à droite.
\begingroup
\fvset{commandchars=\~\&\@,formatcom=\small\color{gray}}
@@ -1876,10 +2131,10 @@ def arctan(x,n=10):
\endgroup
-\vspace{1cm}
-On peut aussi faire afficher les commentaires dans une deuxième colonne à droite si on limite la largeur du code
-proprement dit avec la clé |width|. Dans l'exemple qui suit, on utilise la clé |width| avec la valeur
-spéciale~|min|. Plusieurs compilations sont nécessaires.
+\vspace{1cm} On peut aussi faire afficher les commentaires dans une deuxième colonne à
+droite si on limite la largeur du code proprement dit avec la clé |width|. Dans l'exemple
+qui suit, on utilise la clé |width| avec la valeur spéciale~|min|. Plusieurs compilations
+sont nécessaires.
\begingroup
@@ -1925,100 +2180,18 @@ def arctan(x,n=10):
\bigskip
-\subsection{Notes dans les listings}
-
-\index{notes dans les listings|emph}
-
-Pour pouvoir extraire les notes (introduites par |\footnote|), l'extension |piton| doit être chargée, soit avec la
-clé |footnote|, soit avec la clé |footnotehyper|, comme expliqué à la section \ref{footnote} p.~\pageref{footnote}.
-Dans le présent document, l'extension \pkg{piton} a été chargée par la clé |footnotehyper|.
-
-Bien entendu, une commande |\footnote| ne peut apparaître que dans un commentaire LaTeX (qui débute par |#>|). Un
-tel commentaire peut se limiter à cette unique commande |\footnote|, comme dans l'exemple suivant.
-
-\begingroup
-\fvset{commandchars=\~\&\@,formatcom=\small\color{gray}}
-\begin{Verbatim}
-\PitonOptions{background-color=gray!10}
-\begin{Piton}
-def arctan(x,n=10):
- if x < 0:
- return -arctan(-x)~emphase&#>\footnote{Un premier appel récursif.}]@
- elif x > 1:
- return pi/2 - arctan(1/x)~emphase&#>\footnote{Un deuxième appel récursif.}@
- else:
- return sum( (-1)**k/(2*k+1)*x**(2*k+1) for k in range(n) )
-\end{Piton}
-\end{Verbatim}
-\endgroup
-
-\begingroup
-\PitonOptions{background-color=gray!10}
-\begin{Piton}
-def arctan(x,n=10):
- if x < 0:
- return -arctan(-x)#>\footnote{Un premier appel récursif.}
- elif x > 1:
- return pi/2 - arctan(1/x)#>\footnote{Un deuxième appel récursif.}
- else:
- return sum( (-1)**k/(2*k+1)*x**(2*k+1) for k in range(n) )
-\end{Piton}
-\endgroup
-
-
-\vspace{1cm}
-
-Si on utilise l'environnement |{Piton}| dans un environnement |{minipage}| de LaTeX, les notes sont, bien entendu,
-composées au bas de l'environnement |{minipage}|. Rappelons qu'une telle |{minipage}| ne peut être coupée par un
-saut de page.
-
-
-\begingroup
-\fvset{commandchars=\~\&\@,formatcom=\small\color{gray}}
-\begin{Verbatim}
-\PitonOptions{background-color=gray!10}
-\emphase\begin{minipage}{\linewidth}
-\begin{Piton}
-def arctan(x,n=10):
- if x < 0:
- return -arctan(-x)~emphase&#>\footnote{Un premier appel récursif.}@
- elif x > 1:
- return pi/2 - arctan(1/x)~emphase&#>\footnote{Un deuxième appel récursif.}@
- else:
- return sum( (-1)**k/(2*k+1)*x**(2*k+1) for k in range(n) )
-\end{Piton}
-\end{minipage}
-\end{Verbatim}
-\endgroup
-
-\begingroup
-\PitonOptions{background-color=gray!10}
-\begin{minipage}{\linewidth}
-\begin{Piton}
-def arctan(x,n=10):
- if x < 0:
- return -arctan(-x)#>\footnote{Un premier appel récursif.}
- elif x > 1:
- return pi/2 - arctan(1/x)#>\footnote{Un deuxième appel récursif.}
- else:
- return sum( (-1)**k/(2*k+1)*x**(2*k+1) for k in range(n) )
-\end{Piton}
-\end{minipage}
-\endgroup
-
-
-\bigskip
-
\subsection{Un exemple de réglage des styles}
Les styles graphiques ont été présentés à la partie \ref{styles}, p.~\pageref{styles}.
\smallskip
-On présente ici un réglage de ces styles adapté pour les documents en noir et blanc. On l'utilise avec la fonte
-\emph{DejaVu Sans Mono}\footnote{Voir: \url{https://dejavu-fonts.github.io}} spécifiée avec la commande
- |\setmonofont| de \pkg{fontspec}.
+On présente ici un réglage de ces styles adapté pour les documents en noir et blanc. On
+l'utilise avec la fonte \emph{DejaVu Sans Mono}\footnote{Voir:
+ \url{https://dejavu-fonts.github.io}} spécifiée avec la commande |\setmonofont| de
+\pkg{fontspec}.
-Ce réglage utilise la commande |\highLight| de \pkg{lua-ul} (cette extension nécessite elle-même l'extension \pkg{luacolor}).
+Ce réglage utilise la commande |\highLight| de \pkg{lua-ul} (cette extension nécessite
+elle-même l'extension \pkg{luacolor}).
\begin{Verbatim}
@@ -2044,10 +2217,11 @@ Ce réglage utilise la commande |\highLight| de \pkg{lua-ul} (cette extension nÃ
\end{Verbatim}
-Dans ce réglage, de nombreuses valeurs fournies aux clés sont vides, ce qui signifie que le style correspondant
-n'insèrera aucune instruction de formatage (l'élément sera composé dans la couleur standard, le plus souvent, en noir,
-etc.). Ces entrées avec valeurs nulles sont néanmoins nécessaires car la valeur initiale de ces styles dans
-\pkg{piton} n'est \emph{pas} vide.
+Dans ce réglage, de nombreuses valeurs fournies aux clés sont vides, ce qui signifie que
+le style correspondant n'insèrera aucune instruction de formatage (l'élément sera composé
+dans la couleur standard, le plus souvent, en noir, etc.). Ces entrées avec valeurs nulles
+sont néanmoins nécessaires car la valeur initiale de ces styles dans \pkg{piton} n'est
+\emph{pas} vide.
\begingroup
@@ -2105,11 +2279,13 @@ def arctan(x,n=10):
\label{pyluatex}
\index{pyluatex@{\pkg{pyluatex}} (extension)}
-L'extension \pkg{pyluatex} est une extension qui permet l'exécution de code Python à partir de |lualatex| (pourvu
-que Python soit installé sur la machine et que la compilation soit effectuée avec |lualatex| et |--shell-escape|).
+L'extension \pkg{pyluatex} est une extension qui permet l'exécution de code Python à
+partir de |lualatex| (pourvu que Python soit installé sur la machine et que la compilation
+soit effectuée avec |lualatex| et |--shell-escape|).
-Voici, à titre d'exemple, un environnement |{PitonExecute}| qui formate un listing Python (avec \pkg{piton}) et qui
-affiche également dessous le résultat de l'exécution de ce code avec Python.
+Voici, à titre d'exemple, un environnement |{PitonExecute}| qui formate un listing Python
+(avec \pkg{piton}) et qui affiche également dessous le résultat de l'exécution de ce code
+avec Python.
\begin{Verbatim}
@@ -2129,12 +2305,12 @@ affiche également dessous le résultat de l'exécution de ce code avec Python.
\ignorespacesafterend}
-On a utilisé la fonction Lua |piton.get_last_code| fournie dans l'API de \pkg{piton} : cf.~partie~\ref{API},
-p.~\pageref{API}.
+ On a utilisé la fonction Lua |piton.get_last_code| fournie dans l'API de \pkg{piton} :
+ cf.~partie~\ref{API}, p.~\pageref{API}.
\bigskip
-Cet environnement |{PitonExecute}| prend en argument optionnel (entre crochets) les options proposées par la
-commande |\PitonOptions|.
+Cet environnement |{PitonExecute}| prend en argument optionnel (entre crochets) les
+options proposées par la commande |\PitonOptions|.
\begin{Verbatim}
\begin{~emphase#PitonExecute@}[background-color=gray!15]
@@ -2162,23 +2338,26 @@ print(f'Le carré de 12 est {carré(12)}.')
\index{pythonrepl@\texttt{\{pythonrepl\}} (environnement de \pkg{pyluatex})}
-L'environnement |{pythonrepl}| de \pkg{pyluatex} passe son contenu à Python et renvoie ce que l'on obtient quand on
-fournit ce code à une boucle \textsc{repl} (\emph{read-eval-print loop}) de Python. On obtient un entrelacement
-d'instructions précédées par le prompt |>>>| de Python et des valeurs renvoyées par Python (et de ce qui a été
-demandé d'être affiché avec des \piton{print} de Python).
+L'environnement |{pythonrepl}| de \pkg{pyluatex} passe son contenu à Python et renvoie ce
+que l'on obtient quand on fournit ce code à une boucle \textsc{repl}
+(\emph{read-eval-print loop}) de Python. On obtient un entrelacement d'instructions
+précédées par le prompt |>>>| de Python et des valeurs renvoyées par Python (et de ce qui
+a été demandé d'être affiché avec des \piton{print} de Python).
\medskip
-Il est ensuite possible de passer cela à un environnement |{Piton}| qui va faire un coloriage syntaxique
-et mettre sur fond grisé les lignes correspondant aux instructions fournies à l'interpréteur Python (grâce à la clé
-|prompt-background-color| de |\PitonOptions|).
+Il est ensuite possible de passer cela à un environnement |{Piton}| qui va faire un
+coloriage syntaxique et mettre sur fond grisé les lignes correspondant aux instructions
+fournies à l'interpréteur Python (grâce à la clé |prompt-background-color| de
+|\PitonOptions|).
\medskip
-Voici la programmation d'un environnement |{PitonREPL}| qui effectue ce travail (pour des raisons techniques, le
-|!| est ici obligatoire dans la signature de l'environnement). On ne peut pas procéder comme précédemment (dans
-l'utilisation «standard» de \pkg{pyluatex}) car, bien sûr, c'est le retour fait par |{pythonrepl}| qui doit être
-traité par \pkg{piton}. De ce fait, il ne sera pas possible de mettre des surcharges (avec |detected-commands| ou
-le mécanisme |escape|) dans le code.
+Voici la programmation d'un environnement |{PitonREPL}| qui effectue ce travail (pour des
+raisons techniques, le |!| est ici obligatoire dans la signature de l'environnement). On
+ne peut pas procéder comme précédemment (dans l'utilisation «standard» de \pkg{pyluatex})
+car, bien sûr, c'est le retour fait par |{pythonrepl}| qui doit être traité par
+\pkg{piton}. De ce fait, il ne sera pas possible de mettre des surcharges (avec
+|detected-commands| ou le mécanisme |escape|) dans le code.
\begin{Verbatim}
\ExplSyntaxOn
@@ -2263,11 +2442,12 @@ Voici un exemple d'utilisation de ce nouvel environnement |{PitonREPL}|.
\bigskip
-En fait, il est possible de ne pas faire afficher les prompts eux-mêmes (c'est-à-dire les chaînes de caractères
-|>>>| et |...|). En effet, \pkg{piton} propose un style pour ces éléments, qui est appelé |Prompt|. Par défaut, la
-valeur de ce style est vide, ce qui fait qu'aucune action n'est exécutée sur ces éléments qui sont donc affichés
-tels quels. En fournissant comme valeur une fonction qui se contente de gober son argument, on peut demander à ce
-qu'ils ne soient pas affichés.
+En fait, il est possible de ne pas faire afficher les prompts eux-mêmes (c'est-à-dire les
+chaînes de caractères |>>>| et |...|). En effet, \pkg{piton} propose un style pour ces
+éléments, qui est appelé |Prompt|. Par défaut, la valeur de ce style est vide, ce qui fait
+qu'aucune action n'est exécutée sur ces éléments qui sont donc affichés tels quels. En
+fournissant comme valeur une fonction qui se contente de gober son argument, on peut
+demander à ce qu'ils ne soient pas affichés.
\bigskip
\begin{savenotes}
@@ -2328,16 +2508,17 @@ L'exemple précédent donne alors :
\subsection{Le langage Python}
-Le langage par défaut de l'extension \pkg{piton} est Python. Si besoin est, on peut revenir au langage Python avec
-|\PitonOptions{language=Python}|.
+Le langage par défaut de l'extension \pkg{piton} est Python. Si besoin est, on peut
+revenir au langage Python avec |\PitonOptions{language=Python}|.
\bigskip
-Les réglages initiaux effectués par \pkg{piton} dans |piton.sty| sont inspirés par le style \pkg{manni} de Pygments
-tel qu'il est appliqué au langage Python par Pygments.\footnote{Voir \url{https://pygments.org/styles/}. À
- remarquer que, par défaut, Pygments propose pour le style \pkg{manni} un fond coloré dont la couleur est la
- couleur HTML |#F0F3F3|. Il est possible d'avoir la même couleur dans |{Piton}| avec l'instruction :
- |\PitonOptions{background-color = [HTML]{F0F3F3}}|}
+Les réglages initiaux effectués par \pkg{piton} dans |piton.sty| sont inspirés par le
+style \pkg{manni} de Pygments tel qu'il est appliqué au langage Python par
+Pygments.\footnote{Voir \url{https://pygments.org/styles/}. À remarquer que, par défaut,
+ Pygments propose pour le style \pkg{manni} un fond coloré dont la couleur est la couleur
+ HTML |#F0F3F3|. Il est possible d'avoir la même couleur dans |{Piton}| avec
+ l'instruction : |\PitonOptions{background-color = [HTML]{F0F3F3}}|}
\vspace{1cm}
@@ -2349,38 +2530,45 @@ tel qu'il est appliqué au langage Python par Pygments.\footnote{Voir \url{https
\midrule
Number & les nombres \\
String.Short & les chaînes de caractères courtes (entre \texttt{'} ou \texttt{"}) \\
- String.Long & les chaînes de caractères longues (entre \texttt{'''} ou \texttt{"""}) sauf les chaînes de
- documentation (qui sont gérées par |String.Doc|)\\
+ String.Long & les chaînes de caractères longues (entre \texttt{'''} ou \texttt{"""})
+ sauf les chaînes de documentation (qui sont gérées par |String.Doc|)\\
String & cette clé fixe à la fois |String.Short| et |String.Long| \\
String.Doc & les chaînes de documentation (seulement entre |"""| suivant PEP~257) \\
- String.Interpol & les éléments syntaxiques des champs des f-strings (c'est-à-dire les caractères \texttt{\{} et
- \texttt{\}}) ; ce style hérite des styles |String.Short| et |String.Long| (suivant la chaîne où
- apparaît l'interpolation)\\
- Interpol.Inside & le contenu des interpolations dans les f-strings (c'est-à-dire les éléments qui se trouvent entre
- \texttt{\{} et~\texttt{\}} ; si l'utilisateur n'a pas fixé ce style, ces éléments sont analysés et formatés par \pkg{piton}
- au même titre que le reste du code. \\
- Operator & les opérateurs suivants : \texttt{!= == << >> - \~{} + / * \% = < > \& .} \verb+|+ |@| \\
+ String.Interpol & les éléments syntaxiques des champs des f-strings (c'est-à-dire les
+ caractères \texttt{\{} et \texttt{\}}) ; ce style hérite des styles
+ |String.Short| et |String.Long| (suivant la chaîne où apparaît
+ l'interpolation)\\
+ Interpol.Inside & le contenu des interpolations dans les f-strings (c'est-à-dire les
+ éléments qui se trouvent entre \texttt{\{} et~\texttt{\}} ; si
+ l'utilisateur n'a pas fixé ce style, ces éléments sont analysés et
+ formatés par \pkg{piton} au même titre que le reste du code. \\
+ Operator & les opérateurs suivants : \texttt{!= == << >> - \~{} + / * \% = < > \& .}
+ \verb+|+ |@| \\
Operator.Word & les opérateurs suivants : |in|, |is|, |and|, |or| et |not| \\
Name.Builtin & la plupart des fonctions prédéfinies par Python \\
Name.Decorator & les décorateurs (instructions débutant par \verb|@|) \\
Name.Namespace & le nom des modules (= bibliothèques extérieures) \\
- Name.Class & le nom des classes au moment de leur définition, c'est-à-dire après le mot-clé \verb|class| \\
- Name.Function & le nom des fonctions définies par l'utilisateur \emph{au moment de leur définition} (après le
- mot-clé |def|) \\
- UserFunction & le nom des fonctions précédemment définies par l'utilisateur (la valeur initiale de ce paramètre est
- vide et ces éléments sont affichés en noir --- ou plutôt dans la couleur courante) \\
+ Name.Class & le nom des classes au moment de leur définition, c'est-à-dire après le
+ mot-clé \verb|class| \\
+ Name.Function & le nom des fonctions définies par l'utilisateur \emph{au moment de leur
+ définition} (après le mot-clé |def|) \\
+ UserFunction & le nom des fonctions précédemment définies par l'utilisateur (la valeur
+ initiale de ce paramètre est vide et ces éléments sont affichés en noir
+ --- ou plutôt dans la couleur courante) \\
Exception & les exceptions prédéfinies (ex.: \texttt{SyntaxError}) \\
- InitialValues & les valeurs initiales (et le symbole |=| qui précède) des arguments optionnels dans les définitions
- de fonctions ; si l'utilisateur n'a pas fixé ce style, ces éléments sont analysés et formatés par \pkg{piton}
+ InitialValues & les valeurs initiales (et le symbole |=| qui précède) des arguments
+ optionnels dans les définitions de fonctions ; si l'utilisateur n'a pas
+ fixé ce style, ces éléments sont analysés et formatés par \pkg{piton}
au même titre que le reste du code.\\
Comment & les commentaires commençant par \texttt{\#} \\
- Comment.LaTeX & les commentaires commençant par \texttt{\#>} qui sont composés par \pkg{piton} comme du code LaTeX (et
- appelés simplement «commentaires LaTeX» dans ce document) \\
+ Comment.LaTeX & les commentaires commençant par \texttt{\#>} qui sont composés par
+ \pkg{piton} comme du code LaTeX (et appelés simplement «commentaires
+ LaTeX» dans ce document) \\
Keyword.Constant & |True|, |False| et |None| \\
Keyword & les mots-clés suivants :
\ttfamily assert, break, case, continue, del,
elif, else, except, exec, finally, for, from,
- global, if, import, lambda, non local,
+ global, if, import, in, lambda, non local,
pass, raise, return, try, while,
with, yield et yield from.\\
\bottomrule
@@ -2421,17 +2609,18 @@ L'option est aussi disponible pour |\PitonInputFile| : |\PitonInputFile[language
String.Long & les chaînes de caractères, entre |"| mais aussi les \emph{quoted-strings} \\
String & cette clé fixe à la fois |String.Short| et |String.Long| \\
Operator & les opérateurs, en particulier |+|, |-|, |/|, |*|, |@|, |!=|, |==|, |&&| \\
- Operator.Word & les opérateurs suivants : |and|, |asr|, |land|, |lor|, |lsl|, |lxor|, |mod| et |or| \\
+ Operator.Word & les opérateurs suivants : |and|, |asr|, |land|, |lor|, |lsl|, |lxor|,
+ |mod| et |or| \\
Name.Builtin & les fonctions |not|, |incr|, |decr|, |fst| et |snd| \\
Name.Type & le nom des types OCaml \\
Name.Field & le nom d'un champ de module \\
Name.Constructor & le nom des constructeurs de types (qui débutent par une majuscule) \\
Name.Module & le nom des modules \\
- Name.Function & le nom des fonctions définies par l'utilisateur \emph{au moment de leur définition} (après le
- mot-clé |let|) \\
- UserFunction & le nom des fonctions précédemment définies par l'utilisateur
- (la valeur initiale de ce paramètre est
- vide et ces éléments sont affichés en noir --- ou plutôt dans la couleur courante) \\
+ Name.Function & le nom des fonctions définies par l'utilisateur \emph{au moment de leur
+ définition} (après le mot-clé |let|) \\
+ UserFunction & le nom des fonctions précédemment définies par l'utilisateur (la valeur
+ initiale de ce paramètre est vide et ces éléments sont affichés en noir
+ --- ou plutôt dans la couleur courante) \\
Exception & les exceptions prédéfinies (ex. : |End_of_File|) \\
TypeParameter & les paramétreurs de type \\
Comment & les commentaires, entre |(*| et |*)| ; ces commentaires peuvent être imbriqués \\
@@ -2477,28 +2666,33 @@ L'option est aussi disponible pour |\PitonInputFile| : |\PitonInputFile[language
\midrule
Number & les nombres \\
String.Long & les chaînes de caractères (entre \texttt{"}) \\
-String.Interpol & les éléments \texttt{\%d}, \texttt{\%i}, \texttt{\%f}, \texttt{\%c}, etc. dans les chaînes de
- caractères ; ce style hérite du style |String.Long| \\
+String.Interpol & les éléments \texttt{\%d}, \texttt{\%i}, \texttt{\%f}, \texttt{\%c},
+ etc. dans les chaînes de caractères ; ce style hérite du style
+ |String.Long| \\
Operator & les opérateurs suivants : \texttt{!= == << >> - \~{} + / * \% = < > \& .} \verb+|+ |@| \\
-Name.Type & les types prédéfinis suivants :
- |bool|, |char|, |char16_t|, |char32_t|, |double|, |float|, |int|, |int8_t|, |int16_t|, |int32_t|,
- |int64_t|, |long|, |short|, |signed|, |unsigned|, |void| et |wchar_t| \\
-Name.Builtin & les fonctions prédéfinies suivantes : |printf|, |scanf|, |malloc|, |sizeof| et |alignof| \\
- Name.Class & le nom des classes au moment de leur définition, c'est-à-dire après le mot-clé |class| \\
+Name.Type & les types prédéfinis suivants : |bool|, |char|, |char16_t|, |char32_t|,
+ |double|, |float|, |int|, |int8_t|, |int16_t|, |int32_t|, |int64_t|, |long|,
+ |short|, |signed|, |unsigned|, |void| et |wchar_t| \\
+Name.Builtin & les fonctions prédéfinies suivantes : |printf|, |scanf|, |malloc|, |sizeof|
+ et |alignof| \\
+ Name.Class & le nom des classes au moment de leur définition, c'est-à-dire après le
+ mot-clé |class| \\
Name.Function & le nom des fonctions définies par l'utilisateur \emph{au moment de leur définition} \\
-UserFunction & le nom des fonctions précédemment définies par l'utilisateur (la valeur initiale de ce paramètre est
- vide et ces éléments sont affichés en noir --- ou plutôt dans la couleur courante) \\
+UserFunction & le nom des fonctions précédemment définies par l'utilisateur (la valeur
+ initiale de ce paramètre est vide et ces éléments sont affichés en noir ---
+ ou plutôt dans la couleur courante) \\
Preproc & les instructions du préprocesseur (commençant par |#|) \\
Comment & les commentaires (commençant par \texttt{//} ou entre |/*| et |*/|) \\
-Comment.LaTeX & les commentaires commençant par \texttt{//>} qui sont composés par \pkg{piton} comme du code LaTeX (et
- appelés simplement «commentaires LaTeX» dans ce document) \\
+Comment.LaTeX & les commentaires commençant par \texttt{//>} qui sont composés par
+ \pkg{piton} comme du code LaTeX (et appelés simplement «commentaires
+ LaTeX» dans ce document) \\
Keyword.Constant & |default|, |false|, |NULL|, |nullptr| et |true| \\
-Keyword & les mots-clés suivants :
-|alignas|, |asm|, |auto|, |break|, |case|, |catch|, |class|,
-|constexpr|, |const|, |continue|, |decltype|, |do|, |else|, |enum|,
-|extern|, |for|, |goto|, |if|, |nexcept|, |private|, |public|, |register|, |restricted|, |try|,
-|return|, |static|, |static_assert|, |struct|, |switch|, |thread_local|, |throw|,
-|typedef|, |union|, |using|, |virtual|, |volatile| et |while|
+Keyword & les mots-clés suivants : |alignas|, |asm|, |auto|, |break|, |case|, |catch|,
+ |class|, |constexpr|, |const|, |continue|, |decltype|, |do|, |else|, |enum|,
+ |extern|, |for|, |goto|, |if|, |nexcept|, |private|, |public|, |register|,
+ |restricted|, |try|, |return|, |static|, |static_assert|, |struct|, |switch|,
+ |thread_local|, |throw|, |typedef|, |union|, |using|, |virtual|, |volatile| et
+ |while|
\\
\bottomrule
\end{tabularx}
@@ -2534,31 +2728,32 @@ L'option est aussi disponible pour |\PitonInputFile| : |\PitonInputFile[language
Number & les nombres \\
String.Long & les chaînes de caractères (entre \texttt{'} et non entre \texttt{"} car les éléments entre \texttt{"}
sont des noms de champs et formatés avec |Name.Field|) \\
-Operator & les opérateurs suivants :
-\texttt{= != <> >= > < <= * + / } \\
+Operator & les opérateurs suivants : \texttt{= != <> >= > < <= * + / } \\
Name.Table & les noms des tables \\
Name.Field & les noms des champs des tables \\
-Name.Builtin & les fonctions prédéfinies suivantes (leur nom n'est \emph{pas} sensible à la casse) :
- |avg|, |count|, |char_lenght|, |concat|, |curdate|, |current_date|,
- |date_format|, |day|, |lower|, |ltrim|, |max|, |min|, |month|, |now|,
- |rank|, |round|, |rtrim|, |substring|, |sum|, |upper| et |year|. \\
+Name.Builtin & les fonctions prédéfinies suivantes (leur nom n'est \emph{pas} sensible à
+ la casse) : |avg|, |count|, |char_lenght|, |concat|, |curdate|,
+ |current_date|, |date_format|, |day|, |lower|, |ltrim|, |max|, |min|,
+ |month|, |now|, |rank|, |round|, |rtrim|, |substring|, |sum|, |upper| et
+ |year|. \\
Comment & les commentaires (débutant par |--| ou bien entre |/*| et |*/|) \\
-Comment.LaTeX & les commentaires commençant par \texttt{-->} qui sont composés par \pkg{piton} comme du code LaTeX (et
- appelés simplement «commentaires LaTeX» dans ce document) \\
-Keyword & les mots-clés suivants (leur nom n'est \emph{pas} sensible à la casse) :
- |add|, |after|, |all|, |alter|, |and|, |as|, |asc|, |between|, |by|,
- |change|, |column|, |create|, |cross join|, |delete|, |desc|, |distinct|,
- |drop|, |from|, |group|, |having|, |in|, |inner|, |insert|, |into|, |is|,
- |join|, |left|, |like|, |limit|, |merge|, |not|, |null|, |on|, |or|,
- |order|, |over|, |right|, |select|, |set|, |table|, |then|, |truncate|,
- |union|, |update|, |values|, |when|, |where| et |with|. \\
+Comment.LaTeX & les commentaires commençant par \texttt{-->} qui sont composés par
+ \pkg{piton} comme du code LaTeX (et appelés simplement «commentaires
+ LaTeX» dans ce document) \\
+Keyword & les mots-clés suivants (leur nom n'est \emph{pas} sensible à la casse) : |add|,
+ |after|, |all|, |alter|, |and|, |as|, |asc|, |between|, |by|, |change|,
+ |column|, |create|, |cross join|, |delete|, |desc|, |distinct|, |drop|, |from|,
+ |group|, |having|, |in|, |inner|, |insert|, |into|, |is|, |join|, |left|,
+ |like|, |limit|, |merge|, |not|, |null|, |on|, |or|, |order|, |over|, |right|,
+ |select|, |set|, |table|, |then|, |truncate|, |union|, |update|, |values|,
+ |when|, |where| et |with|. \\
\bottomrule
\end{tabularx}
\end{center}
\bigskip
-Si on souhaite que les mots-clés soient capitalisés automatiquement, on peut modifier le style |Keywords|
-localement pour le langage SQL avec l'instruction :
+Si on souhaite que les mots-clés soient capitalisés automatiquement, on peut modifier le
+style |Keywords| localement pour le langage SQL avec l'instruction :
\begin{Verbatim}
\SetPitonStyle~emphase#[SQL]@{Keywords = \bfseries \MakeUppercase}
\end{Verbatim}
@@ -2598,16 +2793,18 @@ L'option est aussi disponible pour |\PitonInputFile| : |\PitonInputFile[language
Number & les nombres \\
String & les chaînes de caractères (qui sont entre \texttt{"}) \\
Comment & les commentaires (qui débutent par |#|) \\
-Comment.LaTeX & les commentaires commençant par \texttt{\#>} qui sont composés par \pkg{piton} comme du code LaTeX (et
- appelés simplement «commentaires LaTeX» dans ce document) \\
+Comment.LaTeX & les commentaires commençant par \texttt{\#>} qui sont composés par
+ \pkg{piton} comme du code LaTeX (et appelés simplement «commentaires
+ LaTeX» dans ce document) \\
\bottomrule
\end{tabularx}
\end{center}
\bigskip
-Ce langage «|minimal|» est proposé par \pkg{piton} à l'utilisateur final pour qu'il puisse y ajouter des
-formatages de mots-clés avec la commande |\SetPitonIdentifier| (cf. \ref{SetPitonIdentifier},
-p.~\pageref{SetPitonIdentifier}) et créer par exemple un langage pour pseudo-code.
+Ce langage «|minimal|» est proposé par \pkg{piton} à l'utilisateur final pour qu'il puisse
+y ajouter des formatages de mots-clés avec la commande |\SetPitonIdentifier| (cf.
+\ref{SetPitonIdentifier}, p.~\pageref{SetPitonIdentifier}) et créer par exemple un langage
+pour pseudo-code.
\newpage
@@ -2617,8 +2814,8 @@ p.~\pageref{SetPitonIdentifier}) et créer par exemple un langage pour pseudo-co
\indexcommand{NewPitonLanguage}
\vspace{1cm}
-La commande |\NewPitonLanguage|, qui permet de définir de nouveaux langages en utilisant la syntaxe de l'extension
-\pkg{listings}, a été présentée p.~\pageref{NewPitonLanguage}.
+La commande |\NewPitonLanguage|, qui permet de définir de nouveaux langages en utilisant
+la syntaxe de l'extension \pkg{listings}, a été présentée p.~\pageref{NewPitonLanguage}.
Tous les langages définis avec la commande |\NewPitonLanguage| partagent les mêmes styles.
@@ -2630,15 +2827,17 @@ Tous les langages définis avec la commande |\NewPitonLanguage| partagent les mÃ
\normalfont Style & Usage \\
\midrule
Number & les nombres \\
-String.Long & les chaînes de caractères définies dans |\NewPitonLanguage| par la clé |morestring| \\
+String.Long & les chaînes de caractères définies dans |\NewPitonLanguage| par la clé
+ |morestring| \\
Comment & les commentaires définis dans |\NewPitonLanguage| par la clé |morecomment| \\
Comment.LaTeX & les commentaires qui sont composés par \pkg{piton} comme du code LaTeX (et
appelés simplement «commentaires LaTeX» dans ce document) \\
-Keyword & les mots-clés, définis dans |\NewPitonLanguage| par les clés |morekeywords| et |moretexcs| (et également
- la clé |sensitive| qui indique si les mots-clés sont sensibles à la casse) \\
+Keyword & les mots-clés, définis dans |\NewPitonLanguage| par les clés |morekeywords| et
+ |moretexcs| (et également la clé |sensitive| qui indique si les mots-clés sont
+ sensibles à la casse) \\
Directive & les directives définies dans |\NewPitonLanguage| par la clé |moredirectives| \\
-Tag & les «tags» définis par la clé |tag| (les lexèmes détectés à l'intérieur d'un tag seront
- aussi composés avec leur propre style) \\
+Tag & les «tags» définis par la clé |tag| (les lexèmes détectés à l'intérieur d'un tag
+ seront aussi composés avec leur propre style) \\
\bottomrule
\end{tabularx}
\end{center}
diff --git a/Master/texmf-dist/doc/lualatex/piton/piton.pdf b/Master/texmf-dist/doc/lualatex/piton/piton.pdf
index 537202a41c2..af2544f85da 100644
--- a/Master/texmf-dist/doc/lualatex/piton/piton.pdf
+++ b/Master/texmf-dist/doc/lualatex/piton/piton.pdf
@@ -277,259 +277,259 @@ endobj
<< /S /GoTo /D (subsection.0.8.3) >>
endobj
163 0 obj
-(\376\377\0008\000.\0003\000\040\000N\000o\000t\000e\000s\000\040\000i\000n\000\040\000t\000h\000e\000\040\000l\000i\000s\000t\000i\000n\000g\000s)
+(\376\377\0008\000.\0003\000\040\000A\000n\000\040\000e\000x\000a\000m\000p\000l\000e\000\040\000o\000f\000\040\000t\000u\000n\000i\000n\000g\000\040\000o\000f\000\040\000t\000h\000e\000\040\000s\000t\000y\000l\000e\000s)
endobj
164 0 obj
<< /S /GoTo /D (subsection.0.8.4) >>
endobj
167 0 obj
-(\376\377\0008\000.\0004\000\040\000A\000n\000\040\000e\000x\000a\000m\000p\000l\000e\000\040\000o\000f\000\040\000t\000u\000n\000i\000n\000g\000\040\000o\000f\000\040\000t\000h\000e\000\040\000s\000t\000y\000l\000e\000s)
+(\376\377\0008\000.\0004\000\040\000U\000s\000e\000\040\000w\000i\000t\000h\000\040\000p\000y\000l\000u\000a\000t\000e\000x)
endobj
168 0 obj
-<< /S /GoTo /D (subsection.0.8.5) >>
+<< /S /GoTo /D (section.0.9) >>
endobj
171 0 obj
-(\376\377\0008\000.\0005\000\040\000U\000s\000e\000\040\000w\000i\000t\000h\000\040\000p\000y\000l\000u\000a\000t\000e\000x)
+(\376\377\0009\000\040\000T\000h\000e\000\040\000s\000t\000y\000l\000e\000s\000\040\000f\000o\000r\000\040\000t\000h\000e\000\040\000d\000i\000f\000f\000e\000r\000e\000n\000t\000\040\000c\000o\000m\000p\000u\000t\000e\000r\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000s)
endobj
172 0 obj
-<< /S /GoTo /D (section.0.9) >>
+<< /S /GoTo /D (subsection.0.9.1) >>
endobj
175 0 obj
-(\376\377\0009\000\040\000T\000h\000e\000\040\000s\000t\000y\000l\000e\000s\000\040\000f\000o\000r\000\040\000t\000h\000e\000\040\000d\000i\000f\000f\000e\000r\000e\000n\000t\000\040\000c\000o\000m\000p\000u\000t\000e\000r\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000s)
+(\376\377\0009\000.\0001\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000\040\000P\000y\000t\000h\000o\000n)
endobj
176 0 obj
-<< /S /GoTo /D (subsection.0.9.1) >>
+<< /S /GoTo /D (subsection.0.9.2) >>
endobj
179 0 obj
-(\376\377\0009\000.\0001\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000\040\000P\000y\000t\000h\000o\000n)
+(\376\377\0009\000.\0002\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000\040\000O\000C\000a\000m\000l)
endobj
180 0 obj
-<< /S /GoTo /D (subsection.0.9.2) >>
+<< /S /GoTo /D (subsection.0.9.3) >>
endobj
183 0 obj
-(\376\377\0009\000.\0002\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000\040\000O\000C\000a\000m\000l)
+(\376\377\0009\000.\0003\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000\040\000C\000\040\000\050\000a\000n\000d\000\040\000C\000+\000+\000\051)
endobj
184 0 obj
-<< /S /GoTo /D (subsection.0.9.3) >>
+<< /S /GoTo /D (subsection.0.9.4) >>
endobj
187 0 obj
-(\376\377\0009\000.\0003\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000\040\000C\000\040\000\050\000a\000n\000d\000\040\000C\000+\000+\000\051)
+(\376\377\0009\000.\0004\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000\040\000S\000Q\000L)
endobj
188 0 obj
-<< /S /GoTo /D (subsection.0.9.4) >>
+<< /S /GoTo /D (subsection.0.9.5) >>
endobj
191 0 obj
-(\376\377\0009\000.\0004\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000\040\000S\000Q\000L)
+(\376\377\0009\000.\0005\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000\040\000`\000`\000m\000i\000n\000i\000m\000a\000l\000'\000')
endobj
192 0 obj
-<< /S /GoTo /D (subsection.0.9.5) >>
+<< /S /GoTo /D (subsection.0.9.6) >>
endobj
195 0 obj
-(\376\377\0009\000.\0005\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000\040\000`\000`\000m\000i\000n\000i\000m\000a\000l\000'\000')
+(\376\377\0009\000.\0006\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000s\000\040\000d\000e\000f\000i\000n\000e\000d\000\040\000b\000y\000\040\000\134\000N\000e\000w\000P\000i\000t\000o\000n\000L\000a\000n\000g\000u\000a\000g\000e)
endobj
196 0 obj
-<< /S /GoTo /D (subsection.0.9.6) >>
+<< /S /GoTo /D (section.0.10) >>
endobj
199 0 obj
-(\376\377\0009\000.\0006\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000s\000\040\000d\000e\000f\000i\000n\000e\000d\000\040\000b\000y\000\040\000\134\000N\000e\000w\000P\000i\000t\000o\000n\000L\000a\000n\000g\000u\000a\000g\000e)
+(\376\377\0001\0000\000\040\000I\000m\000p\000l\000e\000m\000e\000n\000t\000a\000t\000i\000o\000n)
endobj
200 0 obj
-<< /S /GoTo /D (section.0.10) >>
+<< /S /GoTo /D (subsection.0.10.1) >>
endobj
203 0 obj
-(\376\377\0001\0000\000\040\000I\000m\000p\000l\000e\000m\000e\000n\000t\000a\000t\000i\000o\000n)
+(\376\377\0001\0000\000.\0001\000\040\000I\000n\000t\000r\000o\000d\000u\000c\000t\000i\000o\000n)
endobj
204 0 obj
-<< /S /GoTo /D (subsection.0.10.1) >>
+<< /S /GoTo /D (subsection.0.10.2) >>
endobj
207 0 obj
-(\376\377\0001\0000\000.\0001\000\040\000I\000n\000t\000r\000o\000d\000u\000c\000t\000i\000o\000n)
+(\376\377\0001\0000\000.\0002\000\040\000T\000h\000e\000\040\000L\0003\000\040\000p\000a\000r\000t\000\040\000o\000f\000\040\000t\000h\000e\000\040\000i\000m\000p\000l\000e\000m\000e\000n\000t\000a\000t\000i\000o\000n)
endobj
208 0 obj
-<< /S /GoTo /D (subsection.0.10.2) >>
+<< /S /GoTo /D (subsubsection.0.10.2.1) >>
endobj
211 0 obj
-(\376\377\0001\0000\000.\0002\000\040\000T\000h\000e\000\040\000L\0003\000\040\000p\000a\000r\000t\000\040\000o\000f\000\040\000t\000h\000e\000\040\000i\000m\000p\000l\000e\000m\000e\000n\000t\000a\000t\000i\000o\000n)
+(\376\377\0001\0000\000.\0002\000.\0001\000\040\000D\000e\000c\000l\000a\000r\000a\000t\000i\000o\000n\000\040\000o\000f\000\040\000t\000h\000e\000\040\000p\000a\000c\000k\000a\000g\000e)
endobj
212 0 obj
-<< /S /GoTo /D (subsubsection.0.10.2.1) >>
+<< /S /GoTo /D (subsubsection.0.10.2.2) >>
endobj
215 0 obj
-(\376\377\0001\0000\000.\0002\000.\0001\000\040\000D\000e\000c\000l\000a\000r\000a\000t\000i\000o\000n\000\040\000o\000f\000\040\000t\000h\000e\000\040\000p\000a\000c\000k\000a\000g\000e)
+(\376\377\0001\0000\000.\0002\000.\0002\000\040\000P\000a\000r\000a\000m\000e\000t\000e\000r\000s\000\040\000a\000n\000d\000\040\000t\000e\000c\000h\000n\000i\000c\000a\000l\000\040\000d\000e\000f\000i\000n\000i\000t\000i\000o\000n\000s)
endobj
216 0 obj
-<< /S /GoTo /D (subsubsection.0.10.2.2) >>
+<< /S /GoTo /D (subsubsection.0.10.2.3) >>
endobj
219 0 obj
-(\376\377\0001\0000\000.\0002\000.\0002\000\040\000P\000a\000r\000a\000m\000e\000t\000e\000r\000s\000\040\000a\000n\000d\000\040\000t\000e\000c\000h\000n\000i\000c\000a\000l\000\040\000d\000e\000f\000i\000n\000i\000t\000i\000o\000n\000s)
+(\376\377\0001\0000\000.\0002\000.\0003\000\040\000T\000r\000e\000a\000t\000m\000e\000n\000t\000\040\000o\000f\000\040\000a\000\040\000l\000i\000n\000e\000\040\000o\000f\000\040\000c\000o\000d\000e)
endobj
220 0 obj
-<< /S /GoTo /D (subsubsection.0.10.2.3) >>
+<< /S /GoTo /D (subsubsection.0.10.2.4) >>
endobj
223 0 obj
-(\376\377\0001\0000\000.\0002\000.\0003\000\040\000T\000r\000e\000a\000t\000m\000e\000n\000t\000\040\000o\000f\000\040\000a\000\040\000l\000i\000n\000e\000\040\000o\000f\000\040\000c\000o\000d\000e)
+(\376\377\0001\0000\000.\0002\000.\0004\000\040\000P\000i\000t\000o\000n\000O\000p\000t\000i\000o\000n\000s)
endobj
224 0 obj
-<< /S /GoTo /D (subsubsection.0.10.2.4) >>
+<< /S /GoTo /D (subsubsection.0.10.2.5) >>
endobj
227 0 obj
-(\376\377\0001\0000\000.\0002\000.\0004\000\040\000P\000i\000t\000o\000n\000O\000p\000t\000i\000o\000n\000s)
+(\376\377\0001\0000\000.\0002\000.\0005\000\040\000T\000h\000e\000\040\000n\000u\000m\000b\000e\000r\000s\000\040\000o\000f\000\040\000t\000h\000e\000\040\000l\000i\000n\000e\000s)
endobj
228 0 obj
-<< /S /GoTo /D (subsubsection.0.10.2.5) >>
+<< /S /GoTo /D (subsubsection.0.10.2.6) >>
endobj
231 0 obj
-(\376\377\0001\0000\000.\0002\000.\0005\000\040\000T\000h\000e\000\040\000n\000u\000m\000b\000e\000r\000s\000\040\000o\000f\000\040\000t\000h\000e\000\040\000l\000i\000n\000e\000s)
+(\376\377\0001\0000\000.\0002\000.\0006\000\040\000T\000h\000e\000\040\000c\000o\000m\000m\000a\000n\000d\000\040\000t\000o\000\040\000w\000r\000i\000t\000e\000\040\000o\000n\000\040\000t\000h\000e\000\040\000a\000u\000x\000\040\000f\000i\000l\000e)
endobj
232 0 obj
-<< /S /GoTo /D (subsubsection.0.10.2.6) >>
+<< /S /GoTo /D (subsubsection.0.10.2.7) >>
endobj
235 0 obj
-(\376\377\0001\0000\000.\0002\000.\0006\000\040\000T\000h\000e\000\040\000c\000o\000m\000m\000a\000n\000d\000\040\000t\000o\000\040\000w\000r\000i\000t\000e\000\040\000o\000n\000\040\000t\000h\000e\000\040\000a\000u\000x\000\040\000f\000i\000l\000e)
+(\376\377\0001\0000\000.\0002\000.\0007\000\040\000T\000h\000e\000\040\000m\000a\000i\000n\000\040\000c\000o\000m\000m\000a\000n\000d\000s\000\040\000a\000n\000d\000\040\000e\000n\000v\000i\000r\000o\000n\000m\000e\000n\000t\000s\000\040\000f\000o\000r\000\040\000t\000h\000e\000\040\000f\000i\000n\000a\000l\000\040\000u\000s\000e\000r)
endobj
236 0 obj
-<< /S /GoTo /D (subsubsection.0.10.2.7) >>
+<< /S /GoTo /D (subsubsection.0.10.2.8) >>
endobj
239 0 obj
-(\376\377\0001\0000\000.\0002\000.\0007\000\040\000T\000h\000e\000\040\000m\000a\000i\000n\000\040\000c\000o\000m\000m\000a\000n\000d\000s\000\040\000a\000n\000d\000\040\000e\000n\000v\000i\000r\000o\000n\000m\000e\000n\000t\000s\000\040\000f\000o\000r\000\040\000t\000h\000e\000\040\000f\000i\000n\000a\000l\000\040\000u\000s\000e\000r)
+(\376\377\0001\0000\000.\0002\000.\0008\000\040\000T\000h\000e\000\040\000s\000t\000y\000l\000e\000s)
endobj
240 0 obj
-<< /S /GoTo /D (subsubsection.0.10.2.8) >>
+<< /S /GoTo /D (subsubsection.0.10.2.9) >>
endobj
243 0 obj
-(\376\377\0001\0000\000.\0002\000.\0008\000\040\000T\000h\000e\000\040\000s\000t\000y\000l\000e\000s)
+(\376\377\0001\0000\000.\0002\000.\0009\000\040\000T\000h\000e\000\040\000i\000n\000i\000t\000i\000a\000l\000\040\000s\000t\000y\000l\000e\000s)
endobj
244 0 obj
-<< /S /GoTo /D (subsubsection.0.10.2.9) >>
+<< /S /GoTo /D (subsubsection.0.10.2.10) >>
endobj
247 0 obj
-(\376\377\0001\0000\000.\0002\000.\0009\000\040\000T\000h\000e\000\040\000i\000n\000i\000t\000i\000a\000l\000\040\000s\000t\000y\000l\000e\000s)
+(\376\377\0001\0000\000.\0002\000.\0001\0000\000\040\000H\000i\000g\000h\000l\000i\000g\000h\000t\000i\000n\000g\000\040\000s\000o\000m\000e\000\040\000i\000d\000e\000n\000t\000i\000f\000i\000e\000r\000s)
endobj
248 0 obj
-<< /S /GoTo /D (subsubsection.0.10.2.10) >>
+<< /S /GoTo /D (subsubsection.0.10.2.11) >>
endobj
251 0 obj
-(\376\377\0001\0000\000.\0002\000.\0001\0000\000\040\000H\000i\000g\000h\000l\000i\000g\000h\000t\000i\000n\000g\000\040\000s\000o\000m\000e\000\040\000i\000d\000e\000n\000t\000i\000f\000i\000e\000r\000s)
+(\376\377\0001\0000\000.\0002\000.\0001\0001\000\040\000S\000e\000c\000u\000r\000i\000t\000y)
endobj
252 0 obj
-<< /S /GoTo /D (subsubsection.0.10.2.11) >>
+<< /S /GoTo /D (subsubsection.0.10.2.12) >>
endobj
255 0 obj
-(\376\377\0001\0000\000.\0002\000.\0001\0001\000\040\000S\000e\000c\000u\000r\000i\000t\000y)
+(\376\377\0001\0000\000.\0002\000.\0001\0002\000\040\000T\000h\000e\000\040\000e\000r\000r\000o\000r\000\040\000m\000e\000s\000s\000a\000g\000e\000s\000\040\000o\000f\000\040\000t\000h\000e\000\040\000p\000a\000c\000k\000a\000g\000e)
endobj
256 0 obj
-<< /S /GoTo /D (subsubsection.0.10.2.12) >>
+<< /S /GoTo /D (subsubsection.0.10.2.13) >>
endobj
259 0 obj
-(\376\377\0001\0000\000.\0002\000.\0001\0002\000\040\000T\000h\000e\000\040\000e\000r\000r\000o\000r\000\040\000m\000e\000s\000s\000a\000g\000e\000s\000\040\000o\000f\000\040\000t\000h\000e\000\040\000p\000a\000c\000k\000a\000g\000e)
+(\376\377\0001\0000\000.\0002\000.\0001\0003\000\040\000W\000e\000\040\000l\000o\000a\000d\000\040\000p\000i\000t\000o\000n\000.\000l\000u\000a)
endobj
260 0 obj
-<< /S /GoTo /D (subsubsection.0.10.2.13) >>
+<< /S /GoTo /D (subsubsection.0.10.2.14) >>
endobj
263 0 obj
-(\376\377\0001\0000\000.\0002\000.\0001\0003\000\040\000W\000e\000\040\000l\000o\000a\000d\000\040\000p\000i\000t\000o\000n\000.\000l\000u\000a)
+(\376\377\0001\0000\000.\0002\000.\0001\0004\000\040\000D\000e\000t\000e\000c\000t\000e\000d\000\040\000c\000o\000m\000m\000a\000n\000d\000s)
endobj
264 0 obj
-<< /S /GoTo /D (subsubsection.0.10.2.14) >>
+<< /S /GoTo /D (subsection.0.10.3) >>
endobj
267 0 obj
-(\376\377\0001\0000\000.\0002\000.\0001\0004\000\040\000D\000e\000t\000e\000c\000t\000e\000d\000\040\000c\000o\000m\000m\000a\000n\000d\000s)
+(\376\377\0001\0000\000.\0003\000\040\000T\000h\000e\000\040\000L\000u\000a\000\040\000p\000a\000r\000t\000\040\000o\000f\000\040\000t\000h\000e\000\040\000i\000m\000p\000l\000e\000m\000e\000n\000t\000a\000t\000i\000o\000n)
endobj
268 0 obj
-<< /S /GoTo /D (subsection.0.10.3) >>
+<< /S /GoTo /D (subsubsection.0.10.3.1) >>
endobj
271 0 obj
-(\376\377\0001\0000\000.\0003\000\040\000T\000h\000e\000\040\000L\000u\000a\000\040\000p\000a\000r\000t\000\040\000o\000f\000\040\000t\000h\000e\000\040\000i\000m\000p\000l\000e\000m\000e\000n\000t\000a\000t\000i\000o\000n)
+(\376\377\0001\0000\000.\0003\000.\0001\000\040\000S\000p\000e\000c\000i\000a\000l\000\040\000f\000u\000n\000c\000t\000i\000o\000n\000s\000\040\000d\000e\000a\000l\000i\000n\000g\000\040\000w\000i\000t\000h\000\040\000L\000P\000E\000G)
endobj
272 0 obj
-<< /S /GoTo /D (subsubsection.0.10.3.1) >>
+<< /S /GoTo /D (subsubsection.0.10.3.2) >>
endobj
275 0 obj
-(\376\377\0001\0000\000.\0003\000.\0001\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000\040\000P\000y\000t\000h\000o\000n)
+(\376\377\0001\0000\000.\0003\000.\0002\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000\040\000P\000y\000t\000h\000o\000n)
endobj
276 0 obj
-<< /S /GoTo /D (subsubsection.0.10.3.2) >>
+<< /S /GoTo /D (subsubsection.0.10.3.3) >>
endobj
279 0 obj
-(\376\377\0001\0000\000.\0003\000.\0002\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000\040\000O\000c\000a\000m\000l)
+(\376\377\0001\0000\000.\0003\000.\0003\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000\040\000O\000c\000a\000m\000l)
endobj
280 0 obj
-<< /S /GoTo /D (subsubsection.0.10.3.3) >>
+<< /S /GoTo /D (subsubsection.0.10.3.4) >>
endobj
283 0 obj
-(\376\377\0001\0000\000.\0003\000.\0003\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000\040\000C)
+(\376\377\0001\0000\000.\0003\000.\0004\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000\040\000C)
endobj
284 0 obj
-<< /S /GoTo /D (subsubsection.0.10.3.4) >>
+<< /S /GoTo /D (subsubsection.0.10.3.5) >>
endobj
287 0 obj
-(\376\377\0001\0000\000.\0003\000.\0004\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000\040\000S\000Q\000L)
+(\376\377\0001\0000\000.\0003\000.\0005\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000\040\000S\000Q\000L)
endobj
288 0 obj
-<< /S /GoTo /D (subsubsection.0.10.3.5) >>
+<< /S /GoTo /D (subsubsection.0.10.3.6) >>
endobj
291 0 obj
-(\376\377\0001\0000\000.\0003\000.\0005\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000\040\000`\000`\000M\000i\000n\000i\000m\000a\000l\000'\000')
+(\376\377\0001\0000\000.\0003\000.\0006\000\040\000T\000h\000e\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000\040\000`\000`\000M\000i\000n\000i\000m\000a\000l\000'\000')
endobj
292 0 obj
-<< /S /GoTo /D (subsubsection.0.10.3.6) >>
+<< /S /GoTo /D (subsubsection.0.10.3.7) >>
endobj
295 0 obj
-(\376\377\0001\0000\000.\0003\000.\0006\000\040\000T\000w\000o\000\040\000v\000a\000r\000i\000a\000n\000t\000s\000\040\000o\000f\000\040\000t\000h\000e\000\040\000f\000u\000n\000c\000t\000i\000o\000n\000\040\000P\000a\000r\000s\000e\000\040\000w\000i\000t\000h\000\040\000i\000n\000t\000e\000g\000r\000a\000t\000e\000d\000\040\000p\000r\000e\000p\000r\000o\000c\000e\000s\000s\000o\000r\000s)
+(\376\377\0001\0000\000.\0003\000.\0007\000\040\000T\000w\000o\000\040\000v\000a\000r\000i\000a\000n\000t\000s\000\040\000o\000f\000\040\000t\000h\000e\000\040\000f\000u\000n\000c\000t\000i\000o\000n\000\040\000P\000a\000r\000s\000e\000\040\000w\000i\000t\000h\000\040\000i\000n\000t\000e\000g\000r\000a\000t\000e\000d\000\040\000p\000r\000e\000p\000r\000o\000c\000e\000s\000s\000o\000r\000s)
endobj
296 0 obj
-<< /S /GoTo /D (subsubsection.0.10.3.7) >>
+<< /S /GoTo /D (subsubsection.0.10.3.8) >>
endobj
299 0 obj
-(\376\377\0001\0000\000.\0003\000.\0007\000\040\000P\000r\000e\000p\000r\000o\000c\000e\000s\000s\000o\000r\000s\000\040\000o\000f\000\040\000t\000h\000e\000\040\000f\000u\000n\000c\000t\000i\000o\000n\000\040\000P\000a\000r\000s\000e\000\040\000f\000o\000r\000\040\000g\000o\000b\000b\000l\000e)
+(\376\377\0001\0000\000.\0003\000.\0008\000\040\000P\000r\000e\000p\000r\000o\000c\000e\000s\000s\000o\000r\000s\000\040\000o\000f\000\040\000t\000h\000e\000\040\000f\000u\000n\000c\000t\000i\000o\000n\000\040\000P\000a\000r\000s\000e\000\040\000f\000o\000r\000\040\000g\000o\000b\000b\000l\000e)
endobj
300 0 obj
-<< /S /GoTo /D (subsubsection.0.10.3.8) >>
+<< /S /GoTo /D (subsubsection.0.10.3.9) >>
endobj
303 0 obj
-(\376\377\0001\0000\000.\0003\000.\0008\000\040\000T\000o\000\040\000c\000o\000u\000n\000t\000\040\000t\000h\000e\000\040\000n\000u\000m\000b\000e\000r\000\040\000o\000f\000\040\000l\000i\000n\000e\000s)
+(\376\377\0001\0000\000.\0003\000.\0009\000\040\000T\000o\000\040\000c\000o\000u\000n\000t\000\040\000t\000h\000e\000\040\000n\000u\000m\000b\000e\000r\000\040\000o\000f\000\040\000l\000i\000n\000e\000s)
endobj
304 0 obj
-<< /S /GoTo /D (subsubsection.0.10.3.9) >>
+<< /S /GoTo /D (subsubsection.0.10.3.10) >>
endobj
307 0 obj
-(\376\377\0001\0000\000.\0003\000.\0009\000\040\000T\000o\000\040\000c\000r\000e\000a\000t\000e\000\040\000n\000e\000w\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000s\000\040\000w\000i\000t\000h\000\040\000t\000h\000e\000\040\000s\000y\000n\000t\000a\000x\000\040\000o\000f\000\040\000l\000i\000s\000t\000i\000n\000g\000s)
+(\376\377\0001\0000\000.\0003\000.\0001\0000\000\040\000T\000o\000\040\000c\000r\000e\000a\000t\000e\000\040\000n\000e\000w\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000s\000\040\000w\000i\000t\000h\000\040\000t\000h\000e\000\040\000s\000y\000n\000t\000a\000x\000\040\000o\000f\000\040\000l\000i\000s\000t\000i\000n\000g\000s)
endobj
308 0 obj
@@ -550,23 +550,17 @@ endobj
<< /S /GoTo /D [ 317 0 R /FitBH 771.02165 ] >>
endobj
322 0 obj
-<< /Filter /FlateDecode /Length 3357 >>
+<< /Filter /FlateDecode /Length 3349 >>
stream
-xÚ½[K$· ¾ï¯¨ã.‚•%ê ŒØÞvpNqöfû`8ˆÉˆ ùù!%J%©T5ÕÞИzH$ÅÇ'JEÉå×E.ß¾‘üÿòéÍW7Ћò”5fùô÷7
-ßÈE- Ðañ*â»°|ú¼üð$¥ Rêþàù½–€O¬‘R}”.ÏàðÞ¸|¯/©ÕOŸ¾#fÊCƒÆl˜IÈ,âµÂë+“Ñ°(%¢µÊwdœ!ºÅƒÆÙDæíÈþ]îfÔ´8/tT ²(IáŽÔ¤ 8¼4«ŸÁ?å!¡éšä"ùhˆå™w,£ËÚ ì¸8ï„öu¨Ú¯4ב4‘EÍ¢
-<¬m’¶oY5é2'Ÿ_¯Æq.Îj!}À| ‚u <j‡ì¾kûÄÇü_GfäÔDtý¤åãQ¯Æ/N¢É N
-{‚F
-lY;ÝŠrFQ¡óx´EK©§Î¨äàŒaÏLyx)âÈa×w䌨aífTh´V=C$=ËL’중"æóü>5K Ãìu¹Ëƒ$±;ÑM¦ÇÿciJ:Nä., »Zj%K+bf`µ]“ÑöèYò•<V½è[²0Å]-Ìc¾pÐðÈrÅÕÓuhïW
-­YòGÐeðÉ"ÕÒô¿Åú( {Ê5K·ÒB:F?•°¥'Æçöå K–¼—½–þ§x©},¾E=Hýñ#¿Ql‡ÌMfÛKæ‘t(/$È׉_xŽíëuâÀžˆÐŠHmЫOÄákÔ‚q"„Õ‘Š“E·Œó4›VÙŠò;ÇWv‰èøàÌ„â/2™…';„§ß Ï)…øiqxìè\N…3…ƒ­¤×&hª´­kä'­k@2Ç‘k¬}V×hœõ·_—|ñý·$¯[œˆ^;B©2(„s¾1$Ñ)ÓøÞh!a¬G›æ•¿· I>† ¢<©}3˜´~—Q+s )4Ë|·Òï¢Í D”§6µèÀnªpŒU™§QËبå'¨Eh`B
--µ¾KA÷T$.w£CòÓ«ì«OÚWª;H ’$L5f#ƒ‡<šjnWdÙÑòW7ofnh¤
- zOS[‘-¬®”ä2‡al× :ô@1@¦–±99·í]m;:|£n®f!ƒ·ôkCýB§¤¨ílNÔ#ˆä'©gã¹iþMotã3ÕØûáã¡ŽAam¥½S¯”ó{5ë1kƒÉ."†^„))Áñ÷‹0W–f¤ØñH-q 7£ð†|Ÿ,Ú€j#‹åE‚±²ä“snÞ¡WyEâÛ®ñé­°k~¶¦ý&T/ª9%Ã*O>„ƒ¹Å ®Þ«MˆB…ºæé¼TÅIÆhÕ5‰Aé16ÈqØ©ñ~"tìk EPñÌ¿¤ÈÛjçôk²àËš†ÓŽF/Pª‘S²¹Ž›ÅÇÝ*Ëz©É^dH*FO¦Ï؉Jh(éöf2I”
-¤&w95ðÁœ?qÌC@«ªïêÔúi]‹f¸ªOןôPøbb­g‰uš¬Ò_B£¤±f±¥owjÒ<ŒÍÒ²¸ŽM³Z ‘´1oð] Ø~lûÐö®“r–äÒ
-t
-9·¤õ{”7ƒÁ‰Á¹q”wæÍàp9*½5úÉonq¶P–\®q_§îKߦn ì`½§½Œ¸‘Ëe¯éGˆÏýqZ!£pQmt8Û–ÂàÏQæ¾Þ¤ìݬŠ Da”j³ï:âËÇÏG‰-D)9_å
-ØŠ¥¢K”iíkqÝ´éÛæ)jÏ´9g¸Þ§ ¥•p~C/E)GMIªØê/êÅ¡õ­ÛJXüûËìFš«ųŠö§$‹¸àrª'Q‡’l.¾ìÌŦn{X,+†Ÿ©ÑŠ’Ûþ”@Áuí'4ý-ãÿ$ÕüU+¥a£ë¹hSÀ•4ÌËÛtÙõôH:ù@ã|<.ƒ1(ùâ|¸7™ŽZXc[GÈ¿Uó²lëMv`Ƭ½®¿4«ìm¬ù!Ñ÷cÜ•¥ë¸Ž^gpêães]iåY%_Ï]d5½u§ü–ÕˆhïôãÕØ“MÛݾÙ(˜©ëÊé!ï—‰y~—+_Vz%©™ÑNm®§A˜UƒþëÂÃ5ÓQ]ýëÁŒÌV²/Al£¶9ƒJIá-̤KKÿ0âyj”2äF¢3ैrÓwºpå¨Ð݇ÖsàÒZxçÖ{”5A PzÃK6[kײÜ<g]ž6Ò?dŠÉÅ@ÛÈi"gCë}T|„„á y“¤!nZglî¬êÖ\Îåä`=
-a¦×ÐôX€ó.¦l#]û;QmرÓ‰BËlZ7Yr´H1~>>„ÁdNX K‘îþûýïu%JŽ)‡çÏÍNÊ-nÞ9ì߶`³“W¥6g>·HÚÿT,oþí—ÿüü¯wïýÛ¥•\]£åüSB8%uÝÿ÷‚#ÓwA>êÝ{
-ôá-ɬ›ÒÊß5¾Æhó1ê€p„ ç^¼ʉK:GÈf¼]%á\ƒNgÀŒÒ4Õ™ÅA*¡)3¥¥˜V#Qò2/¡×2<5•€—öi-0J'+ŠYjÑ’ “ºBÓœ‰¨ei©?cù®#JĨ`QïuDL®ÿ"®J[¶©ªü ›z¨Zé%såWÎq%šëZøöKPSÔVœ•Z½äÛ™¦nE%Æh¦›ƒ]ý]5@BÆ(Éæ2ÛÚ$·ö÷îÊðyº?ò^X·Ö¯\Ö02›BóÇ¡yé\ÃZÔx]ãÑ\ª#wû[,…5˜D©ÃÝ-åpJõû[¸°˜ôxÛ¯B_јJÓ·ÚÏùY½à /©¨ùÆ®…Ç­«úCŒXÓÔ°êrhÊ 5iÙºÔ\7ŸIyM)•î%µðìÖr©îQïª{¤'4µÄÎ.C”&æîC>úG§òÈ”¹/#+$Îר«A#»<W+D\»+3R*o2×Q>¿WOãHáÖcc(=»“‡´rÊ÷:äërV±žˆ¢
-ö©ïP¤Ò!-úÄê%ßÑt°týtÒéyod["šïèD†‘¦-´Û„ ÇhÈÚ³qåŽIGmÊe3×öhOæÞž
+xÚ½[K$· ¾ï¯¨ã.‚•%ŠzãÜÛÎ)ÎÞl ñ!q€’Ÿê-±T5ÝÞ^ИzHÅÇ'REÉí—Mnß¼‘åÿåã›/^@oÊ Pqûø÷7ŠÞÈMm Qh¿9èß>þº}ÿ$¥õRêúÁó{-ž”R}.Ï`ém¾×—ÔêÇßÆ1p9†+wƒD’4X kE××BFæ”Æ(7‘±Rø`7F 5‰ÌÛhøw¹ªe7°Nè 6F'ut¢&§é¥éý î)O‰øHב¯È_œb}æláѬymuܬ³B»6UíºñÊIG²$YƒÞ&Iû%‹&ý|¦cåóù|Üf BeA]ʬ®yØøß&é7Ä;z×ú$Þ¹ÿëP†µjó"XKV3ŽêHÊH£J+¼S}T¢§ëH‘ùjFiäBQ®(*2%Gú2¤7ÔzišJ2ÓôG¦ia9†“"ðíò€Ï …ÖvE%ÎÖ¨gÑrd¦
+‰÷(‘Êçù}j–ô«×õ.O2ZŒAêo2½ò?Ô¦QƉܥpS /µ’µU ¡k(^cµ(Ö ’íC—‹~i Af&zˆ/ìv —9_"ŒÄéEÍUÃO×~¼ïF.2ÑA×É'4 Hd›qA Ãf)ÅÂ;-¢ƒú©Î ØPz‚.·WÚ“ÂY²Þbµñ?=ô1ô–ä õWMòUôG“Yæ¦x]’¡¬€q¯ÓxþÙÛ¢_§ÓÅ h ·‘¬z°Dš¾&) FA³CØIŽ¢ÇóR›VƒÚªð'ÃWf dø`q1 °^­Ü¼aîéÝs9‚"4%ú|ŒC]ó©hÝ°°çô:8Mãv4üd4 Hê83Þ§›Æ`¬¿ý²å‹ï¾‰üÚÍŠà´7J €O@ÞéÔEýh¶àQ 1|¶iRÙñg½Dι›”YÔ'­o“ÑNàÂ¥²’J³®nðRûÝ€hkEfêS†M#:3UV“ªü[Q Í ¨å¨Ñ
+QÌ™i·|þì©ö¾çòqØSq{=GÎÑ-؃´FØ]_ö`ç™së5öPÞƒÞÿ1ØÃÆz
+šžËhÝ¥ Ó5ÐS¬³
+[>‘ãÈWô¾kìm »‰: _ÀÏc£„?
+Ì­2%üÑÆ|õ^oŸÊQn´Ñ?‘Úe«ž¦ÔǸ?&æac}úFЊ{¸¡d™¸¡$qy  ~ÔÝÑ©–¤}‘[”hÕ/y=+KGZÿA‰ÄmJ=Œ@ǧto©‡£„4ÚýD¤îýÌ|ÖZ†øq.ñ¬‡ÒËß5¿Aië9jOp–±÷J¹ñiÙ‡*²›ïTi¸æµHÙ;ãf¨Þ¬ÒpA˜)5çbY­ƒ…a}:Ë? ¥‚—ñi+AJG/ª^ZY“ô‹ÂCM´ºµÔ¿€ù¡%J)œ×{M‘Â…fGÅ6~ë^V›è¡fªƒÉ\œWŠëJ±šZ¸ñsÑP<4¥Õr¾dÞ™¦n'Á
+Šd1‹ÓÃÙŽ©D¯© ôÜQ²Âp_Âd{o¾ÁW§?ðÃè.L).ýÓä¥{÷œš¿ ­«ë*"¶ºÇkwI¼4[ž6Á
+I½êt L9V©yŒr Cq3Ó,2–ø1,~01:ì½9ê$‰Øø%^Óòh©N<óƒC™«®çª,«\ËÚÍõPš„7”¢Æò¾D¢Õ§½Œ£4óhwÍ<Ò“¸º„I/ÌOÓàö«|VÐ@9"ú,( +
+´€Z=—\Ö#\¾—¬%Ü'ƒ°ðÔµ^OW[Šª—9ækØSÐ ¶©k€.G¢Ø6ÆëßÆνSyáyZøšsªx˜Äƒúx6ª…BºÂèþø@ÁîŽIS,’±K·FC¤1,!CÁ|íOÛ¶vL$†°²®®í(ë~'N–¨>pñÌ¥<µ¶BÅëMôu(•~åLbˆQ]¬êLû{3ÎRxð|Á(h
endstream
endobj
317 0 obj
@@ -576,18 +570,18 @@ endobj
[ 318 0 R 320 0 R 319 0 R 351 0 R ]
endobj
318 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 276.15 522.003 282.609 534.294 ]/A << /S /GoTo /D (Hfootnote.1) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 276.15 521.633 282.609 533.924 ]/A << /S /GoTo /D (Hfootnote.1) >> >>
endobj
320 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 377.606 293.321 384.065 307.269 ]/A << /S /GoTo /D (Hfootnote.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 377.606 292.95 384.065 306.898 ]/A << /S /GoTo /D (Hfootnote.2) >> >>
endobj
319 0 obj
-<< /Type /Annot /Border[0 0 0]/H/I/C[0 1 1] /Rect [ 468.356 132.704 516.902 143.254 ]
+<< /Type /Annot /Border[0 0 0]/H/I/C[0 1 1] /Rect [ 468.356 132.333 516.902 142.883 ]
/Subtype/Link/A<</Type/Action/S/URI/URI(http://www.inf.puc-rio.br/~roberto/lpeg/)>>
>>
endobj
351 0 obj
-<< /Type /Annot /Border[0 0 0]/H/I/C[0 1 1] /Rect [ 79.37 123.166 202.6 131.536 ]
+<< /Type /Annot /Border[0 0 0]/H/I/C[0 1 1] /Rect [ 79.37 122.795 202.6 131.166 ]
/Subtype/Link/A<</Type/Action/S/URI/URI(http://www.inf.puc-rio.br/~roberto/lpeg/)>>
>>
endobj
@@ -598,19 +592,19 @@ endobj
<< /D [ 317 0 R /XYZ 79.37 771.024 null ] >>
endobj
5 0 obj
-<< /D [ 317 0 R /XYZ 79.37 562.969 null ] >>
+<< /D [ 317 0 R /XYZ 79.37 562.598 null ] >>
endobj
348 0 obj
-<< /D [ 317 0 R /XYZ 93.716 144.934 null ] >>
+<< /D [ 317 0 R /XYZ 93.716 144.563 null ] >>
endobj
352 0 obj
-<< /D [ 317 0 R /XYZ 93.716 125.842 null ] >>
+<< /D [ 317 0 R /XYZ 93.716 125.472 null ] >>
endobj
321 0 obj
<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F23 325 0 R /F24 326 0 R /F32 327 0 R /F41 328 0 R /F52 329 0 R /F61 330 0 R /F60 331 0 R /F62 332 0 R /F64 333 0 R /F15 334 0 R /F65 335 0 R /F16 336 0 R /F74 337 0 R /F75 338 0 R /F77 339 0 R /F27 340 0 R /F30 341 0 R /F67 342 0 R /F66 343 0 R /F47 344 0 R /F53 345 0 R /F59 346 0 R /F71 347 0 R /F72 349 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
364 0 obj
-<< /Filter /FlateDecode /Length 3884 >>
+<< /Filter /FlateDecode /Length 3885 >>
stream
xÚµ\K$· ¾Ï¯è?°²D½Á
Îb æU³ãÉò „K)ò8•3Dv!–˜e$E nþˆ¯ ÀU´N«;Ò¿";K:è)>”1GlÜÊîuz— [¡©ú_+õ—ºÑ'4ÚfÇÇVBËêR¬¤øDï(?bЙ†tG*³´Ý Kå1ˆv¦òQý‘ ü†Ú 8XrzÆd·UbÁm.òÀNE‘åÄÅ£vj•A‰ßnت˜ Ó2{ŸÔb Dr¨Î>Ë v$£lQšþÒÕQžÍM]5|È1MZm•0®eÀT±bƒ”[¢ÄóÃ}¤w`åä±S€#EHNr¤’щšbi\zwEL×ØGðú8oÂß÷¡ Qýì&+c=cŠƒ  0@ýSöc×Ï]ïÅp´°] ¡`¸®–
@@ -620,7 +614,7 @@ cÂÝPä(½tžzçÉOèz’™©¸ƒT‘‘NXÝŽôКFͬ¾5SÐU‹â !ïs/sÍa—÷=rñÛµèdºcŸõÂÇH]³ŽPžªß
Íð†nØT ZÔÔ÷2z8rÍ©"Ý ÏlõóXÔ`HvÜ:ö؇¾ÙY¡ÉA€“IXµñ‡4R3Óz>Þ
94¾ª0ؽ›VÖ
d§ï™³gúìÄòVd¹>Gi)5ѧã͵RØ ‚ZÕC·\š`[k<Sž÷™Ϋua)KD¹“ØuSH qèÑ,‹xör;6v%MhÅܼûûÝ4Z´Í¬Ö7gük’´?Š%;ï·ÿC‰n
-Ö’½î-òêZpȧŽ˜Yús˜$ _Ÿ|Üî1‹ò¹ë¹6£M;Í3Žœ Nêƒóß(›Æ\6÷ê£Q.o¼VBF{þFìó¿*Daå2ë=MEº|ž ²âÑË#F(¼5sðÊÝÏÙ”ú;ú‡´2ù_¿˜(éXÓ„[´‹fTËSwu,¡Ö¡ç×ËŒú
+Ö’½î-òêZpȧŽ˜Yús˜$ _Ÿ|Üî1‹ò¹ë¹6£M;Í3Žœ Nêƒóß(›Æ\6÷ê£Q.o¼VBF{þFìó¿*Daå2ë=MEº|ž ²âÑË#F(¼5sðÊÝÏÙ”ú;ú‡´2ù_¿˜(éXÓ„[´‹fTËSwu,¡Ö¡ç×ËŒú
endstream
endobj
363 0 obj
@@ -718,1053 +712,1066 @@ endobj
373 0 obj
<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F81 377 0 R /F65 335 0 R /F64 333 0 R /F22 367 0 R /F16 336 0 R /F75 338 0 R /F77 339 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-390 0 obj
-<< /Filter /FlateDecode /Length 5025 >>
+392 0 obj
+<< /Filter /FlateDecode /Length 5081 >>
stream
-xÚ½»Ž$·1¿¯˜ÐŽ"‹o`±ÀÍÍ­
-žàhżöJ€€#3Fž©4)—ŸBã¹z$…gÆjÝÆŠ7ÓO˜%8H'>…%ïàž¹ÄÛ*>ºÊLjͽA ÿ ÂZ#çõÀïîõ£•ñ›«8¾iË
-â‰ÕJ0m'¼T¦¹r,sYJI¤.¬Hzªζñ§¦¸â#œnµò“Œy|ÿx>î—<“ÍOÝ« ßÃLV–_áÞíì{+sª'¤E~†Ý0rT£Ææ¿Óg—¯JH¦Å¼Þ®¬)ê/û&¼3©ãñè4Xˆ¨š¬“±ÒÆ]b^“l<óNI¿^H[¾ <OvøUÞ@ºµ¤r…ÿò$o£ÎŒsëM$yÐ…Èž"ðîú:
-¥˜V@á¿3 4®¯š¨(²kÒ>(;$QTt"xÿ’%†o<ë¿GÛ½ÎOPÄç2fÉ!ÞöfÑ.n±mE“eŒ-\àf‰Iô;XÊ7
-%b`ù«6/Mêä>wqƒ3­)ðBŽÊŠ%*iWUÿžÚ5Æ1oë*AãVHuB¹(ºav””„¦
-FÓUÕÐ[¦66˜f÷²R‚ižPbºm³ÍX¾<n©B#%<›ÂGâ|V]‰¯üvKüõÇ°ˆæ†ºÓJ§…ê,á' L»¶Et„ó7w $´EWNÍJ¢¬Bå¼Î,EîQ®Wa„äzÕÕ¡Â^Œä«¶[Êj¬o ÒB61 Cô2yú7|7Õ.V¶wKTÞ,Ë ˆNÈ˸kÑ4gtÔÈD0kMvwO¢bBi
-Mëm©D
-«¹E:õ‚!2)n}™€¡ÔŒ·Ýþ·²ž¬&H•Û*6I0™¢‰ÿýñׯþÓάñ^0'üíï¿?(Éœ47Á™4âöÇ?o¿~øK•î«lÙ)à&l•k›]vL< _Îá.T`re»‚ñ<:û¹a!ñ'Jè=s&ØŠI%E‹ùèý¼ð–>Æ¿ð½Î;x Ù¯,;¤÷@£ÍŠcƒÄQ¥™ç”À<—Ês%˛Œ·]ZŸuxV¬JÊBôW Ð6 q—4×Í´Ñ£^Y[Å^qÍ[£÷¢QãLÛ¬é$ø¼«‚÷"¬ Ø­•gæî3ÑŸ2h©%…ýù50|B§ç)DdÞ£bÜÚ:f=œÚ)æÜ4èÓþTA÷‰³3yÄŸD§ãSböÕ-.pCG?ÌHt‚Ý´,%Ù tžÅ>§¥HÉ„Kô½”¢áÈ`øú-4» ·pônöhTF2õ"¬¼bÖÁ‚º•mámªÙ·-+—äȶ
-öÎ1ÞrýkaÂ÷OŠnÕƪ9m¿(jäÚÊPHϔֳ¡®Â„Ô[?å•O›ã™Ó
-'EŸÙVÿù¨Á^0–#8JBäÌ£“~É¢`4Ì„¶zÍÇÙÞ†¤o½¶¨å¤ð«§ZCƽÕh@:x´fC¿cìà& O–†i&AQ(»i
-2/PëÂûReN&$¡GÍŠð‘‡þý3ŸÊzô#ä¸rB•‚PñQzˆdŠÂX¡ yžÂ¿âê¢æ63$ cGÂ^Ùa?(êBë CV§6dÈã„P“ ½¶JÊkz>’˜"I!O%Ô.(`RA5J(þJÂCj‡‚4’PÔ{”ú‹ tÄh\푽=Šß6ìÑn³ˆE×¼q’³½"Þâ`G€”­T„.(ÛGû[kéZ*7Šp}:( 1Ôô6`½·_j z.’zQi‡¤ë›×‹ª©à㨹ªÛ\Ù^6”ë Xéz™²”cÊ­øßÛ*!¤_›ÅkAL©èE÷Œ*z‰½CBcÈÑÈ®ÐvµÀ%Q c@ Š>QñÖ*QµÉåÞs£çîçò}Ϋçÿb&þºç98IF4–ûÞÙš§¬Ûñ,Ò¯µé©+@ØEBY;¶ å'í®qHO1~§5‰|ÏåÄôA]òR³žH4Új¢&R1$lßÔ‘yHÖR%o¸3ÁµêINô¯BédÅüœVèl€ww|ú‘¶¨Wa´fuk!+š’ºÅî婼V¨
-9@=p$„ÆÅõ"Uõ§`kË}öü¥óv‡À¬nL¿J|¤§ƒš¨O.øƒ’KÄ^R*.ø#¤ÉÜ¡u+Ý)Î }BA™žXFŽ¥¦eÄ=j„¦¥–´$V5”Ãbv ?¸”`e™õ~ÝÌš£,Ù+c{WÐÕg¸—ö)±NP(&ÀÐg0m=4»Þ»|@X$à×D´eJ(:È
-µ-®t—4‚¡%íb+ÛùÂf‰‘hÉ÷‹¼p¾˜6¡78t?ˆZäuL¨‹E^­ÅÖBËÿ&~ `2Vœ ”­
-Y¦ºD“ñ[©IÐO6²J¨â8fÒßnÕßñ[«—Q!E5³Š_9nÞ=Ψæ$V¥¨sPk®fȃ¸‚Úðѱãó”Z¦$*á™–-¶SOuRVE…Ž…7rr‹þÏ›ŽØOGuuÿÖm"îSë²c «WNÖ½¾­ga¶uÁFîÝfåÄì“nº°èÉR 0´•Žœlµ£‘öMnÛí
-ø¹.ðU‡ùe— ßêr©B’Þ¥].ñ=JQ§Mò¸Þg’à–°‹·™»B-ãP¦œä¬R9kVP†—HãØár@ö¦(ô©…<e}^”%ƒÂg8sRYÆɬ¾RšT¸ ðÁv *s[ê£YÐâRæ:ñþÑ”P ôç\Xª™þ¡|§'á4˨7==®}‘²SVä×ðådç³±ÇÝ‚WJR®\mçSÀ­x\Ýí÷]…ŸRÚQ‘XŸ¬&wåÿ¬@hoH6 cxº}¼eËHî¦í”cJJÃwjŸ“jf@gÛèÉ–Ò0­Ã^ôŽ‡´ãÞ€Ç6gÛ8·SÓÜï¸ÍUP=†ÎP¨©W°õ 7¡5ù‰!ût˜¦;¹°>ª™B¯UŠ`,E
-!>ïZ¤é¨ù 5ÐD€ªÇBžVãçç( BÆã+Y ®…‡1…sgôxÌ$+Šú¹ÆOf¯ÊÂEN íi",7Õö;ý0Ft‚b™W‹%S×%þ’ZÌŸÇ•hlUýI øDí"¿Iêæ."ƒ›;t.Û¢·)øDvꩲêı“n|;´FXÙE˜½Êžâ^+I—]‚6vË,«˜yÖ³æ6‹½PNoLxÂAD]NüÓ%Èg×ã.hÅ¢VL8hÃ7è(J
-5êc7dŽøR TéÐ3ž…#Cé!&2†V$ƲVš춌ƒê9^cwš»`j„Ê£Ÿç4?Ã(JÛwVBå…LJXðh=tõmÏœ]âž)eé ß«×ÞÙXó#³åC\¨qÄöéá*\Ç¢j/·¸~ºe{s´úðô¹Pèÿk 8G™?uüŒfÎ
-!¨‘Å9äÖ™º_Ö2ÌaÀD`÷«œÅ=,i¡õæ~ÂÌ\9Ÿ,=òIÅaÈ׊‘$Yµ}‡Ç“çžqÔäð€WS¹BŸvx4ó¨GÁÜ7‡ÇE¿å¼ÃN—¢~&¨_qxJãNù-ÂxO§'œEÓhI8¬[1"æÀÔW–ÇN½jZºë¦Ék˜»iZMkceŸ±ìÙ¡Y*(Œ„´4¹ÛP§Ûrò7¨“—~é¨ô¤?_Q*ÝÁÉ-—5ˆ®Íb…Ÿ9i‡Þ™‰ßf#÷
-GåãqƒvׇÞk
-¨,8‚€Ú‘©Í
-×Á©j¿¯¸%Mõs›!)t³-Ÿ…öQé÷J«I{1îÓù‰í“å¨@U8eísûŸÏdïúQ·üz
+xÚ½]9d·Î÷WthK“Å °½­àÌöf‚"ÛRb°ÿ}o²ÈwõÌ:híôëG²X,V}uâ·_oüöã§û·Oz3ê&“ÊÀíÛ/ŸþÀoâf=“öf`\ܾývûé…sé_? Î9þ _87ü
+ÂZ…FþÎëßÝëg+ã7Wi|#Ò–¨ž×iŒD‘2黼×ö[«'„aÞûUVO(Á´èRyΕc™ËRJ"uaEÒS5p¶µ< sŠ+>öÓ­V~’)ï?ÏÇý’G²ù©{uá{ÉÊò+Ü»}ïûÊœ°jÅ i‘Ÿa7Œœ
+‰óYu%¾þþë-ýñ×Ã"šêN+ª³L„Ÿ,0íÚѱžÑܒСœš•DY…Ê "xYŠÜ£\¯Â zÕÕ¡Â^ŒÓWm·”=ÔXߺH 5ÚÄ$ eòôoønª]¬lï–¨¼Y–A—q×¢iΠ訑‰`ÖšìîžD+Ä„Ò´7­¶E¢Ò ­H&ºÛ?úÞ¤³­ASX uêÔç ‘Iqóˆe…R3ÞvûWÜÊz²š UîØV±I‚É|MüïŸ~øöé?aáÌÝ æ„¿ýý·Oá%™“æ&8“FÜ~ÿçí—O©Ò}•-;%°»‰ZåÚf—“D¸åîBE;LP¶[ (Ï£³O‘¢„Þ3g‚­˜TR´˜ç…·ô1ý…ïuÜd\YvH@£ÍŠmƒÄQ¥™Ç”À<–Êc%˛Œ·]ZŸutV¬JÊBôW G¸K*tSbô]ÀÁK·ÅÕ¨“–‰‘Q®W.©aÞýïU¤ã;nßû÷ŠMÛj„¡M±<{ñ‘ä23xdÒˆ»K^&©Ð
+Ë1)&&euz¦ú„[#gˆ¢iOðØßk&šÆç)tP¸ªÜ>xTC¨®­¢£ ¦V_öÇ’À”†«cIǸœølúÜ«ý1µI
+ͨ¢éÁ¦ihäHÕ ^W¸ÍÈhEE¦päŽçW´k?fgDÖéo
+°Æ½Þ`%ýeD1§Pâ4 cíŠ
+ÛÞs~cæîÙ˜à®á{LŒæ–9k(gZ6‰îcå=zad¨ãÑf{õVÚåÑHÁ®/w½cÎÝ"¤X6rá(…’ÛÍ \û¬SÏòÇh($÷D¯»¬×3©ºé›(ƼôZÞ—
+Žd;yÔ¬&>òÐ|VAYô Gµ{Ò TIp–½ˆ%¤aŽXmлó¤ûg .*m3uDÂ-»½}g|H¹®÷# ßêêI8Ø`“ƒ9½¶FÊXtgÕ s$&ÿQÈËæÂ
+CPt£¯†¤Ö n‘t¦Oª -pÈióšMŠ
+ݧ$&«îue{ùP®O§o@òÑÊRž)·ât|o+E—~mV¯y0¥bb(jYó%zëèC|Fv‰ìgÈ5¢Òû ëÓ,ÞZ¦·‘Ý{nôÜb\¾wõü_¬ÑÄ_wžƒ“T„,p—§Å‰Öí ‹ôk-*Ìer(1i¿tyôX‚híX♟t´»Æ!\„Ü'ЃÇ5ærââP—jÖiÎan5Hg1l_4•yHÖR%DÜÙáZU@
+ºt°Béd¥üš¹1ðnâî®ç¶áô†Ô‰Ó­À¶èJ
+ÝË©˜V¨?rèõ
+wæºê”Ο…¡Ïˆw~8f”š–÷¨š¦YÒ’ÐT¨çóÂ\J°ð±ÄvY,Š-Ù+cùdÐ5ÜKy¢X(`èˆ"L[DÅä÷." øs¢Ú2…ûŸŒ¢¿9Ðåi¹kä—ÎSõ…#5à—Þ[SÓ•˜&ŽÙ¡R±Õvv#¿3Q²W/;xEÚÜÕvã±ëV„†[æ•ë U˜6õÁŸõ?­fÚy:ÊÙZc¯ðá’Æ0¦”œp´w
+kla¨,¨Zô^Æ}o©èõ8–¯)‹Šs?Á × ô€iŠ³8LIð:&Ô“ ^­¥ÖB ÿ&~ `’y9õ²•˳.eüV²côÉBq 5;ÛLú;ö[õwüÖò¿¥USMƬÒWŽó¤wcª9UgT9¨5Wsσ¸‚ÚÀè ïñ|¥rˆW*éo2ydÝhFªT.Š* A ž`ÑÿyÓ‘ã8û1©.ç“0*®Î}ª_V t¹Ê©(i].Õêi[×lDß½aVN̾ÓjTO;¡l{ädK´/"Ý.è "9Ruþ Ug `÷ÀœÑï ¡ª3AÕÔŽE%)ˆvQýá[ íø\‰ øªÄü²Ä…o•¸À”&IïÒ—øQ§Nr»4Ip˾«·¾BPèP¦\ä¬R>–R-zÊ[âÇò–ƒioʲDçVÔÕK}]–%Ü…RB(_Ï¢lІëgR“
+ªÇÐ*ˆšêC:Ù€Ð
+ ‹üD—}:¬Ö XŸöÖ±âÐõp@ë¸ë|à:
+O[Íw
+2Â÷ª³w6æüÈhù$j±}:¿
+ú±ZŠñò˜ç¶¬c/cìƒfNŠ…ø_¥9bd~êz0š9/hA,Îù·ÂÔý´–a&Òg_å¬ûaJK2ÎýD™yæü¿ôÈ'´àÑA­¶QJU;
+òÒ/=ˆJOú³%ÓÝM¸3¹å2Ñ•Y¬è3×<-”íb$xŸÜ7(œ3åqƒv—ŽÞ+çr9ÿrœíí~ªÖu1÷õ[ËŽ
+=vp0->Ð’Ô‚Ü‚ÎÈÕ[C æ Æi¤Õèt妹/oòå}±i•ª³·‡„H\ÌqŽ½hØ}D Sƒº¦dlºŸé|@LJ‡6gá½Æ×ùX˜Ezm" ¯$.M+¬ã;d3«‡P,¼÷Œ›Á΀v6GzúëTÆa ´Öë(ü“7pà °׉;¤ ¥³›e³û±OÅœ÷„€¼Uš.€D¾Å=‚ ô§Ÿñù?ðógD­Ò»Û㛿Å\ ¡Ý¿nCLš°(‚îV»~ø(ˆ¸oŽÞ†7åZ2-o¸±-‚ñ¾â`+L¼py¸èûÕùb.´êRÅýY•”ªV+gH«¢ã_ý¥Æ®¿‘S÷u`þXÆÓÅྴ¬3<êHe?i5©Ë’[jÉîz™Ãc¦yƒÖíÛCÖ…ûxCÒX€w´.Ü qôzÄÀl¤Ÿ7‹kÅÓûÃ5
+çÄçç"¼dDë%+Aïþ@O¦g%WX/ÌÐ5·µü¡
+è:À ×!¾Ê”F¼o"°»óÒ“]~ä@Ãy´¿œæBœ³hîÚóZÅ ÷†t^D˜¸´¼Ê­çãÜ3 nûâGi¹åÝ-ìÎÜoº1»ì»û(’Su–V´è v[
+ë»Û:cXkõv´ìê÷Š"Šæ¯¾YÞÊ—‘)CwcM¹D(¼Ÿ Ç™v$Œx Ö2k†’žá”þ–TtliXq9N€h½õ¡–%îMÓ3y¦õDÕGP;2µ™8Ø#Uí÷i©¢¤³©>·’B7ÛòYæ>*ý^i5i/Æ}*2ß>~«cªUñhŸÛÿ'£ëÿ‚Ãb
endstream
endobj
-389 0 obj
-<< /Type /Page /Contents 390 0 R /Resources 388 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 353 0 R /Annots 397 0 R >>
+391 0 obj
+<< /Type /Page /Contents 392 0 R /Resources 390 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 353 0 R /Annots 399 0 R >>
endobj
-397 0 obj
-[ 372 0 R 381 0 R 384 0 R 385 0 R 386 0 R 387 0 R 382 0 R 383 0 R ]
+399 0 obj
+[ 372 0 R 381 0 R 382 0 R 383 0 R 386 0 R 387 0 R 388 0 R 389 0 R 384 0 R 385 0 R ]
endobj
372 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 386.12 665.921 392.579 678.212 ]/A << /S /GoTo /D (Hfootnote.6) >> >>
endobj
381 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 510.443 411.645 516.902 425.244 ]/A << /S /GoTo /D (Hfootnote.7) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 469.627 607.699 476.601 619.654 ]/A << /S /GoTo /D (section.0.5) >> >>
endobj
-384 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 338.658 276.94 345.117 289.669 ]/A << /S /GoTo /D (Hfootnote.8) >> >>
+382 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 492.322 607.699 499.295 619.654 ]/A << /S /GoTo /D (section.0.5) >> >>
endobj
-385 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 387.236 237.308 393.694 249.818 ]/A << /S /GoTo /D (Hfootnote.9) >> >>
+383 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 510.443 383.749 516.902 397.349 ]/A << /S /GoTo /D (Hfootnote.7) >> >>
endobj
386 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 244.218 185.283 258.942 197.239 ]/A << /S /GoTo /D (subsection.0.6.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 338.658 249.044 345.117 261.773 ]/A << /S /GoTo /D (Hfootnote.8) >> >>
endobj
387 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 275.761 185.283 287.716 197.239 ]/A << /S /GoTo /D (subsection.0.6.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 387.236 209.413 393.694 221.923 ]/A << /S /GoTo /D (Hfootnote.9) >> >>
endobj
-382 0 obj
+388 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 244.218 157.388 258.942 169.343 ]/A << /S /GoTo /D (subsection.0.6.2) >> >>
+endobj
+389 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 275.761 157.388 287.716 169.343 ]/A << /S /GoTo /D (subsection.0.6.2) >> >>
+endobj
+384 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 334.199 93.186 340.423 103.996 ]/A << /S /GoTo /D (section.0.7) >> >>
endobj
-383 0 obj
+385 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 353.478 93.186 363.935 103.996 ]/A << /S /GoTo /D (section.0.7) >> >>
endobj
-391 0 obj
-<< /D [ 389 0 R /XYZ 78.37 808.885 null ] >>
+393 0 obj
+<< /D [ 391 0 R /XYZ 78.37 808.885 null ] >>
endobj
33 0 obj
-<< /D [ 389 0 R /XYZ 79.37 771.024 null ] >>
+<< /D [ 391 0 R /XYZ 79.37 771.024 null ] >>
endobj
37 0 obj
-<< /D [ 389 0 R /XYZ 79.37 711.216 null ] >>
-endobj
-393 0 obj
-<< /D [ 389 0 R /XYZ 93.716 125.644 null ] >>
-endobj
-394 0 obj
-<< /D [ 389 0 R /XYZ 93.716 115.951 null ] >>
+<< /D [ 391 0 R /XYZ 79.37 711.216 null ] >>
endobj
395 0 obj
-<< /D [ 389 0 R /XYZ 93.716 96.859 null ] >>
+<< /D [ 391 0 R /XYZ 93.716 125.644 null ] >>
endobj
396 0 obj
-<< /D [ 389 0 R /XYZ 93.716 87.232 null ] >>
+<< /D [ 391 0 R /XYZ 93.716 115.951 null ] >>
endobj
-388 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F64 333 0 R /F15 334 0 R /F65 335 0 R /F74 337 0 R /F82 392 0 R /F16 336 0 R /F30 341 0 R /F81 377 0 R /F22 367 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
+397 0 obj
+<< /D [ 391 0 R /XYZ 93.716 96.859 null ] >>
endobj
-412 0 obj
-<< /Filter /FlateDecode /Length 4588 >>
-stream
-xÚÅ\ÉŽ$·½ÏWÔ EƒÐh@Õ5-@7Ûs|²-]¬ƒuñï;¸÷̪jÏØôtW&— Ë‹…%/¿]äå§OׯŸ~x¸,X¼|ýõ“¢ò¢.JÞ\œUBZuùúûå—©ÔÛë_¿þL½”Ùö+T˜{I§¤DÒ)õûëgÐá…?ÑДôí+ø—ø„úØ4“!KÿÿôéË×OÿjSyàáâŒÎëËß~ÿ”^H%´#ò…òþòÇ?.¿~ú½èÖëpK¹7œŸ)GŸ)Ç[¦
-eþÛÒ^¥Ÿ[znão›ÿNÏ µ£5žíÐìÖÀ<;ÜhgŒŸ÷*íШF•n¯à¸U¢†[ÅÚñ§y5¶í<ÊíneìÀïãZRПžQüÞù¶éij£Þ†1Ö5hú‹\_qé‡ ½¦­[X ƒPÒòVñBµÕe¼89\óÆD¦ÓÊÞ.'ËÂeîõ°r›¼ñåàölÊ E&j€†4º1=îœ Œz¿¶x¤ymñÀóqð“²ö3:‰A-tâžN,¿ –ùâÑÙr&þ.;kB›gKìP©ÆÂNݧaE]ò 9àVù™ñ¯ŸÆ¸#>·dvÓËl‰á}bÉtš.ϲå'í„2ªÑJãèDsBâŽü÷À¸VÌZºU†LŸzÞ/Ãnd1¿ÉŒÛØÒoyùN¾äår«ž…có<2mj>Ø;V”ðŸµ
-C¯zl™‘]ÑÿîQýoÐÄÐ$€,«ÿ¨G]ø€ú·Vhf"ñCêŸùïÈ:
-k׫¸™mlÖd¬r[çùP› ¨¬`mäÕ÷&7õí-³XwäèP$4+ÜR] «Ìbâ^ú=âæM_»#aÈíLgä^reCe+èæ+Hÿ£+$å¥ÙS}©wùyìçøáüüµ!ݨçŒeJë9UÚûM¯«yÈ€Ró  ·;†]ÏŒ=ÊÔðÞô±÷rì204’â´Kó¤ÎŒé´¶½qפbwú68ხP3Z±ØUx­ª­ö—„»XG
-¤A.m_½îmnpØjÈ¡ ¯‹ÿ†¢Z#xC¥Ù–¤qXí6\ÒΙe¯ÜºÊHHs¹Î4„Q X`ë—?Z·ã ¢›ßc­Ž(qxŽ%œŠTï´sßP6P[áMXf`Í0Pm{æ˜ãïÈ“V»#l9l€mh…ϊϧ3ÁaÂzÀ3zÀ3 `–fÏ ±šUf˜Â²®cÀ:ÞŽ”xß—qyþä:|R•á[±¬&YVC–ñP òÖ £ßx6YŽe`ÃUt
-GÊÕ’
-Ô*4Ð< 8)È@­@ m?h’ "BT+DZuô·ˆÁ( <¤
-IöHà‚t£ZF¯‘9Æ2%–‘I ¤mª€Åæ•íÛVÞ²¥jcL›?-5jtÔjãõµÃê\zª+ ù•§zªÜû¦)o¤”ÁÒ( äHL~>CÕ¢G H¡±š˜Å\§EutC¸7ì½¥ãè–Î,óK8k"(PË À0:ÆikHFZõ®G[^„âÉ ÎƯÆgŽ7èq—ºÓÍŸÊ$•òøYÙ´oÔ²Éôq€Üs6ý=.¿ecAªáí<œ0ÉÉnT ºz<9΢ÞmûèC+Ü”…ÑO¡©ö¾º©Í\KÓ `!úi?ÕxœGŸ¥ïhÑa±«Ãr
-œ-Ùž0O˜È¾Õ­¼W3JÍ#Dè¼ÛÚGâYS¶¬Wñ[œé„·î°îIÄüç¥pt¤ß^)òJœµË ¬SœîEÜá
-²’¥·Ï¡Y¤á`¦6
-96¢c¥ûØ÷­AM”æòÕC>²EßÑÏ3¶lVaq¿[½(Ë{vL±¡¯ŒUÈûí\Ï'¦:•¸ßo$gÄZ·ì÷Ç’S“:ˆóh}˜rÙÇ­BÐN3[
-x„B¢W[ ­½€™ÀQ cpc„e‰M€äÖ TŒôs&€±DZ³}E«u”¼ò›¦•¢­º-Ž}X)öª#:®™m¶l§ƒºKÍÊ%gÞ¡µªœ¾Yë" y$[ý×[£lL›¯
-`¿—ϦÙíoH®åúã\1PšDÃ3,oÁô¼ŽI*ëɹ"Êqu] s\!¨:º§Ú‰0”£Wã`ðv®ŒAú¹ÓÓQüŒþKý±„„¡#Ž€@jY>3`özÜ]¼R·Ý¢Êm5êÓnlÔ¨`æ1¿³FUDÌ4#ÏÆ¢ÎçeëªS£?¤اnÝ­¹rIlãŠK ’ ,!€üÄ}Iç¥PVQøŒÏΉTt§î«7xÙÀ¢ÇÃRÐKYØÁ€ ž=8dç
-F~~ÞŠ`­žÆH«|ï2:.pÇ©Ü槠qEòã\ØóÈ®HÕ}¸\”Ťp-ƒ½äXÔ¢ßT8dòV½ë»YOövš[ßøçÜ~ò³ÍL¹zÇJ›™¼oå›îÌzS…MñJs³[aã¶x$ŽwoZZ‘‘Ç5&å;htÀŒ EͺÆ\Åôð½ÁϾ¦¯Áìà ¸©¾zéð”uV³ü¦í@˜ò|š ÔtUjµñu êSd"ÉÓlõ œ³M¼SQ„5`Ì9%Uoƒ]ç}M.íGu¶X­åJÓ..-›LÔ¨tŠpý‰vr^â.Ý+TN„Í*ì‘ùO¦À»;aN¥žNÚG“‡·‚È)†|
-w} Ê©“šˆ}6
-áÈúi4JM6¤ÅÖ¸R «£¸OzÓ$cßó,<—SñvW€}2+çVkÆÔ·ò9 =%Éý? ëÔéÌ-6Lk}R‘Oú¡3€>ŠQ1¨.a ,ð¹V™¦
-ÈGƒV Ðfžè{â$ü*Ã<cgFN²N’I²sïÿ†Š1 K
-ãí2ú[Ì6s¹M:3'צKµÛÓHÖ4¿)U_·y7MÜMëLÇ÷»OCˆ(ÛÌ£¤¹÷ù>”†ÀýÂ;'¡â(ËA/×)ª–»z(-wõP¹m-,­}j{æ*iúhlêu•5¶–z ç¶%¨–Ú†“lç'K¼X.éî4û¡ò®—%Îsše%”õóqàcU(\ê<õζ7®õ¸ÀvØ漤cË@šð—óûÜ‹9²àÚîpˆ¶KÑC~tìÂm*]H­R)Oµ <ýHí*1—Z]û‹Oö”ä¦_ív±{ýºö<¼ü€)v?Žf£ &efävi÷t{€`S•)ƒÃçK’”–Bªy yWÏJÂíSï3£ÓÑszáµõ–€ÿµ«©ó;µoñè³ÑtÍ¿ÅRÕl}ŽL&•¨9­Ù^,‰‡öf4S ´;„Õ¡Wì.<T€¬Q’·cç];RòÑÿð‡·S>VA3"þ>©~ð>)(AÁDÞ*|1¨ù0?Áá@Û=Ú]m€¹vhEI5Wv=©²ÜZldwõ¼áú, A yLñcX,~£a“Ò íhóý¼ù{—YÑo:þ}Èv
-]AÆÂÖ ¥;7tÀžzº×haù^‡m-ÀÆïî¿œyœE´ùÒUXçéÓØ-¤½¿/Ø_C)÷Ÿ„)ʧ°|ªŠ6ƒ
-¦ô0O÷úðÄi¸íw´‡xWí
-endstream
+398 0 obj
+<< /D [ 391 0 R /XYZ 93.716 87.232 null ] >>
endobj
-411 0 obj
-<< /Type /Page /Contents 412 0 R /Resources 410 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 353 0 R /Annots 418 0 R >>
+390 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F64 333 0 R /F15 334 0 R /F65 335 0 R /F74 337 0 R /F82 394 0 R /F16 336 0 R /F30 341 0 R /F81 377 0 R /F22 367 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-418 0 obj
-[ 398 0 R 399 0 R 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R 405 0 R 406 0 R ]
+410 0 obj
+<< /Filter /FlateDecode /Length 4007 >>
+stream
+xÚÅ\Ko$¹ ¾ûWô°"‰%†íéõ
+½P’êŽÑ{åuÈ…ùË;pG«„"zV«‡§¤Uy¯"×¼Pà§Ð(W>ÏuÝ¡ÐN_¬ö±Zg]WR °ŸÐug„¶næüSº^5²Ëût¨ï<;=Ï®o¼2ÆÍkWO_“NÄŠÎúÂMU´&}›¥¡¶òå[wË´}¹d‰Oø~÷‚6§ûÖµuˆWã˜r3U†£Cƒ·áŒmU\+¡«e¨§ƒ “ sëk¶áŽÎwÊjYÙ,Hxë^¥1iÝó¾íµF+Çû…3š)h*_ˆk{®Æ ØJö3IF·²åJ–üŒKf…í8Ì\âžKÌŸótaÛ(«Êà´PÚN“EM¨<cÖ¤îÛ OÓ”´;V—QÙþ»÷WØùËjë ; ~XãNÚ4ËV•¤Ú˜Æ+Óâ Üθ#_
+5›~´™£$Ke5+—›H?§ 细±L*|ÖMªœ÷+^eyÈqòð‘ÛíÁîÉ„9òÔú£cçätª3aÝX
+Ó¢n*š&8½hm;Û­'/PÖÃcƒ Ïã`¯Û5íÁ®…1RþýïKûû/“=*,É;JÅ ! ¯‘ïò‡Þ¤ŽÑ*ŽÞFŽ$~ÉÖ1áé§$³9W8e¤ÌÔ†½JáÐX++|dQ2«ö‚ï
+súc¦Uc‹øí`OËL¾“¢£"'©>(Ç4i6ÌkÓpU^~¨¸v;}ƒ9 KªäÔû;v7¯keØ«y•½îÔƒ7òLQ´0 fêãÂ{¨…ÍA¥+JÑf.Ý»+YØë ['cê1)ahؘ²9Å{%;\Á{þF®‰”þÚ‡Í#N ¼7,L·txÜ[O9…ýئ@½o°˜¹½¦=ÆÂÖ=>¦¼ãÌy0Í´)ÌeñN”$Ó^ŽT²¯ZÖœ}µt΀žîøÙ¼ ìgi—\ýì±æxŽy˜x)r™KèÖÒ-R
+6È0–a민~=|ÊÒ'黎ŒÌÛ2¨á
+×
+Ëá”1J84-E6:Ž‰ðÂùOjÙ«ÑŽ¤!¤VY¿4CV8d€ÁºÒÃf„ÙèâIÌ™¯è!dUdуŠ|mB¨ÊOùËvö7'ñÒìsfnxG¤2Ñ(d±ã”ÿc–Ðk!íp\)›6[6t§tÙ²ªœíü œ'~Þ#õOù¥rx)s”ýÒ¬eHk™ªÁó¨|ÐûRœF•@éÈRz†}|‚‚ÁÔ¶Nñ…=ŸÅ hÏÖS‚'5ÄäAðâ–Î0>ÑÒIZ=“UC{ž¹-ö/lPܘ~3eŸË8Ï¡ðÉ@µP¯59Va“œÐi <öxßWTœ–oÏX¾[ün£1-þ$j P@m’Öm³ºø›¯Bå¡f®òÕ.Ы tÑaœò–à_&>°Þ ÿ`©!¥ës¦-{­hìCÅ|ÄêÊõI/ C½O5×åØQ›eþï™ 9 †âó ºd)õ®Ä+r¨>sÚÄëÊgea’ÀÉ•×ÒÒñ=žQíãêô-OR9_a,ÉæM‚׈έ/c¤'g ÓGyã·ª¢´
+¥f
+Á&Zg7-#óÅR6ÖœqŽÂ¬éoÞÜa 쓨èŸc—cá Å1–%Zf(6ÅBÄ-N)±!,¨y4îȃ¥»EaR©´\|Kº4nt¿Js¬¹G•¸“·L£jEµ·líìX3͇£Å>"¶¸-u[t¶EªTÃúLS³lÇ9¥. PiÎß½¤?þöµqNŠQ3
+M°H‘+M)Pê•[vv8Š×gÒ’b«¾÷-Ž9ìòÍÎ Œà„žœ*Ò§0Ü¡ý"b;@òmŸË0éSi£À Ó—+`­TJ)®ÂÓ(ùx´ÕPÌkf±7!vMj³U;í­°]ÚV.]s‰±^Ùɺœ…D‰j{kœ«د峂´”˜kÝŠa®X2»¶'õµU’!™”åûÀ÷W×Ø)áLƒ¡êìžš'ÆQ–oMÔô—sS`”ðÒ-O=]™h©Ü?`BÖ„ó¦lÉg@‚ Z?özÔØÇÞE-uåÉßïÞ¨>Ì£ªÍLóUÅÌL3–ÙÊi/ûEUª¨×èŽ)ö-höÖºxrUú%ãYYéŠý9î—BYOÃ+&T;‡ÑÞo`{¦ß6ÈèñäTc4gTu0À« =>‹~ç
+ Ùð“š©|÷#á2­l’MíÓQ)zFçã‘¿‡Ïzd|÷y§€%‹4Kt€PBó%ÇÐý‹)¥Ñ<5&-¹|‹O1"a9Tœf"Ý”¥æQû é¹BÞ9boÁÌA}ÅÃ|R¹€~-+Ä«f»BSn#]U![-÷ í uÅáÆ•Z¨Õ–.%Ê”‡ÝÜe)C;kü,sбƒL ?¡Õòõs¯rŽ{4Äk‹®i6¶Öe ©žv¸¶Ž’¾§H”áÔÃœÊíìRÕy¬®1›¦:>Q˜ Íw~£öLD…öÔ-›$pM/*üA·+2¡ßšöÓž¨“<r5×íÅšegC‡«†ã¸¯? ÅU€^Ð:·!>Æ>ó<6¤•áÇY7µšã"Ÿ†E°M¨—ÓvŠ?UƒÜ-m·¼ê·´œëØ÷ýÜûÀ“ÂE9+¼®ÍÆZs,£>‘Ì#&¼;ÊÐ5£Ž>ï$g„œ¹©]ˆtPRƒð« #>÷ÊðJÌD¢ ]‘ÜúÚ,z„ÇÒ˜gLBSŒÔjë÷j²{cÑ~úÝÁ|~•õB#Î@-`QùC ÉwÙ×Ý-d;¢yn¸•Ÿó`À‡>Ñ™sö”•73%4•ëš£©Ê0w7¶Äe{ÕmÛ]èÝ“$ º<ÊÑžëBÍ£Füðæ YeLoÇþK¿ïhëJ§dÿV^Ÿ˜°ê_i9ÜeHÈ«Üi+à§Ö Òí TGmr‡`ÃY˜§È
+íÜòª{´÷wÞ±óÂi5S0æ<°gÜLžÖyßcJ†×£&¯ŠeKïv¥>ÙÎD-ôÅŒkñà|´c2(öbÝy).¼R²‘âØ¡eïïTŽ”zº*¸SÒÕÊ‘v±„ð‰Ê$/5rûlZײwD¥p£´5‘®Ô¢àê(‘®Ôp4öOžU<R{íÞÉ=™µô«Ô.׬I÷œÄ|ê_§Y¼4âaÏ´v°–ÊŽ½5¢‡œWÇœŒ¨¯åÄ÷â­ëÌýHì^Xéç;?rÚäb%û$šŸþ?á(ýã$®«GÙ.¥Ý˜“ôèÔ ]#N=Ô±WŽ9>8š¢Þïùy@%åCªøìߧlÞç»Ï1ŠQI÷|€„q´P¯áaiaŒ{v/3
+»7¯ë“‡oÄc,èŸF¯Ñ—£¢-3r+Ú=ýì÷Á*CSË&Cø–m„4ˆ¡í†¥[
+endstream
endobj
-398 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 195.455 465.788 210.18 476.857 ]/A << /S /GoTo /D (subsection.0.8.1) >> >>
+409 0 obj
+<< /Type /Page /Contents 410 0 R /Resources 408 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 353 0 R /Annots 413 0 R >>
endobj
-399 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 248.586 465.788 260.541 476.857 ]/A << /S /GoTo /D (subsection.0.8.1) >> >>
+413 0 obj
+[ 400 0 R 401 0 R 402 0 R 403 0 R 404 0 R ]
endobj
400 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 356.342 262.09 378.817 274.045 ]/A << /S /GoTo /D (subsubsection.0.6.1.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 195.455 369.469 210.18 380.538 ]/A << /S /GoTo /D (subsection.0.8.1) >> >>
endobj
401 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 394.538 262.09 406.493 274.045 ]/A << /S /GoTo /D (subsubsection.0.6.1.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 248.586 369.469 260.541 380.538 ]/A << /S /GoTo /D (subsection.0.8.1) >> >>
endobj
402 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 331.385 223.094 341.812 235.265 ]/A << /S /GoTo /D (Hfootnote.10) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 451.762 231.547 463.717 243.502 ]/A << /S /GoTo /D (subsubsection.0.6.1.1) >> >>
endobj
403 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 333.577 207.451 348.302 218.4 ]/A << /S /GoTo /D (subsection.0.8.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 356.342 119.965 378.817 131.92 ]/A << /S /GoTo /D (subsubsection.0.6.1.2) >> >>
endobj
404 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 364.023 207.451 375.978 218.4 ]/A << /S /GoTo /D (subsection.0.8.2) >> >>
-endobj
-405 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 506.475 186.774 516.902 200.29 ]/A << /S /GoTo /D (Hfootnote.11) >> >>
-endobj
-406 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 317.437 164.208 327.864 176.38 ]/A << /S /GoTo /D (Hfootnote.12) >> >>
-endobj
-413 0 obj
-<< /D [ 411 0 R /XYZ 78.37 808.885 null ] >>
-endobj
-415 0 obj
-<< /D [ 411 0 R /XYZ 93.716 127.979 null ] >>
-endobj
-416 0 obj
-<< /D [ 411 0 R /XYZ 93.716 108.887 null ] >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 394.538 119.965 406.493 131.92 ]/A << /S /GoTo /D (subsubsection.0.6.1.2) >> >>
endobj
-417 0 obj
-<< /D [ 411 0 R /XYZ 93.716 89.795 null ] >>
+411 0 obj
+<< /D [ 409 0 R /XYZ 78.37 808.885 null ] >>
endobj
-410 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F22 367 0 R /F15 334 0 R /F74 337 0 R /F81 377 0 R /F65 335 0 R /F83 414 0 R /F16 336 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R /F72 349 0 R /F59 346 0 R >> /ProcSet [ /PDF /Text ] >>
+408 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F22 367 0 R /F15 334 0 R /F74 337 0 R /F81 377 0 R /F65 335 0 R /F83 412 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
423 0 obj
-<< /Filter /FlateDecode /Length 3283 >>
+<< /Filter /FlateDecode /Length 4034 >>
stream
-xÚ½ɎܸõÞ_¡0M>î@£—kÚÀäÇ·Áœ’ÌâK~?û®’ºå  i•D¾}#Ågºý¹ÑíËÓíÛÓÇW&7K¬%¶o<1|A7¶1*h½iÅUlûö}ûí™RÍ(@©²”ò×— ésú…¸' ŸõúÙ=Á9êå÷o¿>QbZüÿ—§_¾=ý§ Rœ€5›–šh÷¿r/¤%4B8âÿñÏí§¿â‹Šr-¦”+¤ÜŠžrF‰h¼4<“xÃ>S
-·@­OíJ.
-V.EÏ÷(Þ`®­2²©h?þÜÂÍ×/ÎxÕ¦ˆÕÜÈ—œã< ˆ†l¼¼Yx'þµ2ŽÎe ë)É€ƒ quF‹Ü%þè Àñ Ñh'õ A¢ìó‹·$ë]ÍkMÛl)½¶³µÜƒìÐȧVÇ5a²Š(yq+®è œ‹š:ÿƦ§µÓ·ãE剃åÇB§Í[µ ámrÙ‚yÄá¸tœÅœ
-­é®·'©j~R
-O Y¾‰4Ù~âˆ~‚Í«© ¦‰¬—ºmnôû½0,¸!–Â
-D÷àL"†CÓ¤ùòA‚tV#òÝ­„ íàÉ°¹ h6jAúÊJbàN2¶†À¦4#Üê\¼E2DT|@ü¡gF±·=ó²ÏY~˜] x’B\oÇñ¾¼P·j} cBØ”¢D8›)Ù¥…’Ì×)Í›9ŸÃÁ,%´ÝÁ¤Ž»‚[¬abä‘@–ä–@ÎÅ$`Ô¬¶É0B4Ârvâ4¯…êª:-EÉ%1Òl
-4‘
-ê*xÎð’¾)T¦ˆ¢ü´ÄC)ˆ™òH«àl¥$ŽHI
-¢° RTbRµ¡¸h\xéÍÜA‡L!¿¯Ü¡ð#mM'ìR¥9‘Lã
-ÈQ—SNkô£$ç4Ž:LÐ Ç"P5 mÍ¡x ‡+ÌËO¥×˜WGj‚„Wk†š·xA´ª™Õ a#rx=õÉ-1æIÎÖèÂþ^´ªŒi²zXÄ2 .`A›O!’âP&CB&¸ŒA"ëL^ŠÐ½ žö ä/÷·Ûˆþ¡2í ®ˆärc‚¡òÖ@•Ãö
-Ëítw¸Îf:ôVcÔŒâs™NÆ!ÝÃy”é’AŽØÝÆÆ5FŸŒ«“ÓÂè ®ð¥):bôWÃÔ•ÍÇÔáásŸóC§»Ÿ&ú¸_EQÊEt±ªSHø”¢«jðky”"¥‰`òMˆÃÜU¶Öš­Ö6rï–©¿ÝÉÖ‹!\Û3Ngkn5ÛµÙšå{·§‚v7YŸ¹ÞÄS©ß⎋‡¸tRÔ3ê×;âW9N¬‹[Ôü¾(¢-fš©˜gD^kbôhq>ªC{
-x¶T˜7†¹+ÏN§>7œö##‰b—?Ü"ƒå{=çgü¨›|Î&W¿½tÍòϧêžO±—ª'|=ø–sDyXd+uiä¾ö.±ä—SÊk'¿WyÿðÓ‘¼Pb
-?zøép>?…'ÂOi?üt£OZ®Br©¹Ær9±=L! QŸwÓ§6Ûù?Ãv¯Ü{ê¸ÝÝzê9;bÉà;¡ÎÑÄ-¨vðuž×-ø•§rJ …™6ßü¥ K´ä—«D–ÏþÎZ;á>²ÖÀ»óäÏÞ=ÊÕÒ½Òb²¨žË›šƒˆw­=¦ãÆÁ5ÑöÚH&p¡Ç›“»§>öµóÏšÂñOöegĵ~î«´Ü=µ¼Ï{ àBfY8W}%³Ìr2Ãø;—±šù?uŸ°Euf…‰rRRNhÍ;„ïʆq Ü‚çr^ŠÇmÆŽ–Ý7ï‘]ÌÔ ¶I[Å1æ0Õ’~<JQ†&w­«RE´j\õÜŽÀÛ] "ÑúJæ
-åôZìh·‰ˆaa-ðU‡ãd‘;ª‚bšAy•“¶Ÿý(¼ì—[0!1LWHfJWZ`Æ™Ãòòx,¸6=¬/:Î\Tw@S×,«huíÖB›AÛ6t~9å¶ÏWìñѦé]²½•@Œ»úS‰è©“)´uemKMhë¤÷/CÔBë=™AM•óÝu#cntØéЈGS+Ÿ§#SZg­œMp´zn›ëÄ­ç1ráGfÿ¤fŠ×iÕ篪aÖ{7­›þ’.J/Zîìú ¸ì=–šz\´ÓEÌðÚ6jƧU×ràoh±Ì¸ž!Up]*C¬-)Óܪ~ö¦®X0_zzÎδï®ËóLhUõ5OOûž°Ýüµjæ\~ ¬"™ûôÛ–£ÃRq7N ¬Í ŸÅiÁÅ{*KM@˜þOˆA
-¶îm'¿Ë–t+½}ÌI#„©”h‰7uµ•ü$Y\¤¨ñÌ7z{àßL“¿®“Röü×|ûÎAákc©ª†eu(]‘²zâGTý’ gûâœ00ó:€OèÜëm±#S µf×As™æ‚yõ9úøBZkêÒæþÜë§ù£ÂV:à¥uÜ7tÜf16Ë~²fÔº
-ÕÕ¿ýŽÏÿׯnÃÄší¿~äw "‚(ææý{ûÖ¡¶`›t‹gÙtï|Æ°ì¥ÜÇãfÜÇW9]=[N4F2$‰Êæà{ÜõòQåûºùJ¦ê6×ó#ð.X³-Ü6•ë
+xÚ½\Éη¾ë)æL“Åø!@ãÑpNIt3|JbâK^?Å¥¸5ÙÓý«e£¦›K­_Ù]ä·ßnüöã‡û—ß?…¾yæ uûòë7øMÜW ¬½Y#7âöå÷ÛÏoœ[þQü+~à\9Î̓s ùòŽdÕt$Éã@êŽÀÏ#w^¡<vöcoÃôœë{"!ŒD× |üNJZùàÑþjAwà~%*´Ê”¸Ä–ñéw¼ÿhdzgÂòIW•M4D‘Ø<†ûè½@•‘ÃÄÑ¿ÝÒ—¿ýx67ü•N·<K Lº 1ÅŒ5ijcù8Ïú[IM*Î>HM»†’FÅJ3¥•4‰öÀ¿áÄeäîA¿"_*_%ºh
+¹Eè-mÑD”ãäþžá€PÌ é#-À“4uØ¢
+¤ç<¡“î6¦¨{Í9¢h&þ %ë¶Dœa›1+ÆÈ{ºÛd+}†ôhDÿ܉!Ë\E ZI…BÂHÑúÞÉ^ùžqšIU„,Å«ü¢úÏ50‡ã ㆱ,ªÊ|ÞA0›C ÿnãß?~»­n5±8¢·r¾Ô4ÎBˆWÖ­ %§€¤‘ú£Mhfø¦¿\>+¶"ç ?%.£Ï‹¨õx-åwI*jýùœ1Ž*^(¡¿Í˜Áò­8úd<ŠÖLJ,…~í‚ì{"?RîÕHùñÈ¿Íí6£˜'›…”r$‹^:|'R§ö] J#¼
+TqÔ.P¥yVpG Á‡¬$5÷Hëª4Bä„|©Ð" ÑG0åν®,ò,"Ãk¸wŠSd6C¿òm‹Óˆ‘ 4’cañ”!a"(Ì@)+ÀÄV«4O<©“Áòj¼u~‚ázÕŽÊí&¦¿\yäV#ß[ñæd´SÆ;R+©%s.xZXFêÞ?[ˆš°€#Å„²: Q` ‘ÜK&SO€l´‰Ú¼Ü·Ñ1òò?/h£Ö¬«a¶×v±–G’ùÔêp1¤¼·"Ô½ºb0p\³M²˜tµuú¾] på
+e7´=QÃTiµJâã]rÙ:óv Õ¥s/JÜ3­ôm´'mZ~‚Ò Ëw™&ß$0©E…ŸdófjA
+Wt—CƒÔiÓ&ŒÛ,¼Wv¨¤cžÃf”`S.¢…›É?JUV‹XlM­DJ¦¥ïV~ü5YeŠÏe%ùÔ>Û]Ùæ’[×oöqŠªä¸¬Yg±cþÔ—k9f ‚vÞ²‰ºÓ­Ž!=Èêß·îç_¢EÝPOÆH×*ÏzLŽ0¾cóy*)f” £iàupU‰%×Ëûv2»NØG‚O*¶2ŒúÈÆp¯óÓòòX1`Ñܼf[¡} 3©}øM®`;ÒÄz$WR¼Ù³tuoNƒNY%}»WÐy®Ô ®e€³¼wÈtÌ«t“z‡¥F9[Õìôæé²ÚÓä #3FTÔŽÌë*¼`÷©wk"IJ¨œînÛÇ䔹Mïia¯üMǬƒ6¶ô£ñÒBÂÈù8£Èqrj¸ˆnª.œVc*Ãœ)xSc9—“‚­j­³lZ¨NZÁPb|–­TCR?KYJÍœv7}ŸÏ9^Ò70 Pæ´ÔK)¨™Ê7>‘V³—’:"%­˜Á|H ‰Ym-%€qåe´ó0:
+åcå•í[:a—*‹‘F @rmŽt×YýV’s·:Ì£+ŒÛqslÁ zƒ«‰`¢îëqKÍ+  -gBÃ{œ ÕÌh.P…/ðvê*J!Kõª•´˜dèµÜ߃«Æ˜&‹‡˜)Àå‡0 Úb QBã
+Å.š¤@®0C’¸~oByÍA÷B8m @
+`áï°5&6¤Œž6”4˜‰é›P¸1eg  ƒiw@Þ,.x0µš{ÄÇ ê&04ĺêV?q?†©ø‰[4õg\]ÍWsÅ Å8ôvg»E‚kÔ¾{¶»EØŠöŠðk³S$²Ì7}…õ95˜CdE¤35{¢iŸæ`Ž2ŽÑ„„éÌN2‹v¹‘Ã*Ñhdt„*
+O€Ï8Ó>ú ­OZ®å '¸ÆrÁ$z˜U¨#µ[eµo½ý
+%Ÿ1Uš¿2¿¬™BurTç0 ½Ÿ^Þ-çõ€R¹+%ò#‰Z"JWé ÷¶x§”[8)>Êðµ'––Æþ}ÙN;ûXisýe½[Ê9Ö•f=ë«øp¯eŠ]¥@¬Ã*\–bÚ)ÅZwgl_ÌF3¯† Ûײ4ñÄÝPÁ— ±èJçšö{m½ñæMDèÏŸh+ÆZ³½QBÙÖ¹³Bld2I´k%lÜÝ;˜2Ù o†’”üü ^ÿ'~~
+
+­þ±åï踡ßnGøI#n8µº+”paG[Å·Dµ™òýSO±ÊKf1þ Ìj5ƒ )ì[…
+KG¦Ü«Ã¤ÛÃ9ÂÓÇvã,T4QŠLU‘QwE0bSË”foªÉcµÍt®½Ã^Ò šJWxµ²þ{иTo˜øk¨É:µ´O²¦Â‘Rh?W”ôæ¡·}4åÑÂŽî’è㵌¥/û~¯´ÛCPŠüž3`ÉÀÕ-ŸúˆZ6¶(€-ù°¥¦c.â1?ü­VËD³K·!¿çzσ<éNœ|_uÀC<2#;-ét.NŒ«fW•41”ãh¥Gõhª¸òTq¯„øâ—oÄAoîFŒµ$ClÆlTtL·åJ÷^ ¥<7—NYS{Ž"µ¹^WÕÒ1Éé`‚ز\‰Té{ˆf:©i©oÓêôiMp_Á¤0LY=öW0)$3V5îªÖdwIWökϨUÈ£b>Ñ”/éG¥rÂt5Ä~Òy„ªG­ñS¥ƒ%7)úæy³üHÍu¾`.+žº²YÞÒ´w>Œ*u
+m™(5”‹ª\§P¬ÏG„lÙŽ:ʧ¬«$gÖn{ÕY–ó)ÁŒßØ„~ìϧÐÁmzå2g㢽tš¾Ÿê‰±@9ÜUrkæ!;±ík:+‹€¢8'T?¦Ä¸Å‘Ö¼*N<Öj#a&á9ÖDÓao%)‡tèQ„H§Þ¹´‚bT¢ƒÍ|‡`Ä[&œl¶½@¯Ú÷«›TK9ÿÖu'»ylƒy?Z(ßÏ°,˜ž)ŒÅ•Þ0–Оȱ"RÜF-Søè0Ãó·öP‡&)y$.#~8wâ4œ4K{Í<ÉY;J×oÃÐÄ>ŸàS„‹- ã/R ¹ÙZR¡›uœzKjay#¸8›çÃzÁnÝÝ… 3K¸æ«ý¹ ¼(DZT£e¿ÕSe¯ ÑÒƬ`zCl ý›…dJ ÞïaÓËJ5LØSL–ÖØìû3hD
endstream
endobj
422 0 obj
-<< /Type /Page /Contents 423 0 R /Resources 421 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 353 0 R /Annots 428 0 R >>
+<< /Type /Page /Contents 423 0 R /Resources 421 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 353 0 R /Annots 430 0 R >>
endobj
-428 0 obj
-[ 407 0 R 419 0 R 420 0 R 408 0 R 409 0 R ]
+430 0 obj
+[ 405 0 R 406 0 R 407 0 R 414 0 R 415 0 R 416 0 R 419 0 R 417 0 R 418 0 R ]
+endobj
+405 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 331.385 758.132 341.812 770.303 ]/A << /S /GoTo /D (Hfootnote.10) >> >>
+endobj
+406 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 333.577 742.192 348.302 753.141 ]/A << /S /GoTo /D (subsection.0.8.2) >> >>
endobj
407 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 352.892 745.619 363.319 758.348 ]/A << /S /GoTo /D (Hfootnote.13) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 364.023 742.192 375.978 753.141 ]/A << /S /GoTo /D (subsection.0.8.2) >> >>
endobj
-419 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 303.231 254.112 315.186 266.067 ]/A << /S /GoTo /D (subsection.0.6.1) >> >>
+414 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 506.475 720.921 516.902 734.438 ]/A << /S /GoTo /D (Hfootnote.11) >> >>
endobj
-420 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 225.413 165.945 235.839 178.306 ]/A << /S /GoTo /D (Hfootnote.14) >> >>
+415 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 317.437 698.356 327.864 710.527 ]/A << /S /GoTo /D (Hfootnote.12) >> >>
endobj
-408 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 105.185 96.542 124.577 108.162 ]/A << /S /GoTo /D (subsubsection.0.6.1.2) >> >>
+416 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 352.892 653.963 363.319 666.692 ]/A << /S /GoTo /D (Hfootnote.13) >> >>
endobj
-409 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 135.281 96.542 145.737 108.162 ]/A << /S /GoTo /D (subsubsection.0.6.1.2) >> >>
+419 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 303.231 162.456 315.186 174.411 ]/A << /S /GoTo /D (subsection.0.6.1) >> >>
endobj
-424 0 obj
-<< /D [ 422 0 R /XYZ 78.37 808.885 null ] >>
+417 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 105.185 71.643 124.577 83.263 ]/A << /S /GoTo /D (subsubsection.0.6.1.2) >> >>
endobj
-41 0 obj
-<< /D [ 422 0 R /XYZ 79.37 241.153 null ] >>
+418 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 135.281 71.643 145.737 83.263 ]/A << /S /GoTo /D (subsubsection.0.6.1.2) >> >>
endobj
-45 0 obj
-<< /D [ 422 0 R /XYZ 79.37 220.864 null ] >>
+424 0 obj
+<< /D [ 422 0 R /XYZ 78.37 808.885 null ] >>
endobj
426 0 obj
-<< /D [ 422 0 R /XYZ 93.716 109.842 null ] >>
+<< /D [ 422 0 R /XYZ 93.716 142.218 null ] >>
endobj
427 0 obj
-<< /D [ 422 0 R /XYZ 93.716 100.155 null ] >>
+<< /D [ 422 0 R /XYZ 93.716 123.126 null ] >>
+endobj
+428 0 obj
+<< /D [ 422 0 R /XYZ 93.716 104.035 null ] >>
+endobj
+429 0 obj
+<< /D [ 422 0 R /XYZ 93.716 84.943 null ] >>
endobj
421 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F16 336 0 R /F65 335 0 R /F84 425 0 R /F73 350 0 R /F75 338 0 R /F64 333 0 R /F22 367 0 R /F82 392 0 R /F71 347 0 R /F53 345 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F16 336 0 R /F83 412 0 R /F65 335 0 R /F84 425 0 R /F73 350 0 R /F75 338 0 R /F71 347 0 R /F53 345 0 R /F72 349 0 R /F59 346 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-435 0 obj
-<< /Filter /FlateDecode /Length 3737 >>
+437 0 obj
+<< /Filter /FlateDecode /Length 4153 >>
stream
-xÚÕ\É’¹ ½ë+êÄ!ApɈŽŽP©T1>­ÛÄœlöì‹ßàî¹tKs°¥îÊ$™
-$ gËneŽên–3uOüóÉÁGv+[T¶…‘ýdfõ—j
-¤½ý'X:þòçè,vܘ^©‘O>Ãz4œëýTÂHW±Ž%J+|ˆªú…¨úòõÿ›E¬päõ¬¡½½ýõ÷ÀÏ ¤Ø
-ïý¸
-{Eœb«·HLe„ݦ
-÷úÕÔ3›ÃJy—°Mœ5u‘h„%§ ªlÑE£öC·´AØ“¡¿­}ÐÉÊŽBø²¶ˆBª‘És1
-disr¶sš`sŸ$<N4Ù0×/¹@Ü¢gÕo…rŒ! ÕÊ¢Ñ>Ï}‹Žaév|º
-¢ÜˆlÂäÊ>Ýl€»)%ÙŠ¥O_+sÀ‘›é 8òZ@{¬ÜÒ𘄱÷“`XMÁ¹&ÀI÷ά<²UŽ¼î
-¥õ9âõùú^žœy“Éî¥BjÂesYi¯©~;‘&^@Ô½´tÏœÐcÚœÌcP÷¢„¨…w]
-©Œº„~É8 iþJéb)ÛðP·áac^®‚u[?eú‡ýðƒ[_>ðb«ú¦sh–¼Ï*\dh§ÖT„âÕKžÊNJ˜qRž·;2z‚— yzº40¢³ë'4G“Y¶‰ŠRõ}†è.9Mt»óHPRÜbÕHñädc”æN¢4<Òz€Íº•¿Ó8‚b¡}dª¬Ø\A]'é÷+)1š¢(\­¼×MÐûñÝ#ܘӴ˯èÊIýÅq‘@¾–è[qÑ'êSSÇ
-Tl¿ã[´Únãúo×^®„îø
-†Â¸€OµsÒ€"S2•#­n• 9=`½@
-¨†Õ8”¤:–£yÇy¿BF UëÓ¼v?5G*ªu1i\—\LbÒ¬1Qy{Ë4Û ÊŒ]ÇÅŒª¹š4aÈZ5´d-š57)¤s×»
-ÛOkÛ`§
-É=.b8;²÷ÊR8V­ò–μ½óÏ×$ØJñiGA}û†) Á#:åôŒÁ"T€®ÇæÂ’çEH¢¸ãû¸GS=_/•RÏU‹.í‹ÈŇ/Ïr›·_ž1KµzgÕXK#Œ%ñ¾*Þ¡À5©—0<(–ÓÑ®ÊéEÔÅì>Z°9bìª ¸›áæ¾5†¶9_5h†$dרP ¼u§ö£î§ï ˜lïš@ã,Ût4Ù¸ï0hoĶ™o ôR‹õ{´øzYZ‡ŽJ÷íUé”)kIâf1»íÔwšHuÎEEˆh;Àt­^“áˆ]ðÀJ~òg«v¯±í*¹a·:*sï¼äð×4÷ò·ÊëÎÝ4î
-_}\Þ—¼8¥­c«°ƒöŒÙ„¬È]+òé-ìØ™ræ×÷‡uqè4Æ–™&;q^fs3¿c»-"N‡ºÏ€òyâè²gÌçÝ×}Yš¼Ê µpCI¤ Öçó6;œ7Di„Çƽ²{†T|r•:à†VÎœù”&ŸÖt¥«ûhûäšYnR}P™±›àÊÁªÝ9µ€š.hŸ s0ÓžÁ”×Ä7œÁ,µÝÌ)åZ–ÊOáX¡d$em(é[^ñbÎÔE°y¡këÚ1_;g}’#<1ò2$¤
-@¾ØæQÖ3C•¤ ¨9Ý×Kš¹E)FW—W[ßšôö6&={œõÝÌíÄæÇ­ø`nÈmXÐã“:³ÐÖ]h{ )/šÛu Q¬ Ÿ+±5½#0ÕaŽAé°@¥ÿ/1¢Ýûï°[R8ËFaùÞº¯jZä@˜ÍNÏõm´´»µ|Ô"¨gÊO2͵ñ”ô©>ÄKX(JÏ}JácMúà—ô!˜ù®ÆHüT߈w›È‰g²(ðï-È«WÉâéböÖÖÑìL¶ñ­ô–D[æÎ3$ÁqºÚã|é
-8^ÑÊRl» ØŒWJÛ./–?ÃÝôŠ^¹Öô¾ä’Þ ›ìãÕ7N ™õ5Ù}]¯1ì’Û«ÇÊ;LéÇŽÝ°ú°ÚÆ/kq+tÞ36TMmp¥áï~Ø3éqÑAÑðgú/*ônwÃpÜPö5F }“,+u-àTENËn®æÃøEhœD§\íáŽÉÈ:b£oiryMß”‰sO¡Q꬙ޮ
-V¿Œ‘xÕÚÂUm“°…©I8Å°&¦§¢­b]H'Þ-UöðM=õÅ; 4õÄÂq»±¶ÛØ"ÍÒeùꮬ^Ês‡›ÅÎðsÞ /ë0àÛãQ_Ö­• \ÚäéEÞ4soWÚÞ‡£W= ïD`<ð™²LéõXöæ¸Ù¼`&‰ñ¶°¡W@=Âm%¢„Ó[óÔ¤Œ¾©úïøº‘ÒN ƒñoìÎT„4ã"Ø„|:骓‹W¹Ö/ ô!"4ù¥¨Ë
-Þàösá«TàŽkZ ­&yÔ°w•?›ß2;*7ì%öë*'å¦&îZë²Î)ŠGUè«ûåWºü7úü:¤)¨þoø{<?V…iÿºýåÃϹ¿ŽBY:áÕ½F ¡° ð¦dx]Û,‚ÛžFßM”´`31¼HgKQtìê‹kN½úAÁ]P—]•Á=`g°=øfª´N׶wºÂ01“*4•›‘þÝÓµ€'ÁO«ÀÍ}Ê*«…é^þÝ›y«¼ZÇ28B[ƒßm9ö)ÕìC½#˜»)¿°¿'j·Y¡jM°ÀãNãô½òVÀüŽlƒSñ­Ã4º)”T÷Õ5vV:wÙ-%ðÞKWu’c1fn­}Ã¥^ß”J[ ]£ÒëQêÞ´æ1„RùÿBÐ2›A[F•69ä®ÍI'úf„ÂP&
-‹ÎXdCù?W—¤T
+xÚÕÉŽ·ñ>_ñ~@4Y,n€0€ÆO#À9ÙÑÍðɉ}Htˆ/ùý÷½»ßH:ÄÀ³¦»ÙdU±ö*6¿ýyã·OO/ŸŸ~xÕx‚9¥„¹}þãIÐ~7ã˜47£ãZÜ>¹ýúžsé8W–sýòüNpÎé–¦KùJ?x~'òw€~îY
+úÛhÎÑð÷àù·Ï?ÑŠ
+ÊÂø#]
+¿ý ño¼V¾WÒä« t %p„:
+¯e3~Š“§¼¤•_âÏãƒwÿn€„3çù‡þÿééãç§ÿP@KæP(ôЉÛï_žü£ë™LX{û럷?ž~¦ \aF—4Œ˜ÇL$,<äH¯øÜ__ÜkIL‡ÆN»fÌtòTÑ÷ÌK …èÚØ–~=Eû¯i܇7ÿÒÞ®!ÞÌ»95Ü„'H0È°›í.¬˃0)°”IRÃëÞ†Õ¹!w ÁQ Íü^%xŸFë÷ §1¾Œ8&,ÂÈ"ŸÜ.×õ»ê×ÍOŠt‡§~°çP¡ðûî¥ÎßSöùJ5JlXël#EZ’á6i'óÝ
+-ȼc¿ w¥¯=–¬4SÏ Ç{É9“ªðg¦B†>¬Y¸Bv,·’hÁ{ž´…'Ã{ö9hQÿÔÈ|7К'nºGCt¯Pÿõç-þñË'/yú¦™3ÒªNÆA3䤽8©S¸TyþvQÛ$Eq¬§i›™D³ÒÓ(ñ\§ít@Ã
+'¥=žå±ŽÌ3,©Ä«¾ÉÖÎÏ›å$s\‚¨“Ì<o’öˆ¿]š$,•ñoñö””èmÙ³Ò C¿ž¾ŸRYI1ÍžñÁ¤““î˜%Okˤk?@.àÔåI#Ñyì=­úÒêöÎk‘×í÷d òÜEld|C­=t&Ý]KýÒ~ŒZ¸ÌY¦Q<®ßZªcw´G¢½Yø`™/Ÿßé@£rh OO‚¥¼•üºj1òÒùïÒ–û[îâ¼ —™â^NùšçKâ¤Î¤³ÌHêÕY}[q
+âtEÑ×°tv@Á¹ÉÑæÙe/.(ï\s¾|c4ñqæþ­uÛ¡cäÓv"©—!ÜìÝ—H­ˆ”=r¾ãûÕÙêõu|fÃ!ü±ÑéO»ÕqÍs'lgô8a«Š£"?¶£gC,æß_©>¿NH$Øv¼ª ZûŸÖ;•6²“ôÉÁ°j²–ñc¸ßÉIX9ÃV{­¯+¥üžKgÇ7¾?ÔÓæñ@X%Š°Ó—*ñRº¿ @#­MÚÏ O'Yí÷T‘ª8´®}Åäú»<†1ó[Ç°äQÛ½Ç,¯ºÌ8RO¦ÄQ«µmœ°ÞÆ÷^’î²e’vÃu¡™7ÆiÄê!O9؛L­Ý‰S£˜!÷d˜¹‹hÖù=Ô† ëÆ7³^b«û¹!s’Ü6;Á ¦<Âé(âQsÄãYÀÎùÊE¤\€Êj«ÉY ÑGµ‚ÛädÍ#8`G,ZöŽkÊ]ðc“¢Cœi£‹2¦û!Ç©BæáÈYTZŽ÷xfÀ»ÚÏ﨔×n£CïxK},âñM‰ù¯ Îs3ò\Bhœ­$›xOzã矹2›y gCÎJkâ0«+!Wù3!MÜ©k/28®úð?ä6%˜0ᛤ¡,#–]d™n½ôr—Êçu²Iõ¤Œ³áÊΈ.ùæÈí¼ª²UJ3ŒØXž…ª’8ÚÇUê«M-”´ÄoVS+¸N},|3Ûz%Sb¦—Ârùé½FæmDë/¨ŽDhS«Øá4§ö3ýJz÷Ø JTŒ„b¤ä·aòÇóZ1©äÍÒßU‚¢aó#:œÓR”BÙ™¬nÇb@¥»ç*S]ã^N
+óç¢Ùøü˜gH?í“Üõ"$ºÍÆ)f…ñÌ2,GŹ)‰¡”fÑ&S” –ÿÅÔ{ºøe,Ó‘2’¶E(Îæ2/Úܧ‡j]¦[cV¦ë1KRÌÐqV
+ÈQÒžkû¼{ãeÚ›em<í ¦o ?E‘dF'Êñ†wR!$\ÏöBJZV¸y/"ÔR&ý·ñ_÷æaQåY³ÓðÀ2˜ìŒÄï í——2À@â Åwtô×Ë¢N‰SÎʪâ›}Y5eã´Òé8(Ù .Oî5ýŒ}ðÐ¥¥m)Fì,ûƒÑÌZ;ÎR
+BSxõÅDr±Û,@¶lmF
+W3ï:
+z;¾á¡1%ÇÁíN¯ÅE [w¾¢Pŵߘ)™¤yûéçÝ\ ÝX
+…¼„ô8ÀÆLmÄ (,¥hr€Ô¬ò §
+%7\4$`Óê]¢†Æbèü|˜4d˜åRÅ°/}õ›(gƸe}óÀ\J²Þ»¶ÓÜðÇ)|EŽ“({á@‚T>9» ÍIùaàGÚÊzÇœ6»_ÁK€®Åæ”çɪ*‰ñ2nÒTΗK®”sÅ¢ Cûr±ßKansöK!“ø– Û WL™‰ß〱ÌrW
+õtÔ«zz!vѼ÷ÖÕœÝaìj ¸ÍoçεìئlÕÀdú$óAÙ5û˜»Déÿ¥(aÆY®é0 hrqß,\Ü0°îkùäcù¶ƒ7W‹ÒàDȼ~uQ:&ÊZ˜r¿˜v›²ó¦4.¢î|¦kåbð爪‹Ðq!L‡H`Õñµ<ŽR‚òNVæßyÊ)Þ+:®éïÍWÿÖ¤›iܼΎ¿Î ÝÂZ9“ ‰“»näS‰-ì%v†<ãk{i¥ÎŸ!ƒ®t^æró¾cÃ-"NBÝç?Ñ<1uÉ6&…ófÁß0¤¦a š—BßD@‚µ´ç¤Í±ã†(Îó ;¥7jÐg$+pZsÖlÌ¥4¹´¦·(Þ½ØGÛ'ÖÔr‹êBåmr_ VíαTuû¼€Ì§ÌŒ9M|@
+Iñ æOd_+iäeYí]m|kRÛnLx^9¬÷–ÖH pvÜŠïàå*
+â5Èq¥‡*òË¥óó sŠñ;`ñ„h½Øÿ+N8òv ~ƒÝ¢W…’‘Ÿþ_·îòoM{0åô´®m‹£¥Õ­Å£@-38C~’e®­ˆüH;á}´„¢¸†ïQò?­â?Æù˜ojŠÄõ,@xÚÄMùÍlŠï÷ˆ?+èèzUëøÅÌ­®£³1qã©xJ¢-q§7½È<jôŒãÝÎ3N·®xÆ+X3Ûˆ¬Æ+¤m‡—lŽk†s ®œÏMk<ï©œ7Ð&Æp·Æňj} v_Ók;ÏËöì±°ŽBSˆé`lÞØÕ‡•¶|X+·1Ag=C3ÕÔWšý^ŽÂúìôMŒ¸èžèŠ÷îìŒìŽ¡· ƒ¸!ïë‹úÙÌÔµ@t৆“Þ¶¦Ãò1hlDǹГ›%æˆ »Å—Ë!|(1Þ=õŒ–g+ G1üß™Î`ìò}(ƤdÁ b7yt§s–ñV¿Bp}
+Ö W;p)S¯ÎøbÃ%y͹à 2SaÓõt²NÃûƒ‚…NDz›(¼2mÁ@‹¶?XÏŸþˆ¬ŠŸÿ°Kèï›O䄧¥Àî¯Ä«<ƒx“=¯X0n7Vw[¨Yš¡t¾;ùVZ.é¹Áf±³KŒýQæ³KåeÞZ©À¥JžÎñ–ãÿË]iÛŽNz’»Ãœt#ž1ÃOÇÖrW%­e &Šá¶P¡W|z’4f<Èô̪֥Úªº¶¦¸ŸÎ…ÓO¿yúõ7ºýúýä»S)¨ùoø…œ)dZø×þ}ûûÓÏ©·‰B ‚Ä¿Û@béž Ïˆ†rñÁ‘^•¼zÓ|Í{þ áæ8 jŸú³uÙ¤*lLjÛø”§ZæíUþ
endstream
endobj
-434 0 obj
-<< /Type /Page /Contents 435 0 R /Resources 433 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 353 0 R /Annots 440 0 R >>
-endobj
-440 0 obj
-[ 429 0 R 430 0 R 431 0 R 432 0 R ]
+436 0 obj
+<< /Type /Page /Contents 437 0 R /Resources 435 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 353 0 R /Annots 443 0 R >>
endobj
-429 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 338.04 576.254 345.014 588.209 ]/A << /S /GoTo /D (section.0.9) >> >>
+443 0 obj
+[ 420 0 R 431 0 R 432 0 R 433 0 R 434 0 R ]
endobj
-430 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 438.852 576.254 450.807 588.209 ]/A << /S /GoTo /D (section.0.9) >> >>
+420 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 225.413 697.31 235.839 709.671 ]/A << /S /GoTo /D (Hfootnote.14) >> >>
endobj
431 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 504.396 294.837 514.823 307.566 ]/A << /S /GoTo /D (Hfootnote.15) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 338.04 483.064 345.014 495.019 ]/A << /S /GoTo /D (section.0.9) >> >>
endobj
432 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 323.794 171.3 334.22 184.029 ]/A << /S /GoTo /D (Hfootnote.16) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 438.852 483.064 450.807 495.019 ]/A << /S /GoTo /D (section.0.9) >> >>
endobj
-436 0 obj
-<< /D [ 434 0 R /XYZ 78.37 808.885 null ] >>
+433 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 504.396 227.826 514.823 240.555 ]/A << /S /GoTo /D (Hfootnote.15) >> >>
endobj
-49 0 obj
-<< /D [ 434 0 R /XYZ 79.37 449.94 null ] >>
+434 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 323.794 119.882 334.22 132.612 ]/A << /S /GoTo /D (Hfootnote.16) >> >>
endobj
438 0 obj
-<< /D [ 434 0 R /XYZ 93.716 115.197 null ] >>
+<< /D [ 436 0 R /XYZ 78.37 808.885 null ] >>
endobj
-439 0 obj
-<< /D [ 434 0 R /XYZ 93.716 105.57 null ] >>
+41 0 obj
+<< /D [ 436 0 R /XYZ 79.37 771.024 null ] >>
endobj
-433 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F81 377 0 R /F65 335 0 R /F75 338 0 R /F22 367 0 R /F85 437 0 R /F16 336 0 R /F71 347 0 R /F53 345 0 R /F59 346 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
+45 0 obj
+<< /D [ 436 0 R /XYZ 79.37 752.229 null ] >>
endobj
-446 0 obj
-<< /Filter /FlateDecode /Length 3914 >>
+49 0 obj
+<< /D [ 436 0 R /XYZ 79.37 367.336 null ] >>
+endobj
+440 0 obj
+<< /D [ 436 0 R /XYZ 93.716 99.585 null ] >>
+endobj
+441 0 obj
+<< /D [ 436 0 R /XYZ 93.716 89.958 null ] >>
+endobj
+442 0 obj
+<< /D [ 436 0 R /XYZ 93.716 80.331 null ] >>
+endobj
+435 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F64 333 0 R /F22 367 0 R /F15 334 0 R /F65 335 0 R /F74 337 0 R /F16 336 0 R /F82 394 0 R /F81 377 0 R /F75 338 0 R /F85 439 0 R /F71 347 0 R /F53 345 0 R /F59 346 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+449 0 obj
+<< /Filter /FlateDecode /Length 3946 >>
stream
-xÚÅËŽ·ñ¾_1? šdñ ,ÐhµœSÝ Ÿ’؇D‡ä’ßOÉâ«Ù==«µm`¼3Ý|Ô›õ¢äå·‹¼|yº}}úáUëKÑig._}RøB^ÔÅGþâÒ©Ë×o—ŸŸ¥„(¥ Rº[ùûñúAI)ñ•ÃŸðŠ}ý
-—
-_U¨_RGÒðGDÊ[èh: IR,Û(ÇRi^—åÆ—µ [ËZ˜HôDo 3ÏmÝÌÎ
-…Í0§eÅ¢h‡Iœv}!"Ñ&éϱ™Ä;3Æm|ƒ‰!á¹+Fdø’@È~l¿~[Å<7<XôI÷U4Êcn+¦ª€:l—\õ$:Æå•]­˜µ:S­*®) ~Üå¿d’ùÇO_HõÖÖŒð¤z#Ìí"‚²Xø]dAhجRùãÙÎhïJ^µä'¿e…sºÉx¦/ŽtEµµ›ìv™[Æšn.›¸<ÂË«uÏ͹—žE9ËX†MGyºc:
-?ui:;Š”·9×t²‘ôê–—Ì›ötiÉ\k’Q4f!sÒ ãZæöŒSáÌÿ6ó”
-rÖ®:—a77¦j;c“ÍñLËAO%^=ÍIûñ*ùÔ®øØ^Vc²g™c´‚¾eŽ×Kð¹×ñk=6Qzê÷´åV‘8õêzò™Ë&…t
--çÁÕ•8…'N5gö$—ûj<6RÐ4ጕF'h5ƒ%OPP£¨¡"ÌЭ9¥QÄt˜Ui_™ƒ2Ú=»ý>ÚÍ:6îeÎÛȪl[hŸsÓÏÍûÁZx” Hr Ý{@ÅÊ1îcã-d­˜æî¨{ŒÂ¹Íè
-.¥È£ú˜sB´ª¼\}ÜhÔL;oñFï”)8,¶tNõ»è<Æ!QÍÛáW5ãÔ=/bìNÔ÷¥©ƒÉ£`’ƒìš ÅsuynG¤Û¬bŠä«ö SÅlšÍÕ°œ«-ùEësí‹Ó±5‰çZr}H5É>Òñ²UßJRó0m~"!X“ñË*å~ºmå†$'Å}7C*Ñ|Ò™0®JÀ¦rc¼_uЯ}&1åæÊXÊ)TQsòpa!jÚ -$”%7èdW‹Hðȧª†3Ï­š¡Jv6ÏK ü´æœYèÔ^.v1s¯üšW9•©Íëœl3(´À^oÛ6ƒû
-ªzNÓ¯þ8À¿UŸ‡!H­Ç-xáþVQÏùѾÞO .}PŒQƒºP¥ØÛ0¦Uj}
-ve{6U×ØÛžÍé;±^ó“"° :¿€ý3êpÆÓ'âYÐHhDÕ9u%ê30³Ý@óñJÎ1L¬£‡)Û
-<Ð\ê](dñÞ§ÎBŠ‚Mµ ®ŠtŽ"îcÍ,Öð€.hœoi£WÍ”•Íªö‡·³
-k…8ÑÿÎEƒ×¹[[pzUTpå’R-òf} `¿Ìptx(>ðÍ)Êà18ÑðO2§& Š˜¡9‘”»8ô Øq<$,! Âè!D8uÁ«H–¦úzsÔ˜+0aNÉä''¯Å•ÑF¹~›>KÔGÏîxžß9…&¨÷wÀ@rC vÀ–Wý‰Û©nCß)žÎøÕ0¥ø¾ÇÜòV™$sšgÅ:µUð…±!bt~tqÐx·`ªüÈÉ÷yÈÍ›6{›Ë«¼Í«}z°ß^KÌïsÞ“§ò^–^m?öm¯ö¦±«äœÓ;=ìnÓß{l¨O*ØþRöˆÙ“å‹@Ùû­¨û;¹<¾Eòj÷N ¿Ý+T敲nt}¡ôªôrJd£az<jeí7Š…“0‘#'!ú[ÅÖÈi¿ð\{2wÍ…‘"èiƒ [»Ð ägÂqj ¾\^ünëé÷ÎV¶Èùzñ=l¬Ò&Uà§ÏÞ<{g®÷®&¡k׎ƫA‡åÿ½ËKfNb÷éàcùM)û‰ï*Ÿh`µ1ó¦Àê^ºÄ8À|¤µû]KBòµK»7ÜŒRÆ¢ÿÿLK=ÝvA‡,0+7WŸH%Ózë2¸nŤ–ä£ï”°[\­áÍ(}jâæž•ï=¸ Ÿ CÈ™ÉNt2Å›?ÿ‚ÿŸ©U,†ËÿÒÀoé,vŠ¦ýûò7 @sà¹Ìó|¦É(½]Å©eùxµpñ8Oâz}9E‰Žˆmh®ë5ÔšDîM­%¤µB̽ 5Ÿü2¶M0qý -õaa7‘°FCQªD΋48¶Ýc£?½×£qº,•GŸ)KÙùßÑhýª+´9:ÿsOïîå5LÐà;2@(‹°çžÌP_c»9’oûC.“6zxø¶¿IéǬ¨íju×
-üKK$pÏ}JÑÞÉÄá4]"¤uÀ¸6Léc*P;µŒjš”Ú$§bxA®ú nQ~‰µüb6¤qå(>VùÒÊ/v Çš´=5î•Õä3;v¨ Øêº)º¶¥ŒÁ}Žp*×v•â²r«–¬þaœ®š7§c#}]Ít7oé26õŸ¤Â‹sf>ÚíÿÎÛmd
+xÚÅÉn%·ñ>_ñ~`h²¸‚
+_È›ºù(´¿y§„têöõ·ÛOORº ¥~Åxþ¬µÆ'ÖH©¾H ÷gøݸü]ßÓ¨Ÿ¿þ€;¸íJ{a<Ì{Њp¯ˆŸ~~)«ìáT„´ó"¼€¿à¾mó[B…€u‘ߤy¹ Bý4:£é]?f$‰)û1úÞì
+ ¸ÒãV[$‘+Þ¢BÞ‰ Xv9У…!æŽû¼Yc¼ðVíV!J ÀgÖʼ* Œ«X à§XhlÍóg`äˆl˜ãý0’?³BÒšÓKHZçõ\wbÊÅ…à SßÍPœ*¢Ö ‘'£mÇÜj?`Šv™ÃB†¥‘6ö't/½'L­îóL -á4
+¥‹ ‚1•FÝš“¶ú3*å= šND’Ë6ʱgý.ëî, òµ¬š©DO`Ì<µu3?+6Ãœv–‹¢ZL¦qÚõ…¨ž#çË«3—xgƸo01$<wlj _’Ùí×o«˜§†Ë>)_¢
+0¬dMw\ R„·\õÙç•]­˜Õ:S­j®) þ¸Û¿)$à/?~Oºwà¶Q#P÷&˜ÛEe‰0Õô²JågC>>”¼:jËO~ËÇž´Ñ—ücÑmp“á.sËXÓÍe—Gxùl]çAÝKÏ¢eì{”§¶£ðzL“ó(RÞædÏJÒ !2,/™7íé Ó’¹Ö$£hÌFæ\@›¸·$þÈ:Îlño3/Ù  gíªsvsgª6'›lŽgz4˜Xz*ñêiNÚWÉn»âc{YO9Î!Žq0ìK0Ü$‹¼†þ®×ñçê7Qzêç´åV‘8õêz²Óe“ÂQƒ¡¡G€\J³€ÆâÇ
+P‚Õ‰áÖ‰è·F¦„ºB_ÂlÕÝû€û(˜L&¸†¤S€ú2á‰
+ƒX__ŸMmžö’X&q¼71Ëbsªh…[i $Nª@³éšÃ~§8䟊½I5€ŽÞÁ¼S ´'Îê(P<«ÙeCiÕ¬žéÉÎM…ÕMñ讋vP4%ÕÕ`áš½¡LRr4¢ùRÁ.¸%¿'pÔA¸ æ]®J‹õ˜.³?0°%)±Ò-;@±‰ÂÕPV´wY‡9G`³ÅoáÞí\èlÓF"Á [¿ t7VåŠã(©}èܸkæ^ÒýÅ4£ìtLI‚Žî>„à
+KÁþÿý¡œešÛûôšliC‚–ðø®¤ð÷²ï½ËZqoøöÈ"â+ë}›u”Öâ@ã\zñ™ÏóiMSšhSUÃR“
+wÙ‹¨E{‘½aMaŸ´æÞì-¸}©
+¡ÁAkWëº:d‡Ná"áih|Y›hC?>æ™~*ný~Á³ðÇ[៷Y˜™Gç<5ïm´é´£‘UøËþ>¿Zöz»'ølsXgøÓ»eþ¥è.¢"EL(þã6|ýSó`QoÃŒû;¼Do+êê‘Šnz^}ãÛåfHßž~®ƒÆ…‡ÉçÞú±qe²iT>þ؈ƒhˆ°Ì}V±\2þ°VÐóB;;¯FŽÆ§, 8úmr._vJ Œ°J7LÆŸ”»0všþÝæß Ûý«{E ó~([ì”1èt¾˜Ï„]Üa$1L±á£aþGaG\0fÞû;­„ófi…Î`g"J¹Ô±3
+-p§×ûÚ:P`àík¹å8ô³¶±;L>¤Á½;H-ÂÙ`é`
+¦‰f¾¨Lx–Ï;ôÆ5hoQêLoZ*LÖ°r¦Oû–)~Ë*DêËQ¯+G½ÚúÝéZšW)eM_ßÎßæv¶:ƒk„š»{ê‰s÷‚áË™yv(c[3“=?ÉÖ ·A‰•ÐŸF5·Tåy—[ª`§˜†ì7&”3«ŽZªöêm4¤¤p³
+·TÅ£–ªI3N†±š‡¡
+•졳ÒØÂó›EXÒÓÅødö2«Üæ$z\KC¿ï TÎü55¿ÿôÝ×Oÿêœ8F2·^¹nýíSz¡ <¢§€q÷ßo¿|ús
+/­_†ÓÃsêw”?°CŽJ~0ïFêË6?cô¨Á8ê« PÓâ{-Ÿ†3½Ã¢²ÃH·¥À:†´ú
+YtÃÇÔÙH&F.Ö𱧈î(â¾­å€Í³*£ç»WÅèU3ee‹†jÛüù-E‹šaæõß|çJ¥ÞÜÍ*î\eˆUJÃåïI¯1­isší\M¯¥Ž¢!…)÷.»>j¦U¸šššngŠ>HÈ´s¨†v!)”èÍæ†V&äYrš \U¶»AÓÁî¿¥=ê=Š]k+
+;¶
+A•-} šÚùÔàunÁßß]O\¹yÔCK£¼Ù·öŸ3œ9å›þ¹9EÙÒÁÌ4ü?™SPEƒž¡9É”»Ñ
+z@K÷ÔX+0a.Éä'ﺕÑÎB¿¥yõÑs8žçwA¡ êã0­ŒÐr¡`Û{…þÂS·ÐwJ§3~5Mi~1·ºU&É\æÙ±N­
+¾å17s­sEwyÐxa`:ú‘“-8 ó´Áªe³÷…¼ÊôƒfYíË›èÓ PðÇxÀGòTÞËÒ€íÇfìÝÞ4vW›spИÝÖA¡$ôW‹rHÌ¡,_ïÉáoAèoÚòø–ʫÛ~üöè¨2¯”•£Ëè-£W5£—S% [ ÓãQÏö÷£–:''zä2D™ X9mžj«å¡Á0Ôî0ïrtk79zýJFn´È/·ºÍz
+~°¡-bN(ã?ÀÌ*0Âj5¯xõàÕ»p}€5‰]»N4^ù9m8º”ôþ?À¢5¿ÐáCÔÓß81ó¦Àê^ºÒ¸Ö³Wk÷¶–„äkW n™àçq¡®lm)Ëùég|þ7üùš”0ÍüOù[ò
endstream
endobj
-445 0 obj
-<< /Type /Page /Contents 446 0 R /Resources 444 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 353 0 R /Annots 452 0 R >>
+448 0 obj
+<< /Type /Page /Contents 449 0 R /Resources 447 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 353 0 R /Annots 455 0 R >>
endobj
-452 0 obj
-[ 441 0 R 442 0 R 443 0 R ]
+455 0 obj
+[ 444 0 R 445 0 R 446 0 R ]
endobj
-441 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 141.139 465.557 190.205 479.505 ]/A << /S /GoTo /D (piton:transpose) >> >>
+444 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 141.139 426.244 190.205 440.192 ]/A << /S /GoTo /D (piton:transpose) >> >>
endobj
-442 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 140.107 365.019 149.903 376.601 ]/A << /S /GoTo /D (Hfootnote.17) >> >>
+445 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 140.107 325.127 149.903 336.709 ]/A << /S /GoTo /D (Hfootnote.17) >> >>
endobj
-443 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 488.456 246.77 498.883 259.051 ]/A << /S /GoTo /D (Hfootnote.18) >> >>
+446 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 488.456 206.794 498.883 219.075 ]/A << /S /GoTo /D (Hfootnote.18) >> >>
endobj
-447 0 obj
-<< /D [ 445 0 R /XYZ 78.37 808.885 null ] >>
+450 0 obj
+<< /D [ 448 0 R /XYZ 78.37 808.885 null ] >>
endobj
53 0 obj
-<< /D [ 445 0 R /XYZ 79.37 771.024 null ] >>
+<< /D [ 448 0 R /XYZ 79.37 732.66 null ] >>
endobj
-448 0 obj
-<< /D [ 445 0 R /XYZ 100.292 565.781 null ] >>
+451 0 obj
+<< /D [ 448 0 R /XYZ 100.292 526.468 null ] >>
endobj
-449 0 obj
-<< /D [ 445 0 R /XYZ 100.292 506.005 null ] >>
+452 0 obj
+<< /D [ 448 0 R /XYZ 100.292 466.692 null ] >>
endobj
57 0 obj
-<< /D [ 445 0 R /XYZ 79.37 352.144 null ] >>
+<< /D [ 448 0 R /XYZ 79.37 312.168 null ] >>
endobj
-450 0 obj
-<< /D [ 445 0 R /XYZ 93.716 99.422 null ] >>
+453 0 obj
+<< /D [ 448 0 R /XYZ 93.716 102.357 null ] >>
endobj
-451 0 obj
-<< /D [ 445 0 R /XYZ 93.716 89.795 null ] >>
+454 0 obj
+<< /D [ 448 0 R /XYZ 93.716 92.729 null ] >>
endobj
-444 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F22 367 0 R /F15 334 0 R /F65 335 0 R /F74 337 0 R /F75 338 0 R /F83 414 0 R /F60 331 0 R /F62 332 0 R /F84 425 0 R /F71 347 0 R /F64 333 0 R /F16 336 0 R /F53 345 0 R /F59 346 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
+447 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F65 335 0 R /F74 337 0 R /F22 367 0 R /F75 338 0 R /F83 412 0 R /F60 331 0 R /F62 332 0 R /F84 425 0 R /F71 347 0 R /F64 333 0 R /F16 336 0 R /F53 345 0 R /F59 346 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-456 0 obj
-<< /Filter /FlateDecode /Length 3233 >>
+458 0 obj
+<< /Filter /FlateDecode /Length 3268 >>
stream
-xÚíËŽ¹í>_Q?0Z‰zƒAÜnìÉ ß‚=Fì
- ‰4ÍyI”ÂÛMŠ˜)ûÇ6<þ¼+’ª4#…ñ¾‘o
-% »>•Õ²0® J
-›,ÿ;¯AX€¶ÆSÅïï-؇"‹«9Ħ^>ÓkqE¤ÈºÆ+aƵD¿rÂ:G¸í¹ÿÁ«Jã)‰½`/’këVNdI ½MØ:Õê5}KRpÕ(IzÙX5kÚ¥N5Ó!®U™V™Í»®‘ä€/ñóòw„³ŽëX“^ŸnÓmõoÞϨA kýöáËÝo{»å±HžŽÁnÿÙ2X@2»ŸþõéãŸ>ü÷Ëöéß ,7ƒ¯T Û—òhµˆÆk³}®Ïe]Ø”ˆR£ýÚ TŒ8€&6À‡íÎhBìÀÏ ˆBÖø\6cd? !Ai¹ÏHDõ%2KDEzHHêÔôˆÓiRzLü™†â¬¿ow·»wU~q%?%ŒòZqˆË±Á¬°
-"z.á‚3:1ïÈŽ Y0³®E°ÆX6W[¡@£ 4ü 4È’ ƒ, HDõ%{D ˜L „¨ès†ïÈx’-BÚnE¾+„C5¡¡«ª¹¢½þý×¢-|HêtÛïiÓÐÃ/Ý+ÞGƒî?CÖ@%¤9ºúe¤©£ið¥å;tÏÛ+…DX˜±8òÝ!JׯŒ^…"árîÚWrjã8;c8ðïÄ´•yb#—ÿuÒà$">?ü’Eá×¢¨ìŒ¸o uí8êóN
-è<4jÈÈœPæ §}ÿ9éè·Yf @Û$ß6NDŒÇ
-‰çïÛ>Þ½kv€à…™,,=ž-¬jÀ¼fâ 97Oðñ°H¨´aÄ¡}`¢«EAœJ1cWF]Á­7ªö˜¿Ã¼Æ ÂÝ£Y¹ˆI‘¾À8l)÷­…ZukÙUªêzaGN/<*ë¼¾‘ïe¤«K;çT±G^te>—£j¥uj£¥”4<ĤªMƒ©„³6‰#aâÌ/8ë£JQ[FQ¡K±Ý呪ÊÛÈD3œzh"ÎJ&\
-9>J0%y‘õ”1Ä9Ð2{nA”±œg#W–
-åE*)™ ¯ZPÍw]ñöX°J³Z㫽½Ç4ÌSf^é©Ô‘ŸOÖš=E~cLc/š|À‚ÜñrñM¡^S,ôEvÆ8xFkŽoùÛÑîì#¸¿b–±ç5îíõLË…7VßÅ#£n1ÿ…‹Õ5:+«–ÉC´Œˆ4<FßCY•èMs`n³x=£¡5½¬ _–^Öœ„ÙÀNÄ’OË8sóGDAƒ9=ÖÓÊ©ò]f&j3=Ã8ö"õnç5Fò•ÕO{-\\!!§vRšÂ@Þb!\OiR[óSnn¾3°¸‹X§iG©Ä‘¨b¥„
-a™úïÙ
->¸™¡l-ÿ/ÒQJ=Ëý»À,%y¡oÊy³¨VYKÝPØÈ-ñ&L>•Pcë£u”[0KN%2-C”::Y0c•2ÍçZ˜Jmm¸Àt¼ºRN(u¹¾[ëîÊ1² <Ä ÷ˆñ¡÷C²§lÕaö Ì¢pÕìË7îÑüäÑʈ9Gö„I±¬ðÖtbgK1½½l_{ÙŽ¥ãgé«4«žSiÈ(Ì C\YÈwöÂVánCW1­¼öÀ˜hÙ3WßtÝŽôÀÄ9K<õüD·S´<ôÍÖ
-~`Zý¹;Y0ÖÎXà©x•Rl —A­OM•á‚˜$ølbÇÍ@5+¯æÙ=áÚO…%}^f§Œ_8ɇÜâ$Gåî•è…rż̀.µlØj²X‚Õ‘Éñî¸W¦ˆNH›n®²t¨iû&ìýÜ^‘NÓR J-F¸ nk„d§I–ÇúTÚ iꙚ¾²Cì«´UxJvCsB-¤R3fàógK´¯Ø]KÎYjŽÓº×~`t³öC`í‡Ú::õ“^îӤǾÙd=8g¦XzÛ»ý§tÚ;[Ú•ÎU`&{î¼ ëÌV›¤ú×ÅË뜡þ-ñçÜ¢ÿ±ú¢(‡¨eÜ—ÏÎB‰–ô¾õ'vTšT©õ¼Bçd/Rš!R®h«é’û
-
-çÔË´”Âj_ÂÓZPR oôÿ¶µã¶ù¾ÌßØïÛXH¿¸èÇÑàoªõÓNô"›Ál¬;ó†~Éó_@»«
+xÚíËŽ·ñ¾_Ñ?°Y|‹E4ø$C·À‡@ˆ R;‡ü~Š"‹vϬ$çÈöx¦«Éb½X/r¥°Û§Mâÿz8½xuñf‹":pf{ÿñAmÿU›BûÍ;%¤SÛû/Û_ž¤#¥y#¥)=~¬Ægüv+ü}ÆwõÛËúNöwæTæ¦ßi¸‚ûò¬/},øòüó¯ïÿÜè
+Qä™(”t0Wˆ]Ч²xFT‘é"å;–ƧßÞÔ׋i/”UóbÄ \¾j™Ô€JxuQö@R +ÛÚ^u‰ëËó£Öú©Ë.¿‚fmdM¤Pü áé–~Ê3¥{6„†8Óx¬ÕŠqÍ3#”‡+ŒçÆSá]]çÔšçÇLp9”OšDŸT¡‹Ê*zòU
+ÚúŽŸYt%‰¨¾Dc(!
+`@©´éðüˆf$Ook¶|®¹pÕGú.“FÏ–ò4dÙŠAæ7ÌxuÍ®]éaÊæýœ@U”DiЪŽHQ´kšÕ‡F y™ÓÊœç´ß?'5ý6ËLz Ì.É7%¨P×
+SÃWò;a«p·i7¯¼vÀÇšv<–ö¸žÎõÀÄ9I<õôD·S°<tÍÖ
+¯Ì¼úKw²`¬±À¥x•Rk‹–A­N•áŠ˜$ølbǽ@5+¯æÙ=ßÚO…å}^f§Œ_8ɇÜã$GåîUè…rżˀ.µlØj²XÕ‘Éñ¦¨#³Ø:1V–5mß„½>ÃkÒi:RŠAé¡Ã¨ iÃ!N±§!I”ÇêTÚ eꙘ¾°Cìë´SxBvGkB-¤R3fáówK³o˜] ÏYhŽÓº×|`t³æC`͇Ú8:õö’^ðÓ¤ç¾×d= 8g¦XzÛ{Ý'¬rK=WújT™ì¸ó>0¬/gXe’ª_{(¯s†ê·„Ÿs þÇê‹"¢N”qW>ï7 %XÒûÖØQ)áÔòŸVèœìJ3ÊÂU»4@r`Gwõ&‰Í+¶¸vûP¹v)ï¬võ"88’ù'’ñ—»G³,–èÒÜO)|¿T4oœN÷ܧ%β͟{w¡Ëv¸Bûe#Ëq‡ÑšvRæU{Kß¾¦,¬òâ÷WÐoš óçt¸NjµÁQö;wOKrjtM¥dM½“<§›^ë»i4=ÏlGTŠA]s5ì–×¥ºSæQŽÏÕ06yúÍ0R®æÙë{Z7Ã]‡·vê- +XÍ¢“Á¼¥²ÃH˜t…*Á'A)é…Ã,Jc
+’õX%uâFÅ8äp¶ÍÜ™QÉT›W¯[½á¨Aœÿvg^A•wd\ä®IRt=‡¸kG,ó<ffôþHé;ðý:O.y
+C^/6õL'+@þ\õÔª‡L々nƒæ+–Ä(Kkк³Çh&XqÑIû06
+¢ÃânèM~Ö/Ç®'‰ǤN‚·èrª°«¬á9÷¶=“Y5Uš¾þØáéïén y¾ázþÊà'öûr,¡`ù ݆ £6œ÷®Ôwг\®S®Ë~:ÇÞUHç¥5w½<íðáêhzFÎÇ^õ£¹þØÍ€7"ôrr5›c&'KÖl`ºp|c¢žæÒõÄã¦ÁÂ(Uî‚x¶Ôà~ÉaÔÂ` N‹` ¿û£ad`eà;È0› Áò4Ÿ‡®¹îã’Éa‹vG’†+ŸƒÅŒÜ·,–UWïçÅ$»÷-+ìX|ZbBá÷ˆàÁ—gxD@Úm‰
+˜›Beƒ¶Ý¿–¬%-éMk»æ§eÛ5¿É­k{»ÝÚ0½ü„(ק;B#C’x\4¹Ôëš°³ºÃ³7Ÿ§«Ù/lCAŒ"Ä+,¹ wfªÅŠ¤†ó¡¦-sî=”•¦®oÈóqíÜÄÆ—Ô)¶MÔ².¬^ß2Á ym€är[Z±*¨ÒÅía#¥÷.Ÿ¦Ì7´]9<õk…õï#ê=,yGoVaÀô—-ßý`r-=F8 ¤óêgâ
endstream
endobj
-455 0 obj
-<< /Type /Page /Contents 456 0 R /Resources 454 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 353 0 R >>
-endobj
457 0 obj
-<< /D [ 455 0 R /XYZ 78.37 808.885 null ] >>
+<< /Type /Page /Contents 458 0 R /Resources 456 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 353 0 R >>
+endobj
+459 0 obj
+<< /D [ 457 0 R /XYZ 78.37 808.885 null ] >>
endobj
61 0 obj
-<< /D [ 455 0 R /XYZ 79.37 608.758 null ] >>
+<< /D [ 457 0 R /XYZ 79.37 548.57 null ] >>
endobj
-454 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F75 338 0 R /F77 339 0 R /F64 333 0 R /F22 367 0 R /F65 335 0 R /F81 377 0 R /F80 366 0 R /F84 425 0 R >> /ProcSet [ /PDF /Text ] >>
+456 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F74 337 0 R /F15 334 0 R /F75 338 0 R /F77 339 0 R /F64 333 0 R /F22 367 0 R /F65 335 0 R /F81 377 0 R /F80 366 0 R /F84 425 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-461 0 obj
-<< /Filter /FlateDecode /Length 3584 >>
+463 0 obj
+<< /Filter /FlateDecode /Length 3289 >>
stream
-xÚÝÉŽ,·íþ¾¢àÉImÀ`
- Ô㲬ØövŸ eye&^Æ%Èí3ÆgfZš. 0ƒõŒ©±_¾n7—’h*$üØPŒE˜QšÓM`„³Ão 3¨(Vâ+Ô¦¨yb,ÐcY‰Ú¿~»¤/þ)À1#¼E§×p¬0Äp4 Ud_Þ#,™Í?/ˆ?&À­?"l«/Ži4è&V ´ð[•
-s/æ*š®ë
-ÓŽfð”dZƒD¬!›GŸ¥O)Ðà ŠRV+ØcÔ¡N»‘:†øcšg˜{5sùžIÿ›Y†–羦Ø)NÇA?à4ù“qG9Ë®"Ϊà¾Îè:4Û¼¶ŠØlR;×úypU¼ÐþŒÐ°:RPüžÔG…•PZ ð²)¦ó …šy|ϳ(4Ä&{x¶˜âdÐQæ@x„Ù27‘CÖ|={r#ëõ`Þ€W |WÄ/šÀ zELÍÌGJõ\¼&Ÿ;øã=¨÷Âï`n ‡…c–B2˜õsxáƒe™ÝÓ£CD媫РÃÕlÜ“Dבïé-ÑfGšîl©\ ®Àܪg/n8ãPi=K¼”®¶n+CÉf̺qe:Þsl`ßV’Pã!Öà°8Y%ãQ0ô3«dM]‘J\BnÙ±»¬÷ÍjFÍrÄmWíJ¸QbŸ+–±­TÀm‘•Ô,;Ðøµ‘”šÝöó.Ó\çÜdýaÇ;ãTÿ¨Sβþ)eÿ9[8y³ßU,»@Äžg[«âxÉ #Ì¬Þ ²'’tÂq6YÚmQ°Áí¸{¢
-ÛÏ¥”“í±
-'Þà¦y`ÖA‡ïj96öö»8ÒW­¬‹%[9¡XëG)#)´1=Ì !ÙHE†SvwB]¬  ó6‘@W«Ï!Õ©Xùÿ5K­ÌÉ·©k¹mµ˜NÕkÒSÖ8W-;ÜaîhOGêìî¼%–µ$…T¶²lc[ýZŽp‘gVþ1.>‹«š„q®§å Wso2›G¸jÞRüTJI1µþ±Ö¸KÌpŒÃhªº½õ9Ÿ-K¯sA«K|ö#ëØ£˜Ïu?·,
-+Œ¡Ráh¡p·èŽcg8ïÉÂè÷¹çöZxéfk¤}•ŸbÛHž(ƒ""[]{’"äÔÑ8¿IÑNŒw8¾*Õ•×ýH‡”8¥m«£9Ÿ
-–lì^¦½™M:¡ñTÕ“À
-m'¹sü(‘È.¡†ÍÞ1ÏÇŒìrÌ(ýJwÊY.BÙíô¦+…-a¿oÙ›¿-;ý÷+1A{Ê€ª‚\…Ùh¦Âî ½-Ž€gíÌyž›gõ”âðÄô#©Mw|Wòܦ …÷0¬O.Î$Ãл”ë³qy ú£†w·I#øÚ”åo¥Þ4?ãFöav“÷ÂX—ãa&o›t'FÏÑHsªíZ9ÂTá³È÷b•n›BE G^¸mR¥t¨Û¨~Ôx¨ôS´Gì§NÒê® U"ºÕûE`Ó¡ŽmZ,Ä­¸“´8åüÀ§mžÔc­ò[ÚV&Íž^åRÁž|­ _a_±Iz!ÝYZHáÝ>-0ó4ÛôXrXºàšúƒ¨dÝÚÎùŸÕ+û7+œ-,º£@Ì¢p
-­R“;*?r7hnߥu·ó^ k6oyëJ‡3ÿýi'î ÕG©íóŠo©‘¯Nya^Ü€‰÷+µ”¡åÔoKÿÐA?6À2ï ¬þXÊ–
->{ÂßG ¨]!£b‡T‡1ÈIÛÇ‚‘K«Ç‘ÆÕ‘Ë“‰ÑœO_E!…“×ÖÓ-ï2¸ÞO
-±Æ‘ÓšüônZSž\™c mYŠ´ïiØ<<ò
-þe1Î%è~_ž[’ºÈ¡<¾¾d.ñ"|äÞKæFE…Š¿,ÔÈ{9!u›ø N'tmôld†­ ½¬ç[ô¾›A¶*sÁ
+xÚÝ\K#¹ ¾÷¯ðDê 4X·í
+^óèW’†ZõI~é,ŒY¦«çÄëJÿžc4‹$ÎÑ‚8`¥v4Å|W¾Ëà
+®gtŒû -êMNä{Œ‚«á#>£]¦‘C•
+´TV¦ö¯ßOñÇ_ò]2g@jÕaZR?†3ŽÅd½\®+ì¢ç™¤Cû~ËIèÛ¨QlL†.‘k—òcÏp ëÜ ä8Ö
+N¼z‹X÷¨3ÆåO`Ðöç%k+ì>îP1«lÏõøS§{¹tOÇ¿Õ(4õ–ÆàƘ!MKA×ÑL8Óv–BEU¦}ñµk´I·Hä²k9ÔŠ³ ÚŽŸ1rGé¿eõQ£AÁ„] D2táP‘,}ìy‡ZRúˆm&Cqô]œY`a¤æ&r¦¤]ã
+r2jŠùô¦—ÍTb$†RÍkpÜ¡îUÙ?÷p›%Ì,‰"`–’ð"Šç>sløñ馶%T(Pþjw™²g
+鎷ÞM
+¤ñNÀFæ+>èK‰ì9 '¢Ô>_ŠWë°•zI0fl̸×”ø¾/+K(ùd†
+pÒ›î¹÷ö¡†‚
+Ûq'ù†Ž†0C…Zs f€&ø/Mǯ€™–Õga¦éï03æN¸øcafÍ÷£0Óþ1˜áŽêáÝ…Ã=¥P˜?£Ìnç”V‹Ž¿™s“¥=‘r{©Á—³G¨"%¬»#Èä«Èõ³E@)›d•`.ÛK÷Û‚î¸#gÔm;–<löÍ
+Uú{NVËSñ­‹.§¨%¦àkw{ÒKtœf-Ú~ìh%Gîý¨;é|F æ5…2¿Ê2¶ºµ7HØ#EJU%>&ÄW •21M¢X³rD¦i
+¯Ë#"ÕŸ1yÊóH¡®þ©Lpç„aŸxil²¼ÛzN¾ý1ƒy•f³ê±„goÉÁ…T”£jÇö
+›ëófGí:ÊiœÓ•zB0àºm)ëzÇ5žs^2ç ÓOšš‰ÈP/ºäë•qIíBÃ;«Ã¸ftm(òÏ<Û4^á&ÍÃâ–¨¶§º,Æð#ùœòL˜B+Ë{Kh¥.ÆF‘î…9º9‡B
+p™r%T\µÖ´ê—”>ÅPzÀ½ôñæg]@Ûj{iøœa¡êA^,år®“Ó\&e‘@íüFΉŠ)!ŽÊ
+50.`˾²×ùe¯°íØ’;ÆíQ^¤ÐÌÙm^†ËÅçüÉx§:›Úe¨ÒØ5Î÷œØ]áßhÚlÑ"ùåŸMo€sg~ñ)v­6œ•ÀǨ·­nsZÞœ:J ÅgÛ¶Ú!΄뤱3š†©d‚‰V3s£ð¹±R]«¸
+eNÌ Aöôöîà˜ Ê0Ðò5°V2èvÑ4wÛdðÙY—܈â©f8j“(\x‘ÐyÓœHÊPõQZÈìð1›D¤TÙáƒ6‰Ê21°ÉËÆbyd¨Ì6IÉÑÛ¶É[É xn
+¸<JÒÇR0C%¦Ú2WòáÅØ9ûñœk¨ú;j„à?z+lycÄFíHèÌ݃¦ŠÚ_›2ì›ïBS¬·Åá&4_MTSž¨?ì²%ÏoúSaª-w:Û0/‹}³=§ír©Å²-œåóÆÒs?”Kw]Ø­•ï.¼M=«¥Wèäç«Ózãáò|Ø89ÙJw.+õóö6óÞ/+ÑwRH(™ßëÆÞ|©Öûã¿”Arh•ûÄ I2Í™r«º…Dœ&=ª9Ü*9ÓÁÖÝ­j»d4øfSéÌ «˜‚Ž^»“qµ÷Ê^ÈL);ex%0ô%ÔêÌ]_ÚØ´™ì<>uÛ³ôà6ÙsÃB1ïx7,óKÚFίH÷äxCñx×èÂÕ°·ÂMÚOyK{AÓæ]¹Þë¼µ5ÄgzwUvìoä=~?†v¯›|‹ÛøÊá-ûàœjÉûƒ–_P~-»‡vƱ®/}]ú:²M*dfÔÛÔåe=‘UšIŽÌ›·ó×àའÜÖª–­Ù „|Ørb”£*©ÚV»çЩ‚ºm­¯iœaZÙÍìôY2Å—þ+xˆnŸŽ+zòÙ¤æ¡'Òîø/˾æŒåCµÒ2^¦®Ïe;¿IÛùÁ‰jåï½=åiMtb`kW´†±á,óìi†yN3'.ʆIXy‡²·; baŽ®Ûï7™JW®é^rÿ}ø^E™eì¹õ‚ƒ÷ZÖ%u•~ÈôY„¢ø»¾hð½±*§‰*9–Ùù>< 6DjÁ„è4êmArÓæ‚AJ«W)# ÚáË“‹¡ÜU/ÿ* “ç:Ò-_28ßÿJ
+dbÅXZ1ÁMËËÝzŒ$,2¡»^
+7+ †± =Ù¬<9Ê o¹=Óӛ號\!¡ÚVóû¨z3èôÕ¸„{K’o_×/é—Ø$”Ú—/ÙDYø¼’o}ÉfTH<ÙâàË‹ØËȹA3z°pý *ù¾p®×š!$X›P×ÒÙõ©9øÔÇ=$ð•Ýh”ÝxÃN­”>IN=ÚÚËòïš@%
endstream
endobj
-460 0 obj
-<< /Type /Page /Contents 461 0 R /Resources 459 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 353 0 R /Annots 464 0 R >>
-endobj
-464 0 obj
-[ 453 0 R ]
-endobj
-453 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 496.645 745.828 507.072 758.348 ]/A << /S /GoTo /D (Hfootnote.19) >> >>
-endobj
462 0 obj
-<< /D [ 460 0 R /XYZ 78.37 808.885 null ] >>
+<< /Type /Page /Contents 463 0 R /Resources 461 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 353 0 R /Annots 466 0 R >>
endobj
-65 0 obj
-<< /D [ 460 0 R /XYZ 79.37 235.148 null ] >>
+466 0 obj
+[ 460 0 R ]
endobj
-69 0 obj
-<< /D [ 460 0 R /XYZ 79.37 209.22 null ] >>
+460 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 496.645 663.138 507.072 675.658 ]/A << /S /GoTo /D (Hfootnote.19) >> >>
endobj
-73 0 obj
-<< /D [ 460 0 R /XYZ 79.37 186.6 null ] >>
+464 0 obj
+<< /D [ 462 0 R /XYZ 78.37 808.885 null ] >>
endobj
-463 0 obj
-<< /D [ 460 0 R /XYZ 93.716 101.443 null ] >>
+465 0 obj
+<< /D [ 462 0 R /XYZ 93.716 145.655 null ] >>
endobj
-459 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F65 335 0 R /F74 337 0 R /F16 336 0 R /F75 338 0 R /F84 425 0 R /F77 339 0 R /F64 333 0 R /F22 367 0 R /F71 347 0 R /F53 345 0 R /F59 346 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
+461 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F84 425 0 R /F15 334 0 R /F65 335 0 R /F74 337 0 R /F16 336 0 R /F75 338 0 R /F77 339 0 R /F71 347 0 R /F53 345 0 R /F59 346 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-468 0 obj
-<< /Filter /FlateDecode /Length 4258 >>
+471 0 obj
+<< /Filter /FlateDecode /Length 4056 >>
stream
-xÚÅ\9“d· ÎçWthC‘à]55A«ÕªRf{3•"ÛRâu••øï<ÀûñuÏ®ÖÁìv¿ƒ@àÃA°ùå· ¿üørýôòÝ]è‹gÞ€Q—O¿¾¼Á/ââÓJ_¬ŒqùôùòóçßÛ÷WÍ9~2ŽsyÇ?xUVàeÞÁ¾…+œ[óþ˧Ÿ^8óa&ü÷Ç—>½ü§Œ.”fÊ»‹Õ–Y'/ÿüopà þË$Nùû?/¿¾ü¯7´Zµ¢U(ƒ£©‘Xƒ„h…„!©
-?ÿs¼&ðÿ[úˆU×ô\¸oMºNï„çÂ3"CGÒm˜ üôˆïóH.Ìú¯Ù4ZHü–éˆOº oD)} ôU‘ÃÛH}?Šï†%:à!Ñüûo—ôá¯?®ÌÅ0o¥Ó-WŠk¦­G®3Ö¹âŒÖ§΋s$%³BŽrIT‘ f¾ÊŠÑªW÷þêLäïH:•KÔ ®X{±Ê3T¯ž|Ú&)‡5’ k@3ÂõýU*wBO¸H…Ô#/éÝ£5’Ê®×(¿gny¾[¯Gé]Ÿõ[ftóJ¦îÙHoÙ®È6*ኴǣ='Éð”ÉóÂu9ïrõ¤eB÷vF¸ã¸R¾Ä=ÛOºªÕû+Ð"ºÅKJ‰-z%<¦š¿­ ˜î/Ým'÷åår-ÐL,ï¤YÂñι̢U,å‚A5»l0ÒÓRªiÈ ÄJè QDJzÞK¯,ÿ¢Kf¥ú†-0ü%B&ç]K‰»V¡ƒŒ$´2š¥–Ö¾5F ÕGù\“NUm(/‰ï‹0D9¸vpÒRâ¢)œˆ§«É6ÖÚÀ=­ ó×jQÊ]ÀBõmVŒŠ}áIñVñG^3†Ç÷×ÆבcŸ ü²¼ªa˜r4:a`XZ“ÿT÷6Í|èãx+Ä­'Š ÷* „¬ w)ÝÚ+Ä3é5™X}/ƒCƒ"ïÿe¼e’V®%6€²öœõ z§o­Òæûƒï(:á«~¥'iΨ¼®CÁX2Ú ´VIêÔÑy&z”
-Ê[(RÜ1í†%ÕQáÍYgÙÀì¨ÉHÒhZ7Fknô¾;T‡îÖ (¥*@ñˆ’HÁߺ1ƒu •3ã UîÙ˜t?@J¤ªYö¦œ`Få1ÀžÝMt )°•®º°{—b$“RŒœ÷ÌOý;Iè)3Š~"¾6âdkùË‘·F—ÆØxc‘OŒ
-fè
-›¤·9@Ã…ð¹2ºÖ“†Òü}ËÁuu^ë.L¬ÚÞëó1øm‚ÌB)ytòLÅ?×øS´B‰¾>Ç¥½Ç<'µ™b»œ™-™
-
-9fæšgš{}+ÄÕHFΑŒÏÅuuß?Ró-So/öÅHAJAÝMøtËÒðÄk¥ÓCqؼ®ªÆêQ,ée>æ!B QX—Äç4”ˆ$±eÖNBë“=[Q¨@–}îj¬gN‰Õ(†7) Ϧt_T
-”P¨z¼ÀÄläAqÜ£% é†Ò#Yœ¸Æ©ü‡j@‡ E d‰²w2¨`vù ã2 ™6å)+†TJLð(Ô“&g,†+rœé+p
-Ú4rÍDû­‘;ÑO™A⌮.ø$ºõùG©ˆ õÚÌáL¢]ò¥3Ö5\w´ÿéßÞûoËt@ŽžÝàŽ}xTókeÂOrFE¨?u.Þ@ϵiLž¥ƒœ\2hD¦ÍZâ¡PK#U椘U Y)F¡2¹$ÈœGYÄÑÚØ0ÊAÙ®hd&ì–z¢õÍ*{
-5úèô¤l‹jf[r3‡%7;¬|6Ø!"Ü V¹IâßÎ÷•5ç‚=¬ä]d&ªÚÐ]òšEbq„^«e[·ŽL™..Í/åh3Õ –²ìôä„rª¤ÆçÚp9¢¯à~ c$o\˜¼Q‰o]§;¥Úá(¸ÇaßøRÃ΀ºæÁtëzf¤
-ÚyfyI+möE €;2誽0U{Án· ð;qŒãïÄÆ0ŽÖòv"°š…Kƒ8¨ s&Žœ«XN2ï:ÆŠ£V5&‹/±5”òø&Q£<¾Ú`[ÔQÀŒ{Ðû¿j!¿Tå“`´µÌ*w\ËÙù )OW­6T2­êe³CƒOëPKÁwG¡h»WÒÕQ-K†äËËŠJZ[˜¶­Ò;ÏÔÃ50…QïÀÃWâ$·Ñ+ #“OH”F©fìÊÑGÇíTLÔ¦–v|I«0;äkRO½çUiL`âµM˲ÌkµÝÒ[ë›ÂdJ˧`ô•îmÜû!_鶾’Ê#G{]u*”‘h›âM›
-ÀŠò¤rÊ)Æ}•ˆNõÿºðþŠ¤ÆäÉÅn·Ùø߉,Ol43¾t¡
-úX¿ÈB† £:ÈÖ
-]×&L]ªéJÓF·isºëTïÚÂ"ºeðrˆYIöaÄxSµk)slb™“BŠ”[£ì[bÚ—¦mk†ÀÐL´É“=dÔ—‰¡³î ÒÔíHÉÃVïíXûÊÞT.Û¥BrèÕÜoúØ6°Ár¡*ÿ ¹eFLÝq:IÁ•·Ìq1­ÎÿЕŸœáù@‡‚ØÒ-µb®vajÏ4Ø4p`n¾§õq Û+e<Èbû±ûjEÝ©¨Íµø§v­÷m›Wí›5rlþ¯ç H SÞQÇ6·®’2åyåW †¨-!íú
-ûÖæ+µ¬Ú4¢í2}Ž`LS<„Ü@ûå('ýH™²ÔÙèè$Oïö^¼µöIº¡»º$šä0âhSz)Èei5œ:éúf[(]}S¸åS¯e"ð(/ïD´óœéɩƳ¶Ì¬[BÅÕo‚'™·n¤` uàQøTWNÙ[ºò\¬Ž1Ê †ï ­­Æz"HìÁžaÊù‘uŸ€"*L÷e¯zÿ# ‰³;#ÇÙÓ^‚]Ëj¢¬ZÌ¢)ßêàR•þ¨øi[ÂSËÖc¥[ O+ºjª–M›HíRoMkH"áÚt3ñÚißàãºÃeöõHo­Ü|ÝüZ[ gʘ×lõÓ®Y¢¿‹[ µôS‰x>Sú§<³b‰ˆ•Ðo_¥e}V-÷*‰|¨YLÏ÷Ð[Ý¢¼
-z–
-¡q3';ÇXe¦n¶üñ±£ƒ=énѧƒIú*³nÍ!¿OŸömµ®H/5T9VÏN.‚¾Íñ’Òz¿êÇìšêãɮ햛—L|éÈ á±¼œÏà)±²>ÕWd³ÉAg;È¢-Ù6\ ô]?¥»æ`g uÝëˆ<0^N½7^LŸ>ös‡×LrûÅNÃt¯üHmå¶Y&™ÒÙ§d IÎÙ.öŒž>šüaNR,µ/?^Ó•3Npº[Šoñ[ÛøJMÀ‰˜WA$»ƒW•ZÝöÜÃŒC?ÚT-0ㇹµÏ'OÚå¾;½¬ê)Ó†4N 3<@XÁúõLK‹oö–†ÜÐ@C¨kå^ºÈ²*X7Ñ<;¥´+a
-ʉ'`£b§Æs`ƒxç8+¨`ÎÀ‡ŽahæPmr¿ÚÌýGáñ“§2%` ïÝåC•*}7ª”š~áB‰G *=vxˆ8Þ%¨JS.zôW€"œbV{ìG(–š]P nm×oêëµË¾áíÙ‡þåÚ‚<e?’t
-í‚ykCd]ÄppU q\§¿môÝ]Ë‹Å9Øþ2V8h↞°ë…Õhâ.ç“Hžú´\Ÿ;w•ßï;ZôT¬Òêè ‡V‹Sèž:{´Jœ¾N ùù-ߘ©Õ»4'&²Åîäíq-µYt²VªíõouRùé²JÞå'Ì^Î#0ã³ö=Õ,¹f Ä5¬8¸N=yšD5y5¾c)yí„ÚqŠ{Ù#g»–kŽ
+xÚ½\;“$· ÎïWLhK‘ øªÚÚ`µZU)³}™K‘m)±\e%þûßà£{zöNÌÝ.§›@<>€àÊÛ¯7yûñÓëçOß½[¼)-Ü>ÿòIÑò¦n.ínÎJ¼º}þíö÷g)­yyRRJúQ½¾hEÿû”N¾XǾ—ßhìUJ ñ»—'í }£]‰OØ@zÊÊ<fáåçÏ?B”Æ(·¡D;¡Œï”Hi<} Qdt¦(®¡uuÐ}µD£M«–oÕZ¤‰òèÝY2í
+¶ìœOäÜ×%ë½@ÅyË*Iœè¨¤i•$_FvjÿãyÙhiéi)g‰;S×Ò?$5Jûê ÿß%ÏÓ~Žë$¥5v–³ËYy#ÔLÑ‘ ,B.fQÇï++Ì‹0 ʬµ¯v›lͨ-»h³©$1qoq`Úv¦ Zx¤¢Y|d‹]ÙÜ(ÐÊv\-Žnô®QHíg
+®šƒÕÂJ¸BüŒJxE÷-Š>kÈ^-+y¢ÐçSÒòmò‘ÉéU}?3»DP¡[a|‹"ß»—'“‚†õ}ëÑ©eëÓdÆçüôÃçOÿíê¤Þ¤®‰M‰·üö)}!­°ô/ùuûý_·_>ý…Æj80$霉ý†Z ÉE~F
+ö{”-( í$ ‹Ö”)­¿qkË##õ=˜¡“χ<dšÿõ–øë‘+2AœöfÐni„q¸²B…Ž‚hE—Ã\ÝœCëŠ DéY.™ª*ƒ•¯³HOzúämâïH:\•DŽ,IKaÁd ’‚‡ìî¹®H¶CÁÒßE5
+¬¯G
+ˆ68ý‘"¯ô[‚öy|ÈytÍNó®4;v³üÓÈ1Zh
+Wzâ°_d'.ŸJ%kIç{6¨ÔýE.Gv`ÜN¤~àò:Ê·tâ1ú¹ì2á/EGÄÇ7ìó!ù³`0Bi³ÐÛ
+QUÇzbm+²*™üdþ—@:ù½}E ïv´Ø ²ñ iŠ’Üé4 eÒ\³W¥ËæãñD°a"æ[\ƒ&œ¯&r݉É5Éb8 RjF…ù¡šcºbÚ3­OÅ'¥–ÍfH(=Ÿ#Gs·åÔyzLvâ*‰t8ð9_dvÕf’;‡:»œ3p€Ž >ž²)Ñhˆlš¼¤l†–
+*ûKšN-4~ùá‹"írëÌE6D'´Â†ÔT<SKèTø ¹Y'‚ÔóJ_S
+IšóvGñŽÅYµ
+m2S¯ƒ ¬Ÿ»ýŸ ¤ê¶ŸÂ%£CHMGÐZ¯Á¯dH-Ûág^¬¯&Ô([Œ˜ÚC-íµ0æjq¸’GgµlÙQhOl+jyoaéTÈï<rj@ †™‡¯
+‰EOq{š¹Û žlp@;µÊ GFB겪#fD½`àB'5Ø°ØNêü? /ï1UÊ#÷[m÷*ƒ”`SBË›zöéÆ´êÆFj/›œµZªå4[ØBÍ¥ÓOÕµß×Ë\©Ê ­ã§­ÀÑõÒI£í¤ñG¬š%ðGr Œ)ôóŠqor¿¾Üò4Ö¼«ã
+gS(—ïpéô·HÖ§'^tFjáÍØ{¤†C®‚jT8®RáŒÝ.þ­šSÁG˜)èªûÅ<ji„¼Âã£ÐÆJaÑÌ3Ey"ë6Ýõh}õÚ&h…vh}-
+ééJÈù)tL…ÌÌút ƒ^ªewöþÏÄ¿¥q~]øCéò˜Â| °6Qî#C LÄ^wuçj™.ͺiò¹‹p¾P“ö Ïîù]½Ì3ß4œ:ëeM=úÜöm(¦,©^ÛëaOrΠÀ¥6|Ú‘¿ÿLãÿ¤ÏO´…ÏoÿKOþFŠƒÂªøÞ¿o£Ê;£n&6ÅRy^l+TH³’i{»¹püÝ»Ñ7G/Jš½˜¶(v¨ønûê ahõ®×^‘PSu£÷'ÃêËûcòg–†§4²=j7¸i"5 6zº3–;3uÍ:ÆÛAO¦„¥‰ìL»x’Sy+%kgyeÇpçò–>þ ~ËQ†åÞz¨:–Òâv¡hòÎêy¥‡J‹{¹,éqž9³t[gºkð÷¼–½ppÆ_lt@\©¸å÷<!¸y¶áZc€‹"%K‚—˜È)ó5{dyE?—jéÖ½?ËbëÌ˺¾Y<d‘SØÉ);/Ê9<ûsa>yi=H± ˜~©ƒÏu‹ ŠTk\ õ—dû}ï^Y1p–ýV/!æß>"üæéäBzP> ™…¦sùD¬~Z
endstream
endobj
+470 0 obj
+<< /Type /Page /Contents 471 0 R /Resources 469 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 475 0 R /Annots 476 0 R >>
+endobj
+476 0 obj
+[ 467 0 R 468 0 R ]
+endobj
467 0 obj
-<< /Type /Page /Contents 468 0 R /Resources 466 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 472 0 R /Annots 473 0 R >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 404.583 638.308 415.01 651.824 ]/A << /S /GoTo /D (Hfootnote.20) >> >>
endobj
-473 0 obj
-[ 458 0 R 465 0 R ]
+468 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 404.84 300.585 415.267 313.095 ]/A << /S /GoTo /D (Hfootnote.21) >> >>
endobj
-458 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 404.583 756.787 415.01 770.303 ]/A << /S /GoTo /D (Hfootnote.20) >> >>
+472 0 obj
+<< /D [ 470 0 R /XYZ 78.37 808.885 null ] >>
endobj
-465 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 404.84 506.735 415.267 519.245 ]/A << /S /GoTo /D (Hfootnote.21) >> >>
+65 0 obj
+<< /D [ 470 0 R /XYZ 79.37 771.024 null ] >>
endobj
-469 0 obj
-<< /D [ 467 0 R /XYZ 78.37 808.885 null ] >>
+69 0 obj
+<< /D [ 470 0 R /XYZ 79.37 750.933 null ] >>
+endobj
+73 0 obj
+<< /D [ 470 0 R /XYZ 79.37 728.314 null ] >>
endobj
77 0 obj
-<< /D [ 467 0 R /XYZ 79.37 493.776 null ] >>
+<< /D [ 470 0 R /XYZ 79.37 287.626 null ] >>
endobj
-470 0 obj
-<< /D [ 467 0 R /XYZ 93.716 115.635 null ] >>
+473 0 obj
+<< /D [ 470 0 R /XYZ 93.716 127.438 null ] >>
endobj
-471 0 obj
-<< /D [ 467 0 R /XYZ 93.716 106.008 null ] >>
+474 0 obj
+<< /D [ 470 0 R /XYZ 93.716 117.811 null ] >>
endobj
-466 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F16 336 0 R /F65 335 0 R /F30 341 0 R /F22 367 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R /F59 346 0 R /F72 349 0 R >> /ProcSet [ /PDF /Text ] >>
+469 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F64 333 0 R /F22 367 0 R /F15 334 0 R /F74 337 0 R /F16 336 0 R /F81 377 0 R /F65 335 0 R /F30 341 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R /F59 346 0 R /F72 349 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-476 0 obj
-<< /Filter /FlateDecode /Length 3279 >>
+479 0 obj
+<< /Filter /FlateDecode /Length 3517 >>
stream
-xÚÅËŽ#·ñ>_¡Üb K“Å70À³Ú1[Œ½9qN>$ÿHÉ⻥ÖììÆÆX›,ÖûE¶¥°—_$þ÷קׯO?¿ys‰":pæòõ÷'u‘ø¯ºø(´¿x§„têòõËߟ¥#¥ÕRÒEü®ðû?%þ™<FÏxÜáwpRzÈãð–çhüÔ‹à¼â8þúÄ5€ðq‰ÔøL}ÆqüS¥ Á¥g öµl]¾'<dƒ•ðqíù-x´†öM8Ñš×Ã]Û^ þkÊs™éâ5Ç ›iÕ8üË?¾þõIŠYôùëÓ—¯Oÿ©ÌWà…µñâµZ©Ë?ÿx¢Z(ë/ÊcÜå¿ÿºüþô7|‚PÎÿð ðßXÌv'f¥AXƒE¡Œ®r.¼ÔŒkH“ nùŠP4GY-Œƒ̤¯Y>îKæ™öù;ËÃ%ÝÊûÊ2('
-y$î‚K£3w‰pø¹~Tîú›¬ÀUákûƒ_š¹ø¢ö¤:‰EðòÉ‚}&Eâo›Êhf$ÿJÏ:Sêá°ó‹Ú±hd1á­9ï÷#u'¼HÕi™w››¬ˆ¥ù摱NXTΉG`ÒŠŸß¬¾x½D3è9«p0 *(+@7Uˆe•–7åÑ­úó_~*K`¿Äëâ¸äO?U³ØªÄ¡>8/ Æë&ÝÙHzî“ìH:‰ËUƒC9¥ö.†ä>N9•¢2Sj¾)wñ“Iñ¾Ì$5ÐôÏeþLlÜ?ú­óHÛy_m|2#ºy6E¥G<± èâ÷tÄ…›.*¡*Už#Ë@Ý¡L<Œ g(£ÓhþVóïÈŽ§˜ÏGÐh¢&,ЛáDÐq‡×#Û!y$úï(f å?Î÷$r0¼'‚(…DàRçÄ€l i7•ñ&øko
-6à^óVþ z:- žÝÊkÙàÙ½|@«[fYßÙ)Œò0¯u¿ìw
-Q +]ái"ÊW-<Kžy¹†FWï¤YÔ¡xFò”2í—-uÚ(á­[Vw™NRjÅ:îjn¶ @Úz4•EcÌ[¬[`¯yþ—}22&ïE³Ïðí‘(Z¡%š†W£šw)A“* ¡ P×ü¼ÏQäÑ
-µ',X}¸ˆF¸
-Zæÿß:éòöÌ4ëk˜'KܲX ‡µq²ï±ÞROÒ §Ý¹fy®ý) ¹¡1âsäñsé=Î%ÜV¥*q]hcßÐíç|‘: ®‰é08J8{™H{¬… À\y‚bÜÍ“ш›_Wí[ȇ{'”2 Ãϵ”-ú#ÔÙ–rQÌ~Õ½–²·ÔKV”Žò½Ô
-³P€ÃïÐVB›váÄ>”ƒu(éeö‡„rp*Åš™â3¡zvïÎRá1)“‹ôSúó@g=Ö Ñü€F± Zx¨ÊÍ^$ ¼xÄj2·"ó½>æ´Ï®_µ!(d£µÊ¯gÉVkálC˜ÎDɾ¾|B·"I¬Ý±qÖNA^>i߇Ñü‹²ž2nÚ9 èÛ³ý• ¥˜¸²ÇGá–Îlö¡Å| á¹; .gÙÝQۭθ2V`Ö=B?:gg%÷_ιµ+þñ>!”ë”À¸YM°`=}̤QDá#üœìð“ÑìrjLzM±¨¬è“% ±gÜõüssWô;¯ ™¾—cOrLšI¥^>U›zLùX?eôDË–I«77Ðl^>å/†ùƒx=)‰Ô)—e-I²£ô!£ùi•qÊ‹ÑmuF å¼[bˆ-È[õ<˜Â-½P}ÚŠ}ewÂǹo]Yo’u¼„ô^
-+8 {ÍO¢¹¶Fs’ Ò
-¦A×® j‚áe»]’`¿Ÿ)ÈûôðMÙÕ†A¦‘*1{1èu=9üLÙ{uW½â ‡?©88ÕwêQ~A·X›‹¾¤Ý"6 <2;½qË+’Dü3¯vÝH–B3¹ütDñHƒó\ÐRÆÕmq­Fžªž¼®ûTj÷
-iEH_/ñÔ•¶‰YÝ YaÍX’L
-Q]“zR …S±Ë£ª÷JVƒïA†¹¼•a†9s#]1ܶwŠõº’h6ôbôœÖÝKå°ì4 eÅ0~~8ÎduÄŒ^†5ÏŸX qBN°A³RTI­£× M»ÒwÒ®ô¥Ó®û™6&çBw‡r]ªm‚ù–T«g³Àÿ^É6¹#¬fgj ;ô\z—vg2‡plQS_Õ´²³·\—ÎU)uÙ#V¥ÚƒíތňÝ…®?Â#M8­w3IGL¯ÚqwÃö&³¢ äI°ÇtbÑç‰NÚÑ©ÝCtF¤Ó«¢‡Å;h4ˆNX´¯æ(ÁtŠPoeJ}MÄ‚íÂnk„ôöCÝÆvì8‡fëÂZnàèœa•ySÐV§6vúÕÕÑe¤†ÛÜ’(.š“-Þá¶lâi[Ùó`2õ*v­4yùîr7•'輩`4Ÿ9àÌÞý¡Ñ÷ñ¦Ü¦Íœ˜Bq>’7òM¯UdJ)¤„o‰6¬¶§‹Â Ð/Î;…ºö€¸ˆC½´ÜQ¡´®æâv> ióš» Q· ,y)OízÔäºõ»7™:¨MA©.ÑÌ€¨/[C÷BBÎtnÉÙ„(üÊïUÒ;‹×1]ëêl>RèîJÐó.ì£Z¹r"í Õ"k‹²=ýÖ°¯g$pûªi°" ×Ÿ°ýˆ eP2aáöÉìSÄË.²úÆ ¢”
-'A­ýÓz°óiCxÄ cxåÈÅ—Mhew6²ÁVc)誴½Ê§&ùh¬ž}@“¹°Xž.'2°ôý@OåY[™|˜›>ŠçïŽèê¹ sàyßÊš_!lxfzÞÕ{
-¯í<¨6A‡€f8 ߺíUy9B†vÞ6óRWü8@±½Ñi“שּׂó^“TA‹.Áx-a9tiY‚6÷Y‚¹4GÇMKæ"ÓϦÛoù
-‘V·8Wï’å‹O|ïL·Bz.yÙ¯^I…+åŠÎ; nÞ"æ{q¾Y”tHsÞg©G'AÀEdÌüVww.¿‰CWZÓz¾·¿
-ÁÅÍ>Žº¨jéyA.
-!3±.
-ÂÙÖÙ»22ûÙÆ ëñ„—ü
-ü~¶vÂk»¹|UïNï×vijÿ֯ݰòÚ»…-»º¢`út+¼w­Ú¯¢3uXL)è‚2"¨V\WG+¥NŸ•C›•{naí|íŽüwtP¢‰†,ËÄG,K_§‹0-aÄ“nÀLUºfÓÿ!Àäåÿ^P
+xÚÅ\K$· ¾Ï¯èÜb «HÔX à™Þ1[{ r
+âœ|Hþÿ!¤$êYU]=Ócw=$Š"?>¤¢V^þs‘—_ž^~<ýõMÙKÑ3—¿>)|!/êâ£ÐþâÒ©Ëß.ÿø*¥ Rê7üƒç/Zy|b”êUJxyº7.ßë—ÔêŸ?þ†#¸Í”öB-CA8TÄk…××Bd›M…½mܤ‚œ …gxïe¦
+‰y|W'@Ìš@ORk|JíéŽÚy™§•úHnÍ}ko½ë©fԹ
+кº\ž|ƵP¹îÕE+´ô+XÏíme8 K£…õH„ÔŒÊè„Ò‘Pià.T#¬s3¯ºÓ½‘¬Õ{QyŒHœ†Y¥Ä´h;Ã-³æª
+¦„FtŽ_ÒEuû©Y
+x£h§ô¶Âig&µJ­¡ôç«CkðæëjßÄ ½§¶°™hÝY1;G}šsjaÕº>ø^çþ$<x=Œ"*j¡Ð¿Lü€Éüd Nr%,¡<©ŽøEø|îË&íË5Éiä¸Øô•Ò„·CÌ¡07r¹c¾
+7Ì¢¾7ª%"ŽíœÊć""™‰Û–å4µ§ëë–óÎÆÛl$ º˜Æ±;voðÓ6œ¥È6 qŽÝåÉ-ÎÍöl8¿eÎwœßPÆœüï3s#X0Kûá‹Ñj˦ýZ%Œ‡9ølkõ \œ·±>NØÐ>\\{ÛÉ%jÝãð%ÿÕDùíA°A(5q‚9ðJÌoväÊK‰¤ÕXHb4ùætå c5ô²§©1®‰¢m)ºÌ¨õØò{ÖízM¿7<Ž1ònƒ^/ 4!pÍã`æÀ½ÇåX»#»s9-ç¨yÅN–¼‘‡úˆBÆ°Çùi•uÀþÊ5ù«òä–¿ÊÍöüU~Ëþ*Ùû+ÿµÆ»Å«¨ˆ qÕÏïÈ—éœ×ïø²´F€a= ËŠ!¿ïå•Ì6– U)1Ú åß³øÈTm›,£¼ñÀ#ìOÁoÛÕž…®3ðIØYÐÂØÊ(€Üã:²Û 3Ò §ÝÈcuk¾ÁrR;óG¦• À'ûZ¶Ì’gq2¶®ß:°È&vBŽ#DçØ[ààR…yôÉwçýëµðNïçá,ä~ï&`Vµ¿Œa³XŒ„Þ8Ý­u·Öƒjûð»Xg]Üd}Á´ƒ¢õ×­ˆ~ßDØ™0VòÛªw)lŠY#Îñ•Å€N©{—
+¬Mø+Ë~ãlÖ\ãÞº¹-¢óRô{½o ®ÜÊiã÷‹’Ó`™ò½*:4[¦yq¢C±HÛ<WZlç¼²èwÎÀ kãÅ‚ÅÈé8w@ÒBY\®\û9wÀÂྠ|ó³ŠhÀ˜Œá;hTE–šy ©1Ñ-—ß÷‘£,.KlÑ4Ýž‘ûÖ68èšõá¶ò¸efÕ/)\÷à‚g¢Lñ'iÀu?#]\ü©`gé‚F.™Yš¸
+åEì’ökûƒŸ›¹x¹æÉ’'ç«ILå)ö|—Þu¦ÔÓi{%ùIûPTS¼ù¶9oGpÏ?÷Óo}ÛöfÇSºuÂ"8')QÂê ½y{ÉRë€P-|[L•^Zê£ëõç¿üTºÀvÚª‹c—?ýTÍb»xp^@Œ3×M»³‘ôÒ瘚¤\4Ê)Ø›€yŒ>çSŽÖ#E–&Ú®P-%³gTP é¿Ëü›¤¸ýê{ç$âGÛy\mv\Ê=èÔš‚Ò=ŽØxTœ·ŸéˆYœ„궄k–8Lo‹ÁôLetÍßÖ…GdÇSFÙ›À÷@2MXÆíLÿç`A·8¿Ç§gò'ê‰%ì‰ô°ÕÁÑò–Ž¢‰O8ŠÓJ¥&ÄÄ7M/{c±Çš‡ò;áÕi±L âÙ¡R.®ÎŽåÚåÒº¨úÆH—W
+W&‹¢Ý~?gôÉ,µBuóxŒî©·=éê
+sæ÷È|4†ßà†¢…À{['3 ‚‘Ò]y®ÿLŒ
+9 `¦bÞË”ÑØÀ¯ô¶·Ÿw¹Â”L)³¨âÜv´[çÎnG3d»^·¶£=UG=Ênô­¤ T€™ÃOØqBkv‘Äv‹ °ZZ?$ȃS)
+Í3>ä©pÛywvÓ5¹h?%Fw¬
+× {Ä ­Æd¬0áÚú¡òg”3¿ª¯²ƒÚÊ…i°$[X·µNVKÝ-KõèÒÞ«¬‡j–ZÈŸ+_¹çš§ç »ÃU89«EÃÍP8‚Q›¾¸”}[•Ó3q­.g¬ÕâÔc1•¾)£n—–:@E›KK ^=lÐÁŸ„ 6õC¤ÿºs0'¯s9žYNå'³×Ûµ*H>ï–‹ô˜_~’ÕÐ .¿YÜpnÛšëz¼V¿æâÎÐwV’mjƒ{Sß8ÊÅ=mÓÿÒ{«ÎÑßÅñ(S¥^ÿÝâd0H:œ@PÉþ(gý \5¤·Ž7qµW®¶DÓ âÇ.í 0®;™â±š®ê¶?ßåJÝóf!ÐŽŠ­
+¬Î_…~VuìÈálô5dtTvÛ1™Lo>ã“Ù|òÛ*¬twüÌÔ  iv Î,LRÞ£pÖöróêÿ¥¾ƒ!ÓûÝž½Õ4I²…ŠS‘ ƒU¶¦LªÛ½ž A‡û¤î£òT“»"ÜMØ0•·2Ì4gi¹·ïS¬·0O_< U Ö¬îV&‡«N³ÌÌò™#€ýTV“ç.™xþÅõgäËÑà°yÚ4pkhèJׄ®tÑ¡ëvªMÇ}e÷µ®?ÁÌGRm\<›…þgåÚtP³ól +\z—tçiá.Øíƒú‡ÇWhû=¢KTÛ‚ª‹R‹/ºûO¼jåhu7O)ní¡ï.ËÇ™a¡<)vžç‰<Oó4Q ÝJGGœ§W37ýiÉwÌÑ ;aA_ÍQ‚é€P :%«¾&bÁög䆷£jGe G\š­ ëjŸÎVi7%­wÚßNwÝBº<êê±Ûòo-p­ýÞ°w+êkçs÷­ºpZŸ ó¦å¢yåD€;°xög†EßÇ›RˆëÂF(nÄÇéÝqV¦èSHüG¢ Ãöô¢0ô‹óÈ|ÈÀxôÓXÞR¡´®æâvþrÒÚ5wAOÝF`ÉmOeM¹i·y]H®C¿{i?Ñ”êÍLˆáehèÎ2äLçðLTˆÂ¯ò^5½eñZ
+?|? V
+ô<
+û¨¶\¹÷<Lý¬û(ÛSÑoûúñŽÏ=+yý‘ÛG)*î ‹´Of˜: _vÑÕƒŠR¬;Öͽzá±ûÌgZrAáè3¶LÿMÝZOºÔãóÿžì£
endstream
endobj
-475 0 obj
-<< /Type /Page /Contents 476 0 R /Resources 474 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 472 0 R >>
+478 0 obj
+<< /Type /Page /Contents 479 0 R /Resources 477 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 475 0 R >>
endobj
-477 0 obj
-<< /D [ 475 0 R /XYZ 78.37 808.885 null ] >>
+480 0 obj
+<< /D [ 478 0 R /XYZ 78.37 808.885 null ] >>
endobj
81 0 obj
-<< /D [ 475 0 R /XYZ 79.37 543.021 null ] >>
+<< /D [ 478 0 R /XYZ 79.37 333.806 null ] >>
endobj
85 0 obj
-<< /D [ 475 0 R /XYZ 79.37 403.621 null ] >>
+<< /D [ 478 0 R /XYZ 79.37 194.406 null ] >>
endobj
-89 0 obj
-<< /D [ 475 0 R /XYZ 79.37 323.559 null ] >>
-endobj
-474 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F74 337 0 R /F75 338 0 R /F77 339 0 R /F53 345 0 R /F30 341 0 R /F32 327 0 R /F64 333 0 R /F15 334 0 R /F81 377 0 R /F22 367 0 R /F84 425 0 R >> /ProcSet [ /PDF /Text ] >>
+477 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F65 335 0 R /F74 337 0 R /F75 338 0 R /F77 339 0 R /F53 345 0 R /F30 341 0 R /F32 327 0 R /F64 333 0 R /F81 377 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-481 0 obj
-<< /Filter /FlateDecode /Length 2821 >>
+483 0 obj
+<< /Filter /FlateDecode /Length 2934 >>
stream
-xÚÍ[KÜ6¾Ï¯è?`†¬*¾€Á
-hÓÓ¼UÓ]-•!1Vo”E“²À.|ø*È6Ò—Ky ¥IªµÐÅh’Æ©™4Àb7hèÚÌV/«ÂíêAOhYÁQ·fáD1á=“¦QZ'JF.W
-]SºšÖ…kü­³ìµ˜²£U‘â…[Qpžjâz*ÞàÉ&Fð$^Ñ
-¥×Õ¤¦jìsQv¥7®(Ž fÒT%Áb?´¬Y&Aì5gÚ·B ÏöÏÃiTT2»ßÌÝÏê€Ç^­à‚"vEe#ˆ´ZSO‚a¬‰«£Èd3³õ’4¾V1”LU{;Ž©õµæ8Yk#4¶¬¬gB¼nM» ‘P8×3¼5kFÂq«½oO¬¿ …òºÐ-nHf fØ_<§ÀŒ³ÇrtÂâÆ%O«juÕÙÜäÕ~‡ûº¬œH?¤Š‘küèê·Uû˜ß2¼Æöì V‹`ÎVmÚ78¨c­Yqn¤ VTë5}’c’
-Ñ Pæ®”¢ò˜#9SlMCÙf1h¡Òæµ4¸²ü#¾Úeâ¨Ñë0î=]Ü(@u~¤cÂókkX!V÷uû&ÎE`:V@‡îRڦݰ•qMáRèPóÿ¿nrOj.f f¼ÓæBþ+³ š`Nf“yZÍ,}$ÿ¿KóóèŽuîø> ;Õ:¯eƒ–°ç†TŠ dìTƆ¿¹H-w¯'4ÃP¼Z{F³.‘Í4@.2—ć„·hÀl¹kåÜí§Jc¼ ¹¬~•ƒOœ¡ŸWc¼Buaw-cÊ"Œ+âºûš„÷®çù»ð.Å>8B­åªUU_Yý˜+>mJOsK6ŒòV£—§˜0TKõ’˜•ŠiýU’m"¿˜f¹Ó^#¨kíE›)Íw£1ï^ D¾Þ/ñ­P_Ë2mJ-{Ô’…›˜Œ«SxT:¥+Uý¾Ö†AøD>l’ø¶FîW>€ZXô½
-i‡À9!C&iikSd¥nï ®\ÔªÝ^3nca(‡kÓe‘6™–ðŽÞ{ÍE°;4sŽÒ‚<}6Gä¾ã“7¹OVBØPjÝæýônØ(îçÌ4:
-
-0Bq0t3O%³Š^ÀЃ¦+á^œèǵ|my”5ŽP“-¥×Ù7ÊÇBnŸRÊ?åê~¾Y¶….–¹e9Ì9©ÀjQ­’xK&©Ós óÜÜBÝJ—FX*#ÊšÉã݋òR0E^§Ö®—^Çâï Fçˆó¾×û=
-/±§<íìôÂÀÊýsêr\ö@lfcÙms†‰š…«RWA,[xi–Î%÷Jòe­Ö㜈c›æWÍoÓ6¿¹Lò±Lò\ÐüòõéÿUþç‹a‡—†»uùýϧp/Rº(ÉùD]þúÏå§.Q„ˆ·¶Å<:+Õ»¾V¹r#C2”9-•¼’öc…²ƒ—¶
-t*…:e»Kšr8¹3mÍ{­r—½^ÆmìN±IŠq°4ŽÕ†YrŽ{.TuÝ8¦ˆâc…Âîh~´#a›ŸcÛ†½ïLdPðNÖóŸÄVÞ/×rÿT13m‰¸€Î½î~iä~zs±Ì]'_êf†œW[Âü’4(UÅA5Š„ó£/ÚÆ…Ç
-â¹ü.”_¢‡wZ­ ·›v¡š36ömÑ\6¯#Àß1y²pqP(ý²š™Ý$ÀC?·+ô2¼°j!–™ (ìgÆ‚îš
- ø<IçšØv &[2§³F\´hiÓí&T*¬˜IG¥»ÆðïÒÿvßú2±VK).šl¥ h W¾Öó9ɽ›oýÜ7hâÓ†Ïï±q.t{ •Âѯ…^±Ø‘Í­–&q‹=ÖÝhyññ ù˜ÈkicN49ÝÝd!-¥ùNÖÕó`{ðyLî(©ç}.zÛ¹ûÞâ-^Js«ŽV>RÇ–÷9Û¹vt$oyƒ½Ñ÷FhŽ«ŽW×FgÎ(‰ã¶¾‰@0p#aúÙÍs° ¾¹øfoC6%¯?kÏ'ÀÖž—ÈC.õ$ˆ[”nvÚçs Ca1Ð'yCÌïZ£k7B”æ> ÞÚ§ÉqUáo^Ãz„ÊKïZ“%vZyòš¼•qû™ôÉ‚%–ZúzcææH«a´•3{‡FŠÔ½öŽ{ïCíÝÊsdïQú¹–F åôÝQ%­e+Ï‘–£ôvöPŽÈ Ào“Ö[Vï¨ÆŠEÙ­¼áù5IË çGÔð¹=–v„(•í-Q8ã
-B¢¤a£¨àw QÊ15èE܃±öŽ¡ÌÛ l ÕY‡-
-¬,ÐG A.€spƒúî©Ä;€ä<
-U›ü­ŽÿDÐ
-É€F¯ýõ±PÌMà
-Z+´„^–w‚+$,êAÃ\1ÉÈ_S‚´;ÞÓ'ASÖ+‰%®ªÏµ´Ï2­\ç,ßåððõ(j%Pë÷¡D‘S(Q7÷JÔÍ<D‰ù÷Ò«w´ï@‰&Ò=%êèŸF‰ºù(Q7ú!(Qo¡÷£DƒÍO D·Ù#G؈|Häµ´ßu”ækˆ>rþ» DïsÑÛÎÝ÷– é» Dïs:¶swQ"ù­ÿ&íDÇëN”h"ñ ”¨›}%øÞõ4ΡDÝ쇣D½mN D½h»(Q?xkŸÄÒƒuòôó3é‰uôP¢nô?I½€ûaP¢Nž#{ÒϵÔZX…? JÔÉs¤å(ý%
-'=­vß&¯w¼ÞM¤/»ë}Z8Äâ$ž{nmÔðzâü0HޥР¯
-i™w¼úU†x¼Hëçö@ëòãò:—¥U²x,$R+/”E´C•ñ RÇm¼;³}„í
-\D½ÀcÚ ÍÍóùDÜ}G¶v™žc–ç9#Œò=õîµ›MM‘§)«z]És3kÎëŠ3C ¬ÇÖîÒ5÷(0è¸KÒrïX’VÕ™ôõ0Z%…[hìYÒò¦#Kå£åP¥Ÿä¦PÏx§jMZl/È[¡;H°Îœè ]™„Õö&^\ÞH$³{è7¯É(ÿr ’6_ó#S{‚vˆÑpx‹–×ÕŠão—”¹ ÞºAiÿýÌš’ùy.;º’“dÿþéÙû{TÞê+GSD,6Ó 2•ÚôïqRóâLfM<n•Ví<Nù¶Ž®Ù je¯ŠyI7uéí(²
-ïÔjün(rÏÿö<{'¶k~N1“ççº;ù ÛÄ°I‘Pœ<{Ýç€ k;Xí½ˆ³ õ†ä¹í=$ðÀ›Qx>ᥥ£ŠË6à-ìoéE[b
+xÚÅIŽ#¹ñ^¯ÐŠMFp
+X­Ñ
+Râýý=¾•'u:ÿ¶7)Õwšéy†¾æK`´}GxË+â³…÷¿ÿü3¡¨ÌŠ„µ†QÔÛû+OOFeHpg¨ñM(˜µ<ÝânqNûï·ÀðÐe8y´¬“y hW”6òÞÁ½1´¸Îݘ¢Z‚Ÿç:ù¾[3`H+¦'_×Ìðˆ’³#ÚL|ÏlX˜x~|ƒn¾:¬ÅSÈZÄÃl6í>-=4À†
+µQ\Zdj2ÌP¢KîÀÃ÷bð.¼¡æj°$?.$
+“TŒl–7b±ú ¸)šMܼXIáÕ¹%§¸12ÓÙ&Äøás—y¶ùì¼ÌâÚl©õWKÞb·lÉý>Ç d`Êo…Fxã/Æ¡X$è–=P/ð£¼BJ@§ë-Ô5Ϻ­!l­4J ‡ÊŸÉÊ ^i)4,Xˆ_N4×@ÚêÖ¶txĶ0Û§û%ˆ‘N]õÆ7ÎÕ$‹öCg-®0=u.,œÎžóô&ðo‚ì’äe••<GNWY†l÷m¢ÿFÂ… ÌÀ®9¾ÝüKÆ<QûœL„Hñ„±S,?¤B›XEûฅ‘W­±W£µ‚kr>&T³œJ¤”êŽû©ŸrMv„y–ÒýŒ2þhu×\-á×—Ô d¯éËеO™“¿óÛ!A¦À«¦”™¯(ðR>ˆïf±
+¿K8 5Ú©0šûiÏŠÞcCY’$9…»ª\O­êI¹ªu'RØ+ã÷f&¯=
+[2wiк. Ú®øNó{ eQI¯áZ<íu3Ê,Xò¡ow;?:*:q$+•]©´¯DÆ cô%5’ÜØHBkgö’)nÚW…U­´Óœ^æ³6V\Q¸U[ûéæ
+ˆùhV̪^qΤ±c‘SKÓd™ªË2ñX4¹@ìY£ –žK`(½_Ë“Î/:š(“f­¥GÍm‚pÐ9®oø×a¯Ü}èÚ¶ûñ[“3¢=†½bïæ@`ʸ,íF9;ß¿PJ.ÑKÿñέ±eOgRÿ/‚ÿ÷¥{üK‡»T÷û>ÁAµ4×ÌÁ
+§qÜ­–2™Û9“ß}·(Ø¿:÷eƒ/›Q€V OYñ!1Ëe
+p)³À=PiE%àRëª\¼’~«Ç4¢ÛÔîÆsØ Ë±Ê®ò-BðÖ_¦€ÂIhÜZ+5ºÉúØøj°uéy-{Än3{I|˜1[jcHÞŒ3¦úÄÎ6ƒo»hÈí«¡³ÖöB ®t,çÑhâ÷$Š€¦—xgè5-3–=hÛæ°°>¶ŠÌ5vìíå‘&¯¹aD>ƒO§S÷ª¸Ÿù
+¾–'´(®­…¿¡”  ¹øÕäÍHNoê Ì¡-¶Ñ›ÏY-ëPO±Ú•´JK†ýSü$ëRßlDj*ŸŒZÍžÞ7„­(ò;Eç§ò»ÇçˆßkìçTJJßÝǵJ>›ÊŸ#*×ػّ¢œÝ)û?ñüã^ŸÈØ
+O&Ø;yâ€[™xp®æwØð­¿·vÔF‰ù"Ë•!éä6Š’–Ø¢”PÞ?ÐEQʧ[àŠ{½®½{*ñÒd:çÎ.Þ[p”ë“Š¸ ÷=¡íÖnw·N›»ó}ìnGoAZÓÑt4¹?â'w¼ûû‚Ðw¯-~ [1§ðÿÖ-öÿ šöKJ×c¤þöÜ~Í© :' •0.ŸìÀèøÇ#hV®;0¶´;ÊÏì"ÝŽÆÈ \scüÔQv{Ì‘”^¯!jçzüg{IÜ¢þ\'©ñP©[ù@©[wØCòFxo¾¤ïA ƒ´Æí© ¤üÃý£~ùAû¨Ÿü”îÑÀÏ7Fv?Ð;:Å þ;PðKô­ƒü‰¶Q§Íf¦@ØxaZ&>,E!mü§´ò¬ÿiŠ^
endstream
endobj
-480 0 obj
-<< /Type /Page /Contents 481 0 R /Resources 479 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 472 0 R >>
-endobj
482 0 obj
-<< /D [ 480 0 R /XYZ 78.37 808.885 null ] >>
+<< /Type /Page /Contents 483 0 R /Resources 481 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 475 0 R >>
endobj
-479 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F81 377 0 R /F65 335 0 R /F85 437 0 R /F75 338 0 R /F77 339 0 R >> /ProcSet [ /PDF /Text ] >>
+484 0 obj
+<< /D [ 482 0 R /XYZ 78.37 808.885 null ] >>
endobj
-487 0 obj
-<< /Filter /FlateDecode /Length 2765 >>
+89 0 obj
+<< /D [ 482 0 R /XYZ 79.37 771.024 null ] >>
+endobj
+481 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F22 367 0 R /F15 334 0 R /F74 337 0 R /F84 425 0 R /F81 377 0 R /F65 335 0 R /F85 439 0 R /F75 338 0 R /F77 339 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+490 0 obj
+<< /Filter /FlateDecode /Length 3052 >>
stream
-xÚÅ[I\·¾Ï¯x@YÜÆ
-J˜è<BOȱˆú
-‰ŽVVë8Ò2cÃ…öH’’ª¿‘H”:¸X´ä?&üf&6¹Â½é»/®KûW lKÆ`.,GJ~µqC6ê0–ÒšéÜäýÅ•Áǧ_ßx85+¥¾¯òÌ{ŠVæÈFà÷*¯ Â<ÊД9¾p
-ÏJòšžöõÅqé’YÒm.¹M‚‘CŸ7Êôfkó8×–‚èOýã$$\ |p{c½5ð9Ei)dàxS]Ì-¥Ë
- ;¼-'ÿ©åð„¹ÇD_a(dkìiIæî©5ÕK’üd,^=÷ÜŸuK‚\
-z™Ýœ^óÈ\ýá[5=Óçô}DÿÆæÃQ“\ì0»Úø[dåƒðfǽd)°{¦Ýšü¯møõo·ôqØ&õx}pN©0–œ¯ä jÁçgÄ«Ú"tÑèZEINKó}ÑÔ¦!Ûe⢇•B×ëA1ªË–7D{¥øUÌê€ÙµaStN¾öÔZŠ¹¶hávÛÈCàŠc³à„ñUF{nÆ\¿ôžÝ¶3¦šÀü¡¡–´©×ü±ZØÚV˜AnÒºµªRŸRþÍîw>(Loz³°ˆ¶?Ùmœ9ï7žK1‘™h{Ÿš3,·¥kÆ#ÄÙn™4±‰
-P¤Åv\SqNø~QgaOóu¬-!÷Ïj¾¤È &IºyÍ Ýûui¥°¦ŸŽ°…íUÀVéÿ®‚>÷Ü›qŽ´À؇xŸ-ƒzïµ±é]¶¶âþÙŠ¥+ë©Á`Û´éÓ GOJY×Ó 7“HQü8jHÛ/i5î¯ì¯kl&¢[%¦q=¾NüѦ³…‰ˆã Ò$¨|ízdÑùÝ
-ݲWVÊŠôüÖ•ŒYÔ¤­éš„ý§I+ wôí—  _¯ŽŠ#íoÏÅEžë™ø–IŠ¾^ ¤rMß7;LÕw¤mîw¥¨¡€½tÅPÄ0Ùíן0IQ‹ÎÚo´…šÞêý¦J¡éß6ÿL­õÒY,ZÑí¤ËEo)™£™î
-þÉY·î èÚ.Ý—SÀ:üé¦|Ÿwdõ€w/û°åp+[•=à‘̵ö$D´|˜^xܪ‰£s$ñ¥A‰ Ú–Ì£œ‘Cñ.¹0éB€÷Ú£ÍÂ6G•1“mî¸\ Þ Ù]V„r«ÒŸÑö—ø”ß]¾rß~BK"®}g9¾Ó¥IºÖ‚HÏÜÓý¶xª<ó9°öõ8*/h Ñ!AÞ†èJ·+¦½K%¥ÆS1Ú/-€^?,ïßsôW8Ù¶#›9,xïs$"&”¬»§|ÎêÛ-ÈîBßñqh5ß-†L.SNŒ1‹Úrgº»U.Õô‡•eèÒˆï,»ùœùÚý ðXêb˜xãý ¤ ¬ÝSyÿYPÏá/9k ù}ïšIê¦s<<;Ã
-4eA‰}x;<s-9°´§z”6ìÀ×äqîÏøX¯zV}Ê7ØK`·ŸßÇH{šÎ–Uö°Žän†žÂpN±—)_mo-h7§£@†HQ?¬ˆÌÚf®iÃ&…~o{Q QöÞ¥ ØœKªhð‡zèY'eu£Üp?Ar}¨€v—#õe8zi¦É{àÕЫ¥<6bÝFçl)éqĺ+G0ÊbœÊaerË´D[‡#zØj·ÄÙ?Ó¦³,â¤?Å8"£ v{ƒXsT1B¹Ð´¤ Ü{˜†?ž(t%ö¿˜„~ûúô˯8þüüH}&Îÿ¦™_Ñ<F8Eïý{ûûÓOåO(Ôfq1ç15v™-à˜Âœ‡ë<X]ýx±zóøžDzý!”Ý-*¡TÛTÏ!r}°¦k»áeüÈTšì¾
-¡¨‘is¡®Ì)šÒ‹èöÿÇöÙ.
+xÚÅ[K·¾ï¯è? š,¾ÅV€sr¢›áSû`ë_ò÷S|ßÝÓ³;V¬fº›,Ö‹_«køöÛÆ·/O—¯O?¼Zµyæ µ}ýõIྉÍz&íf`܈íë·íçgνñw}ùåëOœÉðo?ÿümÛ{ô÷/ee†)¥Æµ¥Š´qS8iÑ×v®ÌØi®õ‰¯,ö £òLpsVFË)c¿ö}2ös5É(-ú¤3¸03Q¢r| Çè•Ç „×’HS ¤Ë;þöüNHÃ<W+Ž¼‡; L{3Ò 4ÕõgF2®ÍÌYöÈl¨äõ²µq Ülιø8A}]ðomKáSÒ³µ®2¼Ë++æüD_ñ^ ‚³Ùø;N B39iR£à­Õz/h&¼>BãŽmüæ}»–|¨ç'ïÚÉZÚ2fÉýCp’|©§¯×X'¬dZL£-_é[Hê­ê6×G«»cç–¶'Þ×"r+÷v—â–±çç–3÷R‡ò» þ° †Ÿ>û?³Y#3ïy#K‚8 _v?1ÖâGQ˜zÅ?dMb\²*³Š,Â%GÈ÷Bì
+ßGÖ…>X+À]YKDÑ?HÍs4 HV
+ÊøD?§+ùZyÁ€OÄsº¸$ÎŒ'j1f¸tW _)Ñ8e^À%Æg×õA"üÿËÓç¯Oÿ©ø õj0Á
+–gZËV’â¯Rf~#o—î®Ïr^ÒªÚ­hƒCw«º7/.ÌÍ(rfšEkh•öQ”öJüçܯl¡¬˜ôGÔŠ%âÕ®%ÊØ"k¤›önÞÇ×*eÒ3éÓd¤Ý§DRí¢Y¡d>®y—Ž)XCJöð\?§L*Êç²ßÄY6¯§€<¢èL§»{\ÇÙWÒ}‘ã5û,f-,.`¹T[QJhÛzWôTž4NXL*Â’îòQô× ú p%n4æè˜cnÐZVÝUUþ žGV—¦j7ríòÚ¸v…e~ߺ˿M§“qýó0ûAƒN©};ŒŽ4Ê|L>“çÜƺ7®#Ýd ’] Å‚ç({ˆ¯&c«[b«
+ÁÉNZ“¶·„ùœ$h0)Q]{‚²‚9î'~ìEà,!˜×!/ŸÉÌõŠ[›à.m]ÔWÌ%>çÝuI»#îÊrý"E‹™Qÿ¸¬n1‡ð5ÞUPÑ q¯›viA³ãx•ÙWŽ)¨U7b|‰%—y΄l¡4ÃüÀƒŒr³¦Ä¸,êS8wGÌÊ`þêG~þ5¢&±{{¸ê«êŠ¼'G‰ÃôS /ĸ:åuáÑ9ÆVK^baÄí¬Ë×_çÝVÇ÷ú¯u™&òû…ÇHÙÆž‚ ÿÄ»ƒÿ”Œ`öŸØ­¥dÊÁè39¸í7¬ñ®i²ŽËÕ;½Ü/ã(
+z MYGŸëL /zæ¦Ñµ)çÐO¨:7m·Ϫa`ü%9â;)+ôt Ô$^:ŽˆÈt
+] •BÈ ØŽeŸUfÁµéè!œ—!„àÅêEØÎãrÅ×vü1zÕ¥Œv½‡“²æ„”4ùÜ=V´g"U¸Y*µ/®à±RyÏ â9è&O@Ñ=ɨƒ‡çß=w¢™éh £Sï=%Ú”¡DäFe½°÷Èyd½+}kc8ÁŒ£¬ß ¥“Ìc^3¬>æ›IÁjA“”µ£dYVBÅtUQ´ÕaÕ*œ÷¾¥W8ËŒ.[ü–gVÊXšôaÖU•øþBkh5jÿP«Â“0Si±7UsS-éà9 !Cm©¥£÷HÁ L±Ž R^NUF2**c1!r7P1*É^k°¨àß~5™.¸ÂYøn‚i`ÿ0Ððºqµª«帜(»¡h³¥}Z¹p“÷WR¾²˜•Êcå+ M½ ž÷“XÊž5By&h¥É4¯¬5¨0Ý%Õä1¹¦fÜ‹:ËðT çñÕ©o<k¯Vhq#ß*4Ž°6D:>7ê€Ã¯ðÈ`fcÝ»ñ ¢¤fNÑ~¯²(2¥”¦9â
+Ÿ c§@[MH¥-7õ’d¦¯ïê+fÉךžD]ñî…ò`m< zÛ•(Ûƒ"­¡)Ãå'âÕdUh˜ô­ fìǶòEzN¦á”§·õàp<H$©b—¨µï%T®{¦'CE¤Y=egÍ ‚v´Ü®éÎû+á[=Ñ'ðÞ££ôp\àCøa¾s~,¬cV‹ë3ÂÒÇÄ_!N(½åF,ªç]r e°ô,¬U,áš½hšÂíkow‹Ym˜@5r¬JŸöJ&°‹+•bÂWÝd™£g½²£Âw,u»e®Áð´±I dmعÖ?Ò¹¼´~]KC@ õ¡)uû–âz}ÀO×µ¾TY(ˆ‡Ö"KyêÛ‚­žËôXr‡Gsã=pYsÉ'xƒêÝë3×$¥ë•Áa M m.4*â`8jû5 LÕƱä¿3%pôÍÖ2vmtšžÄëøHzŒ¼4ãªMšùeDKðô6nGƒ„ëVL•þï"Èk»z5ÏžÊ1­ÏùÑrBë¿ÚW±seËÏÏVtbi³@ÜÉLûîEOûòãÒP.yÃE^ž¤WØt¦ÇÂëØ9) -.Š ,ékÛ°B›t˜[T·n\šy'ÇY ™Äבּë–Êmh¶+üÆ‹ƒŽ’` ýv8Îüƒñ-“dy1Î;GòÞß¡Còö´Õyw"ä0swOçcö€‘‹vÖ~“{]‡Y­ß<´ käÎï·bå÷­kÜèàÍ{£Tpع7Œ^ï—ðÒPÛïÒñ5®õþ–¯÷jõžHhÅ<Í.éi÷ÉÇ9iH?=¥µ½0¯N÷žGìyˆ¿Ó¾ê×ßóõÜ“½à6åg|žlÜÓØȩ́FÇa4¬º‰„ÄÃŽ¿§·}¿
+P†Y%Wª8ð·pyËHïû±ž´œŸœ[­0ø X:wÅìèK€žqi =Mµ_.
endstream
endobj
-486 0 obj
-<< /Type /Page /Contents 487 0 R /Resources 485 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 472 0 R /Annots 490 0 R >>
+489 0 obj
+<< /Type /Page /Contents 490 0 R /Resources 488 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 475 0 R /Annots 493 0 R >>
endobj
-490 0 obj
-[ 478 0 R 483 0 R 484 0 R ]
+493 0 obj
+[ 485 0 R 486 0 R 487 0 R ]
endobj
-478 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 184.097 678.844 194.524 691.135 ]/A << /S /GoTo /D (Hfootnote.22) >> >>
+485 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 184.097 484.605 194.524 496.896 ]/A << /S /GoTo /D (Hfootnote.22) >> >>
endobj
-483 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 246.892 626.6 261.617 638.555 ]/A << /S /GoTo /D (subsection.0.4.2) >> >>
+486 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 246.892 432.361 261.617 444.316 ]/A << /S /GoTo /D (subsection.0.4.2) >> >>
endobj
-484 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 274.568 626.6 281.542 638.555 ]/A << /S /GoTo /D (subsection.0.4.2) >> >>
+487 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 274.568 432.361 281.542 444.316 ]/A << /S /GoTo /D (subsection.0.4.2) >> >>
endobj
-488 0 obj
-<< /D [ 486 0 R /XYZ 78.37 808.885 null ] >>
+491 0 obj
+<< /D [ 489 0 R /XYZ 78.37 808.885 null ] >>
endobj
93 0 obj
-<< /D [ 486 0 R /XYZ 79.37 771.024 null ] >>
+<< /D [ 489 0 R /XYZ 79.37 578.488 null ] >>
endobj
-489 0 obj
-<< /D [ 486 0 R /XYZ 93.716 100.579 null ] >>
+492 0 obj
+<< /D [ 489 0 R /XYZ 93.716 81.015 null ] >>
endobj
-485 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F64 333 0 R /F15 334 0 R /F74 337 0 R /F65 335 0 R /F16 336 0 R /F81 377 0 R /F75 338 0 R /F77 339 0 R /F71 347 0 R /F53 345 0 R /F59 346 0 R >> /ProcSet [ /PDF /Text ] >>
+488 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F74 337 0 R /F75 338 0 R /F77 339 0 R /F15 334 0 R /F85 439 0 R /F64 333 0 R /F65 335 0 R /F16 336 0 R /F81 377 0 R /F71 347 0 R /F53 345 0 R /F59 346 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-498 0 obj
-<< /Filter /FlateDecode /Length 3467 >>
+501 0 obj
+<< /Filter /FlateDecode /Length 3115 >>
stream
-xÚÍ[ËŽ%· Ý÷WÜhY¢¨ÐhÀ=kÀ;'³3¼râl2‹x“ßõ ÞU·zf$€3ÝÕ%‰¤ÈÃCJ%oÿ¼ÉÛOOò&Òöög|À¿üõ§§·ÏO?ܹ,X¼}þãIÅ7nêæ‚Ðîæ¬ÒªÛç/·__¤ÔNJ+¥4JJ|{ýíóÏ4y^„æÁÝ<ô¦€
-p
- ä}ÏÚÓ6GáJö¾f"Ô| \õ5T}(æß’2ñ]{ŽµPÒºY¬b-(Bl—i–&tvá ÉÜp÷½[ñpCZ佡hÖØ#@•eò?†ì(c‚br#¬
-lôD¨mm g‹hTÌJdî}’{+°¿ñ¢ÜÊ–Áq 2£Æ³ÊÓYq½âê£OŠÓÛsEP„¿P䱜l°”ÝIþ{•£͘=mè^ÉõÑ9!Ce…!·œw"Šý
-S)±€Råi6v>KaÏŽÒ4W9²˜-Îv¾‚cR ;36û°U©als2¨ÍÁÕ³!°¸™<ŠÅj¾5SBc׆AByX(¼µ\z¥Ÿ6U8q¼È)èÿzúË秷©I[Cô©JÒÜ~ÿTo–Ìã=-LÜAÝþüÇí§_*-ÉGÍûª¦3³¤ûh)>%»â›Wø ÿbR?­{™]¾ËÚìCÄ$KUîɽÕl?.ëÒoC”äQØJÇÌ@³½ÇùMø3=¤0®§0n¨ß§Ôhë¢ò $uí6bmN¹¡¶™:ÿÇÉ“¡ò Úá ”ZÑAÆi_W{¡g¹ñ~îRTÁ·Œj2.)˜eêRð3ôp´Â¨êÏPµ±t¨:´b̾=+^à¶ÍÙy=vqØj¦TéúŽiÔvN«³V]v¾ï_vݬó“ÖA=XeÇýÊ7²”{e¤Þ¾µþtÞ•TdQ¨F£ª ›ྶ6²XdZ%1GûU¸÷l mÖŸçꎽÔôÅ/4Á8J73â®yw¡‹xåÜêapôµÉGãÙJªKÔ¬LÌç«iÞ¨th3ÍtTÚhcE–X~ò‘Ö7:aæù¿{Šô”W-J¦€m×/?»~GëîÆTåì”DÁ†’„MßyíŠHª/»wk¨“.r~ÿÒ±Z’fGJ¹ÎoœÒ[÷ˆÄ©U›YÅm¡›F?HN
-4¡Ñ2ÊØ}üÍxÞBn¾§ïljli‚| @¤&ˆÒáðŒE“ALpª¡´_ת¡*@¢A…\­j5KŸßuÝM®î|n<°à·+×;˜í°Ÿî¡+Ç·˜™ruYOË]Õ±5zê¬ûp”~C»æNt.ÛöÑ®y<E×ó$å$ª„QÝÎ+‡ˆZZa±•?cilz~0o(©í:­r7 Há$‘1”pŒ!lÎ_N-á=wÓÚ‘¶XÕÎ"vÆæ8ë,^¨ËÇm¸P—¸~¢ISe·ídùݾI²è)‡¸‡%>¯‹$ÛιeO†ÚåÁq_®QÂÿ9eºxɨ¯f~5ZíÈ_-/ž£2”dÜM§ªõii£÷D¤`
-üq”Q½=N´ðР.n=ÒHáÛ%åÆR绊å~þ!&j'Wæù¾sv
-÷z¥…18϶½Õ«@
-üúYÕˆÍÌ ëQ•ÇîØg,§kôº«²;ª,ÍùzäÖy¯Ë5K´yq•JÝ$Z/ÇúKW~û…ç–tà»]I€£ÐÐu|Ìöú­î¨îøÕ@é;¿\hæ§_Yý²…_ñ“µ ç™’nýÇcƒ}·3>Û3a·Nq¹ød+›\*KJ¨HÞ§ö{vÁSùã'™€až¹Þ?ÞKßF*¼§Q½Û§òæÞŽÅë·-r蘉ÍGå@ÊU«]ÚuúÃ=ŠøiQ÷ÁVÅ—Á¼."Â"س6øÒjV(ŸÞÖÏKÎñ@XJß(i-?ÜŸÍžFYû¿ôõJÌ
+xÚµ[ËŽc¹ Ý×WøZ‘¨7`ÐnO¬2¨]U™E0‹Ìÿ/B½©×½·º; ¸Ë¾–(¾DR2¿ý~ã·÷—ÇÇË_Þ„¾yæ uûøíEàü&nÖ3ioÖƸ}üqûÇs
+×~ZKËÄE|/e%õ4&|ß…1Òæ¿a<Ï«¯u
+J ,£R
+)A•.
+•É
+z2¾Œ·Ð´ \y
+2AVVŠ7D2Ðß¿‘‰qúyò ³ö kx7*@«Ñ=Ì;¦õLÅÅYœY}ãÌÇÁÿ¹uÿ¶Ý3Ù0`™pîçïãÒü`Îb’B|æ\‡ƒÿ¿W¾œgN"{B3²2fZp(~ AßûÐBžz<êÓÈ¢KTªgÕo}I¼¤§ÆÒ=Ò¾ Æ ÔlÇWôd•¾mO£÷M<Åýhj6y‡F '¶ÛSEE\2°®S‘ZÛÌäMl‘BK¯¾åE²èa#…è=…Œ¢`;1“üÈ„?ÆR?
+¡'Д2߬ù[Ó4–)…f R¼ä‡ªÐGÙèÁÃêSHßÓDãùjèUˆ2Z3¥›ÄÙbÐ+;6xó#†› %™æÇg¦ ´¥ÛÑ“‚iÕñD4Ì ÁÜäh¾îèÏ´”¯qT>‚wøn™‘†Z¹D˜Ž­Ë3œ@ŠLáËÜþ ʇ_ßC¬:@Úif…Ûø]a‹8Çh #%SøãÌá¨ÌUxûë;™«™†iîà”‹: ÃÌt°êç´!Ð+Œèm|þ’^Œdhñ‡ˆnðßmüøÝ|Eõf7Y/ïÁê ²è*Ñm ­ìV2kä¼S—Ú÷:‚²aRÛÒ?CDr.Œk˜º…‚$VyÛÍÕÌ;9Í}l\I0Óè¼Y?¥D«Ž»ë¡êص{jZ_‘¼¸ñÀÉf%i˜çóJß!9‚(§å:¨®×.a£Ÿ™¥üAß)a¥§­ø%ßÉ~×ÏméàØfƒ4ß¡Ii™ónŸV6ÚÌ÷³¯ùL‘xX¹&®c‰‡+tWH H-ì"ëpT‰‰º.õeäÁV_K¡ð*ŽÕ*ƒ(“s¬¢¬¦õœ-HÑäB#Ì …a"´™ òf5îÕ«5åa‘dQ^0ŸGêïXÕ„˜Â@ªn”IŸeÜ$‡•Ž@å* 㟬t„ÌD+")Õç¢+G¦ZªUL.@,oõd˜™cX©6ÕbiÔ‘ÅRµiIÝÛêÏÎjC‹#ñS —Öm†s²i|ëÀ–¨•`Q ¾¢­oñkr81ô²í®ô\ѦËD„ÔÅCo&!¿¤ÀX U ýFe#ÈŒ[co()¤´!Õ“ëÜQ=ÿZq®ðâªz0Êõ¤‰É9^ÁÞ©[•oi+‡VcQ=Y¢§4’4"TKK@óÜ<õ¨õ…Ð
+ÃÓ¨ yÒ±BPägk¬$ƒè%ãç.•)‰h[¨ øÖ2;=Ðnê-ÏÙ‹ªwÁÊþ¤gF
+Ý£™éúl| (ã/øÖ«W}M ºÓ§( ÄvØa¬õ%±ÚØúlWI`Ä–~¤Ò8‚m7¬ã÷IVܤíü,7´MëPyÙv‡[SHÕ
+*{ˆ©j?–æ8KzÉð5®ºö]™"ÄÅ,R¬•ìóù¥dDCƒ­'»37M8Ýþ¹T¤KÓÈ®
+9
+Á 4×+i¢5X‰rÌزÛ#Çû…¥sd“K[ú5|•ŸŽ‚; ‚‹kH>
+Ž£ÅtN//VinÉ2*—Û‘ÿ·Ê–ô È
+
+â - KŸS{`Ž à…GQxE¥×öNµØò=mÝV˜UŽËº—£Ë¾&£§›ÚÝé¹NyRã—vË •Ãý¶ötôÇ÷GïÚ]-ÓД¥+70ùÝ´9[¸™õº.¿èx‰£y‰,t¬ u<’\1¹r,¹ª¼ åíÛ5éк+°a'(>ùÐÅ^ήš
+Áõûþ•ƒ2¸šo)ÔR¦ò=µä9”ë)ÊèŠõ6Ô¶Í$°§®F™ö#ˆºi£Ä¶Êغ<•êº
+¦jà03À¥Ì@o
endstream
endobj
-497 0 obj
-<< /Type /Page /Contents 498 0 R /Resources 496 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 472 0 R /Annots 501 0 R >>
-endobj
-501 0 obj
-[ 491 0 R 492 0 R 493 0 R 494 0 R 495 0 R ]
-endobj
-491 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 353.263 528.233 367.988 539.292 ]/A << /S /GoTo /D (subsection.0.6.5) >> >>
-endobj
-492 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 380.939 528.233 392.894 539.292 ]/A << /S /GoTo /D (subsection.0.6.5) >> >>
+500 0 obj
+<< /Type /Page /Contents 501 0 R /Resources 499 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 475 0 R /Annots 503 0 R >>
endobj
-493 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 430.922 204.087 445.647 215.035 ]/A << /S /GoTo /D (subsection.0.8.2) >> >>
+503 0 obj
+[ 494 0 R 495 0 R ]
endobj
494 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 458.598 204.087 470.553 215.035 ]/A << /S /GoTo /D (subsection.0.8.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 353.263 352.891 367.988 363.95 ]/A << /S /GoTo /D (subsection.0.6.5) >> >>
endobj
495 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 346.259 159.364 356.686 170.43 ]/A << /S /GoTo /D (Hfootnote.23) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 380.939 352.891 392.894 363.95 ]/A << /S /GoTo /D (subsection.0.6.5) >> >>
endobj
-499 0 obj
-<< /D [ 497 0 R /XYZ 78.37 808.885 null ] >>
+502 0 obj
+<< /D [ 500 0 R /XYZ 78.37 808.885 null ] >>
endobj
97 0 obj
-<< /D [ 497 0 R /XYZ 79.37 694.453 null ] >>
+<< /D [ 500 0 R /XYZ 79.37 519.111 null ] >>
endobj
101 0 obj
-<< /D [ 497 0 R /XYZ 79.37 515.275 null ] >>
+<< /D [ 500 0 R /XYZ 79.37 339.932 null ] >>
endobj
-500 0 obj
-<< /D [ 497 0 R /XYZ 93.716 139.127 null ] >>
-endobj
-496 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F75 338 0 R /F74 337 0 R /F64 333 0 R /F15 334 0 R /F65 335 0 R /F22 367 0 R /F83 414 0 R /F16 336 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R /F59 346 0 R >> /ProcSet [ /PDF /Text ] >>
+499 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F65 335 0 R /F75 338 0 R /F64 333 0 R /F22 367 0 R /F83 412 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-504 0 obj
-<< /Filter /FlateDecode /Length 3211 >>
+506 0 obj
+<< /Filter /FlateDecode /Length 3153 >>
stream
-xÚÍËŽ#·ñ>_¡£}Ø6Y,¾€Á
-øÃß͵[.  §=®8MçlÎۯߑ£6_%ºÑšPЙK7¾G<EAk·Ñâ &†ÞN±Ðà6tóFëXR4β‘±Ê| ü÷ˆ¯*ΧKzÂ[ãBÙzv90z a¦•Q§T(7mêБ»ô2ºSÄ„]Ç Q™ò˳¨†·P-‹‘‹ÏVEH%ϲzóo 浈wFš÷Ò=ÕãN=Á£D¿Iuؼ­"œ O™å ?9ÒïðÊ\Võ20hÙÈ1òR¯šàd;dF‚f.yƒÕÝ”Û|ŒÕ{„ÉÚØ Ùè5YÕbeeEµGùWZ—. †Ö¾v¬ü­
-?hZ໲†Uº‡Úbr‘ôÿ_¾|}ùw'äzCMB®ÌfÉsþý×—ô‘>„p!³dÈ[þöË//¡—=P42`¨ÍL©Çä YGši4!lÕx
-ˆz½ËoAípóÀ8±:™Dë`{>d~k‹º±fdÞõ6ï+¬<-‚íU?ì¼eÙ…Y÷lѼ7«Åš_ç3°×«Ú^j]Ä- V*e¿Và{ý‘þwÌ=¹*˜ êR_œ÷Ù§ˆ½ýÒô.Ýjáò¯rcù–¥ }Ä%ÏÎwÜájvží4`2¨EWYª<²|JôÓÑ$é^8GãÓ©p²Y¼–3{.òJæâ
-’n¼bc¾cV3“\U©ÎHWq½ ™Õò¨¶†UP•ÓzÓÄ°Ï<-3ÞÙ®ZEK˜‡ á‡%Š‰5À/8€{Þl€?wè$º6êvŸÙDÚl"-Y¸;·C“Íbw»ÄÚ9"L7XÝš±œ`šdÒ\¯¤ ‡˪éDçÀÝ5É×ç2·A„‹ÓqCÛ’%±TsNÉ0•s,zIå E¡ümô³¼;)*+Œb¥ý’’©bMwU~Ãh{ú Ó½ïÐM¼AÜ>îò[z ?~ÎÜ;‰—m°ä‚Ò=ô# ˆ6çÇ›·%„ø+¡3³cÞ»dì€L…@B⯠‰ð•½Ù‚5 ÛþÃ'=KÌz› öZ¸!m½Ý[L_“þ»Ì3½×¯zúSl¢áƒZÓ=)ùnu¢sG3ÇÜ毅^~y;KѸ^J°Ò U«ž÷ûQK³FQ…\=àïþó}ÙáÈQoÑS”0î ùDiRDWäè;ø~dÒYÅqtÓà]åO¿«Œ"ªX£Þk¯Í_[x¸¤b!¬âøì cä:<Ak
-+5Fj)‚ÖAGZªâó´¦üI£qüvÚœ»FŠ¨Õž2Ÿœ¦Ö
-æCJæ[>&e–y '3#¥Øÿ Ë…Š%gK²X–å4K–uIUÕrK‹Ín9[²ÈU¢‚Dº°øÿ•5·í–:ÜÊ–k7ÄÝC~ÝL_PXæÚ“|L9zÍjKÞ -ëÉņ9/¯Nµ_…ÐÜE2%eð…§R=sé %t¸£ ÎÒwžSš°ƒ0æ4Qo–“"—Œ¹,úœ"´½©3fmFÕžœ“'5Aÿ£ÕÞ =ôó©)aəŭ+1\ ®ÙîAÝg•#…)Gâ•w*Hwdþ± êÙÞnÌ9³K&ºÐ^~SµÜ…9õ*;Ê€àÜZ[ ®XV §õ‰Úƒá+«O¢EUjÙû&@ ’h³TåÊ
-)­§¿è¸-Z²Š-L$Û2(æÅ‘®PȲ3sîëʔ᫡KÙ\Ëî›óœš«Ï …o‰VPs*Á³ãËÙbÍìîe­h)[Úá¹(RŠÌRzj=“ÙÖÕ@Ä.]VI£—1:l6 ˜[(GBÍ:p”K<—×ÊZyÚ.•$j†-:K¸*'[aÔôka'ü«\ŸlJìŽòÛäÍ´Ð:ÓÁÆÏN-Éví)¶ÏgÐŽíú©‘(KD€¥‡]ü´wÝ÷ì5¾1cßܨ«‡è©76'Õz$zJ5sÓâúKï+~çqÐÿ½'Û{›kGˆSV±õ¾û"ÌAn33¯§™@ŠáÜ·U ùLosŽ–Àÿë2üü©KÅa³ÑíÎý˜X«¿w³á)B5ó‰Í‹HÂ\ù»wÕÍ–¡Ÿ¥¸Æ!e£vŸâ2¾·^‡yêGæ ªøä~zͲ.C+ >òÿŽ2¬AÜ|À-Ã[€x\†5~ìØe's;-¿€-øŠ'ð²Ò`ùø¸‡zM‚£Âu|¬„ka‰DG¤¬á’twkìþùb¼ X²±C¡ÿ¾(ª‰ö¹h¿ƒêîÝ8óSs'©®æÒŠï@'«®&ø¿-Iƒ¥ÐN÷•¤' O•¤§½#×åQ€qç‰:ðUQo¦ešZŠž`ãã$Ô:É9¬°“âõ·•ž…Z#ü¢øB¥tÑO¾þ¼/üOûýo )ºÚ­^óâ†
-Öüø(þÈí§³¾¡UÀ|‡ý#´äBü´×®[.L%í7Ä?HjGØ£Y~ŒBßÒšß*e“ú9~'2&_Àß~š
-àr¼ÊoZ7MÈ$Í¢d´ÀÈTJâçò3áþò³§ÆÇè»Kîdÿ¨ÕäÂaÇ›µ3ûìbÜœ‹óy­>r¢=@IUˆ»½Úí©y±”BÏZLÚ§"µ˜L<k1ÉèÆ•[Mï-R—4¯}ëI2i™§Kñ¯t©ë)iG´2áhLë ‘(wŠ™‘'¶1ôûÈC@ó0 W5AxÙÑçz|øÁømY–x»Vvš$Œrå¤@<ª …Vˆš¦GÚáµ#T”CM™œ«soRÜYÍ1ñ,—KÚÌÓÄQ ³ü,%Ÿ°.ùТØÕG=î'5Ë
-×M óDxlŠ¡/çµ’wŠ«Í§Rüø„WqK•÷Ô0’)Î53â>먀·ežì¨
+xÚ͹Ž$·5Ÿ¯¨Ð
+–K>ÞÀ`€íémRdy2A‘m)6ûóýx<ÞU]³3‚¼‹ž®ª&ß}‘Å™Þ~Ù8þýöáòòðñfÕæ™7`ÔöòóƒØ8þ›àŠµ›5‚q#¶—/Ûœƒâxǹüöœkɹ¢k|®®é÷po Þ»4ð>å1—ô Ïãø0Ç)˹xÆû<Çʧ4®*]…õá’á¸ô #|yI×FXl¯nùûZLJõøˆŸmp÷™F\_«4"®ûôÓËw<0Yøñ&ô!ÿ$þ¨ø'Í““„ÇÓ)Ë®,o™³å—ȇŒGÀ9àD<5ÐΗ–î¾æšh(r¹$9Y—yìÓ}¢{ §bDOª„$¥ºî,ß'pVÀÊZáNB }^$$f|ä{âï¿léâ‡o Ç•Ì 7q\&í2—Nne–²(¼iVXY»{+jÏ´Wã\øÿi¹šõL¢NpÇ4W4^×¹¹ÀƒÆ‘,‹fÄqaLäMÇÓåí2?ƒÍ Ú£²åÕ5ŠœÂ¼Kº”l¼PZ*
+k³”F3Áý¸‚6Y5,T‰›éhV™ÑZ!}Âа|²É– Z‰f?Se8Ï­4ìJ¶H£QMR+ã ÓÊš:cžÄŸN2Ü1ÄÑ´£;ºFµ:’§ðŠY3aÙ‰Eçše§Ü¡Ü
+>óžªÒÔ#â
+˜#§ÎÈN³v3OH_Õ¯äœXϲÌñ ··Eœ²9ÅÜÍéVNNeyØ\+è³®aã<*€ÃÓ”(èÖôÝ-Ó,mO'Ë{Òâ±–ªýªµ«ÚBk±|6ºäLãZ‚OåmÏÿ;îCUP˜êÒ^´Ã¬­6<äçjw(Y„‰w"g˜éê¨\‘Œm¤×Ã9DØì§AùRæeû)~€ðH`þ4< ¶— ŽÙEÿ´BJ’¬^ ”Év«óÈ,Å$Qe•ù$¬ê&¸bR“.êz%6óåRuL6AžVk]S†}i³à­fX~µEʪ»…ñ(1«ƒŸ»æõn#÷“ö  ä^LØ=gY›yw¨ÓXŠÉŽ:*½ÚŒ0P°¢:c9ÀDÇi]k£©Ì¥V™irtÊ¡cÞ®“•Ä|빌Ë1ð°!ÌAA—f¶±)ø¥´N€…?â7=Á$”Úu]˜Í³}ÛГ<ÛìçT›ÉUm­…ìåÉ0}‡kƒ Sø1¡|¬7±„´Ù²ò™âŒî‹Èµü½Ž ܈ɓ™‹ƒBù²ip‘4ƹK¹.^“Xƒx 4 “ìLìlÛO^éµÌ,Ô °×ºu†µ…º[«2eø·ß‘ßëŸZþ£ 4Ú>ð5¯•ÅÌgøÜðÌdiçËÄ/»¤Ncîf„Ê«@á¾e•õ>Þ$_:5ÌÑ0ájÿí¿ß¤fÙK¡—Àé
+¯“c#¡÷9}v'Óg9¥P~SmCJNŸ=Å óÕé³@×(”q|;oŽã"¦Ó|æLNNëj
+’:=ùšâ¸¨r/9èbÐxë’«¼–í®J_°‡\4ÊQš›³µŸ’¿4æZSݼ#µpåà™·Ó–~UKvС@/%m×ÚNì^ååÑ¡¢¶£º J1©^"ðI¦Ô:3;µ a!l œQ£ö”ÒMú‚Æ ¦ƒarǼ.ƒžC~6»:)×nd×ìCò‡áj€þg›½TøÐŽ«Ò&IÝö<ø™Mƒõ^äX ¹¡@z—]ÔsåÓž°%H]7 ÖÂNeèÂzó/ÅÊë®4s§Æœ°Úu%²=Œû¯­ãK«­ ë¾Uî›] ÈÒ®B"k¦–\A}5ȵ¯2yOÂÕJ;tZ2“t-Ÿ´;´e°z0
+ç¾­ µQ:R ­Ý ‚r‡ÝÓ
+SžAÍÞ¯ TT„…Í/–Šv8±ßƒÖLù ÏE‡’tVc""T¶îh(¥NÐœFQ£U1¥&¯ âöÉžNç §·Sä±µ–ÆÒÓJTP¨6Åg:·6tQŠ¯…›°D°zå†Ä¤oÊàwmÈš:Àe:Š¢‡ýœÁ 6{SÙ?AÛ÷ë‡N¢?;CM8ÕäOsè¾çÿ‹»°ó)¢º³1n·Sgª:›ƒV="ÌÐ…–ÂMP|h‰žÛ}ÇyÐÿ}$›’½&ÆÀ=DÊ®En=o½ŒçI²0Î7Ó$þm­Â¼&V¨Ñø_·îöû¦¦±ì×}Ÿ\«¥»úð¡ÊqÅEh÷A^òµíï›Öæ½£r‰§à ­ïø^[Cìd¥>s˜ ¨OÜL/uB´e¨Á3)ÿWô`ÁHfA½k´`Öøý&¬´ýv]Œ2×Ãæ+HÏœ¨ Ÿ^4•>ÖÏ0@0«lËœöç¸ÖxÍ|=¤E[»%w~ ^\2¯\×ɽ«Ê»f"¬dZØ ª¹Gq”'ß—N0] YJ+¹ ̼—QG:Ð-”y[Gz
+ôVØQïúmgâV?>q)šOÂÅËæ¾ÿ0ßîÈFšhèÃèµ<”ÇbÁ¬åñ^ò!ꇵްS#ø„ý^æ>ü0WÃÁc!-«}¡÷UÚtï”Ïñ‚¸ÛZ 4“Í6à)aÇ“™¿ntõýÐý¦Õ˜hºß
+½‚ Ýï°KZºß{LJýðcåp噹ñ>ÆŽy :ÀþÞ6“ÁjÝM²YG²÷ÀÎ{f0ÃÖ«Í‘Ó,aŸæî˜NÞ–§L½S¢¤>ü•Aƒ~ü ÿ ?ß
+¼Ûþ~Áh£˜aÚoÛ?P£’Þˆ kCÿ²JÙá3Lº<0ÃÝâ°ðÇ›–›ÅyáµÑ“Ja6ç™õz÷˜—÷Žy¥ÃúÐyW0ciÏóÇ¡UΩ îé¸o;®])Öœy—í›
+¹ŽlΧNo«ðî8Ñâ½ yæ(/W§Ž¶/¹.f'Zl?<Ù¾_èdã@¥Áåò¥
+*¡#Ÿy­SJ¯i!¥ÒZ_S¤æ°àGŠŽÉ=ª´ÀÄX«زëá‚Í/ë¾öÅ j¹ÐIªt¢¬”LÃ^t×”‘ÍFP£L¥Ód]9í×(®MðÀð¬%å½*N“¦×'¬{짲9¡4ì60êQ¾„@‚e¬B–ù± }©oÃQ›Z!Ô1L£§‘u_oaYºQ‚_cÆ šÈP¤Ì6ïÊuÜ]±{¦eüjzûŠ¹¦É{ÙH8 ©Þ7eÍö˜E0P~
endstream
endobj
-503 0 obj
-<< /Type /Page /Contents 504 0 R /Resources 502 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 472 0 R >>
-endobj
505 0 obj
-<< /D [ 503 0 R /XYZ 78.37 808.885 null ] >>
+<< /Type /Page /Contents 506 0 R /Resources 504 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 475 0 R /Annots 509 0 R >>
+endobj
+509 0 obj
+[ 496 0 R 497 0 R 498 0 R ]
+endobj
+496 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 430.922 737.023 445.647 747.972 ]/A << /S /GoTo /D (subsection.0.8.2) >> >>
+endobj
+497 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 458.598 737.023 470.553 747.972 ]/A << /S /GoTo /D (subsection.0.8.2) >> >>
+endobj
+498 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 346.259 694.726 356.686 705.791 ]/A << /S /GoTo /D (Hfootnote.23) >> >>
+endobj
+507 0 obj
+<< /D [ 505 0 R /XYZ 78.37 808.885 null ] >>
endobj
105 0 obj
-<< /D [ 503 0 R /XYZ 79.37 771.024 null ] >>
+<< /D [ 505 0 R /XYZ 79.37 681.999 null ] >>
endobj
109 0 obj
-<< /D [ 503 0 R /XYZ 79.37 555.106 null ] >>
+<< /D [ 505 0 R /XYZ 79.37 467.789 null ] >>
endobj
-113 0 obj
-<< /D [ 503 0 R /XYZ 79.37 186.744 null ] >>
+508 0 obj
+<< /D [ 505 0 R /XYZ 93.716 99.26 null ] >>
endobj
-502 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F22 367 0 R /F15 334 0 R /F74 337 0 R /F81 377 0 R /F75 338 0 R /F77 339 0 R /F30 341 0 R /F66 343 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
+504 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F74 337 0 R /F15 334 0 R /F16 336 0 R /F22 367 0 R /F81 377 0 R /F75 338 0 R /F77 339 0 R /F30 341 0 R /F66 343 0 R /F65 335 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R /F59 346 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-508 0 obj
-<< /Filter /FlateDecode /Length 3039 >>
+512 0 obj
+<< /Filter /FlateDecode /Length 3505 >>
stream
-xڽɎ+7îÞ_áhEû4 ÄÏíLNyè[Ó`’à ‡Éÿ†”DíU®z餷m•DqIÑüòû…_¾¾Ü>^~xs ,Xiõåã·øE\\`Ê]œŒ[qùøãòËçRqn9çâ |¾]¥‡1mÓ»’ð,À Þåýúª¥Ã§iT<,>Q×Ü97ŸàH€£¯¯L–é…‹qKí<-ÆMŒ …öžæöÏÕƒFBFÑe½þúñ/ ÛéÙÒ*æÂLø£ˆïòÖ|†gš§1Ä^ßÒ ™„„âs =íºf¶2–9¯–ì¾›ü’ßÍ<üFrŒÌy¤5‘IœdJ3#dD…ÓˆÊäF2}$oÐ˜à–ˆq² {]_•Rƒ°ÒˆÎpQÏê(!C£ xÙ¹Y—D“qThâÉ-Ï•ádaâÌÂFx ú*Tdî’6%—…4qõê­EÁ‘ m ¹‘è8+l³ÂhbC&%“ÖŠ5φ)· uÅž–ßZ¤C lE¥¨ry’È°r{+åòZŸ^°m„Aò¼©ˆÙ{ð„>O˜ÀØ—( Î º/øÿuÓŒ³”„dR„bNÀN£ª\Ã3«‡ý¢nؼ§3°eˆàÿ{é¾þTvF2ì´oÖ5Ôa¢Wó•þåyønЋV''³¿fâOqkA1/fÌ\Z‘ƒý³ÀzǤw´Öz’|ÆðÞÊ´uR¤ÌœTU*ÔÖôÍes×­ÿ=«
-ÖÆiUa%i×*’5À4ŽM'Z¡‘&Br°–Éêf þEq8g2È‹Õ† ]°Ô¼h8:½\˜aH¢U««&÷mëžy'F®Ñ@Pª %ìé˜m˜È&-@{
-H“dP[þìúôëq’S4'äiHòÛ3 笑ÙçQ?ß'Z¥A¯qÆS€ ™÷aÅ·KAÒ<SR·ÚÜ:Š'ZL晆—½ü‰ôå[´¥G`àµÐüÞ™¬í1˜â @l^Ì|œ„åß¾Nú9¬í%Ó!1já°rÇ$3©L\UŸçÚWÞé, =l}œ…B ZÉv ·‰
-ÿ.ã{äëúÑ··zøÉù—P„GÛõJ0 ¨ë݆l”eO³×ò0à ½\Ëã³äCÔ{­½Ä!yå¸`Âþ/áñrZ›=÷ÈËÌ%­˜”“Öö°û³á7ˆ¿=¤µ¼A“¤;#od!D9ÑñZâi
-ß?^þ7##=Äâòï?7— áv´38ÿüÏå·—Ÿw˜óè'Ú4Pò Ú4óæs¬R`ðˆ#|É×Ök}Œ
-‡ÙëÓò3° A07î§ù[’\3¦µ¶$Aú³à Õ¼Ø9!¹g”s]þ˜s½û˜dìV„€M€öåúê„ïBpHÊxÛMiq
-o+
-bkW(‹#­Qé\ªq€»ÎTË$¯!W['KúÔ$á5UÏøˆÐâÃËHÚ t0cùD¡RÔ'Yïóü±fFå÷FÅDš‰$­ŸÕ°–«î±ü¨Âª^&Ž×ËDh­EÔšRF ­‘‰TM£O˜²bý1v„§ìX‰Ôk&uµšfýD$¬J†Ÿå¦vÝ€*Æí³q§ù0RJe½Þ‡*OÙ,V—â·¡¸_ŽÕL ?Ò©QÅö§tš97­´HTàoµ4W럅ÜJ©Š1–:e¢ôVÕb£†m·Þ§v"‰5É'‚xŠY,\.ôÄIˆÞTëdô}¬á‘ë9U2LÉS.’þðrûTÔ1û®¢0¸à…ü@6å‡ê®’{Õ]¿WÝUÄRtÙT£Ïäãö‹`âDeä\C¶¹¡ ívËÐ."º«þ‚~ïÔ¸ëVp¦jßD„bš4!ˆ–¢þmö²Q­ã<rŸš'Ó(3JEÏOEãOçX³ÚãÚþÍ!VÛ ²MM[ÞZ‚zÉ Gr|Ë:™íÎý8ø
-qaÍÂ2ì2œ»\ ï¤äÚ¬ˆrëž /Ô¶¾Kµ¾«^‰tw:ÇN«æš`ÿÒ¨Ñúî*‰\ØcûÂdùÆ݆,Bk1º€"ÏÏ(´ç­½X‡xƼ5kâÚé^Íó‘Ej Z®$±6ù{¬P™±+RÚ
-âh1nÎœê<=â0uy&+,¶y&|ÏÇlÀJ&• uý¯&yQý®’µ™'Þd{¾ßm°c+ž:’5~wÞŽ%åäqþ¸õcƒý/4ÅX°–b%ëØiá3·b§ÈEÓÇ­¯\Ès­™¼;Š›æµDØ{ïªÒz}˜“ÆOÓ¸uäl:ÆT<ëb¼6FÅô²–ƒ‹éX©$S›LϽÉ.Y;ÊR5+”'µ³«ÖÌÚr—_t^÷qüªƒJ-˜æ®;8Q’ZßõÓGß©ÀÙ»¼—g{rz>À2&M͉º×G«’ÌUíÎe7¥íHN!å*Ð{úNmh¶Ì¤À¨Êvêè)k+e=·-ß÷“(N£rßw‰F1….±[Ôxz¢Ú²s‰á‡oªŸ¨˜Ú¡¤Urew¼i«'U^\Î"ßX^Un #MD…ýQ§ã·ç9UA©? š$ñ*Ñ´ŽòLßá~ÁG±Ä°Å'E,¢P]=—3ԉ͑ÔïÑc,Ë
-9QúD‘}€¤dZuºLqÉŒTÿxcà¸ï_N~sS?×,¸ g³ï¬ˆ¡¸ÎôF‘‡z‘ú¨±RI9ìÙ*Ö'¨"Þ( %Füž©"‡äÂ…qµèÚÒÓº›mC Ê ðš Tÿ»ï×9“3m@0t—£vêa/ mïzrá®>[ÿ³{óµã9^j­`i!vÕÒßÛÖàý»¼ý¶ÒJYÁOµeÖí¦rZk›$àY‘³Érwý›ƒŒ²êèiÌg™„~äW«L{ǼË=í~™Œû +³ûUHTá„ùçýê¸ï'ùÕ$­Ïñ­–þ²/ãÅDÉ)+ xè ¬ J«u?S¨euŠ´©ZF1ßæÏ šv–x£™YÒ¦œEägUIδðßß°‡}“xG0£@q®">á<ÓVm·z—<ôÖ»Iy£ò^Û·±WØ…Ý6paAø²3ô˜Y€"¯F8¤ÎN—Þæ@ŸbCù¾ŠR§×u݆.ŒfÆêw;hê©r€K4Å`é}Ià§3çŸÐJ’Ðè`¦nÇó‘W=›%¢šÞüçX‚^:lS nHDqfõß ‘nqšº)Zã‘}+ZÇéÓ3‰™¼ö¬Ô„gÖ»'¿_˜øÃ-sªòG™è3\Y@7B+’>`gŸ€ ,]å6w^G¦Ulæ
+xÚåËŽ#¹íÞ_áE©Ðh`=ž 9e0· § ›C°‡ìÿB=¨w•íIï\²@¯m•Dñ-’b¼üë"/__®ß_þô®õ%ˆ`µÅË÷__=uqA€»8«„´êòý·Ëß^¥´FJ㥄ÀŸoŸ””2>Š?ßéO¿}4‚×øKJ}}ýšŸªÏ4~£?·:Î)³Õ;äÙ6­È3 ÒÓ´TÓ|ûû÷?¾Êœà‹ZXk_$äl µ6~û„_ >oeT5¯y3íã•%ü"6§ƒæ©6ðBLóß´£O'ßÒúD1Å•ÏDkàõXÖ3¯Êæ´‡³íIÄo<?î΋3â÷ÈE¸2Y#Vñωk#*D—Ù`ý›/ –øiä„”ÈÑï=êÌ;¼vŒ
+¼i#3;*lfE&85xÆdÛ[‚%<I¤pU5¬ ;Ý:3NûðÊb£XDye
+xFÜ·*d(ê×Vp<W3Í·ÂβŸ±Ñˆ"fÅýl]S¨fø­è^Hûd¶[ÖÎ&l¸%9³
+ˆ‰03ñ½o¶¹Ê°[!1ðˆ»Eöñ¯l¿Eß‘¾#’õ4*GÓzfȬH{È*„мCÛmÓbýΣ£Hv£’E2Ùè“ò™ÁCD}äg2Z ˆb~ÂÆU~UÃêŸG°°3v.0cµuYãÊ
+=z¬2zc8äø—&³(¶xê‰%ºH&Ê`\T}wyT¢y6›7R“ù¿Ç§ª<E†åïïpŒÕ‰´w’–V¸ªå¶˜â¬›”1 ÎÙúÙéÀµi%‹1ûbÀŽ:›GÆmýÛ²Íp¢‹é©Ö‡Övʸb²’‚¶9g—U,2NŠ#úÿ×—/ß_þS9 ÖGÇá$CqÂ?~{‰ãÉ„ÜEIüþÏ˯/¥]LápçÀáä" Öʸ«¤ü‚Jã¼C'’SrÑxá!Ìô:ØçéEœ±éûƒtB­ë‰âÕqŒd
+Øó†´1ó¨düÞ‡=`|§Æq494ŠåÄÍ¿£Í«0©¹QÙNÓgÚëz´GtïGÐÊÙ• D~¥óôÚxZbˆÃóÐ+t N<ØžÖ9!ð§ÞRXqÑAwñ
+‘ãæmŠü
+g+Uu¤¤$\SæK u :p€—LóŸ + Mø(¸é(“oñ¿ìNçÇX Ã4z‹ŠP 9½o5áÊÿ‡Ì¢à…šŠWRñ?(Ü;3¤Ãlι”t@K4š¦Iµò'øBbÞ‡-_Ü) YÿÐÑ)$Çйswt™ž
+¤?{ù=ðoÉ¢NÜ%n”ô({£$íŠ÷n# [Ö
+ŸæDtÊ×o_W–ŽrPX´pXxb’…L ô½i8öe£gXiaããüS*ê”ÞaWò:) þw™?W÷¾m˜5ÂÏ·¹ ðøk¿ž\£%Ô§õî@4`EËì½<´MçGq|”x˜øq«½ƒxHZ%.˜q„‘Æ ¯ç¥ÅiÏ|,RVH÷iì{<ã3w„´—µD¡TxBØ‘ƒ”¤'k™¥màÛT¯Èy>.ˆÚÓ€Ó
+âGLË%òsUš(ù
+½`ÐÇSÿp=e—ÖõÊÌþ’øý)~6wüÏæ[ŸsºÍÚ½JÓ‡ªZ_ú†àóK¼ófÒFYÅúëq/9¯µ]ø¯¼Ùå·§®-Úˆ³3ÕÉɘ;îÍ
+M‡û̯^•ö »;µÝÓžȤO±Á´²Èñ —*ƒèîîšG·ý ‡šeõ1Nµ“ÁÖ±›®&Bžq¬Î+Lo]C0Ú,hx3¡UÓÏުܾYÐõ°ôÿlÇúVäâ4… 65‰Ðš¦cӬ͗o_¾¿ü‹ì4Ç
endstream
endobj
-507 0 obj
-<< /Type /Page /Contents 508 0 R /Resources 506 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 472 0 R >>
+511 0 obj
+<< /Type /Page /Contents 512 0 R /Resources 510 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 475 0 R >>
endobj
-509 0 obj
-<< /D [ 507 0 R /XYZ 78.37 808.885 null ] >>
+513 0 obj
+<< /D [ 511 0 R /XYZ 78.37 808.885 null ] >>
+endobj
+113 0 obj
+<< /D [ 511 0 R /XYZ 79.37 771.024 null ] >>
endobj
117 0 obj
-<< /D [ 507 0 R /XYZ 79.37 456.212 null ] >>
+<< /D [ 511 0 R /XYZ 79.37 327.442 null ] >>
endobj
-506 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F75 338 0 R /F81 377 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
+510 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F22 367 0 R /F15 334 0 R /F65 335 0 R /F74 337 0 R /F81 377 0 R /F75 338 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-516 0 obj
-<< /Filter /FlateDecode /Length 4261 >>
+519 0 obj
+<< /Filter /FlateDecode /Length 3512 >>
stream
-xÚÅ\K¯[·ÞûWhi#0MÎð 8ˆr­
-aƒ·åŸ}õÃôËßéõ'¯cg/ÿ ÷þJKÉŒOcüëò×W‰ ›#™9›7séȃ6ë&’qkú&¿œjF:Ñ7ùê„.N÷ö¸TBƒaˆÖhï«–šÞ7ºS‘ÞÚ'S¡Uò,¨mñÕÄDkÏÈ }xdOèš~Ù-¡êÓñBvÈî+/B}+as¦XÒ&» ü†Hâ-mQÜHÉÀ›ÇÔ'tÍðˆða ?½%Kª¸Ÿ¾ù aH&æ+>£ç‰XÈðA2ÿ’Æ ¸}M
-áiVl–M8ŠÞ*MÑQ
-¯Ä0‚£” j~R"“ÁkÍ2JF›©æ†Ik‹¢Džkœ“Ÿ¡D=Ì9^Á¨0æü¸^{¾}ž­¿'Èéöû& £ d¨K…©wW{³
-QмŒ¾ûØ.9,sJ
-;j}¤Å½Ï
-kŒ’tꉇ=ñ¨‡úY“Ú—•õý&\ ¯‹´ënûQš¶p[R^FT8ö. Î&¯xö³÷ðOWm£ÑkP 3ì{ìáåZÈô(Äz‘iIrt.¯ÁÏÑ\Ôb7?°Dú)Ü$ëŒ{ÁEî_z$^‚@øãMÀ¹néí]K@î f=sµVB监²uÝR6
-©* ît%‰€ÕŸh ó$to mÒÿ2œúë`£ÜðMLÞàoAO ,£°Œœ¿;i† Up«´ à|RZ§Õ
-Pµ φzIÎ
-[ø|ÄÖïMb}£‘†='j°,þ¦Û=Á@¥5žtWî—]°÷”‚á´y5£ú½fɶ%Å÷(*ç×O6¯e3WˆõMYål ‚«,mœt KŒ^#à¸Í5BQ ßc«*ò–XB åyØ&Ë&5²ºÿî¨ý|ùæBÏ¿\º¯î $pí‡ô†éI˜ß®°f;ƒAb%bͤ£^-Ò›mg‡yF·óYÝ
-Pc†Ê-
-Å‹Hc ìØÃäŽ8·Æ±—Lê¤X‘ºx5k6ÝÓ&wÕGI ÓVŒ’¼˜Ôùƒ1Ú+Æîž—Ùè pÞ%Â63›“7R¨-UjUwG‰n+€Ï5qIz${ìB­Vd Ûï6ÃÕBgÚ»
-’”Zê£@†m0è`lë˜áëÂ)fÖk¡Ÿë!»—Ãðûø¤àcžÍ½™ït+y^¸&ŠV[º©Çç5–Iãfç%CLÉæ§rÈþù¸ËˆŸ9²‹¦ÖKÜ:Ñ™ó(ŒÓ÷p ,ºÚDò+i¾ º=¢ÔLH%Y¹UNÛdIRRn«,
-~iã{]f"
-ôô
-`œÔ<ôpç ˜0yÿ“.Ö½v¸‘—7ªµµëÄQ‚÷”xCš¶ÎWh
-$ò ËÍ2²=û;Zë;àu¶5á4Ûé©èû6¨ÞkÖÀ‹wYá'_-]3£»å©'P½sòÁáì"šÎù)Çz–æ¹9‰tWèWšƒÛ2oaü)½è ½É.ÁžQ¶5YëkûåEHÿį[Tø¼»©eŲ#æCHêO)Nˆ"ÛÓ†i×1Ú¿*Ç“/#‹çVÙJÜyrywâ·„aVŽ‚Ÿ–é­µàëä}ù¼°f›'“Õ Ð5Ó–®H§Øá-%C‰ÌŠQ°Ó¼õ4iL¢š”ÖÈ®E…êyƒÖÏ›ðx= ITTÍ
-^M½`ù¤vÑLóò¤Ë¤Ë@‚ä´+P!ÖªMšo‡¬…’Mº6~ À>õvÐÀEø5ç톾T…šéh]M¦ 3 ܸôŸít¢áŽö89ï“ÚJ½4¾nê‰öÀƒœYeõegÀC<Ëú­­¨A5ð[öóÆÏ:ÃSn5Lx4ŒÈÃ0ÎáÙÍZXáà„{9ÊZë"}ëPñÊáYÍZ~ð™bRù8²çnwdq
-_–¦JÕHÃ!-„ï¹þ}¸®x1Ž#=?˜ØXf‘ ‰‹”æ ”Y$V;•¬Ò²¡àb“–MwÔ™ïÍð1/jøoÞ7bÞUKuŠAK¹Hã¹Ìäšï[•¦e7å°N‚rMq´«>ìQM!ÓbjT2&|Yä1r¦JLÐþÐÓ0ø ƒ
-Ujv{+ƒ²ËIkùµ—Å-›Q{ed¾Ù?f¥Å4ûüÚŽ¬¸`šBÛ¡1á
-û…¬þ;þi!
-zj.ié-͸tÌž–nR€/-U„67XQ‡Å\ä42óÝð÷mxÖBbŸÑèÒµÇõ
-@ZõE¸¡’¶ùk”éOè|øøêAòK€
+xڵˎä¶ñ¾_ÑÇ]Ã%‹oÀÀíÙ6àœâìÍñÁpˆ þüT‘,Š¤(©Õž±ÑÛjIU¬÷‹)ìå_‰ÿ~ûîúùÝÇ›7—(¢g.ŸÿùN]$þ¯.>
+í/Þ)!º|þõò×R‚Á–R~®Rü6/xÏIiuþí"^«rßã'àuXÞ%XD“®~ÌuÁ‰h¤ÃoˆÏ?~þn¤ÅD¡¤«´Ü
+þùÉ‚Å;ꛌ®™
+úM«X+¥'Ê_
+xmÒ¥
+ÉrÒ §kµ™
+5Þ40“ß
+ ZxX<ëë3
+`ýÞçQ…–Ø9®µSJ)¸xÛŠzV0Ì¡²ŸµPïÿŽ«î+×yXtP?ýþóúíÓGxËð«Æ BЛ«Î¤Cφê]BAÐkö¬úpÖž¼ÞW£ÔñŒ=õ°¯º&MÅ‘Ý°%ŽTî†Ò„´Pž÷mÇPñ£zHµ,JDÂLDEPK6
+g4ÙþmdÖz…È0R¿¯aŽ ºŽVž´}ÿÕA|@ÿ6½¬ßÃ~HðN [Ë¢€PRõP} Rû1
+3.ù¨ÖÝÇK ÙeèAx 6?-Èç«¥DlBЧ3™ ‡}ÛT0¬õ
+ñ„z`'6zjih½bÛ`;ÕH !õO˜$U;e‹€¸ê›g­hä*s€O,Qüü¤½mæàùq¤Ó<‘ïÐPŠ0 »åIY'î+o?‚ÚÖœA_·ªŽ\µ+ãÕ²ué"®`C’ó³U\^—A£qeµ3%5V£iÖ §šÍÖœbžŒvÏùN
+C޸Ѓ6 bÁšfÀÖëªñí²êC¦À§T>ãªÝ2bÌ\ie…q+lDQÈ\lDò”öj™§$X¶%Òõ­âÑEŽîø1ö¥w0ÎTÛönWrÖ†ÔH¡÷Õ·$a"V7+©’«HU\%ýô=3gˆÂÙ%6°§NÒ‡O• £buºvù£þÃShÜ9å27Œ|Êe[\õDËfXtØÔ()éÄ“÷{ònâ™W6”œ°5Z pqÙ†™L^wÓ6´ŸË®©–pL. 1 &—ïXû¬Ùôho”¥QÆ̓J@ùÕÊõøB /¡MnÀbJ)t¿4'n|w+ülñ:)-öø£-숽î@YgÜ“Zä~Õk…šô>‰ß6tªw©^c9ìíšDŠÁÒÎ…Ðùf.ٺݖlØX-qOVFzÁýI[0ØŒQºo íÜÿš"p8¥û`3Ý«€@<'ø[’Ó:–é¨kGÈ›ÍÀ¡
+nKYâ|Z'ÕôÓëéHŽ*y} žo
+KE¿0•Rq¯TÜró”eÑæü-²Û ´¸µ6gA# ÁM8¨°ç  b9Ôm÷Ä·¾4¬Vþx¢ðbJ h~U>ÙËÙs¸øX¤À§”VI°T“X|™Ç9\LL÷`”DÉ,ç©+•Ý ž‘5»9O^†ÉTËéÐĪäÍŠ±QmŸä½7ëÊxÖ•9°¼|¶µìŽ ç'5Aaƒãw1~ƒ÷È]9Ìâ¦ÇbÜj ¡`uÏÕþÒ§S eÂæYÛ ïIE¸†SSÀæ0Ì›e­ùäy».µÛu,C„TÓuN„,ãœÀØ7b´3˜»‘í£n²¹%ßlÊt²º2»!´Y¥ù€Â\t8¡ô8æüy®ÂYÚªM3²æ¯MËÁx¬Èÿ\Öò³
endstream
endobj
-515 0 obj
-<< /Type /Page /Contents 516 0 R /Resources 514 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 472 0 R /Annots 524 0 R >>
-endobj
-524 0 obj
-[ 510 0 R 511 0 R 512 0 R 513 0 R ]
-endobj
-510 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 264.586 580.299 275.012 592.889 ]/A << /S /GoTo /D (Hfootnote.24) >> >>
+518 0 obj
+<< /Type /Page /Contents 519 0 R /Resources 517 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 475 0 R /Annots 525 0 R >>
endobj
-511 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 318.325 558.936 328.752 571.226 ]/A << /S /GoTo /D (Hfootnote.25) >> >>
+525 0 obj
+[ 514 0 R 515 0 R ]
endobj
-512 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 250.957 312.804 261.384 325.255 ]/A << /S /GoTo /D (Hfootnote.26) >> >>
+514 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 264.586 426.375 275.012 438.965 ]/A << /S /GoTo /D (Hfootnote.24) >> >>
endobj
-513 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 184.327 222.282 194.753 234.656 ]/A << /S /GoTo /D (Hfootnote.27) >> >>
+515 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 318.325 402.694 328.752 414.985 ]/A << /S /GoTo /D (Hfootnote.25) >> >>
endobj
-517 0 obj
-<< /D [ 515 0 R /XYZ 78.37 808.885 null ] >>
+520 0 obj
+<< /D [ 518 0 R /XYZ 78.37 808.885 null ] >>
endobj
121 0 obj
-<< /D [ 515 0 R /XYZ 79.37 647.132 null ] >>
+<< /D [ 518 0 R /XYZ 79.37 493.208 null ] >>
endobj
125 0 obj
-<< /D [ 515 0 R /XYZ 79.37 536.464 null ] >>
+<< /D [ 518 0 R /XYZ 79.37 379.723 null ] >>
endobj
129 0 obj
-<< /D [ 515 0 R /XYZ 79.37 385.61 null ] >>
-endobj
-520 0 obj
-<< /D [ 515 0 R /XYZ 93.716 156.601 null ] >>
-endobj
-521 0 obj
-<< /D [ 515 0 R /XYZ 93.716 137.509 null ] >>
-endobj
-522 0 obj
-<< /D [ 515 0 R /XYZ 93.716 108.953 null ] >>
+<< /D [ 518 0 R /XYZ 79.37 219.681 null ] >>
endobj
523 0 obj
-<< /D [ 515 0 R /XYZ 93.716 89.795 null ] >>
+<< /D [ 518 0 R /XYZ 93.716 143.906 null ] >>
endobj
-514 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F73 350 0 R /F75 338 0 R /F74 337 0 R /F30 341 0 R /F27 340 0 R /F32 327 0 R /F66 343 0 R /F68 518 0 R /F55 519 0 R /F67 342 0 R /F64 333 0 R /F81 377 0 R /F15 334 0 R /F16 336 0 R /F65 335 0 R /F22 367 0 R /F71 347 0 R /F53 345 0 R /F59 346 0 R >> /ProcSet [ /PDF /Text ] >>
+524 0 obj
+<< /D [ 518 0 R /XYZ 93.716 124.815 null ] >>
endobj
-527 0 obj
-<< /Filter /FlateDecode /Length 2593 >>
+517 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F74 337 0 R /F73 350 0 R /F75 338 0 R /F30 341 0 R /F27 340 0 R /F32 327 0 R /F66 343 0 R /F68 521 0 R /F55 522 0 R /F67 342 0 R /F64 333 0 R /F81 377 0 R /F15 334 0 R /F16 336 0 R /F65 335 0 R /F22 367 0 R /F71 347 0 R /F53 345 0 R /F59 346 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+529 0 obj
+<< /Filter /FlateDecode /Length 3233 >>
stream
-xÚ½[Kã8¾÷¯ÈhµD½BJekÝsÝ= öÿ_—E½,;NMucP“Ä–øù‘vKa/ÿ½Hüÿ¿¾]?¾ý¸s ":§Ãåã?ßÔEâêâ£ÐþâÒ©ËÇÿ.¾H ÿîRZ…ŸW)ÝMJƒŸð¿»H×MR½áo ?pø§i]ºÎ{ð²ÿú×Ç¿g¾V
-%¡ç›x%ZiŸ5D'órô]š‰Wºo€äI²&ÙÖ|tÊèA¿"g¢gŠ^YþGz/éC
- |‚¾ödÞ>€× Œ÷ê¾PÖÄ_å€=Ã×곶’N€s•æ½Ðó¯ß-Ø—âíH’2‡Äͽå¬Å;In ­·–®Ùdå·s ..Z¡¥gÆöÖþàg©× r‘…RoümdËWI°ºæÖœËËô ®ÈŠ=R¹É˜Õ‘Â[<r1kõ÷eøùǤl0B›Ø{ŽL
-xädÃäŤpñbP›ª{¸ŠkãJp¶Š4Ÿ"9_ø…/¼ú±t?Gé’çÓ:'™¿7kƒ²6EöÉoMê­–íZÓ.k~;§¹7Ú:F«GêêøØ»bzþ,‘Ò²ó(ŠUÂøš{,™QŽa¹8¿Î Y5ä:Î_é,?• Da­9¢µÎg+Z*í­“¹W&Ó¡á~Ü•½D¬ià̶¦Y´g;`F‘áŒÕ/DLçÄÆWR)acûrÊs(ßȧ´*ß5MÙ\€8A'êaM=å6pQ¬wùhìʦ)ùŽuÙKÇ?îÞ¬Œ¤λÉL].¡Ík kçDjÚœ­’ÝyÌ9xa¬]qö9é…s Æä¼jð+g¢æÖU‘ôd|ðlúR
-ú€àëE±)΂V׸ιÚùb‡å@” µ®¦z…ðB²ÐUÍ8êJ+,¦•¼$)FKàJ›YV›£j?91S„`F·„cÓ>¤èÓý|ýŽÒËÄ’ÂNÃK;"™§ÊzZiMÊ$x>\€éÀ
-%òÝ|5´ 
-G Ï⇲’N¡ºŸÛzÊ·žBNö‹=¦|ZƤɸ®Çd‡qZŒ«Aà.6®W|´³Ô´ß-÷+„ n¦°E¼‡R(­±Ä™Š)éGÛJ=âÎv±±·,­é’ÝßâÿC}@EL7v–tðM0)µ©a™É%Ýœ9pÒV>ô|X)oÖÕ]Zxìú`·¾v2Õ^°ç»}ò"Þ© 2¿Uâ*TïSrº>JT€6 ª‚\E´›«N¾òI e~ågá­I’d7”Ιk¢–pÌI›GÚÎÍÊTIË*.
-;¶­˜gˆ–ct“ùÜqAtFàÚY~Mf2&9!nÌÖº²=9±h 'aå¾¾1tÊæƒÖ´=p'bV¡ð(ÏÔo‡2•ÐÆl©ÀÍ14£Vñ)i”V˜¯Ì†ò±4J{áSZÚÊc:Þhé3AC–ó ù@acü“òòB.´rÛ†çY0~•yZ/è¥,ûߊë[þ'äÒÚ ­6r…©)ÚãR¾/ò¡ÁŽÈØ8s(°mŒpP¾ž
-ýN,2ª%ÔËö=OÝrÛŠ®Ü˜Ø£Ë …¾Uô;5«sžzwãýÌz>Ÿ.©&ý2ׂÑom´Cw8JzŸ}Ì&sã»øÓÌNƒ•›mž€Bm¿BÑÌ÷#'Îx®Þ©@À»ƒFŽÖ"´·2ïyµªø㜉ݛè0 _NQŒ
-Ó‚‰±3À†–y
-ñR„/О
-<ëûÉ™¯–S›ÚP«VÉÛ­/I/ 0‚ëi]Ÿä§|µ<òvîÝt›ÄëÞJ,G¾Ò=Ö¨ŽéêÉfQi¬}ÉË–=‹”¬’îež,?IlaqüÔ  ¶ðÅg:åìLe´pMšK
-ý³ h4GGÛs
-2üº ?æ‘Š=tR›G[ù~ÿ—HÏù¾Þ×.Æ]~®ãÎ}®x¯îúäþ¼ù~,¦†'MM¾šãJµÐYgÉã©UùtFëi¢BÞ2 Ó9 24”C¥‘úësˆŠXåÝ,æ %°ˆCÂL˜=—Ndýç AšÆ¡„9$¿ BS Ò>M‚rÍ—íU
-Ò2e”‘¥ý|eËo/š†!k•5㩧,¶g…n}ù9ðÃ…ig†¨,V}ã÷fˆFõ‡~¥y5}##uãʶeö(]=ZÈ܉ÌÑNc¸&¤+fjY°Ò6ß·¢â©¢¨ñyt©þ¸
-¦8ñ‡qB'ÝQ[VïÇLÁmLÖŒøI¬_<«ƒðãlÔ"jüøûü7i63õ’+Uº8ïd8—u“ÅÄáX„tì" (¼OU\çÆ~£Î!¹€þ¡Ì€ñCª¾3ií+¿á6g6>46‘"ÈCcª÷ã„Ž $&ÙríÍ¥ó݈Réuÿ5ÝÈóÝDë2§ÒÔǨ¡qȨÝÒûU~oú®¤^‡¥8×Sb'eìßÿZÐŒXé¼Zí+'(JùÔ”w¸³Q\iyºzêv`»s;CáQ=D„Aãä««ã`Æ1j6íô4uDSÄöjîc\Ðøn^õ½—÷’ŸiK!j”›U{.Í­úQ‰JÛ™nøLŒ¦÷ù8>c– áwÿ9€Î Ejú§Ì§ÚaÀ4à°¡ÇT}…Éæ=xÿøöÅW£
+xÚÅ[Í’· ¾ïSÌ ,Mà_ÕÖTi5ZWÙ§$º¹|JbâK^?
+…zæ8FÚ옾ÁÆIر°<Ц¶3ÕÉŠ\@* T“§/»´"ìg°§¼¸ÝÙ­åýaÅÁ Æç=ÞÝYVÈ!S—ôéŒ>ºûb`zåÑ*ïLWvf¦X®˜'Óa_ž™¾I–’pÛ»5{Ú’êö,Éõ–”ä’ÜéBƒ•Th* [¢¼¯Âˆ
+ŸQ…iUù]hÖ§;WŸž²Úݤv”jV{#Uv}e¡S4‹Ú~>õj¼f: úÚ53•÷ïa\·ù£ºÆÖ*ߪcV5éžD¥ÉÞäj,>Ÿ§"pzRx5¤©x*M5„&=å@“mìÛ26ë0`3mÒ4ÅäGØœg‹®sl¿uXò­i¬Óõ–|Ac:¿¯múMvÞŒè²SèS–1íPÒÚ=+OI©z$l~”
+){Ž+S=lT­e ʨÞb$9uOwÞ)ÃÒÓéÑÄÉ\²_Ç gjì€ûmžVsoµsÊ2EÓ<ª.¤ÄE·€>î¡4¼+h+@Ac7bù>ž ‘•6b³w#¶ Æé•úÖGR„sò®: ©SÝP?>‘L[EI¸9¨<ÄEþ
+7”¹QáU+~îXyˆ?­(½ôîAþ´JÅžsÖó/d¿
+æ…ò` K^ö´<Ä€ 6|ªlíaÉߤCT”{š0ÏaÛ©/ÙüɯJ¯¿õ¸‹×˜G1Õóa—Ìš¡µÙ=ê’÷gŽºÔŠnkG]jÛ£²[Au…ÚDòÅ|›#0iÎùLªÊÎG`vŽ\ðö Ù¤G øC§WÎÀÄ"¼ã Œ¡Tg%}ë˜]ÝRÚbØ뙡Ð~cFËʼ&)
+´cýŸßçãv½Ô߿ϧœÒ~¿>Ÿ²\iøóû|Ê0¸þcû|
+)Å
+Ç}>“…ÓÊS3eÑÇS  Ò÷ñ^»Ä5ï„<i‡ŒŽØØéëé K_pïÜ@–ÐÔÁËhi¯• Ñ´mýò+ÝÿýýD›‚¿ü7ŽüJæ‡Â*~ïß—¿øJ ‹ÂΙa?zº§žK‚ÛR-~ïòÃÿ†^Œ%îîgB ÅÜúv€P6G†Ò ÉOe;¤RD„¶>
endstream
endobj
+528 0 obj
+<< /Type /Page /Contents 529 0 R /Resources 527 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 475 0 R /Annots 533 0 R >>
+endobj
+533 0 obj
+[ 516 0 R 526 0 R ]
+endobj
+516 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 250.957 757.853 261.384 770.303 ]/A << /S /GoTo /D (Hfootnote.26) >> >>
+endobj
526 0 obj
-<< /Type /Page /Contents 527 0 R /Resources 525 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 472 0 R >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 494.44 624.146 504.867 636.521 ]/A << /S /GoTo /D (Hfootnote.27) >> >>
endobj
-528 0 obj
-<< /D [ 526 0 R /XYZ 78.37 808.885 null ] >>
+530 0 obj
+<< /D [ 528 0 R /XYZ 78.37 808.885 null ] >>
endobj
133 0 obj
-<< /D [ 526 0 R /XYZ 79.37 559.897 null ] >>
+<< /D [ 528 0 R /XYZ 79.37 342.967 null ] >>
endobj
-525 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F84 425 0 R /F15 334 0 R /F74 337 0 R /F22 367 0 R /F65 335 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
+531 0 obj
+<< /D [ 528 0 R /XYZ 93.716 108.953 null ] >>
+endobj
+532 0 obj
+<< /D [ 528 0 R /XYZ 93.716 89.795 null ] >>
+endobj
+527 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F16 336 0 R /F22 367 0 R /F81 377 0 R /F84 425 0 R /F65 335 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
538 0 obj
-<< /Filter /FlateDecode /Length 4295 >>
+<< /Filter /FlateDecode /Length 3778 >>
stream
-xÚÅ\9d¹ ÎûWTè öYu¶¶º°#“Ž ïÆðþÿÀÔA”Þ{UÕíq0ÓUï DŠúxªÄå׋¸|}¹~{ùã»4—°«,\¾ýò"ñ†¸È‹ ›vgå&¬¼|ûíò·W!¬B¿ !ÆÏáË*¼ª®B‰ß|ü‚·µŠ_B|AÄotUwnù³UD
-¶pe—é+=›–M0»' ®dqHŠ´6oTœ.°aÅ4n;?½ k©CùÛ+îËÂCBcÐDlñ-¢„ªHÕÞ÷j_¿ê_S«z£d¬I‚é餓Çzg!ù äͲ¿OÈðĵ{¬Zá(l‰>„kí6'ä3S£¿N-³Ù`§EYYkëÌP]Ê3ú-)iÖ³êD8hŸisA MÉw›a¬~mÆ'.gTz°½zœ*;&Pºj[y”`/kŒçá#ù¨?ó€½)(ïÜ Œùñѹ; ûÞ "òS8+8¿÷©¯ºfb õµÛbv½šà· §…:çîXG¼ßŒ3œ,Ái[„ÂÇBsÐó
-¦Ú÷žCÿ‡R¢»§x×Æé9Û©–îb´Ð‰9q°Üèþ˜=?â&¨ là/>èLH…Þ—‡iø¢²\ ÄŠØß«!Á»~¡Ðùj¯šùJh–«›ØB =ñÿ¯/oß^þÓ uRyÔ0›Ã⿽Ġ7¯íEŠ ÐîÿþÏË//Á]ôºƒØÈ¥òŠs{ ‰‡òS¡¨7[3ÉåØ»ö«y)èmU¯ú\íñš?‡v °²W‡p^¢žLjJÛ8ëÉ¥G3%ÚÆ ß!YÆ‚ÚF¬´¦Ü/zIïÌr9Ö}ô“3΂|
-#ä±ác
-xø )òn-šç1mѲϣýÏÜP€Ú*÷Æ* 0ü(Ï—}Ü}k´~̛ƤôXµ0Ó²ä}y„,ѱ$‡Öý¬Ú75G……³Š `ÈÇÃx ª©
-öS1†·Ù
-”­&Ý‹° ²÷tóûPDL ›î¸ÀW¿<¼cŒóÝ´B®³6‚CñA7cr­ f4 }Ëò®S›•ŠSë·Já}UŒó·.0!þPkÛ"[í®–ìÅë½0¾Ò¨Àa]À=¶µov0¹ßÝÇ1€6É+©®]ôÇÁ …¤œ)‡×±=%(ûe(Ì[V´!œQ!]‰|©1Âñ¸³©?')²K1Rà$³«»EЪ—Ï®WœîNa”6kQì‡Q»#4¼ÒêiòŸö€‘Ì‚Ž&#e|4ÕWÇ?ä%§Í[vR­/wt›ªÏ*%#Ÿ½ô…ó¬†êNâº×íß½äýÚm @—øXZ—rñO9l-g} ,n¤i†müÈÛùØ6k9wÎu=¬Ã”žsWA|ØL‹ jAjAÜú\Oj«™‘šmwT£Áú$\ª+9yÃô29:i·§­á5ž|µïé;7¨É`Üx~Ú|s„â³Òu̘RŒ¥ŸoæÂbiÞn¹ý=9']"·õyP"Žüºq6:%:éJRÛœ¨<ôÂКZ ºØú<ˆ”à1ø·‸ [nq0P™°Š@Ù×f*þáugëµVí͹>ÓÓIάq&ß©)ÇJ5•Óˆqe¢“èrb‚®¼¸§x±x×à×ýƒ·’*­]y–;cVêÚ”2ýë: ¶†ŒÂÉÕn…ÛIÊbd.†­ßûͺ'÷ ¥úðKÄ»C>)‡Ò¢) -{×ðPÞ‰m ®okÐb±!äÚ‘¯?üû‡COu­$“Äz£SÀ5¥
-:`É%nâaÕ˜¾ð}¶>żæOc %…y„?íÍ&åÄ ô™$å–oôÔÀŽƒÁÇMjóVòÁh['Ы†
-ï(ýgaW+±TOÂó¥»Za”2–Kk
-pÆýuqºÔfQÊݬ¹D­”èB
-¡Ú>’5—à‘œâ|ô
-¢ÉÎÝÑ ¢œâ ;üØEb'™î5í½}§q”‰ã5¤¡×Âðöæ–M‰»Ð9º½/`ë]Þ›BWcÑ@¼Ž`§ëïc¯nA }¤ªU“˜¨uá‰õÇcëç´·¡*ë@ŸN²y_ÄÏñ9ïËR%ŸèT 0“‘dÅÃñÚ8¦z9Å—Pñz(­}¾žd¿£GÀ Zn5§çà8$>:)Toö¦k¹ (BIæݽvf2=Úí/¦Ã¸« ÛM×±t®»ôí¤æ±G%õc´80Û…ÞÝ>Š¦n¬>EÚ¥Ò0©Þt뜺Dž:ë2<µ/N”“WCãT_HOÿF÷óúUÁÄF+;-Ñ“Íõ!d;Rcu•Q9tЩÂØ=›âX˜ÚÏ[â%Bª1œÚà !N 8¥©UnÈŸT‡8]Ýó‹ fXNü"¥ÑU‘#7g~˜ÔºÎ¦•sÔt7ö>¼Ö9™Æ8a²ÈTíÝamYæ“_ºã¹¦fL+§Y¸$0]¿’Ý1°Ú#”vÙη.˜'¿ýä|sžÖ]ÕàŸúŒ3Œ­«»w¹hû½eYÓœ·O2Ÿ½b¥€S¼âZ÷&xn’`'Föb+­»ÄvÍÀ9¿ÙSkù9N-¦µ\%4–‘?ã.$ 6¥—´¶)FnJËdÉkMYOf¸.¹sz£ž;_Àû–ˆAD½Q ÜyLãü]³ÛˆP`RLíRž¿Y†XV´XoÒˆ=>là-U4±oë>¿xöAMYÝX{À[çΞ4ÆX¹yÓ,ª»ÑNœQW=¡O–ÂP’ÊRºµÌq»J:—¿ÍoUgF¬Jž4Ú1çl¬ãÄZLÐNÒ4±æ<Ú왊骋¦uÒÍíòeu˜ÆZÛ~-¨£’¡r|Klÿÿ×¥}þózd¢Ñ„7
-<펤Â?jxàåUƒF_& 5·W†ŸË~L.°.¹ñrŠë|ã)‹a´«‡²`m;ºƒ·©Ø²S£Ã0[ÅÇy´/ÏÆÄ’]Q)Gv†Ãz„Q¶r‘"Ç”æI@r£+tÕÒæ}¥¤K­Ï¹Ë+RA"Œ`b»k´ýÕû¹asf3‰²ÑùØê^„&²Ñwëô$1]MKÊÎ Ks/
-ÅÙ{´ ŠK¨­ž¨Œ`ˆQ4®·Ö›Ó5$þÙņkÞ͆±s`b4”Úù©ƒu,OPSþJ@XÖßUÞé:j¬Z8åÂvK[f8GiÝüÄ3G¸SX[çM~Kµ UdiÔmm;±ÞÜÁ‡Iqç´ éìÂÉñ‚‹Rrsž?ÓuÌA:¹r[ÕÛ2Ì %è˜%ÓµaÞ¸ÊhV-/P‚f,/ìe;qJ*ð©}ږé'‡
-cxijqÕMë›n«€uw¤À©Ö¦¨X[ØzžŠL™â˜¬‹Fµ¾þ¡üN®¢+õéJ›¥ÈHóâ .R{"ê“}&ãGJÏd@Ð G:êvò“>õ2.>']«üæéUÁÃQÝ<;`7' ›Ú?iÈÐÊl}±qžaÙ‹¡q‰pYìbŽŒ'Ü æXµ>mZït#è´›Ÿúnt¨¿fÕ†•Nò)ùÚú”†S|ª÷N2Åáô^º²ÄÇ|«·š™˜z'U ½Ó;î ŽËîƒãŠ÷’ ÿ'8Ž moñYDÓ§`õ ;ΰ¤~Í«tnšÒùJ %Ÿ»·’¦úþ@
-Q…n‰Ó™;ß+AiÖt<·˜ß[Ìf.ƒífÎñ¼V\N5T
-co'
-±F b……)g±æû8í7k$§È
-¤›:…Ï:ǼC Rœ2õtépؽ¦„ßTÄ$6¯¸x{­™ÖÇÀè‚.?Ëò_ƒi# :aôrLgU”§b+\Ëûò]kD£4 ¡&µ¯Í©8k?µFÊ#%ù4íOXðx^ÞÍÊÉ|ÇV¥sv^ï]c¥,Æþ¡3VwåøÖwÊ(á6‹Ýãè5åoêydês$Y‘s$å©ápF¦Ôu•ŸÒ§c_`jü÷<å©ë ð¬ŽìÎVËo´|ÈܪÕfžÓÉÕǦð²–y—¨m‘‡å‘§Ð7=ðr=Qœ¼
-´u Å‹;%?U9„ÅoÁÕÓñpUú%ž¹eƒWáJ5KÚþÌq«T‹Jkj bÂt£¼P:Ô{ Gˆ{ë'^» ³0º=Ó²k1ô+L ˜JEÿ®Ønôªõý¿ù ¯ñšñ½Ý¥øƒ|:ðYŒ ¶ÎEÙÙãB˲°5ìíšÂëî/»¾ÊïÕ5¹vG·ŽÎ™ªõàÔè·f ¡³Ã»]™ÎnZÕlª¦³^²/~Ž?Š´ß´¿SöëÙ¸q6:v§D'³‡üwùÎlòÿX´ †1‡‹] ´mú«ƒ“ßsËyFplþ¿Û²kc6‹ÀÊ–¦œ?Ð~|¢Ç‹ u8ƒóh7Ʌш–½ˆ£m—ã¨g*(ôycßIQGÕeªoß^þ ~9k
+xÚ½\I춾ϯè?04YÜÆ
+%~0—Õ$ÙÄfš+?#º-å€=¢¥=­Q}Ãûz¾¦%
+
+2äîLA–®V±Ô¬zžîh–žñ¾>Ç.ºPüƒÿyNˆZa݃¡…Ã㨂ðÊ¼Ä Æo¡3Ï%T^[¦xÚÖÝDŽ¼ Ê$t{!'~¾ åài¤þz Q½¼›—ù‘XŒCÂL˜5—7Ndþg„ NíPÂlô#I MŒ+>¿H¨&šW¦±´2’´ŸïlçÛ³¦Ð[S]kŽgÊ:Š-ŒÆ RZöv_ðÃŽ)›æ‚¦6Î…Þ)ö!ŽQ}ˆCWh¨å/RY2{8z4k”îÎ-d®DæèMcØ'¤;fJya%m¾n—Š»Š¬¦ÃÃÎûã(˜ìÄÚ ítGiiX­xG8f
+ÜFdMˆOÆúE³
++Õbãk
+êÁ's )¥kî
+qµØZÕ ®kÔëËÉ,}ÖXË6˱¿4OhíFÒæÆdÿ7ñØÔ ­Ô<Ÿi¶5Ùuêln.Ò·–—ÖØ}-À;eh—©EÓEóŒyMŠš]˜Wû²å:7ŸÈ­ÝUÜAèJ©°=zË 3dU l¿¶Mi}Õ‘Ïôl—R¿h—ó¿Z¢ép<õ7Ìdùøc0+ޖ˪BŠDT;¹¿2¬sIjÝü•ÈB=‰«çrAvÒâ3ne…ò3ÈÍE}¬Kï›"eÖ-5™ÆM“j^™žf%ù¡Ñ <å‹ÑŠ±˜ÎØI–ùÓ®'šL<§`"Öï•Âù(4>1¦«¾¿·p7`[Ûä¼»³ä Ï÷¢ùÊœ”ªum,3áŸ+$ðÑDaœû ~œhK¡ñH¶©}8»úÄ…’zzÏíŒ#qW­ú•Dè3ï¯s+Ôú>nš<ï–Œn|ÄÖ.Ž¸Ð!M•}·þNªìb/—”Ì$ÓÓ´IÈØÊ)Ô÷ŠLR'%·
+ÓÚö¾Ø¢uöVæè>;¡1m¶‚;–¡Î»v*Drçw8Œ%šaìÖ¦UHø¥ïŽñÁ÷Ý™1ø]U;6˪9Ü01µ&„yyæɨ ~CÅ°ïA˜˜@ØÈ#¦Ø;ÐØÍ)}ä¦ôê¸Ö‘ÇÏ= l‡íÝ¡2•ß9ÈÈ÷û<¼[a¾P5Acj¯6‚ýìâ¹yý Ûóɵ §¯r¦”DBf¦ôÅÅÔSª]ܬw•ã¥NVÐÁ™<ñÐ}H‘ÖÇ™_>ØŠ\ô½Mù¾•Ÿ(|õ©:(¡ÍfÑϪƒõ¹î3S«ŒåŽkÏ÷çh@÷±X¯yɘр„Tªów´ò´Òd6ƒË&ïÇùŽ~/&[ÞVWMíˆÔó¼²0>¿hˆ>ê×Î^sæ: xÊÔÕ|(ú%§¬ìD+øÔô·?¥DvÓá\ÒÛ;Ncih-ºTrܘOÓŽÅ6ÿ‚¹`èj`#±WÍ%:¡­Ùè¡rµæaìë¨b«ßûÕ[h e-A­S¥€ñÔ–ÃkÌÿaÕ¹ÅÂõúºg_à…U­Ju¡ñkùwÕ¦½³G#bˆÕdÜ‹aKMÀ“1Ž]«Qüã·ýñ÷_†¨R:=¯œ›Äté´u?ݯ-Ô
+®‰‰;_ ‚ŽÝ¢Ì*O€_h¹5*#ØHþEˆV‰¢¶kλ!†%3BÓ]FhØÄãùÎ-„„ÇÔ|âï@Ë
+Ð/°FÛÀÀ`\@Æ_âh6þ=é°:úäúÍS?àŽó'rxÚ>,}è¯ó†t€á†^!Î*)í¦˜m<ôP\Þ9æ°kRi}˜vÿSˆÃ–Ê( Ú“×Â+}«£ò¨3‚ÿ@}C_3¢Þ€§|›¢MýëV‡É4
endstream
endobj
537 0 obj
-<< /Type /Page /Contents 538 0 R /Resources 536 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 472 0 R /Annots 540 0 R >>
+<< /Type /Page /Contents 538 0 R /Resources 536 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 475 0 R /Annots 540 0 R >>
endobj
540 0 obj
-[ 529 0 R 530 0 R 531 0 R 532 0 R 533 0 R 534 0 R 535 0 R ]
-endobj
-529 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 133.218 514.573 147.943 525.522 ]/A << /S /GoTo /D (subsection.0.8.3) >> >>
-endobj
-530 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 163.664 514.573 175.619 525.522 ]/A << /S /GoTo /D (subsection.0.8.3) >> >>
-endobj
-531 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 324.77 186.413 331.744 198.368 ]/A << /S /GoTo /D (subsection.0.4.1) >> >>
-endobj
-532 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 186.766 142.577 209.241 154.532 ]/A << /S /GoTo /D (subsubsection.0.6.4.3) >> >>
-endobj
-533 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 487.781 142.577 510.257 154.532 ]/A << /S /GoTo /D (subsubsection.0.6.4.4) >> >>
+[ 534 0 R 535 0 R ]
endobj
534 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 354.688 73.058 369.413 84.346 ]/A << /S /GoTo /D (subsection.0.8.5) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 171.066 124.025 193.542 135.98 ]/A << /S /GoTo /D (subsubsection.0.6.4.3) >> >>
endobj
535 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 385.134 73.058 397.089 84.346 ]/A << /S /GoTo /D (subsection.0.8.5) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 209.263 124.025 221.218 135.98 ]/A << /S /GoTo /D (subsubsection.0.6.4.3) >> >>
endobj
539 0 obj
<< /D [ 537 0 R /XYZ 78.37 808.885 null ] >>
endobj
137 0 obj
-<< /D [ 537 0 R /XYZ 79.37 732.66 null ] >>
-endobj
-141 0 obj
-<< /D [ 537 0 R /XYZ 79.37 501.614 null ] >>
-endobj
-145 0 obj
-<< /D [ 537 0 R /XYZ 79.37 352.065 null ] >>
+<< /D [ 537 0 R /XYZ 79.37 402.445 null ] >>
endobj
536 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F64 333 0 R /F65 335 0 R /F30 341 0 R /F27 340 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F84 425 0 R /F22 367 0 R /F15 334 0 R /F74 337 0 R /F65 335 0 R /F64 333 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-543 0 obj
-<< /Filter /FlateDecode /Length 3534 >>
+547 0 obj
+<< /Filter /FlateDecode /Length 3346 >>
stream
-xÚí\ËŽc·ÝÏWè†&‹Å`4à¶Ò$«³ ²
-â,/’ÿ_¤ø~ÞÛT÷•áEдtE‹õ&yD~û×ß¾}yýþå‡77L¢†Û÷_¿ú‚ßÄÍ8&ÍÍhÁ¸·ï¿Ýþö#çR¾|œsÿ–þä\üÌ9¾r®è=Zzœkxùû÷?'Ò‚9¥„YЖ†ý-´‰PPÆ@C/¢‡wO÷å«4Ê?½¿HAõÝß1Þ„áyÓí5±"ÔÍ1§Xš9–Y,³4âÅÊÓÊý)zÊ~¢™2¼Ñ·Ú³©}ûE¡]~êÛÑ7âM¤§
-_¾‚õo„_¾)È,¿–¬ùSàŒg¿•Á …{n¹g
-‘íÈ\ëµ0y“,U/Ëðp!Ë< "*M‘NšeÝO¤*®|:J®öT$£ë7ýûHWCL䬃&Ťƒî]sͬÕY×AL0ÌQÊ‘·ðu{¡ýÛÁ•] äLY1Ž6Êy|Å K½8ÑÚrKòY5Ž ìbÎÚ!s²Ø7Dþ¿JÔýÇ”¦ŽçÓϼäŒÒý¶LG—æÅd§¹•É„oS¼m ¯Õ®'‡òƒor;Û…¤¥4¥Ls;J*5hé~ªIÍI=R)6ÏMëªI,£K'Ÿ³±¥ç sQì3Й&ŽS·)²¯ŸÖ²Ï&Xì¥Þq%m9³áJI
-Fyà|­Îs<KaøÌA
-7R)&'™ýÇæìAò9My¥¡Ü
-ÕJ’’À`V*¯Þ©yþ&§…øiL ADÉÀÈEvÊôµ» ÀªEnK4wrÛjÙrúï³þ«@<Cƒ…Ÿé^*Ë—“ ;kOAøµ‰3M’—8fÓSCATLÂ8 8™”z£¼ßòÄLv™`ùif G´LÝÊŠ”£
-Må±ÞOý — eY½ c/…QÛE«ÌV’:ÄÜТ.åSqå\ÀmfŽÐ¼¸Yì¼ÊÝ@¥ OGñƧa¸RB•†¹Úñ¤ò¼êÌ}@\r.1ìØÌ–Û&ï^h “–ŽŠ”gGáÚQ¸¡y—\ÓPK¥z7[NŽ@ý %“…§ÊÇ;×Å;ÎŒºqæ´þ}ë>þ…œÈâ<Tkiçšœ\‹ ëÚˆíkÃ>Ó_¾
- Ño@ÇÐ,ÖkE×Ù…uÏ)$’bl¿>
-E~>ÿ½ŸŒ¢ˆê¹ò]¼$
->ÒÀ½ªÍw0É cë1P+½åé°¬ ¡ÚËJ& +p,ÍJµ'“Rû:àµJjGñ*õË2K}'‘Ot5øéBýba¢cX‹»,̲¤8—´,ìnìˆ+ÔDÉq•j'éÇ $X=/®¼€‚ݼÖgÊõmƒ¥>Çm‹˜ÜŠÈ«ð»ð”C^.ÿü¼¯÷–žZ­ ¦T¼%Ô`ûNt¡£—óáëOß¿üg$Ï9³ÜÝþñÛÿ¥fŠLV CÔ·ÿþóöë—¿v!0ìsy£å™á>§Ölc9“ZIÅtÝRqñÍÓ>5eH/"îä¿|ód—• LÉ6¡±%¸‹À ó*:‹É†Vž¥ôö—oC7õ]{dÇMÝÃÌšY4]ÐNœHÿï6þ œ­¿j9ÕÈŒ³ã8³ayi{ZùmÛ×prC;«ÏÇýõ¬HáHuÅØ£¦›wÍ­¥5%^i~HYM7»R¯[ö‘ŒlìlÚW"ô¨ýfóhãÆ àw~WÜyó)Fü)Ó¡è«qºSƒž8Ú14ÊäŽcß##SHÌN­· ÌhfÉ#®40+˜©•ÎOÙWßל½>jnR2›ëlºe})¨Œ¼_at)æô¤‘¯-ÁP¹M™°o|\]ÀAf.öøªcuk²-]3ÔöFæ ·¨îîsÐøÁžš¦r‹¿FnN>ʾࢴ+™û]_#Cq(/õ5šš1¥„–î!gë;_ÌÆúõ–[e?¹¼.¨çP;p{?µ#G;A]9¦ôÔw(þ¦Ò·ÞêŠò¡½6¨+ÃlY
-Kûu}ŸÔû¡.êïq!z…ñ¥òpBïX“Ü©ëëÚ˜\°”q&WÌÀù³òQôç‚4$}'CK¨Ð*{²ê
-c¨¨WµyO¢ì»l ¤ÀÝu
-¥¨¹ª&϶ùN0å:lT ÜÁA9Ÿjÿ¾±¾dY‘V
-é¸ñ¸æÅoê±^‹²9ªù HK6!'õ>’Èúq^¯Ldƒ8ÏÙDéÉQÒq;Ò!¥õí¦eætùË4È´Ô›¢¤pm§àjð
->(Žpgð§˜Ræ#–)9gÆÚgX¦¤€Ã…ݧ¤€èža™Rh†Æ}Ä2%f¸Û³L š9œ ó™ÑãÀQ¸9yÙɆ’|ž»U&ÇÊÛ!Ú’yŒ1/ïœbfÈ=
-ŸÂÙ¤Há-ïE¤P¤Ý³"‰Pðe¨`à˜‡¤g?­$”˜´­|‹lO‘{’10ŒΰȤ<JáÏÕÄ«ßñµÜ]iê´œ¤r€ %ß!‹Ù-¢Ï'´QìKà ÓV^M§_€ƒ'j]Cç½RÓR@Õ\±6ó‚ÿ¬ð£¬ˆ<.-‚[ìR‡­
-_? Eà6¤çÙ„88µ"a)OÛ±§Ò-Šªì¤¾V´”iîl+#ÏBh|Ë¢* ®xbÁYÕeå9ªJ"0%ÿð *³&&ýºW|Î5ÓìA + ÞbàlчõÛ ç!í.LáK­… AÏ2³
-åÍs2JOû#p¢dzJÛQU’T®K¾Ò1p¿STƺ ªŽÜ?ʵç@ãDPŽ—}¯K!A9¶õClA‚üBaâî
-âáüqRñ#ùcéõÊü1Êô<<Cž¹ à$¡-hÒÚp×DÉI…}’j’Φ< 0SëkàAÆ„ŸŸ=à-T,Ii>f£N†ß6<ÅFeÆ™M™J
-@“ù õO ì‡lTúljí¦JáHt²ÑOᄸ‡ê$Å y¼²Yæø-  ÍQ9;H!;²ŸÉÎ’\”\Õ ;X!.rµÊÒK°Ð¨Æyl
-¥`_¾jÀæö±#v ,!ÿ%ß6^øæŠ)\êï¶ÁpÁœ,‚ܯ½L:ü¬à)OQ€ø”äֆ诉ªyqó$ÕûV¶+:² !ä(SðMüEé6öÜßEÖ iÂÏ—úñêÕ¥§³J2 ¨Þwöv‚ô‘@5ã½q=×ýÓÞDVAEÇwQåÅ£J{Í~ÅÛt¯%ZêhJ Ì™ºeúZ’:-´ÿ¾ ša
+xÚí\K#·¾Ï¯Ð19,—dñ æ0«•çgo†O‰íC²’Kþ~ªøè&‹­V·¦5ÙbC+‰MëÅb‘õi¤°§ßOÿýáéõËÓÇK0§ ¢sN_~{R'‰ÿ«“üÉ;%¤S§/_O??K©”¤4ZJñ³ÂÏg|—ø2¹žÕv‡ŸµÃŽQŸðýÛñ;໓¹Ÿ;ç¾ú‚ï2÷IãCyŽm`æ1DÇ œÔ"}sjÿòË—9ïV
+%uË;ñ:Ó">Ó¼nY¦eš…20ѼzþåƒÕö9sçŠD¾' !·ž8(Ò’D•{KúÔ̓Ð'¯ƒPh2™é&ò¦~2qj‹!¥¼:ž<¾km+­¤Ô"0€¾›óDQ® BÏIëÒ\Rx‹Ó”?u_ÿ4q¢¥èNœ2 ø¬ödîXæ)Ÿ¡¸¸b"™ÝÊMRWY§ç¹õöéYíI=’¡¸W 3ã+9æ•ÑB:¡«,Ód‰ÄƒÀ¤H²ðƒ¸hH¿Í ´¶’ðØì^g3mñ:[Æí7ápN·Ì©Ù,Óšºe´uƒ¹`˜È FÀŠI<ˆÛ,’\Ö2Ig';•ÅA:O«ZæÅ<²=w¯s›}ß!ʘë}'?ó5BN1=ËÑ­Õvõ Š}$WâõÜÒ+ÞÑG<ç´0Ðí
+Ôé¯_Ÿ¨Ù€ìIaŒ;ýû×ÓoOÆ'HÇcað…¨¡~ù©ldèÅ72íL»‘‘+XurýD-EîÄg™‰˜%"(•÷W¥ ©qU>þôC3Ö
+퇱Ëk¶ãf¢€ZqÖr
+ýžR8úïÄßgËZN­Ö{>˜ê¤p¢U?¶cÑO‚Ææ=nY*\nÚ…aļÞö Âk·Í{²˜5Á ×Ú0[·}®yà5÷›¬ßÓ6;|OYáÁ,qGÖŸ|ðM–% nʜ˸-~b”Áñ±×|Äx¡ÔÐ{³(Ì9¼:Ì?Ê-aÙ?Žòí„Byø\Ë»Ñ&ÿ©«šs„ßÔUßÓÆÌdÑš.‰Ç Öûzör
+Ó1ξ’¦¬‘wv‡$¤9Çd´óµÏ23%“äR¶è.ík1$:ƨÄ]‘žÍôzd¤ç:]ôЧŧ6ƒ†â Õ]c›‹â"UáA>ê¼0ÊnÕ§ÇÓ ½½9‚)­w{V ¦5
+´›†°ÑGAEáÇxMW|wo™€1H 4wá[vI0Ýjq7obÎ)t 1TëÍû7àb’Þ´.ma)«è«
+‡Y›Ð\
+Î}§B"½j-,ÌJO“5,«¬p:p¶!)¾’m«‰Ú™zÄÊJ¤o ‘)äØÓ24uî§ê‡†ã=@Û˜î™ÀGx
+úç¶ó9Í|™öPâ¯`H¾êäËü:<:9d %½}4’ô#åA#ÜG¢õß
+ƒ8±yvAœ8·!N|Ĉhœô¨’&¯Â~Hõ‡Ñ¾à´ÀÝá
+Üt/B<Ì…%!&ÔcB\Oû à¦.7qn×ÁMG;ÀMlì pë½5Ôéà0Ô-¸‰ÅÁn7ÑQáxŸâ>Ÿëí‘nûÃÁM|Ž=à&>vÜ4Hs ¸‰Ñ^7-¨õp£{(¸iÙL×JÞ¬÷}q¿”©5muÍæ¾¸ï †©ÃÐ:ÚS©ñ1À&Fû À&FisìÃ,q”ªœÞ½Sìcsû8÷w
+ÙIÃV‘Zpݸ‰
+çîGž®ò§=à,ƒÄË! èÌ8)eZ¥3úBͽé7=V¨.nVZñS”Ï= ø¦ùqöxBV@Y±®æT±w˜z” Úî ºYž ȼ*è3õkVÕºöÐOH …4›–g»_$MõØþ™)]J½ºe•Z8F˼614iþJ ]‹šð¬‹Ñ¨àFÐ4†~yÁiÿ_c¾f¦ùê¹ È1¤UOI;dêÚ,-æ¾OÄѶˆõžÝlâ|ª©Ðuuo
+reÇ.ô6§'P(RÓˆò3€2Ít4¯ù\"ßâ¼1—¾äOi\ŸÐÔy¦4øQºÇýÃÐ/(`3Ý÷$CÆ Ôêî¥/×.-ýÔ ÜqiA?[8–cž¢Ã·¸ðGmnœÌ©ÌÑœ¿åk‹žÕáL¾ªžà[HLówn¨C¿ññ»¹·èÙTte ŸñX‡Éª¡ûÛå²ø¿êú‡
endstream
endobj
+546 0 obj
+<< /Type /Page /Contents 547 0 R /Resources 545 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 554 0 R /Annots 555 0 R >>
+endobj
+555 0 obj
+[ 541 0 R 542 0 R 543 0 R 544 0 R ]
+endobj
+541 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 219.345 612.02 229.772 625.967 ]/A << /S /GoTo /D (Hfootnote.28) >> >>
+endobj
542 0 obj
-<< /Type /Page /Contents 543 0 R /Resources 541 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 545 0 R >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 255.958 588.109 266.385 602.057 ]/A << /S /GoTo /D (Hfootnote.29) >> >>
+endobj
+543 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 219.345 311.093 226.041 325.041 ]/A << /S /GoTo /D (Hfootnote.30) >> >>
endobj
544 0 obj
-<< /D [ 542 0 R /XYZ 78.37 808.885 null ] >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 255.958 287.09 262.242 301.131 ]/A << /S /GoTo /D (Hfootnote.31) >> >>
endobj
-149 0 obj
-<< /D [ 542 0 R /XYZ 79.37 771.024 null ] >>
+548 0 obj
+<< /D [ 546 0 R /XYZ 78.37 808.885 null ] >>
endobj
-153 0 obj
-<< /D [ 542 0 R /XYZ 79.37 748.402 null ] >>
+550 0 obj
+<< /D [ 546 0 R /XYZ 93.716 256.803 null ] >>
endobj
-157 0 obj
-<< /D [ 542 0 R /XYZ 79.37 403.167 null ] >>
+551 0 obj
+<< /D [ 546 0 R /XYZ 93.716 246.997 null ] >>
endobj
-541 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F64 333 0 R /F15 334 0 R /F74 337 0 R /F65 335 0 R /F84 425 0 R /F73 350 0 R /F75 338 0 R >> /ProcSet [ /PDF /Text ] >>
+141 0 obj
+<< /D [ 546 0 R /XYZ 79.37 220.737 null ] >>
endobj
552 0 obj
-<< /Filter /FlateDecode /Length 3275 >>
+<< /D [ 546 0 R /XYZ 93.716 103.571 null ] >>
+endobj
+553 0 obj
+<< /D [ 546 0 R /XYZ 93.716 93.943 null ] >>
+endobj
+545 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F84 425 0 R /F75 338 0 R /F74 337 0 R /F16 336 0 R /F15 334 0 R /F93 549 0 R /F53 345 0 R /F64 333 0 R /F65 335 0 R /F30 341 0 R /F27 340 0 R /F71 347 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+563 0 obj
+<< /Filter /FlateDecode /Length 3922 >>
stream
-xÚÍË’ã¶ñ>_¡,€Æ³jJU+ÏÊUÎ)ÎÜ\>9¶É’K~? 6@Š” Iì’5"F¿»t›3}úóÄñ¿?¾\>^¾\:9æwúøãEœ8þ+NÖ3°'kãFœ>¾Ÿ~yã\*Î5p®$çÆãßÿ~ÇoŽ•ž…wå¹Á¿¥ÁÎ?à÷ŸãoÀoÃÓ8óžÆÊ+~ó4&Îwù=>5Ï pl€‹j„oqMù~~ÕR#†V& ´€ \ÓluIÏãJöüëÇO/œY|ð‘àœ?ÿBù 9\Ö|PˆÈ´¢ü–p ¸Gz.é]äAÀïk¦é’>†BsäO€÷5Ñ¥lzo\†7æÛ#</x‘r›©váSxW{Ÿ¹;AtiÆ$=ŸÇfii¨alvÀ.¼0Üü¼` 37¢ä¯euuMr‹¸&I^ƒgBAÍk#ÒjQç:úއߑ™o ·Z&Úõx]°µàÖݲɚ6›¡U:&Ð
-V­.§™®ãM#¶y¢z@6Æ1–(¦Ðê⨀Uþó竹šIÛÌí›ó› f´¦–~>cáŸýŽ˜õ_Õ˜jË´µtÔç¬áVù³ž‹ïx37Å>Uè¥qÍŒÙê&¹ßÔ%ƒ™/º›º”4Fmi âg ̲®?¿5}\SÆI–°ÕMÈ-P=ì‚.Lù
-mÞ‹= @ PýD`osy]*ÎÊå×ò–
-;=­…¡˜ó¤2Öl
-XZ·Ø”¡÷ Ð?kçfæŽDúC8ƒÆ¬%yç¢õï°f²ªÉul**„ËlOWŠ+ -Eù¢ºä‚»Éá-äWÜf#·VÁÁãÊóñ£¬Jy|£×ij
-Ûdë#pÓËp:ûzÝßI̼p˾œÈÓîÖzTBp&ë]6.qoÖrè·$Tž_ZQ±Le›žC î[º·^±gÒ+“ R¥“Tÿ¬xÜ…HÜ5JÌÉ[žð BÝ! ¥¸3Ì—Žc"2“±ê@âÛÆ,¸:3ã€1*…ÛH%(Λþã°†@¦Õ’Žá`"ïæ:ËPêýÈ*
-Ö‡å‘C!·ˆåÅDÓø\Ń¿Š¡u
-Çë‘“|®•ªUÎ¥0¾ézÑQZÔ&‚ñJ¬5…M! o(´H™´:îÌ‚c+šËÀ HuÃ…„Wâ#j`%è‡Te
-@cØU©qL½A·&¼©`݉&¨æ*ÒMUB7d„ Cvý²rÙ/#
-âj
-r‘Â"—(|9{Ð:çNCKΨJ>.‹›Ÿ§¬(]coñë "ç ö^&7<Í£õDÑ ßÉû5ÌvšRÖ!Ìc¼eHaË©”¢P“È"®¦ ÍÈfn¥¸S?yÕŸ5µ*¸Œ²Te½ œFç¨ùv™s¨X¸ëš2ýí¶ÀäÃ{ø¿o‹éµ€ ×$c[ ÛOj9
+xÚÅ\K¹ ¾ûWô19X+Qo`0À¶Ûc {Ê· § »‡ÅÈþÿC¨õ`©ª«=íöLWKI‘R¼üz‘—/®_?üð¦ì%ŠèÀ™Ë×_>(ü@^ÔÅG¡ýÅ;%¤S—¯¿_þñ"¥ú$¥5åe¾@J/¯ÿüú7¤åÍŠ–RZ8k95}EJJJÐå•(j¢´æJ™Ä–á”<^\D
+o¯¶/ô®pí"=õòÕÚ*KZÑÝòªø©y)üh_yÐrÅh#‚š¥ùËþzÄ6+”ζµIð×^Šµ/8I<e9dù”´ž8‡kyfèçíü É9HÂtQ¨ºú$SÒED9=OºLóÍ-ïm¥¬æ5¼£5\åjä(=ƒŽpjÃÔOë%©\µ‹olÈZgö‡û­¤kó™¤í륵´Ö‹ý.O{múMœ×§ÅjifµŸ¤Íü“t!GÚVñ•4ì¬rä `Š¦¹ly½­„å7yˆ–
+¿ÝçŠå0xû­<§ÝHï“¥¥Jï5yÃçîo¨ÄàƒÁ&Ù¸6'ÏŽAæЙt0îLÕQe¦zJN^ÞmgÁu
+…ø×ïy–q""ú+Àpùãß—_>ü?Ò=|¼8 œ6"5'¼j›OÕ“s†ŒÉ|’ Û3>Fx–è,PÙôèA¸Óqèp«•Ñ"ðuÜk弰έ¨$smÛ[a€àÉ5)Ô§ô›&¹Ñ¨€—QöÖ£íFº<£†Òú¾teGBÄIÜðŒœ¿ÈpœGx+,X¾úe†l.vmT7¯N¼ÊPËÈD+ÑÈZ½–Osä’jÈz3ï>*@-\ >HÝ,mõŠä5Õ†9E€)åÙ¦vC€¤„¤im4‘b6…ÝQüð2Î<e`0´Jàâ=hàà¬ÐNo¨Ì UTÂ{±Íô Ýæ`>z¯‘~09I‚ì2ê`눫{¶`¤mªÏ1eXÔ@ymmå$r (è‘2IhÄH÷Üö& ù¦”¥Å†¦²ÌF ñµ’ø}올oÒž5|Xi1„m6ÌÝÄAI#Àû‹Å `•çÑ/ƒMI?cvÊø¼LÛÉÊœÆPŽ­Lg]znQöŽiå²ð­èeë!ÜJL— rÖž·EƒÖÃ.¦ÙqѲ´¡œqMf2þZ¨æwd7cá=1pÇ(›Á–Š„û×ì)eʪ7ÔbŽz´HÀéY%ŒÖ½6þ–zNcÚ„‘‹Ñú–ú 3éh§Çñ[¹ $„­,O©óf÷œx­­îµ$–\-ï/s!bò(í†'[‹y_0£F?ðá_/å—Ÿ¿to
+oDÕ œF÷¾f߃ÊáÐÛ-óܸš˜ÜÇ^ƒØ405µÒ)v–º½%ÜY„ŽvÓÁX‹}||„³ŠSäe¥˜-W‹wJHœ²³Õc-›\"à,H€ÄøJ›aÍË(#=™û,æ$´€åÛ–M~_èM&aõrMZ‡ç¬-©Î¼ÔùêMÂÈ´QB;S¸öãN 2r
+pÛýÞ‹T&¤ñnˆTg’Íú“: ½P>òÕ[·ÛjÊèŠ =“bÈÇ=“:jt‰Jiì ß]¥wQÇ8ôp„ ¼ª›v¶¼vÇÕÊŒÞéYñT¢4YÚA`j8•r“RÝ%*ï…VÓÑ,Evã²4¤½Í^nrªC…·n¥²Ü”ÊòĦ”Qm“3ä²YðÐq>¹œ3vJ´ºbçCÐz˜¨¨œ/Ž|é‡uÙ|߆š¦¬ÝÏUÛSD€·^î62NETUÆà3½ ±VÓÎéòrS[Æ6ÿ¸[Ìjʕ‰\ÉaƒæküÙÉ’WÂëȹ˜n½¶KºsLJ.ËsÅÉ·[Koø|jØQ³å ×n.µ8DȾô¤{gïÐtr-ù1W˜«±`ZÃ]»× _†3²vTÛF~M'1Tpï©g’ãÆå˜çÎ' ˆüXr‘ÌÏa œP˜2éÓzÞuÇ»®Þ÷MÀ‹è§Øå}(¸kk…ÙïŽ> ê“^ªcî×¼Y7œH:wÙ[Ëna£Ì3g·&å!ÐïWèvv«Õž• Yv"­D´¹KÈië`…‘À•g¡­‘·D:ÿEKÏÇ»åð üžÜs:óÝÚÑ9”v^È~«âd%®Ç{ÛýÊ+œ\Ý+q-ÔEÌ*]ùéÜ8ƒ~œ5X#›;uù]Y`ù+ƒ òØM ‰µÙ0'&)))º¤~èÇVÇ1]’ 6r`(dY&ÓåoØîärfº\|<?ê㉮Þ?×`ý¶×èºr¸2œ(6߇G‰ñUñÕ¸^ Õøõ¤ ÁÉ[ pNóò-™e`:<™ÛÄמ›Ü®ÑF#²ô;DtƒJ†¡˜×¾d¦+ä)Þ.*óN™¤kÛ)Ê°&·2Å~ª"DZó…æ¨M›ryhàvÚõZ8¸¦< Óƒ—vœJó%éGë"¡úr`øÑîëÉ|<üjîØtßß­uO&PŽuC¿Õxà¢Z eN¸¨akc¦1ÖýZßÞÁïª[tœ¡¤³RËY¥<]ËÇ>l
+î×ùÂCÛð(}§a…ðù™x¨gâE0^Ç”§ëÖÞÊŠ¤°(µÉ(ç-•ožz[]ôqÅ(ÉHÆND¿ hÕþ½Àó#o^V&¯Â„_Ý/O7U"uɇ*± ¤$ŠŽ}ô$yÙËEŽ5f&6§Öýõà–D+À[nDúÞ-ÂY®ÝÀµÛJÒ\KYzÝöƶ÷³;+Ê…ñú›@þ¥ˆY®ß.Ó۟Љ°2CÅì(ls}ð.Õ:#bç+¨¼ë!W°P;Í®@ž×¥ë‡ètd1„˜0ôˆLŸ“褜WÛ.mÂD ö!X¡ÚÐoÜmgªç3Q|ï«æmª.ñÿ/\¯©‡ü¨W¢1_ÒÝJßàW¦j0øñPòÚA>ÙŽ¼ó¡ÄÁ­ÃíhGðin¢Œµ0.ŽÉU_È7•šØžÅ ¡tE\B¼€N7cŽ;w <–#}ždÉ·† ÔÅI@ÆÉú¸²GI_Ý°ŒæHmÝB „e7ÜþJV`_%
+­&ês:iùqÊ®]SgöÝÖy¤³:w£²vseȄʧÏU¦ŠQ¸~G˜”ÙJŠµºTÂu”>VWΉªãZ;
+™ŒÇÖdy%¸J
+ÊvsíÏÒ ­qlv :gl3‚áæ~UyWþO­zë‘*ózéÙUe ¼^Màݾîóv\0DôŠ ¾w¥•ü,´»ÒÚ «mꎥ»ÞtYz€À|a:}UGD/ÓYËpaZ
+í’DŽ¨X˜:téâ¶Á—K¾þæç/‰ê2LÇ}ÕGêû§˜Ù¥ÎÜDÄ‘ŽB”ª¿Ž§ØXõ˜È§®½qÙ‹L7²ƒß¨e‚ëʇNÿ.ügækýÑȧ3H>°e´!“JŠ®ÍÕüë8ÕË|+‹o\þ*ÒR$Üi"ŸÐ£Ì}³K7®°žx¦ÙaÁúÅ
+w=ed]l²_ôýƒ ·YÎLÛ<`¶œÓ®¸Ë¯ü3ìF#êšúL<6fÎÑ3Ë_¿ó|îža"¤õfôiƒ(0è<ÕÀ´ÃõÓ²¯y®?z}«¹á騅-µŽ¢§¬…ñþ £#Ä™H×»NKðX½ÙÈïçCOà”B3WçøÌ_Ò7æÁ%;µ×˜ƒ‡ š'\ÊvOïóŽï}‰!
+#ùŽßÏ_Ù©îNJ×Bö]_K \|.˜c:ÁîÜn½çlóäç‚9cl®N¹ùé–Ëç:A-ãöv µœ£3 n£°n3—e}H™GŸu™þfÀsA]âµ^‡‡ìlšû}A}^ê  ¾á½ Ï0>Êç%Ük
+‹ÍÔëÚ˜b¶.É3$ˆN(®£=ô—
+wH-z'Bk"µfÀFÖ>cÀܳޟxVço¿Îƒ{p{N
+g-g¢¡¶:_
endstream
endobj
-551 0 obj
-<< /Type /Page /Contents 552 0 R /Resources 550 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 545 0 R /Annots 556 0 R >>
+562 0 obj
+<< /Type /Page /Contents 563 0 R /Resources 561 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 554 0 R /Annots 565 0 R >>
+endobj
+565 0 obj
+[ 556 0 R 557 0 R 558 0 R 559 0 R 560 0 R ]
endobj
556 0 obj
-[ 546 0 R 547 0 R 548 0 R 549 0 R ]
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 324.77 547.946 331.744 559.901 ]/A << /S /GoTo /D (subsection.0.4.1) >> >>
endobj
-546 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 111.011 392.512 125.735 403.691 ]/A << /S /GoTo /D (subsection.0.6.6) >> >>
+557 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 186.766 504.908 209.241 516.863 ]/A << /S /GoTo /D (subsubsection.0.6.4.3) >> >>
endobj
-547 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 137.449 392.512 149.405 403.691 ]/A << /S /GoTo /D (subsection.0.6.6) >> >>
+558 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 487.781 504.908 510.257 516.863 ]/A << /S /GoTo /D (subsubsection.0.6.4.4) >> >>
endobj
-548 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 219.345 189.952 229.772 203.9 ]/A << /S /GoTo /D (Hfootnote.28) >> >>
+559 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 354.688 438.576 369.413 449.864 ]/A << /S /GoTo /D (subsection.0.8.4) >> >>
endobj
-549 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 255.958 166.042 266.385 179.989 ]/A << /S /GoTo /D (Hfootnote.29) >> >>
+560 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 385.134 438.576 397.089 449.864 ]/A << /S /GoTo /D (subsection.0.8.4) >> >>
endobj
-553 0 obj
-<< /D [ 551 0 R /XYZ 78.37 808.885 null ] >>
+564 0 obj
+<< /D [ 562 0 R /XYZ 78.37 808.885 null ] >>
endobj
-161 0 obj
-<< /D [ 551 0 R /XYZ 79.37 447.38 null ] >>
+145 0 obj
+<< /D [ 562 0 R /XYZ 79.37 709.823 null ] >>
endobj
-554 0 obj
-<< /D [ 551 0 R /XYZ 93.716 120.649 null ] >>
+149 0 obj
+<< /D [ 562 0 R /XYZ 79.37 424.887 null ] >>
endobj
-555 0 obj
-<< /D [ 551 0 R /XYZ 93.716 111.021 null ] >>
+153 0 obj
+<< /D [ 562 0 R /XYZ 79.37 396.567 null ] >>
endobj
-550 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F84 425 0 R /F75 338 0 R /F74 337 0 R /F81 377 0 R /F64 333 0 R /F15 334 0 R /F65 335 0 R /F16 336 0 R /F71 347 0 R /F53 345 0 R >> /ProcSet [ /PDF /Text ] >>
+561 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F30 341 0 R /F64 333 0 R /F65 335 0 R /F22 367 0 R /F84 425 0 R /F73 350 0 R /F75 338 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-565 0 obj
-<< /Filter /FlateDecode /Length 3202 >>
+572 0 obj
+<< /Filter /FlateDecode /Length 2914 >>
stream
-xÚ½[K·¾ï¯è?`Š,¾Å
-ÈwÛF‘E™då-£HÏ´°ÇŒBs$N^ñZMuy:õ{»Ñ¤bVÈ‘Ó·͈jš2¿î?Èpà˜Ön4\qS¦ÁOíý1ÓäE5¸B] –f
-)?LqÿÈ_“1è½¹ÖgÚ÷mƒ»H}¶ÛÀÙìÝ 4Ê»Wugpd‡x½µôL÷Ç 3jµ¤ÅæMžT{ÍŒ{´FˆÚhzO¶ÿüõé?ãPq aùãÛ=V#k©¡˜Rfùï?—?Ÿþ†ob~…-˜Â?|Aò_Sæe§ÁŒÃ•C m%Æêj²:>Ó›éçŒ+9R1YJZWéë¯_š¾´4¯úÎ}BÇM¡€Z1Zúu+q"éß2~Îæ¯ZN5N,Œû†q¤Ê!…­üµík€9¾ê×ѹTØŒ[õ¨+îcôhŒØáCè‰Q{ÁåOðêXlû—dØBàüŠõ{Úê ØšY\”'Ü‘õ ¿Ëò~Ð+.ý>GŽŽàD æœûnaDab V­ãC¡aNÃåCZÍñq^À0òŒc͹Cøɳzäþ ÜäYßÓÆÈgjMtö3¯¡õvtt‡Àbõ ƒÀ=‚seè&4‹-#´#°?Ý1 0Ì[ét·ù
-m4Ñ蟽¯
-@präª'«Ï0àì#çZ¹{eÐ$cã÷y{ŒD=®3Zkt³“ù6oÏz{yš·ͧ>ÆÛ÷´ûÜýmÞ¾§tÔã)Öãçÿ‘#ýqyÃX'ø¼‘û¤CHl©8êÏY7Ð(;'é[òg}¯°bO
-Þ²ûé‡H¾ê»õžQô5pq_ ‡Ææ”ø3…”=í¸y4g&ŽƒÔ§pƒžNÛí-ÿ(9c­Ä7ùøa¤ë™N~Ôé¾—ÿ}jë´ZiÈÑP^2ŽA'©p„Qc™ú¨>-0£V­­:ƒk™³æ-³Ã)íû0ê%ÓÆ~ F=ÞÔ©DÄÁ}F%z Ðî]•´š:w£Rxf×þšvôÞ½dJôAbÅ@³£~d•”J#¬¦k¼ªÌm²`Âdíëiöæ¸8U0ü®ÕYâ”
-óã¦É§;êÁb'NGǵNc‹9:†ŸÌ‰z 89”Z=<Ôº„*—P[ åô`+1³)7È fŠ`HI`ã͆êÆÑ܉RÔ™ƒÈ¤p”8–F(‰!¢/i NÊp¾'Q¥È']ã9–´:;¥#¡\„@£~B‹R
-~åÈ7'ETo·-eC¶œñù‹ϱZ"ŽʧöÊ\’häâšÓD×Pµ%m-F.¦P]iOn™øHµ+™V(ÄH-ø¥Ö̤*–RFSŠeš²—’&ÀXU«ìbkÕõíV-ÐéÊX6ÒÞâŒ@†s‚AiÒG<lìfHŒ1Q{A']äÎØZ'>LÏÇÔŽ9 cën” ‰¹‚Öu@\R="M±£ýXË•[ÅÓõT½úò¦ÆQjx41B‹v-ö&ÆF[yo¹Ìí20í ˜¡o(XºWw˜*Ô©¬/Ql1ÞSïRö—}R[°— ßê ¦$
-À^z>¦Y|›ÚYD•eVÙeR_]ï;º˜¦8I)»e®½ÑWÜqLþ< ¦1Ñ©…àêµ®î¹l·Ö¶ÉRh9Ü>ÈÔhÛÅ×jį̈á½/ZQS¾›p¥)CÜÓanãÍþ˜©hñs2ijšm0ëšm°m/Óž¼‰sK¥ge&ðÜ­–­þ`tÌ>F5ªÅŠFÜû†jdœGež%õf'µÏ“Â,A¶ËArŒì°#TßtéÇúÉÇ‚KôÎVïBû¥N }à‡V¸èzf7
-{á5ÝŒ2õÞEÎlNª1v5°µQâªïɆ àLǜǶ³èÒ,r­8JTË9 å/Ù†ÿ hîà
+xÚÍ\Én$¹½ë+êš&#‚ÐÐÕ5jÀ>y ›á“áñÁ˜ÃÌÿÜr!™Y™*–ÜÔH•IcyŒàòÔòòŸ‹¼üx¹¾¿üåÍÐE)áµVöòþÛ‹â7ò¢.Ö ´k”F]Þ¿üã«”ˆRj'¥¹¾~QRÊðȼz⟚¿~DW)ÕwþݧnÜŽ» Õ¹%Úò-´Á7þ@yB6KpI2²‹å-\“„0Nø`”ÿŠ*Ë2ðúÏ÷¿²]J_¼ðؾÖ,aŒ.f‘Š}Õ›‰ý¿
+ßö1¤œÐÚUCL’ÁCÁ£T4¼%ma2"¡|[%ôDνيì¨òvJJré0¢ÚRèùÿ?ØGÇ&tÄ!½°Î-áÛƒ,Ç$¢¤$À ÊÁ&“2HÐ'„™LÒ)èÑxKm#âä
+nF+ÒÜ'È SyPÐÅc‚ÍvYÍfùhÂ/«¯«,3Þ þ±‰™­;Ÿ€¾hÉ©üƶ9Z¡Ÿ[¾~®ŠNÔÂ.4ô©mχ`Z‚]ønÆDå)g…³KG…p®'WßsZ_‰´Fx5ÏþœŒB•LðC‚´hì-Ïþ AM
+Á¹[¾@Œ¢c¾ˆ5$¼5i5U<t$à:÷+¾Ê}W®Òj™%S]îD
+çJì­bà‰#Õsëz°ï`JÖ«’«G„ xšƒÁ05Å„ ¦i=“ãƒw¨N6’&¿t¶Ôóáã'•…ÂØq%%œËJýœ’²–½>8WRÖ’§U©„Un˜¯$÷ן“U×C Hª•îÙ•¢41篽¥çZÄt.³±çÌÉrÕ)µØA Î’×V#äx'“{Ï›°Z7ØX©¦eíº­²`Îkà•èt*ÕWXJ£7 Ñ… ÚÖ¢·ò-ÊxëXÇöLÑXsY3*wî—Œ'¸RsÒª½ãxGÎet˜<-•{2åU¬>èJ ÂPÝØÒ=l¸g1'f/Œí‡éQhcŸ‚Lï„õö˜;‘ó÷ d"'Ðî#ÈÄP3;†LTžË®où@]DN9ª~q,¤"iFS¯ŒÓCªÅÀi²2.ÑÈH>R¢‘'
+hì,Ö—Ýp‘DARwJuºµÈ%Û`ÕѼR‚-V £hqÕ‰ª<=ĵIM /#}»ÇË@µæ L ÐÜÉÏ€%ÙHá Ã.i±åÄ©ÈFNòÍâJøm2·P ’E0o¦‹ØvExróUØ<`Ú^$[ãˆù܆®óuÑŠ„5yqbPÄ'…<ºà‚T!Ö(ÐOW~“¾aeÄ'áÊ*Ü«—7‹ÃÏÞ]ð¤æŽ)es
+!cª(ù ”'ÍuFxD B2ÆŠJ?s[àÜÓ£®#âÆ9â1ßo
+,°!e3Ôòb–›‘)”‰D¦\3ä«6Ë t»Ë°Sá¡®«¿e°bCS{Õ;€…(%læ3‚EÚvËó‚’„
+m ¥¹ÁhI©2²¦HÅé|JA°8¹xû
+bh«3y!rÈä Öð¼hP@#ÿ¶ä°D†Ý J!/¦„Ÿ‰¥öñØÜᙡ³¼µÂ¡D3´F§?‡h†¼´Í]üLjfÈ…×;žhÖ#O£H!¡pÒ å™!‚päžÙÞáøpg‚Ο¤›â¹ÇùÚYl}·'x®é:û͇h`­¦Ä³ß˜ 8/¤ÂVÓ@I›µý$ò[×#¼‚cD¥îuòO8[’^?‹æÆò’)Gþá«Ú$¹=Nv
+á$»URN‘ݪ¾ »UžFv«Æ9Ev«u¼Ov«{,ÈnG¯ÚÂ~½:ƒ¥û—H€iKðŒ ·Jö¨oí†Sßj-÷©oF'¨oUß;Ô·ªõi´(#õ`´@¸Ô°ŸrçXõø¥c£ý@"\%û®jýD¸c
+–KÀªuÅ]à]¸êã«ùªU:Š?÷^¨ãÙÛ5µ,çÖ~=OM†“<Ø?á¸í)ér-ûÊ[GËá”·ZÛ}Ê[£Ñ Ê[Õ÷å­j}6m*‚—‹cQ£¼åŸŸ“6ë±O›í‡àê1Îàê¾û¸Æš¸Jö>®ãÖ!¸JîP\?L[l†ªõÉ"RõÞ%½Å¢ñ*3ÊñnÙNN ’Ï)3•ìhp•¤Ó©–CFNµñïʦÚ|³;f7‘öÕøyWÙ–ÅTDmí&RI­úV»‰ãQЬ¸„øçYŸCø®Æ:I˜Ñjü cªk¹'he«Ðhv†*Yªk%ã#Ó«ÎsÃãX#VÒ`°Å¿õ2‡güS³@Þ V:åóÒ½ó¡ŽcX©eÙ³–Œ—Z–5•5°»¬©›!Ôڄĵè=â]ÞÆÖVa#*Íù·ÅÙ%ÉÖn9´¢Ë,Øz¤!$ÀLšm|ºA±ÍkËgø³¬-ë9sÄCe¥y¡…
+û ˆ®ìAf²lÕz K5³eOÌ–ÌkýF9¿(ižƒÑLŸ=èÓ̘}
+F3eö#- Úc-¤Ø Œ®´ÂÎÿ¼Â Jÿ|ô“–uÕXŽ1:ÚCwͼɵóÀk|sagúÅõXØf~‹‚8ÿ†/æ¾
endstream
endobj
-564 0 obj
-<< /Type /Page /Contents 565 0 R /Resources 563 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 545 0 R /Annots 571 0 R >>
-endobj
571 0 obj
-[ 557 0 R 558 0 R 559 0 R 560 0 R 561 0 R 562 0 R ]
+<< /Type /Page /Contents 572 0 R /Resources 570 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 554 0 R >>
endobj
-557 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 219.345 544.571 226.041 558.518 ]/A << /S /GoTo /D (Hfootnote.30) >> >>
+573 0 obj
+<< /D [ 571 0 R /XYZ 78.37 808.885 null ] >>
endobj
-558 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 255.958 520.567 262.242 534.608 ]/A << /S /GoTo /D (Hfootnote.31) >> >>
+157 0 obj
+<< /D [ 571 0 R /XYZ 79.37 771.024 null ] >>
endobj
-559 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 322.429 411.45 337.153 422.409 ]/A << /S /GoTo /D (subsection.0.4.2) >> >>
+570 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F64 333 0 R /F15 334 0 R /F74 337 0 R /F84 425 0 R /F75 338 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-560 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 352.875 411.45 359.848 422.409 ]/A << /S /GoTo /D (subsection.0.4.2) >> >>
+576 0 obj
+<< /Filter /FlateDecode /Length 3062 >>
+stream
+xڵˎÇí¾_ÑG Êõ~
+p&ð7ŸàõŒà¥ó»y<^k.=.¯ñéƒQð9xÞ Ÿ?üüéàM¹-‰ä5ð¸gÍjá½cÖ|ì°ƒ¼
+#ãNÒ¶y*¸Ç^‚½:;U®Ù·F
+“æ Šëe@¿´J„½Œ[/åxNOðÂËÚµéKŽOóÙF¶qKk}c´#[dƒaýåu_©?­,X§›)ÕÝ9‹ç/}ã÷+zÓ>
+§ýŒùÅéE
+#&ŸâÔL%Œ]3”ö5æ ÚϼŒ0àH™ºoœµ2µ^òôvÂڗƵ(ŒùüJÃJ¤.Ž2}!.z_\úÑ^1Ý·ì^—Ì´TAï\6ô§âH+f«h-ÁÖô˯†›W5I"]é~Ñ»›Î©Lýà°ôdl
+Nëâ¢zå„l‡œ³svZ+ G¤3Ûßo4!®;@ΗÎÛ'Ê(![› çP\ÚzÔQuµ"ý¡®Ãdoœ;Pd¶s9åØá0¢Ôv€t ø”D
+E`õnOL@ŸáÛ¸ œÖ½†ÛkÑŒRz‹lBæÚ sÉì Åcc,fUL¼~LÿA•®Ûðø)k¿ÛKKí»‹:]?gMf”ƒ2;Õ<Í ìRÁE„Ư^K„#2"Êö¢REœ2l$'7óMü²Ä)Ȇ’ЫôžÑ¿D&Z ïü+ÉdBVÍê%IÀ%Õ A×ÂÁˆ€Œï<”)‰ÇÏjg21xWÅj•9ðNÄ€1¾ˆ ¥%]UOÛK(Jv×£Z‰K Ú”<Š“Ùµð-»×Ò ÚÝ ¤”Úív`û/4[ßÑ싧f¸}l°—e´,RŽN„ô ¶1! â.·Ù«eO‰.~IAi$Á@þªF2bü#ÙÓæJ¼Q˜Øºf8-4Í0]|žäà1³S/ÃÖù"ËdÄŽTr5knƒé¯Û%òT²g©ê°¼ÀÞUt-o~ùòë¿ùçÛwáÍ_ *¾ÍðF.áMÞ˜þ¿oO·´ê‘}ÜH½ÅÛ¸7Èo# ꜈„IZ1~N…‘^ …­¨áÍ÷§âlO´j6
+¶+e†Öé=öÃõ½9RO{?]ñ¥H\ìK1¼Än[ºè²ôœK™ð·ªèHeòCSçÊRöKiÇs~¡dð4¡%®=Cp<ix-6f\›QÖå+†¤(ºW4ã·Ì{ÚŠÛ_™˜UÁR(ž&fMª³þ©ï5¹®šº:ýjÇÉVn7òÐ[°7L¹*ç…nŠ~ÊUG}òä¬Ë¥Œn¿Ð=L¾n)QˆiÆjyÆ…¨æéÊü§+yna÷íê¼²dŽQâ_ÞÍÜ6ÑÉûÎ3ÈãÞu¬öyß*/’.ÇüÍëÖÓî´aJ·±ëK6 ¹-ͳ–#¡ÜÒÊÓÑ+0Žè€ãØÑ~¹©Y+ŒÑ½óñ
+endstream
endobj
-561 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 235.007 384.561 245.433 396.842 ]/A << /S /GoTo /D (Hfootnote.32) >> >>
+575 0 obj
+<< /Type /Page /Contents 576 0 R /Resources 574 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 554 0 R /Annots 582 0 R >>
endobj
-562 0 obj
-<< /Type /Annot /Border[0 0 0]/H/I/C[0 1 1] /Rect [ 111.059 67.636 240.514 79.256 ]
- /Subtype/Link/A<</Type/Action/S/URI/URI(https://dejavu-fonts.github.io)>>
- >>
+582 0 obj
+[ 566 0 R 567 0 R 568 0 R 569 0 R ]
endobj
566 0 obj
-<< /D [ 564 0 R /XYZ 78.37 808.885 null ] >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 322.429 739.616 337.153 750.575 ]/A << /S /GoTo /D (subsection.0.4.2) >> >>
+endobj
+567 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 352.875 739.616 359.848 750.575 ]/A << /S /GoTo /D (subsection.0.4.2) >> >>
endobj
568 0 obj
-<< /D [ 564 0 R /XYZ 93.716 490.28 null ] >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 235.007 713.286 245.433 725.567 ]/A << /S /GoTo /D (Hfootnote.32) >> >>
endobj
569 0 obj
-<< /D [ 564 0 R /XYZ 93.716 480.474 null ] >>
+<< /Type /Annot /Border[0 0 0]/H/I/C[0 1 1] /Rect [ 111.059 67.03 240.514 78.65 ]
+ /Subtype/Link/A<</Type/Action/S/URI/URI(https://dejavu-fonts.github.io)>>
+ >>
+endobj
+577 0 obj
+<< /D [ 575 0 R /XYZ 78.37 808.885 null ] >>
+endobj
+161 0 obj
+<< /D [ 575 0 R /XYZ 79.37 771.024 null ] >>
endobj
165 0 obj
-<< /D [ 564 0 R /XYZ 79.37 442.26 null ] >>
+<< /D [ 575 0 R /XYZ 79.37 183.799 null ] >>
endobj
-570 0 obj
-<< /D [ 564 0 R /XYZ 93.716 80.936 null ] >>
+581 0 obj
+<< /D [ 575 0 R /XYZ 93.716 80.331 null ] >>
endobj
-563 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F84 425 0 R /F75 338 0 R /F93 567 0 R /F53 345 0 R /F64 333 0 R /F81 377 0 R /F16 336 0 R /F65 335 0 R /F71 347 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
+574 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F64 333 0 R /F15 334 0 R /F81 377 0 R /F16 336 0 R /F74 337 0 R /F65 335 0 R /F106 578 0 R /F105 579 0 R /F107 580 0 R /F27 340 0 R /F30 341 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-576 0 obj
-<< /Filter /FlateDecode /Length 2303 >>
+587 0 obj
+<< /Filter /FlateDecode /Length 777 >>
stream
-xÚµÉn,·ñ®¯˜ãÑÜŠ à‘4’S Ýœ ÃöÁp€<øÏO‘¬âÖì–æ=ù05›µ/¬*Ž<ýv’§ïï.¯wß\œ¢ˆN;{zýõNá yR'…ñ'ï”N^ÿ8ýø(¥Õøy>?ðI|
-Rª'üÿrÖ>ípøÚ">Üïbz+%àNpéûü
-¬k*õ®›Løï׿£éÝ‘émJ:6=ØÆu¢Wq¬ÝGI#¢ 3[LP ƒZB*„tÀg3“5J„`fèì—"bȦCkó˜ý‘0âþ ¬Cð­24¡r“”
-JR°·+[o’ß(¸3¤os5Å, %`Ê¢ÌRô‘ê¯]™çä¶ÌÃUu ŽÃ.QöÚÎðioÌFK=ÎX†ùrÁtC‚Æòâc?äf¸µ #~YÍ؆©Vï]§ÉÖ$ÕU=Ö)‰¼ËF‹}½8 ]Ù*¦¡#nbÈ wNgFú8=Þcäl÷|q
-5œÇÆ:0HéXÏ…ØÂÂv«z?DÒ÷qpÒÕ-µŒÂC¾›I¤? ÿhi*D¡e˜yº-L÷§‡@Ip’Ø—d`hôþÏk~pQd-ŒqlN£5}I*[±˜'ÑvöÊ™ŽšY}H ë”üL,F’;ªäùݤ{NÙòùNÞx¬Öî _#IvŠãñ˜ó¦=ªq©ì×ûy” ¤ÆWß”_ºã¸[ã2‚‹)ô¦4PVí³Ÿ7å-ßê—Ëñ/‡rX+Øa­á}¯`¶Nbü ,Z(=X̲<·SÄt¹°sm-÷7~$60åç ÏAÑc´ZW½*7â¹4Ï}O=ý4õÔÞ.¦žfè3¼£Ëáâe/­d®/›œ{X (Ô¥ 3ïçÇ‚ò¹Y_P«Y(’ó/hVºÊ}Ü…r‘bíÑÉsxÎ+—oÁßÔÉ¡lÖbºÝ Ñh4«€Ž¸\ìf–´üh§óøÏ¿Ê??´ìmƒ€=Û„ßÙåý XôEØpóÜ7ÿC黢 ÒlÊ74Q—tA!„qU®Šì4»Öq3 àŽÇæ¶ûƒ‹aå4Ã0Óþ ŠaÜÁª”ÜŸºsýT“–ÝÛÖQGyÇŽ¼:Nù÷OŒ,ë&ý”t1­th ?ÄJ¿ì)sÆš© O..Ý™GýPy›ëU9Ï”:1#ap_‹ß­{ Ò„1±¿ð_W·Õ˜t‡yw“ªB*號۫žcw‡¡¶•z 5¶íÛÌ>Å£)~ÿòz÷HÑG
+xÚ­V=o1 Ýý+îDI‰’
+#‡áúプ?Rq”†Äà<Ãpý5|;{Áûðâ=¡÷I>‘äY¾¹Èdý*{í;ù¶ç—½0ÚY]ëäË÷ëç“w)
+¢RCÿ6_fD‹CŸ÷˜îaHÁb¡Ää°Å[(èÞ1‚+‰n2NŠRNFñîm]m©zê§Z&!-žçÃl”ATg1˜M÷ºÑÎ…Ilø0%öÁ,oͱ:­{;î©Õfç¼Äš~Âè ÄuáqZ
+:«è³ /H³J¼µ÷€Z”˜—õmd?šƲ%EÍÎo£ú_ÙÔŸžQ¼³?%àõò1J6”ìTEˆ ż[ýxôÝùعؤ rÖüöâ(î(˜‡yS°ÐUðj„ôÂ)t%¸l\lú¬)®ƒm@Y`¯½#ó<A¼?98‘£Òá$¸d:×|ÂT¹œ4à“îú æy7œ›:ÃS?SMý=KH]c³ßf© Ç}Õî<¡’òúÿ“b ~Ìvs:nÔêCµk{áÆZý˜)µÀØætA`Óßy˜Y2i÷>P
+@Uj›äµk³6SY‰ý÷û`‹¯ËÜ\„°sÏa#ÕåevA¦Ú‹Ò–¹E#FOä¦ØET­‡Q£´:ïYÌ›6n]£ ¢‚î4[+ÛRÊ«Ä­Ô­uݲ&šÆá=Ù£ rãîb×Qþ¡»už÷”€ª„
endstream
endobj
-575 0 obj
-<< /Type /Page /Contents 576 0 R /Resources 574 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 545 0 R /Annots 581 0 R >>
-endobj
-581 0 obj
-[ 572 0 R 573 0 R ]
+586 0 obj
+<< /Type /Page /Contents 587 0 R /Resources 585 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 554 0 R /Annots 589 0 R >>
endobj
-572 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 480.517 320.949 487.491 332.356 ]/A << /S /GoTo /D (section.0.7) >> >>
+589 0 obj
+[ 583 0 R 584 0 R ]
endobj
-573 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 502.177 320.949 514.132 332.356 ]/A << /S /GoTo /D (section.0.7) >> >>
+583 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 480.517 670.112 487.491 681.519 ]/A << /S /GoTo /D (section.0.7) >> >>
endobj
-577 0 obj
-<< /D [ 575 0 R /XYZ 78.37 808.885 null ] >>
+584 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 502.177 670.112 514.132 681.519 ]/A << /S /GoTo /D (section.0.7) >> >>
endobj
-169 0 obj
-<< /D [ 575 0 R /XYZ 79.37 515.126 null ] >>
+588 0 obj
+<< /D [ 586 0 R /XYZ 78.37 808.885 null ] >>
endobj
-574 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F65 335 0 R /F81 377 0 R /F106 578 0 R /F105 579 0 R /F107 580 0 R /F27 340 0 R /F30 341 0 R /F64 333 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
+585 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F74 337 0 R /F15 334 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-586 0 obj
-<< /Filter /FlateDecode /Length 3557 >>
+594 0 obj
+<< /Filter /FlateDecode /Length 3561 >>
stream
xÚÕÉ®$·í>_Ñ?0²Dí€ñ€ééiÎ)ÉÜ ŸćÄç’ß©}«*õxì8‡~¯»ªDQÜIQÅo?Ýøí»w÷Ïï¾yuŠIeàöùïÞà7q³žI{³†3ïÄíóÏ·¾å\}z{/8çøÕ8Îå?ðö^ZMW
üŽã¸¢'èZyBZÎ5Ž7¼Œñ#À_
@@ -1779,42 +1786,41 @@ VËļ'êfì
F0%ì8\¤Ì†.êqÔ†µ'˜v0ÍwQJqH1Ò”ªÉ‘=rª=&9•I©ÏÆ Ã(h])ù@dÖó\ç‰Ý\3ôJ¿cÌ“Qêgȹ0\;>@Çÿ~/ÂRI&(òë¡“NeQÎuLš)Wë‡xxŽ›M}®ÆRƒÎÃa02°Fyɸ)Õx ½´H8Ad0]Õ¾6áG®LôÊ ¢VMšœ4ë{(Díy…z'„ì øGVð ¹äülRˆS0L¶2^eqêï]Ký+HÜjxóGq3+ÁD#Ülíû;¾‘mÔðYn”b1ÝâÈâ‰+¿áÓFŒ£6‘ä 7Íi/Ë ÂL£zߊ‘¡„zÔ’{zîє݋o(œoŠL9ÓèJ5Ð]ÙIjœŒ{F+iЖŸt.ï5¢¼-'%@uí¢é™ýc-Hçmˆ‹„v]ì–˜ÐrŒ†E½¸Ñ€A3ìx
ª£)}rÓ¿£êHCß#µS÷2ærÆSg@3Ó4V~l™ÿUôe˜à¦/mDjy}*kA¿Uú›h×H0•ª‘ã²îºÝ5§ø›6M
†´¿j zÍNô0»ã*§mJçjý¼GÆÐÿÖ?ô°sCÁÁôEyF30`L[~q¿nà‡ÆQ™¹Sl𜠭à»|±–9«ÇM¬ÙHàïçhvs†a’¯g›FŽ4å c7Ðîµ°°ØÍMck×ÈqÀp/˜ã}¥º`¥EÇìÇQµóîÒljµ˜'b.L Í<Lú÷Ú|l/-Óe˜uÜAríÿ'›M+
-b4蛆è_·5ŒùÿÜlR’ãž4/n6) O­0#”w›VSÿŠ¾†¼Y;ì¼é—m6¡'eh­JÌþ¡+«üÜm`€ôÜ_Úþ.
-® º;¦– bç}+Æo<7p8…ªË¨BQ—yé¤ì/ÃAeOÕB6gXzn#Äp†UÜ4ùsj*¬vÁÑ98E│<͹ßožZÞ,ã®}_† éƒóõ¦è’2“9âéðñ?oùÛŸ•%Lz}†À€¦JìÊ SPÚ
-™Ã½þÝ5eÍ/Õ)ºóù,>ìT1㸃sç’7ñt„— 4ärÂL¼m–nŸl{
-ã•ö AZIjÈõ«÷h¿"u7ré_ °¦?5l{=JŸøX¨¶¨Ç¦(q>÷ïPud}WK}åH ŸJd-õÂG­‚…Æð´Õ°k4ò>Æ_m„¯ÈO1\SÔF`Oà% ¥ŽòÃC‚Ca„OÛIòÿS’ƒ¡ª™€…B¥Sq³}L¤ e3’wïƒÁpôÛù0ññÜdžˆðŒÿ(§‘ý³=Ñò kòÎÕjÇÒZЄ`ƒ½AFÌúå-¥³û@j¶#°qSóhuûG§+Êo»a®ºÎ/}MÕ•3=‰'VlÐá¥U¡Y5|7J>^óq®µÈÍ/éN‡‚´€aÑÚ]¼e"šô×Þ–Añlcvïÿ9ü”½
+b4蛆è_·5ŒùÿÜlR’ãž4/n6) O­0#”w›VSÿŠ¾†¼Y;ì¼é—m6¡'eh­JÌþ¡+«üÜm`€ôÜ_Úþ.
+Ô8
+Víñç£Åƒáàn(õW¡×¥oÏšTæ
endstream
endobj
-585 0 obj
-<< /Type /Page /Contents 586 0 R /Resources 584 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 545 0 R /Annots 589 0 R >>
+593 0 obj
+<< /Type /Page /Contents 594 0 R /Resources 592 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 554 0 R /Annots 597 0 R >>
endobj
-589 0 obj
-[ 582 0 R 583 0 R ]
+597 0 obj
+[ 590 0 R 591 0 R ]
endobj
-582 0 obj
+590 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 278.812 667.892 289.239 680.183 ]/A << /S /GoTo /D (Hfootnote.33) >> >>
endobj
-583 0 obj
+591 0 obj
<< /Type /Annot /Border[0 0 0]/H/I/C[0 1 1] /Rect [ 112.169 86.983 232.661 97.581 ]
/Subtype/Link/A<</Type/Action/S/URI/URI(https://pygments.org/styles/)>>
>>
endobj
-587 0 obj
-<< /D [ 585 0 R /XYZ 78.37 808.885 null ] >>
+595 0 obj
+<< /D [ 593 0 R /XYZ 78.37 808.885 null ] >>
endobj
-173 0 obj
-<< /D [ 585 0 R /XYZ 79.37 771.024 null ] >>
+169 0 obj
+<< /D [ 593 0 R /XYZ 79.37 771.024 null ] >>
endobj
-177 0 obj
-<< /D [ 585 0 R /XYZ 79.37 748.222 null ] >>
+173 0 obj
+<< /D [ 593 0 R /XYZ 79.37 748.222 null ] >>
endobj
-588 0 obj
-<< /D [ 585 0 R /XYZ 93.716 99.261 null ] >>
+596 0 obj
+<< /D [ 593 0 R /XYZ 93.716 99.261 null ] >>
endobj
-584 0 obj
+592 0 obj
<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F64 333 0 R /F15 334 0 R /F65 335 0 R /F74 337 0 R /F16 336 0 R /F81 377 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R /F59 346 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-592 0 obj
+600 0 obj
<< /Filter /FlateDecode /Length 2900 >>
stream
xÚµ\Kä¸ ¾÷¯¨?0Š%‹¶º¦Øœ‚ôm±§Éaw9å-[–d=º;‡š®‡­¤ø=òöýòrùËᦔÖ*w{ÿ׋¢_äMÝ\ÆÝ*!QÝÞÜ~ûIJø.¥õRâýõ›’RÒWHÍ“^úõ›q–/¢oÔý}зwºâ±~æ÷ÇU–n×?oWÞù®×ßß%z”½P]%9 ¢ÝÉ!0HõDúË+Ã+Ãë7íù ÿ¬×ÐK›•8³_J7ÓUû'ºÆm×ò/úþº¬cžׇ„õå›ë+ƒj jðBÉ‚ÅI1iç„uÅ*)WÄM‹’‘ÐNç+h Ẕ
@@ -1837,22 +1843,22 @@ W!a+p]×ñàILä‘_ÌïZDάB2#Ññm§Ný$>}
·|ÓyRM­ƒX“xdV™ž…¬UsU°ç›Ä¥´ÂêÂ(c;4>5xÌ ¶ið(Ô4 Ñ»xJÄôî’Òêh$ŽÞå¼Ê¨w)±Wõjcp*: i¥ð¶¸+>WÚúßÝѦÓKþRÁ, :»lîh
ß()”,ñÓ³ÕN¥`Ô’%Mâ·dIÜN-È“àÖÁ,O¯¡®á±Œ;¹
³˜<½Veqp$ÊððÇÅ)Xàá5(,':‹äÜ®äyrÛP:îý5v“ Д6?è¤hC
- úxœÇjÎXùd« V>9 zØŠöh7úœ:îè#°ü,—*V}ˆ‡ª$l†ì¿8¨>â©©T ˆ_õ(ª¦KÑâ'‰Ýñx»O‰ø~dÚ—
+ úxœÇjÎXùd« V>9 zØŠöh7úœ:îè#°ü,—*V}ˆ‡ª$l†ì¿8¨>â©©T ˆ_õ(ª¦KÑâ'‰Ýñx»OˆDü~[Ú–
endstream
endobj
-591 0 obj
-<< /Type /Page /Contents 592 0 R /Resources 590 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 545 0 R >>
+599 0 obj
+<< /Type /Page /Contents 600 0 R /Resources 598 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 554 0 R >>
endobj
-593 0 obj
-<< /D [ 591 0 R /XYZ 78.37 808.885 null ] >>
+601 0 obj
+<< /D [ 599 0 R /XYZ 78.37 808.885 null ] >>
endobj
-181 0 obj
-<< /D [ 591 0 R /XYZ 79.37 771.024 null ] >>
+177 0 obj
+<< /D [ 599 0 R /XYZ 79.37 771.024 null ] >>
endobj
-590 0 obj
+598 0 obj
<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F64 333 0 R /F15 334 0 R /F74 337 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-596 0 obj
+604 0 obj
<< /Filter /FlateDecode /Length 3101 >>
stream
xÚÍ[K$· ¾Ï¯è?°²$R/`1Àôô¶ûdn†O6œC²‡œò÷C©ô*©J*y×A½[Ó%‰ÅÇGŠÍoÿ¸ñÛ/÷—žoB0§”0·?^½á7q3Ž¹-×âöñõöËgÎñ çÊr®ß^? Î9}¥éOxÒG¾~£ü úF¼ÓÿúöN#Ûßþ¹Œ’oéI©2^>«÷¿~üDüY~Cæ¬
@@ -1864,109 +1870,110 @@ Q+&L7SNÌ& éÐɳµ‚)VéYÃ,·GôÀL”ħn‘pDJÊsl\ (ÈSzÔÓ«NzKEBèÿ„ˆþÃÍs[¤´ó|À¨À
Ôȶs¨»v­Ûa’Ùô¹Ñ®àz†ìÓÊ´2Áç¤á‡i»YWÃÒWPd1‰iHGY/u¬ÛýâGöö'$\yÇquiײaU‡»“q1À0göÓöZñ=.â}V©¡gNòIn+îæ]Ì£¼ÊÂÂ{5àS`ÄÒ{‰\T9颚+]¹T Æ}µKʸ'ò-êøW©"§°a:FõöÇD!£,¬mb1Ô·ºnÛ*Ž¡kØ<űù¤R‹Œ¦¶Œ)l›²Æêåû|¬hWÙR´Ã , C—=fV™W››å`¿éäë÷aAUH„ŒPbçPVO¸Fx¤r´
Ž±Â m×HUØÒ㥯š&WLA6hTuÚQ§¥8RWí<¥äx<\2ôÔ'` I:T¯çN”
pÁL{ô•2«ôÆî\SIÚŸmªÅ*ì¦h2ÜU
-ºsܯt56ôcÆ[ç9!KýR÷åk½q!Ý7¸ÈWÈu½žóåy0ÇM¸¼ \£ Šáå‚5ë¢Ô$tHÆ×9 €Óï½*_©&Ä»D9#Þž¶Þ×6Æå}šøiSÐVÞKígÕ?‘Ožò‚Þ¡q[µd‰‡dŽ
+ºsܯt56ôcÆ[ç9!KýR÷åk½q!Ý7¸ÈWÈu½žóåy0ÇM¸¼ \£ Šáå‚5ë¢Ô$tHÆ×9 €Óï½*_©&Ä»D9#Þž¶Þ×6Æå}šøiSÐVÞKígÕ?‘Ožò‚Þ¡q[µd‰‡dŽ
endstream
endobj
-595 0 obj
-<< /Type /Page /Contents 596 0 R /Resources 594 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 545 0 R >>
+603 0 obj
+<< /Type /Page /Contents 604 0 R /Resources 602 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 554 0 R >>
endobj
-597 0 obj
-<< /D [ 595 0 R /XYZ 78.37 808.885 null ] >>
+605 0 obj
+<< /D [ 603 0 R /XYZ 78.37 808.885 null ] >>
endobj
-185 0 obj
-<< /D [ 595 0 R /XYZ 79.37 771.024 null ] >>
+181 0 obj
+<< /D [ 603 0 R /XYZ 79.37 771.024 null ] >>
endobj
-594 0 obj
+602 0 obj
<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F64 333 0 R /F80 366 0 R /F15 334 0 R /F74 337 0 R /F81 377 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-600 0 obj
-<< /Filter /FlateDecode /Length 2875 >>
+608 0 obj
+<< /Filter /FlateDecode /Length 2876 >>
stream
-xÚµ[¹Ž$7õû+ê†â¼
-nŒ+%Ó·÷ÿ¼0|Coì¦-ú¦#T±Ûû×Ûï?R
-_(•†Ra_?1J)>Rîç?üõ“ÐÒ5Â'ì ÿ?ðé[<Âo÷½´RØ_~ÆVúõ÷Ÿ‘&o–XÅ‘ž‘ àD)™ÉÀ¾ÊRöTøß(>•ðú‰÷Žæáøá"%rS쌭ò/l£c[÷†ß_ý8âyÒÞVSöO&SÔp4A†0:Lqqy¸Ò„1Õ÷®gƒ³¸Ä7–Æú8 ¾(£¸5u³“Ô-txæÞ¥çn ¹šo¾änó¤oežØÿz®
-\tÁ.9ƒóè)DÚ’Ï ¥ë¾U`Ýj²ñ¯Çô­Á°™…Ú=(4¥°u¾›!ùáiØq‹ñ‚åÃ:÷ÖþĆ1†Ö^ö½³©NüK«ï’\H³Ö´Ø[©¦Z,
-¯M§ ìg®›£úÎ|â\QTê¡×=.SÜÊÉrqŽÚüMl! SêÛ1EÚhõ¥òy¢—éÞÏhÂH@ïRdQɘÓÕHLÌÔµõ”°]xçLpyïCôS²’K!¼ß¼K‚6>ƺ !_â‹°?d¹ÄŸæl“®,. B‹@6¸–c?ïšW„ñnC?ú„[Ð3ÓúŒ$­&¹^ \12Ø„TÊG˜]¯ ½ƒæ^ˆW£hì!'Ñ‘›0ð>‰‡€Xa7±…`„r5`ÇÍÕp Šhfv1%J•G˜ 6X` „¶cS‘#B¥~šäDÀ(z†BnbEëñrýHœuɹŽ719Šd E>G¦&ÊÄ9R=Õqínmô&ž) JÒۜʿ•¼ÆÞ#N5ý3 f‚3"G/Óûw‡I5=¶GKÒcÇ´Ìfo8áN‹ìaC„su:̘-áñµd3M´“ìv”*Ýp­É4ºÃ鄨Ã.Ï5¾4„ZÙ+Ó¨мÛRCø5˽N'MÍeæáv´1ÂÈŽÓ}–®’…uYÇIÊ&_/9ŽÒ)™–XºL–•w^mÛ³­Ü}DžÍyjÞ*vë©|®á:Im[Ûs‘Î÷¼ÔqÍùŒóøåWªaiÖ’S€R@͹°¤¯½dÄ @‹5îlQî ™÷îÔ5wú_ëœÉmäL½Â™@
-Ž‡Ú¾‹gF@ï®Dv"Ìs ·×
-ÕuZÈdq@ÛkÕ& éu*b@›ib©ˆ…ÝUú9q€V9Yä î![I†­ôGºXŽQ„Y¾šûm§TôZ<_’•ê²Œ${ÎS¼õ¢—üHI,ÝE·ŒXs†>SLTci÷]¦H«ž÷Çcs'²Mq ê|‹9ggǘՖYÕ… H¹ï”jªõɸÕ
-…s*›èÉl{iZåàÝIÍË#\{ðéWÏ—ùNHW"6»¸¨Á¹´sÜ&£}æoqt¤eµœˆcüˆ†á4ýùuA* !·/ @µ„žé]^
-×à\‘-Ëé…S®–¯–æj¢¿ñæå˶Ԃ’D@u!$•D|å)Ô!㛺––[ºbÀ€Z*ž*–OôJùÄ·®ê}©_6ƒèÇkÕ×Au>–V•¦ŽgÕ\‡õ8-åzåªm˜q}Õ¶_ƒñF¥Ë% Õƒ+j×E3w{Yô#ͦZ‡zTõ#nߘåè €hn‹ºÕIIº£ûˆé
-Y7÷Å[³’‰^nk–oÄ¢Ò#FÊÕt=‡{èù~°n³éÞAéãZÂçÈ[ñŽzëOe¹Å[µÎ‚)wNL—‹ŽiEÒiÛí
+xÚµ[ÉŽ$·½÷WÔ Å%¸BS]]ä“á¾ :Ù°Ò|òï;¸o™IRÓs¨îªL’/HÆ$½ýçFo¿¼Ü?^~z*¸1F¬”Lß>þýÂð ½±›¶Dè›VŒPÅnßn¿ýL)¼S* ¥Â¾~a”R|¤ÜÏ'~øë¡¥k„OØþàÓ;¶x„ßî{i¥°¿üŠ­ôëï¿"LÞ,±Š#=#À‰R2“}•¥ì©ð¿Q|*áõ 7î‹{ÍÃðÃE Jä¦Ø[å_ØFÇ¶î ¿¿úqÄ󤽭¦ìŸL¦&¨áh‚ at˜ââòp¥ cªï]Ïgq‰o,1Œõ#p@|QFqkêf'©[èð̽KÏÝr5ß|ÉÝæ HßÊ<±ÿõ\Ë{J¥ñ½:†a†h9aO§ ´—Ýý.6~¹þ2£¤~eóã¡#=´!þ‘ÇåaLþ ß±y ùY0ÀäÑ|ëÀä©¥¢e3áÞ¶Á]±°ŠhÞ¯¹ã†#ší²©ìG‹»L‰tº ÿþrJNà
+"‘/;
+Ï4$ a—¼ðªÈ)¦Òã'šXK"@hoíˉæóhü«\¹Á”Oä‚÷—ÿ–%¥Œ0knÒjt ÌíŸß^~ûßü ?¿:é°úö?ßöjNŒv¢òçí/ÎÆñÚåa$’Õ&5OÐRªè^lå•Ò[R¹t"Z©:ß]ÒyÂQiXeˆ“­Ë[Xa§6“ŽÉ¼y2cƒ#Á0ÒÁH*ؾs-”ˆz[]»™l©ˆ´¢]ß0BR‡ŽAÜæƒ.L'îkSéF¦’Żë<8ÙO.m?ÍÏ¢aº”*í¶z’äûµãD€ó¾W’#þ,{õÏÄ,¢“L T<.©\{»ëÕ, ¿²Ô#‹À©Ç!*Õ0Úõzõ?cåAQÂoÎP
+PÞñJðß
+šóçñʯTÃÒ¬%§
+§¬²´d†pÖ'¹‰œ8fOÑ%
+QËGö @Ÿ‚&â¨/S¹—âU?ôªp¢›ÀDáF§ o¥Èj1m×ö½I(t³Š^ ÃÒ!}÷ƒSLhŠ`X±µ“Њ—ýh{ÿà€D4Û£ú$æsîò¢Óáâ“ŽäE×1˜nl”ÏÚµ˜5x¼í«ïˆØm-©µ‡™’Zǘ«³UŒfv±•F“ ±çñ 7½µ‹éÊTFaªÉ k‰râ³…'¨Äè–ãy“wm4CUx-š óá
+Ü––Ml”?5òa“ÇXðÕŒ&v¥8kL%Év-´}Ï,Œ€Þ)\‰ìD˜ç*n¯ªë´É‶תM4@ÓëTÄ€6ÓÄR »+ª0ôs
+(@ÔùrÎÎŽ1«-³ª %rß)ÕTë“q«$òªu ÞŽ¸ ¬¼/ØÑQ•,V4Ú"îX|;ù‚#¶«l
+çT6Ñ“'ØöÒ´ÊÁ=º“š—G¸öàÓ®ž/ó®DlvqQƒs'hç¸MFûÌßâþèH7Êj9Æø Ãiúóë‚T@?B,n^
+€j =ÓOº¼®Á¹"?Z–Ó §\-_-ÍÕDãÍÿÊ—=l©%‰€êBH*‰øÊS¨CÆ7u--·tÅ€µT<U,Ÿè•ò‰o]ÕûRÿ¾lÑת¯ƒê|,­*MϪ¹ëqZÊõÊUÛ0ãúªm¿ãJ—Kª1„WÔ®‹fîö²èG:/šMµô¨êGܾ1ËÑA
endstream
endobj
-599 0 obj
-<< /Type /Page /Contents 600 0 R /Resources 598 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 545 0 R >>
+607 0 obj
+<< /Type /Page /Contents 608 0 R /Resources 606 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 554 0 R >>
endobj
-601 0 obj
-<< /D [ 599 0 R /XYZ 78.37 808.885 null ] >>
+609 0 obj
+<< /D [ 607 0 R /XYZ 78.37 808.885 null ] >>
endobj
-189 0 obj
-<< /D [ 599 0 R /XYZ 79.37 771.024 null ] >>
+185 0 obj
+<< /D [ 607 0 R /XYZ 79.37 771.024 null ] >>
endobj
-598 0 obj
+606 0 obj
<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F64 333 0 R /F15 334 0 R /F74 337 0 R /F81 377 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-606 0 obj
+614 0 obj
<< /Filter /FlateDecode /Length 1294 >>
stream
-xÚµX¹Ž7Íç+ú–&«Š  ™Ù G¶7Ù°{;ñï»x6ɾƫuÐ;}ëx|upåôm’Ó§ÓååôÃÝФ”ðZ+;½ü~RüENj²^ ¬QB5½¼N_>HIÏRj'%ºó“’Rò+ï|Áù ­BüF]ù÷Æo/,qKÏá¾J©;²¿!H’ñ÷’W:þNç¯/ŸÙ?¥'/¼ösé0FW÷Ø'ãy­áß` ‘ßj:? 7á3¤+˜LÎbåÅ,UŸXÆfÙð.ç¨ïò¾"¾9„"H19TKk¡‚áÔ"ÖMìvqç ÚÚÙå6`tÏ1)Ôr€œµ؃—Z†½Hï·ò>À æ, ]Hån‡=ì.
-äApLƒã:A7PL9aõÅŠY-¾‹xÑû¿©EZ s‹ ßÊ-45¼B›qh·O¶÷tÏâ «ûÛ/Ú¢tJÇ"iäÌ)ºô2Œä(
-Ì qa³C^JöÍù¨ú©{ü±ZTdr*Œ6ÝÓBFä¢_Ä=ÄéH8æNÅ©\+éh,¦Åæa‘ß~W1èk)6º—[­U²–›–²Ù£RÑdÇO•G¡-ŒnU\*•—Ò®Å*bò¥ú³›Ï–«é…µë~Mq 4º÷óñ½X˜Ùáæ+³âùåô× ±TBy7ioyòqÓ¯¯§/_ùËo|}ÙãíôO”}Ûˆ³!•þœ~9ý”æ©u,«Z§…®ó”‰Ý$—137–ŠUëšxÒÔõm™»^Û…¿ÄßvýÝ`ZQkœÐäjg¸&ä²¥UÎnDîX-4­t´R«£þt˜[(æo`?AŠÛÚí±Ç9i(ÁËcnšn×ïtw¨)[çú.w«Ý̲aûhtIß²Ø %õb•y H"a°î|Ì™{i{lÓ_Àìµ-Á„ËšþÒÃGPìŠy^XçäsÃ|Ӡ˵
-1b L¥t6:ƒýП¬ê~
-Ë]د‰Š€Õã¨?LÙaØÁR:6&î²÷¥…Ä=±ù÷x¦R|ŒT ë×óy™£ŠljÏp›ÒÍÏó  kÝ'ÚšùØÛæ™Æò½´öÕ@æü±m¯×¢Ð¿j%¯P Ôµ)»YÙ¥íÀÀšQ®rºr ÔÎÄÄœ™1žÅOâšrÊ,•56 7®S×êÙ§£ÇÃ9t಑»USþV
-+«ýbqž®F›‰¤ðv C<—Êû/2c¢
+xÚµX¹Ž7Íç+ú–&«Š  ™Ñ#Û› ŠlX´ø÷]<›d_ãÕ:è>Šu<¾:¸rú:Ééãéò|úénhRJx­•žÿ<)þ"'5Y/ÐNÖ(!šž_¦Ï襤Rj'%ºó“’Rò+ï|Áù ­BüF]ù÷Æo/,qKÏá¾J©;²¿!H’ñ÷’W:þNç/ÏŸØ?¥'/¼ösé0FW÷Ø'ãy­áß` ‘ßj:? 7á3¤+˜LÎbåÅ,UŸXÆfÙð.ç¨ïò¾"¾9„"H19TKk¡‚áÔ"ÖMìvqç ÚÚÙå6`tÏ1)Ôr€œµ؃—Z†½Hï·ò>À æ, ]Hån‡=ì.
+äApLƒã:A7PL9aõÅŠY-~ˆxÑû¿©EZ s‹ _Ë-45¼B›qh·O¶÷tÏâ «ûÛ/Ú¢tJÇ"iäÌ)ºô2Œä(
+Ì qa³C^JöÍù¨úÛÔ=þ\-*²9F›îˆi!#rÑ/âât$s§âT®•t4„Ób‚ sŽ°Èo¿«ô‚µ]‡K‰­Ö*YËMKÙ‡ìÇQ©h²c§Ê£ÐF·*.•ÊKi×b1y‡RýÙÍgËÕôÂÚu¿¦8ÝÛùøV,Ììpó•Yñáùô× ±TBy7ioyòqÓï/§Ï_øË|}
+ÙãíôO”}™Ûˆ³!•¾O¿~IóÔ:–U­ÓB×yÊÄn’˘™›KŪuM<iêú¶¿Ì]¯íÂ_âo»þn0­¨5Nhrµ3\òÙR‹*g7"w¬‰šV:Z©ÕQºÌ-s7°Ÿ Åmm„öØãœ4‚àå1·M ·kŠwº»T”-‡s}—»ÕnfÙ°}4º¤oYì„’z±Ê<$‘0Xw Þç̽´=¶é¯`öÚ–`ÂeMéá#¨aVÅ</,‡óò¹a¾jÐåZ€jtŸî»A#‚
+vã¤_¿“Iz"sÌÜUS$ùÙa9-Gþ+ÊÔt ¡Š ›Ê=;$æZÕf…áÅ.ì×DEÀêqÔ¦ì0ì`)wÙûÒBâžØü{<Ó)>Fª…õëù‰¼ÌQE6µg¸¿¿Néæ×ùÈŠ…µn“NmͼïÎmóLcyŠ^Úûj sþض×kQè€_µ‹’W¨êڔݬìÒv``ÍŒ(W9]9PjgbbÎÌÏâ¿'qM9e–ʆשkõìˆÓÑãá:pÙH]‡ª)+…• ÈÕ~±8Ï×G£ÍDRx;„<çX_*ï¿2¢
endstream
endobj
-605 0 obj
-<< /Type /Page /Contents 606 0 R /Resources 604 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 545 0 R /Annots 608 0 R >>
+613 0 obj
+<< /Type /Page /Contents 614 0 R /Resources 612 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 554 0 R /Annots 616 0 R >>
endobj
-608 0 obj
-[ 602 0 R 603 0 R ]
+616 0 obj
+[ 610 0 R 611 0 R ]
endobj
-602 0 obj
+610 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 263.782 468.798 278.507 480.753 ]/A << /S /GoTo /D (subsection.0.6.3) >> >>
endobj
-603 0 obj
+611 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 294.754 468.798 306.709 480.753 ]/A << /S /GoTo /D (subsection.0.6.3) >> >>
endobj
-607 0 obj
-<< /D [ 605 0 R /XYZ 78.37 808.885 null ] >>
+615 0 obj
+<< /D [ 613 0 R /XYZ 78.37 808.885 null ] >>
endobj
-193 0 obj
-<< /D [ 605 0 R /XYZ 79.37 771.024 null ] >>
+189 0 obj
+<< /D [ 613 0 R /XYZ 79.37 771.024 null ] >>
endobj
-604 0 obj
+612 0 obj
<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F64 333 0 R /F15 334 0 R /F74 337 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-612 0 obj
-<< /Filter /FlateDecode /Length 1309 >>
+620 0 obj
+<< /Filter /FlateDecode /Length 1308 >>
stream
xÚµXÉŽ7½ë+ú†&‹; 4–F|s¢›á“ û’9Ø—ü~Š{“ìmé ¨›MVÕ{µ°H:üèðñ4ÝOnJ Œ+%ÓÃýljá:°A[Âõ #T±áþ6|9S*^)•†R%ÇF)Å!…¯ü†?_¸–nŽ° þ_qtÂ×ðîž9à{ž ·0¢¯q6¸±ü•œá¿VyDà¼K\ƒ?ÉñÝI´øÌ‚ ¡·´_ïŸ3“ƒ%Vbï!3A83 r…OqgŵMá—´¡åAºKÒ™Äphå?pA´0Ö«ãÔ³ ŸÓ ÓúìÞVXñ÷Ÿç2¢37NŠÕÁzE GQÔ’Ö‰?ÓY™X Ö9má-ùÆÍSÎå$$n†“¨EBä¬â:Ï/‹M$P ¨(qæ‘Š¸&âTÑ®à©è µè œ­TÇG…¡ÌǶo™Ä¼ÓJô¾åüyæ!`N½€‰`ˆüé–H!î]ÍŸ~º®ÌXûýs~,Ñ'%¡ :̯~e¨ÌF–·³+-É7H4Ç3›"“&ÙWņ9m]]Jz>|]ZÑõk(C¬±-º'׎E€·ZUŒï‚ªÇé¾{­S;ªlb)0ŸB+zóõ~úU™2¬”0˜"|øövúò¿|ÇߧmõðŸû6p Äh‹Ï>‡=l%?’X®ˆÁ¤L¸Ø’uã‹4Ò ©K†½n(gXM¡3Tà·MCW¶†$–áGZÒäœàÈ)¤Û%Á $ÑIZH†k ÈÏU¦»ôÏõgÇlª‰¦æ·‘®qºD,ŸŽAi¤/Æà’¾£ùÖlç¥Vè[ÖÚòô¼4DãŽÑj=P„³'qÞ6Á4Ñ´Ã&¦²ƒsXc¹ªÌ)¤•¾Ž'{ÿ¨kaÞ;í!ÿ7ÒökmÜÖBxÛÇÆÅvXªá“ãÀp¶Súà0à@@éVKËdggv¡`Ávk?Jyð KÜ04?"µ–ÿ"m;lR;ì¿zÛèšd)býô„ÁFß°Õ'ra‰6ªåú­:¦¶cFc¿C”º,t†Ÿ3å´ *>¥,<¦ÈpÛh„ÖùG¡rL]çMÃŒ"vãÇŒÚò$JMJ7ù!ºf¯ÀœÊ–ÛŠ–êÐn(% 2ãB¦ô‹µ!&SîwB»–V…6S1Åõy®c,1H<–mž¸™>X öR¼³ëÙPc_Lu§u^=ûüìô4Âwv¼óbS…Zóêþ©-y›]¦až™GN” ª]ÝíÖ¶œWaÿ$ ’Ët+Õ¥ùÌ®YtÉî»yö͇ƒ%`x«_AÒNgdMD%
6R·K¼G%æGÞ)*¼¶ÇÄ$(~«zôÎáx ¶±KÕ„m¤òÆ^Ä.3Úè…I_®ë^S9#Ä‘w?ØEäûBxgÝÃ;˜™«¥.ìï·-=…ÕG¶‚ÆEe‡øÙ­ %FtJÛ
fÚNÕj+xÛsn®;]˜`ã’ÍïXÇ¡YÝbõmDºù 'ÁyS°z§yøvç=•Q"4_²ù
-ܽu¹!ÁC–¶Éˆ3M§
+ܽu¹!q‡¬|yõ/3<Mž
endstream
endobj
-611 0 obj
-<< /Type /Page /Contents 612 0 R /Resources 610 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 545 0 R /Annots 614 0 R >>
+619 0 obj
+<< /Type /Page /Contents 620 0 R /Resources 618 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 622 0 R /Annots 623 0 R >>
endobj
-614 0 obj
-[ 609 0 R ]
+623 0 obj
+[ 617 0 R ]
endobj
-609 0 obj
+617 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 254.015 699.315 260.989 710.274 ]/A << /S /GoTo /D (section.0.5) >> >>
endobj
-613 0 obj
-<< /D [ 611 0 R /XYZ 78.37 808.885 null ] >>
+621 0 obj
+<< /D [ 619 0 R /XYZ 78.37 808.885 null ] >>
endobj
-197 0 obj
-<< /D [ 611 0 R /XYZ 79.37 771.024 null ] >>
+193 0 obj
+<< /D [ 619 0 R /XYZ 79.37 771.024 null ] >>
endobj
-610 0 obj
+618 0 obj
<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F64 333 0 R /F15 334 0 R /F74 337 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-621 0 obj
-<< /Filter /FlateDecode /Length 3327 >>
+630 0 obj
+<< /Filter /FlateDecode /Length 3324 >>
stream
xÚåËŽ#·ñ>_¡X†,¾Á
í/Þ)!º|ýýò󳔤ôñå“’RâOƒßæŠ ~)5”ßùûö¢ŽqQJõCù6øܪüî—¯?áÒÊ^¢ˆ…íÒZ °@K»ÿ5Á~ù¤µÆ'ðZVòòÂs]5”2F“üÞEš™FhO¿f#ä ÕÔ7þ üÝÐR€63'(PïàX#‚‚J†0ð ÀâøWèûôù:&Ç
@@ -1979,12042 +1986,11998 @@ A‚ŠbÙ¼Vèhs!?qu²yPB¨þ‰è´d m"Ìs©2 ÝOœ¨VEÈ4˜Ãcþ¾`«%¹Æœ‰äôe»xþùFf6j&ØË`pku[
‹0ø82¾Ã2°¬Gè…âƒtŽ(ÖXâ*¥ß–^ö}»½´²áp'Dšéá= ½CúÛø…_ʆáA•MÒ¢ ÿ?2ò†“µŒÿ(¦º·ãpÆ£óîÐ[B¹ÖJhíÿTI«VøàO̵ôS˜÷³á„ï%Œˆ¢fË÷Ù1D+ŒWEêÜf!è|¢ò›¯„uê}‹®\`]{¸|DŠ6
'݇ñÆ×sŠΪ·IQ[á¢ýÞÉ×ÚIÿñëÓ¿g¤À t—_úù|þüü”öùc¸ü7üý¢°æw*Íû×åïOökr“fÔ‹Õ’O™Rß² ¨$ÊämBÏ·™ëæ´Õ“$æ'AZx´P^„é´j'ŽZÖG£ôóLz
성ŒáÁåÉÞùØsu@ïŒù¨·<ÍÍ)ò™/ÖDÆ" `:aÀQJ;äuÓ÷½³*·NÆ%?5*Öqf(©ZÊÓç±¼ùP‚COÚWTêÏT}‚÷+<9ŽwÔ‡¸ùt¼fçURG3a:>êÊ“Õý@lÒ<¤¥Z– ‚Ãw¢Dé ¼wó*¦ˆã‡7q£˜åQë0}yhM¬‹‰ÌißÈ™§aæyž´éƒØáªgmÑðÖ–<¦5þÈQ ùT=ïœÌ³y}ÑÇ ]‘w7ÖohŽ:f²ú‚Ûxþ©Ë!r´‰··~Øo ;P.ƒˆNï)×;™r:Û æÕ’¹˜š”
-…>¼/7pûüZ²þ«%šyÞnZ™Çòf°ò„ú\ ÕY¾ö·ä>ÓóLÍå©—/=ÏÌã{f×bM­}fæÏ£"UA ãÛp¹„ÍŒQ/69Cªœ¹5¦Ê‹¶ ë-=. ë!XNŒ›³ü<†')U@M\v3ý9&§ärLøî«Éc0 }€™¡çl²B*ºÐ²C/Øã/'ºV(k’z—9\¤©Y©å”²•‰‘¹³ú‹õîv·¡¼åƒM´©Oê†qG±@¬Mk»õêg4n#Œ‡7I¨Þ.WñÔF(vD»ƒkj{Tzƒ+m„þ)[ ÇÑ0™1aí,}ßÀƒPáÖaáßôUÇ,j±fºz˜*L$âî{ÙYê†3°Á:sŒ¬€°]×øˆçÃåUkv§lµFuºJ»cÙ5ê¡)÷ʶäê®j FyVËDZÞ}¬~€q>)ñ–Ÿ9¿öÌÌ«ÁÖüæ0@¤ËS)Ý¡ò»e•Æ]_Ëiš/]•§üšOן³ºÌhÿ8—ª.ÛttÈ…òõNŜҎnI)lª3F(w&A³^vôu=D—’ £DІ7›þAzÊvk5oØPÖnZ†v2<wù·Ä¾<åÅPÝ*É—3†-r³ò–ÌNQ2Fæ¸6—iýFdØÜgÅ'êU¯ø_A¶ÞZµ¾±ƒÓÍŒ}Æöê! ¢ŸŽ×ðJý@»­£¢@üí5MMP‹·d ê^sNk–ÙÒÝj[¸Ð[J »‘XÛ(î·ÇZ!vãH¯oòµúÝÁmÙ½SÞ•9µÙ-¼T\Yö‡›¡f`lÝæÒc`È×Jzu°ù¯Òæ¡Œmþç ¯– Ÿ¥C¦þr»¸msR¹aYt/L^Çœ…XŽåéVh‡yƒvÂÍк+µãÕƒ®-`ºÞݼJJª"¿â]ˆ mNöë$„(åÞžßÜäó;ôåÍÂ'Л2­â§
+…>¼/7pûüZ²þ«%šyÞnZ™Çòf°ò„ú\ ÕY¾ö·ä>ÓóLÍå©—/=ÏÌã{f×bM­}fæÏ£"UA ãÛp¹„ÍŒQ/69Cªœ¹5¦Ê‹¶ ë-=. ë!XNŒ›³ü<†')U@M\v3ý9&§ärLøî«Éc0 }€™¡çl²B*ºÐ²C/Øã/'ºV(k’z—9\¤©Y©å”²•‰‘¹³ú‹õîv·¡¼åƒM´©Oê†qG±@¬Mk»õêg4n#Œ‡7I¨Þ.WñÔF(vD»ƒkj{Tzƒ+m„þ)[ ÇÑ0™1aí,}ßÀƒPáÖaáßôUÇ,j±fºz˜*L$âî{ÙYê†3°Á:sŒ¬€°]×øˆçÃåUkv§lµFuºJ»cÙ5ê¡)÷ʶäê®j FyVËDZÞ}¬~€q>)ñ–Ÿ9¿öÌÌ«ÁÖüæ0@¤ËS)Ý¡ò»e•Æ]_Ëiš/]•§üšOן³ºÌhÿ8—ª.ÛttÈ…òõNŜҎnI)lª3F(w&A³^vôu=D—’ £DІ7›þAzÊvk5oØPÖnZ†v2<wù·Ä¾<åÅPÝ*É—3†-r³ò–ÌNQ2Fæ¸6—iýFdØÜgÅ'êU¯ø_A¶ÞZµ¾±ƒÓÍŒ}Æöê! ¢ŸŽ×ðJý@»­£¢@üí5MMP‹·d ê^sNk–ÙÒÝj[¸Ð[J »‘XÛ(î·ÇZ!vãH¯oòµúÝÁmÙ½SÞ•9µÙ-¼T\Yö‡›¡f`lÝæÒc`È×Jzu°ù¯Òæ¡Œmþç ¯– Ÿ¥C¦þr»¸msR¹aYt/L^Çœ…XŽåéVh‡yƒvÂÍк+µãÕƒ®-`ºÞݼJJª"¿â]ˆ mNöë$„(åÞžßÜäó;ôåÍÂ'Л2­â§
endstream
endobj
-620 0 obj
-<< /Type /Page /Contents 621 0 R /Resources 619 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 627 0 R /Annots 628 0 R >>
+629 0 obj
+<< /Type /Page /Contents 630 0 R /Resources 628 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 622 0 R /Annots 636 0 R >>
endobj
-628 0 obj
-[ 615 0 R 616 0 R 617 0 R 618 0 R ]
+636 0 obj
+[ 624 0 R 625 0 R 626 0 R 627 0 R ]
endobj
-615 0 obj
+624 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 384.187 623.97 394.614 636.42 ]/A << /S /GoTo /D (Hfootnote.34) >> >>
endobj
-616 0 obj
+625 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 219.594 531.297 226.29 542.485 ]/A << /S /GoTo /D (Hfootnote.35) >> >>
endobj
-617 0 obj
+626 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 224.825 519.352 231.109 532.078 ]/A << /S /GoTo /D (Hfootnote.36) >> >>
endobj
-618 0 obj
+627 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 308.511 508.283 314.795 518.575 ]/A << /S /GoTo /D (Hfootnote.37) >> >>
endobj
-622 0 obj
-<< /D [ 620 0 R /XYZ 78.37 808.885 null ] >>
+631 0 obj
+<< /D [ 629 0 R /XYZ 78.37 808.885 null ] >>
endobj
-201 0 obj
-<< /D [ 620 0 R /XYZ 79.37 771.024 null ] >>
+197 0 obj
+<< /D [ 629 0 R /XYZ 79.37 771.024 null ] >>
endobj
-205 0 obj
-<< /D [ 620 0 R /XYZ 79.37 705.06 null ] >>
+201 0 obj
+<< /D [ 629 0 R /XYZ 79.37 705.06 null ] >>
endobj
-623 0 obj
-<< /D [ 620 0 R /XYZ 93.716 227.357 null ] >>
+632 0 obj
+<< /D [ 629 0 R /XYZ 93.716 227.357 null ] >>
endobj
-624 0 obj
-<< /D [ 620 0 R /XYZ 93.716 189.157 null ] >>
+633 0 obj
+<< /D [ 629 0 R /XYZ 93.716 189.157 null ] >>
endobj
-625 0 obj
-<< /D [ 620 0 R /XYZ 93.716 151.299 null ] >>
+634 0 obj
+<< /D [ 629 0 R /XYZ 93.716 151.299 null ] >>
endobj
-626 0 obj
-<< /D [ 620 0 R /XYZ 93.716 108.297 null ] >>
+635 0 obj
+<< /D [ 629 0 R /XYZ 93.716 108.297 null ] >>
endobj
-619 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F64 333 0 R /F15 334 0 R /F65 335 0 R /F74 337 0 R /F81 377 0 R /F83 414 0 R /F16 336 0 R /F75 338 0 R /F93 567 0 R /F53 345 0 R /F73 350 0 R /F59 346 0 R /F85 437 0 R /F71 347 0 R >> /ProcSet [ /PDF /Text ] >>
+628 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F64 333 0 R /F15 334 0 R /F65 335 0 R /F74 337 0 R /F81 377 0 R /F83 412 0 R /F16 336 0 R /F75 338 0 R /F93 549 0 R /F53 345 0 R /F73 350 0 R /F59 346 0 R /F85 439 0 R /F71 347 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-631 0 obj
-<< /Filter /FlateDecode /Length 3060 >>
+639 0 obj
+<< /Filter /FlateDecode /Length 3152 >>
stream
-xÚÕ»n$¹1×WLx,—,¾aµFs€3ÃJŒ;G†Ïvpýÿ‹Å7û¡¦VžÝ fµÝMëͪb‘_þyá—_–ׇÏ7¡/žyF]^ø_ÄÅz&íÅÁ¸—×?.¿>rnÅ'ñ¯„/Ÿ¤÷á ç
-ð ÿ¶û¢®œkßÚòÖxs‹ãçaœå\<ã÷ÅAÀñ2‡… |ní"¨°<,iù[Yßš²ˆX]ã8ãË2.Ÿ!(S¿|¡UmyP5×0¾Àõ½ô´I‚ÖÄ€=s„WàñoO›á‰
-ŸØñOkiÑ>eúªâü@™r!ÑÈÈŸ¿½þi¹òLp“E.m\ËðJ˜E8HP]Æwä[øV¹ž”£9K/©Ï2©”ãú×Ï7«¶Ô„bÊ©{PÍÌmEpÌÃ81 å•ø4HªÕ,×iVÖª;k5ÇH¬¦h¶«æ1Û¨ëƾ]„¯FoÂñ ɬèO°6d_”~‘Þ
-F+‘z¾,ULJ‰À€¥ÑŒT6àG! æÄ
-b\\sË©M±+‹=›²Z.Òn‰4^#;fz"B6 ÓùÓ§òM'0et&£7O>òÂsæ‚Qˆ¢@%b`ƒ`U¡ Ï&z¤@@À€¾sbì¡çÐŽ9·b‡>Æ-±KÖu~ê%þ3Èö‘0{‰^´Vz?zujd"L-7`%Å$ª“/ã•Î> *PôúQŠ`â‹3¢ü÷—‡—ׇÿTvxÏpû¼ï˜Avüýú`™AÇ,$óÊ]þûËïÆM
-&j :DnÏ‹dÇÀ„SOµ‘µ¿CcnÈÿ,ùN÷nDoäÌ{mJ–êQÔy§Dášlëú÷¨%sFÇ Lé¯ñ¸=*eÎúGþÑv“Â>¯
-ï^ØÃî·ÙPžGB<ã‘ `dΛ{Ç^š"™~$S›Ùû7Ú–jÚgÉ”Ò3œÿ‡‰‘3B©4ËŠÊñ§)Ü›֮ã-#9ÓMd†“öqïLhñ1ý²º Qé©Ý½((osPKO]”a¤È:‡œêæv*Åc =û;Q†ê·Hš ŸÊnÿj(Bb(¤¦M=†¥?I×EìôÔ¿«R?‘”Ç™ø,—’"çIé4*Íç›öôîNHh‰Á€]£GÔ^1ÛR$û|sî‚Ùº1Òu“-fð®›üÓ¿~Ãõ“ÇBlMÃtŸŒ±›÷—׿¦YÛk @càÃbÿþy–μ8×XÆ@§:¢³ŸŒ(˜¾„š·‡ÌɸZeñaözªM×L›y×ñ&©gÙ8ÎSf9¨{ÓÓeýdr€)Þ×KrnP7<-kÒÜë]¢,ÁSü–7q_E-–Ú˜Ÿ"®››»I›âš3¯sÕ}z§éиˆR¤‘î!‚[&Œ³i«ÝðÞï`/îB^/môZýì£-4ØC.ï‘&¼T›x§f„2¢/ùƒQs¨÷³gP7]}iLû¦ÉŽqYjRΑÑÏdÈ—ˆéé­nßù9l£Ê6ym+ν¯JõÌ<:W›¡~¥ÙK¬ ÅQc!,͵‘µÁ¾äS~›÷½:&Öú·=ä<kþ5jW/3Îc˜”ƒò|X'‹9˜Êž¥ètSZ¤ôå9îdº…n‚,â/‡_¤Z¼‰›Ÿ»¦«V$‡ÃùÛ0ÖŽ¤Œ±ÍÿÎòÞ!ûäEa¬$\#Mq¿›?戥Zrí•|Foù§00 ii¬ã¼Ciô
-€Œ/KDmî"VŽÛQªbH³ò–Æ3ík£Ër:«(È÷¶\ÁY]n„?Äe˜ÁŽFt¶ôn§#µcFÊ–Ÿ'ó‚ÂÏ‘ö¶§
-óZ«,3Vµ˜ž ³¥¯Ž{1¥äÌJ[{1ûÒXõ¼Æ&À\)¢ra8u¹†þ“ÚiljÕ+{+ù<É¥b1ͳ±èl#Œ¯ý>K=€{¾"z¹+3M^’â,U)KEî–G©Ô÷˜ 4ʦx­ÿ„wZ•9[mHÔ¿ËB¢öeUÐc·–„…Š¶xγôãNQ8ü&Ìõ9¾ŽYWÒÛÒ*)Ôcm$-­£&)ítB5‚Î¥®MC_ÏêÇìÃQM‹`\:‚_Ê÷ÄÓ8¿=/¯+ë¾¹ÖŽí°ôU-RóöDÁ0«
-É^¶-–i”¸™Ôr&tiž¬V©ëÚwiíL,mÙ~›«äsb冴C«B”2¿#vÁðÆcçi%#Úã9wž#e¾Z| ¥Nã²I›ôkZLµê;4¹9Ù\‡fÔI|©­®›•×ìqåB?nuv»Á¿º7d ^1g¡í!n½Ljjl׈m&ëûÛ
-÷'ãJÇÒ‰Ž²ã1Ï;ÅÞ.ñFã£ÄÝkE¯êZ=[œùÐäYZ:s¬F[©å¸ôs‹[ì¾Û¥!t%‰.ž˜«¨
-ÄåÔøMNÅ%î¦p'ˆ6ˆ.?Ïretdr¹¬’MŽ4äÐäjZU1œå™ qïTþä*&Дw®SÌ$Ž“lÕ ñ__A°Œ[ÛñSÍñ³‡ð^~~žîø΂gB¸ÎºçΚ§R(àÀ@øÍël<ßl!¿
-ô\©µ™£ Q:`VŽL.¦ÿ”NÈ ŽªËÇRrEr(ÜÐ#cpÅqåze¶qmnxÝréJ0Uû€WuÙrÔ½QëÜË»q®6í¦m¿6·÷¯:̃åˆí˜ ÃË5Ÿú -Ó¶g×Õ ›Qâ&õI¡>ÁŠÆz)xUßÚÃYZÅîF=¤pçVHº'?½?JÎTÓDý4ÛH4
+xÚÕ¹rd·1çWL(Äâ>ªX¬âp8ªræ2—äÈeIØÿ¸Ñ@ãzféÙUÀ]¾ ÑúD?òÓo'~úéáüþðå*Ì)°`¥Õ§÷_ ð“8¹À”;9+·âôþÇéç'Îxö
+þWòùQ…;s®%Œðgéº}á܈ôÖ•·6Àœkš§9óçâFü³—æ+š/ÏåQúøpm7p2ŠÛËsÞþZ¶‡·¶lbe¬/iž e•¶'ÚÖ‘gÜÕ•7U{‰ó ÜÐËO«$ƒ Ø18ižþïi³<S2Ûþy/#Ú'¢¯Š!­”i_ð÷ bJüùÇû_F‘ëÀ·$råÒ^–·Pâj}ä Bõ„ïÈ·8#ò­r=Ž"d’^>
+œdR)‡ý#®_®N¯W)4Ó^ØKݬ\?èRzä¸0
+ å›#ñ8Hª=Y¾;Yt6êÙYs˜ÄÜ
+M
+fž3eNï™±Iì?ü¦òÇ=±{ËLPÝ¢§åôšýú9½3qÌ&ב ѲÂ:$?¥€ázä¼UÎÌËO* àF‚ãá&KFÇ@á¸(¥³Ì»0¢)% â†c&pv§Éf
+èµàw@MUVÅxP7Õó
+%þ%‚;¦€„a5:ÚÛ}ƒÁkHYl´5shõ«÷hÔ*ðáYx«qãÙÉšAX=‡z¿zuÛU˜ÆÄoš á™jê¿jŽŒ~u$C½%”ðœ^«ó¦çèD,NòÒÖœ{K•+š4›êͲŽâêsª!¥Yc),¯u‰µQ¿Ô ½%¯Wç¤jÿº}̬ݿ@ÑbªPt¾ .„/‰N¢5…:û. Ô#xŒ¥òvøû.ŠÂi8s~„b4%ºžè “¼äU¾ß±ô¦ D胃|Á²0[·­Ø ­„3: Gµ’ûAb dh‹B?Öú‘̪dË®ÈOéº%›êöîK¸UÞT˜…[j‰°ºâÆã’£sÌ)×9 =Ø ›ãÅüóÁ!
+Ž!0s€œ®¼†´Z¥ÈK‘/Åø’Êk;+•ié¡)ÕÚRPÎWdù©1T…_š“æ’¬¬ZT°Ÿ5£ÚZæ\‰bõÛL¤0,¾="[©_þmG{hîq—á]Ð(-Ú«³”~L‘ÛˆäJBq¨„Q–HASq×ͽ f^S@Œç»˜t„,Òå•è5ySxíVØv-1]ÌîúuË©aúÍ쇴Vhײ™3í²¿p?öGˆ¥|é=øŒ>†sOq€Ÿ¾KÆçR»À÷  Ÿ¥÷÷LªN
+S‰h¿þ{Âg
+âŽÂPÀTéD+¹Ôy
+Ú–¾¼°—¡Ó~ß\ÂnVÑž=®¼)j÷óM)+ü›¡{M–Ú€sí½Ike¶ÊûQ£|Õ¨ý;-ðNRŒ;íK'ÊŽÇœ<Å–—ø «[aÃÒˆE×Ǿ¸ ê;ØK¿:EjXÏßS”»JêßµS÷ ÙGÇ‹'['=WQ
+53x™í
+kF8• °¨É©(Õ¦Ó}‰ª?£4Ú&]}ñeYæ)7êPkióXÇR¥VËŸ¹WV¨ƒ‡ßG®Èž+µ4³— */»#“‹ê¿Õ6±bt­”udšŸD²+\ Òµ\.v®]‚ilSÃËŠI@„×cÿaß&G õT:·²nXklëó/íhóa÷öÔñ³5 {VË`1¦ì7î½Q}³ïê…Í,qUû‡IÃr¤°þ±ƒEik³±Ôi&¸éÅ?% vtκF/˜—¦5õsýCýúMó>†ã¯ʤÐqæmF̵ùôë·˜¥Îí#¨>±÷'ߘiÛ%™5ö¤9~£»dÕÛûÃÿ
endstream
endobj
-630 0 obj
-<< /Type /Page /Contents 631 0 R /Resources 629 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 627 0 R >>
-endobj
-632 0 obj
-<< /D [ 630 0 R /XYZ 78.37 808.885 null ] >>
-endobj
-209 0 obj
-<< /D [ 630 0 R /XYZ 79.37 639.908 null ] >>
-endobj
-213 0 obj
-<< /D [ 630 0 R /XYZ 79.37 621.783 null ] >>
-endobj
-634 0 obj
-<< /D [ 630 0 R /XYZ 77.176 602.516 null ] >>
-endobj
-637 0 obj
-<< /D [ 630 0 R /XYZ 77.176 591.557 null ] >>
-endobj
638 0 obj
-<< /D [ 630 0 R /XYZ 77.176 580.598 null ] >>
-endobj
-639 0 obj
-<< /D [ 630 0 R /XYZ 77.176 569.639 null ] >>
+<< /Type /Page /Contents 639 0 R /Resources 637 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 622 0 R >>
endobj
640 0 obj
-<< /D [ 630 0 R /XYZ 77.176 558.68 null ] >>
+<< /D [ 638 0 R /XYZ 78.37 808.885 null ] >>
endobj
-641 0 obj
-<< /D [ 630 0 R /XYZ 77.176 547.721 null ] >>
-endobj
-642 0 obj
-<< /D [ 630 0 R /XYZ 77.176 536.762 null ] >>
+205 0 obj
+<< /D [ 638 0 R /XYZ 79.37 640.179 null ] >>
endobj
-643 0 obj
-<< /D [ 630 0 R /XYZ 77.176 525.803 null ] >>
+209 0 obj
+<< /D [ 638 0 R /XYZ 79.37 622.054 null ] >>
endobj
-644 0 obj
-<< /D [ 630 0 R /XYZ 77.176 497.908 null ] >>
+642 0 obj
+<< /D [ 638 0 R /XYZ 77.176 602.787 null ] >>
endobj
645 0 obj
-<< /D [ 630 0 R /XYZ 78.499 486.949 null ] >>
+<< /D [ 638 0 R /XYZ 77.176 591.828 null ] >>
endobj
646 0 obj
-<< /D [ 630 0 R /XYZ 78.499 475.99 null ] >>
+<< /D [ 638 0 R /XYZ 77.176 580.869 null ] >>
endobj
647 0 obj
-<< /D [ 630 0 R /XYZ 78.499 465.031 null ] >>
+<< /D [ 638 0 R /XYZ 77.176 569.91 null ] >>
endobj
648 0 obj
-<< /D [ 630 0 R /XYZ 78.499 454.072 null ] >>
+<< /D [ 638 0 R /XYZ 77.176 558.951 null ] >>
endobj
649 0 obj
-<< /D [ 630 0 R /XYZ 78.499 443.113 null ] >>
+<< /D [ 638 0 R /XYZ 77.176 547.992 null ] >>
endobj
650 0 obj
-<< /D [ 630 0 R /XYZ 78.499 432.154 null ] >>
+<< /D [ 638 0 R /XYZ 77.176 537.033 null ] >>
endobj
651 0 obj
-<< /D [ 630 0 R /XYZ 78.499 421.195 null ] >>
+<< /D [ 638 0 R /XYZ 77.176 526.074 null ] >>
endobj
652 0 obj
-<< /D [ 630 0 R /XYZ 78.499 410.237 null ] >>
+<< /D [ 638 0 R /XYZ 77.176 474.546 null ] >>
endobj
653 0 obj
-<< /D [ 630 0 R /XYZ 78.499 399.278 null ] >>
+<< /D [ 638 0 R /XYZ 78.499 448.875 null ] >>
endobj
654 0 obj
-<< /D [ 630 0 R /XYZ 78.499 388.319 null ] >>
+<< /D [ 638 0 R /XYZ 78.499 437.916 null ] >>
endobj
655 0 obj
-<< /D [ 630 0 R /XYZ 78.499 377.36 null ] >>
+<< /D [ 638 0 R /XYZ 78.499 426.957 null ] >>
endobj
656 0 obj
-<< /D [ 630 0 R /XYZ 78.499 366.401 null ] >>
+<< /D [ 638 0 R /XYZ 78.499 415.998 null ] >>
endobj
657 0 obj
-<< /D [ 630 0 R /XYZ 78.499 355.442 null ] >>
+<< /D [ 638 0 R /XYZ 78.499 405.039 null ] >>
endobj
658 0 obj
-<< /D [ 630 0 R /XYZ 78.499 291.681 null ] >>
+<< /D [ 638 0 R /XYZ 78.499 394.08 null ] >>
endobj
659 0 obj
-<< /D [ 630 0 R /XYZ 78.499 280.722 null ] >>
+<< /D [ 638 0 R /XYZ 78.499 383.121 null ] >>
endobj
660 0 obj
-<< /D [ 630 0 R /XYZ 78.499 269.763 null ] >>
+<< /D [ 638 0 R /XYZ 78.499 372.162 null ] >>
endobj
661 0 obj
-<< /D [ 630 0 R /XYZ 78.499 258.804 null ] >>
+<< /D [ 638 0 R /XYZ 78.499 361.203 null ] >>
endobj
662 0 obj
-<< /D [ 630 0 R /XYZ 78.499 247.846 null ] >>
+<< /D [ 638 0 R /XYZ 78.499 350.245 null ] >>
endobj
663 0 obj
-<< /D [ 630 0 R /XYZ 78.499 236.887 null ] >>
+<< /D [ 638 0 R /XYZ 78.499 339.286 null ] >>
endobj
664 0 obj
-<< /D [ 630 0 R /XYZ 78.499 187.073 null ] >>
+<< /D [ 638 0 R /XYZ 78.499 328.327 null ] >>
endobj
665 0 obj
-<< /D [ 630 0 R /XYZ 78.499 176.115 null ] >>
+<< /D [ 638 0 R /XYZ 78.499 317.368 null ] >>
endobj
666 0 obj
-<< /D [ 630 0 R /XYZ 78.499 138.257 null ] >>
+<< /D [ 638 0 R /XYZ 78.499 306.409 null ] >>
endobj
667 0 obj
-<< /D [ 630 0 R /XYZ 78.499 127.298 null ] >>
+<< /D [ 638 0 R /XYZ 78.499 242.741 null ] >>
endobj
668 0 obj
-<< /D [ 630 0 R /XYZ 78.499 116.339 null ] >>
+<< /D [ 638 0 R /XYZ 78.499 231.782 null ] >>
endobj
669 0 obj
-<< /D [ 630 0 R /XYZ 78.499 105.38 null ] >>
+<< /D [ 638 0 R /XYZ 78.499 220.823 null ] >>
endobj
670 0 obj
-<< /D [ 630 0 R /XYZ 78.499 94.421 null ] >>
+<< /D [ 638 0 R /XYZ 78.499 209.864 null ] >>
endobj
671 0 obj
-<< /D [ 630 0 R /XYZ 78.499 83.462 null ] >>
-endobj
-629 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F109 633 0 R /F64 333 0 R /F22 367 0 R /F59 346 0 R /F88 635 0 R /F111 636 0 R /F84 425 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /D [ 638 0 R /XYZ 78.499 198.905 null ] >>
endobj
-674 0 obj
-<< /Filter /FlateDecode /Length 2245 >>
-stream
-xÚå[É’ã6 ½÷Wø†C‚àVÕåªö6U9÷-•krÊÿ_à Hɶ¨qÏrp·,‹ ñ
-]|>þ¦Îå:ý·¾¶Õñû­ÈVUÜê3AJ“ú–ñ¹I¸¢Cæ ,F
-%âõ&X”tB#ô¢fƒ#ÐA(Ô|xÝ6e…3®—° Q(ÖÚ†n¼öÕâ8ªx¡âðëØt”ë˜v­„¬É­h“Fo°Œ¢hËuòÁé÷ky&k\µJš¦ûé÷¤azÖœ
-jù¹zJíxŸéöïSyž|=£ùýýH*'
-[QIç¨MìÊ5¡’¢—P³~Š4,˜§'“”ä%YZ’‚¥èÒ*cQmBÏ—^—|½îRm…t½?¾¥`-GÍž¶¡V(½Æ\ª`•¬žc¤Ž<{Ì¥²!yaŠ#òªø«Gdo?Àe]°ØÌr+£’7§ß“g’—¦¶[¼8`’Ûy¸I‘ð1{z’•î™Öþ¸Ã"6¡¥k,ò1äÇ„GvHJ˜Ã=’I’]ø½ôL¶¡fìàëxÎ…kÓýô?â:ˆ¢Ç8ûŽ¢CóV'aÜŽN ÝÀäm{"£†F:2Z£ÜüœŸ=5ÉÁB\Ú.)&õÕ§+™ÊälÜô
->ÿ8…Y:£«¯OxöR£E# 4S³5Cl$XÍíþljô½øZéžI«ŒÂ­ûU×(ŒmæÒ±d¸ðUªC¥¯BûÕS˜ m¬ê!u[ûrÿ­ÁSr$C‰Kuÿʪ‰ˆéK˜ì†ÇÄùÄ5q°5¯TÚ
-^˜ÈÄÎO++í‡säNBŸ#'¬2iú ³Y‡=Ín<¹7»-mòù®‰óƒਠæ»B…¯}(K"×~}¤ÝÌC4ì×Ê‚ðVs­¶æ£¤U+áQöã`¶Ù«ÉíWŽ´½µßùóÓº(Ì“eŽs9ûÀb­ô“¾Ç³µ¬2ÙÕ71tc»Ôñ%ºìÈ®ŒQ"Hl¬ô1F ­„qNB)Z>‚Áü®“0ÎJâO®óÔV‚‘÷×–­iè|”˜UiÒ<ÏžÀsúÆ;ïäóMÏ¢åQ>ç9²GÑj´ÎhÖ–ONcF?óHž «Ç¦Hk¾¯x¾ºZH!ãì̽ԌY¨•°yÞH¿©b¸Ö•¢ªñ{ª¼6enYk_‘¢Uå/â»w¨&‘9¦Ž½IÁ‡­#½ˆëà˜uZ #¬9Ìx3=Õ¤ ƒeÐVÀ0ß¡ °aÜIXMQ;ir^¸ÁÊšÒá<Ùç‚J5ùÚºñ9ø»SP4^€ŸÖÖlO ÿVÂãÕîZJóºî—¤ô-²ßoÊâìbÁ"GáÝãă —´vü¦µNRôñø\mœ.Ú¢\Ô°ôóú•~”¶ÑlØ÷”½Ž*
-lDš‘¶\óÔ£¾µÉ •cSrMíÐ?Ô¬ÉK€nDT,ÄŒ?éO ·¶ÒQÆßҎ¾Í$KwòÈp®—TÏx„›Ž2Úô£Çç!h¤ð¸ðƒç“>¬D»«‡Ê ´Ècvã…(«
-Ø‘ ÿf,7.Ýwã ^€™ÆE’ËêÚ¦ã…xÛÁ ÛNÂú|ùÕ˜¥w£,­ˆœÏ‘Üî$l@Šñsžvj¶:×¼—u‹Ú½Úªt\Ï™FÛ>¥<
-T–·ÕcG#: ;VÅæ<Î}äú2kÇ Ú¶ìüOíƒ6¸`åxgN+dks¾*YT͇mæ⪞öpxó·“ðc”óÚj>ìõÿÄÝ‚Àà›X1[cÅ(a敹í؆c/ŽmuÇDfô~•mìùÞHæƒ,”‘6;IòÙÑÞÝYdªšÆPƒ¦­€ñþ
-'›Ùvlôð²÷y^FƒH-Ü\ãÓzxµ“0œØŽ½ì¢‡3 V@£wó|RÙ:}eaÖÜ»¶o|Lgûdµ÷…m„Ëv“–Îfðó~}Y—ÎœM'yöœ›ðJxöš‹ÎZTËÈ“eÏ•©îpYÖ8ÒÞÅ–¶¼·¾½œŸ¼_ñ0–g•øɾBjÃïÁÏ^ƒÑÃ/]´ Žh_§›Ò»ó‘÷7@Xc騚óÍ»‰et×Ï·ÿ
-endstream
+672 0 obj
+<< /D [ 638 0 R /XYZ 78.499 187.946 null ] >>
endobj
673 0 obj
-<< /Type /Page /Contents 674 0 R /Resources 672 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 627 0 R >>
+<< /D [ 638 0 R /XYZ 78.499 138.364 null ] >>
+endobj
+674 0 obj
+<< /D [ 638 0 R /XYZ 78.499 127.405 null ] >>
endobj
675 0 obj
-<< /D [ 673 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 638 0 R /XYZ 78.499 89.593 null ] >>
endobj
676 0 obj
-<< /D [ 673 0 R /XYZ 78.499 768.829 null ] >>
-endobj
-677 0 obj
-<< /D [ 673 0 R /XYZ 78.499 757.87 null ] >>
+<< /D [ 638 0 R /XYZ 78.499 78.635 null ] >>
endobj
-678 0 obj
-<< /D [ 673 0 R /XYZ 78.499 746.912 null ] >>
+637 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F109 641 0 R /F64 333 0 R /F22 367 0 R /F59 346 0 R /F88 643 0 R /F111 644 0 R /F84 425 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
679 0 obj
-<< /D [ 673 0 R /XYZ 78.499 735.953 null ] >>
+<< /Filter /FlateDecode /Length 2231 >>
+stream
+xÚÍ[Én#7½û+ôÃ!‹Å 0X–4@ξ¹&§üÿ5ܪI–ZR³ÇžÉAVKê~¬õ±X¤åៃ<üx‘¤«ø÷ÇËéãåûÕ„Šà•†ÃÇß/*Þ$êàúà¬ÒªÃÇ¿‡?_¥´oRêpüëãYá¾_=¼Öjß?¯¤#€-OwB<‘ÀH¡$ ømh)¼ 0¢@|…ø’ñu‘ãgíʵŽ×æT®M¼Þ㻊÷œß ˜Š
+ðBE[÷®À¹,`Z Âj7d¡Þ$AˆÏƒç
+»îWÝYatògªf
+݉4#m{Íó^áu,m¨!›JkzýCÍÁá¼âQ»³ýI¢`¸ŽŽ"O—vô©Ñ,}“%ÃÖ/©‘ñÈn::ÈhÃ¥œ·ÏC[$êôx%Ï}º&í®&œŽ“§ÕÐçìÆåI¥,
+·šh(£&¸šhh>'ÑâºÖߌ´WóÙ¤Š£Jøè7I•u}šThû¤ÊŸ†¤B³3©
+ —ò±-ê­C6Îæ qI ,)O 8§_Âk±0íÜ=û¦œŽà^ëÚÓçf¦Ï¤œŸ÷4N q˜µ“Ü,
+!åزʠ ÍB ;Fù¿Hø<ÔÂqñ‘‡Mb¹ì¢ŸÚVYÞr€/àZ
+h™J.c÷¡íƒÛ º…!Á KgÓ©RAt <ê=Iþ––÷§ÿÒ\'­žîúÂsv²ƒ ¦CCY†Ð˜Úâe
+}²¥_g2}êS§¸Æ/(ñ<k¹´¡Ñ1NŸ•d;jáßlÍK÷Ýv °kÃâM²ÇbϦ̈́®‡‰ÓÛµ a}ÆüjLÌÓ»­œZûÁ–šÛf,Õ1tžxj½ÚzÞ·b‹ÚÝÚêÔós½¶¬B}SqUiœžõs–bt…m|7ý³µ†s7÷-Ĭ&ŸíþWäýž$mkžæÙ¡;.ŸXÜ=7*å„UaˆK3572„y ¤†Ÿ+XÀgý—ÂÿÐY„óSOÖ1#Àt×鶟¬bÀ„…wŸ½qRøîЪž®F
+endstream
+endobj
+678 0 obj
+<< /Type /Page /Contents 679 0 R /Resources 677 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 622 0 R >>
endobj
680 0 obj
-<< /D [ 673 0 R /XYZ 78.499 724.994 null ] >>
+<< /D [ 678 0 R /XYZ 78.37 808.885 null ] >>
endobj
681 0 obj
-<< /D [ 673 0 R /XYZ 78.499 714.035 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 768.829 null ] >>
endobj
682 0 obj
-<< /D [ 673 0 R /XYZ 78.499 703.076 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 757.87 null ] >>
endobj
683 0 obj
-<< /D [ 673 0 R /XYZ 78.499 692.117 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 746.912 null ] >>
endobj
684 0 obj
-<< /D [ 673 0 R /XYZ 78.499 681.158 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 735.953 null ] >>
endobj
685 0 obj
-<< /D [ 673 0 R /XYZ 78.499 653.292 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 710.406 null ] >>
endobj
686 0 obj
-<< /D [ 673 0 R /XYZ 78.499 642.333 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 699.447 null ] >>
endobj
687 0 obj
-<< /D [ 673 0 R /XYZ 78.499 614.467 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 688.488 null ] >>
endobj
688 0 obj
-<< /D [ 673 0 R /XYZ 78.499 603.508 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 677.529 null ] >>
endobj
689 0 obj
-<< /D [ 673 0 R /XYZ 78.499 592.55 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 666.57 null ] >>
endobj
690 0 obj
-<< /D [ 673 0 R /XYZ 78.499 581.591 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 655.611 null ] >>
endobj
691 0 obj
-<< /D [ 673 0 R /XYZ 78.499 570.632 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 644.652 null ] >>
endobj
692 0 obj
-<< /D [ 673 0 R /XYZ 78.499 559.673 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 633.694 null ] >>
endobj
693 0 obj
-<< /D [ 673 0 R /XYZ 78.499 548.714 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 622.735 null ] >>
endobj
694 0 obj
-<< /D [ 673 0 R /XYZ 78.499 537.755 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 595.267 null ] >>
endobj
695 0 obj
-<< /D [ 673 0 R /XYZ 78.499 526.796 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 584.308 null ] >>
endobj
696 0 obj
-<< /D [ 673 0 R /XYZ 78.499 515.837 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 556.84 null ] >>
endobj
697 0 obj
-<< /D [ 673 0 R /XYZ 78.499 504.878 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 545.881 null ] >>
endobj
698 0 obj
-<< /D [ 673 0 R /XYZ 78.499 477.012 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 534.922 null ] >>
endobj
699 0 obj
-<< /D [ 673 0 R /XYZ 78.499 466.054 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 523.963 null ] >>
endobj
700 0 obj
-<< /D [ 673 0 R /XYZ 78.499 426.232 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 513.004 null ] >>
endobj
701 0 obj
-<< /D [ 673 0 R /XYZ 78.499 382.412 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 502.045 null ] >>
endobj
702 0 obj
-<< /D [ 673 0 R /XYZ 78.499 350.546 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 491.086 null ] >>
endobj
703 0 obj
-<< /D [ 673 0 R /XYZ 78.499 330.635 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 480.127 null ] >>
endobj
704 0 obj
-<< /D [ 673 0 R /XYZ 78.499 319.676 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 469.168 null ] >>
endobj
705 0 obj
-<< /D [ 673 0 R /XYZ 78.499 279.855 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 458.209 null ] >>
endobj
706 0 obj
-<< /D [ 673 0 R /XYZ 78.499 268.896 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 447.251 null ] >>
endobj
707 0 obj
-<< /D [ 673 0 R /XYZ 78.499 257.938 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 419.783 null ] >>
endobj
708 0 obj
-<< /D [ 673 0 R /XYZ 78.499 246.979 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 408.824 null ] >>
endobj
709 0 obj
-<< /D [ 673 0 R /XYZ 78.499 236.02 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 369.4 null ] >>
endobj
710 0 obj
-<< /D [ 673 0 R /XYZ 78.499 225.061 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 325.778 null ] >>
endobj
711 0 obj
-<< /D [ 673 0 R /XYZ 78.499 214.102 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 294.112 null ] >>
endobj
712 0 obj
-<< /D [ 673 0 R /XYZ 78.499 203.143 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 274.4 null ] >>
endobj
713 0 obj
-<< /D [ 673 0 R /XYZ 78.499 192.184 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 263.441 null ] >>
endobj
714 0 obj
-<< /D [ 673 0 R /XYZ 78.499 181.225 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 224.018 null ] >>
endobj
715 0 obj
-<< /D [ 673 0 R /XYZ 78.499 170.266 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 213.059 null ] >>
endobj
716 0 obj
-<< /D [ 673 0 R /XYZ 78.499 159.307 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 202.1 null ] >>
endobj
717 0 obj
-<< /D [ 673 0 R /XYZ 78.499 148.348 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 191.141 null ] >>
endobj
718 0 obj
-<< /D [ 673 0 R /XYZ 78.499 122.47 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 180.182 null ] >>
endobj
719 0 obj
-<< /D [ 673 0 R /XYZ 78.499 111.511 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 169.223 null ] >>
endobj
720 0 obj
-<< /D [ 673 0 R /XYZ 78.499 100.552 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 158.264 null ] >>
endobj
721 0 obj
-<< /D [ 673 0 R /XYZ 78.499 89.593 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 147.306 null ] >>
endobj
722 0 obj
-<< /D [ 673 0 R /XYZ 78.499 78.635 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 136.347 null ] >>
endobj
-672 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-725 0 obj
-<< /Filter /FlateDecode /Length 2002 >>
-stream
-xÚíZÉrã6½û+øh¬U.WY–4U9û–Ê59åÿ¯ƒ•
-}Í9¡Î8];¶ûj' û.Íúü õþ¨ä½jS—Ôœi°PÍkéåÚj!5GÕ2Ö3ãeo-i–¢Gi“ ãÌ’/—óدS–~³f@Ðeš‘ŽYº Çkõ|DÚ9ŒqÌôò›MþáË
-B(Uíñ,ôäÃSÒ¨þ©à´"=sz®ÙV<;xʵ %KF‹ŠçoÒ=å2šÂ#}êm-pæÅš\€NÈ1€TQ_Vc½SB¹Ã¬×'zÃëÙlÞú/1Î#…f4 o󫩈n8á˜ó®7ÜFnZx¨q•UƒÐc>Z·%—Š÷ñ:³¬áž;ó%í9>ªÈQT„
-pè¼Ð·ti
-á]¦ÑJ‰{º¼V&ëµ6òÕy’Må$sÊiˆÔ €ÞTÑ«/{Ö½LÖ*s†4–CÞû?2§!· ÖT$kÏϤøX}›…ÜÆQÒ¨õ{I®TlPÄn•~’»±uª:Ö|'±[ý#zòøÈàÁ÷1MaiWSb3Û ÷0(Æëlì«u†ç“ªÏêL ìT4-°cªH÷Üöq}a¢ª(QÀBŸå¹íˆ]U—
-²_ÛÃöòZ
-Ðnj5“NOZã­;Ó‘Eøí=^á™ùàäz«šq*…»QžWr|O7ðú ì;ŒÔ«À`ãllóª÷ ÷Zƒ»Õ[÷ÝR¥æýZ¥'¿ÿš]Ö¯ò†)k±~·¶‘Åù
-eá®L#üjáÓx!u³Ìmûô)FBkµjΙŸØŸ±¬bZ{,q•¡à¾è¢¸©>u k]X¯-´]j‘(KM}ó_çqs\µž)K@EÅØ"=l}IPÜcìÎyݤ[ýJ܃7Î Ïme.rýz²»\òjY5Z2£…mcç2+gD©¥LT5tžheóĨ®º‰ïë=ö3<um‘s6Óq}ü¶ÙçµJ0ãäÂ4Šfš×ÕyÖB¬r­./Õuµ gÍ£ugúµÆäÖê`ª«ª1䚪:«.ÕM,C{î/ö™8³)„öâ£tª¢å¿Þ¼¿D ϬQX|â+(„r-I@aŒý»yüUUOš{¸®<kÖ«y—¬Nî˜ãCAÊ*¥ñ©…NëÀÏ‚ÆšGŒÏ"Íkåu‘þ(Ò N2 «—Hš
-4ƒLZ¹˜4#”¯Â.¯ÕìŸË8C[Á@
-s¼FC>M Z ·•œW¢1¢ÐùŽtŠÉq…Ü6“ÚB'Èý^ÝÌ©ËETù-0é%–ë^£b„RøÞõ(R›Ðáãí9i‡ÓOíEn{Ï_@ÍEP!ƒ @!X eË…W[צ(´cÊH„ÖXJdͼùŒyÊ›[l­1ÇxV=eæÝ„ÅxêPŸÉù¹þ[ÏüuÔìE²õz[[åîì6C‰³é…²)I1L;›Ïd ©Yå>þ\ô<«¦ŸOWdá‚ØÉÞç^ 9V®Z¼¸‘RÌJýnƒ `AëN›žÐÞRzÖ“
-»‹ðÆ1>.ƤðR@(;¦¡- šÁÓ u„²c*PL3&£*QG ŸGÔ/…ÏûÉ{8ËPz!s÷duB3ãïÏÝî{É;‚ûÍÞ¿{<0Y÷bïîÞìÝKfÂñF$ï#ÈWçî.pH©"Ó¨ûò_fî6p]ÔÞ½‰ûr##ËàOF›IñÀqZJn£žÞ~
-endstream
+723 0 obj
+<< /D [ 678 0 R /XYZ 78.499 125.388 null ] >>
endobj
724 0 obj
-<< /Type /Page /Contents 725 0 R /Resources 723 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 627 0 R >>
+<< /D [ 678 0 R /XYZ 78.499 111.511 null ] >>
+endobj
+725 0 obj
+<< /D [ 678 0 R /XYZ 78.499 100.552 null ] >>
endobj
726 0 obj
-<< /D [ 724 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 89.593 null ] >>
endobj
727 0 obj
-<< /D [ 724 0 R /XYZ 78.499 768.829 null ] >>
+<< /D [ 678 0 R /XYZ 78.499 78.635 null ] >>
endobj
-728 0 obj
-<< /D [ 724 0 R /XYZ 78.499 757.87 null ] >>
-endobj
-729 0 obj
-<< /D [ 724 0 R /XYZ 78.499 742.255 null ] >>
+677 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
730 0 obj
-<< /D [ 724 0 R /XYZ 78.499 731.296 null ] >>
+<< /Filter /FlateDecode /Length 1945 >>
+stream
+xÚí[Msã(½çWè  4P•JUÇSµçܶöº{Úÿ>´,[(v’Ùƒ'ú@Oôë¦û>ý3ñéÇg:ù<Þ¾Ÿ´›sVH˜Þþ~¾ŸÄd sr2(G1½ý;ýùȹ”œkxúëížá¾Ÿ¬š,sˆÒ¶Ï ÌhCÄ çÈ=øã“G{åd>÷÷Ô!‡6ñÞ±¶“Æÿé‡Î·=ÖãðÌh{éÛÿ"­úwj›1xn{ª÷Ãu…é<<‹ÙjW87<Ûä¯)›Žƒ­á¸´‹÷bŸ«s®xFs&8´žÁØgzPÉÚÀP±0ô _ëõx é<X Áº—§otFÐ2Ù4#:£‡{åz@
+\‡ç@Ú/Jvö?Ùß# MžŽžtKO‡sÕ›*GɽٛòÐDZŽÑdG-Ë„7¡±PºmräŠ
+ÅL¤^(’å^}óÅ~;J ¦‰§Ô§z€ÖU!¦ÏÇÕ­\Vër ñ]–ÄîÿÈÊ·rjrÈ=@t§MÆGª_kñ3…ŒãHÚ‘j½M–e¢J±ŽŠÝ¤€c(;)¡^‡HéÖ¢'ªS"$Äò¢¤‹áÛ¸&«´‹I±º­·pÌØ9ƒ(o‡qCîé"Ù§†<¬ƒ;–ÍcÜ!]Ä’{j÷±üÖÓPY@é–í€]È‹%Ù-ËíŒaZy) h»›\í8³
+endstream
+endobj
+729 0 obj
+<< /Type /Page /Contents 730 0 R /Resources 728 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 622 0 R >>
endobj
731 0 obj
-<< /D [ 724 0 R /XYZ 78.499 720.337 null ] >>
+<< /D [ 729 0 R /XYZ 78.37 808.885 null ] >>
endobj
732 0 obj
-<< /D [ 724 0 R /XYZ 78.499 709.378 null ] >>
+<< /D [ 729 0 R /XYZ 78.499 768.829 null ] >>
endobj
733 0 obj
-<< /D [ 724 0 R /XYZ 78.499 698.419 null ] >>
+<< /D [ 729 0 R /XYZ 78.499 757.87 null ] >>
endobj
734 0 obj
-<< /D [ 724 0 R /XYZ 78.499 687.461 null ] >>
+<< /D [ 729 0 R /XYZ 78.499 746.912 null ] >>
endobj
735 0 obj
-<< /D [ 724 0 R /XYZ 78.499 676.502 null ] >>
+<< /D [ 729 0 R /XYZ 78.499 735.953 null ] >>
endobj
736 0 obj
-<< /D [ 724 0 R /XYZ 78.499 665.543 null ] >>
+<< /D [ 729 0 R /XYZ 78.499 696.145 null ] >>
endobj
737 0 obj
-<< /D [ 724 0 R /XYZ 78.499 626.667 null ] >>
+<< /D [ 729 0 R /XYZ 78.499 670.278 null ] >>
endobj
738 0 obj
-<< /D [ 724 0 R /XYZ 78.499 601.576 null ] >>
+<< /D [ 729 0 R /XYZ 78.499 659.32 null ] >>
endobj
739 0 obj
-<< /D [ 724 0 R /XYZ 78.499 590.617 null ] >>
+<< /D [ 729 0 R /XYZ 78.499 648.361 null ] >>
endobj
740 0 obj
-<< /D [ 724 0 R /XYZ 78.499 579.658 null ] >>
+<< /D [ 729 0 R /XYZ 78.499 637.402 null ] >>
endobj
741 0 obj
-<< /D [ 724 0 R /XYZ 78.499 568.699 null ] >>
+<< /D [ 729 0 R /XYZ 78.499 609.55 null ] >>
endobj
742 0 obj
-<< /D [ 724 0 R /XYZ 78.499 541.778 null ] >>
+<< /D [ 729 0 R /XYZ 78.499 598.591 null ] >>
endobj
743 0 obj
-<< /D [ 724 0 R /XYZ 79.822 530.819 null ] >>
+<< /D [ 729 0 R /XYZ 78.499 582.665 null ] >>
endobj
744 0 obj
-<< /D [ 724 0 R /XYZ 79.822 515.204 null ] >>
+<< /D [ 729 0 R /XYZ 78.499 571.706 null ] >>
endobj
745 0 obj
-<< /D [ 724 0 R /XYZ 79.822 504.245 null ] >>
+<< /D [ 729 0 R /XYZ 78.499 560.747 null ] >>
endobj
746 0 obj
-<< /D [ 724 0 R /XYZ 79.822 493.286 null ] >>
+<< /D [ 729 0 R /XYZ 78.499 549.788 null ] >>
endobj
747 0 obj
-<< /D [ 724 0 R /XYZ 79.822 482.327 null ] >>
+<< /D [ 729 0 R /XYZ 78.499 538.829 null ] >>
endobj
748 0 obj
-<< /D [ 724 0 R /XYZ 79.822 471.368 null ] >>
+<< /D [ 729 0 R /XYZ 78.499 527.87 null ] >>
endobj
749 0 obj
-<< /D [ 724 0 R /XYZ 79.822 460.41 null ] >>
+<< /D [ 729 0 R /XYZ 78.499 516.911 null ] >>
endobj
750 0 obj
-<< /D [ 724 0 R /XYZ 79.822 449.451 null ] >>
+<< /D [ 729 0 R /XYZ 78.499 505.953 null ] >>
endobj
751 0 obj
-<< /D [ 724 0 R /XYZ 79.822 438.492 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 494.994 null ] >>
endobj
752 0 obj
-<< /D [ 724 0 R /XYZ 79.822 427.533 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 484.035 null ] >>
endobj
753 0 obj
-<< /D [ 724 0 R /XYZ 79.822 416.574 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 468.109 null ] >>
endobj
754 0 obj
-<< /D [ 724 0 R /XYZ 79.822 400.959 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 457.15 null ] >>
endobj
755 0 obj
-<< /D [ 724 0 R /XYZ 79.822 390 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 446.191 null ] >>
endobj
756 0 obj
-<< /D [ 724 0 R /XYZ 79.822 379.041 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 435.232 null ] >>
endobj
757 0 obj
-<< /D [ 724 0 R /XYZ 79.822 368.082 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 424.273 null ] >>
endobj
758 0 obj
-<< /D [ 724 0 R /XYZ 79.822 357.123 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 413.314 null ] >>
endobj
759 0 obj
-<< /D [ 724 0 R /XYZ 79.822 346.164 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 402.356 null ] >>
endobj
760 0 obj
-<< /D [ 724 0 R /XYZ 79.822 335.205 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 391.397 null ] >>
endobj
761 0 obj
-<< /D [ 724 0 R /XYZ 79.822 324.246 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 380.438 null ] >>
endobj
762 0 obj
-<< /D [ 724 0 R /XYZ 79.822 313.287 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 358.549 null ] >>
endobj
763 0 obj
-<< /D [ 724 0 R /XYZ 79.822 292.019 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 347.59 null ] >>
endobj
764 0 obj
-<< /D [ 724 0 R /XYZ 79.822 281.06 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 307.754 null ] >>
endobj
765 0 obj
-<< /D [ 724 0 R /XYZ 79.822 241.535 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 296.795 null ] >>
endobj
766 0 obj
-<< /D [ 724 0 R /XYZ 79.822 230.576 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 285.836 null ] >>
endobj
767 0 obj
-<< /D [ 724 0 R /XYZ 79.822 219.617 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 274.877 null ] >>
endobj
768 0 obj
-<< /D [ 724 0 R /XYZ 79.822 208.658 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 263.918 null ] >>
endobj
769 0 obj
-<< /D [ 724 0 R /XYZ 79.822 197.699 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 252.959 null ] >>
endobj
770 0 obj
-<< /D [ 724 0 R /XYZ 79.822 186.74 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 242 null ] >>
endobj
771 0 obj
-<< /D [ 724 0 R /XYZ 79.822 175.781 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 231.041 null ] >>
endobj
772 0 obj
-<< /D [ 724 0 R /XYZ 79.822 164.822 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 217.101 null ] >>
endobj
773 0 obj
-<< /D [ 724 0 R /XYZ 79.822 151.037 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 206.142 null ] >>
endobj
774 0 obj
-<< /D [ 724 0 R /XYZ 79.822 140.078 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 166.306 null ] >>
endobj
775 0 obj
-<< /D [ 724 0 R /XYZ 79.822 100.552 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 155.347 null ] >>
endobj
776 0 obj
-<< /D [ 724 0 R /XYZ 79.822 89.593 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 144.388 null ] >>
endobj
777 0 obj
-<< /D [ 724 0 R /XYZ 79.822 78.635 null ] >>
-endobj
-723 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /D [ 729 0 R /XYZ 79.822 133.429 null ] >>
endobj
-780 0 obj
-<< /Filter /FlateDecode /Length 2716 >>
-stream
-xÚÅ[Ko7 ¾ûWì±=D‘(ê, d¼Þ
-bm襵ÀÂG¾3-þãÕ·?áÍ™³j²ýX¸” °Èe®ÍÁ ±ß=´=’åú89óéªà}hnC>
-z)OÌ•¤¬ÕàÖFeΩAá½”¨Æ×;cGÄz”2„«‹4ŒpÈlâ)ñ\—s77ê=9t”¦p&1M3½¼OžÙ=[
-^í%9ËËïN8ø5tˆ<R$Ú>úÖ÷„Q3ämœq#;s?¤ÊžžâÒ½Ðç¼ÁÃýæh5hpSŸ¸™Té·v†x…ºPŸ¼Â[2{Q~|ÊbìŒrƒ…Qnô*ZÍýÖöy0‹œZ–> ƒ6îÝî-&3×:Ɔ4Ð_æK)$AÁ{¢pŠ¨Œ"t/ħq:Äg§óÀd£‚œ³¬jj£8ì5•Û¥vRl_Uƒ#\ j|;§“D 5HÁ’u%:$º˜Yêû->ߧp\àŘ’`úæf!%Ž;œLÁÓS!ê$ÆËÒi­ä>ë
-q­¸ñÖ Ռϳ€8ãYCfnK˜4Š3qä9ŒQË0H’ÏÄ|aw982ôÉÝtŒù¿…®<1Å|¿b¦ûô»œqàc¾‹»ÐüÆe ˜Ý35Ð9_ 2àÞ7 šzÍçã0(v¼­-=3µhÎïx*½m1û¶ë ¯e%~(­iåax붗ÇïI ÷…œN‡¢+öèaŠ¨©¼ãô…ù1[ƒDZWéÞÙ.Œ”ó‘Úúòaä0ÃÇ9>ã­óvRÒ8b{«÷¾ao‹¨Pýâ' îõ%
-sñï-l—BŸ´ùQç7Hv$Ÿ¡¨ªÄyè|NS"1¯-YáÖð{µÏ«÷€¥æÁw"ªžEÔÐ{K½ÂÎ9Ç„ }oŸáa”6)ìèd¥*2P#Âó)ŒrÌ¿©–ðˆwöSëR |PSˆ3j·^JéYÞƒÈòD¸–"í~ö—ä&­Sí<í±FLf§mT–J ˆ‰a(aõ<Äò¸À¢G [àEsØý¢0tyŠEæ˜EFF^³ò©©ß­­¨ um¶’A#[ÝÏÖ:ØefUžÈœs¢ág3=ʾEöo‹ÙU´~õ#ÔÑlð©žÃœ27„•ø¶?ØJ™=^¨m,XòŽ[sµë˜Á²j>WŽü(+‹øqª‹ U¢±KÑö¦
-{Ÿ§’‚Æ4r(í~Æõîb°ù¶„M+ä¿Ãæqš½|Ü—•„ÓLŠ½jž‡6³,×·¶‰w¥“ghÂË•¦4Ö­¥Rš©³&B¿T"÷)¬¿@Õµ;e/LÌë*’Â~¿æµá9ŸWíjûJNØs˜ié$«q¿áGæ°½£ÒÉíù˜–¸Äc)§LòÖòWsq@Sbs·~Uñ¥|¿X­óôŠº…Õ
-*­3t«ÎœX) Áü?oîš#š¦
-’fœù´W¦vzË7å’ÓƒÑ>ò—²6cÒu°ˆ»Ëúé¤ê5xÆ$/÷
-ä¹ìKuOå
-­Í0~‚³%Ý…S}úÞF¢¬FÆ:cÍ®'Ö­2Ó†(®ç/\ªx•©o O¡Ü2–AÒ†uç[^¢PÃ|ûq.'miÀ´‡kí]„˜ž*~ò&EŽŠ
-›úΫI©aTE»%_îÈú)òÚX-×$ÊL?:ÝÕZËZá´„†G—T™RDé½&K:ú56|Òí/’Œp?[Ja’͇JõÚUŒNÈsÇ€õš-¸xÄLjaÓìT±%'²„ s¹2†%+¿UåjeZ†b0?þ)I&SHÂ%q'N¦\ÝÉhè%75к¡´ Û¨ÓÞ Ú~Ùãx »{¬8¨g9’Ù×ôç\s”ÅÁ «ðô„Ññ8%¦ºp¸“>Ÿ›‘¥ Å\EÕ­äVƒ|2@Ùµ=ÆË· (/ oàtê]þ®0oÞðË?¿^]AË>Œ°8‚§º™ˆHû^Íx!?ªÖFîÔêwq•ySd~²UWê}KÙŽmá²æô¸ÿ[³832™¤Cÿ[J­ªY™c†
-endstream
+778 0 obj
+<< /D [ 729 0 R /XYZ 79.822 122.47 null ] >>
endobj
779 0 obj
-<< /Type /Page /Contents 780 0 R /Resources 778 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 627 0 R >>
+<< /D [ 729 0 R /XYZ 79.822 111.511 null ] >>
+endobj
+780 0 obj
+<< /D [ 729 0 R /XYZ 79.822 100.552 null ] >>
endobj
781 0 obj
-<< /D [ 779 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 89.593 null ] >>
endobj
782 0 obj
-<< /D [ 779 0 R /XYZ 79.822 768.829 null ] >>
-endobj
-783 0 obj
-<< /D [ 779 0 R /XYZ 79.822 757.87 null ] >>
+<< /D [ 729 0 R /XYZ 79.822 78.635 null ] >>
endobj
-784 0 obj
-<< /D [ 779 0 R /XYZ 79.822 746.912 null ] >>
+728 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
785 0 obj
-<< /D [ 779 0 R /XYZ 79.822 735.953 null ] >>
+<< /Filter /FlateDecode /Length 3184 >>
+stream
+xÚÅ[Ën$» ÝÏWô2Y\]‰z†éiûY{d›¬’ÿ_F/êA©ªK¾v2@í*‰¢(êðRóÛ¿nüöÇûÇßß…¾yæ uûøç^ð›¸YϤ½Y#7âöñïÛß_87Žsù>ðú›”:<±oœ‹_áÉýõ Ò¬ZIÂ1+<•*ö rƒù—–s-òÇxÎÕ£ý.¡´—­reôõ\
+èè*Jª31<Ï$?ÍãÀ{|k^Ê›Gÿ$¶‰cÃ#>±Ñð
+îe°dyÊ%KϤñ#?µŸF»Š_¯$q*)Î\‹:6Ú!~ü©åWÌ…WÿËkn™öveyõH=‰¿)Ï7Ø.Ì£ÕËè<Z@öˆ)ƒšf»Y¨oâJZük\!ÙYÝMV_ŒyôŽ¨Y°~y›=¤ÊÍ3,r‹Wñníïc›'«(yð`3ÙLÖ&ŽG‘°X±èÇöt•¤ö,4š¬Ÿ×–3á"üÿG ýM1ï„„^‚Ó œ¾Y0Lx¨âð?Ã'ƒ/¨óû»S7Ô0ÒõB¼e=5îóÈóŒˆsŒû ~U_ÚÑT„ŸRNšþ¼¤©n-# ŒRÀl«v'„%'jHM a˜Õv’¢Š¿ùæo:XŠß&O½7†Ÿ¥Ý=Öe|ÔH*ü-®F#öek‰oµ®¿=òêÅO\½$ó^VŽ·ñõ£öØ6 ñ’ÉàÕԀŽ/&)~5…¶µ—íë¶/A Âfì§ý¬/BÍŸ‘‘–ÑõPu­O\¢ýйÏö3˜ÔfÚ`z˳©”#Ï–kÏNšr‰ÂYæÊÛæî uæÇýHÍÐðèûS'ºÒçÌ ûï.—L†@M—K][.㘨”Ç5O>6‚àšA+w¾ÜqåÓí¶é g*Úƒ@Üót"åÈÓ‹Gãìqb™­~–G^ˆ+ùÏŸÀì@3”õÔ`êmÏ`DÊÁ¢Â‰6”w‰À–Í ïýDšQô[ülOK†M0pƳ{¡œÙ˜>K®}o|IÞ¿t’½™f©a‹7)•ž§¢Ú;f€²>[ÃÜñgÜ÷<í{ù*¡òšØÝÇ­“@$R}'i‚çäK¿Å²¬˜*¨‚h€[ËakLQ죵¢ˆcà”†—y:Þ“¹!åóÒR4U!&=¶O6“`ëê"|õvJPÓSÜ19±Å˜§j:h¦½¥ãS[’¸”‚-zÙ.­Ây%M‹}Ñ‚P5~ææYf›AqÞÇPV:ÉÔúL¯~%ëšgëñW­_:`| Ö€nÅ×i]Yñ=¥,RÔ¨¬Ä™çÁzÀ$É|&‰Ó:p.ëèßK∔tžˆI\Ú1˜Äýª1S¾·5>‡»Ü¦¸mòí å.f‡h‚AÆʵàÑy}›fJ»öµ‘ =Á+"¯¹“ȸJ1%ì2ê¥í!D‡ö÷Ê£Þ(Ìy‰1äp1—#ú¤ÌMÎÖSNKršô0 å9VƒÕÌDGG+X—{šuOÜCÉ©ç´Âç%!]*KšÅ¶¾”™‰±RöÄ꯿¥Eƒ÷~‰ÀsCìšáÛ`-Ë^¯w…žr‚Š:²¨RÖø7L×I›Îl¸wU»¾¢×*Øò œºU8Í­ïØ*§05 déË`ûV˜á’"ÐÅÂPA "$Ao rÀX~=ÇĺÀZ%΋ªBòhÜò¬A)¹A|”‚²¡ÎéÊE­,óV5Õªø N“¨Ü ‹ÃJM8¦rQ:«—LlN± ¼g ©ê ’ès8
+^Ý"¼^Ù¨ŠÑÁ¨rgnYð}ß=L NOÜc’Î/‡k)Ÿu‘
+aok*©y¡‘Sm÷ðrÌŽm´dÌÄLä–mF!ÿ;Û<§ÙÛˆÊö’À€W0°âÕIÜÚ­X®¶ñîtªý0„×ÍÿŽo”mÕ4mðé°'r;¬‘§À”÷GÚ ö…3h×#îìºH
+ÇíÃ>‹Çuz}Š‘Cj¸Š!ÑÊÞS3§Dâ½y+óô#Æ­•´žõ±î ¾sšZ¸ý‚¤£fúÙÇâ ^#9(ßk›æ‹gú÷¶å#ìÅç‹•;Ï 5óBÒ‘Ìì‰Ö¥Rä(ŒG›ñ¶YϪæ*X/·¥_[«´ÿ1›z·g¹a²£ /ž#ŽBú+5õ¼tþº°ú5®?HÖÀ &’µº¦ÃñŒ“PkAaiŽó#U³ @©íÀ®QÜSøŒã€µL~ã.Ÿ¿¿e|ƒÛ<Æ"ê
+^¾Î½ 0eÌʽÀª‚jnM·º}™'ØU½ ,-çq4ËÍ ‘Ÿ Y%x:¡•;J£5­6ê(é°fg`}¶¯ëÑ…½’k{ÔõZÞ@û)­ÛŒ÷˜Œ2‡5ÐaßTgÆCêDÄ´)ÅÚ~å~»@Øè¡À"ˆ–åTIõ2>9èˆ\2^ºÙ®†>ñ¾¶mY¼|;1ÅÊ©ÊSL³Ò_IN-}b”çPZ€O À'ÔEã›qþ„Ö–vÏæ½ð…x¯¨;2C‹8>¸Fø¶.¬e#!nö³~šhí/[}0ï
+\ 0yÀö×gHKˆvÜÏœeë £Œ¯)þºC¼Õ­Í-À‰o÷»/W¿}üø/Þ'@a
+endstream
+endobj
+784 0 obj
+<< /Type /Page /Contents 785 0 R /Resources 783 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 622 0 R >>
endobj
786 0 obj
-<< /D [ 779 0 R /XYZ 79.822 724.994 null ] >>
+<< /D [ 784 0 R /XYZ 78.37 808.885 null ] >>
endobj
787 0 obj
-<< /D [ 779 0 R /XYZ 79.822 714.035 null ] >>
+<< /D [ 784 0 R /XYZ 79.822 733.96 null ] >>
endobj
788 0 obj
-<< /D [ 779 0 R /XYZ 79.822 664.222 null ] >>
+<< /D [ 784 0 R /XYZ 79.822 723.001 null ] >>
endobj
789 0 obj
-<< /D [ 779 0 R /XYZ 79.822 653.263 null ] >>
+<< /D [ 784 0 R /XYZ 79.822 712.042 null ] >>
endobj
790 0 obj
-<< /D [ 779 0 R /XYZ 79.822 642.304 null ] >>
+<< /D [ 784 0 R /XYZ 79.822 701.083 null ] >>
endobj
791 0 obj
-<< /D [ 779 0 R /XYZ 79.822 631.345 null ] >>
+<< /D [ 784 0 R /XYZ 79.822 690.124 null ] >>
endobj
792 0 obj
-<< /D [ 779 0 R /XYZ 79.822 620.386 null ] >>
+<< /D [ 784 0 R /XYZ 79.822 679.166 null ] >>
endobj
793 0 obj
-<< /D [ 779 0 R /XYZ 79.822 609.427 null ] >>
-endobj
-217 0 obj
-<< /D [ 779 0 R /XYZ 79.37 583.978 null ] >>
+<< /D [ 784 0 R /XYZ 79.822 668.207 null ] >>
endobj
794 0 obj
-<< /D [ 779 0 R /XYZ 79.822 534.244 null ] >>
+<< /D [ 784 0 R /XYZ 79.822 657.248 null ] >>
endobj
795 0 obj
-<< /D [ 779 0 R /XYZ 79.822 523.285 null ] >>
+<< /D [ 784 0 R /XYZ 79.822 646.289 null ] >>
endobj
796 0 obj
-<< /D [ 779 0 R /XYZ 79.822 474.468 null ] >>
+<< /D [ 784 0 R /XYZ 79.822 635.33 null ] >>
+endobj
+213 0 obj
+<< /D [ 784 0 R /XYZ 79.37 609.881 null ] >>
endobj
797 0 obj
-<< /D [ 779 0 R /XYZ 79.822 427.644 null ] >>
+<< /D [ 784 0 R /XYZ 79.822 560.147 null ] >>
endobj
798 0 obj
-<< /D [ 779 0 R /XYZ 79.822 380.819 null ] >>
+<< /D [ 784 0 R /XYZ 79.822 549.188 null ] >>
endobj
799 0 obj
-<< /D [ 779 0 R /XYZ 79.822 345.95 null ] >>
+<< /D [ 784 0 R /XYZ 79.822 500.371 null ] >>
endobj
800 0 obj
-<< /D [ 779 0 R /XYZ 79.822 334.991 null ] >>
+<< /D [ 784 0 R /XYZ 79.822 453.547 null ] >>
endobj
801 0 obj
-<< /D [ 779 0 R /XYZ 79.822 288.167 null ] >>
+<< /D [ 784 0 R /XYZ 79.822 406.722 null ] >>
endobj
802 0 obj
-<< /D [ 779 0 R /XYZ 79.822 259.275 null ] >>
+<< /D [ 784 0 R /XYZ 79.822 371.853 null ] >>
endobj
803 0 obj
-<< /D [ 779 0 R /XYZ 79.822 218.428 null ] >>
+<< /D [ 784 0 R /XYZ 79.822 360.894 null ] >>
endobj
804 0 obj
-<< /D [ 779 0 R /XYZ 79.822 171.604 null ] >>
+<< /D [ 784 0 R /XYZ 79.822 314.07 null ] >>
endobj
805 0 obj
-<< /D [ 779 0 R /XYZ 79.822 112.824 null ] >>
+<< /D [ 784 0 R /XYZ 79.822 285.178 null ] >>
endobj
-778 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F22 367 0 R /F65 335 0 R /F30 341 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-808 0 obj
-<< /Filter /FlateDecode /Length 2898 >>
-stream
-xÚí\ËŽc7Ý÷WøZ‘¨7P( n—dÝ»`¶3«ùÿmôEÉ×–Ë40³¨¤ú^]Š¢ÈǨâ§ÿœøéoçŸß~»
-}òÌ0êôóßßDxÁOâd=“öd`܈ÓÏÿžþzãÜ
-Îå5ü
-”\ø<Gø'×"ÎœO\œó¸øÞšü¼~ÇÅ1
-ë•‚˜Ö
-…J¤æêZA¾÷V›©*Œ´ti3“çÌ
-Xý¢b=Y6@㓲i¢8WÓÕçšO .&Ö»Ž#óÓ t‡ÙCn€q')˽óE2?—w<µ°Ì•%”ÓΟ3§}-º9ƺ²(_ë“"—'2 ¡ßPIG•aÒ¯ç0IžæÚ˜_Y'ÛØîMw܃ã08ê9S.Pt³Þ vCÏZuN˾u†;¦y æõ¤cÅæ–ÁÄÿ9hzpéüÇ}7%’KR6TžÁsc4SrÂ/ ;øEˆ$Dª‘9†ùyÝÉk´g¼ÂÚ¼ƒJ1 m]ÆQǺ
-=Ý2ô”o5¨,ñÒô6;é3òŽ‘ZÇÝÔîŠ}3©¾?ƹî±ôlpC0-»yd0*<wC«PäIñ¾ˆ,Œq‰YjÏ@
-:ãÀ$ÏtH…(¯jmªšw18¹c Jf‘ûf&ð`CÄÌÌyËÌF"ÉÉžiÎòlw9íìÇjûs’!=`DÜ3d¸2"åÞ°‹Ï`^Mž‘“3ËDˆŸ­t­¨ò°ŠR™³>‡]=TWæQPÝ’½su^nr^þV,¯Ü›ùÛÉSŘH´d[51)o7ÐsÙW4òì–™”GAR²® ^uÏ|’[[¡Ìå‡:Ú¡QstÐ{+ºmŸ±Ýv ­Ueü"|PJ¢àEµÊB\iùW Cj~©Hõ¡>YíY~S÷,ϵܳ<pÈï£~·ó2º„<¼j`æå%0 ‚ÊL^êϦ„§_']¿´ÒÅm,æÈ‘¯cxžŽçvcíüõûwkE”»HWSež²l¬È¦æ0Æ]-ˆ( ‘Å&?^+JÞšzZŠêmÉ9~#>@—ñ”›TLó·K16Ÿ#ø“–É\ÓoëÏkÎãj(ëµùP)/CH}³B§1ºÛU¤<Pš:M‰ Œð‡™X`“•Ìq‚M”½€Mn$GŽW”ûð÷^G¼ÆUçÞÚ3‰´èC¢½r÷öjˆ:‘ž¡›‘UŸ–R½ ªÎÉZ+IÜ1FiO²û:³PÂ1ãñ¹Ò—Áª3s ÷ûN Gˆ|¾ôu péPÙë8ŽÓ!öZ­â8ååF>¦å§š®×*ñ—h«Ýp&Òœ¼§¥òüdDú»µÉ ³|C1uæ-ëBÙNÐxÂPJýQì9JЯ%ŒÆ³ÉSpˆLHM©¶`ÇË¥\›¢û©Àk(J†y7S‚ÓqöÎÊ„¶Ì¡³= B²à($È­ê/!’ U
->‘νLæ>é@¯´ä·eÀqo&¸-ŒD^#¬ÿk?†AåNß® µú^­Î‹j¨”Ö‡uˆçÂ+2ëÙHÅ
-¡ït¹ >Aç¹…œúÉŤ?Ž–@cý4ãöɇÅU¼þ¯.¹WÊ‘ÒW316/ùN¯Y€J%V²´âà oáT°€’ý* «¤KW$ó˜ñ+¨½2nhù"Êç,ÓÆ ‰ˆ ãnôî\î•ð÷ÔÐ Og¼eRK5Äm ç;*È™ñ’Î]Tï³jÜŸ{ŸO“oÔ\Oj@­0„­Ô¤Ž‹C¸ˆïj‰ðißX@Û~P—ÂXk:úhصg8h30°”;
-ûX I;ãÉÖÙ"!ò¬í’ø ^
-ë˜jò%[çd„ÈëðòÆ'Ì“|(M\QpdzI"¸^‘™ñxYÀŒÄ”×üQ8ûš«ÿÇY1Î"Â Ý ¹D¼›‚݉±s!ý"3?a÷J2=g[:#Ï[=í&¨òÛN"žG Ìð)òÜ+³"¯A‹/ÍòÎaÂÕ­@žÏ¬ãŸØr,]¿L;Þ+¬ÑÖû‚¤ùДêy+ã_·â9!3^üo—O‰¯K±™âÛ79d°#€r°@±]Yji{Eþ‘Æ/RýQWîü± Î\?>ÃzÚoä-!L,Ý
-pKïç¯×é3Ý©“&=þC~44‡üWàÚ¯ä±õ´tñ¥žÿ*]€_ÜMi§V—ÞÎROFËõÆÉa=Õ)Æ•÷“ý9*Þ»‚ú¨o4ÇHB
-ÊÄ×´ÆÄvH‚¤R¥XZ5Á»+μí4o±óÇÏoí@5º
-endstream
+806 0 obj
+<< /D [ 784 0 R /XYZ 79.822 220.421 null ] >>
endobj
807 0 obj
-<< /Type /Page /Contents 808 0 R /Resources 806 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 627 0 R >>
+<< /D [ 784 0 R /XYZ 79.822 161.641 null ] >>
endobj
-809 0 obj
-<< /D [ 807 0 R /XYZ 78.37 808.885 null ] >>
+808 0 obj
+<< /D [ 784 0 R /XYZ 79.822 102.862 null ] >>
endobj
-810 0 obj
-<< /D [ 807 0 R /XYZ 79.822 730.975 null ] >>
+783 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R /F22 367 0 R /F65 335 0 R /F81 377 0 R /F30 341 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
811 0 obj
-<< /D [ 807 0 R /XYZ 79.822 720.016 null ] >>
+<< /Filter /FlateDecode /Length 2873 >>
+stream
+xÚí\ÉŽ#9½×WøJ­} ´Ëéú\·Æ\gNóÿצvŠ’ÖÓÙ(`æàr:BAQ\)ŠQüôŸ?ýñíüóÛoWaN+­>ýü÷77øIœ\`ÊœŒ[qúùßÓ_oœ‹3çúòþ]i¿´Œ¿ò· ù[ü€oGXáø»‰#óU£•¬Ï¿Üû¿~þ \8½âBXɸW” 3iÖÙã'Î#U¾ódÊëõIá˜W’RV‘ò9sÚ×¹ô¨+30Î…ø©W²þÂtâ* •d÷.}¢¼žÃ&yæ1Îâ1êš)Ù6{½ªâ .é¡ðdzԓÖΔ‹Äÿ‘64hÃÌV!¬Q]ué5`8P f²±™Ï¢?b:0Ám³ƒKç?ê=?W¤l©=
+Â#0ËkŒTY0y„­Wf¶\YkTºH «/¡Ëcv q©XºîPºê­ºÝBG³úá&SÒâpÛ…:¥Þ–®Zï4ž$“®,T
+UÞàÖ†ˆå8Í\7÷3vÛn u[ªmXTœ´VhC¡ÛÖ5.´ü*•«ºÑd{[¯¬T–ïT•å¹–*ˇ d4ïV•¼Œ!¯˜y9†C%a«"ˆÈÔ¥~î °dZòp2ôKÛßbÉ< Üøp̱òçxfñÕM¿w.&Z¤Õ‹«­òÎ)²a[³D9–‘ºI1" ?^ê)ö ¸á¹Æ¨ÓŠ–¨˜“ââ×ÅP³6PnR¥&8ì×>•dù\ð-%Ì2"yjú«sÝ‘yÍy|B5£6ªeô¨w–è Æ@»D‘šÁN§)1Áþ0 X2œyF\Z¦SÉIã•Êù;I½ç ®Æõ¾Ð¾£èÉ8Ö•¿§«qWá‘ÎÚŒÍÉj8K'º@™õ1>ƒ'Ù}[há™õžÎø\]Å(Ë
+endstream
+endobj
+810 0 obj
+<< /Type /Page /Contents 811 0 R /Resources 809 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 622 0 R >>
endobj
812 0 obj
-<< /D [ 807 0 R /XYZ 79.822 673.207 null ] >>
+<< /D [ 810 0 R /XYZ 78.37 808.885 null ] >>
endobj
813 0 obj
-<< /D [ 807 0 R /XYZ 79.822 638.352 null ] >>
+<< /D [ 810 0 R /XYZ 79.822 742.926 null ] >>
endobj
814 0 obj
-<< /D [ 807 0 R /XYZ 79.822 567.632 null ] >>
+<< /D [ 810 0 R /XYZ 79.822 684.147 null ] >>
endobj
815 0 obj
-<< /D [ 807 0 R /XYZ 79.822 520.823 null ] >>
+<< /D [ 810 0 R /XYZ 79.822 673.188 null ] >>
endobj
816 0 obj
-<< /D [ 807 0 R /XYZ 79.822 509.864 null ] >>
+<< /D [ 810 0 R /XYZ 79.822 662.229 null ] >>
endobj
817 0 obj
-<< /D [ 807 0 R /XYZ 79.822 475.01 null ] >>
+<< /D [ 810 0 R /XYZ 79.822 615.405 null ] >>
endobj
818 0 obj
-<< /D [ 807 0 R /XYZ 79.822 428.2 null ] >>
+<< /D [ 810 0 R /XYZ 79.822 544.67 null ] >>
endobj
819 0 obj
-<< /D [ 807 0 R /XYZ 79.822 381.391 null ] >>
+<< /D [ 810 0 R /XYZ 79.822 497.846 null ] >>
endobj
820 0 obj
-<< /D [ 807 0 R /XYZ 79.822 370.432 null ] >>
+<< /D [ 810 0 R /XYZ 79.822 486.887 null ] >>
endobj
821 0 obj
-<< /D [ 807 0 R /XYZ 79.822 335.578 null ] >>
+<< /D [ 810 0 R /XYZ 79.822 452.017 null ] >>
endobj
822 0 obj
-<< /D [ 807 0 R /XYZ 79.822 300.723 null ] >>
+<< /D [ 810 0 R /XYZ 79.822 405.193 null ] >>
endobj
823 0 obj
-<< /D [ 807 0 R /XYZ 79.822 289.764 null ] >>
+<< /D [ 810 0 R /XYZ 79.822 358.369 null ] >>
endobj
824 0 obj
-<< /D [ 807 0 R /XYZ 79.822 254.91 null ] >>
+<< /D [ 810 0 R /XYZ 79.822 347.41 null ] >>
endobj
825 0 obj
-<< /D [ 807 0 R /XYZ 79.822 243.951 null ] >>
+<< /D [ 810 0 R /XYZ 79.822 312.54 null ] >>
endobj
826 0 obj
-<< /D [ 807 0 R /XYZ 79.822 197.142 null ] >>
+<< /D [ 810 0 R /XYZ 79.822 277.671 null ] >>
endobj
827 0 obj
-<< /D [ 807 0 R /XYZ 79.822 186.183 null ] >>
+<< /D [ 810 0 R /XYZ 79.822 266.712 null ] >>
endobj
828 0 obj
-<< /D [ 807 0 R /XYZ 79.822 151.328 null ] >>
+<< /D [ 810 0 R /XYZ 79.822 231.843 null ] >>
endobj
829 0 obj
-<< /D [ 807 0 R /XYZ 79.822 140.369 null ] >>
+<< /D [ 810 0 R /XYZ 79.822 220.884 null ] >>
endobj
830 0 obj
-<< /D [ 807 0 R /XYZ 79.822 105.515 null ] >>
+<< /D [ 810 0 R /XYZ 79.822 174.06 null ] >>
endobj
-806 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-833 0 obj
-<< /Filter /FlateDecode /Length 3199 >>
-stream
-xÚå9Ž$¹ÑŸWÔ†"ƒÁ h40ÕDzÇäJ–þïnð&ƒ™Y™½ÕëȨé*&Œû"säí¿7yûãÇý÷|*s "X°xûýŸŠÈ›º% š›³JH«n¿ÿwû׋”oîõ§‘’¾¡’RÓ/T†~Ù@¿>éqÄÆ‘wú@¡¿rs´Ï]V£}÷’ç9ûúïßÿ$Dn!
-J §‘cêh%Ò>+üe›\@Rs &y¸½±ä²= ­Ö…¸}„„D<1OÌcñY'f¡§Á »D‹0Ô[cã{fcd;Þ«0
-cîq&}÷u“¯&¯£yU\ï4C‚Š3l¨»l¯kP ŽñIÞ+®ýú|’p"¼ª$
-pîæ0%m%ÔlŒ$´ˆ`­õKÿ~(&…Fx§8Ü(¦„ò}Wù¿¯ÚSæ|–ÝîÇÚ(4,T?ÑZM h’ß·0ðÙHaAnXØÞê+&­PÖ1D¯˜6d'jHUà]Z£©`S™¬½qaÕàLüŽ&§µè¸ðδjÇ,Ñg,[í‚ß$¤+P¦‹¸º/8Ä–ŒG@àØ~“cpÂFϺ)²lÏ‰Ú Ä«Më­œ
-ßwÅ)˜Ô8c<´Tój(*ÇÛ—eþ†Ôµf+Rejè“C§îˆ²¬7t7L‚ Ø†¥x¿˜ „sžgƒ®dƒ Ès²ÁoÈ]ŠÁ Þ´ÖQ Ü=ϯ&Tó²mÇvMk„äšá# z9ÝŪ€éë¦éêNiuÕŸ< x*î ®6¢þ‘¸”fƒÏ÷¿BÓÃãƒÃzíÐ\Q
-š» îü
-@Åe€e÷Gå^ÉXîa2›*ìj£y–-÷2×ùùt¯ÅØ¡G3ï×ÕÃm®ºà·²úa ¨ä¾ìµd<.ÕJOŠq3)Æ-¯•çN 1žòZܼ–¦AýœÏ£ÅWçf–öTŸ%õ†bd¼sU’ˆï=¯9ü6}õ\,eùºµPÊ>4·8V%7 ¥m\)J
-Ú‰3¦j|-ö¦ÂNÄot^(
-¶ò›bÇïºQ!˜j1*k.Õ äIÑâ@’)ùj’ÜŒWx ­°à%Ì@¶xÐÝåA6©oãC…lë7—ðDZÑóLwÆé¨ØæWûN§ÞˆØÚrQ9ƒÓ€/UB+ÈV; ³‡³Ç÷ÝŠ?kuÉö·Ö>ÝtÍ¿6ÃÜ\÷©ü–âŒY*á¼^"¤¾¤È3¨ÎéË‘qR‡Z5‰nà%9ánRP9cïQq·([jq!.Ê ;s›SCÆVï\Ö¨˜õîAëè°P±SKV®×Íë--}ïÑu2÷-cßo°|÷ž“ÁËØM©#³†Ã¢•«]ì¯:¦f̉ãÓhÕsKJNo(¬§`I‰åxù©~fŒÝ~T ¤ðÌä¡ù¸w¢PX·Bññ†·-gwK}ÚB«Yº–idá®Á‘»Fï®zÈÝ4sìâç‘Zqä—&{1ïÕú;mŸZît um Üxo¯ïÛ.rÜyzÓfÕŽRÃw¾ø ãäz«Ð½w'T
-‰Âô©Ÿm6úÙ:dÈLŒ/JO÷óÁDZ YfÈx#ÓÒÅ|6^ãZŽQÀð—³ÚÙÞûãë®Ú‘×GNÃ^¦ ¿˜@£}½Â£¿öHlßëµFh»`Ä‹ÜÌ/„‘Çí>—±Ç1P²Æ㘡É:C #¤TNmä×»`ã«Ó!Øé5-ÙÍl«¥ o5Üàä$땼JMw.‹údºG¶W%=pÉú’ž\ÄÔ”¨.¿Œ÷Qæð¦‹ÐÍE,¥ß塋ȳF¡õ®‹hõ뎋¸˜IÕWñ" ˤðãJ&Å€¤Ljt%_ê91O¸B{|A§r?®¾Á€¤rèÞ±é_™ÏvªRT)Ö’)Åê©lš²Í¡ÈÚÏ> ´?ûµ¾óœRÁ5çÛ‘S'ï*é„&1(`/£á)Óähœ¼.¥”Î8…çý«ËzBþ…H§X³ùë‘3”+qððk™9þïMßêëhk]Ti®¨¯jAè!§,„žlß+ »sÀ¡tô¸\ÇKH•|,oÝéÏ«ÍŠY/LRŸƒ¾Î*£È‚ÜÂ*Íþf(_@¥ÐÞ/ªy©‡Æ€<Ç­u†“úœëñ@
-endstream
+831 0 obj
+<< /D [ 810 0 R /XYZ 79.822 163.101 null ] >>
endobj
832 0 obj
-<< /Type /Page /Contents 833 0 R /Resources 831 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 627 0 R >>
+<< /D [ 810 0 R /XYZ 79.822 128.232 null ] >>
endobj
-834 0 obj
-<< /D [ 832 0 R /XYZ 78.37 808.885 null ] >>
+833 0 obj
+<< /D [ 810 0 R /XYZ 79.822 117.273 null ] >>
endobj
-835 0 obj
-<< /D [ 832 0 R /XYZ 79.822 650.274 null ] >>
+834 0 obj
+<< /D [ 810 0 R /XYZ 79.822 82.403 null ] >>
endobj
-836 0 obj
-<< /D [ 832 0 R /XYZ 79.822 577.547 null ] >>
+809 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R /F81 377 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
837 0 obj
-<< /D [ 832 0 R /XYZ 79.822 542.677 null ] >>
+<< /Filter /FlateDecode /Length 3468 >>
+stream
+xÚå\Ën%¹ Ý÷WøZ‘(êú¶í²î]m²Êÿo‡z?«néöõAž±«$Šâ㈤XÍ_þýÂ_þøvûõíoŸB½8æ4h|ùõ¯o‚^ðñb“æÅhÁ¸/¿þóòWεå\~Ò¼}åè‰4œ+Á9Úø£Äzn€þö?ï4ææG[z
+ŸééÍÓˆou¨¼gºe~ ›Ÿ‚¤ß<¡Ê€v Kš7Sýbñmë—f93< ‹AdÉ¿í7¸eFë(Íéç=¾ 4ÃÚ ËQ ú퟿þNâ6¸·´È¸˜N;âJ&®\]L¢¶V‚d ÄHÍÏÖü””È´ØÀ5˜þ¯0Š l_WÍ‘hÏØTB2!õĦ ³ò('˜BõbP0+lô“ô¨¸×7&­¢PƒVQè×ÄD½ÐîWOëØi6ê¨??c$Žœ.ìñL(€d r$’L÷ty¥ðiù#Ý‘ð¢Þ\ëAgìI°Lâá&³ÃEeˆŸEŒïQŒ^ìÙû½ãÁÜüÈèçqžáo*Îväg·"|@Ù*ÊÐ.¯²žW¨˜ç´˜ÒšàÈÀG‚cVËý²·K)_3bœªI bÖˆ‘®WS`ùƒ~ñÇÿ>[OS ôÜš
+HÁÐLŠÀÛ`Y®‰†„£ÇÙÞiÀÙåV.ȧ§… Èq¿_dËè Ó_×jË!dž­Xú_òkíÈ xD’ïw)Ì ©ô$ò›â!
+xSâµ9?˨ ÜÑ”0–)åF¼¦$‡)Ðqº =nÃy›Ã §R<晈#óÓNñN %8¼vÚHáD˜¶p úZaBòg˜hæ@ŒtÜwVó$—S3§àLá´R8{h?Ï£NQŽ‘ãlóÞÅH“yZͤ®ç¿ºoäÿÉ¥ÃÞ°GˆãMåVÆUC>œ‰éÜ6XA$C`œ³
+Å㛊GJ=mûº°—²jiOgÎA<ÍÕáèûŽ6d#G’Zó4Hj©5ƒ EµÅ"Å–ÂPWÙ‘Â.”®üìj¨ )iðvÚs0FM1Ðé
+ñFÊÉ59S¾pEÿýƒ(6 sVHh)X
+í-¹-å=šòžLÀ«Ð«SEB©þE1"¾XbCÓn"h:°#‘`MÀð¶Ù'xyRÆ«@}ǺœæÀ$Þهś•%Z\ÖÏœk5ÑŽâÓš§uãÞS åZ\Ë#.Uò\.™åuc¼¢•SûÒÀ¸’ã.ÿÂØRjÍ´#!vÐTB žH½óS~X¢tN3«fr¡ñ
+5Z\À(í±U4gWȈ»'«Ó,ŽÐ]öš•ðfmùí ã²^þÍK(úFT1êH%WhJnø™O†’ãÛj8‰“œGŽ›Újœ ÉäÆ*fßAb¯êŠ”›*z5è¡îîlgÑnû:¯™8z\0¥ï›¡ RdÝ
+¦PwBÁÈsBÁ/\’ÃCK„ÕµmÊÌ׶vqm›†¨èæÉå¢
+ Z'*Å´qy¼ X™öÁžî›v$·AFvÅ”À‰ù‹d\0àjœ®]Pv©Æ¸åtáéq%þDѧÕrqX-]Íû€öÎQ”¯IÁÐOð+¸¼ç¿rÕ(æIå¼éú¸M•¥S³Õ¤3’v·þƒ-þþ×xý·´.Tü@8‚;ð€)f !Ô³fŸPK
+«âØ. ÆKXÉ=€UÒ0=±~ ©@INŒ³cý SÅ2Rq¹0ŒÈwÌEÂÍð­Fß9r_ï/߇…Ø^–²IZçŽå&8|™­u°“Š@¸?½zÁd‹Ï)^—îÁ•S[«‰vMa9çCa²ÏØ—”·Ðf|±JO©"š{’ÒÀþÈI¯-,ø-Ø.ÌkÛOÀv‰” IÄçÁ]'A^‹‚U#ñý½.Fî‹n Þæ÷©ë«ÉÔm6€diîó5«*‰|Dz|»oP®€›âLJõŸ'¹€W;?ú¼#WlëÅìž<’
+A»ÆÝË÷Á"‘oÕ5Fþ?ŸƒŽ/–¢ÉgTx鬨oœÃÌ/:+FþöJJæœJ߶œª'ò¤ÓâD“!ø*š\ž;2
+[é*y8ë®tÃȶ²Ÿä@0~ÈV‹>q­’v—urZ9”¹L§pñ)U]·\©ßÆS§ŒÊ‰~á·ïÀ…vpîî2ïäS|—„ÞÕբƸ°!c™¦íWíúÅb1úh”j/´Ð+ï&Ú†š©´ jüR¦Ü²¼ßï:”†N÷p
+endstream
+endobj
+836 0 obj
+<< /Type /Page /Contents 837 0 R /Resources 835 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 622 0 R >>
endobj
838 0 obj
-<< /D [ 832 0 R /XYZ 79.822 459.987 null ] >>
+<< /D [ 836 0 R /XYZ 78.37 808.885 null ] >>
endobj
839 0 obj
-<< /D [ 832 0 R /XYZ 79.822 425.118 null ] >>
+<< /D [ 836 0 R /XYZ 79.822 632.395 null ] >>
endobj
840 0 obj
-<< /D [ 832 0 R /XYZ 79.822 390.249 null ] >>
+<< /D [ 836 0 R /XYZ 79.822 560.521 null ] >>
endobj
841 0 obj
-<< /D [ 832 0 R /XYZ 79.822 355.38 null ] >>
+<< /D [ 836 0 R /XYZ 79.822 526.334 null ] >>
endobj
842 0 obj
-<< /D [ 832 0 R /XYZ 79.822 344.421 null ] >>
+<< /D [ 836 0 R /XYZ 79.822 444.326 null ] >>
endobj
843 0 obj
-<< /D [ 832 0 R /XYZ 79.822 309.552 null ] >>
+<< /D [ 836 0 R /XYZ 79.822 410.139 null ] >>
endobj
844 0 obj
-<< /D [ 832 0 R /XYZ 79.822 238.817 null ] >>
+<< /D [ 836 0 R /XYZ 79.822 375.952 null ] >>
endobj
845 0 obj
-<< /D [ 832 0 R /XYZ 79.822 213.91 null ] >>
+<< /D [ 836 0 R /XYZ 79.822 341.765 null ] >>
endobj
846 0 obj
-<< /D [ 832 0 R /XYZ 79.822 202.951 null ] >>
+<< /D [ 836 0 R /XYZ 79.822 330.806 null ] >>
endobj
847 0 obj
-<< /D [ 832 0 R /XYZ 79.822 191.992 null ] >>
+<< /D [ 836 0 R /XYZ 79.822 260.753 null ] >>
endobj
848 0 obj
-<< /D [ 832 0 R /XYZ 79.822 181.034 null ] >>
+<< /D [ 836 0 R /XYZ 79.822 236.699 null ] >>
endobj
849 0 obj
-<< /D [ 832 0 R /XYZ 79.822 170.075 null ] >>
+<< /D [ 836 0 R /XYZ 79.822 225.741 null ] >>
endobj
850 0 obj
-<< /D [ 832 0 R /XYZ 79.822 159.116 null ] >>
+<< /D [ 836 0 R /XYZ 79.822 210.141 null ] >>
endobj
851 0 obj
-<< /D [ 832 0 R /XYZ 79.822 148.157 null ] >>
-endobj
-831 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F81 377 0 R /F59 346 0 R /F84 425 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /D [ 836 0 R /XYZ 79.822 199.183 null ] >>
endobj
-854 0 obj
-<< /Filter /FlateDecode /Length 2254 >>
-stream
-xÚÅZËr#·ÝÏWè†!Áw•ËUÖh”ª¬½Ke›»ºÿ¿ _àlµIÙ™,dKÝM<xð
-Îå=|€su{ý®$WÇ«xE™W°/ù9k^ÿzÿ#ÌcÕÑ<B¦È@©Ã„6NÆó5¾ˆœÃ5 7P„/¸c’ *]周ì°i󬆷YàvºÐé"‚®ÊI?Ãw‘?ñ{„+­A¶ßÊ®C‚e\¨ÉP´wIBYÈ×ïà^z{ÄÅÈ_|¸‡îñ)‘&«‹}Wà_òs šø+JŠ-ʳÐMKF›[6Z8ÌvÅ™:‰Ë&>§<Üà"Ñ y‘yf×/¾H–R¾äU¥§¯ù“WW®g9ÓÑýÃßßàÚ_óNHèwšÓ+5Ú¡*:N-¦² E¿Ýº¸`5#]/Ä[æÁQ!Ñ-¢–™hþ¤?äõÄßÑFá‚”çñ{X ÄUý(ö öÑ Qrçh‹0ƒ-ìçÏ1JßÆ ÞSœ¤\ÂIpˤ*̶B2PT õsM a˜Õ–‰˜FO¥d¤
-VPðôÍ£%0ôª×–º’eª´:Â]H8ÊnƒÅ!üo7¨h}üì¡5JI.x/yý¨ª´c¨¨aì"Ÿ0È6 Æ &( ¶
-kEÆÝÈTU²kö¿FUcÅáÖ*°†¹iõ²èc"~âzåyu!Cu¨¤}ši¸`Fûɶh&’¢´Ø _O5ïýÆqŒJ‘V¥/øšYßJûU¾†™ª7{ÌPÅÖxI»r•VKÅûj©¿µ}6VGù*úesû¨vsðÙ7®cØœŽNä=E궫ih†›\m‘©W#B(GÙw³C„žæ)ZkæäÄlë
-Ùß äuvW”
-
-Ú+‹ûxõRöÙ^Á!íáõÈÏ!3Ã…!\ù®‚^fay§Þá9S\P=ñ‡g½Mæ”çN(l¼¤
-iWÛø%ŒpÃÌ`Ö–
-¥Úù*¥Ú„8²óÆ|¥À%/#¯ÍãLL^?(ª:‹»§¸ËS£9Ÿ•dPÍâÞØ[Êj÷æKØG²mùg¶Ú2ðnR/´ê¥õ°ð©ÕKºka<¹+c|»š=ï ™ò/ñ¿ÁulÖ¨ÎN—ÊŽoåÉ[/ûH‡zŸx,îg©ú*z-$ ‹Õ›´tÎÊôêÚjÔf0L
-ÓgÏ/)L7mÕo[Tgò Ï—>·O©êÞ¸Ýr\05ñäÕ)rœAÈ~'ZÆŒ­g-ÜVÇŸHI•f—BŸïúÑ15q‹Åžn¼ÊMÊÃäõz¶QJ‚­ßMrùúõÊÇ´”“òjËóˆ”%+•`FÖƒ%ÎûF=·±%ScÜ«Û!ÿ9e'Æ„ýGQ- ˆÔ²q²Êãì/f
-TÖP)”LöÛÄxÀ€‰÷`Würæd\ÌA¡÷–:J³À¡
-endstream
+852 0 obj
+<< /D [ 836 0 R /XYZ 79.822 188.224 null ] >>
endobj
853 0 obj
-<< /Type /Page /Contents 854 0 R /Resources 852 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 627 0 R >>
+<< /D [ 836 0 R /XYZ 79.822 177.265 null ] >>
+endobj
+854 0 obj
+<< /D [ 836 0 R /XYZ 79.822 166.306 null ] >>
endobj
855 0 obj
-<< /D [ 853 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 836 0 R /XYZ 79.822 155.347 null ] >>
endobj
856 0 obj
-<< /D [ 853 0 R /XYZ 79.822 742.926 null ] >>
+<< /D [ 836 0 R /XYZ 79.822 144.388 null ] >>
endobj
857 0 obj
-<< /D [ 853 0 R /XYZ 79.822 731.968 null ] >>
+<< /D [ 836 0 R /XYZ 79.822 133.429 null ] >>
endobj
858 0 obj
-<< /D [ 853 0 R /XYZ 79.822 721.009 null ] >>
+<< /D [ 836 0 R /XYZ 79.822 122.47 null ] >>
endobj
859 0 obj
-<< /D [ 853 0 R /XYZ 79.822 710.05 null ] >>
+<< /D [ 836 0 R /XYZ 79.822 111.511 null ] >>
endobj
860 0 obj
-<< /D [ 853 0 R /XYZ 79.822 699.091 null ] >>
+<< /D [ 836 0 R /XYZ 79.822 100.552 null ] >>
endobj
861 0 obj
-<< /D [ 853 0 R /XYZ 79.822 688.132 null ] >>
+<< /D [ 836 0 R /XYZ 79.822 89.593 null ] >>
endobj
862 0 obj
-<< /D [ 853 0 R /XYZ 79.822 677.173 null ] >>
+<< /D [ 836 0 R /XYZ 79.822 78.635 null ] >>
endobj
-863 0 obj
-<< /D [ 853 0 R /XYZ 79.822 666.214 null ] >>
-endobj
-864 0 obj
-<< /D [ 853 0 R /XYZ 79.822 655.255 null ] >>
+835 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F81 377 0 R /F59 346 0 R /F84 425 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
865 0 obj
-<< /D [ 853 0 R /XYZ 79.822 644.296 null ] >>
+<< /Filter /FlateDecode /Length 2836 >>
+stream
+xÚÍ[ÉŽ#9½×WøJ-Qk
+~ùï…_þüqýõã›Ð—mŒºüúÏáoð‹¸ØI{±F0nÄå×ÿ.ÿzãÜ8ÎåÍàý§”Ò_‘–s-8W.}´xç¯[ð¿Ãg÷Ï\ñét%=a¶@'ÜMÿ ǧàšhž>ñ®ÿhõþ3zÂp 7pX è§o~õ¬*“&ä¬yÿ÷¯¿üâ­š-¬anX½Ì|LŸ°^O>šKQrÇ@¥¤]Å™ŠðÿôôvQlsBBKÁiN_¬² ¬,Šð¬Ø-|¡¬Ï?nN]œgÃH×Ù,ÛÀQ" ªŽ‚¸ÌWÖ$ýÁ§ÿýùþSƒÆ§]z
+Dú„ïs©dj…ú¡”²­º|™­%sèÕîmÁ¥1Á®<wùj¡g(ö(³ÝUVÌž†¢pëh—a¸·0Âv5ðÑ6“ys.>“ù'“'ns8:*·‚ÈT×MMHÆÕ`j–L­'Œ'pˆ´nfS }!Õå5r`Ü/€¬Ñ\—ÖØ¡kDû@×
+ßõ×û‚5·£÷ê„2Ã(efTN8£q‚¸6qÅ ]¬bv¯u-Ô1XîšK—a·‘ê]wœx:öY WF7!#¹".&~]wOc,sz4ÝÓ%DÖw‚^ˆ¹"¸a´MÔ’°Ò} ‘“ÝaEJ2« •\Ú ‘°*ÈA“®?üÆ\+Q6ºø<~¿U×Ö*ì*¯VNÑ1÷çd63Kø\–Ÿf=À¡òs§ä'¸eÒÇBL‘ˆ9µNÅÆ¿Á¬²=ñ„€)üØÜXeg±j³M¼Q×ôA¥{´p„<…Û(M¹¡&â|‰ñ@ç{wgÎߥÞ=P¢'¨Æê÷&ôu0^‰JâY±{e6„`‹!¸Ø)ÔßËÛµèÛ2bŠ–wŸ¥ÐÛ€ÞÓºXtË,î°©·¼Ïîxw„¸‡Câ#=‡È †âJw´43Ê;´Ž3Ååó~xÖJ0Ð$LyœàÍ6Iò»ÚO%EãF¸a&aÍk'–"$
+µÓU
+µ;âÈÆÓ•"
+¦å0Qv™˜ge7Ée¦ûµ^/
+ådI@Ð P*OèFJ7·“µ©™Çû”J±oYKFˆfƒ‡¨u6¼-ŠÁ„ô›=•Àæ)'ÎI¦éuæÕ÷T§ÀRoS2ÏïéJ&{@L*Í<w”ʦÂ}ú?B‹³pR+¦„¡T(œl7Š¾Á€¡w²/¾EI·1e]êY˜—J¨€9¢dÈàŠ?kLˆ åvGWàeÍ'Y#hA ñ¹²÷–,tRiŠObVš~…,;Ñìã%Þ/¥“<o®Pš\F³oµÊ!¡¦TNâÀ4 o×Yª*ËЉ{õ k5‘¢§éJèÚ¡ùÚ1ªR’iÁ‰^IÉÐ@µTŒ+íÅÛ“÷;Rƒ–ju#8A%êt'æb«¹Œ…i€Y(¦ZŠÓ–Ú:<“Ê»‰ì@J«Îù“‘±5O¨$wW¥âÿþ3ZæÞ÷<-¯­SõƒYí¿ä%äYª¬÷ÃPû×õ[ŽžLÒCUë¨ OâÜ"ÈžJ/ÈÀ|ôŒ{°ßƒ´§Y÷ 1eý,ŘÚSy‚ '¹¸øXÚK{"O0Á5\P.΂¿ g"µuñ»¨Ë'ÔL(Ø< AÄíPY—8É„“ƒÎô=•Þû»#EC™þ~ä˜en¡†n›°up›D ¨õ÷yžñŠˆ€„·V‰$TN„@ù¥™¹ii‚3 -M¿ŒSh.ŸÞg›ÚF"ÒmÄñJ¨ˆØrz/Ž<¬êl>Ðz‰¨¦7ÎÆM›ªùûÇ5ŽŠ °èŒ'«Pró“r…_ „òœ/¥…Pƒ1Ä]B1ƒYXÍtÛÓÜ›Îe4… OFÒ‡³QœVº(ÜÎué[øl0Q³7çhÇ¿<9Ÿk(¿Å«}ù-^¹H¤U ¥üÆ[í§+jð4æá©mQÆÁh(òñ- Æo?„Pêó%ÖZwÃ|:¬ÇîtM^9E@ 늣Ô^anž¤©¥ÇÃWIµØ¸+2­¿Úƒ
+*¸‹ Ò?r“ldàc¡èN/ÍJÌ*ÿת9¯`ª9<rh§:0t¶è8JtŽ“åSƒƒî8ÈNš7ŬÓƒüãØ>¼7yD6ÿ¸1 GR¡³ÙH5ÙßdzØŠmÛÏu]E³w¸l© wÕT\·ºÜ䎛ø­kt­ ÞUÚd.ncRo¦Zôû
+î4
+^Puþ{"-Kõd ¥Úùÿª„­þ{Ò;Æ»Bo>E}Ùðns˜·³Ä£0Ý!ií Ò¬þ9Œ`Ó_)f@#½­= «¶&>•Ÿ_ÖúŒæ¶AžʧÒ8攦£Î`ç|~ÃœÇz—>¼+=ŒÒæô«îÝ¡¦¬,úêm㉈¨43$éûX}_‡ù>ßM5Õ·ýš[|ÎKy¸3EÛÿªÜÊYòI"?nÉAîçy {ž6¯HØ…ÇÕÆhª»µV6!òG®®S•Èñêo…Ÿ:|ý¹cÚL«>¸¬àvîèý±xwxÌm3ìïÜ
+œs¶}Û$Ží‚˜sçß6AMò~7k͸‘T¦÷Ž÷µsÎJóù …»%
+)=FÙèlÑû]‰¾÷xUÊ{œxÄj 9ž`1™ØÖn“-±ÐÖ˾ϛsËÎ5ªç†2—}ëÙL%š-媣¨•Áhe¹¦FNãƒ%åOÏ)›h 㯢cbÅ¥Ç(6¡ú
+úK-ïÕ•º·Y1Ÿ-=¹‰ŒbQæ²Q¾S:z®fÚ™9è§,,•Ž¯éÓ´-ç|o^¶êðf¬5ÃjÛ˜áO
+WÔ7IúŽ^¾¨“¿è´öeÖÚœ¼NýÛ=IË™3†n³«ï`¶4Ö^35ÏF´RnÍñ#3¼Žzÿð6ÎatÄ’Ù}ýúñ7Üû˜
+endstream
+endobj
+864 0 obj
+<< /Type /Page /Contents 865 0 R /Resources 863 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 622 0 R >>
endobj
866 0 obj
-<< /D [ 853 0 R /XYZ 79.822 609.427 null ] >>
+<< /D [ 864 0 R /XYZ 78.37 808.885 null ] >>
endobj
867 0 obj
-<< /D [ 853 0 R /XYZ 79.822 574.558 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 755.041 null ] >>
endobj
868 0 obj
-<< /D [ 853 0 R /XYZ 79.822 563.599 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 720.811 null ] >>
endobj
869 0 obj
-<< /D [ 853 0 R /XYZ 79.822 528.73 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 709.852 null ] >>
endobj
870 0 obj
-<< /D [ 853 0 R /XYZ 79.822 503.823 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 675.622 null ] >>
endobj
871 0 obj
-<< /D [ 853 0 R /XYZ 79.822 492.864 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 651.515 null ] >>
endobj
872 0 obj
-<< /D [ 853 0 R /XYZ 79.822 420.137 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 640.556 null ] >>
endobj
873 0 obj
-<< /D [ 853 0 R /XYZ 79.822 409.178 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 568.627 null ] >>
endobj
874 0 obj
-<< /D [ 853 0 R /XYZ 79.822 398.219 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 557.668 null ] >>
endobj
875 0 obj
-<< /D [ 853 0 R /XYZ 79.822 387.26 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 546.709 null ] >>
endobj
876 0 obj
-<< /D [ 853 0 R /XYZ 79.822 376.301 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 535.751 null ] >>
endobj
877 0 obj
-<< /D [ 853 0 R /XYZ 79.822 335.454 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 524.792 null ] >>
endobj
878 0 obj
-<< /D [ 853 0 R /XYZ 79.822 324.496 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 484.904 null ] >>
endobj
879 0 obj
-<< /D [ 853 0 R /XYZ 79.822 313.537 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 473.945 null ] >>
endobj
880 0 obj
-<< /D [ 853 0 R /XYZ 79.822 302.578 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 462.986 null ] >>
endobj
881 0 obj
-<< /D [ 853 0 R /XYZ 79.822 291.619 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 452.027 null ] >>
endobj
882 0 obj
-<< /D [ 853 0 R /XYZ 79.822 280.66 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 441.068 null ] >>
endobj
883 0 obj
-<< /D [ 853 0 R /XYZ 79.822 269.701 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 430.109 null ] >>
endobj
884 0 obj
-<< /D [ 853 0 R /XYZ 79.822 258.742 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 419.15 null ] >>
endobj
885 0 obj
-<< /D [ 853 0 R /XYZ 79.822 247.783 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 408.191 null ] >>
endobj
886 0 obj
-<< /D [ 853 0 R /XYZ 79.822 206.936 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 397.232 null ] >>
endobj
887 0 obj
-<< /D [ 853 0 R /XYZ 79.822 195.978 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 356.705 null ] >>
endobj
888 0 obj
-<< /D [ 853 0 R /XYZ 79.822 185.019 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 345.746 null ] >>
endobj
889 0 obj
-<< /D [ 853 0 R /XYZ 79.822 174.06 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 334.787 null ] >>
endobj
890 0 obj
-<< /D [ 853 0 R /XYZ 79.822 163.101 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 323.828 null ] >>
endobj
891 0 obj
-<< /D [ 853 0 R /XYZ 79.822 152.142 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 312.869 null ] >>
endobj
892 0 obj
-<< /D [ 853 0 R /XYZ 79.822 141.183 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 301.91 null ] >>
endobj
893 0 obj
-<< /D [ 853 0 R /XYZ 79.822 130.224 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 290.952 null ] >>
endobj
-852 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-896 0 obj
-<< /Filter /FlateDecode /Length 2975 >>
-stream
-xÚÍÉrܺñ04€P¥R•æIzU9û–Ê59åÿ¯ÁÖX©g;9Ðò`£ÑûFyû÷MÞþüvÿñíoŸÊÞ‚hn?þõMÅò¦n.ín•¨n?þsûÇ‹”è¥ÔŸñ‚×ïà1ÞÑNJ«¤4¾\V½‚‹÷Äßézkîiµwá^WßË¥þ(+ ÂÄ“V¡,—†ô4Þ3iÅK1½–¶Ä·¯@Ò¯UƒµÎa~óŸ?þ àÌŽ
-\¾Ûlg¥ZÂ%+rë´r¡~w6]uòûy•eüÈü…If3lâäü<ão*Nï]íÓÕÏÕ8û
-a7IMÇÀO§ó…2i|6ü7¦¬PÁ6®GÉõEr qËÅè@zþrVòI\ŽEA9á<r(´®p‰U™¥ùn ]…îmýIOM½ƒM4èÉl¥Êbè¦Ló@5BÃNŽ§Þ%oŸ9C2:Ç‹YÂ1¤°)Јÿþ cÃÍˆà•†‘0ÞŠènN)Í[£Kè·´ªñJ4Œææ#uQû‰ENðHÒꬉ$Õ6B!fúµZÖ…nçÆÓ@¢AµëIvmÖ” Y•+C~äd?Îu—Ý$*BÛ ÛÿÜeªJ)´Ñœªh/QuòÿAU=x‚KÔ;ŽwÑiáîâÝYÆx×oâݪ~Oâݲj
-Yê¶Ôçä!ª9(»ÆudÁê“f­']ï^v4Xa§3i¬u5e}¶ª÷¾‘}8FQ
- =£ôÂËß:
-ÒS²„\¢à¦šî™²ìWLL\ßû{«KNt?Kòyv´_¶»h¢ '9cÞL_âÝ ä÷ñŽ"ƒ ‰,ÇÿWðyÂÃ'Ö@@ü»³þÞ_¨v”ÕíøÚò¨lIòSÊ[ÀæÃ.öÏkç0./̬ßdÙ’µpÎSÕ7™Œßà°|Q ÉûCkl­¨9MYÛDGY^ü°o‘³Ã…ÖªÀwËÚï›õ}„«1QãÔ3TÇã (VSÑ1ú]m§V±H؛㗗àýÀKhBÖk/îeƳÔhËŒßâb«˜Õ¢Ë Û–ó—uÆ• Z'Éx£»¤™TréÕÀEè"nU•º²Âôú^?é¨Bfª.¹. [å
-¢®u£ú¤fpJ%ñ…r£¶eC‰
-‘‰A”?¡Üd6xS×1åëå¬=Çc¶5Çß”®6qß&í£äº¹…wf'z(;çíD‰+ã ¼%YoDT~îiÍÇOË€@­Ad“Ê<mñ £§KTÈ–ì V-›•*~ÅS”{e÷æÄ"
-”0×XbÑ"—‘ÊV¬ÏÆæÞë“™õÉYù“ßc:}dA•wÂÇ(šácuIhç(^G犼p°@ZübÆôÃTZëûPMl+æSöá&fp—f•fÌÖŸçJíü,Cl5ÏÂ…Óö`g{¬h[ Ùr\êÏXJJƒá«¡Ë!Û“Û5oóóÕâXd¢ûŽë8Í$âaE;ÉCÎzÑïZ
-§s]â>DÞc}]-Î9^œÃµ…€þ¡` V§’,ú-›}h‘íµ\»CS¶™{c¾ñ‘_²ß“iGû­ãy\¸d¿g ¿1Ë5;ûÖBÁ+tPÑ€ät°pŠJ:¡ p(µÜr ‰Â{ÏÑÀû94
-g‡Âý©¾:­g:ÿb¿z(&Ø(fa!ÊÛ9¢
-å€C¹Î£”à8úœ¦(m…õÈ€,‘Nµ‡-Ýd:…ËÄ)½æúç4£qñÞk ä[ÏÿëœrFH¥ë"(SV©8”¹°AùYOÝ+ÂÆÏgd:CŠuÇßDü/—¿ êèaQ{Maf(_@ÂA/h˜K6•Ai…¤£> ËRÂÚf
-ëªëÖðBœÉûÖ-ðzç¸7«Éqg5¹}žh¤2¹Bøõ‘1 Æ)ö0ï¼E±4¬§µ­$xÙŒèxfÀÅ ^+ß2 ¿/(!1¢4ojà|P$Ì;ÚhW)‡^h¹¸Ê“é8©ƒrÝUjÍA¥?TR3á®òy
-Þ”¯‹$çÇBûÇ"
-öí/ˆ§JeúE1/Æ°
-˜nó¨
-‰æ~˜^æKk`óºøˆí@ÍI
-èR
-jä®gQïS!]îFë_:š…å„?ùiˆÁó1®ÖÈMOsš:0®õáåH‹Ò
-ó2êÑcšöâhïl ¢i ±ì[eßÕ‹4¯ì™Z½K¹Îëåì­Z–ß*C/­}µÖÂ"q£„Ý„ž êå±³Jmg`nJŽ ÑŽy¾ã®EÊ%)ï­{ÿ‘!Ò“kD”_ŽAêH©‰ýì…€a€”(1Q¿ÈÍyÙàƒ—Â?{¯ÐÒ”ž>«Š¨$ãâ²GjgdLý«‡>°³‘€˜ñ¹Á¾°\…ª©T{-óãÛ¡IiÚð-ID-û6+KÚÌóÒ‰‘úežµÔ ð#Ä\C¬LcfÕ–«)Û‹ÈK{>bIyo³7c–Ùpkb±k§æMÔ§2žÖD¥ItÒrmJsgQ˜)= µáª‘›®×ï‹g4ìz Ñ]gg.; ÊùXüLé‰z[K…¾Õ[w³ò=V=éB¯“Y7ïf ×#uŽV‹³l4¨F!‡ò‹BÔ‹GSÁˆèݧ^¹=Ÿ£>‰A)Q¯iññëwõ²‰‘¯¢êµPJsTÏ汄ê eF5†#ñÎ!þÏs»?aŠ0ƺBYÉp6w%"ÌPNæ!WQE5}Ö@¨¾]Ò]å ³R€FŽÆÙü²æ ÊÐÐA€s þR†AùEŒ/´
- ã쥂ƒrjØRI%0¨1#˃Uz™ØÒ~úüéuúìˆGbeu¯¦Ö*ôð¡XeÓË(›¦Q6š¤L¡X7 â#/ºW hmsžp46œ–O éíè^7î•=až˜Çèp8*©0–3ïMuAñA8}õc€„`À^þÉ#
-ƒðcødØTyÖê'˜ý$
-‚S"ó^”£ µ{„mÞk“ ÅuþI˧Y+JƱN@õrng¢ÊÛ$’ô…a__fÇÛxh½›ýóû0Ovø½gúúNý*1ˆþ½f›œi`õï|°~È<š3>= ÷þÁßü=g¢•|Örèlwúæû47Êx@1þ8sZÅ»&-Þbv\o™õÌßþ m&?
-endstream
+894 0 obj
+<< /D [ 864 0 R /XYZ 79.822 279.993 null ] >>
endobj
895 0 obj
-<< /Type /Page /Contents 896 0 R /Resources 894 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 627 0 R >>
+<< /D [ 864 0 R /XYZ 79.822 204.239 null ] >>
+endobj
+896 0 obj
+<< /D [ 864 0 R /XYZ 79.822 193.28 null ] >>
endobj
897 0 obj
-<< /D [ 895 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 153.392 null ] >>
endobj
898 0 obj
-<< /D [ 895 0 R /XYZ 79.822 719.071 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 142.433 null ] >>
endobj
899 0 obj
-<< /D [ 895 0 R /XYZ 79.822 708.112 null ] >>
+<< /D [ 864 0 R /XYZ 79.822 78.635 null ] >>
endobj
-900 0 obj
-<< /D [ 895 0 R /XYZ 79.822 667.591 null ] >>
-endobj
-901 0 obj
-<< /D [ 895 0 R /XYZ 79.822 656.632 null ] >>
+863 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R /F81 377 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
902 0 obj
-<< /D [ 895 0 R /XYZ 79.822 592.201 null ] >>
+<< /Filter /FlateDecode /Length 2620 >>
+stream
+xÚÍ[ÉŽ#½ ¾ÏSøZ#Q;`4з ç¾¹&§¼ÿ5ZH-¬²]òôüÈÁÓ¶JEQ\ÄGžþs’§¿~\¾~ü¼){Š":pæôõï*='uòQhòN éÔé뿧ž¥Ôî=èô×*)|ÓVæQÒ)Õ/)Í%=MßM¨ãpͳLšåb¹åQzÏø4W§‘DM¼ÿëë‰oö¸QÁ‹`ó“ßv²òC+»ˆ”ö÷
+%I±ÒJ”ç²qá\%y¼A@#2î±ÚµÖD¾ ˜ª
+÷™¾«ú)ßuÝn~Ö¶õ‰Â!ÑC«¬0.ñ"Íã\äíåÍàf³˜ n­X>2‘íÁ;’
+GÏ‘]›{p*ž³ <ŽÉý倔ÖF9¾õ£øš¶>S)&¦˜É@TCá`rÐA«b”ÇûÊË(Œõ„¥ͨ¼`’*!­6&i—@-£òºIr}ldßDÁ~ü†y&·:nÄ°†í0ýÔ£ÊX®9 K\ÃH›Ëç×Ö7ó:…î¥@«.„Ç"zéD°í=—Oü8¦ý$;.x]ÝÆ ô’ÌDÖµoÒ_˜ºˆ–p@ñR8ßü×L8q*,Uté°¾ G<, ‚1=b+€žQnÎÌÜÉàÇq,·º#±¡ây·,¨Ø¬O¨÷CõÐò«cªî ¥>^°¹Ú{žçG>”g˜óèE÷eÚkÆhó²S"”SÒ²¾.Z¾Çù]]ÓÚ*fÛmß{+"–· 8Øí” ¥.?Wi)7:ßUÖåPë#ý»–c¢H:_‘ã¹=K*k뎅ïãXŸ»k9Öˆd¿œƒœGDÈy½õêé̸&‰IúÕ†¬†á&¦e&õ>„½We
+weJOŸ‹+U²q¤¸Y#ßòNåF‰G½g) öCåˆepTd¦’t±4©Ñ"§{iÎ$;²¬†7«SÈ=å悪nâxåRæÝcÌ7ƲQ¢kËÈÝ”­Eâ¥5賓¾GÆÐ÷ÐRïÆ[3‹mQ7=d<·¦]u3l’©6µ°P
+
+nda–ôÀÔŽVÓ)T÷ëk×â[Ï"“REps.Ž×dê0*Ç‘ø‘zßôn‰ú
+T†Þ¨ï@êF¦#JZ.°ƒi7•4•u¤®c¢ngãh›ŽÔœ91*¢®n-øôÌo¶v0/vZ­8•ŠzMÃÇïo꼃‘WYõ^HˆœÕ£y,±:S™YM€$ýr3Äÿ¾À»M
+¥ÔÆ°ì’ë2*/ÈË$<caÆYÊ/•ØÐZ(V? Ç“-¬Á0*Hq
+©ŽW÷Ž1Ô_†¢þ~Ü¥SN´áüY@+äZPþ G1BˆÂxÍWÚr?F#È]Ïzž9U
+‹”J¬Òã-=UÊÓì{2åÕÅúªíªqvW#¹­*ŸLß7“oÕcT#¶A._ñ鵶H‡­!{n<æ'B.åbèe<:#BïX›™á2ÖE‡^œP–1fêrʺZo@ o¸Î€Å_çrïØÙÓiô_“
+µ^è¨úÖ†ì Ú‚ß«Å`Få{%hÿ( Ô
+5;~¯ìªt:Ô6ü­uý2*» äCœ˜Øß=³†y½9iuk8¶›°·XbT¾sk/nk«­Å‹üÂ:ÌËxQÅY8Z3‹ F†âwõ÷d4Þ5WoѦÁlùJZtB†©FèÌòµÌL„ªûÙKÏ1¦ÿ¶ukxeáôGæ ÷ÈðL¤0ÌþŸÕ:cÞ5_p9sî#c3‘?ÓÌø¤½î.2Š Ò[w2RDßfh¬þüúñ?³®’E
+endstream
+endobj
+901 0 obj
+<< /Type /Page /Contents 902 0 R /Resources 900 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 622 0 R >>
endobj
903 0 obj
-<< /D [ 895 0 R /XYZ 79.822 536.574 null ] >>
+<< /D [ 901 0 R /XYZ 78.37 808.885 null ] >>
endobj
904 0 obj
-<< /D [ 895 0 R /XYZ 79.822 525.615 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 730.971 null ] >>
endobj
905 0 obj
-<< /D [ 895 0 R /XYZ 79.822 514.656 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 720.012 null ] >>
endobj
906 0 obj
-<< /D [ 895 0 R /XYZ 79.822 503.697 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 709.053 null ] >>
endobj
907 0 obj
-<< /D [ 895 0 R /XYZ 79.822 492.738 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 698.095 null ] >>
endobj
908 0 obj
-<< /D [ 895 0 R /XYZ 79.822 481.779 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 687.136 null ] >>
endobj
909 0 obj
-<< /D [ 895 0 R /XYZ 79.822 470.82 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 676.177 null ] >>
endobj
910 0 obj
-<< /D [ 895 0 R /XYZ 79.822 459.861 null ] >>
-endobj
-221 0 obj
-<< /D [ 895 0 R /XYZ 79.37 422.769 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 665.218 null ] >>
endobj
911 0 obj
-<< /D [ 895 0 R /XYZ 79.822 387.037 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 654.259 null ] >>
+endobj
+217 0 obj
+<< /D [ 901 0 R /XYZ 79.37 616.847 null ] >>
endobj
912 0 obj
-<< /D [ 895 0 R /XYZ 79.822 376.078 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 581.061 null ] >>
endobj
913 0 obj
-<< /D [ 895 0 R /XYZ 79.822 365.119 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 570.102 null ] >>
endobj
914 0 obj
-<< /D [ 895 0 R /XYZ 79.822 354.16 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 559.143 null ] >>
endobj
915 0 obj
-<< /D [ 895 0 R /XYZ 79.822 343.201 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 548.184 null ] >>
endobj
916 0 obj
-<< /D [ 895 0 R /XYZ 79.822 332.242 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 537.225 null ] >>
endobj
917 0 obj
-<< /D [ 895 0 R /XYZ 79.822 321.283 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 526.266 null ] >>
endobj
918 0 obj
-<< /D [ 895 0 R /XYZ 79.822 310.324 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 515.308 null ] >>
endobj
919 0 obj
-<< /D [ 895 0 R /XYZ 79.822 299.365 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 504.349 null ] >>
endobj
920 0 obj
-<< /D [ 895 0 R /XYZ 79.822 234.717 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 493.39 null ] >>
endobj
921 0 obj
-<< /D [ 895 0 R /XYZ 79.822 223.758 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 428.633 null ] >>
endobj
922 0 obj
-<< /D [ 895 0 R /XYZ 79.822 212.799 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 417.674 null ] >>
endobj
923 0 obj
-<< /D [ 895 0 R /XYZ 79.822 201.84 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 406.715 null ] >>
endobj
924 0 obj
-<< /D [ 895 0 R /XYZ 79.822 190.881 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 395.756 null ] >>
endobj
925 0 obj
-<< /D [ 895 0 R /XYZ 79.822 179.923 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 384.797 null ] >>
endobj
926 0 obj
-<< /D [ 895 0 R /XYZ 79.822 168.964 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 373.838 null ] >>
endobj
927 0 obj
-<< /D [ 895 0 R /XYZ 79.822 158.005 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 362.879 null ] >>
endobj
928 0 obj
-<< /D [ 895 0 R /XYZ 79.822 147.046 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 351.92 null ] >>
endobj
929 0 obj
-<< /D [ 895 0 R /XYZ 79.822 136.087 null ] >>
-endobj
-894 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F81 377 0 R /F65 335 0 R /F59 346 0 R /F84 425 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /D [ 901 0 R /XYZ 79.822 340.961 null ] >>
endobj
-932 0 obj
-<< /Filter /FlateDecode /Length 2177 >>
-stream
-xÚå[Ën#;Ýç+ü­–HêÚq|Y÷np·3«ùÿíè]eûJNºç³¨ØUVQIRŠ<ýû$O¼H¡ã·ð÷—óÏ—ïWíO$¼S§ŸÿzQ¡‘<©“Óœ>Y£„4êôó?§¾JiÎáÒᢷ?þãEÌïWG''¼1èzo…ÇA€Â \ùãwŸïuøÝÈð©ò³ø[j_¿_Ãõ.%½ç¶tyû¦AWd•¯ˆ˜ßÀð6Al™Ÿ“;îâ{E €­á–w¢wp’Z:ÿ•~µJ×/â’~•´ 8
-˜m1Ð EÈÅ 51”V[Žµ5ßæòRæöÎÌ<¡=pB™z±CÖï‰=¢4±?ž3¦d(×<äx‘)fîcÛí!*+
-ç<G¬dÑûnÌêÚAQÜe{hHBã´ì¡ßÚˆò•C{rX€B[3 Ëí kDÙ§{F0ÊM†£×Ä@-´3¥úB
-¢—BÊb¿c£ÕHn˃Êlˆ/•0¡ŸöÄQ dMÜó‘mÄçT¨_re¿+²öRØiÚqKà#‰[“&ÙVÆ]±Â:dIqÁVylDánV0Ýœ²là`Bíùáb5Ôš;9šÝ´qº!çB\Ïê G”;óÑSçkI¶c½ÖV8@.ôjP"C)º{ÌÀ5p¶ùIʺ»e=ˆìÛ½öô ÍhÌÖ¯÷)Äÿ’˜ÁåkårSóíiÏãÎœSÕhùÅ*ŠÄ"ûSn“Pž‹×œmŸé1{TÜ7C©>R9‘¥¹<TYØXòy˜V5´íA†œÙÛ)Ll²+†²¿Vki…TÄÅÀÍh5¢ÔhE%®e™–g•Ϻ.u÷ÕÈnn±àÑ<{Cy÷ZîÏ»J"oDH'%¹-%1”õ”`E¼D”}É
-©¥¥VÕøtj@áSz3ï"à )A˜&Ž²o¼dI(´“‹LM“ e8ÊÒ¼\Rš¶+®Áà´n2£EžÞv!ž1”'´¦A€ò\ŒUVfQ
-÷zú”G¯šÜÿõ^_òºó¸kDÔç£Û
-rR83yç*-ÞÉP
-×yì`´ðÇ6O7Çe :* mÌ7‹>¬°Rˆ¨
-:2¸¤¼ü7›îxÏÃSd1à }ðÚ8¾\m#º¥Ë#6à6ç
-â¼vPî÷geH€÷\I«ÙE‰` å±ýôô¯ºv Ç_áâOXŠF1Fñ¤ƒ½íìd¿Vª:Å¥ØÜÍf(Q{±\^ë•z{¯_¡0‰å¶hCyB; œæHo‘}†rë\Ås§•ô!šMˆ¶
-] e_K>ðnÒÓ\íaGé‡n„¢µ3¿' 9›ü€©`sƒxiN$cæÝ‘Íú¿ã)È_¹€îþ£Œ†u0.´‹”do!AAÚuªŠ_JÞ!<£Í‰dÈ㛀x”™?~¾ü_‡^í
-endstream
+930 0 obj
+<< /D [ 901 0 R /XYZ 79.822 330.002 null ] >>
endobj
931 0 obj
-<< /Type /Page /Contents 932 0 R /Resources 930 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 627 0 R >>
+<< /D [ 901 0 R /XYZ 79.822 263.253 null ] >>
+endobj
+932 0 obj
+<< /D [ 901 0 R /XYZ 79.822 252.294 null ] >>
endobj
933 0 obj
-<< /D [ 931 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 241.335 null ] >>
endobj
934 0 obj
-<< /D [ 931 0 R /XYZ 79.822 768.829 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 230.376 null ] >>
endobj
935 0 obj
-<< /D [ 931 0 R /XYZ 79.822 757.87 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 219.417 null ] >>
endobj
936 0 obj
-<< /D [ 931 0 R /XYZ 79.822 746.912 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 158.645 null ] >>
endobj
937 0 obj
-<< /D [ 931 0 R /XYZ 79.822 735.953 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 147.686 null ] >>
endobj
938 0 obj
-<< /D [ 931 0 R /XYZ 79.822 724.994 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 136.727 null ] >>
endobj
939 0 obj
-<< /D [ 931 0 R /XYZ 79.822 664.222 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 125.768 null ] >>
endobj
940 0 obj
-<< /D [ 931 0 R /XYZ 79.822 653.263 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 114.809 null ] >>
endobj
941 0 obj
-<< /D [ 931 0 R /XYZ 79.822 642.304 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 103.851 null ] >>
endobj
942 0 obj
-<< /D [ 931 0 R /XYZ 79.822 631.345 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 92.892 null ] >>
endobj
943 0 obj
-<< /D [ 931 0 R /XYZ 79.822 620.386 null ] >>
-endobj
-944 0 obj
-<< /D [ 931 0 R /XYZ 79.822 609.427 null ] >>
+<< /D [ 901 0 R /XYZ 79.822 81.933 null ] >>
endobj
-945 0 obj
-<< /D [ 931 0 R /XYZ 79.822 598.468 null ] >>
+900 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
946 0 obj
-<< /D [ 931 0 R /XYZ 79.822 587.509 null ] >>
+<< /Filter /FlateDecode /Length 2441 >>
+stream
+xÚí[Érä6 ½û+ú†C‚{•ËUÖÈ=U9û–Ê59åÿ¯áŠå6Ù¶'9ä [­V¿üuá—Ÿœéxþþ|Ø^¾_µ¿(æpyýóA„‡øE\œfàôÅÁ¸—׿/¿?rn¶p¨p<?ýñúÛ/4¿_º8æ‘®%"¤fÚJ"‡ÇÏŸ¾iÐ宼†Ãr®ÂSÊå±¾ßcZs&8P¦¥Ÿc (°éíïW¡/>¼FµoYϤ½Ø0aa ¾£~p®Å¸pnÃT`ú&¥L¿òU xE„gá¼áI@Ôg´zú–^Ӣ܎øì™TüñŠ„få•z7`¬¶|²‰¯^©‹z}Ñø÷üÜÁûçðåòSQÊQöåê–Ÿ‹Z!7d …(²óÉ,èx”ɃG&•‡ ¿×•eetsÊ( ³ÚR*h#‘õÈ¢õ’­JË‚Y#~‡eEÜÓ“>£­UAü¥¥¶<IÁÃ;¸ ½fq=0«l¬üÀ†ZòV„
+z«¨QytÁ:âŸÔƒçëÖåßjÏèf%C9œÉ
+èx,³ò(Ïee6Ÿ@Vz*ºj@¯ ¿ÈÉ—K„›H|Ó"´$¸øÌçð ×MR†{JSÌfVèz*w¨(ÈpÏ l<¯±ÑSIþ´Á>aË[÷{á?–§!$ ³§Ó˜ÍWÊ"ƒP™ªH)ï˜àÕ7«®Æs”OÊ"³–QrÔ<
+/÷ÔJnU»°•JЖ€2ôõ‡‚OZûûçqOù©¯ÙèÚ]JÂÊ•Ìuýe±<ðv±j­ò„Ǫò)§Ry…*Ÿ[Zñ*Ɇ¶ÃÕøz[©ÿÂr€4ïyÅdu˜ØmGöƒu¼Þs± P bˆƒ³ym±NB¥dAïX§vmÅ«‘ñ7¥TÑ,}h!&
+€)é)$‹µFBå6„`êÌsžôlÚñ #‚j”cdÓ¼ÛvCtýQJ˜®ŽŠö˜nZœŽŠoƤÜ*ÿõFÂÃc ¨,f×=¥qB¨¬k„tžéf%XؘÍöK“ŠPiËg *D®.¹ïmV.ÁéÈýH÷¢ër\Cö©\q,µÔÇêGÒ:fš•0ŠâyM=•QDÇùá¾á”(ú‘þâ0–™f \D1»jCQôT>#q6î¿“<Km˜iVè’[ò`„ÊmýiÓ?4mtÇŸaâwhJͶYߣѮõ¿ •õ:ª”ŠY3DöÅþ7¡ñ‹…t¬eêåÝ$sÜ*"—ÒBåt07XólòU’ýžÈÙ>Œ’X®2Çs¾K¢S›MÊJ¡‹PYÇ<g^ec±K¨ÐzÛ™3šÛ%ñk\„Ź·’‚°ØU&Tª• o}
+”€YÛÄÛ‘øH8JÁsûd°¹I Çg{d°¾šR/Óòr_JhϘ˜ÉJ·A~@©L5E?íÆ/%J›OyÚ.Ñü±$d- ¼ÙBžžÀ@’ý ^Õ:oyÅpóö1‡ü<Vmt¤_u{¤Ï
+•‘GwƒN-IšÒxÕêôÝØú±s­ À48ŠÖIs q© £Ì»™w-ž<Ç®ÅÓΩ6U+ƵÝuú¦6uîØhî±Ï÷Þá Í‘hpf/¸`Rà£
+endstream
+endobj
+945 0 obj
+<< /Type /Page /Contents 946 0 R /Resources 944 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1000 0 R >>
endobj
947 0 obj
-<< /D [ 931 0 R /XYZ 79.822 576.55 null ] >>
+<< /D [ 945 0 R /XYZ 78.37 808.885 null ] >>
endobj
948 0 obj
-<< /D [ 931 0 R /XYZ 79.822 565.591 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 768.829 null ] >>
endobj
949 0 obj
-<< /D [ 931 0 R /XYZ 79.822 536.7 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 757.87 null ] >>
endobj
950 0 obj
-<< /D [ 931 0 R /XYZ 79.822 525.741 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 729.015 null ] >>
endobj
951 0 obj
-<< /D [ 931 0 R /XYZ 79.822 514.782 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 718.056 null ] >>
endobj
952 0 obj
-<< /D [ 931 0 R /XYZ 79.822 503.823 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 707.097 null ] >>
endobj
953 0 obj
-<< /D [ 931 0 R /XYZ 79.822 492.864 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 696.138 null ] >>
endobj
954 0 obj
-<< /D [ 931 0 R /XYZ 79.822 481.905 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 685.179 null ] >>
endobj
955 0 obj
-<< /D [ 931 0 R /XYZ 79.822 470.946 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 674.22 null ] >>
endobj
956 0 obj
-<< /D [ 931 0 R /XYZ 79.822 459.987 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 663.261 null ] >>
endobj
957 0 obj
-<< /D [ 931 0 R /XYZ 79.822 449.029 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 652.302 null ] >>
endobj
958 0 obj
-<< /D [ 931 0 R /XYZ 79.822 438.07 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 641.344 null ] >>
endobj
959 0 obj
-<< /D [ 931 0 R /XYZ 79.822 427.111 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 630.385 null ] >>
endobj
960 0 obj
-<< /D [ 931 0 R /XYZ 79.822 416.152 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 619.426 null ] >>
endobj
961 0 obj
-<< /D [ 931 0 R /XYZ 79.822 405.193 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 608.467 null ] >>
endobj
962 0 obj
-<< /D [ 931 0 R /XYZ 79.822 394.234 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 597.508 null ] >>
endobj
963 0 obj
-<< /D [ 931 0 R /XYZ 79.822 383.275 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 586.549 null ] >>
endobj
964 0 obj
-<< /D [ 931 0 R /XYZ 79.822 372.316 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 575.59 null ] >>
endobj
965 0 obj
-<< /D [ 931 0 R /XYZ 79.822 361.357 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 564.631 null ] >>
endobj
966 0 obj
-<< /D [ 931 0 R /XYZ 79.822 350.398 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 553.672 null ] >>
endobj
967 0 obj
-<< /D [ 931 0 R /XYZ 79.822 339.44 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 542.713 null ] >>
endobj
968 0 obj
-<< /D [ 931 0 R /XYZ 79.822 328.481 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 531.755 null ] >>
endobj
969 0 obj
-<< /D [ 931 0 R /XYZ 79.822 299.589 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 520.796 null ] >>
endobj
970 0 obj
-<< /D [ 931 0 R /XYZ 79.822 288.63 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 491.94 null ] >>
endobj
971 0 obj
-<< /D [ 931 0 R /XYZ 79.822 259.738 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 480.981 null ] >>
endobj
972 0 obj
-<< /D [ 931 0 R /XYZ 79.822 248.78 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 452.125 null ] >>
endobj
973 0 obj
-<< /D [ 931 0 R /XYZ 79.822 237.821 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 441.167 null ] >>
endobj
974 0 obj
-<< /D [ 931 0 R /XYZ 79.822 226.862 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 430.208 null ] >>
endobj
975 0 obj
-<< /D [ 931 0 R /XYZ 79.822 215.903 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 419.249 null ] >>
endobj
976 0 obj
-<< /D [ 931 0 R /XYZ 79.822 204.944 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 408.29 null ] >>
endobj
977 0 obj
-<< /D [ 931 0 R /XYZ 79.822 193.985 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 397.331 null ] >>
endobj
978 0 obj
-<< /D [ 931 0 R /XYZ 79.822 183.026 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 386.372 null ] >>
endobj
979 0 obj
-<< /D [ 931 0 R /XYZ 79.822 172.067 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 375.413 null ] >>
endobj
980 0 obj
-<< /D [ 931 0 R /XYZ 79.822 161.108 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 364.454 null ] >>
endobj
981 0 obj
-<< /D [ 931 0 R /XYZ 79.822 150.149 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 353.495 null ] >>
endobj
982 0 obj
-<< /D [ 931 0 R /XYZ 79.822 139.19 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 342.536 null ] >>
endobj
983 0 obj
-<< /D [ 931 0 R /XYZ 79.822 128.232 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 331.578 null ] >>
endobj
984 0 obj
-<< /D [ 931 0 R /XYZ 79.822 117.273 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 320.619 null ] >>
endobj
985 0 obj
-<< /D [ 931 0 R /XYZ 79.822 106.314 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 309.66 null ] >>
endobj
986 0 obj
-<< /D [ 931 0 R /XYZ 79.822 95.355 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 298.701 null ] >>
endobj
987 0 obj
-<< /D [ 931 0 R /XYZ 79.822 84.396 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 287.742 null ] >>
endobj
-930 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-992 0 obj
-<< /Filter /FlateDecode /Length 2848 >>
-stream
-xÚÕ[¹n\;Íõý¦IW@àv» ¼p l0é¼h’ùÿàq+.EöÕeË~ƒ ZjÝ¥ÈÚOUQüòç…_~¾p¦ã·ðóçËõýåë]û‹bÞ —÷¿ˆð¿ˆ‹ÓL:}±F0nÄåý?—¾rn¾…Ï•s-ßþõþÇ /4¿Þº8æבÜ0á-¥b%ç*|ä=PóœÃýí‹–:Ü‘*Üqáêð]äOü>¿Qž¹çëêš÷Óñöcš3Á%eÌ\O1& 0‚R‘v{à™P0mãÛ¹mhÅ”0”J”¢‰R1Y:Z)ò ¹ðw¸œ¤˜$Vß³Ôeü}«º0øMñ^?Å [¨BÑIü®Q·¼ÔQ¼ž¨_i:í嚟Š{IoÕUêû•Ž‰ 9"\ð{©¬D€ìBÇrr|æS¬ï2,,“RO »s +ÍÂ.(•'äÜ^3µ>· ‚†•”Êþ6Œ× ¸¶¡ÎmCfµ¥T¢ò¢Ù”}ä‘ߤ˜é’&Ê•ä“þyÛ6N1P~R5ì17R‰ÌÁµÙn´k ѶÕ-Û¶ü¾½] ¦Ýª{»ˆ¤(ç›+ÅGMÄ¿ãf“;ñ•ó%I†‰Nߊ÷Ta5^Ôðotïñ’k‹c«#»m±ÉŒé5|ìÉÅmО¤TŠ1}½ }ñá-iTÿ–õ ‚,A3 5s)‘C0†×–b£Qƒæ¯Y,ЋcÚÀ'0‘ä8ˆWµÎÉî˜nÞ¤}Í)?¯¯‰a*Jî%ʼ#1ñ·¤ƒûÒᇌ¼hµ|W™²‡ð¼5EVV­dR2-•ÖÀI´dÂèIæçQ²Éç|å±Ë*Éë*Oé9ÞË8ÒûèMm*ﲬ0Ê>ßû`‰GbE˜¶†ÊA]Õ€„W žo_¤+jÅëªI¥Ç,Óº7Šd|‡
-Ö0o=ݘª^}¨(á%3W:lH)Þ{Iæ¢ð•¬ÞãÕÑŠÖr˜äŸÕ™f²ÈôDÞfM¦*‹Æ“~Ó_â;RÃ^mO·UŠ´å°j
-‘=OÄ~ÀÓÇb›=ˆ­BMdü¼ùs[cà&>õd¡v“ÛŠz#‘ÿ¨×E>l4Ý[¸ß ÐÖ{*AØk>*ÒœˆÊ  ¾¥OmJ_-EÅ[´]ž,Ab¸bìT§4Aæ'ñ‡|EÝZºÅtŒ®ŸXù–Si“"lõÖ²+ì
-˜¯°ï–âfXÿoÙ ã”SŒ7 ©ÅéƒÈ…Q;íÖ qÚaŒl°)ÉüŠOD8Ü
-fHÐßÁfJ ðšîRš¥`ÁV•-åKŠ*y®Ö"ÊþÁ`»àÐ ˆH
-ÍÑL-åtåAw¯¬U¢Ä¡#…Â\†¢–põ¨ÃßË÷˜$(`ŠS²:6cS¼É|Òx“®Žñ&‹ˆ¾*¸Ô ¯Äú˜ÔÞ®±ˆŠûË9EŒ¦LœŒEšèÛ],Z$ƒ 6©[±:ƒñƒ¤3ð>Q·x|”ZúšÝò:° ™ëú§cŒ Ür=¡S½cF* DÞÛ࣋Cä(s~‰UeùmÜEVãl;@ÙOMìË7¸}4{Ò;wT"Bå¡Ì¤µ5•&Tˆ ‰ràz&ü"qüT»?ºV<ÔÐ|RÄæèšP©ùw»ëòÉŽË&óJ¥,eþì$¼X!¡RŠ®m8ΔªgðçÏqé ¥ò•÷d€·ßسú ¦‚³"4rJU%!«[Î#£"eêªÑ¯ >·Zoz©"sÓf¹X–¹®ÑCæO!Ô¶ÀÞ–7è ƒ»n ˆ5a×:ø\3c•ê¸z€ë(=BJœ¯(%<Acx_É•Xa¥±Œ¾Û8™Å©— @=û°{s»|ï®ÆTZË¡hÁ´†0é Åa±"}αÉßQüüå?;ïLCWÈgˆHŸº©”óŽ¾%[±ªÈ˜e¹¶ÌI©,Î|¶‰{x2˜•ÉS° À23žjŠaéä(°*cF\¨ÉÑó<ìÓYrr–ç³&„Ðo&ÉœZ`Þˆ<± ¡™Ï+¥]|Ûj*§JWésíìÌ0VàòpøÁtWƒJŸök+u×Eìl‡þDE(¡>•„\’%6ú€‹>Äñ:¬|Í&k äxV"S¨yĶÙ{=ßwí¥Zs—…¥´y z})‚Õ\­k­±™‡Wk7®ÒI=¥Õ´XZÃœ­˜HĦ sK*ñβ4wsiž.¥f¾’yëØF–\iäâÁŠ²4–ôC§ÒMýwØqgû!6¸h*ˆG%Æ
-WU´ì?8Ц˜EWJ½Úç6·ˆŠP&Ö«­&ûÍ¢MZh‡Cª&Ð@²ª–‚ U·q‹–1‚^;\C;ÍÏe3©9óVÑhyrÀRFT„Èß7¢:yŸ;Ŷz’ŠÛÊ!„Ê~$¥gA¯S*ÛëÐ*Rõ>ô+ªÎÎ#×þu¶Ö^{mÚê‡ýã
-Ǹ·“
-álS…0R!M!™›A8nŠjÙ‚«¹ï erLõ¹p¼/.
-endstream
+988 0 obj
+<< /D [ 945 0 R /XYZ 79.822 276.783 null ] >>
endobj
-991 0 obj
-<< /Type /Page /Contents 992 0 R /Resources 990 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1026 0 R /Annots 1027 0 R >>
+989 0 obj
+<< /D [ 945 0 R /XYZ 79.822 265.824 null ] >>
endobj
-1027 0 obj
-[ 988 0 R 989 0 R ]
+990 0 obj
+<< /D [ 945 0 R /XYZ 79.822 254.865 null ] >>
endobj
-988 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 130.17 348.109 144.894 360.065 ]/A << /S /GoTo /D (subsection.0.8.2) >> >>
+991 0 obj
+<< /D [ 945 0 R /XYZ 79.822 243.906 null ] >>
endobj
-989 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 160.615 348.109 172.571 360.065 ]/A << /S /GoTo /D (subsection.0.8.2) >> >>
+992 0 obj
+<< /D [ 945 0 R /XYZ 79.822 232.947 null ] >>
endobj
993 0 obj
-<< /D [ 991 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 221.988 null ] >>
endobj
994 0 obj
-<< /D [ 991 0 R /XYZ 79.822 768.829 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 211.03 null ] >>
endobj
995 0 obj
-<< /D [ 991 0 R /XYZ 79.822 757.87 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 200.071 null ] >>
endobj
996 0 obj
-<< /D [ 991 0 R /XYZ 79.822 746.912 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 189.112 null ] >>
endobj
997 0 obj
-<< /D [ 991 0 R /XYZ 79.822 735.953 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 178.153 null ] >>
endobj
998 0 obj
-<< /D [ 991 0 R /XYZ 79.822 724.994 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 167.194 null ] >>
endobj
999 0 obj
-<< /D [ 991 0 R /XYZ 79.822 714.035 null ] >>
+<< /D [ 945 0 R /XYZ 79.822 78.635 null ] >>
endobj
-1000 0 obj
-<< /D [ 991 0 R /XYZ 79.822 703.076 null ] >>
+944 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-1001 0 obj
-<< /D [ 991 0 R /XYZ 79.822 692.117 null ] >>
+1005 0 obj
+<< /Filter /FlateDecode /Length 3019 >>
+stream
+xÚÅ[ÉŽ9½×WäX–¨(PYé4ÐÇoƒ¹NŸæ2ÿhQ»¨ˆ¨PVºûvT,”D‘”Ä/^øåç g¯Â¿?_®¿^¾ßµ¿(æpùõß^âqqšÓkãF\~ýïòïWÎÍ{ø]9—îí?¿þxáYæ÷»SǼ1ÒõB·L* RÀ¼}Ó ñJqnyø?ÈÔ"Èµé§ ün¡­á®eøÞû÷?Ò3uë¥(—ßo)”î‰to[úÖ× Ò¯ñ^éGl?ܳîÁ=µ$ïù»{~÷Z¥Ú¨¡ïw¡/>hŒê5c=“öb¥bÂ@Õ®K%¼}“R¾¶±—`_à^žâÝ8Fè¿Á~˜&ÁS™Û_áÈÒ{I7{_+óî5½gM£U[cLiEG9ëðPSàó ©2Ê[§«{?&µ•Ý1á—Z½}«Cᇨ&åª8þ¦Ík¹› BŽT 
+ÔÙù:GþÌ‹3Šz±Ñ§¼ØÛ0Ž
+A·A=˜ÝÿF4<™mTyÖk½¾7wÆwG‡ì1Jº5É=8‡*†öÑKW¡] ËäžÖ“ÕŽRÀœÀã“¢b§4Ù¦yV=¢â m—G‹ûšlŒ}íã:*2½áˆ?¤;¨Àˆ>¿Ï›+¤76|8?I“q {@Õí¯RŸ³?Â}Ž$nûykhVúGõ€½énpä,£<Å~Æ»öÿáì“ÙvÀ¤6ÕÕ³^ö« vì­pÚŒÌ1±èüZÞÐ:÷pˆ) /)‚Fi»Iè_Ä!¸-^ÞBI
+_C9 !{tpH¢–2éV:†i%è×ö6)ë“ ×#%^ƒ¬’ŽF!½cÖL£Ø#'HÆaÔ°6à´›LÉ<9ŒqLq7ñ?y÷ÂXm©8
+Õ‡faÕÓ;Íòª´ú…! ¿ÂÍŒ–L™îb˜ 7p‚s¥™„*1ÐáÝŠ!"÷_Ÿ§@sk4§ÔsŒoï ê™zä¶2J:’
+Á;Uœ‰ël‚½~Ÿ`’RÉÃHëˆ@oÒ8)ÞÄ»#Þ$QÂW‡0Þ„õ˜Ô¾®XDÕ}ÈåœdŽk:ˆ“X¤¹dÂJúu‡EÁ@ ¦¹¯Î7“ñƒ 3x¨…–ŒÞÉày#% Aóè߉º c €|—eŒQ?Ö0f”IdµÎ‘,ÈÁ³•¬2ÿoÜŒ"Q&Á,;PÙ/`•-Wr@¼'zçÊ”¥.‡) ?ëÏM ˜`ë@¥E’É‘×3àIêø‡¦6ž•‰àœâï-9룔—«._¬¸,^;Ïìl…æºd…DJNºVºa}SzêÆû¹nHÍ´3TÊ.ò™IP¼ýÆšÕçlH‚_epV¼9Y²Ê[-V
+|ÔyG¿‚–¬ªJdÚsdP)±.ô¾Ý® „.˜ÕÉC´I`ñ|‚%y2F+ÍÂ\S)cDܨÉÑÑ_Ÿ%'gy<jjÏ”™TãÖÇ(ånžÙ)p襢!‘r*yUÎ2îÜæ‡ Wî
+AG@'”
+&/©|Z±­Ò]‡ÙÉ>KýFjt”>%…qhU±×¦•ú$=ÈqYò³:îJù¯Ù’¯P¥ˆ"¡F[¢Nù&Cô}ŠQ(·U$lj›7Øë“‘’ÏÕÌ6ÊËyånÍáÆV:­ÇÀá6`YÙ kY!H`YйM)ød39wsroÅr> á¼ÕlqH.—rS5Ö”¦KR?Ô*ÝTq‡w¶"bƒ{IM±—dl1«Ê—ýqL׊)©hK±úA+ÝæÖ(QVÊ4ôj«Ñ~“jã,Ø׎9ßHšªM) U·qEb<‹ÕAi­ù±x¦BP„™ì«•5ªQÆß·Du
+dr)‚)ë‚ HLYèb…†HÕ{Ð3²Îηüël«ýìjÓZ?¬¯(0¨ À@¯@éÏ×SŠG)ÏS ²±3
+¤­©¬¸ý$õ(}x²u»úÊT"½¦SµXq!Rp0qnšF*|4ô$iÍÆ[<É›ƒØøº©,«Zz Œ†ªúl}'«šH¡ªV™¹Å#²¡ë¸(rcóUÕÇŒH´eí……&þS¾Á"dJü•„¬q÷§¨UFO²ÏŠ#pÏÂlÐÖ*Ž#IK\-àÆd¦ÂP|w+œVò¢ãä%\—üE^»µÝøæÄZãÝ‘µ¦Fï…€g^ZøPê>ÝK”„ƒ¢M‹.QJK³fäe”Ìá¶Á»¤Áåp;ìZ_«yIZ?ºöM¿*Ú/[Ž· àf‹±…‚ìãv¬2Ï)ÃÙoíQ)µdÚù NÞ—²~"åxÑb2êÝ"È¢»=Ž©
+˜‘TrmáfBjBjAeµeȨ¡a«¹¯å‚Ô°Dø¯+K
+fFzµµ¶»•H9ú¼Ành n5‰õQQ¼9í=°½—çübüh9ÇaPÑÞœÎnŽ·/–C8 Ò)NAÝZƒíÀµ•D$ÒÓŠb5U»—GÃV,m_;jBe§¸¼[ÔwÀ
+•§ý^=¡wÌÁ”à­í°%BþÙòÅ6"?VÆ€`ÎL9ÕâîY"e½Œ&HçS¾±¸™H9Ì7ò:e·û˜ƒ”ü¹<¹s·´×oH!9Êþ¶¶ê;˪ÑÁ•£ª9[áɼHy`†"ŽŒί“ä¥v"åLòý0ç0Ï*4lÜë€#?[v(#„ <þÝ­CϺô³š/V%좄UÅA „ĹóU„¢¹QÊÓÅ®—ƒ3U…¹dË"¼Ñ˜ -ÒÐ5–ߪ¢æÄX¿*ZËŒˆ”L÷@êÉÆ“"e.íhösÔ\ðÀ„WÓ€Öò"åTþ LèAW¥t[§¼Zà rARù”0”ßÂ\Î…Oy…`’kÚÂéêEÏXKê=¬—–Á•ÅÅô-Û®7„Ç\ÜP̘ÏÂoÄzÏpÖ¢´áì&Ûú•mÄ«ÌV¡ßpýüLÇ´ÈëÓJÇélõ¢4uŽu(5ÆvÜÞöÁ<Xa:=GÏÑÿ¾­×=I»I^€}k QÔÄeîЕœ0[3}² @26†ÉKúo?³÷´îKÈl³lÂ|¤·Þ(°So7í,¨Q)5šã±Rðt9?Ýi»8>=V* Ö¶%m³DàʧMÚc1;g¾Ÿïáµ–­¸;d»;fW˜]N¤æ îý»Òƒ¸EÅä‚lþŠžŽóý*þ®òN¢Hz{ût]jHoœ†pbÓ:Â,X»©„²;Ì|¾5B…Œ×¦N¤hS‡ví
+òf0=Þdƒ}
+ÉT—3t¤¶ì¦hFNzei·ÎPìÃûgçÆЮàGÊÝZý¤†Ážƒv>Ž¯,TG[=§eÉ Yë$Éì¹³—L›Þ›ý1ÏÃøу0>–EÆêJZ¯õÅâÕ°ªÛ+œžÒc Ê®_ßè#Óxr´•ÄÒüÄ:˜j}PÓqÝbÝ…©´þUþ:|ݯ½¤;øÎptý“BRœ9¯6&Ëò†úø,ú~ÀW"ÄtÓÞZ#é¾éÊN0ÓÎ;Í+M…ø”5‡neŠì ‹«ùZç¥{á Po£MˆÌÌ·ýLÝ"ô_/±».
+endstream
endobj
-1002 0 obj
-<< /D [ 991 0 R /XYZ 79.822 681.158 null ] >>
+1004 0 obj
+<< /Type /Page /Contents 1005 0 R /Resources 1003 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1000 0 R /Annots 1038 0 R >>
endobj
-1003 0 obj
-<< /D [ 991 0 R /XYZ 79.822 670.199 null ] >>
+1038 0 obj
+[ 1001 0 R 1002 0 R ]
endobj
-1004 0 obj
-<< /D [ 991 0 R /XYZ 79.822 581.532 null ] >>
+1001 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 130.17 546.366 144.894 558.321 ]/A << /S /GoTo /D (subsection.0.8.2) >> >>
endobj
-1005 0 obj
-<< /D [ 991 0 R /XYZ 79.822 570.573 null ] >>
+1002 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 160.615 546.366 172.571 558.321 ]/A << /S /GoTo /D (subsection.0.8.2) >> >>
endobj
1006 0 obj
-<< /D [ 991 0 R /XYZ 79.822 529.726 null ] >>
+<< /D [ 1004 0 R /XYZ 78.37 808.885 null ] >>
endobj
1007 0 obj
-<< /D [ 991 0 R /XYZ 79.822 518.767 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 768.829 null ] >>
endobj
1008 0 obj
-<< /D [ 991 0 R /XYZ 79.822 477.92 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 727.983 null ] >>
endobj
1009 0 obj
-<< /D [ 991 0 R /XYZ 79.822 437.073 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 717.024 null ] >>
endobj
1010 0 obj
-<< /D [ 991 0 R /XYZ 79.822 426.115 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 676.177 null ] >>
endobj
1011 0 obj
-<< /D [ 991 0 R /XYZ 79.822 410.174 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 635.33 null ] >>
endobj
1012 0 obj
-<< /D [ 991 0 R /XYZ 79.822 399.215 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 624.371 null ] >>
endobj
1013 0 obj
-<< /D [ 991 0 R /XYZ 79.822 388.256 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 608.431 null ] >>
endobj
1014 0 obj
-<< /D [ 991 0 R /XYZ 79.822 345.417 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 597.472 null ] >>
endobj
1015 0 obj
-<< /D [ 991 0 R /XYZ 79.822 334.458 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 586.513 null ] >>
endobj
1016 0 obj
-<< /D [ 991 0 R /XYZ 79.822 323.499 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 543.674 null ] >>
endobj
1017 0 obj
-<< /D [ 991 0 R /XYZ 79.822 258.742 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 532.715 null ] >>
endobj
1018 0 obj
-<< /D [ 991 0 R /XYZ 79.822 247.783 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 521.756 null ] >>
endobj
1019 0 obj
-<< /D [ 991 0 R /XYZ 79.822 236.824 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 456.999 null ] >>
endobj
1020 0 obj
-<< /D [ 991 0 R /XYZ 79.822 225.865 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 446.04 null ] >>
endobj
1021 0 obj
-<< /D [ 991 0 R /XYZ 79.822 214.907 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 435.081 null ] >>
endobj
1022 0 obj
-<< /D [ 991 0 R /XYZ 79.822 203.948 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 424.122 null ] >>
endobj
1023 0 obj
-<< /D [ 991 0 R /XYZ 79.822 163.101 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 413.163 null ] >>
endobj
1024 0 obj
-<< /D [ 991 0 R /XYZ 79.822 152.142 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 402.204 null ] >>
endobj
1025 0 obj
-<< /D [ 991 0 R /XYZ 79.822 141.183 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 361.357 null ] >>
endobj
-990 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
+1026 0 obj
+<< /D [ 1004 0 R /XYZ 79.822 350.398 null ] >>
endobj
-1030 0 obj
-<< /Filter /FlateDecode /Length 1816 >>
-stream
-xÚÍZËnë8 Ý÷+òWW"©Phšä³în0Û™Õüÿv$Y²%*Éi/fá&±Õcêˆ"iËÃ?yøõrü|ùyQúà…7`èðù÷‹
-äA¬hÖ(!:|þ{øóUJã¤ÄK8àíhΠ•R+)É-‡Vo`Ãy áw<NaÌ1ŽÖá,óèãr¨e\Þþúü#Øbéš-Êirk€Â¡–Ãœ+t·|Î¥;dôë3
-è8ú:ƒ4³2ßhq¼O<0\ÕÁãËUÀðͽæÛûHV¹´ü*ÔEŠ
-=–«Ñ\sZ ãïx=Mçt—t
-O™2\è,2¦‹¿ }¼ýfŠ´D¦¦Èè˜*§ö7CÙáäd•ÀÌ(ùdÔŒ¥r´ûÌ>Ž›óB#48>!sœÊk e‡R CÔ™1%>)1Á¢Þ¿V|ÔÈ©&€í|Ìr¡= ã4çbRj0”ùT¦
- ÝŽ›Ô %‡"Øs
-´ eÇ&Ð2T¬¾Ûs¢†¡|OÌNCáÝÍbT_Ä&ˆT ä±­¢âš“¸Ïs¿%E<}“ÃÏ.r±)Q K˜²
--Ê—V![ZàfŒJM‚”á(Elâ±Ê©Q{Ó´y!IEܼQARÌkQRÂÆŬ¢­êZ·¤ùÇѶ45‹hX
-ŒM4¤ñÍÄ’æ.‹ÓE³r;ß M÷(È!µî¨{Ÿ¢Ž¡
-¿"ÁÊ]çÔz*j2”y=B(ß™1ªG” Ce‡¤ôNS¥A ²Ãé:äV ʉ\¬1ßØ)ÆMY¥ðc®'ú"
-š~Èt˜Â0]‚¶µƒãI?¯C™OúèLp@ÃÍMú¹¶a(‰ÙK–L°oeݶ'/›žµó¦Û ¢¥å¦
-‚\ 0”V½Æ6w Ʊ]vóÎ`{¦D½Ât›¤Q˃ó‚_ZñÅmÓ½Í6ö–"f½Ì'ZDhHhrݼÏ-@‹²Ã…5†bÊs3F~.ÅʵÕ/Ìך¥4NëF*–%¾y–<3%a°›‘›Jm-È^Q cU·¼zJ0”f€VAgÆ`‚ ùÝ…ªˆ¡¤vÚžR%9××Ú²‘´[~üoÝòú‹‚Ã,aÒ‡ Ü{Î֢܊LëÄN[hOßKhgá¾$PkÒËþj L·1À;a=ñ)ö1²«2”yæÁÙÀ]“Óã£{;Wz0”"ûcl'Ø"MŒN«ûf§«Wb« ®ç¬òrA×Åã]Žû¬ÎZ>ýÉC)»gmÁTÚ¯y" [,^Vt>lI­%É7z+¦ 2Zxå8A£Š%ïL†²¬(­žòöC½~Ÿ·l¯ôtÞ²ßoÂÊ{í;ZÞ§ÒCÙaFû˜)š0©!€žl,]í–VÚysxFû]o.Ì’„($©Ž¨9iÂPæE
-°3oN³0”,I)”é½zP Øø6P‡Rú~å¶úm‹ºW^ºxk!^VܨŸ®vôoøþ-eq¯Û¿ÝM]öÇ*å¼
-endstream
+1027 0 obj
+<< /D [ 1004 0 R /XYZ 79.822 339.44 null ] >>
+endobj
+1028 0 obj
+<< /D [ 1004 0 R /XYZ 79.822 298.593 null ] >>
endobj
1029 0 obj
-<< /Type /Page /Contents 1030 0 R /Resources 1028 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1026 0 R >>
+<< /D [ 1004 0 R /XYZ 79.822 287.634 null ] >>
+endobj
+1030 0 obj
+<< /D [ 1004 0 R /XYZ 79.822 276.675 null ] >>
endobj
1031 0 obj
-<< /D [ 1029 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 265.716 null ] >>
endobj
1032 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 742.926 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 254.757 null ] >>
endobj
1033 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 731.968 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 243.798 null ] >>
endobj
1034 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 721.009 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 232.839 null ] >>
endobj
1035 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 710.05 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 221.88 null ] >>
endobj
1036 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 699.091 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 210.921 null ] >>
endobj
1037 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 688.132 null ] >>
+<< /D [ 1004 0 R /XYZ 79.822 199.963 null ] >>
endobj
-1038 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 677.173 null ] >>
+1003 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-1039 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 666.214 null ] >>
+1041 0 obj
+<< /Filter /FlateDecode /Length 2498 >>
+stream
+xÚÍZÉnk9Ýç+üÑ“Hj‚
+˜øö¯/¥OžßCí[Ö ´'‹$@¹òŽUïßÂ4Þ_‘Ô[RWQ“ºäɺpÞ²â¾Òãóx–öÆSÄóç¥F ŠÅsRj§àA©ñZþ½´?3
+¥‘ŸæÅ@³áêäé¹øö=C ç…Õ8)yXp’e0W
+~;³F¾s’¸õÙ’Å‚œf“odz
+Ëí<± ¢:®eHhÖ"¶*ÎÓ˜]Ó8düæNæ}Óš»s9r<
+G)4“5Ó3€ü€E¬Nƒ6Ô8 s>6 Ò‚%Q›QLHxÃH˜Ïï¼ö»f8»ÃÏ:Á¤Éä5°£F/)¹”aã$œ•j^ŒWÆÜåJîÊwË·)‹á~kq*\1¦ Ä‘bÉU)•T´·Ü[ÎH‰]ü4ÉU8,Ö¬—3djùDØfŠ„“u¬Yw²)tHrv
+x0`ifRÊŒ(Ñ »¬y\Ó²xÎð
+ïÅ!»…ëÛ÷lê44sárßÄ< ëÍ(…6U7ÕIJFTÃ3¬Š¼k9bÁÛ½)/x*yà²'‘×Ô¯$ °,‹öØ;¢´;¸ìÂ\‡ò00 ó\‹‚<W”ÆNT„–¨È€ò7ÙÛʴؘ€Oäצգü¿ÓŸ'¤dQšz#GUE]=ÊÛ}¢­¤­°f£½ê\™z$ d» ½¸å„–—ÆQÉ2È9M(›|uïE7Lv«‚ ]Ùžo3íµ¾#R$Z¹k‘ž‹É;‚Gν\*õ;Kú­ºiW Ägç"=M¨ß¢†Ö¶Û"t.KR\¾¼¿UPïÆ··'BdŽí‡“½+å܉&.Ú]íguâÃ’øøPüˆwnZêÛ®X¿qAã6R;`¿ W’ªÙÞKš€ÛËÞï
+Ö•öè‡Uu&9¨F}¥ŒE_=Ê­ÈTÏXõUž¹öuáöLN ÖÔÓ‡m)G§Õ)“ÖÂ4å5CíQžÐ<:.¤pcq³z@)Í®XB4!:mæ›®]‰Ú7ÜÏYÖ§c…¬¤b€Ë>ox`¹$¤iúk›áJñž±Ðö·™Ïù„ûÁÀ
+ïLJj¶FÜ瞯Öë½Ë
+bºä¼žÌT¯yf’V”6KyŠ¿ÉZÐÝ´–çíFjáÑLj¡µl×£¬‹¡<ß³n2ß51 <×.ß=÷Õp@º­pÀýÖúª²B­¨¦¤¼ÈP”uj ,
+ÙY}.”äï_΀PRÒ-—å i%Td>ˆq”°r€&”²)˺8K‰×‹¦]Û»¼QEížL¼aù·øÅ|j±‰NÛhêëùˆ¥H
+åpRéÇšJ{”®œ,ý”ˆ«,\U x@£JŽrŸbì=Êb('ÀèI ·—z”'Äý™90-ö&”u1¼Hv’b­@ïAî5H8ÙÓ¶Åÿ°?´×—Ze=ȃ8Ä£æÄÚ$sô›~¿ü?5Âi
+endstream
endobj
1040 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 655.255 null ] >>
-endobj
-1041 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 644.296 null ] >>
+<< /Type /Page /Contents 1041 0 R /Resources 1039 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1000 0 R >>
endobj
1042 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 613.412 null ] >>
+<< /D [ 1040 0 R /XYZ 78.37 808.885 null ] >>
endobj
1043 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 602.453 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 768.829 null ] >>
endobj
1044 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 591.494 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 757.87 null ] >>
endobj
1045 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 580.535 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 716.61 null ] >>
endobj
1046 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 569.577 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 676.816 null ] >>
endobj
1047 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 558.618 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 665.857 null ] >>
endobj
1048 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 547.659 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 654.898 null ] >>
endobj
1049 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 536.7 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 643.939 null ] >>
endobj
1050 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 525.741 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 616.101 null ] >>
endobj
1051 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 514.782 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 605.142 null ] >>
endobj
1052 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 503.823 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 594.183 null ] >>
endobj
1053 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 492.864 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 583.224 null ] >>
endobj
1054 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 481.905 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 503.335 null ] >>
endobj
1055 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 470.946 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 492.376 null ] >>
endobj
1056 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 459.987 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 481.417 null ] >>
endobj
1057 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 449.029 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 428.202 null ] >>
endobj
1058 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 416.152 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 417.243 null ] >>
endobj
1059 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 405.193 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 406.284 null ] >>
endobj
1060 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 394.234 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 367.13 null ] >>
endobj
1061 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 383.275 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 356.171 null ] >>
endobj
1062 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 372.316 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 345.212 null ] >>
endobj
1063 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 361.357 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 334.253 null ] >>
endobj
1064 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 350.398 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 323.294 null ] >>
endobj
1065 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 339.44 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 312.335 null ] >>
endobj
1066 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 328.481 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 301.376 null ] >>
endobj
1067 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 317.522 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 290.417 null ] >>
endobj
1068 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 306.563 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 279.458 null ] >>
endobj
1069 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 295.604 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 268.499 null ] >>
endobj
1070 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 284.645 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 257.541 null ] >>
endobj
1071 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 273.686 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 246.582 null ] >>
endobj
1072 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 262.727 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 235.623 null ] >>
endobj
1073 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 251.768 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 224.664 null ] >>
endobj
1074 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 240.809 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 213.705 null ] >>
endobj
1075 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 229.851 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 202.746 null ] >>
endobj
1076 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 218.892 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 191.787 null ] >>
endobj
1077 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 207.933 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 180.828 null ] >>
endobj
1078 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 196.974 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 169.869 null ] >>
endobj
1079 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 186.015 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 158.91 null ] >>
endobj
1080 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 175.056 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 147.952 null ] >>
endobj
1081 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 164.097 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 136.993 null ] >>
endobj
1082 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 153.138 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 126.034 null ] >>
endobj
1083 0 obj
-<< /D [ 1029 0 R /XYZ 79.822 142.179 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 115.075 null ] >>
endobj
-1028 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-1086 0 obj
-<< /Filter /FlateDecode /Length 1621 >>
-stream
-xÚå[Ërê8Ýç+ü·#u·ZRÕTªBnÕ¬³›šíÌjþ;’m%q äÞŒ}Ü:ý:’3ü;˜áçÃæýáq‹8Dˆ‚ÂÃû?6ý`;øä/ŒØáý¿á¯?ŒqhŒé=#›éâÓkŒÉ?“1œN‘|J:Ưé=ýäx:–+ÇŸþ~ÿóÁ€Ë¶¤¿?“). 1XÂ¥)Á7x
-ÉWl¡8ÙBaš‡ô¸ <„4¡°‰"†“eH“U£ey`o“…”›^ø’¾¿<ýpèæ+ÊYh§×xE˜ÆW®,(’^¼™î27yìóõÕÕ| k¤åCœŠär|ä1²Ì>çéXFÈ\”xðr„»Ëðc,ûŽVñSƒã'[LsäßãìéyD߆3ãÀ†Øå©8«A¾6ÇìËt\pq÷׉KºgZÊøMCYqYÆ
-c$…¯ˆ* èí’¢©“¨(ªA®›‰w›G ‹-oU¼Õ ãˆgK GgÄÕ±¬;Á…Ì^ɼŽç–»ï¬Qó“Ô 9jù‘ŠŸä‚Ð,Æ?su¡Šã PänÜϪq× —íüŽ÷qPü¼S~·Ï#$îø"]ý©AÆÑËÌ,,ÝNÇÈ×#¹ËQðºãOÊ'¥nž¯’Ýõ™É’UÅ&1»ûx5_A‚ëøZ§´­ñ@Œ-J®Ö cÁ£ta¾Nàڤܼó-J©V´Ùûg|_mv^I±ˆ›‰ùâÕÉ‹å âe.äs—µ®t¡)k*ÏsSMúoù§ím­ÚÇoÇf±ƒòéUë
- xñ+XåŠE犔O#IEÀ•RZʬÛÌe÷Dzێ¹¬Ÿ &Í”ƒ ]²Žše¦
-Z’B
-’©Ô·Á¯ÓT ÊéFq¯ëäø:*xmÓ%f;çê–Ó”vcÍá-ˆóï 7h"‚ÐѵVbÌ ºYÛ ï½9bš;VÍyÚ\×¥y‚òífúúhm~ž«%n­ª)AU£ä–’´\ŸËUVZÜf9Uï$àÇ+Ä»3ŽÏoΠÃØÔ7©¥C©}?‰ºÂcAg“‰Ñ€©·R§¢¥"³A¹UR^•È³[&ú¦Þm^ªŽ× \°ã}áŠ3J
-endstream
+1084 0 obj
+<< /D [ 1040 0 R /XYZ 79.822 104.116 null ] >>
endobj
1085 0 obj
-<< /Type /Page /Contents 1086 0 R /Resources 1084 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1026 0 R >>
-endobj
-1087 0 obj
-<< /D [ 1085 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 1040 0 R /XYZ 79.822 93.157 null ] >>
endobj
-225 0 obj
-<< /D [ 1085 0 R /XYZ 79.37 771.024 null ] >>
+1039 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
1088 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 745.834 null ] >>
+<< /Filter /FlateDecode /Length 1664 >>
+stream
+xÚå[Ér7½ë+æܺÊU¢dº*gÝR¹&§üÿ5˜$Ð ééIQö–9$¯<,4ÿƒ~<íÞž¾î‡É£çáíŸ'›?0ƒB
+CðŒ·ÃÛÃ_ãИòßhŒßÍ)}ûb1ãÇd ç¯øñ+ù¿æ¿ù#Çó³ñ³òÜã·¿ßþ|2àF[ò¿?²). )ZÂÚ”è
+ôl{ø;_ŠUò«(
+t¬ofFZ;¶”/ò;(
+dh’$N©SÊçÕ˜#dC)L[{*Š]÷ÚN'2`²ŸÏ:>[”{¦åMÉÜ>}Z"”´*ÏêÊ•g¿TÚÓf꯲^P6Yàö¼”’Z¹ ”ËWÓo©l4À®¯jºA²V9ˆºþêÁúÜžPÒúû—¥L ”GV~&±y°.‚£ É]«[ ¹-Êï Í,p¡Õ´q½¦-iÛ¢¬OÛ÷¦,—Ôå*¶–•+Çk]!¶ä¡Ý¶9Z+_Kp5 ú³h‹¼·ÒŠµ²‘]^á[‰òKT -‘–!˜Îkõb!²Eù”yZâ A`’Ä)÷BÊ{$jB‘;{tgÎ-Èzuî­¾é„KÉšÏöÕ…Ê‹Óh!Šfì¤åm Dï»öº«|-Èéx¨é×½u§~[ŽÙÞù $1Íáùýíé!l±È
+endstream
+endobj
+1087 0 obj
+<< /Type /Page /Contents 1088 0 R /Resources 1086 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1000 0 R >>
endobj
1089 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 734.875 null ] >>
+<< /D [ 1087 0 R /XYZ 78.37 808.885 null ] >>
+endobj
+221 0 obj
+<< /D [ 1087 0 R /XYZ 79.37 771.024 null ] >>
endobj
1090 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 723.916 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 745.834 null ] >>
endobj
1091 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 712.957 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 734.875 null ] >>
endobj
1092 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 701.998 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 723.916 null ] >>
endobj
1093 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 691.039 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 712.957 null ] >>
endobj
1094 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 680.08 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 701.998 null ] >>
endobj
1095 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 669.121 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 691.039 null ] >>
endobj
1096 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 658.162 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 680.08 null ] >>
endobj
1097 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 631.412 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 669.121 null ] >>
endobj
1098 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 620.453 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 658.162 null ] >>
endobj
1099 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 609.494 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 647.204 null ] >>
endobj
1100 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 598.536 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 636.245 null ] >>
endobj
1101 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 587.577 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 609.494 null ] >>
endobj
1102 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 576.618 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 598.536 null ] >>
endobj
1103 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 565.659 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 587.577 null ] >>
endobj
1104 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 554.7 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 576.618 null ] >>
endobj
1105 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 543.741 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 565.659 null ] >>
endobj
1106 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 532.782 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 554.7 null ] >>
endobj
1107 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 506.032 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 543.741 null ] >>
endobj
1108 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 495.073 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 532.782 null ] >>
endobj
1109 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 484.114 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 521.823 null ] >>
endobj
1110 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 473.155 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 510.864 null ] >>
endobj
1111 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 462.196 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 484.114 null ] >>
endobj
1112 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 451.237 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 473.155 null ] >>
endobj
1113 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 440.278 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 462.196 null ] >>
endobj
1114 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 429.32 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 451.237 null ] >>
endobj
1115 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 418.361 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 440.278 null ] >>
endobj
1116 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 407.402 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 429.32 null ] >>
endobj
1117 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 396.443 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 418.361 null ] >>
endobj
1118 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 385.484 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 407.402 null ] >>
endobj
1119 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 374.525 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 396.443 null ] >>
endobj
1120 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 363.566 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 385.484 null ] >>
endobj
1121 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 352.607 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 374.525 null ] >>
endobj
1122 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 341.648 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 363.566 null ] >>
endobj
1123 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 330.689 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 352.607 null ] >>
endobj
1124 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 319.73 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 341.648 null ] >>
endobj
1125 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 308.772 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 330.689 null ] >>
endobj
1126 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 297.813 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 319.73 null ] >>
endobj
1127 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 286.854 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 308.772 null ] >>
endobj
1128 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 275.895 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 297.813 null ] >>
endobj
1129 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 264.936 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 286.854 null ] >>
endobj
1130 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 253.977 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 275.895 null ] >>
endobj
1131 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 243.018 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 264.936 null ] >>
endobj
1132 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 232.059 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 253.977 null ] >>
endobj
1133 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 221.1 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 243.018 null ] >>
endobj
1134 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 210.141 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 232.059 null ] >>
endobj
1135 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 199.183 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 221.1 null ] >>
endobj
1136 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 188.224 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 210.141 null ] >>
endobj
1137 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 177.265 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 199.183 null ] >>
endobj
1138 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 166.306 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 188.224 null ] >>
endobj
1139 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 155.347 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 177.265 null ] >>
endobj
1140 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 144.388 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 166.306 null ] >>
endobj
1141 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 133.429 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 155.347 null ] >>
endobj
1142 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 122.47 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 144.388 null ] >>
endobj
1143 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 111.511 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 133.429 null ] >>
endobj
1144 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 100.552 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 122.47 null ] >>
endobj
1145 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 89.593 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 111.511 null ] >>
endobj
1146 0 obj
-<< /D [ 1085 0 R /XYZ 79.822 78.635 null ] >>
+<< /D [ 1087 0 R /XYZ 79.822 100.552 null ] >>
endobj
-1084 0 obj
+1147 0 obj
+<< /D [ 1087 0 R /XYZ 79.822 89.593 null ] >>
+endobj
+1148 0 obj
+<< /D [ 1087 0 R /XYZ 79.822 78.635 null ] >>
+endobj
+1086 0 obj
<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F22 367 0 R /F59 346 0 R /F84 425 0 R /F15 334 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-1149 0 obj
-<< /Filter /FlateDecode /Length 2057 >>
+1151 0 obj
+<< /Filter /FlateDecode /Length 1989 >>
stream
-xÚÕ[Ër#)¼û+ôÃ@ápÄȶ&bϾmìu÷´ÿ]žÝP´äF–v4Ù­GgSI‘•Ð´<üs‡ŸOR˜xþþ|:~<}?ÐÂ;…pøøûI…Ƀ:8#À™ƒ%%$©ÃÇ¿‡?Ÿ¥D/%™øÿå¯?ždÁü~rúà„'Bׂ(4Â8â( ¥Ô. ½‡c•_ñXCx½åcƒù=…+•?×å¿ çÓ[þ©œð
-&æsÒy.·´‰ú³J²› ¹G¹6äpá®ÏßÕÏé6¡¢J#•Ì\¨=
-ÐË7¦Ý›úGæWlpü¯1 åŒåÜÚ×6üF½fò"p
-ïÃKSƳëÕìÆÑÛ4%à„
-ñrJô>J k,G‰Äž¢Úƒ®I`¨5®7þ¢¦4Ú†2\©ˆ/,9ÔS‰ºÅ«$ÚßÚ«]A²À ;jZ@ I
-ÇÌ]åjài’òF ´]!ÓíNMÊGIc¥̹ãcXXD!½ï:³óÚŽ¸-™Ù&éBN Ôž“a`ŽŒå1ëãHÈAGñÿ,ð_«¯dQàÀ §äµaêz·Œ©z«JÄ”ì‰W^ô|›¬¨1j`ðÇ”b0”Ïã‘U˜ŒÚ§„9² *~-ŒÂÀÍqÚ£Ô¤3ºSÞSI¢ã˜š}®<MÈO’omA9w¹ö¸/ŒÑCú™9ªz”mªÎ¥\MVs,áÃúYJ½{§›rÂx3P w§›´‚†tÃ9{”ÄÄ[vIÆC’Xh™ØUøoàSéõ\K¸OÍï[ Iß3 M¹ê¦Nö£ñ$Ȧe¯÷
-ô£ŽRšñý¤ÌÁ‡³€t{–õíÁ FgÉ €œê9wQLûšÒ‘žzœÎ™—oZËHr|wjÏKô¾®Ú
-ªQŒ4Œ]Š,„!ò<Æk­áíëD*d:_±í;֤Z¼žnlrf-L/º2hSÁ+5ŒÎ—Öš9ÔÁýX =r…\·yÓÞ ‰CÂL—<­Ž²C˜›½3”:‹#§º9-ÏåÉ] Z€‡ðôÔÊ+CÙÙ}» Ü]ç‡Õ†
-_®|§û¤r½?WWÌ­¾vÈ5w~.µ®î³Ûn]¯+Ë]žÛhƒ²Â 9¹É¹ùZ7<¬"HÔòs†’¡|ªGPåM\·ç´0·xA TøÎkbvÛ9¥e(½znßëÆ_¿>¿±—6ò»wÓ"76-²¥ï/¶èâNÚù~²ZHm8Í“n“¡|‘æf;LB)7¿zC+iä]†³"ÒçcrCù¿èv¬Bë
-ÔZm–Ö«ä«nXœVåÝ•å¦sI›e¯'lQÜ<ú•¬ÎmëR…ÕC½™Ü—ÁP&Òë«þænŠèAX§‡a7çÈ{ºaáþ+ N Cu›\síAj2/R*vÝmQ÷ªì{Š¦§‚=¨pœ~
-GCñÚëEK¸=HÚú~\7Sóàn&¨í³T|Ëú¥¬ÃX¾¸a&ä:h)¼í76dÙ|ÿxú^oZº
+xÚÕ[Ë’ã(¼÷Wøš†âÑáˆñk"öÜ·½îžöÿ¯ˆ’ lá¶Çšƒfd¹•‚$ɪ™ïþÛñÝÏ7Ît< ÿþ|;|½}\´ß)æ°ûú÷M„?â;±sšÓ;kãFì¾þßýýɹôápáû¾þzãóãâÔÎ1oŒt%ˆ
+5¬£Pfµ¥(óÓ©Cǃȸ8fb
+¢úbç"d=Áe8d&+Ñ{B4©ð¬†oP",Дs¨())
+qT›ÊÉ.œ¯Ó ?®Q¾‹…{lO”5 çÚ<b•@‡’ؘÆ'HrS=5ÊcÕ³Õ Z‡2ÞŠfÞõUg5Èc‰Ã,%þÅUHi½©ö½{IR¡€·ºe©¯ê"(«h’ug0ëz­s)§˜õÐL7Ùå\å©Îó4¾Î±”•ÌII)ì¬; ÊïSÔVÝLÚªÖF¥\_G"­5Êï£u^§CÍ$ ¥°sÅ |—B¬£îPScúz˜¾O:z®÷)추žµ% z_ò
+ï“¢‡Ò§z!„2Ì»†Ò¾ÜŸ ¼Nq›õFá¯â#Í{åu4?Í+¯/ (®Ê¥$ÅJ¡27Jû¦¦^Ž¹EV͵¸`\(Ú¦97ÁíN\ÑŒŒŒ]ë7X`šž§Ñ{P®ŒÖë iÁC O,#_½&‘Ö Þ•RÅzjÞ7—j¹Ä¦…‘¼Öa–—`P®r¨THÊÁ¬á:òˆ<Ï›ò.Ì”F0ÝK#ÒK ›yÛWÜœ“qæટâK:yf@•XbŽ¸¿îzƒ„ ¬¾ÕuŽ®åi5c@§{¦elÙp!nœp¥Lò&Kî,g ÊýŠÚjÀ”†3©šLxm™‹4Õ(÷Ó´…â@ª]“ý’²õÊ~«”Ž©zÑS» 4ŠSX¹Æ¥Ðöi.–©z2ökmÕ„.V£<ÚÅJžþ`÷
+"¨×â"Ók 0TP Ò/ Íš×LÏÐÓWLQ”•ülˬÀ+¦½¤T‚çŠY“ÌHÕ
+·êq`³õ"\†¾  <Vy[5@Ð<užNÚ¾¬ <–ºM˜£ôÌú&[ŸÉ8æŠå¤( ßÉQ”Uæ·›¢°Ì9ÚÓÎÜ®yMj÷GZ!7̃ ìwæ{å!:Ûª
+¯ãrTCY_HQBÙ¬O„ÿ¥g}^(¬b\é //$(t ¸\ùNœº‚Ó´¦zïËÄ÷ì4]k¾'?ߺÚWÆÝ£‡xƒ0’qg¡÷½½BP¾7›õ LL¯±ŽTõe”å{Tm ”`Â4±}ýâŽ.ð& ê|‘ƒ Ôþ9ÿÁ•-ï™ßF~×þFf~CZ”¾¿Ú¢«¿ì'áTŽ]¤3Ù¬A¾IrñÚtBÉ›_#¹AÄ‚kþœÉÌ/(ïh”ïññ¢íX'˜+†ô8üjÂå}ÂémY4÷Ÿ›^~AûžÍ:Ë™3†Lg²Zƒ ‰âÏ
+0tËüãeû
+ŸÅ}^Ìè¸ʼ­ßÆh8½ýd’×í
endstream
endobj
-1148 0 obj
-<< /Type /Page /Contents 1149 0 R /Resources 1147 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1026 0 R >>
-endobj
1150 0 obj
-<< /D [ 1148 0 R /XYZ 78.37 808.885 null ] >>
-endobj
-1151 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 768.829 null ] >>
+<< /Type /Page /Contents 1151 0 R /Resources 1149 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1000 0 R >>
endobj
1152 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 757.87 null ] >>
+<< /D [ 1150 0 R /XYZ 78.37 808.885 null ] >>
endobj
1153 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 746.912 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 768.829 null ] >>
endobj
1154 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 735.953 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 757.87 null ] >>
endobj
1155 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 724.994 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 746.912 null ] >>
endobj
1156 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 714.035 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 735.953 null ] >>
endobj
1157 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 703.076 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 724.994 null ] >>
endobj
1158 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 692.117 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 714.035 null ] >>
endobj
1159 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 681.158 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 703.076 null ] >>
endobj
1160 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 670.199 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 692.117 null ] >>
endobj
1161 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 659.24 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 681.158 null ] >>
endobj
1162 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 648.281 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 670.199 null ] >>
endobj
1163 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 637.322 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 659.24 null ] >>
endobj
1164 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 626.364 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 648.281 null ] >>
endobj
1165 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 615.405 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 637.322 null ] >>
endobj
1166 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 604.446 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 586.036 null ] >>
endobj
1167 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 553.16 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 575.077 null ] >>
endobj
1168 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 542.201 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 547.355 null ] >>
endobj
1169 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 514.479 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 536.396 null ] >>
endobj
1170 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 503.52 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 525.437 null ] >>
endobj
1171 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 492.561 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 514.479 null ] >>
endobj
1172 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 481.602 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 503.52 null ] >>
endobj
1173 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 455.786 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 492.561 null ] >>
endobj
1174 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 444.827 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 481.602 null ] >>
endobj
1175 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 433.868 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 470.643 null ] >>
endobj
1176 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 422.909 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 459.684 null ] >>
endobj
1177 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 411.95 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 448.725 null ] >>
endobj
1178 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 400.991 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 437.766 null ] >>
endobj
1179 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 390.032 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 426.807 null ] >>
endobj
1180 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 379.073 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 400.991 null ] >>
endobj
1181 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 368.114 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 390.032 null ] >>
endobj
1182 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 357.155 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 379.073 null ] >>
endobj
1183 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 346.197 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 368.114 null ] >>
endobj
1184 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 335.238 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 357.155 null ] >>
endobj
1185 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 324.279 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 346.197 null ] >>
endobj
1186 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 313.32 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 335.238 null ] >>
endobj
1187 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 302.361 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 324.279 null ] >>
endobj
1188 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 291.402 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 313.32 null ] >>
endobj
1189 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 280.443 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 302.361 null ] >>
endobj
1190 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 269.484 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 291.402 null ] >>
endobj
1191 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 258.525 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 280.443 null ] >>
endobj
1192 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 247.566 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 269.484 null ] >>
endobj
1193 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 236.608 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 258.525 null ] >>
endobj
1194 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 225.649 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 247.566 null ] >>
endobj
1195 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 214.69 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 236.608 null ] >>
endobj
1196 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 203.731 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 225.649 null ] >>
endobj
1197 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 192.772 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 214.69 null ] >>
endobj
1198 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 181.813 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 203.731 null ] >>
endobj
1199 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 170.854 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 192.772 null ] >>
endobj
1200 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 133.429 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 181.813 null ] >>
endobj
1201 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 122.47 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 170.854 null ] >>
endobj
1202 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 111.511 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 159.895 null ] >>
endobj
1203 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 100.552 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 148.936 null ] >>
endobj
1204 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 89.593 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 137.977 null ] >>
endobj
1205 0 obj
-<< /D [ 1148 0 R /XYZ 79.822 78.635 null ] >>
+<< /D [ 1150 0 R /XYZ 79.822 127.018 null ] >>
endobj
-1147 0 obj
+1206 0 obj
+<< /D [ 1150 0 R /XYZ 79.822 116.06 null ] >>
+endobj
+1207 0 obj
+<< /D [ 1150 0 R /XYZ 79.822 78.635 null ] >>
+endobj
+1149 0 obj
<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F81 377 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-1208 0 obj
-<< /Filter /FlateDecode /Length 2073 >>
+1210 0 obj
+<< /Filter /FlateDecode /Length 2119 >>
stream
-xÚÕ[Érã6½û+ôÓƒnìUS®²FVªrö-•krÊÿ_€
-™éí…$Ÿ‰¡  ¥æ,„õûÄP„@ŽB* eŒ>ïÓÿe¾F?ƒ¢ñsyý¦Iç7”ËO†'TA‡kø³¾=¡Ío˜ò›ºNMó=;Lƒô€Jrä -J¡!ª­Ï“"Q)sÉʼOô¨øL¸/¯-=×è!œ>-QäóÛïËo<@î(mä
-HÝ[a…¿I ^'&¢ä¦Ó,>£Cþ_ZÇ¢M¹®äßè<ñ5ŸzgŽ…y±Xdªó÷»"Ã’OKÕšäui'ÉÎÜl­¥†ÇA’™ËÏ'K’’I¬ƒokK¾“®%QÒ+Q”H[‡ÎÓÝ$Rº›éÛ4IgC*5pÛˉ>,£ïTJË™¾¹q“Y¹”D ½>teQã\–}ºˆu²Ê7#M\cyŒ”~(F2”y;ìÔ8¨lz¼ÆÁ Öá$`Œ%\§ S°Eá©V‰ÉæJŸ\&¬ž±EñÏK ÅGR}ÿý7«¥qµ¥|—Iõ‰-Êm†!HP;‚ÔA %>’Ó'j„´–»Ó\AÞcUëß7Ý«_tI±Ä“]{!åI ås’ž×jH¶]£±·í+„´(É¥.5?D·ºE’ĤY$©dYºf²ò&<Þ[ϧfw«Ÿ»ÃÞj'Xw|P‚Á¶eyÛßð–hQ.À-+•¶æùôj±Îk©êbiæé3ÔPŸ­9O{;âÂCÉÂGÅ79ªñÿf¤æü#ÕÁxÃÉßÛWgò9Ê8ùÏl A>°Òvµú %
-ŽJEãQb̹5ý_íöí!vk<Xëøš ¶ åqkòÔæ¬8ôumÓ²ä
-kQS\㣨t@;3Õcš¶(µöNJ›²gV…î²Ã¥é
-ùð`ÿõõ:? s˜c´`YeU åq?íÆn<×eîœr¬rc()eŠåY¨:y§›JÝw¯ß;‘"¯Á‰.· NÿʯYƒg­ÀÉ)pªÝeÓ]½‘íÉJpÎq€Á}d†RÎÒµž8ûº*› 'ÏUØ[üå*›¡¬‘W9™–n5.úÊtª±…nÓçOµÇñ~4‚ïLaïÀ.·ë-Èø,Bˆ\
-9ö åÖØp K€ª^Å·©n…ÅÞZórŸÛáÖ}ƒªð6#èˆqcÄ´(‰˜|Uåèm]mK’›ÝEBEV=/;{›Ì1”^! TcS,†2îèm3º[~9´ü e¯_”@¹zï™|Â.tí-
-9-Êšo;¸±Ã7>ŸmŒRbÃOÝæeµ2–Í–¡Ü3bA£€¼ç 
- e»PxÚfµRTWpl]¨¤Ã`ìlCY;¨½h"vvß{šã+ϵ£DPDœšÁùCÙ¦æYk{$ÊÈŽŠÝGŽPxТ·Ó±y C)Ó²Tç>k¹ƒ!•ìŽÃÌG‹~ï@+Ý©¦†jþäž’÷h{~¢="w<Q8›"=79”'Z¦lÀP—¬ów ò¸Ò–[l©_z‹]-yoþ£g§ÍI‰Ð0UÝë6ûûÇË¿FȯÆ
+xÚÕ[É’Û8 ½÷Wø‚à^ÕÕUí¸ª9÷mj®3§ùÿëp•DP–Ûxزü<,@Zþ9ˆÃÏ&½Šÿþ|9~¾|?›pмTxøüûEÆ›ÄA¼ôæà¬aåáóß߯B(/„A!ìûÛ_Ÿ¼ˆŠùýìõÁC°Vù%ˆD Ò!EAJˆ"þ}”÷ª^ÃBèøçôÛ7ƒ¦~Cûr§I¯ëFÆקr=}.”÷ê¯Êûô:#,Ÿ:!Ûå3¨T 3=Ã5éâu<Ü&q–ö4âésâjºîV^
+‹ ‹\3‡ Rs¨°ÏÒ‚3Ž¢l÷öM»,­‰·9Qoõ嶉WQ^›úuó5<ÏIaD’{2ìDö©<ëfbT
+flÑœ"¹FmR#¿Çâðí^}ZZrgDs•ÐÚÁIÕ>¥•ã-E‰â1Å°Á€ŽŠ¡?ö‰¡ D*)ÊÞœ¾àuáhéŽd¡ÉÉ®äêd‰{­a½¥Ã’EpGC²sÙåN³+&z’Ëåüzîé1òÎ8ä“Ë¥Í)PkÑîAîY­EÐJRyì‘•ø
+MüÖÿ¦ðûYšCˆr£ÕK¹]
+¬ÔTAf[DPèB«Eñ¹¶|—‰Ö³®)~½
+'¥’óhÁ íëágõÛ÷‡ø­LŸéÁ&¼Æ‚ <Î&OíÎBƒèà‰:Ò², €*w¯€W®[GSóêJÜ|AG*eœ’®ÓIºíãC”Œä/²fg»&iîš;‚k’¶]½^ÒŠßÉx»mµGý€=‡¯Q (_hšêö),Z eÊÃׇv¤öUzwXÒ‡! xå5A¹ÄõÖô,ÝWl±ä6âз]ò÷}"-6îñk
+fPåµFP.þTÉ%ÔxôE×ÿ—»ŒÊÖï-*B²¸1UVAƒV–ª¼wÂZU&(·ªlļÄu9î1ªzÚ¹AUÏSµG鵈ˮ‰V‡ ‡x„LÙl®þ7#Ñ ì9ÈÄ¥Ö!é‡À1<j{”žÚ®AÂyÏ¥þ%åÜ-·e¤õò¼4ÙcOt)+Á˜0P›—”ëÙýYWKeŒYFí]+•
+`õ°Ø2K‚B«ç\QŸ*?Ç’n&Wï\Cz°¾/üþ]]C ÊoOH7ÑËJT|7”\_ê–cR<?êQîð£ßØ¡¥ã ÎJ©Û6bƒ/ì
endstream
endobj
-1207 0 obj
-<< /Type /Page /Contents 1208 0 R /Resources 1206 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1026 0 R >>
-endobj
1209 0 obj
-<< /D [ 1207 0 R /XYZ 78.37 808.885 null ] >>
-endobj
-1210 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 768.829 null ] >>
+<< /Type /Page /Contents 1210 0 R /Resources 1208 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1000 0 R >>
endobj
1211 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 757.87 null ] >>
+<< /D [ 1209 0 R /XYZ 78.37 808.885 null ] >>
endobj
1212 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 746.912 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 768.829 null ] >>
endobj
1213 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 735.953 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 757.87 null ] >>
endobj
1214 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 724.994 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 746.912 null ] >>
endobj
1215 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 687.136 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 735.953 null ] >>
endobj
1216 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 676.177 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 724.994 null ] >>
endobj
1217 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 665.218 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 714.035 null ] >>
endobj
1218 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 654.259 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 703.076 null ] >>
endobj
1219 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 643.3 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 692.117 null ] >>
endobj
1220 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 632.341 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 681.158 null ] >>
endobj
1221 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 621.382 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 670.199 null ] >>
endobj
1222 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 610.423 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 632.341 null ] >>
endobj
1223 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 599.464 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 621.382 null ] >>
endobj
1224 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 588.506 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 610.423 null ] >>
endobj
1225 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 577.547 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 599.464 null ] >>
endobj
1226 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 566.588 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 588.506 null ] >>
endobj
1227 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 555.629 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 577.547 null ] >>
endobj
1228 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 544.67 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 566.588 null ] >>
endobj
1229 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 533.711 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 555.629 null ] >>
endobj
1230 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 522.752 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 544.67 null ] >>
endobj
1231 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 511.793 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 533.711 null ] >>
endobj
1232 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 500.834 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 522.752 null ] >>
endobj
1233 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 489.875 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 511.793 null ] >>
endobj
1234 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 478.917 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 500.834 null ] >>
endobj
1235 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 467.958 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 489.875 null ] >>
endobj
1236 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 456.999 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 478.917 null ] >>
endobj
1237 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 446.04 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 467.958 null ] >>
endobj
1238 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 435.081 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 456.999 null ] >>
endobj
1239 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 424.122 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 446.04 null ] >>
endobj
1240 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 413.163 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 435.081 null ] >>
endobj
1241 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 402.204 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 424.122 null ] >>
endobj
1242 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 391.245 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 413.163 null ] >>
endobj
1243 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 380.286 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 402.204 null ] >>
endobj
1244 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 369.327 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 391.245 null ] >>
endobj
1245 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 358.369 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 380.286 null ] >>
endobj
1246 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 347.41 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 369.327 null ] >>
endobj
1247 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 336.451 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 358.369 null ] >>
endobj
1248 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 325.492 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 347.41 null ] >>
endobj
1249 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 314.533 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 336.451 null ] >>
endobj
1250 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 303.574 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 325.492 null ] >>
endobj
1251 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 292.615 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 314.533 null ] >>
endobj
1252 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 281.656 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 303.574 null ] >>
endobj
1253 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 270.697 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 292.615 null ] >>
endobj
1254 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 259.738 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 281.656 null ] >>
endobj
1255 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 248.78 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 270.697 null ] >>
endobj
1256 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 237.821 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 259.738 null ] >>
endobj
1257 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 226.862 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 248.78 null ] >>
endobj
1258 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 215.903 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 237.821 null ] >>
endobj
1259 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 204.944 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 226.862 null ] >>
endobj
1260 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 193.985 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 215.903 null ] >>
endobj
1261 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 183.026 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 204.944 null ] >>
endobj
1262 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 172.067 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 193.985 null ] >>
endobj
1263 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 161.108 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 183.026 null ] >>
endobj
1264 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 150.149 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 172.067 null ] >>
endobj
1265 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 139.19 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 161.108 null ] >>
endobj
1266 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 128.232 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 150.149 null ] >>
endobj
1267 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 117.273 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 139.19 null ] >>
endobj
1268 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 106.314 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 128.232 null ] >>
endobj
1269 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 95.355 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 117.273 null ] >>
endobj
1270 0 obj
-<< /D [ 1207 0 R /XYZ 79.822 84.396 null ] >>
+<< /D [ 1209 0 R /XYZ 79.822 106.314 null ] >>
endobj
-1206 0 obj
+1271 0 obj
+<< /D [ 1209 0 R /XYZ 79.822 95.355 null ] >>
+endobj
+1272 0 obj
+<< /D [ 1209 0 R /XYZ 79.822 84.396 null ] >>
+endobj
+1208 0 obj
<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-1273 0 obj
+1275 0 obj
<< /Filter /FlateDecode /Length 1834 >>
stream
-xÚÝ[Á’ã&½ÏWøÒ 4P•Úªñx¼U9Ï-•krÊÿ_,ÑØcµmm<{ÐŒ-KOðúuÓ HíþÙ©Ý.J¼ì?^¾]ÜYˆAÜ}üý¢ÓEj§wÁ·ó¤A‘Þ}ü»ûów¥LH‡QÊÇï}üñ¢*æ·c°»
-zq3Lm oíeÍèQÄÍÀ
-?ógë F
-A;Ï)Z›-5Q÷(÷y5èxƒ„kîåK†u ‰¯kú¦8P)\f j±¬hÛmnÙ€ÃgJÑ|˜Q[ 9M”ѵ§ßÀ° `P …Õ [†p0‘l¡’£êPFu(k;|@OœªÅ› ¯÷ÐÛ¥–$Ûç¥æ¼´‘¿/wíäïçhW·M ë™yH«Ì`Õ/rit`­$![µc(ó†òf­Â@‹%ûygŠ-â^k 6 pæ…¡´ØÖ©d+’ª´»Ê€ÃnÐ2Q<WÂP¶|˜ûü,ÚÝýæPDp8G½Ùþýݲ²fëÅEZš´Ÿƒ†§Ÿ³Ó,h 9ÂD¤yœKýôw3¾uÒTê(æ¹Ù¹£˜$BŽvVAôó\μ[çýãå?H ^)
+xÚÝ[Ërë6 Ýç+üÅ%A$g:w&¾N:ÓuvnÛUÿ[R%”cÁÖ¹ DZ" @2æð÷Á~{1@å·üó·—ãÇË·wJ)Z‡‡¿^l¾Éì!`¤C` †íáãŸÃ¿ã¢1ìó{úþçÇï/fSk°ˆ À·÷賋k+¬e$ŠÏ(ó+d´”?›ü:cäÏùw—÷ùïþôýgÉä¯Pþ
+æËdóûûøuü1ÞBHÅ4?š´Ë%r\ëÓ¾±!ƒ (Q° à8®2~Ç2Œõm4œŽÕøñÅ…®Áù7ŸJ8_ýc§ñidWwj©À6SRá÷Qá(²DÉfjÍ°©S›Ûg†'È”H”â‘"™AQÇÑ aR`ñÐ ©â3~Ôh¹íøü(t;\ÛÔíôÝù©j" 2K"ü›Žˆe Â.¯:Ä"W‡ËféžVqvwrZéNxuZÒ88Ö¤¹ ’JÄEK=8Ÿ¤9Uf´(úXâàÀuVðQ¥ d+’Öâ…²Nʈ¤ËYRK#xg;¦^uLµ({c­P=ü¿X¼‘Pç”ñÖ¢¬f¹“Ú Ÿo³®3HW¬”+‹•|÷âØ)‘0K P®{\®•×¢Æš*W5mV¾$L@ä;¹ÓÞ’mJÔxË-J]¡«(²0\b¡P3NÔßÉ
+¡‰ÙYÔé\šo_Ø;EëçV°å¹Kù6>ðÖM
+”ùdGJ~œv™ÀI“²olAÜŠ%?1RƦci^¨¡x©÷ËôpØ'×µmCu`—ýL•\û¶QO=y@‹’{eÃ'P@þ­ nêî¼w€ä:þtÝ@©KshWœ¦àœ®Õ{j£x¬)jþZ„qWýjÍ«ìÍ»“†&/} ìâÊc|ð´2F ÎQG¡®¹(÷£pI#sª83 ö¸š Ü\Ÿp¯Ll ¸ÕÂgÍ$ºN <Ÿ ž5\Jàû"D´…Ÿìã¹ÁSìBHר”aÖœ˜¨K¡[3åååì-ioÕÐç–Ýüô^ºÈºïíxú^lž¥e>ð©«’÷v.Ó¹1²j™ýž=Î=K÷[Î8W—mlr^>‡vC›ì˜š)PÝi´ zí=mlS9a%;¢Áø,¶½F'”U²@), ¹ògk瀹ÓäÞÒ¸Æu‹òˆ¸–Žxš˜F„`H¨¬kŠNuOÑÖBðÜQwG´1bèÄ©«¶J©–†E”£ØĬ,N›—_=²1&ˆ;ò¼*²JÙòÌ÷u‘½å*ßÖ!ËSƧþ7Ž!BäÔÉXW3
+”ëTø¬‘Ž uS·(? t$†D @9¡¬ŒŠ\àúéܤ„’´½+²5À[”G¸\J}šÀv9Œ%Ê‚Q èT÷´L Žš×Ýmd†$€²,’(?[K¡#)ê"¸EÑÿׄMlŠ³Iu¦] |‘ú@KU4€.uTéþgL <y¦ÕRÄ °ÓÞjiÒt rK’·ÁaWZ(·Ü%Ê—LêÖpÜ ¯]•õIR·ŽÁ'”{ÀŬöõOõ¼Í5'pärÀÐ5ŸÔšHæµ2¾ôô+8F、HÔŸql=øÈ€n¯R¢Lÿt;¡9­ùžî1ÎœšÕ›6_ñúô¶%Ù·ïËnsÙÛ(Ÿ×ÇvÊç­ š¦sSÝ–&Þ£J´ÆaÙÿïä 8vß×íÚµ ˉòê«aü5——ý1·hÇ-°Iuë.-HMˆu“J¬*™#¿½ÛÌ|6˲äbf"™øà ¤°ìà,›Ho/ÿF¤ð
endstream
endobj
-1272 0 obj
-<< /Type /Page /Contents 1273 0 R /Resources 1271 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1026 0 R >>
-endobj
1274 0 obj
-<< /D [ 1272 0 R /XYZ 78.37 808.885 null ] >>
-endobj
-1275 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 768.829 null ] >>
+<< /Type /Page /Contents 1275 0 R /Resources 1273 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1000 0 R >>
endobj
1276 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 757.87 null ] >>
+<< /D [ 1274 0 R /XYZ 78.37 808.885 null ] >>
endobj
1277 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 746.912 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 768.829 null ] >>
endobj
1278 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 735.953 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 757.87 null ] >>
endobj
1279 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 724.994 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 746.912 null ] >>
endobj
1280 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 714.035 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 735.953 null ] >>
endobj
1281 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 703.076 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 724.994 null ] >>
endobj
1282 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 692.117 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 714.035 null ] >>
endobj
1283 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 681.158 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 703.076 null ] >>
endobj
1284 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 670.199 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 692.117 null ] >>
endobj
1285 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 659.24 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 681.158 null ] >>
endobj
1286 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 648.281 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 670.199 null ] >>
endobj
1287 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 637.322 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 659.24 null ] >>
endobj
1288 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 626.364 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 648.281 null ] >>
endobj
1289 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 615.405 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 637.322 null ] >>
endobj
1290 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 604.446 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 626.364 null ] >>
endobj
1291 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 593.487 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 615.405 null ] >>
endobj
1292 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 582.528 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 604.446 null ] >>
endobj
1293 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 571.569 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 593.487 null ] >>
endobj
1294 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 560.61 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 582.528 null ] >>
endobj
1295 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 549.651 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 571.569 null ] >>
endobj
1296 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 538.692 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 560.61 null ] >>
endobj
1297 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 527.733 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 549.651 null ] >>
endobj
1298 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 516.775 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 538.692 null ] >>
endobj
1299 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 505.816 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 527.733 null ] >>
endobj
1300 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 494.857 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 516.775 null ] >>
endobj
1301 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 483.898 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 505.816 null ] >>
endobj
1302 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 472.939 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 494.857 null ] >>
endobj
1303 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 461.98 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 483.898 null ] >>
endobj
1304 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 451.021 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 472.939 null ] >>
endobj
1305 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 440.062 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 461.98 null ] >>
endobj
1306 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 429.103 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 451.021 null ] >>
endobj
1307 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 418.144 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 440.062 null ] >>
endobj
1308 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 407.186 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 429.103 null ] >>
endobj
1309 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 396.227 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 418.144 null ] >>
endobj
1310 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 385.268 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 407.186 null ] >>
endobj
1311 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 374.309 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 396.227 null ] >>
endobj
1312 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 363.35 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 385.268 null ] >>
endobj
1313 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 352.391 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 374.309 null ] >>
endobj
1314 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 341.432 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 363.35 null ] >>
endobj
1315 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 330.473 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 352.391 null ] >>
endobj
1316 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 319.514 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 341.432 null ] >>
endobj
1317 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 308.555 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 330.473 null ] >>
endobj
1318 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 297.596 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 319.514 null ] >>
endobj
1319 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 286.638 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 308.555 null ] >>
endobj
1320 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 275.679 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 297.596 null ] >>
endobj
1321 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 264.72 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 286.638 null ] >>
endobj
1322 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 253.761 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 275.679 null ] >>
endobj
1323 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 242.802 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 264.72 null ] >>
endobj
1324 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 231.843 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 253.761 null ] >>
endobj
1325 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 220.884 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 242.802 null ] >>
endobj
1326 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 209.925 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 231.843 null ] >>
endobj
1327 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 198.966 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 220.884 null ] >>
endobj
1328 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 188.007 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 209.925 null ] >>
endobj
1329 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 177.049 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 198.966 null ] >>
endobj
1330 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 166.09 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 188.007 null ] >>
endobj
1331 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 155.131 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 177.049 null ] >>
endobj
1332 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 144.172 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 166.09 null ] >>
endobj
1333 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 133.213 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 155.131 null ] >>
endobj
1334 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 122.254 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 144.172 null ] >>
endobj
1335 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 111.295 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 133.213 null ] >>
endobj
1336 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 100.336 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 122.254 null ] >>
endobj
1337 0 obj
-<< /D [ 1272 0 R /XYZ 79.822 89.377 null ] >>
+<< /D [ 1274 0 R /XYZ 79.822 111.295 null ] >>
endobj
-1271 0 obj
+1338 0 obj
+<< /D [ 1274 0 R /XYZ 79.822 100.336 null ] >>
+endobj
+1339 0 obj
+<< /D [ 1274 0 R /XYZ 79.822 89.377 null ] >>
+endobj
+1273 0 obj
<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-1340 0 obj
-<< /Filter /FlateDecode /Length 2119 >>
+1342 0 obj
+<< /Filter /FlateDecode /Length 2209 >>
stream
-xÚÕZÉn#7½û+ôæU\ÀeYrö-È59åÿ¯)®M[š¦Æ3A¶º[ìÇâcí”<ý}’§ßž¤0ñŠþÿötþ|úv5á¤Eð
-áôùד¢Aò¤NÞðæä¬ÒªÓç?§?^¤´FJ ôùöúççïOr“)”€a
-dÖ¨Q£Òɬ‰šKyëcÓs.¨ÐéÒµÐ|™iŽ[fMXËÄ('
-Ÿ¥)/lÙE*Ðüë³OëÁ.ËÚ ¦ÛuÊcâ®,ÅZÖ…ÆD3¶ú$JYϘ^)REÓÌWÛnF›=}÷ÜK’ÃØ—b¼%w×Ѭr[ßHR\KæuÉßÆ NYoä_ŸËTíQ)ÊÝ۶̢ài긜]–œ{!õ}]Œa›>ŽÛò‰2^¶¾ÉM‘(l4ö‘œ¯V§h>IÔú¥Ôm‘”„ÖýH‹u‰Ý²'¶.:jŒ{éw¡j˜»ÔjµÛÑŠ%ë[]³¡-dOkˆ -[âÙi×-JƒˆŠ¿øÅŒ*‹äN<ŸÅÁ6F ºtZÈÐè.u<Š®U­é;n£õýíÎ0#,O:#ÜÞ šÊ÷K• =§ãÆ™ûœ9£o®£Ž©,¤ÂÆ×qµÌIŽÛÖ±“}eÌûjÒ½K¼ÞS†¬DštBëŸe]ÊH².ä³4X}Däí\غÖoªßInønËc’ÄËÙ±/ôÅ?·T~?§úŠêš¹Ù­iñ£ÕÙzòª-EqTœº£Ž’ˆ1”±“ðŸfùÕ›Ü1 }êm¢¬!7„í9RúLÓÈ.œ$à“?¹¼"¼T½È×1,§‹ÍÈëðæ¾<Ï:
-\çJ²+=×jÊÆ
-×ÍÊ]ñéZnœÕ²¿z‘z&ýÑVm,/È£0^ñ-ž3”xu , ãè¹/šÞr”Ä°”ÂØižºj#h8J5ÃHòAó\bñ”q“ÝT¾`¤pÒðE Ìu#JÒR·Å¡T£^FßQÛ=Î?ò£ À œ¶“Ø~Mìe/:Õ’;^×~oë§È~ðŸ'§
-†f"É/‘4‚%Éé’Vã-)|ÙIÍR67‚¼Ù%M±Æž´Áµì¢ûaùÇçÓ¿‚+d
+xÚÍZËn+7 Ýç+üÑ•¨7`ˆãø]gWtÛ®úÿÛêA½({<r’{»˜xf2¢È#’:”Äÿøáçg:Þ…¿?ŸNO?.ÚóNH8|üý$ÂGü N3pú``܈ÃÇ¿‡?œ®×p©—¿>þxâ(óÇÅ©ƒcÞéz! ¨Pá’œk‘/å‚Ä÷pç2\Æãsüåá:ç÷ð¾}{yÖ QJi "_ñ>¾Sák…­Ò»s–¢N¹çôžçSûA›l[‡Ó=4g‚IÊ5F){A’–sñ†ÿ‡ â×Êd°´BiAJÏ¡kn€z¸ÒãyBé™P’B¨Þ÷A( ³ÚR)–tñÙˆôî¦gcth0n w~Á¦Ç±u”—|Iì) ƹH“ªÜÞý èÀ1pé “qäü
+–h*@Ãö£m«EˆEr)ŽzÊxF ÒóeÙjnC•6§5¥G)[iBñ_ZõÎ T74BÇHlƒ3yÝITMl[û~ÜŒ×Lr;Aùº%‘ò”·â¬ø>¡Tè|é²;ÆVqŠIå)0Òï†ÛШ°ËjhÇ”š\]º]jxË<8*$Í.§æW%%Z|.Áš’›oAÛ¶øvþ¶Ÿ$÷i0IÅ¥¤#%þ¦ÏØÎJÑ ê|V{P—–œPT–)7{¹^ÌQ
+˜e5¤a:ŒUC­Û(åWˆÆ)ªŒ”‰xš»9è Fìó¤Ê€fÚÌÁ·Fªˆ0ĉ
+ëA)yqÔn/_)Ú BÀÜŠ¡š<yG7†˜è ÃÑéSi¡%â’_ŠtÓÿ8 \2£GÜD>îFÕ(e] muˆ CÕØIa0E!)<ÞZZ„÷ >œÚÌV8^šê_ÑÕOùJàŸ·é†õZ@iÞw"ãø¾qÐnxO–6ŠYo)J{9‘²žµ–ÌI7©±Æ7ˆ”o®)ï¤ÄÛ#ø©P+`Îz
+Ø^R
+GÜK¬Ó²Tj¤•7Qi™]Œ¸”ãLˆº
+ŽËZäI‹ ’®sþoœÏÝpË—g쪾Âzܾ63ѹS×Ñ&çeÒ^a ´îãwJà÷¼.™ÜtH©B¤p¾ÚC¬½ÐNtZTG,8ª‘–ñHÆÚ„.Ž‰)FG±Ç~Š‡Ùs)T»-²xiÕ­3TC®yqLè:vÞu R/˜O~1¢ÂH¦4Ð^,´dÏŠ+\d †OÅ׊×Ìj¥nïà-ô±R4ó›>k‹
+°BÑŠ¶¢¦£®>¯›Sþ Tþ9tû %M.e”ó‹„cñ‹|'ætÓïæäÏKËO}ÊCqÓF×Rš2Þæ¿^IÐIÛêˆxEvdû„–Y.~ݼ2ŽJ-®$CÐ’r’üª§Ÿ1"r'˜ãJ³«]–®z˜ò÷W`B¹%;aßSËÜ* JÆjàš¸Â§ñ»=·¥Us³e½"Š–8Pp“†F.ܵ:Aß‘ƒ[˜¹a,LC˜^•åx³G¤!u‰!ë‰(lMa(¢0@_Ü%Ý,ŒŒé}‚F›bW?âe¬Ò„=@3Âx':6I±‰tu²8æIyÚy’`_I¨BMj…›,ïö@Ë”\l1˶¢3óÞJû‰ëiÏ—=A¨#ãÄ5ý\h˜mx.;>Û¼$¦l®ikšg…Ô-òÊXhåS¿3hèÌXǵìЪ”Í9©/³©¢ïK:óî\¿GÖB„¤é¶c%t_m^ºæt•©!¯«ËKûrˆ;öã™ ½{í¾`0
+ùõûŠ©5_ÇÞ–ññ°€¢xí='lHY_>‘—¢¨±xòHÙ»ƒx÷ðN->n¸›  ×¥½9"…°jæ1©C~{¸?\v@ «rÜ
+ϘKŽL¤< †±L©Y¥s DȯË?#%3þ5ª´žo ”ýʹÉ×鉔õ|êr¦ÁOj¬X RR8\Z¤[Ìéž7ÔÊJRÉ$å|Ab µ|]6)TÌzv¼µ££pÉŒT‹½GdÀ3ýDÊj`F‡WÕþü0¬a„¨”¯<›ÛŸ±TݹÁ²›‹Äv….¼|Ü´}§LSÝŸèg;ÌRÞD] ¢€S› âê¶RmuÏü™ÒÜÖ­[ó[ºD¿½-oÜéØ®õðÖj½p™[ãqw#‰[7YÔÎV¥5ýt7,+»vRöÞÂ'V[x¨0y)¯©F)-Ù>-mÚ¥¹gFMÞµ^Ž'˜5Žá^j‰AH¤lS–²¨ïËžR]³ÇY‘œ1úQa9sÜSÀö’`LžDÊj„
+ØéI‹×5-!å«úÒ…] x×-¾ú†úÎãŸ3^…H9æü4¿ì%›8Ù)Œ” |QÊI ·D¦ˆ”;'ÀÇIÑgÞÖ°ìN1¾<ýz=}™
endstream
endobj
-1339 0 obj
-<< /Type /Page /Contents 1340 0 R /Resources 1338 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1026 0 R >>
-endobj
1341 0 obj
-<< /D [ 1339 0 R /XYZ 78.37 808.885 null ] >>
-endobj
-1342 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 768.829 null ] >>
+<< /Type /Page /Contents 1342 0 R /Resources 1340 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1000 0 R >>
endobj
1343 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 757.87 null ] >>
+<< /D [ 1341 0 R /XYZ 78.37 808.885 null ] >>
endobj
1344 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 746.912 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 768.829 null ] >>
endobj
1345 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 735.953 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 757.87 null ] >>
endobj
1346 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 724.994 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 746.912 null ] >>
endobj
1347 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 699.787 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 735.953 null ] >>
endobj
1348 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 688.828 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 724.994 null ] >>
endobj
1349 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 677.87 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 714.035 null ] >>
endobj
1350 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 666.911 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 703.076 null ] >>
endobj
1351 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 655.952 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 692.117 null ] >>
endobj
1352 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 644.993 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 666.214 null ] >>
endobj
1353 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 617.933 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 655.255 null ] >>
endobj
1354 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 606.974 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 644.296 null ] >>
endobj
1355 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 596.016 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 633.337 null ] >>
endobj
1356 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 585.057 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 622.379 null ] >>
endobj
1357 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 574.098 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 611.42 null ] >>
endobj
1358 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 563.139 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 583.524 null ] >>
endobj
1359 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 488.259 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 572.565 null ] >>
endobj
1360 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 477.3 null ] >>
-endobj
-229 0 obj
-<< /D [ 1339 0 R /XYZ 79.37 453.248 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 561.606 null ] >>
endobj
1361 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 399.385 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 550.648 null ] >>
endobj
1362 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 383.724 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 539.689 null ] >>
endobj
1363 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 372.765 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 528.73 null ] >>
endobj
1364 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 361.806 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 453.014 null ] >>
endobj
1365 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 350.847 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 442.055 null ] >>
+endobj
+225 0 obj
+<< /D [ 1341 0 R /XYZ 79.37 417.307 null ] >>
endobj
1366 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 339.888 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 350.931 null ] >>
endobj
1367 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 324.227 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 334.991 null ] >>
endobj
1368 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 313.268 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 324.032 null ] >>
endobj
1369 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 302.309 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 313.073 null ] >>
endobj
1370 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 291.35 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 302.115 null ] >>
endobj
1371 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 280.391 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 291.156 null ] >>
endobj
1372 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 269.432 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 275.215 null ] >>
endobj
1373 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 258.473 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 264.256 null ] >>
endobj
1374 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 247.514 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 253.298 null ] >>
endobj
1375 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 236.555 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 242.339 null ] >>
endobj
1376 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 225.596 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 231.38 null ] >>
endobj
1377 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 214.638 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 220.421 null ] >>
endobj
1378 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 203.679 null ] >>
-endobj
-233 0 obj
-<< /D [ 1339 0 R /XYZ 79.37 165.23 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 189.537 null ] >>
endobj
1379 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 144.388 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 178.578 null ] >>
endobj
1380 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 133.429 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 167.619 null ] >>
endobj
1381 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 122.47 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 156.66 null ] >>
endobj
1382 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 111.511 null ] >>
-endobj
-1383 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 100.552 null ] >>
+<< /D [ 1341 0 R /XYZ 79.822 145.701 null ] >>
endobj
-1384 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 89.593 null ] >>
+1340 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F22 367 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
1385 0 obj
-<< /D [ 1339 0 R /XYZ 79.822 78.635 null ] >>
-endobj
-1338 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-1388 0 obj
-<< /Filter /FlateDecode /Length 2422 >>
+<< /Filter /FlateDecode /Length 2108 >>
stream
-xÚÕ[Ën3» Þç)üÑ/QwÀ0pìÄè:»¢ÛvÕ÷ßݨ 5cò7n»pl5߈ïdøé_'~úó3?…¿¾]¿Þ~ݵ?)æpúú盋øIœœfàôÉÁ¸§¯Ÿþ~æÜhÎ¥ ïêò¯¿½ñ‚ùëîÔÉ1oŒt=ˆÐŠ)a(
-¨€à9W.¼Äkx‡ðù:ÜÂ+\S—w :Þaê§k¾D~™ÏúK@UïÊ(q•ùhÈUÝúÕrÂÊ+#‚åù{CÄ;Û3 Ñfžtü}Æ\Í™à@™+å1æÉœ%³J!‰pyá³ Ÿµ*$r´h¬ÖâSÄ-³Ò„ß&\z&”¤„«Ïc„+Íž(Ê7¶Ž‰ðŒn*Pgý±mHÍ´3Å0rØÂÈq[Åpn•9­®™Ó(rëjOJ´sMª¿›¦
-sdO|óEW^q5
-u²Û<›ü ® ’w¼
-òòžàÚ#^¦-|ä-XÓƒæíf +ž¡Ì¥<%ÝÙbÕ[¤vV ÊÜ>Ü+ ˜+•drIô?!t›O3IñN­*÷Š ùÖºÀñ‹6g¼š*á!”UŒ»iïW<+癵åz]%´fÖOÖZ³ÖÞ2Ž‚$Ó[¢4ÔI$Ê÷ä2ys—ÈÖúùÞ z2ÓQG³0‹K3zÃtÀm™?J…x`2ÑÒ­™ŒÌò6dP;›h½d¢ Ê–‰NgÓÇz<s8þ&ï-¼Q·Á…þ¬Ù`^Ìf[-¹I‚ò3‚yí&QK AI}/:_8H£ö9°Áëy<4m{¤í‰ËLàœyï)ƒL‚2F`”Étðf[ᶓÄìaºk‹Ô0¥Etߎí´çŒ7»ªb|<
-.2;‚|c!úàNÐ] 0‹õ"(5àØx´¦LsLPž÷ZÞƒùGÄi<äúGaÈ‘®F/¡KP_W|”£¬÷¶«x¥.ÎY”’çç]¸s×$ëWñ063¯ qBºb?Zz‘ÂGcp÷êéAˆn¤¤§w0./¾™€$ëqkþ>3mÉÿœ(öç=Žo+`­e‹±*§mÃå™ñ{ò/°¡x]ó'ÖuMi¥®wˆßP_AŒ'ý]LʺÏÑ\0%4ÝÆÁð ý>A¡~?ùwK’jNƒY4¼E[Í|êž4òüq^¤œbÚï§Eññ)ˆ€\,ÊW1w”“Ðæü£­Sx–äŠ7O0¦!aÊ+j„
-ï¯XˆJE)C¡ úz(®¬dFÂtÖnÉeâZûxá·4µIC~mKƒ~¨ÑI^öíÉÑŽY¥öE'AÉ ó{Ë‘¿+T½(ÕÕÿ/Â¥,³n2$G®åUÂõ#B¶o¶¾í4”4Ì™˜¬–œA9¦ ‚3è*[6€7;õ%»Q_¯Ïc†>T?’€úr«Áå˜z BåGVh—C¢|µ†pkªèeÄ>Àסa …Õ«…©äÆ+±2›¿hæÜ‘\C»Þ *\ëj÷XZÛs³Y©»èL‚Ý1 …+’ò´Ûs<þñ¸¥w t5òSðiÔ|&£ñ®e:ÉÏ^
-ÕPì…ÙÚK{qV2>Ö­“¤®5šÊD\!›K0½„@Œ+=¨ÖQ(´N-§y§&R Æ™DT®9¢LDâD€£}“&Nq&`rÔG[PH܈²Ev úþt³®/ÔIðL˜Á{ÄŠ]´°ÅcØô""DHY¹§D,Æ5¥V¨¡m»Õ
-^¨o!úMi[ eFJÎM%»é[Öû
-ò„ž˜è[ _
-%p+¥ q.¦s@‰[Œ_(
-&¿fœSl[^"JÍã´X¨‘ÑNWÜÜövŽà>FZéû)ýVц[:†µA‚r¨v‡œØlBÁÚ)hïJ5ãÑ—–i ô?Ü‹yD3ÍìLõT¬5†Î ‚±ãty!,k=eå³za¾¯Ô •°bÁÛ GÉhµÁÇãsqºØúéXv*“yïiàRÖš-S¶e{C)r®ñ‰8eZ˜ü¬˜š«fšL8”~Të.‘h¾zïÇǘF›ïÔÒDœ§â³ÓÓ+u$òºÉÁŸé~Ží¨±õTÚL«\ŽãbÊL\^k)0Ìb8!ÞæÔ¬¸”IšË»2âÜ’¸5ã/Ãüêž]4Lqú~´­ŸÚJâ<Žî¥½d’KÜ¢²Gl—\û«X‘.Îw=ÑмŠÎï¡ á¾/ÖÏ?ýDcCù¾”ž»Yý±è·[âí0ƒ ÁT¶Jx0@ÍF,ªàµŽ5 ä-þE¢Z¦öÏí±dÓl¸#°mµŸ!% ê ‘~“?§ÿÐ(ã+O€r]"‹2«\‘z@©'Óä©
-m&*©çI¶²6·L[ë2_Í¢7ûGU'ï±ðÓ'3O,F6+™Pno˜í[†¼ýÇÕ® åë1bÇ×3¹R‚id»zìóf´9©ÉغH¶~Ôç×Û_ú†€‰
+xÚÕZÉn#7½û+ôæU\Á€e[äì[krÊÿ_‡ûRlIMÍX™d¹»Ù¬í±ª(~øçÀߟNŸOßÎ
+ÈÚ#Y±ü•´qÌ_Ÿ<q¦‚Ôþïw/´rÉœ½ÐV1°ê`$2ݤÖÊd”4eå};[y°^smâ s`)Ȥ $ûHZ@Èûk%“äAÎ$y_þ÷ÒBÐÞ[t¡@d‘>iÖaºß4–u‚À ‡I'r—N7 %PÐËË
+¦Oû“ŠùÙ)Ên¨5sÒMËxÝ· %™š¢P
+ÀLÕ˜I4è7Ðqç͹¦ÀïmPôP"¼7ädµ[$‚Á3R¥§„XÞl3f‚¹ßy•bnÒ-î qÌ¢ IQ²èwlql‘Ø;rQtÈîâÕûÅΉb’Û®¹öˆrÇ2P2Γk«5êQ~O† û+šŸ° 'UÉ¥=‘ Ü± ÌSÊä8kùAÙ"£H>6‘A´ßK¿&Ñ\0áto’ó?‚’õýí,ÔåD`È›Šû"C¢\)–6}<}€ÍÅDq]<•ÑÅ©#kó\| vãSqQî¾<G¸6á@áu`ªPÒŒîAÓrsý‚Sý’–¥_ò,ñí¤#·Ô‚ÂÓ¬T1eù¡RÈ"\S.úú'(ÿ A·õ4‹ÞT²j/ûpößÀÖŽ¿(},wÓ¤¹f»¤i<ÃÙií§bï«‚Kë˜1“äj9$”/ŽQ!!?vçùL$ -Gwiô Ä¯(•â ­¦úÙ›gÊ (ëù¢BÇ$ºŒ½ik¦h‚²EÑÑ6}¦—‹ðð Ï-½™óô¯£m–Im'á_—¶I‚r‡ „aŠ;º \+ JôèsŽù¬Aš³Ï‰M±X¯ë¸s@‹¶kñÑf\V×LMt±˜cŽ cþE•‰ƒ7f…· ÌŒ.wjyú•´|îîÌN:om'&—UK.KPîX†•L#NËXkx”šð\kºJe˜iïl6]啦똶ßnÅ濶QÇmN\ŽÉ™$´(¦;§qLd¿ŠWr3Í/·nc£ö½K ,Í=üÛ«ÖóŒ…fâ½yyÞ› Hd·¶ÃG’-&2ÿ¼^n~o…`­°åXUÓ¦a`ž3\Çý6B¯¢+¾1c×ÂU}CüD
+ÆêÀ×KiD-J|„÷Ã'´BÌCŽ‰¨Qh~¾ž‰û eJ+jì½™fÞ2
+Ù[ût᧵¹Cúl»ƒºÐÑa.ï¶7\G#Ó .»Žw‚\@§ïV"ßëT½+ÕÑÿçRÀ´ê\{ë‡â\#Ê£œëKœì2oݽg Ìpœ”üº´i”}Ñ $³Ûí%púB{Él´—À©ãX Íè .¿ªËðRy”€JSVh›2¢t·fpï ¥´TKž—ûü
+\W¨äYÅ£ú°ÐUÜp'4fÓÕˆ¦È5³kÙMA…Sm¯{k›7ÑJ]EG æ%d­ Õi·æ`~bn̶sŸ)÷ÔrÊ=#i<+Œ–üè kÙñ—ÁÒònÇ’#dñþS75SÆ×]8^QKVrÔ9g˺êמö™}íû1j±‘{·‚l’™½VÇrF ]Áâ~µ‚,­Ú:u ”ÇlbpœY׺é]ØØ°™Ú—‰3¬Øâ ‚i#é¥Ë[x¢¢l3PŽ/æéJojßkŽNu©›|Ãhë» xÝ:œR,\jv”/ç¦ç¾3ŽÛ43·OÕò8(É8N™ÀÎNÑÁ ?]úþm¥ÅÍö­©¶½olÇ¿ª€\Õ‹DÆͼy«¥Í› ¬—|€À„Ó2äRÉGPdGa1§íle =+m”\>ÛÆ;u˺oØÀïË‚‚`BéÉ× ʼ/ü&Â
+΄3Tؽí„",A®U#ÓÞGÃ×
+'œßÐöÂ¥vß’påºÕ öôÒÎ#¾X`k™ß¨À{+õ"ðˆBc´†™z˜ö áŒg2 ²-4 “hY¼r¶T¦‡ˆ§5ñ¥å{]“oD¡Ò65N?vúb!•b’OFÄňQ&!Ë,=8ùbá¤dRâ$œ]nDÙ®ôÇÓ[‘ˆLZ9¹¬Z˜ ¸’6=H
+®üp*2§kuïCäœi>mñ‹ù A¡nõÎ:¦å°›‡ÊÅô…€”âW?Sl ^Iο¥-݈š]8×o—Vâ pó¬xý•_Æ2=Ù`ñW6ƾ)8`Ú’3×NG±%åŸO?
endstream
endobj
+1384 0 obj
+<< /Type /Page /Contents 1385 0 R /Resources 1383 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1000 0 R >>
+endobj
+1386 0 obj
+<< /D [ 1384 0 R /XYZ 78.37 808.885 null ] >>
+endobj
+229 0 obj
+<< /D [ 1384 0 R /XYZ 79.37 771.024 null ] >>
+endobj
1387 0 obj
-<< /Type /Page /Contents 1388 0 R /Resources 1386 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1026 0 R >>
+<< /D [ 1384 0 R /XYZ 79.822 751.43 null ] >>
+endobj
+1388 0 obj
+<< /D [ 1384 0 R /XYZ 79.822 740.471 null ] >>
endobj
1389 0 obj
-<< /D [ 1387 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 729.512 null ] >>
endobj
1390 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 768.829 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 718.553 null ] >>
endobj
1391 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 757.87 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 707.594 null ] >>
endobj
1392 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 746.912 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 696.635 null ] >>
endobj
1393 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 735.953 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 685.676 null ] >>
endobj
1394 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 724.994 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 674.717 null ] >>
endobj
1395 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 714.035 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 663.758 null ] >>
endobj
1396 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 703.076 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 652.799 null ] >>
endobj
1397 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 663.562 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 641.841 null ] >>
endobj
1398 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 652.603 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 630.882 null ] >>
endobj
1399 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 641.644 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 619.923 null ] >>
endobj
1400 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 630.685 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 608.964 null ] >>
endobj
1401 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 619.727 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 569.113 null ] >>
endobj
1402 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 608.768 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 558.154 null ] >>
endobj
1403 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 597.809 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 547.195 null ] >>
endobj
1404 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 586.85 null ] >>
-endobj
-237 0 obj
-<< /D [ 1387 0 R /XYZ 79.37 563.674 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 536.237 null ] >>
endobj
1405 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 531.101 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 525.278 null ] >>
endobj
1406 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 520.142 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 514.319 null ] >>
endobj
1407 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 509.183 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 503.36 null ] >>
endobj
1408 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 481.4 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 492.401 null ] >>
+endobj
+233 0 obj
+<< /D [ 1384 0 R /XYZ 79.37 468.944 null ] >>
endobj
1409 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 455.553 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 436.147 null ] >>
endobj
1410 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 444.594 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 425.188 null ] >>
endobj
1411 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 383.107 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 414.229 null ] >>
endobj
1412 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 357.484 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 386.334 null ] >>
endobj
1413 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 346.526 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 360.431 null ] >>
endobj
1414 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 335.567 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 349.472 null ] >>
endobj
1415 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 324.608 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 287.704 null ] >>
endobj
1416 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 313.649 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 261.801 null ] >>
endobj
1417 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 302.69 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 250.842 null ] >>
endobj
1418 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 291.731 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 239.883 null ] >>
endobj
1419 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 280.772 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 228.924 null ] >>
endobj
1420 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 269.813 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 217.965 null ] >>
endobj
1421 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 258.854 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 207.006 null ] >>
endobj
1422 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 247.895 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 196.047 null ] >>
endobj
1423 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 236.937 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 185.088 null ] >>
endobj
1424 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 225.978 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 174.129 null ] >>
endobj
1425 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 215.019 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 163.171 null ] >>
endobj
1426 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 204.06 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 152.212 null ] >>
endobj
1427 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 193.101 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 141.253 null ] >>
endobj
1428 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 182.142 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 130.294 null ] >>
endobj
1429 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 130.673 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 119.335 null ] >>
endobj
1430 0 obj
-<< /D [ 1387 0 R /XYZ 79.822 119.714 null ] >>
+<< /D [ 1384 0 R /XYZ 79.822 108.376 null ] >>
endobj
-1386 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F22 367 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-1433 0 obj
-<< /Filter /FlateDecode /Length 2893 >>
-stream
-xÚÕÉrë¸ñî¯Ð ÐØ«T®²,sªrö-•krÊÿ_ÓXšØHŠ°ì—™ƒl‰Þ7òË.üòç g:|ÿ¾Ü>_~-Ú_óNH¸|þûEà"~§8}±F0nÄåó¿—^97
-?7Î¥|ý×ç?^x†ùkqêâ˜7Fºˆ†Ym{( xΕÃÿø„é¼ãuüXõú‡W¯+ÃS¸¿Æk⽺æ>ÕÙLs&8ôSç† =0ÓhHÏ„’ oxz ©™v¦‡ÒÓWúÚôdº¨§îø1™æø]š•æë7µ µa½nÇàjN™ÌG›öƽ´Àñ:Ü2÷òµ´ÿÄÞ¾º6KppL 5;‚ã6So¡üÄÁÍí‰C
-öšå<^­6ß;ÿªžñ.ŠtÚ¹|öˆzrž7bš[âæCʬ*^ŒHpÅz¯Šú€
-nIÒƒ9¬+aj61Žqìp [Cxx^”Ræ@ôPVÿêMþ­ö ’ç°M<ÄRiŸhÜR|‰•P±j |„3(°]ܲ¸eÏÈCî>JÝÈy®º½wxé-“â• ìd¸ÏͼVÔ€M²““ÂЕ¨ŽŒä*T°²«G ±Ðw~èè,Óàú‡~ŒÂ*&q§nÇVÚݵX•DYç“î\–ðþø¢ôÐ爑⸠p4SÂôç5*ˆHq6ÎX·C
-*
-7ÓïôODÖ˜C
-z(_@Ã"têh‰=­HdÚ­½ÊÕB”w(JŸ<Q¢¨žY?+m9"çè³45H=Ô{ÎÖÓˆµ-”ù²“Ö†y?dg«_Y;(Q—ä‰úl…˜1ˆ¼eK´ôÔÞÎ ƒÅÜrèà²AížPNeæÛ5é¤?_±Ëµ•JuP²9÷bgRÆŸDÞ›T·é[|ZòPúNž¾Ã=ÿßÀ¢|ʵj
-†T%;ÁÑfƒ9óŒša"Ù3âl%T©…r*™Ð!P/ÌKédê2R[új«Çå¡ñésk[öÚͤעRHÆ"âk”ÖU§~WÒ«<†j#7O–,³³é€üÍ–Üt<›±Fø%}ókžN1ÝF‘oSzÕAÉ.êX¯”ñ̽UqSVîTÜÒ*ÞK„D¯e]¿ËD{i7]òÎzßC®u8c™ÙN%´t•R"eÕæS½
-¦uìAz¶¯–íî‘ÊckUù±æ~¬²U´7Pà LáXUô‹üLð\Õ Åò´žÒ
--|…zlæ¦"ñÊ|.¥æÙ0úË“ÙºâhŒTå»[øM9â7·ð7÷~¢…¯Ð¤:ã‚«9‚·P~âàò‰C≘bn9%Ü”SÙ´˜šr·…9¥È«JeR3lוîdT¦shWº]÷,Fý“QYh§ œrûÄóœé·¦•!9¦ž`¾²¦äŠra·êœ$Z ¯\]X¦ã€IïóºÆ-¦ô9ïN‘£ÛŒÎ<ߊãÚ“ \'F1^•Þ*‡ßÐëD¦P õ
-±»+Ñ=ùùbëŒz¸o¿Uû%1ø߶Áµ›˜å˜µúJ[mÿÉ:^p%óµÃøçvté6Vœí¯G¥\1)|ÏŽÓÓ³™-”}vŒC•÷Öˆ¥váé7é]ÛU ²y¾A^2izZÂÍuÔÈ0¡`c,Þfêê¿s]ýË5õÇî
-tù¼p-3,eaë½Ð0{àªÙƒˆ}ZÖuÿdSÜïšœ»\¯u?\Å 8ù²A_*Sñ¥T„Qýîu}¾ŠABÕBÕvŽÈzÕV9¾³lE5ÓÃdoäêcHäÏÓ³nÐøÉ·a[ }ÜWHPqKWŽT½7Fºu˜·b(ÒÛeÙICIQLNŠjómø,!œ`29,ÒyŽÚn‚¢jÉ×þð9XÎœ1æ^pi<) f‹
-endstream
+1431 0 obj
+<< /D [ 1384 0 R /XYZ 79.822 97.417 null ] >>
endobj
1432 0 obj
-<< /Type /Page /Contents 1433 0 R /Resources 1431 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1026 0 R >>
+<< /D [ 1384 0 R /XYZ 79.822 86.458 null ] >>
endobj
-1434 0 obj
-<< /D [ 1432 0 R /XYZ 78.37 808.885 null ] >>
+1383 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F22 367 0 R /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
1435 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 768.829 null ] >>
+<< /Filter /FlateDecode /Length 2970 >>
+stream
+xÚÕËr#7î>_¡C|V¹\eYVªröm+×ìiÿÿðÕ$Aö˲f3Í´Zl
+åðʽfØ—´µ‘yÛ{YOL‹”µž²2€_'¤<É—™ 'fd(Á™Ž’িÉ%ÖÇ’)°™•=Ï…!Z¼Ê€ªå¯ ƒÒ²Ê½ôPbWDˆHžòLp³ ¿Ã
+EšMíÈÂ)$ ‹¯² +#^ò!e–…C©¿(yÀ0¦ø°K8¦ žáˆ¢™½¦ƒŒ]î¹Mì…(äÖe,ó‘ªk{7Pv¡q|jGIÓªbNÓóëдZìI•bd,æ³êlx„ïh²DITš­"ã|{0F¶è kŽ­H²j&v‚'³L=³cœ30‹xE½R•¹ZL¨
+%;¸3hhÍ4˜ÁÏêch
+«xAwì%ݽTƒ±°H–ZÎÄ[ ßéŽ úAýc3_CéÕ)åÓ´â»ã¶‹ü’YðÃꆂJ& î^8.Ðâ‹Ü`ֵƥs9Á$,á‹RY$à«…w-9þ/¨[Òòœ[ê¡HUëvÅ%« ¹æV\’¹?¿ªþ×t†ÉOJÊäƒÝRw'PΣ¡¼ŽE=ŠÆÛ™& ò+6Y6,gyêS$ãz;^JËGK œ¯8) LÃ]-|e5&P¢ßs|'RØ3‹.cüxÍ–è¾ÕÒjêK0qp÷M·‘j÷uåTF2mÍ úTY…@i-6çVíLi,Ų̂&Ë­$}‹OKJߊ°§kyËÿOp+~I—ÞH離*©†àh39œó¡3¡ΩRåP¡dpêÕ«¾·µ˜¶‚ÔW½úÂßveh|úX²ÚW¼V“襞Ôõ
+—õj°£åˆŒ(çÓ)ž™Ú%*hMØq{‰ÙòÝ ü®"ñ“øÓ½hàƒpa¸‰òûí¿; Ï !1tU… 4­Ñî¡JoÐ92§æ˜ó/%øª¬R™ÁÛe¥;˜)w#»®Ù‹ ù³ÐKA8rþDzŽôZÓÊ2ÿl–gkQQ®ì6“Ä ô”uFÍù)&ÃÜ[Z×9Å”?çÝKð覚ç³
+uP¿·Å¸Ý$fÔHÓ¬þ®¬éçûóRÅj‡f›z<®ÒMo(h|®ÀÍÁº²–œ[8kzÛj9Æ
+ˆʈ“=GD¡Œì„Ú)KX‘)œ‰´g0¨käüðZÁzu#Pï^f“>̈́Ѧˆ":o| w^‘q‹ºëù‚ŠÔ–y;øÈó£|E¡l ÐØ/2ã=÷ÙÍ¿jˆàqß’E5t÷„œNu%¿ZYë·ÖEy£¸Ô±Î•)Äê®…ïÉÏW[Ÿ`´ƒ}ë½Ú/‰1H&ú&T õŽÎÆ¢5²žBéËíÏ,åWr~švýœG—n²â˜h9*•hDß¿ŠÇ¡ÎGeý8ÆÊ€{çhĽuáé{Ñ» ·‹d7òx‡©`²ï²E §j©Êy4„SÌÊÁ,éæÚ:ò+׿\Xßw ·ÔRIP¥©Â‡ÑÌxçð4/ouB!—¹¥’x!‹&/¸ì•Ã­0 O’"oÝ„ëï›pÆ1t!Pº÷E¹˜½(»‚”5LƒšaZ«ƒ®™q”ýyW.èDXw'»õxçÀº3.)ØÚÉOgÖ¹xÙŠ¿–Œ£Å‘>ÞRò$â©5ó¾{-±¹¥Ó×ÎÈjÕ eŒ7áGý©–þwbÕÑþU6Õ™]N1”w2Ð8²ÿbãµ”Õôä|ü#”fz‡ëŽ—n³!P~VüóÄاVÖn»…ÆóãVS¦,+Ù¡ši•æ”±IÈkJ©XòÂù6ÍúxÎæ,n[WMô{þ 8&ÂÆÐ38÷Š?Bs÷íÙTà*o;,³–·.<ì4iR3Ù*¹Ÿæ Re¸Xrî}üÈH
+endstream
+endobj
+1434 0 obj
+<< /Type /Page /Contents 1435 0 R /Resources 1433 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1000 0 R >>
endobj
1436 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 757.87 null ] >>
+<< /D [ 1434 0 R /XYZ 78.37 808.885 null ] >>
endobj
1437 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 746.912 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 745.915 null ] >>
endobj
1438 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 735.953 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 734.956 null ] >>
endobj
1439 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 724.994 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 685.222 null ] >>
endobj
1440 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 699.133 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 674.263 null ] >>
endobj
1441 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 661.316 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 663.304 null ] >>
endobj
1442 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 611.545 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 652.345 null ] >>
endobj
1443 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 600.586 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 641.386 null ] >>
endobj
1444 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 586.68 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 615.562 null ] >>
endobj
1445 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 575.721 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 577.783 null ] >>
endobj
1446 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 564.762 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 528.049 null ] >>
endobj
1447 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 553.804 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 517.09 null ] >>
endobj
1448 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 542.845 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 503.221 null ] >>
endobj
1449 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 503.245 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 492.262 null ] >>
endobj
1450 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 492.286 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 481.303 null ] >>
endobj
1451 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 442.515 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 470.345 null ] >>
endobj
1452 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 431.556 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 459.386 null ] >>
endobj
1453 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 420.597 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 420.008 null ] >>
endobj
1454 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 409.638 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 409.049 null ] >>
endobj
1455 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 398.679 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 359.315 null ] >>
endobj
1456 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 348.908 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 348.356 null ] >>
endobj
1457 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 323.047 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 337.397 null ] >>
endobj
1458 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 312.088 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 326.438 null ] >>
endobj
1459 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 301.129 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 315.48 null ] >>
endobj
1460 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 275.435 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 265.745 null ] >>
endobj
1461 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 235.668 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 239.921 null ] >>
endobj
1462 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 224.709 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 228.962 null ] >>
endobj
1463 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 199.015 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 218.003 null ] >>
endobj
1464 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 188.056 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 192.495 null ] >>
endobj
1465 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 172.2 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 152.802 null ] >>
endobj
1466 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 161.241 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 141.843 null ] >>
endobj
1467 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 150.282 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 116.335 null ] >>
endobj
1468 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 139.323 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 105.376 null ] >>
endobj
1469 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 111.511 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 89.593 null ] >>
endobj
1470 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 100.552 null ] >>
-endobj
-1471 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 89.593 null ] >>
-endobj
-1472 0 obj
-<< /D [ 1432 0 R /XYZ 79.822 78.635 null ] >>
+<< /D [ 1434 0 R /XYZ 79.822 78.635 null ] >>
endobj
-1431 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F65 335 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
+1433 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F81 377 0 R /F59 346 0 R /F84 425 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-1475 0 obj
-<< /Filter /FlateDecode /Length 2185 >>
+1473 0 obj
+<< /Filter /FlateDecode /Length 2621 >>
stream
-xÚíZÉrã6½û+ôƒº[•JU¦-MUξ¥rMNùÿk°%k2ñä@›"ÁGôëz#?üuà‡oOœIæþ~{ZÞž¾^¤=³F Þþ|n?ˆƒ‘ Œ<h%Wâðö÷á÷#çŠÜ!ýqúãí·'ž0¿^  ³J¡©A„PLKÝ£€CÅ¡€;Îñ?úsûséîà çŽÓ 2?©›_KÂànœÇq¿ñR°
-<ß)>Z&{ñçÄoQfÄ÷ã*ñU>—õZc!KRmÓ"ƒaÂÉÓ‰Lç9‘[”÷DöSöÚòô×ü½0>Ÿ_Š5ø±ôÚØ€ˆG^˜–†_"ô¯»H¿â©ŽÊY²„f
-üt+wÌ õû¥ÛÞä¹5’-¬¼B<VX!K¡7½mÂ}­pTYu~n*­ÝŒÙ?¿®Æ%ÍSùãþµ¨0B1hÀÌi E)* KX×÷OO
-FS–s+ªE¹cä† ¦1õt(aóÅh9R &åMR—]K¹ë¨¶v®zë†|)ë1_kq"훧 ˤ¤ÁlpN/-
-4BzkÏŽÛÿ×Tb]L‚åÕWǶa夠Ò*
-ǖ»=FPy$Èçíøj‡ž“ë™òÙÆ÷cúŸ¶é¯!ÖqŠjî´eèLI«uïöß/€½ýÔѯ'ÐÇhe ñ£éés#¾€9Fß_€n²]FÙ~°Äú«y¯ÍÏæ¸$î¿+FâB§#ë$Þõ{Ý5söû_z+&1Umfôþ<„'×ÿRDzS‡ ã:‰"” Ÿ¼j;Ur`J–1Py
-(Þ™‡à6$lˆŽB"‰(v|mŽü‚êc´¿)º +D%0êµY8DâÇì‹òý#æ+™$8Ž1£t+€”Ÿ={¬Œž¦­ó´)™XzIäG›éŤJ þ©è ó“-NŽY”ÍÖü´’çQ ¯å%%]EÄçy¦6¸ô í:KbºÕm"½¬¤Ê»µJ _ÓÖÂnÉKnZÄ-µ•à­ˆªðÁŸ!ÍÍÀûxjß¿î'&nuQªÊ󥬮<Yÿ@ :Þ}­"±K°™I‡$Ýš†8fo–šR‡2zKe˜6M¼‚¸?ÿK¡w‡²?Px/HØ2—­</ uÂ|-þ¾@BJÍ `OØÞ\0ÅŸÊOH¼?r6¨˜%œ3ŠzÂ'sÔåŽi8S·\ÓxžŠ¨;”ÇdõÜ=RýTq®¦Ó¡„ÂåRÕm^“‹ëª0)d˜™®@wOÓÝ™Ñqí²~èQîP0çŒf¶/q³šY0FÐîKZÃÞQœ#uÒnZ
-u! {.U)5\¶We½Q^Ûì4/q`uÐrkÝk~ÿš%c7b “¦TÚ¡Ì;7Ò† œÛdñ»C¹µ¶j·ó ‚”fB .f²€Ý¡ärcétŠ–ØfvšR1hW §KÇ
-äݯ.9uÑ2¤¦‘É=ó9¿ ´¦ÂKQk´`\ë¨rºâGÎeÉ^ÌÉâo‡òYÛ .ÞvÿUOÖ^gÉjQ>[;
-hÆKákee®žÜ¡Ìg¡àœ·(…­Õ—Î}‹Ý¡<¾ø\2ACp5ùåP‡òYË]Âfï& ÌÊg+w ƒ `*'ÉåIù³óNø›u•È¬üdÎYÎ[ùÏÇÔFN_—¼y‰Ä¢Ý¨Û Úy¸`”­5¿ø™ÓH‹òoh䇥+_Šf®&“Íäj$6)–8çصMíÓ–³‚HÎP’L6Ò;”ÿ·]ØiaÿyNüå!âãCÄñ²6ß¡ÌGEBhFš†iÌç;”Ÿ¡÷!¸b²­óš«åw(óüZGÔÃ,vFo’ Õ<¦÷aˆ¹$}°ƒ‘“BfÜ~Ú‚Ä]žVâ¼ëq_÷C™ò•Ä¯Ô ÑÈqÀÞÈ,)¡)J(}õ~,„j,qfu1 ³F%ç·§
+xÚí[Én$9½û+òJ%QÔœNGsöm0×™Óüÿµµ1´f8”.=s°33Bz")Šk¿üçÂ/<q¦Â7ÿÿ§ëÇÓÏM¹ 2g…„ËÇ¿Ÿ„Ä/âb«.F Ƶ¸|ü÷òÏgÎ5r.­ÿT/ÿúøÇϘ?7‹ËœÖÒÖ Bhf”éQ  \=
+ç\ ÿyóŸþš~÷÷¤¿é>úOô÷à-®ösêâü* ±^Å8&ý¨˜ä…RO¥ÜÖË)¥¿"MZ múS⬿n ¬$¯4Z»DW¸:Þ 8ÒÐ/4i¬x ë¾Ø¸šŸcä>""Գﰥqš×«zºò/ñ–)äé3Ra^AüЕ ¿€pã]}‡f[ñh€z\¡5PÔÉqËTé´k2s´ÿT6éF¥gŸ)™D&%Ã5%kQ‚’Å ¹‘X=‰×|ÍeA^ù3VÂØ02ó
+T`雂3J)ü-«‰&EøDONU¢N†«ºÛ€4ŽfÆ#”)MT¿€y¦¹ªly¢ÓàŒNàŽi7P¤$¤´KïvÈ1 2?oàY•#–xéùMœ^ƒÜépŒ‚jçñvªð™F˜@ë.EÌÊœ~Åc˜y‰h·rì`Û×ÍÇó]áPCu¨Áa¦§V|‡†ËÌ3Ý­P
+îÑŽdÍá–q̨٘µ6™IB× ðåp¸?Ÿç`@üØÌ\o•n,Í­¶=­ºr±éÚŠ„ÙÅR”«/y­Ý^Ñ6ëˆäÈú‘Õ«çMìÒ’}O6¯¬¯°ƒ†¹A5ÙE¦æq·j‡øîÀL¢?’ÌSÞ›D)—Lb‡”(ðHë•(üßÕµ(¾‘±‹3±ùu-þ:0~£N˜AúQ+ ‰‹ÖŠëðeQXÍ„½(ð}M-Ê×D¡ÌLуЎ_+Ûà¾,£˜PX‹@³êÖDТ|QôLaç£Ñ3‡"Ò _‡F&œêÅ‘=òiq´(_ÇT#t6]2Çß(%HÝ‹D_×DÒ¢|M$’OíÅÖZi
+f&ì‡Vžfí4ÞGÏ­vû´ZðbÈÉÿPh¸‡ÉÏ9ia½ù@…çÔëq˜Ä¥'ßö3sØ’fú˳™ÂX~û™4¹ãu%°Þ{áQTLIç™$ZÇ
+ê½U’r)Tz
+¿å4€Í¸uñM—Sh«³oZ£ž_ül¦S§zÄÃgQjf»$
+Ï'Q´-JÙÜbò8y ˜í’<ŸÔБjQ Ù®K$p9‘èP¢ñ•I (¬Š*•SE²Z1ˆ×3ËU›n*+Љ¤k­ó/N¤]yY >^wÆ y]Û—¥Íž©^O'É`IefŒN_.–ê!õ+f¾ 3î5ªüAÑÈ¿Lã«Nd˜W
+%:xd—Ö—ùS¿žÈóÐgZ Ì4ÏK%ùI¬n&±:Îcu:wåzàš“ *Á¤¹˜$¼cda˜üG›’îRõx¦ÏÁ
+T.yv{i4ƒª›èJX×Etl‹­¹‚Œ¢/W×Õò¾6ɘl—¡D^ç_ñ~ éÊÞDC˜4ÑB
+Š:P‡¯©}gr£,’mž«Ô°á‘šy‘*Ê¥>i$ì:¶°ön]œÙâT•L0uIŠ\£”¯9낱¡”ÄE{Ûk Ýîjd’ëvwëuYÝèãúŠw ŠÛs¶µÈgÝÌ|šy|½ÀPbOÁnUº®ë®•{€Wº<¡4BêÁcù9*É$~él²šýR‡²ƒ#“ÖdØ¥¼C9/|+Ìf–îQ¬PçÍ÷á¯Å(…׫!œPKQh òŽ&>¹Y¬Š8Ã.GÄåLµCs&pá¡ã¤î?òhéÙë
+rØŠ­›ÁÁ“¶­ÞÑü—x&%¿,¯UO\ϱóF°§–œ"¥'y—’3©]â®@f:¸<¢VzÐr vÑùÑ>•Qô#ÞBºÐûÒºÅ~r‡XLr4žÍ#3åÅ+r{¤.mèÓ ŽîléÄïµ5®G™œ–©éŠÅ—XÜC°Ê›ÿ#&MèË5NÖëðjÿ·C,ÉŠ¬ïŽÆõ¤-[Ðî´(¿\ò«L)Á$ô<-Ö@Z(m“Í纔1X,1P´ÖŒéPŽìËã Ž!—=¹gcSnâƒ|ÊÇÆóÍq$ã\lê s`{¨poÙp„½|Ï6ox/§Ê¯wüÔàÔÁë½
+›Z0ÀÆkáû²CíPþ®^PœÁ «Å§­Z¿[Ÿ¤Où¤èe´1t(…>/€õ¹, Œ­u?:”Œ¾0 Ûg@gŠ\eêP¾§Ó >]öÍIµKžå±NïÿRwWøÔÛöiTÔµºZ‡ò뺻§Ÿªm«FòÖÊPÊdøPµĮ́œkQH‡ò몵¿·³+|Ò©…í…q6Ö¡=iQþßÙ­:»+›á³e­ö
+J_¼Ýwf«lÙs¼<ý äõþ
endstream
endobj
+1472 0 obj
+<< /Type /Page /Contents 1473 0 R /Resources 1471 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1522 0 R >>
+endobj
1474 0 obj
-<< /Type /Page /Contents 1475 0 R /Resources 1473 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1026 0 R >>
+<< /D [ 1472 0 R /XYZ 78.37 808.885 null ] >>
+endobj
+1475 0 obj
+<< /D [ 1472 0 R /XYZ 79.822 768.829 null ] >>
endobj
1476 0 obj
-<< /D [ 1474 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 742.11 null ] >>
endobj
1477 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 768.829 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 704.84 null ] >>
endobj
1478 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 757.87 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 693.881 null ] >>
endobj
1479 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 746.912 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 682.923 null ] >>
endobj
1480 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 735.953 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 671.964 null ] >>
endobj
1481 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 724.994 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 661.005 null ] >>
endobj
1482 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 714.035 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 623.735 null ] >>
endobj
1483 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 703.076 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 610.375 null ] >>
endobj
1484 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 692.117 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 599.416 null ] >>
endobj
1485 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 681.158 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 588.458 null ] >>
endobj
1486 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 670.199 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 577.499 null ] >>
endobj
1487 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 659.24 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 566.54 null ] >>
endobj
1488 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 648.281 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 555.581 null ] >>
endobj
1489 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 637.322 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 544.622 null ] >>
endobj
1490 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 587.509 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 533.663 null ] >>
endobj
1491 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 576.55 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 522.704 null ] >>
endobj
1492 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 565.591 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 511.745 null ] >>
endobj
1493 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 554.633 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 461.116 null ] >>
endobj
1494 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 543.674 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 450.157 null ] >>
endobj
1495 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 532.715 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 439.198 null ] >>
endobj
1496 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 521.756 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 428.239 null ] >>
endobj
1497 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 507.808 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 402.924 null ] >>
endobj
1498 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 496.849 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 391.966 null ] >>
endobj
1499 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 485.89 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 381.007 null ] >>
endobj
1500 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 474.931 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 370.048 null ] >>
endobj
1501 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 463.973 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 359.089 null ] >>
endobj
1502 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 453.014 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 348.13 null ] >>
endobj
1503 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 442.055 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 337.171 null ] >>
endobj
1504 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 431.096 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 323.811 null ] >>
endobj
1505 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 420.137 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 312.853 null ] >>
endobj
1506 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 409.178 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 301.894 null ] >>
endobj
1507 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 398.219 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 290.935 null ] >>
endobj
1508 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 387.26 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 279.976 null ] >>
endobj
1509 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 376.301 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 269.017 null ] >>
endobj
1510 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 365.342 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 258.058 null ] >>
endobj
1511 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 354.384 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 247.099 null ] >>
endobj
1512 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 343.425 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 236.14 null ] >>
endobj
1513 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 332.466 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 225.181 null ] >>
endobj
1514 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 321.507 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 214.222 null ] >>
endobj
1515 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 245.791 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 203.264 null ] >>
endobj
1516 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 234.832 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 192.305 null ] >>
endobj
1517 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 223.873 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 181.346 null ] >>
endobj
1518 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 212.914 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 170.387 null ] >>
endobj
1519 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 201.955 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 159.428 null ] >>
endobj
1520 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 190.996 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 148.469 null ] >>
endobj
1521 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 180.037 null ] >>
+<< /D [ 1472 0 R /XYZ 79.822 137.51 null ] >>
endobj
-1522 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 169.078 null ] >>
+1471 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F81 377 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-1523 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 158.119 null ] >>
+1525 0 obj
+<< /Filter /FlateDecode /Length 2467 >>
+stream
+xÚå[ÉŽ#9½çWøJ%‘Ô ¤Óéú\·Æ\gNóÿ×Ö’¨H;䪬`®òñ‚¤¸<RJyúÏIžþx‘BÇwáß?^.?^¾ß´?‘ðN!œ~üûE…‹äIœàôÉ%¤Q§ÿ=ýu–QJë¥4o¯ÿúñç‹,˜ßoŽNNxcÐõ Þ
+Žƒ
+«˜üþ-}\Šœ&¾ž¯oÚa¬—–¡´e(=\ødž/üo•ãâå*%®ÊbXvðUs9NJöAž"[*.Åbg(ë9FkŽ€‹q´’–ÎPþr¸&%œÃI±·5_Qž°/Já¸GkdÉá åkr¸V>H 'QÝZòQžÏáÿWy[úànSJ:Zé«éG”_—·É;!ÉNâÑR,1”'ÄpVHç&Å¥”ÉPžÃ ð\ŒÅŽ›¡|ÚDÆh°-m·—6ûv%ÅÏ­%ƒú]M©pÛ•ŸkEÈè`ÕÁo˵té|jW e[&¤õ{M-ü¡ ÷º.¿ún›öæ`Tp3 ø|ä
+ÐÈE=Ê:ª¨#ʽyz?]Ÿ£‚
+õ“©(uïjÞ®H´ÿ4ʧ»¶¥rÖÅiÏ©µ·oÒÐåš'€[y¡r„ú‹z¯ï¢5’|¾&€ÍN¥ÜœCö£ô÷½l•—T^A—êNÙÒYÂÁºÛ/MbÊúÆW=
+j3¸¤ â¹ñ*5AÏiêUÕ¶Iæk¹2±˜U'G‚œâN~©– HòÏn@ö´8UºK?|ý¹I´Jh˜’íQ²\RCYo/ЄËÌœH×vøÊ×oL"yaäœP×öÚÊïÛkëÝxgŸmÕè„!=¹Ò­e(#¹¡b–´ª{y²'IGötîîËßQ·.þ|þÜÓ²ÊP³ñw—©9‚ÆnÊEjÎPÖÏ:4S´ÎëI…¢H0ðëH7¬Ê×% tÅÇÅ=JAkVQ%°N8ÓÚ©Öäôë 'Í
+=˜ØSÔ×ò\K{ÏUÚíÍôäoÙŠtg`+7¦
+Ôæ¼o^Z¹§Âzb€ÄS Ѳ9XZ(Ä{àÖÓÀmZ¿N•PH;…ÅÃs ¨ë«
+Á8iÏõß{·ªhïðTt§a ß/+«@(å'×Z#ä …ï§D¢‚äÚ©„ãÊVïØ&iOp@*¡Æóª¸~\Ž¡¤°¿µ™CíÚú3A[?g­sú‡ÓÑZ<Ó1¹R'Ò5ÛSg—ßÒ×G>̃]õ`÷.Q…úãñVôËÔŸ¡ŒÔŸ›“wEi†ziyxôŸŸ3aEèû£ùnÆŽïó<eƒåô–¬zux®Ã :'uòX‹¦ÁT£ m€–',OÖV'cXhƒ˜d=¿‘†rE»^ϼGb­Tä¸f-JïsD²ÿl–k;g—E ¬/³¿Ámj¦ÍèªaÍuPW—þíÖBOæN[P¦p'H2Ü3…‚¦CØpfǹg2(<!GióMÚaÈm¡·†aëÅ 7l×kK
+εíØyÉÖІ’¤0QÑW­Ï­)6ׇޢ´Më=J°Íg¯÷I¢…ÐX)~wÚ½ B™JêÒ暤ú©nµ]¾I×.}#Ä]{l<ÛeÌ›…ú‰L?<-‹Q›ï¸µE Õ:µq›ÄžÍLy0jÉÆ}ýiû°múŽ&ïdcN©U ¥Œ¾efß*cã¨3ÚûžJ4iÅq?«
+ÓiÈc•â~ÿKA13iÆSÎätù›˜rܱ”j±Ð`÷ž´rPņ`BÁÛÖÖÑ>v©©Á3Rú–e¤OU~˜w
+ܾoÜõwòz®ÛÁÄC>$ä7—¼³Ê™H
+tS;±8ãc(S‡Z¶Ý+C²Ô6ž*s–*í>2
+Ý"å“?C`m Çý©öezâ´½j~ðbüK(tËÉäèÙ4Ï>ÈîlC7×Ù9ç°{`¯£äŒÿØ’lS&h§‘ú? à©r^²'–F9AVñµY<
+endstream
endobj
1524 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 147.161 null ] >>
-endobj
-1525 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 136.202 null ] >>
+<< /Type /Page /Contents 1525 0 R /Resources 1523 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1522 0 R >>
endobj
1526 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 125.243 null ] >>
+<< /D [ 1524 0 R /XYZ 78.37 808.885 null ] >>
endobj
1527 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 114.284 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 768.829 null ] >>
endobj
1528 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 103.325 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 757.87 null ] >>
endobj
1529 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 92.366 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 746.912 null ] >>
endobj
1530 0 obj
-<< /D [ 1474 0 R /XYZ 79.822 81.407 null ] >>
-endobj
-1473 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /D [ 1524 0 R /XYZ 79.822 735.953 null ] >>
endobj
-1533 0 obj
-<< /Filter /FlateDecode /Length 1964 >>
-stream
-xÚíZKoã6¾çWø,—œ¾
-˜ià„
-Ïà4žöÑ@-´3( x)É…ÿ×pA@†|žÃýpYzü¢A—ÑËÈ8+®F¸§ž›{nZ0e€æ‚ᤵõ(ô+
-ºTsʚΠ;í.¿¬Œ)ËWœ­°qº%$YÏkýQYG”µ¦©£ªnç—22U1³F®µ†X¾³RõVxp$åµËšmò¯™©ZGZŸKãëçÛšûR iƒn›÷Þ¬ KYœr] 9T¤RÍj‹Œpf ¶z*$0”ùí…0/Ç@JS”¡¼H£_Öt\íz> †²Tx*ÎÑîQ¸±µ»ÎÏ5¶-%ÔmÈtÓ>l£Ö˜®8Ci~³\Y{ ߪ¬åÇ)«M½wT’D!¡Û£ÄJj²,g(ï) J½É„_DØ HE™Öd5 ,àu«šüœínØrK-»‡Äýv]ÝZÑ™÷
-ß+BDšdïÖ ,Hòo¬ÇQ•SB)Åu5Y¹3”çámVßðîYeX)”†AOS{J†Òïõ¨¨%ùÎu«ll÷Œ{lé]{(©TÝšrÄçïí.µnÙ³ò7çíJ{¡<rUâ\Pd(ožU” d]v¨dcª­¸ŠÓEG›.tˆœ
-êšÑí/âJ³„¡Ü§Y‚DH¸œêÞò¦œØ3”ãÍ’TËÇÿ©q‚V À—aoåT—¡Gù¼Æ š0Ìà@ïiʯÊä…‘Äiì­Jød(h †ô@c.‡3”Q¬0Î ‹¢§¢8Cù¢8Æ‚ ì ÍY[r@¿R kÜ°Ì8Å{”ûDqð$œÎÞ¼WÂCùÕòÞ¥z”×\êý©¾j¾ù¼¸ „óÀÙíÍîÅ“ÊF ÈiL¾#ÄPÐÐRxK¹nCù¯¶¼ !Õ`¸“¹”¡üjykyx¢Ð°nÎ2{”û$gPNHo'ÒsT{”ûµ¼AZ¡Ð tiª¿ÅPvµ¼•“šíÛuõÞ6ƳZ0šµlÁÄ€O%ÖV-¼”ç†ð³ñ\¥ÐÞ OÞh1.íÖFÁV.
-~K2
-”»åëÑ`¾» \Žpo­Nè}©Q†…ÛÐ7mâP­]¨6æã1ÞÊ¿_oi ø¸{ö°öýƒŽx•»yŸ ßi;ïõ}‚åxžuçݹ5 *ï3DòpÉAacG^\€ZŽÞU¥ÛGO|"˜mM~à
-ŠhÌ7ô•Nc¦Â™†>y¯¡¿¿QÿÍÈHF ÀÞ¾„)†2¿å‰›Bb¯ÎÒt÷‘¡@Í9mÕ~Y;T*öè ñÀ=j6;Ëê
-qÜÚÎ.›Ðù—„½9.ædO¡
-?&ˆ"DÉ­Çíû…­Ö±ˆ‡*%Ah䜫î{äô·õݱúöMÛD]Þ«‚¦Z­›Ï‹þš:Ó[%K¤1ËSGƒ_‚×5w©°Élî¤
-c°Š«prOЃô¥:W&oæ¦mÁeÁ½í|Ÿ+BÛúg³“€7+!„Z›âfp$ëÑùõõáVÒ¥°
-endstream
+1531 0 obj
+<< /D [ 1524 0 R /XYZ 79.822 724.994 null ] >>
endobj
1532 0 obj
-<< /Type /Page /Contents 1533 0 R /Resources 1531 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1590 0 R >>
+<< /D [ 1524 0 R /XYZ 79.822 714.035 null ] >>
+endobj
+1533 0 obj
+<< /D [ 1524 0 R /XYZ 79.822 703.076 null ] >>
endobj
1534 0 obj
-<< /D [ 1532 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 692.117 null ] >>
endobj
1535 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 768.829 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 681.158 null ] >>
endobj
1536 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 757.87 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 670.199 null ] >>
endobj
1537 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 746.912 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 659.24 null ] >>
endobj
1538 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 735.953 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 648.281 null ] >>
endobj
1539 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 724.994 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 637.322 null ] >>
endobj
1540 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 714.035 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 626.364 null ] >>
endobj
1541 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 703.076 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 615.405 null ] >>
endobj
1542 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 692.117 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 604.446 null ] >>
endobj
1543 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 681.158 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 593.487 null ] >>
endobj
1544 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 670.199 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 582.528 null ] >>
endobj
1545 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 659.24 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 571.569 null ] >>
endobj
1546 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 648.281 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 560.61 null ] >>
endobj
1547 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 637.322 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 549.651 null ] >>
endobj
1548 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 626.364 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 538.692 null ] >>
endobj
1549 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 615.405 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 527.733 null ] >>
endobj
1550 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 565.591 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 516.775 null ] >>
endobj
1551 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 554.633 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 505.816 null ] >>
endobj
1552 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 543.674 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 494.857 null ] >>
endobj
1553 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 532.715 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 483.898 null ] >>
endobj
1554 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 521.756 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 472.939 null ] >>
endobj
1555 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 510.797 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 461.98 null ] >>
endobj
1556 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 499.838 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 451.021 null ] >>
endobj
1557 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 488.879 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 440.062 null ] >>
endobj
1558 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 477.92 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 390.249 null ] >>
endobj
1559 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 466.961 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 379.29 null ] >>
endobj
1560 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 456.002 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 368.331 null ] >>
endobj
1561 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 445.044 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 357.372 null ] >>
endobj
1562 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 434.085 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 346.413 null ] >>
endobj
1563 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 423.126 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 335.454 null ] >>
endobj
1564 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 412.167 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 324.496 null ] >>
endobj
1565 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 401.208 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 313.537 null ] >>
endobj
1566 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 390.249 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 263.723 null ] >>
endobj
1567 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 379.29 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 252.765 null ] >>
endobj
1568 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 368.331 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 241.806 null ] >>
endobj
1569 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 357.372 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 230.847 null ] >>
endobj
1570 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 346.413 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 219.888 null ] >>
endobj
1571 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 335.454 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 208.929 null ] >>
endobj
1572 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 324.496 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 197.97 null ] >>
endobj
1573 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 313.537 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 148.157 null ] >>
endobj
1574 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 302.578 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 137.198 null ] >>
endobj
1575 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 291.619 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 126.239 null ] >>
endobj
1576 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 280.66 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 115.28 null ] >>
endobj
1577 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 269.701 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 104.321 null ] >>
endobj
1578 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 258.742 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 93.362 null ] >>
endobj
1579 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 247.783 null ] >>
+<< /D [ 1524 0 R /XYZ 79.822 82.403 null ] >>
endobj
-1580 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 236.824 null ] >>
+1523 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-1581 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 225.865 null ] >>
+1583 0 obj
+<< /Filter /FlateDecode /Length 2821 >>
+stream
+xÚÕ[K¹¾Ï¯Ð0MßÀ`
+”ÝÁÛ Sf|
+lL‡77 )ì’Ó"hÅ©7O‚ðÒOæ¹³á5žÉ'*Mê·Å‘“ô²#%†Ã¬z/¼ «û
+€’âD YŠ­§KJ'™ß@Ð
+è¢!
+”08µ-?¤Ò>U°WÂÕ×*&¶#_‰}Yeܸ¸Þ5¬ßP!¼|šgoªåþèݾ­U˜8õ^i­¡Šy?‡¤hœÂ\ ÛRœeöö^5:0à½W\r¢  ÒòÍ8³xRíeÀ@‚›µL4*#ÆeU>Œó»Cs®óõ@S6“mcd)tm/¼£“¼.„ma©ñÊÀêÒð\R^†Þ×ÂB.2\»þÉm©¬¯öB5Â~«–púJé²k1¡5©©1^z`aê^…祾Ñznylö^W.L½­›åÛ¥“îß4¸{#Äcn5müÇyª鎇áä|AQèz¿•®¤03…G±ùld‰ ´r|5òŠ¢›îÖÈŠ‘al² ¯Z“–Wú¥oý§¹?šk©†;=Nõ=µ•Âq ²ó@_Ê@âçéy®|>,…m–ЧCˆ’Q9^òЄ ÀÙØ[/¨KFeí|Ç¥Ú’t Ž`ä®fÂÉÀB3è¿réÃ’oZwóô™Q+/<L§†½¥pByàTNèX¢–œLÍê;2*ÎðTÑ´×îHðùûêôáû€H!ZäßÌ!‘2*dˆ$׉’úm[…âc}¸|Î玺 l¯kœì89AÀ÷|Á•çrýþ&ënì ù«há@ƒv›(eÓ1+¶³I¾6ÑßerTYŒ]%öúàVÑpFmO7Ððñô e,çСµÑVrZñ^ű
+Ü·÷ØwÔõŽôÁ¢XuÎ\ó;ojªûŒ’Šm:Ð*¶ÕO¾‡˜f¼~Otp™íÙTþÉ%£·å¨ÂÜÍTÔÚ[â#S7ïhü€ÖBŽ`̼î/ïÕ«ŒÊOãcŽ—gu¸[ž}à3*[gC]»  Î°ëïÚí²ç<¯5 †g¹çqƒæ'S0.O·ƒñ›ÀÍß]§ë^Z»?;P"âÑŽIçÝÍNÇÔMbÔûß|Ž‡‹­šœ¹ˆý¤<M÷!ÆR‰#‡µ"†¡:³DÓß¿X+
+»˜ÏŸtUýÓÊz£$cŠ'±ýõC2ÄîÇ<ÞŽÄͲÞÕŸAE#Tð÷¡D&c’ËiµÄBªrðÄ]ÑñÈQÊ–®ÝßÂgr¼
+Z
+endstream
endobj
1582 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 214.907 null ] >>
+<< /Type /Page /Contents 1583 0 R /Resources 1581 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1522 0 R /Annots 1626 0 R >>
endobj
-1583 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 165.093 null ] >>
+1626 0 obj
+[ 1580 0 R ]
+endobj
+1580 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 435.916 202.655 446.343 215.384 ]/A << /S /GoTo /D (Hfootnote.38) >> >>
endobj
1584 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 154.134 null ] >>
+<< /D [ 1582 0 R /XYZ 78.37 808.885 null ] >>
endobj
1585 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 143.176 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 768.829 null ] >>
endobj
1586 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 132.217 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 695.106 null ] >>
endobj
1587 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 121.258 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 684.147 null ] >>
endobj
1588 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 110.299 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 673.188 null ] >>
endobj
1589 0 obj
-<< /D [ 1532 0 R /XYZ 79.822 99.34 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 662.229 null ] >>
endobj
-1531 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
+1590 0 obj
+<< /D [ 1582 0 R /XYZ 79.822 651.27 null ] >>
endobj
-1594 0 obj
-<< /Filter /FlateDecode /Length 2841 >>
-stream
-xÚÍËŽä(òÞ_‘?ÐŒ
-í4®êÖf:Ó A¼_„k¹ýï¶Üþúvÿùí§47/<*„ÛÏÿ~“á‡å&oÖ mo¥XPÞ~þÿöï·e±òÝéð¯Vïßµ‚ð —ømYäeQÏõ©OŸ´Î„'ÖÀ#<±ËbdÞ÷¼/®Ž¿Ççð V•U*¯H0U»¢®7ý™ÿùù¯@—…-º”1B‚ã”%<~Êîm®( bÙ6‚kÙ¢ô»²ñŒOt:€5PÙf—Jz<;ÆÆ' ¹&3%¹CzY ˜ÏOgà!C@ƒ0Æ4©Œ™züCÆ
-“)É{–úˆ¦lè#ÞeäÉHâÙ‰Ä }Ðz“Ù02‘Q3„•CIÙª5•ã9ÇÔ¤ÕæGV[Ðí·“V Jà¬<iµ¬ä ÆÖl+½=ËܘRj+¤©æt GÝú®5Ñ¬í±¦Ià1¸
-
-¼ðYæÿâçøl•ŽÊÏF“-ûž¤:ǾMA ʸË”.?‰.Çs9Êa”Ý:iÂåh ÂûJÄ*éÅŠYpÆÕ502¸GJO™GÚ%ù¥ß)à¶uãPßmð;ÚsÚN:ðÁñh¾¹ø¸q&f
-éÕÊ]ð:©  ’HüñtpsÔŽkµ5–C‰Zy…Es#MÑÇÄÏI€l±x‘&ª˜mÜß¿›þ®Ÿî­¥ÐSüX‡j5{páG»ZßGÛÓB Þ„}†8ž˜¼¤[!ÚiöËð¯ÖœýhæØßCIì×Ù-%wìz1d6„ÏØ1nà Q“õ¨Ñ)­ëNØÖ†0"»­+0–¼÷œP(“"LVcÛq–£Ð.g2ÂA80'œJγûϱ%éß½$çcÄÐk¡ƒâBO1AùZÝx!ÿY‚Ú '>æî¡lIý5±Qª)Ö-• õ¬êqV
-‚jC\üÏú9âz(׈¤?cI:aš0\Dl{ÂŒš#¬‡ÂãÅ‘Ue#ª÷êPGSݬ‹Ä\û+Wà~eù˜fCHÁzμŸcÃb…Å¡({˜Žä„•fåäŒø»òÈR+å-åæšI•uM¬Æ…Ö¶߸.¦uyÝš®Ðó8M•R¨PÓ2Ì‹â¦|%z׶&Z²ZÕj×yœ{+œã&$Ã>ÄVuÞn`ÛQÂöQƒ5iTj7¨ã|;ÈQ±bª—œ5SÏÄS:! •ñWJCH8÷’)P°zPñx $ÛÓ;¹Tkd1¤x8ÀDûVEI)(}OJ˜ö¬%sba¦*©5\’f&`õ0û¶åÐd®§i݈”^};íè!÷;ð­¯í×ÔhiZ÷ºÆ½ÑéØŠÉ-쳋Ėôg©UP¥f¯2îN;®ýÀEqAž·ÃC­6R ©qP·¡JÆ;kTC×Ôƒ`
-³²!ehX…[BÆzêüäý$Ôü­«7$jÃ$Er‰qªµƒ¤XwÚŸSÜh k³‚i;t€›g®NøÞRZ1ÝÙe) ?M ‰ "?]és¥¬N›²¾eµ)yYÛZÚÓ7&["|M@·‹}Òn²¢Ú282ÙWé“t ²ÊÚ¢ï¨í†h‡¥‡q¯MâæF7†Öp'åÞøA«,óƬk¾k`¬ ùiÆŸ§ÒŒ½rÈÐ4(Úòúêm{“4M—(A‰XRÇ^ºµ‹j:Öºžôl'P%z×Óà™ÒÎæN]AØ1M×~*cPN£a´pcR=ÙbPv»% ¶©«ŸÕܨåtôͯ:32¤“jwØá˜hÙî§b›'ÌŠ”pÉþÉæ‘^Ònå‚–h)úb®™ObaB¶‰ HªôŸ•?Æl-º[’i#I¶-´iÕP—ƒ!œl‚€ å§Cöq4ζ&L¼&A%ñÚV=Lœ{ô~K„ÎUý,Úà½X krÂÇù¦CA›A9ÛäLiÜëFg×|húÀ"|uJ[!ôóÆ Î‰ÅΤ³ Œ>Vr(ó*o&¤BŽÆÙ‚Õ¡¤ ¬\Tc$³êj¯…D; z. ‘N…r—©íkõ’ˆòAã(¼çëúõ7¬5\\ƒ%5¡ðµ˜Í ²À1å
-¯7¬c)¥Ç9r6m(éTŽ”Tæ:v
-ë8m/±b® ÷õû‰ÖÞL¥/A‡ìçÔ5ç}©ªžSJêµéõ9굕o¶Í1wÔx{Ö³3™ƒW÷JíŸzFÏZë_Pw­H7¨»›S÷Ê…@{6Æ^ÝLÍP0(ÿ[CÞ¥Õî°KûÂvBVb꬧¼7Óœl”]ã)½NûÖû#UÂ
-endstream
+1591 0 obj
+<< /D [ 1582 0 R /XYZ 79.822 640.311 null ] >>
+endobj
+1592 0 obj
+<< /D [ 1582 0 R /XYZ 79.822 629.352 null ] >>
endobj
1593 0 obj
-<< /Type /Page /Contents 1594 0 R /Resources 1592 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1590 0 R >>
+<< /D [ 1582 0 R /XYZ 79.822 618.393 null ] >>
+endobj
+1594 0 obj
+<< /D [ 1582 0 R /XYZ 79.822 607.435 null ] >>
endobj
1595 0 obj
-<< /D [ 1593 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 596.476 null ] >>
endobj
1596 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 733.96 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 585.517 null ] >>
endobj
1597 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 723.001 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 574.558 null ] >>
endobj
1598 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 712.042 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 563.599 null ] >>
endobj
1599 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 701.083 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 552.64 null ] >>
endobj
1600 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 690.124 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 541.681 null ] >>
endobj
1601 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 679.166 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 530.722 null ] >>
endobj
1602 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 668.207 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 519.763 null ] >>
endobj
1603 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 657.248 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 508.804 null ] >>
endobj
1604 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 583.524 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 497.846 null ] >>
endobj
1605 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 572.565 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 486.887 null ] >>
endobj
1606 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 561.606 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 475.928 null ] >>
endobj
1607 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 550.648 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 464.969 null ] >>
endobj
1608 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 539.689 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 454.01 null ] >>
endobj
1609 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 528.73 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 443.051 null ] >>
endobj
1610 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 517.771 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 432.092 null ] >>
endobj
1611 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 506.812 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 358.369 null ] >>
endobj
1612 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 495.853 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 347.41 null ] >>
endobj
1613 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 484.894 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 336.451 null ] >>
endobj
1614 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 473.935 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 325.492 null ] >>
endobj
1615 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 462.976 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 314.533 null ] >>
endobj
1616 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 452.017 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 303.574 null ] >>
endobj
1617 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 441.058 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 277.671 null ] >>
endobj
1618 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 430.1 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 251.768 null ] >>
endobj
1619 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 419.141 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 240.809 null ] >>
endobj
1620 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 408.182 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 190.996 null ] >>
endobj
1621 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 397.223 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 180.037 null ] >>
endobj
1622 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 386.264 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 169.078 null ] >>
endobj
1623 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 375.305 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 158.119 null ] >>
endobj
1624 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 364.346 null ] >>
+<< /D [ 1582 0 R /XYZ 79.822 147.161 null ] >>
endobj
1625 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 353.387 null ] >>
+<< /D [ 1582 0 R /XYZ 93.716 117.414 null ] >>
endobj
-1626 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 342.428 null ] >>
+1581 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F16 336 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-1627 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 331.469 null ] >>
+1629 0 obj
+<< /Filter /FlateDecode /Length 2689 >>
+stream
+xÚÕ[Én#9½×WèŠMFpNËj`ξ æ:sšÿ¿vpßRé¤ìš®9ÈNe&ƒÁX)~ùÏ…_þü±}üøã.ÔÅ1§AËËÇ¿zÀ/âbCs1Z0®Ååã¿—^9—‚s4/ÿúø3roœuL ‚¤Á–sýN×"~üµ¿'>7†xÏ@¼wúîèþ=»§w·DÀ>áÂif5ŽxñFHðòÒ£_À\Ó¼Îß…«'?÷4)ÿùÜØô.÷÷
+Qê±Ã
+ÓJàæßðøy avWзø^wkézð>´ßæÕ
+„Î)–´
+UܹΣÐ1ëÚÚX(õáN±÷ˆn!ˆZ p‹Üäº-Å—MÏsSXŠæa\ä'Ü–4CMƒW줠fÚq£…òÜsÙ&ë²ú¼é
+KyêäÈÎf¹™Ü%¤ÿÉ6•øvè ^kªÙ×gßì÷Ì¢¾¼O«4Ëß)<¢ÄÖ#"…’STí#dmáÛz'ò}É‘I^¬NïI•ŒŠr„#OgÐa|‰¿Â·.’ H^&­ñ=zÓfù¹ÙÆ©…·J¤&õîœ}Ê6Sú`”ÉÑüyjô^Ì)õ^# 6§WZV+Ù’å4ˆ¬ˆ0åBÒ<£‹ÓoŠ:p¯!îc!÷j^žCn?îmz0Ÿ:ȳæòH9S[Þ ´Äëî¸O¨ú§f÷SÇÐrJ|»¨Roçãîd®”à6÷ªé ËzY¾4²n;fìµå}RÝ·¡B:4ÏýèÙxX½O!²_õ¹®7²|±i: ¬²|¯—²îìPY¦Ì¸’ÅÎf²IÃM5iÙ¬˜å
+w¥ºJ*my'äHêÙŒÏú&Îòë5êÉ­šm»>sXcIcW¹®sª7¯ç׬§=ÊdHzæôHÆb07 üzCý Œ2ÊÐ|q6ÌòèQÖò^Zð¥-ä·Êû·V@F!âÄ µSjʆU
+á8“ö«ž ëÊ/(¡
+
+endstream
endobj
1628 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 320.511 null ] >>
-endobj
-1629 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 246.787 null ] >>
+<< /Type /Page /Contents 1629 0 R /Resources 1627 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1522 0 R >>
endobj
1630 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 235.828 null ] >>
+<< /D [ 1628 0 R /XYZ 78.37 808.885 null ] >>
endobj
1631 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 224.869 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 733.96 null ] >>
endobj
1632 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 213.91 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 723.001 null ] >>
endobj
1633 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 202.951 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 712.042 null ] >>
endobj
1634 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 191.992 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 701.083 null ] >>
endobj
1635 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 166.09 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 690.124 null ] >>
endobj
1636 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 140.187 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 679.166 null ] >>
endobj
1637 0 obj
-<< /D [ 1593 0 R /XYZ 79.822 129.228 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 668.207 null ] >>
endobj
-1592 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-1640 0 obj
-<< /Filter /FlateDecode /Length 3243 >>
-stream
-xÚí\ËŽc¹ Ý÷WøZ‘D=BírÕ
-3„M ïÈ,·™³À…'v"ÍýÏß.éß~
-Ü™‹aÞ‚Ó=w
-°QHäN1cMáÎ| ¯H‹g½·>¥ã~Z_äê¤ÔñUÚ—¢róÀqP»N }'ß­¥”¦àæø  ”P_•Ra6‘ŸÈô$‡¤øyWeÔ£Ï
-àœ€ 0‚R‘Q8ªŠúõ³xÅô,è„,Þ(Ú3"-"‹"xoF?ˆ œ©µ8eݲ^C³¨Çž¶û´+Pa˜”ž
-T½ï t¤òƒ
-ô»iþbçø>Ø s }NêJ3dÙgÂxÅ@Ê…–縆 +)•ÌƱ×d›iëOùÈepx»€¦¿±¢1.¼aÎ
-O7›G\¿(6ßû·É¤-¶Í_îE–}êi—ò<2ëvš¡è=ïìÚuìd{’F™Úrg=ÉNµÓP­Yå0ô®[L¯+ãa½³˜þøÉkÑ¿î¹ö“Ö+E> ….¾wôÊ5×½+w¤"Í6
-x× Tã?”N>¯c]O|9OáT~
-Ð&»QgjŠ~üé ™;˸›ŽÁY—0ï<¡"Í RY΄n€FàPóK¦Koç1˜¸}¾ôLy§˜%s%ŽGŠZõKÛÈ8ª |PRÀ­‰¼fÜð£Œ+–-zÝ®ç«ÄÆó˜
-YAÉ fH\nk\Þã!mž1P6/bug‹ÊKÞ°Ñ.Ü£+Â0-Ý Ü…~¼Êžº;¹NÉÌ´©ap\صE~…¨åIÍ\ÙX0«§Q#„U³ãDµcÂÛ‹HØuöõãB $Œ¦ô6å)À1‡&åêy
-'Èi$*j‡žGEɸIKít>r^>t•%¹\Z?Î;H#˜r q—FìР¶ç²’9T:êØœI¬OGu7Ç!¾‹ážÓfs[€{¦ÐQÝ1·v­
-ÜÌ^̉_Ë3­¹ø€c.gnÞ…&ø¾là˜koŸŽšøPÁá JLcQªî‡Jžô4š{•¬ÒS ÆÑVc_Ó
-µ·”†yÖG~ŒKÀo P*ã«žl9Ž7££lmF°„J SÜferv§ØaÙýæœHÈ5utWá~˜+¨q™ä=Údo;º%œmøØ¢½+z¼õX´D¿µ*O(&Þ£zÒ˳Q»âLzEˆì[=P–™±ˆ%pq6ñ’‘TB%zË×βݲ¥{'^ôÛ6»`˜Ñrb×í±;R‰H@¶LÕË%I"˼Znúr3‡!×É¢U×ê>*ÕS3 ”o ¹3t'‚w‚YîVÁ;Æ`/2¤á©\Ô(`Ie‹çZ¨ôXj©´b0RÙ± £VüðÒµ¸`™8MBʹß<¥:Ã'×ÕGlµw]3EÞÖ&—Ä$QÀcHsv•%•L‡,ÕÂG•wWÞ’d<JS½b‰µŸŸw£ «áa‘W®\æx»ñ­Ã0ÓÓbš9ˆUÇÕ±VÚµZ§tÆŠ\ÔuUºPFLN„‹q§ŽS1ŒJœ0›TïaK½G|Z~l§øh™Ûãr–(^c•Ÿr‰ÕÚ2SK PD@ƒ¦Hi(Erp.àN* ½e¶U84ä©Ù_kÇe“–,Âú¼<V'FtvTá\éòZKMjÆa*#‰æš™ŒÙ©æf¬·¹êUžö¥-ÙÈʳõ:ýaÌ}:D³º<˜Ig˜ƒÙÑ[7¡RÏ|FÊy µ5u9ûë1Ä xP”‚«—x7žN;Û ­¿¥²%z[0‡øúÇäWž©¢•V0×2ÃT:W@&EÉVK…ãøªVñÛ V‘R±{³1!ÕSqüC¼!öªxƒ2Ë9GræôΨþ
-ofþ§x—@Å
-¨pÎâ]¹‰Pë‘Â5.^ŽNçÎ…MÕoúv\Õt,Ä0þ[{ ãð}2ga¼"Ü‘Ê>Ž'´e 5eã,Ž‡¼T•3al#ßBÆL¬žÄð\HÐS"ß_£ž<ª%bÎÔámiì®ÔA3Åí¤§zOOG*O°!ÑÔ*7±±çJ*ßßP£,€)ç§S°÷SlBeß(ï 
-Þ¹`Ýå/¿úåWlþ+¾~F‚w—ÅŽ¿£yR1½À/¿üùÓÓ¿±â¢™·¡`h”®(2À°ø¯¸+p±8Ž‡tEWÌ¢b9Î䇵ËZŸý%?ùKKú3ÖÒ HL£ø½˜æyT=ÚÃ/0¡DŒÀé/0aùãApK´Í/åP~<X‰O?„
-ç€ÿütg— )n˜ª½Íù&ÿ¯e- 4Ì(ûPKl§ÔëU"@»y—J¥ÕËqx•,öêÿqIkåk¦ZZ8<µôûWg4µã•f¤ñ•‰¯±J¸†w«Å<z¡Þ œ­÷Oçð¡û7šèë
-endstream
+1638 0 obj
+<< /D [ 1628 0 R /XYZ 79.822 657.248 null ] >>
endobj
1639 0 obj
-<< /Type /Page /Contents 1640 0 R /Resources 1638 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1590 0 R /Annots 1685 0 R >>
-endobj
-1685 0 obj
-[ 1591 0 R ]
+<< /D [ 1628 0 R /XYZ 79.822 646.289 null ] >>
endobj
-1591 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 435.916 757.574 446.343 770.303 ]/A << /S /GoTo /D (Hfootnote.38) >> >>
+1640 0 obj
+<< /D [ 1628 0 R /XYZ 79.822 635.33 null ] >>
endobj
1641 0 obj
-<< /D [ 1639 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 624.371 null ] >>
endobj
1642 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 745.915 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 613.412 null ] >>
endobj
1643 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 734.956 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 587.509 null ] >>
endobj
1644 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 723.997 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 576.55 null ] >>
endobj
1645 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 713.039 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 524.745 null ] >>
endobj
1646 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 702.08 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 513.786 null ] >>
endobj
1647 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 652.266 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 502.827 null ] >>
endobj
1648 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 641.308 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 491.868 null ] >>
endobj
1649 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 630.349 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 480.909 null ] >>
endobj
1650 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 619.39 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 469.95 null ] >>
endobj
1651 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 608.431 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 458.991 null ] >>
endobj
1652 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 597.472 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 448.032 null ] >>
endobj
1653 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 586.513 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 437.073 null ] >>
endobj
1654 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 575.554 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 426.115 null ] >>
endobj
1655 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 564.595 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 388.256 null ] >>
endobj
1656 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 553.636 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 377.298 null ] >>
endobj
1657 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 542.677 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 366.339 null ] >>
endobj
1658 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 531.719 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 355.38 null ] >>
endobj
1659 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 505.816 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 344.421 null ] >>
endobj
1660 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 494.857 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 318.518 null ] >>
endobj
1661 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 443.051 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 307.559 null ] >>
endobj
1662 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 432.092 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 296.6 null ] >>
endobj
1663 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 421.133 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 285.641 null ] >>
endobj
1664 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 410.174 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 274.682 null ] >>
endobj
1665 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 399.215 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 263.723 null ] >>
endobj
1666 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 388.256 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 252.765 null ] >>
endobj
1667 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 377.298 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 241.806 null ] >>
endobj
1668 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 366.339 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 230.847 null ] >>
endobj
1669 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 355.38 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 219.888 null ] >>
endobj
1670 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 344.421 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 208.929 null ] >>
endobj
1671 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 294.608 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 197.97 null ] >>
endobj
1672 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 256.75 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 187.011 null ] >>
endobj
1673 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 245.791 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 176.052 null ] >>
endobj
1674 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 234.832 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 165.093 null ] >>
endobj
1675 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 223.873 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 154.134 null ] >>
endobj
1676 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 197.97 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 116.276 null ] >>
endobj
1677 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 187.011 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 105.318 null ] >>
endobj
1678 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 176.052 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 94.359 null ] >>
endobj
1679 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 165.093 null ] >>
-endobj
-1680 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 154.134 null ] >>
+<< /D [ 1628 0 R /XYZ 79.822 83.4 null ] >>
endobj
-1681 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 143.176 null ] >>
+1627 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R /F85 439 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
1682 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 132.217 null ] >>
+<< /Filter /FlateDecode /Length 2756 >>
+stream
+xÚÍ[Ér#¹½÷Wðƒ%±E(!6¥‰ðY7‡¯öÉÿ5v ¨RíéžE²dåŽ|™E~ûÏßþüvÿüöLJÐ7ϼ‘nŸÿþ&Â?øMܬgÊÞ¬ŒqûüïíŸ/œƒà\Ù×ïÊÈðÍøðí#¼d¼¢â•GxÉx%¼óz5®?âÚÎaüh»'z`^¥}Éë¬yý×ç?¿VüJ®™Ç6ì„t—J¿PYK-•fÜ©#*…±üa†×ïÒ¦å=oŒâƒ«Ë,Õú¥^ÍêDÎÄS
+˜´~2H¡S±„‹“nä#0dy’¯ê9²(ŠÄ†R7µH·›mvÆ>HÇ,
+µ÷ðYäWü¯es”x_y`Ù÷QÖÞOeÎ2é5å@ë|·¤Á`'u/wLö
+ò)µöþò]#YM‘—®L’ÈõÎèàZ—ˆÄW·PÙoÓN[]W˾=®‰tX ]Rg:f±ð÷Ï <íoÀ¼JŽÊsšIt§`[Ðí«ÈN!T’án.XÀ(‡, 0”Jô©2»‰åâQŒU\F‹Ö a¯¥>ñš#éÁ]ö »T¯PKê+kzÜE>Oý¯ø¿TLrUe7n2¦íZˆ¯àÙ°rð£ûi¤ ÌG=ã{EùT¡e’Á ¼ë(£ý2v¹A)ÂäÏP2I8cˆ<é;p`SrcÔ¦¼gyÁ¬Ýÿg?Š9°Å‚îÕUÚV=B2Ò2 £÷SÁknjê§l¼vÝn3ÍEz§LÃÓ˜Ê*Šðùw9¬JLI3%"uuÅ ”ÊA8Ðb [ò²¢ºÎ˜ÈÓ!ùhnöø­û(÷¨‡ÃÉ!Rûs9?»5‘G VËÓÆ)\S:r¥Ë|ÊQîY*3 ”Z9téÌËÇeIíMã)NN‹Û ´*t:O~Tª³VªÊû¹²SÍpZ@:Hgá@»úÚŽË„¢‘
+ÕpÒïÚ­ñãmÿðÔáÝ
+GYV~eL%¥Œ!%¤:{HÒQ„~”‡|§|\©îÓª’Pb¯J¢YâÅ!je™ÖúŽ-pBRäÞ÷R½¸~ŸZóÎô;Š·ÀìäµWÑS)Z0‘ž%WPwœZ@ªûJÕL.³Òì?
+/ø@ÿ{¿ôM#š‚ìË/?áŠ3/§Bèj­X•‡©ÔtÙšÓ|]‰T\”òP9*0¥¾ìu~¦“óÕ¶˜"Þ¨Ð2úz½W]SIÖ»í¹W1%;šäÚèjµ‡D·>)‚d¨÷´¹–2TW+ÍRð*ûl€ÝfKÙ¸Z¥6 ”'Z:ï`-ð£î›ãÝ7;wßÊêuÏÖ‰±5–¾¡&XºR[!µÝÙ¨ˆ¸u\½Q-šòðg¬œdü®+Ø]Vìný0Ž(ýˆÒ hT}f?s9±Ã)‹:*¡ð²‡Æô¤ ~m:
+>¶:„\RCÍŸte¤u­ùSw¢ùTº;jï¤5«&Mu†èl l™`ÖN²jÈ2 æ¥öïG)jŠïkf~Z¤ÕÆRÒJvÊ*q ™®AèòǪ©æY¸W= ÄÖs“ah­˜zÝïüÔéPÑT ÚÖÂZÁ]¼êk_‰+åÔ\«Õbï«?å‰ršÉUÃ-‡Æ¹œ{‰Û¢#ýiš[}ªÈd*ÅÎËíÈ’VÕàÐK–=·V¤QëØ<ðtcÐ7KÝSƨcd[]+S–ʼn½ÞL/éª<@©|øQåiÝ([C[žo T¢¬†áN¢‡lK¥í•‰«³m%ÈÀö¸z谉˅1»ø­{ÐLBUwØ~D.|&œWŠ·Ì0àÙ+ÇLµÛÕ~Réç* @Ü‹?rá“<ø}„š¹˜í}¦VÞômûõ¶žõvzX¨·ç‹kà–)7UµW»gqwôqLåRõª¼d
+RÁˆZZúµàJ Üw,<C¦mk˜«{?]{ѨM0 \Y1¦ý·jG»1:Š¸ÂËÇH>"·zª©3RóK¾2vþk]°¢{ðTָɨÙQF®Ÿ FD^lõ ®Ñê=3û—Ÿ ›0#{Jº÷J-¾¢ëÚ>½F(°_„DÊŒéô¹6Cð–yé(:Cì€OŸÚ;´°ZåX& )¸‡“Â¥Ï÷»`7©}âmIÉ,ŸúW;õå„&Töç½u2»¨ä`«’#TÚ,¥À°j¯¨U[4¦¶ç©Áá„kµÕ©#Tö5&gN:ÊÆÕþtiÜ*“èèwok_ÔjJW»bXÇœñH ¸Þ.mvBEëm6LˆvA¹¸Ú.Owa"úOóVº­Ó»±‡X½µ=\;LòRfécíh—áXõz’ój—¹Ê‰©¬†©´û¡ÅjÀy–îÓ}у«x/'ÑßöDÇTš-M/c¼˜±3ýâ[ž¾£`Áuë§ý”G QmƦò·zbÃm%HBe{J¡X8&ƒïl„Ê%ì)\¨ç‡ž÷89ÑrgrÒVŸÁš¼jêkEaM^85ÛöÖäí–¦u;?Žñ.þþƒj㢚`Cî) ôkÔ(F†¡Fs5`˜3… •¹˜ì?+Áå=œb…0 ,wo`@fMna€ôÃwo`aÁ™
+¡HÔs¢ÖãŸiæ@SJÚ4+!¬É­ÞÒðý#SuŸ^ëâð·+yñ¡MÞc$S}ÞŒ¦<él¾þYM ¥ŸÝÚ^c»ý<`x¾©ô·Ó3Ð}÷
+ž7¹
+endstream
+endobj
+1681 0 obj
+<< /Type /Page /Contents 1682 0 R /Resources 1680 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1522 0 R >>
endobj
1683 0 obj
-<< /D [ 1639 0 R /XYZ 79.822 121.258 null ] >>
+<< /D [ 1681 0 R /XYZ 78.37 808.885 null ] >>
endobj
1684 0 obj
-<< /D [ 1639 0 R /XYZ 93.716 90.265 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 745.915 null ] >>
endobj
-1638 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F16 336 0 R /F59 346 0 R /F84 425 0 R /F85 437 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
+1685 0 obj
+<< /D [ 1681 0 R /XYZ 79.822 720.012 null ] >>
endobj
-1688 0 obj
-<< /Filter /FlateDecode /Length 2713 >>
-stream
-xÚÕ[Én#9½û+ôÅ"ƒÁ 0 X–UÀœ}ôµç4ÿîKJ'5ê™CVIiòeD0öHñË¿.üòë…3>ù½\¿^~Þ•» sVH¸|ýù"ü"~«Xu1Z0®Ååëß—¾rŽŸœKþûãë/<cþ¼[¼Xæ´–¶Z2+Evw”|G†âLpèÉЊsãΑa$œP
-x†ü¥®þ³GÅðÝ´Ïxóë>üÿþÒwyæ¥~û¡@e™w‚HWølüNÍ‚vé á~{Z€v!|×|[„Ò1’ŠPÁ9Z`ZSÐ^^â#ËÏV"ñex««ë>…Ç°6î±ùÇkZ÷p¯ H¬xùùª=ËtŸve– /"3}Ý’Ùò„ò Ã
-¯¥RÊ×,î¬ÓéNÐô`I)lÔ»˜õ_;Ùj†NL‚Às‚PÈPhŠ´)’#² Û1öU žbÝJƒ®©ü·¢‡á~qÑn ;L7ºÙN‰²Qw³þŽÔm M*¦ä”,H¹§=#JZǶ¼¶s Wq‡"Áìky3òìgwYdÊLÁ|3-#(;,þ…¬É´c,žOí
-+#JŠWðîázû!^c®3Ƙc_ œeº¹B¬Ã›µjþ::„[“„÷»ùnXåug·îu÷„‡ú ÌkZgt&×àŠ\àÞß
-JpðW)ò&øCžÁë;·òHxÌ}Tù·ÑSFÖ®icôˆ¶,3üMù§»I™“GOãZíSÞý3G¸á‘»"ã@ x]EÔBzòg‹ó:"}îg Q!BÞƒ‡Ä#ZÆ‘rnnÅŸÆ1çõ*iòÝÙ
-˜‘#×Ñ'T?pûv”P|9´‰N-Íå9øø¿çH‘׉ü£;ô©
-zzgsüb6H~ѯ[6öÏ&yíçÆ»DKǪ™ê÷-ª
-/n[G¤Ø"‚Î9^4%âñ›ño³ã8t@ÙÙLü J¯¨ƒ¿ êÜ)R8CÞƒqá0µŸý7=|S¦ ûÒ…âyö^ƒ))'áÙ=á(Å]Ö¶4_g"¥.Š^h˜à¶áNËóNòVÛl*ÔÁIåÕžÊ(€¤Ïžz“«£.®Æ@Û¦Å$Úé“$ø#•zOŸ3j¦…š€[ /Ay‚ /I=v £ºÉ=2F”±,nkü"2Ó
-þ¡ûfùƒî›™»oyõºgkEߋ߆&X¼SZ!¥ÝÈ(qí Øò ’4¥±OŸ9Ç’ñ‡²6×îPjwãºaDîGäN@Eu‰üDQ Ätã¥Äj/œ¡
-Ï{¨MOÂà禎#é U¯÷þÍXÃ1PÓù‚ì¦Gí zÒFšH«•¨Olèrâu&hÒ1}SRð¾×!`‰6tâë\÷§ìÆSñéC'®YuiŠ6mCiòð²´’e>æQ˜Ð¯¥ßsQ||[3ÓSM­t–¢T’VŽ³Í4 bã¿+ãµÈY ôŒr®üÏ' >ﱀ놷§§Œ‡²¤ªÕÖÖªÞW}¯+a%Lݵ’.¶ÆúSZ‘ã V·dÇ|îq aì‹öøÓ ;õúdæIœÅŽÊýHÑ^& §l,³Úõ§\¼k©4J&›Fž¶·Zm§©}ê4ÊÙÝJÈн Æ›&é[y _•F(…×Ë<®ëy«Õ–#Ö) 6‘e7Þ‰xƒ‹­Î´> qv¶-³ô@ÎF%pXg@ÍÇnÔ™Pa„¦…É…ÚhÍ\{Ad>‚gǬ sjÊßÎö”rO— Ä"âšO9¿vuø³†ê9¡m½¦šâ>èݶûsézÔßý Īz>ÁôsCf®³4n˜ Z>¢œÊ`½d™9Í`‰c¾=za w±ßŽ[þöÁó™ÊÿïœÜ8
-B爭æ'P5Ævm¬š;æÙB4îÛÃiáoyXhÎäø
-pÍ]·"4AÙŸù
-ô*2fr‘Œ÷­LŽ œùÜž©
-i}|›rš³õÜ­#(OH Ci&2ìVó– <ú…‘|_뢒“»ÚeÃ;¼Újµ¥¶Éà^ÂMdìý؃ ¨Ïq¢·’n™àõÄ¢¯õÛágE·úŒm{÷qUͺ+·Ø0VÃTÚÿ ‹Õ€óÈÙ-¦Ûl[É4”ï³…bæ{©§¨[jlE÷é[÷ß2òölyµ-Ÿ6Ü0ŸË™ðoK¶C@råÚ²$¤·à Ž3׬/üH9{Ãϯ—ÿ
-endstream
+1686 0 obj
+<< /D [ 1681 0 R /XYZ 79.822 709.053 null ] >>
endobj
1687 0 obj
-<< /Type /Page /Contents 1688 0 R /Resources 1686 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1590 0 R >>
+<< /D [ 1681 0 R /XYZ 79.822 698.095 null ] >>
+endobj
+1688 0 obj
+<< /D [ 1681 0 R /XYZ 79.822 648.281 null ] >>
endobj
1689 0 obj
-<< /D [ 1687 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 637.322 null ] >>
endobj
1690 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 768.829 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 626.364 null ] >>
endobj
1691 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 757.87 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 615.405 null ] >>
endobj
1692 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 746.912 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 604.446 null ] >>
endobj
1693 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 735.953 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 593.487 null ] >>
endobj
1694 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 724.994 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 582.528 null ] >>
endobj
1695 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 714.035 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 571.569 null ] >>
endobj
1696 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 703.076 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 560.61 null ] >>
endobj
1697 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 692.117 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 549.651 null ] >>
endobj
1698 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 654.259 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 538.692 null ] >>
endobj
1699 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 643.3 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 527.733 null ] >>
endobj
1700 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 632.341 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 516.775 null ] >>
endobj
1701 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 621.382 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 505.816 null ] >>
endobj
1702 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 583.524 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 426.115 null ] >>
endobj
1703 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 557.621 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 415.156 null ] >>
endobj
1704 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 546.662 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 341.432 null ] >>
endobj
1705 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 535.704 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 330.473 null ] >>
endobj
1706 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 485.89 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 319.514 null ] >>
endobj
1707 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 474.931 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 308.555 null ] >>
endobj
1708 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 463.973 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 297.596 null ] >>
endobj
1709 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 453.014 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 286.638 null ] >>
endobj
1710 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 442.055 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 275.679 null ] >>
endobj
1711 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 431.096 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 264.72 null ] >>
endobj
1712 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 420.137 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 253.761 null ] >>
endobj
1713 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 409.178 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 242.802 null ] >>
endobj
1714 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 398.219 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 231.843 null ] >>
endobj
1715 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 387.26 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 220.884 null ] >>
endobj
1716 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 376.301 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 159.116 null ] >>
endobj
1717 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 365.342 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 148.157 null ] >>
endobj
1718 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 354.384 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 137.198 null ] >>
endobj
1719 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 343.425 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 126.239 null ] >>
endobj
1720 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 263.723 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 115.28 null ] >>
endobj
1721 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 252.765 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 104.321 null ] >>
endobj
1722 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 179.041 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 93.362 null ] >>
endobj
1723 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 168.082 null ] >>
-endobj
-1724 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 157.123 null ] >>
+<< /D [ 1681 0 R /XYZ 79.822 82.403 null ] >>
endobj
-1725 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 146.164 null ] >>
+1680 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
1726 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 135.205 null ] >>
+<< /Filter /FlateDecode /Length 2496 >>
+stream
+xÚÝ[Ën+7Þç)üÑ‘(êì$.ÐuvE·W}ÿm©ëHÍdäã“æï"ñ\?‘o"5üô׉Ÿ~{âLù#úÿÛÓõãéÇM¹2g…„ÓÇÿž=ÄOâd«NF Ƶ8}ü}úã…s|ç\Jú³ç??~â óÇÍâÉ2§µ´5ˆPÈPèE;Ε 4MH@¿otné:Õsñ¯é÷xLqI×5]ÃëòŽvçgŠ•*G:RVqù‹Š3Á¡gQ«c,¢bDerÒ1rE#4z0Ód€e‚Æè'\#ƒ&z”DÆ›P'GoÆú-ã˜4'ÃE  üê•ä –ŽWŒ·ó³´&œÁÿJ +ÆO:Ü¢R˜·¨ñŽIª&oùŠ~ÉÊ )BT° ‚űIÉ"íG´øù×=õ@J&t· " CÑ­Ð*Þ#?L%Éá–åFÛá³qEþÒswH$§0?Ù¾çnydé ßm©3 ÍSçùòãx÷àÏe?ÉMïh¶ôStßõâß==Á´ì1ìùý‘÷A†H•ò%z)é=’€÷\2+ix‚ LħòÕð<T쌕J8š~%:b
+¬Ù)<»’ø†×(&M×¥ÎqÁ¿b= "þ…c…Ì" (Ìè{?Ê4ïÚPðkâŠÿ3nÊ“v(0W´Ò •ìÉPpŒ ¡™Q¦Gy°*æ9*³µÆ+ϘõÓÞÍÄ#,X²¼¡øà SÍ
+”">:쪯SºC¹c^%2%ÕŠŒË12¤bÊê%ÌkÊÊŒŽ¾Ê[Böo~> egÕœìÌ[ôœ!P¸x/_÷j{NñDzÿ,dÊè^<Ò͉§EÌFçrÂñ[dÍ«{p&6ºûrBÛº¤†Y?Á¬
+'h ã¶Äíd¤…5†5htˆççxRn¹´<õËÚxV¯Éã•ìK½!aUš#ÿ»[¡ÈŠzÒ¼:ŽT
+³jaZ"{:tŠ»¶Z.o¬V-2áúÁr1$Ê@ÃÂHö&žÕP_tE
+d-"/Ë}­dmÈúÁ•©¤F1QÕî«K AÆÊ-–GøKžÁó³x‰9q¬ä$îàKWÜtªT…çk±‡²Í‘;?2‰TV5⪚’ŠPsØÏw¢6fãànýN¾²”µb˜ÉÁky"Me".Óãê¢\N}
+éŸñŠ¥‰OôŶðn;æéSõáaŠ;õÐ’|áb3£R_¨\•’a8¯¥ÎÅÏe^üh^^Y˜eÖ–1WR
+®0nèjíLU©ê3 xOó?ì;Ðõ˦c\çw»½Õ’ñÁÕ¼îMÇADÁ`šÕTl¦óQ”œI.†„àT>Ú!•*"_ê¿aöÞG FŸ[‰ßä\¥2£ø-…®_1Ÿ\÷,•Ë·ýz²ÔL¹ÕH€K)#ØkÒ㚣®þ¹‚90%D?‚E› ¡çgaQó¥3QŠé·|7ÖYʳ®PèûØúJé„„3òte#MXiA@
+bp€4äîE¼S®ª4vñ S»ªe´i“ô ¼7— «Ö¥^|±Ñ»ANP*Ùt<ìg–a÷úŸ.0ÄáBöhí ™k‡´Õ*¨—?þ<ç+h+í m„f!Õ™J‘ÖO´
+"ÿ–²e;\>-)dþ[¤P¯Lü¨Ôüè<»ª`¢9a¥R- +Ô-”VkZ «ë¬, =«EqüZÞuHÓAD*Ç”Ö#JŽ5R¹Cʳ´o,ÈIÞëm“,¤:tÓÌz¯G/ÌÛŹn‹ð—»Ó‰–inG<ZàÈl‘Bñ^ÕãƒÄ%¢Ô¥mÇIÚƒe<-/ièÇ åu™ªlwHóºO6¤‡„­g¤?-PðÇ•l³¿©à‘Ì÷JT›…¥´’¢,(¥1R …1· ªC:ŠŸxûúÈÄ‘CTs¼·HG"“§<×é’Pç
+“ùjÙ9°ñVÓ>«»ý{$ô›g5ô’~`uo–NÚÑ>ÝzÀêuö9¼´Ï^²úºåéý5ÔÖ¶“OŠ;¦8ŽÄ7Ygè@0r‡L• Ĉ³•¹§lùËR;,Ÿ”æ&t¼ëê `i’ƒºÛlÅêkCWh©ô†Ã
+endstream
+endobj
+1725 0 obj
+<< /Type /Page /Contents 1726 0 R /Resources 1724 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1522 0 R >>
endobj
1727 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 124.247 null ] >>
+<< /D [ 1725 0 R /XYZ 78.37 808.885 null ] >>
endobj
1728 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 113.288 null ] >>
+<< /D [ 1725 0 R /XYZ 79.822 768.829 null ] >>
endobj
1729 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 102.329 null ] >>
+<< /D [ 1725 0 R /XYZ 79.822 757.87 null ] >>
endobj
1730 0 obj
-<< /D [ 1687 0 R /XYZ 79.822 91.37 null ] >>
+<< /D [ 1725 0 R /XYZ 79.822 746.912 null ] >>
endobj
1731 0 obj
-<< /D [ 1687 0 R /XYZ 81.145 80.411 null ] >>
-endobj
-1686 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /D [ 1725 0 R /XYZ 79.822 735.953 null ] >>
endobj
-1734 0 obj
-<< /Filter /FlateDecode /Length 2425 >>
-stream
-xÚÍ[Én#7½û+ôæÅ0 X– gß‚\“SþÿšâRÜšÝnjŒI(#õòXk¥9Ó—¿/ÿÿÛÓõóéÇ]û‹bÞ —Ï¿žÄ…ãââ€u±F0nÄåóŸË/œkàÜúôÑðúççïO<€!Ô»SǼ1Òµ8 F$°é톘/(Ñœ 3JÌõ%Ü2©`DÊ”ü¸ }ñøàbÍ[Ö3i/$ÓPÞ1ŽsyǼ>K xEZ¤Ip®\úhñ
-¯[¤S…Ï Ÿ¹¶O›[º
-WüîÓSáFO•w#f¸*½òõÜK»x€2®àí{ûz"’@Ãëa©žte©á9k²0¬š <Êu+@¹ÊtBæ†7é{$âšž ÷­I×é(Ÿð.jC¡¹ PéEâZ!’bp½(ê°ˆFaj¤¡Â,pyM Ó'Ü•‰ÌÁH„`ÚØ"–FÒJ¨FPâ½ÒbâÝ°N¸hÉÏnÞnŸˆ"¹ÅOccéñ@²´ûpÉÓ›:Ý9|û¼ÑHÁ™Ä­8ˆç@¬{Ú—J3§ôˆ¤:1’úSõãOHÝñÖ¾·µé¹,⎌œdå@'¦]n­ÇxÏŒ(6Ýo˜×ˆ‚~–Rî(/Ý +F·rOL¦«QMüµ˜2¿Š‚÷ˆoe×…«¸ÈVy›l61ùºÓy¹#Œ´á”R£ç,à`Ñ'^G Ó£Q0<yÚ(žž 5£#”Ùc⃼Vdˆ'od³/N*kýq¤-Zç˜Ñr­ÞNE+o™7ÊÄQ|TýÛü»
-%ëj€‘Y8týžÍu¬A²HŸ€4ßžéÞÌáÓê½äÕn«â³–¯fâ“~)ØH`V)1†Y©§”¸s”DÐvD‚,?Ú}¤Í s›å–ýĵZ3kÍÔìôRº6 ­ËM)æ„R¢ÎQ"5ÓÎlTµ¹º=QVo;ö*¶¶ªåÆŸ-r'%sÚM­BžãC±AÒ«”
-kNÄò}G™%„‰þš«X噫=Yüä®Ó
-bô~;4”+>OlÒUMg\†à¥ò8«g´£Œ m]7(…åc©™êˆ¿8I‡Pj9 <§Žbæ‡.%ÖžÓ­z¶u@[µGÚ›#´µOœ¸Û¦ƒ÷嬞vJ‘ÖÏÎ
-¹+ÝMººS3󪼯ÌMß•{8@žÙöF4k¹$À(FàçMo>º@UãIÛå0nžŸ}³„—¥eƒG3qíjäþö€´lùÂ`t›þ¦ôËÇ£¤ñd(ù›6ûIý¨?µÛUú®Ù’Ð&Æʉ4ÏK Hg£Sñ·_™‚EÉíA9¹ð§2Ä{t&2Ê©w÷›)Ùô×—fÊÁÛÚ®ê‘Öí$SÖÎ(Y H딈«»)%kùÆ€ôø¹ žîoé¿ò
-endstream
+1732 0 obj
+<< /D [ 1725 0 R /XYZ 79.822 686.139 null ] >>
endobj
1733 0 obj
-<< /Type /Page /Contents 1734 0 R /Resources 1732 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1590 0 R >>
+<< /D [ 1725 0 R /XYZ 79.822 675.181 null ] >>
+endobj
+1734 0 obj
+<< /D [ 1725 0 R /XYZ 79.822 664.222 null ] >>
endobj
1735 0 obj
-<< /D [ 1733 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 1725 0 R /XYZ 79.822 653.263 null ] >>
endobj
1736 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 1725 0 R /XYZ 79.822 642.304 null ] >>
endobj
1737 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 1725 0 R /XYZ 79.822 631.345 null ] >>
endobj
1738 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 696.421 null ] >>
+<< /D [ 1725 0 R /XYZ 79.822 620.386 null ] >>
endobj
1739 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 685.462 null ] >>
+<< /D [ 1725 0 R /XYZ 79.822 609.427 null ] >>
endobj
1740 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 674.503 null ] >>
+<< /D [ 1725 0 R /XYZ 79.822 598.468 null ] >>
endobj
1741 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 663.544 null ] >>
+<< /D [ 1725 0 R /XYZ 79.822 587.509 null ] >>
endobj
1742 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 652.586 null ] >>
+<< /D [ 1725 0 R /XYZ 79.822 576.55 null ] >>
endobj
1743 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 641.627 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 565.591 null ] >>
endobj
1744 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 630.668 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 554.633 null ] >>
endobj
1745 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 619.709 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 543.674 null ] >>
endobj
1746 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 608.75 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 532.715 null ] >>
endobj
1747 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 597.791 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 521.756 null ] >>
endobj
1748 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 586.832 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 459.987 null ] >>
endobj
1749 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 575.873 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 449.029 null ] >>
endobj
1750 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 526.379 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 438.07 null ] >>
endobj
1751 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 515.42 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 400.212 null ] >>
endobj
1752 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 504.461 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 389.253 null ] >>
endobj
1753 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 493.502 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 378.294 null ] >>
endobj
1754 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 482.543 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 367.335 null ] >>
endobj
1755 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 471.585 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 356.376 null ] >>
endobj
1756 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 460.626 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 345.417 null ] >>
endobj
1757 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 449.667 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 334.458 null ] >>
endobj
1758 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 438.708 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 323.499 null ] >>
endobj
1759 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 427.749 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 312.54 null ] >>
endobj
1760 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 416.79 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 301.582 null ] >>
endobj
1761 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 405.831 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 290.623 null ] >>
endobj
1762 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 394.872 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 279.664 null ] >>
endobj
1763 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 383.913 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 268.705 null ] >>
endobj
1764 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 372.954 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 257.746 null ] >>
endobj
1765 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 361.995 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 237.821 null ] >>
endobj
1766 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 300.546 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 226.862 null ] >>
endobj
1767 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 289.587 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 210.921 null ] >>
endobj
1768 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 278.628 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 199.963 null ] >>
endobj
1769 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 240.834 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 189.004 null ] >>
endobj
1770 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 229.875 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 178.045 null ] >>
endobj
1771 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 218.916 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 167.086 null ] >>
endobj
1772 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 207.957 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 156.127 null ] >>
endobj
1773 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 196.999 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 128.232 null ] >>
endobj
1774 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 186.04 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 117.273 null ] >>
endobj
1775 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 175.081 null ] >>
+<< /D [ 1725 0 R /XYZ 81.145 79.415 null ] >>
endobj
-1776 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 164.122 null ] >>
-endobj
-1777 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 153.163 null ] >>
+1724 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
1778 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 142.204 null ] >>
+<< /Filter /FlateDecode /Length 2320 >>
+stream
+xÚå[Ën+9Ýç+üÑ•Dê®Ûq½În0Û™Õüÿ¶õ.IEÇÅtÜs1ƒ ßØõ8EQ䥒œþ}’ñÿß_./?n&œP¯@Ÿ>þõ¢N2þS'¯…Å“³JH«Nÿ9ýã,¥ÑRº ¥ý™>oÿüøãE&°õãæñäE°üˆ£´ÊéIÛr÷`ÌKŒJjÊÇ,#Œ·+’Æøˆ¨Ê}D}ãÀÅs¿Åïñcãq°o¯F›z\Ê•Z•Oþ‘ Þ©Ò]—òÝÊíÜönû!…@¶ßk? [‘ôÔ¦fj[b
+ØO—2žÇÀŒ´)žv6—U/?Y3?R­WnlDn^b´!ÃùQTûbAbÇ+ð^ ñ¤%•J²+9m¾m"´è_C°sC °h˜(ÆÑœ†§¯LµÂ¡þ¨Ôi.9ñdžIŠi¿+Ùe‰o ¢°(KŽªŠªþ$¾%
+çÙCžçÙ3·Ú<W™yü=ïþDw6¾Û“×Lö·VýµÂkOFà [;iç…·´„WåY~™ÑÉäÃ:ÈÄ}TCÕÄ==Ž Ïõé;±ƒÉ±"’f%iAª–ü¸)sJeh’ûv— qªvÒ¨£Ÿõ(“Wx³{EÎ%º¶\–>F½iwÞö%–9PºÚŸ‡ª±1úlWžÚÏ&$¸5EÑŽ¶ýŽJ‰vo¯:?¨œ* tH5P[M´píu”òº}”×?e9ΆxØY11€SËãyp¸¿ô>kùüÔé.p[ßdû¯
+ øNì¯Û?‡—øºmÄßš•Ãákи&ÙÐÂ' Žž<´³=Õú²}¬<37ÉOŒÚa·de·Î7ÔÌmÇ3›¸e¢ÏÒjí]'…vöa­ûZ3ç'zk‰g÷¼*‘ŒÚ=9ÑŠ8ÒZV­[fêO²*ÞYÛ.w¬t—£Ý5é]‡Í„[* E¦”_m`5éäóÚÙbPÄm wî« .£=™h9¼R7ݲ±2±÷Eèy噩»I æÍEòK05ñ‚&¶#±8…«Ÿc©êön6ošî¨}Q¼?./Œ®ñº¼pó>/j˜÷Žl—Tô h"Æ?@ÉqÀ„â®c¡#µ‡âO»¿E²òkŒdé¨Ü/÷ƒ›_ Û ¨|U»å ûgÎlî-½s×¼ŽZ3"õ0‘î=šÝ ïT'w4¸E´
+£··Ú8ÏK¹Õ¥ÙË!Cì7ö>üHמÍv¹ùÖ+Ž[†ô>ÎÖÈù4ó Îè`g¾äé„ÕäÜ”¹³kª¥Û{YW‡øpcO(Ep=2»ñÞ?^þÏ­Ö…
+endstream
+endobj
+1777 0 obj
+<< /Type /Page /Contents 1778 0 R /Resources 1776 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1522 0 R >>
endobj
1779 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 131.245 null ] >>
+<< /D [ 1777 0 R /XYZ 78.37 808.885 null ] >>
endobj
1780 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 120.286 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 768.829 null ] >>
endobj
1781 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 109.327 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 757.87 null ] >>
endobj
1782 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 98.368 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 746.912 null ] >>
endobj
1783 0 obj
-<< /D [ 1733 0 R /XYZ 81.145 78.635 null ] >>
-endobj
-1732 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /D [ 1777 0 R /XYZ 81.145 735.953 null ] >>
endobj
-1786 0 obj
-<< /Filter /FlateDecode /Length 2343 >>
-stream
-xÚå[Ënë6Ýç+ü——œáı] ëìŠnÛUÿ[>%’Ù¤ß).tåØÒy83#‰3uøûÀýÿ¿=ߟ~^”;Hæ¬@8¼ÿõ$Üÿ L˃тq-ïÿþxæ\çÆqŽ~“ç—?ßâÌCý¼Xy°Ìi¶ÆÜ0”Ð#~ù¡@…OÒc9×Ãþì÷þ³æiS"íáÍw*Ûrö‚£N8Ï¥sªcÌöh]ÐtÚ‡3 ¤ÏââG`š´a4×ä%ðBa?Ý7¸–Š ØrmÃ~ˆkg˜ÛE‚ß©aŠpNÓ…@ö)‘yê<xÍÓ&2UpÙN>`+ì‰÷[Þ‡EÑõ(¥ë•¤+ŸpYNʼn3y¼P2¡Z
-Úk­–hÈS ±¯Ž“} ßµƒÍñ4›®æW×Xù‹{Ûè.®ì¬Oj`Ié¯ÕLˆì€b–ȵU™i —áï舥Ær93«Ï—œ)Þ²±œöòO1ÕÚµ÷óNÔ:vöáIú”`ÒÂ]˹Ö"ù0àᨙòÜçsŒx±Ñ±ƒÛ¡¢ef£EW_~ÍnÝ-¤)Ï :ÈÆÝÅŠ^À\ãj]®”Ý%Ÿ9 4¶Íë+4.®˜kNˆ\3a\ÏÅÊÃk¼£µL‚ì¯&KÈ 3LÁ4pfx
-Y…p ñ–m¸.¯þ†´_ÙõX²æ| ¸Ôú‰‹Ž£ãïì$Sf)‚⥌a«µ]BaÐãJ/5réÒq…çdmóðåÇJ˜k‰AXNkSÛr±0]:| Ç„#uµ(®žœR×Mù  °'TºëF£\l@ug¸ñ&}{6žn*úÜ´9Ké{r„ðX‚¬˜Ç‚œÐÌ(Ó#A1»†ò¶Kˆ¥_C—>µ¡¼Ò»ûM±É¹r¿SdÉ0Úv„ GÊ}|$Êyuá6jY«á¦œ@Å”Õ=RL ˜]WlÙ/i·ÕÃá¬Ò$­Óo@¢B}ùm½Êìü-gÆ/bþ£=1©˜XÔ•²yüx\“ئe›KÜ’¢ ¯ÃdúÍp¢jºRCÜiŸJ;fŒ¥Xl&-¬´Hû>Õ×çö³5ÈÇ4 k\Þ+ø{&Kìi14ÂKRS¼^NÙáwÚò>¡m ”eV8’ãשÐ!ÍDfÉ0Ø¿(·Z|™¯¬Æ$~¦ü!¬à츽<ò‚„¸c°E¹Žª}cWRb[n¤xÖÜô¹RžE‹†½T©±.9´›åsIËRs¼´HãeQTãD„Ÿ$ɉœã¤E¢8Yúnmê¸æ¼‡ðQÇÕœAKcäGÙã’qP¤§á{-ÒžJèL­ŠN›Ýf±jßݯû¨Â½.'Ãë¤Öëâ¬uö4½6Ajî¶íˆ*3Œ(NZúæ-b}ÇVúà[ &Ç5ha¨E× #þ¸ñ½ÓZf–|¶Äõs®1ý½\ý´6Ÿ>nYF0!-ÅÛ¨vÍÚ½CÚj×[þØ\ê'˜ñÑp´Ì>WÔVýÛp…hÝÔ*Ð,Þm‡š3aÅç¨ê-vØ" Ùái©…&G-$ý:g Ðt%)Ñ20‚ȨŒÌ5C¤fG†¡
-Æ… –bT%•¥h‘æ£ræ¯OŽdP© Ý‘%ó¥zî)ÁÂ1î¢aTrdZ Š†Ú÷Çixø})à– ”$vÎ&[¤iïÎ0ai“s]i~$V3dÈUYÿuHó#1Š²äêÌÝ÷êzUQT-ö´>ïq‡zZ2pdμãÔ!}óû)B!k]±P7Ù iºWA»¸„GâŽÝ¦sI=lC•rªî¿Œ×‘ú±½h¹äêOyTH`hµ@£RªØu‹4Ûin;ÌCö¾gÛWTgá»\¹Ïd¿´ç/P0 @q?ªŠs´HÓÚI
-endstream
+1784 0 obj
+<< /D [ 1777 0 R /XYZ 81.145 724.994 null ] >>
endobj
1785 0 obj
-<< /Type /Page /Contents 1786 0 R /Resources 1784 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1590 0 R >>
+<< /D [ 1777 0 R /XYZ 81.145 714.035 null ] >>
+endobj
+1786 0 obj
+<< /D [ 1777 0 R /XYZ 81.145 703.076 null ] >>
endobj
1787 0 obj
-<< /D [ 1785 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 692.117 null ] >>
endobj
1788 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 681.158 null ] >>
endobj
1789 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 752.889 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 670.199 null ] >>
endobj
1790 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 741.93 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 659.24 null ] >>
endobj
1791 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 730.971 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 648.281 null ] >>
endobj
1792 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 720.012 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 637.322 null ] >>
endobj
1793 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 709.053 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 626.364 null ] >>
endobj
1794 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 698.095 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 615.405 null ] >>
endobj
1795 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 670.199 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 604.446 null ] >>
endobj
1796 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 659.24 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 593.487 null ] >>
endobj
1797 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 621.382 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 582.528 null ] >>
endobj
1798 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 610.423 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 571.569 null ] >>
endobj
1799 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 599.464 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 560.61 null ] >>
endobj
1800 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 588.506 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 549.651 null ] >>
endobj
1801 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 577.547 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 538.692 null ] >>
endobj
1802 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 566.588 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 527.733 null ] >>
endobj
1803 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 555.629 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 516.775 null ] >>
endobj
1804 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 544.67 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 505.816 null ] >>
endobj
1805 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 533.711 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 494.857 null ] >>
endobj
1806 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 522.752 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 483.898 null ] >>
endobj
1807 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 511.793 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 472.939 null ] >>
endobj
1808 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 500.834 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 461.98 null ] >>
endobj
1809 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 489.875 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 451.021 null ] >>
endobj
1810 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 478.917 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 440.062 null ] >>
endobj
1811 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 467.958 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 429.103 null ] >>
endobj
1812 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 456.999 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 418.144 null ] >>
endobj
1813 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 446.04 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 407.186 null ] >>
endobj
1814 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 435.081 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 396.227 null ] >>
endobj
1815 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 424.122 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 385.268 null ] >>
endobj
1816 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 413.163 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 374.309 null ] >>
endobj
1817 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 402.204 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 363.35 null ] >>
endobj
1818 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 391.245 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 352.391 null ] >>
endobj
1819 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 380.286 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 341.432 null ] >>
endobj
1820 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 369.327 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 330.473 null ] >>
endobj
1821 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 358.369 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 319.514 null ] >>
endobj
1822 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 347.41 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 308.555 null ] >>
endobj
1823 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 336.451 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 297.596 null ] >>
endobj
1824 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 325.492 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 286.638 null ] >>
endobj
1825 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 314.533 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 275.679 null ] >>
endobj
1826 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 303.574 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 264.72 null ] >>
endobj
1827 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 292.615 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 226.862 null ] >>
endobj
1828 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 281.656 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 215.903 null ] >>
endobj
1829 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 270.697 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 204.944 null ] >>
endobj
1830 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 259.738 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 167.086 null ] >>
endobj
1831 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 248.78 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 129.228 null ] >>
endobj
1832 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 237.821 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 118.269 null ] >>
endobj
1833 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 226.862 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 107.31 null ] >>
endobj
1834 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 215.903 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 96.351 null ] >>
endobj
1835 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 204.944 null ] >>
-endobj
-1836 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 193.985 null ] >>
+<< /D [ 1777 0 R /XYZ 81.145 85.392 null ] >>
endobj
-1837 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 183.026 null ] >>
+1776 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
1838 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 172.067 null ] >>
+<< /Filter /FlateDecode /Length 2587 >>
+stream
+xÚí[Ën#;Ýç+ü­–¨gA€8v 0ëì³YÍÿo¯(‰z•ªRrœÆ] îØUeŠ:¤ÈCJæL_þ{áþÿ¼\?_~¯z¹(¶8!áòùŸqáþŸ¸8`F]¬Œqùüßå_¯œkàÜ.œKɹº¿ýûóŸ/…yQ¿W§.Ž-ÆHWËJ3ÎÅF’ò¼4ã¥iáßßü_ç_^²øð×¹ùû_&>«\ü¬u¹šÈ³Ðœ ý,ÔÿžœÅÂ,wI^¨¨™¹g…×ñ>Î
+?Ë«¿v‹Ÿñ=Ο1é{8s}û¥Aûà6;W¹0¡äh®ææÚIêæ
+"¾ð½´­…ÂœÓÕÌ^ùÁÍunŽ­$Hö v[’η≀óùÈzù0IÂgIzF)ö8Â2
+‘kÒ"F¶Î{”ajÉü”FG‹H€dÔ7ø)Ðô°€ Í0?5¤OÑ› …²%®åfslg¾0ЭÁD;d’Y^ð¦5…×RTݳ-XÍ`‹K‹2Í®^i¾k´dkuº"ÚÒ½¥ÂÒ\køâ
+Èê벊šáE"¯õˆ¸†wÅí®7¬Kf£%æ19¬7¤œ —­$Hl Ï;Ä·ÉÞÝÌ­bj·†›äwjíØÁä\A1m‡õÆÙ
+‘rm+ 5ŸuC^é².JEâ3 *È„uúûçÖÝ€…ÙDZ’ÑÔA„ÿÙº–ü¬•4↗üAœý{œ‚û?Z´?[©rëÙô’¾ˆl1Þk߬Î9+0÷0Ÿ g‘·Å¸O¾/æ8_û'l÷D“oS¶ŒOµ‘)EOm^·kÚdMSl;Ìn <¶›õ“+ØC®°øÚR@¯ÁI^£¼Ÿjpgõ æ<á1F2Ç+†@–
+YûH{Á}=ãd/á‡X™p– Q7±2)åkWǯt•|;za~6y©MÙ‡ºW%ãäñ!F˜–ã…jw6ƒj Ì)ņ“ïn :L+(¶k)›É,”^.F–R.ä÷kI7¡„¿í•d‡ËýG©[‚1MϤ<ÝwrÓûTí$9³ |â^J1W\Éq*Ǧ©r©µ¾rìBù©TX¥O6̳Un¶æo§Æñn”Ž ?án^Eî1aÖ¸ÜLÿmmƺ&°Ò<kl|²IŸõCãئÀãB9³‹ê(‰¹Q‹ßOT…šS8\K3ª+Pª™|‘~”u>AË›¾×CT•O\“Õé€"´¿5Z(rŽ)µ‚!¯üŽÚ{2]£XaÕ¨!¨|ŠÁ÷›ù˜‚6i®Y3[:{\QYðU«j$i/‚íÌ`–ØjŸ0ýøCs¹9sµ’žg/Då™öjÛ]gìRã!{GwµpÆ­¶Ó¬9Œù‰º­¯$¬õµY*š©=$R^'Åu¯Û‰8 ·™U"q¡yzMYg%m£½rÓÈ_Õmç$Ú@ùºÛƒ2‰£®à8µ›ª*bú`mH`mg"tMªÖi6A‹ž¸¯¡>MNÁ¨ENpûZÓX”̼–Ä•˜{ç<>à €ºkT%±“¿>u
+^]‰‡% ÕÞʱƒp&ÑëÿC÷°^òdÄÚ ’'ë%©ý·|Eüy Ò\WÆ×!fLNõTï$Q'ý“v r—8‘{
+äÁækJi…Qˆ´ª„Ï=òC#¢~Zx}ì~•Ó¶ÓCeȽê¦Bµo³ Ùçiä•´aÀ‡=¤É­NÒÿ­tH&­¤45ì•Mv”;IYã[ñ¥ÜINJý† m¥bàÌHÛÉžp' f÷¤H&ÁöšDm¦ö¤{I;ç—à}¿ì×kOÐfg#€IãF³9}¶'žÆê%é¼ëŸ‰5Ý)ž2¶+ᜌç6š>× ¸`JŒ@?{؈œ¹4]I$¿z¬È\³§“”ËOvËi$Óz³§…>o®ñ¯D¿¼‰xßNw¥;ó&¶z]Çøj‰GѬ6ëès6ës¯ÆŒIåÚ:Z釔ä>Ù(¥HÎÒ·WéàA¦µ¥ž8êΞá¿ÊR,o'›† Ò>Ý?‘€ÛÁ#ß;Ù?IýØVNXᥠé¤ò°€œÊó÷}òû¨»nD9Q•ºé'£Ôõá&†>wÙáz=ÛÄ õÚJšÎ‚Ò¿RÀ0rÌ1ñNÒ¦^íGkSÐîÃô'{ìKÏÒîÚÎÜGì9çq1ªiÞ òÍMsX|úÕjh5•S:I­ûo¡~ÌÆ _rëá2‘Sˤ“4¯‰/`”Ò«“´5¹NÐOG9450¿ñô¨‘iŸ}ÕÁ4,=¼ÈÎrq2t+i:‚Ä“&#EÎÒè[A£æ2£S't½Þx<wŽzÞÊåT1"n:aß©G°*Fž%Åa+é{ ú?ˆ×x%všÓyA Õ©ÏkÕI€M³ß<?À
+<C[½ÏÙª•4œqÇ
+‡ð6+þWxÜ*¾4‹YåìŽ$Q€VÒ±GÖk©·‘ú;Ä¡dqZ
+7¬ÔCKÍmFv’ÂS×=ü¾vâÝm!¶¸dšVN%Ž¬q\ñ¬!†?Œ–¯Ø­5Ãh£§²|'i^<úc‡iþ$ÉNt®ôçÎå홥m:CE
+³ñMº6i%%“I
+Å…$»ìžUYf›‹âl)Moérؽ¾üorøï
+endstream
+endobj
+1837 0 obj
+<< /Type /Page /Contents 1838 0 R /Resources 1836 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1522 0 R >>
endobj
1839 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 161.108 null ] >>
+<< /D [ 1837 0 R /XYZ 78.37 808.885 null ] >>
endobj
1840 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 150.149 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 768.829 null ] >>
endobj
1841 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 139.19 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 757.87 null ] >>
endobj
1842 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 128.232 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 746.912 null ] >>
endobj
1843 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 117.273 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 735.953 null ] >>
endobj
1844 0 obj
-<< /D [ 1785 0 R /XYZ 81.145 106.314 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 724.994 null ] >>
endobj
-1784 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-1847 0 obj
-<< /Filter /FlateDecode /Length 2747 >>
-stream
-xÚí[Én$¹½ë+êšMw P€J¥4à³n_í“ÿÿjnÁ-™YdµäÓ` i)—GòË#“yùÏ…ºÿÿãíþõö{“ö"ˆ5ŒÃåëßoìBÝìb€(qÑŠªØåë¿—¿®”Jˆ?ÚRªäí__ÿ|£ÌAýÞŒ¸b•â¦Æa ÓÐ# T8$ñpHíÓ]»;tæ®ùÝ}öá®SJ¹{>â³"ý«Ìí—™ø=!°øã×4¶ üÏ#¢ ïù±u®åÞ ²°uÚÐ&½Cco»w'ÅOø•”0
-C~Å¿\iTªî{Ï´ç«G`øãçY½Ê·„ >âˆóµ9Ø"fÒœƒ­í3×e¼È’gÏßó3ÇíYSžÉ–ïjâÛ¿™Q§Zh·z¾¿7&/Ö1
-b§£uµ8±.B4³ÛìW°§øÁŠ…¡?;šULs"Ù®eO«5­ÁŽ<ÎùµjQ^ÄŸŠ÷Cxà=ÝñjCw¼ä©óƒ@šÓÕ`
-t¨Z¼¡:Ǧ͞˜‹›R÷HY®§¥b 3WÀ#Ž*õø\ñÖeÒŒdbà²ÒFk™Ú³šî6Õ|ð>¿@¢êàkNà±¾¿%ý×_i4[Àg°lŽÈ
-˜P¼NnÝ ²0ý:÷’Ø+—{±6ÏZ¤Q†¡hµ
-ßUî|˜Ö-³•*Õ„ 葦öGÂË;Íþ,í_„§Oâµ{B_Ÿh‰€Oµž)yO©®û5­rO“o;Æ ZØ~Ôß\Ážæ
-V`Ð÷`2¯nžJ0³ý¡æœ˜1”Áª -õt£›QI¸á=ÂeeÌh¤ê[Ë{g';ÎýQ‰jÃâ*læ4y¦Ú¥ªÍñ^Ú“án¾
-9Œ “
-›nÖM˜(ŸˆªD*<—‚^.Fl)òï[ 7¡„e϶m%Á¦WiÒ†»ûÔû¼ô“\h‡”„âóÁ'R¨à*»í)’“=ÀÓ)4Þ ·ï}k¨²ØZ;Ès'É anÀݸºmªÃ„Ù‹gTõoûmû?ÚKÝê¿ð@‡wмlã²:
-bfÄx}xÅ)ßÜ‹5Þ#ž?ÂÍ.%yÏMpßÛ)«Â­_ÆÄŽÕe‡"HËG+eVL©R‡Ròjæ¡ÀÇÓ5ôZŒD¡Ì×çFÛmÑaÚºfÕìÚóâ ƒgrÕéȇŒ`5µå‚ÅÅÈ^³j"Ú«Eú>{ái´ï²W+xÍØ¥~ã%{<ñï®0SÃc— Õ©»ÈOÔºV¼’¨–÷’ÉbÕ”²ÚÓLʺœ†Ê®k~('Š™~L)‡‹‡WSÐÙ°¯ÑXå¨#èÝIžø f ùàDw`*Á¡(x@M¢SQ…‰>hâW+LÑèkÙÏ2dlW<¦¾ê–®¦ÈLZpðب¾×íÇ(1ƒ‘··RâÞÍ&ˆæ²ªöbì÷§NÍõy¼;>¸õtzPÂ-ëûÿC^÷´\r¹ˆÖ;&'Ë%.]&#埌cà=¸[qZsÓÙmôà-
-1Z”Í‚æD/l¾Õ~WúG-Šï<Ê}°Ì¢òWf´õú"û¥áÁ)ü.#‹©PmÜìýõ|ΰf%°@ Ó#+-nítH[é4SX´’aÄH3´Òš Ü!ýÈñ%Дk‡+Mî–/tÎqœD®}¦Ô=9D>ªùåÖçf«cÆßξt«G:<¼~îiº#<ûu0‡ñ­‡èYwq˜ŒX_ü€¡CZ®ˆ
-endstream
+1845 0 obj
+<< /D [ 1837 0 R /XYZ 81.145 714.035 null ] >>
endobj
1846 0 obj
-<< /Type /Page /Contents 1847 0 R /Resources 1845 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1590 0 R >>
+<< /D [ 1837 0 R /XYZ 81.145 703.076 null ] >>
+endobj
+1847 0 obj
+<< /D [ 1837 0 R /XYZ 81.145 692.117 null ] >>
endobj
1848 0 obj
-<< /D [ 1846 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 681.158 null ] >>
endobj
1849 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 643.3 null ] >>
endobj
1850 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 632.341 null ] >>
endobj
1851 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 621.382 null ] >>
endobj
1852 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 709.053 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 610.423 null ] >>
endobj
1853 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 671.195 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 560.61 null ] >>
endobj
1854 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 660.237 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 549.651 null ] >>
endobj
1855 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 649.278 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 523.748 null ] >>
endobj
1856 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 638.319 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 512.789 null ] >>
endobj
1857 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 627.36 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 474.931 null ] >>
endobj
1858 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 616.401 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 463.973 null ] >>
endobj
1859 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 605.442 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 453.014 null ] >>
endobj
1860 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 594.483 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 442.055 null ] >>
endobj
1861 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 583.524 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 431.096 null ] >>
endobj
1862 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 572.565 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 420.137 null ] >>
endobj
1863 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 561.606 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 409.178 null ] >>
endobj
1864 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 550.648 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 398.219 null ] >>
+endobj
+237 0 obj
+<< /D [ 1837 0 R /XYZ 79.37 374.763 null ] >>
endobj
1865 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 539.689 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 332.999 null ] >>
endobj
1866 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 528.73 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 322.04 null ] >>
endobj
1867 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 517.771 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 311.081 null ] >>
endobj
1868 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 479.913 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 300.122 null ] >>
endobj
1869 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 468.954 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 289.163 null ] >>
endobj
1870 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 457.995 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 264.256 null ] >>
endobj
1871 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 447.036 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 253.298 null ] >>
endobj
1872 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 397.223 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 242.339 null ] >>
endobj
1873 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 386.264 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 231.38 null ] >>
endobj
1874 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 360.361 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 220.421 null ] >>
endobj
1875 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 349.402 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 209.462 null ] >>
endobj
1876 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 311.544 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 198.503 null ] >>
endobj
1877 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 300.585 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 187.544 null ] >>
endobj
1878 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 289.626 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 160.645 null ] >>
endobj
1879 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 278.667 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 149.686 null ] >>
endobj
1880 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 267.709 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 122.787 null ] >>
endobj
1881 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 256.75 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 111.828 null ] >>
endobj
1882 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 245.791 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 100.869 null ] >>
endobj
1883 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 234.832 null ] >>
-endobj
-241 0 obj
-<< /D [ 1846 0 R /XYZ 79.37 211.375 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 89.91 null ] >>
endobj
1884 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 169.611 null ] >>
-endobj
-1885 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 158.653 null ] >>
+<< /D [ 1837 0 R /XYZ 81.145 78.951 null ] >>
endobj
-1886 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 147.694 null ] >>
+1836 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
1887 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 136.735 null ] >>
+<< /Filter /FlateDecode /Length 1779 >>
+stream
+xÚÕZMoä6 ½çẄV"©/ ìÌè9·¢×öÔÿ­dIcKæxM;@Q,&ñÎ(o)š¤¬•½ü}Ñéço/Ÿ_/?î6^HÅ`._½˜‹NÿÌ%€rtñÎ(íÌåëŸËoZ[(/÷¡5Æ÷?¿~Ñ,Aý¸ºðÄ1Æ)oýˆ7­)#¥|jm~¦k®ïï¯l^q-ø º¿àjµ2X®AƵGB£µ§Â3jºv±ð·é3ºçŒQBŽ³³2Î=ºÂ-û”šãÌ›®iMzß…d›+6!·‚2‰ gÉìè‘Èä˜(~Ïœôõwþ}œ·ñ
+À²1ƒ2Þ=™ÂwŠñÊ9ï%»ûâúZm8á{í8ÇÙ@7™ =R³!ó/~.q2Å|ânÃb Ë^¶ÅE«PûÑL ¼,ß Hd‹ 9Ö=Ì÷Ɖ|ã)¤Èqµ ãÚ#=çZ|-ï¿çý™âiÚ«ãöxTÈšã>eæt@[Ö$àÃl(BÃÒýÑí‘6ù~çk"_¡’H[|ñD4PZeå+SÓi“o8΢²–Øx)逴ö8_”–å+SÌi“/竽rèØx)倴x˜¯N9Ï*‰P¤-¾ ù0ß`•7aÅ7ˆ•o@¢ŸUZõšJå1U‚aYçïIyÇÑŠaIJÿ(¬§šö\ídª  G[(zÒ3Þ£nçÈÉ;‘{‹üÿMÇí± kL$Öž[¹ÎÜÛ]ÐúŒ³vQ! g‡P-$ÎŽÜ+µ^"ÇÕ‰šÐ¢Vˆå-SÍéïé.^ÄÏ7ô¤ÖÄD˲1$SÒ‰³ê=1©ÓµøÿDÿ`uT ˆå.SÕ‰å>¼çêl ¿Wf‡í ”&ÏÆ‘Lm$ÎWs)àiÿSðJVÅ„ª; =ãý ³ òNX5>Ί•w@Êœ§˜þ,¾=9« g•ñM¡Â@ºyð[38YR`€£+TÖi“o‰ o¾¥Ã'BYdj:"aáö˜&êš÷Ä  ÇU¨˜#Îür$—éçqž`¢eyÊr@rf®¨–ÎV©œõ¯Ñ
+×î 2U¶xoOàÛ‚1*âS‰P%¤M[ü\ýâñ}ÀÙÀÆL¤-îù3¼Ï9åDü£÷Š"«6B…šŠŸñ­sj=Bq$¨×é’QÚyOW?ÅÓ‰Ö* g‚P$$W{ÍvŠjïwc/¹†Dqñ]>¦DpA ‰zW%[óá­ÌÆ+"¾µúòýuú¨5^ùKýµ¤¶yY
+ÐàZIWÚä²ý,ïõob p|¬i öã èÚÂkD›Ì¯bÖÄxbwo+<Ì!x¯.ñĹ5(“¼58¨8f¼Ôjˆ-©äóœñæF`,øá[ÞO}åê8(müäõ6÷ÔVdŽè+Çr |;Ã:Â|Pº:¼Û¶Êj«"šÑéM¤\ôÜM%,å¤Ç!°žã¹Ùèõc×L *eº³`Ó>EŒHà¥LR{9&µë×C4*
+Ø͵¢ÍÀI™¸t·id™Èê§iJsnž/?|WOÀÛ©w·3×ng\»Ê»Ú§Èö‰{¬i5Ï(Kô`“©Ä{k3H´‡I¾C”î†`9&{«,ÌúïF$ºO•Dóq(‰juš[ôwŸó¬ý‘èîmï>Nf–SáS @¯’ßV“Ü_Ì5ôHk´ùo‹Ò•eBæ)´óó½5驃 =·ælÕêN¨3;ûÙXetàØîGŠÊ'„Ióš”ažGÀýâg£2€+$Z[ëÌñˆß›·‰¨ K{ïà¢Òî¦Ý^ž²Üæ'‡\=¹˜çÅ’¦tè–J×â¥S:3ÇWŒ²™µN!ÖÏõê™Êr¡Ó/@`]¸s¦â‚²é­ þk?Ì1uT“Œ7
+<²w…•…WTó Ó
+ ±lH”-$¹_NêqÙ˜A“iŽ™ì¡^-ä,Së‚‘U±½:^+ŠIÎR{†+U¢Û~=­Õç€$g’jGòcRãqXŸÚ@»N°yýN…ª­Å
+« Ø?ÝQ†<p݃ù|êúןx‚9ýv#„w@g>>g·‰~;ÿ~ Íîï¯YWëm—ªkWˆË´æ*!Å”ô¯g›“Ò‘Jñ8'«ÅAðíëå_ÊÜ
+endstream
endobj
-1888 0 obj
-<< /D [ 1846 0 R /XYZ 81.145 125.776 null ] >>
+1886 0 obj
+<< /Type /Page /Contents 1887 0 R /Resources 1885 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1522 0 R >>
endobj
-1845 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
+1888 0 obj
+<< /D [ 1886 0 R /XYZ 78.37 808.885 null ] >>
endobj
-1891 0 obj
-<< /Filter /FlateDecode /Length 1860 >>
-stream
-xÚÍZËŽã¶Ý÷WøRC‹/`0@{lȺwA¶¹«ûÿÛð)‰TYÓ%Ͻθ-êèÔƒuŠØË.*ýÿ÷·ëÇÛ—‡‚´ÁËÇßoú¢Òú]¼Ó œ¾|ü÷òçW¥,Ö‰J9ûí¯?ÞTKP_.¢s&lq¢‡ˆaBRŠ¾' æÓï X§¯ ø–®]ë5Jß]z¾×ëù÷üÑßë5||û͈͢nù–°®÷ç{­IcûwÝ0uýÛ»ôwÈc—»ýÑ*æ)Ë8ºn~+.Ùxøîµ
-´BÖ½ô)÷jåÁÎH‰§‰‰ ÉpLŒùíÀ[?#•h4ï'g+w¯Q®^¯‘ì¿çÈ,‘#ü}Ó|G¹[×Oþ.s½/_·T¯å{–ñ÷-[©1€NÎa|Hw™G$·ùïnyõU²’þeñsqbžqóý¾[ jF”Lh¿‹n{<zdŸ2sU<ó´D»‹Uâæ£,V#kqFöõ{¶Î^«…‹Ã/·V‡‹j¬Å ®<£×`ÓÆæ¿Íuª¥Â¨(è•õOEh3ÒqFnçÒ#úêóô|×î)÷Eæ)²4R.Z0Ês‘rWÑü™Š®é€k\¹zwã+ÄÞ/ýŠ[Æ°Ñ8ì
-;#©îßZÁÑzˆÄ*‘PYg¤C¾57¼þ)k|$—.íTˆîb5‘Ìúêûöϯ‡Ñ8P†£*Ì È¬ìr&×½Ïó,ÑBŠGS(Rí\ö;7û›½OyÕ»š@kdyËTqB:â}¼wÞe@[6U„*9!Ú²y·jÎÇAG‰å.SÆ éˆ{9€òX+Ê ù¯ƒ4–Í#™BNH]Å_ñ­W€Þ±ÜdJ8!J]kJß3tPñe•Ô6‚ў͙JNHns€®TnI÷ýå¡í%¦ga¢¸yVjÒŠQ‚ CŸlõ7 _Û«ð„fŒùÚ;Ìo¿•K}á•êoµ¸­ÃRŠV€éNÑ:dG·{Ú᳌ùáY§ed1_mNœ.ÇNúë«óh.ñĹĨ4-“·&§Ìgš¹s`ýµç“ssG0±žü™ž:ñ~ê+×6„Rà‹×û–|>3ZGdŽÆ7Žå·Í ÷é0^Þ[e•…hôŒhƒtRa
-endstream
+1889 0 obj
+<< /D [ 1886 0 R /XYZ 81.145 768.829 null ] >>
endobj
1890 0 obj
-<< /Type /Page /Contents 1891 0 R /Resources 1889 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1590 0 R >>
+<< /D [ 1886 0 R /XYZ 81.145 757.87 null ] >>
+endobj
+1891 0 obj
+<< /D [ 1886 0 R /XYZ 81.145 746.912 null ] >>
endobj
1892 0 obj
-<< /D [ 1890 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 735.953 null ] >>
endobj
1893 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 724.994 null ] >>
endobj
1894 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 714.035 null ] >>
endobj
1895 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 703.076 null ] >>
endobj
1896 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 735.953 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 692.117 null ] >>
endobj
1897 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 724.994 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 681.158 null ] >>
endobj
1898 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 714.035 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 670.199 null ] >>
endobj
1899 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 703.076 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 659.24 null ] >>
endobj
1900 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 692.117 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 648.281 null ] >>
endobj
1901 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 665.218 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 637.322 null ] >>
endobj
1902 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 654.259 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 626.364 null ] >>
endobj
1903 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 627.36 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 615.405 null ] >>
endobj
1904 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 616.401 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 604.446 null ] >>
endobj
1905 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 605.442 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 593.487 null ] >>
endobj
1906 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 594.483 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 582.528 null ] >>
endobj
1907 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 583.524 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 571.569 null ] >>
endobj
1908 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 572.565 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 560.61 null ] >>
endobj
1909 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 561.606 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 549.651 null ] >>
endobj
1910 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 550.648 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 538.692 null ] >>
endobj
1911 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 539.689 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 527.733 null ] >>
endobj
1912 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 528.73 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 516.775 null ] >>
endobj
1913 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 517.771 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 505.816 null ] >>
endobj
1914 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 506.812 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 494.857 null ] >>
endobj
1915 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 495.853 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 483.898 null ] >>
endobj
1916 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 484.894 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 472.939 null ] >>
endobj
1917 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 473.935 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 461.98 null ] >>
endobj
1918 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 462.976 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 451.021 null ] >>
endobj
1919 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 452.017 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 440.062 null ] >>
endobj
1920 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 441.058 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 429.103 null ] >>
endobj
1921 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 430.1 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 418.144 null ] >>
endobj
1922 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 419.141 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 407.186 null ] >>
endobj
1923 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 408.182 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 396.227 null ] >>
endobj
1924 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 397.223 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 385.268 null ] >>
endobj
1925 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 386.264 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 374.309 null ] >>
endobj
1926 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 375.305 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 363.35 null ] >>
endobj
1927 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 364.346 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 332.466 null ] >>
endobj
1928 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 353.387 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 321.507 null ] >>
endobj
1929 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 342.428 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 310.548 null ] >>
endobj
1930 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 331.469 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 299.589 null ] >>
endobj
1931 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 320.511 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 288.63 null ] >>
endobj
1932 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 309.552 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 277.671 null ] >>
endobj
1933 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 298.593 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 266.712 null ] >>
endobj
1934 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 287.634 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 255.753 null ] >>
endobj
1935 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 276.675 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 244.794 null ] >>
endobj
1936 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 265.716 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 233.836 null ] >>
endobj
1937 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 254.757 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 222.877 null ] >>
endobj
1938 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 243.798 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 211.918 null ] >>
endobj
1939 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 232.839 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 200.959 null ] >>
endobj
1940 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 221.88 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 190 null ] >>
endobj
1941 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 210.921 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 179.041 null ] >>
endobj
1942 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 199.963 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 168.082 null ] >>
endobj
1943 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 189.004 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 157.123 null ] >>
endobj
1944 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 178.045 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 146.164 null ] >>
endobj
1945 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 167.086 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 135.205 null ] >>
endobj
1946 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 136.202 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 124.247 null ] >>
endobj
1947 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 125.243 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 113.288 null ] >>
endobj
1948 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 114.284 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 102.329 null ] >>
endobj
1949 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 103.325 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 91.37 null ] >>
endobj
1950 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 92.366 null ] >>
+<< /D [ 1886 0 R /XYZ 81.145 80.411 null ] >>
endobj
-1951 0 obj
-<< /D [ 1890 0 R /XYZ 81.145 81.407 null ] >>
-endobj
-1889 0 obj
+1885 0 obj
<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-1954 0 obj
-<< /Filter /FlateDecode /Length 2090 >>
+1953 0 obj
+<< /Filter /FlateDecode /Length 2141 >>
stream
-xÚÕ[Ínã6¾ç)üË%gÈ! ìØ.ÐsnE¯í©ï-E‰¢£Ýn±àÆR¤ÃóÏX
-súû$Ãÿ¿½\ß_¾?Œ?iáB8½ÿõ¢N2üS'‚ôÉ’’ÔéýŸÓ¯R’®RZ/%ºóŸï¿¿È ¾?œ>9á‰ÐÍqPz$ üöL˜O$1R( #IÈì“0Žz$ýˆhçoLÄuSJ©ÞÂoÂgº…•Æ¹îaÈüÙ\ó} íˆïÜ*êú‰|~.cÕ»pã2€^(C4%Òš¸FåU¥Õõ+cJN¨ ÒH‹pŸäZ
-ð+$ЙݴSq‡ ì–Ï2Çuh6ÏÊ
-
-¼îÑew¡Zê÷(ùÎk¯ÅÖ¶è­Ý«ºœÚ§¾µJg¾Uç7W-BUîå¹ëZ9÷•œ7ýć…pˆÔ’Yì8)Mviµ³t&e‹æèª9f%…eIZîöÆ7á÷,óÕ@‚0v¤;›U 8Ÿ)Ár™?pÓyd W‚ÔÐ&öê% vHìæ oB†’ðêÙitzQµžZÔüwÑ^+?É-N1è³^‰öãgéútÚ‚äyq³·0-i_‡T¹™kæ<kO×Řçg
-)Î\+_ÜÕ',êájx§ÛÒ³«±eEQâhµ weÚ
-kÍP‡ Ïš–H“kØvÍÞuË
-Ñ–¦Õ¾â=6œRO,©uMR\ ù-\ëºÑ®>Q\ Â:+û<r€óBCËçóã§óãlþœÄôYá”
-¨9Á­úBVÇÞX¡È ý²¬§CbÇ"Ð$@ú‘${ËÄ‹:¤íæðùa²ËÙQž*7«ø"¹÷lA±› ¦” >ÿÉDHyÌZù³–WÊÏÍù}¡ÑhÄú¯7Ðï?ªŒ-€0ö
-£ƒîéækÄÅK#°Ž/œ
-EŒVzDó¨CtoÍ«©úÖ‚jlë
-ÏPª+m†žžyÔ! )ºäU&ZŠî—îú1f:ÒaæñSÌP…"L{š!ï(§CQ7º6#K}ô,gŽÇFÏAÚÁ&ÉÄ¿£³C’x'7Òˆ¤þ^-Ô[M=2Å)­(„AT(uCƒDQK¤-ƒìcd=¦«ÚU}×áñr#/û†Š$h˜‰0Ë€%Ж™V‰#71—;ÄÓUW£ã‰­#hýõtìd¿Cšæ¥ &?VªîHÖáÚ¥®?S»”výÝŠH#³>èF4R‰¢q-…Gè]ZÅ™¨¼|]¿$
-»þÊ:vÐ!érD‰I›
-ÙS‘;€ˆêÊ44®¿À‘xà¥ël}ÎQÒiìŽ;J9_ Ã)á=ÇNÎ; é(Þ¢–eö8kú1~ÂJáÖ_GÉ|²–½Ú: <Äj~Sk´McØ<ô *K†NZ
-ßRtS轿¿ü ôŒ=
+xÚÕ[ËŽ#+Ý×Wø. <¥RIÎ*{¤»®ÝÕÝÞYÍÿo‡
+ƒa%Q?NFÃÙ.v#'`56rGÏî˜j,K…8r¾¿gyÞ T& ÍÀ.SfÐÝ3ƒv ?8í“tH/,ÂŽóTJì¢ÙÍõÄD^­Ó£ž`˜ÒjRŠI°Ñ”—jªº8(+à*ÒxvâuâÜîÝI_Sä¨îÃ×Ãø^»|[¸G¦†Âý”ð똛­enu{ú^Ü9qq©yŠs¼ÏŽÆ™8Ovhsfn4-ÒwGãʈȨÕÕÉìȬ.¸áÈô”7uHkp¸œ ÄLÙ®vRvó¹i×°‘ùZÌšeŠ¯I¿&lÍíùŽböºì~î0Ò£×!5ïÇ»ïÇÍû³Œéuá*òt÷¨É0t¿]s 2jŸƒÚ\µ{ùU]1»„âð‘G¢®šŸ_Uoþ†…B>»RL =*|#»iÂB
+œÉnкn¢ó.~ çÑÕmqžh:i«bŒÜI„ìOS™¨CJu“’uê”g‰c1ye-° HøÍŠ¨½dÿÑPG $(,¯d¹"@i+·šœ`SòJúìZCß…mâbÀÀˆ²ÅõJY‹„TM(L`ñ`Ž ÙðRŸŸ§Žæ†SÈmCÝ4)b Ç)JÍ•”)r´–T4Å€cíÈšÜØžZ;,«¨K\ 5"—6ð£Òvž£­EºM[©Ö7Á¬øGsrQåÆÿ9µÊ ï̈ÚIÝ!‘VÞjÂD'Ôš¯öÕmSíÁ@¥=—fÚöŒËJ+‚²C‚üA-Ò K-_­Ñ÷šT©°ž'ŠmlŸ¾A#‚ñC÷œÛê†ó(-ÅöK}ý7¤­Ž´Ý¹ý7D
+aHáÜfN‡4¢&šKÄRŸ=Qý@öi’œr˜&·nZ Eý5^*¤‚|®Æ㈫¨(tA“E!ýP¬>ªš™§é–;ö’·éض8rž-o¨²tSBÁNÔæEɵ-Ò-7å>;¤å‰tá8; lQ+¡,Žˆ™TûÒÐ9Ïu5ű²ê&²·/µüNûB)`âr›£±EÑhK¥±¬a_ö\ל¹lü¼}© @›!1s+€I—MB"&M*äXeýDp0?ÒѤà툈I½Þ#ÉZéÉNãÞèÇí B 8à†„ÌéóéKBÊ!Õ.µÇÊégbEœ;6 ]bNuwH·6q Ö9¼R;À%À¡Õ‡9éÜi¨ë´”–ƒBæ´üL™¬Ú Ù›ÕÒWôiŒ¡zDÚiQ¹´Oûœ‡©œËwtð@‡¡ü›TÖÒí2p!Ì•øSv7Þˆ5|Ü*±¾Ôx|2„ W÷iM"%)2¥I•m”–Æå …ðd¹K½ödÙ4ƒ{AyžVÚÒ-%D%À/ÉÿÅZ f¿!No™TÙ;ä~Ÿ-~¿r­\·9¥0:KÛœ&
endstream
endobj
-1953 0 obj
-<< /Type /Page /Contents 1954 0 R /Resources 1952 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1590 0 R >>
+1952 0 obj
+<< /Type /Page /Contents 1953 0 R /Resources 1951 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1522 0 R >>
+endobj
+1954 0 obj
+<< /D [ 1952 0 R /XYZ 78.37 808.885 null ] >>
endobj
1955 0 obj
-<< /D [ 1953 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 768.829 null ] >>
endobj
1956 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 757.87 null ] >>
endobj
1957 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 746.912 null ] >>
endobj
1958 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 735.953 null ] >>
endobj
1959 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 735.953 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 724.994 null ] >>
endobj
1960 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 724.994 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 670.199 null ] >>
endobj
1961 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 714.035 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 627.36 null ] >>
endobj
1962 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 703.076 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 616.401 null ] >>
endobj
1963 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 692.117 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 605.442 null ] >>
endobj
1964 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 681.158 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 594.483 null ] >>
endobj
1965 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 670.199 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 583.524 null ] >>
endobj
1966 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 659.24 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 572.565 null ] >>
+endobj
+241 0 obj
+<< /D [ 1952 0 R /XYZ 79.37 535.154 null ] >>
endobj
1967 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 648.281 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 491.397 null ] >>
endobj
1968 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 637.322 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 480.438 null ] >>
endobj
1969 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 626.364 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 469.479 null ] >>
endobj
1970 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 615.405 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 458.521 null ] >>
endobj
1971 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 604.446 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 447.562 null ] >>
endobj
1972 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 593.487 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 436.603 null ] >>
endobj
1973 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 582.528 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 425.644 null ] >>
endobj
1974 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 571.569 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 414.685 null ] >>
endobj
1975 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 560.61 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 403.726 null ] >>
endobj
1976 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 549.651 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 392.767 null ] >>
endobj
1977 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 538.692 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 381.808 null ] >>
endobj
1978 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 527.733 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 370.849 null ] >>
endobj
1979 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 516.775 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 359.89 null ] >>
endobj
1980 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 505.816 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 348.931 null ] >>
endobj
1981 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 452.099 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 337.973 null ] >>
endobj
1982 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 410.338 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 327.014 null ] >>
endobj
1983 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 399.379 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 316.055 null ] >>
endobj
1984 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 388.421 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 305.096 null ] >>
endobj
1985 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 377.462 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 294.137 null ] >>
endobj
1986 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 366.503 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 283.178 null ] >>
endobj
1987 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 355.544 null ] >>
-endobj
-245 0 obj
-<< /D [ 1953 0 R /XYZ 79.37 319.035 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 272.219 null ] >>
endobj
1988 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 275.895 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 261.26 null ] >>
endobj
1989 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 264.936 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 250.301 null ] >>
endobj
1990 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 253.977 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 239.342 null ] >>
endobj
1991 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 243.018 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 228.384 null ] >>
endobj
1992 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 232.059 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 217.425 null ] >>
endobj
1993 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 221.1 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 206.466 null ] >>
endobj
1994 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 210.141 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 195.507 null ] >>
endobj
1995 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 199.183 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 184.548 null ] >>
endobj
1996 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 188.224 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 173.589 null ] >>
endobj
1997 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 177.265 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 162.63 null ] >>
endobj
1998 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 166.306 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 151.671 null ] >>
endobj
1999 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 155.347 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 140.712 null ] >>
endobj
2000 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 144.388 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 129.753 null ] >>
endobj
2001 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 133.429 null ] >>
-endobj
-2002 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 122.47 null ] >>
+<< /D [ 1952 0 R /XYZ 81.145 118.794 null ] >>
endobj
-2003 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 111.511 null ] >>
+1951 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
2004 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 100.552 null ] >>
+<< /Filter /FlateDecode /Length 3058 >>
+stream
+xÚåÉŽ»ñî¯Ð˜,îÀ@ÀÈ= gß‚\“Sþÿ.UÜšÝjjÆp^rKê&‹µ/dÑüò¯ ¿üùíöóÛ¡/žyF]~þó›/øE\¬gÒ^¬ŒqùùïËßß87Žsùpý†Ç'þü\øn ç*ŽˆÏàúŸ ЭšA ™áf„¯%çâG˜Í3äIÜÂç-?Wá·º‡q?çð>¸Úœà†-6Ô@¦&B1÷Œ;<eÚ‡· ÷HV%nyp\:NŽèÀ æù3H£!4W<$¡÷u^„—Ès´8±ÕölE#´®,#Ëš8‡_µyk˜æòw‹àH‹0x©…lïŽyܽ
+)R¡MLÄ DÊ3„l—qET¸"Îå{„÷ëw)ex¢n™2R²N4yHTŸTÒ#Òù)ÜpÜɹgíªóˆü$>OOil/BJšƒˆDÍH*tËøG)»·ÀìÜ|èm+›JCæ 7Êf*)˜†bJÄAÒŽZ #~ÊdÝJ²2OÌ[°ðl³ÂèÏ°olêÖr/)NdnÖ æý¸Ha2)ºé M-Ÿ’妧$#¤Ûe “ý Ö»¤\ˆqÔUÐÑ’×UÎî¨Ü¯çöÈséó Gv$÷¸ÃßäFß[™ò[θÞèE7š¼a1¯BÛÜÉN´Qx¦Mñ½+·à~¥JGƃºâÓb~åWT†ôë´‹Îظh!a¨ò¼ñxöŒÇÓÐx<Ûz<[¸áEËm<^wÞO% Ȁ ú}‘!»¼à 2¼ú
+ÞRBaYÕó‰ü¹eM& ã¤7Ð\6DvÞ³õ‘‘à’
+š's­Æ‰iò!-sÊ ôe§rÕ"#’>I¿¬}+j{˜ÖÇÌȸ"? [‹á*‡qð%dp¦c²þý3 ¢ý%x'$´ˆ8`3ã%sA$ÁȪ?*Ì{†…ig`•º¸@‘®…ãmð`n*'9@_åDÉ |`"¸!*Éj‘ˆðᬛ!ý)"D‡T0B³Š‰ ÑMø)&î&Â0üõ
+Ž¦YP¦÷Ù6ß¹¯CÀÅ”ýjÍ>zHˆÉ€ýrTû
+
+IO{HÑ(¬¤dJÀŒgóAÒ¶Ò_^×ÛßÁ˜Òr&•Å¬u€´Ž‰Ly5Åä}©š -c"½fžO-÷d¾ˆü
+ˆb -'^Ò†ÚÙÍH/œ¤Ü†¤ÀªIy~ïS¢8Vtþ*·óµÁ¯wOŸ(’¥ ¥<詌Ԓ» íפõëË´/I†¥Æ™ZŸ\ÓùÒ—m‹H%˜àv†áâ&Ý
+-vye y«C Ð9”vœ[ÝuÇn†AÞ6¸i_Ò·m›]Äǵø”>ŒÒUÄëžGÙñû=OlàHG!„=¥Íˆõ‹'Ƈ½AûŒãJMåù`
+&`-·)®:½§€•É
+É¥kiÕ:Ûܼw«Ç ˜q”ƒ%°ÅMÒ°®±;=ÙÛ.Ðõ;ç±íf•Ÿ©Oøbs'ƒZ€kuÚèã•­)’Àþ…˜±£½v!Orð¦é˜"­¥v“Ÿ\)è’f¤ÌÜÅ?q¬à5³¡ú ½” ã˜Ð0 dïKl€4&àò¶='ý’$üÿk»YhË„—3yíüÁíæÒ×$‹Nöµ”B(`
+äQJ!½Uº¹4Žjp;ÞoÊeŘ'àLÌúÒ£ì`ä{M®€ãºD“Æ=Ëù©m±“Þ×,¹nô–ìR·Ðu êI ÞAZ»¡P¤\öžÏ2ÀÊŒ9 çí¥›8~É™2®½rdd«ÛkÊ¡00Ré–p\é§>d›ÞÚt¸«ú]–ý0''7÷òÓÍ¥/šžf?¹µ(¹gZlµg«±Sš
+ár °d›Oo8*©YÈWGŒÖ#P¼[ÇýÔ£­Ý% Q§N쉣³£ƒÍÙ-“cKÆ#„ße*ݯGî˜ÖÓÄ`­ý°´í¤êäÓlÓí[þååðªD¼ezgÏA-Jh&ykc%ÒÉûþÖ^f™ÙÿŒœŽŽs•xÑ®¹Ž,®NR¨È‡Q÷&à£àOn±{fB¶ÝÃß½ ÷Œ=C{™¾=­…‘#q{;¢+F…žEÈ4f!…Ž-åæØÇÜvoßKçAHfÂÅßTéº1sf³£Ú×­ˆœx˜¶òÝðµûï&Ú«þ$ŠÞVHé¤ÚÐo¤–cõ£K»ýÿï
+endstream
+endobj
+2003 0 obj
+<< /Type /Page /Contents 2004 0 R /Resources 2002 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2041 0 R >>
endobj
2005 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 89.593 null ] >>
+<< /D [ 2003 0 R /XYZ 78.37 808.885 null ] >>
endobj
2006 0 obj
-<< /D [ 1953 0 R /XYZ 81.145 78.635 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 701.605 null ] >>
endobj
-1952 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-2009 0 obj
-<< /Filter /FlateDecode /Length 2727 >>
-stream
-xÚÕ[ÉŽã8½çWø’EFp é´=ÀœóÖèëÌiþÿ:Ü‚¤(J)¦]Ó=(¨¤Ô ¾X s¦Nÿ>qÿÿ?Þ®_o¿Ê$sV œ¾þõ&NÜÿ' LË“Ñ‚q-N_ÿ9ýqæ\çúÊ9ZV—?¿þùÆ1Oê×ÃÊ“eNk´-!43Êô”´ð‡óç\zªòæ©zÊÊS†»?ûçp½¼KÊ¿Žòò®âÈð ½ m:"à¯Ñ¨ýY~øÃø{~
-PÌ$a‡y†g/ï(Ô¤ð…`hò
-÷¢áî™ÿ xÚ)†ÜŒÀÓ×)ð:JKóñgÌÞŠ/M­‚»¥=¯7±ß5µ• ¥Bù1eG ³ç…ÄcÔÃœhh|aT$¨Æ‰FTqûZÈ 2"†s®kI(e2ÄjÀAà!àÅsÖ·q–Ö\µè=BÏ¡&Q q°s8,)AžiOP šƒá/Œk4h%˜ÐÐœærøŽ’Ξ½ùXyÔ|0]™&² reÁÍ¡J,¦IÿdºÒ¿%p8ݹœ»£¤?³É’è²cðhô!éŒbz*à˜Rr¨ÎsqO «ó ñ#:CŸ¸j ϲ,,Sn˜DMf–=¥&ì‘‚¡ åáÙ³Ä\"çé1ñlåßäÑmQÂÏ"~‹â†i\'Yr:Ëì)耯þ É‘ršicF“žÌ,;JÅ/gŸL
-ü`ÍWÆ1ôh¿Ú­ßÄUlNž¥Ãs͈5$+—NžË_`ÎÉñJ[ViL#GcúÌ’”ý¨O˜çÞ %\÷£EŠ·(æ=^A)Æ­ú¯»|¡€˜£÷ØçŒ.úŒ[Â4¨b’ wEöL¢ B(rµòir½„˜É‰V£ÛÕU —–•4ø†¸ÅCÒJ5/¹¢NÑ”aBcÂ%ÎÆð‹Òç:Z€!âc¡Œ>ÇPîhâùAï„;æ¶ä>}¹0Û¸b½Äsnç †ynpÉGÎÊuô
-!*Ëp'Uo2ÿºM22Ý:ÁÄšŽ"Ìï=ª^╾“Í$£ø}×è0QŠš“‰áæÖ¬HÊ“‚aSžl›öI $/ƒº$]Éq%#º´ÊD³ ´éIÕ5þ,2Œ>ЉvM‚>4FÑj’[l×—`þ^?
-Ø¡ñmö£•È.ÚRsÆU¯3&ûåè^¯Ù)<ÊÌÆ^{ ˆB1­JJÚ9 ;áÏQºs}SÚlñnu®¸‰ü×aŸŸ¸Ùñù#1<ðYª q¡¦u¡Õaº• µCêŽ8>[_Ôuh <ä«àÔ4å
-¥?±óvd”VŒ“,ìÔËé%‡rQ"ñϤ]Æœ‹ÒîfoÚúd½£K‹ÜF᥹Ó&À•Pq<K—Ö³Ã$ýXUÑÿ½íè„E…È«ÈN:ȈÞº™ÙO©dYS0-1šÃÑ:_^ht”@ÏrâEËùÍÉJ[G)®FsˆjGTA hq³®]ÖÅ*Ò½«9vqœñÛq<¿³}Ÿ#s)‡Zv°Ø†œYãzJ^Bí2VÔ¢¿ÂAñ"çU ¯+¹¨›¿Ú©ñðn×å…¶H3e<XÕLs5‰¿ÔqÉ7Â_ÎYÈ’RYŠl/Åcz³¬?›Œ¦Î»óéÞå݃@qWf—3Ûþ}A87yÜ-ÕZÑ’£'ñE÷ï. íËïÍ­~“À¢ÌZ74xœqŸ¡¸‡ô™“ øÎ_®µ¶]F­4ü€¥ÝâXif%D­t%¯ë«i FŸÁ:á|´€šxIhÚÃû¬‰9³nýÁéBeG‰vJ~D;ˆ÷fý誧oü‚¬ñ Ê)—®£×¹¨®¥%±(÷cé c|½»P™¬dv”¢®ºu¼k‹”†¯›€<kðòz<_?Ÿ/øè¼Þ‚ó=ZÚÍ„žÒ¼>
-×; ‘“ƒ»Â¨˜²º§´§äaâɽºazwQ6~VW'ñà×õFBÀãh.(•Ï¼DOié?£†±uBžS3ëêŸöµúÞêðJÇ–ýñ‚œòk†ÈÚ)ï(Ísb%ƒõÆBÔy5ÇÉ’Ò´õAÊ 9‘SÖ×Q¢†êfÜŠFµ¬Jm##èF£Ò™iû®uË×ùé¶wý±Îi`èrt£—Ðmé gÛÄ•ØsM³++ûœ¯µCu¯bñ¼îPECߨ•`±V™FQ Ÿú s–£ÉSö‰¥} jõµÇ5F…Ï'0m¾ØܦÞEs“ò4º’3´«5¿¼ÏIK—”þO#0€cp„ÇÑ\´mIéïçõö¯‹ÞÂ2©ÕH*“kGiž¿S\9ù˜ZÊu”¦9‰{P\Œ89˜+æÅ{G¨WO2FÕaQŸmUP«æJn§Æ/i Ìj7 –õëf9tsGÓ¿,¶ŽÒtÒ%´_8Û¡ƒ™ìÜë(­äÖ%F–æ·e:¾-8—Ûymð[º§'ÈBùe<È¡Œä”»é(mŸIë÷/Ñ^’ i×C§9ÙóØQzYID abÝé8œ¬Ðu”u{ î
-endstream
+2007 0 obj
+<< /D [ 2003 0 R /XYZ 81.145 690.646 null ] >>
endobj
2008 0 obj
-<< /Type /Page /Contents 2009 0 R /Resources 2007 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 1590 0 R >>
+<< /D [ 2003 0 R /XYZ 81.145 679.687 null ] >>
+endobj
+2009 0 obj
+<< /D [ 2003 0 R /XYZ 81.145 668.728 null ] >>
endobj
2010 0 obj
-<< /D [ 2008 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 657.77 null ] >>
+endobj
+245 0 obj
+<< /D [ 2003 0 R /XYZ 79.37 610.118 null ] >>
endobj
2011 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 583.646 null ] >>
endobj
2012 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 572.687 null ] >>
endobj
2013 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 561.728 null ] >>
endobj
2014 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 735.953 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 550.769 null ] >>
endobj
2015 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 724.994 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 539.81 null ] >>
endobj
2016 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 714.035 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 528.851 null ] >>
endobj
2017 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 703.076 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 517.892 null ] >>
endobj
2018 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 692.117 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 506.934 null ] >>
endobj
2019 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 681.158 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 495.975 null ] >>
endobj
2020 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 670.199 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 485.016 null ] >>
endobj
2021 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 659.24 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 474.057 null ] >>
endobj
2022 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 648.281 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 463.098 null ] >>
endobj
2023 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 637.322 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 452.139 null ] >>
endobj
2024 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 626.364 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 441.18 null ] >>
endobj
2025 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 615.405 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 430.221 null ] >>
endobj
2026 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 604.446 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 419.262 null ] >>
endobj
2027 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 593.487 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 403.67 null ] >>
endobj
2028 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 497.689 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 392.711 null ] >>
endobj
2029 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 486.73 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 381.752 null ] >>
endobj
2030 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 475.771 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 370.793 null ] >>
endobj
2031 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 464.812 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 359.834 null ] >>
endobj
2032 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 453.853 null ] >>
-endobj
-249 0 obj
-<< /D [ 2008 0 R /XYZ 79.37 406.142 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 348.875 null ] >>
endobj
2033 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 379.658 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 274.203 null ] >>
endobj
2034 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 368.699 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 263.244 null ] >>
endobj
2035 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 357.74 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 225.56 null ] >>
endobj
2036 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 346.781 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 175.921 null ] >>
endobj
2037 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 335.822 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 164.962 null ] >>
endobj
2038 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 324.863 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 127.278 null ] >>
endobj
2039 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 313.904 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 116.319 null ] >>
endobj
2040 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 302.945 null ] >>
+<< /D [ 2003 0 R /XYZ 81.145 105.36 null ] >>
endobj
-2041 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 291.986 null ] >>
+2002 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F81 377 0 R /F59 346 0 R /F84 425 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-2042 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 281.028 null ] >>
+2044 0 obj
+<< /Filter /FlateDecode /Length 1951 >>
+stream
+xÚÕZÉn#9 ½ç+ü­H¤V Çö
+– q†9°N¤ú=Qfü ΉfÈ”ÊL§Ì!oÙ Çô*.€.îF–`
+£4÷¯÷êþðu¾ë)[àÎæxØî²2ªòI‰ûÝÌ3võ‘ææÉÛI³D;Á`jÉ)ÉHqÁ»º°º{Jû¯É£6ù!ø²‡µí’îöI^böÌ?_„:8oø)5¶ÇÐ[f$C«‹eRK^ ’/ÉF Â_"æñzÌ¥11Ö¶ëcúÊQU¯ Ñ]b2àÄ”èʸòkB’/é%÷q˜8*ãJ4ãnͼ‚É3‚S¸ÚE;Ò_Óü°±,°^Qá’Qòš‰vw3Ú3ÕÎ<$½ÌΧ©²Œ ±9ÙÆ•H¨65w ^¼ªIÜ"¿íŠ[½WøŸòñe­X(K]KJ0i¦k ©ŒH}m‹^ˆÕ]–;·\æRkneº°òîÎg¾S`JLËZÚÌ{$úÌ㬡)Æ˳+èv¾¹›#pL©iEÕŠ”ó$º%™°©%’RÛ è¢cí´ä©úÒ[7ÅåYÒ˱M5µß‹}Øé×8?»œFªrþÍÍ?’Ü; ‘Kº²‚œ.ÆÕn>—ô©øwÆòVšž½÷_IE‘ÿÜùGßg¨‹…ŸÀŠá̘Ýò“çõκ°Ò#}ÆJ)@1òbqcîýÌ-®™•õQ¸¼NˆÌ+ǬÐ3æ¥ÄÆ|Da¾´åZ9´›K©Ÿ8oi™õVOæ½Úäç¢8 ÝVÕ±=„-¹Ñ.*µm æ+õÁêºãóaåT¡aÖÙ)»o´|Û#Ñ-œñýîI°d±íËåt
+*g_É—ü¤ç,Ë:m&Õ—r³Eß@›ÌH=,EGKï&Ïpa5*ô¬eTpE{•ô¢DÒž›âŒÉ#\7t¶Ü”øŽçín­•›òl aBQYïÏFíU¬GàU ›SS*.í<oíõŒ•+GMÛXý™^NWÕÕž9å9†.£u‰é‰b–¾qjË/Ÿí#Ø—¼SÕ²R£‡ª®.ZÛèM['ŒFi›mÞ‹°/Í~–8h£Xé;´·ô­pÓܱ¨®r€¾W~T"öýà´W^ˆ["î‘ÈZFúÚ FMKí h@ºuTŠDÛWf£ìd[xÒ3­¤‰4ZŸç©ºþ}ÒWQûé»Iœ÷áÄSž‰îU¡ñ[ÐaëZ SVHS¯”@\ƒ§ïé].ýpætUeIåÛO1" [pM.Üf©gv{F÷lÎŽk¦ü¶}ªlÌR2V­Zã§T:dÝŒÕU —#u@º¦ÜfUàß *Ñ¿Éá «ð÷FÊ9Ý#˜º²%H;Yè–øu¦Å4¦eNnU ïѪ< =A”LëiLÑ6Ò{ rC@fø<¸%©9¾^Ÿ?l“ 0#çËŠÖ  HßokëgXä‚‹3W[³Ò=Ò’®ÌÖ‡V×'…6Óõv¢ë«ž»z~¾]1Óõé×î8þ¥;yN!hö:‡[…±ŸmU¨+ýçÏ s¸‹¢ðnH‘Я/,wgéSœ¹á„(Ó·ÚAçE8 ‘ ‹§…q¡f–¬v9©H+úè¾3ªÇ?‘÷[œ]8Æ•žz‚öxÔ€Díÿ¿„m"Â2îÌŒ b= mEÊ7ÕW‹”p‚‰^ßFmkÓ.FxÏ+õ‡'„‡-šTtÊ9í #¼ÄKÂø.m/±#¤Æ}
+Çœ'/©
+l©Ÿè^g¥Ù#¨MÝ{ºJ\Z®3oö.†‡VÃõKw"³¬³ÓøËzc¸Ü'b¯HŠ×h扶'¨ø­½@äBjš6WÄ}@"wBøJÂw}JÈ‚Ä'Y¤ÚøW™X,{àñóé‘ÞSçj/©,p_C¤š±@|ªd@Za¡ÔÙ{X
+endstream
endobj
2043 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 270.069 null ] >>
-endobj
-2044 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 259.11 null ] >>
+<< /Type /Page /Contents 2044 0 R /Resources 2042 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2041 0 R >>
endobj
2045 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 248.151 null ] >>
+<< /D [ 2043 0 R /XYZ 78.37 808.885 null ] >>
endobj
2046 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 237.192 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 768.829 null ] >>
endobj
2047 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 226.233 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 757.87 null ] >>
endobj
2048 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 215.274 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 746.912 null ] >>
endobj
2049 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 199.67 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 721.009 null ] >>
endobj
2050 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 188.711 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 710.05 null ] >>
endobj
2051 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 177.752 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 699.091 null ] >>
endobj
2052 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 166.793 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 659.24 null ] >>
endobj
2053 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 155.834 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 648.281 null ] >>
endobj
2054 0 obj
-<< /D [ 2008 0 R /XYZ 81.145 144.875 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 637.322 null ] >>
endobj
-2007 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F81 377 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-2057 0 obj
-<< /Filter /FlateDecode /Length 2498 >>
-stream
-xÚÝ[Én#9½û+ôÅ"ƒ .€aÀ²¥æì[c®Ó§þÿks nIIIYêB5j»RäKòŤ9ÃßîÿÿŸ—ã×ËÏ3ºƒbÎ
- ‡¯ÿ¿ˆ÷ÿ‰ƒ¦ÕÁhÁ¸‡¯¿¼rŽÀ¹~çܸðyûß×_x
-’I,fßñ'eÀüì$= {&ùÆØU3À¤›š‰>î3¡™A3"U÷\ÊSçÞ!ëûhÐ’#ÙŽ0;LZ{®Ó o²`Î`D²¤-þM€˜u¿˜$yè°do,~ûeXzØp°r@=¨BWÔàHOu6uiF¬ú}4&%Oc‰ÀômXÛ5š3j6„4G|”ç:ûûâ0h–zí£úµôÜ|’:_æÇT'Dz
-²ÐLK ‰~'ÊL"'ö¨-zó€Öt^Ôh¥ñÉVÏÃ7xŸÿÚ1µ]‹þèmþ¾$0àb|ƒ÷"?”
-ºŒ<)UÚ…˜èuxYâ.#×çf]Pö¾á)ÈÀ¼÷é
-É¥U²4ºxÛˆ&‰½0dãÓå`g¶¸IŒÔ¼¶O’†‘¯&,AVÇMcƒž–¬i¦>F2m«³È뺆&6Sò·ÏJŠÓOsr
-÷Ê0¡æ-µd'ÒLòØÆʼӜ ÇÝŸ{{™efÿI髹Ûõ\Mè†êR‹7+)VõJÕKŽ¸pnCøõ*Óã Y3âoÔ”‰¸U -7Û»Ôý]=*p$ã˜M¹=‘;
-c¢vÐwS‰Ò«Y¼œ *¦äÔÝI¹æîz¤[i¢Üï#•úÜ¥³¯ç¹·E¦•dª–S-Óê´ê¤ëÁ~bȲ¢,\+ƒßŠÿ»C¼÷ª(Ô(‰ðsçi(¾ Hë+ 88]ÉÎcÀ|.;
-Á´Ûú÷ý•˜ôVêëÒi*Õ…:àÙž)]Ι‘nÆéÞKù¤ÉWÒЀk|aÙý¹žÙm}î…ÝKŒÖZã[U†°Ž+f¬î-ᲦH—*·YxöE¨'j¥ð)£˜ò÷¾äs¤õ•hì–³•Èµ“Õi}%
-˜áSNv–99U€~Tå鉂5åb}@Zd¼«´8]ÉÚ¼éùúÚ\‚;o˜zªÎk)Ú€ôû5·¾Áb8GÑfFâÞÜ,«t´«®7ÜOѳ²>ÿ9Ô¤¬·“²¾–sÏˈYYßüé–íþVwóZ+%{Ýí¸Øﶨ{Vô´Ãçú'_!çÖÅ™3µƒÅž¾^þ5UZ
-endstream
+2055 0 obj
+<< /D [ 2043 0 R /XYZ 81.145 611.42 null ] >>
endobj
2056 0 obj
-<< /Type /Page /Contents 2057 0 R /Resources 2055 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2099 0 R >>
+<< /D [ 2043 0 R /XYZ 81.145 600.461 null ] >>
+endobj
+2057 0 obj
+<< /D [ 2043 0 R /XYZ 81.145 589.502 null ] >>
endobj
2058 0 obj
-<< /D [ 2056 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 578.543 null ] >>
endobj
2059 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 567.584 null ] >>
endobj
2060 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 556.625 null ] >>
endobj
2061 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 720.161 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 545.666 null ] >>
endobj
2062 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 670.496 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 517.771 null ] >>
endobj
2063 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 659.537 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 506.812 null ] >>
endobj
2064 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 621.828 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 466.961 null ] >>
endobj
2065 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 610.869 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 456.002 null ] >>
endobj
2066 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 599.91 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 445.044 null ] >>
endobj
2067 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 562.2 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 434.085 null ] >>
endobj
2068 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 551.242 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 423.126 null ] >>
endobj
2069 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 540.283 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 412.167 null ] >>
endobj
2070 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 515.122 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 401.208 null ] >>
endobj
2071 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 504.163 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 390.249 null ] >>
endobj
2072 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 493.204 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 379.29 null ] >>
endobj
2073 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 453.651 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 353.387 null ] >>
endobj
2074 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 442.692 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 342.428 null ] >>
endobj
2075 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 431.733 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 331.469 null ] >>
endobj
2076 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 406.573 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 320.511 null ] >>
endobj
2077 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 395.614 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 309.552 null ] >>
endobj
2078 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 384.655 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 269.701 null ] >>
endobj
2079 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 373.696 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 258.742 null ] >>
endobj
2080 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 362.737 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 247.783 null ] >>
endobj
2081 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 351.778 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 236.824 null ] >>
endobj
2082 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 340.819 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 225.865 null ] >>
+endobj
+249 0 obj
+<< /D [ 2043 0 R /XYZ 79.37 202.409 null ] >>
endobj
2083 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 313.815 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 181.567 null ] >>
endobj
2084 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 302.856 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 170.608 null ] >>
endobj
2085 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 263.302 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 159.649 null ] >>
endobj
2086 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 252.344 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 148.69 null ] >>
endobj
2087 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 241.385 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 137.731 null ] >>
endobj
2088 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 230.426 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 126.772 null ] >>
endobj
2089 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 219.467 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 115.813 null ] >>
endobj
2090 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 208.508 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 104.854 null ] >>
endobj
2091 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 197.549 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 93.895 null ] >>
endobj
2092 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 186.59 null ] >>
-endobj
-2093 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 175.631 null ] >>
+<< /D [ 2043 0 R /XYZ 81.145 82.936 null ] >>
endobj
-2094 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 150.471 null ] >>
+2042 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
2095 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 139.512 null ] >>
+<< /Filter /FlateDecode /Length 1981 >>
+stream
+xÚÕ[Ënì6 Ýç+æ¢HÔ¸‰g.ÐuvE·íªÿ¿­ž–DkÓIzç.&‰mͱxDñP”ÂOÿœøéçÃùíáé
+pòÌ0êôö÷ƒøIœ¬gÒž¬Œqzû÷ôçÎ5pn}øí87çü;Þ3ççGÁ9ML¸%¯áÏÒÉñ¯p—çñw}¢Îåiùˆ×p½Þ«­âw¤­WÆc|­ò7áü,!¢šéù¯·?8ÓÑâðóg0Xû“bÞ ½ÁX`À*ÉÌh°yÉÆJ—±
+wOW§N.g¤ëq¼e‚ÐIùc.Ùôhrìdº^²Ù6|à5_«åùQƒŽß6õ/e³q©}üî2Ò&®ùY"Úçk¸æg2|WA{\W|K¥I³f4½‹&Á-“
+0R°”Ø,p=í‰Ú×a˜Õ#}ÓÑÕFÁ™ Ÿ9¥¤Ù8"µÉZìqÛ¬/ÙŠØ6zn´=zs†ë=—ÛÆïÄw¤g·x“…·ÂÙû\–~¨RÒ¬á¹MÂ\ò{âû­É1êëÆ{æÀÌXWëI‰lU´"õ°ô:1uÎ×ÉB‘­†eÛ6ZžX*íãÄO½ÊR´<²œÚ˜Æp%]âQ
+Á>ã¦øóÚ{¬zmÑIËÌõŠº|<WèÜ;Çœ±î_¢þи‘¢ªxGòöÎû’g–˜¼z(o^§Õ
+´€»™HQ!‘ãuP¢
+U˶ו›ÏmÓšäÚ¬+Çäg&ÇòºBiŬÚ&mŽ\XCHiLÏÅ' ›—V’•5b®QsˆœªÅØ>þÞâ9µÛ¼q‡W¾×²h'·•¨å£ïáX)%™uf6"Ä"!B¢«
+˜ž
+--ûqî&ù;7÷­mãá܃IHÁô|؈IB"'y
+=û·OðáåÚœq°@ZIîòöðíxÓZ
+endstream
+endobj
+2094 0 obj
+<< /Type /Page /Contents 2095 0 R /Resources 2093 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2041 0 R >>
endobj
2096 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 128.553 null ] >>
+<< /D [ 2094 0 R /XYZ 78.37 808.885 null ] >>
+endobj
+253 0 obj
+<< /D [ 2094 0 R /XYZ 79.37 771.024 null ] >>
endobj
2097 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 117.594 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 751.43 null ] >>
endobj
2098 0 obj
-<< /D [ 2056 0 R /XYZ 81.145 106.635 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 740.471 null ] >>
endobj
-2055 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
+2099 0 obj
+<< /D [ 2094 0 R /XYZ 81.145 729.512 null ] >>
endobj
-2102 0 obj
-<< /Filter /FlateDecode /Length 1996 >>
-stream
-xÚÕZMo#7 ½çWø¬V¢¾E€Ø.ÐsnE¯í©ÿÿZI#$ g4ÅÂÛ3~#=R|$%)ìåï‹Lÿÿö´¼>}¿Ûx1"¥áòúדºÈôO]g.Þ)!º¼þsù㇔¤t?¥ÔQJŸÿ|ýýIf°õýÌ%ˆèœ#Nô"BÀ@`ÒkI`ð&¥¹&ÐôÞ×Ï6]w2ýUéo\¯•ûÛû{z½¤ß½¬÷šëó7 ¶!«õ•‘ò¯LX¥^VÔü}~Ÿ¿Ï¯üYûô÷ºŽ¤=ÉÀ:‚ü])¼¬S|‡>+…’@Ñgá}Jz¡ `$pÜ‘è(”ÑÔHÜrl$Ê o=FÊ|gn2¿v©Ö\V~‹pÛ,i^F+êŠ6Z3[«XîZ¯_×Ïù}Aó§>"®_ñƒ2¨ã¾r-A¨D1e‰Ÿ<KÌH”%2/ÔLá³Øfr¡¼
-ס¨-¯ÓÙr˜ò&am W¬fES„ÄŽëÚá9’ƒ‰]•CôQrèÚ5×Ã2ã–Çeç+Ÿ);;-Újáì.?væx’Ö :#±å1aOƒÙ³œp¸VÈ¡iì}Ìûtõ£µÞ(ŠUf/!íjNÄ#®/ÇëÛÆóøâpÝ1¨]Ûò<C …@2ÄëI"$ªßˆYúµJæìŒe45cf/!±cD-B GÂjÓ! ÿ*„ãàÑ6ÙËR'–½S=¯Ys¡ÓaBÞ57¤óZy‰ÆÁç=jKŽ„—ó $rƬg’ÿ‹Ðù$™t¤ûó‚鈰R$±£fÌlÆ!$ìY<s…RDzK4ÏpôʇÆÌqËÌÚÞÂÜ6#ÃZµ´\{«ÛêY«R‘Ü;ƒ0l:Y·FvU:
-ödÍî«!¤v–±ø «âÖ²†Snûƒ Î_=ây<¿ÖŸ¸ÄûÍß·ŽE¬­Ö·îx ïDUùüDÊ"Ì&!Bâ뀡9^“}ØΗêûËÛÁÕ¡‘ÒÃÔy)”JìÓ›Â
-endstream
+2100 0 obj
+<< /D [ 2094 0 R /XYZ 81.145 718.553 null ] >>
endobj
2101 0 obj
-<< /Type /Page /Contents 2102 0 R /Resources 2100 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2099 0 R >>
+<< /D [ 2094 0 R /XYZ 81.145 707.594 null ] >>
+endobj
+2102 0 obj
+<< /D [ 2094 0 R /XYZ 81.145 696.635 null ] >>
endobj
2103 0 obj
-<< /D [ 2101 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 685.676 null ] >>
endobj
2104 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 669.736 null ] >>
endobj
2105 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 658.777 null ] >>
endobj
2106 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 647.818 null ] >>
endobj
2107 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 735.953 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 636.859 null ] >>
endobj
2108 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 724.994 null ] >>
-endobj
-253 0 obj
-<< /D [ 2101 0 R /XYZ 79.37 701.537 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 625.9 null ] >>
endobj
2109 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 680.695 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 614.941 null ] >>
endobj
2110 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 669.736 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 603.983 null ] >>
endobj
2111 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 658.777 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 588.042 null ] >>
endobj
2112 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 647.818 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 577.083 null ] >>
endobj
2113 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 636.859 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 566.124 null ] >>
endobj
2114 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 625.9 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 555.166 null ] >>
endobj
2115 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 614.941 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 544.207 null ] >>
endobj
2116 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 603.983 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 533.248 null ] >>
endobj
2117 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 593.024 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 517.308 null ] >>
endobj
2118 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 582.065 null ] >>
-endobj
-257 0 obj
-<< /D [ 2101 0 R /XYZ 79.37 556.616 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 506.349 null ] >>
endobj
2119 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 535.773 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 495.39 null ] >>
endobj
2120 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 524.814 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 484.431 null ] >>
endobj
2121 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 513.855 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 473.472 null ] >>
endobj
2122 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 502.897 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 462.513 null ] >>
endobj
2123 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 491.938 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 451.554 null ] >>
endobj
2124 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 480.979 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 435.614 null ] >>
endobj
2125 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 470.02 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 424.655 null ] >>
endobj
2126 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 454.08 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 413.696 null ] >>
endobj
2127 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 443.121 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 402.737 null ] >>
endobj
2128 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 432.162 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 391.778 null ] >>
endobj
2129 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 421.203 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 380.819 null ] >>
endobj
2130 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 410.244 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 364.879 null ] >>
endobj
2131 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 399.285 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 353.92 null ] >>
endobj
2132 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 388.326 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 342.961 null ] >>
endobj
2133 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 372.386 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 332.002 null ] >>
endobj
2134 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 361.427 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 321.044 null ] >>
endobj
2135 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 350.468 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 310.085 null ] >>
endobj
2136 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 339.509 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 299.126 null ] >>
endobj
2137 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 328.55 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 288.167 null ] >>
endobj
2138 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 317.591 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 277.208 null ] >>
endobj
2139 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 301.651 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 266.249 null ] >>
endobj
2140 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 290.692 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 250.309 null ] >>
endobj
2141 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 279.733 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 239.35 null ] >>
endobj
2142 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 268.775 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 228.391 null ] >>
endobj
2143 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 257.816 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 217.432 null ] >>
endobj
2144 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 246.857 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 206.473 null ] >>
endobj
2145 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 235.898 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 195.514 null ] >>
endobj
2146 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 219.958 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 184.555 null ] >>
endobj
2147 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 208.999 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 173.596 null ] >>
endobj
2148 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 198.04 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 157.656 null ] >>
endobj
2149 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 187.081 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 146.697 null ] >>
endobj
2150 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 176.122 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 135.738 null ] >>
endobj
2151 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 165.163 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 124.78 null ] >>
endobj
2152 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 149.223 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 113.821 null ] >>
endobj
2153 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 138.264 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 102.862 null ] >>
endobj
2154 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 127.305 null ] >>
+<< /D [ 2094 0 R /XYZ 81.145 91.903 null ] >>
endobj
-2155 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 116.346 null ] >>
-endobj
-2156 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 105.387 null ] >>
+2093 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F22 367 0 R /F59 346 0 R /F84 425 0 R /F15 334 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
2157 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 94.428 null ] >>
+<< /Filter /FlateDecode /Length 2140 >>
+stream
+xÚÕ[ÉŽã8½×WøŠMƒÐH ]N0ç¼ æ:}êÿ¿6W‰ ‡3Jjæ%[–žby|¤Xúô×IŸ~~;¿ûãjÜ)©äÁãéý¿ßLþAŸÌ)$eÃ)x£´7§÷¿OÿþSë`^¢ÍG /ßmù\µvFk¼hsõZûT~‰åšs> ùýa¹Ç§üí:ΔkóÝÚüÈÇs=ûŸ÷e»rv™UÊ?Ë|y’oH¿ |ùîÀÕg糺ýk½îÏà}ç”Ó–>ÆíŒk0¶?gš÷Z4Š}ö<îgìê8`_¾Cì—À¹9ä/ÍÑýqÁ7øzóe3 šYíl3®s°ë/¤ÊüŸ˜ª`RFû*ÝᢌbpàÕOÅF‡ Îý™õ—Ï]7®”³p~iW_€>3A¡Ý › ª\¼Ã‘[‚}9S‡Ï×¹ìµ/×ö£×”)1Ýž5©^‡~ä¢b4$ÐXe’¥˜YP³¡¹Ð”s VE):¶;‡µ›7¸ ”- _lPÆ™¯"XKãQÏŒÔþa'EádÎćrá¬rèÓ
+·ýN ʶ"‰Ë¦ËÓßX êXÑÀ$H¿­l:Câ<z°ƒÛ<Z‘¨Ô|ÄyÖF9÷ÑŒîH)žñe%XYkÔº.QV¯Bz¼×]¾Ôü`a”AçÈ.ÌÂF– =·¸¿·ÄJ£l´Ê¦pQ6×IRè›i³@>pqs€))–õôUTk’¸êa´ÊhÖ’›ÀÞ §-lŽßü>8 ;a   "Y·FÄŽQ&:–²%7‚$‹d%õ$µbÉD§@`ý-ª¤G%¯í©CžæEÑ!\,79h“YÉÚ6‚ôѲôÿú ÷³yL™©y›› ¹¼BTV'.¶›c4¯Hr]1 ì-'Ê1Èäu:&¯Ç$vÐ'xÒè}å™’ÄéN^I··_hm.’¶`#§ X óS:Öa—B$yø¢8ÛÞNÚ¼LæÊt3#Ü¡½çü»æÜ^óQ1çøúë¤ñ>ë.Ñ寜µ\ž„Kt‰¾™úli¬.)_ö8îÒ|”.(õLö— •R4g»”ñ^v°fxþѬ¿¾A³v˜6“صՠ †éý\©8µ*ƒ½ibeX/ìUµ/
+žE¯¼qìxv"q$Hb•¶Ö)¿.6n–ÈVÑ’\§•Oe˜¬#HTãŽ2eÜ;˜PéÖWˆãxeÑuÇÌÙÞ•_§Í;×}fë|Ó.¹ò«‚eáŠAÚö… ÝÔM]ê »F­%©åT7Í_ÙÐ%\#HŲ±O¡æò<í«™ÖbPOíyœòrÄHFE0œ7•'‚Ľ,DͯT³<j=p– û$‚T,ßÆÌ^÷õ®ð£÷õ‡-÷I¥Û5‘¾%PdùŠ$±õšnÐ1ï\6øv©£m|”y·"}É;û,ï0Ï—n—Oªw²¾‚ m#ú2­^ö=Y´ç7ë.§s‹ÎP„cžÙ rdY)["HÏô õzN«¤Öý^÷XTÀ+íÙ2AÚªhZw™Î·ª¼Ø~Þ«îR˜šãÊdœ2:²ì–õ4é«ÞŽÜŽwE~æÁyÍýqï5*ƒleö$é!ïE>M*›Àoz·*+ÐünbŒÈºLªw•¦³_N©ù”`sJر$êÕÓ:Œ‚`9‹…
+AZFųû\ãµ²Y«e]
+Az®•˜”uŽ³RØm¤{•EÊñãc×Fe“g=“ué³]ßǬ… Ð–-²î v}ñŸwaÌó‹c–ççbˆ¬å²
+O(Pï}Ïèk¶7Äåèz r¼Ì «6Aº·Ûå°¥ •c-¬¯ Îfe_aãªéSúƒh•×7Se+ß C€pµÿm¡ü œm¢H€ð6¶öÿE°u1»Íwÿÿd‚ºÞ†Z¥}x· õÛû·
+endstream
endobj
-2158 0 obj
-<< /D [ 2101 0 R /XYZ 81.145 83.469 null ] >>
+2156 0 obj
+<< /Type /Page /Contents 2157 0 R /Resources 2155 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2041 0 R >>
endobj
-2100 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F22 367 0 R /F15 334 0 R >> /ProcSet [ /PDF /Text ] >>
+2158 0 obj
+<< /D [ 2156 0 R /XYZ 78.37 808.885 null ] >>
endobj
-2161 0 obj
-<< /Filter /FlateDecode /Length 1945 >>
-stream
-xÚÕ[ËŽë6 ÝÏWäª+Q%ÅÆã¤@׳+ºmWýÿm%YŠ%†™1ÜŠt2ŽçD¤ÈsHZW+ú÷¤Óÿÿx™ß_¾\ütrjŠÆÂéýŸsÒé?sŠ Ð¥ÑœÞÿ;ýõ»Ö´ÆW­ÝYk¿þýþç‹Î` êË%ºST¢=Ž1¨‚ ’M/ï´†EksY¯á”Þ¿¥Ÿº¾¿¬¿»t\ê}Sý|©1}–qܺ¢ÎÀO¬óZ œuèeÖH˜VdëÊ›×Õ\é½Ë¯¸¾ò5°ë=åþì¡yµÜ›ÕâüYö‚RKí¤Œ³¬¥nŸ¥:(ë€"A®¬ò&²ew­d
-j‚HJ
-àXo¾Ê¼9" ã*³MšÈdäüy+[—ÎZ\Ù2YÔ¢³þµ7{Ë«¾Ï×› […›
-yû›¼‚ñËöíNWi„»ñ±GT@ÏùØÊø‹ ýtbUÔÈZEšAÄê…Ö(YÍØY`U±'@Ïû¼%%Ze©· ÍXm{°Vª¶¦KٮХÏÛ–Nyûºï» ´`%JX©$±à£ž KJ;+µkÂŒHÎli_¼5¯Þí½ø½¦?Ee5K{ ªjAJ-Àšº•üZ\””>oÔp/–UP¡º“½¸qDÙ°ò}Ÿ‘m££ë–£'õvO±±®Q,t>æؼ¡¦üSXD¤{rÀKO‰%·îDó^Û+‰/µxš;ÑÔû¼<>*ç!a‰JúølVd~´Õš>Û·õ×r ÷¥iÏ¿ôþÆÁ­Àj׸Ru4Þ‹ÛCòèÑ+‘óðÞÒµ2,As½wS’WË®äU"èi½p%Ü’u0““ÆtbÙJóPëmTÑ9Î {+³¶!#’Xò<£gW"w$.ùšüõ$üQÇÒ:ŸFÈXl…eLÒBo° AÙÉóçX7ɺÜö•×Zu:"ÉO°4'½$.f³§‡nçm£›&ym7ZL7y.ž;LæÚ§…óTãdVŽHÎl2`ÛÛ¾ÐèI4ÇA‘FØ<Ó´'Y.î|ÂLòÈ‹ƒ˜€Ýä•Ö›eV”ïIÌ<.LI"YæÙY V&@ÏìOh³}ÈÈ¥e7 \Zt˜¨Ƥw7ôˆóþê­m܈$&j—Zp‡È­DX%$÷úˆg 
-—Zm¯g‘p Fè@ín?ñA}ÇÅa‘ë^×(¨Œ+õuíWF’zÓzå]d½)¨¤¾guóm_‘=x[ÜF`xÞ®SxëÇ¿™r©l·®¹ø±Q8ŽTœ¢®¢\RÀÇîuG;V¹ÏrïƒS~âœ/œ´@4’¥î¥=ïlÏ5w/ÎX…ְΕ ÷’X ì“ø²,î g‰'>ÿ ÑL-¸ÒŽ'vÙ@ ‰EÓT:²¤(è¤&š65àX¦óÒÍó¼b§ïÙhÌ}ÔÏâ_&ÀRÏz§ÌmоŠçtè¡"à_¡—U` çfaKž+ÿ·ùðc%Vêe
-<p^–ÖI"ô-ši±pó\zïK-£`r¬¥¯2­‘䪧½Bœ¸•ì¬[q0}¯c>cÀÿäBØük#Xú!ÚÀìB„ã6‚$óãÃx €
-ŸÊ²AÚKpîRŸÅ|¯ƒ6€FEkÙ’m飑ôÏÞÝ~ÖuA·3Еn=7¯U ,¹
-â$9«X¯nÇpvÿI¼Ê­#Î1jý6§(¹ñº†ÇpÐ"¯ñ8=ƒK*g8Oî­¿Ú–ŽHr‚N͸µÀ­DX£¤ïxº4(,kƒlèFöœ®üž§&¹ˆývÔx?îŽçÌd”3ŽÛ'á|Ž ѧRÇO¼Œ@µržeFáó[‚”¥¨ßmó6ýÀîØÈG=ÿÑÓ¬Ð=›+™êºR¥Eï´y±DXöÂÛËÁ38)7!›Ï^ÄŽIÌÓÆGåm`W"›¡$1O”‘0Y9Fžyîùã³ÉO=,ôžE…¬È Çu#P±wéXS¯ÜRNWØÑgpä|¶Ü„ÞÖ Q<#HרsÝɹ;QÓÍa²E×â<v»rÈ“zI œ5©Abφk~Jylå:5ŸÎr+VI)¯üš1oUõïœ@?´ò)u›· ÊÂe¥Ñ$Y·Óã®pgƒÙS_É´#Q\NŒ@ÙfŸd[HÚí9ƒb›ðß?@×\^º©à²Ã¢µžÓÝɦy;ˆ›}ÑÙõåbüiJ‹(§­·E@ŠôxrZMäøkôß_þ³ÈÒ
-endstream
+2159 0 obj
+<< /D [ 2156 0 R /XYZ 81.145 733.96 null ] >>
endobj
2160 0 obj
-<< /Type /Page /Contents 2161 0 R /Resources 2159 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2099 0 R >>
+<< /D [ 2156 0 R /XYZ 81.145 723.001 null ] >>
+endobj
+2161 0 obj
+<< /D [ 2156 0 R /XYZ 81.145 712.042 null ] >>
endobj
2162 0 obj
-<< /D [ 2160 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 701.083 null ] >>
endobj
2163 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 690.124 null ] >>
endobj
2164 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 679.166 null ] >>
endobj
2165 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 665.218 null ] >>
endobj
2166 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 731.287 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 654.259 null ] >>
endobj
2167 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 720.328 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 643.3 null ] >>
endobj
2168 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 709.369 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 632.341 null ] >>
endobj
2169 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 698.41 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 621.382 null ] >>
endobj
2170 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 687.451 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 610.423 null ] >>
endobj
2171 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 676.492 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 599.464 null ] >>
endobj
2172 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 665.533 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 583.524 null ] >>
endobj
2173 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 654.575 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 572.565 null ] >>
endobj
2174 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 638.95 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 561.606 null ] >>
endobj
2175 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 627.991 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 550.648 null ] >>
endobj
2176 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 617.032 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 539.689 null ] >>
endobj
2177 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 606.073 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 528.73 null ] >>
endobj
2178 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 595.114 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 517.771 null ] >>
endobj
2179 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 584.155 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 506.812 null ] >>
endobj
2180 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 573.196 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 490.872 null ] >>
endobj
2181 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 557.572 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 479.913 null ] >>
endobj
2182 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 546.613 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 468.954 null ] >>
endobj
2183 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 535.654 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 457.995 null ] >>
endobj
2184 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 524.695 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 447.036 null ] >>
endobj
2185 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 513.736 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 436.077 null ] >>
endobj
2186 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 502.777 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 420.137 null ] >>
endobj
2187 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 487.152 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 409.178 null ] >>
endobj
2188 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 476.194 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 398.219 null ] >>
endobj
2189 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 465.235 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 387.26 null ] >>
endobj
2190 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 454.276 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 376.301 null ] >>
endobj
2191 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 443.317 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 365.342 null ] >>
endobj
2192 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 432.358 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 354.384 null ] >>
endobj
2193 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 421.399 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 343.425 null ] >>
endobj
2194 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 405.774 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 332.466 null ] >>
endobj
2195 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 394.815 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 321.507 null ] >>
endobj
2196 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 383.857 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 310.548 null ] >>
endobj
2197 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 372.898 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 299.589 null ] >>
endobj
2198 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 361.939 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 288.63 null ] >>
endobj
2199 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 350.98 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 277.671 null ] >>
endobj
2200 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 340.021 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 266.712 null ] >>
endobj
2201 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 329.062 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 255.753 null ] >>
endobj
2202 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 313.437 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 244.794 null ] >>
endobj
2203 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 302.478 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 233.836 null ] >>
endobj
2204 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 291.52 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 222.877 null ] >>
endobj
2205 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 280.561 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 211.918 null ] >>
endobj
2206 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 269.602 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 200.959 null ] >>
endobj
2207 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 258.643 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 190 null ] >>
endobj
2208 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 243.018 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 179.041 null ] >>
endobj
2209 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 232.059 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 168.082 null ] >>
endobj
2210 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 221.1 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 157.123 null ] >>
endobj
2211 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 210.141 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 146.164 null ] >>
endobj
2212 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 199.183 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 135.205 null ] >>
endobj
2213 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 188.224 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 124.247 null ] >>
endobj
2214 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 177.265 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 113.288 null ] >>
endobj
2215 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 166.306 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 102.329 null ] >>
endobj
2216 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 155.347 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 91.37 null ] >>
endobj
2217 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 144.388 null ] >>
-endobj
-2218 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 133.429 null ] >>
+<< /D [ 2156 0 R /XYZ 81.145 80.411 null ] >>
endobj
-2219 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 122.47 null ] >>
+2155 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
2220 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 111.511 null ] >>
+<< /Filter /FlateDecode /Length 1872 >>
+stream
+xÚ­ZËnã8¼ç+üÃ!›d“F‘½Àžs[ìu÷´ÿ]’b‹щZ [²Tî««©HaoÿÞdüÿ—åýåçÆ›Á+ ·÷^ÔMÆêæA ¹9TB¢º½ÿwûë—”¤Ôa{áòú÷ûŸ/2E¨Ÿon^Dí[¥P8ëH&"Èø®¤4K9Ž¨ñM‚–R½Å÷xÞÄ‹ôR¯Å5ž‹/x”k—‚áË÷é\ü^=6ëg?ñÔJ¡$L=ýÍó´GJ鈆P¬_¶ãkVê ”Ñ3+uàYÙ#%ëôc‹¡ƒ-¶é\Ê å‚¼¸f9x¡¢I3Ë=Ïò‰cyúÎÀVAt]ª:lÎçj»ì¥rÀN«Èò¼ì‘È£T熬ÅC½¿^U N­6<«{¤™Õ†V}ÉA²ºe
+'”›õõ‡›îFú”
+›Š(“”¯iØSPR3#«|~­MŸp0äþ{ì°©ø¦ü,lg%
+LCmX²¼nUBçóçF&äŠyÛ³gæu†K¤pÓ¥À“ YDñû,^ƒÔ‚ÓqŠõXÙ¹5?­ê힌5¬‚ËP‰-ÙD ÑI"³²zÙÑsA83¥f¦€L´Z»²î±¯Jj„ê1¶ô†ުןU#ñJŽ¸¯QL¿³G°D*Ýæ~‹^8?¥þ³B¨0Ç€Äæ°¨Œ„÷Óz?)b
+õ@ßEýP&ÎgÅK)¢™cKÉeJ·²7C8О—A”˜‰MéV%ð0³„©q¤³”ž§€uˆöZ)i§2YµP:ÖKCk4q‡‚U(‹”YçôG¸¹ZšIÝìöp£)½jLææÉ
+Æý„ÚÄhšîÛÓoWg´fê8o/e@¢v›½hÖ95¡ìõÒ4¤ûÇ‘94wCkxymÝ»ŒG!ÌâÂܽ¨JMíŒ}¨â¾‚ÒêËS,4b¨¬JK’wX½ížK^)¾©´¥b`3ÙPNZáÖî¹W$7ºÎ
+¥õ4º<9: ‘GÄ9$ðSÔöÆÿ8zÃÉÊeécÐåÌt­ñ¤ã€„þ(aöu%kDF±—ëê­Îà¹Or¥Š±Z€²S¯ «#HìÞlÀ
+=_²š£Tzœï*Y€Èš¢qj—#Ñ‚Ý5é”8/ £ŒÐ8%þ³›S”¶‰-dŒÔ·óÑ°w–¤«³img„Fü\H^z­Ë«]zíTBç>ÌHê
+t]Î\á\
+Ï@Îßè¨LT§^fuùúC{ý«Î¼yzxÐÙ©z,ÍÉ{ãJªYÏ5§…\é¹=Î>Á±Çâ½$MÛë´KE9ßø§¸¼¶<Ôvsºcg®{ߥIúîUüÖ¢™GeÖÓ!ƒ §×œ—¥¶$vç…XnO:/s/n@Êý¢é9‡°ñEúœw—-šXxYãg½bì øx–§É‚-SWÕ ÖYÏîÇFÉ#à³Êœ ø¾úš{i›€ö'?¨àÃPù9%Ô¨]ŽŸuÏz'SmH|K ò±?> ѧÕfa¬(¥d;ɤœÆ¥7í>ÍÚulxž^Mí ª@ÌÓ–9IYDüõ4*/PÏbwV_R; >qEtjfSŠ Hû®ÕZDɽ
+Š:à1­U!þ–‚©µ¿Yä1 ±ã¦¼^OxVÖh«G$[–ªèÜ^uvÿ´>!½ò-Û/g„ fê—çùÕ#‘<p¦È/¨âÃV[õ±«¡ƒˆzÿ»ß 3áÈ ³¿Bºï÷÷ùã}Z?rïÀ®fÔÂk;­æ“ò%U±‡ÒJ#ÎwJ4À®²|˳*ü}ÄQÒJ2Ý}­„-ïÜ4¬†G=›ä•Q"LþjA³Ÿ=H§f¥´ˆIûlö‰tE³ÜëZ94ù|øl+áƒ8‹ï™h“%D·H£iªü™ÝZÉ /7§¹ÙõF ÊÌܹò§ÇóD¥`Ï…å#/¨ÓÂI?s¹ËÕå‰ÙTlóäxß:,\jíäz,å­ì¬¼!Dã-ÞŒÁí?Ú<ò¸¿¿üƒ1R
+endstream
+endobj
+2219 0 obj
+<< /Type /Page /Contents 2220 0 R /Resources 2218 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2041 0 R >>
endobj
2221 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 100.552 null ] >>
+<< /D [ 2219 0 R /XYZ 78.37 808.885 null ] >>
endobj
2222 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 89.593 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 768.829 null ] >>
endobj
2223 0 obj
-<< /D [ 2160 0 R /XYZ 81.145 78.635 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 757.87 null ] >>
endobj
-2159 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-2226 0 obj
-<< /Filter /FlateDecode /Length 1846 >>
-stream
-xÚ­ZÍŽã6 ¾ÏSäV#QÿÀb€fèynE¯í©ï]I-™f6¡'Xx'v’/üÿHÚZùÓ']þÿóíüõö¾ø|r*'cáôõï›9éòÏœ¨àN1¥ƒ9}ýúû§Ö´¶¹Iëà?þùúëMW°õ¾$wJ*‡`ÓŒcLPÑGŠç‚f´v—‚Tô×å0Ÿã~Æér­œÇP^—ï‚íï¥Û{óç –")Œßàp¡þÞrÓd2Ì«x­ŒÖ*Nf•-J\¥¬«•Ö×ËM»ÕrçÛQµBm«…Žid³2ÎrY+Óh‹d'_ Ÿlìšô]Ÿm>LÃö°V”)â2Z¹«L«-Õªj~°çïHl¢ðTâàKäg™Ä[$”8ê›Ä¶GQõA=ª½K­ƒ‚8©=ȤÞ"½Tʽ²:rR†³HJ‚t¯ÞHcüpö†ä”u™Õì™f[¤*á×X¿ã!ZeYa­,Ä·@µº õ±>†ñ«§É@9kXÁ“Lð-ƒ&yçBäºC8ª7ÊE`ãDÆæi¶3Fy“ö°¤®|ÊXVRäUÒÊwuÎáã9 YyïØh‘1*Er[ ŽIg’ò™å!3R$··oìÑàæÎæÔ:ª`÷<ãÄìH‘ÜT¥Ïý|ªàU£%-¶Ïã³-C/Lo–úûú ¦>bä42*Aj•°s Ö—ÃþðÉ«h'¥Q R•®FOµa„ÑýctÁù›Œé£S‘ $!an$rÏ“
-~®Uœéz‹µÃ:«’6œ’B¢%H¨òV“ºÏWßîÒ¼•°RËX– qRÓɱUþ)ÿÛ´ùÊNÍ;£R²làɘ ÝÓ®Eä8©¼döV« ŽÕFÆÒiŽ&Ì•&ugå&õ«§orг‘'cl‚´Éî“jûø-iuVŠ“VÈà)véÚ>¡³¸Y¶{†zαºOB-\NJ»ÏYû<£&·%Ë D©$Ñ(ã 'É“Œ›c áD 8Ìí×[yiIyî罤TsB7±»|üðàë·¾ÂQ ‡v¾ wÍ®âÊU»~w¨XOl¶ •ÉÀ™íÙ
-¢ãl)lJ…6|d3´C%âz^í-—ëwÉ„fÏ<Š.[[iÖXÐz‹-%ªg-(kc’ë Ô–ûa™H‡f¡Ä>Շϡõ£ˆÄÚÒ,ž†Û*å2F\OËËÑÑúÀ欗U-’¸ŽÙ”•ãq’ê¿ÅyUñ‡>sÞ ]tÎ7‡.ê6–™^³\øl'ÔÝBÄE݆¨¼céEØå¤g‹z›.ÄÚ—Q`Ú|a74oH[êéqW§aõ‚…éä.|ñ›7—ó¬¾ÞÏ’öŒ%A”ßOî*ÞŸP¤©(U©Ÿ¥;èy@w,‘áL½¥>©æΫ°ŸTªæÂ}
-ABÊmZL™Ž$Ô´>O„t}p¼Ã,¦Þ9ˆ ëTØÏ<Õ. AÚÜo‚i»ÆÆñ6‚jþµY¦†¨ç¥Ç¶—äï¼yi¹’¦H›ï5OÓ údnÞæÍË>'¥Ö«â~FkÖ•µ¤ 5ªƒM~µÚJüË^‰W·>Ö€Šû™®j-l RHûfÍ+=,B›½WŸcoL)mU¬6*¦Ìj•dœ¸E³si§UÚ\-ª¼¤W!@¯jVZ¢‡k°#eÒB†)»v¥lé<ÜÌ@°*[–ôž]RuÇ$q3TŽ, Léè„:hã™f£¼îe{ 6'ß<—àµß·RK:PÚ°´%l Òkfpo÷äåĦ†Ò†1_µ–}%ûGs2üVï±ó­ÔºÖ(í·<ÕQÜ&¤¹eà¤Ã´S
-¶cwì5&œ{Ö,ý(ŠêZêÌG­¿üøa“ý9æÞ6?,x•í»AoO± eJÉõ|R<ÙËuÖ%@ë{– ×í­é{Þ*PWú2W¢™ÏñkíºnyÛß5Ž?g4·Œ<zÞhÎ(Ï礕­÷ ’˜{Õ*ðq.ÜǤÆ4âcH×¾E<߬ze¶á[PfË=?1w
-nž:Ú/“U`]öìJ‚2„{qɵðÛØ›¾‹‹ÜPþ&~wcåã’0lvØz:©†5Ÿ¬Û$HbIJiMäIR x+©W[œê<lÚ±IjN<o[›yϳöî;×yR¯ÿ°„É8lŒ!é°£V‰<ÎÚM÷lwÙ}¸êEë})ý&C‰ËûprºôöãQ˜ñ\äõëíаI
-endstream
+2224 0 obj
+<< /D [ 2219 0 R /XYZ 81.145 746.912 null ] >>
endobj
2225 0 obj
-<< /Type /Page /Contents 2226 0 R /Resources 2224 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2099 0 R >>
+<< /D [ 2219 0 R /XYZ 81.145 735.953 null ] >>
+endobj
+2226 0 obj
+<< /D [ 2219 0 R /XYZ 81.145 724.994 null ] >>
endobj
2227 0 obj
-<< /D [ 2225 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 714.035 null ] >>
endobj
2228 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 703.076 null ] >>
endobj
2229 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 692.117 null ] >>
endobj
2230 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 681.158 null ] >>
endobj
2231 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 735.953 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 670.199 null ] >>
endobj
2232 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 724.994 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 659.24 null ] >>
endobj
2233 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 714.035 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 631.345 null ] >>
endobj
2234 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 703.076 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 620.386 null ] >>
endobj
2235 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 692.117 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 609.427 null ] >>
endobj
2236 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 681.158 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 598.468 null ] >>
endobj
2237 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 670.199 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 587.509 null ] >>
endobj
2238 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 659.24 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 576.55 null ] >>
endobj
2239 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 648.281 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 548.655 null ] >>
endobj
2240 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 637.322 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 537.696 null ] >>
endobj
2241 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 626.364 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 526.737 null ] >>
endobj
2242 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 615.405 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 515.778 null ] >>
endobj
2243 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 604.446 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 504.819 null ] >>
endobj
2244 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 593.487 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 493.86 null ] >>
endobj
2245 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 582.528 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 482.902 null ] >>
endobj
2246 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 571.569 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 471.943 null ] >>
endobj
2247 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 560.61 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 460.984 null ] >>
endobj
2248 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 549.651 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 433.088 null ] >>
endobj
2249 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 538.692 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 422.129 null ] >>
endobj
2250 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 527.733 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 411.171 null ] >>
endobj
2251 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 516.775 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 400.212 null ] >>
endobj
2252 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 505.816 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 389.253 null ] >>
endobj
2253 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 478.919 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 378.294 null ] >>
endobj
2254 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 467.96 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 367.335 null ] >>
+endobj
+257 0 obj
+<< /D [ 2219 0 R /XYZ 79.37 341.886 null ] >>
endobj
2255 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 457.001 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 309.088 null ] >>
endobj
2256 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 446.042 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 298.129 null ] >>
endobj
2257 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 435.084 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 287.171 null ] >>
endobj
2258 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 424.125 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 276.212 null ] >>
endobj
2259 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 397.228 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 265.253 null ] >>
endobj
2260 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 386.269 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 237.357 null ] >>
endobj
2261 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 375.31 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 226.398 null ] >>
endobj
2262 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 364.352 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 215.44 null ] >>
endobj
2263 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 353.393 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 204.481 null ] >>
endobj
2264 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 342.434 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 193.522 null ] >>
endobj
2265 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 331.475 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 182.563 null ] >>
endobj
2266 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 320.516 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 171.604 null ] >>
endobj
2267 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 309.557 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 160.645 null ] >>
endobj
2268 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 282.661 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 149.686 null ] >>
+endobj
+261 0 obj
+<< /D [ 2219 0 R /XYZ 79.37 124.237 null ] >>
endobj
2269 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 271.702 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 103.395 null ] >>
endobj
2270 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 260.743 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 92.436 null ] >>
endobj
2271 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 249.784 null ] >>
-endobj
-2272 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 238.825 null ] >>
+<< /D [ 2219 0 R /XYZ 81.145 81.477 null ] >>
endobj
-2273 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 227.866 null ] >>
+2218 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F22 367 0 R /F15 334 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
2274 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 216.907 null ] >>
+<< /Filter /FlateDecode /Length 2437 >>
+stream
+xÚÕËŽã6òÞ_áãìa9dŸ@oö¸½À"·tA’k6{Èÿ_çDR%™ôŒ <mSd©ÞO‰3uúï‰ûÿÿýrùxù|Sî$™³áôñû‹8qÿOœ,0-OF Ƶ8}üyúå•sœ£ã\¾s®/o¿}üç…`Ô盕'ËœÖhk8Bhf”é!Ië¡ Îá¹ø~¿ýS
+÷Àò ®å[Úá¯Iÿ[ø½Ýç횆t&œwB öbí–h«Xu‡OŠ3ÁäÓyŒO ™0ÐCBYpZè°=-ÊÒ¼¢öð:Gñ”Ú7ÂgòœÜ7-tLH¤änNo[Hûz‹Æãyõ+×tU‡ûAÚ-M†[ú(•¥X>z–J°Lxô)*í•R1TiŸJ½HvÕÌU •ª¹Q´.hǪóT
+
+_ƒjà˜á¶‡„‚pbª
+þe-РøvØWz׬Õ!ˆÅí·½ªõ6xt<ý|êä<ýàÙVÑoC¯rÞ¤[œ;dw Ú½®ŠWLx cÁmù4A
+Q¹¾tFæ=Ÿ‚‘ÂsÞrìqÐúoa83bs*¥.É=‚¶¯É˜ƒ+Mx‰®ŠcϮٽ ÜÕåœ?“VøØì|8¢”aõ†›üðô£ÞÈ@y3—
+z2‹:RõFÆAôPZL¢ž£6MzV
+f¥í!gÞ77Úñ–If™–J’Ëe¯†WX¾Œ0 «×ñzÝ­‰aÔ Sñu_ÎXäTd}IÀ¥&æàÂ!‹ÃZ[eaÌg73Lûº^@Ýk%¥<sìG¯«ž'$ ½
+¦ÕFøƒ»Ûf
+^O¡¯õʶOs샜Ø>*õ Ù¤t‡þA2eÄÊìl´ö Y|lûG±¼ôé_=˜±àÜœûá§óÝà¬Q·‡Rpž Y…‡SÈ*g°‰QHnIH*}§[Ú=<Ò¤Ýï•ËSÇêAHÙ¤ã×¢Úu¿o‹‰<¦!Ñ´-NˆAz}F²TlÔ¡t€žL¾¼5ý›üù7gý$3Á2åHf¶e
+3[@_;!)í“ò¤Z!º„“Míñ’/<—¤q[ò§Ÿþì ­Bi_hi"ÊÛ*¿¬a” ¾<<f«§Ý6¥¦:Ÿ[ð’µlêDç§w×Ú(ŠŸƒ­¡¢R- Îa|¾ì!B#³`é
++[¬•Vh{cEx­D¨r&‹£9SÜYDPºEÜal›v”|#¹â²Ô[aêQáy ØØtŒxK˜zL$*"¯‘¨_ë|nY©òª´R§/y%SjI›yÌÿrÑK<ÜÆG=;\Sg¨~æðr\7_µ!Ö/C²¡Ý
+ù¥–IDį+C‚õeÒr$ìI•Õ›-ja0'áv©¹²ý‰›®ï•ðZd‰²{J5A)ªb²b­0Õ³®+¦µJÕÞ`½s5“Ü&׌ÏD–öy9Ý>ïÛ?::V,àn²¾Ö8x¬FQy§3S!0>YJxœÁæiö8 £wñÚ7åÚwäÚ·ïú_ÑU·×/D•|«íþ{c÷ß»ÿnÛÈŽ–Š]8—YQr ó‘ópÿµˆ²´/ÊH P¯M6OÙ4ëòÒÂjaâ˜0Ó}G˜Ha±·w³]ᤀœØK–æºÑ-œK» ÚÆí8x8½Ò'É™3KZ ÕR»¾¼ü7ÿ=
+endstream
endobj
-261 0 obj
-<< /D [ 2225 0 R /XYZ 79.37 192.457 null ] >>
+2273 0 obj
+<< /Type /Page /Contents 2274 0 R /Resources 2272 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2041 0 R >>
endobj
2275 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 160.326 null ] >>
+<< /D [ 2273 0 R /XYZ 78.37 808.885 null ] >>
endobj
2276 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 149.367 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 768.829 null ] >>
endobj
2277 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 138.408 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 757.87 null ] >>
endobj
2278 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 127.449 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 746.912 null ] >>
endobj
2279 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 116.49 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 735.953 null ] >>
endobj
2280 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 89.593 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 724.994 null ] >>
endobj
2281 0 obj
-<< /D [ 2225 0 R /XYZ 81.145 78.635 null ] >>
-endobj
-2224 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F22 367 0 R /F15 334 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /D [ 2273 0 R /XYZ 81.145 714.035 null ] >>
endobj
-2284 0 obj
-<< /Filter /FlateDecode /Length 2605 >>
-stream
-xÚÍ[Ic·¾÷¯ÐÑ9˜Cw@i@µ¹¥}’\mçÿ ëq+.zzT{€ÀÖ´D‘õŠµ~U¤8Ó§ßN<üû—·ëçÛ·»ö'żNŸ¿¾‰ÿ‰“fÔÉÁ¸§Ïÿžþyæ\çÒÅ¿Ö¿ÿûó¯o‰RßîNóÆHGéa˜Õ¶§Šs(™çâ{øû>‡÷ZÊ:|ÇÏñ „á'Üj··Žq † =%0«œHÏ„’3NÌõ'R3íLOÉð@ ÷s²SÇÞÖ ñYº¼Cyª4ÇGÙn2¾•ËûÇD`x¶¯ËÚ¾ZJÈîË~5ÚDÞqoÈ?òmü¸ÇƆ i ’¼Â<¸Öyøå÷ø=Žáw¸incyÝeg×I‘ö±Ùxæ–­YX g²–}Ïßs0PºEÿÛ^"¾Ðÿ²üL’ŽÙdo¨G]d;J>š÷gËBNËÞgV¸O½§#¸æ™uû5æ†1S±ºµ ÑR»È‰ñšIn§Î¤qÂ-“
-zJ‰“ow€“« <Œ¬²žI{2Æ2î}ºõÉù®IðÑÔ‚ð9
->ª¯à_ô…òþþþ³tò\=D]ãK|OÖrG¯ŠHyfZ&‹ˆÔ!yË<¸žš~ë¦ ~69ÔDÆ·ïÑH-¾V™—ŽYðSK“KÌ·„ Å·-Ö\k|D¤ñ°UáÿŒ,³SUK
-D`µÕøML$ö²¸ Àªxª~¹”¤:B5 ™¦æ@¬XkŽåRN ,v§àã(Š
-øÕr×S’bÄ4Iþ¤ › ø¼a
-àœë$ªó[M([‚²w8ßBä\ä‘X2Æý`Ó'~‹P/Ñ–H#m6¡À$"²[̇q1Í‘ÈV¹Þ“X Óê•°Ÿó$n‰öœRnÍU9Ï´h—*ý•P/Kyn»y9nÆob·„~’÷(®82ƒ{ †¸GPGñS˜¿k'Â2
-?Ó™\kgu”^.,Hf§aà`E–š-P”¥ÔãT¡˜:ÀP¥¹=Þ ¡Ÿ~ÿSL‹ÎÎ[÷"¤CÑ.ùsZ"ÂÓ5ÁÍ‚ªš5ÿüG~›û¦džw¼ý'- ›‚ùP\ÚmK§¤GO.åT
-.±ºÕy„¢¦ ùÄÑ ¶O ¾±¥Kq­ z™>G{x—â\õ]H~^JH­˜®‡7t0ì"ŽD[K˜ ÊduŽGÖ».¸´ ´B5UÉ9)䳓ømnõ™Ï Z¼Žë~7 ^ò¶9Áœr=å$ûf¢Vs&úIð=—j*å<צ—E^p{u-Œê÷¾"÷Í‚,‘ëc=ˬ§¬ëk$®ÌäKbH=¨9±­€»;Ä)î÷g¢¥´ûzƒžÁšB´7Á8Ú˜`$¿ót×T”ùøìÂác %ukœ&®=;­,pŽ¼’Ö‘ì™ÙG^tûجÜj ’‰ÙjRÚ¹FlŒiqE®JÛ¯Ó»äÌh3¯gÆbíI0+Î2S²6™Ê¨d9*YæÂÖ™¹ñQJ?ZzÝèÈxb?yÇTÈJ½@¶o$„8cÅ@eµ ”"|%§ÀhìoîårJè§ßÿÈKÎͺ¿ýryšœ4í¢˜œ¶ÌC†ŸÂ÷µcæ–Ž‚hÐû»ï—H¨èF·ws*œoÎoÙ°K±Z\èH‘õ>šÆfÓþ| ƒ—ŒÌtr°á›tÒúÁÛW÷µK</>û9< ƒØÀ ž¥¶Yjè©rq ¨"°n«³Ÿçy¦d:R§„z±Ì’¸Ÿ^:pæA/­Þ8^ç–‹n@®Eùå+ €k¾ªU¾Þ ÒR{¦|/VØo^KãX°Û~8»t6ä=<swJ4¬ÒfžÇÆDkܻˊ²²(è£5‘弚£“ö-ýáFcöè–Ð×zKø^“ým´“Ú™x¡Ó
-iQŒ‡­¡‚ÚRŒ‰œOè½f°”·|§¦=ÍÝúDUÖ_¯mÉÒ?¸™J®g™œô$mJäÆ@N¡úƒ>'óS÷c¡ô3W~2Äܤôs««£c{—–ø:иA¯åVaÑø@q…iÖvƒÓšÌ^S¹çÝ\>*xfb¥x…­
-endstream
+2282 0 obj
+<< /D [ 2273 0 R /XYZ 81.145 703.076 null ] >>
endobj
2283 0 obj
-<< /Type /Page /Contents 2284 0 R /Resources 2282 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2099 0 R >>
+<< /D [ 2273 0 R /XYZ 81.145 692.117 null ] >>
+endobj
+2284 0 obj
+<< /D [ 2273 0 R /XYZ 81.145 681.158 null ] >>
endobj
2285 0 obj
-<< /D [ 2283 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 670.199 null ] >>
endobj
2286 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 630.349 null ] >>
endobj
2287 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 619.39 null ] >>
endobj
2288 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 608.431 null ] >>
endobj
2289 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 735.953 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 597.472 null ] >>
endobj
2290 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 724.994 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 586.513 null ] >>
endobj
2291 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 714.035 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 575.554 null ] >>
endobj
2292 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 703.076 null ] >>
-endobj
-265 0 obj
-<< /D [ 2283 0 R /XYZ 79.37 678.299 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 564.595 null ] >>
endobj
2293 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 657.456 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 553.636 null ] >>
endobj
2294 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 646.497 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 542.677 null ] >>
endobj
2295 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 635.539 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 528.73 null ] >>
endobj
2296 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 624.58 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 517.771 null ] >>
endobj
2297 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 613.621 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 506.812 null ] >>
endobj
2298 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 602.662 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 495.853 null ] >>
endobj
2299 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 591.703 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 484.894 null ] >>
endobj
2300 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 580.744 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 473.935 null ] >>
endobj
2301 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 569.785 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 462.976 null ] >>
endobj
2302 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 558.826 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 452.017 null ] >>
endobj
2303 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 547.867 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 441.058 null ] >>
endobj
2304 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 536.908 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 430.1 null ] >>
endobj
2305 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 525.95 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 419.141 null ] >>
endobj
2306 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 486.323 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 408.182 null ] >>
endobj
2307 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 475.364 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 397.223 null ] >>
endobj
2308 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 464.405 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 386.264 null ] >>
endobj
2309 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 453.446 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 375.305 null ] >>
endobj
-2310 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 442.487 null ] >>
+265 0 obj
+<< /D [ 2273 0 R /XYZ 79.37 348.359 null ] >>
endobj
2311 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 431.528 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 274.219 null ] >>
endobj
2312 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 420.569 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 263.26 null ] >>
endobj
-269 0 obj
-<< /D [ 2283 0 R /XYZ 79.37 396.175 null ] >>
+2313 0 obj
+<< /D [ 2273 0 R /XYZ 81.145 252.301 null ] >>
endobj
2314 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 322.708 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 236.361 null ] >>
endobj
2315 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 311.749 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 225.402 null ] >>
endobj
2316 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 300.79 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 214.443 null ] >>
+endobj
+269 0 obj
+<< /D [ 2273 0 R /XYZ 79.37 175.679 null ] >>
endobj
2317 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 258.734 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 121.32 null ] >>
endobj
2318 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 247.776 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 110.361 null ] >>
endobj
2319 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 236.817 null ] >>
-endobj
-2320 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 225.858 null ] >>
+<< /D [ 2273 0 R /XYZ 81.145 99.402 null ] >>
endobj
-2321 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 214.899 null ] >>
+2272 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F88 643 0 R /F87 2310 0 R /F111 644 0 R /F64 333 0 R /F22 367 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
2322 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 203.94 null ] >>
+<< /Filter /FlateDecode /Length 3359 >>
+stream
+xÚå\I» ¾ûWô°"‘ZÁ
+6ÄÀ³ <Ã3Xò]ñ^£Æ]ØpîïJd‰M¾tÝûÊ‘=¥BæÔ†§à?hªî\çw'ð÷lœ‘x²tLpM=9ÑxÿŽÒ¼%é·r¤yQÚ¬«èM6|ÊUÀ ·~ †­¥Ia¯Ô<NšÌ„}·Õl0ÜÕÝtI•v§ŽÌÀ½©#|ô#CÐOLšm¢|â) ¡°žã^®DO¤§OzKBVòô·D„b ðž# ¾UÁÄS'ÏjŠ‹ëÚªL<4;>'¶ö‘E¨êKåéquYâ܈ץ_ƒœé¾çÃèv'G¹|7j ²®DY€RÍž—Ö†ž® @/Ž¢âç,ÊÂì|_ô,¥²qäÌ\RKRÉêÔͣǡ†w‘–'Œ„ïUkj”:èDjª“¸$vô~îÞaØ{ûëºÎTØÿü¿x­)w“ÌYÐkÍój4€ÌX[5”àõ¥?ÂßD+ï¤>äÊ›õÚ×h{:Î$å„bÌM®`
+˜ßšè“}©¤q’ÞôMfìÔ8ïŠ`{ȸf\læ*غì:øÕâÔN]ɇ6£7ú î’¸ë³&Óa|è÷ç8¶B³¦D%d
+y¶²x_xë)–½1?Ș
+O‡“ô{úÖ€ “Ô>EµšRØ–|ÍN²”îd6‰Ó+Û§åLýÌ#ùë —P’‰ Ó8ÿ˜vÛLªø™b¨8·j½Ý5yÚe¥ãt±K{
+s£ß“ÇÃѦͲtB¿wý>Î 5.Kïù»í7
+£̤ô?dÂMy«ÉkÕI¬²É ù°ŒËUœÃ§"ü&úX<AA>Ám©è¼ôÐÍ…=ÅþÚ£ìdeTÑmÛ5‹.GM¹,G I%S¾Sý¶KÒ®ó‘0ñ!@ænIÛ&y($Š›RFÿ¶äAqçÿà =*XB#¡Ï'ócˆ=ò"x–.`K9_ß—’Bé<y˜Iú+[
+͸R«}àqM×`^׺5Ì€šjýcÅé¡¥”EjôÙNF¬û|ÊâÑ9¤:9ÑLø[ä©8wv§ÞtåôD{¬È¬ØH<EÑ;iˆð‰”@Jaq&®6…vëF‘¤—ë°˜ïhñ­ÍZ»lg·Now@_ÏFA º+UÕ³ûºÑ<Ç…’%.§ŽïeR‰!‡ß뀈›J+Ë·²R:í/#¶€ O[òUNMîÐJ­ t «™lºå=0ï^–
+2}fG­ZPKåcÙf›ÁO,;Ž‹s› ­e‹ÎôTeÏϪÊB­óì‹: C44(f‚\= +‚Œ”š$Ä ŠþMÔÿ"·Ò2ã#/åÖ®ž[BKI ¢d>fÎ’@y¸¦Ñ´{¢oïÑ•f©¹¥_akÍså£úPå4oäð§ö&S\S9V»—dÖÁF;@$q¶ùÒ`1¥¥õ³4N÷­ ÊaË@è¦V~dž1P1ÐWpÛ¸wG¯>ª#]íqï*Ìñêæ ¿‰RPS4bÅuwö»e‡x6$&g]ô>Û`R ­€}«Õ,Û‘V”Û¦i»ÉÃ…W²ä’r
+ÌiCÎÁÒÙÇÞ9X¦NÎóUÒRÖ„*ðCÖÎ^-! .}Ÿ•Ó‡>|œeJÚ¾o"îÇüýJ‚8w çc¾O '}E½5ñ³·Äd»ó‡0m˜ö—¨ÜæÔ}ÁX&@Ñ'§}Ð`4kµÂ²¨þ·­ â²\í†ÛÝA¬W®s„!#ÆÔykÙcM f>rxÖE’{«0§ðFô ö«é>'5*d‚e𸴘EúP\\¾7QÃXo’¥VSØ@³u¯€ô'Â2ï#…hů¼; } [<ñ:­'G-‡¯û½p ʧœzš¬FBŸ­>\pé¿JuÂÇWf8ÎT¸x I(ý–ê€&RN¹»vð'3ëA¡tñm¶Gzg¬Ôc7ÿcö¦ØÿP­ãŒû1GÙ¯„O²­žYîb…²Ô¥®J²¿yõlÁLyµk¼Ž”F_ó·p¥âÝrhÿº„ÓÌj;]Aj%DBKUaünææݾÜ]‡ ‡‡ÖÒ›@):×Bi_èð.¶¥Æn‰’8w Ÿ|Û1ÅNÝ?9ukTéyÉìÒÝš!ÂØCWí±&o^ Þ,¯b(r†4ˆÛ«Ö„ûÉ«-4!4÷ɾèmÒ·Íö OC;(}̈G¯d!¼B×qh»îñaó‹ï¸ i˜2óe»ô*0!„búÖLA7²ÆÜÆ*4­)4E¦×£’ísܶöÊHg.\ ©5)|½À <À3‰/–Ú‹Ä#¡Xe3ýŽHñEløš¼Û¥î¾C•©‰g¯ ù(«vUt!=.Ü[«Õº=!Ô¿È¿¼å‡£t³mc L]Ì
+ì%”NØŸâ+Š6¯¢óðŽ–2”Θ~Ÿó,¯+<rRSI?–$ õGQ™Û·Ê¹äG1aOKý뉗´³ù&~nyyá¿ð MÏ´xug-Ž„àktrXç eb¥o>Ëtm?‹þ‘ÕÏ_ßþ ä[È^
+endstream
+endobj
+2321 0 obj
+<< /Type /Page /Contents 2322 0 R /Resources 2320 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2041 0 R >>
endobj
2323 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 188.224 null ] >>
+<< /D [ 2321 0 R /XYZ 78.37 808.885 null ] >>
endobj
2324 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 177.265 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 731.557 null ] >>
endobj
2325 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 166.306 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 720.598 null ] >>
endobj
2326 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 155.347 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 709.639 null ] >>
endobj
2327 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 144.388 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 624.484 null ] >>
endobj
2328 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 133.429 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 613.525 null ] >>
endobj
2329 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 122.47 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 602.566 null ] >>
endobj
2330 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 111.511 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 517.412 null ] >>
endobj
2331 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 100.552 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 506.453 null ] >>
endobj
2332 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 89.593 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 495.494 null ] >>
endobj
2333 0 obj
-<< /D [ 2283 0 R /XYZ 81.145 78.635 null ] >>
-endobj
-2282 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F22 367 0 R /F15 334 0 R /F74 337 0 R /F88 635 0 R /F87 2313 0 R /F111 636 0 R /F64 333 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /D [ 2321 0 R /XYZ 81.145 422.294 null ] >>
endobj
-2336 0 obj
-<< /Filter /FlateDecode /Length 3184 >>
-stream
-xÚå\ÉŽ$¹ ½÷Wä´Z"µ…*;' ø\7ÃWûäÿ¿šÚ—bÉêiŒa j2#BAq“øH1›3uû÷ÓÿÿöíþùíÇS¹›dÎ
-„Û翾‰§ÿÄÍÓòf´`\‹Ûçnÿxã\çh㟖ïÿüüû7O+o–9­Ñ¶tœaì†yÿ‚sú
-’þhzÚwÎ%}ÊÝÓôI×â'}§OºäJÄïáóßùhÄ:Iq&8ÌdB¼$SOHÚÊ gZÚ÷ï
-”Ÿ‚ăG¾Ò¢»z¶Wð1^i·y~ÏW(ó·0·¬JTvœu6¢çd:ây4¢çx5¢—bIç~Õ”è˜83¥üã’){BkSa \u†Áûü¾÷bíæÏ
-\‚Òà2Žcrz¯—ñÖ \‚RM$ãVà2ŽÁe¥]þÍ”Ý8:œ(cGYÇë¼zô
-wûÄ!ܪ
-©å¿Ö#IÕl5ñ½àœÃ{u¢ešÙ˜Û(xûw…!OX/‚õA¤Ìzñü˜€ÝÖLâ[ »^¸¹­R"£±Ù•7óMìi43ªORz`x’稳L!v£‘ÌPfò^ŸRôh¾Tt—QŠb¸µ¾Û¨ îÚjY¦ýòÐßÓ»gÆ´À'®0½º'6rd°etVì–¼:]» 6xò,¦_®U±ËŸŒ;œ;@\/ò%%2tÉýr2ÎLBD2Ï1à\WKFk°öIŽkÉØúÍ&¦¬÷äø§†§Ï’ˆ=j¨ ÑújþD™³ÒÍ`&^ª~„¾š? üù“"plçÒÛKéSOèÕìé7ç
-H"ÓC]2~OèRŽ¡80Ž0Ë1ð«9†%Ä‹ã>ŠÁ}WÀ(0o¶…’Ê¡Oyã7™Så¼)­p9p͸ØÌ•‘uŽ9#ì+¥©EUI3z£_ï.‘»6g2 ÂG€6:‡±È€<™3E*>OH³ååÀÛ²[K1GÆ4~'_Ê<íæK’"úÖ€Ò%©)Aµz¤°-øšEªŸ$6{§—Ž3nÌSG#ÓHþzº%”d‚dæïSÀ&ÈÄzïž)ºzs­ÕÛ¥ÉcŒ%ÆÅ.íIøÓÔ— þüi€; êK¹½²á÷ýÑ2µéUÞÑgþ`,°.ý
-±á:Üêã¹›‹µñ
-ºy:f‰ëÊÛÅpBè¯[ï'æËã[ÒÓÝ?Y"ÐôÐÊíð’{&`\ŠáùiÕ
-ÿ]þ(Ü”·’º„›L€ó¸TÃÙ=>qŠ¶Võqñü…“#–ºÙq¢°‡Ø"öÄH–GeÝÖ¨™uÙkÊ%9ò–”óÔà;Åo›T ®á2ß°L|ˆ¶rMʶI2‰ì¦ž”Ñ¿,u ‹³`‰ z¼Ôx5úzê0?„X!Á³2WÓÜ/å¥ãäa&èßyØ’i†•j·Ý9ûºóºÖ…%M¼®µS „.¥,¾*!¥™‹X÷õ”…sHup,B[=ÞÊM‰^ºÖtáô
-RÔÚ©¾ì©z/†(Å”/B^Á‘9iG*Iù¥A¨ò ŽE–EOA„÷VSùé~ŸV)YCÛ9 »Œvj™ó>¤Í¡iÜ}ðDy•cݨÁ ‘ -½i`¤Ðïz àwc¯Ô¬rq¡/sM äÕöåP*$]`9ÓF͹։5úr: Ö©@»FFû'œ6PVÈŒÐ3]ìÖ(-ÑEî¸eF™)wç:ŽÆÛRZ%d*ý„&ü¼FÎZµ-•e«l:?°l?.Ìm6´®ZÈg³3<>Ë:(ÕγßÔI飛Jb¯IÒSª’ ~-`‚.rk³Sµ_;¸êé\JÉs˜C=K¥€k=öN´Í=ºÐÌ5·xåCkš+Ôû*§yŽþµ7é˜âz”ãjﲑÌRú1jcD"·>Ì׺¦´cý,ŽÓmcC¥²Û0à{©Õ†™fôT ´Üý&NÎHêu¤‹=îM…9ÜÝãWQ2j
-FL ¸D7¬Ñ-9ij"19ë¡iýòhãdÛh5Ëv¤eÁ¶¥@Ú¦=r·FAJ–\Ž”ŸIš¾Œ.¡Tö+Šv#Õî
-ÃòG÷Ëû¨ õæ­°Âm{¢†¾èàe‹Ý¦°Á%
-f‹_ÁÐ ËL2Ñbys$úèâ|ïz‚ ÔC®ã_ü½p")̓š§—N$B_-Aœðê¿J‰BhÉÀÍÓÀk§š¥_R¢´zæµ®“‡9³ìzB'Îöˆ?ËåÁÐÎÿ˜ýTì¨ÜqÄ}Ÿ¤¿ìUÚí¿Ñ‚§‹”¹¸0PjÊ$ëµp‘W¤™
-endstream
+2334 0 obj
+<< /D [ 2321 0 R /XYZ 81.145 411.335 null ] >>
endobj
2335 0 obj
-<< /Type /Page /Contents 2336 0 R /Resources 2334 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2099 0 R >>
+<< /D [ 2321 0 R /XYZ 81.145 400.376 null ] >>
+endobj
+2336 0 obj
+<< /D [ 2321 0 R /XYZ 81.145 389.417 null ] >>
endobj
2337 0 obj
-<< /D [ 2335 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 378.458 null ] >>
endobj
2338 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 367.5 null ] >>
endobj
2339 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 356.541 null ] >>
endobj
2340 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 259.431 null ] >>
endobj
2341 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 735.953 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 248.472 null ] >>
endobj
2342 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 669.203 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 237.513 null ] >>
endobj
2343 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 658.244 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 226.554 null ] >>
endobj
2344 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 647.285 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 215.595 null ] >>
endobj
2345 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 558.618 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 204.636 null ] >>
endobj
2346 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 547.659 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 155.347 null ] >>
endobj
2347 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 536.7 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 144.388 null ] >>
endobj
2348 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 448.032 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 133.429 null ] >>
endobj
2349 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 437.073 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 122.47 null ] >>
endobj
2350 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 426.115 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 111.511 null ] >>
endobj
2351 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 349.402 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 100.552 null ] >>
endobj
2352 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 338.443 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 89.593 null ] >>
endobj
2353 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 327.484 null ] >>
-endobj
-2354 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 316.525 null ] >>
+<< /D [ 2321 0 R /XYZ 81.145 78.635 null ] >>
endobj
-2355 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 305.567 null ] >>
+2320 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F83 412 0 R /F81 377 0 R /F65 335 0 R /F59 346 0 R /F84 425 0 R /F85 439 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
2356 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 294.608 null ] >>
+<< /Filter /FlateDecode /Length 2682 >>
+stream
+xÚ½[ÉŽ#9½×WøJ-‘ZDv:£9çmÐמÓüÿu´ï¡ ¹ºæà*[!1ÈGŠ›”ôöŸ½ýùãñõド›!F‚ä·¯¿0û€ÞØM‚ê¦$#T²Û×oÿ~£TjJñ°xÿÉ)Ø®(hG˜ýÜßÿúú—¥¨øŒ"C LÊž¦[)RxPÊ>,5îèÛßwK]‡ïnœ?#õ9¿Ì Q {êÊ®æ(q¸|ÿ ú- ‚N´g`ÿúH£~é3-“¦Gñãè„õøDˆ4’ÞRÓuO¤YÓvÉ ÿœkGO°ø‹Àm9²ã¼žårw&À aT&@%GÛà D ¨úQ%Óˆ¤á•<,
+Oi‚Õ>{ä™´aø,ÐàNøŒëŠ€n6Åù7úUö·°¤„ö"R"Ü°ÿþi-J˜'F[­-J±&¦P&t_8°í{¤pÿZq3ýqh~ÓÖ2%êÆ2©"È¡§´a÷?·‚ïòœ0cf¼Kqw&‰j „‰'!ò7Ó½9ýí¬"È‚¢7ùÆFù35¹++C|**ßµ!t"iæ’—§ˆ $p‰áû¬xÙĉͦöŒ{@µ”àÿƒÅž´Ò0‚
+5?+f©ª¿u•\ Lå -0µ¯¦wã¯`ŠL
+q7ûêy±y‰"CQì#Õt· óeT„Í0OÁ­eÙƒ"t¨¿#Tx·/Ã7¢¤Ï 05ÜLÇ[ª§ËìIOç:Ä\‚Ýkfñ^Æ×áÌŽò£Ô[KzÙù8+âU˜v]–>ž)ñ
+íÙºÉû6aŒ(9µÔ½L±#t£ïðb%ëŸV ÏêÛ÷N„£$š•@ttšGpU_Îítk`†þXÀ‘5M¢È„ÆisPj¢…îÙh5÷M{ÑzA…=…À X~ä£T
+']3êjï Þ*i»7Ñ=8bÎUV¦'a÷/»°ˆ¶n4ƒ w\ŠœÚ<ŠOÄ_¾‹[¥e¿J¯¡Fk±†©Ýw kïÊô«>îëwI$@͹Z1f^®Ìñ­è©h15Šã*Uë0D¤%›h
+|n†3eWÖFšUÖ’MD+xLšµ8Ñ•Û~ÞП­, BΙg”ý—\Dé1G(å|‡MyÏBØcÙï6š²[U’t Â3n{“ûÇëÍæyï½cfþ/j|!—àŒZ3åS}ßòÐ-¡sì!uÁ““ì½ôyЦÎÏ]¦Zùñæ™~œ?»ãù³ûù³Cž>cVàóuçëèùû˜X¼Ï©k».Ec Vˆ™Ê¯v ªÄ@©áí.Nù\=3 }.ôr‡…>4±Ð˱X÷X¬3¯èE[¨œêEï饣ÔÚÌB^·cÏžÝùBg«gú,¬ÿ´1dê–D1â|©¬äz:Ÿï¸±ŽÐN¾[IOŸNóòs·W ;ɹ׉©Kl˜šW·Nª[5V·Ëì“cúwM³Ï“£s›¿Ú€8P€*¾=K)çxæ‘Z¡
+L:ÂÊšRxö~7ÇïÝh/¯#³ö§æ®·ÜOKh‘E]Û4›n¨ô¯¹·ÒÝUWÜ$Xå ´VõÄ4X{&äÍ:4뎶µ3*Kg¦9¡L÷m83[oÙÜg À~Ý—IA„‚,Q¼u.¡“?…OÕÄMó²"e™_E½—j.¹xÃx&ÏWï,ûž)›¡6”Ö÷v|[_ Ø[á«ÐãYQs48R¢'hìîP°Èé4¡ØkBw„;”½¸Cg'9ŸWé¹¹“æÞ–·È}Üå^î”´œ¶A}c
+Ù‘ÇÛRï¹rîÝx
+Ae§Â¶x‚þþ[4ÙRÒŸ8s9Pè·NlRõ¸K:ýnƒ÷½–þ9³–*z7Zy.Q5΃µÖAz¾ÉgÒÕ3r‡EO’°I‚0y?àg—ZIS§GR÷žÞ?WÏÆcRåGýú‘ÜYÊ¿¢+‰#}¡ží©@´Å¥?GM4š^.ÖΚÛ8"‡U®ÇeÐ]ºèø†Ï„Joõ~´¹õÙîOÆÑ”…†e²ÕêžÌ,, –[©”<× – n=ø`0§ë:7É™)2i]}9h<É,-ÏMÃ:º£¨.ãÍTeÚíl×±¿ªs]*ÝÈ Ž*û§Å±…ù.vG~Ž¤¿Òþˇ¯PrÎû–.>
+Ã1ðÚ©0;È$ã¶Ìm×|hRké$Jg™+ZUÉ%{nâZœ˜0îO!ê.h¨·œ~–cõVU}7Ü
+&~¦hnÔÒÒª¦áãowCª"ˆS“”Îh¬j€MóNMÖ>5PªÏg3ÄÇÚãó'±ü#Á\î}—²
+$T €XëŠîͨ“ɽGpL¿j W Èwꀣ¨£^W”ã“ö#Õûû£<?ݲï¹=•kÔ)löBë£`hÝߍDÊï “f&üÀ°¿0ò+áÜå2ì9ÿ.<‚$ÊìV9˧´1ðW§j#mc:ß¨× DÄÚC«dA¿ˆp.<£Eô’ŸŠüåÊ>Áuò˜ìãLµ…þN×&V¤©EW]KýÚþu²íhyN&¥?'ëxØt¤Ì¸C#詜ś¶Ë㜓װé‹ÿî˜mÇ^™’óz·ty©gäÔãõ@þ¹{‹§#´¨HçžýÕ›«L¢ÕŒÿ‹WdÒ…Û–Ðiý;徫w7%°Ù»ïæ9.^OaÖÁ1%ñý•ÙÍÈé¾xs¯œ¯T÷í¿ë¨•»š…î®Õîe †6Eïz´/ÞÐFA„–%³É÷‹h_Ôå&*
+endstream
+endobj
+2355 0 obj
+<< /Type /Page /Contents 2356 0 R /Resources 2354 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2041 0 R >>
endobj
2357 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 283.649 null ] >>
+<< /D [ 2355 0 R /XYZ 78.37 808.885 null ] >>
endobj
2358 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 183.026 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 742.926 null ] >>
endobj
2359 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 172.067 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 731.968 null ] >>
endobj
2360 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 161.108 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 721.009 null ] >>
endobj
2361 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 150.149 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 710.05 null ] >>
endobj
2362 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 139.19 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 699.091 null ] >>
endobj
2363 0 obj
-<< /D [ 2335 0 R /XYZ 81.145 128.232 null ] >>
-endobj
-2334 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F83 414 0 R /F81 377 0 R /F65 335 0 R /F85 437 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /D [ 2355 0 R /XYZ 81.145 683.151 null ] >>
endobj
-2366 0 obj
-<< /Filter /FlateDecode /Length 2583 >>
-stream
-xÚÍ[Én#=¾÷SøZ#‰Ôì8þ9ç6˜ëÌiÞÿ:Ú¨­TŠ•t7þCâ²IQÔGRæ—ÿ^ø寷ÿxuqÌi©ñòñŸÂwð‹¸ÇÀ\ŒŒkqùøßå_/œkË9<üŸ|ý Üù0œ+Á9Úô§Ä«4¾ÝHÿ=üÝý˜Ûë¿?þéßdaö&‚¡Rã»"5 ïj(ÌyÚ0¡ìHAÞ8ožkž_¥}!î}[‘ ô™÷-
-<ÿºöDùîÔ(™H)QÔ÷$%ê–j?Ì :hfäÞÈoß™tU¾™<ƾZù’86Ptù¯ò)|ý™„#Á’*uæäc7)f_¨Èh\ì2Êëã* „Ž ®Û5IúL2DýКðô™ =Iú愹afÙ#©·Ñ´:‹½ã{ƒ hè ß/íå(eâL…-ãÿÿå­P¹ 2gÈÖ
-­dÞ, ¨h‹Y^ì ìoSúšhåÍç÷^¬·f ¶¥ã sÒŽ„@Œ‹žÌGIz‘ž”'Uz )+Ѩó”ÞO"ÎÍÄ·%^Oh.žÿ~Ml‡çdÌ^dLâTb»%qG'˜Â¦–`†d‚ʆ½E°ºSý>s­ˆâѪ'îã¸kwç’I+¦¦¬¶$ï U×s)í)§LáSL n )}ºÁ6ù´œž› <ǧÐÌ(s 4±ö_k>Û;DkÇ«™¬ø¾'kOIòbÄf"u}*¼#_y…3=¤còIýžÄû‘—}=*Ëõ¨Gô·§Çž’ü3ZYa´„4S\Îð$r™Oñ€¿Ân„k¦hpŠú@2¡õHsã$YbJÌ{ì‘ú×-òMT:x I­óÒ´zæþ^üÜ:;Sψñzº„ñV´1cÆ<sÊu2ŒüM< )·çÈ·c;>Ëu„Shz@˜Õ' ‡'Ì ŒM-„1MJ½¼‹4hd‹êc E*-zŒ(ÐÍ惬†Ñù¬JàØ}ja˜:¨°Ç•Ü;¿zJ_BP›¼sÍŽGZ`]ßöÜSOèïw¢)§˜>BŸ(êuKÔRã‰ÿ®§×¦¦,2sÄcAS°wf ”þà™µ!­ñ§‚†©´[ÁÀ@¨²½Ë2ÌÊ)C{} tæMðZ=gÈgüáXL¡föÄá–¸=¡ß¥¾ö¨©
-ûEšÅÜxGs„-uô„¾¡)Ù»9Š}6È'Ü@iÛ&7ùöñ¹³¦å[«€¼·Ñ÷Hé·o+Ûß[—n&ÿ³È„äï)µQ\L5‡Ááaú#ss÷éUÙüØ€¹v-d|º°›¸¥'ô½è4÷ïc³õÿñ)ZÁ„SEî¡¢Ò©…¨ÎVL\û/so8JθßD*¥ß‰T~éGå˜k§ØB/¡½¬S
-c¢Ø½‰JÖù›L絡jrár
-¨ï))™š5LHÛ’ˆGïp+X6ñæßÞù'ÁµšN­4îÔÌxëN1ÿ|®bº¢àÇÚÙIá#»Q |#׫@ŸUŒ«QÞ2´ÁÃ{w8¡IòëY5nœµVV¯ŽÏC>êb´óêÒ`öα¥yÿXï(ãé^ýÈ}뢤ó8Té ræjR+`Ð\K~ÿøñg+=
-endstream
+2364 0 obj
+<< /D [ 2355 0 R /XYZ 81.145 672.192 null ] >>
endobj
2365 0 obj
-<< /Type /Page /Contents 2366 0 R /Resources 2364 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2099 0 R >>
+<< /D [ 2355 0 R /XYZ 81.145 661.233 null ] >>
+endobj
+2366 0 obj
+<< /D [ 2355 0 R /XYZ 81.145 650.274 null ] >>
endobj
2367 0 obj
-<< /D [ 2365 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 639.315 null ] >>
endobj
2368 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 742.926 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 628.356 null ] >>
endobj
2369 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 731.968 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 617.397 null ] >>
endobj
2370 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 721.009 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 606.438 null ] >>
endobj
2371 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 710.05 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 595.479 null ] >>
endobj
2372 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 699.091 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 584.52 null ] >>
endobj
2373 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 688.132 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 525.29 null ] >>
endobj
2374 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 677.173 null ] >>
+<< /D [ 2355 0 R /XYZ 79.37 488.622 null ] >>
endobj
2375 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 666.214 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 470.488 null ] >>
endobj
2376 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 625.367 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 459.529 null ] >>
endobj
2377 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 614.408 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 418.682 null ] >>
endobj
2378 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 603.45 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 407.723 null ] >>
endobj
2379 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 592.491 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 396.764 null ] >>
endobj
2380 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 581.532 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 385.805 null ] >>
endobj
2381 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 565.591 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 374.847 null ] >>
endobj
2382 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 554.633 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 322.045 null ] >>
endobj
2383 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 543.674 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 287.175 null ] >>
endobj
2384 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 532.715 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 174.597 null ] >>
endobj
2385 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 521.756 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 163.639 null ] >>
endobj
2386 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 510.797 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 152.68 null ] >>
endobj
2387 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 499.838 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 141.721 null ] >>
endobj
2388 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 488.879 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 130.762 null ] >>
endobj
2389 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 477.92 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 119.803 null ] >>
endobj
2390 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 466.961 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 108.844 null ] >>
endobj
2391 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 407.731 null ] >>
+<< /D [ 2355 0 R /XYZ 81.145 97.885 null ] >>
endobj
-2392 0 obj
-<< /D [ 2365 0 R /XYZ 79.37 371.063 null ] >>
-endobj
-2393 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 352.929 null ] >>
+2354 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R /F22 367 0 R /F83 412 0 R /F65 335 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
2394 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 341.97 null ] >>
+<< /Filter /FlateDecode /Length 2478 >>
+stream
+xÚí[ËŽ#» ÝÏWøZ#QÔ h4ÐŽÛÈzvA¶É*ÿ¿½¤^%©äê’oO‚²è±]%Q$ER‡¤F^þ}‘—?~\ýøyWæD°`ñòë_?½uqAhwqV iÕå×.ÿx•Ò©7¯éSÃÛ Ê@߬ä_RÂUJõ7)Ñó_}èí=½±á퟿þNë9œ­§ÐŠà͸¢A¢‰’QôýFŸ´è´®¾¦÷üÜ~¤g¶á‡ç·i幤€F€ŽÂQ¸² Öî Û…½DõivµÑB©)¿i3ŠòÑÑ“¿©Û‘9âqEi¬@[ç0Ì/([˳ ¾½€Ý„a64]É×"î¸ûY Á²0%maí[¤Ï :Y:´©8?R™YʧԬ¬ÚŽ œ´
+å­pzÇ^»ûO²:‰j¤l|œ%…aϦÿ
+&\|Jih)xDÒi2zçê|V».Û¤N´rŒøy÷xñĉ%:Á‰
+¥Æ8U•–¥#ŽÓwþŒNÀ1›Vú ²Fn{•s¿ì¡ºBÝ–oêcï,ôvQ36z¦½
+ƒáiйÇïjÿøZ… #Ç6¯Âª‰›+˜M~×öÿ.>^µ
+×uÎ@ùu“¬hòçà1„GhÜW4Î’äУ¡ =EÚwÆ
+¤0zž-…Bç²×¯P˜}U’Z»z5Zè#ÂÜT)Ыœ Ÿ
+{œ·©à餪WÛ7¿>¸lxÝÖåÜ(b˜;¿ñ¯[®R1EÅz;ý ´éMªã©›žÙ2à¡œ4ƒÒô¾„Ù¥Bƒûnel ‰™ÞÛõüÇ
+œ²Í­óôD»±
+ß©£Ô•ý¨|xϳ¯ÙPoM üxhÚ‡iQÂÁ¸PÉlÚªØÌ:,”³)åZ”¹c›GøцⓣXŸFpÌ—S]–fû;úi|õÙø+Ò†2³þ'‚l}xx~yžÃÎW”›Êyè+Ê·±c¢©ÏcG¥bêÿF)úhPE÷‡ý5R †6NïóÈzjÉ,K÷öaÉÍ–ê Uã4÷hO|ÙÝä#‡u¡}åù ¥¹åKxrX ³5§læ¾+nÑ«hìè¦Y=qd¢wëb´ñ¹œFÇŠQ¯Íߤƒ½Ž»¦1¬Ú(veü¹rÈ:5òµ\tP|-oŸ ¾¯vT{:‘ù'¡¼ îç¬i×¥é»[™aïIû+"»„¼¾|âJœâK†VÍô»øFJzŸ«p…3ž¦=·Ì/_?”S{8{Ý ¥€°£¤U“e-òÄ·QOy:yÙÉ¡@ï(™ENçqÆÈÙû>ÜJ¢G¡[êÎÚªö~°»²+­¹'®|' ÌT"¿$Ñ@(,ÿ7á­n±Yâ£'´àÿ‡ "Ú/k,"¸Zfsýâã×?þ
+endstream
+endobj
+2393 0 obj
+<< /Type /Page /Contents 2394 0 R /Resources 2392 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2041 0 R >>
endobj
2395 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 301.123 null ] >>
+<< /D [ 2393 0 R /XYZ 78.37 808.885 null ] >>
endobj
2396 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 290.164 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 743.045 null ] >>
endobj
2397 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 279.205 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 732.086 null ] >>
endobj
2398 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 268.246 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 721.127 null ] >>
endobj
2399 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 257.287 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 710.168 null ] >>
endobj
2400 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 204.485 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 699.21 null ] >>
endobj
2401 0 obj
-<< /D [ 2365 0 R /XYZ 81.145 169.616 null ] >>
-endobj
-2364 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F83 414 0 R /F59 346 0 R /F84 425 0 R /F74 337 0 R /F22 367 0 R /F65 335 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /D [ 2393 0 R /XYZ 81.145 688.251 null ] >>
endobj
-2404 0 obj
-<< /Filter /FlateDecode /Length 2021 >>
-stream
-xÚíZÍnä6 ¾ïSÌ ¬V"©? d2 ôœ[Ñk{êû_+êÇ–eÙ‘&Ùz˜dÆ–?‘)Š2)/]äåç·ç·o?nJ_¼ð ]Þþü¦Â yQëÚ‹5JH£.o_~Ò€”>ð,¥VRÒ5|¿=~/Ã]õFÈ0"Ü5á=§Ñt}ËOû2’ŸEË¿T¼~Ýxl¹‚6#\Ó\<‚ ÌùøÇÛoAnK=¹”Є­ä¤óS}mŒ°°yJ»"1„Ù­)ò­ú'ͬ|÷°jëZ™Ã3W~ÚóhHO%}uMÜ.œ@zšŸd>ÉÕãuf˜±#{ÀOÔìÅ;r‘÷–esõ9ý/2¦YŽíAÙ꥖DZ½k9ƒÌsãEä…’¦°j!áSô¤Ì\ð"D¬½Êº¦«ÅŸÌr'ûQ²¬éZV#©•AÓÊÀÆ«úþ¡¼^A‹’XHXS¬´‘P1[Ø—«…aÚŒ¥n¬9c²çvÊ·ÚÝ j}š5•Bs­µ¿ðN!ÔZ;‹Z(íæXJ]þ'¬N~Ü]\`Ï «q¼\ ÄŠ±`¬H4oXl4ßyY“)•å.Ò¬@ByßU€†PÒ
-$h‘BPÉ2éõÛë‘ü|¯Œ‚ë¬
-POÄ1B„SZ EnÈîˆKh(wÔ"µ†eôb Ë7v0¶éu?Šn¦4BÓf;"µõ³\KàTlz#;xºvf‡ä'従íA[αb¼вbžW†Yi‘ü}>üaR'êiPØ\D ReŸÅ»ª-Å
-颶;$sšD¤dÈ '¨vI†Ô£Ãœ ’äô0%?õ¾˜öÆ|7§1Mò§©°"(ÐíŒûÔ'E’²S®ùºy- Í*?pžN“ Ú‰£2éÄpšÁ6[;"v/¡Þ-.jJuå-™h"¿Îƒ³9Žóà<¢äi<¢˜–ŸÒri÷P¤¶É8)ùPÔm­½4Û(/´_<fM995pî-R °®EéyÉ»hV&dQ¦`Ð+” KwâÕÖ¿S,@/$©y:O6R‡ÝíýLžÜ
-m ÒWm_$‰ ƒBY×µM…Àéˇ@Ò @u³ˆÑ|µ¬í-ÒÇ")Ý€3šó•¥¶úoVÚWõ ”å.•C?_6H÷oŽÊG¼ŽDƒÉeÙ·@w „Î Ú—SY ÁÌ* Ô
-¼¶­c÷,ø÷“•¡Ú)€U÷•[ûÔHêªó-•Lcá,õçmºéòDûESaïh¦Š`T9çU.+Ep²
-ZÎ; ¦PRÚ
-Å»Çv¶v¹$ÝÞ[.q4lò7åA(_µq®{Bê7(íLiOXû‹#îÒ_œÞi¬ ¶kw2·œ¤_V›4áŠýÌÕ}ÚŸLW<hº·BY'`ß²ÅyÏÜ)¾:IFo}µG·Ç/xîÎêO]rI$£xp£Í…¤ðë{ÈÈ`:ï¼¾}ûŒM5
-endstream
+2402 0 obj
+<< /D [ 2393 0 R /XYZ 81.145 677.292 null ] >>
endobj
2403 0 obj
-<< /Type /Page /Contents 2404 0 R /Resources 2402 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2099 0 R >>
+<< /D [ 2393 0 R /XYZ 81.145 666.333 null ] >>
+endobj
+2404 0 obj
+<< /D [ 2393 0 R /XYZ 81.145 655.374 null ] >>
endobj
2405 0 obj
-<< /D [ 2403 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 644.415 null ] >>
endobj
2406 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 742.926 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 633.456 null ] >>
endobj
2407 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 731.968 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 622.497 null ] >>
endobj
2408 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 721.009 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 611.538 null ] >>
endobj
2409 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 710.05 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 600.579 null ] >>
endobj
2410 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 699.091 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 589.62 null ] >>
endobj
2411 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 688.132 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 578.662 null ] >>
endobj
2412 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 677.173 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 567.703 null ] >>
endobj
2413 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 666.214 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 556.744 null ] >>
endobj
2414 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 613.412 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 526.69 null ] >>
endobj
2415 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 602.453 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 515.731 null ] >>
endobj
2416 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 591.494 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 504.772 null ] >>
endobj
2417 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 580.535 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 493.814 null ] >>
endobj
2418 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 569.577 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 482.855 null ] >>
endobj
2419 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 558.618 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 471.896 null ] >>
endobj
2420 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 547.659 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 460.937 null ] >>
endobj
2421 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 536.7 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 429.009 null ] >>
endobj
2422 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 525.741 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 397.082 null ] >>
endobj
2423 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 514.782 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 319.208 null ] >>
endobj
2424 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 503.823 null ] >>
+<< /D [ 2393 0 R /XYZ 79.37 283.236 null ] >>
endobj
2425 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 492.864 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 265.22 null ] >>
endobj
2426 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 481.905 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 254.261 null ] >>
endobj
2427 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 470.946 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 243.302 null ] >>
endobj
2428 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 459.987 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 232.343 null ] >>
endobj
2429 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 449.029 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 144.388 null ] >>
endobj
2430 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 438.07 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 133.429 null ] >>
endobj
2431 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 427.111 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 122.47 null ] >>
endobj
2432 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 396.227 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 111.511 null ] >>
endobj
2433 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 385.268 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 100.552 null ] >>
endobj
2434 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 374.309 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 89.593 null ] >>
endobj
2435 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 363.35 null ] >>
-endobj
-2436 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 352.391 null ] >>
+<< /D [ 2393 0 R /XYZ 81.145 78.635 null ] >>
endobj
-2437 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 341.432 null ] >>
+2392 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R /F83 412 0 R /F22 367 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
2438 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 330.473 null ] >>
+<< /Filter /FlateDecode /Length 1907 >>
+stream
+xÚÍZÍnä6 ¾ç)æV‘HêÇ@ ³™)ÐsnE¯í©ï-eI¶,s)™dÅ43^éERäGZZÙÓ¿'ÍÿÿãáüöðxµÓ‰Ô ÂéíŸsÒüŸ9PŽNÞ¥9½ýwúëIk Z;ËŸþÐóßo>èÆP×@§ &ç0Ô8ÆeùQ‹4¥Ù•0ïHbµ2$IÇ$iìó vÆ,ßH—oÎ,ÿúª58þøø}yêF÷“2„Ò>èÒ·Ë€;$Wd2—òÍk‚2¼l#N+Ö{ÒSÆC‹~T〕$a;õH2y5Ah(šò:ƒ<^=M<xÍj²Ÿú“›ŒòäË\xþ5b<ÿ
+¨]0j î„æÅž“ø×eW0Ãæ_¬Ý´@@i«
+ÌË!Š6î$¨UðSäÜ^Þ¾»Ž—Y~?ÂD@ËøKü,£’P¯s#$–u¢²~‘eפm@ægKØ‚ŸËÜ|P#òl—kßÞ*âvóÉ:zÜ5µaÆg$S÷òòìš[ ›Ñç#'ÙNZ‘ÙAÌ™ºéy²Ú†œ¾dŸÂ™L´Æ'©eÆM–¤­ñý¨áûE–g'I 1’Õ
+ÏàŽâ@…°«šâÇÕÂ-’ܨÝ'PWŸë9øâj¤9×ôËyݧ5LS&iŸcÄ«Ú5Zn7ZÙ ª3tÙ˜+¡K§ðµç)PUC62›ô òêóÂ{Ž|Àå.xl¥"“B2ÍÙ¦n®¦'%lÎfȬˆRX”eÈóh3Ö½®|z檉üSîš‚PÆç`ŸÚÎ:£éU7e½8&d¹ÓjøT3”EÖó1‡I2Û¤‹¨Å­%1+Û½µsIJzJO›'¯óªÒAÍšÓÇ»2®GܬŒ¢œÓ¯Ú†ùßC±ÇºfIsnUíþñêä>¶ž#´úØ3Ëãn8j…°Gí£'e'+ò±b¦º]ÌÜ2|NCt¿ã!.FNGáÃQ™4:tâÆ_†6¾Ýøú<zÒâUùŒŸÛõÌö(¯Ž•ŸQœå?ÞKŠë¬0Šâ¶@ãŠ+Jšøo¬0äRS‹žÖYà…5@·jÑwÔuOÝó@‚ãŠ\ô«Îz©¨i T'þl×˾yái!“´)’f6Ay—YkÒ+§›Ö@Ùî²j|Ì"‘Þ{ß,*ÚX…2í-tró¤Eún‡ü–õÖÉÓ¨¦5)’tgÙV\z ôáÖ%Ä
+
+ÄPÔY‹e oImƒ[µ•Û‡èˆ;å­ß!U]Š54À¹~Rýzt±lÒAÚAgýU®Ü4H4zå¸
+endstream
+endobj
+2437 0 obj
+<< /Type /Page /Contents 2438 0 R /Resources 2436 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2041 0 R >>
endobj
2439 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 297.596 null ] >>
+<< /D [ 2437 0 R /XYZ 78.37 808.885 null ] >>
endobj
2440 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 264.72 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 768.829 null ] >>
endobj
2441 0 obj
-<< /D [ 2403 0 R /XYZ 81.145 186.015 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 757.87 null ] >>
endobj
-2402 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F65 335 0 R /F59 346 0 R /F84 425 0 R /F83 414 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-2444 0 obj
-<< /Filter /FlateDecode /Length 2171 >>
-stream
-xÚÕZËr,' Ýû+æ‚A¯ª)W¹¯gnUÖÞ¥²MVùÿmxCÓL|}óXŒÝMƒ„G
-’žWéèx‰·H+éúùnèbœ¢š–ŽÕÌ‚é y•yq`«Ú• 캵°ù R~Užôª@¨˜4èuI =¡y$|­@ ™°r$Ú%ö„ær†ð¥ b€j(YhOhA [ìåGøz¿åp0!ìó]ÈÇAGÍÐýO|¡z)Þí©ƒ²×:/l/ ýûÝ1IŽÂÑc†÷Ï~8χ@Qà ˜kŒ‘ª†L”?¶fÙÂh?æWO3—gQÊÖ°ècLì›Cb¢·ÕþGþC€¥HÕS ÔүƼQ#õÌuŒxyÀ¼ŽU°õRø^9„ç¯~&é¤'ð\™Gƒþ!i«Œ=™Á¯t·²Z24Wv<·‹Ë\-Eͨ’’í1²Ä8Ù~ÏSàÜžZž‚9èG{ÉTµ”Ä]Ì!‘Ãœð¸ºViróüמ¹×.;ŠçÚè­¡§Úp•ÞÚÌ¿$¨TsÆäzÈÓG¾¬½<x :üT¿
-P¡<{>¼÷¡ÃÙ<¿ZíõêgÓ4²%…Œ F‰U胆cË™>B‚ÝÛÒ“—çž4A>ª\óÂÔ;#ñ!U·N•Â€¸«vbïÐΑ£2•o•I­:aj©ÂÄÀ“)øà”„Ð™ñÜ‚:åLE7Ñ4rÈ4™^ùðšFoÉPßš@x{hÚgI–3 ýDQ1‘]9MŒœëpþLÚqm\G¡[”y`Û÷0½ …–³X{
-}<!V°Š ƒË1;ìZÞ4Ò¤ ‚KÆ_8ì#ó½ñTîUý‡Ç×nƒzGðˆ{áŸïj¼×éÊZG¡SÇlo˜¢«Ñá@duOQhÍ€†)o­âè=ø–½¿¡8
-ÞÞƒóç{oŸ áB)fœO—*›ŽÐªàµÝÛQ±©ä çN[vFym üÅIé o˜Ì×v¡;BëŠËJ
-îýV##…M-Ya{B'—ƒ»H•o•Œ”¨nU9šú&ƒÈÈʺ͗9©Hí(íŗ]óÆ šÀîžH»UžMÂÄk3cŠI¥“ži=¿¨=LŽ´7[x¤«4=¥·S>%G£‡x‹åØùq#`ö`ìùutð÷\ü)gV<Ùœ¶ÜÞŸþ Àr÷
-endstream
+2442 0 obj
+<< /D [ 2437 0 R /XYZ 81.145 746.912 null ] >>
endobj
2443 0 obj
-<< /Type /Page /Contents 2444 0 R /Resources 2442 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2099 0 R >>
+<< /D [ 2437 0 R /XYZ 81.145 735.953 null ] >>
+endobj
+2444 0 obj
+<< /D [ 2437 0 R /XYZ 81.145 724.994 null ] >>
endobj
2445 0 obj
-<< /D [ 2443 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 685.852 null ] >>
endobj
2446 0 obj
-<< /D [ 2443 0 R /XYZ 79.37 773.016 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 674.893 null ] >>
endobj
2447 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 754.882 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 663.934 null ] >>
endobj
2448 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 743.923 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 652.975 null ] >>
endobj
2449 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 732.964 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 642.017 null ] >>
endobj
2450 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 722.005 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 631.058 null ] >>
endobj
2451 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 633.337 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 620.099 null ] >>
endobj
2452 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 622.379 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 609.14 null ] >>
endobj
2453 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 611.42 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 598.181 null ] >>
endobj
2454 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 600.461 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 587.222 null ] >>
endobj
2455 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 589.502 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 558.327 null ] >>
endobj
2456 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 578.543 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 547.368 null ] >>
endobj
2457 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 567.584 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 536.41 null ] >>
endobj
2458 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 556.625 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 525.451 null ] >>
endobj
2459 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 545.666 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 514.492 null ] >>
endobj
2460 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 534.707 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 503.533 null ] >>
endobj
2461 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 523.748 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 492.574 null ] >>
endobj
2462 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 512.789 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 481.615 null ] >>
endobj
2463 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 471.943 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 470.656 null ] >>
endobj
2464 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 460.984 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 459.697 null ] >>
endobj
2465 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 450.025 null ] >>
+<< /D [ 2437 0 R /XYZ 79.37 412.169 null ] >>
endobj
2466 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 439.066 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 382.364 null ] >>
endobj
2467 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 428.107 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 371.405 null ] >>
endobj
2468 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 417.148 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 360.446 null ] >>
endobj
2469 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 406.189 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 345.074 null ] >>
endobj
2470 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 395.23 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 334.115 null ] >>
endobj
2471 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 384.271 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 323.156 null ] >>
endobj
2472 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 353.387 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 312.197 null ] >>
endobj
2473 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 342.428 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 281.594 null ] >>
endobj
2474 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 331.469 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 270.635 null ] >>
endobj
2475 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 320.511 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 259.677 null ] >>
endobj
2476 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 309.552 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 248.718 null ] >>
endobj
2477 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 298.593 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 237.759 null ] >>
endobj
2478 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 287.634 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 226.8 null ] >>
endobj
2479 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 276.675 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 215.841 null ] >>
endobj
2480 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 265.716 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 204.882 null ] >>
endobj
2481 0 obj
-<< /D [ 2443 0 R /XYZ 79.37 215.101 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 193.923 null ] >>
endobj
2482 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 185.011 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 163.32 null ] >>
endobj
2483 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 174.052 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 152.361 null ] >>
endobj
2484 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 163.093 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 141.402 null ] >>
endobj
2485 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 132.209 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 130.443 null ] >>
endobj
2486 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 121.25 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 119.484 null ] >>
endobj
2487 0 obj
-<< /D [ 2443 0 R /XYZ 81.145 110.291 null ] >>
+<< /D [ 2437 0 R /XYZ 81.145 78.635 null ] >>
endobj
-2442 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F22 367 0 R /F59 346 0 R /F84 425 0 R /F15 334 0 R /F81 377 0 R /F74 337 0 R /F83 414 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
+2436 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F83 412 0 R /F22 367 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
2490 0 obj
-<< /Filter /FlateDecode /Length 1813 >>
+<< /Filter /FlateDecode /Length 1776 >>
stream
-xÚíZMã6 ½Ï¯È¨V")JŠ’ÍLžçVôÚžúÿ¯+Ù’-ËôDÊì;Ø¢Ø&ãgêñCŒµ²§O:þÿ§ËÛÓ—WN¤‚7§·žÌIÇÿÌɃb:96J³9½ýwúëw­-hÍVkz‰Ÿ—ç¿ßþ|Ò ,B}yõtò*0£¯q‚S| D>‚­á¢µùšþ~þÍ‚g >!½ÌßYÇï_›c麈@W­]:Ÿ¯³ùX¹.}ç®/O@*ß,.ßìrÖ‹ò3–û,Ï ®ø»AžÕÊhÉ;‘·J&¦e².¦ñËBßµ|sË2i¢¡þËR^d&m%g%"@™è‰Àh6 ìœt®ítEX±ê5Y<Je%ú0tÑg´SHÐ"=2Ä~ü³l¨<>È0xe"uÃ~(@·@ÅPx4ˆƒU¨˜1vÄ èÈ å8^J–|ÀãƒKõc3ˆK¥¾è6¬œu;¤%ƒ¹Êt¸Ô¥Ì,õÂ-ÑztŠ @ì[
-34ÆÌ©bævŒº{Šñ-fŽ­c‹ôù= ZiQõŠÿBÌhÔ¿ƒšÂT&HŠ÷äAp
-,6÷/—<Í/óï²1åq軂ҋ ­aÿë…ŸR/˜D°Ÿ²ð¹¿Ìz¡Az^0ìzçÜß}æ‘kƒ$æê­)å»I#ïö¿ˆ®06F‰ ëÎýMfñÓéÓï:†X¡ ¸ÎÃ?4HÖé=6ôѹ¿ó(ëØ"}~)×¹¿§)Ìl‘íaƒŠ|#ÕŽ­c‹ôù=¬AYq|3m ôÔ#„h¶åiÜNó{UÓ/oOß
+xÚí[Ënë6Ýç+üeÉyðìëä]gWtÛ®úÿÛ’"©5rȤq4 ßèÊâÑÌpÎðŒDëÓß'}úùpyyøõÙð)¨`ÁÒé寿Ð'srA¡;9k”¶æôòÏéß´væÑcü‹ðø b:r 5¥OŸz.Z³‰gÒ_ÒÚ^ã'¬ÇMc®¾ü-p$Y`¬LH7JðR
+ˆwH£•Î:­lT ‚%5ô4kÖ<kk¸·ÄŒƒrñ>‚¥öÒg)ia43Šz†hɹÏÔÊ»Ð"IÌ•&U¨•g¦¥¶rÁK¶÷jŠÑÓ~‡4[Œ.«‰©^r-M55×Ó½‡öE ]n…y^¯–œ²t.‹]ßGVy‹NJ|ŽWDÛðœã>¯Ãµ–ã%)Žy>~Ìc/Uy–™yî󭮈ð||f¹z<;ãÊí1ˆ3ìDzs‹Ôh°7qØ°òbòõÊ’jÚh[kúôI:Sõõ^÷–¨ßné8è¨ñæø Í-Ý„¨ç.cé‘„–n«n7q©jùÐÞµêøÜLÞßìä<«@f‡r=¶7E‡#çJS•Hu×¥5iIž‡¦ÿ%A³É­šÓ3úDЉ~å;›iTFp*‰+c¢¿ù2X jÈCÖ<žêRáö2GÛ›qÈ®L
+%
+vÝt/FµÊ¯$gBr¡dÆhgÉέν"¸ô! Òú¶WZkQ§¢5vZ!¤þþváÅØýbB¸©²V¨JñÚì@©ôŠa0±ÿÛ!ÝA©0áN©PŠb¿F.z¯EúV*_C©0ÂN©”îí=jvn‘–ìì¨îý,‹Vx1Q{“êÆè3Z0¢éç1Ž5Hßû£0‰@i†{û½’œ Ò(ǵ59R„æ@[ßÒÉÁ)`lªÈïN–÷)U¢•Çë7¥sl|™w¦}Kç/)Éêô©‰?ö¿Aº“t¦ô˜E–?ƒð$‘®¯ˆèÛ¬‘…ïÿDbú#ÓÛ¢ÕyÚ" ,ÿƒƒ;+½=±Š64@Öîí}×â?èUl¤Lo«c1Æß´H‹ø ÙBû->ºæD³$>ÒßÞ®rc‹tg!%<J~t7*ÙéÃ8Žž”&’,î~Y’IÞ }2ËÑ¡ÒžE¿ÎC,o¾Yþö9± b~Ks‚c,oîÍr6ÊX/úáÇüØ"}ËSó­ƒÈcùé³Y!öp¢[4Fò Ð7Çß>#Æ+FäŽqc‹ôÁ @ìÝ漦«Æn÷îeÆK“]úV½l ªÛ€ê5¹Ó•Û÷£íCÃ]-D·Ö¿^•[ºÚ)±»¾¸,Y6s
+jòèË÷ŽƒQŽ«Ã4&y¤U§:h‘!å´8qƒ
+¤A{çAÛ4*G(Ú懞ʹH£–¤Ø“8m<´làs«òX ¼Q^Pëçþe½Ä` ôaG~4¤¼µbšáØ/Õ6@ '˜s²=‘Va)Õù‘Ä4ðéåá_”ð7
endstream
endobj
2489 0 obj
-<< /Type /Page /Contents 2490 0 R /Resources 2488 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2099 0 R >>
+<< /Type /Page /Contents 2490 0 R /Resources 2488 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2547 0 R >>
endobj
2491 0 obj
<< /D [ 2489 0 R /XYZ 78.37 808.885 null ] >>
endobj
2492 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 755.155 null ] >>
endobj
2493 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 744.196 null ] >>
endobj
2494 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 733.237 null ] >>
endobj
2495 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 735.953 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 722.278 null ] >>
endobj
2496 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 703.076 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 711.32 null ] >>
endobj
2497 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 692.117 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 700.361 null ] >>
endobj
2498 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 681.158 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 689.402 null ] >>
endobj
2499 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 670.199 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 678.443 null ] >>
endobj
2500 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 659.24 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 667.484 null ] >>
endobj
2501 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 648.281 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 656.525 null ] >>
endobj
2502 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 637.322 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 645.566 null ] >>
endobj
2503 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 626.364 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 634.607 null ] >>
endobj
2504 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 615.405 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 623.648 null ] >>
endobj
2505 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 582.528 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 584.443 null ] >>
endobj
2506 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 571.569 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 573.484 null ] >>
endobj
2507 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 560.61 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 562.525 null ] >>
endobj
2508 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 549.651 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 551.566 null ] >>
endobj
2509 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 538.692 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 540.607 null ] >>
endobj
2510 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 495.853 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 529.648 null ] >>
endobj
2511 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 455.006 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 518.689 null ] >>
endobj
2512 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 444.047 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 507.731 null ] >>
endobj
2513 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 433.088 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 468.525 null ] >>
endobj
2514 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 422.129 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 457.566 null ] >>
endobj
2515 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 411.171 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 446.607 null ] >>
endobj
2516 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 400.212 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 435.648 null ] >>
endobj
2517 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 389.253 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 424.689 null ] >>
endobj
2518 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 378.294 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 413.73 null ] >>
endobj
2519 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 367.335 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 402.772 null ] >>
endobj
2520 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 356.376 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 391.813 null ] >>
endobj
2521 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 345.417 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 380.854 null ] >>
endobj
2522 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 334.458 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 369.895 null ] >>
endobj
2523 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 323.499 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 358.936 null ] >>
endobj
2524 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 282.653 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 347.977 null ] >>
endobj
2525 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 271.694 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 337.018 null ] >>
endobj
2526 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 260.735 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 326.059 null ] >>
endobj
2527 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 249.776 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 286.854 null ] >>
endobj
2528 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 238.817 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 275.895 null ] >>
endobj
2529 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 227.858 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 264.936 null ] >>
endobj
2530 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 187.011 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 253.977 null ] >>
endobj
2531 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 176.052 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 243.018 null ] >>
endobj
2532 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 165.093 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 232.059 null ] >>
endobj
2533 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 154.134 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 221.1 null ] >>
endobj
2534 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 143.176 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 210.141 null ] >>
endobj
2535 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 132.217 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 199.183 null ] >>
endobj
2536 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 121.258 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 188.224 null ] >>
endobj
2537 0 obj
-<< /D [ 2489 0 R /XYZ 81.145 110.299 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 177.265 null ] >>
endobj
-2488 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F83 414 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
+2538 0 obj
+<< /D [ 2489 0 R /XYZ 81.145 166.306 null ] >>
endobj
-2541 0 obj
-<< /Filter /FlateDecode /Length 2864 >>
-stream
-xÚÅ[Ër,· Ýë+æLó¾ªTªÒ\i\å]’»sy•T¼É]Ø›ü~À7øèVSñM#M³›h
-õ:
-èµW;Z_T0f¢´Í 8N-9->Pê¬f“'e™–°Ü(jO;%½mÉò:ñ‰'VßüÅþúJôYFè«ÃbÜ
-ÉÊ"õ”>ðž}ַɳâÌ/¢²» ß¼En$´·±ÐépÙ‚# /)€+Fõ"mÞv% ¯’r
-'…F* Ы¸Õ$—€3†¸4§¼-mÌ2ÚmÓDÛ$îEk²üVòKç0
-íö¹)"ˆž
-
-´†%ÀT+Ñ–÷P¸!½x&Üä/ÒKRÎÏW*NÔ´N‹V
-ámÑÒÒbÜ!TƒêÒU¡V–Çd—«çqÊh”RÒF ‰ÏŸò’•9;7
-&fvL™*x+^œìømæå÷Ñ^ó2Ù[¿H‰åºäK«ZmIŽþÄ»¶%F‡ü.%sî¥üèiL„
-’ôwºÜén¨î¯£0½Î®ÕNÒÓ9NAhX!/õ>ºPœýþ±7ÿdš‚Pi'VrovÀGJ­Ë¿¨óν:5÷ß|×gvä³H$Hêc»
-ß;é©›:B¾ò Mz>èžK”r̨šŽ¢jVîi1ƒöxCvqËè¢òœ®ÖÆi ‚÷ ÃÏ"ËõÈ%œ—¤Lb2:Ìê
-1>{·TÔl/hÁ·ErÉq¸çÁ›z
-)H~> Š‰Òh…yñ*æÉ`®©e
-™*TÐ'Ïa{7}öç­$=¦‰¾¥­Þ¦{P0@ŠG;M&‰OLµ/
-endstream
+2539 0 obj
+<< /D [ 2489 0 R /XYZ 81.145 155.347 null ] >>
endobj
2540 0 obj
-<< /Type /Page /Contents 2541 0 R /Resources 2539 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2578 0 R /Annots 2579 0 R >>
-endobj
-2579 0 obj
-[ 2538 0 R ]
+<< /D [ 2489 0 R /XYZ 81.145 144.388 null ] >>
endobj
-2538 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 256.954 157.029 267.381 169.618 ]/A << /S /GoTo /D (Hfootnote.39) >> >>
+2541 0 obj
+<< /D [ 2489 0 R /XYZ 81.145 133.429 null ] >>
endobj
2542 0 obj
-<< /D [ 2540 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 122.47 null ] >>
endobj
2543 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 754.882 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 111.511 null ] >>
endobj
2544 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 743.923 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 100.552 null ] >>
endobj
2545 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 732.964 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 89.593 null ] >>
endobj
2546 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 722.005 null ] >>
+<< /D [ 2489 0 R /XYZ 81.145 78.635 null ] >>
endobj
-2547 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 711.046 null ] >>
-endobj
-2548 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 700.087 null ] >>
+2488 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F83 412 0 R /F59 346 0 R /F84 425 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-2549 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 689.128 null ] >>
+2551 0 obj
+<< /Filter /FlateDecode /Length 3187 >>
+stream
+xÚ½[É’$· ½÷WÔ Å}‰è舮®.Eèf{n
+ì°.žƒtñïà
+.™•Y£ñ¡º«2“
+Oãÿ*¯¦ÆÔ§Ú·Ï}É¥Ç1•ömAQÖùêÌVŒüIÎmãÓØòM|RZ‚ÞÝn퉇®1 x>b ³MCfµe>T¥¢2HÅíO!$SÖŽ£;3Èý3ŸžÌ «Ã¯Ê{ó0ñ4_³Aˆw»¯ ]gÉ‚C™î–¥¡Þ5dó[¹P÷²Q
+Çó<ÔÂX^®VSž¹ËZ°8©b{ëÀÐ,zSQx%p¤’…_q|QŠO¡BtÚÃ’+8¬ð¿,Zž‡Â Ä+á&¨‘Af¸¤\ýµ¡âD͘´hZ6ï•---øBU—~jeyl6¹ê¾ï§¬aʨQZiÓâ"ŸÕ?å%+5r¶
+t7øÝÝPÍÿ9¼n<D^J/ñúû™ d ´„ lXa/õ9QýùØž?¨g`ñ–yN*#¥&èû"tèñ<ù0!Ðg0<©ŸE(A‚7
+ {ô|ª¶°¯ü aÏ*TÁxÃÈéƒy8] 5"Uãò@ÓädÇø<"—ÑHå1]¶Ó$ïS–ïCE.™ãfäRï'‚$X)ü8ªƒ€^­1ƒdF‰i¾9+¶9·öL«‘À¦Cq·äGÝUvznë‚üFŒ”óäËÔK˜ÀF|p ŠµTLÈö-¥5ÛÍ]öHF9nÿ:cøhÿ®Õß ÛPƒ}öÕàS‡ÚÒ"ÓxŠª [Öaˆ¤}'†ü›˜‚FŽ‡É{›J
+ œØT ¶Èd “äRdè’øÍ »± ,ã]·Ú¢D®E‡%º)òFí‹y㈂»PüO_7Ô¥ŠÉ.D
+qH~a FéjÅyù*ðɈ®©eD ™ª®H¡ q‡7}ö»I"@© qïOu XQmŠ„y±©}˜àãxg;ò,¤
+1’\²u,Ï'4g2Œ„+’sºQ¸ð„+ÆFoÅŠÍ£Y¹ÂfOé´+“Ä_*ì`S9é)}ï:bÍO/óAü‡©¯ÄH©eu1Äë:ƒøøð>³òRÁ­¥[>Š‹\=¥¢ñÎ>E”dе¥w”h2•ïŽ·òuI:m46S(òÍr_©srö”ŽÉ)åì~¬¼\2níJÞ£¶ÈÛSjò¦ð=ÉûUÎÉ(Ág
+¦’ã\gr~Ž3ð˜#…Ý×ÚÕ°n·ê{Äëi†’ìu‘Z ,él-vµÑyDžÅ”~Í-6ÇÝ-¿ÒJXýææ“0,¢¸«íX7Y÷s·îCp©â®ßDìÐZ–Ç°Ò
+cÝI‚T{sÂGú±†“®”f÷R%ž'Ç'ýªͯºHeàcÆ =H‡rŸaÕ]š@猽µv³tgAn•€h2¦ ;i†Dxläo´»ÚÔ½¯ô<¢Ü‰–‰œ\BŠ]œ~xe%h/¢,\8”ÆÒ^Ó>E^¦¯E¦é@K)sS67ÉZå^˜±v»HÁ;Ò³Õg·Ñ
+endstream
endobj
2550 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 678.169 null ] >>
+<< /Type /Page /Contents 2551 0 R /Resources 2549 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2547 0 R /Annots 2588 0 R >>
endobj
-2551 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 667.21 null ] >>
+2588 0 obj
+[ 2548 0 R ]
+endobj
+2548 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 256.954 388.538 267.381 401.128 ]/A << /S /GoTo /D (Hfootnote.39) >> >>
endobj
2552 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 656.252 null ] >>
+<< /D [ 2550 0 R /XYZ 78.37 808.885 null ] >>
endobj
2553 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 645.293 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 755.792 null ] >>
endobj
2554 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 634.334 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 744.833 null ] >>
endobj
2555 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 623.375 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 709.449 null ] >>
endobj
2556 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 612.416 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 698.491 null ] >>
endobj
2557 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 601.457 null ] >>
+<< /D [ 2550 0 R /XYZ 79.37 658.847 null ] >>
endobj
2558 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 590.498 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 593.803 null ] >>
endobj
2559 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 549.651 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 582.844 null ] >>
endobj
2560 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 538.692 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 515.751 null ] >>
endobj
2561 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 497.846 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 480.367 null ] >>
endobj
2562 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 486.887 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 469.408 null ] >>
endobj
2563 0 obj
-<< /D [ 2540 0 R /XYZ 79.37 438.264 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 458.45 null ] >>
endobj
2564 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 372.309 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 447.491 null ] >>
endobj
2565 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 361.35 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 436.532 null ] >>
endobj
2566 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 290.615 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 425.573 null ] >>
endobj
2567 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 249.768 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 386.547 null ] >>
endobj
2568 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 238.809 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 375.588 null ] >>
endobj
2569 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 227.851 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 364.629 null ] >>
endobj
2570 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 216.892 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 353.67 null ] >>
endobj
2571 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 205.933 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 342.711 null ] >>
endobj
2572 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 194.974 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 331.753 null ] >>
endobj
2573 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 154.127 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 320.794 null ] >>
endobj
2574 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 143.168 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 309.835 null ] >>
endobj
2575 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 132.209 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 298.876 null ] >>
endobj
2576 0 obj
-<< /D [ 2540 0 R /XYZ 81.145 121.25 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 287.917 null ] >>
endobj
2577 0 obj
-<< /D [ 2540 0 R /XYZ 93.716 91.444 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 276.958 null ] >>
endobj
-2539 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F59 346 0 R /F84 425 0 R /F74 337 0 R /F22 367 0 R /F65 335 0 R /F81 377 0 R /F83 414 0 R /F16 336 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
+2578 0 obj
+<< /D [ 2550 0 R /XYZ 81.145 265.999 null ] >>
endobj
-2582 0 obj
-<< /Filter /FlateDecode /Length 2791 >>
-stream
-xÚµ\Ɏ丽×Wä4›dp
-”Z•|®›á«}òÿ_‡[pE‰•c 4•)‘!Æþ"ÈlJäã¿êþÿ·íûí÷SÚ‡ Ö0àïÿ¼±uÿ±‡áD‰‡VŒPÅßÿ{üëRÉ)U"^’üûûŸoÔs¤~?xb•SÓa
-ˆÖSšR¾}ü’\xºûÇ/æþr‘./õE)¸wŠÝ}Æï¸+ÝóÏøŸ0?¬¥bí‚/I £|Ä—ÚÖøj)qŠ<qî×ùbnb‹ëUÔýe…'üìøòÏeº‡sügeÝÅWùK˜€!ŸŸk|¶”îñŸ¹k«töå—Â#~Á®ñÛR*üJðkŽü†u»5K× _QŠÇïÚ1Ç“ ‡çÞ^·øÙóù^å‘i¹òhÖxl)‹wªàcÏDÔ|ä•~¶<ñiG»øû|›*•Ú¼\“OKéŽ ,®UYI€êáZŽµJASJju%FvhUpo%@‰Ñö@iy% "¾î-„j·
-ÑÿòÛÄóø^—Åñ)-kÉO÷Ú‹C¤Îwœ<ŸÊûÍá÷“ɇuÒáN¨•t´% 
-$‘ó§r
-Z )hJϾ{
-ü³øŸ»| š2)JÂT1âð†!²ð±'ÞñRðòŠ6wÛYÞžBfN ‘õYõ¿…,u ç-ÐÉý7‰œj’uTH.+"Y‰ì µ@> ÏBIs<Õ£(‘rH©ì)>Xoq1Ïu–ÄH£µ÷(´èQ~ý¶[^¼¼Hfür?Ò äçg[ vw-õ,A’XyªBí1ùÁ³È.¾@léÎŽ0Ÿ È)~TAá1j̾Ÿ‹>ÆÕGÞjÚm0
-4ZÏå†]‹
-FJ!Í¿„ï^`q!ƒ!©î9±v
-gŒ(žÃj­V
-=÷>Ob­šÑškÜKì¨u7G·ïXãíèp%ì÷h7Ü[­õ¤rNeõH¢°†Ñ;JµD¨yŠŸ%4òŸ ç^_·*é«U3”Y“AKijU:^ë<T‰#k«m)ª*ßk’´Ñ¡í*”Vê¿ŸœŸ×*’rBÛ΋NÞ >ã_Oѽ”v¥ x/AD$ô糬ÿ[=Ê;©wFÄ š˜•RB³:˜‡’’¡ó:êŠV°NÑ:»§ì¨°¡ÇgXŒãHLÔ6œ…а¼)‡IQò0ß0
-Õ¶ðXñš˜‡†ú}t'%}nþÙcüô¢­Ä 6¥ȪܮpO% g˜
-ž¬åçPW,Pé‡T¸@^´ß`°°ØŒÚÂ|Žq¯Ö¥¶ì¦¹@ÎB¨±NÐ÷>ÂN ¥Â™ Ë^‡€„²‡7*lÝ~H†8Sš â݈ñ§vËŒt AO‹—ŒÄKÝS–^n'êlCË`J—Kõ°Ïs³—ÀTGèLù„ÒÛÚ–ö?O1Œ,…ÖŽ’%¾¯+>ü˜ WÓ„pż‘0âån+‡ÞùR“œAz97ÉÙÖÏ…#ûùs?÷j¾¿Nçïsúáýâbþä¹o Ïž+¯Óù4^Ëi^0—œí¡B_÷›§¨¿Ž’µ)c:g>[ÚÈQXµŽÜ£‚}ƒd‹üQF,ȲÙq<XJ¬V£ñ7 ›d:B? 2N ¬|æÏ0”P¦‡Œ­Õ4¥ÓóÖ¢!JÇ„ꈥB>¯»dgcò
-ÏÞcìK¦ Ê'…‘FÀŽLS†£Í’aÖdÎÍRÈ„ Uìíü&(4abÈÂbIÑQ:3Ás^Êy
-}àóq¹åráz¹u³@>ïïH=hÐݘE­qI8‡¡ÁšÖ:JõÖŸ™`€jûýÀË`Ü•ì±nÃÆ vϯÆcw:NÝÔÛQZÍç\…ÍÐ…§ÕFü ºd‚„å¨ËEÔÙSJÕsŽ‹Pd0K93}
-^äÂv¢§Ü}ØâûqCç*•íåcTŸ$;qÏ{sý\ÕÓ‡D¼¨E
-hƒÍâ¦ý2öì)í¥w2³ÚzÏû'³±eóm2.ÕÜèÅ|ilέ羲
-3¸å.gª‘”ï LY·§TZt?É¿¦j]ïÇmÌà!—pÐ÷î‚?]äß AO¸Š«âO½Ïøšì #`ôHö©šèÆkJ7ÃñŸ+ ¯#4Ù/Jm't’˜ ó¸´¡5`b±×ßQ:5³?í‰Æ`Z§|½ý¸0D²!kf)bu„Z£þJ{Y'‰ŸÏ€a
-û2K#`OìV³ôRï•â~êUš;Ì1ÕÁ@¯÷^1ý¾¢/'mia¨¯µ2«§Tm`wzÆ[>ý|1&œ”Þ®õUáSŸÂ®÷­§ ž^ú âMe“à³DîÔ¼ ;&‰1 ”kÅVO©+6Äv²Þ“ÂCWÛd¹pžÍ­|njÛÝœQ1‹ ù¬_xO5ç
-Û¾,ʨ:x5F_ŒÁ£¹«®Ê/[ð·³ù—}çªÁ’d°¨E÷GK=ÒâÝ2 µØQ:ô¶fí¯\f½ð;c°Ó?“QSþMÚ!Nóù˜úXÄtm¢Äþz7OR½âwšmÍHcwÏÀ¡Æ:J{Á¢ÊAW­)æùÇiZÉã9óù¼ »ýzïäNN­ÇÜÍuŠ·‡SòXԢĀêîsMw¥½ A;»”/?þ^„oëx¿>24³°ƒ1µ¿œŽµeìUm‘}N¼®?a‰º,¦¼–Ð^Ð5zÇió.Yc—V[DþèŽålÈŠ´ˆ׎Z®gš¸…Ç/šé·”üa¾Ñ¾ÄñgPË­%F¡B…µvr¦£tÖZºæå¥v’•„š!r[DÝ¡vq+éCIZrH­Ý]í嚃½ÇZ.Ëôl{â1´°öB/é­ÉÞâ|©—½Ú–QsGhÍÇz÷ô–5R0öEl¸ªŸ¦ß•.çÇæ”f%̉½=czJç«ÍQÐŽŸÛôW(O˜2#­-¢äŽÐ^!û½‚é®üP~•îO­Ô±Óh µdÅÊÚ¦¿x²N=R=„?õTˆ–§áëûí/ò)ž´
-endstream
+2579 0 obj
+<< /D [ 2550 0 R /XYZ 81.145 255.04 null ] >>
+endobj
+2580 0 obj
+<< /D [ 2550 0 R /XYZ 81.145 244.081 null ] >>
endobj
2581 0 obj
-<< /Type /Page /Contents 2582 0 R /Resources 2580 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2578 0 R >>
+<< /D [ 2550 0 R /XYZ 81.145 184.787 null ] >>
+endobj
+2582 0 obj
+<< /D [ 2550 0 R /XYZ 81.145 173.828 null ] >>
endobj
2583 0 obj
-<< /D [ 2581 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 162.869 null ] >>
endobj
2584 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 151.91 null ] >>
endobj
2585 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 140.952 null ] >>
endobj
2586 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 2550 0 R /XYZ 81.145 129.993 null ] >>
endobj
2587 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 735.953 null ] >>
+<< /D [ 2550 0 R /XYZ 93.716 89.795 null ] >>
endobj
-2588 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 724.994 null ] >>
+2549 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F59 346 0 R /F84 425 0 R /F74 337 0 R /F22 367 0 R /F65 335 0 R /F81 377 0 R /F83 412 0 R /F16 336 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-2589 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 714.035 null ] >>
+2591 0 obj
+<< /Filter /FlateDecode /Length 2903 >>
+stream
+xÚµ\ÉŽ#9½×WøJ#Q;PH ]‘n ÏukÌuæ4ÿí[(AÛype¦C¢¸‰z$Eoÿ½ÑÛ_?î~üëp³Ä*Pâöç??˜{@oì¦-áú¦#T±ÛŸÿÝþùE©Jµu? ¥ê3ý¼üd”R÷X¹?ùÃ}àã'7Ü}#Ü7ì·û¹¹oïnÄÿö¿×Q’;²Ê=µq¾d~ÆÇ¿ÿüíØcrÁgD
+“ÙS,ÍÍÔUà
+"e·
++ŸB™î5ÙÅì4^zè0.01¦§ólˆq“Õßáñ|È”0ʦfæ¸ÓSz:ä˜Q¶! eZ]ÈÇýá6ÌXáàyuaµƒ1…ã5ò;qÌ5ðS
+àN>tå˜ÛÍ1MSÿ ~m=~_°·–(ΧöÂ¥Y#¥¦áŸ+Ì+ÙœØê‘;ÒIo'váMâSlÚ0OA?=‡uÄ›Æ'OÀy>%J!õÛC”ÓH‰K¶FJÛq©ûJâ¡›«-%q^ÍmöÜÒ·‡9³bø£îõËë4svi/­‰frf/dB5RÚr_jCÂ^|œ$Q)]QÛIÕÔQϺ{æð³$Õ'óKŠãŠ!%•€×ã¤RDËàÇ
+::)mýU°UÂZôq’ØŽiéRGiœçcôÉ56ç´PÓš~é>N»ÅM%é
+Ž”¶Š®óî8,Þ%oN'l‰ˆ3æï"Le1“§Œ¸GS×]BK‰‹öÓñ¨[h¡Åu6ïK´—xž,-¶„9UîêÙ@騸t.ËK%P†8WœÉƒ„Ý#¥¾“x¯f'mx)Aµ¹*ÖÍ 4'ÝÇV3hz¶O!±¶FOé!µ/5ajw
+ÄW<pÚ(m±ÙvP/yÒQ!…dŸÈ†OÒ7F¿
+ „&µ5‚òÊoƒÛž©ƒ­ê=ÏX;äFvËW­„wWM0õœ5 #f_m W> š·I×f­¼Z"_8R/žY«³äéªö?Z"F©©EpƒPÊ¿ÚܾÔA,>lóûÜÙÌ9.Ü_ËùÅgÅÃj{ã~^þo.ž(©n‚[Ó‹æ¿…úúóãÿ«€Ù
+endstream
endobj
2590 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 703.076 null ] >>
-endobj
-2591 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 692.117 null ] >>
+<< /Type /Page /Contents 2591 0 R /Resources 2589 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2547 0 R >>
endobj
2592 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 681.158 null ] >>
+<< /D [ 2590 0 R /XYZ 78.37 808.885 null ] >>
+endobj
+273 0 obj
+<< /D [ 2590 0 R /XYZ 79.37 771.024 null ] >>
endobj
2593 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 670.199 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 713.623 null ] >>
endobj
2594 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 605.442 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 702.664 null ] >>
endobj
2595 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 594.483 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 691.705 null ] >>
endobj
2596 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 583.524 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 680.746 null ] >>
endobj
2597 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 572.565 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 669.787 null ] >>
endobj
2598 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 561.606 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 658.828 null ] >>
endobj
2599 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 550.648 null ] >>
-endobj
-273 0 obj
-<< /D [ 2581 0 R /XYZ 79.37 513.236 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 647.869 null ] >>
endobj
2600 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 453.539 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 604.662 null ] >>
endobj
2601 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 442.58 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 593.703 null ] >>
endobj
2602 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 431.621 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 582.744 null ] >>
endobj
2603 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 420.662 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 571.785 null ] >>
endobj
2604 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 409.704 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 560.826 null ] >>
endobj
2605 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 398.745 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 549.867 null ] >>
endobj
2606 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 387.786 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 538.909 null ] >>
endobj
2607 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 376.827 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 527.95 null ] >>
endobj
2608 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 365.868 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 516.991 null ] >>
endobj
2609 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 354.909 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 506.032 null ] >>
endobj
2610 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 343.95 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 495.073 null ] >>
endobj
2611 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 332.991 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 484.114 null ] >>
endobj
2612 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 322.032 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 473.155 null ] >>
endobj
2613 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 311.073 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 462.196 null ] >>
endobj
2614 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 300.115 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 451.237 null ] >>
endobj
2615 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 289.156 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 440.278 null ] >>
endobj
2616 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 278.197 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 429.32 null ] >>
endobj
2617 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 267.238 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 418.361 null ] >>
endobj
2618 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 256.279 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 407.402 null ] >>
endobj
2619 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 245.32 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 396.443 null ] >>
endobj
2620 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 234.361 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 385.484 null ] >>
endobj
2621 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 223.402 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 374.525 null ] >>
endobj
2622 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 212.443 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 363.566 null ] >>
endobj
2623 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 201.484 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 352.607 null ] >>
endobj
2624 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 190.525 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 341.648 null ] >>
endobj
2625 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 179.567 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 330.689 null ] >>
endobj
2626 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 168.608 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 319.73 null ] >>
endobj
2627 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 157.649 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 308.772 null ] >>
endobj
2628 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 146.69 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 297.813 null ] >>
endobj
2629 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 135.731 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 286.854 null ] >>
endobj
2630 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 124.772 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 275.895 null ] >>
endobj
2631 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 113.813 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 264.936 null ] >>
endobj
2632 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 102.854 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 253.977 null ] >>
endobj
2633 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 91.895 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 243.018 null ] >>
endobj
2634 0 obj
-<< /D [ 2581 0 R /XYZ 81.145 80.936 null ] >>
-endobj
-2580 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F83 414 0 R /F74 337 0 R /F22 367 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /D [ 2590 0 R /XYZ 81.145 232.059 null ] >>
endobj
-2637 0 obj
-<< /Filter /FlateDecode /Length 3232 >>
-stream
-xÚÕ\Io#¹¾÷¯Ðh6ù¸†˶È1è[krÊ%ÿÿ0Ü—WT©X–É Ü–JäÇ·ñm¤Ì™¾üûÂÿü¸þþñë¦ýE1ï„„Ëïýþ̨‹5‚q#.¿ÿsùÇ ç8—’ss?¯ÿüý·<‚¨_7§.Žyc¤ëq&,l>’ (á·ñå7ÏÂ
-Vp.Þó{ž+È¿å5Î{ý©AG__ÅÏÞòÜ4òÜ„°µ(Øá·U/=¿ƒ¥Â8]ÆÇyñ1öæ¨HŸjcã1’ ;•<ЇæLp˜êãmMi‡‡3úHXá7Üš^"ê$bè2fYÎnÔçÒ|]æ™çëFz&”œéFú5Ý$B7ÈL/ê$Êå’l_q_E}îÚ»ÍxI¦ÍY’+î¿k{HÆ=Æ{æ)bD¬gëAð3ý¸5ý¤B{¢ÑûH¹&—~Ä×Ɇä}’ës,o6!m¦)Î³ß ca€žú'½&c‚y‘M†Éæ;?Ÿù³dë…_¸Îýͦ‹¿‰ò«²DZŽÚëϺ0þ!Öaõà c¦úQkú!H…§ÈÚ¸‚…½LdsçŒîŒhy@Ú“bô“3ÙÊ~­g‡bКžŒ×Lr;õUrIOi‡‡³²XšL“®ô½‡q$_3.ÓãâÒº.¯›bÝ}]ÔœSL*?Óœú\ÓAi/¾G6ÿQýb‰çèÿR Z‘Ë{Ó?”xŽùúYúüYøR4Ÿº„¿¨%+™Ü*)$1v-U#@¸{†”¢å¢çJ»²–Ñ“=s­oŠDÆ
-£„œêb­@‘
-o(gìªD~¾R½C§Û(Ì £Ì<ŒÄwup„Nqí¢%_¬Âõži­fzYìP¤~ûŠÅ|4¸Zu®®Wý®_[Gš¶ÐjöWð¾c Ç´×S]­u(Ò„§¾K?£™Û™NØ^Ç猾Sue¿ÿÛWÔ}Gõºh†[f¤™ú´µE"]š§ñ×W®²é"V0ªóýg}æ^<9ݹ[Ó‰ö†k§:YëP¤R…õ~í†øõ*²¯ò£~ ´J®_«üÕ[Ë‹Óž}Öž^Ô…ÓÌ
-7õWkŠÔùð´JGjÑvÍ*?V1;Ýî¥\&ÃdŽoÊékåFÆk`NÁlüÁ2Ã[æÁQ >“ÌUB•
-_)]Û«Ïñ$ÀBÓAÊ=?q$4Èa—ð-uƒöp>ÇWF´\9ÑûëùÙÎ9Îo›£ß¯§Oô^´Ì99Sö¦6ú⃲!Lëp¬gÒ^´ˆKÔ¬KŠ¥/Ù§n•Ï¹?î H#ÌK”L+n²ëœt'#ädRÜ¢g½à»ŠT3 ¾Âog
-¯`ãGÃKéìÚ²–‚5€{)fym%é‡$8›·ò¯›U3QIéN(»‰°@”YsKi‚Šè$¤7÷^37ä­-ò?µ/y´¬²‚—¦Æ+f¾èý©v±ÏÑç··^ml·FïjŠÕpÉ8Ô^,±9zŠì-2_úº3 Ë#úueuí÷„ržq7u˜kÄâ
-1TøÇB, ¼Ü ÜݪGÌÖI¦º& ³¼Z¶Õ¬$o“–f¼’Ÿäãp,–ú$åŠå]K´Úd;Énò¢®?{À§5AËcL³Æ¹
-‹?¸Û¥YF»EÕW*ÙâSªr"C×Z©
-lˆD¡²¥wî çÎ냪À²RÀâ2ë4ó]¥JåWïèòT]½ 8önûc<iG £­Rïgìlå³+ÅÓ¡È&HÁv~ZŸL]¼:xAfÝ …NÞ¶Fb1þÂÏBi#ȉ¥ª 1Ñú¸ut×Rï‘yLSrƒæ€¿Û/MCa$%¤øÔÝÔã• 3[èwë˜A?¬rz›´ƒ°]D«:18{³®YIi™ñ|©À›>cg*Ÿ‰¶na3ýjÊ%}tþlänl›=,øj›q(øÄBÁWÌ*dÛF›“åžàQ³Ž¢œ(÷XÑFF¤YÂGŸØ$”»®‡z,lmÊù4<
-ð• ñ ÔŽ
-endstream
+2635 0 obj
+<< /D [ 2590 0 R /XYZ 81.145 221.1 null ] >>
endobj
2636 0 obj
-<< /Type /Page /Contents 2637 0 R /Resources 2635 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2578 0 R >>
+<< /D [ 2590 0 R /XYZ 81.145 210.141 null ] >>
+endobj
+2637 0 obj
+<< /D [ 2590 0 R /XYZ 81.145 199.183 null ] >>
endobj
2638 0 obj
-<< /D [ 2636 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 188.224 null ] >>
endobj
2639 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 177.265 null ] >>
endobj
2640 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 166.306 null ] >>
endobj
2641 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 155.347 null ] >>
endobj
2642 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 735.953 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 144.388 null ] >>
endobj
2643 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 724.994 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 133.429 null ] >>
endobj
2644 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 714.035 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 122.47 null ] >>
endobj
2645 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 703.076 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 111.511 null ] >>
endobj
2646 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 692.117 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 100.552 null ] >>
endobj
2647 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 681.158 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 89.593 null ] >>
endobj
2648 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 670.199 null ] >>
+<< /D [ 2590 0 R /XYZ 81.145 78.635 null ] >>
endobj
-2649 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 659.24 null ] >>
+2589 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F22 367 0 R /F15 334 0 R /F81 377 0 R /F59 346 0 R /F84 425 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-2650 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 648.281 null ] >>
+2652 0 obj
+<< /Filter /FlateDecode /Length 2640 >>
+stream
+xÚÕZÉŽ½¾û)ô¦ÉbqÌXV€ƒ¹¹&§\òþ‡÷µ¥¦fl$ÿ±Ô-²XkùHÎÔå_NÿþåÛûÇ·7å.Èœ.ÿü&.œþ LãÅhÁ¸—_þþ¹Î¥ä\¿ûÏ×|üõ÷ĈԛŋeNki[:4&JWú»¢DMÓ³æôGÏHJÐ'½“"½çñ]ø¼¾~W <yhDz âLpXɃ¿­a¼tL œÆ¿qnÜj<X&H‹ñ
+NéËæÀŽ„ÐFñ½ªÄOÿ\TpKo *Ï+Ô+Í`íŸ}×®Ulž-1CU(Öo¿üûHÃæ T#ÀÍÿžGB5‰,ß’IGî:óåù<Óž?xÅøì?=•(Ï<ç¼¼uŽzkùT*ðµéLÂ0
+Si¾OjÉ4ÔŠO¡zöz½<+z÷*ä€bJ»bè–+yÈUøe2€œ [¿ôÛ
+ßëV+ʾ$#Û%²õ1óÇM¯ýÓF‘¼ßfšÉ4w½MkÒTbtMñWçM~w'€u”Þ&~–ioGH’ÔJ=IªKtŒ,8ÓµªÉµUæ"h(-ø™":gHúòÚóÃß|Œ7Kžñ"Œ×Z¸OŸ1¢ˆLÊ‘˜6…9MÿŸ¾ÈEdf²yY¥Iqb¤ï•áû,ÓN’
+&®³JO'\å4ÓƬ®t; w ô8áDçšl7±Ša—‚Øs­&7L"Œ”¾¬³¹®Œ}¦ŸyÔ¿l•#o ܆Úö–+ºšp¼ÕÆBãTM¡ gÆ`Û§„äzL{á ¥…PQT½Þ¯¤`
+Õ¸ÊÁö:âThA »xÍÉ(pæõ¸rùÍq5ôZÚ—yÂè¦e¡7*§êH»Ó{î”â{sÍzOýºÌ›«Z%š)QF&rr¼ÆΊR`mË06†Ð:µ2Åå£hy’0½xz•T×!*I ñì(ç B$O''
+‡[õŒÛ*ˬ¨‰OõU^iÛJU·I-3^‡%¿ [³4KmjÅôTË
+
+Qô±òïâC%†ö« tqL6]®‡Í0öþÈm@îÊ#¡³Pˆ¡ÒÁ¹•8³~îê92eÅH‰|ç»qÁÕÅ«…—,¬}É Bâ“×­‘”˜œ?ÉsÐ(MŠ\x*
+"ó8ãÌÎÚà]3h‡Io 8(ÃEcW'º q4ë=),bƵô(‰‹ÚFd*ôa ZX]¿¤š´@JE×&žõÒõ°ÙƯÀŒ]Ã'6¾äVTm;÷l»'¸·¬©<Ñî 0 ¼ô”VßøNÃTPÞ }œú1­'ÉWé© üøGZ¿a­;Áëqûû³¢6©ð½VÊH7Ïrž:¶a&"<âÈ´Ä#Nž¨fÐR+
+ì‹oU_Ác2ìËk©PËM“ø 5Oƒ6ƺ¯/áñó1¸f(ÕÄó~¢i¨†›¤¯R¥],n:×¼jJPA6/ˆZʶ0ñ(ËI,U[,•(ìÅÉÁ ysÖ•ÏxµÇbWu_d¼ôVê~ÀÎÒbªlKí:Zt±Ûµc´wŠU—÷#š°LSå>P=“/%04bâ§Ã»–MÎHí¢¤þLTë×úŠ¨ÖS ±¢É’Þºp=Šv› "gÅáÚÁ’BÇXÒƒšþY, ,Ï×'³¸…% ”¾KZ;ǧ®7 mBêØ—ÚÉë(5„îÂY›,zÅÚ%^™n`œe±'ôšö¸¸ú
+t­¹u º[öàPp»›Ž {Ú‡$'+]¹òrÒ@¡N ›,YE5¬[±tòVœYã&JêK`Ú'6†3·ÁãMÍjðÅJqÓ •Å¡b´þ@èy³U=–L)XªëmÏÏJn—L9¹âää©Nád ¤>sѪ¿4åëŽUø:AySþ°VâRvÏ{Jÿ7~¼
+ð›:$ÐF-}[¼É)(vΔÎI¡˜‘5~@ ‚0Œˆ|¨È¿ciÐÊ5,ÞÎ_u
+-íÚ %¼ðÚ_~
+G3¼Ä$g€àïö¹Ê21ʨÜëí8«\
+endstream
endobj
2651 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 637.322 null ] >>
-endobj
-2652 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 626.364 null ] >>
+<< /Type /Page /Contents 2652 0 R /Resources 2650 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2547 0 R >>
endobj
2653 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 615.405 null ] >>
+<< /D [ 2651 0 R /XYZ 78.37 808.885 null ] >>
endobj
2654 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 604.446 null ] >>
+<< /D [ 2651 0 R /XYZ 81.145 768.829 null ] >>
endobj
2655 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 593.487 null ] >>
+<< /D [ 2651 0 R /XYZ 81.145 757.87 null ] >>
endobj
2656 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 582.528 null ] >>
+<< /D [ 2651 0 R /XYZ 81.145 746.912 null ] >>
endobj
2657 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 571.569 null ] >>
+<< /D [ 2651 0 R /XYZ 81.145 735.953 null ] >>
endobj
2658 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 560.61 null ] >>
+<< /D [ 2651 0 R /XYZ 81.145 724.994 null ] >>
endobj
2659 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 549.651 null ] >>
+<< /D [ 2651 0 R /XYZ 81.145 672.192 null ] >>
endobj
2660 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 496.849 null ] >>
+<< /D [ 2651 0 R /XYZ 81.145 604.446 null ] >>
endobj
2661 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 429.103 null ] >>
+<< /D [ 2651 0 R /XYZ 81.145 593.487 null ] >>
endobj
2662 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 418.144 null ] >>
+<< /D [ 2651 0 R /XYZ 81.145 448.032 null ] >>
endobj
2663 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 272.69 null ] >>
+<< /D [ 2651 0 R /XYZ 81.145 437.073 null ] >>
endobj
2664 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 261.731 null ] >>
+<< /D [ 2651 0 R /XYZ 81.145 426.115 null ] >>
endobj
2665 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 250.772 null ] >>
+<< /D [ 2651 0 R /XYZ 81.145 415.156 null ] >>
endobj
2666 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 239.813 null ] >>
+<< /D [ 2651 0 R /XYZ 81.145 404.197 null ] >>
endobj
2667 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 228.854 null ] >>
+<< /D [ 2651 0 R /XYZ 81.145 393.238 null ] >>
endobj
2668 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 217.895 null ] >>
+<< /D [ 2651 0 R /XYZ 81.145 382.279 null ] >>
endobj
2669 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 206.936 null ] >>
+<< /D [ 2651 0 R /XYZ 81.145 371.32 null ] >>
endobj
2670 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 195.978 null ] >>
+<< /D [ 2651 0 R /XYZ 81.145 360.361 null ] >>
endobj
2671 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 185.019 null ] >>
+<< /D [ 2651 0 R /XYZ 81.145 349.402 null ] >>
endobj
2672 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 174.06 null ] >>
+<< /D [ 2651 0 R /XYZ 81.145 338.443 null ] >>
endobj
2673 0 obj
-<< /D [ 2636 0 R /XYZ 81.145 163.101 null ] >>
-endobj
-2635 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F83 414 0 R /F65 335 0 R /F75 338 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /D [ 2651 0 R /XYZ 81.145 229.851 null ] >>
endobj
-2678 0 obj
-<< /Filter /FlateDecode /Length 3158 >>
-stream
-xÚµ[ÉŽ7½÷Wäˆ&ƒ;Ðh@ÝÕeÀ·ñèføäÁø2:Œ/þ}—àžY™-É@YÕ™d0vF<²øöçÆ·ŸŸ^¿<ýtzóÌ0jûòß'/ø&6ë™´›5‚q#¶/_·ßž9—‚s«8oœ«WÎ5~WŸçðöòû—_žp6Sø1Û_a úãןq%»\I€fºi-˹ḆkeÚ‰m¤¤–””ab¤cláËá˜ÌUøŠ<•™Z0)Ç©AÄ ªñÈνc¡L´À@ÃÁ¢•a-Sn¢§ *<($(ÆøSJî˜3zæ0›¦ü ¤ý¦˜wBBKÉCÒV‹/œI‰t£ŽœÚrd¤kéxË<¸‘Pð£ d¥+÷òIƒž`ZOÀX*ƒF««Iþ'WIyJ Á-“
-FJJOº~{ÏSÄXdÜB•îá=„[™s£!<+oÍUy3j%¯z?'¯0Ìj;RN<‘¬ìì)¡HUÆìjç­æ— %íægFúkÍ…° Z ïÕ-rx´ÿ ´øÇ5É=¿5iоÖ_ÓdOé;iò~¶N4 ûé°¿oc˜â®$›K÷ĽTò9Y0Ð ôU¶Ž| ÏÃõœV—–Æk™äH©8ÇÁ-s²ÞÁ„wÌx?ò"Í‹“Ï$ÝË'ðî¹Ò ‚÷8L#ÒS¢°æ0éWrÓ­‘¨Öµâ&Sž¸¼ûEoÄe톉²RñçB•4˜(–8pÕÊ
-*­hé:W'Ÿ)#î ?É·‹kÅ”.¹^ëxÔŽ«&Q+Zš—:Z^‘6‡[ª8H²4§h‡ÓœÑü_Ź1»Üin+Þ^À>™ÃS8´ˆ—0"¢]­xqa†,sIsQ×®¬sK³cµ¼B·^´§°nŸûhl‰Mñ’½%E…“«¨@1/Åh¯¸û*òªÃ¸RÖ0­Ìdñ(ƒ;¶ßÂo°
-P¾fŠkR6û¬‚j‹Î·úN[Š!Ž´ ´c ¾aõ ZN1-&
-e©‚ü]Øç1ªF¾StÓÓ³ñž(Hü7Ú
-ežJ¡±yjˆ^û\yˆqGÏ5ŸßS”¦(ˆv…V½^Âü¸ËÉl[Wó"ÆZ°Åû—§ÿ׺‹ÉÑ
-|Ñdí\!hž‹2gÎtïE}[¼¾u±Kkjý 7%~lÝ÷‚e±;¢b„>e»Z—>8Êúô™ù Ï¾v5†¦Ç¯zÄQ#¬5&=¬³ !åKJù<¶÷fáiëo)ÄÍCÐÓ’ìâ6Ò§3¥‹¡” qjª1tš²C‰©œKÉV1DÂ%¦ ƒusjŸM;£’Q)ï}µSY­+¦ý¸¨ö_²\Vì9ÎŽÕ™y˜w'­ÐM¸êÚð¦šé”ì•¢k*?òúVËš{ ·$L+`L8¯ÓZU¿þÜÒ—ˆ9ܵ1ñH§»¢4sÆ °ŽAéÇÍçÐ]Ì:D@[f„ÛÑVfÚá¡>¤Ñ
-91‡Ñ IÚúǯû˜H6® ]œo§˜¡2AR"h{Œmåk{1l3bBÉ\Ô?;˜É2f\Ì[2’a©9ŽNY£ã/q ÃÛøoäfýªåÌaŠMÒ°–.¥~€®²7ůí\… ôÓ\x`:ߣº¦ùð–šóþ¼–Ã> ½˜èÙ“ü@¨(ô8_€‰»Ô™€ÈþÅC‘é—Mð·;¿)d@æáT"R¦P·!Òð8ÚR#¿WV`9åý …¶‡eqÐàbšEPDÙW©J¨ ƒ¼o»¤è¯ªA5űžfACfX>†tfî^U§s§!û¥n©šuÔ1¶æÌíá¹w¼†4) 1ëÅ
-i¢0;º„öA×À>©Šr]ÐDý^}–ÜõÃ@¬r’¹YBš×K@ì@i 3b]ÄDÈñPÆ@»(§ì1äRÎÏçäð¶ž(ÉÊÓ¶”Éx3‚ù¼I·žR…+ÜRf¨àbEslÇïµnŠ­ákU¬ À¨¦pkÁËif(õÕS¥9ókèw*š詧´Ò“D¼õ!fzêÉHpôyù$&wo–>ª¯É×SZÉG0,ä‘}µoµüÇØ<ãÒ-åW×äï)íÆ[ÇÁÕÒ÷Ó—p ½lòš¾zJã!4™b²?ÆpOËMéìi ÖjxZi YÙtðkº|ìneSád/Ÿsy˜;Áe}é‘E3—êòAÖHÉV‹©N–{+lE ÓÀ ¡¸JO¨
-f(}ýyÈ?tÉ :Þ‡·—OÊùåB²üÉaßÁ€ÓµòÄ…,Æ&A‚±RPõr…þ7Ôg¨KÌGÍ1L·HºÎ>]Ußµ°VÓuõy6Ý0(Z}­r Aן¨ .]GW+t0]«/WéU{³Ðo$uôK_½¢—jT×5è0š¤TL+1®Ð£ ë™
- ¯¯ð6\à=äË ¦”›ø¢ sœ"´»\t>J‘‚3¡au§
-”«x|´ÝˆÇLJðxl„Æ_ä(wVO#G<-=Ž Ö)”a^«QЋ)®å'm­sϱ£Á0‡”>ÞYûA
-ô$|¼Plì]•Óìtdþ–R
-ýÍoOÑz#Q®ÈOwrv¢ êO[ö´¨ æT”g+–È"}ÌûÊÈ©)~`윰9gÆ•~ØIRî.?y¢•[5pœ-?KúÖ8Kd:l·üú‹žšvß*›m²£"é\¢üžJ¥}«Oã먓á\QëQ‰£N‚Ã$5SqÇGÆØc,±Äö¶þªâ–X¸þ«Ïù
-endstream
+2674 0 obj
+<< /D [ 2651 0 R /XYZ 81.145 218.892 null ] >>
endobj
-2677 0 obj
-<< /Type /Page /Contents 2678 0 R /Resources 2676 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2578 0 R /Annots 2712 0 R >>
+2675 0 obj
+<< /D [ 2651 0 R /XYZ 81.145 207.933 null ] >>
endobj
-2712 0 obj
-[ 2674 0 R 2675 0 R ]
+2676 0 obj
+<< /D [ 2651 0 R /XYZ 81.145 196.974 null ] >>
endobj
-2674 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 244.87 541.675 255.296 553.846 ]/A << /S /GoTo /D (Hfootnote.40) >> >>
+2650 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F83 412 0 R /F65 335 0 R /F75 338 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-2675 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 106.14 342.303 116.567 354.594 ]/A << /S /GoTo /D (Hfootnote.41) >> >>
+2680 0 obj
+<< /Filter /FlateDecode /Length 3123 >>
+stream
+xÚµIn$¹ñ®WÔš&#‚ h©TÌÍvßs²á¹xöÅßwp_’••©–¨VU&Œ±òòÇE^~yzýñô—ÀÅ oÀÐåÇ¿ž¿u±^ ½X£„4êòãÏËoÏR'%Þø/ß0<þxþH)‰¿Ó•ß¾†çañ­ø‰-ã5JiMš …·t}ùýǯŒ‰Ò+L”wÂx?ã‚æÅa†oäË7ðî¹Á ‚÷0L#ÒÓa¡”À#Pšaµ­¥Þú'ÚŒáµ`ÆÁk딀O¢#a!W¨…ƒ "ä•ÉeÌ_Óß+Àèæj¦º·ù>Iœ¼PÒ.ÃkÏ<‚ÂãÆIæŠÆ‰ó¨£ä©pƒqà±–eiNåŽ,sÂ’ô*Î ü‹r¹•¹a¬z{ûhOaWþ¼6?Ôî囎rµêÅ…XçÎE^»ºÎ5Í´D­Ð½ÝãFX7âü:s¡Zˆ.ö’µ%Y…ÕUFáQÍò
+˜j*ZµkWdÐd64¸}ù-ô­Pºy
+(aHÊf³ödÍÊï0ÈRMv¼Ç¥°ˆóê'¸  ­6Š•E‰¹Iß•}ž­jÆ;YwyzÔÞäª âŽþFY*ž§Aè$W45X¯}n8D»‰£«æÎœÏï‹•&+ˆr…ž#_Âü€ `–­k~‘m-ÈâýÇÓª
+oŒÍ5¤ÒÏÜcÈã&7€›^t­O?ì²ãЛޭ„ô˜ŽÞÏ=÷˜ôç#2Ä;=æVU?XäBÃÖ¨`Ã×ý"Z-ÈÌ“òþ¾»œ³ÂµÅ¸¿œáüfÖé":#@.=ÃѺû?ð[HßÆ0Ô"Jm½‹Ð‡ Íæ½9K hé
+ŽV.
+u#¤!9‰“!Î-q:X%Ð^(ÀÒ—W´úìÑüœ\4
+¿Ôºƒ•öBL0AJr¡Ê ³áÆCŠ{®”
+pcðNh¤ÆCï‚ñ é,ï€ mÍ
+“£qqÁd‚´ÚêïyJŸ½?l.Óã7žÁÞyÿÀ¯Tû0Íï{—®€zÖnÀNÝì’ãGƒ+/¬tHŸQΣ…Ñn…ÝÉàh‚ÔùûïCAûýeH§²¼_by0\B)œõHþ@nÈü×­iøÖ÷x¿2¯*ùT;Ôrž–Ñ|~ÖUÎZ¶Ó8›sjkŒÕ ۹鱾S†T7zQè?’¹
+¨xˆüôŽ£N¨]R½ÇC2ìH5LdÅTH¥y_ 8U·:߈uÂÚÖ†7ä¯ëÕår)¸ž…}¹¸^ü³–À Úz‹»<5ýVU7Ž²1à
+endstream
endobj
2679 0 obj
-<< /D [ 2677 0 R /XYZ 78.37 808.885 null ] >>
+<< /Type /Page /Contents 2680 0 R /Resources 2678 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2547 0 R /Annots 2719 0 R >>
endobj
-2680 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 749.9 null ] >>
+2719 0 obj
+[ 2649 0 R 2677 0 R ]
+endobj
+2649 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 244.87 636.328 255.296 648.499 ]/A << /S /GoTo /D (Hfootnote.40) >> >>
+endobj
+2677 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 106.14 436.955 116.567 449.246 ]/A << /S /GoTo /D (Hfootnote.41) >> >>
endobj
2681 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 738.941 null ] >>
+<< /D [ 2679 0 R /XYZ 78.37 808.885 null ] >>
endobj
2682 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 727.983 null ] >>
+<< /D [ 2679 0 R /XYZ 79.37 773.016 null ] >>
endobj
2683 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 717.024 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 597.212 null ] >>
endobj
2684 0 obj
-<< /D [ 2677 0 R /XYZ 79.37 678.364 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 586.253 null ] >>
endobj
2685 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 502.559 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 575.294 null ] >>
endobj
2686 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 491.601 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 564.335 null ] >>
endobj
2687 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 480.642 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 553.376 null ] >>
endobj
2688 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 469.683 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 542.417 null ] >>
endobj
2689 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 458.724 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 531.459 null ] >>
endobj
2690 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 447.765 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 520.5 null ] >>
endobj
2691 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 436.806 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 509.541 null ] >>
endobj
2692 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 425.847 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 498.582 null ] >>
endobj
2693 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 414.888 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 433.825 null ] >>
endobj
2694 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 403.929 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 422.866 null ] >>
endobj
2695 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 339.172 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 393.974 null ] >>
endobj
2696 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 328.213 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 383.015 null ] >>
endobj
2697 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 299.322 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 372.056 null ] >>
endobj
2698 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 288.363 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 361.097 null ] >>
endobj
2699 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 277.404 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 350.138 null ] >>
endobj
2700 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 266.445 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 339.18 null ] >>
endobj
2701 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 255.486 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 328.221 null ] >>
endobj
2702 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 244.527 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 317.262 null ] >>
endobj
2703 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 233.568 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 306.303 null ] >>
endobj
2704 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 222.609 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 295.344 null ] >>
endobj
2705 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 211.65 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 284.385 null ] >>
endobj
2706 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 200.691 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 273.426 null ] >>
endobj
2707 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 189.733 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 262.467 null ] >>
endobj
2708 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 178.774 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 233.576 null ] >>
endobj
2709 0 obj
-<< /D [ 2677 0 R /XYZ 81.145 167.815 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 222.617 null ] >>
endobj
2710 0 obj
-<< /D [ 2677 0 R /XYZ 93.716 138.708 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 211.658 null ] >>
endobj
2711 0 obj
-<< /D [ 2677 0 R /XYZ 93.716 119.616 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 200.699 null ] >>
endobj
-2676 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F75 338 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R /F22 367 0 R /F83 414 0 R /F16 336 0 R /F65 335 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
+2712 0 obj
+<< /D [ 2679 0 R /XYZ 81.145 189.74 null ] >>
endobj
-2715 0 obj
-<< /Filter /FlateDecode /Length 1531 >>
-stream
-xÚÅZÉŽã6½÷Wø¦†µp‚ì¶<@Î} rMNùÿkHk§J2éqϺMI¥§ZXÅÇ’Ìéß“9ýx»|¾}¿¡=EˆŽœœ>ÿyÃtÁœðä#°?y‡`ž>ÿ;ýõ‡1òaŒÅw
-iìɺ¾cæûQ–i<C·|d ¦{$Ìré(ý¹˜®ÞƳýÑòn7ÈÜï¾öhyìL—RùlFÍ’|ÉçG ‹éŒŸŽ8iàæçå«wôÉJîš%Æ3½þý³’í{ã{=ðcôÏc-Ó]òŽ³jáýïÏ?ß Ø›ôÿG
-'iš@båÅ"¡± ˜¹ÿs¶Ç¢üýäRˆ‡%ŠŠ[¤óû7K6ì4âi””·]þÎÄåµläÑu{Û\w­–³´¢Z.m–¯‘È(–kÞØñ Iÿ·k?#™žäpF˜F]s÷¥/|5Œ°Û¢¶{’,`´š'™ë<i# ñi²Ù݆„§>±¦tJ©g¥?¦Ë=‘uGb§é.]›îÒ/îKؽè\ú±\ûdœÇ£L¶ç^RšsÙ0¥-’æm¶HQ™Ç×iVµié"cÔ´´T™w¼ $eVv×k¶Ó!+ç.MEa ´¨ çƒØšy΃ªºç;V!Ÿâ+Bš<GM^H`U>hòìÁ’¨úÔ­&ÑC¤PåTÏ)‘Ógd½Ë¨ë¯ä¢WÝ,yO$œ×æœT÷•µtDbiu>9°ÎªÆV. ƧpH—ìfÖ;sŽÞ>e éöìˤ@÷‡Ò„š“-8£æImÉó¤@zHØËãuŸ°SešÓËHúñš•µ‹ÃhåiEÚt²‘Á…Uùì |s‘/ĶϪã嫘aKŠã~*.6ýxÖ\P»‚¸
-endstream
+2713 0 obj
+<< /D [ 2679 0 R /XYZ 81.145 178.781 null ] >>
endobj
2714 0 obj
-<< /Type /Page /Contents 2715 0 R /Resources 2713 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2578 0 R >>
+<< /D [ 2679 0 R /XYZ 81.145 167.822 null ] >>
+endobj
+2715 0 obj
+<< /D [ 2679 0 R /XYZ 81.145 156.863 null ] >>
endobj
2716 0 obj
-<< /D [ 2714 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 2679 0 R /XYZ 81.145 145.904 null ] >>
endobj
2717 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 754.882 null ] >>
+<< /D [ 2679 0 R /XYZ 93.716 116.798 null ] >>
endobj
2718 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 743.923 null ] >>
+<< /D [ 2679 0 R /XYZ 93.716 97.706 null ] >>
endobj
-2719 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 732.964 null ] >>
+2678 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F22 367 0 R /F15 334 0 R /F83 412 0 R /F74 337 0 R /F16 336 0 R /F59 346 0 R /F84 425 0 R /F65 335 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-2720 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 722.005 null ] >>
+2722 0 obj
+<< /Filter /FlateDecode /Length 1716 >>
+stream
+xÚÕZÉŽã6½÷Wø†MÖÂ0°Ûv€œûäšœòÿ×"µÑe™´Ý™ ž–-ê±êÕÂ*ŠZñîïŽÿÿövüz{¿pØ‘
+Þ ì¾þz3;ÿ™eiç¬QÚšÝ×?»?öZ3hX>þãϯßëñ¬•Ñ ·<Œ×iò8õûÅÓΫ`-úå¼Á©
+eÃú ·ºßb-÷\–° DöeÊ)ôJÂF‘Qß'ÉÉ^J¥
+\OUù'±œj¸aG8
+ˆûyï9]~¹Ã·Óˆâ[7R” Þš=5}Çâ-Ü»âQìè \Õ³éoce=&²5ÐÆëÙÉ}…@±1Âõ~ͨ@kA^^!THOk‡ôin‘ýÖBÚ€Ò\ãôîˆc슌(Ç¡«¿ª‘þû^&ü¤7û9² qØZ—ª¬B»¢—÷=­»!óÞëB®gz{Œ- kyk¬¹ÁD¾®‘z+WŒ½‰QÀ}QP!Iv;ÎÎËÝÛ…½Î‹(Ø3EÁƘ)
+¶ÆXqLwÄŽ=‹R_¬‘îDÁ¹Š‚[šnGÁùmQ°~º“·Ø/ÆòEŒìY j nF¶ÖI‚ôu6PªwReS¸¢ùýüXm¥÷€b…?Zjª‡†’t´
+ߤçJ2չݥ 8Œ¹î*oÛcoåXm«²6£ D¿Ù_2ß7ºGƒ3 *m¦Ê•\Ù2KÍÄ¡h¹hû§bnŸ;Ìn‚ÒÎHfo¬·G³¯ú„Ž÷ü=ªã˜ÐïäýÌoœW`œ´·‘ã~lÆƽœüëF7ÚçÆ’$—hìbŠKT@Û›aÒ†Ö`<³PåµÇÕ £BÑõ[»¤Òj®¾ã°ZÍÄÕ BÕnmlJ^#m¾äY7'©„ÅÕkáEáµj†rùU>·sÂ
+endstream
endobj
2721 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 711.046 null ] >>
-endobj
-2722 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 700.087 null ] >>
+<< /Type /Page /Contents 2722 0 R /Resources 2720 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2547 0 R >>
endobj
2723 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 689.128 null ] >>
+<< /D [ 2721 0 R /XYZ 78.37 808.885 null ] >>
endobj
2724 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 678.169 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 768.829 null ] >>
endobj
2725 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 667.21 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 757.87 null ] >>
endobj
2726 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 656.252 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 746.912 null ] >>
endobj
2727 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 645.293 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 735.953 null ] >>
endobj
2728 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 634.334 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 724.994 null ] >>
endobj
2729 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 623.375 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 714.035 null ] >>
endobj
2730 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 612.416 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 703.076 null ] >>
endobj
2731 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 601.457 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 692.117 null ] >>
endobj
2732 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 590.498 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 681.158 null ] >>
endobj
2733 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 579.539 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 670.199 null ] >>
endobj
2734 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 568.58 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 659.24 null ] >>
endobj
2735 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 557.621 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 648.281 null ] >>
endobj
2736 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 546.662 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 637.322 null ] >>
endobj
2737 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 535.704 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 626.364 null ] >>
endobj
2738 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 524.745 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 615.405 null ] >>
endobj
2739 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 513.786 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 604.446 null ] >>
endobj
2740 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 502.827 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 593.487 null ] >>
endobj
2741 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 491.868 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 582.528 null ] >>
endobj
2742 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 480.909 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 571.569 null ] >>
endobj
2743 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 469.95 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 560.61 null ] >>
endobj
2744 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 458.991 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 549.651 null ] >>
endobj
2745 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 448.032 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 538.692 null ] >>
endobj
2746 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 437.073 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 527.733 null ] >>
endobj
2747 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 426.115 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 516.775 null ] >>
endobj
2748 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 415.156 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 505.816 null ] >>
endobj
2749 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 404.197 null ] >>
+<< /D [ 2721 0 R /XYZ 79.37 469.148 null ] >>
endobj
2750 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 393.238 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 437.066 null ] >>
endobj
2751 0 obj
-<< /D [ 2714 0 R /XYZ 79.37 356.57 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 426.107 null ] >>
endobj
2752 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 338.436 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 415.148 null ] >>
endobj
2753 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 327.477 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 404.189 null ] >>
endobj
2754 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 316.518 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 393.23 null ] >>
endobj
2755 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 305.559 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 382.271 null ] >>
endobj
2756 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 294.6 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 371.313 null ] >>
endobj
2757 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 283.641 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 360.354 null ] >>
endobj
2758 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 272.682 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 349.395 null ] >>
endobj
2759 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 261.723 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 338.436 null ] >>
endobj
2760 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 250.765 null ] >>
+<< /D [ 2721 0 R /XYZ 79.37 299.776 null ] >>
endobj
2761 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 239.806 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 281.641 null ] >>
endobj
2762 0 obj
-<< /D [ 2714 0 R /XYZ 79.37 203.138 null ] >>
+<< /D [ 2721 0 R /XYZ 79.37 244.974 null ] >>
endobj
2763 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 185.004 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 226.839 null ] >>
endobj
2764 0 obj
-<< /D [ 2714 0 R /XYZ 79.37 148.336 null ] >>
+<< /D [ 2721 0 R /XYZ 79.37 190.172 null ] >>
endobj
2765 0 obj
-<< /D [ 2714 0 R /XYZ 81.145 130.202 null ] >>
-endobj
-2713 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F59 346 0 R /F84 425 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /D [ 2721 0 R /XYZ 81.145 172.037 null ] >>
endobj
-2768 0 obj
-<< /Filter /FlateDecode /Length 1719 >>
-stream
-xÚÕ[Érã6½û+ôîAoXª¦TeÏÈS•³o©\“Sþÿ€%lÉ€$;ÉA–DB¯÷F“v»¿vn÷ëéõýéÛÑ.Aòäe÷þçæn‡»€Ã.xçq÷þ÷î÷ïÎùè¿åíŸ9r>"ùˆb~ÿ™¾.G=åWÊ/—ÏÐr¶ßÿñþÛ“-òß_ùúšv)"Óùõ#A&$
-×bº…wð‹l gÕã§Ã%ùò¹¸Õ…–_ÒÏQ¹I“Zrsê“›Ä@:Ió²•ÐãñX‘!Ëþ|>ÊáŽçù|eÑÌñu\­~Tj ö¦Ô±Ojq@iƒtÆ[G99
-Ñô@í㤠¸E½ÁêwM^Kó•êu±ñ¸3û¿Ë.>0&SÒ§Aó¡éd—KÚøPâs­Ð¬1z›×šÚ8¡#\œíÿ”ýŸr$©×ý¹ýÅUﯟðÈ#¤ý3:u7!"\ˆ ³Á
-è,4Œ„°ó¢ 3迧ÎËgÅM¬µˆCKÍrSóécWÿ”À³ovºœ»$WÏFœ&åd¿)2‘Ùb²¹—Iƒd¹ýÕ,ÑSû.¯F9X`¹ñ‰Á¸õ8€’X:ël:k†­GÔ«ÉäeŒÉ‰s
-_‹4¬%çÁa°˜ð Ç­‘n.Á’rwk2ŠC%¸EzD –(àR2-×Yør«‚6H£YK
-šLdŒÉÉÜû™ûÖ݃xŒdx.MÍzE 2“bMÏÍúRKýv:¨ÝI´ŽA ËcP:Ìg|©XüecP¡ìÔ´7×Ö1hƒôƒ
-ÆÌÚ[r÷fö:m‘F»,)ú‹ÁdÒ™ÇYA£ß Ý7†­“õ~G—ËɃP´¤í­UÚéŽ>—£fK&“SgµPAß"}Î<æÒöÖ\ÊA@Ñô¿Îjä"c4DŽjðÿË lW\Z#+S•LsȘ9ÖH'{̉¡±Ç— a ÑÇ dY 4±ö<¦é5ÒÇžÿ_Ȳ x6[žîlÍ‚ ÒhÌìÀ‡mO";ØʤAž;Ø#Ös×}¼«ß1…`Ì»ô–æºwÎUs Ò° ]„ ÁbÒ½s®LÖH7ï )wä!E“QgŸ%y/èpƒôˆ=!EŸSI²Øuß–Ÿwb-Ò0“ M5uχç­zÅv`?¡MÍ[¶¼}CÓYtL k¤;ÚTRΗa““ …T‹tç8öcý_J¨¾à^ ç°Ó£yLo Òph1Aî ,&ƒ%¶EúªÑ,åM¯‹Û¡#—æiX—è
-ÌdÚMǘ¬‘. f¯äðAæ"ÀÆ}Lî¯Ru Ø" ë"›L:ó~á6@—g¸Ã³Ú‡>«éA³ä¢šoo¨—ŸRÎYIOOÜÜO!O)#~Ÿ¾øcO±œuóûél>3_"²u‰œ‹¡t}‘Ië2ËñGÌÛñ(¾à*¼w e4}bVêhP/gfe-gi:²žÄ¡×kO]—­üþYØŸ=Ã]|ŧ«¢SÊ-³ÄÛEçõê[Ý…:<+@Å[«8\E9Éï뤧IÛrtÍÐÚ5QÄÍÑÛ!J ïÝ]l}­¸öôã:º.Œ‹Ú's¤™kµÚ5=Ir,5ɦ9ãkõÚ·ÕÝ¡Ùýc˜Zû…RIι`zæþ™™Ïô>«l9ºr»ãº£»Åó3Z›ã#~¥uŠêãJ,JY¾å«ŸŠ¢®(©®ZduåÂz»² /(jÁ:ùUMgK7zI1WÝ ûfÙ:çpÝ̘ò^˜›«ŸÂsôÿÀ³ÙHu¶îËÿE¬p®ÿ[„•[–ÜNí=¿K: ”ùk¹;éôŒøÙNöðþô"£Sß
-endstream
+2766 0 obj
+<< /D [ 2721 0 R /XYZ 81.145 161.078 null ] >>
endobj
2767 0 obj
-<< /Type /Page /Contents 2768 0 R /Resources 2766 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2578 0 R >>
+<< /D [ 2721 0 R /XYZ 81.145 150.12 null ] >>
+endobj
+2768 0 obj
+<< /D [ 2721 0 R /XYZ 81.145 139.161 null ] >>
endobj
2769 0 obj
-<< /D [ 2767 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 128.202 null ] >>
endobj
2770 0 obj
-<< /D [ 2767 0 R /XYZ 79.37 773.016 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 117.243 null ] >>
endobj
2771 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 754.882 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 106.284 null ] >>
endobj
2772 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 743.923 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 95.325 null ] >>
endobj
2773 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 732.964 null ] >>
-endobj
-2774 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 722.005 null ] >>
+<< /D [ 2721 0 R /XYZ 81.145 84.366 null ] >>
endobj
-2775 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 711.046 null ] >>
+2720 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F22 367 0 R /F15 334 0 R /F74 337 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
2776 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 700.087 null ] >>
+<< /Filter /FlateDecode /Length 1785 >>
+stream
+xÚÍYËnë6Ýç+ü@À¹± t]Ñm»êÿo;)ɢƲÆv‚âÂ7ŠÄŸ9ÎKèðÏÁðÿ¿¿||½¼ž)<ädѾþ~±Ãÿì!9þƒìáëßßoÆ3ÆŸŒ Çrýþ××/¦€1Ôë9ùC‚¦KK¬ÃÒñý7rT®H¸rã•7Ó=œ®>ùsºø|®W{¹ÚþĺÚy~j.ÿŠÂxeOküt°óB¶š‘kœ¤YøÐiÖ!e-d"“£ŽÉ -£±†>j¹–¿J`„y#Ÿ!š´Bö0ªõ²œ#‘]ÚÇ ¤˜WHj&&€ AÜ9Ú©“—×H›çnyj†Sr¾uR¼©§Å²Gð¯ÎÜ>¦ê#2š(ÊáUrtHlIË)y@ŸEgAÕáê‘~64Žá0~cH E©üI'ÕH{¬Bpàq•Î0ÏÁb/‘ ÅU%ÝG½öå1²·óõ¸†Xu*÷“ֲ࣓,P&äI­%Ÿ(²(1Q¦¹iéÍÕ/•Ü\"/rÓ%¾I­’M@™$&¨ô¸%ÒÝ)8˜ƒÈ(©RpôŒL9@ˆQܹ‰Ï°ì×=’6fQ"ˆ6‰L¼ŽÉé"ç·âvK¨zâÑC”÷·æ¥ny@HFŒ‰-8wëÉAòë”vÇÐ!»ÔùTCb Ÿö×›8îTŸ„’®°®llA”ïãGIl5È–
+©ìƒu²uHê£å='&6eŠí‘~j2‹ˆÂÚ½:5÷Hj-ƒhHb¢Lu=Òã“Y´¢7eòë‘Ô*1E‘ÉQÇd‰twv)CrIb´ûåhMÃ=Ò3Ò°‹ RÈ"»¤ õHÚ¨åB„lÅ#‘е¹ìF Wò¦
+z ÆŠLvÆý6Ã퀮ÏpÕ³Ú)).ÛÀûf¿”Ÿ4K.Ò¼ž-Ê8Ñ•=K3—¾îîÀÚ<Ïzß¾Õ™.G¬·:ñµ¿Þ]*OMý9?å'õ;Jßa]„²£Ý· ºûjÉ –v˜º‡›ýÁŒLÆéôÌ­¤Ò2£ŸT½Æ§n¸óþÛ`Pq€àäN¾Ü'v ¥ûi”¤¬Þ4Þebêéã‘>…•|±ÍÏ
+RqÙf6cfB¶á0lïVãݶŒñƳ»à.c¢ЀI++>üu›`ÎEúaKreÛvnK*Ÿ9©‰Jã†iãGsÞóâ-Q;œí\ÃŒ“ÉŠˆ,â…öU¶ñîÂù¦u“Ó¥Ë'Ôªä ¿ñš÷´ÒYÆßø¨µ«"Õ†LmÕhCl+GÖë•e&xE©kö­×Ʋôš0›žÀ¾dKZEǸ½Ó–‹Äþ¯) ÇT—Xl
+à¬XTí,ã[b逮'–kóÂ1лû_
+endstream
+endobj
+2775 0 obj
+<< /Type /Page /Contents 2776 0 R /Resources 2774 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2547 0 R >>
endobj
2777 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 689.128 null ] >>
+<< /D [ 2775 0 R /XYZ 78.37 808.885 null ] >>
endobj
2778 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 678.169 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 768.829 null ] >>
endobj
2779 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 667.21 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 757.87 null ] >>
endobj
2780 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 656.252 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 746.912 null ] >>
endobj
2781 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 645.293 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 735.953 null ] >>
endobj
2782 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 634.334 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 724.994 null ] >>
endobj
2783 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 623.375 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 714.035 null ] >>
endobj
2784 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 612.416 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 703.076 null ] >>
endobj
2785 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 601.457 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 692.117 null ] >>
endobj
2786 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 590.498 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 681.158 null ] >>
endobj
2787 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 579.539 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 670.199 null ] >>
endobj
2788 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 568.58 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 659.24 null ] >>
endobj
2789 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 557.621 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 648.281 null ] >>
endobj
2790 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 546.662 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 637.322 null ] >>
endobj
2791 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 535.704 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 626.364 null ] >>
endobj
2792 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 524.745 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 615.405 null ] >>
endobj
2793 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 513.786 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 604.446 null ] >>
endobj
2794 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 502.827 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 593.487 null ] >>
endobj
2795 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 491.868 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 582.528 null ] >>
endobj
2796 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 480.909 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 571.569 null ] >>
endobj
2797 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 469.95 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 560.61 null ] >>
endobj
2798 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 458.991 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 549.651 null ] >>
endobj
2799 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 448.032 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 538.692 null ] >>
endobj
2800 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 437.073 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 527.733 null ] >>
endobj
2801 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 426.115 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 516.775 null ] >>
endobj
2802 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 415.156 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 505.816 null ] >>
endobj
2803 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 404.197 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 494.857 null ] >>
endobj
2804 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 393.238 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 483.898 null ] >>
endobj
2805 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 382.279 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 472.939 null ] >>
endobj
2806 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 371.32 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 461.98 null ] >>
endobj
2807 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 360.361 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 451.021 null ] >>
endobj
2808 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 349.402 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 440.062 null ] >>
endobj
2809 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 338.443 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 429.103 null ] >>
endobj
2810 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 327.484 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 418.144 null ] >>
endobj
2811 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 316.525 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 407.186 null ] >>
endobj
2812 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 305.567 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 396.227 null ] >>
endobj
2813 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 294.608 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 385.268 null ] >>
endobj
2814 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 283.649 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 374.309 null ] >>
endobj
2815 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 272.69 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 363.35 null ] >>
endobj
2816 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 261.731 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 352.391 null ] >>
endobj
2817 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 250.772 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 341.432 null ] >>
endobj
2818 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 239.813 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 330.473 null ] >>
endobj
2819 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 228.854 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 319.514 null ] >>
endobj
2820 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 217.895 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 308.555 null ] >>
endobj
2821 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 206.936 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 297.596 null ] >>
endobj
2822 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 195.978 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 286.638 null ] >>
endobj
2823 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 185.019 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 275.679 null ] >>
endobj
2824 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 174.06 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 264.72 null ] >>
endobj
2825 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 163.101 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 248.78 null ] >>
endobj
2826 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 152.142 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 193.985 null ] >>
endobj
2827 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 136.202 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 183.026 null ] >>
endobj
2828 0 obj
-<< /D [ 2767 0 R /XYZ 81.145 81.407 null ] >>
+<< /D [ 2775 0 R /XYZ 81.145 172.067 null ] >>
endobj
-2766 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F22 367 0 R /F59 346 0 R /F84 425 0 R /F15 334 0 R /F83 414 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-2831 0 obj
-<< /Filter /FlateDecode /Length 2983 >>
-stream
-xÚÝ[Én#9½û+ôÅ"#¸†Û²èãÀ·Á\gN}™ÿ?Lp_’™JÊeTcº¡’œIFÆÁG&gêòŸ §ÿxzû|úySî"™³áòùï'qáô¿¸X`Z^ŒŒkqùüëòÏgÎp.?âǸ—}þùÄ=1"õófåÅ2§5Ú–ŽšeFJR½üP <Íú‹¨jAGNcüÓ®œãݳœÝWtüßy\Ë|,¿®‘‚*÷D/ýu(³y;äü»ÒQ:JÝ(ñŽg‚ÃLƒÄÅ) ‚fÂÀH©á¼hð[´ªZ}I>×ö}Íɦ{ ‘f7¶"û!¸âÝí*8ÛÊ‹dV‚Ž ‰3£è·sF‘Š§#¥Ê›&ÕŠwº‚S±ùË12ã÷õ¿¨˜²zCIÿ
-î„a
-×Ó-rÙ˜%£|ó
-6×YIíþaþÁpËW³º4ÏS»!Œñ,‡ä)§ #S]Öet©]ñ©}í"•‹™h”T˜£%R'Z|æK4k®P2ý ñŽ+¸t䓃Ƽ¸h²¸â}RT• ¤ºWT%ǤÂ}ŸEõ‡V!šbþ7çǦ'Îm½"«Üh?R&e’?§yÕ ùJ’eOÉ ‘šõQ¸ Ù¤ål]ùV´ØQÙãÞ!{ŠóÕ
-¾å6k3fû|µ8›ë,êÛk!3—£Ù{~ÔF‡ñŽ·üü—À‹,:Ü2QÍÍYpf^yOMæàÊ1°®ä†kc974„¡ñ.>g7!fÛ&¸´“oMçІXlÚUÒÀ5…riõ[ïJWuòÂ6^Ï.ꕪ¯ë™T5•46²åI¶ò\îÿÆâõã3³_ô¼Énlé¯Iî2¾Ï€6¯'rPN{i%©C9¦ÖÚŷ幤°·%VÒˆs©¾YAÍÃUXÃ,àÈUv²¼rÎ)Ç'Tö¹fy™BNß)+R3©äøœÌe /_üX(Dfç­µüXY „ö×'ëì£kÔácIuúÍ÷ù³´V(UØtׯŠ®›^íù•ÌÕþ¯å÷,Š‰œYãFJ(nûðk\ɯ¶PM
-J±´{;i(™48RÚ,“w´Í2ÙÏ©
-LåLÎ7†ßsKt‚«¶nyw3)¥'j¶Áª±¦ÔÌ:­ŽN3zœ¼R˜¤d ð@q~í¤ìHiScNé0aÄÙ®vU¨¤¢¶zÚçÞ&ñ:&|çà–úxÛÐY¦ÅF”m@ûÀËÔ†ÅƯw÷mŒ`VâFý«è.
-ÊÎÍ:Å“ÀWBwBûè<Šæ5iRNù]s{B߄債Œšš»g±¢´¶(c¹'—`jrBã:âçvgOYìž ^Ö¬1”ÑpªY»¦ÙžÒ µð§€Â®¤]
-Q›é¸|¤]¿‡\v ¯µ[ð„Üzž›ñVá5ŽJ|=3Ë<÷)Lýž{ÑjÔ)=_µtJf Ôé}‘'¥˜ÞÂ%§“øy? 7PÚ;H+Åv¥&ê[ó»Ù£žª½¦²2‰Õµ=µå“ö@í–žƒ0g4m™¢K¥]?~ßÉIDæ®]Þûe±?جóVjê’fv[ºçã{Y׈L[3Óõ"œ7P:ÈÊ‹Roh`?Åï%øi t
-~ÔÛÚz̾;_&~Ñù2!U_7>k¥ֆъt¤ÐŸ¶{ø¤€¡öp£‹yÜœÞ"#"
-9pÝyD^¡º3j¥”J>׳IåW8Ï–e*gžlï½ ŽñÐZ>+”¡ÁvNîïã¼xD'ƒpÛÃ.]tíx¯Fò›Q\lMH'W®‡ñ
-Íxn”ªÂkoIÛ×X[Óª"yñÊá‹Â
-J“rÜ=I—àkƒÇ|ÅëU¾¬ V7®¸t)LàêóShêþ€Òλwõ½»ãðͤ”#U ñ³Øð IKf3møNî7&i tðÑù>éQd‰LÅ4Ìd:{$,!K=¡ÝÕ†jû¬¶ÇÚ_íÕNêKïI  uªSQ×@´R¿.ûR „¤uþÔ¸vjs ôØ:ðØç☼®ïÏÀ×>ï7¬Gf$Nµh×´ØSúFŒÈÑÐÊ©s®½Ú×j¢×Ù!ôî{3ì¸Þ%÷ȉ*9ÔTd¹$rOèd8³ZOý
-—8î ݧ=@×ÿ#0è>D~ü‚™CiêÁ¨Å¨YÏùø|ú˜qk
-endstream
+2829 0 obj
+<< /D [ 2775 0 R /XYZ 81.145 161.108 null ] >>
endobj
2830 0 obj
-<< /Type /Page /Contents 2831 0 R /Resources 2829 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2578 0 R >>
+<< /D [ 2775 0 R /XYZ 81.145 150.149 null ] >>
endobj
-2832 0 obj
-<< /D [ 2830 0 R /XYZ 78.37 808.885 null ] >>
+2831 0 obj
+<< /D [ 2775 0 R /XYZ 81.145 139.19 null ] >>
endobj
-2833 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 768.829 null ] >>
+2832 0 obj
+<< /D [ 2775 0 R /XYZ 79.37 102.523 null ] >>
endobj
-2834 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 757.87 null ] >>
+2774 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F83 412 0 R /F74 337 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
2835 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 746.912 null ] >>
+<< /Filter /FlateDecode /Length 3278 >>
+stream
+xÚÝ\ÍŽ#¹ ¾ÏSøZ#‰ú ´»ºäÌ-È59í%ïõ/±Tå’g»È.<¶Ë%Š¤HŠüÄjÎôí?7ŽÿþíÛýÇ·ï_ÚßóN€¼ýø÷7qãø¿¸9ÉŒºY#7âöãÛ?_9×’sõÉ9
+ÄP¶–Ö`ŽÂ Ÿ¦5ês¥Z „Ž«…‹»í³•ƒ‘ß4(¼¬_ª(%¨¹²²W1äÖ«€†gfüjy_àÌYO)èt¸ÏÊ·TלWMæpÈÑÃk×Õ3ýXI]Êô[ßñÕx^Ô1×ÌJ;Ó±¹_Ó±Æê*¸:¡ä©~"Oèt?vE¯eôÏé¶ãaM¿Ú+f›ê÷}I¿”Ò¨_3×­ùüñà®HÁ>#渟I~M:Bi.ä ?'6ÏHg%sÓpy-ªÂ„Æ•s?½rþÙŒ`΋©]ê5á%ÿ Îì7Z Nk´ä*^+·¹ç>ðáe­`ÍîANµ¢–vB Ì|ÇÚþÙ.Œ…¿·0µrX3Bé/áÂÒc•7õá‹9\•ŽPúK8±p õR³ë{0þòZ“n¤ô›œXÍ’«‡Î¼¨“P×{;ÓÉÕ¤“E«-¥$íi%’ª0Ìí™÷ QsPÊ8%g¨—*(J¨q]¼£Ü[êj»Õ²/ßß°’)(,0£af Þ3c!$
+§Õ2ð <ņ„‘ЮH>PìŠä0¦Á#åסèW
+‘*Í¢°Zì«%\0ÕG×r^ApeÎ"–a 3á÷Ut‚qeˆÚ~¨¨…dœ.GÆɉ! wÐjÖ‚µ
+Ü[yJÁLÖû±Ü‹kf4¦*bê½z©_†Pô¾È“V¸¯Ê)O‘/‹1Q¥¤ô¼kL‰}¥bfð°îsw>=t“õ>¨æžºvž–ë )`JÀÔù.BgÆ1—¥C;þ8ˆHOxæáº|ŒE±v©g)£æ,i¶ñ8÷º/ëd<èèzÈ#”Nbò"‡¡ÛÐkÊá¤^x<J—€'‰Å¢îôÓw™‰_Ôe&òå<k%66f„ÂØu÷tÇ”ÓÃ.æip×¹!DA"D„uL†™d²z+Ó˜Ò‚éö™Œ€9a¨(cÝ~˜âÊÐï¥èè¡cFìúp„¼¾Âx7ϘcóóB£bÕf®Å„%±Ö;-@.]ˆúµ‹ó‘N0ÝЪ¸*¼u=fÔK‰.þÚú’j÷Vìe+2Õ~'WîVî ÈZé*À`?¦ä÷i\jÏ)ܾÑeð®ë5¸h*n
+Šk¦ùŽïiP8ètÄ€pJáުЂæ&©¼vÏÚÞÒÞ’™Ö ÉKW<@ìËx ßÕBíV»ÝϼÜkfQEYÊð‚L6k°æPá˜Xí¨øØøì+Ñ'}ÛOÓ/C4ˆW.!²ñÎêó‰’,>Ö¢`­Z]?¦ï¯«Í–s# Í–Æít½`$h ¸ñR©CŒœ WÀòó%DIxAiž<²qjÅÜ0¼qGm;åA “j‡Ðøž¥Ëðµ…s¾,–ܬò…¾h1™§¦¸tiLÀêüÙ5u0›VÝŠYPMéC‚]ÎÝK¦B58hz-&|“vçý,á»xÒ˜Q$Bèäi¢ëyҳȒÄ`ìÕL¦«í`X VºÏ³úë¸Úk™©Ü%Å,šŠº†¡Jc]öSH‚aÎ4ãÖ:6 ¥çêÀs›K÷”º~ìoyÞŸP;âhÆÍÔ¨¯‚dE‹#¥ßˆ ‡Õ*ŸV“‹OùJFô>kÐÁ[ùxÛ)t}Hî™naÊL…VkB”~çBaI+œ¬ñ<Rz P˜¶ÿ#Hè1LþZ2Åk0†Ï†Êa¿ò>5Úä¯Ó=
+SÎÔÒÕÚlcò¡"™w_
+œç&‹?¬•\÷¤Æ s©0 þ8ûŽŸÎ‹KŠ/î)êHŠ!|Ë HÈB¿<Ü'˜ÐšÎ–ªÑòŒG;yL¥‡œéêpÈ©Œ%ý=*“G·ÏÓTc¶ð;cg¹H/ó9¯ÝÂõ¢Œð9îy<YnßL ÝnöÍDûŠT(Ž‰ªi…p^®úèÍ ¤'Si[’·´ŒWJ&AwX•ÒîÜ9Î㥾wj8N¿Š–4âåQ©fgݱ8ó1È݉D1‹>€Ú;õægƒ^L„£BËž¬ëþẠ4iko
+endstream
+endobj
+2834 0 obj
+<< /Type /Page /Contents 2835 0 R /Resources 2833 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2547 0 R >>
endobj
2836 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 735.953 null ] >>
+<< /D [ 2834 0 R /XYZ 78.37 808.885 null ] >>
endobj
2837 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 724.994 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 768.829 null ] >>
endobj
2838 0 obj
-<< /D [ 2830 0 R /XYZ 79.37 691.303 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 757.87 null ] >>
endobj
2839 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 661.722 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 746.912 null ] >>
endobj
2840 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 650.763 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 735.953 null ] >>
endobj
2841 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 639.804 null ] >>
+<< /D [ 2834 0 R /XYZ 79.37 700.214 null ] >>
endobj
2842 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 628.845 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 646.372 null ] >>
endobj
2843 0 obj
-<< /D [ 2830 0 R /XYZ 79.37 595.155 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 635.413 null ] >>
endobj
2844 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 541.663 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 624.454 null ] >>
endobj
2845 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 530.704 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 613.495 null ] >>
endobj
2846 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 519.745 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 602.536 null ] >>
endobj
2847 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 508.786 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 591.577 null ] >>
endobj
2848 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 497.827 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 580.619 null ] >>
endobj
2849 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 486.868 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 569.66 null ] >>
endobj
2850 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 475.909 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 558.701 null ] >>
endobj
2851 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 464.95 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 547.742 null ] >>
endobj
2852 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 453.992 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 536.783 null ] >>
endobj
2853 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 443.033 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 525.824 null ] >>
endobj
2854 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 432.074 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 514.865 null ] >>
endobj
2855 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 421.115 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 416.935 null ] >>
endobj
2856 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 410.156 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 405.976 null ] >>
endobj
2857 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 318.168 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 395.017 null ] >>
endobj
2858 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 307.209 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 384.058 null ] >>
endobj
2859 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 296.25 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 373.099 null ] >>
endobj
2860 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 285.291 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 362.141 null ] >>
endobj
2861 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 274.332 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 351.182 null ] >>
endobj
2862 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 263.373 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 340.223 null ] >>
endobj
2863 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 252.414 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 329.264 null ] >>
endobj
2864 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 241.455 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 251.668 null ] >>
endobj
2865 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 230.496 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 240.709 null ] >>
endobj
2866 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 155.347 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 229.75 null ] >>
endobj
2867 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 144.388 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 218.791 null ] >>
endobj
2868 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 133.429 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 207.832 null ] >>
endobj
2869 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 122.47 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 196.873 null ] >>
endobj
2870 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 111.511 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 185.914 null ] >>
endobj
2871 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 100.552 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 174.955 null ] >>
endobj
2872 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 89.593 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 122.47 null ] >>
endobj
2873 0 obj
-<< /D [ 2830 0 R /XYZ 81.145 78.635 null ] >>
+<< /D [ 2834 0 R /XYZ 81.145 111.511 null ] >>
endobj
-2829 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F22 367 0 R /F15 334 0 R /F83 414 0 R /F74 337 0 R /F81 377 0 R /F75 338 0 R >> /ProcSet [ /PDF /Text ] >>
+2874 0 obj
+<< /D [ 2834 0 R /XYZ 81.145 100.552 null ] >>
endobj
-2877 0 obj
-<< /Filter /FlateDecode /Length 2875 >>
-stream
-xÚÝ[I\¹ ¾÷¯¨?0²DQ`4Ðåî`nI|Ìi‚Ì%>d.ùû¡j{zÕ¥¶s™C¹Ëo¡>îÅ’—?.òòóÓõëÓ§›2— ‚‹—¯ÿzRtC^ÔÅ¡ÝÅY%¤U—¯ß.¿~–R¿Ñ¤´2ÿ…×矴ótÇÁ3¸øÐè¾ægÒs7¾ª¾<ÿöõZÕ.WUF œ×5Hô⺾«H»PYcWÎ míLÅ&
-Ïð èÞLÉáŠHà€GGN²láQ]éï5_XßÁÆ ‚1Sv‘Ú-S€kƪ«ôâÝDÛÇO”½¤« ŸÊ6á{A˪é‘Ey—ymA
-º†qZÇ…üß2­’Ï>Ý<^<¶Õ~HÒ 0SâÁ@R¼áo¦}{{4ÐGžšñÀ ý½Å÷™RL“êP×®(¬ªwK Vb£`ù›ªô]èînÊVQŒG<Èö%QÝ’íH©ÉÖ¼Ì\™×]”R ðf…ÒÀÊ‘R‡Ò4-´
-å`¦´B¯#Ú®\½W­#Y¦j!Gë>®Xzñf§wÞ?Zg ŸÍ²9©ËýÒòh¡Ì°ø˜…Þkæ$ÑÞá`ŸèýÑ°ÖëB:›:Œñݺ¥_öt8Rj:Œ’ÏAzéá›x­(ý
-¯{xGJÞî'Æ Ä°Äì÷0”FÌ}á zâ­Äîë½è:Út«/[ú,ÏkvÕbNÔƒMÂ-¸<KRTCyÁïÞoaŽøí¶¬Ñ
- jiÏæ1Y+K%§›)­òS”›»¥g.Ÿ¬VÂ`õ S¤ÛÊ£\âéET(›Ñ\–h£'=ñ.Rœ“Mö–w]|)åÜêŽ÷î~Q“ÄÌŒlÞ¼‚WËM™”´‚WˆT¹Âµá®¨‰;áà@·?»Š¯¥`æb¶^YhòÝ]´öBŒy\*ïl mýÕ¬ˆòÄ1uMCMÁ¹`ÕÍhò~"íhä¢Î·*Ó¹OhfˆQu¥/WåÃŽ`0ÍRyß µj¯²_Pºg= ŒÐ3zÒ¸QŸÇB·ß%iÃ:wÈΓßàTÍoT”ùk{ò¸Ó©AëÔN)À˜ZÃêõ[^Ø‹¼G¹¿¤¥ü¡KÚºk™Ì@"Ó愬\<(±k’±ÛÐÖöžÛ(2ptj^…C‘v÷›`†ò€÷Œì #ïYÒ63adÓÊõYr¼…¯ÛÏÒEB=¶'Ê®·2µ¼Ùg×.NÅNòÚí$»w™>NÍ”™Fuq`®JÀêê¡I~jœ¥«cã ±/DKbÕ7^°iëó±¹V½Ã61u*>ÕÑgõyj4ò6eV£_õ‰IòyÚôÎLza”'f…F€>PKm»×VÀG3Êý Ú&(WáNãÃÑ"õ¯|×k>‰šÑ”ú©<×áik°†Š¡¦ï©¤‚ž~Ê ù°È‰øp@À@rµ%ÒÇ^þŒeÿçï±þrë4ˆZHJã“"¦èЪ¸“dj¼pÊÔÙ"Þ§À³¤ˆé|3ª—Î9¥—HÂÞ­Çjk¯n5„×Ë~…ŇêÖàD
-Tõ)µ.Ü#ü4>õÛ ž¬ÊØOv_™§‘RÇÓ÷öŽÐ PÁ­0>Üc-GJÆÖŸÛÄF™´_b{ÙÃ6RjØ¢n9çòF¾ÙÅ{Ï5Îk—? \Xñ§7m~¤ôáÎõ&~Zý1|¿ Ô¡‡®r¼Ö‚t¥’B[µ´"³s¤Ôá|kç|ºXIý~;j¡í×>PÉéʥج䘟‰Rã]+ÇR1°ìþîâŽÍ,ÔKsÑ{¸GJ³lbuN _f£Gs*c)å”Ç›|Ñ®ƒ–?ðå·³ìDéè u’fÛNŒæxb1nf͉Ró9Gp'àQíøÛmöxbñnfЉңxãhÉØ8™+˜ñŒv]u«•
-·éN)ïiy™3ÏNTKøÑÓwªñéOXÊ|¯2˜(•oqliù1qbÇ`}3é„îêo!mÕœVKˆ{‰}¢ÔÙ†mC6)Z«Ö¸jßÅ-¥p–V±—é'JlomÏV[vï7$öø
-lˆðF ]Ãî[¦úç—ü%B+{¡ºÅé8;=þî“lÈŸ[¥±:=‰>Ø»ðíߤY¹¬uÜ3qô ÍÑ'ÞŽ>›¬€$]ú%+¸5ì>QŠ›Œ®ŒÊbyûúôŸÉÐ)¯/¿{úõ7ºüOúüBÈuð—ÿ¦¿]”CaU|íß—<ý-ÿЩK*Í
-endstream
+2875 0 obj
+<< /D [ 2834 0 R /XYZ 81.145 89.593 null ] >>
endobj
2876 0 obj
-<< /Type /Page /Contents 2877 0 R /Resources 2875 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2578 0 R /Annots 2921 0 R >>
+<< /D [ 2834 0 R /XYZ 81.145 78.635 null ] >>
endobj
-2921 0 obj
-[ 2874 0 R ]
-endobj
-2874 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 236.441 142.077 246.868 154.681 ]/A << /S /GoTo /D (Hfootnote.42) >> >>
+2833 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F22 367 0 R /F15 334 0 R /F83 412 0 R /F74 337 0 R /F81 377 0 R /F75 338 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-2878 0 obj
-<< /D [ 2876 0 R /XYZ 78.37 808.885 null ] >>
+2880 0 obj
+<< /Filter /FlateDecode /Length 2533 >>
+stream
+xÚµ[Én$7½ë+òšM2‚ PµT|³­›á“ãËôa|ñï;¸/ÉL%ÕÝ0ʪÊåñE0Ùœ©í¯Óÿz¸½=|¾+·!sV€ÜÞþû 6Nÿ‰ÍJ¦q3Z0®Åööuûý‘s}ãܸøÜÓo??pFPŸï7ËœÖ`[!5FŽH’?}RRyLÁ9júHÎÆßþ¯øBOùqd§¡ýgÅ™àrÊÙ®qî‘zÎÚcòÈ_›ðå+qžw~R¼æoÆåoèߪX„w/gÄ#yós·¨£ó íý ¡{üx)hQDFþ>Úòî=s£'圿^Ö58&fºÖêš®…fF™Ié½½ÞTdøù.ÔæM‰Í8„%‘ ç
+VÒnÖgšð¡Ó¸Cßå‹¿c³fÆç¼þã•`­<b^u¯_‚&ÓS^ßJ<}’6M‚œ‰bœ‰!4îä(ˆ|N“{‹HS&Þ$l"i+f#!ÑzÁ£FúõTÕ$3r‡à9xÅ(L"{2QëE#ÐÜ“”ÆËR?Ò
+XËP©ëZ9åÄŸ´µCûòô ‘,Ì(@Xlõ×Kœàvº3›§`H^£´à=›ÁP…d±,WÍ£"I‚¾¼#
+÷<`KR—ç)µ]ÕÔLö«Žƒ¢¶´fQ•i´s>0!NorØ!¨–õÄ Œ
+“°CSªFž‚ß´Ù7aº*OüWö.ÙOx Ñ–˜{è/½)µ)Sz®áSÇÈ3” 5|É”lñCDˆ¿ä$âeW~Á@bžÅÒGoû„+ÿøÕg^f
++¶8
+³FÍ„ÊXW…ê‘úS5ä+ÒUï}è³$”DZ虄ú¶&á€ô­}B%È•2{^cÖ#5ÚN±DÂ*7®™«M‰–,{Ô»Ùœeå¦ÍÌ­ÏŸ«Ë::±EùÐiƧkùr‹6Š×5`½U¶Àžr]nÅÔrÔýéÝ@·ÈÓ RNyâÏé»ÚEy40¡aj6°&OÔzSðýM;ý«¼•drnîcnáÝ#]±÷U®(˜Ä]D·f¤Þ£|‡‚hQ.àLZ=“k1ÒH§Éí"GA9¤43Ž‹±r@j’t^=¸·éìÁSU´È—[ÚMù®EÐé*_OÌ
+—>o¹Pð¬É ”£˜‰½œ{ &oµª ¥ƒûNž¬f¨æÔ×ï€tZ.r¤
+œZÕZt¤S#{LQÛ…U竼520å½m¤F·÷ZJ•Féûm E90epj#kQv@Ú{Jß sÑÙË·pGú#¦Ñk1ÒHsî>:å~QÜÀZå ‚iµJv9ÚH½­È»“L;3ã¶1¤&Ûz·õ£=9ẁɸq¤½½äáoŽºÒYfŒ›r^‹ºR_}„5™²™¼&û–òœi ³RÌd\ ±Rc{¢ÝY¬2úuòƒ—4šY-§¼×âë€ÔðN›‹>^Åó@á©s¦6´c¤ÊsÈÌÞoJÅ™SÅáµ=zѶMëNrm›¦m¸zt%ßi÷§ã~¦çÜù¦§å¡o2°š´9Ï$“Ü0AYÒ(›Z/0Œ‹ézXÛµ€úmïØI4/âkTÔ~‹#Þ“n¿G0ïóvmÅ F 8¢˜½Oqㆦ!¤Æ¼ºÓ8±×œîv‡¹òÕÜH‘é<Üý|lJµ—vŒ,AYïlþÐ]=?ðÕBù[ ûÃ2õ¹ñ´A¼Ú6H€r<Ö%ó®¡•Ùo8Ç;•„~l›aYÓ¡!¶²9†Ôœä€NUâË(Vït´ÒâÄ ŠEB•Áï3J?úµz:ß“Éæ¯÷XöChÁâ0š_Î}v Q¾Ç1G’ÐÛ:æQÿþk‹_½ЛfŽòÕ¤òÐ/
+.(Nר2ëßøTÌšó´3Ýÿ‹Lòiα¶S9
+Ôº4‹ÓΣË[=qUÑi¨=UZRÅ
+<Ÿ»UØ´T8ž½Q¸;¹ß&>µ:*9e4=­”¿J'C—¼¿3µm…%y!ïð/ILûþ
+endstream
endobj
2879 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 730.971 null ] >>
+<< /Type /Page /Contents 2880 0 R /Resources 2878 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2547 0 R /Annots 2926 0 R >>
endobj
-2880 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 720.012 null ] >>
+2926 0 obj
+[ 2877 0 R ]
+endobj
+2877 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 236.441 194.879 246.868 207.483 ]/A << /S /GoTo /D (Hfootnote.42) >> >>
endobj
2881 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 709.053 null ] >>
+<< /D [ 2879 0 R /XYZ 78.37 808.885 null ] >>
endobj
2882 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 698.095 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 768.829 null ] >>
endobj
2883 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 687.136 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 757.87 null ] >>
endobj
2884 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 676.177 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 746.912 null ] >>
endobj
2885 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 665.218 null ] >>
+<< /D [ 2879 0 R /XYZ 79.37 671.39 null ] >>
endobj
2886 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 654.259 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 653.255 null ] >>
endobj
2887 0 obj
-<< /D [ 2876 0 R /XYZ 79.37 578.737 null ] >>
+<< /D [ 2879 0 R /XYZ 79.37 616.588 null ] >>
endobj
2888 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 560.603 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 598.453 null ] >>
endobj
2889 0 obj
-<< /D [ 2876 0 R /XYZ 79.37 523.935 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 569.562 null ] >>
endobj
2890 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 505.801 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 558.603 null ] >>
endobj
2891 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 494.842 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 547.644 null ] >>
endobj
2892 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 483.883 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 536.685 null ] >>
endobj
2893 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 472.924 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 525.726 null ] >>
endobj
2894 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 461.965 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 514.767 null ] >>
endobj
2895 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 451.006 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 503.808 null ] >>
endobj
2896 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 440.047 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 492.849 null ] >>
endobj
2897 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 429.088 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 481.89 null ] >>
endobj
2898 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 418.129 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 470.931 null ] >>
endobj
2899 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 407.171 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 459.973 null ] >>
endobj
2900 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 396.212 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 449.014 null ] >>
endobj
2901 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 385.253 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 438.055 null ] >>
endobj
2902 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 374.294 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 427.096 null ] >>
endobj
2903 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 363.335 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 416.137 null ] >>
endobj
2904 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 352.376 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 405.178 null ] >>
endobj
2905 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 341.417 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 394.219 null ] >>
endobj
2906 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 330.458 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 383.26 null ] >>
endobj
2907 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 319.499 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 372.301 null ] >>
endobj
2908 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 308.54 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 361.342 null ] >>
endobj
2909 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 297.582 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 350.384 null ] >>
endobj
2910 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 286.623 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 339.425 null ] >>
endobj
2911 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 275.664 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 328.466 null ] >>
endobj
2912 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 264.705 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 317.507 null ] >>
endobj
2913 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 253.746 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 306.548 null ] >>
endobj
2914 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 242.787 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 295.589 null ] >>
endobj
2915 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 231.828 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 284.63 null ] >>
endobj
2916 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 220.869 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 273.671 null ] >>
endobj
2917 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 191.978 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 244.78 null ] >>
endobj
2918 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 139.176 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 191.978 null ] >>
endobj
2919 0 obj
-<< /D [ 2876 0 R /XYZ 81.145 128.217 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 181.019 null ] >>
endobj
2920 0 obj
-<< /D [ 2876 0 R /XYZ 93.716 98.405 null ] >>
+<< /D [ 2879 0 R /XYZ 81.145 170.06 null ] >>
endobj
-2875 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F65 335 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R /F81 377 0 R /F83 414 0 R /F75 338 0 R /F22 367 0 R /F16 336 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
+2921 0 obj
+<< /D [ 2879 0 R /XYZ 81.145 159.101 null ] >>
endobj
-2924 0 obj
-<< /Filter /FlateDecode /Length 2165 >>
-stream
-xÚå[Énä6½û+úÂ!YÅ 0 Øîî
-%õŒ9ÞxÌ{¤•ÖÄ61Ç·tOlÊsˆÏ0^12•®N¦g ëü¬Œ¥{K2²¹B
-aÃͳ¸öHµ ‘ù-Yœd…[âO^@¿»ø’¾e]„t%¯ {â8sùi/T|¯øÅQ~=ÒÊÉYÙÞ’o.?*ýXz[ËÒsô¥‰ñ;apY*'´63–öDzGúÌŠ\9¥ÚÚ©œ¯<9{¤UN«ÆœåÍÑ¢ï}´,Þ×{×,ÿð8Ú`H7㼈z#{Pf€Wòäø©O¾GÜ)’–º¯™bñK60L¹x—©ár&C[¦bYëâÆtñ%ò«/‹ekµ@PSrxŒœV·H±>Òèw­/!ŽÒñ•f” ÜÅƱÆÕ¸"Ï¢o7ž"4_£^¢$ ç““QáÏIKQ»¦Tg¯éwxkß22g)è¹J’(”›Ù±æ$8´H|Š˜*œ¯»Ø»Ø¸z`õ“×zgÖ¼Ùu-q´6]×ºÏ Eéüs«F$CHv3Â2•i¼¦Yù`¿“•9
-|ý¤6ù;#KuY¦.÷éÈE¢v®gú¹ÊrrÝNHÐ8átí¿“É²Ùj™);úm-¥¡ª3’·ÆÕÎL)­pÖM#س"¸Úà¥an;ä*ºÕí2n^žsÍÌîÖGVk¸íLògÏrÚ„]…”.Î,õˆ´.iÛ¦jZîm&=Ü­Ô(<Î{Ud­šH æÅQW—jì|¾f»ª;o-©š1)+~Êøèfœû+ P_Ïù·ÜŒ=ÃMj¶ëÄDîè.e!×# +’þ_[.œ`A‰à6{°x;¾/™Ù H;Ìx¼–
-o¿w@û³–@/¸e`&®é§(:
-f¦N”zÁ›F[{ã í¸rH%@MÞŽï
-J8 S³i¶ ð ©‹ÉÖKáì´%8ÚnÅž_9½A²¶n<ÿ6kÛ?”ØútÕRÈ—lÇ><"¬ÆÓ—õxpñª÷ŠÓm©¤í”#Ò­GcO—eéÜ&Á&«°2ӀėÄxáÑÍ$a69ÒwF/:Ὗɜۗá}°±…éû¬}÷èAA»ÏvÀN2¥S¯¥ï†îÓþWÉ7Ζ¥RS:žG§GÒ’+‰D¿wê¼a@2†)I
-endstream
+2922 0 obj
+<< /D [ 2879 0 R /XYZ 81.145 148.142 null ] >>
endobj
2923 0 obj
-<< /Type /Page /Contents 2924 0 R /Resources 2922 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2578 0 R >>
+<< /D [ 2879 0 R /XYZ 81.145 137.183 null ] >>
+endobj
+2924 0 obj
+<< /D [ 2879 0 R /XYZ 81.145 126.224 null ] >>
endobj
2925 0 obj
-<< /D [ 2923 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 2879 0 R /XYZ 93.716 95.166 null ] >>
endobj
-2926 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 768.829 null ] >>
+2878 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F81 377 0 R /F83 412 0 R /F75 338 0 R /F22 367 0 R /F16 336 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-2927 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 757.87 null ] >>
+2929 0 obj
+<< /Filter /FlateDecode /Length 2088 >>
+stream
+xÚåZKo#)¾çWø Šâ!E‘œØ^iϹ­öº{Úÿ]Þ tµÓô8£H£Q¦m _×»ŠÎðôï‰ûÿÿxzûxz¾¡;)æ¬
+¦ÖHÞ&Âêç›”'çWI?¥YesÒFûGõ|”éíè9Óçò|ýáÀqþ+Ü’!ƒ…—$‚hŽAžt}Ißá­Œ98@œùVM
+I£çÛ¬CZÌü!9Ãœ´#P ?ĪJœ­ÞXô]t\­Tµ“ó:† ÔOÁRüj‰áóÚ“ãïþ7éèßµ‘0 éÕ
+=+LÌÇJ˜Å7w
+³Ú&B²Œè<ÁJÜ>a"¸$Ó ÁóMàS—šq·8ZcËÒÊ—¤æ%©½Jó²$4“]ÜK߇õ²¢pª³õí¬ª3 ˜B¡Q…Â:fùŠÆ‚’H 8rvØüŒÞ•…ÔÈ,®^à—„8)é%qad ïó<úÑàÕâ½|jéD¯uyV¢`Ôpnc@ШÿÕÁKE7]äFƒ\uæKÞ
+5Û`gžÓ2ϵº,a.Tt¦<ê®Z`Áˆï ¬E(&ÀÕÀ(Â{}<ƒô¾×(-£ÏèéiJ Šì4Ò’]`špGT$;Æ4sI’JàQº“ÎÎÁ§<Ê×õÛ”¯w8wâæ1“]‡ƒ[ëú"ÐmZ—§ê·a§ÂØØû úV…ꀚ¸Tû,Aî!Õú!HMžg49
+²Ý[]æÍÛ€Ô\"™h·SÖõžÑYOJR“@
+ò<'Ȩ çç.(¾o¤†‡ó%$“ë;&±½õ\a¬G:f!{d¾®92}*\0Ï7)=;'½é 5îs+T¤)c׆ËóC7Î!9ªû5
+endstream
endobj
2928 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 746.912 null ] >>
-endobj
-2929 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 735.953 null ] >>
+<< /Type /Page /Contents 2929 0 R /Resources 2927 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2547 0 R >>
endobj
2930 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 724.994 null ] >>
+<< /D [ 2928 0 R /XYZ 78.37 808.885 null ] >>
endobj
2931 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 714.035 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 768.829 null ] >>
endobj
2932 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 703.076 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 757.87 null ] >>
endobj
2933 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 692.117 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 746.912 null ] >>
endobj
2934 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 681.158 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 735.953 null ] >>
endobj
2935 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 670.199 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 724.994 null ] >>
endobj
277 0 obj
-<< /D [ 2923 0 R /XYZ 79.37 632.787 null ] >>
+<< /D [ 2928 0 R /XYZ 79.37 687.582 null ] >>
endobj
2936 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 611.945 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 666.74 null ] >>
endobj
2937 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 596.005 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 650.799 null ] >>
endobj
2938 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 556.154 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 610.949 null ] >>
endobj
2939 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 542.207 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 597.001 null ] >>
endobj
2940 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 531.248 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 586.042 null ] >>
endobj
2941 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 503.352 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 558.147 null ] >>
endobj
2942 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 492.393 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 547.188 null ] >>
endobj
2943 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 454.535 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 509.33 null ] >>
endobj
2944 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 443.577 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 498.371 null ] >>
endobj
2945 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 432.618 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 487.412 null ] >>
endobj
2946 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 421.659 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 476.453 null ] >>
endobj
2947 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 410.7 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 465.494 null ] >>
endobj
2948 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 399.741 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 454.535 null ] >>
endobj
2949 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 388.782 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 443.577 null ] >>
endobj
2950 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 377.823 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 432.618 null ] >>
endobj
2951 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 366.864 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 421.659 null ] >>
endobj
2952 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 355.905 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 410.7 null ] >>
endobj
2953 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 344.946 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 399.741 null ] >>
endobj
2954 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 333.988 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 388.782 null ] >>
endobj
2955 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 323.029 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 377.823 null ] >>
endobj
2956 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 309.081 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 363.875 null ] >>
endobj
2957 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 298.122 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 352.917 null ] >>
endobj
2958 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 287.163 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 341.958 null ] >>
endobj
2959 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 276.204 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 330.999 null ] >>
endobj
2960 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 265.245 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 320.04 null ] >>
endobj
2961 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 254.286 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 309.081 null ] >>
endobj
2962 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 243.327 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 298.122 null ] >>
endobj
2963 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 232.369 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 287.163 null ] >>
endobj
2964 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 221.41 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 276.204 null ] >>
endobj
2965 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 210.451 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 265.245 null ] >>
endobj
2966 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 199.492 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 254.286 null ] >>
endobj
2967 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 188.533 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 243.327 null ] >>
endobj
2968 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 177.574 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 232.369 null ] >>
endobj
2969 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 166.615 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 221.41 null ] >>
endobj
2970 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 155.656 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 210.451 null ] >>
endobj
2971 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 144.697 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 199.492 null ] >>
endobj
2972 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 133.738 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 188.533 null ] >>
endobj
2973 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 122.78 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 177.574 null ] >>
endobj
2974 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 111.821 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 166.615 null ] >>
endobj
2975 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 100.862 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 155.656 null ] >>
endobj
2976 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 89.903 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 144.697 null ] >>
endobj
2977 0 obj
-<< /D [ 2923 0 R /XYZ 81.145 78.944 null ] >>
+<< /D [ 2928 0 R /XYZ 81.145 133.738 null ] >>
endobj
-2922 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F22 367 0 R /F15 334 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-2980 0 obj
-<< /Filter /FlateDecode /Length 2294 >>
-stream
-xÚÝ[Ë®#'ÞŸ§ð U\¥Ñ‘ìi;RÖge›õ¿ÿ6@Csq5ÝØ)ŠFûøºîU˜3uùß…ûÿû¸}}|(w‘ÌYpùúëC\¸ÿ'.˜–£ãZ\¾þùãçúƹ‚õݸÏ?¿~ÿàÌC}Xy±Ìi¶ÆB3£L¤ôºº"æ€Å™à@Q¢à%Ü0”Ð#Ÿ¥)JômŽ’I]?¿)PáÓâé2á=â}uqüã+ãzÉ
-Î@m’•?ý:ñ Ö6ž.X>¿¡ƒø×'ÿŽà¿1.ðþq.üiý·V¤U2päüè#|Ëä¿Òê8O.áIëH@ïa]ø.ŒiÈkiD%?¿E2ã‚0eY ÓÊb¥V"Ñ ~&I 9xÕª'‘˜ôøD‚²Ý5i#q£rL£ëÑ•ˆ^uV‡gEæ7Ú¹§ùš|[Ÿº*$z‚ªo«ºŠhÆ¢ÝfA–SP‡^VÄÀ¬œ´†¢eàt¦Mz÷ˆ½Šã7fIR²«±èm$¬D³¿Ò e¥ä–ŸÒ#D™,‘ÖôÍŠdÄK†—¢ÌÀ¾WÅœ?kë½Ñ‹‡òçë)v†9°=P *p$luo¸í®îº¯éuÊY¦Œö*·S覂T‡¤Ô,%Z1IÆm´çÍ„Hª-X–O÷UžÙÛ’¯_“&:sQ÷M#›¤³¶”ôsï«.r˜ŒA-éSL‰fÇ7
-fÓšV’I:ÁjuN<¨˜==šš´ä‘ÒÊ•™¢“¯–sT¶H•›¥˜’¸Û4w­SOÊ"<GØù½¶“‘Š2:˜öÔ,ÝÌš¶¦èbqÎ}Z$åf)á5()Jä}Ž’餾'©õ9Zƒz¢öz¾pÍÛ"ýR¿RÎWZSTž-j•R¡r&N¢.ÏŸŠ‘ÿpLTÖ2à %•É»Cš§Äf¤%)¹ÎQÒ"Qq´§,û—>Ÿ>‰ ÕÌÆ¥‘Y.(Ÿ¬TRùÕí—_¡(é}e«”]mr˜.¹”f‰Jçz¾ÒÉÆÒ"í©|ÌG§êI^¤`Ö"iøj*ØwH
-k#Ç°µ“;i4j¡ü_öÇÃÚ£õáµ»~ãÇç˃õƒqøy0®Ö×Þ¸H¯f|R“ȽwHR“rN“-R OëõµË__{ã××H~ᵫ>ÖŸr} }^?‡ƒñÈûK‰_„þYžL–uR¡O‹žSñX%¨Žœ™Õ:³—Kñd‘ÓI“;æBñ–
-Åv¾t–qù”îÑ.ÕRè€^M
-i³½” v[¥{ÛfŸØ÷´÷ ÖdüÚúl‘»7±º ä“ŸYî^å;”:[ï0¦7úÆ×óͶmD…æs*J-rº+7ç3àßìN>‘3Žßí;>Š#¼
-4g5ÅÐÙ}rfë‘Ú¨÷R
-çò¶ñ‡ûja!M†ÏÍ^qÔïÅ+ô½”ïás>??*4¼­¯”J¸\^ïFÈôܺœËçðáÙ[THÛª¿É¾Õ¤Æ¤„æù~…š¸“4Ö"E¾®Ï[Ò(K󂌪»‘#þ½÷ž/ÛÑ^¯›,«»©Ã2¾ºŸ{ º`^ì,Þ—°¥÷ŽŽÐ1.¥£Ó7ƒ’ŽZ¤ÌOô(~SÃÀV¶˜ýl$Ÿoëóãþ”®²VwNrk ÓPoW³íä°éà~ªm‘+€AE €‰JþuE`1ÞýDø±~›}5ÛGݳÔÛŠ-OÛü9g!ÂÙØÑ',ää.+eÅhP_kv_΀ÂIÂçöRÒ^ œÝ7wSò•ÿP
-‡±Ü ÛŽ;¨xIG¬Ä•,E=¶}§Ëèmç*]4Ëõµ‡PQF=çØøJ&ù&W€êW"·/d
-àL*Mi}î<±ªëÕ\áh¨Œ³¿|KÐRùéý§RlR€Z0öRÆ3ÎØ ZÅ’«'•Â“Ž¬æ¶ÔÐz °‘%«Ö.8m9úëì*‹ªéÓM2æCšBK†˜¹]v ´ã óÆ6Äé.uÔ±8ÀìE¨ÿŒaúÀ® YýÌíøZœrf9û“?øE¹ ÎÓâÀ½:‘¶tåKmEù¤gÛª¼â~Éó^³Îƒð:nÒ€óZð!_úýaù%â¶_¹}ü +j6
-endstream
+2978 0 obj
+<< /D [ 2928 0 R /XYZ 81.145 122.78 null ] >>
endobj
2979 0 obj
-<< /Type /Page /Contents 2980 0 R /Resources 2978 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 2578 0 R >>
+<< /D [ 2928 0 R /XYZ 81.145 111.821 null ] >>
endobj
-2981 0 obj
-<< /D [ 2979 0 R /XYZ 78.37 808.885 null ] >>
+2980 0 obj
+<< /D [ 2928 0 R /XYZ 81.145 100.862 null ] >>
endobj
-2982 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 768.829 null ] >>
+2927 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F22 367 0 R /F15 334 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
2983 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 757.87 null ] >>
+<< /Filter /FlateDecode /Length 2495 >>
+stream
+xÚÍIŽ#¹ñޯКCFp
+H-i
+äÿþéªÜE2gB-P ÌKØ eBb‹@z0ÃʦøÇÓÊ‹õŠ¡ÑÖpœal( ¨  S Ú"Ýd®û’N+P®† kGDiuŠ(Á C =$¥V1š¸!&ò& ™0ÐC’Š¸£Ê§Gâ(ÙB¶ök–E§0ê±Édã5ÉKI?÷‘¤AŽ2ºµ,!Ì^%*ß0ЫüáŠÁXûð{P1ï{:@P0ºnŸî‰꾈£v’¡#$åc ÉR…å&C)–øí6¹]ëГ£'›=¿¯íx¤"f=5K7³4}å<ðômMÒ*è¥þ·di$åV11À|ˆaâé[¤…tR7±õñ\¢a«okÚÝBú½6¨8“F±¼®aÙB*X®xTԅ㔌¼éßì=}>Æ”0#® [Šs¤uLÀ2¥ì»†I iä#‡úD¼ÿÿ’çÄó™e¿"üJûdV“SµÐ~ªø$²JŠÖ’åôLsdÎ •ålRDÊÒBÚùœŽNÔk´(‡ÌÛPñqÉÙwÖJŽ¡ ”;!7¤t¡T¸ï‡µGëó»þ>‡÷—ë'ãðë`\¥go\ä§_”¤ÿLJJy6Ë#A6€vZ§g—:žž½qé™q/<»Òásé)×»Ñ×õ³q8´¿ö•LÀKê­¯ËI]©à§EO©x&Ž¬#e&é&ÙXÐ3/ú¸2•æLhÑ–ÓÄn¾t 8ŽæŸLÔ²ûï
+¤·Ãíiû^ˆ
+Æo•v|BJ©yÔâA¿¿Mükû&}¦ÒÓWÿ²ÊStŠã†v®)ZÉì0';YËå‚´…3¹Ð‘/òªQNò hY-†j„KjÔAZ9ڧ댲ԗ˜ÎdŒ³ì”²È£y1‹=H†ô¸"ÑÓË_é
+JÃx‰7¶¿DE…´¤.å"Þ–èÞ¶Ù'Êžö¾TŠÅï­'…ܽ±Õy„ÀÚ³ÜÑ¢;d:[ç0F·ñÍ°×pÛˆ
+­çœ“>[ÈùNݢɠfÜ Mæd!MfßÚ·{GxßþA11¨+ír]ÙAjí_(Cà˜˜o5¦PH&e•=_V!gÖGRëtàQ2aÊn{x$ 12|nJÅY»C«Ð’½‡Ïtv~”e„y[[)gp”]ï:ȼoÍÑ|Ø{ó
+¹ª"÷=l[-JŒ#ƒAµdîÅd‰µ"]×׊4òÒ¼Á£ê%ÁˆßïÇ­'ÅK5ÚËuãeu‡ušÅW÷8c D˜†=‹w%liÇ}CFà€Á ² ·‚’Œ:HDO´(vS;Ã@VºHv6ãO okóãö”®¢V÷M¨3@8ÔÕ*éù€MS] J
+ÛªMd“÷¾D8z[$Ì„’yÎÞ.˜’ØcO…ñ-§=÷Ê:m²K鑆)u` ó›tÉü¦‡Þ*p¢0¿ÓP>É„Ëöœ#ã`Åø…›”-u_$E^¿täó{Ñ™Ä<’J¹mÞ-ÍéãwUáÌX#=Z!ëdPYrâñÜ®yK(G€n§N3­`–˜èîGuOoùçßu©ï –†ï¸•Ò‹¾OhÅöÚ‰zhâ´Ç^œwÉ~ÍR^]_vQê~è.N²½±ô
+gî([×7\½(.††ÒZj7µpÒaÛ†”¬ŽÅ¨³åX¼s¼Ä¨¦‡½J–”Œ¿^=‹!x­ÕAÚ ëÊ6…ÓÝxªÕ>Oßþ™+°®ßÕ(
+Yg“ýmèr)%½‰A·ÓÓõºø]æ ’Õ­õóRBd\k]P9·_EH„¸þzEî\B- xTç’ЦÐﵶÐyçV±¿ãÊ~Ë~“®‰ÄfŽ$r²õ’%Ò ¯Õ*L­¼f¦ÝJ)µ…Äœ­Ä¦v™àsëBZÃá ”Ý|З×Zé‹äÌ™ÍÇ#n"x|ýø \M¦Þ
+endstream
+endobj
+2982 0 obj
+<< /Type /Page /Contents 2983 0 R /Resources 2981 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3034 0 R >>
endobj
2984 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 2982 0 R /XYZ 78.37 808.885 null ] >>
endobj
2985 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 695.106 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 745.915 null ] >>
endobj
2986 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 684.147 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 734.956 null ] >>
endobj
2987 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 673.188 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 723.997 null ] >>
endobj
2988 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 662.229 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 713.039 null ] >>
endobj
2989 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 651.27 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 702.08 null ] >>
endobj
2990 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 640.311 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 691.121 null ] >>
endobj
2991 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 629.352 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 680.162 null ] >>
endobj
2992 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 618.393 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 669.203 null ] >>
endobj
2993 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 607.435 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 658.244 null ] >>
endobj
2994 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 596.476 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 647.285 null ] >>
endobj
2995 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 585.517 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 636.326 null ] >>
endobj
2996 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 571.569 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 622.725 null ] >>
endobj
2997 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 560.61 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 611.766 null ] >>
endobj
2998 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 549.651 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 600.807 null ] >>
endobj
2999 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 538.692 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 589.849 null ] >>
endobj
3000 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 527.733 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 578.89 null ] >>
endobj
3001 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 516.775 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 567.931 null ] >>
endobj
3002 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 505.816 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 556.972 null ] >>
endobj
3003 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 494.857 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 546.013 null ] >>
endobj
3004 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 483.898 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 535.054 null ] >>
endobj
3005 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 472.939 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 524.095 null ] >>
endobj
3006 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 461.98 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 513.136 null ] >>
endobj
3007 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 451.021 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 502.177 null ] >>
endobj
3008 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 440.062 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 491.218 null ] >>
endobj
3009 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 429.103 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 480.26 null ] >>
endobj
3010 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 418.144 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 469.301 null ] >>
endobj
3011 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 407.186 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 458.342 null ] >>
endobj
3012 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 396.227 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 447.383 null ] >>
endobj
3013 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 385.268 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 436.424 null ] >>
endobj
3014 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 374.309 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 425.465 null ] >>
endobj
3015 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 363.35 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 414.506 null ] >>
endobj
3016 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 352.391 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 403.547 null ] >>
endobj
3017 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 341.432 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 392.588 null ] >>
endobj
3018 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 330.473 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 381.629 null ] >>
endobj
3019 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 290.623 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 343.859 null ] >>
endobj
3020 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 279.664 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 332.901 null ] >>
endobj
3021 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 268.705 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 321.942 null ] >>
endobj
3022 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 257.746 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 310.983 null ] >>
endobj
3023 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 246.787 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 300.024 null ] >>
endobj
3024 0 obj
-<< /D [ 2979 0 R /XYZ 79.37 224.075 null ] >>
+<< /D [ 2982 0 R /XYZ 79.37 279.045 null ] >>
endobj
3025 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 205.94 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 261.258 null ] >>
endobj
3026 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 194.981 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 250.299 null ] >>
endobj
3027 0 obj
-<< /D [ 2979 0 R /XYZ 79.37 146.359 null ] >>
+<< /D [ 2982 0 R /XYZ 79.37 205.096 null ] >>
endobj
3028 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 128.224 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 173.707 null ] >>
endobj
3029 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 117.265 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 162.748 null ] >>
endobj
3030 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 106.306 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 151.789 null ] >>
endobj
3031 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 95.347 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 140.83 null ] >>
endobj
3032 0 obj
-<< /D [ 2979 0 R /XYZ 81.145 79.407 null ] >>
+<< /D [ 2982 0 R /XYZ 81.145 125.584 null ] >>
endobj
-2978 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
+3033 0 obj
+<< /D [ 2982 0 R /XYZ 81.145 95.481 null ] >>
endobj
-3035 0 obj
-<< /Filter /FlateDecode /Length 2599 >>
+2981 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R /F22 367 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+3037 0 obj
+<< /Filter /FlateDecode /Length 2628 >>
stream
-xÚ½[Ko#7 ¾çWøD+‘zF€xè9·¢×öÔÿ-õ~Œf<r¶Å"{F¢(’"?’
-gêò÷…Óÿ¿½Ü¾^~Ü•»Hæ¬@¸|ýõ".œþ‰‹¦åÅhÁ¸—¯.\9×7ÎÐoŹü|ûóë÷w+/–9­Ñ¶tœaìHH"„œ£ Ÿw"øÉ9qié;- ~ÒçøYszGÏQ"Ž ïÓxÿÜÛ«E”QæOðÇûqJ¢§]¢ù¹ÊC¦ªTù´ËOáà£|¸?Î4¡PÒA”?î
-ÏåÝSz{•Öø'÷çבx¿Åuâ Oó7Å£Œ*ï‰ ¡f\
-×{\1ÚRÞ[^?X™KoyÕr…o¯`“ò”0²ø¼xâRyR^Üo‹”Æ4¤ÂŽKáš!7ÅRÊQˆ8Ù•L¶ß槞­øÄ3œO“¼[
-\„=—‘~šòmceô,Zo<ѱÒj³qC$oãVÜÐ@(0Ó-GrͬªóYܘLr;Û˜‚SÈ™5n¤¤ÞËNˆCñ·úXåÏp&¥›ñ§oçøâkK Z‡ºÈ“rl‡¥÷s,IÎÀm¥C4ü‘í>‹ê²¢ë^åW’[A1cÝÃ=%åV9AÔ)'v“žRcmjò©:Y´®EµÏ$eµV¾ê
-é“øÜRMásA ™85!µ&‡žÒºF„bZÉ)'r“ž’5ÞõJ³Ê—L;=µ\óH=¥™ͪ¼”#‚Ó@pf4PjüѯñœÊfÅæÔ#®†¬Ð~ÈòŽê04e¡‹>òçyFgì;Ǻsú>š',-šg ü\H-ØxŽÙ"âQÒ˯ÊÈc1±‰Ç9°kÄ¢nÑå+QiEJû¸šf˳¨§¼Q~\Z‹ç§~E#ëxp’.Ž01ñNpFŒû])zÎAE‡ Sx «@zÞŽ3ÇøØX²Ä´•.ˆnÐ
- "\\’Ž™BÞ9XuPuÂé;܃FÁk†70×vÞ™ãSkÔUã,?Û^Û7綨ùV³GOÙðvMy­¹b þ,i¨€Bè»NOyÞ¡§¡ ÌÇ1ÅVz‘wöˆ0dU·Fz0J½—ZÖCö‘êA&5è£ùYßyž«Ù LoË›¼ÿöÛþþÓ¹Ùœ¤mæ¢dJ–Úãݦ.ª+MÉŸaÁÖ!ôˆ°e©n{Ÿ¥&:§'Ò¯½Ã0?xob¸m•Ìþc4@{Êä‚ÄRb›f6æJݧúq¬¼ÕTnéÐxœÍ«äc2™ç¥Òñ¹©+1ÍγÝO^­ív×%Ÿnsû´Ý¤ŠH$/¥2DÉ'ñÆ×ßæKFŸ•+5X|í>Q'LÈêosý$­Ù®ïß5tZˆ™'èA)û(žÌ]Üu2jeÔ‘cs|zPq:¬$ `Fo‡Ç% íf¦w]ù'€‘ÌŠ‰ßsñ/÷xe×oÈ¿ÏÅ9Mÿ‰{U¬žÝht´qŒL4ƒ
-””œ`†`â¨ÂÕˆ´†Á Kž¬$,Ù‘ÙG’lÑcƒ ï-PöŒí’6×¾÷Hï8¡[N¤Ñ äbŸ,Nd±ô„Ž«BYóòc"œ¾šœ–·åèÖª}a7ù³Zs†ìZW!6ÙËG„uËù
-¹vjc'Ë*Y˜=¡}aæZ{‹ü¦U{=#Ì]!™g„¤È΄„KIÝ@hEH9ú>]s”)iÓMœ¬qÃPÂHÉ[¸~ðÕce÷'ÄGâYòyê,«I®¦6²„Š)ŠH%LT¦¨ÓCík+¨ž}9yæ‘Õ¶µ´•Di>4JN¨ ìfØ£ŒaÒp)Dh lqg#8›ë³ÇÉÓ ;‡‚òC€b  ÞgYý~*Ô=Ըؘt¦¦IJ:P}N0 L¼ŸKž@HÞGÍOþÉjcr_¡ƒ€ù¼žuo™æzêÞpɽ ”þ÷ºÙâ¾¢_f¶ïÓ¥QÍ„‘Òrƒ†BÓvÓÔ’Ÿ§KŸÙ­Ž”¾ÛŠA…Ì€›qvºÝ–8ë)-þɾÈgÍ9ÛWËŒt„~]#æ?mÀ 埓âxØþûÚö{Jëz
-!e­€ê5žOMWc³›hœ‹?æ–°jW4]ùZ+ÂíM“ˆnk?™DíLj>{ðHrËt2ˆ~¡!‘3š8ðæ0“K¬©5ÅdÞ2ÑŒé°ÍÃÃ8V7þ ÔÓ¶[ë¥åúMR”yɬY³=ÖGÛ5K-ríXƒö5Ù¹ÇW+Øk ô«°×Óx 0Óh¶…-€’ÍÒûyýø¹P÷8—~à"?Ng›$l5*‚ä·§èd¹”šúÈÓ‰éÙäòûˆJzÚ·ü!=ÇáAúztÃB7uÚ6‘ÜíßCÑÜ#wݸT)øà`"¥Y8¾‘¶i=¹µº:ávJKÇ}Èì*•Ú¹zpFW¨Úžbæ+÷Û£.£»~\x2¡xæ&¡Ê=ÐÔZ:Êÿ¥UÌ¢÷íáØÃÈjzœÙ´ðŽÖV#(¬ÊŠ@?„R–E1N Ý-£;ë5”²Hz’³7—ˆ6Bm[Pnú”ÖôÒBY7c*±Â¤ŠGP•Ä6~œ{JÝ…F@r¼ãš•ÛØÐû–­è’ר]¬0?ö¸û:/ÛÞ ˆO†Ì[@#ŒfR5öR»{½@¾Óª”á*.Ƴ
-nì•—»îœPÓ©æb¼#á {ÈÔ ‚ÎýSo q‰îŠ@`§uÇxÄŠiô ²½=ÞÂÈ2ÐDŠnŽÎû ;änwsÂM8Î:yÖQ;ÆY]ÓÈp{˜å#Ui{£8«,ò˜º*wU!å(._¹¯†”ÃvIO6ºš™'a2%u[×~tÝ¢ ¾3´-ÛméUEú 4ˆþWÒ£å¦ aºÌï<L˜¦—”!±ÃgŒwwŸÎã<šéiÉaíojz:=¤÷™œ†öîâ@1Ýÿ]ÿ1î|‰/AÕÒ³EÖý=~«¨*„d†ÃlŸg †é¾é@I•^ ¬¦ Âÿ!ŽÄOgk‡éÎð@)´ño]!pU^˜±rÊÚÚÝüž˜\cíïéF°÷DK×
-fAÍ8>[ÿSŽ ÀÐ,'Õý…‰ÛÜάÖSnOÖ ù…¡æªÆ·
-ȵtŒ¼»;½™5èlú>Bé¥2t¡ÓÒz¤ œ0M`Ž,Ï™R~h.×|~½ü y!®š
+xÚ½[K#¹ ¾Ï¯ðX­Dê 4h¯Û ä<· ×ä”ÿ]êY’ŠU.¹79xÆV•(Š¤¨–·ÿÜäíÏ÷_?~Ü‚¬¾ýú÷EäMÝ\ènÎ*!­ºýúïíŸRZ/%>é?ÓÞÅ O ”RÓwý §÷8^ßÀ4Zz>¥TÐ(½§ýÏýúq¡ ÇHŽ†&>œúéñ£ðñ[ZòžuTý¿é¸®Îk&^C~/ñü(ë;Í®”0 æõ¢Uîý.ˆÚב4NwˆÆ #Ín‡)$^ŸyEûˆ¿ëÞêúqgiÍG^7í¬Éðçoà‹ê”ô*TñEñä¥ê¤ºxÜ)¨¼Ó‘J;š,E¡¤m–Ò–Èú@DfWºØF~ZG#[y$2wžd|o¶”¸H{noƷе_;+£±liR˜hüônZ¯zxÑæÐ ÍÔE^"ï&~Ï´Ê1úýéõÍ“n-úžNp"€Ÿ %fz" 0ëfUf¡^ÝhÚ²û¼´1…RxfJæ³í„8ÿ7Uþ
+ðŽãÃ5þ@ ½§²ñgVy’ tÉñä¯ñ¤¥€°§TŽAÒñ£Z}W›Ó‚{;t×9¶äº¢5K „LXåÃK¡•bÑkŒŒ”:k3Ì7¨ßtÓºU›}ÖoÕJãÿñ|mOŒ­ßÔמ*=]”ƒ B`-×ä0RZ×]9: ljþZãd¤„*»^íV9ÒNÔ;ŽH'.,y¤‰§C·,/´Â8Ãqg`ÉM”:ô÷xNr"ÂAà8]»²&BÇWVtS§WSºoþ:ÏÙL9Â_Gôãmͬ ƒ:ÖT ï]©åpa¶ŒxL
+=°²ôK²  îÛÓ
+øXš#^æ¡ÜBÒ´GÈD³"¤‰ÐŠê­ûvªQ{
+x-{j®&¤¨a¦-<^zðÍke'$ÞÀ\Ìyé,«Óa%›D¸šþA# ÝG%,—¨.·Îö;´°?ûš‹ˆjë$Ö$ÑjrÒ ÔýaÛ(5Pþ\Š¾µÑ‡7 AnnÂkœ'³—,
+áLLÌ'̧/`ƒ¸çå/:ºf^lŽ5K­¤Äšgh¾Æ• >¯…>oà­%yöä_L2V÷5:¹0ß×ÁÛî ¢Òv‡ñzÞ²º·‘Òÿ=]¶¸oÂ0RZnß—3¢V(3¥åºŒ&@á8¹˜ñlnu¢ôÝú ’ýJXÎ>—8›(-çû)ˆ
+9F®–Ó*#¡¿¯þò?­» ]—Ê)vû~mû#¥u=X-(e-¬q2Rz»î‚Ö4®Â³rŽ'J×oŠø¼zÃ#‚йžD÷1¶1 ú‚6Ò·”a…Œ2•“ìOÉ´û’AO)¶ÖvU—\ïS7äÖüî6®Iw/XuȺ!oü±%‚ûWˆîs>•ÄV`r=Gð(ú@$L¢_HBhŠú΢9prɹ´.‡,{†3šq¶y™¸"2¨ÍõôU–Ó<iëº)Šò9.áj4ûÙs^´_³å µ´Â*Ǻ<\Á^¡¿ {½· PècØÛþjåZ Øi"Ä…÷|þeh!9¹ê^ÇÒ/\$È×ál„­ÞŠàµ°û4ŸþZF®¥.?òv`z5¸ü>⇞ŽeƒxH¯qx¾ž5V‚ÖB°•2·¾¡êZßÈ]w.U+99˜L‰+ ç'Úw%§°–S',{q¦}èê*9hÃKµ7 ³+4})±òUˈ}iѶ·‡:\a(^i 4µôYJJgñ¿öFx ó¾#< {z3¦Üƒgv¥»³u‹Õеªl×ÏöJyZÕ<1Uµœ o«¨¡Ö£@ÊH=ÌÑ\R Ú µ?nýõ€zWŸL´Ø^…¶nÅT±ŸÂ•ŒGR•Æƒê}ž{IÝFBznm-Cõòµ0ú–½èŠ×Ø*Xi~.möm]¶oÈ#SãòÐÓ"¬ßU¸[A÷¨(J´@èŒÏ*„¹FÞZ"Â5¡–S-ÕÜ zÈRˆM‚®uÓh y‰¡3 ±Ó»c|¾bÅuúÍ‹¦Ù÷>ÏÍUæ/Š€¨áÙ0Ë勦n)$ÁàiÖųŽ6éÜêšN ”»Yñ¦Ê"íaç&‹úÎ]µU(1J¨ö›!Õk»…';]1æ©‚¥ ¨>¯ýªÍ¢¿|9´­û
+íˆé͆ô+@éý7:ѳå–>0Û榼X¦·¡°#9Ƈ–§ë8OÅžYc8œw1SWB‰ÐIé““ÔTÞ]ÜDlx –ÛÄÕ$_«¥wÓ¬Ç{üVZUÅ¿Ù÷l§}~.5šN”L«¶Àj  bC­óOW³‡¥Yx¢”Êø÷!¸,/¤ðXÖÖzòGBŠé_t3Ü{£¨ËGÖ*VÃS€&|Ä™—Ú±eâþ¿J 'Y_M:ògJ]»Æ·ÒÈ[åÐ8½›5é}žõR2ºÑéi•«zAÎñïÜ4²¦Œkr)ur^ÿ›µëüÎkŽý«y™ÂþHhlêAÉ7ghó†—Žìg1úÇ,±Zàb9ƒmÁÉJ¿e]^ ¥ò{þ¸p=×S´3Ú´óvÂIá­å8»ZG´ñ¢ó¡“†¯Ã„Yž5± (ÂvIuuį_?þ+y
endstream
endobj
-3034 0 obj
-<< /Type /Page /Contents 3035 0 R /Resources 3033 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3076 0 R >>
-endobj
3036 0 obj
-<< /D [ 3034 0 R /XYZ 78.37 808.885 null ] >>
-endobj
-3037 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 768.829 null ] >>
+<< /Type /Page /Contents 3037 0 R /Resources 3035 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3034 0 R >>
endobj
3038 0 obj
-<< /D [ 3034 0 R /XYZ 79.37 730.218 null ] >>
+<< /D [ 3036 0 R /XYZ 78.37 808.885 null ] >>
endobj
3039 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 700.135 null ] >>
+<< /D [ 3036 0 R /XYZ 79.37 773.016 null ] >>
endobj
3040 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 689.176 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 742.974 null ] >>
endobj
3041 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 678.217 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 732.015 null ] >>
endobj
3042 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 667.258 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 721.056 null ] >>
endobj
3043 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 656.3 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 710.097 null ] >>
endobj
3044 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 645.341 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 699.138 null ] >>
endobj
3045 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 634.382 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 688.179 null ] >>
endobj
3046 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 623.423 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 677.22 null ] >>
endobj
3047 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 612.464 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 666.261 null ] >>
endobj
3048 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 601.505 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 655.302 null ] >>
endobj
3049 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 585.579 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 644.344 null ] >>
endobj
3050 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 494.968 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 628.498 null ] >>
endobj
3051 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 484.009 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 538.168 null ] >>
endobj
3052 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 473.051 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 527.209 null ] >>
endobj
3053 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 462.092 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 516.25 null ] >>
endobj
3054 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 451.133 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 505.291 null ] >>
endobj
3055 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 440.174 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 494.332 null ] >>
endobj
3056 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 405.333 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 483.373 null ] >>
endobj
3057 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 394.374 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 448.693 null ] >>
endobj
3058 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 383.415 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 437.734 null ] >>
endobj
3059 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 372.456 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 426.775 null ] >>
endobj
3060 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 361.497 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 415.816 null ] >>
endobj
3061 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 350.538 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 404.857 null ] >>
endobj
3062 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 339.579 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 393.898 null ] >>
endobj
3063 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 328.621 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 382.939 null ] >>
endobj
3064 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 317.662 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 371.98 null ] >>
endobj
3065 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 270.865 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 361.021 null ] >>
endobj
3066 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 259.907 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 314.386 null ] >>
endobj
3067 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 248.948 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 303.427 null ] >>
endobj
3068 0 obj
-<< /D [ 3034 0 R /XYZ 79.37 212.322 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 292.468 null ] >>
endobj
3069 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 144.388 null ] >>
+<< /D [ 3036 0 R /XYZ 79.37 256.077 null ] >>
endobj
3070 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 133.429 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 188.224 null ] >>
endobj
3071 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 122.47 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 177.265 null ] >>
endobj
3072 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 111.511 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 166.306 null ] >>
endobj
3073 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 100.552 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 155.347 null ] >>
endobj
3074 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 89.593 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 144.388 null ] >>
endobj
3075 0 obj
-<< /D [ 3034 0 R /XYZ 81.145 78.635 null ] >>
+<< /D [ 3036 0 R /XYZ 81.145 133.429 null ] >>
endobj
-3033 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F22 367 0 R /F15 334 0 R /F74 337 0 R /F81 377 0 R /F83 414 0 R >> /ProcSet [ /PDF /Text ] >>
+3076 0 obj
+<< /D [ 3036 0 R /XYZ 81.145 122.47 null ] >>
endobj
-3079 0 obj
-<< /Filter /FlateDecode /Length 1826 >>
-stream
-xÚå[Ënë6Ýç+ü™3ðã¸@×Ùݶ«þÿ¶¤HJ"EÛ¤ø(.|eÓòá¼y8T¨Ýß;áÿÿíåøõòvVnÇà¬$Ü}ýõ"wÂÿ“;‹ yg´¡åîëŸÝïBèc|ç¯jÿç×ï/"€y¨·³å§5Ù5Ž4œ¢I¹ý«BÞI!ÐcÊ!Ø_ÙzìOÿBÿ
-ó?æßóI:Æ9W*Ü_ ›òó˜ü%ÒJþ —×<‚"¿c5ßµ¼óºá!ê=éë_”ô ú*¯?¢=Âg:‡ßÌا"ÎóÍ3kYˇm¹È©t~'?·XË·‹>[]Y¬g%1êr ™Zþ!óO‰´ø‡¼UҌʆ¤Ÿ´!öɦ-(?T!µìnܨtÒ
-š°Á–ô±Ë
-Î:Ú(”Ë¢„Ú9m)¤kR#¨ˆçXd§B#VEh.Ä£J’xIM%}®È;©BR4k¥‹b$‹Â{Z’~¥Ã¶`žÂ§vÉÖç+øE!LÉG\9žæÖ·J±™q´tiDP¦érCÁV]6yLAtL9S¬j÷”” %7±cU"]Z™YÆäX¯ÈœjÂtÅ´Š6VdÆžß®\>h !@«fÅïåbÙ%Ò*t])êŸNµãç\HbÔLYÚ5Wˆ^–&5ej¤ÛLì©þ~‚%ã—ºV¾Ð˜%K¤‹¬àãY1¢ c[šõ²±¬Y‰Ô#Ëî$ø40ôÀŒŽ:Mcøx|~NÌ( VºÚ²‘ëŽY¶Dº3+ùv–ê2aSžÓ[;¯>™Ÿé¤9§âÄàˆÞ—½ŒœJßïÄoòÞ*Z=Iã'kH#­Ïåky¦Õ0ù?íLßΆ[è+¯ò’F‘qÞd›—¬…:îjô¤]ŽÁÅ*ËHÀÏ£W6=_Õ‡Hy^àZ™<Tìî³nhAV€Ÿ­‚ B7MÅö¸Gû> —DŽðû×8¼ÊŸä}õ›¾^HK|½˜cþÁqýƒsòˆÍy?šY¨À‘jeVçÎ'Ñ°
-çï¨{)™’þ+£[Jund2 ©.–_u
-åÖ$ùC¹ÄK‘Óí@¬¸÷ ƒ¦iÎ]ŽDª*küC5ù lKDr#"V@÷-–œÚ]›„j-š)¦§¥íóÇI5û‹lšil{Qà¨Ñf¿ÀpSŽAj_!}[NÑõìÊô%x¯¹'.~uùž™&ÊPÏ@ZlÚslCQ!}gŠ²DjÆÞU¯îËÑë«EÊc¹ä`ÞÍËþ’M1“…‰Gl­8¸-¨¾ÓÓèsSliÀa˜`WH+‚­FeòˆÄº%SwSÖS@«k¤’êß½=ì>L¹‡„è»íÔ¡€¬iY¶—eË–Hë
-9FÛ”ä0$I…t£Ù7(¥%`íZRöR€nƒTdÇq××Úü–C2J6MaÇLQ
-›1¤†Ž™j¤ïncòw9jJÊc’–H7Z_ƒRúÝ­&nº˜Æ¤,‘~®uý ¹d†e½¿~ª1\Y -hÓ\G{×zÏ”Œ°5RKÎp°­†cP0r³ª’ë_éQƒ4X#uo¢Ñ`u󀓫î@Ü“í_ 7Ž«]šp¦íÔµ¹Èò{œcZMí܆A³j2¥Ç9ÒÝî¦xÞF‡0ªÖ÷ÚØ㈣Hs¿'ÿ\Ÿb/+vVóqšüié÷Í@‰–šDrïkMô<G!3c_kée
-J¹<²i½Eý/‰\QyYûðºnòÝTbî—‘ÉÍNÙt°çÁn;OÀŒ•b¯äû¬çõP!pL5ÒlÈÛ7}O× }ùvʵ’p¬ëVõuÝÚ½Ž»»mÈ¢¥È`§m…ò­]¶ã…¾ÎéÖÆC+=¢±í–Lv{Ê BÂÑÇ—PZÛ>C„ÆvvÒ0O›¶Ý„I’^ê¨À;¥FúÎxYjÈSâD:¿–n{4ððbÚÿTH?xdøÜ
-pÛ™ Ç#_©†÷ªÒ0 7™S//ξ*‘þ³}êŸ?Ø ë/ZÛ²i/_Î6-‘†ë¤T„Û%ÙöóâT*¤á:)YÂöùˆ HoÛK1°'æ%Ð/zp&<ÉR¶ÔéeÞ³–deæ9ôÿ2¤Þö>&ëƬ["-Öq£Ÿý0xÛ+ šõò–¬Y‰t_Ü<eeüy«úmƒÚ¶v&£Ú!£–@ÃÕÖjPÛ6ɶ½³áË=«
-h¸ÖºÑ ±ýä"àè
-§jÂJ™‹OÔ8?³
--xpË£bDs]ýüzù´ïw¼
-endstream
+3077 0 obj
+<< /D [ 3036 0 R /XYZ 81.145 111.511 null ] >>
endobj
3078 0 obj
-<< /Type /Page /Contents 3079 0 R /Resources 3077 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3076 0 R >>
+<< /D [ 3036 0 R /XYZ 81.145 100.552 null ] >>
endobj
-3080 0 obj
-<< /D [ 3078 0 R /XYZ 78.37 808.885 null ] >>
+3079 0 obj
+<< /D [ 3036 0 R /XYZ 81.145 89.593 null ] >>
endobj
-3081 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 768.829 null ] >>
+3080 0 obj
+<< /D [ 3036 0 R /XYZ 81.145 78.635 null ] >>
endobj
-3082 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 757.87 null ] >>
+3035 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F22 367 0 R /F15 334 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R /F81 377 0 R /F83 412 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
3083 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 746.912 null ] >>
+<< /Filter /FlateDecode /Length 1746 >>
+stream
+xÚåZËnë6Ýç+üaÈy‘vè:»¢ÛvÕÿß–õ"EÛ¤ã8·(G6%Í çq8”V¼û{§ÃÿßžŽŸO/'ö;RÞ„Ýç_Of§ÃŸÙ9PB;+Fi1»Ïv¼j-Çô±>÷~þþ¤#X€z99Ú9åEЭq {e
+>²÷¯
+ªST?ŠD¦pžMë4ƒxT¨mÍ è›Ìà­òàJ rI ( y‹¿§YœFÆã¨FT‚âÔeJçÂÄãñ ©WÉp@òU%]Û\‡IB‚‰qÖJÖ^‰fðÈéÜü ÍJ‡éz^ßÉœÝ9{½œ.àë AÖçØÏßfûÑ‚j6ÏÎïžµ2Ó7;#OïœEÚUcŽ»œ-:ïlæ8:ÑqŒ™ãÊ¡üíŬ¨îPB}•#WÜ"™‹ì)æcNŽôä­Ó´Ü»šòN[)òÕ”Øg‹i庇¦‰ùOÆ\Hé÷”HR‚éÕ Q1VK}´ifDY¶%Ò"ó/1ß°$€b‹¥%†tÒeÉé,-x{”£ÄPM3†>Ír¤y³Ý˜ÓØ%ö`%é4ŒUüãëø1>£µ’/ZY¶•JN–Í‘ÎùÌŠF¾œ ŸglìPY3WŸ‰ŸÉ¨y´@Œ¹Á!¾.#²Œ¼çsg'w”ÆaMãŒ2âJy†j8Î?GK5™×hsN£Ä8¯²ÍsÖ Õšqƒ>j7ùàb•e$âO£V6=]Ô‘Cvð5‹ 3´T³ØèŠè´
+O+ £Pqš†d{܃{„ENðûç4¼ŠŸqö]Òo8½–ô±²˜c¾á¸¾á4Έ›â¾3²X¼²ÖT#ëÐCÃ
+  œ¿Ý¡n¥dÌN95¥2 )Φ_N:ÅtkGùcºŒÓSK»ü~Ý îÝi²ÊqµÈ¶®r (Í%Pžã¿”ÓE9_­– €IÄè¶bI‡Ñ_Ë€ªÍѧ‡Òöñí¤:ܦ<Ö‹_ߣ@bß+‰ §¬T½ªÞHw‹+¼a…‰3X]gw¿f¦J§¯E©&¥­Ù³sQQ Ý1LÉc²Í:=-~ºd,n‹ÓËcŒe³Äá´8šI–û‘…1…ƒ©Ù°saáÜs–m T•°“`H+‚ͽ2‰VÆAU¦Ö®l €NJ¤œê#ݼ<ÜÜsO~=ߞwˆ¼Àše[ùÑdÙ©»¢:5pìŠ$®O’éJ³¯SJUKsÕ©
+i~ƒ”EÇü®­µy¦ƒÛi‹çHRµõÙ"GúJ¦Ð¬ÐÙªa×NS‰tïFzRÕjÚZñGI ¤+ͯN)Ãú–dÓÒ–C{ÍŸ¤Ì‘¾¯‘µB©ìmä¼0Ïø—÷5ºs+ZPlj¦k-õ!¥Zí
+ š”¤ÐvùÄ(f¨ ØZéA”±P"5mp†éSâmmƒ“Šî@Z“íŸ6Ž‹]#Aj¾ô,tôšž1TS7·aÀ®šL1{âqºšâÕ˜öÛðGy}­K=Ž4
+8÷{¦Ûå=õ²Rguº0=fúµôûf ‘’Ú‘L½¯5ùqíŒ}©Q$Ë#pÎO#›Ö[Òÿœ¨q*ŠYÖNY‚²ÉwU‰¹_†vjvšê‡Zï·Ï‰˜)OìÙ¼Îz^vTž°Dš y½ã&·tÝBùSvÛû‚°«ëV
+¤îµ*§ô¶¾Oó”#ý²}êïßØ6·ˆhÓVº<Ù4GêÎÆ/Ùv"°ãmÅ1+HÝùÑ8V°í6`ÇÛˆÖ†FJ¤zuÆXR°í`ûk…‘¥94%R’™æ’ÿcEÛ€sUëº>ëæH‹u“ßÈ£_§1
+ÁWã€û4Ë‘nó›‡ÔÆX•L\¢ÕŒJ}FÍ€úó-ê£LÕoY þJ\"õç[ãqµ®·2Œ$%Pш{TØ„¥,ùmIuí4ŃҖK¤ÿÀÆú÷[7¬»©fÜV¾27úñw(¶\Ó«•ýŒzå@¿ð2äûmjY‰‘ªM].º°söí»09²£°^¶s…Gœ%ùø|ú£w”Î
+endstream
+endobj
+3082 0 obj
+<< /Type /Page /Contents 3083 0 R /Resources 3081 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3034 0 R >>
endobj
3084 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 735.953 null ] >>
+<< /D [ 3082 0 R /XYZ 78.37 808.885 null ] >>
endobj
3085 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 724.994 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 768.829 null ] >>
endobj
3086 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 714.035 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 757.87 null ] >>
endobj
3087 0 obj
-<< /D [ 3078 0 R /XYZ 79.37 675.375 null ] >>
+<< /D [ 3082 0 R /XYZ 79.37 719.21 null ] >>
endobj
3088 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 657.24 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 701.076 null ] >>
endobj
3089 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 646.281 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 690.117 null ] >>
endobj
3090 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 630.341 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 674.177 null ] >>
endobj
3091 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 619.382 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 663.218 null ] >>
endobj
3092 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 608.423 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 652.259 null ] >>
endobj
3093 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 597.464 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 641.3 null ] >>
endobj
3094 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 586.506 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 630.341 null ] >>
endobj
3095 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 575.547 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 619.382 null ] >>
endobj
3096 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 564.588 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 608.423 null ] >>
endobj
3097 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 533.704 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 577.539 null ] >>
endobj
3098 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 522.745 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 566.58 null ] >>
endobj
3099 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 511.786 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 555.621 null ] >>
endobj
3100 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 500.827 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 544.662 null ] >>
endobj
3101 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 489.868 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 533.704 null ] >>
endobj
3102 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 478.909 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 522.745 null ] >>
endobj
3103 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 467.95 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 511.786 null ] >>
endobj
3104 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 456.991 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 500.827 null ] >>
endobj
3105 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 446.032 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 489.868 null ] >>
endobj
3106 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 435.073 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 478.909 null ] >>
endobj
3107 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 424.115 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 467.95 null ] >>
endobj
3108 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 413.156 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 456.991 null ] >>
endobj
3109 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 402.197 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 446.032 null ] >>
endobj
3110 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 391.238 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 435.073 null ] >>
endobj
3111 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 380.279 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 424.115 null ] >>
endobj
3112 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 369.32 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 413.156 null ] >>
endobj
3113 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 358.361 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 402.197 null ] >>
endobj
3114 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 347.402 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 391.238 null ] >>
endobj
3115 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 336.443 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 380.279 null ] >>
endobj
3116 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 325.484 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 369.32 null ] >>
endobj
3117 0 obj
-<< /D [ 3078 0 R /XYZ 79.37 288.817 null ] >>
+<< /D [ 3082 0 R /XYZ 79.37 332.652 null ] >>
endobj
3118 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 258.727 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 302.563 null ] >>
endobj
3119 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 247.768 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 291.604 null ] >>
endobj
3120 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 236.809 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 280.645 null ] >>
endobj
3121 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 225.851 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 269.686 null ] >>
endobj
3122 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 214.892 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 258.727 null ] >>
endobj
3123 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 203.933 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 247.768 null ] >>
endobj
3124 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 192.974 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 236.809 null ] >>
endobj
3125 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 182.015 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 225.851 null ] >>
endobj
3126 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 171.056 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 214.892 null ] >>
endobj
3127 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 160.097 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 203.933 null ] >>
endobj
3128 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 149.138 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 192.974 null ] >>
endobj
3129 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 138.179 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 182.015 null ] >>
endobj
3130 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 127.22 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 171.056 null ] >>
endobj
3131 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 116.261 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 160.097 null ] >>
endobj
3132 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 105.303 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 149.138 null ] >>
endobj
3133 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 94.344 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 138.179 null ] >>
endobj
3134 0 obj
-<< /D [ 3078 0 R /XYZ 81.145 83.385 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 127.22 null ] >>
endobj
-3077 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F22 367 0 R /F15 334 0 R /F83 414 0 R /F74 337 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
+3135 0 obj
+<< /D [ 3082 0 R /XYZ 81.145 116.261 null ] >>
endobj
-3138 0 obj
-<< /Filter /FlateDecode /Length 1659 >>
-stream
-xÚíZMã6 ½Ï¯ÈXŽ$’ú
-ãè…}4뺭¦ksxÝTˆjGÞší”Å[-R[ÙºJv¨~ÿÙ:<ð|3æ”BÁD‡í,wÐÈÆm=×*‘ØÜV+ÑãKµ=ÅÄÞ–ôìõyñU¯Ö‰Mù´\Ó ÙðŠæ¥ŒVâÙôa‘Š%Ô(-ý¤4 .fªïÒz,ë“}O~‹„~$„Ÿy¦Ü‰ôY¤È±ïdçuÅmJWkò3néó ’o~¦VùqhŸXûÃ\긿æûHe!– ßκÕI˜î\ΦDX ØýL.XðÒþý²&aúŒ—&ìS <Wç“Ϧh™b’„ô܃Y­9²’Ik…x †CS·ˆ|ýbüK)žå+ó&Ì h0?ÆiÑœ³¦ºŸ5tnmÚ2BHÜ{ ãx8Ÿq)ð.̽ú^Õ jþ#Šòâ5+k:"Õ;c G{R"¥ ''µÉZ`3T,³j¸ØÔ"ílúÖÝ2[7äH2Ž-ÒŽc.+¥ÜˆÀ*?Œ ”qk‘*·´¶).öz¢ÆÅg×Õ^+–Ô>ÄøFöÍjëb_‹Ty›¬}šN)ÝÅ£‰ošô>/¼ ÍhÇò½íáÉËÛñmm7©†.íæR›Ô¢Å¯5¸ãÀ8™3«Œ‹9-RñB=$´A)pÇ©l²avúTlh‘ÚÊ’ø%Îe/ƒ—Á¾å¼
-ÖíšÍÞŸÖvÕ\øÁø
-»e‡TyÞŸ÷u~p‚ö·õçØCu¨`ó.æð]Þ±=:kÔ^éfÄÅ¿².Ü!Ívø,ý³ùÜ0Ý4<û\¨&:¤vï`Ë$Û×úFןÁ¿ì»VRü+SBRkaQÍi^ŽKl?ÜK4¥É½æ£LuHU|­ó»EeìzáCŠN£ô~È]¦–:¤]dè©ß
-„¼  [ŒP,µ@;Öo9g.i’ò(KM@n¨2„©Cª<»J,ä§X›Mµ×Ì8º|R€ä™m‹ÓNÐW<ãó0?ÊÍ?í¥ó& ~Òxzrmd{"UÿÇ»ôûÇÓWkzœ
-endstream
+3136 0 obj
+<< /D [ 3082 0 R /XYZ 81.145 105.303 null ] >>
endobj
3137 0 obj
-<< /Type /Page /Contents 3138 0 R /Resources 3136 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3076 0 R >>
-endobj
-3139 0 obj
-<< /D [ 3137 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 3082 0 R /XYZ 81.145 94.344 null ] >>
endobj
-3140 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 768.829 null ] >>
+3138 0 obj
+<< /D [ 3082 0 R /XYZ 81.145 83.385 null ] >>
endobj
-3141 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 757.87 null ] >>
+3081 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F22 367 0 R /F15 334 0 R /F83 412 0 R /F74 337 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
3142 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 746.912 null ] >>
+<< /Filter /FlateDecode /Length 1545 >>
+stream
+xÚåYMã6 ½Ï¯ÈX$’ú
+‰ ê|5"i™¸h¼'qÕ`Bƒ.ÌH5¢¨EàQíJ;> ®¬e‰6ôåw¬ßùèÞÊ]ÌC½Æ6‚džuöŒH+g¤«eëÙ¹\«¼qá]®ñ;åXlò—£øSûíÉ~õÊ©>¿øá\}ÂÏñýXž ¹^ƒØŽå®¬8Kœ%ûsÝ2°qvo kcV¹wBZ9Cô€…„0K,»hìe9"ý‚১Xˆ`@tn8©ªÑ¤Ñ¼Ap"‘£ŽÈˆ¤Ñ@Î`ô“½º¸Â#ÍHc.ø÷GrË]DnIÇmDÒ¯—φÅõ"“éÿœ‹.Ê$úu90"Uöxmº¸5ì
+¿Ÿ&@cO×\LHw«Å#+å`BkÚÞ–¡5cÒk\)‘‰.Ý0ÄýU×)ÎH…¡’IDƒDdoa- è' ÒFqÔZ'Ù[„:‘é®–PÍïX",úª!åtÑI;¶q‰M18ÇYqXyº’¬mqñÂ6–›6tµÙܧ^5ò&¡½uÔykD•mR²õû×ê4{àùâý!Ë}qØÆò˜ ”¼q®8wÕfs©VB‚—ÕvŽ‰­-üîú¾òYïv̦[îÐB~ÿR£°\å/ ŒV:0'cQZùIŽ&û4áðj,«Ó<驳nëŸù¥? øYœè±ïäæ{Å“ÒjM{Ç…¿ q|øùUáe ߸ֆ]ñ‡˘O÷ãûJ,1½«—€ãíدrTýºìƒ‡÷SÍAþ§!êY«÷1iÃKGbeÛÙöøî(»›üÞõÛ ¼/pÙ†&VMêC¾½ÇŸ›0¥¶X§Û{˜#»£ð|°!àíý÷ôd¨|Úù¥.Û»,Ûi]ìEpÛ6ËóÅÑ7BÕ'ãóU* µ»U
+endstream
+endobj
+3141 0 obj
+<< /Type /Page /Contents 3142 0 R /Resources 3140 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3034 0 R >>
endobj
3143 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 735.953 null ] >>
+<< /D [ 3141 0 R /XYZ 78.37 808.885 null ] >>
endobj
3144 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 724.994 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 768.829 null ] >>
endobj
3145 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 714.035 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 757.87 null ] >>
endobj
3146 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 703.076 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 746.912 null ] >>
endobj
3147 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 692.117 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 735.953 null ] >>
endobj
3148 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 681.158 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 724.994 null ] >>
endobj
3149 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 670.199 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 714.035 null ] >>
endobj
3150 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 659.24 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 703.076 null ] >>
endobj
3151 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 648.281 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 692.117 null ] >>
endobj
3152 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 637.322 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 681.158 null ] >>
endobj
3153 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 626.364 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 670.199 null ] >>
endobj
3154 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 615.405 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 659.24 null ] >>
endobj
3155 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 604.446 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 648.281 null ] >>
endobj
3156 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 593.487 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 637.322 null ] >>
endobj
3157 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 582.528 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 626.364 null ] >>
endobj
3158 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 571.569 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 615.405 null ] >>
endobj
3159 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 560.61 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 604.446 null ] >>
endobj
3160 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 549.651 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 593.487 null ] >>
endobj
3161 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 538.692 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 582.528 null ] >>
endobj
3162 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 527.733 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 571.569 null ] >>
endobj
3163 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 516.775 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 560.61 null ] >>
endobj
3164 0 obj
-<< /D [ 3137 0 R /XYZ 79.37 480.107 null ] >>
+<< /D [ 3141 0 R /XYZ 79.37 523.943 null ] >>
endobj
3165 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 461.973 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 505.808 null ] >>
endobj
3166 0 obj
-<< /D [ 3137 0 R /XYZ 79.37 425.305 null ] >>
+<< /D [ 3141 0 R /XYZ 79.37 469.141 null ] >>
endobj
3167 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 407.171 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 451.006 null ] >>
endobj
3168 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 396.212 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 422.115 null ] >>
endobj
3169 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 385.253 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 411.156 null ] >>
endobj
3170 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 374.294 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 400.197 null ] >>
endobj
3171 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 363.335 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 389.238 null ] >>
endobj
3172 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 352.376 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 378.279 null ] >>
endobj
3173 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 341.417 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 367.32 null ] >>
endobj
3174 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 330.458 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 356.361 null ] >>
endobj
3175 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 319.499 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 345.402 null ] >>
endobj
3176 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 308.54 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 334.443 null ] >>
endobj
3177 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 297.582 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 323.484 null ] >>
endobj
3178 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 286.623 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 312.525 null ] >>
endobj
3179 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 275.664 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 301.567 null ] >>
endobj
3180 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 264.705 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 290.608 null ] >>
endobj
3181 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 253.746 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 279.649 null ] >>
endobj
3182 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 242.787 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 268.69 null ] >>
endobj
3183 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 231.828 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 257.731 null ] >>
endobj
3184 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 220.869 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 246.772 null ] >>
endobj
3185 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 209.91 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 235.813 null ] >>
endobj
3186 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 198.951 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 224.854 null ] >>
endobj
3187 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 187.992 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 213.895 null ] >>
endobj
3188 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 177.034 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 202.936 null ] >>
endobj
3189 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 166.075 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 191.978 null ] >>
endobj
3190 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 155.116 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 181.019 null ] >>
endobj
3191 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 144.157 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 170.06 null ] >>
endobj
3192 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 133.198 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 159.101 null ] >>
endobj
3193 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 122.239 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 148.142 null ] >>
endobj
3194 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 111.28 null ] >>
-endobj
-3195 0 obj
-<< /D [ 3137 0 R /XYZ 81.145 100.321 null ] >>
+<< /D [ 3141 0 R /XYZ 81.145 137.183 null ] >>
endobj
-3136 0 obj
+3140 0 obj
<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F22 367 0 R /F15 334 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-3198 0 obj
-<< /Filter /FlateDecode /Length 2718 >>
+3197 0 obj
+<< /Filter /FlateDecode /Length 2737 >>
stream
-xÚµÉn+¹ñî¯Ð<†¬â
-Ü–5ÀÜ’ø6˜Ó™KÞ!¹ä÷íš‹(vSF²¬&Y¬}!«ùåÏ ¿üò²}½üå&ÔÅ1§AËË×?_„àq1Ž¡¹-×âòõóòÛ+çF¼Yôßo?4ÿŸæáç°q.>8—6|¨ £ÎÞÒˆv´&ÌO`{ƒøûF#qµ•WÚ#@IOö3Ì2öVâíÄÍP˜†ÒR%3*i õ<y›}À ´¢þHØÐ`K•Ô5Æ i2öÍBæ†Áeß2‡„ÝÛþ fˆ•h Thþöûׯ^´FND+\“hÁ¯‘>ú3‘÷ÛŠHÂóVD~ÞGÞk¬FÂ+²ÛMˆ)†B;&%ሠó n êþ¼¤þöKÀV_4s­ª÷4LÞ(`vµ×ïFX<[Î#zA*fÍæʦÕL…õþo€ ÜE2gB Áó *Öìl ¤»u˜Xy±¯5g˜Û
-Ú§‚h= ñ=Ï6õt´²ã-±3<¯ã
-TP@¹JH†‹ï§ÈÜ0 ªÐB‚÷d{ /¥VñÈP»^èÎá…Ü Úõ<&§à)È(WƒI#â“þ3;ÀwZ®Iу“R×ý©¾_-à X¥œ“bH¸]#¼Tð(^nÙ‘ñò¼v(A ÷WÊ츒†g´6:ø¹H©v‚I5$U«%R;H…Ö`MÞß“Œ>³‹zÚ•«TZΤƒ!•rÊR¡R‹^“=΢¸ÞZJ)Ò'º’$‡Z¿H£
-åPiqÆR+ÉÚ/Ø'üâ"Ê2eÔˆù¹FG ©¢ãŸ ¥aZè¯ðmÖ¼aiÕRŽú3‚šieFÔ§Ž¨oÿ÷¼ONI Àã4K9Í”ÚãVµ ù Í²ßo?<x@ΖäcªX¾¦ß¸Õ³à}‘)Êc'”1e-¿è
-ë Ê&˜¹f\ÎÇ¥KŸ‡ëóg¶~ºÿu>*}‹üQËüW>³ÚÐéÒA1eu¨`×&¡Ž·0îGBž´Ç$Ú#ˆ›3xõ Y PúìÚÝÕëá“]N7ßdFóOæõä&Z@O¬rž¢Ó‰1™Üžw ™18"âd¾»ˆÒ#ñ˜†ï¹Ì
-9¤ã}Í=´Z÷°_1ÐqÊ•2“‰Éåñ!Mç\‹³|hÞXr¸ˆ‹žÌÝÊÞ'æ¹|¼r›Ï¥ÌPÀîE©q`V©‘Ô΃’ÔZH„+eÉTGÌèêçÖAwúx­«ŽØ®|¿•2"ð4¬ VAt¶n¦#Täɡγ¾%Gt‚Y§‡r´Krì žA%‡Lx?¤ËT Ç£9T^Øå¹Ç+üèhRɹ®‘>¥R ØÞLVq͵TcT~Gf–3‡fè1ÕšÌZHªª3éȹ¶©™\êR·®û©|Â\‹®¯êÝ™®Ð>õ±1lëóÃaaí‰Î;=X”‘öe¨±CÉ5µjZ"ž×ÂãítO}&VСF¯êƒÕ6Ç9'¬10Ÿæ=ŸSûYòÃwv¾(+ånè×
-”’º–Óºr­1¡/˪>/{4·¾ø"›9’‡¡K2ÛÚÕû×A’c7w‘ËÒÖ !5—ÏÖ!B3£Li¹\@4Lð»ôÝùK‹œ9w
-מʡ-kµÙÌ~ªâº<{?å&hJnJ9Ê,î’îå2ÀüH×2ò ¾ÒÞtFD6~äùײŒƒEJÉXÁ $D¡˜°r4íV£4¹ÕȦdT%}º$D.€±Ö3ÑAz¨Îím}Tá‡t}«L‡ ´ѶXptŽËÄtQ1Qõ¦ƒ­ÈûLI†=ƒ¯ë.¹ëñܘž’›¾Ç}Õ”À!7CÎaÁ¯Cv¨…K‡° Ç¦î>K^ð´ù€æ ­"¾vèÚAZ1Ÿ––tlìÓšPo0×abž{PÎI÷w§çŦ›”{Ôëöãò£u¹&¯k´iímŠ&î‡ä“tÜÏç§nÇÌ0_9›9‘ [H=ŽˆÇüjh:)›zÍY¹4kT¶Â£5¶dOxP â­º¦uÇ•‚AUÇ.J SâÞíù¬“¤ØBº¯!äïymp4¶v/=hO|oì®ñ߸#Úd䈯ÃL¸bÊ©ÑüµL¯tÜ¿\G¸Òn8FoË¡K8É4ê!Qk™_© ­‹XYdÚ˜V¸Vhuf†«8`FØ!Žv ÇÒªâ?ÕšäÍ}3V”»Zþ…Tõß-$/síNsduà^
-w­‘a9ʳ¡,¦} œVGene‰¹ÿ·u³÷­ØQgq ãR%õÛøxA©=ôÍ›Ä(ÆKEýþ‚«Þÿ‘Uo3Ħ!>xÿ'¯©»­â<ª½¢iêÝ:|‘¸·U®z,=Õ3Ê@Þ»U¹‘-78áp%
+xÚµÉn,¹íî¯èxŠDj .·{€¹%ñm0§ 2—¼CrÉïGKK«U¥6rh·»$QÜER,~ùóÂ/¿¼l_/¹ uqÌiÐòòõÏáøE\Œch.F Ƶ¸|ý¼üöʹoý7ÂÛÆÿ§yøÅ9lœ‹Î¥ Ÿ0jèó£·4¢­ óÃØÞ þ¾ÑH\íGå•öPÒ“}Ç ³Œ‡½•xûñG3&‡¡´TÉŒŠGZC=Ï@Þ¦A0­è…„¿Ç64ØR%uqABšŒ„}³¹a°@Ù·ŒÀ!a÷¶?Æâƒp%Úš¿ýþõ«­‘ÑJÇ×$ZðëA¤þLäÄý¶"’𼑟÷‘÷«‘ð
+$¤ìvâcŠ¡ÐŽI G8bÆ#È|‚[‚úŸ?/響ý°ÕÍœA«ê} “7
+˜]íõ»‡‡Ï–óˆ^ŠYs‡¹²i5Sa½ÿ (w‘ÌYPC°À<HƒŠ5;[¸ðÝabåÅzL¼Ôpœal(hŸ
+¢õ,Ä÷<ÛÔgÐÑÊŽ·ÄÎð¼Ž+PAå* z,d ;E†à†aP…¼'ÛKx)µŠ—@†Ú ñ²çðBîízH“ŒSðd”«Á‡¤ñIÿ™à;-פèÁI©ëþT߯–a¬RÎI1Ô+µFx¨àP<¼Ü²#ãåyíP‚†o¯”Ùq%- Ïhmt<½UJµLª1©r‰ÔR¡5X“÷÷$£Ï좞v¥Æ*•–3é`¨É¸Fe ©P©E¯ÉgQ\o-¥tÒ'º’$‡Z¿H£?ÊòsÆReuKv«àÞn³5Ò ÷]?lC»0÷0å{9ìåÔG¬óZY¦Œêy­ À:ËëÒ§ñ’†i¡Gx¬³xµV­ù8èxÆŠQ3­Ìˆ:½£¼º‡äu"Z
+ÈzeÅ0³Dëݤ»ÛQÊ{JlN4|òŸæÚÂ4ßµ^c öð©ðlê
+uØJìäY½ëÐrò¨„Í¥z »ä-Z@½E´„.Œºeòwâí![Œvý¼r4Si)X”â>×ÚI#ìQÜŸvö伨/‡
+C‡|2¹È,î
endstream
endobj
-3197 0 obj
-<< /Type /Page /Contents 3198 0 R /Resources 3196 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3076 0 R /Annots 3248 0 R >>
+3196 0 obj
+<< /Type /Page /Contents 3197 0 R /Resources 3195 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3034 0 R /Annots 3247 0 R >>
endobj
-3248 0 obj
-[ 3135 0 R ]
+3247 0 obj
+[ 3139 0 R ]
endobj
-3135 0 obj
+3139 0 obj
<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 236.441 745.828 246.868 758.348 ]/A << /S /GoTo /D (Hfootnote.43) >> >>
endobj
+3198 0 obj
+<< /D [ 3196 0 R /XYZ 78.37 808.885 null ] >>
+endobj
3199 0 obj
-<< /D [ 3197 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 743.055 null ] >>
endobj
3200 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 743.055 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 732.097 null ] >>
endobj
3201 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 732.097 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 721.138 null ] >>
endobj
3202 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 721.138 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 710.179 null ] >>
endobj
3203 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 710.179 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 699.22 null ] >>
endobj
3204 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 699.22 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 688.261 null ] >>
endobj
3205 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 688.261 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 677.302 null ] >>
endobj
3206 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 677.302 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 666.343 null ] >>
endobj
3207 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 666.343 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 655.384 null ] >>
endobj
3208 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 655.384 null ] >>
-endobj
-3209 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 644.425 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 644.425 null ] >>
endobj
281 0 obj
-<< /D [ 3197 0 R /XYZ 79.37 607.769 null ] >>
+<< /D [ 3196 0 R /XYZ 79.37 607.769 null ] >>
+endobj
+3209 0 obj
+<< /D [ 3196 0 R /XYZ 81.145 586.927 null ] >>
endobj
3210 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 586.927 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 571.245 null ] >>
endobj
3211 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 571.245 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 520.213 null ] >>
endobj
3212 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 520.213 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 509.254 null ] >>
endobj
3213 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 509.254 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 498.295 null ] >>
endobj
3214 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 498.295 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 487.336 null ] >>
endobj
3215 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 487.336 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 476.377 null ] >>
endobj
3216 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 476.377 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 465.418 null ] >>
endobj
3217 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 465.418 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 454.459 null ] >>
endobj
3218 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 454.459 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 443.5 null ] >>
endobj
3219 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 443.5 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 432.541 null ] >>
endobj
3220 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 432.541 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 421.582 null ] >>
endobj
3221 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 421.582 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 410.624 null ] >>
endobj
3222 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 410.624 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 399.665 null ] >>
endobj
3223 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 399.665 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 388.706 null ] >>
endobj
3224 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 388.706 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 377.747 null ] >>
endobj
3225 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 377.747 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 366.788 null ] >>
endobj
3226 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 366.788 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 355.829 null ] >>
endobj
3227 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 355.829 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 344.87 null ] >>
endobj
3228 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 344.87 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 333.911 null ] >>
endobj
3229 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 333.911 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 322.952 null ] >>
endobj
3230 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 322.952 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 311.993 null ] >>
endobj
3231 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 311.993 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 301.034 null ] >>
endobj
3232 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 301.034 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 290.076 null ] >>
endobj
3233 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 290.076 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 279.117 null ] >>
endobj
3234 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 279.117 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 268.158 null ] >>
endobj
3235 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 268.158 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 257.199 null ] >>
endobj
3236 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 257.199 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 246.24 null ] >>
endobj
3237 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 246.24 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 235.281 null ] >>
endobj
3238 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 235.281 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 224.322 null ] >>
endobj
3239 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 224.322 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 213.363 null ] >>
endobj
3240 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 213.363 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 202.404 null ] >>
endobj
3241 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 202.404 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 191.445 null ] >>
endobj
3242 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 191.445 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 180.487 null ] >>
endobj
3243 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 180.487 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 169.528 null ] >>
endobj
3244 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 169.528 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 158.569 null ] >>
endobj
3245 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 158.569 null ] >>
+<< /D [ 3196 0 R /XYZ 81.145 147.61 null ] >>
endobj
3246 0 obj
-<< /D [ 3197 0 R /XYZ 81.145 147.61 null ] >>
+<< /D [ 3196 0 R /XYZ 93.716 89.795 null ] >>
endobj
-3247 0 obj
-<< /D [ 3197 0 R /XYZ 93.716 89.795 null ] >>
-endobj
-3196 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F16 336 0 R /F59 346 0 R /F84 425 0 R /F22 367 0 R /F81 377 0 R /F83 414 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
+3195 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F16 336 0 R /F59 346 0 R /F84 425 0 R /F22 367 0 R /F81 377 0 R /F83 412 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-3251 0 obj
-<< /Filter /FlateDecode /Length 1917 >>
+3250 0 obj
+<< /Filter /FlateDecode /Length 2097 >>
stream
-xÚÍZÉŽã6½÷WøÂ!YÅ h°Ûö
-"Xmñôù盢ò¤N.p'g•V>ÿ>ýþ.¥õRƒ.}þ Ð8)’}¾Œ:kGãNÓs¼n4çzþãóWÚÉ·“B-€ˆèöJh÷j²Ö Dß#è{YM4êKFTÄ…ŽWAä¹×
-„—¡Gœ¸JÜVh8ÿ¢ý{+{ËÛÄíõc I@uÙ#¿£iÞ5Þ·s—¢®óÝ-‹ËÚø›Tp«3ã¸ú¤>ê]RFD˜1¯+±T ÃÑâ\¼¶£Ëýꪄ’˜;£Â ”´“¢[ª`“ªôf¥
-ššß61®åu­‚ŠÈ.ÌÇHPž*ýÅÝVÝÔþp&)§g} ù’Îη³ '®Üû}±I©øx
-CMÊéÕ&å6?Ô>ÒôãͬÂZ \#- Lkóµïx÷xÄËüW ñ ¬Z û­Š§5È£nÝ0©ó~=4¿Þ|¦
+xÚÍZÉŽ#7½÷Wèš&Á (Z%>u3æ:sòÅÿppg2#S™åjxP+Å$ccl,yùßE^~ývÿøöËS™KÁj‹—ÿ~SôB^ÔÅîâ¬ÒªËÇŸ—?Þ¤´^JxÒG_¿ƒ'¥QR¢Ï£®ÚѸÓô;~4ç~ýÏÇo´“n'…Z
+#*÷³D ¬¨®"&®§ÿ#‚ Á+²ÁkANƒÐ×Ñ‘
+'ù¦ôÌØÀñ Çr
+¥-e7zF2·E0ÅümNÓ§P µíHž?GÞ¨ä.uûh­¡<ÖOò AXÃ2aÍ1&Ð"`F2áUZ±kEª§ 5`E>kˆüVe}ÍrŒÇ8veȧOHɆܘˆ±šT Û{öt(Õï:óKŹ>É]×GY¤Dqç=êí÷ñÔï­‡çj½=+o¯„¶2
+çØÔßOÙú„4ÈìÆØz‚ÙïÔÙÒqóÀ(9 j–¶ÆhE€z_£— Â+;ËΚÃõòÁÞÎHñ8uè…7Ž£îhÑV\ñ„4œà¯‰œðÁs”L9”²Â…R+öR.¤lTú¶F—,t,î¨Û-n4íªüŒ4&o¡æþ²$lŽßK’8S÷$n·-%cY+úo%"”†#Æ{¬#2 =:¾nÜ:'TXí„÷’i?z’œù\F•õø„o=4Ãîj?Ï+¶Wf å8‹êu.¸¾k«Jk—Ò~#ß“åM®4Û¼{žSiÊ(L§“šE³î½
+H*¯ý€ZrÔ|P¯·šì“"«bÅTÍ ¼,˜fPËú¶²äVÐZ'Ï7’wSÞ°çûv¦¤˜€vú`¼‘÷b£ÎûÜaY±n¸TçUð:¶\`vÙZ}R]äîcÀQœj[N@µŠ/d­Úù¥‰¬ÿ­¢jÖšïfŠôÞšêÞÅYfêúÎ7÷^˜LSemþ•ŽÉ õ€Ú³YÇÁ«ªg T{ÇË«³Úe[
+¯ÞþTö©³õ%û}‘RNª€Ò @V Ī‚%Pê@¾Ø[Ó½_ê4¯\Û•~d›¾Ãy5œÛó'ˆ}?;Š~ÂvC¬ÆÏd«¥Ö®¼‚Â?× [Ä¿ü;Z}NW¿l”x®ZzxÜ~€â˜1šµ<c?Ðv@4Àñ”’Ÿ•Ålõ&¶1¶/eðù™€¸® Ó^/¢’)“ãîzú†ÑÐMLŽÜº´DÉ„/ Tyaƒã Ôh5d‚ՕЪŸm3±5=fAºÕwËÞô*ÑÛMæ
+%Wt;uMÆwCöO#òŽœ»uW4•1{€Z„ìÄƵ¹“ÄΕàڻ̙¥ùÏ
+;¼‚Ú%‘MŒëAAyݨ "²“¿ƒ¤Úgt[uŸÈ®uÐÂdó8ãL& ìúÆ ,€ŸlçkŸÿ‚aâhª´ó'¤Ï¶ó·yüGVM¦ëÝ:·Æã-#­®‘–­kógßõîñˆ·^Ç£²jÂí7õ^V9 :vÃ$ÏûQýy§
endstream
endobj
-3250 0 obj
-<< /Type /Page /Contents 3251 0 R /Resources 3249 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3076 0 R >>
+3249 0 obj
+<< /Type /Page /Contents 3250 0 R /Resources 3248 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3034 0 R >>
+endobj
+3251 0 obj
+<< /D [ 3249 0 R /XYZ 78.37 808.885 null ] >>
endobj
3252 0 obj
-<< /D [ 3250 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 730.971 null ] >>
endobj
3253 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 730.971 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 720.012 null ] >>
endobj
3254 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 720.012 null ] >>
+<< /D [ 3249 0 R /XYZ 79.37 673.39 null ] >>
endobj
3255 0 obj
-<< /D [ 3250 0 R /XYZ 79.37 673.39 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 655.255 null ] >>
endobj
3256 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 655.255 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 644.296 null ] >>
endobj
3257 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 644.296 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 633.337 null ] >>
endobj
3258 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 633.337 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 622.379 null ] >>
endobj
3259 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 622.379 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 611.42 null ] >>
endobj
3260 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 611.42 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 600.461 null ] >>
endobj
3261 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 600.461 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 589.502 null ] >>
endobj
3262 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 589.502 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 578.543 null ] >>
endobj
3263 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 578.543 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 567.584 null ] >>
endobj
3264 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 567.584 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 556.625 null ] >>
endobj
3265 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 556.625 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 545.666 null ] >>
endobj
3266 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 545.666 null ] >>
+<< /D [ 3249 0 R /XYZ 79.37 497.043 null ] >>
endobj
3267 0 obj
-<< /D [ 3250 0 R /XYZ 79.37 497.043 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 466.954 null ] >>
endobj
3268 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 478.909 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 455.995 null ] >>
endobj
3269 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 467.95 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 440.055 null ] >>
endobj
3270 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 452.01 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 424.115 null ] >>
endobj
3271 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 436.07 null ] >>
+<< /D [ 3249 0 R /XYZ 79.37 385.454 null ] >>
endobj
3272 0 obj
-<< /D [ 3250 0 R /XYZ 79.37 397.41 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 367.32 null ] >>
endobj
3273 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 379.275 null ] >>
+<< /D [ 3249 0 R /XYZ 79.37 330.652 null ] >>
endobj
3274 0 obj
-<< /D [ 3250 0 R /XYZ 79.37 342.608 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 300.563 null ] >>
endobj
3275 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 312.518 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 289.604 null ] >>
endobj
3276 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 301.559 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 278.645 null ] >>
endobj
3277 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 290.6 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 267.686 null ] >>
endobj
3278 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 279.641 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 256.727 null ] >>
endobj
3279 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 268.682 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 245.768 null ] >>
endobj
3280 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 257.724 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 234.809 null ] >>
endobj
3281 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 246.765 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 223.851 null ] >>
endobj
3282 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 235.806 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 212.892 null ] >>
endobj
3283 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 224.847 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 201.933 null ] >>
endobj
3284 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 213.888 null ] >>
-endobj
-3285 0 obj
-<< /D [ 3250 0 R /XYZ 81.145 202.929 null ] >>
+<< /D [ 3249 0 R /XYZ 81.145 190.974 null ] >>
endobj
-3249 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F83 414 0 R /F74 337 0 R /F65 335 0 R /F75 338 0 R /F59 346 0 R /F84 425 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
+3248 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F83 412 0 R /F74 337 0 R /F65 335 0 R /F75 338 0 R /F59 346 0 R /F84 425 0 R /F22 367 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-3289 0 obj
-<< /Filter /FlateDecode /Length 2228 >>
+3288 0 obj
+<< /Filter /FlateDecode /Length 2243 >>
stream
-xÚÝ[ÉŽÜ6½ÏWèL“Å4Ð=ê1à[’¹>%ˆ/ñ!¹ä÷Ãâ".b÷¨ÚÈҶ4”TzU,¾Z(óåÛ—OO—·§¯
-\&´šW×CÀ…äÌY¿“hЄòœ'ŒâZÎô6|Ó‹Çq¢ ™ðzÔB]9·þ˜ ˜ÚKÒ¾à:¢õ{}påhŽ+‰ª“P ¤™éTìsT§^R£“ØéDÄÈ%ëfÍ…†±—Ô`Ì<’ˆÍx`Rø)¶3 Û ©bùE¿(«mYýâ½ûêNŒEÕÏ 6wIsù^PE çÄ=Èžê’¯ -Æ…ˆÜ¥qKžË™âb
-ßÑà÷’ü°E–ÌøCÄ"âÔž)S/Ò4œ½¤ç5cóéˆ^²¿îç¡DU¼f¨+Ö(Ç”“S}MŸ^RÕóŒÌ23&ž§FÅ*-Ó ¦>"iX{IG||¿ŠUÎzJFsçY¢ž`˜6Óèu4={I{Ã|"f 乚ÞÑôñÈvÔø ¯Ìˆ>S˜1gšD¼\…ƒá%FÏAR=bUPü‚ˆS{ÉŒó3œÄ:HÖãš9ãò€êp°r
-‘H{A{ïĺsûm²nZyTäV0kÅ :1H’æØ‘JÝë*;kriS¼´¨8Hêó)kÆ\¥æ«Zogçí çWçºÏys¾¾cËIn¹»gâ™»{&Ì5ͯrŽ½gퟡΈòÌé¹óÓâÿ ©A¨sfÅBá;Œï÷fçg±¯tÌy5µ/-$õy`´BÖ²0J­šfû‚e^ê)£Ðr¨ARƒP¤\´«2#*x0ïÖÂ0o§ù1'$5¸_òìa.'ÅÉ ãb—gh çEƒ¤ŠÓŠŽîõËR¯OyÁx³òZsªXSl0 §Øüj;eií’:kÛ•5£ØFbn_óݯVÍ0 Ç™÷~D5élÝírË„;Ý4q¾” rÀÌæë`^˜uƒ ¾QšªxM*Æ£oÚtwÛx]KéÀ„kÎ
-ÝM)ß/þ-}ÞzÆÉÂçUYh#
-1%-ª~¸ä‹~øŒ2sµÕqrð¼µ;²-šWFáñ%u]m/Ï·‹—Q7UYçÖ
-Ê“âÔ Âó ÒÏ\+ƒaeZ&ÇûÉÚZÛ·JÁ„RÃÛ„x¹¿ÆMêm¼ƒ±DˆØ¹¸-IýçÛ’N~ŵ(Ì‚4.îX!Ôõ
-m£s®²ðy%nðŠÒÌÙrí¨¼ŠIP3^9XÇ^鼂‚ïò
-¶L=…}°¶ Ä,qê{IX
-5陦90ŧ4}´pËÛƒ¤&Á{°¡¯eW•×Ú¤h·Š$š duJMS‹£Å`¶Á ©ê2o‘Öñ–Ldn}Y^7ßJ;ll“ _’åÜÔ5M×^R³±d#×—Yºfzz˜FQUË@“üTKEÓ²—TµÜ—-)A/´ÛÎRi°5í•[ùAG혞;­¤©Ø êçñ@¦ED­,3BÌ`·AI?¸±)¥aFïBx´4$Q×Åû¡û‘õ
+xÚµZËn,·Ýë+ú./Y|‚€dÀ»$Ú^9ˆ7¹‹xãßOÍGsF]J¼hM«§O‹õ"åöû&·Ÿž®Oß߶(¢g¶=)¼!7µù(´ß¼SB:µ}üØ~y–Ò)õ;ðòMWÌUJõŠ¿€Çm¿ê¥´ŸSx\êUMWñŠ“õŠ‹¼Pðnx±Ý-ÿOçí)¸¼üúñó“–Á¿?¡6nFÄ 4ôr(˜7^À.á^ð0ø·ŒTòý=˜- 6œ=Jô"Baˆ*‰Uáå›ûœÅ&
+RÄgV‹šþ‘d€uµ²ê ›åŽ—ǧBX×ɬ¥´(& ±÷G`(‰ø–EL¿ñØüZ70šû÷ñÌ€ E°›ŽW/¹óHaùçnèwe—&J¾[ZE9¬WkY‡EøçT>ãûÜ¥¸·þ»f»—ýìÚµœ`x(g£õ¿Ú9©®öùÄêS›   hÕ1e)š|4å«|ôŽqk­  ð¼—âEÝ'xúH›WûÇËãêu–Í4¯so•A¦ãöð}Pùpo̓QÝT‡®ƒµ7õî”r
+£µ™¾¦Ôëã9î"ÎJøŒc©®¾Ï-£þñû–OþNsQ¹’oìà´&éÆ
+š¾,¢Ä¿b¬þÀÜ®_Q½w\ù•“UFõ+#ÐìWø¡_aÒF·ª—ÑëlÝA
endstream
endobj
-3288 0 obj
-<< /Type /Page /Contents 3289 0 R /Resources 3287 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3076 0 R /Annots 3339 0 R >>
+3287 0 obj
+<< /Type /Page /Contents 3288 0 R /Resources 3286 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3034 0 R /Annots 3337 0 R >>
endobj
-3339 0 obj
-[ 3286 0 R ]
+3337 0 obj
+[ 3285 0 R ]
endobj
-3286 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 236.441 434.994 246.868 447.514 ]/A << /S /GoTo /D (Hfootnote.44) >> >>
+3285 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 236.441 428.892 246.868 441.412 ]/A << /S /GoTo /D (Hfootnote.44) >> >>
+endobj
+3289 0 obj
+<< /D [ 3287 0 R /XYZ 78.37 808.885 null ] >>
endobj
3290 0 obj
-<< /D [ 3288 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 3287 0 R /XYZ 79.37 773.016 null ] >>
endobj
3291 0 obj
-<< /D [ 3288 0 R /XYZ 79.37 773.016 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 754.969 null ] >>
endobj
3292 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 754.882 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 726.252 null ] >>
endobj
3293 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 743.923 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 715.293 null ] >>
endobj
3294 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 732.964 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 704.334 null ] >>
endobj
3295 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 722.005 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 693.375 null ] >>
endobj
3296 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 711.046 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 682.416 null ] >>
endobj
3297 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 700.087 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 671.457 null ] >>
endobj
3298 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 689.128 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 660.498 null ] >>
endobj
3299 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 678.169 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 649.539 null ] >>
endobj
3300 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 667.21 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 638.58 null ] >>
endobj
3301 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 656.252 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 627.621 null ] >>
endobj
3302 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 645.293 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 616.663 null ] >>
endobj
3303 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 634.334 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 605.704 null ] >>
endobj
3304 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 623.375 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 594.745 null ] >>
endobj
3305 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 612.416 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 583.786 null ] >>
endobj
3306 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 601.457 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 572.827 null ] >>
endobj
3307 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 590.498 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 561.868 null ] >>
endobj
3308 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 579.539 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 550.909 null ] >>
endobj
3309 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 568.58 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 539.95 null ] >>
endobj
3310 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 557.621 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 528.991 null ] >>
endobj
3311 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 546.662 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 518.032 null ] >>
endobj
3312 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 535.704 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 507.073 null ] >>
endobj
3313 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 524.745 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 478.356 null ] >>
endobj
3314 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 513.786 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 426.077 null ] >>
endobj
3315 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 484.894 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 415.118 null ] >>
endobj
3316 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 432.092 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 404.16 null ] >>
endobj
3317 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 421.133 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 393.201 null ] >>
endobj
3318 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 410.174 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 382.242 null ] >>
endobj
3319 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 399.215 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 371.283 null ] >>
endobj
3320 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 388.256 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 360.324 null ] >>
endobj
3321 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 377.298 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 349.365 null ] >>
endobj
3322 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 366.339 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 338.406 null ] >>
endobj
3323 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 355.38 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 327.447 null ] >>
+endobj
+285 0 obj
+<< /D [ 3287 0 R /XYZ 79.37 290.547 null ] >>
endobj
3324 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 344.421 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 269.704 null ] >>
endobj
3325 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 333.462 null ] >>
-endobj
-285 0 obj
-<< /D [ 3288 0 R /XYZ 79.37 296.05 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 258.745 null ] >>
endobj
3326 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 275.208 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 247.786 null ] >>
endobj
3327 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 264.249 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 236.828 null ] >>
endobj
3328 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 253.29 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 225.869 null ] >>
endobj
3329 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 242.331 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 214.91 null ] >>
endobj
3330 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 231.372 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 203.951 null ] >>
endobj
3331 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 220.413 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 192.992 null ] >>
endobj
3332 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 209.455 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 182.033 null ] >>
endobj
3333 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 198.496 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 171.074 null ] >>
endobj
3334 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 187.537 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 131.747 null ] >>
endobj
3335 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 176.578 null ] >>
+<< /D [ 3287 0 R /XYZ 81.145 120.788 null ] >>
endobj
3336 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 136.727 null ] >>
+<< /D [ 3287 0 R /XYZ 93.716 89.795 null ] >>
endobj
-3337 0 obj
-<< /D [ 3288 0 R /XYZ 81.145 125.768 null ] >>
-endobj
-3338 0 obj
-<< /D [ 3288 0 R /XYZ 93.716 94.776 null ] >>
-endobj
-3287 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F22 367 0 R /F15 334 0 R /F59 346 0 R /F84 425 0 R /F74 337 0 R /F16 336 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
+3286 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F22 367 0 R /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F16 336 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-3342 0 obj
-<< /Filter /FlateDecode /Length 2522 >>
+3340 0 obj
+<< /Filter /FlateDecode /Length 2518 >>
stream
-xÚÝ[Én$-¾û)Ꚇ`MɲTåªiξæ:sš÷¿[°%I‚ÛÒ/ýj¹Ë•Aì‘`Jäí¿7jÿÿÇÛãëí÷.·› ›an_ÿyc7jÿ±›¢ÄM+F¨b·¯ÿÝþõN©zPÊ7ûywŸÿþúçu`ê÷nÄÍM)nJF5áZ$¹}ü’ Ýo/ûótŸøh“ÇßØ'¥ÂØ'Âò°Çïv¾²?â‘辂@ëèÀñ8"è9R¥õò38ŽBÃË¥ó…Œ%%ŒBWÆÆc5ô|#Lð½’=z0„YåôèÅ”7M60-W B JI¢ Q=VôŠ†Qµj•ÆŪ ˜&
-%èp}Ó˜s^üñ‹KåW±(V­BÑƧ[ðxçÁá‰P ßƒ‚´åAØ÷¬ Øÿ#µW-ç£éºá0¬D¨€OðYüÝ=w¸OMóºÒ™=ãŽ?“#’¥d»*W×oó´rOå{à8 !]@ûpë˜jÔŽàÞMæÉóeÚ9)ˆG0a¤N;Ž;ñ4OÜ…pk²Õš:îÞc˜ƒì6÷{ÜÅ^ÅŸ iK@8¨ä¶¥­hhÁMÀAŒ*„™A‡a…¤¿gvꌌ™ÄÍòV¢BŽ£~ÄéÛÑyN
-Ëpü³Qrù‡{´‰€¦ÃÊù O<ç¾Þ…pØÜ<íÐîJŒ={:ÖÆ~ä:²õ¹½Š¥½êÖê„ß+Øðš\"&CŒ¢G'S[Z8˜@„A‚
-X—Ýû’C×@ߥD)è1ÛÖš^šhÊ»ôfe ÐŒWûªÌ‹Çœx°7öM]I›©µ]]ÉIÓ²@\¶H° ¥ÒDÕåd®/e •-kL˜ƒWøÉIÑ¥E®bÙîòà>¦u/
-.h¦ñ>¯ùóùùbîç4
-ð³í9ßE:1/ôy KíY\|€}¥Z÷81iË´5õèM”Õ€îGÕÍí={f¾lê®<{“^‚Þ!{Dç±äØ‹Ý=Šh„yÏ*¹Š7~ôï3Æ¢‹”âåò9?˜Ô¢j“Mö4;[ÆGÍV8%s®F¶ï¶OÐE¿ä1 Œ„Œ~„†Ó {ú!‰µdÜ-]ç[¿Þ "†çÓij¨\«›mc=íÎöQ»5g;²ëÔqe§vá5—S)¤rê3g»3z_ÚLˆº¤Ã?¢Å¸ÀC™¶(|['S]áß×*íi¹W#Tó'Ývȶ-„1Ñ¥_j‡ ùvȽcÂW¨nVùzõGÛ!¡6¤ê*i­j–Û!! a›îr²Ô5@©UØÇ¥ ÖÉè×£0XÖà>t½r8L5ùëãFòFô>Žìóq¤œƒþŽ{S¯ œEõ M€›®Ï,µ< VÄ%›Žu_ýÆ +fÄ1]S9LÍ&ªU3–Q£òɯÍÇ4—%`a2EX–aúÕÊÝ­|׋ìb…=¥gŽ^¤¦aB-¾/ü Å öˆr²ñÁ¹C|l¶øµ9i™;îH·¨(ä˜l•\x±ãxsíø,Û
-Ì~ä$bÒ1K˜kxo®Ý-aê0;Ýmq)ñ´è"€"Ä•'Ÿ9yº7ë-î‹Y¡rµµÈ‡“`%ÏO‚ãhuæ©äêɬŸÇX=DBgù·ó{9 ÷¦?Ðâý¡pFyŽ9}2«DuvŒóûî5éÆAç
+xÚÝ[Én$-¾û)Ꚇ`MɲTåªiξæ:sš÷¿[°%I‚ÛÒ/ýj¹Ë•Aì‘`Jäí¿7jÿÿÇÛãëí÷.·› ›an_ÿyc7jÿ±›¢ÄM+F¨b·¯ÿÝþõN©zPÊ7üüø÷×?ߨ³P¿w#n†lJqSâ0ª Ð"Éíã—é~{ÙŸ§ûÄ'@Ó˜<þÆ>)Æ>–‡=~·ó•ýDŸðZGŽoÀAÏy*­—ŸÁqz^.…˜/d,)aº26«¡ça‚÷è•ìу!Ì*§G/¦t¸i²i¼XjPJê±¢W4Œª-P«$0.VÅ4]Añ5c¬‘DÇ̼:‡û¨Lö™æñôÛÓíÑ}ÒÉñ¸°+ñç`þþóûbm7Ƭ job%8!8¨
+JyeüÞ™¼mV `uW(Ao„뛦@À¤x ˜óâ_\*¿ŠE¹Û':ˆ6>Ý‚Ç;O„ú
+’è¼ {AÎm(öc9¢m=®V·.›9lݪ@¯ÕÓ ÒùÞ1e®má…eK®cõêN8'’o½Ø:yi'5’ÓU](ªWY`å¡[çoXç‹"¶Ok%±Wl¥gGL˜ Iú,LcJ«¦œ±¯J€È®™¨Çšpk šwロì?[Ê"·Œ¬Ëî}É¡k ï‹R¢ôŠmkM/ÍF4å]z³²hÆ+ƒ} UæÅcN<Øû¦®¤ÍÔZÈ®®ä¤iY .[$X…Ri¢êr2×—2„ÊÈ5&Ì‚Á+üäƤèÒ" W±lwypÓº‚À4ÓxŸ×üùü|1÷s€À‹ãI³XÌ°°öhŽ–Íø¢j¥"tןø’jk ÏÞ=Ôª(B~â>ÛÎ=4ò^5ÎïÛ¿Õ9L/b3¿‡5œ:r‡,x\ùJ௨•5\1Ò_*ÿÖVùpsÜ÷?Q°Ä¨n‚š,áPÁ5²uøÙöœï"ˆ—
+ú¼ÀŒ†¥ö,.>À¾R-Ž{œ‹˜€´ŠeÚƒšzô&Êj@wˆ#‹êævˆŠ=÷3[¶Fu×@ž½I/AïÀ=¢óXrìE‰îE4¼g•\Å¿z÷cÑEJñrùLjQµÀÉ&{š-ã£f+œ’9 W#Û÷Û'è¢_ò˜FBF?BÃ醽ýÆÄÚ2¿®ó­_oÃóiâYT®ÕͶ±žvgûˆ¨ÝȳÙu긲S »ðšË©ÎR9õ™³Ý½/m&D]ÒaŽÑb\à¡L[¾­“)‡®ðïk•v´Ü«‹ªy“n;dÛ˜èÒ/µC Ð|;äÞ1á+T7«|½ú£íPaRu•´Ö5HË톰Mw9Yj‡ Ô*ìãRëdôëQ,kpº^9¦šüuq£ y#zGöù8RÎAǽ©×΢ú„&ÀM×g–Zž+â’MǺ¯~c†3⋇ή)‰¦fժΙ ˨Qùä×æcšË°0™",Ë0ý‡j劀îV¾kN„Å v±BŽ‹žÒ3G/ RÓ0¡ß~†b{D9ÙøàÜ!>6[üÚœ´Ìw¤[THÒI¶fáÅzŒãP̵ã³l+0û‘“ˆIÇ,a®á½¹v·„©Ãìt·Å¥ÄGDТ‹
+N¨.ßs "ãVrFµHAßß;$ ´xGÑúBŽ4A".µ–wú² ʃ]–iy¸‹A$ŽOוÎbÑóí gÕêÐ^[(îpŒK†(“"‹D{d>àvS`~¦ð9ˆßÒµ£–¦ºÂ3Þ¼ñ"ƒ¼Õ}Ëå}†ßúg×£L°Ã¦QК¦ "Yª †Bä6{ñ·ˆÚ"TµÅóO²ÓDC?èÊ5çjª›lÉ|†wò ßD:'áÇUõh¢©aá»s ̤nŽâ. MÑèo·kœÚp¨ºuö%ÊfÛ5-[¤,Ô/:…ß—ö[º¶ 8uU“xq¹«_u`•µ•Ó·5~@^°Ibh?ó%y5HÝèðSéx‘S#ˆºÇél#½¢A¾/ðå{žˆÆ¯'$-JGsbÌñ<Vη¿r#ÌÆŠ鯋Ÿu…ïý Îåþ£qØB|ëÉs²’&‰b¬Eú»ÆÉÈñݵ×dŸÄUý|ŒPƺŒÞ×ü¤FêG‘¿ÊOÜËal™ðÈÏú§ÄzBOŽ“KRxôwõ¶ºñ®¼Ìš¼j¤Ÿ÷jã¢ë!rÍCj¤o_æd›&LË.Gb)ó7HßçÈ(ßWô´É—ÚöéûiI@vóÿlu_i4Héo¹
endstream
endobj
+3339 0 obj
+<< /Type /Page /Contents 3340 0 R /Resources 3338 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3034 0 R >>
+endobj
3341 0 obj
-<< /Type /Page /Contents 3342 0 R /Resources 3340 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3076 0 R >>
+<< /D [ 3339 0 R /XYZ 78.37 808.885 null ] >>
+endobj
+3342 0 obj
+<< /D [ 3339 0 R /XYZ 81.145 768.829 null ] >>
endobj
3343 0 obj
-<< /D [ 3341 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 757.87 null ] >>
endobj
3344 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 746.912 null ] >>
endobj
3345 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 735.953 null ] >>
endobj
3346 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 724.994 null ] >>
endobj
3347 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 735.953 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 663.225 null ] >>
endobj
3348 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 724.994 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 652.266 null ] >>
endobj
3349 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 663.225 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 641.308 null ] >>
endobj
3350 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 652.266 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 630.349 null ] >>
endobj
3351 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 641.308 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 619.39 null ] >>
endobj
3352 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 630.349 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 608.431 null ] >>
endobj
3353 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 619.39 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 597.472 null ] >>
endobj
3354 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 608.431 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 586.513 null ] >>
endobj
3355 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 597.472 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 575.554 null ] >>
endobj
3356 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 586.513 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 564.595 null ] >>
endobj
3357 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 575.554 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 553.636 null ] >>
endobj
3358 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 564.595 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 542.677 null ] >>
endobj
3359 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 553.636 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 531.719 null ] >>
endobj
3360 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 542.677 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 520.76 null ] >>
endobj
3361 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 531.719 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 509.801 null ] >>
endobj
3362 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 520.76 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 498.842 null ] >>
endobj
3363 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 509.801 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 487.883 null ] >>
endobj
3364 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 498.842 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 476.924 null ] >>
endobj
3365 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 487.883 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 465.965 null ] >>
endobj
3366 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 476.924 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 455.006 null ] >>
endobj
3367 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 465.965 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 444.047 null ] >>
endobj
3368 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 455.006 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 433.088 null ] >>
endobj
3369 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 444.047 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 395.23 null ] >>
endobj
3370 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 433.088 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 384.271 null ] >>
endobj
3371 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 395.23 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 373.313 null ] >>
endobj
3372 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 384.271 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 362.354 null ] >>
endobj
3373 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 373.313 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 351.395 null ] >>
endobj
3374 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 362.354 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 325.492 null ] >>
endobj
3375 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 351.395 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 314.533 null ] >>
endobj
3376 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 325.492 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 303.574 null ] >>
endobj
3377 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 314.533 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 292.615 null ] >>
endobj
3378 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 303.574 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 281.656 null ] >>
endobj
3379 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 292.615 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 270.697 null ] >>
endobj
3380 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 281.656 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 259.738 null ] >>
endobj
3381 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 270.697 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 248.78 null ] >>
endobj
3382 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 259.738 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 237.821 null ] >>
endobj
3383 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 248.78 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 226.862 null ] >>
endobj
3384 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 237.821 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 215.903 null ] >>
endobj
3385 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 226.862 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 204.944 null ] >>
endobj
3386 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 215.903 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 193.985 null ] >>
endobj
3387 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 204.944 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 183.026 null ] >>
endobj
3388 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 193.985 null ] >>
+<< /D [ 3339 0 R /XYZ 79.37 160.314 null ] >>
endobj
3389 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 183.026 null ] >>
+<< /D [ 3339 0 R /XYZ 81.145 142.179 null ] >>
endobj
-3390 0 obj
-<< /D [ 3341 0 R /XYZ 79.37 160.314 null ] >>
-endobj
-3391 0 obj
-<< /D [ 3341 0 R /XYZ 81.145 142.179 null ] >>
-endobj
-3340 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F83 414 0 R /F74 337 0 R /F81 377 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
+3338 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F83 412 0 R /F74 337 0 R /F81 377 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-3394 0 obj
-<< /Filter /FlateDecode /Length 1761 >>
+3392 0 obj
+<< /Filter /FlateDecode /Length 1940 >>
stream
-xÚÕZÉn9½û+ôaXEÀ0 ER€9û6˜ëÌiþÿ²É^È.É,EAâC[2›ýúÕÂZHéÃ}øþrzùzE<D:{xÿ÷Ò }€ƒÊøƒw ´ƒÃûÿ‡¿_µFÔÚ¤ ¾imOå»Óoÿ¼ÿõ¢eÐô÷{¤x°*0¸Å ¨ÒK¼õ
-À̘.ãÄt­ V¥÷õì!$n΄-Nô*bèÐd2…Îäðí !¥»ÆÎßð˜^E
-EhƲ³¨™ÈµŒÚó¢H¼÷Œ@áwqV…Ó%"}¦96äÿ—7¬œîÏ-ìªÁð*5j…À›é(2S „—J¶*&“_¾_[%ækRÖ¹Ü{ÈËŸò¾'Gh
-mzÖ&ŠLÑYŸÈd$¾9VuU±?=Ï~šîNü4åf‘½ûšá~^p)/Xô‹êÃÞ¾¯wë>5r¨ÑÄ-3m)bi–‘„BǬ™y$Ë5Å°ê¾kðp { Ž=’WmÏßÃ[0¯å­èýkqóÌÙŸg}oïä7úãêU:ô“•A0cAAØip²•-HætWãœ"·“af<yHhSRaîqýæºÈÃ[ªÊR,…Þm,UžÛZ
-}h-•ùwc£²·òÞ¶aÎIÂ`à )B>I0è€&Ã@QSQ-·”WÅM°.{¡h“i‰M.4$h¯ŒÅÉÃÖôkíâÝZøPr[Æ.´å£œv¬œvLNLοG¢ãÂ>/\].JN äópZê¬*¨"eû%VgÁ×Êiõît]Ö¢l\h?<ë¡F&t‹„L¸g8{,’Îq >»¸íF‰Ä|[\e£GتÝäœhKd¤ó¾ö‚Ëk½ËÍóq·µ¤‘v!A¹9kØ‹h©uHœ5r6']rX¯íÉA/‚Rñ®ü®™Êêc†ët•÷ÀÍ—5_Ðí09U4°F÷_6‰‚
-€œPƒ­ÓbËé ›”Þ@¬±{pAQêÚ°é\öâií
-ù¥Î3DËñ,È~-Òïpd¶ÊÚÉZZ£Û/Š…ñNáã¤ÐbH*b-dk‘6;ÞÐœ)¤[Þ±¾?X‘U\ôAF¹ßYo ²}ÐÔQ,­óÜå”Ѧ˛GM”¹¯+#M7Tž ›ðTúÇü¿9mgu•ø¸–­Ó
-<»‚ ³š: ÛéÁUrS:7¹ÆÕm+,cx}85ØÔv ð>Xt­‚=’%>ôÛoíFVÞ\ãdäs‹k·„2,Ž1ëcÓôKKk‚Bb—ÐhÉS ÐéÖbϲ‹zjiÆа 9´­ám”e‹´²”Ønï‹¿Çvà”1‘ÓJ­Ûºùš”a•(ÛLnqn/ã)7Ÿ¾|ML1•ã(ªì:$")“`’S!Çd´¶I&ôä{$¶É‹‡¶W}\§û¨êX;«Í¸'…Úò¨HV[A¦­‰¤Žq ÈZÖƒ놼!\ô €¡4+«‹Ñm—Ò:öHOM
-+ûµD‡$¹p¥kÍ´ÇG‚jem` m$ù£’Õsœ« EÒQÙÀæYJì€6" Õ5·T`k³1ýÜp¤Ämìη["1òO9ØŒùTrg’ãxIPÛ†gs€,-R‚Wä#4Z Ô^¸’¯`kª Ä¨ç4"3Z¶*ég¡ºoå˜4·9SÙê‚•Fï”ÖF+—ªýè§d E¦üã÷üôF®›?^Ir‡Ü­•óæ÷c—÷—“)
+xÚÕZKoÜ8 ¾÷W̨V"E=€ ÀLgR`Ϲ-öº{Úÿ]Ñ’’é‰4¢Í!­cËŸøù‘Ž>ý{Ò§ï_.ï_þx8E8{zÿç‹IôÉœ|TèOÞ¥9½ÿwúëEk
+Œ#®h€¬ç¤@8KŸ‹¹ŠZKœ^ײ AR?ÝãnÛû'ºá>cs6(AâYh¦øÎáS2š’MܲҖœ‚&¶µ0ßI(tfËÌwX/ kmjì]E^Q´­üÞ¼œÉ’÷…º°Ìþ:Û{û„wôç5YHŠ$ÊeÂ΂“¯lFú€î sŠÜN‡Yâ\†+FS$g¢6çþ‰¤e}dO]
+iónã©üÞÖSàCí©=‡r蔸Õ÷؇0—ª^D9„¡dPÝa8gÉp™„/Ç~P cTL½†T\¨K £½B -’7[×gWñµwsj‘SɱŽMjÔ35N:E·¤§íÓŒ²{$:o™Õù‡Y™!Ÿiß–úq¤M&(*±ƒý’«g–^Ö.Ñ~n+)ëVšR•IÙUŒPRºA’ˆî=ÇÙóÚjq(ï.a»1"õQhg¶fG®‰6gÆ^*½>•Öù¸Z{õ¨7RZÒÑKÞ°·¡£Ö IÞàjN:×°ÖÚS€>N‚ÈepÇG'«mópYŸ* —5‚5Îq–œY“ûOÈšd0’NÓâÊé7Ëš„¤À¨g_ëaR°PºÕ ÕYÓ9âéèÊV¡FI¾N>¾ÈW#ýúWÏØ:l¥5¹ý¤Tï$9MzÌ`Š{+z,Œy¬FÚxì|`¹AI5( $Æ~'3"«¬q-Òå~d(£­ØM ÅÒ9ÏMN¾[5yó]ôó¼r¾S5CáãÁàò^MÄû­lSK$ÆC'/+Õ¡:.¸ÁRé¹\îUæá-¼íûèIE»ía…cŽeÆÇû5ódé˜.]‡/öÍÀöûüลe ƒîEP$ÖÉN:{·Â9v®+Ñʇy€®Œ$‹Ñ+窓è0ÉúôR8Ô*øØ"Y’ëºýV;š§’ŽÒÐÅÂÚ¢/u
+ò©Ÿí± œQhMZwÜ€‡š‹é(“³îÃYcTnߤ³”ìs–²AZ¥ñÝ>‰ï0åö]ÿ¦ÉlÖ{¯ü¾{žÖ  ãƒ<e¿ëÓ0O²<yI‘^ÂXˆ{ƒD4* ‘ò1ˆ’t!“%hDªÉLJžð©Ê}D*×¾¹ùTå~èSU"z*`ƬU#Ñ(EDD·õΑR'DÁ5@Ÿ°
+<†”ØØ×®HbS=>^W?_SúõaÄib`DÔ»ßJóXш®°B <îCckh”Ð
+u1š#ØÒdLDÚCnëï°×ãVh¹K§|¯ö);'¹¤— ”†¡Ú|2¤û>š‚Ó‘;Y­âZ?6œnï_þ'ÒËä
endstream
endobj
+3391 0 obj
+<< /Type /Page /Contents 3392 0 R /Resources 3390 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3034 0 R >>
+endobj
3393 0 obj
-<< /Type /Page /Contents 3394 0 R /Resources 3392 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3076 0 R >>
+<< /D [ 3391 0 R /XYZ 78.37 808.885 null ] >>
+endobj
+3394 0 obj
+<< /D [ 3391 0 R /XYZ 79.37 773.016 null ] >>
endobj
3395 0 obj
-<< /D [ 3393 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 741.13 null ] >>
endobj
3396 0 obj
-<< /D [ 3393 0 R /XYZ 79.37 773.016 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 730.171 null ] >>
endobj
3397 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 754.882 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 714.426 null ] >>
endobj
3398 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 743.923 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 698.682 null ] >>
endobj
3399 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 727.983 null ] >>
+<< /D [ 3391 0 R /XYZ 79.37 660.693 null ] >>
endobj
3400 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 712.042 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 630.701 null ] >>
endobj
3401 0 obj
-<< /D [ 3393 0 R /XYZ 79.37 673.382 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 619.742 null ] >>
endobj
3402 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 643.293 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 608.784 null ] >>
endobj
3403 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 632.334 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 597.825 null ] >>
endobj
3404 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 621.375 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 586.866 null ] >>
endobj
3405 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 610.416 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 575.907 null ] >>
endobj
3406 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 599.457 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 564.948 null ] >>
endobj
3407 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 588.498 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 553.989 null ] >>
endobj
3408 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 577.539 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 543.03 null ] >>
endobj
3409 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 566.58 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 532.071 null ] >>
endobj
3410 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 555.621 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 521.112 null ] >>
endobj
3411 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 544.662 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 510.153 null ] >>
endobj
3412 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 533.704 null ] >>
+<< /D [ 3391 0 R /XYZ 79.37 474.059 null ] >>
endobj
3413 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 522.745 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 456.023 null ] >>
endobj
3414 0 obj
-<< /D [ 3393 0 R /XYZ 79.37 486.077 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 440.278 null ] >>
endobj
3415 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 467.943 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 429.32 null ] >>
endobj
3416 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 456.984 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 418.361 null ] >>
endobj
3417 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 446.025 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 407.402 null ] >>
endobj
3418 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 435.066 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 396.443 null ] >>
endobj
3419 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 424.107 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 385.484 null ] >>
endobj
3420 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 413.148 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 374.525 null ] >>
endobj
3421 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 402.189 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 363.566 null ] >>
endobj
3422 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 391.23 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 352.607 null ] >>
endobj
3423 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 380.271 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 341.648 null ] >>
endobj
3424 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 369.313 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 330.689 null ] >>
endobj
3425 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 358.354 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 319.73 null ] >>
endobj
3426 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 347.395 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 308.772 null ] >>
endobj
3427 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 336.436 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 297.813 null ] >>
endobj
3428 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 325.477 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 286.854 null ] >>
endobj
3429 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 314.518 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 275.895 null ] >>
endobj
3430 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 303.559 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 264.936 null ] >>
endobj
3431 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 292.6 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 253.977 null ] >>
endobj
3432 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 281.641 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 243.018 null ] >>
endobj
3433 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 270.682 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 232.059 null ] >>
endobj
3434 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 259.724 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 221.1 null ] >>
endobj
3435 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 248.765 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 210.141 null ] >>
endobj
3436 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 237.806 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 199.183 null ] >>
endobj
3437 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 226.847 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 188.224 null ] >>
endobj
3438 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 215.888 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 177.265 null ] >>
endobj
3439 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 204.929 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 166.306 null ] >>
endobj
3440 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 193.97 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 155.347 null ] >>
endobj
3441 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 183.011 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 144.388 null ] >>
endobj
3442 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 172.052 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 133.429 null ] >>
endobj
3443 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 161.093 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 122.47 null ] >>
endobj
3444 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 150.134 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 111.511 null ] >>
endobj
3445 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 139.176 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 100.552 null ] >>
endobj
3446 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 128.217 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 89.593 null ] >>
endobj
3447 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 117.258 null ] >>
+<< /D [ 3391 0 R /XYZ 81.145 78.635 null ] >>
endobj
-3448 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 106.299 null ] >>
+3390 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F22 367 0 R /F15 334 0 R /F74 337 0 R /F81 377 0 R /F59 346 0 R /F84 425 0 R /F83 412 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-3449 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 95.34 null ] >>
+3451 0 obj
+<< /Filter /FlateDecode /Length 2212 >>
+stream
+xÚÅZÉn7½ë+úL‘Åâ4’&€oIt3rJ_âCrÉ笠/Í5G6cÜ­^_‹µ±9SÛ×Óÿ?ÝÞîîÏÊmÈœ¶·?ïÄÆéŸØ,0›Ñ‚q-¶·oÛ—Îõ‰siãQŸ{û|Ç=AÝŸ-n–9­¥mqh& ŒHhá…sñLçŠPs£éGG%èçΟ(zZÑ“(éHW‘î⳿Vîº|vjBÓ6¢Tíù_x¥·N]Š€tÖLÁ;úWœ Sý?­é¿Gút6Jß¾M2é˜@9“Lºc’ ÍŒ2#’Ò«LÀ2AC̘Ø5&=ð¢5•Ï´×Fmƒööôé-Ý”{:Ÿ5˜þ‰—8_aF<"ÙÚ€º¨ pª­éÀæÀŽ@žŒ7"/j00Û
+ééÃùˆÙI\Q _zÞ¤¾ÁíŸñKÓé¢?žMD}âûAªSš~yíâ1òIç$;<Ey=f-%½è‰lèTœÞû³P›£©
+˜ÎüZ¼®æ{‹Ñ1«¦S¿9¤ÊшäAš(¢üy–¾Ç¢´ó”«žEIˬÛE$é–#î€Ôè]íó‚*AÎ8óšlŠÈêoDô›],óï˜ún“UÏÊ ¥Òêø¿T)£¯2.Î3P,Õlž3©aøœ´pŠ3|SäVT$;£g<3Œ©_cMíø~¤80.‹G‘¯Õ2ÂZ-uÇPò´õQ¼âõë©rç%±(W¼Åé5ïÏgœ„åÌ97²šT4×$n˜Pb'›Zœ/´–q;µ«ƒ™VªÏ bȸ$dHI4/âkT¤:%‘éopûÀ¼Œ¯Å܉G-˜¨œŒx´2M/åß ¥ÇR’DlÊåè>ò;9¹2ð÷9ß)®á%áQ²iĦ÷ýإ؆îVôYùÕìõrm_ŸóÝ„‘>UoŸŠ9§Ñ³£~‰Ü«T~Á·R¡nWµy´ðPÊ‚R† à`»UUO‹çÌ5ˆÕç\Z?ij)C À@¯ƒˆ?ýZÝ—OnóŒøëý •nÆ%+Þ~ûÁ„x¾¾¾u¬ª¯3Ì¡0”—™Eоnñä¿ …Þ¼g”Þ°‡@%zÅ(`‹Ûœ&\
+*fÍH\ÙU"ƒ}À9XëdÒÅò(‹ô™„iBu´„!×,½ôH>%ÔmRµÈKH&õÜQ¬[$%ÖÆHMj—R«Îï—hߺßYÑû·›¶æ‚äâÏS
+\“¼GªÌ›õzëGrKÛðÚjÍÅôØ°YN祣ägß(Ö'—dª¬~AI^ý
+‚Ò<ý€Í.¬¾E©)%¢üa&õÑÂ,KÝ#U©÷eCÚ|Ù—&¹\@È3{1ÿX‘‚‚]kÄÿŽjYÆiZ$Xɵil£/RÜG=ÃÕ‚hšáͼƺ®•eÊÌT}´Vʪî€vzZd…†i!f´Ž–F™VtÛÚ>|hMKÍ´‚©´k-Ü)•Î÷g€Ëé!3ÍÖ†ÏR}››õ6DÍO¤
+žúe_Ìæ°ÜñõÎ/oËSó”8ËhÆYm±/PJ q^M>ÀÉ:L”¶–; @—·Ë.·>j-¦žfm˜.úûŸ÷š>^¨dk8d‹ª ƒœ¤‘¶äaÃó†¬ÔÔÞ–ö¶ Ëª{¿ã¾œ|‚¦ð¥õT\J>$ß3A¨ågîùú½øô)ÁnŠC"}e7J «Ÿ…
+endstream
endobj
3450 0 obj
-<< /D [ 3393 0 R /XYZ 81.145 84.381 null ] >>
+<< /Type /Page /Contents 3451 0 R /Resources 3449 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3034 0 R /Annots 3503 0 R >>
endobj
-3392 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F22 367 0 R /F59 346 0 R /F84 425 0 R /F15 334 0 R /F83 414 0 R >> /ProcSet [ /PDF /Text ] >>
+3503 0 obj
+[ 3448 0 R ]
endobj
-3454 0 obj
-<< /Filter /FlateDecode /Length 2169 >>
-stream
-xÚµZÉn#7½û+ô¦IWÀ`YV€¹%ñm0§™Kæ\òûaqi®²ºäza¿~EkmÎôáû‡ÿz8½?<]´?(æ
-h2õHLóþ&r´6lN½â¨Þh{¤†ãf-¨ÜŒaJ˜‘ø¸N$n=RoûP/ÊîĹ¼f#çqu'{E•Ok¦‚_ÈWöÏ^ùz¤Ê[¾$ëƒÖS2çsâ«læîÒuK^¥˜ònÅßœhü{¤†¿LÜ¢Ìü §ò`ü’ç gÔð|ËÜ|úE=ÙŽ/ó:DyÎéž!ïY)™^N;·E´GkæZÇblpúðY¢”B03ûã(¦£‰Ù#Í«†>:zá•#ç̹Ô,MãØ#UŽèyŠµÁX©XœcòNÐÎ3ËaÉ—æe¤Þ#!?äªdÑ *Oë˜Uz¹ö4Ï9 5óbWsλðt‡~jc™uKïDôœRå²dA/½üeƒ‡ß×ÁRR-‹Ö†99{$Gö¸R3ïzŽ ª%+(»R^G$»Ùù2|ÆÖg ÿ0—!åG7và<~Ö¬iÌÂòìÉËücW‰ë¬4sÆ­Ö™y H Ã×< §´Âwyn á÷+žÄc@ê÷XZɨm·óX-ðÖfQà­jFÜ«[njå1¦¥m›®à¼¤œw»sÎ,¶+¨q¦úͧ‹U+NÂqæ½Y-²Î$“܆Ü\L²iêzqøXÚ‘VΡ d@Ú€N4Šø–ÓºS9œKߤÒ¦Ú]Úw{áUøbSu+Žòò°Ï
-l“žÒý bSÒHæ£<S‚[T#ž_ÊÍ4œË;¥HßØ”IÒ}|÷V‘Ý­d³Ê£Åê•úKge~MG?do›:ç·C}NÜ«T¸á[©”iW59:ù¼¥!ÊöÊ.]·«¶—çáâµp-²©js®íŸ¼´Á ³E32</Eú3oÕ~a|[–¯÷K´•œ®©‘0‚ ¥†· ñúñ7ž)%oq,Þ0f×¹%Ô¿¿ÒÁ/¸Cbl˜·àtgÀ2Õž3kkÝn•}_±*èìÄ\;¢UQ˜zeUv&<Ùª @£UAà]V…H_I&µYÒß™Èó ¨=†…¦ ¬ˆ¼@0é—A
-ŽÆIŸçP®>}W±1ì °+Mò©J°.\Ôë­)œ>[^Kâ%¥‹6ä^ñ`á–‹¼7“*¢v@M¹×F;_äÆ }+qÂ÷MfðŽ©EéÀíOͲÐR•zNRbRLp»f%a@ Óº^@2º`žçÒƒÑûSµ"cÔ¯,!ê"ò·†é¹ü÷¦ …ôÉFÍ´R+^{SŽÂ«GºoÇìpëŸÚ)Z1íôRZZit@Ê)éÓEÊëaHÇLÓ2ÀèãÃÜ€ÐÉC>†©à¹^°õ]éþ•J*šÌ—ðNÍ(q”
-5ÇÑ/«òFçQñmîiuM –8<ø¿¹E§Â5g/]Xø¹åõMS¦n
-»Sâìa ¬•†ª¬-ë)³iC¯ÚËãßnáôÍÞë~+OãÛûÃ_Cš,kÐÚß~<|ý®þþ¾„yƸýŸ8îGPpÅŒÀ§þ<üúðsúÙŠCX'ku7.\a’ÂLH½(ª‡¥ƒC˜.Ë^;…ÀlX{‡ß–Ö ©TšJ@z:Ï“xPzáÊØE J×7‘rbI@XÁ¬ÜÙ†¸&¥É
-endstream
+3448 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 236.441 445.953 246.868 458.542 ]/A << /S /GoTo /D (Hfootnote.45) >> >>
endobj
-3453 0 obj
-<< /Type /Page /Contents 3454 0 R /Resources 3452 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3076 0 R /Annots 3507 0 R >>
+3452 0 obj
+<< /D [ 3450 0 R /XYZ 78.37 808.885 null ] >>
endobj
-3507 0 obj
-[ 3451 0 R ]
+3453 0 obj
+<< /D [ 3450 0 R /XYZ 81.145 768.829 null ] >>
endobj
-3451 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 236.441 463.885 246.868 476.475 ]/A << /S /GoTo /D (Hfootnote.45) >> >>
+3454 0 obj
+<< /D [ 3450 0 R /XYZ 81.145 757.87 null ] >>
endobj
3455 0 obj
-<< /D [ 3453 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 746.912 null ] >>
endobj
3456 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 735.953 null ] >>
endobj
3457 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 720.012 null ] >>
endobj
3458 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 728.979 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 689.128 null ] >>
endobj
3459 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 718.02 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 678.169 null ] >>
endobj
3460 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 707.061 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 667.21 null ] >>
endobj
3461 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 696.102 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 656.252 null ] >>
endobj
3462 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 685.143 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 645.293 null ] >>
endobj
3463 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 674.184 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 634.334 null ] >>
endobj
3464 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 663.225 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 623.375 null ] >>
endobj
3465 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 652.266 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 612.416 null ] >>
endobj
3466 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 641.308 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 601.457 null ] >>
endobj
3467 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 630.349 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 590.498 null ] >>
endobj
3468 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 619.39 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 579.539 null ] >>
endobj
3469 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 608.431 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 568.58 null ] >>
endobj
3470 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 597.472 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 557.621 null ] >>
endobj
3471 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 586.513 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 546.662 null ] >>
endobj
3472 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 575.554 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 535.704 null ] >>
endobj
3473 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 564.595 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 524.745 null ] >>
endobj
3474 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 553.636 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 495.853 null ] >>
endobj
3475 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 542.677 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 443.051 null ] >>
endobj
3476 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 513.786 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 432.092 null ] >>
endobj
3477 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 460.984 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 421.133 null ] >>
endobj
3478 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 450.025 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 410.174 null ] >>
endobj
3479 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 439.066 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 399.215 null ] >>
endobj
3480 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 428.107 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 388.256 null ] >>
endobj
3481 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 417.148 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 377.298 null ] >>
endobj
3482 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 406.189 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 366.339 null ] >>
endobj
3483 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 395.23 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 355.38 null ] >>
endobj
3484 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 384.271 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 344.421 null ] >>
+endobj
+289 0 obj
+<< /D [ 3450 0 R /XYZ 79.37 321.953 null ] >>
endobj
3485 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 373.313 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 301.111 null ] >>
endobj
3486 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 362.354 null ] >>
-endobj
-289 0 obj
-<< /D [ 3453 0 R /XYZ 79.37 339.886 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 290.152 null ] >>
endobj
3487 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 319.044 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 279.193 null ] >>
endobj
3488 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 308.085 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 268.234 null ] >>
endobj
3489 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 297.126 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 257.275 null ] >>
endobj
3490 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 286.167 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 246.316 null ] >>
endobj
3491 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 275.208 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 235.357 null ] >>
endobj
3492 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 264.249 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 224.398 null ] >>
endobj
3493 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 253.29 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 213.44 null ] >>
endobj
3494 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 242.331 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 202.481 null ] >>
endobj
3495 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 231.372 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 191.522 null ] >>
endobj
3496 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 220.413 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 180.563 null ] >>
endobj
3497 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 209.455 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 169.604 null ] >>
endobj
3498 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 198.496 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 158.645 null ] >>
endobj
3499 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 187.537 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 147.686 null ] >>
endobj
3500 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 176.578 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 136.727 null ] >>
endobj
3501 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 165.619 null ] >>
+<< /D [ 3450 0 R /XYZ 81.145 125.768 null ] >>
endobj
3502 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 154.66 null ] >>
+<< /D [ 3450 0 R /XYZ 93.716 95.962 null ] >>
endobj
-3503 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 143.701 null ] >>
+3449 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F16 336 0 R /F22 367 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-3504 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 132.742 null ] >>
+3506 0 obj
+<< /Filter /FlateDecode /Length 2221 >>
+stream
+xÚÍ[Ën$©Ýû+êLC@ðZ–ª\®‘fíÝh¶sW÷ÿ· $Œ*åniÔrg:“ N¼ƒ
+'´pÉZHŒm‡,#4E2›Š®e7S`‘f‰mRʆ”LF§A¨ ÉÊžnæ^kÝL«üÖÑ.OŒÏ²Ø¿¼æßu1ôÙ%:û½@ ½Ë^&ïòæµl­ö=™à¢æýD'ÁL¬$IopýÛ+þ¼káå­6û¸ç<¥|¸ßéý.)Ôä+^÷yäÊ7õgüÃ~·ÏläêÌhëú8ÒépÝûš©h% ­éó`ºy¼ A@ÐÔx8–1JvŸ,¼°aò“ìSÅû}VoRéf<U½»Hš_l‘©Š }Ã0­‡t:3ùÈï«'o×ÝàÓû}Æëšù7“ÐP#SÍÖ{¡µ!Õæ)5;’f,5„à£0W›˜Ýïo£v¡•ûT<ø%óýfå2Ui­0Ê’ª1”*…AGª^³T92.³H$å¦s÷%‹a÷“k«À¯ˆ/Ž |5ó°ü7Õ‹<¥&óA©Uk:ÌãuDåxx$t?G›â35%ä°]®wkUÂX<3Ú.l“ÃxUZ®ºY±²¹.b
+ÏGÁ[5”h¶D>LBJÑ-þ¸o•lè¼pIQP¹­Î[RÔ¬\>z`Ççòd(Ä´á2ŠVxp$p³\Åå‡!(©¶¤Í¡›‹Ì ð– %‹9uG6Rjk[–t ¹ØâÊ?H21”D²Œm¤Ô°¥4k¡i~‹Øp\ÿÐãš}ä‚ËhÖo>–óÞÎÞ@¨¡žkÂ!º‚¼ä4ÇÖŽ‚¢àúV_À)uøé…
+§!5P8“ߎs¤Ôáü^mÎãÇ%¢¶H~Î,~&J+vÃÅê¥PÊPX5ÏÄ'JGÙwɉÑ¡Ð’=ãH©‹€Šj‹qq¢*8RïÈÃ9Rêº<ºÔ¨×jÃ\ŒÆ ОÄÈËs¥†q±²dâÖV€ ¤ ð²àD©ÃýÞºîµùÃÇ (èPÆLˆ#¡†Ò©Ö9f·fŒ2B;S2ÛÚ4^ja$Pã3H)ç&Bóá{kvºüÆòMÆhŠñ’’¦ñ>jÍrü™#¨‰Ð¡ÙpyRPLö]H±³š¤ÚÀL)å-º… Ö’¸3–ÂGïŸ(uK*8Ôë”9Ýí‘ok܇v#›÷¬sn¼°Ò“†<ÎGJº–kÏugoº4Ê]É—×åÙ\Dzë'­]¼’WÃãu¤ÔxM~û";y´ÅxÚiQù§îóÌüo@ßÉ#°÷BؼÉ5XaI¦W\ez Ôx>®Ds®®un¯³ºbJüe½þŠ ªP8MfŸÕäXY)Q;h+~Líuï<¬/Ÿ ÉS0y‰;Ò¤Ó3ø²–F8wÈÜ)Ñ®.]«¬GJIñpAÐ"¾¡p­®I ®‰Òs¾Ý6¹~‹OC¼x4·Ì•íD‰Ýȧ„H"¡z `¥ÚRãy=ЉºAº, .ÙÁŒ-!‡[°€ "8GÂõ,¸#¡îvxâZ¶c¦û¾«Ð¢fnÊö'}JTpó:ŽŠµ©ò«g‚ö9W4:©©yVKv"„l à…$-j1«WQCµöÈ}›ï”rBIEk's"Ôà>k€w û픶;ØŸà)ï/dË|Í$UvâH»O‘IøídP¯¦íÌ…Ío’ƒPg0¶‹a»ŠÝì
+ûî})ÀÍ|<[yÿX%å5÷}£*´ß·®35Ÿ}|P²­XrH¿×éùê¸åV—â¡rZ€EJ…¼#¡¦Bêìm­ìŽi\ëùÞC _7õúoºEØ{ï¯YH½"óöf= B*4ôY‘2¸µX1RïŒfÔ«áø‰S³Ê‚ÐÇrj»²:Ž!vY§P m„·R˜ý¦•‚2RhïI¸¬•ÂD(ÁM«ÊïÜ4ÚÂÖ¥‹õ²jÀnÓ„]â+“Wát Â;Çg%ê±G³!»cpdmÂ|Ê ã)/ÃênO”îŸR±Ô¦ÅÓ—Çû\Ò·?P8JûWI/òŽ
+HÒ<é”ÆcٽĩÕÐÌ ˜Á
+DÒIV›öDh<ÎÃäQ`8VQçõ&²Â¡› •j§ßÍ®'Jìy½3V+¨½šúï4Sf²ÍaÑjû.t*cû”›ê;­æùöoÝ·zpΫ‘’ñjñÈx"D–0}oÔH:ý׊Ö@oåÇÅø¾Ë;DÃcUúEœ~ø—[!Ší)¦²àöTÖúø|ù•µ=
+endstream
endobj
3505 0 obj
-<< /D [ 3453 0 R /XYZ 81.145 121.783 null ] >>
+<< /Type /Page /Contents 3506 0 R /Resources 3504 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3569 0 R >>
endobj
-3506 0 obj
-<< /D [ 3453 0 R /XYZ 93.716 90.677 null ] >>
-endobj
-3452 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F16 336 0 R /F22 367 0 R /F71 347 0 R /F53 345 0 R /F73 350 0 R >> /ProcSet [ /PDF /Text ] >>
+3507 0 obj
+<< /D [ 3505 0 R /XYZ 78.37 808.885 null ] >>
endobj
-3510 0 obj
-<< /Filter /FlateDecode /Length 2056 >>
-stream
-xÚÍ[KÛ6¾ï¯ðè„rø
-(a{ý~X«òúMiÛ:Ü®6aÛÆ«Ò²²íe[µ©ÂG¡ˆ]°`lœEfoÖ´Þ0ìrB‘„œO¬Ÿ0=°èCx¼uË”-¶vç¬ÑœlÝ…Si°Ùõ¢²cz¬Œš9òŠö‚§ó^ðNo÷rqkà£,¤ÜÒ'«ëó¢³i•6œ(ØTî0‘e׋Rùô‰Ÿ×;Cf¬”Q€"±:§C„k£ ø¸CÂdZäÞÂ}€²ªyþq.”gËűô«1™ì‰¶<y„÷üäl™ì2eO!O8ïY“2"ž&¤Ž'½ãIHc ð:p4Ì#RGcXé3RÚ¼?˜„£¬¢–ÓŽ’6
-é´B0,g#RGçkí“Ÿ­#ZŽ#t‹éˆÝHiÕ1½žXZƒŒÖi/û®
-Õ·,ãMHƃտnï@cäèfÁ ©£û½¶hm>'§Óè Š3âÔ¨ôºxþ2‰f4KP#GޚѦõÖ
-š$äN@#¹™Ä\…/»RÓuß¹·ÈT†ÓË”äÞçëÜoŒ½Ïr´X¢êÞ!#¢\dE#Úšœ€HLˆK8l„=˜9+Ψ¡šßËläƒ"‘Xje;P#÷Y£@z`Ôo+µMÒv`cûýÂn3IÝ!Ùc÷I< ?_›¡TÍjZŽž¸òKvî(ʲƒ3lÛ‰
-h bܵ”î|8©W%Ž@ägv{E4ÑW–Úºv x»ztؤ-'PºÊÈUØï7÷Š!ÝgÄiZûP‡¶)ÉVOaãÆÜ{þlJ@• ÚWqâ9
-í÷ï뛚ÏVO(ï(¦±‡yÓ:‡ôGÓ”ÏQÖº”ž¨QÐÚ±*íöO@M…9hTK]ÂA gª;­r]=ñº ”ƒàëÖYÿL7
-Ä9X>8E¼/Q÷ÇxŽEÈî4 [›ˆ#Ÿ¦
-endstream
+3508 0 obj
+<< /D [ 3505 0 R /XYZ 81.145 768.829 null ] >>
endobj
3509 0 obj
-<< /Type /Page /Contents 3510 0 R /Resources 3508 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3076 0 R >>
+<< /D [ 3505 0 R /XYZ 81.145 728.979 null ] >>
+endobj
+3510 0 obj
+<< /D [ 3505 0 R /XYZ 81.145 718.02 null ] >>
endobj
3511 0 obj
-<< /D [ 3509 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 707.061 null ] >>
endobj
3512 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 696.102 null ] >>
endobj
3513 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 685.143 null ] >>
endobj
3514 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 674.184 null ] >>
endobj
3515 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 735.953 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 663.225 null ] >>
endobj
3516 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 724.994 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 652.266 null ] >>
endobj
3517 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 714.035 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 641.308 null ] >>
endobj
3518 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 703.076 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 630.349 null ] >>
endobj
3519 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 692.117 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 619.39 null ] >>
endobj
3520 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 681.158 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 608.431 null ] >>
endobj
3521 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 670.199 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 597.472 null ] >>
endobj
3522 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 659.24 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 586.513 null ] >>
endobj
3523 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 648.281 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 575.554 null ] >>
endobj
3524 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 637.322 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 564.595 null ] >>
endobj
3525 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 626.364 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 553.636 null ] >>
endobj
3526 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 615.405 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 542.677 null ] >>
endobj
3527 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 604.446 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 531.719 null ] >>
endobj
3528 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 593.487 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 520.76 null ] >>
endobj
3529 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 582.528 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 509.801 null ] >>
endobj
3530 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 571.569 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 498.842 null ] >>
endobj
3531 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 560.61 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 487.883 null ] >>
endobj
3532 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 549.651 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 476.924 null ] >>
endobj
3533 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 538.692 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 465.965 null ] >>
endobj
3534 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 527.733 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 455.006 null ] >>
endobj
3535 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 516.775 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 444.047 null ] >>
endobj
3536 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 505.816 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 433.088 null ] >>
endobj
3537 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 494.857 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 422.129 null ] >>
endobj
3538 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 483.898 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 411.171 null ] >>
endobj
3539 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 472.939 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 400.212 null ] >>
endobj
3540 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 461.98 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 389.253 null ] >>
endobj
3541 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 451.021 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 378.294 null ] >>
endobj
3542 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 440.062 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 367.335 null ] >>
endobj
3543 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 429.103 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 356.376 null ] >>
endobj
3544 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 418.144 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 345.417 null ] >>
endobj
3545 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 407.186 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 334.458 null ] >>
endobj
3546 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 396.227 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 323.499 null ] >>
endobj
3547 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 385.268 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 312.54 null ] >>
endobj
3548 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 374.309 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 301.582 null ] >>
endobj
3549 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 363.35 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 290.623 null ] >>
endobj
3550 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 352.391 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 279.664 null ] >>
endobj
3551 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 341.432 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 268.705 null ] >>
endobj
3552 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 330.473 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 257.746 null ] >>
endobj
3553 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 319.514 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 246.787 null ] >>
endobj
3554 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 308.555 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 235.828 null ] >>
endobj
3555 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 297.596 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 224.869 null ] >>
endobj
3556 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 286.638 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 213.91 null ] >>
endobj
3557 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 275.679 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 202.951 null ] >>
endobj
3558 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 264.72 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 191.992 null ] >>
endobj
3559 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 253.761 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 181.034 null ] >>
endobj
3560 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 242.802 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 170.075 null ] >>
endobj
3561 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 231.843 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 159.116 null ] >>
endobj
3562 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 220.884 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 148.157 null ] >>
endobj
3563 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 209.925 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 137.198 null ] >>
endobj
3564 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 198.966 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 126.239 null ] >>
endobj
3565 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 188.007 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 115.28 null ] >>
endobj
3566 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 177.049 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 104.321 null ] >>
endobj
3567 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 166.09 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 93.362 null ] >>
endobj
3568 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 155.131 null ] >>
+<< /D [ 3505 0 R /XYZ 81.145 82.403 null ] >>
endobj
-3569 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 144.172 null ] >>
+3504 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F15 334 0 R /F74 337 0 R /F81 377 0 R /F84 425 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-3570 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 133.213 null ] >>
+3572 0 obj
+<< /Filter /FlateDecode /Length 2384 >>
+stream
+xÚÅ[Ínë:Þ÷)òGG¢þ¢@s› 0ëî³YÍûo/iI¶$³®ä¤gpžÄ±?óç#ERŽöòß‹Ä¿ÿx¹~¾ü¾Ûx1"¥áòùŸu‘øO]g.Þ)!º|þïò¯W)Ý__ïôþíߟÿ|‘†P¿ïÁ\‚ˆÎéPã(é…6Ð#iÒ|H ÷„R õDV
+%•è}N¢É)­B‰QýEŸß~Y°ù’W{¼GÄ× _ÞÓ™t…qålmÊ;pøò³úé(”Ñœ~:Îé×"}­Š) é‡ßèûŸÐ‚P(<§c˜Ó±E"‘ŽN®ºÝVI?Ê;:ƒ¸G>%=MÖsáäuõúÂÐú“5Ùrlæ`E´ëýâzlµÜéž³6R^
+í/6¢@q‹­[Îvr¹þ—Ö:3Ô­Ÿž~”OÅ—ËÑkòebj9ƒ"ƒª&îê¾~LGA¿ý‚Á©(ÄX^ù½^O÷PݳÒÞpJÚû–NkªÄ¨
+#Ù‹OíÇ¡õ´ÒÂH½C
+‡·Ï6Rx½Ö àꊑc_…ç Ùio"ê*\6e²¾—›W?˜˜8§¿Áßø=†[aùî¹ |غH•˜à_K>M÷N÷(ß,k—*ŸÊ÷¥/KG;JTW¦ºšŽ„×VCõ½‰±é±y%¤Ø"[ ËÞ–³¦{MwP¥£^¾åû|!ýuë.s̲²úUÖ‚»­¥J¡è+ç„ÜO%‰¬=d¥ND­{|ïñCMÝCÜyj/-K†Ù4åsJZ×ÒYô­KkQÇ+ëD€¶/–ô²ÍÛùÈêq¯^7>Á5û–ÎsqÇ…ruÊiO½–ü™p­©²Ù¢úrQ¢g ‘>)Väá”È鳇+\öPÎéYŽ™ì—J¯.N/Hê$Š4´Ob¥+vj¢b9˜´2<‰ù*H|]¢"YÙ§ó1ŠŠM“®3nE†ƈ°ÕŒÛäfc/4'QHíi°
+;Š …µ9ØÐ#W,:”+(¡¬ë¯žè›dm þͲÆ
+æL… œn§lIïɶzcºÊ<ÔÄÂr¤ÔL¥««óì"öŠ¶Æˆ[Ù}d
+k´ŸŸ³r¬¯DTn’_ÓµÙ]ü$z)‹Í@Œ=zïÏ]¸V›•?Ó‘ÚŸ[EÊù3TþÌÕgåÏð½?!h¡í…Ÿ¯”Ž)Ý.ôÝMrŽ·É‘|\‹17ìž?ýºä}hŠ¢‰ÙÙÓä`¯Gja$Mj‹™R²ýúèä¯(Û•ØÖU V•
+iIÏC‹øèÐbt£á)3!
+öö0>›Ì&ë‘´Ùü|ÒnïÙÍ¡
+)| ”Ð:žø…¤²ý=¬Î39¹•Úmô7û?*‚ðÊô¨}+ž¤oZñtÈU•, >‰éÄå<æóbo
+ï-‚‡·
+¬‘¥áh—K÷ˆó×vÌnq3Ûu–™R)–{zNà© UòÔ:Ìe›‡¦d€UÚ‡Ót²Ïë‘ßT| ©BÜòäÞÛÞøs˜zdBK±BÙwjfºwìNwj ƒPÚpöŽE¢iŒaãëR_ªå, Û"»úQÇY‹(¬”·œE&$Ô!M5¯
+…½í®«· _û-Uš•‚«Ìãh•þj ÿ´ápíº(îɪ:ÕÛƒÛ¹eFUŠÅ~KwºèS^ \!Y»ÏýªCj™øu‘šØä]™£=ðZíî0kS·¿
+»Úç~zÑgŠƒ ñåè“~b`i“ »À­¡¿­Ü>_þ?NÃ
+endstream
endobj
3571 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 122.254 null ] >>
-endobj
-3572 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 111.295 null ] >>
+<< /Type /Page /Contents 3572 0 R /Resources 3570 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3569 0 R >>
endobj
3573 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 100.336 null ] >>
+<< /D [ 3571 0 R /XYZ 78.37 808.885 null ] >>
endobj
3574 0 obj
-<< /D [ 3509 0 R /XYZ 81.145 89.377 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 768.829 null ] >>
endobj
-3508 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-3577 0 obj
-<< /Filter /FlateDecode /Length 2474 >>
-stream
-xÚ½[Énã8½ç+üÍ&‹Å Äíx€9ç6˜ëÌiþÿ:,.U¢Rv ul‰|ªÅZh)Ìéß“Œÿÿñrþ|ùy5á„"x¥áôùÏ‹:ÉøO<‹'g•V>ÿ;ýõ*¥=ÇËH©ý}ûûóÏI`êçÕãÉ‹`­ö-Ž’NhŽ¤”FEùöÀ!ìú .õÀK ô<~¦¿!ÇsEwñÒ~3(¥úUÆËxÁ‚h–÷…åž]Þ|¥wf¾1}!##…’ЕŽÉHYáŒãHD½vc²ˆ´û8&~†…/t-óinĈ¤I$é_VIÄ'ׂt™å^¡P÷¸×zŒ{°B9àHc²jö È"çs–É‚¤k‹ti>ÄghŸe-à…Š‚èÈ ?Æä¥0ÞîŠ-¸Èµñ™’@ål§±y³—`äl’å€ÙñßîÂœî·HºÐ ×YŠ¤`m"sm‘~5Ž¬qâ žå»l0BKד—=OY#Gâ־ݭǸӄ./ïSºgH‡­Ñ:-t— =·<¶@¿ÇÑgÎémßî­ZuEåçì!ý~¯hè k‡fNí[¤ãvˆq”Ò]Šæ"†”(*RÕÙ¿þ¼*s
-â‹„ŽóA »jG_'ÓüZëb¡vù–ìôR¿U]¦»ç¬Ël©u­ Ššz³yü˜ï‚~û¾€S P #]å³^†;h€®…i‡=¦!Ê?ÆsŒkŠÄ(
-#Ú«NÍå®ô´Ò¥Þ!ù»¯/2WJX·ì­`Ûˆ°CÇ>
-'›C’Ó^DUg‹¨È#ô\µ
-ñ †lsú üÕ¾3î-¼à ؜ A¬‹U6ðÕXìµ¾¢>I–ªßêódN¾Þe–ÐÌÌát½Ó2f¡}7jþFF¼Øä%E"‚ßôîµbÂk~ƒú•ï:ùVì·>eÔŸ3~âZÊnÑZq×-¢†&´èê_Ò¨üNc‚²ž©ã¶žïj5
-Ë5 ­f+gÕ™¬ÜõÝGÞÂò(zjóÍLÉ;á¬Ùl.UzNn]t¹³hÙ©×Õ†à\ôIãlØé¿ÎÎî«â©×ê*3®ÁÆq%ÖÓ¤l’-Dþ¦º${¿?{¸j¿ênÙÑiý@H:òÕŽ’ºÚ¢«„D«+Ê'[¢­rÚ¬„4ŽÜÏbÕùN(³ ÛhZ YÊ.+§r° iò<´ËúëØ€3Â/˜l7;…Õàþ¦@Íz 4nÝ[*†>`<nLè.U^ e,›<‘ߣ ´60ì/6/@7>_LqÞrN«/ÏŠ¤%a¶‹ƒ> ‹¾ó ­5M\Tó¶Ö©&ª´eqØŬï AÅ8Œ«ø9›óÈVjµðÆLšVðÂánò“LK™ â>Àѹ:w‘ÞP6êÌwZu®AgO¾Qg 0uú¯Õ·¡ã~ˆ†îz Öý^4eݧÆ@ÄéU&K| éùÎÛáìCENƒJÝ-“Lí8ÒPzúp‰h’[-EpžsK×hY¯rËê²ÖMÔÕDy/%‰ðhIb´ð™R…žÌF Uf éA™Í¸'åöþ˜ÜdÒöÄ6Z¬®eÔ)LŒÓ„qÃRRu‰zŸÒ%Cz¾¿ƒwžÙ=ÍçaÌuBO
-£ÕËÁEÛ!-É [r–^'ç·btѽîÊÊÏÉj‹4æñV~‡Ç76µxךïÍÆhM¯ ”¯9îÒoÓø3¤`°×zJÎy-Òc¾ u¯Á“,SÏé†!lðŒµôçW ¡±³LFh épÑR5í÷N7GÒqŠ”ûN=4¢”.Àè0=:NõÝüËá†tœ"ï…QÐ¥hlçNðˆt?ÉÖ6æø)û5Eô%emÓzZ>uiݯòÄôC9Ãßãô\„“k¡íšAÑÛQ„SÈQyž©ßäàù–mâXªt"†<0£Ú_¸(¨ž—÷o¹*NIÓS÷ºæÌMáy¸^3rcÎeå$¨ê±–Šxù›¼_É×&„G~Ã^%Q`·]•´JgÀ˜Ya.¬‘Źm½eJIÒq)5Uæ´[–®EyÒVGÒwY[pQÉÛ³²2/ÈjØ¥7Ë#äo8áÄøÚ·^7xV@¿[Žt=
-Òá[i+ì.Õ!õO†Ž[ ãô€vŸ3{œòÒ[¤ã)NvE4Ù(`HÇ)’Z¸}.–(š‹²ÒÞóôkÜ_<ÅOPŸ®S£!LQüèVEJ¿—‚Þo±ŠsÝ-,>\­ráÞ¯¦¦=‹WÂï»àIzsU¢-ÐCí_—ºöÌÔÌý4y tã˜Z*ª.Q
-endstream
+3575 0 obj
+<< /D [ 3571 0 R /XYZ 81.145 757.87 null ] >>
endobj
3576 0 obj
-<< /Type /Page /Contents 3577 0 R /Resources 3575 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3630 0 R >>
+<< /D [ 3571 0 R /XYZ 81.145 746.912 null ] >>
+endobj
+3577 0 obj
+<< /D [ 3571 0 R /XYZ 81.145 735.953 null ] >>
endobj
3578 0 obj
-<< /D [ 3576 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 724.994 null ] >>
endobj
3579 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 714.035 null ] >>
endobj
3580 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 703.076 null ] >>
endobj
3581 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 692.117 null ] >>
endobj
3582 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 735.953 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 681.158 null ] >>
endobj
3583 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 724.994 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 670.199 null ] >>
endobj
3584 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 714.035 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 659.24 null ] >>
endobj
3585 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 703.076 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 648.281 null ] >>
endobj
3586 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 692.117 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 637.322 null ] >>
endobj
3587 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 681.158 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 626.364 null ] >>
endobj
3588 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 670.199 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 615.405 null ] >>
endobj
3589 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 659.24 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 529.726 null ] >>
endobj
3590 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 648.281 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 518.767 null ] >>
endobj
3591 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 560.664 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 507.808 null ] >>
endobj
3592 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 549.705 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 496.849 null ] >>
endobj
3593 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 538.746 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 485.89 null ] >>
endobj
3594 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 527.788 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 474.931 null ] >>
endobj
3595 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 516.829 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 463.973 null ] >>
endobj
3596 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 505.87 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 453.014 null ] >>
endobj
3597 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 494.911 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 442.055 null ] >>
endobj
3598 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 483.952 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 431.096 null ] >>
endobj
3599 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 472.993 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 420.137 null ] >>
endobj
3600 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 462.034 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 409.178 null ] >>
endobj
3601 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 451.075 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 398.219 null ] >>
endobj
3602 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 440.116 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 387.26 null ] >>
endobj
3603 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 429.157 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 376.301 null ] >>
endobj
3604 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 418.198 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 365.342 null ] >>
endobj
3605 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 407.24 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 303.574 null ] >>
endobj
3606 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 396.281 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 292.615 null ] >>
endobj
3607 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 334.647 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 281.656 null ] >>
endobj
3608 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 323.688 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 270.697 null ] >>
endobj
3609 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 312.73 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 259.738 null ] >>
endobj
3610 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 301.771 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 248.78 null ] >>
endobj
3611 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 290.812 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 237.821 null ] >>
endobj
3612 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 279.853 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 226.862 null ] >>
endobj
3613 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 268.894 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 215.903 null ] >>
endobj
3614 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 257.935 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 204.944 null ] >>
endobj
3615 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 246.976 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 179.041 null ] >>
endobj
3616 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 236.017 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 168.082 null ] >>
endobj
3617 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 210.141 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 157.123 null ] >>
endobj
3618 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 199.183 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 146.164 null ] >>
endobj
3619 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 188.224 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 135.205 null ] >>
endobj
3620 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 177.265 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 124.247 null ] >>
endobj
3621 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 166.306 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 113.288 null ] >>
endobj
3622 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 155.347 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 102.329 null ] >>
endobj
3623 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 144.388 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 91.37 null ] >>
endobj
3624 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 133.429 null ] >>
+<< /D [ 3571 0 R /XYZ 81.145 80.411 null ] >>
endobj
-3625 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 122.47 null ] >>
-endobj
-3626 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 111.511 null ] >>
+3570 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
3627 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 100.552 null ] >>
+<< /Filter /FlateDecode /Length 2514 >>
+stream
+xÚÝZËn#;Ýç+ü­–Hêâ8`ÖÙ]ÜíÌjþ;z¿J.—ÒžÜÛƒ†Û•²Dñ%ògòôïwÿÿãåòùòó&퉘5áôù¯qâîŸ8`ŠNZ Æ•8}þçôÇ+çêâ>’sD÷ývþóóŸ/Üs¤~Þ ³J¡i願–z¤$‰sGźgឯîÛ8ÊoñoÀø!ÿÎiŽiæ¹ßÅ»{æî~Üù‡é©ËüäÇû1ž>zî¯ñoÿ\ÇÃ5?i»}§*]enTø@’3Áa¦?´ÇôÇ5C‚‘’׉—-ɽÈZ&§\™5«” ZÉ[Ä[ÉkÝ[Štð—¬Yã?å/Š–öVžà¥úˆóÑÍo=oånF°¥"~ü³©„U¯õ9øÐǸRKÑóî=ÉÚgC;Úʾ+i”%pÇÓük7ÂúϪ½À0á 1Û…rÍ^=¥{»ð±³~e Í
+ùyTy$1x‰ËÜÆÖ(q­«7ÄÍ
+oBl½öØ.ÕÉ»í„ݦ¼CÑ›U+/sä½øMI°kMg6ƹ¢Û®å€$ÜÌ’f5Ø
+´…˜[ KÁ¶'ô(T%äso9*9p=Ä^[¬•}nv[Å]Š»„"a¦,uYË•=¥Ū'V$^¥EÚÊ os}4OXž<Š¹Åü(ôÕø{ýM–ÚO¶:KOâc[#Ö_ë¼+5û,dˆÛD¢çXJZdhqj©·%K”RÊ ‰ûš’úüy݇¡^î‹fÚÀ%D5Ú ª½´.¥S(ªiZçz%­‡Ñ»iëYZçf“ÖëMZ/Ó#ƒ)„±]þŠl§üeÆü~Mù+ÍnÑzeqTqΠ®ã’ø¸Ås¬%•
+I,µ&w4Quj R¼á;È|ï! r!Lrí@}µ:‹Yðþ:’rÄâÔKSÁR$¥æ¤,¹(%R‹P6¹"£¾Ÿá,÷¦ÊÝSÇžmwX= »ô&#»kT·jrʸ1SÊÝG„¼ƒûYÁ‘ÑãYJø§_3o»ø¶xVÞ
+!úP³åbÇ¢¬~'Å_sJ+òÊe °Ó9½.|Ç® Ú\ ¶"–ÊÖìû¤ ¬ 5:¥odVU•Ú;m üãNëçýˆ£€`T»cø Èþnd•ÄlÇŸJë¬T|C8K0w
+ Rç²Îƒ¤§Aº™2}€ÌõOŒªsõ™Pj ž!y+yQ ®¥¶Îr…"ݲÆLA÷Áæ|/=¡çW(ÊÔÿ©ʾ+“C¨PK@ȹȨ6–$û©MDæ"¡šŒÚIý`dSŒJŽœ›[ÑÍ÷”£ó#³á»éê>1lÏîú7*¦ | ³(³ÓMzÚ®[Ç$}Ûê`6¹&Œ¥tZ@…’¡î͚Õ-##\5Sª˜/6žÓrCìûb7€“Fš‘ƒå˜âÁ‹–jZÊ¥òp ô…ü·l”I{`òôk ‚E›I·=­žÚìà¡—$æʉ‘Ò_Ò  ‡uM»]VÃ5(ýŽ
+BbFO|B¥?Z:òA«˜¨ ŠÙ™3M>ó‘øµóo<ê©ð«¼¹Ìn“À¨]˜+}-Α\(yyé&Ô˜ßÆCËÜÅqoÑÎj{ï< Ì}¦é9S†¿ºLÞ<Ðç.^q>*Q:˜ì˜]páêçN£"S ªÉˆ²ŠJºöFQ(6 ’ÚÎà“‚âŽ.Ä ïzB^'§…ÒejÚ(PúRâF¬J:Eó¡ïµ•Ô=P e̬U(äñVa4ˆÁ)–!Á¤C¡ÃZ”î
+ÄÐ]“
+—ú¶ÜNpÒAà>wƒP´=ßPÈsª´]tsnƒjjàFœSJóëp2U:v<+¡(.6A•ÙR ßa¬/Š[.¯C7¨K«¹œÛ
+µŸ9ñtÐPÚév=Ï/àEn×ê¾¥˜Ö®$ „îÃE‘€9Qß»è+
+eY5ø(JMh ´ M…4L¢žqršÆô1PZç„4“ÚL9Yƒ”¥Iдß“*¦`&Ò"6í -ƒd’)%¦Œ¬ÃÒ@pTçß „ 'ËÔ,‡]ÒFOéÒ¸ý?
+endstream
+endobj
+3626 0 obj
+<< /Type /Page /Contents 3627 0 R /Resources 3625 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3569 0 R >>
endobj
3628 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 89.593 null ] >>
+<< /D [ 3626 0 R /XYZ 78.37 808.885 null ] >>
endobj
3629 0 obj
-<< /D [ 3576 0 R /XYZ 81.145 78.635 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 768.829 null ] >>
endobj
-3575 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
+3630 0 obj
+<< /D [ 3626 0 R /XYZ 81.145 757.87 null ] >>
endobj
-3633 0 obj
-<< /Filter /FlateDecode /Length 2430 >>
-stream
-xÚÝ[ËŽ·ÝÏWôX–H=A3îé
-%a&?âšü%`D9£¢,QÚÑïË*—„Ò8ãR¿ã¬PFJàóEœ:Ù¸ŽÚ†¤múµ¼b´ú,IŽçÅ1ÉJ’-­ÇÄw€ü,y
-Oq,\Y¦(O”¯<ßÐ
-”çQáIŽ$Ãà"†Äq-F\ÚjÉq·Ò“Ys¤OÖæ¼xøf/áfGÞ êl”™y¯^S“ܵ%YMHéGôõ®á@¸›E¦[ µV[A)qjíëJ¨=ŠS÷F[D¥D­‡Èk´ŠoÂuƒÜVQ—ECXÑO•õ²”)JÚ'Æ4bDÔ{¹áe®îë]Ä0W¾Ì[¥oÇ÷í õ®×Y¾Suœ û·í~T+uû,¥‡ëD¢O²hBµaf)\Ã4#¥œïRÖ¾äŒþ^÷៨¬¢(oÔT~i“o íðÔ½œn¼Ð1Ñ'uéV’z}7©K7KêÒï’zz´Kêu:3˜³A»É_ÌvÎ_~Ì_émÎ_yvÕ+&ãqÐÄé8ƒN¸­¯™+¯Xb­¶MJÛç®<‡yá4uÝ,4¦ôhn*¡¬Š4gŸ¢ÓBEÐæ›VA‡©^r&HDÙ»0Ì‚„ÊœÈ?)ûSgJйFr lc^·nü$Ö¹‰ªgä“ÖÃn|¡Â†K3f&ÂÉ,U½V&ïh¢âéÜ?H¤dÇw!Pø¾-4Å0Cµýh½­VgQ ~<ÄŽÚuÀ‘ºÞÊÓðÓ²sZAS 2#­E4›ÝÎEnÕw4ȼ?-ï£dªÐïn@wùIAwÖx‘ªr]°c¡„Ph—]¼•|#¦Õm×,[ŸVç*»!E Ým;îYÔÕoD!~[¢P^Q6.kÎÙêÂèÙ–r°±–¶þ¾[*EFö£¡F·Œ ’Âj¢jsƒ›¢ã¸ióçÇG1Táûêl»˜àýÍðÎåÄl'ó«Ú=«EßPC#βÌ*CÛs]çÁ®Bâ¨ô(ÞL1J–*¨DÇ:Å~¡¬©dÞË^UèZù_ ´\¨´Bã{› 3úüBÅúVåj¡òÀ›A
-£ÕÜ%#yÛ‡“ì
-ë¦g/GOÈŠ”~Å>…&@èÔî܇^Vrü@hé܇R¡ð÷}t=ö1ø±#/<íiè«>)¾‹}T8
-_Y›
--æñS>¹,ÍzŠa–PÓØ[gJà(4O/™2ýk“)Ó“
-½‹WÈG šQ “-s]PíCµSe.rIÉ8«*eÓæ¨*Å®QÒÚrRTÜІºâMg(ë”ÄPÛM];jƒJ]õm`P´Öé¶DØ6Ýjò(ÄCÓž¡2Ç{†lS4£‰K¡ÃZ:2ÀÇ wmªh&žÛiÎ:HÜ—®ª£—Êœ&í&@¤9 ¹A³‡î
-j¤ÄúÑUö—س·±‡^rÿq½jd»Q¯ñ÷è7—”^=¥™gôý ¼²W4àx îE)ݺ) ßtø{î×axPv\k†{íw¶e4 \>àòªéÀÕÎhÎíØKvgì8ýšòÖwbÝþ,­÷ýWgw¯âR `'Ò÷ÏK¸t t§‘é;qàËqª¢Ú¦ûç(LÍûgKhš*/J5eäe) ”Ö9±!5'œ,BÊÒ$d†/‚ÉÊx§2­¡ÓÒ2LVÚ ½O„ü_Ö8ÙR:
-ŽjýË`Šg¨óôuÔeml)ýDÿ`YFº©¿¯ÁÑÒ§€e¥´0Úϸ;
- w[JËÿ½}!Q¿OÃ/Ça BŽ”~Õ}ñi€9Ðß8ÓëAxSÒý†Î'ƒeˆÄ=‘“‡ÖcJÿ'‘1ÉÛûÓ?„2ž9
-endstream
+3631 0 obj
+<< /D [ 3626 0 R /XYZ 81.145 746.912 null ] >>
endobj
3632 0 obj
-<< /Type /Page /Contents 3633 0 R /Resources 3631 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3630 0 R >>
+<< /D [ 3626 0 R /XYZ 81.145 735.953 null ] >>
+endobj
+3633 0 obj
+<< /D [ 3626 0 R /XYZ 81.145 724.994 null ] >>
endobj
3634 0 obj
-<< /D [ 3632 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 714.035 null ] >>
endobj
3635 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 703.076 null ] >>
endobj
3636 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 692.117 null ] >>
+endobj
+293 0 obj
+<< /D [ 3626 0 R /XYZ 79.37 671.1 null ] >>
endobj
3637 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 623.079 null ] >>
endobj
3638 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 735.953 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 612.121 null ] >>
endobj
3639 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 724.994 null ] >>
-endobj
-293 0 obj
-<< /D [ 3632 0 R /XYZ 79.37 702.177 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 601.162 null ] >>
endobj
3640 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 653.796 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 590.203 null ] >>
endobj
3641 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 642.837 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 515.651 null ] >>
endobj
3642 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 631.878 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 475.524 null ] >>
endobj
3643 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 620.919 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 464.565 null ] >>
endobj
3644 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 544.207 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 453.606 null ] >>
endobj
3645 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 503.36 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 442.648 null ] >>
+endobj
+297 0 obj
+<< /D [ 3626 0 R /XYZ 79.37 407.986 null ] >>
endobj
3646 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 492.401 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 325.54 null ] >>
endobj
3647 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 481.442 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 314.581 null ] >>
endobj
3648 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 470.483 null ] >>
-endobj
-297 0 obj
-<< /D [ 3632 0 R /XYZ 79.37 433.711 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 303.622 null ] >>
endobj
3649 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 349.464 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 292.663 null ] >>
endobj
3650 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 338.506 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 281.704 null ] >>
endobj
3651 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 327.547 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 270.746 null ] >>
endobj
3652 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 316.588 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 259.787 null ] >>
endobj
3653 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 305.629 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 248.828 null ] >>
endobj
3654 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 294.67 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 237.869 null ] >>
endobj
3655 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 283.711 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 226.91 null ] >>
endobj
3656 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 272.752 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 188.224 null ] >>
endobj
3657 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 261.793 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 177.265 null ] >>
endobj
3658 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 250.834 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 166.306 null ] >>
endobj
3659 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 209.988 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 155.347 null ] >>
endobj
3660 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 199.029 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 144.388 null ] >>
endobj
3661 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 188.07 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 133.429 null ] >>
endobj
3662 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 177.111 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 122.47 null ] >>
endobj
3663 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 166.152 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 111.511 null ] >>
endobj
3664 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 155.193 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 100.552 null ] >>
endobj
3665 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 144.234 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 89.593 null ] >>
endobj
3666 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 133.275 null ] >>
+<< /D [ 3626 0 R /XYZ 81.145 78.635 null ] >>
endobj
-3667 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 122.316 null ] >>
-endobj
-3668 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 111.357 null ] >>
+3625 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F22 367 0 R /F15 334 0 R /F74 337 0 R /F65 335 0 R /F83 412 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
3669 0 obj
-<< /D [ 3632 0 R /XYZ 81.145 100.398 null ] >>
-endobj
-3631 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F22 367 0 R /F15 334 0 R /F74 337 0 R /F65 335 0 R /F83 414 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-3672 0 obj
-<< /Filter /FlateDecode /Length 2406 >>
+<< /Filter /FlateDecode /Length 2561 >>
stream
-xÚí[;#7 îïW¸LŠS$Šz‹Öçu€ÔÛi“*ùÿe¨÷cäñÈë¼€¾›Ñ|¢øIqøé·?ýøåüñ凫P'Çœ§_¿zÀOâd“æd´`\‹ÓÇ履_8×–sy¥¼~•ÜÑi8W‚s´ñ§Ä+ºo€þö¿ 9¿þòñÍdål&‚!Â8W@C?Wƒ0§UhÄ´jy|[;ú]âßž]¨ßÚ¿àïøYÛwêjýݲ~Á=•—W°/q,žã5Èׯá"LÎóËžMÒ(ˆù ýÄalO˜Û™ÖfâÛqA™éô?\üxlz\ìæôcH|i,¾%aj?f³´,û›<Š23¸£_è˜à:K ’¼ý€0€ •L„º¤iþ™Ù×äÌÂ]©È€ˆNô:™$ØxIO“&‡E;|)³‹«Nì
-wóØ HQÐZQÅ·/‘‰ 1­†„¡EC"Ô- c÷%ápC‹LžÇëÓ$°ÂàëÄ|ç‚D4̉™$Afë­`J4i‹$;Wž;dãÍâ ‹–r£ûåF`åŽgNàûµ’ŠPÉÂÏoˆbõöb³½¬ á/lT;ªyr®Qþ2‰jûjeZ§!æ)ÏDÆ™ò¾œþý‘˜§Ü ™³BBË< Œ¸i@2à²8Gâ—öŽîÍ_G¬´+£Æ“%!hò© Ž#Aƒ¢×¯ðlQ <¹‰YÆkÚ[%ãÏ¿X`¢>ø±ò­¼‰«‹À
-µJ·Lû[ŠÖbÄh h?ÊWôŸÁiÍAÜß(÷’Ÿjpãò<‹N÷sL£)
-VÇBÂÑ$Ÿ¡EJÙí»?¾ß#
-’ô”vÐKV À–'æ9q£NtMwÞÅldDÚ& ,Ò,8£W§4ãã{¤OEeèã(§ê —89 Ó‡¾8ð)@kiC˜˜G£Þ`H-í¥äq®ñdج–ÊckYæ“ìa´Â ìñ
-çaªjMð=ÒÃy;ÍÎPÈ)E¸f=ÒÃIë*œêÔZ\0 -•¤AVÏ ÈÇh”'*ݤn¦OÝèiÌ/ó¸èªåäôÔ5å7·_°Š¡ ;ûîÖüá(WôÝ3Òf ×Ú5@Ùq>o,éwª„ñ™âñíò\×·üihdhéO(Ow™%-å”N+* ȧÇü¡ú *
-‚Iá·’ÐЮ²®¹Íµòy|ä•Ù6 l³©}‰§D…Ý‘»†šç·iîô
-ÔLj=Ó¾µ®›èØ»ÏÆnüÐ={£ë‹°¹±$§›ãx[¿´˜6²ýuÇõ~A>u.GƒÜä\¤[|ê?Å©Gð{Gûÿ‚¶È§.o±­a@ZáS¯'õyžómЫÅs
-Xù|Åk #Rª“µÍ€ÁÖL{D>P)í/ùûÏ¡ìųëñv ~•ñÓæÀ£Ñ‘™Š;ÝëuÛ.Rgjuê7ÊÍ%›·¡íGe¹*רãéýK7‡9«955)Ÿáñ¸7‰«º¥ŸÏðkŸ÷ËvL™¸š3i­)¤ÇÙ×èÅïNÓÛÓÅ`vk'A=P´§F/'ŸËù¯ÍtjÌ–¶~Ù ¦~k¸ÕÚë|¦]n¿¼oñ¼îp4QmíæQ‘#Á(}BÎœ©Åñ÷"Ü÷/ÌBµ
+xÚí[9+9Î߯p¸<­DÝ@£û¹=ÀÄ 6Ývþ8Ô}].¹=ÇØ.WIõ‘¢HŠÅOÿ9ñÓÏß.Ÿßþyúä™7`Ôéóßß>à'q²žI{²F0nÄéó¿§_ß87Žsyü—Üãi9ׂsåÒG‹w°xßþŸ+¶¹¼ÿëóÉIj$¡S
+æ±"5Æê(м
+c™nÃ-O½ÇÏ5ýü˜Ê½øÑÿƒKºFíû´Ù†»uþ‚.¯ïàÞR[uI× ß¿Ç‹88/LÒVR
+†cÛ‘1¿3¬+Ì÷í¢
+èø ×Ð^uFºj3´Añåeñ# Ó„6›©ÙßÅ(É̪ýRž nŠÄ Ë;L
+-éW–ËDhg¹Ø¼I\ÓÓÑæÔÉf³­²)·ÅŒtwØò³KÚifÑ›žk¶~ųÈNSÛ šá´šiC¢é–to$tMu©?íž·<¯nÛ‹h»^eÑðl—ûᥠ?îþ×!o3\Ë^¯A?RR¼•¯àÝvßg–¨–ø#É™©%£?S"‡Ê3)ŸdrÊ,A¾JÞpýÂëú¢ðÇ‘~‚”kú2RŠ2vÕ;[äJ
+fÜàÕÇš¬'J»²^”Ù✀3k¶FñÜ6÷£H”ZµÊ÷ÌqKq´æ#N„&†ö½|í$‹¶9âñF¹¬„ÈЀŸÇÊ;Ý1­aÀõ1J1àHÔ$§¨zZ»Ú?~ûi
+5s€V Z¾Û˜HØJµ$-dgæ‚T-Ï¡raïhÝGà×·)I»‹¸B·Œ;³‚¸ò(r½Už[ùñŒ~÷¤ØV0É›KÙÞ%„U0—&gÒb}͘\»€w
+M <jmÑHjጟòŸ}ÕÛ½³0·{ëu»_–d܆>«û¡Vhc‰¸ù|<lâ–I3%š¿æ¾ÚÓR3G„ÚçÃQÅc¤4ù“MTŠ}ï¨A1gɽw1 ™)íú“ y’yAîÎG=ù‚üHéKž™æÀ<n]Wj É‘Ò1}Ó_Ò åóÞ“:!—|̉RÏ{Mz\šG·«¥ÙZ¤ù¢•¯œ`\
+Ÿ£>x–ôDéKú‡
+b¬D Ï·ï%¿Bf<}V-ˆÆuÏé]i-=QúScMŒ¸0ê"÷ŠÅÜõLé‹5¥Lºínâ–sÓ%Âßz`¿‘N—%èí·LR*¥f.§Í²Lûb´pW½MÕ!íûnqš „˜¹X)NCóÅ™)l*²ò\Z²3q|owÊó)ëoxÌu'm¶A¬éjXrʱåçºâ§Ôãa‘ ˜jõúaäœÞ,•/¦rSr}rZc 2Ñ[æ~ É«y(±ä ©!7âZ7]\2°žZ@Gƒ¹²è'Jô¢_ã< ˜[Œ¦FB}ÅÇT ²ÈŸC£aÉàÁÀ*‡À¥×Wñ„ªB•+K»R
+K&JÏ–
+½(iÈ•6–ÔŸ5wz¢ôtŠ
endstream
endobj
+3668 0 obj
+<< /Type /Page /Contents 3669 0 R /Resources 3667 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3569 0 R >>
+endobj
+3670 0 obj
+<< /D [ 3668 0 R /XYZ 78.37 808.885 null ] >>
+endobj
3671 0 obj
-<< /Type /Page /Contents 3672 0 R /Resources 3670 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3630 0 R >>
+<< /D [ 3668 0 R /XYZ 81.145 731.363 null ] >>
+endobj
+3672 0 obj
+<< /D [ 3668 0 R /XYZ 81.145 720.404 null ] >>
endobj
3673 0 obj
-<< /D [ 3671 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 709.445 null ] >>
endobj
3674 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 730.971 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 694.288 null ] >>
endobj
3675 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 720.012 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 683.329 null ] >>
endobj
3676 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 709.053 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 672.37 null ] >>
endobj
3677 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 693.113 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 661.411 null ] >>
endobj
3678 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 682.154 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 650.452 null ] >>
endobj
3679 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 671.195 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 639.493 null ] >>
endobj
3680 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 660.237 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 628.534 null ] >>
endobj
3681 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 649.278 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 617.575 null ] >>
endobj
3682 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 638.319 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 565.521 null ] >>
endobj
3683 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 627.36 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 554.562 null ] >>
endobj
3684 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 616.401 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 543.604 null ] >>
endobj
3685 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 561.606 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 532.645 null ] >>
endobj
3686 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 550.648 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 521.686 null ] >>
endobj
3687 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 539.689 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 510.727 null ] >>
endobj
3688 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 528.73 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 499.768 null ] >>
endobj
3689 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 517.771 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 488.809 null ] >>
endobj
3690 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 506.812 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 477.85 null ] >>
endobj
3691 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 495.853 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 466.891 null ] >>
endobj
3692 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 484.894 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 455.932 null ] >>
endobj
3693 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 473.935 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 444.973 null ] >>
endobj
3694 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 462.976 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 434.015 null ] >>
endobj
3695 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 452.017 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 423.056 null ] >>
endobj
3696 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 441.058 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 412.097 null ] >>
endobj
3697 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 430.1 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 401.138 null ] >>
endobj
3698 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 419.141 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 361.074 null ] >>
endobj
3699 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 408.182 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 350.115 null ] >>
endobj
3700 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 397.223 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 339.156 null ] >>
endobj
3701 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 356.376 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 311.047 null ] >>
endobj
3702 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 345.417 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 300.089 null ] >>
endobj
3703 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 334.458 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 289.13 null ] >>
endobj
3704 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 305.567 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 278.171 null ] >>
endobj
3705 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 294.608 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 267.212 null ] >>
endobj
3706 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 283.649 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 256.253 null ] >>
endobj
3707 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 272.69 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 245.294 null ] >>
endobj
3708 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 261.731 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 234.335 null ] >>
endobj
3709 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 250.772 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 223.376 null ] >>
endobj
3710 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 239.813 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 212.417 null ] >>
endobj
3711 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 228.854 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 163.53 null ] >>
endobj
3712 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 217.895 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 152.571 null ] >>
endobj
3713 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 206.936 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 141.612 null ] >>
endobj
3714 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 154.134 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 89.593 null ] >>
endobj
3715 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 143.176 null ] >>
-endobj
-3716 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 132.217 null ] >>
+<< /D [ 3668 0 R /XYZ 81.145 78.635 null ] >>
endobj
-3717 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 116.276 null ] >>
+3667 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F83 412 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R /F30 341 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
3718 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 105.318 null ] >>
+<< /Filter /FlateDecode /Length 3160 >>
+stream
+xÚ½\;o$9ÎçW8¼ F+‘z†÷´½ÀÅ“.½îÿ§G½ŸU]êñlÐÓíªÅ—¨køË_/üåÏo·ŸßþøêÅ1§AË—Ÿÿý&è/Æ14/F Ƶxùù¿—¿rnÄ›EúFxûŽè¾}.Ñçƹ¤oyÏ·Å·ÿüüMbäj‚iº5L’¦âœkǹô‘‰ÊšUA£…œ¨ ‰£5¯Ü´¼É{¼ï¿¥Ÿ üLôÛF)üìþãGÆë­àñŠ¤
+”—ÑúOùk6SsÇ+È;„§Ìpïžpþ³+=j&”\J/÷¤ï)³C•$¸†7.FóëäÞü‘¥ò/o×èX^Þ"ß½<y@;ÓÙÕ>¼Ågà³›KŸºZ© ,*``è–ýµŠïøÉñ³½RXsÕUµówõk5uYöÙ£áó|±;dÖ[±ãts­
+áÉÂhÁìŒa2'ñ’À
+3®•:ÚïT)ãFÿšA¤D¦Ì¨` H­XT´¦§q)&Î&ÕŽ)Šóàà‡·Æm¡*-˜˜”eâzÖw ”*±¥:Ï™
+fÄÃ8xwÿÍÐê‘ÊÙ:ûŽ
+—ÙßÂS~3ŠwæÝ&߉ÛY"[V
+þ;GUÿÛßÃÏ– ¥¢'D/,ª=ô1Zlq”éô;åQP º’ÐrÚCã
+OkÄRú L¨-ÒÌ°BEˆ[¨h¤ô+˜ª³t #wý M´=4íèƒ}ôWp£6d·DÍòcOC¥'5ä}*,¿FBTK[:ø•â½¿4òÑÇÁìAqÃl7ÏÅ>Æ™F=׸-ex½ÞQ‚…þÏñ¨V†Ié–™£rGë_óqO WG„ò¤ŠG¿‹q8ÜUvLÚ옴¶JÒÈ=#ÆÑËMxž%n™™¥NòAšã.Sö“º¤ðZ†`æ{‡K%˜Ñv4Ú.´‚).G*6×Å>(“Nö㛊ÂÆ6ñ\@E’Cš)\xm¸½p1Pz2\TI÷—¡ÐLóº!ýˆ˜Ï¦¬Ç§©èìk?ô—•ã´ªY®a#·ùªî욯–üVϵj9 ­Ã¸d¡Àô#ŸE`‘»QBU¿ÑËÎóI+™qz¤=>kcAóP‚õZ·Ê¢?šÐKäi:Þ [}ƾ&tŒOd:¥ÌU¨ÙÄrÞr±ü¸¤UPœÖÜsX{b))ÇÙr!)ØZHìªçõ••Ñ∋>MÃ[® õá?ù¯jÙ‚F74FF0R¬t¦o×tF®l”)åÔ!çr x‘sã*a•®T©º
+=rŽx½Ú()Ñçv¤|‘
+¢TYÑ¥‘’ž¥¼¸ŠËóFÎÉîÓG;íA54<ðx­ö´—Óóá0»¯÷fù`*`m¯o.:»²ÇÕ2“œ”’”ª«7e _æ2‰nÉÝûw#¥¯ö–M¹èKZ±’ëjAÄо¥p¢tÉ[ŒJaˆ·yz=JÌÅ$-ú¬…¤p4?dOÏêʦ
+ûÚ.ö>]¡¯2 s¸Ò›e›¾Ÿ•mTqXÉW¥‘®Ð1¹ÝV™džçwcžMd@ñðÊ ù±Q|J¡ª§¤ý!_¯ÿJ§j&œ´ÂïÒ{Oýz#H@Æ…ZiþjA,õF ”šnêR>j󑘦/6’5´›ûNÑùií€c4j¥‹å©Tßmu9
+Á6¿Ð仈žH}„†r ½/žq%ˆ3úûvPîŠ.C»Ä¾WÁhÿÖ¨FJ—^ùýÁ°©CÆõ˜‡7îòÑðìÐõˆx:ÞÔ:rFÞRëvOë=¥ÐïoÄÛÉðÞ"Íll•5è'¼õøèÇ K}´Ô7^ŽG’PZ }ÒZŠ.*>~~û?œ~ƒl
+endstream
+endobj
+3717 0 obj
+<< /Type /Page /Contents 3718 0 R /Resources 3716 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3569 0 R >>
endobj
3719 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 94.359 null ] >>
+<< /D [ 3717 0 R /XYZ 78.37 808.885 null ] >>
endobj
3720 0 obj
-<< /D [ 3671 0 R /XYZ 81.145 83.4 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 754.882 null ] >>
endobj
-3670 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F83 414 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R /F30 341 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-3723 0 obj
-<< /Filter /FlateDecode /Length 2452 >>
-stream
-xÚÕ[9+7Î߯Pè L“Åâ¤ÑÈÀÆ“N½Ñþÿty_]­iŽ5Þ@3R‹,ÖͯŠ?ýçÄO¿ÿ¸}üøí!ÔÉ1§Aãéã¯ÂÁOâd“æd´`\‹ÓÇOœ9Ç7Ε¸€õï p÷˯҅Oè?Iã?YôŸ´óŸþá‰
-£ï~Œ Omyªýfú—æåi˜Æi ÆÁ£>ݬ‚úæœÆ}ùóãß^>ƒ”| Yîf Mä$ÉéC¦Bk ,2ãôL%ÌôzÊÚ hîJ
-ZÍ:ØŒ]×8Ü×çúÿï)v¢äžžÒÝ»E É
-rO~Jʲ&v‚I
-­$ÃŽ ÛmfBfEG´Å(ycƒl¸{pÎ0òhF0cpÍ’JâV&°Ÿk3‰+Ì»mZ)¸†é]NÎO‡}8Î^!Ny5lÕ9"m‹Jìwrž¹¸¥qá{£Óó2'*(fܧæ@.}†ßp€áW”‰‹iBN[ÝÙEa¡è2ÍcÖRÌnGSV¦½ÅSÜõðªa}î$îxÃ[Y/}Á]¬ÙY¦<~Úb\°Ì‚<2´Ê¾ˆºPÓçNøD{#ÄhÒìﺮ¸5l¦¤TsY]¡Yz¥ùfôóD>øK}Vý:.7²g–uü<$«_NvÇ”ª^9ÚJñPãQ^)7qØ}€ß8šð‰î³kctW“'Û䪑5Yl²‹Üf—ø(
-¢Š9œ—Â)DBFÅ…é
-ÂK“þ‹’UÀÖ2nÉØ8¸ ¾š(I½ÅWpýi]?C.JðI4’ ¤O:<wœ[oæòmɃ1OM§#¦œŽ8l&}ê³.´ÂìÌSìbõÆ^­AÔÏŸ$!çUk ÃmŽâŽJþLV©43n#«¼Q2=å_zoB:i«TsîYå½7Φ±´hÜé‰M0›^*_nâÀç/ü_<T /_–¡/G(­ÕØú—©a@w’Ô¹žçóÚ}û¤€ŽØÅà Žj÷h'“•vhéÒŽ Ž=íÛ††!WõÅñSÇò…†Fœ)Ä>”®Ù )­ærÀ@‹ùÖ
-—2áHèëžÃÓŠdè`ÑR }Cj~ëú¾‚¸³÷óR·p–ig(¥-Þ¦Ÿ(ýäÔ-¬af쯥‹ÓÇOÀ‹#¥§Ü.òh|MlÅãQ0 "ÞÈœ(u^q¥ïÐÿ˜AIô´\Kf¥˜)¥í«”ú›;9ÝiÖ
-Em…Ÿ"i µuðìÚS@¡gJä=¢×ikQJ”ÌqIIy8)GJMÊxGzåû‡Ì!’|Ù¥nýD©»‘¤ûßõŒ÷?·ÿòï}B¦pV‘þ£ÖrÍH©ƒK¥ñ«ö+!˜ÇB¤\¸–ç'JÿHxx/âPüÿÏa¤_…qmÈP[Bm¡/ÃHñà€àg­¹;Òùõ}ºÆ³ýÉ]ßÏ`ìFáî•#gδ_K¶›Jï?þ[èJù
-endstream
+3721 0 obj
+<< /D [ 3717 0 R /XYZ 81.145 743.923 null ] >>
endobj
3722 0 obj
-<< /Type /Page /Contents 3723 0 R /Resources 3721 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3630 0 R >>
+<< /D [ 3717 0 R /XYZ 81.145 691.121 null ] >>
+endobj
+3723 0 obj
+<< /D [ 3717 0 R /XYZ 81.145 680.162 null ] >>
endobj
3724 0 obj
-<< /D [ 3722 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 639.315 null ] >>
endobj
3725 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 742.926 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 598.468 null ] >>
endobj
3726 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 731.968 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 587.509 null ] >>
endobj
3727 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 721.009 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 576.55 null ] >>
endobj
3728 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 710.05 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 565.591 null ] >>
endobj
3729 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 699.091 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 554.633 null ] >>
endobj
3730 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 688.132 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 543.674 null ] >>
endobj
3731 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 623.375 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 466.961 null ] >>
endobj
3732 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 612.416 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 456.002 null ] >>
endobj
3733 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 601.457 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 445.044 null ] >>
endobj
3734 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 590.498 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 434.085 null ] >>
endobj
3735 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 579.539 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 423.126 null ] >>
endobj
3736 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 568.58 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 412.167 null ] >>
endobj
3737 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 557.621 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 401.208 null ] >>
endobj
3738 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 546.662 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 390.249 null ] >>
endobj
3739 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 535.704 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 379.29 null ] >>
endobj
3740 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 524.745 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 368.331 null ] >>
endobj
3741 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 495.853 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 339.44 null ] >>
endobj
3742 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 455.006 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 298.593 null ] >>
endobj
3743 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 426.115 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 269.701 null ] >>
endobj
3744 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 415.156 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 258.742 null ] >>
endobj
3745 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 404.197 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 247.783 null ] >>
endobj
3746 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 363.35 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 236.824 null ] >>
endobj
3747 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 352.391 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 160.112 null ] >>
endobj
3748 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 341.432 null ] >>
-endobj
-301 0 obj
-<< /D [ 3722 0 R /XYZ 79.37 304.66 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 149.153 null ] >>
endobj
3749 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 277.2 null ] >>
+<< /D [ 3717 0 R /XYZ 81.145 138.194 null ] >>
endobj
-3750 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 266.242 null ] >>
-endobj
-3751 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 255.283 null ] >>
+3716 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R /F81 377 0 R /F27 340 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
3752 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 244.324 null ] >>
+<< /Filter /FlateDecode /Length 2400 >>
+stream
+xÚå[Ínã6¾ïSøÂ%g†@ÀŽãzέèµ=õý¯%ER¤F´,:Nš¢‡ÝÈ5œÿù†¢äᯃ<üúqzÿñó¢ôÁ oÀÐáýÏ*Üu°^ =X£„4êðþ÷á÷g)“/á¼<!R“”Z…;g)éü6ÎòqFø+_þxÿ-¬`©·‚B-Œ4|  ðt jÞµJÿâ5…µ â*™ú[ým|^©/ (ʬ¤±)DÊn–_žÀ=!õsÎ@Z.󨢗_E­ŒÌc3ñI5—–¶¦¼Ü4WÌzŽ¼¦Ù†¹ÉÄJ& ‹[n©×Ä¡5"6ì›ô
+ÝÉÝeápSÏhPÈõ¢©ò=‘ž”©^ÌÐÃÌÐ «z®E`›3C[+0±Ï%þÛ_“B[UŠúâ›Ù]˜{DÐHvoŽGãzF‹#Mî;…Ƽ4UJl è$Ù ®’»}irÜM­‚8SÔ$Ôm£ffoŠš™ 5Ýy‹@FúÓ¸¨6n…0ÕÆïJј¼Ý”8¹áÓJXí¸¡ õUÿAP·—ë'²ƒ„§üìÖ¥ìT°³î/p ¶±ðk¬4‘_!¾4OfžQe±¶Ÿ[*¢²XM2=ohO/Û‘fB
+4¶gs³£µ_­é>wÂǵgd/[ЗaR“Nª5:ñc³ú,-WŽ…§dÿÉ–ÑÃ3†QRËÇÕ´ÂÀl~m׎óøEÃtÞáæþäA Hº®ÁCuIhÕðl•t­´ÐÒ÷ZíGZí÷´‰f)XéGi”#„åÜÒäÑ-'ႬLæÏn 
+ zµjî L-@ÛdU^i
+ÒÝ­¦ )¥4õ×dÙþZ¢ÐºÖöíÆáÉX½ÃÔi7n}¶”…4rO{ °d>›‰íé*÷W.8t0Ö¬æµýAéöéÅù§5®õ™·Ûž¬I^ íýPwp®–Š¿'O:å²ÁŒyH …Å9Œ¶4ZEUÊ­${ÝIàŠKC<W¤ÇK7‘;5ÎLµCn¨4FM#ó^—lö,¡eq—§%bŃ*iîi•Ä6vâ{;…?¦BêÁvEI/ t•Œ
+çd¶ñ9)1úNÙ´¼±û¤¸EZ-ðm -Œï"[ô#E–ú„¶åµÎAµŽ¿/lkH“°Ø…¢è† (£ôÅm Q(½¶°ô˜KJ›Üòˆ œò]w¾–
+͈Î9A¶^Ì?_<׳Ç˯Ðn}÷u-Y¸y¶ØX®€9£Ëtty6à[}O_NÖPŽß†åM‡’^§Ø‚;CÀw4»ÅíÎäFqo$¤Ä%áñÏãP(ãzz¬‡]ÒyL »>¨~¯¾!͇ß>dÿX ÷Z%ͽps½¼zÈ hüKøúb½ù0ñíýÇ?iâ—'
+endstream
+endobj
+3751 0 obj
+<< /Type /Page /Contents 3752 0 R /Resources 3750 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3569 0 R >>
endobj
3753 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 233.365 null ] >>
+<< /D [ 3751 0 R /XYZ 78.37 808.885 null ] >>
endobj
3754 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 217.425 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 719.016 null ] >>
endobj
3755 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 206.466 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 708.057 null ] >>
endobj
3756 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 195.507 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 697.098 null ] >>
+endobj
+301 0 obj
+<< /D [ 3751 0 R /XYZ 79.37 660.326 null ] >>
endobj
3757 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 184.548 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 594.012 null ] >>
endobj
3758 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 173.589 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 583.054 null ] >>
endobj
3759 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 162.63 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 572.095 null ] >>
endobj
3760 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 151.671 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 561.136 null ] >>
endobj
3761 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 140.712 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 550.177 null ] >>
endobj
3762 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 129.753 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 473.464 null ] >>
endobj
3763 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 118.794 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 462.506 null ] >>
endobj
3764 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 107.836 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 451.547 null ] >>
endobj
3765 0 obj
-<< /D [ 3722 0 R /XYZ 81.145 79.94 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 440.588 null ] >>
endobj
-3721 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R /F27 340 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-3768 0 obj
-<< /Filter /FlateDecode /Length 2348 >>
-stream
-xÚíIŽã8òž¯ðšEFpÒåt}ÎÛ`®3§ùÿµ¹o
-9EÕÚÀ à²EQ¡Ø{r¦.ÿ½pÿÿŸ/·—/å.’9+.ÿyîÿ‰‹¦åÅhÁ¸—ÿ]þõʹ¾qŽ˜¾»þû㯀yP_V^,sZ£íánJ˜!I˹œƒ‡$¾†ëë
-ÔkZ wôݯúvåÊò«¼»#å:g‚E‡‚5:FHh2¶¼à(“pG¨«q¥¿
-O);ï÷ê3JÕý÷Ì¥[SéʳG€·ÂÁý=ªýªoÂŒ<VùŽŽ ‰ßõmï¤ÀAøÞ¸§ÿöòÐo[‚ Ÿz%ǧô{‚ùï¯!ðúk/±ø„M;A¤Oø¹‚ù÷F’yfC“\x[ãx8N¸Oœ‚¾wš±('°LxPrz;$'g˜;:¯8œ3‹ŠBÝB# p^ ?£ÎäÓؤ­²~„»éNâ9¼ÍIzRö Hg4j¦¿gtÒÈY+Pç5;œçÏÏûµuÌM2Ñ.¾ ÒO¶ÞÚxÔ„!µS­Ñ1BúÅÖ{‘ Úk´²$äFH£÷Ô éqr[ºº_XÝ·¿Ä{'ù¢'ã¼÷4OûZwd-‹–9Pý xLÊ­Ak¿|Ó´*Ej!â1þ£·EÆõP¾£¯^¤DjÆ%ÙÉ÷cÔ€`r é´Éר·Ûím9Öœ Ç$€F‹Qã éwŒ^îÍ…ëȵɗýã- -)yŒFsP1šìËC¨‹óCØÒ6Ž¡¹(+™®"a‹9ºþ`;§$mq´W0ÁxBÇø[¿ûY@ƒà²Â•`&(]qUé®l¦ðËÃH
-w
-Éi_‚ÇB¼­”s¾¿HŸ°Ì¿¤o­ö1AúÉ•,层<h¸FÆ
-*­U¯û¬w²°'A*¹å"¥Òi&IêÑúB&u‚ôsjv"׳gUZÅ„ÛÔ9Ð-×9&HÏêx«§õ›O¬4’"EåÑÚI®/ÍÆúIí^¯²6ë{J«ŽUá¾õm-øMø‘‘‡z™IñïhçL*æv‰äßYkNXÉE:0Š¤ómÎÒ骟”>}ÙÖyFGãÜ¢¹#$„Ážþšë>ÕÜe‰"gè,É?»&Ñ }òOz¸Âe}?ãÝ„c©µã-m™òK¤XÍ5èk–½ ·L’Ì?(æ€NŸ&ô9¸Aj.¦ ÒyŒ¬fJ“þw±ó1Aúe½4Ši¾õµv9¢˜ ç±–þKR-vN&H¿8ªA…L[Eѵ8Ï2C"mÛ±>Ѷ;4”â¡UJkÕô}üm ËNçÚÓØIjù/QýL7Þ«Ýät½o§ÁL½£E9I`4)§·59ŽøðUô]ó.DÁŒ¶åG£—Ü¥ž!ýã4´¯Šþ>š ž»Ü‘ò±kò!·Õܱ“¶V:ÆœeÖ ¡µZÏ éh×}_k˜C %z4ÂÑL˜!ý¨®ÿÉæìRWÍ3ÏþmL¤oíüÅ‹22š9CFH‡c¾,£Ò4Ëð£æ4ÖÛÑ?hc’ÂÙh͸ØNb¨ÃkníM€6J€ýI @ÇZv® ¼;gÚo¹Rè)ôláqNãêôkî[ÌLëSµÔ,w‹XL[±csPçrbi꺳Lz$—[V‡Nµ-ê8bz¿"䢑eGmïW $45"ºÛ "ðBP"<⎀¾­;ÛØ>žšét¥íßÖL G@ØMõJØÅrù\Á@
-1ê²28"õµN¨µ}J—û©39#:Ÿ´Ç@ã:ÐøÌ€Ý#ÅÕçüIÊC‘iH.\ÛËÒÿËÐΉcéA=ã}ÑFîãýdø }Ö¬7<—-HèOA»œ´¡¯ÂU'nÔÌ}S,ÈÞ Ë;
-/Lµx÷é^æo‡Ù­hBÚÓ…8ÏEC·fNX‡§ší”_”ó[⨤ͯ+&*hAÏ°¢4 oJ2òµšì´Êûgd?G˜ÄÂ;BŠêBzÎ Ï}.®ñbXfÁ'APjÜÛþ¢r⛈O<d™r,%«y
-²PRî„·å­Ã•5Üå=¨¨Oùº®¯õ £Ÿkà>œI*a±{/fTŸk‰?Äå!D‡,éI×f£&HÇâÜa;Mu>s–:SK’ÎX-mØź›|ö—D;5Èœö
-endstream
+3766 0 obj
+<< /D [ 3751 0 R /XYZ 81.145 429.629 null ] >>
endobj
3767 0 obj
-<< /Type /Page /Contents 3768 0 R /Resources 3766 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3630 0 R >>
+<< /D [ 3751 0 R /XYZ 81.145 418.67 null ] >>
+endobj
+3768 0 obj
+<< /D [ 3751 0 R /XYZ 81.145 407.711 null ] >>
endobj
3769 0 obj
-<< /D [ 3767 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 396.752 null ] >>
endobj
3770 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 385.793 null ] >>
endobj
3771 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 374.834 null ] >>
endobj
3772 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 363.875 null ] >>
endobj
3773 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 735.953 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 352.917 null ] >>
endobj
3774 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 708.604 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 322.032 null ] >>
endobj
3775 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 697.645 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 311.073 null ] >>
endobj
3776 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 686.686 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 300.115 null ] >>
endobj
3777 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 675.727 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 289.156 null ] >>
endobj
3778 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 664.768 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 278.197 null ] >>
endobj
3779 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 653.809 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 267.238 null ] >>
endobj
3780 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 642.85 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 234.361 null ] >>
endobj
3781 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 631.891 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 223.402 null ] >>
endobj
3782 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 620.932 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 212.443 null ] >>
endobj
3783 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 569.673 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 201.484 null ] >>
endobj
3784 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 558.714 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 190.525 null ] >>
endobj
3785 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 547.755 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 179.567 null ] >>
endobj
3786 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 536.796 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 168.608 null ] >>
endobj
3787 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 525.837 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 157.649 null ] >>
endobj
3788 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 514.878 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 146.69 null ] >>
endobj
3789 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 503.92 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 135.731 null ] >>
endobj
3790 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 492.961 null ] >>
-endobj
-3791 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 482.002 null ] >>
+<< /D [ 3751 0 R /XYZ 81.145 80.936 null ] >>
endobj
-3792 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 471.043 null ] >>
+3750 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F59 346 0 R /F84 425 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
3793 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 460.084 null ] >>
+<< /Filter /FlateDecode /Length 2739 >>
+stream
+xÚíÉn#»ñî¯Ð„CVq #K
+³oA®É)ÿ},îd³[MÙA^€` Q‹MkßHs¦.ÿºpÿÿ_ß®_o¿Ê]$sV \¾þù&.Üÿ LË‹Ñ‚q-._ÿ¾üýs}åÑÿ¦ÏÇ?¾þöÆ ˜õëaåÅ2§5ÚŽà†¡„’´œ+Á9xˆâ“~üE¢= ?¡ÌOJå'øÝΨãÍ–§»‡ûˆu/ðõø¾¾S®<Õ=Ê|Qæ·}[Ÿà3?ÉDv‘R|lñ-s¸öÿ!Ägí±Œ¿ÑÏ‘þ[ÞÒ'=ãµÙ=H£îÉ*·™dÑ­I¶‡t Y÷ÉfÉb’ <^— :&$N%h×$ØCÚ— š¨{
+ˆÔ5´¢èäÄ~%|_¤,ñ™ïQkôõöé£z£“Í4Ö¸U:„a
+ö¼¥q«sq¤ýE«”çÏ}MÖošæÜãüÀ“k»Ï²µj§r3㌼/qf€äçDK1šWíõÛ6«­ô8º‘JtÕnžQ ‚É $G>6ûÍ9µ…BÞFÈ(ýðŽ´'~zÊ ¸m#F£è¢'‘¤ç¡^æŸA†SöeQ<cŸTÌëëhʽW½ùÄK.R©I32õuÌRU1R^ë L1ú½¦·=$„Λþ9ôÖ=ÕÛe‰J?KàŒg³É,ÑÒÜî_Œo™ËúöBlÓà˜RrJãÉ|K[¦üÐ
+¯öÀ¤ñÜ7“ÇÉŒÕïþìhp:¿
+> ÿ¶–ù0A«8GŽùà?á˜TƧz¹÷6zÈsi‘­7<—5Ih­ÀcHЭCÁ ^¦(Aܨ‘û&{= K32/Lñx·á]âoƒÙ5kBœÓ¤8Gš x—4Ðð‚w8Ôl§ü w¡’ ñ\õßj×&’œ•¦aáµQ)R!#ß‹ËŽ£¼]#ß³q±ð†¬º×™nÝsq…ˆgÇ2
+>
+b¦6>‘‚RCŠn2>ñ Ì±é\Å_m'R’ßÐn¤¼J6¬Í”TЧ´ Œë²Âèc­ÔÒIèbá_Œ¨k‰²#DeW#)åQvš‘,^‘ Ës_ˆÛKU¯çcàst„iq¶E”LH}ã´bZpõbØmû´ÓŽL¥`å‹jÊäR|ó®ÄUßÏ^š,ñ:9R}µV“MϸµNXhS%e?`|]¯_ þ(Eeµþ.…‘möù·Öcw¤“ÛCj`ù9'0µ%\ã}ü2‹U›Í™ž'Çkw±z@ß·èý:ãg¬Y:f¶W.‚5¯~ÚšÏÔ[¼r[L^·C´Ìl/…ÏXHk–(À#èfuˆŒu­6C|Œ£mêGr.)7¶+KÌ6çb¶p’Y=jß ÙR1Ë7ç†\ˆTv¸ ¸KÌ“æOš•NÞ´ý°IÇ´Wè«…ÆG£¤qI¬ŠÝÓ<w/g”¥CG9cÂøDΘÖA-3S>(ÌG½v~TWÏuÆdèoŽ9gíxFúŒ2µ*sæA3qU˜&mLdÅ4;NH2+=p~œD:Áº /Ä¡Æ¡Ÿ-”W,äb2¬Ö÷ã=‘3)츊
+ó¬k‘þ*ÅÈ7=ä‘wmS2W<Á]».s7ÊR¼·gŸR¶ÞØæéKìÚpé åu¯›Â:ÆMµåá.-vŽi,"Jƒå±È¶Æl›:„”ïšïuÕ0\÷è ²wlì]é’J øû4H9h¥$Ei“eïÔòÒ6ýÔ&=jE%CI4ì¾ÐŠ–3«G
+®=l®ÓsA×ã‡ECå6Á¶fWº¯±š5Y.úÉ¦Ô Qp1}×âê5Xd^§`“ZœwÕJ_$gÎÔ{+÷Ò”¾½ýÀni
+endstream
+endobj
+3792 0 obj
+<< /Type /Page /Contents 3793 0 R /Resources 3791 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3569 0 R >>
endobj
3794 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 449.125 null ] >>
+<< /D [ 3792 0 R /XYZ 78.37 808.885 null ] >>
endobj
3795 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 438.166 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 768.829 null ] >>
endobj
3796 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 427.207 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 757.87 null ] >>
endobj
3797 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 416.248 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 746.912 null ] >>
endobj
3798 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 405.289 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 735.953 null ] >>
endobj
3799 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 394.331 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 724.994 null ] >>
endobj
3800 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 383.372 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 714.035 null ] >>
endobj
3801 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 372.413 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 703.076 null ] >>
endobj
3802 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 361.454 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 692.117 null ] >>
endobj
3803 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 350.495 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 681.158 null ] >>
endobj
3804 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 339.536 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 670.199 null ] >>
endobj
3805 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 328.577 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 659.24 null ] >>
endobj
3806 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 317.618 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 648.281 null ] >>
endobj
3807 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 306.659 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 637.322 null ] >>
endobj
3808 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 295.7 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 626.364 null ] >>
endobj
3809 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 284.741 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 615.405 null ] >>
endobj
3810 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 273.783 null ] >>
-endobj
-305 0 obj
-<< /D [ 3767 0 R /XYZ 79.37 251.421 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 604.446 null ] >>
endobj
3811 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 229.939 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 593.487 null ] >>
endobj
3812 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 218.98 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 582.528 null ] >>
endobj
3813 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 191.631 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 571.569 null ] >>
endobj
3814 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 180.672 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 560.61 null ] >>
endobj
3815 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 117.458 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 549.651 null ] >>
endobj
3816 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 106.499 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 538.692 null ] >>
endobj
3817 0 obj
-<< /D [ 3767 0 R /XYZ 81.145 95.54 null ] >>
-endobj
-3766 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F22 367 0 R /F83 414 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /D [ 3792 0 R /XYZ 81.145 527.733 null ] >>
endobj
-3820 0 obj
-<< /Filter /FlateDecode /Length 2916 >>
-stream
-xÚÕ[Ën$+Ý÷WÔ˜†
-<›™CAòHUøý=?y饭ŽŽõP©èÊÍœDú~֮ΤcBÉIgŠsãö¼¥§4pôó]蛣Ù@‹6³cÒÜŒ
-\”±~œø1ü¯Á^8æI'.>w†8Ïôór‰œ{ Â9ë²¾ÈñãÊïI6žOJKÑž.­ÀyN^<¯’ßv: o¼N³5|Èŷŭʘ"W·ZÒª0Ï«F
-ªrš'$›e;ßY;$8Áœt“.Ä©ÇI.˜Ð8ÎÊ~SÂs½¦¤„”‡Ùøv¾¦äL ;ÎÒºúZ”¿Z1ê ½<2yfÝAòM™=9éÌë±ÎËÚ¶ÏQ¾Ÿ™RŽ^ÿ!?ë@öâ 'éÜd½ÆOfßDk™”5–S&_~’]bŠÿ¢JOÞR \äX ïl…)rtò˜’\»52ÏiÅ»lâ]YmWü²­•”è(5QßäìÔêÒ¦L¢ g¤ä#V.Ó«¦šÓêšJö¾Ÿz™°œY TsfSʲCÊMá—ͪYÃܧ‹8bL”ùíH3Ñ»p}ãc^3c¤óà# 9
-x{HuÝØqÖÕx'T@0­iÎ×´†â|2Eãq× jÇ”‚ Ñ°HJÑOcÌÄ<P
-å,C)‡úZp’‡:–.CÈÖmÆB]÷Ef\ÌÍj `>‚#`^Áõ¬#½]2´Ó ­X:º½æèX­q#¥=WH©ýîÓû¢€$¾]p}ªÌÐ÷¼'>ƒUŽ6á¨ÇÉ;¨
-¶w P¶/ƒ½JD•`áÜDmoÓ,^8'F*cìê¸}x*C„ºt~˜ÑršVp8}Ôyf3òòQü¶uõ´Îõ–ƒDÚ«Lïò¾þ…‘ß(=+[퓨2N£~Ú^á罆3—Td>e'—òôƒfïÁ|g’iA¨TN‚áb3£Ñ2c¡-ÒY´£\t-7>ðsÍ€
-ä°:žCu’Yã¬a·à·B-ì7\Íœl<¯ I§&\³¸6y^´ÁJFž5RûÔF@k´³nz/«÷”®ÀýhVû°²ÛÜÐÙ”‘´odÐʨ¶ Ú@éÓý`¸Ìñ%\Þ<=(mõƒ5wäGpjžÚo€Mª.X(§öÐ<]´k[¤3‡ãbËZyöÆðD8—IØ1Ê>ÁD¨ö gŒŒªÍÄ'¤þfPJ×/õƯ”û]e÷¯U°ŽZð“¨æŽ]­sê]¦ÑuQ㼦O•µÑVPU:ËѬf¡µRi*Õn|”iQ”3ŒÆöé´ÕP­‡µëS'XçJ*{R*ÀØÒ'ϵ?™í å—t€“œQ,­ì;­ôÓÀ½©Zži… ©#‡¡|GA9êQ”vDFUŽZ4EÕuÖÑeŠ §q”÷´0¿ð–»¾åÄÅå±M‡8ª—jP”öÁÁ¨ÛÙŸ“fÏ”©Œ¥MâL Ÿ²Æä¿…wZ͸«QÜœÎÔnmßÑíc—¨4‘›é^ßb4«tõÈ4¥ûÒq/èÙñIð×¥Ú–0vÏ®žn
-dF›‘R­ýµ5åQ€m»vñ€ÒÀ@¸¿W›ŸTuµÅ‘’ Œ£;ü‚çïà{'ßÁ¨@ÁtMŸÅÙ¾†ÚÂ<h¬&NZ8?‰·üD–̲¯pEYWú¾Ú
-ÍúîIü›¨{_Õ›ú%.¹X*øb÷FJN$R®å’©æǯþ¤*Ôg ã&Ë„Æb.Cf7ðÜ7‚rÎ=«‚ïDš¥)färÍ\ñLê=(XQ‚ ”¡˜*y©¹¦?Ë'ü)G¿7Á 5¸ÑͬÃrj˸s„aº³ËQ¢¹‚JG[eÚ“­ÐDͧé÷Ò_N'ªç$sZŽTÛ3çÒ5™íqº½'v5-:PN¶;¿z™˜fNÈ%nÊUBÚÞ§}½Ô«9ÚÀ:A7­¼»y—–3e—…Wî]+(ãŠ|›¢`‰k¬yzSB$ë²T_m:'h1Pú&h!5áX³LÄz«Òõ„VÀ^×Wû.Ö6=‚Ý:yÆ_÷uH+ëj¦ö”ØSZá…C-BmÇçûÇÒVÁëL+ï­B¿#^“˜hUÑhŽor³©g‰ 5,cëbÊHJ”Ž¼Lª/ûƒºþ̾ç
-&ó·:mê4C§Vº¾|i6"´ÒöI½Š™ù¤^½m_E(ÔŒ¦FäÓù`ƒrýg—_ª3P"¬ÅŠÁæï‹Óÿ-Ú/`bpŽ'VWmÁáEGfÿÕ…7—P(¿Š;ÁéwÆ7óº#îLü ¸³“á¬$%Õg¥FÍmö‘$Jªör¤’»¸Ic¿»{‰IÂrRy¤g“uÛŽüø o*DB}0òv!:ÎOí$'½­î ‚õ-Ký…‹MÇìA§U(`ÄÛ¸&–‹ÅGté}úu¾Ÿø¸Ö»÷7@”PãZkt\./Á#ܺ4›·.•"ð&ǵvîA’¨‘ÂhŸÈq×rŽ¯Æ–³BÓ^‚.î]Är™Gœmú2=,k–˼8P|cÈÔ-ªGyD9z8 Ðòw3õyèiN¶“AäÂJ; øßµ²‹aد
-Þl^l(´Ú]K03_L¬µh]ž4,WP÷¼9œ››OmÝV­ÐM{r¹2Çæ-ØžÐukœiük–kþBìõÌ&Û› ˆOÅy©´½Ë´¥ëZ t¥Ç_‡MgÁQì79±ûNìÖý|ßhn®26oî±o›SøûfËØìÒ ”ŽÍÙîÔ¯l;è-ÎLi{CΙ˜¯Óyözr¥Æ>é{‚ëðåVxóîÓ@é›7ÂXFÕiÉ·Ú㻧Ôð}œE7yEÿG+vé,rמÒwëX#“°ÄW6™ïžÒwèXºíuÛ9Û-Ò×Ì'Ðõ†ÌàXÿÕYä«0/堞ЀÆþÿ Ù¦Öm”{d‘Õvù$>yuO黣‘üS XòýºÇwOé8¿¥â8dZ/½ö*Hbô„¾YûV3Ý÷® ×{øÑú†Lhþ·]Üd¯ ÷„>¥ßÃÃ_G¬j¼QªuõªS:Þ>~üjÉæ
-endstream
+3818 0 obj
+<< /D [ 3792 0 R /XYZ 81.145 516.775 null ] >>
endobj
3819 0 obj
-<< /Type /Page /Contents 3820 0 R /Resources 3818 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3630 0 R >>
+<< /D [ 3792 0 R /XYZ 81.145 505.816 null ] >>
+endobj
+3820 0 obj
+<< /D [ 3792 0 R /XYZ 81.145 494.857 null ] >>
endobj
3821 0 obj
-<< /D [ 3819 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 483.898 null ] >>
+endobj
+305 0 obj
+<< /D [ 3792 0 R /XYZ 79.37 448.434 null ] >>
endobj
3822 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 426.952 null ] >>
endobj
3823 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 415.993 null ] >>
endobj
3824 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 389.437 null ] >>
endobj
3825 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 667.21 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 378.478 null ] >>
endobj
3826 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 656.252 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 316.056 null ] >>
endobj
3827 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 642.304 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 305.097 null ] >>
endobj
3828 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 631.345 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 294.138 null ] >>
endobj
3829 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 603.45 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 268.459 null ] >>
endobj
3830 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 565.591 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 257.5 null ] >>
endobj
3831 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 554.633 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 246.541 null ] >>
endobj
3832 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 543.674 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 168.402 null ] >>
endobj
3833 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 481.905 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 157.443 null ] >>
endobj
3834 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 470.946 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 143.718 null ] >>
endobj
3835 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 459.987 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 132.76 null ] >>
endobj
3836 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 449.029 null ] >>
-endobj
-3837 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 438.07 null ] >>
+<< /D [ 3792 0 R /XYZ 81.145 105.311 null ] >>
endobj
-3838 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 388.256 null ] >>
+3791 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F22 367 0 R /F15 334 0 R /F74 337 0 R /F83 412 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
3839 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 377.298 null ] >>
+<< /Filter /FlateDecode /Length 2597 >>
+stream
+xÚÝ[Én$¹½ë+êšMF7@Ð5¥2à³n†¯3§ùÿ«¹&—df‘’jlêÚ2c#ã1‚É™¼üqáîÿ¼\?^~Þ¥½³F \>~îþ‰‹¦è¢•`\‰ËÇŸ—½r®®œ#ºWr¯æíßÿ|áÌAý¼ºf•BSãäÌhÛ#IáP¬C¹»?pïùÛ Òý‚”ß_#íö·w2¿ƒëöŠ2V*?ÐWr&8ŒôUrN_ŒöH^~º9Ùî«¡e‚p(ÍIÄ5C‚©“èç]È‹uwƒ´º[[†ú¢0 Ú¼ÇÝýúí
+öN¾ºy¹?ˆèpsWHþZ{1ep4– å¾ì#ãà)Bâ5hhdv^ /‚Ž
+>¿»÷¿¿ÅïC Á©IÀ‰É5ìäŒw&£ NFáþýGò£x}Âë­ŒèœP]5'¡Jgy i¬dÔÍô6cTæÎ÷]ã5-^á1ü½tË÷ùOÑ­z`5//^išë£NÁr]ðpÎÀØÚNk³û|÷g¹üvaþÚZ “þ3&ÛHw»4NBuÒQ$d;zdØ~‰öËÁ(†^vÜOôºXÍMïW.:
+ÍŒ›”¸µ ÌkôSÔ6øJL=r,Åo’­³¦-*Z4_å#-Ü¿ÉiÎ1ìã-^ë  U2ƒš¤f`¡7ƒŸÛ9ž“eÏŒIÚ0)÷(j“Ë|ØÙoʆXfqŠeÞ ¦eR£GÂÊÒõÜP·aeN¥kpq¹WÚ-ÖZ..-÷RXEE”4z0'ÉO¬Ž?ë:ÒªzJ1j¤½Ï©'ÓR÷H…€Ú²¿pá_·ßn«òJÉ\Øöòú?m'ùdÒ¨ Å€ïÈZrPä÷Q÷F¿ƒ«‚®«8Sò;*ø¢ÁH’tXjÿN¼çwÎ29@Ö NÄÈš‘Á%¬¼EBõbðuc/Z‘I´# «ë$ÅUL8þÓ!ž ’Š+/D^”~ó‹Ò[H‚:1F4ÐQÔ~éÕ» K»Î×å*/ºgi0žˆ™ Lü´3§<?¶G'!ÁÒ#S4ß’n”¢ÞJ!ÅæEú^‘Ý%áÊ6{Ò­$€t]E:ÅÐ%Õ 4Ú§Pi‰)³¥š /zÒ5ï6¢§7¶t@♕أf½wsøã,…WºA;ää»S™,g`w玺x2š¼ 1¦}}@¹N¹£‘nßlw#›Åi/ 2 j8í-‹é˜XÀ5±D&æ<X–éE 50­†¹í·èžÄ-¤Ìðaª›®­ÄT×!¸üŠ«fŸ&“›ì9Áj¢<â ý¯ëV”œ§3¹fÅiD­q-(4ùLÛb1øµÇÊÛ«Pò¸ûÏ{¬B#*ËñEi팖™±™'ËP쀎b é ƾÑÒŸÙøÌP2â‡- Îz(†ë.´)´I„fVÃH’ÙÝZÎ-ÒIΨr„÷ƒ÷GðÆ»Š¿«Yù¥<Ûüª¹bðù}P[^–j‚KŽŒC™Z¦°6°j’…Æ+3 Ÿjþ¿™b¡|–w‚•ïŒßìÇíyg’¯ãg…$tKˆ$ê-·XHBåxŒç™-J.ã&‹Ý*@Ö0sãC;ëlÛúš.ŽÏø&)åXô²MÌŽ3¥@&Píìfœž¬`\oÝ-r9,—ÂrÚöáÛâÓºdö Ô*˜“­3dž½#r+~ú¥y-3æŠ÷ÂF‚ú±Æ6p)KÍLç ª°mPGJ]2Ðó ·'Á~¬aÓãhWãØRÐû'JÜÔœãW}Í™Tî!8u²¢Þ Ôn·cºÌWœmú2žÚÆÌ(I`{Ãjçêš •ÞE¾bë= ŠãÉUs§<ŸzŽºõÎ!×RTz©‚{þ7?EÕÜ4ìF€Û©\)$ÕeØK•[qþûâ‡
+' ³œzôùik-<’iÜGz0I%s+í@ž´¨ ”4í7Ü© ´Fo¼§vFzŸ/î&zÓ!ÔÚm5—hfˆ ÷zF *—'õÊÕ=¯@VMôÛqõñÁÆmT ]ô‡Kë ÌȳµßìiÞg6ÿšïJ5xèŸÏoÈ‘|ävdµÙzn¶Z‹4o5•¤AìТ©=BÅ<)Œí7„±ô} :e²I•Ùy1Õº;1ÜŸ¸ î\«ÓuHÇîlRwªXÖ5ôši¦…{AÇ5i¢Æë³X•ëª0úd<®)‚íâEÖŽBuHO.Ü Œ J®ÉÝ"Ur¯¢‹²jwÈ¡¬´&k‹ôlK·!Uj¸&w‹ô 2CY‹:ÒטOðëѽ´­Èòæ™^Z„:¤Ž‘ý鱗E»`ºmQd»MwãS\·HÏž‚³öM{–e± ãÙø”ŒÖ2mÅP_KjtHO¶>à ÂHîÙ”Ÿån‘ž°‚Ön$ʺ–Õ;¤gÛX¹» al¬eõiÔù¾Ïmþ,··zl™µÓÒ÷æ·\Ê å¹T¾\Îk@œq1\èfyGÊkÒèŒÔ0‹µyŠ×yªmˆ©ëÀ·_Œ¿¦õ `™mdåYÆ”rR‘û¿ÎÀ×$ÅNG ˵°é›gÍy}sA_LH=Òw–Ùä™Ó"ýÍ¡°‚ kFv[¤VÒ“ç°0œA{êq“{KuH1'Ê2š‘Zµ@϶¾4Ìí
+endstream
+endobj
+3838 0 obj
+<< /Type /Page /Contents 3839 0 R /Resources 3837 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3569 0 R >>
endobj
3840 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 366.339 null ] >>
+<< /D [ 3838 0 R /XYZ 78.37 808.885 null ] >>
endobj
3841 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 355.38 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 768.829 null ] >>
endobj
3842 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 344.421 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 757.87 null ] >>
endobj
3843 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 333.462 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 746.912 null ] >>
endobj
3844 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 322.503 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 685.143 null ] >>
endobj
3845 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 254.757 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 674.184 null ] >>
endobj
3846 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 243.798 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 663.225 null ] >>
endobj
3847 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 232.839 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 652.266 null ] >>
endobj
3848 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 218.892 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 641.308 null ] >>
endobj
3849 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 207.933 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 591.494 null ] >>
endobj
3850 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 196.974 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 580.535 null ] >>
endobj
3851 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 186.015 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 569.577 null ] >>
endobj
3852 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 175.056 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 558.618 null ] >>
endobj
3853 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 164.097 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 547.659 null ] >>
endobj
3854 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 148.157 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 536.7 null ] >>
endobj
3855 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 137.198 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 525.741 null ] >>
endobj
3856 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 126.239 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 457.995 null ] >>
endobj
3857 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 115.28 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 447.036 null ] >>
endobj
3858 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 104.321 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 436.077 null ] >>
endobj
3859 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 93.362 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 422.129 null ] >>
endobj
3860 0 obj
-<< /D [ 3819 0 R /XYZ 81.145 82.403 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 411.171 null ] >>
endobj
-3818 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F83 414 0 R /F81 377 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-3863 0 obj
-<< /Filter /FlateDecode /Length 2562 >>
-stream
-xÚÍ[ËŽë8Ý×WäFW¢¨P( ©$ ôºvƒÙάæÿ·­§õ0íX©ÔÅEãv9–}L’IIœ©ÓÿNÜÿÿ¯·Ë×Û¯»r'dÎ
- §¯ÿ¾‰÷ÿ‰“¦ñd´`\‹Ó×ÿOÿ~ç\_8ÇçÆùküøÏ×ßo<€y¨_w‹'ËœÖÒ¶8Brf‘€üKòWJ•+íQ%xtô×þ+ ý_ιøô×—Ô÷Ôî…6yYp\¹‚sx~WÿÏc ]Úts{Óó€TL
-Êa+2ExÂÀGìs¤AÀ{"E|¦~>¶.‹`PÅüÃ]ü%.u…ôDygà,ã‚Ìä;ª1Cy±ÓØ"L‰+Š5¦(Š+O/ÞE Áì{‘}Ts¨QÙQ´]_J
-ªíÍC9Ç´¦ÇœèÁJ4Ì0ÝMF™Ç}Q­±iÔ¥©\îtˆw6ÝÁî¿80¨÷GP>–vvìuß›Ä{øV`.9Èþh¹§RŒ¨pÝÙ¸w%?ý=mS
-'žÄ]y40Nw2zæ¾XVx±V†QØ|l~Ú&põílzǧ~e-óI9õãTj1 m§FÆüd ×Ëp\MΦOÊf o&‹Ò~ƒÌÁUúuÚ-Ì’(”çâTë?ø(Îü›xg’'í“&ë(žŽ,
-O=R;&eÙoëþ˜EÛ%(¨¿JÈm…§ÁzUyª¬“®{H'yRŠY¹*b…¿GK9=¢6Må#§¨afwÕ'Æ4ö±?µéh "Ç“=Gôa>P=?ZˆÈÅ–‰îyÀÝê9Q|ê,l« Ö$t¢ŸËWº((E@#>-mEûãR2'$ÅøÑRˆTLù”xDúí£0
-Éžœçl§G*…ÚÔ£Y©||휢¤:\zÈüöH½EoYc«Ú@d°H·ýÖo·ÛoÌÞë^.-ÐÅJzã‚q©I½Ù9kê‘ž–gÜÒ¾ÕÔ¬0 =/‘Ï<„°¤D8'QôÜ<õ8øß™§vm¶ÚýR®¾¦¼så}×T<iʾ׶ä3è{âœr#••¿<¯'m™PŽ´e9§§é5z¢£?WW‰Ü õ¥ #c Ée½ç5ºZúûŸ¯§µ¬¯Ôj¸ŽÑÏÓ1ú€ôdŒîj‰èE±8ú¸¬¤z8‹HF"Ž,Iß|ML4©@&)ÝÚ‹n¤Ãºi¢öÃïôTà!þÃ6stY*k\¥A[mLZÊ„Ù%)’I­HÏsþÛ#=?¢p`È5%ÑÑL!WG¤A¢ý¥+i ú?cý"–fC9VÿǪoBõN®3ø¬Å®`m*¹D—Þ/D
-41­Ž”¡—ŠsHå/éº[,H•ž¼ê,”çÒ¼,kñ#×ú¬ìX(±Z¡©–<(`K¯#ÇaìÖlÁZB,X(qá9Wf ¯Ë…E¾@¿Ñc/ãv ÌO¹ºâ3]ó•F3ÅÉ™ãhî”-y@Ú®‡;MjNõ¸~¾—8Ûísn¤Ç×¹\k@BjÃÇmKþÐÖÌm“}PÈ”¥G8œª< H}E”ÎZê’z]:ï7 ¨Í1xfKLFmz9"ëôƉ’yŸ$-ý`f…ŠyF¤fsÜ1¹§8>¨·I.üX¤µ¡¸8š·.z¤9.V[5&zàç*ÃWõ éŽÇôÅcz$r[­è*n¡W‚ÖVÿ¤ryKÊÆVKÊߦyÛBžäSp?RtM
-д=ÌI Î1ã%ödl= MÛ#XÅ,JR’óÔ<: =^W,ùÓ²áÖlosuøv=¤]CësÕém‡`Y‹“‘ñ€ô{Ö Ÿçí›ëˆ %s@:àÑ8,G1R_£6’j-ÇûNÕ‘â¦8›säW¯s‚Ð=Ò—Ft~LGé‡=ægðcd` ŸdÁÏÔ†ds®ò? ==ƒŒ#9wOîÁž—8ãŽhr³C´“íÖ¥û:×’€§{«õÀ&æP?l‰Ó³"wL¬wGH{<J @zÚZ µ—%Sßv–ÛmŸçí¶»Þl‚ï¼÷¹ýßþžP;ßSðÄ”,œ!¡„£±óŽïƒº©—í¬6å¹×æ¶9´;z9ÃŽ>w0ïjG/÷÷.;ï=sBCXÃ`½CÚãÁkÑK4ØÌN•Øn;ãŽÎöÚì3\ÁÀÐ\Ì…ÏÒþ©¦~hÍ¥ìT\ Å–÷I.4gR ÅÅd= íLGí9ÇkÝÄ‚n„íéiŸ“þÔÜc®¿QÜè˜TŠäl®Œ9 íp&žäl«¬xo(3>¥¿Cçb„d°9¸¹¸Ð-H¥õñÄÌFÍÿЉ™´I]´¥~bõàщ™„B˜‰K kÄÙ3R3€kß=1c%“#¦šÚÞì´ÃÆ9Á-SM‘Ͷ§°‘ SHbÚó ×´¤˜ÏJ˜´xŠgò\0rºÜ¬ô,«T‚\drÈTpù^¸&³Ý£JûwÇó-v9ß²2ŽxgëÀàrL">Õ­Q_·Ž¬ÈÕB—+VÍ•MùJødcåõüLä³;óŸ°Z+ˆcõòôræ*þ2ÍâYWGD€rÔ'Vžœa
-9ã«©»Ú¯—­•ƒüeŸAxr¹×U&§×¢¬fŠîÒ\¦ÝáÔtW‡Ã>›ÉƒäŠi:5;¼Â¸H
-¢’¨Žµþ©cÕäaêcõóÍQÄÞZé“gÀ™:ÝEß¾Þþ#
-ë{
-endstream
+3861 0 obj
+<< /D [ 3838 0 R /XYZ 81.145 400.212 null ] >>
endobj
3862 0 obj
-<< /Type /Page /Contents 3863 0 R /Resources 3861 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3630 0 R >>
+<< /D [ 3838 0 R /XYZ 81.145 389.253 null ] >>
+endobj
+3863 0 obj
+<< /D [ 3838 0 R /XYZ 81.145 378.294 null ] >>
endobj
3864 0 obj
-<< /D [ 3862 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 367.335 null ] >>
endobj
3865 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 351.395 null ] >>
endobj
3866 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 752.889 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 340.436 null ] >>
endobj
3867 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 741.93 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 329.477 null ] >>
endobj
3868 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 730.971 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 318.518 null ] >>
endobj
3869 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 715.031 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 307.559 null ] >>
endobj
3870 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 704.072 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 296.6 null ] >>
endobj
3871 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 693.113 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 285.641 null ] >>
endobj
3872 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 682.154 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 274.682 null ] >>
endobj
3873 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 671.195 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 258.742 null ] >>
endobj
3874 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 660.237 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 247.783 null ] >>
endobj
3875 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 596.476 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 236.824 null ] >>
endobj
3876 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 585.517 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 220.884 null ] >>
endobj
3877 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 574.558 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 209.925 null ] >>
endobj
3878 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 563.599 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 198.966 null ] >>
endobj
3879 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 552.64 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 188.007 null ] >>
endobj
3880 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 541.681 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 177.049 null ] >>
endobj
3881 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 530.722 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 166.09 null ] >>
endobj
3882 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 519.763 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 102.329 null ] >>
endobj
3883 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 508.804 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 91.37 null ] >>
endobj
3884 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 497.846 null ] >>
+<< /D [ 3838 0 R /XYZ 81.145 80.411 null ] >>
endobj
-3885 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 486.887 null ] >>
-endobj
-3886 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 475.928 null ] >>
+3837 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F83 412 0 R /F74 337 0 R /F81 377 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
3887 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 464.969 null ] >>
+<< /Filter /FlateDecode /Length 2444 >>
+stream
+xÚÍ\ËŽë6Ý÷Wø†—,¾AvÛuï³MVóÿÛaQ¤øPI&w?$Õ‹ä©*úr¦/^xøÿo·ï_Oí/Šy'$\¾ÿøþ̨‹5‚q#.ßÿ»üçßœ›çêÁ¹|ýüï÷ïÁÔ¯§SǼ1ÒÕ8Bfµí‘T@öó_tødçà\ðù[©ð/Ò÷ð|…ÏNïÅøåÕòåš¾çxE>óˆEÚJùšk·^s|µ~Ls0LXè‘hÍwOsÔG)·ÚB„|ý¤×w²±–Ç»Âß½·Œ6ù|­O ˆ¯eÜÐr[|ZÚ‚ö×,.=JR×0fq©™vfƒô2jŠÝkMŠíf5ÇD‘ÐÄÜæb§EŠZ¸¬Ñ¬TÂ2
+’˜}á{íêçÀúåC™ðÏ<’<by¿•u;_ÎûÉJ&i7©975@ïñ¾—É;Ñ'°ìÿTOÑò¾Ó[˜’‚œçrÎ]-Ò{üíPyäŸì«­¬ïô“LY’«N²ôé$K÷‹-ЖobãF…»Ä–^§Ùx”æ5Õ|zÔ:lýœïý>ν÷c\æ-°?¦Ø12^Åã#q!‘x)ýÌ÷°¢I߀gZ+Ê7£¼=û¦CöMÅۇǴ9Ú!þ)d Õ.-ÿ[\ï+±ím9iAá˜öš²àh¾ço‹t~Eá–iH‰s…€ ôHD¿žB_| á¡Õhë™´íƒ0¾¬F_èOp»°Ì0)e³¶$T')T"(¼Å%M¥)};K(Ë|X<:„21 Ò7aÉ‹‚ãÆ¢nË{Ü`⛼{Å-dùJ)ŒP¾¬¾
+äf)~ÑN<Jt&maB&¥i‹9
+Ý!lG©|¸çð™8¦×íéØ&%©³õ_(îH­Bö©)›M–1;¤›‰“6Û++áueÆSþKÛøqsA&c¼zÝ\°ð™Šôki*{Ý÷kþYb{/‡ø²äKc)߉ŸJ©Ÿè¸S‘æÜKÛ©Ü…+aÄNQ[Z [ÄÜÃïåÇ-$¢°±ZÖ0¶B¨;-'™ì1õÚ ꫘ϵ…‚͹ì­Ü(ÍxX] Él•:¸
+]¨JÔe™)Ÿ`S„Ú‰wGYìÒ<Ä♼fŒ”.WžµK%È&“§|+\•Ù™ IÛ±Ðtƒ“ÁžYÀƨñ›¸mª>X˱ÜÕô¨S¿ åÃÑH± Ó6º|¶añ\>¤±ÜýUE¹áµp[™Ö£2¶‹‚¸V¯w«?Ùªy¶ˆÕUI¼h_ &ê‰ÎvÕ,‘ºñ,?/Ù-ÒqÅ ýÃÊI¼sý®©MNw£À 戊¤›Î¶;¤’è€iªÑ¢;m3)¯ãÌ29îŠp~ƒ$QQlÎ ÁNÇc¦—žî%½î·¼yªŽ&,:4‘-%hÏÈ ^žgóJ£ymt¦¢£ù{Ö¦EªúWºižM”›—±‚¸ïte°ŽcfºâxbKDO¶³ÅZ¤ÿÛÿomSUÆáVŸÈ&çÐôú"- ‘IÙc4ÉÍëK‹$ ]Ð¥ŠÁ­m0µÙ¦Í»§{~Ó^œôÆ¥|7ù; ì@BÄy@‘φþÖäÓQäs½Û¤D-D'ëX—˜œìøu|žõ£Ã<eˆç»n—NI•öM9ïË,‘¿úaF‘`š²…1LEÄ\e¢CÚ§l¯Ü–&«©mÚÙ“8^gÛNüLä›i4½çpr#˜¬HôH¼Z˜_Ÿn± ë(rYž<4Õ!ib)Å-^ݺm~R^c8GFÞ ­6’9)z¤eéW«¼æL5åìæ(´a<©•šÓªE:ž5K%$ViRÕRÌW \:Ê^´—°²‚wãüÊs,Ö¬tß‹?ƒ×ÎÓ·üP
+endstream
+endobj
+3886 0 obj
+<< /Type /Page /Contents 3887 0 R /Resources 3885 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3569 0 R >>
endobj
3888 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 454.01 null ] >>
+<< /D [ 3886 0 R /XYZ 78.37 808.885 null ] >>
endobj
3889 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 443.051 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 768.829 null ] >>
endobj
3890 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 432.092 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 757.87 null ] >>
endobj
3891 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 421.133 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 746.912 null ] >>
endobj
3892 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 410.174 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 735.953 null ] >>
endobj
3893 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 384.271 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 724.994 null ] >>
endobj
3894 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 373.313 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 714.035 null ] >>
endobj
3895 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 362.354 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 703.076 null ] >>
endobj
3896 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 351.395 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 692.117 null ] >>
endobj
3897 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 340.436 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 681.158 null ] >>
endobj
3898 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 329.477 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 670.199 null ] >>
endobj
3899 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 318.518 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 659.24 null ] >>
endobj
3900 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 307.559 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 648.281 null ] >>
endobj
3901 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 293.611 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 637.322 null ] >>
endobj
3902 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 282.653 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 626.364 null ] >>
endobj
3903 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 271.694 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 615.405 null ] >>
endobj
3904 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 260.735 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 589.502 null ] >>
endobj
3905 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 249.776 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 578.543 null ] >>
endobj
3906 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 238.817 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 567.584 null ] >>
endobj
3907 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 227.858 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 556.625 null ] >>
endobj
3908 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 216.899 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 545.666 null ] >>
endobj
3909 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 205.94 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 534.707 null ] >>
endobj
3910 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 194.981 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 523.748 null ] >>
endobj
3911 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 179.041 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 512.789 null ] >>
endobj
3912 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 168.082 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 498.842 null ] >>
endobj
3913 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 157.123 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 487.883 null ] >>
endobj
3914 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 105.318 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 476.924 null ] >>
endobj
3915 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 94.359 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 465.965 null ] >>
endobj
3916 0 obj
-<< /D [ 3862 0 R /XYZ 81.145 83.4 null ] >>
-endobj
-3861 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F83 414 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /D [ 3886 0 R /XYZ 81.145 455.006 null ] >>
endobj
-3919 0 obj
-<< /Filter /FlateDecode /Length 2993 >>
-stream
-xÚÅ\Én$½ ¾ÏSô ŒF"© 0 ¸Ýî
-å—OT~%¾Êg9hz äLp¥Q’smפé)UiàÃѳ[ÙÔ½• ;Ù¦ºð¸ÍWÑšéIÛæÛE¡“—p¦±¬ý³ë)°¿>aÿ­nÀ}NnÕ§ûÔq‹p¤¸­ê NЉ>Ôõœ>ˆ3°JXäCzR–Æ·º%ã¯÷¾Âk¾½Öß˯õ÷Å{zﬡÜ]}«¾é÷ñ>3ÛUË.[qÑvB3
-;ßÑåmëQ‡(BóbQz"fô<žD±èvG£FJ½Oœ•w[Æÿ™™8•™Ödî)='ósY㹘•4õt\“»§ô¹s‹(\}VF!˜µr&ãYü ‚Ñ„Rã•Ëµ¢ä‚qÜÔ^n9E³æ{Jˆë0jþ8êr•ãÆÌ4p' ”ö5+"¯~¨R{? ?QZîóä*O‰‘Fì#¶ØD|QGÚÕ`g::‹Ë³ŽzJ¯Ù{òR¶@3Ëv)ï­_9…¢d«¿[ù’’®ZœïcÍx=¡Cm .ù[Ÿ:=<ò
-ò°jlZøïJK´4îà³$Ü
-µ©~ß&…ì>^B°ÛÎ
->‡F–|ìäë©“Ä©ÌšzJ}Z ½°]ä!ÌšfqpP’dÎ$#¥=nñ¶ïüÝÄóâ ¡K0¾!'OlRýºítòùDå
-Õ<E MÜ’ýŠY¦|m#ÿÅÙWµ%³+?×,–ÍêYøœ¢w ô²S"¼"o¡AFz³ûŸÓç4bãz ´ ÄgãŸ&+e“¹'7ÞaO–‹ºÓÀ¤03Ý÷ÙkzJ]ñ±È•LJ;ãê,œÎí)õ¾|<*.|·`‘ˆ)À餞°i&…epý[Û8gýV»b›Á| áßa>6 ¦ÌÇ´v² Ý.‰õ³¦½LðÛ…3î(lH™åx@Ê•^{·Ò"M"ä/Y2§‡L߯:¤ÔàÕg¼ƒ;ì1*b©w¨ ´šYçSâDª=xŸY®^ŠY;¼¬,º«˜–ª^Ǿ9»q‘Á?Sªä´ÜdŸºAeNq™dÕj‚×PÙÑ‚ê”ó°–®)nuE¥¯qøÙ¸X,‚òÅú–7ôö|B …~ÅYˆî¦ý N¥sÄ1âù‰†<‘„~+DÜU²_$ëßoõÝßĦ$‘@I…`°Ž{gº©ºLw•³râÇa•80JTëШmåâ™qÒ½ÞLÆ4)+èzŠ *oSbÔKŠB#¦)É3ôFÞ’8åF·Ò4'ÛÂ8ÂǹŒ»›wXà ·Lo«À°›}¬íf¥i­ô
-Ô2¢‘Ô¬øíp¬az[‚ »åJyRU¯<iõ|`43Û2Ó^ÓpOéé´bfßÛ¥ç9R’Ù9(^,³JÏsätnç€x±Ì(­œ_x¼V®öͦ±~º`ué›–
-ùþuç€|ôýùfÎÎúz ù\^iÖ÷\§†Qj-j‘qª3ñ_知)Ú@iðÝ㢄aÜ–H”<b ¼Q v+ðªqÛ×øíºžA©×Æíáåxmþ´§„k¥ qùDŒÒ<œjÓìÌШáóÄæF¹
-ˆj»×A %ä™;»§Së
-ÈÈ®ÑL  †¶*·,NX‰Œ;„ŠO ý4Ö6˜¦®ÝÃ4†m8m‰8U,ÓdG] Õä¡i4 ÐBõI Œ[ö¼…\þ
-fü¬¦B縡”¢mÿUûVwO¨íž¿Í¡•Î+O¼Íië#t+,o‚/¾{|`ìãàÚÍ#kO(¸uyJ]üý$° À(Un
-€ý)%.7þÍBjÖÀl¹’š=Ê
-endstream
+3917 0 obj
+<< /D [ 3886 0 R /XYZ 81.145 444.047 null ] >>
endobj
3918 0 obj
-<< /Type /Page /Contents 3919 0 R /Resources 3917 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3630 0 R >>
+<< /D [ 3886 0 R /XYZ 81.145 433.088 null ] >>
+endobj
+3919 0 obj
+<< /D [ 3886 0 R /XYZ 81.145 422.129 null ] >>
endobj
3920 0 obj
-<< /D [ 3918 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 411.171 null ] >>
endobj
3921 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 400.212 null ] >>
endobj
3922 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 384.271 null ] >>
endobj
3923 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 373.313 null ] >>
endobj
3924 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 735.953 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 362.354 null ] >>
endobj
3925 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 724.994 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 310.548 null ] >>
endobj
3926 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 699.091 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 299.589 null ] >>
endobj
3927 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 688.132 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 288.63 null ] >>
endobj
3928 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 677.173 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 277.671 null ] >>
endobj
3929 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 666.214 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 266.712 null ] >>
endobj
3930 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 655.255 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 255.753 null ] >>
endobj
3931 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 644.296 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 244.794 null ] >>
endobj
3932 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 633.337 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 233.836 null ] >>
endobj
3933 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 622.379 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 207.933 null ] >>
endobj
3934 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 611.42 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 196.974 null ] >>
endobj
3935 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 600.461 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 186.015 null ] >>
endobj
3936 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 574.558 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 175.056 null ] >>
endobj
3937 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 563.599 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 164.097 null ] >>
endobj
3938 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 552.64 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 153.138 null ] >>
endobj
3939 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 541.681 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 142.179 null ] >>
endobj
3940 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 530.722 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 131.22 null ] >>
endobj
3941 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 519.763 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 120.261 null ] >>
endobj
3942 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 508.804 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 109.303 null ] >>
endobj
3943 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 494.857 null ] >>
+<< /D [ 3886 0 R /XYZ 81.145 83.4 null ] >>
endobj
-3944 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 483.898 null ] >>
-endobj
-3945 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 472.939 null ] >>
+3885 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F83 412 0 R /F74 337 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
3946 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 461.98 null ] >>
+<< /Filter /FlateDecode /Length 2935 >>
+stream
+xÚÅ\ËŽ;Ýç+üQDê 4hwÛ¸ëì³YÍÿo¯Þ¯b•KŽ“AÐi»Jb‘‡‘”ª9S—ÿ^¸ÿÿ¯oןß~Ü•»Hæ,¼üüÏ7¸pÿ.™–£q —Ÿÿ»üës}å\Þüoɹpïÿþù÷7ˆyR?îV^,sZ ÛÓn˜8SÂ;ç
+Þ¿+Tþ›DOÏ”oÆSGëïû«èÊUž)Ë7õåg] Ï ÷wüX©Óoãl÷³tøþ•8î
+„Q‚:Øiü‘ìw.Q”ÞF5Ì4üØðYí£‹&Ø}´ýEŒ,0ë…‘Â5ŒFJ¯Y{âRÑÀè3Ëz©ßµƒ·ÇœbÅ#ëªð€‰6ÞWµg8sÂPÚÓ×5íM”ñ®øÛ<õ-A¤d»BvKn¡¹V>kØÈnæØÄ}Šp>$”OÃr@°¿¬rÌKû±ìHé x~mMr0¼ì(Jš²Ei_mëÁS:ÆÁQˆÅà9RƒÜsÜEn…õi0ÉìÉŒR*æ52ÚãUÔO
+_x^¼ F«;±HãB@ K ®Ï*4>QÒŸÖÒ߉Òó2Hr´–˜N”B3E£[ÕtErÔW_°5Û‰1Tæ8‘—––F^Æ]Û 17Ęz-^ÿM±·~Êåç¢&804‚t^±æ¼#¥×¤ ;%Â+¢–rœ Ô³)º’L‚ž)-'â[­÷Qé(šÐ–ÜY‡;Y,bgj“¸†Ÿ³É}¶š‰RÔd+>¹Ò– g(®Î¦ÓE£#¥Ñ–oyuÀæõ-ÙŒÏúquñé‡FÏZ÷Œ °¹(…LuÐK~ÿ.¤èšIhß²ég÷ÈÆŽ&;@ -é+$Â7ÏvbF“Ì€çF¹ ;E‘îÄJ˜ Éd5œ=QÑWÖìFØ2³h%]è}•¢¢ˆP<¼FÉ(œ™"ý86a(£Í'˜’ÝgV¤X~='7@,µãÁðöÄœ7ßé I"ÝYYâ>‹\£á¹ï¹ÞïóÈŠ]£>ź K06’0‘É>¥÷8Ss±¸
+’í:OIÛS\fY&ò5¡Ý¬ÁH•ä<Ž•×ì_m}Úd^üÁÄR T&RiAÏÉ^¨±¬±”J¤‹ñá¼}ŽâTQCÜ#=;Áy óV#ÜuÖ_"ÛÝoñârÈ ‡JƒG°Qç–Ò7Z¦æx”Ÿß8"¯:>W‰ÒªQšx·oåFïþjó
+ˆåJ -ã^® rÅ+2GS¯”U"þîBbÂ%{¡2$iÍŒÙÈ[§Ú`«Š£ÞL÷„?`Ü?|~‚]]ÍÀ0­‘ZÍζÊj6Q"k¥Wd-s6’[¿?á^©\P}¬A5RšÒ‘'¡:kåføœ"E !þC ŸtŠI&|gá‰ÒÓ%¤´’«IŽÖº¥ç92‚Y$ÓÏÅ2{¢ô<G™Õ–äh­Ìž(í7?ë8V­öÍ¥æ¸#u¶huÞÏíLI†N>áu±£ûÒóš:#V¾óµøҹΣÜ<ZDÖ§}Žtó³5qÞL M|\IÔLɶ¯ÌsZl±Krt—ÁÕ$ÃéyñŽs¢]s@×æ¦%¡)e\h¤«#%±VP °Ì˜¥y¸·Ý%¼ïXÉ ‡bnû R $Øîm»Fæü³äUXRÙ=l«D.KÃwqíj·4צÌ0Š+²Š"72o3†HŽH½ŸÃL. H ÌP§ØC¸¬apž|T¦¢±¤‚b[€–«ea°¾)}ílL ÅY—ÓçZ&ÕqºÕØÅãÓ\¬Õq]u²SpusUŠÉÿR*Ø®Tˆ×lå1K§²š«_»½?½)(x;TÉ}D5ÿý ýÎ;ˆ"£ØC„b*‘
+ñ§öú2¤óÚ#og™13…Çž…Ü0Ô0Ï*æߊ–XjŸÀŒÖ¤ÝIê{+Öbatm ÐÒ~¦çmäÖ6êë(¸‹ãˆw ôÿ$l©|¢‰Tfa“à+e'Jp¡MP¦âã…/Êìo4?¼T«‡fb³JÏ =0“`\’ËyV‰¦±fS[ÁNm…fB‡’SŒ^3”ßj$ÚçÊ|ˆ®Ðq'Ìç>T¼}¼ƒp{
+¡ý*×¥&]ÃÔ'ð;p›.JƒH£I¤UCO¢Û‡ÀæÚº>²a ™Wˆ+}dµÎu9M»—Ó(œ–á¼$
+X‰¾¶r3VSMy¨Ãct¢P6ÂÆ P7]ö¬Eúø )~VCŠÞĆRvˆ¾ ØôÛÌ=gm÷r·¸Và$‡„ÉÚ|µÊëŽÎJ€FÇ;ßKßúZ÷Ø÷Àf'Ξ€¹càíg 48ßw‰î ˜d*=@“cV!Æ6óÖ •)äq¼õÿÒÝ°p&zK½zÁÀEn­ÄEh„õYBäáÔž)|öË$Cߟ,ú.wÂ^Ü‹K󧤓0OïèܪfŸ]§8¯‡% ŒëIì«\ˆ‡’4Ž°Çæ&%C°›g}¯…J00ÏJÖ2÷û{kiWlM±jG·k¬ÇDÙð¡ZéwÒëþ€‰Í¿<–𺚻~WJ,wþíBT6È
+h_Þ´FßG؇/?K}›‰Ò“§8žjr¼ìd‡àŠå(4N«åÌ7SÚ??¸Ó¶Ùîš(⬱“ÒN¶INØþ">ÕF"ܶT¨6ã1½FŧŽ^t†iM¯è$#müôqÛ¤ÕN8óGÙb=
+¨œ)µ×èúô²ÙG__Üÿ8¾/ÜÖ»†ù˜l¨o‚Åóck–ÿŸåHÔ±¤ž>Öô4R¢õ°ƒã•~‰ñÙ×Âè$¥Œójóô{Ãà“Ep§+Ž Ü@hônÚÚá>{÷ _ÉTLk [ûÛ¥%ÏúXå¤O¯IuœMj‹:FJO€À3RÉ5ŽFJ/͈—êì]ÿVx<¥²s
+Öòr\rÈŒ•¤Š%ðFBg¼ëTþJË|.üá
+endstream
+endobj
+3945 0 obj
+<< /Type /Page /Contents 3946 0 R /Resources 3944 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3569 0 R >>
endobj
3947 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 451.021 null ] >>
+<< /D [ 3945 0 R /XYZ 78.37 808.885 null ] >>
endobj
3948 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 440.062 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 768.829 null ] >>
endobj
3949 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 429.103 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 757.87 null ] >>
endobj
3950 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 413.163 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 746.912 null ] >>
endobj
3951 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 402.204 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 735.953 null ] >>
endobj
3952 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 391.245 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 724.994 null ] >>
endobj
3953 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 380.286 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 714.035 null ] >>
endobj
3954 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 369.327 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 700.623 null ] >>
endobj
3955 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 317.522 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 689.664 null ] >>
endobj
3956 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 306.563 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 678.705 null ] >>
endobj
3957 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 295.604 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 667.746 null ] >>
endobj
3958 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 284.645 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 656.787 null ] >>
endobj
3959 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 273.686 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 645.828 null ] >>
endobj
3960 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 262.727 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 634.869 null ] >>
endobj
3961 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 251.768 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 620.001 null ] >>
endobj
3962 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 240.809 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 609.042 null ] >>
endobj
3963 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 112.291 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 598.083 null ] >>
endobj
3964 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 101.332 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 587.124 null ] >>
endobj
3965 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 90.374 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 576.165 null ] >>
endobj
3966 0 obj
-<< /D [ 3918 0 R /XYZ 81.145 79.415 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 525.431 null ] >>
endobj
-3917 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F65 335 0 R /F81 377 0 R /F83 414 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-3969 0 obj
-<< /Filter /FlateDecode /Length 2428 >>
-stream
-xÚÝ[Ën#»Ýû+ôÃ!«Š/ 0`¤ ܵwA¶É*ÿ¿ ŸÍg·š¶&7[êæéªb½YÍ™¼üëÂÝÿ¼]?ß~>¤½³F \>ÿù&.ÜýLÑE+Á¸—Ï_þþ7ÎÕçÚÆ4ïÿøüó{0õóaèb˜U
-M#@0‘8§çðˆ(QO(’œ 3Š”<G× z¤Ž¢Ÿ!/Ö­÷Ðjµ¶ õE2-e^K¿8—âŒû[;¸½ÿ@Äð)~‹¿Qþú•sñË?oûÖKôQßH“¾Eºâ]þ·õZÿ õ>™ü4÷­{²ºÅÏþïr—” ÛÄçJóþƒˆ¦ˆþ
-x¢Fý¨¯«ë“ëÇ×ÑŽÖÕ¬‡¨CEsãç^Ö¤R2 b‚‘¯y½*:
-¿6]¾kžá1êqÞwu­÷}Ýš‰˜ð‘y²OkûÔ"Í÷aGŽÛõÖþ=ᇼW+ITŽ9Bx¹RJ|@íEŽ˜õQ´—_á¢äp9“Ú5ɵH­}Ïõ]<zûIÏ‹l€é)g'Ë”LÕ#-ÙÖÇ*ÕB0#vÐd¹¶-Ò—‹Ç
-C°SŠh¢é¥Ù¦STâ®ýMÑ-o­|ãíJšcºì™¤ µÚL qIx-Ðë:å‰o1gx‘ÍIm‰iVu6ßL6×!ýî̲öÑÉ>ÕŠwKŽ%í ráE™+ÍHš¨z̓wHKÍ)1¢ÔG¹9@¦ÊÛ½L‚ú+r(‡Ã½!¸½J‹¸ˆR"
-é°Îš3Õ“ó„áyà801±‰„mD…¸­tâx‰Ý*ýxû#M©SÙ”´Þføò°pí–²[ßÝJtË¿’¦©¦ C<TÍ€ªš7žV_·E솵L¾¿­.'HH\òÂXRÄnÎüÞ²¹¶*[Âã!:¦œU{Û©¹U[ꬡZóÈ]ñkëYUikN]£âmw`¥^ž@·8¶Íximy–JÛ&µ·¢©©wñÖeø¹ÞÎÛŒïP$3\ô(yC‚=ÖûXëFÓbŠÞ¥Kø¶ÕGÜ àŒƒü&7ˆÄǽ-Ü´°Ù¸Pwô¹õጘ>È"“±Ù\ª’IB¶[½t‹ê‘'÷/759ÙËÛ‚É¢ƒwîÙ€š9ø³%xvð-ÒK“ˆG“J5Ðy§¸Q""œ)=“ÙÙÂ='"-ÒïNDvŒÿù$„»KÜLå½V€wH_.[ÈyKvFÑbaÛ!±š]Ý^äÁý²sÌ -PkY™J*ñÒ§!ç¢QkCû—Ò}©“å¬$ÛR¤FßÆû¼Ä¤ª½A{ͧ蕷Y-ÊHã8M™‹ì)ç6]sú¤dgþ [­º}«ÝMþäSã”ãµ"¾CZ*ˆÜôP‹wƒÍ¹äx&©¡DÓ¨1û'iG¾· ù5!·½¦SÑ-‡l#\¾š“úõ¼åHOŒøT/Ow âIw‡´ds*^-rái ©®m¸< 쀴cG‹Ô¹Ä–ÌÐ*Ž¿×¨k‘ x¨Óq}ÕŽÑZæ–Ψ?› &ê;¤Šúâ{¹,-çõÁ»‰¢7pmü’=’Á÷s'q£Ë,ïAO¡_©Ç»
-†^m–£1L*5“þÙ¬2K¿E:¯;C+òØã¢F¦±xkU+V͘9‘P7'‹Ë;ódÎBHgDý“¦ËcßÔ¶²Go*ú­Ò½•@¼Ç ¥¦RX÷Ø© Sá‰Ó“k¦pÎî–$=©‘]骆­š×ô#åªjŸêZš6³+eì—†KPZfìÔù,&ùÒÊÉ4]Z[9©W•?HŽÙ±Íï/ÒW§IÖÖÉeGˆšYm¦üš5GØ"ÁGìY ¡ã#¤duyÀ‹……ni9Ùá;«dSB¨ÙÙOPÚ9Ömªð ˆzJÂ-ÕêoÕ/šqa§†(×Äß"Uqèe¦!ãóIk¤6@­„Ï©Œÿ&»‹ÜýÎ.pÉS#À¥Ñ˜éË='&&f-Ž{uH_§È f¨ÐnÙWw¿«§hvÿÙü6sÐ" ­aÉDs†ª`t©^{J{:¥Ù2îÏpª¬úدj!¸z”œIìlNš%Ö"µ}®±ñŸ:?X²ÃœhT£oÓNÀÑš‰â‰·³Çã°Ô“Û¼ú×­ÀåÄ8:Á°G3+@—¼“™ÝkÉÜKÿ­œ‹å䱕8]‹ÔÚ¯…zÉó^¸“‹û†¡±Ó}0³}šÑÔÙ-¾Ð…dcU‹I²×ÒMÝ$’b4˜qÞìúî­=÷7íÖq}+¬`¼Ä—•w òYtŽ¥C8ž.OÞŒxZ`•“éÍk<}Ï¢>ÿR‰&´f@sO³6ÿß!ÄÏ™$RoáÞóõ_ôJ10zjÃ8±a!%C˜úÞŪCú? D ÕèÍù>jÊ~;¤× †Ïí3å/¯9cˆl|ƒ
-endstream
+3967 0 obj
+<< /D [ 3945 0 R /XYZ 81.145 514.472 null ] >>
endobj
3968 0 obj
-<< /Type /Page /Contents 3969 0 R /Resources 3967 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3630 0 R >>
+<< /D [ 3945 0 R /XYZ 81.145 503.513 null ] >>
+endobj
+3969 0 obj
+<< /D [ 3945 0 R /XYZ 81.145 492.554 null ] >>
endobj
3970 0 obj
-<< /D [ 3968 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 481.595 null ] >>
endobj
3971 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 470.636 null ] >>
endobj
3972 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 459.677 null ] >>
endobj
3973 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 717.686 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 448.718 null ] >>
endobj
3974 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 706.727 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 324.486 null ] >>
endobj
3975 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 695.768 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 313.527 null ] >>
endobj
3976 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 684.81 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 302.568 null ] >>
endobj
3977 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 673.851 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 291.609 null ] >>
endobj
3978 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 662.892 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 280.651 null ] >>
endobj
3979 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 651.933 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 269.692 null ] >>
endobj
3980 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 640.974 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 232.059 null ] >>
endobj
3981 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 630.015 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 221.1 null ] >>
endobj
3982 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 619.056 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 210.141 null ] >>
endobj
3983 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 608.097 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 199.183 null ] >>
endobj
3984 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 597.138 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 188.224 null ] >>
endobj
3985 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 586.179 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 177.265 null ] >>
endobj
3986 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 575.22 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 166.306 null ] >>
endobj
3987 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 534.595 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 155.347 null ] >>
endobj
3988 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 523.636 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 144.388 null ] >>
endobj
3989 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 512.677 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 133.429 null ] >>
endobj
3990 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 501.718 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 122.47 null ] >>
endobj
3991 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 490.759 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 111.511 null ] >>
endobj
3992 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 479.8 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 100.552 null ] >>
endobj
3993 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 468.841 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 89.593 null ] >>
endobj
3994 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 440.17 null ] >>
-endobj
-3995 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 429.211 null ] >>
+<< /D [ 3945 0 R /XYZ 81.145 78.635 null ] >>
endobj
-3996 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 418.253 null ] >>
+3944 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F65 335 0 R /F74 337 0 R /F81 377 0 R /F83 412 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
3997 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 407.294 null ] >>
+<< /Filter /FlateDecode /Length 2574 >>
+stream
+xÚÍ[ÉŽ#9½×WøJ#‘Z‚tÙn ÏykÌuæ4ÿ­¡rº>8ÓvHIQäIóË/üòÇÛç=…º8æ4hyùüÏáð‹¸ÇÐ\ŒŒkqùüßå¯_œKá_÷ëO”ÖBùøÍ9Ü8×ÎÿOþJŸðé_PÆjà\ÉëOˆ!M’þ¿¹§Ïš_ÿýù§gÇHŠa8Ó#;ðÌshDã$DXmclcJ‰ôÈË&Ë ¹ÙÌ`~ÁïëOi¤a HY´â
+yWÈ×Åâ³{Z'=/£{Æç<)(*jÓj¢ÌÅS·hȼBâUÚB»­°†±6".Œ*á™çÜ÷ÆÖÍ-ã±,þß6fÛ½LK:&¸.»b ™óô”1ˆ,~—wAE5áUl(ª2ÀƼƒ~rülx"]Dòìä)á4Ùˆ4iDÀÀ‘]%+»*Š#SPÌr1R)ì¢ÛoÄÖ6°=SáÄ5Bßò7°Í>’gÔ7¥A”LsÜÛÂÍ
+» F1Y¤·¡´äB™r0©Í¥Å¼Å±)øYÓì¡{2rxð–Ìc3ØTŸU£yÝ®8:ð`Ë+ò™
+¾ÕÿýÃó¥ÜE2gBË—æ5¨˜Pv“éÃËÖÜ%­ð쥽väÅzù4ÚοfÂÀH)Êb®?¨_Ù8xâ×ÓÍß'–ÞÉb@.›à³<Q÷ì îÛ7"ž#Ê(ë¥7~£Q½Çff :É„s”ÎôíœÎ¼®”Õ#¥røÂΖòSÖt@Š–ªWKdzȽɌÛ;EéJlÏ“ÝÑÛ;·íÞëÜ.ê[ IªûcÍD;B…÷¿øáÀÀ
+Š!tk õ”Îœ™]Ë^“A;Á€”Á.É0RêOVáSÖxàEÄ\r¶Ú`;a,fOl`¶äªÉÛ¹£½Íã‚Δn½Aÿ \çmôªf-g¨isUkší)l“#Ö¢f)PN­¾w—%ÖŽI®H‰åšÄ=¥á„_´’LV|:ƒ ^#g5Ñ}á¥ö0PÜ{n5®ÚãÇ&Š¨¤lôšW%òéŽ{ç68¿O ÿ ÖÔãÚJeLP@سüoÁ[Ä×$*|6hˆ¾¡ð1 ÆÅ@/ †/Ä@éƒ Ÿ(Å£¹
+c´ô£’î Oš ð\L”¢C Øzì±g¶4W¹U¹Á1¥Hg#çäöò‚›(í¸•Eî„õÀyv ñÿw=%à;pe‘?n˜FMñwüþzJ•¿ÆÙBu6鄼RM@M<Ê;³jUÊi¦¡ôràf½ ”è}Ë éؽ++˜Áz.GW–nÖð>·î}’b\mJ ¼Í•{
+Ž.µ8 3Í{=* £áY„\”ß:o9èËùÂÛrÇx“SW‹¿r²5úW:ËÖÃÏãT:úˆní¸’4§1ÓaÒÝù‹„œˆ“©Ì*Ta_7Y㊞[¼,7ƒ¬Ù»”‡[4 éãŠv*¸tw(-(r®æàúuXXÔŒ•Œ;Òa…¶E3=¥I:ñ¢VÄ[¡¼4È„œ²Jè–Áò@ >Òýsrª´Y^³/±H´¹Ïêh†YªËœtY•’WžîÇntò‘ ¢¿d!Ì1éõ´ÔÀ„Jý‹wRã£ßv4Tª¼.âóR¯ãsF¾)(±Ô¾³³9}e;‰d…fF™‘ÒËé^ ¡€«(ŽÎ¢R;D #¥¥ô–’aÍ’hÛ/7¯{¢R%¹Œìê;ÑY¦8Ž«†½¦SF)H¼‚PŃi%yËõ^BOá¾)°†¯D¹öÅw/^ûPø]12QJëjUÊ¿ßjÓ×èز?¥¨ÅõmÜíZßVÛ: c$xå¸iˆ"t×ÙP¢ô+enYÀ¨±ÍÕq鯧²/ÓÈ¡”½°lî÷j¨á3fcYÆOh-“3~Š‡Ó.ÎÒþÅwÇÈ'¼ðâa™\î iÄU§‹Æ09c­ètÕš{J}Ek.ðç
+&飞oc冮(ÍYØ…C:ý.TËݨßÏYE…1/‡!Ôš):.Êîèæá*”˜I8yöbQ¶´§Zf«í/µäÐ*¼”õ‹3z阼e½7näâ¶É߈}Èטa<"Óþ±ç¯eßzJñú‚)ÃY··Z6Ýt’C&ØÙ]ƒ[ß¿µuÿ¦ý:ÆVÈ=bÔŠÎ-·eC×
+=RRàÙHaÇìHßF6‡Ã¯S
+5³½¹}jDÜKI pÀ¬0” ž½ e(ÕJ4=F¹Î•·Kg(Q4_=Å`³Ì°Ûko8³D@µço1Eƒ=¥Ú›¹…ÇÇ|&j€ì‚¦ljPµ8NÜòž5Wá†Ëç«iÃœîçÏ­nA¯ÊJÒÙ½ZåË^O¨‡F&o¦ ÷`d#è;÷lòM­d mxD*`­ g ´ÒvZñîd½ð·Jô2Gz óˆ8ß?OsÚNã+NïÀR ¡-Aw±lÝ e|nžŠ§{­Åg Dë~G‡7º!2È_2ÅÝp—´¥Ñ5‡œÛ¡6©-
+ÎTjqcÛnýx%´fŒZÖî·m×$3BN+g„DfùÌ_éüµ•Â’Íê2(qÔVH°S+z|nîmãQw*C“¸PµÎ[øa;Ž &¡–RèlÓ£ïrBV…ä`6Þ‡F0Çù .æ‚/‘\W»=}RIµóƒL4hûTVä(–˜hW)wn­ð¼íÀz„ g¼‹P¤“Yëª(½³3[ÂA(<tZ½½½ä°ûZoÖwïÝÂj4^¬Ð ”ÞºömÄ[Šw($Ô=[wËÝí¥s¤¶84à¬ëXEH|/‡/þ !­ˆr9u… šº6€©8~¬E¶¬‚ ¡%¢þ©Î'œÇÆFJki î­K©Ð_s(!ÏÞ4‹±u„öÏVk_{^H>Gïq³Qv{O´êÉl¼Pc/MûÀ*»S‚ŸYÖ¯†ÄoÔòoUJß½°¿6¹ª.P0IüÎA¿ˆ‡öd¡GJߪª/Ê
+|羆¿±gÏY¦¤"mW-qߢ:öŽŽ£ü¨Ž¨ ‡{Ç?ÕÑ¢ÝhäÉí©ÃNæÀz˜{÷Š|q¬‰¾Ú¹ä=zBÿ€> £™Kž \’¬'DÙÑSéváÒa¯€ãLh}‘œ¹z i=SÛtŸ?þ^"•
+endstream
+endobj
+3996 0 obj
+<< /Type /Page /Contents 3997 0 R /Resources 3995 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 4047 0 R >>
endobj
3998 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 396.335 null ] >>
+<< /D [ 3996 0 R /XYZ 78.37 808.885 null ] >>
endobj
3999 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 367.664 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 742.926 null ] >>
endobj
4000 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 356.705 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 731.968 null ] >>
endobj
4001 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 345.746 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 721.009 null ] >>
endobj
4002 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 334.787 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 710.05 null ] >>
endobj
4003 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 323.828 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 699.091 null ] >>
endobj
4004 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 312.869 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 688.132 null ] >>
endobj
4005 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 301.91 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 677.173 null ] >>
endobj
4006 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 290.952 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 648.281 null ] >>
endobj
4007 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 279.993 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 637.322 null ] >>
endobj
4008 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 269.034 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 626.364 null ] >>
endobj
4009 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 258.075 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 615.405 null ] >>
endobj
4010 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 247.116 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 604.446 null ] >>
endobj
4011 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 236.157 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 575.554 null ] >>
endobj
4012 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 225.198 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 564.595 null ] >>
endobj
4013 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 185.014 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 553.636 null ] >>
endobj
4014 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 174.055 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 542.677 null ] >>
endobj
4015 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 163.096 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 531.719 null ] >>
endobj
4016 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 152.137 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 502.827 null ] >>
endobj
4017 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 141.178 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 491.868 null ] >>
endobj
4018 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 130.219 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 480.909 null ] >>
endobj
4019 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 89.593 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 469.95 null ] >>
endobj
4020 0 obj
-<< /D [ 3968 0 R /XYZ 81.145 78.635 null ] >>
-endobj
-3967 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F65 335 0 R /F81 377 0 R /F83 414 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /D [ 3996 0 R /XYZ 81.145 458.991 null ] >>
endobj
-4023 0 obj
-<< /Filter /FlateDecode /Length 1999 >>
-stream
-xÚå[Ín#7 ¾ç)üe$ŠÔ°`¯í=çVôÚžúþ×J3#k¤¡Év¶Ù‹lì±çþ‰üD*
-x÷×NÅÿ}9¼¿¼ž9ì‚×wï¾èŠÿôÎ#XÚ9«AY½{ÿ{÷û7¥ì^)”2>ý¼ýñþÛ‹J`êõìiç!XküGö¶E¢ˆÀZ)<(¥¿§÷o¿0ò·ùUÿž—¯ʯ˜ó+›$Á(Åקˆeæ;BÂMŸáyþ¬ ^pB~…û-6á^^Ù‹´§üÊ<•_EÁÄ»â«Év+W|àV J~°Üç‡`Áyl‘ðûEÖÅɪ“õ΂ôbõólÝdÑÚºñ7Þ¯¥  ÉˆZÒX´ÕHe5î£[Gúå'^¥¨-&«„*òб;r3_î˜ïOQºŽR­OæïÿL~ˆßtÃF:šNZÏfÌÂ5îg©’Ät(šMÑtZÞûÙtØÚæ¾ûãÔ_;@dI:õéϤm‹”ä·a»bÒu<¬#€SN ¢aŒ†A”´¶ÕÁò”ƒºtp›©ä­Fj^ËvÁœò¸œ»òw »Íœ[»¡›ªûÆ,gƒQN²\ÌÒ#–k’Ü:z6 %91Œ‹ï Iühì!ñk¤bö:p¯-HÚ—T´*%ü¥‚*”Ñ’è¬^»:Öñ)ñ&›IaRŠî•âz£8× Ö¨Q8FvÁ~(Ô@uà÷%’t%Ó(‹³‡YŒ–T3aLµIŠ.£çDHn=Ò4¨k ‡¢”-èˆÐ å4ÛzT*ŠßÒF *¼ Ò(‘F‘®˜°*Ƀša
-…dÏà´—¬ßK!³õk¤Ynº°'û ’³’ð½2 _­dçQ‰ Ò¢H„*Ùh€¾
-ÌžP¸—&-×@°g©Y%W÷²N>‡{?È®™4xoDãú!ãÖ@Ÿ+â9(šQÄ@í$p‘ñ#q‹te»2(ñ,JGc+»FêOKU J¯B,Èb^ê¥0Yú©H_Š›ý±Û*
-b´IºõÒ•…ž5H«Þá DÞò›fL?ÈÕHÏ$Œ5­xˆ0’‹Û9 ’¾½%{!Œ ÒOBÉrÜÎJê÷ýe__=Ôñü¿ÐEŠ¦C¢ñ{ûE!Æœi‘P(þh×ÒëCeéáUC±Z±‘$ã9 Â'öLÉ ` Q>FJùÐ"I]-{0(/j0†Å€é£ˆ
-Œ-ÒgòËÊ?±ÓAké¨ëvC3Y«ö ;ηH×ØqfÆ™%óñ_`É&„˜ÅŒÞI—rŒ4H«ìB€Rºž<|šÉP*MIÂüÙ¨ìÞ±H>:éÐEö)ɮ٭·1Å1Ü9 °atêfL8Í£}‹´:) -ÅÓmŽª\½—M÷l½?nô2Ûù [ Ûr2p'E»¸Z%é§Ç'¬%‘;iÕ%k¤'ìU X4¢l}¬c: jƒô”½ª1&òÑÙÌ"—äiåíý§•ƒN±(½Â6H8ìe­Á‘½ÌCľAúÃȸTÁy'ê6v¨Aº{׌>€G/úÝ ¤û%r¼«RogA[pìZ¤F¢×³æ]j
-aZjån"cÚ¡5Ê9cß¼ÉC¯Gq‰Vû÷|…ìúåYÎN°ùYŽ¤gicc®Ü<-UÄ|*ŸökvÍ·4Ð~šÁ7 ©pÎB:ÌBæ+f:„5_uªýt>š•ßMÈó|¸«\™6À›‰àúV}\—üùYi1.\Žž-’—¹"®¿Ãq‡5Ý–W%-.ýÎô®¨;­ÙåÁy”\)vËCÄt°cª› ¸»uDí]KôÜ|žÓbÁß<ïãgÆåCjãvö£ë"x=ˆcœ×`o-¯¿©î£¥t:‰˜°1ȧùسžÖQKdKé iÞÛQ˹°Fê;Ì°ê&o÷ðøØaˆ+ŸG
-z¨ÛÛÙ\½¸¥˜Õ@ÅÿõQ‚y»f\‰‡ô¾'>,ÞwÄ!Ǩ=¬ct¸ê£v ëaàÅPû±¸ª‘®ÇUÚ?¥úcì’pb{jP¥¨g„YÞÞYÖ£Fêé°o3Ö{¹¥2cÔ8et=è»Xhìï
-¤¦•a—CŠˆº"JѽÝéæU45D–â[›gS,žYrjš—¹Cî Q˜:
-endstream
+4021 0 obj
+<< /D [ 3996 0 R /XYZ 81.145 448.032 null ] >>
endobj
4022 0 obj
-<< /Type /Page /Contents 4023 0 R /Resources 4021 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 3630 0 R >>
+<< /D [ 3996 0 R /XYZ 81.145 437.073 null ] >>
+endobj
+4023 0 obj
+<< /D [ 3996 0 R /XYZ 81.145 396.227 null ] >>
endobj
4024 0 obj
-<< /D [ 4022 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 385.268 null ] >>
endobj
4025 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 374.309 null ] >>
endobj
4026 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 363.35 null ] >>
endobj
4027 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 352.391 null ] >>
endobj
4028 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 735.953 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 341.432 null ] >>
endobj
4029 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 724.994 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 300.585 null ] >>
endobj
4030 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 714.035 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 289.626 null ] >>
endobj
4031 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 703.076 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 278.667 null ] >>
endobj
4032 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 692.117 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 267.709 null ] >>
endobj
4033 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 681.158 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 256.75 null ] >>
endobj
4034 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 670.199 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 245.791 null ] >>
endobj
4035 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 659.24 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 204.944 null ] >>
endobj
4036 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 648.281 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 193.985 null ] >>
endobj
4037 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 637.322 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 183.026 null ] >>
endobj
4038 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 626.364 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 172.067 null ] >>
endobj
4039 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 615.405 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 161.108 null ] >>
endobj
4040 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 604.446 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 150.149 null ] >>
endobj
4041 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 593.487 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 139.19 null ] >>
endobj
4042 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 582.528 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 128.232 null ] >>
endobj
4043 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 571.569 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 117.273 null ] >>
endobj
4044 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 560.61 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 106.314 null ] >>
endobj
4045 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 549.651 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 95.355 null ] >>
endobj
4046 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 538.692 null ] >>
+<< /D [ 3996 0 R /XYZ 81.145 84.396 null ] >>
endobj
-4047 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 527.733 null ] >>
+3995 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F65 335 0 R /F81 377 0 R /F59 346 0 R /F84 425 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-4048 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 516.775 null ] >>
+4050 0 obj
+<< /Filter /FlateDecode /Length 1924 >>
+stream
+xÚå[ÍŽã8¾×SäV-R¤~€FI§2Àœë¶˜ëÌißÿ:’mŖ̤Ä$…íÁ Qı>‘ÿéXÇ¿6ÿÿÛÛéãíÛ…ÓLŠàððñçlþ‡ˆÆÓ!x0ÖÃáã‡ÿ~·Ö­ )¿²µôþãßßlËPß.‘Ñ$ï]Üâ
+V³¾»ú^ºj:»ý}rt_íd]íak#.¯Aš×JöµFQF u‹ì¬V¸ †‚˜%æn‹p[ U¸f÷EAKå»`—æ87žÀeEâImÐÉ0“DÝhV »EwK’)©‡h8±Dýh
+S©o‘Vê×àÖr ‰ãšTÏ©þsÃãy;ªÒ³©z4Ôz0NÞø$Šœ®é^™0¶iÅS #G6¢ÈoT%ŒÒ?$aä@&È
+8ó™ ï€V‹âO,ê_œ.rñKDáf7œ‹bt=
+Áý–z85’V[ £‰„¢Õ¨òœC2že¼L`bÃö`F6§1õH›Xûá
+èóˆ-¼¬£æ(oEÏ3ÚQ«¾°E{˜aÓM<ßïÝø~øaˆß«5Å…ü’DOͪhÖ!­Ð>L0l.¬Q>hˆÇÇr¨ZêO[-UÇ}—õÂË‚"b5@·õªÔO%þ8¿8ܳ؞RrlB;#¼Ú‡Ó±Ñ"tØ÷žÛZn‰ÌzŒç9bÉ„vÐW%4šEW‹h‘Fγ؅_f E#Úˆ(éö¾Ò­645D–à»®½Uͳ[%^³äÒ&tU/k‡<®‰ÂÔ¸QÙK”=œObr&¶Îr&󹨴¶Czœ¢üÛ©f¥h´
+¨µHwüAœét$Í~óFV©à#ç*1±Ä‡²vènûƒM ¸½î-ôÖ$çE~u3ÏiðtöüëZÐH9Å AâÕ)­¦EzêqÓÒ ³Dª¢îZ¤‡Oàë:2ˆÑXYÙXw
+"oGo-’¤› Óêý6Ó1~üg @Ö¸%>”yQ‡ôp\L†œH®iÕ½2*¿ðg
+endstream
endobj
4049 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 505.816 null ] >>
-endobj
-4050 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 494.857 null ] >>
+<< /Type /Page /Contents 4050 0 R /Resources 4048 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 4047 0 R >>
endobj
4051 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 483.898 null ] >>
+<< /D [ 4049 0 R /XYZ 78.37 808.885 null ] >>
endobj
4052 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 472.939 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 768.829 null ] >>
endobj
4053 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 461.98 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 757.87 null ] >>
endobj
4054 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 451.021 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 746.912 null ] >>
endobj
4055 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 440.062 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 735.953 null ] >>
endobj
4056 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 429.103 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 724.994 null ] >>
endobj
4057 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 418.144 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 714.035 null ] >>
endobj
4058 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 407.186 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 703.076 null ] >>
endobj
4059 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 396.227 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 692.117 null ] >>
endobj
4060 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 385.268 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 681.158 null ] >>
endobj
4061 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 374.309 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 670.199 null ] >>
endobj
4062 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 363.35 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 659.24 null ] >>
endobj
4063 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 352.391 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 648.281 null ] >>
endobj
4064 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 341.432 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 637.322 null ] >>
endobj
4065 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 330.473 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 626.364 null ] >>
endobj
4066 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 319.514 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 615.405 null ] >>
endobj
4067 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 308.555 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 604.446 null ] >>
endobj
4068 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 297.596 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 593.487 null ] >>
endobj
4069 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 286.638 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 582.528 null ] >>
endobj
4070 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 257.746 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 571.569 null ] >>
endobj
4071 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 246.787 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 560.61 null ] >>
endobj
4072 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 235.828 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 549.651 null ] >>
endobj
4073 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 224.869 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 538.692 null ] >>
endobj
4074 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 213.91 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 527.733 null ] >>
endobj
4075 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 202.951 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 516.775 null ] >>
endobj
4076 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 191.992 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 505.816 null ] >>
endobj
4077 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 181.034 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 494.857 null ] >>
endobj
4078 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 170.075 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 483.898 null ] >>
endobj
4079 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 159.116 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 472.939 null ] >>
endobj
4080 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 148.157 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 461.98 null ] >>
endobj
4081 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 137.198 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 451.021 null ] >>
endobj
4082 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 126.239 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 440.062 null ] >>
endobj
4083 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 115.28 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 429.103 null ] >>
endobj
4084 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 104.321 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 418.144 null ] >>
endobj
4085 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 93.362 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 407.186 null ] >>
endobj
4086 0 obj
-<< /D [ 4022 0 R /XYZ 81.145 82.403 null ] >>
-endobj
-4021 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
+<< /D [ 4049 0 R /XYZ 81.145 396.227 null ] >>
endobj
-4089 0 obj
-<< /Filter /FlateDecode /Length 2095 >>
-stream
-xÚÍZËŽ¹Ý÷Wø¢H¤ž@£vÜ`Ö½Ìvîêþÿv¤Ò[EÛEwNœ²tê”ÄCIR˜ÓÿN2þýÇËùóåçÕ„“Á+„Óç?/ê$ãuò ¬>9«„´êôùÿÓ_¯RÚw) äÕoþù"X„úyõúäE°ýˆ£ŒZÙ äÛ&~3¦~ÓÝY)1~ì%þÿ²o3|ƒÖ¯caûûƒŽ82}oOmý¦>ö8ýWª ÙÞÁ}|g¤P(ß!ò|7#ußAÄ´aï›ôΓ/âíãw{$°ø…i¡4R¶éžm35.0r61ŽÚµßBýA¦à…Š;ì¹Çû‘`…r°"%ÿêä÷+—‘rÀPŒ¢,F3’NQoT¿òÜÀsÂnãæWóë¹´ i$Åv×q4Ùiô¤6x­6sí•V€µ”½‘×!{ÑãíŠTG;K´o|eñÆ9óNüíGŠU±Áçßõ™i‹ F t¤-ï,[¤ïŒþ¾ØY¯ê@Ù‹g6"’Ý!P]#4‘ å1ôO¯Ö¡@Ú\Ï ïT-Êë2—“¡Q‘cÎðb° }%ï¿/F 퀴Wó‚0#=½b[[)$‡òÍH)g§,Íçô© ·yýñ8
-Ïõ7\c!cÈÊÔ Òqu“ÔÑݾ¾ÍZièe&ud'5”2‡'WÛwº a2H}\þ|A‰Yå… {½ð~\ÁTïÏHw#¸e ïÌ•Ò ‹–â}TçTÞ3Òo¯,¯hûÞ_«FÂ%ü•Š VXç¨XÕ`% RÅoÓ\Æá”'¹¿ó¸ÏHÿ*Ë8-9EWœÌ@Og:cQx©HB²Â·"=ÏÈ€ðÈèT?qõÀˆ° =ÏH+á=’Œ²>YÚ£4éSäY0#Ý®ŽhJÁYµæ;Hï0idÇïá˹̨Í#sÙQ%Q}1#ÝöEtZÉù×>Ï9¾À¸¶CBH!"¢Éë}ú˜òïåk¾‘ZÈý¾
-?1?šé£.†°G‚¬úÇ­Î…{ùtÐ3²½ùçU™S*‰otA ;i—O蟯µòÛD$¤gõ×\ƒ·¶aí=¬1åIŠCªóoõh3öB¾KŽmSfÕ9Öئ5ã¦çÆ2ÖˆÊËû5RxV¤®qŽDÕ…}TmÄ´)Ö
-TŽ3ÒÀÑ~Èå«6”äÊtx[¤p›‘fÝ;Žã\ëÑúxß®¯dyFqí‹ujrý:ª1ª}3Rç}¯R×®p/U˜cÇ'­ûÞ‘ü5ÿŒ4ð/ZwËu”Lžk žGÈâ¹ <‹òÙÆÔŒß×Ã5›=—ü›åÎYŒõ„¶²ç¨š©öÌHÇÆ ¡òg¼Xâ ÓµSo>gª·€zÛ[~÷š5“…œß ç.]ž†ò§©÷(´Â¨Ý›Ò(ß,¹”UjD9d¼û¨ „2¸"Çõìø×¾…±g²-·ˆÆ1-¤7;8ž[A{a¬¿KªeçK¯!ê-0øÚÕWö¿ÁìÿZan>*ê­új‹D1F%‘qZßÉ¿YQ䣢ÈOöµzQmµ–…¥³·7‹6ûÇó‡Ä)+–©N*#ÓDG¶¥§OÌU,õÒ»‰*Þ«K/¹Õ†wÉF÷· ñk†(æ]Žúš¡ÓöÄÙûÏaâ‚2[Ìwq2ظªÌ l½‡Z Kh#¼ê¨kØŒ4œàŸù ÞˆÂzɯ9*ïiŸKžÞ¹B
- nÊöIÈ‚4œK=¹{þÌÍéá…áƒXÝq_ůzªf¤á¼žÜìÏñ<T–¥òt¥Úܬ.ÏÖ5ö`ºY€Äs¼*ª¶ÎHÃY–ï ¤y´}Ò٣ʟí–î-OÏ×ó¤t~¹ãr+¥1&GYzø&h±tFn¨ýY›V=A‘ª{ýj4¿á–L|(4qÓį‚ª3ÒM†¬dp%´ äH4<î3yªÊà¥R+Š•æ±q¸³£ŸÃ~ó¬ˆ*Ç—S û@c2öÁÖŸ*Ñ5ÁõR;)ô~äþñùò/ìàœ…
-endstream
+4087 0 obj
+<< /D [ 4049 0 R /XYZ 81.145 367.335 null ] >>
endobj
4088 0 obj
-<< /Type /Page /Contents 4089 0 R /Resources 4087 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 4143 0 R >>
+<< /D [ 4049 0 R /XYZ 81.145 356.376 null ] >>
+endobj
+4089 0 obj
+<< /D [ 4049 0 R /XYZ 81.145 345.417 null ] >>
endobj
4090 0 obj
-<< /D [ 4088 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 334.458 null ] >>
endobj
4091 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 768.829 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 323.499 null ] >>
endobj
4092 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 757.87 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 312.54 null ] >>
endobj
4093 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 746.912 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 301.582 null ] >>
endobj
4094 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 735.953 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 290.623 null ] >>
endobj
4095 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 724.994 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 279.664 null ] >>
endobj
4096 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 714.035 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 268.705 null ] >>
endobj
4097 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 703.076 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 257.746 null ] >>
endobj
4098 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 692.117 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 246.787 null ] >>
endobj
4099 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 681.158 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 235.828 null ] >>
endobj
4100 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 670.199 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 224.869 null ] >>
endobj
4101 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 659.24 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 213.91 null ] >>
endobj
4102 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 648.281 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 202.951 null ] >>
endobj
4103 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 637.322 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 191.992 null ] >>
endobj
4104 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 626.364 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 181.034 null ] >>
endobj
4105 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 615.405 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 170.075 null ] >>
endobj
4106 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 604.446 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 159.116 null ] >>
endobj
4107 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 593.487 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 148.157 null ] >>
endobj
4108 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 582.528 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 137.198 null ] >>
endobj
4109 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 571.569 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 126.239 null ] >>
endobj
4110 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 560.61 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 115.28 null ] >>
endobj
4111 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 549.651 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 104.321 null ] >>
endobj
4112 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 538.692 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 93.362 null ] >>
endobj
4113 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 527.733 null ] >>
+<< /D [ 4049 0 R /XYZ 81.145 82.403 null ] >>
endobj
-4114 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 511.793 null ] >>
-endobj
-4115 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 500.834 null ] >>
+4048 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
4116 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 469.95 null ] >>
+<< /Filter /FlateDecode /Length 2284 >>
+stream
+xÚÍ[Ën;Ýç+ú¢H"õ é´}»În0Û™ÕüÿöêYz±ÛŶ ‚JÛÕ¥S‡)>$Ka.ÿ½Èøÿ_ß®¿¿ýx7á‚"xúòû?ßÔEÆêâµ°xqV iÕå÷ÿ.ÿz‘Òþ”Òèöùúïß“ ,Býx÷xñ"X ~ÄQ`„ñvE‚ˆ‚7)õ{AH}ÀÈH¡¤¦Ù+ÑŒ¤’Š¬®åj mˆß½Õß}¼Òçõõ»Ñ&Éí§çÆ›À•‚P¤ü?ÏÉoP ²+RâoÃÁËŒréÎ7Jdd¼°KhndzòÎ(3Ž×vc|ºÚoêWdñášå!Ÿ!0ì‡ ÒW®iSûÚ ÕJhOû3Rçl$i\±û–¼d³&oå„Ö†äíy¼g¤Î»Ï1FTçâeoÉF;è?éc\Ç‚ý¹Ñ2Àï3?ŒNsåiÊFÔÛþîþ­9|
+À@úœ“M[¡œ^‘žŽuÖ
+JÖ—8êœß2™™ „ –´7Ãb¶ õˆm}å\n^
+Žä†<n3ÒœM¤(Õf¾dÐtÖ±?×í#ÅrஓÆáœ'­xòÍH÷£ú]å^s[Çžã…Wâ66þ3ÒÀ¿fÙ++¹<Ñ ¿›¸? Í h`Y£I¶ÝVÑúóû> Yš[ùβ=¬RQ✮þ«83Ò9«!"gzçwe.!¾KGŠÃ»\ÑïŒJ_«–S¯^Š§iÀ—Œ¢ÝK‰CV—¤!=“<-ß õ=©÷¨(‹QÛ›’gInµzU5ï–mMO÷J âº¦ ¬Èq5û®ýK/ sÂ+%øÑhÑBz³Áñﻄ cýCRm­j:Í÷b Ó&éµE´¢ÿXÛeý·¬=ë¨FĦ«<aÄ(«Þ8ÇØI¿ÙÊëGÅxÜÙëŸòÙ=èx²²töà#b–(Ëß™NoÎ=«eJ/º tÇ|ý0ŠØË™ö óÕu”Óå©Œw+B÷· ówÜf±TŽí5à|ÇÙdžg0qA™%æÚ]
+òqU™AŒg®aPD¥PkØé~aY來1<ŸÁÛƒPHÞ?y¼g¤=–<Ý ˆ•—PˆGà…»©s̃ìK_âé°Ç;45£°ÉàûÒÈ®$ÑƵ×R^Þ¼ vrŸëÖ½ºirêSu´÷s½´ReÔ<ò½/<yI¸ý/n­ÅZ;ÒRyyý‚´XÁ\729BÚz’#/¿_ÆÙ%æ#zª!î´|x°æ’g¦g+¸­½à¼š„#'ݬåÜO=˧g[{2~«$¤A“¿óqžÌÄQÅú›tgfÁ0u–Nm«ÍãÌc=²þÈhÊXÔØà…óa|L¶’Ê;éªa£Á®®¸U*7¡j'5˜ÐwóIÁL‡Ç)k .hí†^3=¥ÚGŠUî¦&:~“{~Û
+˜œ¢—§ôPÖøÒ>ÑGÚÜ¥=O²-%Åüôñ–† 5°´ò/i·à|4ãN›U·{ïmãÓûÀÑhñŽz‡¾PÐå‘TÆ
+X é9ÖõQù߯
+Â3y¸Xõìùˆ5ìÞï‚Ä0Ä­WH÷̶½™Ç~ 1^¸~„GX³üÒç솰¨Ã^ŸôK+¬öúT!¬~Ùëä—å·{þX¿JöÈZ[³ÅŽb¢†q´#“æ½É+ƒj6¾Å¢V)ÊbÏv/šÅÎHŒ)z¶‹ §ÏhŠûÙª¥ný,HÛî“W4Zäu²*Á˜ã… ièõë­Ïü ÑÔžñéýßš[3u P¸=µH:8[õ4ÌHÃ(Ù‹ì÷á:T–µòtµÚÌR×{kGÝ y‘¢dõ<Yg¤á¼ƒ÷u“å+íç¨råkØ%O÷Úµ.@iO(ïq+´ðÊ‘–mX’.Hîü¶ƒRªƒ Ç™j~Ôm6¿àäöJxãI‘'ãŒDÕ­gü¸×«ƒ=Ü©wŸ]ˆSáqþð%§<´‹åC¤ç
+tj}C[+>ÚYÀX¦ùupkô<lÞj¨^A%‹å<bîŒË=y«ÏËy?`ÖÃœŒ¦D³Å¼«n½{_µ5=¯—ÆwŽ ·5™ ½må÷PXIª,¯Ëלä>Ò9ª ”±+;ÍÛ82hf;•Ô£S‡ƒmµ5xØpˆ–Á”CF}
+°Lö *O±?[‡Ôƒä RðŸ,@™òh%ÐìÛbp¾ìhòÌH_Z
+endstream
+endobj
+4115 0 obj
+<< /Type /Page /Contents 4116 0 R /Resources 4114 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 4047 0 R >>
endobj
4117 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 458.991 null ] >>
+<< /D [ 4115 0 R /XYZ 78.37 808.885 null ] >>
endobj
4118 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 448.032 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 768.829 null ] >>
endobj
4119 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 437.073 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 757.87 null ] >>
endobj
4120 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 426.115 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 746.912 null ] >>
endobj
4121 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 415.156 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 735.953 null ] >>
endobj
4122 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 404.197 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 724.994 null ] >>
endobj
4123 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 393.238 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 714.035 null ] >>
endobj
4124 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 352.391 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 703.076 null ] >>
endobj
4125 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 341.432 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 692.117 null ] >>
endobj
4126 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 330.473 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 681.158 null ] >>
endobj
4127 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 319.514 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 670.199 null ] >>
endobj
4128 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 308.555 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 659.24 null ] >>
endobj
4129 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 297.596 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 648.281 null ] >>
endobj
4130 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 286.638 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 637.322 null ] >>
endobj
4131 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 275.679 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 621.382 null ] >>
endobj
4132 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 234.832 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 610.423 null ] >>
endobj
4133 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 205.94 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 599.464 null ] >>
endobj
4134 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 194.981 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 588.506 null ] >>
endobj
4135 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 184.022 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 577.547 null ] >>
endobj
4136 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 173.063 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 566.588 null ] >>
endobj
4137 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 162.105 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 555.629 null ] >>
endobj
4138 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 151.146 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 544.67 null ] >>
endobj
4139 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 140.187 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 501.831 null ] >>
endobj
4140 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 129.228 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 490.872 null ] >>
endobj
4141 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 118.269 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 479.913 null ] >>
endobj
4142 0 obj
-<< /D [ 4088 0 R /XYZ 81.145 107.31 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 468.954 null ] >>
endobj
-4087 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F83 414 0 R >> /ProcSet [ /PDF /Text ] >>
+4143 0 obj
+<< /D [ 4115 0 R /XYZ 81.145 457.995 null ] >>
endobj
-4146 0 obj
-<< /Filter /FlateDecode /Length 2218 >>
-stream
-xÚÅ[;#7 îïW¸LŠS$Šz›ì³÷€ å¦
-ÒæQäÿ·GÒèÅõŽ|\1wÞñè’¢È-Oäéë§Ë맟^”9,X<½þùIÅ/äI\ÚœUBZuzý÷ôû“”¨¤Ôîù³Ö:þeCüë%^Pî }ÿDw¤töù×_"¾C_
-tj|aª/á’GóÒ)Ôý8˜„¡Ávôóç]"ºðºK¥Ó]ˆþŒˆñ#[-áï¨ü¼lÆ\G; ´¯Ö.=· êøÆZÝóð’ž'|úF_HÚ"_‹ºI#™YH󚳘(¬dMFHoówmŽ*eìˆ`Ò() 9Uü÷kD0á„"x¥¡Eð "¤C'”ÒûŒŸ#éÍŽ·„•Ý3ê‚'%±Úw³/Ð#Òfµ8o ýåó¬»lÿ[ç]ù©j½Í75Ñ6Z'M0z8¦‰²Â7"‘ì4Ëä{$oœ™"¯5ÐX>Á™ô)ÓÞ‡ýysMn°hM÷ögå£L;l;Æø´z²„¬êlÞöý8×¾+qéêÆ-Î#¡‚áæÑÀ±ytZ
-Ж³Ž½¬Y§Gj43w?AÕd¿§çç(º–ÈYâÚžgçOoØpÑV2jê<k«ó1[€ì¬îæ6×´€)Pla’›àu~Þá¬tJH}‚ªc‘–•ŽOPÚ?“aâ›|rÜ-,]“±a7|ÙÇ^jêƒmBŽITB¼°“µ66€Ð*pÓ¡Ã’ëH÷ö’#.jä•à×¢ök
-u@}€=–DèNIT…}C¶N
-”Š]:f)™HxÎÞš=Ë©L½r(ÝÉ]èÒë¢ô&Œ”„“Io"!VvDªélLI›äÛVÌ¡«†Ê:£þK;®úH°5ëhzMŸÉ„}j(®úP4"ƒnU'í„–®%žE§©ÑIM:-ÊV;Q­SÊ"cÔȘ}ôªlÊÄÂr²¥IE¶©Ê¦s,)Ä7‘ÔÝ»ßy®®õ´¶Wõ“±DBÇéw”èýz¤*7ÅÌ-?_ÒU²Ý–»]–=ÓB·:?&ha}`å?/É? 5òC-j‹üv•PšøŸÓœ˜zÍÅ{ FÊ[e5*;*¥þ8 …ËÐwvuŧ„sŠUǯ©Ó#óš¢+eâ-íf.c¥ð
-X¯1kò÷Hó|<.#á ë2‹Ùu@ª2¢+Ì9ñ6›‹­ÂåÒýU¹µ> ëkYt@ªr?/,ž*’Õaõu4e;.^P66~½¨ 84›™³ç€ÔÌÁÛ²ÎÅ°øÍ”#ðåX)™6Xry©Ñ`«­.P…˜ÈKƒ›ò&Þ–sú€4xAW ®Ê(­Êq2.æö©]f>niS^†\ØxsÊ1ôìî×q e[©aÜÅ9þ-
-å`DšÎOåB%¬FÖ©ò ÂI?"5§SFææÈ•Xæªìzou=”´–Â:ÃÚ
- ngªTó‰ù7DDN¸0åwŠàG9HÖq@‚7³Üì°(»·ÂëÀÉ~”›Ù{¤oäªàŒð¬IÒ"V´º>j_¯‹X¿ˆ
-ŸãÊ‘dì[iuM·ìî Â÷š}iß´+]Ú ó®w‰ù¶i£uòÜSOíÚÐ[³@nÉÝ°MiwVS»³¢Faw-;Ðw[œ“*”¨°1ÉÖ‡éÛþÉ»æçXá&‚’:± i)éoë$V¹5z3C|O6ŒõÏJ÷¶N±˜Ð?µFß’§ìïd4ùlìSS„샻©ãnÝØj¡‹Mˆ¡nò
-ÈŠ^ï70G—Rž]|¡ªš[¬[? ìÁ;5ŹZEê»Ü:䲂l¼Ê¸‘ËIåÇ&íÍU0ï’ÒØ|åî=ÊûÆ׶cÚÖ>õyÏ Ks¥ÐÖsÏr¢„ù=ûN,´§- æ%ŸÞPŽ5¹·½ ã
-eiŸR×eÝfsîöúé?Á„“™
-endstream
+4144 0 obj
+<< /D [ 4115 0 R /XYZ 81.145 447.036 null ] >>
endobj
4145 0 obj
-<< /Type /Page /Contents 4146 0 R /Resources 4144 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 4143 0 R >>
+<< /D [ 4115 0 R /XYZ 81.145 436.077 null ] >>
+endobj
+4146 0 obj
+<< /D [ 4115 0 R /XYZ 81.145 425.118 null ] >>
endobj
4147 0 obj
-<< /D [ 4145 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 384.271 null ] >>
endobj
4148 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 754.882 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 355.38 null ] >>
endobj
4149 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 743.923 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 344.421 null ] >>
endobj
4150 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 732.964 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 333.462 null ] >>
endobj
4151 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 722.005 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 322.503 null ] >>
endobj
4152 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 711.046 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 311.544 null ] >>
endobj
4153 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 700.087 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 300.585 null ] >>
endobj
4154 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 689.128 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 289.626 null ] >>
endobj
4155 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 678.169 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 278.667 null ] >>
endobj
4156 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 667.21 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 267.709 null ] >>
endobj
4157 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 656.252 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 256.75 null ] >>
endobj
4158 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 645.293 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 227.858 null ] >>
endobj
4159 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 634.334 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 216.899 null ] >>
endobj
4160 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 623.375 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 205.94 null ] >>
endobj
4161 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 612.416 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 194.981 null ] >>
endobj
4162 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 601.457 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 184.022 null ] >>
endobj
4163 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 590.498 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 173.063 null ] >>
endobj
4164 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 579.539 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 162.105 null ] >>
endobj
4165 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 568.58 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 151.146 null ] >>
endobj
4166 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 557.621 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 140.187 null ] >>
endobj
4167 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 546.662 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 129.228 null ] >>
endobj
4168 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 535.704 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 118.269 null ] >>
endobj
4169 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 524.745 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 107.31 null ] >>
endobj
4170 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 513.786 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 96.351 null ] >>
endobj
4171 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 502.827 null ] >>
-endobj
-4172 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 491.868 null ] >>
+<< /D [ 4115 0 R /XYZ 81.145 85.392 null ] >>
endobj
-4173 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 480.909 null ] >>
+4114 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F15 334 0 R /F74 337 0 R /F83 412 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
4174 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 469.95 null ] >>
+<< /Filter /FlateDecode /Length 2414 >>
+stream
+xÚÍZ9#·ÎçW(´ƒ¡Ébñd#kdàá…ãÈpê#ðÿO]¼¦ZÍÙl,´«m‘«Šu|,6gêôljÓß?¿\?^~¸+wBæ¬púøýEœ8ý' LãÉhÁ¸§¿O¿ž9×oœ+à\JúØËoÿ{ጠ~¸[<Yæ´–¶Å
+
+=")wyU èx<úˆŸ8Çkü®yÄnD}"§âLp˜É©Õšœ=R#ç{’ÍÅáÚ|¿Óǯ)¢þô¹Åß4¬ê#(§úàš>=R£Ï ¯×ÃËëuʺ¢¥ÿ÷º*?X&H°™ßÈ5ù{¤í~|^Fa€šÉˆïk2öHUF4ÉÆdWéýEDûjždÏWåæšÖ£ÜHö0nMî©Ê­d”ÑÛWš(«Áêë¨âwCƒ Dýx¸/ê¢b’›™.
+–tš=x,kö$^ôVeäçí¾[ÇaA
+ÑOž©¼Õî5è[ðÔ<S7ß-g‘It3Ëéëšåz¤Á n)‹…l·*£‘LÎE|[±j÷v²"úi›Ó°ñåXcüØâ·‚ikžÏù]ó­¯ÛaQV0îó{­¡3CʵˆKþ”%'å'«°V‚¡©œkla@ªrñ-Ùi”S‡<È„fF™)äyo5’L¾ù½&élôì>ÿCÑCb±ü[“|Õkˆ™gÜ“¶É‡u“sÿZ´8¦N­kÖè‘BTˆ˜3b”tõ°±“H^gpk—¬+Èmöó5ÔB ÂÑqÕæÑÆÛy{ÜÈëæ¦<aäªÝ…eÊ©i”äF7jDzÊ©·z~§]²Û„¯mæ7þ½hSn˜–SNt”Ëe_î‘žEç§%VN3m:棯1s,²¸©‰ ˆ¢èÚFHÍ•»ÔÊ–¸Ï¢>V1#ìLŸE&7 5Þq@ŸZe«>> (ϸͪN™Ñ3•)VÔh$6-J¨%³\LE\£XÒp†™çìEY0‹0“u‘Å H c}›ðÁ]žÞøÆæ·çÕªò÷YD-ó<…‚Y+§²KYl@5ñ¹ñ«øÉ—r’9À©?¯1´i´€G}jEÙ…#qÔTöƒ|
+4Äz$_UµküyQ.îL½ê ß@Ç ·#R¬ÏffU¹g˜Ne·½øúTuBgùÀÌGùA²Á€Tu™s®úÜ{Wéù¤žI}  uz6ò¦åÞ!ZøÝTbóG™EÖµG‚.3B‰wGáC["~ô{=G¶šûç…ÞÓô^ãBì-jj(^ÀÍ4=Ê9²¦=RÕt[¡cw!³àv§ò‰!ïædDÔŠrÂLÅ£$«ØÁÃ*·S%§j ¦¢¿­‰Þ#}#SE” ”œÉ%ã£GZì;á4õ¥q!é†yò€0 -3Á¤TS8XÏé<&‰ë HÕv« Îä–Ô‰ŽUigˆXØèÓIçˆÔN#|[žíŽ@-Ðw~ïgÒ 37ª`Jˆ~ÊiŠ ¦s(E
+×Ïùÿ/oy!;g42œ¦»I¥)¤¼ð­gÝYÅ82뉶šÕˆOý•‡{[¿§²™hhnšèž¤‚:y´ÂYPÐÚZ4l¤±ž²ÐO‰ÌèÔòÎ)_§O¸á0ç<Îí“(G™Kº.Øþ‰4e%×®é–ÐIƒ3M
+“ø¥•­fzb0†±Î jä'°çÊYrõó÷(QÑ ´N2Œ¶ çÜ'‹y1›Ðž[£‡ÚÉû' _”>7gÒ,¦jŒëkîƸÉCåLkTŽ2ÜÆ+ )zÛ5’K ;}¡ª[pxìÁ;¹Os5u“å®}™È
+NÓUÄ«›”pnK÷aSµÑ:}\ _÷•­î0ukž:^¦;Â\ÅLº?,x¼Þ&aZ§ôa¡½k™`^Óݯ°¡¤Þû 0Nà6.˜/jJ÷3 ™GÏB)Ù\[†ÊL3”çBínææ¹Âö(÷‡À8³ä¹É#²ø V}cê¨iÊÁóT@‡g /4ØZe?¡m³”Ä”¸o­ Ê9´ú…P~¤_¾X·Ùb)9Aw±žG¿5-‹÷”ÝeAOŽªðò@”¨ÆêËKlóÄœ6^i¦ê;$Ï¢-ŸJGå³›w8_€rG=Œ5õ<ÒÝl^Ó‰R?ràK-º‚9¥|5ÞþBÁµ‡öjS–jH¶3Ꜭ(rzs—ðÝÀ¥<K“£×Ñ
+e:ø6v â“z÷0ŽQp$‰®¯±æ­
+=
+hZ~r«õ¹.”¶qËa…"G¯/•$9M~IªÕàìyÛvê7'* Î5µ>_âǧ-WHORš÷,Êœk«Î_〠On•³CAjŽ3»\ÉX:Æoµ¶=C­¬äyªä†œlô>†:"Ù¿¥WX:DO‘|æ)Q¹C>w$ûDµf9šévLëÊi‡š´š™ûO_ŸÎü‰‚Î5í¬ <êaiô‹#»Ciœ{k¹fa©càIWoXÞÖ£ByexâXÖP½°£ú‹$\
+endstream
+endobj
+4173 0 obj
+<< /Type /Page /Contents 4174 0 R /Resources 4172 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 4047 0 R >>
endobj
4175 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 458.991 null ] >>
+<< /D [ 4173 0 R /XYZ 78.37 808.885 null ] >>
endobj
4176 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 448.032 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 768.829 null ] >>
endobj
4177 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 437.073 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 757.87 null ] >>
endobj
4178 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 426.115 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 746.912 null ] >>
endobj
4179 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 415.156 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 735.953 null ] >>
endobj
4180 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 404.197 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 724.994 null ] >>
endobj
4181 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 393.238 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 714.035 null ] >>
endobj
4182 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 382.279 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 703.076 null ] >>
endobj
4183 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 371.32 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 692.117 null ] >>
endobj
4184 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 360.361 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 681.158 null ] >>
endobj
4185 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 349.402 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 670.199 null ] >>
endobj
4186 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 338.443 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 659.24 null ] >>
endobj
4187 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 327.484 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 648.281 null ] >>
endobj
4188 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 316.525 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 637.322 null ] >>
endobj
4189 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 305.567 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 626.364 null ] >>
endobj
4190 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 294.608 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 615.405 null ] >>
endobj
4191 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 283.649 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 604.446 null ] >>
endobj
4192 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 272.69 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 593.487 null ] >>
endobj
4193 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 261.731 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 582.528 null ] >>
endobj
4194 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 250.772 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 571.569 null ] >>
endobj
4195 0 obj
-<< /D [ 4145 0 R /XYZ 81.145 239.813 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 560.61 null ] >>
endobj
-309 0 obj
-<< /D [ 4145 0 R /XYZ 79.37 183.439 null ] >>
+4196 0 obj
+<< /D [ 4173 0 R /XYZ 81.145 549.651 null ] >>
endobj
-4144 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F74 337 0 R /F83 414 0 R /F59 346 0 R /F84 425 0 R /F88 635 0 R /F87 2313 0 R /F111 636 0 R /F64 333 0 R /F65 335 0 R >> /ProcSet [ /PDF /Text ] >>
+4197 0 obj
+<< /D [ 4173 0 R /XYZ 81.145 538.692 null ] >>
endobj
4198 0 obj
-<< /Filter /FlateDecode /Length 2168 >>
-stream
-xÚÍËn+'t¿Â?
-‡Ã¤(RÇ•ºÎ®ê¶]õÿ·=<˜ñ Îu¯¼9a˜ó~ƒ<ýs’§ßœ¿~üv%<)%¼1Êž¾þþ¡ø<©“õBÛ“%%$©Ó׿§?_¥„w)õUJõ!%^øï3? %ÁÛ‹¶&ìÐü—zÍËþ-þmá­®…/e»•Ë’¿åǨ„`LŒÊ8Þ©ËJ!®uÏ{ÚcýÛ__0oÊœ¼ðÌãš5Ad
-kø‘¨`Z_ÐÙÀÊ9ÓqNOƒ/A·¸])
-}ìöt“xï_“v‹fõµ¬™êº/0k)zC”KØ Ú W.iW€»X’#e‹ m‹°N®˜v™8X˜¬,훘––Ml€ 54V\9:{#ÚÈDp|¹e&‰µ)ƒHú(±ÈR}T¹4{Z;Îú‘½L;Š&£h\ûý²ºeLÊ kª§µúÕZßa_y÷„}¥ñ{ÙaÊÞå²w¥Õ(¿ðGÁfÆ‹Y¥íÁ¬Ü„Y9ËÉÂì$}8;°%/@­¡¸‚{/)1á <QR"ÜIJKâ:NJdA ¡jTneT”´cí'"e…aMÔ×]š'Éf0@Ø6·
-ÐôX¹ÒŒš8½Ãˆu2$kÆ»g
-Éæ8$sØžÉ
-H¸íA}H>öЂŽp)‡ÌîB… -ç*øh ­±z”Ë7¥ø¥£^A ’~¤`Ò:ûïì,ý%rÕ°+û
-¨+vmÌ8\Á=S/ê&lÌLؘ!.ª¤®š8gOgÌð±oMR ­F
-!:1ì7µ# Þ”8:’i‚fÌúˆÕtÇÖÍ^µm)¥D+ôåZ:ãÄs¥,̶ð¸SÙ³å¬Wg…$º§Ð%Õ õÜqX4aâJ#&C³±Øéé'Švb2af
-‚0ðÇ[ཱdV0Ç‘kÃ^û N8Û;ÍpÄЕò‰ê±‹Œ«å˜7ºý}£h0N8øIÞø¡¬Ý|è‹¡Ç«9(
-#ýHåÁ¡*Ü#x«½u~aÈ­h,OUGââ_i^âjW¢ÊÍ’XÎ؇ž*0Û<°ÅãOøG˜;="ìëÞ¹QJœ¦¿ bw·fßE ­p…ý—»ÿb*¨Š¨;êo¸ý»‘úm#a1ûís.p¦¹¯DM?‡çú¶ÜÇqåzOâkãÞI°\ð¸¾*µzÀ%ø‘ÌïŠîÛ7YÆá
-[¥¼â)†åJ'‰£=îŠWÒªY¦é‹îZXÜÓÞ,0r¹E¸ýœ0}ßÎûÀáë²ÇâxᩪëÜ4ÇM,(æ»i0ʇÛôðƒÑnq%ÝÀäâÅ̓ÄϯH ú†ýLvMãWe YÆß #ÞIN<ûsbÊQæ<Ýàinð©ëì
-"tßáÝ´"§|ïWrÝ6böª‡¦Ææ.Weª í!ËsÝ®ýˆåWåC+±?ÐI5—;Všì¥Òé-ü¤³¢tB»•vçš-e4“õ ÷c Ìß™ºG¯4
-òpÛƒÚÔ£{ïoÜ-9ïF<w^8UäZ¡|óæ,íÜ lÇÙ]õ‘ªî¾î¦]Á^âîs{´Ô).á~¯_™õýü¦» Y¨T6×ušý:gïÌiÂÑ*¤‚—œ$è⯭Æ,Îúz&ñùõã?ƒxUÏ
-endstream
-endobj
-4197 0 obj
-<< /Type /Page /Contents 4198 0 R /Resources 4196 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 4143 0 R >>
+<< /D [ 4173 0 R /XYZ 81.145 527.733 null ] >>
endobj
4199 0 obj
-<< /D [ 4197 0 R /XYZ 78.37 808.885 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 516.775 null ] >>
endobj
4200 0 obj
-<< /D [ 4197 0 R /XYZ 79.37 775.009 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 505.816 null ] >>
endobj
4201 0 obj
-<< /D [ 4197 0 R /XYZ 79.37 704.799 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 494.857 null ] >>
endobj
4202 0 obj
-<< /D [ 4197 0 R /XYZ 79.37 646.545 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 483.898 null ] >>
endobj
4203 0 obj
-<< /D [ 4197 0 R /XYZ 79.37 600.246 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 472.939 null ] >>
endobj
4204 0 obj
-<< /D [ 4197 0 R /XYZ 79.37 553.948 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 461.98 null ] >>
endobj
4205 0 obj
-<< /D [ 4197 0 R /XYZ 79.37 507.649 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 451.021 null ] >>
endobj
4206 0 obj
-<< /D [ 4197 0 R /XYZ 79.37 425.484 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 440.062 null ] >>
endobj
4207 0 obj
-<< /D [ 4197 0 R /XYZ 79.37 355.275 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 429.103 null ] >>
endobj
4208 0 obj
-<< /D [ 4197 0 R /XYZ 79.37 273.111 null ] >>
+<< /D [ 4173 0 R /XYZ 81.145 418.144 null ] >>
endobj
4209 0 obj
-<< /D [ 4197 0 R /XYZ 79.37 167.036 null ] >>
-endobj
-4196 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F64 333 0 R /F15 334 0 R /F74 337 0 R /F65 335 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
-endobj
-4228 0 obj
-<< /Filter /FlateDecode /Length 3835 >>
-stream
-xÚÍËŽ#¹E÷ýú¡ù~
-ó­ó¼]×ÃRØ»L36ýììYºõÑ ²!*ãl‘L¡¶žj¹[;еw²bm³ÙÞÙWõ•L®g7MûÀ]¨•©2 Â/¤åZ\Ô!&«|ˆ_ªs™<B÷Ú1S+õ:7ƒì¹RR¶¸¹tp½W!¸_hã;0‚A• ékGp*Ó®Nsi ¯±ºö¼[}¡=ZEcŽJïªubW±ÊîÛzæƒfIxÒ³EMµØ¹–CçWVÛó^¯¾èwïÕçòÏZ9Ú…'-Ô^Å2ޗбIÜ`MCàû²« ¹6iqô±­ E ÍàŽ?Ûï]‘{p÷pšD2eªqXÓ¦òÚÍbƒ½‹i7Äú-ÔeÑåf«X¶,›ã ’ÉÙe[{8
-É+çý¯äêî@*󸺂*>÷´ÃH(ÁöÅ9ZsÑ Áˆá@h±pa­]C”hùœï¬™b¾:³íRc:¬‘-jq$Ç£²:üÇZWeò÷aÖ¯@[’¢3·ßÆ“ 0=ìKç’Ê4§Ò6có '_pjd 
-~7~gNÍ‹÷Ü륭ÞBN.ÐÚ
-%µ¯åî<x§Jh>Ýàkô*ŸKF´Ì$~/6×·íÿk]T–ï!mXûTr*–h;ú¨m(íXß[^<ÄÇ>œnË#¯8x¹¡l
-»~ë \–
-§F¶§~›ìò0>G;kmdõ:+Z¶ý·ñ:½Eâ¾}ÉsbQ)ji{+g }š*<H烳Ššô¥ÔT¦ä©²†z¢ÿ¯ŠÊí£U¨ó²´ÐÁ|Ê°w¤²Ë«}Ž,•ÙÕéW£yI2Ú'oû­;ÍñýîTÌ_ˆ”¬´ÌóܬêTdrH¶áó…(S ¥Ì%M-áí…óöLÚ®yçÚžey™1³õãû}å ­çîµ›Žñ²̺ä·/VŸ¢
-Öí:ó5… Æ)ãâ\ÚñªÓYÛWˆ¡XÁ;ÙU’õçý !uÈôbžk²éfôÊÔI±ùAÝ>öÙͶêäÒ_ÚíT”…²~¾Žgûü¸,¤Džd÷5}G½úóV’L¨³’^ì7G²ß÷[ó[»9[$'?sÄ{£¼Ý¿,º±¶ÛW­ÝÜçÒfÖ8ñŸ‡ï ¥uÉŽÛͲ,
-ZË—Mäë}ŒjÙv·"·Ý„ÞÛ²ËFôf;[¯ÝgË}Ý•ìr)À¡ŠÖÝ!ŸÚ3hàE6ákÊC)㯓M dw@½/*'‡êý°}p¶SëT¤õ2•+qIÏ38f܊ú&¯y}´Î ™3”'”ÙTPƒV%§/µß=e¿ UÒw=x¨ž²˜bò—FkS™ËzçS‰4lVîW÷¾årõ¸6/FÏRí~¶b3Ë[Ëæᕈý`ï0¢Ò4@/wØci ð!êÝOKI^tg[>î$1ºã-v†ÇÁ@°”2—¹¶M3í!<Þ­xœ‹ëE3ú`¿$l×ûR4xéÍœNÊÚ°kòtx´ µÞ‡Äõµ«}ˆH/æ}§~\D%IÅâŽìê­ÍÍ_?a‹·^¥˜ž´…‚åÓ‘)}vyÒsfr„~7Q@‡Î+ÄxE•ÖùÁ‚§¬|*¸Lñ•¿P¨€S²`PÁŤ’îQPÌëŒVÒ±Äɼ‚ÖÝ©|<½ó®ž'å¿ž™8"7bš’ÆnüèO¢õÏ»Çzpb|ØÕü¢{´¨'ïæâÆ1l†‹¦ˆÞÕäKF[š{ÖÌÇ;—îÑ» èg×d¿·
-9Ÿ¬¢ß•vá~²¡°ÅÙ +™“&$a®~^´¥áhÕ#þåñ<®a,U9—|qFHÑewæluá"ëwyÚg«®Jf»â\+/¹ê¹D4’w^¹`ŽìyqH,µß™Ó7¨ìû¯K¨«Ý¾c^ܨòº(«w3-Ùé`é¤}OºIŸ(½¡4c¶ýE7ªñÆ J<ÚÿpÞ©TÖ`}Š/7ûõ1ÚƒÅn´Êë~v¿ÓôѤy•¿õ÷-ÿýóÖþñ?¨&kÏÝŠÍ™ÖÔ*…Ôé¦ØÀ—Æ$ÔŒk”Ð7¿2 j€æË «Ï#ÑJG›;™Gž’ªêyïæy³ÊÿzEq˜(O˜¶«2Í“ïÈ}>Ô‹&lÚzŒfpÞä„y—¶÷»žµþ­ÉýÝ­›l§ÆOfÜO§Á‰+Ö^ÙZŽ#m²ë´}_·Œ¶‹Q|_q1ôs“oŸ&»CÃø¤è²aÖêÞ0ÄëfO¢"J»Hº“PÚ{‰iJ^]*(]c9‹Ó”Ɇÿ‹Î tvÊe‹ÒÅPã`:“Ù(ít$»=JWç™Ñiâ¬]"/”¦|0£Ó¤ôG‡ŽŽ£õêà±t¡FŒè4q4©2g=:M\ŠÊtš¸ì)SišT¹ÀÓ„’õèÑiâu"»Ñiâ)4&ž&U.0í4Ù`:“Ýè4ñ>’ÝèÈ{šT0)I¦)~Õ0]é€ÎOsªht–øbÉnt–T1-vG_F]<I³Lr³x.áJOÙ¦YÂ;œeC{Æc½¹®cÇ«úŒ8®ÄV´bÛ€+­ÀhÑ
-f­€è®-ZÑ¢ ÍZÑ¢-ZÑ¢ÍZ¬-ZÑ¢-ZÒ¬ݵ£E+0Z´£E+@šµ£E+0ºiÆŠV€4kF‹V`´hF‹V@t׊ÉçÃZ±ì'ì­%lZ1î{o¯*öËaËêM–Õ6|äzàöËë™ætçqÿ¥¿Í-‡¹È¶W¹F‹¾`´è H³¾@t׌}ÁhÑf}ÁhÑŒ}ÁhÑŒf}aÖŒ}ÁhÑŒ}iÖˆîú‚Ñ¢/-ú‚Ñ¢/ Íú‚Ñ¢/ÝôcE_@šõ£E_0Zô£E_ ºëˤ¨¾˜’”»\¤~•ñ\_øêÕxBP3‡ä_ÉP¦ËBøÓ“Ö3Ï>5å³c´xvfÏÒìÙQºyvfÏÒìÙAš=;H7ÏŽÂͳƒ4{vfÏÒìÙQºyvŒÏÒìÙAš=;H³gGéæÙAš=;H/ždÙ³£tóì Íž¤Ù³ƒ4{vŒϾóÐ/Ü
-­i™K)‹oçOu¯)GcÝ/W/ÿüñؾ¢×N˜ê¡¿+k1»¦½.\ þZ=zþ[ͧ
-±iÝ•@`0ë‹<@°¨‹8@0kƲ4@°(‹0@°è³, pWQ€`ÑIÀ`VA€à¦*r€Á¬,b
-0Z¢Œæ°
-F‹¤`´H
-H³¤@t—ŒIÁh‘fIÁh‘ŒIÁh‘ŒfIa–ŒIÁh‘ŒIi–ˆî’‚Ñ")-’‚Ñ") Í’‚Ñ")Ý$cER@š%£ER0Z$£ER ºKÊ$ ƒ™º¬ô¿‰Pÿ
-endstream
-endobj
-4227 0 obj
-<< /Type /Page /Contents 4228 0 R /Resources 4226 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 4143 0 R /Annots 4237 0 R >>
+<< /D [ 4173 0 R /XYZ 81.145 407.186 null ] >>
endobj
-4237 0 obj
-[ 4210 0 R 4211 0 R 4212 0 R 4213 0 R 4214 0 R 4215 0 R 4216 0 R 4217 0 R 4218 0 R 4219 0 R 4220 0 R 4221 0 R 4222 0 R 4223 0 R 4224 0 R ]
+309 0 obj
+<< /D [ 4173 0 R /XYZ 79.37 350.812 null ] >>
endobj
4210 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 287.863 168.645 296.75 ]/A << /S /GoTo /D (section.0.1) >> >>
+<< /D [ 4173 0 R /XYZ 79.37 242.547 null ] >>
endobj
4211 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 265.945 162.18 274.912 ]/A << /S /GoTo /D (section.0.2) >> >>
+<< /D [ 4173 0 R /XYZ 79.37 196.248 null ] >>
endobj
4212 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 242.085 199.908 253.053 ]/A << /S /GoTo /D (section.0.3) >> >>
+<< /D [ 4173 0 R /XYZ 79.37 126.039 null ] >>
+endobj
+4172 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F59 346 0 R /F84 425 0 R /F88 643 0 R /F87 2310 0 R /F111 644 0 R /F64 333 0 R /F15 334 0 R /F74 337 0 R /F83 412 0 R /F65 335 0 R /F81 377 0 R >> /ProcSet [ /PDF /Text ] >>
+endobj
+4230 0 obj
+<< /Filter /FlateDecode /Length 3450 >>
+stream
+xÚ͹n$9†ý~
+½@sy€ @%sÐÞbÝk}cƒd3“yÔ/uí †4U_%ïø‚ÌT~úëI?ýþíöãÛ?>¢2F•Lzúñïo†ÞÑOæ)åÒSŠFéhž~üçéŸÏZÛW­Ý‡ÖæMkÿN¿ßèŸÕ:Ú—ï.…J8úÍ<óËå¥ýžìËx­þóï‚'½¼u½½Kÿ‚é,ŽTTÈô3È+R û±cüË¿~üAm3ᩨ-µqß4oUŒAšæßz-R-ѹúJ|±™ë–b«K¿jòGW5Ö©˜ý|ÝÚ¢àéj¹·,ú©—Öß[ŸÜ:W߯¥Õ×å3­«íªÇí²Î¨¨Ë\ƒU?]Õß­JNhý#e}¯–PG¯ý,ëä¯ç˜ñª”_hŠ¹ L±
+ŨŸutE*Ù¾]O&í”3óÚ8ðHõkeêØ´¾ç÷âoTÀ­3ö£6ý²²&¥iæÎÕçöÊÇ]]­ïcWërTïúúýz÷×ڜʗmp&©hÒQb[a²ªÛk믯î¤{ݤ¼ú3ddÞƘU1¿ÔÄ-÷'®ËÈÄ¥X¬CcãõT6E¥PækŽ¸Qz·Õ˜’¸¥2WƼ½kUöùWrÔ+0‡º¶‚±8÷¦µÙ CBÇ!+¯Í|ÍõÜo­áøíÿ­¾Ž!TáàwW¯}ä’ÔVƺ×ß>/«½Ú¯þƒ]å•Í»þ©1§Ø9FêÅ­ÓÈ]ÆTÞ—âe2õxï±$=óúh¯JJ´i‘嶚ñ–çDë…Í,i¯Ègļ•°·ùs4‘{¹ñ¼‡%wH½­ÛùŠU¾¤Ñ_ c=­ðÝÅjÓ,²ãñ™|×Inì®)§æf
+AÞ.>áì}p=íyù>¢\í›Z¥Ö'y|0oM|ïÿ݃ŽP2òž]=F±¾k>÷8w‚·«ÞÏô¾—ëHX‹Ë•ÝªŠ#lµ·Ú”ù8ÛÔ+ä±ÓCƒýtÍ!ó²tæ² zð?Ÿ|÷_U¬3p[*¦qZb¤qû+éã䟯€>™1˜øØ‘Ý^óÿ<²ÜCëvÙ…n4ØÚA}â*Ý“…j,¸ë¶¹¤¬ss9–ƒ/’Â
+¶~}¢õë~¥#Š`õ{æ=%*¸ðØ‘Ú^s›†ß%Gûô<_¡ººöŘÝ'凢l0󧜲YK+ÙÇ]+×þ/:r{MqÍ9ŸÎŠ±4©íØ‘Ö”‡e>ú‰ÒwòÕAr|^% ­í2÷VqÐü,}'—“¨œÞ%·‘wz,’´qIGVUÉýJ­à9s©™&_hS y“Š8ÎdhÙŒI]L½E÷ú´_-„BFøøX7SB?³æx¢Hž&õ㜚Ëô·Q3Û[³¾íX®¦2«‰*Æò™t7šÕù^¾ë$.q.)D44ºœiÅú_(4&à„" )Eê›|˜XÿÙqR1ì®9Ÿ¾¶Ù÷eþÔEˆîŽ³£ü\Â&Ÿïµžw“íÕ¶hEïŸ;•¶!«l²mô/òèFaÿГk_S]æZÚ÷˶Õul~DÛÆ›ßk×ÐÑÜQF?N±Ô~ã¢*ÚÏW·c3'Qå4©sžbDÎç)ò§R…Ds&Î×\{à¨?±>êrvsÛÌ;Ri'ëß½oËæ]nS\/‘•3~Wúß¾Dè§ïù”tõ¦ö'K'ÖñÏsí'‰ó*¹Ãc]›š—K¯ûx·HfŸ—cŠm’¢yžÒ̵Å?ï<~}'Á)cË\ͳÑKªÈ›ŸVw>`W› ¥~WÚ¨ù(‡óžÞìšéôîXßùªù¿–SÏþ‰uÎÒ™ô¾$^a\y„å¥s½ÝžöϯÏýlöÏ “x’ÅUÄÃu[mW±@¦ïñ„¡Í~Jùá÷H§ëÊRrëS0½, YæµÇïÞËŠÊû²+áÚ$¦ÔíBœ?%Ç’rñ…úXO‘Ͳ:íV¬M?×MenðþÎÑþÎD3—
+»X»0­ ?]׺w«™íTÚñ$¦ä"[ûX5n¯yÙ*9Û¶ë›-w&qQÆ•¹”¿Ë‡”NEëæÒ¸H¥;I‡¹t¦…¨tvGcð“‹Õë¬\Þîf³å™Öî7$6eªÕæn0?áÌ*@¯ÿ;®oÉü÷¯§þËŸ¿SITøéÖÇRûM^õ´‰âWs[¦B\vkÎr'Ïgh~HŠ©&t\Ý©zäS†Oëa6WÏ›e%Huüúñ…OTmWT5cͽñ©×Qµø6–Æw—ÝúÎeû¯Í}µìVö··Þ¿5í[d\V~ªÆítœ„Ê–m½Ž®ÆKk–ÓG£m«ÍÉ­ ‘nŽ_›v¹©]-(í²ÖP>¼jö0Å6Š L"ïZz“j#m18ФÂQ·Ä„Ih-RPÑÎŽ ÂÅB
+gª2;M çA¸ÆË N*sÚ £pi7ç1Ø%ª38(΂P8¸¦j ¦y”a¶€SÃ%ÚÂpj¸ì•ñ(Ló(tj”Bu§†×‰ê N oÕœ¾>TPØQ¶ã
+S‚PÀ©áiGn<8ÜžæŠF£b0(\ÚS?œ’2œž¦QÑàÌð´Áª \=Yì ßu¼hÑ䬼 ³["Ò½(á-Ñ°òdÍ0 ˜ÿÄëÛÙ›³‡þ°
+v÷èÊSîè
+w3€4«¤Ù Ír@énŒ=€4û¤Y ͆@é®fG€t“Ȳ%Pºk¤Ù Í¢
+ƲQ X„Áâ`0Û‡L X\Á¢“`0‹‚Å#Ü5¡b f‰@°8‚E!,Aà!­`D¯‚Ùí5ê✠„ï•Õgòêd6ù¯ì@¦çô…ðG¬^GïmSî…oˆñ£%€c´DpæŽÑÃ1Z‚8FKÇhã Ìq£%c´DrŒ–PÒË!zsŒ–hŽÑÎ1Zâ9Hs@Çh‰èÝC:ÆJLiê-Q£%¬c´Äuˆ}ŽÐ_ºçF3_…寋Z|ïwŽêYR\ÝÔq¹FùÏßØÚôµ{C¦MÍåæhÙݺw|³©yŒ>ÿœ÷©"¶Í»§fE`´(£E-ŠÀhV³"0ZÑ¢ŒE€4+¢‡"0ZÑ¢ŒE€4+£Eݱ¢fE`´(£E-Š€è¡ˆ9V¢É¿¡µ”ÓcW7Ž“ÿú÷yÿ÷GU4É«¼+é¤=&Së­Aé¢Él¦³2Ö´ÕªíQÚ8ªw@i~Ú
+ Í™FK¦€Ñ=SÀXÉ@š3Œ–L£%SÀhÉ zd
+[š¿gì"S0IÙj
+]ÉÙ}¦°Ú•™öŒn}Ä>˜Ý–ñxv˜K\Ks[‘{ÒÄh‘&F‹41Z¤‰Ñ"MîÒÄ`‘&F‹41Z¤ Ò,MˆÒÄh‘&F‹4Aš¥‰Ñ"MŒib´H£Yš ÌÒÄh‘&F‹41Z¤ Ò,MˆÒÄh‘&F‹41Z¤ Ò,MŒibt—&ÆŠ4Aš¥‰Ñ"MŒib´H¢‡4·4,ÍâUJñÌ™m—Ýé^å[ ú_©l¿¢ébǽú¦¤íiåÉw |q/6Ø6èŽ @¸»
+À`6
+endstream
+endobj
+4229 0 obj
+<< /Type /Page /Contents 4230 0 R /Resources 4228 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 4047 0 R /Annots 4240 0 R >>
+endobj
+4240 0 obj
+[ 4213 0 R 4214 0 R 4215 0 R 4216 0 R 4217 0 R 4218 0 R 4219 0 R 4220 0 R 4221 0 R 4222 0 R 4223 0 R 4224 0 R 4225 0 R 4226 0 R ]
endobj
4213 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 230.08 217.99 241.039 ]/A << /S /GoTo /D (subsection.0.3.1) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 255.115 168.645 264.002 ]/A << /S /GoTo /D (section.0.1) >> >>
endobj
4214 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 218.124 271.838 229.193 ]/A << /S /GoTo /D (subsection.0.3.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 233.197 162.18 242.164 ]/A << /S /GoTo /D (section.0.2) >> >>
endobj
4215 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 206.289 260.909 217.128 ]/A << /S /GoTo /D (subsection.0.3.3) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 209.337 199.908 220.306 ]/A << /S /GoTo /D (section.0.3) >> >>
endobj
4216 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 193.776 282.11 205.731 ]/A << /S /GoTo /D (subsection.0.3.4) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 197.332 217.99 208.291 ]/A << /S /GoTo /D (subsection.0.3.1) >> >>
endobj
4217 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 174.239 177.731 183.285 ]/A << /S /GoTo /D (section.0.4) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 185.377 271.838 196.445 ]/A << /S /GoTo /D (subsection.0.3.2) >> >>
endobj
4218 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 159.903 307.764 171.858 ]/A << /S /GoTo /D (subsection.0.4.1) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 173.541 260.909 184.38 ]/A << /S /GoTo /D (subsection.0.3.3) >> >>
endobj
4219 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 148.396 172.561 159.345 ]/A << /S /GoTo /D (subsection.0.4.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 161.028 282.11 172.983 ]/A << /S /GoTo /D (subsection.0.3.4) >> >>
endobj
4220 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 136.441 214.364 147.499 ]/A << /S /GoTo /D (subsubsection.0.4.2.1) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 141.491 177.731 150.537 ]/A << /S /GoTo /D (section.0.4) >> >>
endobj
4221 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 124.486 276.302 135.544 ]/A << /S /GoTo /D (subsubsection.0.4.2.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 127.155 307.764 139.11 ]/A << /S /GoTo /D (subsection.0.4.1) >> >>
endobj
4222 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 112.53 251.943 123.479 ]/A << /S /GoTo /D (subsubsection.0.4.2.3) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 115.648 172.561 126.597 ]/A << /S /GoTo /D (subsection.0.4.2) >> >>
endobj
4223 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 102.398 258.917 111.634 ]/A << /S /GoTo /D (subsection.0.4.3) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 103.693 214.364 114.752 ]/A << /S /GoTo /D (subsubsection.0.4.2.1) >> >>
endobj
4224 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 78.697 378.259 89.666 ]/A << /S /GoTo /D (section.0.5) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 91.738 276.302 102.796 ]/A << /S /GoTo /D (subsubsection.0.4.2.2) >> >>
endobj
-4229 0 obj
-<< /D [ 4227 0 R /XYZ 78.37 808.885 null ] >>
+4225 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 79.783 251.943 90.732 ]/A << /S /GoTo /D (subsubsection.0.4.2.3) >> >>
endobj
-4230 0 obj
-<< /D [ 4227 0 R /XYZ 79.37 775.009 null ] >>
+4226 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 69.651 258.917 78.886 ]/A << /S /GoTo /D (subsection.0.4.3) >> >>
endobj
4231 0 obj
-<< /D [ 4227 0 R /XYZ 79.37 704.799 null ] >>
+<< /D [ 4229 0 R /XYZ 78.37 808.885 null ] >>
endobj
4232 0 obj
-<< /D [ 4227 0 R /XYZ 79.37 658.501 null ] >>
+<< /D [ 4229 0 R /XYZ 79.37 775.009 null ] >>
endobj
4233 0 obj
-<< /D [ 4227 0 R /XYZ 79.37 588.291 null ] >>
+<< /D [ 4229 0 R /XYZ 79.37 728.938 null ] >>
endobj
4234 0 obj
-<< /D [ 4227 0 R /XYZ 79.37 482.217 null ] >>
+<< /D [ 4229 0 R /XYZ 79.37 682.867 null ] >>
endobj
4235 0 obj
-<< /D [ 4227 0 R /XYZ 79.37 400.052 null ] >>
-endobj
-313 0 obj
-<< /D [ 4227 0 R /XYZ 79.37 343.689 null ] >>
+<< /D [ 4229 0 R /XYZ 79.37 636.796 null ] >>
endobj
4236 0 obj
-<< /D [ 4227 0 R /XYZ 79.37 328.77 null ] >>
+<< /D [ 4229 0 R /XYZ 79.37 554.86 null ] >>
endobj
-4226 0 obj
-<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F64 333 0 R /F15 334 0 R /F74 337 0 R /F81 377 0 R /F65 335 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
+4237 0 obj
+<< /D [ 4229 0 R /XYZ 79.37 484.878 null ] >>
endobj
-4295 0 obj
-<< /Filter /FlateDecode /Length 7667 >>
-stream
-xÚåÝÏŽãV~Gñ½Ÿ¢_Àñ¯$`Ð@•»{€,ï‚l3«lòþ‹¼ßs%R%òT ƒíö§»¥¶ô;÷RÙ|;Oÿû¯~k–¿ù×üöþçoûÕ¶ßn§ÛØŽý·?ÿã·òïšo—Û©»|»ŒÍé<6ßþüÏoÿö÷óy¾ÿÞÜÚaúÛæý{×NmÏ—ó÷±Ÿìó¹ÿ1ýØûùܵó¿ûþ{wí¦Ó]ÊÌb¼MÿŸÔx.?6¶ßÿýÏùíüíŸÓoüú
-Ó(…I”Â)”³ ”ÂôIaò¤0ur8q2¸¶IaÒ¤0eR˜09œ.)L–.UR”(9œ&)L’¦H
-$ƒkÖ¸]z"wƒçæÔ^‡ç=½4¥As‹ºƒO§F-oçDû÷ò÷m÷ý÷åojÔÚýÍ×ú‘m¾œ&fNS3©KΦgN4§)šÔIšÒµiN5§©šÔÉšÓtÍiÂæ4es:i“8msš¸9MÝœ&oR§oJ×À9Máœ&qNÓ8©9§©œÓ%sÎÒ9©:§)Ó¤ÎiZ§tÝF¦vãõvš&ã‹Ø=úü8vË?ÍÇZûû?Ë!Ðk ßû}ëÕßUïÒ¤õc;H’ÄK‘œMNNŽ$.5R˜9œ9œI\JäpBäp:äp2äp©´%B§A'A§@—
-Óœ VÉÉñ¾qz&óçTÛæ¼Õ~ÝÏÒšå,—_÷-Uùçl¤nÛ¬÷Ú# ®ÎéÛrk×>lÄòó/?Ž{DbÖü 1§©ŒÓdFêtFé§)Ó¤Fê´Æibã4µqšÜ8ÞHœà8Mqœ&9NÓ©¥kuœ&;NÓ§ Ô)Ó¤ÇéÒg‰Ô©ÓäÇiúã4Rºh£ç>Ül‚Æá4½ä7š~zýÈé-ßmÈ¡º¹Bœü¿ì‚ÚÒ˜ûWæž ÿÔÅ´Ùý }=Ô÷ñO˜Ï,Y¶I×ïW~K·ßŒÕ“8J†ÂÃáÃàÚ …É…ÂÔÂáÄBaZ¡0©P˜R(œP8›N(L&¦
- ‡Óƒk"¦
-…éƒÃɃÂÔAáEiƒÃIƒÂ”Aa 0]0¸faç*\í±°é³ûç,<}ò3^Kê4o~u/g8g ¾ß·&ýûófdÊEó«ß߀¬àÁÄabâ45qšœHž(]ƒâ4Eqš¤H¦8MTœ¦*N“§Ó‰§)‹Ó¤ÅiÚ"uâ¢t­‹ÓäÅiúâ4‘:…qšÄ8]ã,‘‘:•qšÌ8Mgœ&4J×Òlô§RÓ7§á|{•š‡Ï]žR³úå2®ô~ÿîõrÜìüײCÖö¨ NÓ©Ó¥kœ¦ NÓ©Ó§iƒÓ´ÁiÚàtÚ qÚà4mpš68M¤N”®mpš68Mœ¦ R§ NÓ§Kœ¥ R§ NÓ§iƒÓ´AéÚ†n—«jÈ6LCc^nC–ÏI>ß>ÿàû¹ õï_´â~¹‹ýN0Ë×üh–+]g¹ÓÌr§™åRg–;Í,wšYî4³ÜéÌr‰3Ëf–;Í,wšY.uf¹Òu–;Í,wšYî4³\êÌr§™åN—Yî,³\êÌr§™åN3Ëf–+]gùFj–On/×ùË'/gù»ù âqÆï|ê°sl©-Z?У£EN³#pšŠHŠ(]+â4qšŠHŠ8MEœ¦"NS§S‰S§©ˆÓTÄi*"u*¢t­ˆÓTÄi*â4‘:qšŠ8]*â,‘:qšŠ8MEœ¦"J׊lô§*2ýóëòUE®ÿkY¶ ›ÃL‡Û‚õ£?èJ×î4ÝiºÔèN3Ðf ;Í@w:]â t§èN3Ðf K®tèN3Ðf ;Í@—:ÝiºÓe ;Ë@—:ÝiºÓ t§èJ×¾ÑóÔìåùGí;×çmÁµž€Ôæ»îe\—Ñ}9ß¿ó^.­úx‚ëý[ðþ¸BÍ{9‰v™ÚíãiKü>KÞ9vo§°yì;©³S:a±º„ÅiÂ"uÂ"uÂbu ‹Ô ‹Ô ‹Ô ‹Ô%,—°H°H°H°X]Ââ4a‘:a‘:a‘:a±º„Eê„Eê%,Ò&,V—°H°H°H°8MX¶zžÐÜ) ×ætyþ>_w}:…©ç+ŠÞ¿Ó7ä"+íeuk½XJÛì¹8Ë|‰•%Js|Æ$éú!¾¸>ijhˆÛú»%WùwcÙxÔnïWBÍ…×^mB˜Fë?—£iä4ÓÈi¦‘ÓL#©3”®ÓÈi¦‘ÓL#§™FRg9Í4rºL#g™FRg9Í4ršiä4ÓHé:6úSÓhzî—ËõÕ4z8Ë¥}Ûûäñã 6½Xº>^ªÿZþ_gL{Ÿ1—ð_-žçâóM
-NS©S¥kœ¦
-NS§©‚Ô©‚ÓTÁéRg©‚Ô©‚ÓTÁiªà4UPºVa­—*¼Ù*Lÿ}»é¹o«pÿ
-ìø·|®7fn?ºÙЯ§7÷ »ß›lÿsªõ9úœJêl¾œfóå4›/§Ù|9ÍæKê²ùr˜Í—ÓdÖi2+u2«tͬÓdÖi2+u2ë4™ušÌ:MfNf%Nf&³N“Y§É¬ÔɬÒ5³N“Y§É¬ÓdVêdÖi2ëtɬ³dVêdÖi2ë4™ušÌ*]3»Ösf»¯ÀÓŸ§ÿ~×z*Pÿ³žæ²ºpÐõac´œ³Ù}òŸå6ko÷ÓMòÉÔò+/_0¾n?¿Z}¨}ü8»¸+Mì»wwJÎú`ù£¼~ñ”œî6žúözÿÃ|:%烫1í>üº¢éÊ9œ;_1a¥±y0+ ©³Ò:+ ©³Ò°zYiHœ•†ÔYiH•†Õe¥á4+ ©³Ò:+ «ËJCê¬4¤ÎJCê¬4¤.+ ‹ËJCê¬4¤ÎJCê¬4¬.+ §YiH•†ÔYiH•†Õe¥!uVR/+ i³Ò°º¬4¤ÎJCê¬4¤ÎJÃiV½›Ç§N¯¿tÛ>œóåžË8 Üïoº7ä(…N“B§I¡Ó¤Pê’B‡I¡Ó¤ÐiR(uR¨tM¡Ó¤ÐiR(uRè4)tš:M
-N
-%N
-&…N“B§I¡ÔI¡Ò5…N“B§I¡Ó¤Pê¤ÐiRètI¡³¤Pê¤ÐiRè4)tš*]S¸Ö˱íÁ¦ðÒž†æigøpâÐWSؾÕ(^Zc¾ŽÎ-ÿ÷ã´~Gq’ºÄÉaâä4qrš8I8)]ãä4qrš8I89Mœœ&NN'§'‰'§‰“ÓÄÉiâ$uâ¤t“ÓÄÉiâä4q’:qrš89]âä,q’:qrš89Mœœ&NJ×8­õ'{íáùÍ7ŒOû´‡Óq¾§qþÚæÛü=…Ý\7ààW«³÷sš½ŸÓìýœ&¯N“W©K^&¯N“W§É«ÔÉ«Ò5¯N“W§É«ÔÉ«ÓäÕiòê4yu:y•8yuš¼:M^&¯R'¯J×¼:M^&¯N“W©“W§É«Ó%¯Î’W©“W§É«ÓäÕiòªtÍëZ/‡A;›×~z?Ÿö~ç5}-¯õ¿œãºüõ½^ºñåmXˆÝúÅÎibç4±“ºÄÎabç4±sšØIØ)]cç4±sšØIØ9Mìœ&vN;§;‰;§‰ÓÄÎib'ub§tÓÄÎibç4±“:±sšØ9]bç,±“:±sšØ9Mìœ&vJ×Ø­õ;}!×njË8´O:‡/Çnuo.ôƒ«Ú¬uvœöûx]áù™ËÏi_\cø²›ÚÝY·~²G³ÎifÓ™ugÖ9ͬsšYç4³NêÌ:¥ë¬sšYç4³ÎifÔ™uN3ëœ.³ÎYfÔ™uN3ëœfÖ9ͬSºÎºµß¾|)´y)vé†ÇË__æ#hÝpþ{®d¾¹XØÃ59ræãG×IÝ={qó›ÎÿËëÎíér¹­ŸÀý Æ¡|¿½Ù\CäüpIîåÞ ?îw’?x\ºuûï_ºÕi®P&5"æ@¤Ô9é4{3§Ù›9ÍÞÌiöfR—½™ÃìÍœfoæ4{3©³7SºîÍœfoæ4{3©³7sšõŠÓ¬Wœf½âtÖ+g½â4ë§Y¯8ÍzEê¬W”®ë§Y¯8ÍzÅiÖ+Rg½â4ë§ËzÅYÖ+Rg½â4ë§Y¯8ÍzEéº^YëÝàoßN½½¶ýGŸÏÉ^mÏ.åD•û.¸ËÚý^p‡*kw—?u9!—?$aûŒö“`uI‚Ó$Aê$Aê$Áê’©“©“©“©K,.I:I:I:I°º$Ái’ u’ u’ u’`uI‚ÔI‚ÔK¤M¬.I:I:I:Ipš$lôœ„ã+±äÆcíevãíã$Ü÷~c¹%ßÏq{¼wôùá-³@LÚ\‡º½±wØ>òý½ƒÔ„Bê„Bé
-§ …Ó„Bê„ÂiBá4¡pšP8PHœP8M(œ&N
-©
-¥k(œ&N
-§ …Ô …Ó„Âé
-g …Ô …Ó„ÂiBá4¡Pº†b­?Šq<Ýš~/ó¢„bèÖwc^Ý`ò¶ºyÃË[BâHÃÎqhë9¯>ê[}»©:j7Ïð`ÔJQë4£ÖiF­ÓŒZ§3j%ΨušQë4£ÖiF­ÔµJ×Që4£ÖiF­ÓŒZ©3jfÔ:]F­³ŒZ©3jfÔ:ͨušQ«tµk=Úã¯Í2j‡éñ »kòùpLµ\ù«hÔµøÓÁ•×äÍÛë¯ï³¹cðûæÓž£Eúæ©,Òf‘.uéJ×EºÓ”ÃiÊ!uÊá4åpšr8M9œN9$N9œ¦NS§)‡Ô)‡ÒµNS§)‡Ó”Cê”ÃiÊát)‡³”Cê”ÃiÊá4åpšr(]˱Ös9ŽO¾¢}wšø^9æ/õ°H>j¾®Âr¥%·tæcóíï»ÿ±¹Õåcs©ó±¹ÔùØ\ê|l.u>6·zùØ\bªê4UušªJª*]«ê4UušªJª:MU¦ªNSU§SU‰SU§©ªÓTÕiª*uªªt­ªÓTÕiªê4U•:Uušª:]ªê,U•:Uušª:MU¦ªJת®uw3×%¦ª]sšvG»U½Þ÷cO}›ûmŽ­þ$}µM{æ„eóØÂâ4aqš°H°(]Ãâ4aqš°H°8MXœ&,N§‰§ ‹Ó„ÅiÂ"u¢t ‹Ó„ÅiÂâ4a‘:aqš°8]Ââ,a‘:aqš°8MXœ&,J×°¬õ–Þ†¥¹Î·n÷@ßð:,ÛÛ;~üÊ|¸î~­|îí\>]ylÎÞ­É–ƒŠ?–ëæóký¨w`Ùž›gx0<fx:Íðtšáét†§ÄžN3<fx:Íð”:ÃSé:<fx:Íðtšá)u†§Ó O§Ëðt–á)u†§Ó O§žN3<•®Ãs­?7<§WZÓí®Ê§_ëõªœ¹º+ã둺ÿaõã'-Fìùá;†ß}—ŸýxÕô#˜¶×{/WDoëÑwß¿›?¯ƒ÷¯Ó¼æýë4ï_©óþuš÷¯Óåýë,ï_©óþuš÷¯Ó¼æý«t}ÿ®õüþ=¾*FÞ¿Ímzí\w?Ó¯õòýûÉ›´ñå±íïºÿå1©s\ê·º—:GÁ¥ÎQp©s\ê·z9X!qVHƒRç`…Õå`…Ó¬:+¤ÎzÛê²Þ–:ëm©³Þ–:ëm©ËzÛâ²Þ–:ëm©³Þ–:ëm«K¯¦×R§×R§×R§×V—^K^K½ôZÚôÚêÒk©Ók©Ók©Ók§éõFw×O¬·§Ÿ·üu§×ó̓^®·Ûç37kÙOÞv•2n×A¦ŒNSF§)£Ô¥ŒSF§)£Ó”Qê”QéZF§)£Ó”Qê”ÑiÊè4etš2:2Jœ2:M¦ŒNSF©SF¥k¦ŒNSF§)£Ô)£Ó”ÑéRFg)£Ô)£Ó”ÑiÊè4eTº–q­»ë'κj.Í©½tûß¡ËÅ`–:v?Kÿ–o¹ýº¤[þù~„èùÖåc{?>µn+_€x<ÂÔç 2ï†`ó<B uB t Ó„ÀiB uBà4!pš8MœN$Nœ&N§ Ô Ò5N§ Ó„@ê„ÀiBàt ³„@ê„ÀiBà4!pš(]C°Öã°s=°§ ·S×\ŽB°Ü´l“šûª—CùõÓÙz!ýëfm¿ýëf9]}:Í¡O§9ô)u6xN³Ásš žÓlðœfƒ'uÙà9ÌÏiºî4]—:]WºvÝiºî4]—:]wš®;MצëN§ë§ëNÓu§éºÓt]êt]éÚu§éºÓtÝiº.uºî4]wºtÝYº.uºî4]wš®;Mו®]_ë¹ëú»ïM?½ÒÆö¨ëË}M_þ¬[°óö£þú½øüÿã ÿ\H¥åͳ;ÊN3”¥ÎPvš¡ì4CÙi†²ÓÊg(;ÍPvš¡ì4CYê e¥ëPvš¡ì4CÙi†²ÔÊN3”.CÙY†²ÔÊN3”f(;ÍPVºåµþÜPî†é¹n¶–;l.CùÒ”oʯ¿J1Öepþz¥Oß‹¼]® ¿¿]Ù<®ƒíŠÓlWœf»â4Û©ËvÅa¶+N³]qšíŠÔÙ®(]Ëè4etš2J2:M¦ŒNSF§SF‰SF§)£Ó”ÑiÊ(uʨt-£Ó”ÑiÊè4e”:etš2:]Êè,e”:etš2:M¦ŒJ×2®õ\ÆN†l»S?nWºúy×u¼_rëáïÉs£w»µyDÝršnI]ºå0Ýršn9M·¤N·”®Ýršn9M·¤N·œ¦[NÓ-§é–Óé–Äé–ÓtËiºå4Ý’:ÝRºvËiºå4ÝršnIn9M·œ.Ýr–nIn9M·œ¦[NÓ-¥k·ÖzéÖU^ž¾išSûxG÷vpyúW2û¿q‰zýæY z¥ë wšAï4ƒ^ê z§ôN3èfÐ;A/q½Ó z§ôN3è¥Î Wºz§ôN3èfÐKAï4ƒÞé2èeÐKAï4ƒÞi½Ó z¥ë _k7è³A™^–Cÿñþäm{Íù/Þy¹ºÙ|9s~oRgß±yXûÛ‰—]‡³Ùt8œ=‡Ã)‘Ä%D
-Ó!‡“!‡S!‰K„NƒN‚N.’¶ôÇáäÇáÔÇáÄGâÒ…IÃ)à ÃéŽÄ%;§:/Ñq4Í‘¸$ÇáÇáÇáôFar³Æcÿ‰Š®—Óp÷js¿pý—ks~¸(ýrw”Ýãa›‡´8ÌádIâ%KÎ&K'K'K—,)L–N–N–$.Yr8Yr8Yr8Yr¸dIÚ’%‡“%‡“%‡“%‰K–&K'K'K'K—,9œ,9¼dÉÑdIâ’%‡“%‡“%‡“%…ÉÒÏYÒßÊ\ÝËÒÛ_ÍRû¶{öæ!쟆ípNkp85t85t85”x©¡³Q§†§†—*L N N %.5t85t85t85t¸ÔPÚRC‡SC‡SC‡SC‰K ¦†§†§†§†—:œ:¼ÔÐÑÔPâRC‡SC‡SC‡SC…©áwÝ朅r‡Íf§—Òévyº”DŽþüó·ÿU"uJ
-endstream
+4238 0 obj
+<< /D [ 4229 0 R /XYZ 79.37 402.942 null ] >>
endobj
-4294 0 obj
-<< /Type /Page /Contents 4295 0 R /Resources 4293 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 4143 0 R /Annots 4297 0 R >>
+313 0 obj
+<< /D [ 4229 0 R /XYZ 79.37 308.541 null ] >>
endobj
-4297 0 obj
-[ 4225 0 R 4238 0 R 4239 0 R 4240 0 R 4241 0 R 4242 0 R 4243 0 R 4244 0 R 4245 0 R 4246 0 R 4247 0 R 4248 0 R 4249 0 R 4250 0 R 4251 0 R 4252 0 R 4253 0 R 4254 0 R 4255 0 R 4256 0 R 4257 0 R 4258 0 R 4259 0 R 4260 0 R 4261 0 R 4262 0 R 4263 0 R 4264 0 R 4265 0 R 4266 0 R 4267 0 R 4268 0 R 4269 0 R 4270 0 R 4271 0 R 4272 0 R 4273 0 R 4274 0 R 4275 0 R 4276 0 R 4277 0 R 4278 0 R 4279 0 R 4280 0 R 4281 0 R 4282 0 R 4283 0 R 4284 0 R 4285 0 R 4286 0 R 4287 0 R 4288 0 R 4289 0 R 4290 0 R 4291 0 R ]
+4239 0 obj
+<< /D [ 4229 0 R /XYZ 79.37 296.022 null ] >>
endobj
-4225 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 759.955 197.477 769.031 ]/A << /S /GoTo /D (section.0.6) >> >>
+4228 0 obj
+<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F64 333 0 R /F15 334 0 R /F74 337 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-4238 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 746.057 249.98 757.016 ]/A << /S /GoTo /D (subsection.0.6.1) >> >>
+4297 0 obj
+<< /Filter /FlateDecode /Length 7466 >>
+stream
+xÚåÝÍ®ÛXzFáy]…o Õâ¯$ `àœ²Ý@†AÍ‚LÓ£LrÿƒÜïÚ)‰\v!A€ Qhÿ<>¦Ž¥om’Ù|9Oÿû¯~i–üë?~ûüó·¿ÿhÛ/·ÓmlÇþËŸÿñ[ù½æËåvê._.cs:Í—?ÿóË¿ý~>wׯkní0ý°ý>ý´=Ÿ/ßÎç~þoúñx+ÿ?4ó¯}ý[wí~/?ë.ül¶ËŸkë¯\ÏçæüÎçôU¾•ŸÏ?žåX好ÿ=Ý~µül¶õWæ¯?.ÛеóW¼ôo¶éš¯ûðêÖ´_ÿýÏùíüåŸÓ·åõÛ3}SsyúõßÝ<}§7ßÖîvjúŽ?5õÛÚ|–Mn§t9ûßïßœ6߶>ôîR~eó†Ïߺéqóm{¹áçþÔ÷×í& ó?[ûfãÿþ£^=Gšékµó7¡½œšëõþp¦¯u]¾Þßšs;?œ¡ûÚ^üwB7?„¶»oòò@Çü‹/¿[ú~…«ò<:ø*¯¾íÐNÿ·íF××zœþ[¯/§ I|Nc×X}íNݵµúÖœš®Óú:m¶ÕÝyœ¶»·ºé§í¬nÛi»G­oÓv_¬î.ÓvÛ®¦íÖzè¦í¶O“nzR]=¾žÆÞ>MºËxênöiÒ]ûih==©®7ý4¹Ý¦í¶O“þ|™¶Û>Múf˜¶Û>MúéIu½iݧí¾h}¶Û>Mú~œ¶ÛþË÷Ó“JÛ©CãÐh};õg­/“쳤ŸžS·³}–ô·vÚnû,ÎÃéÖ?í½xÕX5—SÛNÿRÓs§íºçX=D«éû_‰ÖËÙ:mòõÒoÿÚw“¸éNc;XÝ6SʼžŠßŽVwã´Ý«û~Úî«Õ$Øi,uI°Ã$Øiì4 –: Vº&Øiì4 –: vš;M‚&ÁN'Á'ÁN“`§I°Ó$Xê$Xéš`§I°Ó$Øi,uì4 vº$ØY,uì4 vš;M‚•® ÞèŸJð¹›ö¯ï<~Ö÷—¿º·G~×åQ~&¿R'¿N“_§É¯Óä×iò+uɯÃä×iòë4ù•:ùUºæ×iòë4ù•:ùušü:M~&¿N'¿'¿N“_§É¯ÓäWêäWéš_§É¯Óä×iò+uòë4ùuºä×Yò+uòë4ùušü:M~•®ùÝh•ß®§gñ4f¶ù]²[×öMIî|@|9–|~qp¿[HÏáÚúë}ŽJ/òH/'®Kâ÷‚µÙðƒ`Y½KâKêKêËê,§ –Ô –Ô –Õ%XR'XR'XR'XR—`Y\‚%u‚%u‚%u‚eu –ÓKêKêKêËê,©,©—`I›`Y]‚%u‚%u‚%u‚å4ÁÚêv ŽÛ_糦ãå9XO‡l/Íæ ñÎ9Ã)bËáÝù¤iÿY~Üv_ÿ¶ü V¯ÝÝ=ÛlÙÁî™ÔÔÎij'u©ÃÔÎijç4µ“:µSºÖÎijç4µ“:µsšÚ9M휦vN§v§vNS;§©ÓÔNêÔNéZ;§©ÓÔÎij'ujç4µsºÔÎYj'ujç4µsšÚ9Mí”®µÛ蟪Ý4£û¦}W»‡££¯k·ül~TSÐr”ôZË÷yß9ëǯ*xDi½qGQ’ºDÉa¢ä4Qrš(I()]£ä4Qrš(I(9M”œ&JN%§%‰%§‰’ÓDÉi¢$u¢¤t’ÓDÉi¢ä4Q’:Qrš(9]¢ä,Q’:Qrš(9M”œ&JJ×(mô<ñ?ì1Ãa8õÃó.ØG=fØ}/1ZÞ)óã¾ÓU~ž]­Õ›kk°8ª¸zMß–wÁvíîZþüåÛq°HÐzÃä0 rš9M‚¤N‚”® rš9M‚¤N‚œ&AN“ §IÓIÄIÓ$Èiä4 ’: Rº&Èiä4 ršI9M‚œ. r–I9M‚œ&AN“ ¥k‚6zîÃÍ&¨ïNÃùi¿húóõ´ÕG> ‘£ys†øŸïè??_0ehøYÓfÿhèëÑÀ×`~{ʲ#uýzå \ºýh¬ÅQ4œ&R'J×h8M4œ&R'N §‰†ÓDÃéDCâDÃi¢á4ÑpšhHh(]£á4Ñpšh8M4¤N4œ&N—h8K4¤N4œ&N §‰†Ò5Ý.D”Óºæ4ô—çh<:¯#œ§{ó£{;áy#âç}Ï¥ÿ|ÞW™bÒüè÷÷OÖx°â0©qšÔ8Mj¤Nj”®©qšÔ8Mj¤Njœ&5N“§IÓIÄIÓ¤ÆiRã4©‘:©Qº¦ÆiRã4©qšÔHÔ8Mjœ.©q–ÔHÔ8Mjœ&5N“¥kj6ú§RÓÜNíy—š‡ó6O©Y…¹Œ«
+ëm?ÚSpš=§ ‹Ô ‹Ò5,N§ ‹Ô ‹Ó„ÅiÂâ4aq:a‘8aqš°8MXœ&,R',J×°8MXœ&,N©§ ‹Ó%,Ω§ ‹Ó„Åi¢t ËFϺ³{
+Ã44šç=…ëÓ[˜Úq¾héý3C.ãÒ^Vïp­—ciûמ˿ÌqY¢4ÇgL’®âS„ë7M q[¶°ä*¿7–úóö~±Õ\ÛíÝNÓhý}9šFN3œf9Í4’:ÓHé:œf9Í4rši$u¦‘ÓL#§Ë4r–i$u¦‘ÓL#§™FN3”®Óh£jõÓŠñí0zx“Kû±wâñõ¡Þ¬\op-ÿÕÓÞGÌÃMVkçã±ø|›¿0w_«ïÞÑ‹Ba^
+——„¢¼"Î Ba^
+órP˜WƒÁõÅ°Æ?õZè¦/qÞ¾îgõ»æþ-vùæÊÕ§ÕËwqý¿{‘äy¿þ¶=ñ.Ï|gyêKç¾Ó<ùæÙï4O¥ëó£[q›zÌ£¾«OÏÿåv6ùPðø5÷ÛÉñæå8Ç-Oæþv•±µÇ=_&õ¥4?A×OÞý«‡{tü@a8œ£
+sð@aŽ(Ì¡…³Vw6Ku…Y©+ÌB]aÖég™np]¥+Ì"]aÖè
+³q8CYaf²Âe$+ÊDv8Yaæ±ÂŒc…™Æ×a¼¨Ó(»ØÇMsº½Æ}Æ|†iùr õoGWWw}{U…æ:=¨¶ÙþeoUs;ŸºK«õõÔ´Ô\Ø]ê\Ø]ê\ØÝêraw©så@©så@©s‘&©ó 4«Ë™‡9Sà4g
+œæLÔ9S t ½Ó”ÞiR/uZï4±wšÚ;MîNï%Nð¦øN“|§i¾Ô‰¾ÒµúN“}§é¾Ó„_ê”ßiÒïti¿³Ä_êÔßiòï4ýwš€Òu°Éøçî}9÷îÝÚOõ=_î}în2šýöæñF¢ËîØùý]Uù´Áå\nQÚµe(;Ró{Šêoì\™‰;n·ïS\#1lšÍp«w¥íê#›³\úû±‘eïªnˆºù¢»›stCÔ~Oí¹¿oàÓ Q_ßØF]’øáZ{ £Í6,Œ¤ÎÂÈê²0’: #©³0’: #©³0²zYIœ…‘ÔYI…‘Õeaä4 #©³0’: #«ËÂHê,Œ¤ÎÂHê,Œ¤. #‹ËÂHê,Œ¤ÎÂHê,Œ¬. #§YI…‘ÔYI…‘Õea$uFR/ #i³0²º,Œ¤ÎÂHê,Œ¤ÎÂÈiF­– µÇS-Úþ¶íñÃoîªÙ‡÷C¿¾jåúHòóqê¿zå˜ý¿~@G3^é:ãfÆ;ÍŒ—:3Þif¼ÓÌx§™ñNgÆKœï43Þif¼ÓÌx©3ã•®3Þif¼ÓÌx§™ñRgÆ;ÍŒwºÌxg™ñRgÆ;ÍŒwšï43^é:ã×z™ñö
+Å}מÚÛÓ>×ÊçÝÞû™E.‘ÿ¼«ø~Â/ûeß~¥cyãÝý­oû;¥uå¿~PG+©S¥kœ¦
+NS©S§©‚ÓTÁiªàtª qªà4Upš*8M¤N”®Upš*8Mœ¦
+R§
+NS§Kœ¥
+R§
+NS§©‚ÓTAéZ…µž« /<MêS×=­ü.<þÁ}.ëÝ(ÛW·Uúõôæ¶*÷Û­ì`[oÈÑ6©s€Íi°9Í6§9Àæ4ؤ.Øæ
+¡ÂtPa2¨0t¸DPY¨0 T˜:œ
+S>…>gÓ=…ÉžÂTOa¢çpšgpMžÂOa‚§0½s8¹S˜Ú)\b§(­s8©S˜Ò)Lè¦s×Ì­ðR9{1©nlOÃ0<eîã/g®ý¨Á^~¦wþØþ-ÿûíYoäQ|¤.õq˜ü8Mœ&@R§@J×9Mƒœ&BR§BN“!§éÓ„Èé”Hâ¤ÈiZä41ršI)]{ä4Arš"9M’¤N“œ&JN—*9K–¤N—œ&LNS&§I“ÒµMk½ìílœ†éßw›¦Ç3ª¿˜¦qþ ÉÇüÎÉÝ3©«¿þà<ª³Ù£3–:cÙŸ3–¤KP•-95”˜KJ%¤Ê&£ÂÖˆKB% Ê&ŸÆOcI§±„ÓØdSÑDÓX’i,Á4–\*›X
+[Si,¡4–LK$•M"%Æ–<I•M%ŒÆ’Ec‰¢°5‰v¢¾ N×ͯ•§½µ‡Kÿþbë
+„ýù3훫^vK»;êVõhÒ)Ì S8sÎÙŒ9…™r
+3äfÆ9œgpp
+3àf¾)Ìxs8ÓMa†›Âe¶)Êhs8“Ma›ÂÌ5…kש¶ÂóPûÅ+§tÓ¨»\ÚÇKb^æÃ[ÓÂﹺéæÚ"áÍû _]Vmÿ=ƒë¿tÞü_¾þH;}û®Íeý
+Åi–(Rg"u)Rg•buY¦HuŠÔËBEÚ¬T¬.K©³V‘:‹©³ZqšåÊFïÿ)ð×éÅ7¶¯?¿rx·#v)ï!¹_ýšÛ­Üo
+sx]“vwùS—rùS“°yDI:IPº&Ái’à4I:Ipš$8Mœ& N' ' N“§I‚Ó$Aê$A隧I‚Ó$Ái’ u’à4Ipº$ÁY’ u’à4Ipš$8M”®IXë% òf$íôzºÇ×I¸ïûåæ<ß¹ƒðÃ%ÀÏ/‡¶Ì1ážÄýxx”­î;l¶ü`ßÁiB!uB¡t …Ó„ÂiB!uBá4¡pšP8M(œN($N(œ&N
+§ …Ô …Ò5N
+§ …Ó„Bê„ÂiBát …³„Bê„ÂiBá4¡pšP(]C±Ö?Ša<݆f/ó>D ÅЭo˸ºéÔmu­ç··‰Â=Þ®ž73´õÍ ïNq:GÜ¢ŽÚÍ#<µRgÔ:ͨušQë4£ÖéŒZ‰3jfÔ:ͨušQ+uF­ÒuÔ:ͨušQë4£VêŒZ§µN—Që,£VêŒZ§µN3jfÔ*]GíZ/£v°£¶Ÿ¶ï¶»&ŸÇ”QË…b¹vE]‹?\y½&oþx<ßþ|qùÍ]?7g{Ž雇r°HwšEºÔY¤+]éNS§)‡Ô)‡Ó”ÃiÊá4åp:å8åpšr8M9œ¦R§J×r8M9œ¦NS©S§)‡Ó¥ÎR©S§)‡Ó”ÃiÊ¡t-ÇZw7ó.+ÊÑu§s¿»HŸ?qÃ"ýù]Oóå –ë¹¥s=m¾ù{N›KÓæNsÚÜiN›;Íis§9m.u9mî0Uušª:MU¥NU•®Uušª:MU¥NU¦ªNSU§©ªÓ©ªÄ©ªÓTÕiªê4U•:UUºVÕiªê4UušªJª:MU.Uu–ªJª:MU¦ªNSU¥kU×z®j§«:uë|ÝÝ›?´ÃþØÓ©os{®±ÕgÒW»iïÓœ°l¶ý ,N§ ‹Ô ‹Ò5,N§ ‹Ô ‹Ó„ÅiÂâ4aq:a‘8aqš°8MXœ&,R',J×°8MXœ&,N©§ ‹Ó%,Ω§ ‹Ó„Åi¢t ËZ/aélXÎÓ.N·Nex–íÝ ^ŸC™×ݯPÏ­ ËÙ•ÇæÜOÚ?7g9¨øm¹Z=_ë[½ïÉîðÜ<ƒáé4ÃÓi†§Ó O§3<%Îðtšáé4ÃÓi†§ÔžJ×áé4ÃÓi†§Ó O©3<fx:]†§³ O©3<fx:Íðtšá©tžk=ÏãÏgx6·éÑ\†ÝáÙï¬Ê˜íãè{?R÷OV?ži¹0bÏŸ&|}³>þôãµÊߌ`Nl¯O{/×!oëuÈ÷^¿Ûï×þëWê¼~¥ÎëWê¼~­.¯_©óú•zyýJ›×¯Õåõ+u^¿Rçõ+u^¿NóúÝèŸ{ý^‡éÿwwª»÷/ߟ¼3ŸÛü¥ûs8‡ÀÎp‰Ëp‡süÛáþv8G¿ÎÁo‰—CÎæ…Ã9@ápŽOH\O(ÌÑ ‡spÂá,¯%.«k‡³¸v8kk‡³´v¸¬¬¥- k‡³®v8Ëj‡³ª–8Q6¸6Ya’¬0EV˜ ;œ+LŽ.5V”;œ+LŠ¦Ä
+bƒk‡W¸»þÄ1ˆæÒÚqw=߉çí2º}~¿åf‰ú“÷0¥z›í:ÈžÓtÏiÂç4哺¤ÏaÚç4ñsšúIü)]ûç4tšJ:M&‚NSA§“A‰ÓA§ ¡Ó”ÐiR(uZ¨t¡ÓÔÐirè4=”:Atš":]’è,M”:Qtš*:M¦‹J×0®õ8üÄ›©šé;µp¾^âe‰c÷½äoùìÚû‰ÚòóûqŸçÛ€íý¨Ó:­|¬áñ¸QŸ9<œ:ÞíÀúadÀáTÀà…i€Â$Àá@a 0ó_aƿ™þÎfø+ÌìW˜Ñ¯0“ßá ~ƒëÜW˜±¯0S_a†¾Ã™ù
+3ò._Q¾Ã™÷
+3îfÚ+Ì°7¸ÎúžGýÛ y=úþvê†áhÖ/wÏ,;BÍý“ÐË1øzZµ^kpï‚WÛ¿oÿ‚WN×£–NsØÒiŽ[J]8§Ù…sš]8§Ù…sš]8©Ë.œÃìÂ9Mº¦ÝR'ÞJ×z;M¾¦ßR'àNSp§I¸Ó4ÜéD\âTÜi2î4wšK’+]Sî4-wš˜;MÍ¥NΦçN— ;KÑ¥NÒ¦éNu§©ºÒ5ëk=wýø‚Wt}ýQÕ—»€¾9¼Y÷±ÎÛ3ôõãìùïõ•‰ÿ®RGòê± dcÇÊfË(6–Al,cØØ aE3‚e
+[ì£]Æ«½&HÓ§¾?° ØKS>¬¾þ4Ã<$—!øãq,>}4ñZt¹ûþŽÇf»v<œfÇÃiv<œfÇCê²ãá0;N³ãá4;RgÇCéZ9§éœÓ”Nê´Îijç4½sšâ9æIœê9M÷œ¦|NÓ>©S?¥kÿœ¦€NÓ@§© Ôé Ó”ÐéÒBg©¡Ôé¡ÓÑišè4UTºvq­ç2vW[Ʀ;õ×ÛQ»zòˆK+Þ¯zõðãòíÉ»ÝÚlÑA·œ¦[R—n9L·œ¦[NÓ-©Ó-¥k·œ¦[NÓ-©Ó-§é–ÓtËiºåtº%qºå4Ýršn9M·¤N·”®Ýršn9M·œ¦[R§[NÓ-§K·œ¥[R§[NÓ-§é–ÓtKéÚ­µvÝÊâ›ssº×{tWˆÿöx1±ÿW‰gÐoÕÁ Wºz§ôN3è¥Î wšAï4ƒÞi½ÓôgÐ;Í wšAï4ƒ^ê z¥ë wšAï4ƒÞi½ÔôN3è.ƒÞY½ÔôN3èfÐ;Í Wºúµ^ÝÙkL^o§áòzÿäc{Ù÷ùÍCÿpÁ’öóÕ½»D y°W÷kÌýˆ_¼#nþ¨zý˜úÇÌÌW-ëæŒ|ìÚÍãÛŸ³—1ëp¦¬Ã²gÆ:\F¬´eÂ:œëpæ«Ã¯—éª0ÃÕáÌV‡3ZÎd•¸ V‡3W^ƪ£™ª—¡êpfªÃ©g¢*Ì@]㟚§ÓÛ~ožÞ¯Žþ‹·u_Fßü ÖÍ{+ßÇÙlÖþa‰—£8Îæ ŽÃ9†ãpVö—…½Â¬ëNmNm$.µq8µq8µq8µq¸ÔFÚR‡S‡S‡S‰Km¦6§6§6§6—Ú8œÚ8¼ÔÆÑÔFâR‡S‡S‡S…©ÍýæÄû<·¦¹<ŽÓSét»\·mIš¾ÿùÛ(>f|
+endstream
endobj
-4239 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 734.102 202.349 745.061 ]/A << /S /GoTo /D (subsubsection.0.6.1.1) >> >>
+4296 0 obj
+<< /Type /Page /Contents 4297 0 R /Resources 4295 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 4047 0 R /Annots 4299 0 R >>
endobj
-4240 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 723.98 200.416 733.106 ]/A << /S /GoTo /D (subsubsection.0.6.1.2) >> >>
+4299 0 obj
+[ 4227 0 R 4241 0 R 4242 0 R 4243 0 R 4244 0 R 4245 0 R 4246 0 R 4247 0 R 4248 0 R 4249 0 R 4250 0 R 4251 0 R 4252 0 R 4253 0 R 4254 0 R 4255 0 R 4256 0 R 4257 0 R 4258 0 R 4259 0 R 4260 0 R 4261 0 R 4262 0 R 4263 0 R 4264 0 R 4265 0 R 4266 0 R 4267 0 R 4268 0 R 4269 0 R 4270 0 R 4271 0 R 4272 0 R 4273 0 R 4274 0 R 4275 0 R 4276 0 R 4277 0 R 4278 0 R 4279 0 R 4280 0 R 4281 0 R 4282 0 R 4283 0 R 4284 0 R 4285 0 R 4286 0 R 4287 0 R 4288 0 R 4289 0 R 4290 0 R 4291 0 R 4292 0 R 4293 0 R ]
+endobj
+4227 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 758.062 378.259 769.031 ]/A << /S /GoTo /D (section.0.5) >> >>
endobj
4241 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 710.311 243.704 721.26 ]/A << /S /GoTo /D (subsection.0.6.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 738.037 197.477 747.113 ]/A << /S /GoTo /D (section.0.6) >> >>
endobj
4242 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 700.07 231.559 709.195 ]/A << /S /GoTo /D (subsubsection.0.6.2.1) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 724.139 249.98 735.098 ]/A << /S /GoTo /D (subsection.0.6.1) >> >>
endobj
4243 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 688.114 244.312 697.24 ]/A << /S /GoTo /D (subsubsection.0.6.2.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 712.184 202.349 723.143 ]/A << /S /GoTo /D (subsubsection.0.6.1.1) >> >>
endobj
4244 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 674.326 252.591 685.395 ]/A << /S /GoTo /D (subsection.0.6.3) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 702.062 200.416 711.188 ]/A << /S /GoTo /D (subsubsection.0.6.1.2) >> >>
endobj
4245 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 662.491 269.318 673.33 ]/A << /S /GoTo /D (subsection.0.6.4) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 688.393 243.704 699.342 ]/A << /S /GoTo /D (subsection.0.6.2) >> >>
endobj
4246 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 652.249 256.257 661.375 ]/A << /S /GoTo /D (subsubsection.0.6.4.1) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 678.152 231.559 687.278 ]/A << /S /GoTo /D (subsubsection.0.6.2.1) >> >>
endobj
4247 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 638.471 267.465 649.42 ]/A << /S /GoTo /D (subsubsection.0.6.4.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 666.197 244.312 675.322 ]/A << /S /GoTo /D (subsubsection.0.6.2.2) >> >>
endobj
4248 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 626.515 283.794 637.464 ]/A << /S /GoTo /D (subsubsection.0.6.4.3) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 652.408 252.591 663.477 ]/A << /S /GoTo /D (subsection.0.6.3) >> >>
endobj
4249 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 614.67 259.216 625.509 ]/A << /S /GoTo /D (subsubsection.0.6.4.4) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 640.573 269.318 651.412 ]/A << /S /GoTo /D (subsection.0.6.4) >> >>
endobj
4250 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 602.715 285.228 613.554 ]/A << /S /GoTo /D (subsubsection.0.6.4.5) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 630.331 256.257 639.457 ]/A << /S /GoTo /D (subsubsection.0.6.4.1) >> >>
endobj
4251 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 592.473 260.89 601.599 ]/A << /S /GoTo /D (subsection.0.6.5) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 616.553 267.465 627.502 ]/A << /S /GoTo /D (subsubsection.0.6.4.2) >> >>
endobj
4252 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 578.246 356.78 590.202 ]/A << /S /GoTo /D (subsubsection.0.6.5.1) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 604.598 283.794 615.547 ]/A << /S /GoTo /D (subsubsection.0.6.4.3) >> >>
endobj
4253 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 566.291 423.071 578.246 ]/A << /S /GoTo /D (subsubsection.0.6.5.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 592.752 259.216 603.591 ]/A << /S /GoTo /D (subsubsection.0.6.4.4) >> >>
endobj
4254 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 554.336 434.598 566.291 ]/A << /S /GoTo /D (subsubsection.0.6.5.3) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 580.797 285.228 591.636 ]/A << /S /GoTo /D (subsubsection.0.6.4.5) >> >>
endobj
4255 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 542.939 298.12 553.888 ]/A << /S /GoTo /D (subsection.0.6.6) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 570.555 260.89 579.681 ]/A << /S /GoTo /D (subsection.0.6.5) >> >>
endobj
4256 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 532.697 179.455 541.823 ]/A << /S /GoTo /D (subsection.0.6.7) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 556.329 356.78 568.284 ]/A << /S /GoTo /D (subsubsection.0.6.5.1) >> >>
endobj
4257 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 509.066 226.618 519.965 ]/A << /S /GoTo /D (section.0.7) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 544.373 423.071 556.329 ]/A << /S /GoTo /D (subsubsection.0.6.5.2) >> >>
endobj
4258 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 487.148 153.283 497.987 ]/A << /S /GoTo /D (section.0.8) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 532.418 434.598 544.373 ]/A << /S /GoTo /D (subsubsection.0.6.5.3) >> >>
endobj
4259 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 475.073 196.72 486.032 ]/A << /S /GoTo /D (subsection.0.8.1) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 521.021 298.12 531.97 ]/A << /S /GoTo /D (subsection.0.6.6) >> >>
endobj
4260 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 463.118 285.168 474.187 ]/A << /S /GoTo /D (subsection.0.8.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 510.779 179.455 519.905 ]/A << /S /GoTo /D (subsection.0.6.7) >> >>
endobj
4261 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 451.163 215.52 462.122 ]/A << /S /GoTo /D (subsection.0.8.3) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 487.148 226.618 498.047 ]/A << /S /GoTo /D (section.0.7) >> >>
endobj
4262 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 439.208 278.842 450.386 ]/A << /S /GoTo /D (subsection.0.8.4) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 465.23 153.283 476.07 ]/A << /S /GoTo /D (section.0.8) >> >>
endobj
4263 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 427.263 207.39 438.212 ]/A << /S /GoTo /D (subsection.0.8.5) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 453.156 196.72 464.114 ]/A << /S /GoTo /D (subsection.0.8.1) >> >>
endobj
4264 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 405.385 343.181 416.354 ]/A << /S /GoTo /D (section.0.9) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 441.2 285.168 452.269 ]/A << /S /GoTo /D (subsection.0.8.2) >> >>
endobj
4265 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 393.38 222.155 404.339 ]/A << /S /GoTo /D (subsection.0.9.1) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 429.245 278.842 440.423 ]/A << /S /GoTo /D (subsection.0.8.3) >> >>
endobj
4266 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 381.425 221.168 392.493 ]/A << /S /GoTo /D (subsection.0.9.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 417.3 207.39 428.249 ]/A << /S /GoTo /D (subsection.0.8.4) >> >>
endobj
4267 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 369.031 250.508 380.986 ]/A << /S /GoTo /D (subsection.0.9.3) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 395.422 343.181 406.391 ]/A << /S /GoTo /D (section.0.9) >> >>
endobj
4268 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 357.514 209.691 368.583 ]/A << /S /GoTo /D (subsection.0.9.4) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 383.417 222.155 394.376 ]/A << /S /GoTo /D (subsection.0.9.1) >> >>
endobj
4269 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 345.559 235.007 356.518 ]/A << /S /GoTo /D (subsection.0.9.5) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 371.462 221.168 382.53 ]/A << /S /GoTo /D (subsection.0.9.2) >> >>
endobj
4270 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 333.166 331.933 345.121 ]/A << /S /GoTo /D (subsection.0.9.6) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 359.068 250.508 371.024 ]/A << /S /GoTo /D (subsection.0.9.3) >> >>
endobj
4271 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 311.806 184.546 322.645 ]/A << /S /GoTo /D (section.0.10) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 347.552 209.691 358.62 ]/A << /S /GoTo /D (subsection.0.9.4) >> >>
endobj
4272 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 301.564 182.752 310.69 ]/A << /S /GoTo /D (subsection.0.10.1) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 335.596 235.007 346.555 ]/A << /S /GoTo /D (subsection.0.9.5) >> >>
endobj
4273 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 287.895 281.114 298.844 ]/A << /S /GoTo /D (subsection.0.10.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 323.203 331.933 335.158 ]/A << /S /GoTo /D (subsection.0.9.6) >> >>
endobj
4274 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 275.821 266.498 286.889 ]/A << /S /GoTo /D (subsubsection.0.10.2.1) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 301.843 184.546 312.682 ]/A << /S /GoTo /D (section.0.10) >> >>
endobj
4275 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 265.699 308.71 274.934 ]/A << /S /GoTo /D (subsubsection.0.10.2.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 291.601 182.752 300.727 ]/A << /S /GoTo /D (subsection.0.10.1) >> >>
endobj
4276 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 253.743 268.292 262.979 ]/A << /S /GoTo /D (subsubsection.0.10.2.3) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 277.933 281.114 288.882 ]/A << /S /GoTo /D (subsection.0.10.2) >> >>
endobj
4277 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 240.075 208.436 251.024 ]/A << /S /GoTo /D (subsubsection.0.10.2.4) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 265.858 266.498 276.926 ]/A << /S /GoTo /D (subsubsection.0.10.2.1) >> >>
endobj
4278 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 229.833 258.718 239.068 ]/A << /S /GoTo /D (subsubsection.0.10.2.5) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 255.736 308.71 264.971 ]/A << /S /GoTo /D (subsubsection.0.10.2.2) >> >>
endobj
4279 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 217.878 316.441 227.113 ]/A << /S /GoTo /D (subsubsection.0.10.2.6) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 243.781 268.292 253.016 ]/A << /S /GoTo /D (subsubsection.0.10.2.3) >> >>
endobj
4280 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 205.923 397.756 215.158 ]/A << /S /GoTo /D (subsubsection.0.10.2.7) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 230.112 208.436 241.061 ]/A << /S /GoTo /D (subsubsection.0.10.2.4) >> >>
endobj
4281 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 192.144 194.479 203.093 ]/A << /S /GoTo /D (subsubsection.0.10.2.8) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 219.87 258.718 229.106 ]/A << /S /GoTo /D (subsubsection.0.10.2.5) >> >>
endobj
4282 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 180.189 223.271 191.138 ]/A << /S /GoTo /D (subsubsection.0.10.2.9) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 207.915 316.441 217.151 ]/A << /S /GoTo /D (subsubsection.0.10.2.6) >> >>
endobj
4283 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 168.224 274.508 179.293 ]/A << /S /GoTo /D (subsubsection.0.10.2.10) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 195.96 397.756 205.195 ]/A << /S /GoTo /D (subsubsection.0.10.2.7) >> >>
endobj
4284 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 156.279 185.562 167.337 ]/A << /S /GoTo /D (subsubsection.0.10.2.11) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 182.182 194.479 193.131 ]/A << /S /GoTo /D (subsubsection.0.10.2.8) >> >>
endobj
4285 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 144.314 300.033 155.382 ]/A << /S /GoTo /D (subsubsection.0.10.2.12) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 170.227 223.271 181.175 ]/A << /S /GoTo /D (subsubsection.0.10.2.9) >> >>
endobj
4286 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 132.478 227.614 143.317 ]/A << /S /GoTo /D (subsubsection.0.10.2.13) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 158.261 274.508 169.33 ]/A << /S /GoTo /D (subsubsection.0.10.2.10) >> >>
endobj
4287 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 122.236 238.005 131.362 ]/A << /S /GoTo /D (subsubsection.0.10.2.14) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 146.316 185.562 157.375 ]/A << /S /GoTo /D (subsubsection.0.10.2.11) >> >>
endobj
4288 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 108.568 286.653 119.517 ]/A << /S /GoTo /D (subsection.0.10.3) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 134.351 300.033 145.42 ]/A << /S /GoTo /D (subsubsection.0.10.2.12) >> >>
endobj
4289 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 96.493 244.073 107.452 ]/A << /S /GoTo /D (subsubsection.0.10.3.1) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 122.515 227.614 133.355 ]/A << /S /GoTo /D (subsubsection.0.10.2.13) >> >>
endobj
4290 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 84.538 240.317 95.606 ]/A << /S /GoTo /D (subsubsection.0.10.3.2) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 112.274 238.005 121.4 ]/A << /S /GoTo /D (subsubsection.0.10.2.14) >> >>
endobj
4291 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 72.583 219.285 83.651 ]/A << /S /GoTo /D (subsubsection.0.10.3.3) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 103.28 98.605 286.653 109.554 ]/A << /S /GoTo /D (subsection.0.10.3) >> >>
endobj
-4296 0 obj
-<< /D [ 4294 0 R /XYZ 78.37 808.885 null ] >>
+4292 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 86.53 311.739 97.599 ]/A << /S /GoTo /D (subsubsection.0.10.3.1) >> >>
endobj
4293 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 74.575 244.073 85.534 ]/A << /S /GoTo /D (subsubsection.0.10.3.2) >> >>
+endobj
+4298 0 obj
+<< /D [ 4296 0 R /XYZ 78.37 808.885 null ] >>
+endobj
+4295 0 obj
<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F22 367 0 R /F15 334 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-4306 0 obj
-<< /Filter /FlateDecode /Length 1098 >>
+4310 0 obj
+<< /Filter /FlateDecode /Length 1389 >>
stream
-xÚ½šËn#7E÷þŠþáU|ÑŒ=À,í‚l3«lòÿ‹E^Êzµo 0„nwŸ¦JyO—å°yûùëçÎ;¿~9ž^>¿…´5ײä¸þxçÂBq"u+98ŸÃvúsûí‹÷I¼/ͶÕûüËØj;|Ê1ÚÙÜ{³‡>©ª‰v$|µí7;z4âÛø½ï_¨l$-–Ãï§/~ûi5|_µˆfWK¹«¥>¦ctùAåOè$NKcéì]ž.®Ò…”ä²–®ê´
-K·à‚*MW+›¥Õg«;²tˆVwbi«;Ót³ºÙi¢Z¬nöÓј¬nšNju³ÓDmRU®.GvšhÉN;M´F"MÛ¤ªž&­YÝì4‰¾XÝì4‰!YÝì4‰6©j£iõVw¡éju³Ó$Ælu³Ÿ|´IE³Fåhº¹èiº;K¢Í©æÙY›XÝì,I>¹ïÆV5£¤óáNyw~‹ÍŸwýVÿ£ß›U»ßdçíq^Yí|Ü·ÍMû¶á`؆£aŽ†mHzÚ†¢—m8¶áh؆¤§m8¶áh؆£aŽž¶!áiŽ†m8¶áh؆¤§m(zÙ†£aŽ†m8¶!éiŽ†m8z؆ca’ž¶áh؆£aŽ†m(zÙæšî¶‰¯¬m´¿šÝnÊ̵ls¨Ý1ER;`â)þÈ~ødXhÙÆÌËQɺ+-«×j·Ó2¼ÕÍ$ÇAôûu6"FÑ16ž3Ëû1ŠŒkÆèËŽr]“Ê´¤ŸãÌc²®HqœíG±ß_÷y9Žy>z£”ýåqó¦°<8z,ŽÅò é¹<8˃£±<8˃¢×ò¸¦ã«}>GvyˆE«ñÞòˆXIÿÝTùWEc<ó:rGDÇ£ß?ªìkýæMÙ×: O­s4´ÎÑÐ:GCë$=µNÑKë ­s4´ÎÑÐ:IÏÜâhäGÜâXäIÏÜâhäG#·8¹EÑ+·®é–[AÄÝRo­~±¹ÌLi[>O¦Åtþ8öEgðCÏ?¹6hAG8îw{ׯêƒfƒg¯ÇÀ«Õ£`tzŒFƒgŸGÁhó(]Ã<eÀ±Ó P0L@ÁO0ðÒ
-ŽFrp4¢ƒ£‘$=ã‘=âƒc‘$=„£‘ áhdE¯¹¦Ï)RŸ¤Èç7‘G_º—æ´l¹oryŸ)ÉÖkÐäû ÞëõDg[ò“S]‘Gcöœšw¸Ïþ @šw!g[ ®•zwñøŽåõôò7Ã;?
+xÚ½šÍnã6F÷y
+¿@4ü)q' Ë"»¢ÛÎj6}ÿE/Íûɱ“(g  ;Ò}e_~G´Áþþùqˆç|¿;=ß}yŠóaÖšj9<ÿ}7öÅCŒmJi9´§Pãáùçáϯ!Ì)„¶ÚýB}Ðýñ¾–b{«ý—Ÿì–Ž÷9gÛRlKüÍî¿ÙÖ“ßÆÿýñ…šCéää©uüëù÷»pøaµ|ßjJ¥LõšÞ¡ç4å¶Rº†)&N·iÁ…´yª9RzÉS^¥×8Åœ1½XٔΡZÝ…Ò±XÝ3¥S²º+¦W«»Q:7«›¾;¹ÌV7¦çluÓ6ÉÖT ‡—©Ú&¹Õ)¯´MòR¦X0mMµ¬¸MÖÕê¦mRB³ºi›”8[Ý´MŠ5Õ²b:«»az±ºi›”R­núÎk*ÌUçˆéu*Ó­Mq¦]R¬§Ö@»¤¬Éê¦]2‡yZË«±sîö9_É앹Ê:ÅP÷Ì•×Ïš+=¼´)š{æW5¼Ëo1UJç:-­QZÎd´œÉh9ÒÙ –3-g2Z΄´;Ñ›3-g2Z΄´;“Ñr&£åLFË™ŒvgBØÉh9“Ñr&£åLH»3½9“Ñr&£åLFË™vg2ZÎdôp&cåLH»3-g2ZÎd´œ‰èÍ™×twf^¨3s?›ÝÕžõIgÖh#Ùh¥íûí¦–üÆhùÑò¤‡ß,¿1Z~c´üi÷¢7¿1Z~c´üi÷£å7FËoŒ–ßí~ƒ°ûÑò£å7FËov¿!zó£å7FËoŒ–ß í~c´üÆèá7ÆÊov¿1Z~c´üÆhù ћ߮éî·Z¨ß’õŽuÚÞ§™ó'ýŸ¬¢Òý–y¾×§›‹í/û¶¹©qß6 –m-Û0Z¶´ÛÑ›m-Û0Z¶´Û†Ñ² £eFË6ŒvÛ@ØmÃhنѲ £eH»m½Ù†Ñ² £eFË6vÛ0Z¶aô° ceH»m-Û0Z¶a´lƒèÍ6×tyü•O cžRÙ•M¹Èæ¸tÅ´tLK§£¤ÓÂq®_‡>j:dµ1ëå«4[\å¶-µÖ[…å6´ÕÅÔ¿rëD±g#j”<ÆÖsÖôrŒ–Æ1côMŽéº¦œ\’ÁÇñmi;b.coߪÇý¼ÏC¤ÓØQýÖ ¥ìÏŽë×üƒÉà17ª©Á`ŸÖÄ@°æ‚5-¼ÍŠ+¸OŠú@'EˆSZv/ÁrÖ¬˜óëÿq2ô1Æ3o[NcKÊãÖ¯sÚ—ùÍ‹²/s»Ì-™3Z2g´di—9¢7™3Z2g´dÎhÉÒWŒV^1zc•XöÈb´2‹Ñ
+-F+µ½ÅÖ5ýK¹U—u²eÎNl•Ç[™_$ž<FÚH’ï'ÓÆtþ4§ìÁw½ðvÈõ°ÑÂs„ãîïæ¬ö—x+<kÇ`_ß1Ø—w«;ûâŽÁ¾¶c°Û€ÁC.`°«€Án» <<€`i€Án»ì€ðP
endstream
endobj
-4305 0 obj
-<< /Type /Page /Contents 4306 0 R /Resources 4304 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 4143 0 R /Annots 4308 0 R >>
-endobj
-4308 0 obj
-[ 4292 0 R 4298 0 R 4299 0 R 4300 0 R 4301 0 R 4302 0 R 4303 0 R ]
-endobj
-4292 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 758.012 231.609 769.081 ]/A << /S /GoTo /D (subsubsection.0.10.3.4) >> >>
+4309 0 obj
+<< /Type /Page /Contents 4310 0 R /Resources 4308 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 4047 0 R /Annots 4312 0 R >>
endobj
-4298 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 746.057 257.761 757.016 ]/A << /S /GoTo /D (subsubsection.0.10.3.5) >> >>
+4312 0 obj
+[ 4294 0 R 4300 0 R 4301 0 R 4302 0 R 4303 0 R 4304 0 R 4305 0 R 4306 0 R 4307 0 R ]
endobj
-4299 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 734.102 432.127 745.17 ]/A << /S /GoTo /D (subsubsection.0.10.3.6) >> >>
+4294 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 758.012 240.317 769.081 ]/A << /S /GoTo /D (subsubsection.0.10.3.3) >> >>
endobj
4300 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 722.147 350.832 733.215 ]/A << /S /GoTo /D (subsubsection.0.10.3.7) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 746.057 219.285 757.126 ]/A << /S /GoTo /D (subsubsection.0.10.3.4) >> >>
endobj
4301 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 712.025 276.381 721.26 ]/A << /S /GoTo /D (subsubsection.0.10.3.8) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 734.102 231.609 745.17 ]/A << /S /GoTo /D (subsubsection.0.10.3.5) >> >>
endobj
4302 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 698.236 373.667 709.305 ]/A << /S /GoTo /D (subsubsection.0.10.3.9) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 722.147 257.761 733.106 ]/A << /S /GoTo /D (subsubsection.0.10.3.6) >> >>
endobj
4303 0 obj
-<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 676.378 142.892 687.198 ]/A << /S /GoTo /D (section.0.11) >> >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 710.192 432.127 721.26 ]/A << /S /GoTo /D (subsubsection.0.10.3.7) >> >>
+endobj
+4304 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 698.236 350.832 709.305 ]/A << /S /GoTo /D (subsubsection.0.10.3.8) >> >>
+endobj
+4305 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 688.114 276.381 697.35 ]/A << /S /GoTo /D (subsubsection.0.10.3.9) >> >>
+endobj
+4306 0 obj
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 116.232 674.326 373.667 685.395 ]/A << /S /GoTo /D (subsubsection.0.10.3.10) >> >>
endobj
4307 0 obj
-<< /D [ 4305 0 R /XYZ 78.37 808.885 null ] >>
+<< /Type /Annot /Subtype /Link /Border[0 0 0]/H/I/C[1 0 0] /Rect [ 78.374 652.468 142.892 663.288 ]/A << /S /GoTo /D (section.0.11) >> >>
endobj
-4304 0 obj
+4311 0 obj
+<< /D [ 4309 0 R /XYZ 78.37 808.885 null ] >>
+endobj
+4308 0 obj
<< /ColorSpace 3 0 R /Pattern 2 0 R /ExtGState 1 0 R /Font << /F15 334 0 R /F22 367 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
1 0 obj
@@ -14026,28 +13989,28 @@ endobj
3 0 obj
<< /pgfprgb [/Pattern /DeviceRGB] >>
endobj
-4310 0 obj
+4314 0 obj
[513.9 ]
endobj
-4312 0 obj
+4316 0 obj
[686.7 0 0 0 0 0 0 0 0 0 0 560.2 0 0 0 0 0 0 571 702.2 706.8 0 0 0 686.7 ]
endobj
-4314 0 obj
+4318 0 obj
[513.9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 399.7 399.7 ]
endobj
-4315 0 obj
+4319 0 obj
[525 ]
endobj
-4316 0 obj
+4320 0 obj
[ 3 [ 602.1 ] 5 [ 602.1 ] 11 [ 602.1 602.1 ] 38 [ 602.1 ] 68 [ 602.1 602.1 602.1 ] 72 [ 602.1 602.1 ] 75 [ 602.1 602.1 ] 79 [ 602.1 602.1 602.1 602.1 602.1 ] 85 [ 602.1 602.1 602.1 602.1 602.1 ] 91 [ 602.1 ] ]
endobj
-4318 0 obj
+4322 0 obj
<< /Filter /FlateDecode /Length 20 >>
stream
xÚ›"ÁÀÀÄÀÀÀwóû
endstream
endobj
-4319 0 obj
+4323 0 obj
<< /Filter /FlateDecode /Length 11571 >>
stream
xÚí| |UÖï­ºU½%étv¶î®î& ˜&Av"J  IL¡“î,’¤cºC@DÜ ""âÂ(.ƒ(ã‚{TÔ™qG™‡apFÒè'ƒ>Ÿ£Pýþ÷Vu6Pç›÷¾÷~ßï÷Òž>·nÝ{ösî©J„xr%¡¤ ¼*oܱÇ?ý3oÔµøÚFŽ{÷1B„‘„¤¤×­+¯8šEHê4̽PßÖÐrôÖÿ±Ÿ´ï°~cCóªú;ÞzêEBÒ¯%$éÚƀϯvTÜMÈ(îOjÄ„e†èÅu®G6¶„WÆ¿.Íŵ×Ï7ë| T%2Za×-¾•m’O2àú/¸VZ}-Zóòq}’W}[{ mJtÃZBæb¿tœÒûÂMD&D/ßA& †£Åô¤^U1Î`¦TŠ¥1D+ɪDPeRQ_ì'Q¢QCªš*l3¶Ÿ,#Â/ÿ‘h?  Ù‰DˆáÂìF’â1+ðyJ,|^2ü¶y “FË‘+„ׄCÂ'·Â?E§è Åbqž¸G|EüøøWñ3ñ¸ø5NgÒEÔG;èeô
@@ -14083,10 +14046,10 @@ R ¸kBXäæ±_"‘öPS°U—;~Â@Ž1~1ncÎÌ1c¼ÆüˆØõ|»$a= b‚Ö[á¬0\Hx …ù$¿Nchäbo
å ßÓëâi×ÂL¹ËOׯÛ+¯Wéºk—ÈëöÒuWJ×^“)_»„^[ ]“I¯VéU[é•Ø´V¥W
endstream
endobj
-4317 0 obj
-<< /Type /FontDescriptor /FontName /GMFTGJ+DejaVuSansMono-Oblique /Flags 4 /FontBBox [ 0 -208 1000 760 ] /Ascent 760 /CapHeight 729 /Descent -208 /ItalicAngle 0 /StemV 86 /XHeight 547 /FontFile2 4319 0 R /CIDSet 4318 0 R >>
+4321 0 obj
+<< /Type /FontDescriptor /FontName /GMFTGJ+DejaVuSansMono-Oblique /Flags 4 /FontBBox [ 0 -208 1000 760 ] /Ascent 760 /CapHeight 729 /Descent -208 /ItalicAngle 0 /StemV 86 /XHeight 547 /FontFile2 4323 0 R /CIDSet 4322 0 R >>
endobj
-4320 0 obj
+4324 0 obj
<< /Filter /FlateDecode /Length 477 >>
stream
xÚ“Ooâ0ÅïùÞ=¤8!h…"µ¡T¬D©
@@ -14098,21 +14061,21 @@ xÚ“Ooâ0ÅïùÞ=¤8!h…"µ¡T¬D©
endstream
endobj
580 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /GMFTGJ+DejaVuSansMono-Oblique /DescendantFonts [ 4321 0 R ] /ToUnicode 4320 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /GMFTGJ+DejaVuSansMono-Oblique /DescendantFonts [ 4325 0 R ] /ToUnicode 4324 0 R >>
endobj
-4321 0 obj
-<< /Type /Font /Subtype /CIDFontType2 /CIDToGIDMap /Identity /BaseFont /GMFTGJ+DejaVuSansMono-Oblique /FontDescriptor 4317 0 R /W 4316 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4325 0 obj
+<< /Type /Font /Subtype /CIDFontType2 /CIDToGIDMap /Identity /BaseFont /GMFTGJ+DejaVuSansMono-Oblique /FontDescriptor 4321 0 R /W 4320 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4322 0 obj
+4326 0 obj
[ 3 [ 602.1 ] 6 [ 602.1 ] 11 [ 602.1 602.1 602.1 602.1 602.1 602.1 ] 18 [ 602.1 602.1 602.1 602.1 ] 29 [ 602.1 ] 31 [ 602.1 602.1 602.1 ] 68 [ 602.1 ] 70 [ 602.1 ] 72 [ 602.1 ] 74 [ 602.1 602.1 602.1 ] 78 [ 602.1 602.1 602.1 602.1 ] 83 [ 602.1 ] 85 [ 602.1 602.1 602.1 602.1 602.1 ] 91 [ 602.1 ] ]
endobj
-4324 0 obj
+4328 0 obj
<< /Filter /FlateDecode /Length 20 >>
stream
xÚ›$¿‡õ
endstream
endobj
-4325 0 obj
+4329 0 obj
<< /Filter /FlateDecode /Length 12930 >>
stream
xÚí¼ |Eú7^ÕÕÝ3™I&3!!áÈLg†d8†$†KÍE€@Hb.•cÈLH„æ
@@ -14163,10 +14126,10 @@ WTÍÇ.¥šÏ¬/†ÞkúKK«+k0O¨/w)XU»…I܃À, ùëêªK+üØ,m¨ VÕûë¹<e a㜣X W—Õ/†ÍÝ
»MgËuv«#K¹µ˜Ý¢³e׳›oZªÜ¬³›–²¥Nv£Î–ØØ :[¬³E:k¨W"YC%ŸÈõá¬~¿\Åê2äZ]§³UW+ÕëYUå@¥ª˜Ud u¶ ]«³Š4Vþ#›¿‡•é,¨³€ÎJç9•RÍ#vež“ùu6Wgst6û*«2ÛÆfØ5o±«qqu4»ÊÊ€èÑlºÎ¦élj¿>ÊÔ4V¢³béìÊ¥¬PgÑ,_gSèPeŠÎòö°ÉÙ¤Ü8eÒ(–›¥äƱ‰9qÊDMÀÕ„
endstream
endobj
-4323 0 obj
-<< /Type /FontDescriptor /FontName /FGWDXK+DejaVuSansMono /Flags 4 /FontBBox [ 0 -208 1000 760 ] /Ascent 760 /CapHeight 729 /Descent -208 /ItalicAngle 0 /StemV 86 /XHeight 547 /FontFile2 4325 0 R /CIDSet 4324 0 R >>
+4327 0 obj
+<< /Type /FontDescriptor /FontName /FGWDXK+DejaVuSansMono /Flags 4 /FontBBox [ 0 -208 1000 760 ] /Ascent 760 /CapHeight 729 /Descent -208 /ItalicAngle 0 /StemV 86 /XHeight 547 /FontFile2 4329 0 R /CIDSet 4328 0 R >>
endobj
-4326 0 obj
+4330 0 obj
<< /Filter /FlateDecode /Length 507 >>
stream
xÚ}“Koâ0…÷ùž]¤8oZ¡H@`„F}¨ N·!¾09É‚?¶i¥
@@ -14179,21 +14142,21 @@ PZƒ0=Âô  ‚0/¼
endstream
endobj
579 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /FGWDXK+DejaVuSansMono /DescendantFonts [ 4327 0 R ] /ToUnicode 4326 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /FGWDXK+DejaVuSansMono /DescendantFonts [ 4331 0 R ] /ToUnicode 4330 0 R >>
endobj
-4327 0 obj
-<< /Type /Font /Subtype /CIDFontType2 /CIDToGIDMap /Identity /BaseFont /FGWDXK+DejaVuSansMono /FontDescriptor 4323 0 R /W 4322 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4331 0 obj
+<< /Type /Font /Subtype /CIDFontType2 /CIDToGIDMap /Identity /BaseFont /FGWDXK+DejaVuSansMono /FontDescriptor 4327 0 R /W 4326 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4328 0 obj
+4332 0 obj
[ 68 [ 602.1 ] 70 [ 602.1 602.1 602.1 602.1 ] 76 [ 602.1 ] 79 [ 602.1 602.1 602.1 602.1 602.1 ] 85 [ 602.1 602.1 602.1 602.1 ] ]
endobj
-4330 0 obj
+4334 0 obj
<< /Filter /FlateDecode /Length 15 >>
stream
xÚk`€
endstream
endobj
-4331 0 obj
+4335 0 obj
<< /Filter /FlateDecode /Length 10706 >>
stream
xÚí{ xTÕ¹öÚ{í=3™I& ¹.3³g†d ¡( $@$7“pS&™I2dâÌ„-
@@ -14249,10 +14212,10 @@ L‹/ª´ø"àhéˆB¸_él÷ë
_Q ‡UzEíÀÛŽÍ4”CÛÛŽÈí*mk]#·¡m[¤Ö`®Üº†¶K6ÐõxX„‹ã¹´kZü´M³Ÿ6AR“Ò¨_¥*mP©o3]§ÒËýô²K3åËTzi&½¤ˆ®ž6F^MWeÓ•dŒ¼R¥+Šèr•Ö×Yäú4Zg¡µg˵{èÅ5iòÅÙ´&V«´ªÒ/Wí¡•~Z¡Òe*½¨<C¾h-Ï KÏÐ%gèâÍ´¬4C.ÛLK3è¢Zb¥ Šè…éô‚ùVù•ÎÿšEžo¥_³ÐysÇÊóöйç[ä¹céÜ-Òùz~±4ç¼yÎz”;/‡Îž•#Ï^FgÍÌ”gåЙ™´hFŽ\ä§3ðzF^˜Sœ-O/¥…9´
endstream
endobj
-4329 0 obj
-<< /Type /FontDescriptor /FontName /WYCBGG+DejaVuSansMono-Bold /Flags 4 /FontBBox [ 0 -207 1000 760 ] /Ascent 760 /CapHeight 729 /Descent -207 /ItalicAngle 0 /StemV 150 /XHeight 547 /FontFile2 4331 0 R /CIDSet 4330 0 R >>
+4333 0 obj
+<< /Type /FontDescriptor /FontName /WYCBGG+DejaVuSansMono-Bold /Flags 4 /FontBBox [ 0 -207 1000 760 ] /Ascent 760 /CapHeight 729 /Descent -207 /ItalicAngle 0 /StemV 150 /XHeight 547 /FontFile2 4335 0 R /CIDSet 4334 0 R >>
endobj
-4332 0 obj
+4336 0 obj
<< /Filter /FlateDecode /Length 434 >>
stream
xÚ…’Mo›@†ïû+¦KΰØÆ4‘…Tã8â+mxwìnevÑÿûîî˜DŠš Äü3¼3;“/ÏUôMš=Fók/Ø™Á
@@ -14261,21 +14224,21 @@ wX´qû==mÙRl Á
endstream
endobj
578 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /WYCBGG+DejaVuSansMono-Bold /DescendantFonts [ 4333 0 R ] /ToUnicode 4332 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /WYCBGG+DejaVuSansMono-Bold /DescendantFonts [ 4337 0 R ] /ToUnicode 4336 0 R >>
endobj
-4333 0 obj
-<< /Type /Font /Subtype /CIDFontType2 /CIDToGIDMap /Identity /BaseFont /WYCBGG+DejaVuSansMono-Bold /FontDescriptor 4329 0 R /W 4328 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4337 0 obj
+<< /Type /Font /Subtype /CIDFontType2 /CIDToGIDMap /Identity /BaseFont /WYCBGG+DejaVuSansMono-Bold /FontDescriptor 4333 0 R /W 4332 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4334 0 obj
+4338 0 obj
[ 28 [ 603 ] 35 [ 544 ] 43 [ 544 ] ]
endobj
-4336 0 obj
+4340 0 obj
<< /Filter /FlateDecode /Length 14 >>
stream
xÚc``à
endstream
endobj
-4337 0 obj
+4341 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 852 >>
stream
xÚmS]LY¾Óãʈʦ;0sÅ°b[¢£Ñ!¨¨©Y‰ò0¥ÓvdèàÌÔ
@@ -14284,39 +14247,39 @@ xÚmS]LY¾Óãʈʦ;0sÅ°b[¢£Ñ!¨¨©Y‰ò0¥ÓvdèàÌÔ
Õ|M -¶#=Ú´øœÌÎìÇJ…À×jã 6eF½>'0ªTžCbddt Yãàlø2ž•ZöoV*99­éÕ‘!Ÿ93ŒD£§cƒ)|ù'ùa½
endstream
endobj
-4335 0 obj
-<< /Type /FontDescriptor /FontName /HSGBBJ+LMRoman7-Italic /Flags 4 /FontBBox [ -528 -292 1571 1123 ] /Ascent 1123 /CapHeight 683 /Descent -292 /ItalicAngle -15 /StemV 123 /XHeight 431 /FontFile3 4337 0 R /CIDSet 4336 0 R >>
+4339 0 obj
+<< /Type /FontDescriptor /FontName /HSGBBJ+LMRoman7-Italic /Flags 4 /FontBBox [ -528 -292 1571 1123 ] /Ascent 1123 /CapHeight 683 /Descent -292 /ItalicAngle -15 /StemV 123 /XHeight 431 /FontFile3 4341 0 R /CIDSet 4340 0 R >>
endobj
-4338 0 obj
+4342 0 obj
<< /Filter /FlateDecode /Length 370 >>
stream
xÚ}R]kƒ0}ϯ¸{(´ÖØÂE„µ]7ÇúA-c¯6¹vM$Ƈþû%±¶0º ŠÇsÎõÜ£ƒ‡]<suÄ`:¦°ÇFµša°Xç5 –ŠµJ³AäÈ{¶™ÁN+–¡á"]¦R˜‘§’•-Ç^u_4Ç“7‰{ ø¼e¯óù{ð±Þ«*—OAjòR°€:ÓA˜ÒŠÿÕ%á> ~È'êF(9ƒhL)µ^$_¨Ê­×ðÂ>t!$×—œpt©I4.˜¹ e•íÉ™³sc°Je¡HC¸·dcôÙg‘p«9j!O0¼ÑJ²¶®Ktq€’$Ž…lûÙäBèvO¹e…9ÿQÂÍr8×£..S›:g¨syBÛ
hñÊ AÉñ´s‹ZA;íök7'ZØ9”>F‰C“i‡&šwhšt#¼Ç½ÍÕvݵZÛÅ|·>¾ .$^ë¯Uí\þôß­ÿÚ®ÈP¦á|
endstream
endobj
-567 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /HSGBBJ+LMRoman7-Italic /DescendantFonts [ 4339 0 R ] /ToUnicode 4338 0 R >>
+549 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /HSGBBJ+LMRoman7-Italic /DescendantFonts [ 4343 0 R ] /ToUnicode 4342 0 R >>
endobj
-4339 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /HSGBBJ+LMRoman7-Italic /FontDescriptor 4335 0 R /W 4334 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4343 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /HSGBBJ+LMRoman7-Italic /FontDescriptor 4339 0 R /W 4338 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4340 0 obj
+4344 0 obj
[758.1 ]
endobj
-4341 0 obj
+4345 0 obj
[892.9 ]
endobj
-4342 0 obj
+4346 0 obj
[ 28 [ 525 ] 50 [ 525 ] 55 [ 525 ] 66 [ 525 ] 72 [ 525 ] 75 [ 525 ] 77 [ 525 ] 81 [ 525 ] 96 [ 525 ] 98 [ 525 ] 105 [ 525 ] 110 [ 525 ] 112 [ 525 ] 116 [ 525 ] 118 [ 525 ] ]
endobj
-4344 0 obj
+4348 0 obj
<< /Filter /FlateDecode /Length 23 >>
stream
xÚc``à``PdP˜âÀ°À©
Š
endstream
endobj
-4345 0 obj
+4349 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 1970 >>
stream
xÚV PT×¾ËroWYöºŽíQÎ-UB£<JL|Ð:ˆÊ£aµ>ÒÊÂ.»+Ë^Ø]–·
@@ -14334,10 +14297,10 @@ n¦(£Ô»ø!©sös.Ðw’ûõ ˆÐ#rÔo>Ë^Gûðr´Ï!¼^DûèÛ|ã³…)—Š@/#ˆ"É T×ðsƒ`Í
endstream
endobj
-4343 0 obj
-<< /Type /FontDescriptor /FontName /OMFOSG+LMMonoSlant10-Regular /Flags 4 /FontBBox [ -477 -316 786 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle -10 /StemV 175 /XHeight 431 /FontFile3 4345 0 R /CIDSet 4344 0 R >>
+4347 0 obj
+<< /Type /FontDescriptor /FontName /OMFOSG+LMMonoSlant10-Regular /Flags 4 /FontBBox [ -477 -316 786 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle -10 /StemV 175 /XHeight 431 /FontFile3 4349 0 R /CIDSet 4348 0 R >>
endobj
-4346 0 obj
+4350 0 obj
<< /Filter /FlateDecode /Length 437 >>
stream
xÚ“Ájã0†ïz
@@ -14346,112 +14309,83 @@ u¢kš
|Q”‘4¥N.¿›Û[Yý4rá¢Ò^®ŽåÇx¸4@',kmSr0¥:Y¹q°”®¶îJ (ñ+ÎÐu<!:ÁðšÌ†ÿ,O”d.có$õ4 ÍHó@÷}l‰ô€”!=#­‘ÖH›@³ihÎ-&H˜s1EZ"Ý#mÍзè}X‹“z@š#-Sì5ôæÇâ÷ú{+xgŒÛ‡p Âœý„¥‚ï3ÓèÆ»ÂÛðxÚoÉ,x
endstream
endobj
-437 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /OMFOSG+LMMonoSlant10-Regular /DescendantFonts [ 4347 0 R ] /ToUnicode 4346 0 R >>
+439 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /OMFOSG+LMMonoSlant10-Regular /DescendantFonts [ 4351 0 R ] /ToUnicode 4350 0 R >>
endobj
-4347 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /OMFOSG+LMMonoSlant10-Regular /FontDescriptor 4343 0 R /W 4342 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4351 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /OMFOSG+LMMonoSlant10-Regular /FontDescriptor 4347 0 R /W 4346 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4348 0 obj
-[ 27 [ 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 ] 138 [ 525 525 ] 162 [ 525 525 ] 201 [ 525 525 ] 245 [ 525 525 ] 251 [ 525 525 ] 265 [ 525 525 ] 271 [ 525 525 ] 337 [ 525 525 ] 341 [ 525 525 ] 420 [ 525 525 ] 564 [ 525 525 ] 568 [ 525 525 ] 602 [ 525 ] ]
+4352 0 obj
+[ 27 [ 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 ] 61 [ 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 ] 138 [ 525 525 ] 162 [ 525 525 ] 201 [ 525 525 ] 245 [ 525 525 ] 251 [ 525 525 ] 265 [ 525 525 ] 271 [ 525 525 ] 337 [ 525 525 ] 341 [ 525 525 ] 420 [ 525 525 ] 564 [ 525 525 ] 568 [ 525 525 ] 602 [ 525 ] ]
endobj
-4350 0 obj
-<< /Filter /FlateDecode /Length 44 >>
+4354 0 obj
+<< /Filter /FlateDecode /Length 48 >>
stream
-xÚc``ÿ
+xÚc``ÿÿÿÿ÷ÿp€Á€„@›Cb¤1À
endstream
endobj
-4351 0 obj
-<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 9128 >>
+4355 0 obj
+<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 9105 >>
stream
xÚÍ{`ÇÖî
-[+Æ€…ÀHɬI€Kè-¡†^ Æ@ÀSÝ»dËݲä>’«Ü›Ü+`SMÇ¡‚è“B 0nBê,wœ÷ÞJ2ع!÷’ÿ–ÿa£dµ»3gNýÎ7‹°¶&X,Ö%.›Ö»,³ÒÉI$š1n­§·<`§Ätk=Œ~Ú
-‘Äßù¯Ä3Às§ÔÓÃAäá)qùx:,]ÿÑ:‡%¢ ™ÃJ_wÏ ©§Ã¸qROO™L<s™Ü{¼Hâ=Á‹yF:!Àòt‚é½qKœW­·rùÂÅ«>Z<^*sðI<<e;}¤ãÿn‰]—«D’Àó=DnžË=<ƒd¾²0‚ù#d´ô6Šp †ïïÉÄHâ/Ä(â=b41†KŒ#ƈ‰Ä$b21…˜J¼O|@L#¦3ˆ™Ä,b6ñ!1‡˜KÌ#æ ˆ…Ä"b1±„XJ,#–ŽÄ
-b%áD¬"œ‰ÕÄb-ñ±ŽXO¸ˆÄ&b3áJl!¶ÛˆíÄb'áF¸„'áEx>„/áGøD Dˆ1LH)!#äD¡ B‰0"…€D9QA\ >!~&~!0ÑÉêÍêÃêÏÀZÃZËZÏraU²ªzMíõ~¯é½fôÚlÅ8ó'Œ3¹ˆ5CüÖǬ'½æöºeµÖê²õdë
-cIßXu@…ût³ÃÈH1ô÷«‚…b‘Õ°¡Q}(ý6OêDZ}äÐÏ¿¼¼Káyh$«§OÛËÕZY¶«&Žk›`p6 ±†ƒÝQ#’y[èÂF~ƒFD†ÀÌP€¼9Ÿ:Š¶Ž„ó‚ÊÂ*
-ë3Ž‚Ôšb¨~vØo…g%cû-ï xʹWžå¶Ã½­€7Ï·¢6
-k*`£ij‚/ƒ!î
-Àk ÷Þ…«Ý÷{¾ ÐP¶J2õ¼íNÐfEGÓïðÅ0L3¯RšW”LI—~ ÚUîÕ¦8½Ù^wâ¼àRðÍ¥k6¹Œ[—·²`ˆŠðòŽŽàŠýb=|³.ºuzßž†jà¹ko`‹ðJõõ–]Š’Åñ”r”"Tèã»·(šj<[Úššy½m_Gæטïòƒ"7­ÃÃ:Á©ŠÚòÝpq}øÁŠ ‘·ÐSùq㾬²–CTžøè´Ò ®-½œÞÇÇÓ>‹KUÁ¸¤¡xÚlŸðŠ »
-†¢14ÆqwdÅIŸ¢¡¶´#ºÏ/Š(
-Ž‹S©@Td4T›˜^NåÆ(ô¾B©8&DDmñJŽ„†åefêt ¿ ¶¢D˜–QDÅä–†ìVTçêk¨#MÚìl-²
-¡*Xˆw­îÚƒkVôäÏ/ÊŠO˜uîç3ìò\X˜!(‰,T¨’’
--㥅%ãV‡ ¨Œù`j»Çü ²¥e_òëalXŒŽ2©w¸»ð1?!ô—ï¾ýî`c°W>•¢“g¬˜‚­pŸ«3ÚsÍ»Q^„ßÆý±=^‚£~X€†=¼{¶ŽrFRþÌíëݶºŸ»õÅ¡Öý‡÷­ž˜hBbÚh°{`D2£‹‘×B‡ Ùüs^W'U‚öªºsÇÆUw°À!d¤ˆ ¤j&ª:åÁÝW(…äÉyîÑmj,ÚË÷/ þ‚6"[’wûNéª
-(kj‚å¥ °~oØ!!²zöÙQóOv\¶`‘Ç'Á5ιsÇÎ_=·t*°u
-yQ¬`¥ÇZÑ^ÛøY‰Y)Œ±¿x±”“ *–
-ÃB#eê4µ&‰BŸÿº„’«*—”S]o"ù-+tÊ—ÿb'6{yB¯ðë,Žz65æ\`f@!¦_æIã {´ï&~½H£X …{ªh*§û¨œn€GKL—•° Ñ‚\S"
-†a’eÉÁ›¨5ps¨
-TšæªJ>¼²”m[®eV ýjR²˜!“¡·Ø4d(Ü|:|ä]ÍsK '’ b,鲸ò²¶ê8u¶3Ë]¡¡Z]­©§l§^™yƒ£…nâ7ˆ`À£_ÑhS
-m4]SØ‘ôS©}©_—sü²T»
-sã¿Xn±1óø+#£Ñ¿
-ñè׎d£.k—)ÒÐ`·ÏˆŽ´Ï7òÓ¡èCþ.1ŒM„ÁÉ
-`µ?à=—ÇÇøFP%²mÕ«…x0Boáexê…ßFöˆýàÞS³{^6°®QÀcÆy‹¯ÔÉ££ \"ãÂw.~°äêýõ¿ ATQ~Jš°4Y“¢Qq}S«c …Õ¥¥Õ·FÀ-xþ*,œ‚mÿ:
-õGïÖ[@ÙBÄC‹…\Ï
-}F[ñ›ªý½Äþ^õ↦êú€ÏXÿî;[Ü'Q–÷FY¡ïªøg½nñúyU‹›235-H‡yn 窒Ââå‚È‚°’†N!kS”Órës#Êf,†Zùhêûh4
-°{wë;å=b¹“hÈ×hšÊ„æ®Á6`-D"ò$`+ÊR Ï™Øn—)€y‘t^ƒ¥m§5äïB%Käîå.Bl5f Hñâpÿ‡£Ñr°hϦÀ𠽫¶LEÓø¼ÆõÛfÎ[²úÊý†Ë7ÛŽoXoŠçÏ + Èë|ðWÃç
-»³W~4üp…wåc¡ùüó°}@[8ÍñûÂóݸñ juˆ  2BŸ·+óÐ'î÷ðÐlv?(Ž
-îLû Û`›i³g,¹¼õlà]w ¿n¦à½Ž)ÈÙu<x¦ fþ:ç‹ø³ØùàÇÇ[´··nÙDå3dùÊfÞÚ™+O_:¦íþקWQ¶hÝ­Û·XM´‹Aä7{˜2Ñ32Êzzí9¢Éœ=°‰Âc¬›¼¡`šTzC/Ͻ0ŸBÏÈü½°™ Èï ¡—3¹Þû{+t‰¾À?µ#M­Ú™è2q¾v;P£ Û'ܧ)Ú¥¡ÒÐ\¶ædZëIAgŽu¬\$’ÉD¢rYMMyy¹œz˜~YßÑ`ÆÈL^Ž¦•ü—†@Fˆ¸YÄCC§Ü¿û
-M"ók™Š ‚‘ÔF䓯õÁÌ­„`š¯Õ€l˜|êÈDörúÿ 9gæŽ `ÓŽyxSì=í#ɨ Æ+Ì“ÕvO6µ¢Þæ˜3.…{&ož×Ôqª>B/,©Êo0[w§™i’Áîž©¼ét
-ͦkˆðSìTu¢6N(‹
- “”¨ó(d·‘”‘•œ!Ô”•R¶7Cè4ë4=ÑŠöAç˜ujæÅÈŸÍô (SDÊyªì8
-íÆKña¼š˜¤ŽHÊ¢ ÒÓµÚ €LOçfåd–
-^[Ö]#ò`Ì™ÚÕ-Jiy…¥d®(lKFwJÞˆ=ÐÆßÞ}eùŠN¹´G;iÛý””¶X,í©ë.eâÜK”»šâUD
-òÛÍ-3¶l ÷óhÅk°®|{çý Ûy·£ùä_Ûw;–/] °ÔŸÓÚ£-^m‹ô·^êñ,¿Ù Æ
-oÇ:6ÒéÍ’›ÖMø#Èö=ùê™4ˆ‰D6z dz•A]÷ow{$S48ŒÝ FŠ´®  ñ´õEÖìÝ=Üb÷ø$‹ße£o-ZZÞíG;å®=¼bb·÷¸Þ"oßd >Ší/eVTkª»6¯ä0iâg#ŠfÌy€ßÁTº
-¦ÒICÁMË?î^3žÑm‘=rïî+Ú¦«9èáÊþ]Kƒ_âп³¨îq}¿KžžÙç!¿4Z› ðn´íBËØÙ™ùYzA¥</ÀhÁ@‰vìÁŽQ+ãE¾*+É<ØŸ™¤K‚âRSi‘èJÛ/mÏ=g2BIkÓrN]…¹IŠ¤Ö>±êÀXj5^íí04…Œ¯­W6:"WûÚX•Î[¸Æb€
-XGuÊ9Ò.ÄpÇblfDŠöÖpÒ¥º ]Ðìa“–\'¬ËªÊM£>AëÙ°üfzÐtz“÷n—#8ìN´!Òô;è-Þ1s~’C¦ûŽå”Ad=9ÖnriÉ¡‡× e~êà Š÷Em¢† ý,:,ƒ»)ÜÊyE¤=ìfÙÐ"ïØÝý‡÷•æE9ÎQuÅüõß<ôy©ÆGmHÂh1ÑýfÛ=ó²o
-éŠ0Ñìæ¨(.úìMôÈÚ´¯†<ŠŸ žùzX!¬.Öì§hM§G¨8›1ûj7òúäÍ»Z“RäöÛf§õän^í?ÉÞJƒ#ãª5Ø7¢’»ÌÌAè")1qk$f˜Æ
-`¶À4SCBj°v
-ãƒø€^ŒœÐʲjt
-o×Ǭϣr¶ÂE΂®ÖÿcFõÌè¾&ZjÀ¸o1³ÇÂð€§£‘5²~ú
-“Žx¢ÈWT&¦0Å醅ÌùŠÚD L4QOƒ %zš9æÆ÷þaÔé¡&dF•ÏUfåÁ|!ãöÅPŸ‘œ*>Iùo)-jÎjšÑ
-/Ì×ðñÈx'? ØvŸ—C„QdT( I„ɇ'QrLô®3**îˆéá3ðºî(8“[Qr_ø <dm¥s…ó7
-^:ðE«ÙˆŠÑöâµüéJ%-í³"
-»HÁfR@®ŠŒûÖ¯N•1kîì÷××zeÇPû·×ÅÝ
-ç&e_Hòj/*J6ú
-6ìøh¾›»®P ¶Ö$îO)ᦤ”ú½ LAa>'ŠÊtyu™Àÿ°AyBˆ¸7¾~h¢ú®eìnP¶ÉæÛ‘ÿX@½´
-©Iø!‚[•øYô&A@ϘUîús
-P—˜#²ˆ6Ñ,YA~fMð9~–
-ÑÌŠŽ½ÔK
-û%ýmÿôw:îàŸ7ïô‹|¤ùžÇ“ÊW*
-ŒäÆ%EÆ…š‰í²g­ˆ l³CèVëñ˜¹(Þ²€3|›,Œ ‡*“0¡Ô6Ž….ÓW”F®^î:Ïg&w¶Uã>[ÑлifW!HCrÄBK~|Î-)NÕLTPí¥h¼#Áî"åÝõFÞ:„­ç#öä‡ØzÝÆPo7€†<øò¡PW #
-©ø¸$¥JÀk”Éj«KKêûŸ…ÌO슕ÈjÞ€÷ b}÷%êÇTÄ+Ö.ãûËù3gNÜþü¤ãÂßnU½n.%RUhlÀŸþº€­Ž€)qYIdq…®ØTJ>eJIV!Ôd
-l» r• 4ýšN'ô ‡˜Ø8j.çmØŠvÊ7öÈy‹z°L÷?°'Ř`æ/ú+옴íFÞ3z=âówCe„"Ù?¸&»Ë}…óak…BÑ”<à”/ÌÉðnšÝbÖônFò.Ž$ß½ásý««mFЃ?~¼â1|Œú·y~fùŽÓé-zpódæ¥jÁí¹—Öùæ¥/ó¬.)'!T7`†ðZ‹—›(ÚÍCB‡‡¥lIâz$+le‚'€g<@þphñÆ•kW¿<7í¨¥MÍÐA­6ÛÂ<V*ôÁRY¤ï”'kÑ@4øþ£§f§dBþñVó^ÿm:à
-PßQŸâ€ç€{ÏšõÅàÞËLü˜)uzufB:u¨èPÕ áçÆ­ï/^ïìîGáX&?«ãââ"MBôu÷>—ÒÀºa4m’ÑúW|‡}7_\‹’ÃWnpqYyò€Ööè”óÔ|0ñùóÐ@€ž¼ä?Ì[7­&´wÍxÈÈ èÑ×Ü~ÍÆÉ;6mNŒïX[PÙï™*œFŽ»|{÷¾ôºƒ€7/0­ »¶rlñè[,Ú³ÿ •BŸ4°ŠéH+:•nç7Á(ðŽ%C—Ã]ÔbܽA>1Ái“Ëâã«ÆÑCìw•wuÑïX¨‡
-æI4¨3í‘]
-k„UepŽB|º½Ët¸Â¶0„æX´ØŠN²œ›`tÚ§›¶¨"‡cÃpd`Wõ¨}zÀkõÂ÷Ù^¹åP/,©„{˜ôB_³k»ºiË"ré$+Z÷²KíQf*ÈøzܺøI›M˸°¹Äår‹c0VÈ|„ÅRñÊmx}òŠ¤½ñ-ñ‡w ¯íË»ü, ×Uu”†¼Ö™ÃV¤¦†4 ue°"›JÍ<diûÓÜŽcYšš+Ë.g’ysjY±–ºFç²³ÍâY–_H+­ètú]Ó±&Söë^þqr+>ÀN!«#N«ë¸§" ½„Þ‰‘k"(¥Wô–D 7…Ü„°÷ÐN?K-¯€5ÔYüÛ3³ŒÉõS³ÛŠ¨ò/4¥š|®†L9eȹÎE©Ñû…Åe°9“:‹¾b›¼t%.3f2‡œÄo¡|D 1»¬»Ÿp°ÌR õÔ
-,XŒì¢ê.ÓëÖo‰¸XŒá|¶¼bübFåÔ=´ò^ÉwñP?÷dAX´ª«Ms'q4‰)ÃÙûzð`}_.µ’Z6~ÉcvEEW÷òŽek
-¼Êa)@Ï_1‡¦\ẍ”FÓ±Ñþùî<±Žƒ è;?2=¨e†–\»g¨b€&R’Ø€±£¢¡JÙ5É ’ÇíqzuÔˆ™UˆMÍÓªh¶Æì‘X€ñªïñdØÏ‘
+[+ƀłÑ&³&.¡·„–ЫÁÝT÷.Ù’,WY–ÜGî½Ë½6ÕtŠIaR%ôpBÊ,wœ÷ÞJ2ع!÷’ÿ–ÿÙB°mæÌ©ßùvà––Ç´z™Ó² +F-stˆ§Yåî)÷Ûd¼´˜¾­ûÁ¾ÍcA–±`í-µÖ<<ÒÚ₵eÇ:|åEÐß´ü· ‚—Ý—ûî¡íÏ~oý÷¯©Ë­‡OÄX#¬z<bññ-ñ7n\Ïš7àõÓN;~üäybIh·§—Ì~âøñ“F¿§ÙÏkï°ÝÕW¬úzÛop³wkï8Ö~¹XÁõ¶!°wq÷Úîça/ö°_í¾Þ^.u’Ú{‰åé{cíW{yKíâ _{îï w?÷íRw7{y€›{½ÌËÝ~ÑšWÛ/Èì—y»ºHÝíÇŒ±·—º»Û{Éd’éãÆÉäžcÅAžã<¸{¤ãüÌ7IÇŸ³Ðiùê1Ë–Ì[°üãce!2{q½›»l»·Ÿtìß-±óp¹8È»ß7±‹û7÷
+2ˆGTÆF9ôbtùh,©Ã÷’CßjXðò*ƒg£ÕîOV!A#›ºÛJK&˲µ1V6qz'=­¨·=l@rƒp[ØH5H`xD0ÌÈSð¹ÓçØ~óp8; ,´¢°>ý0H©)†Yô}–3xF"¶ÛôžH¨šuÉñin;ÜÝ
+„³½+Za#]SS” »*€°1Ìs Œ§W¸4î9òlê§elTz¤×#[=ïYÛÍ6ԯ͂U²ïP¦˜V)Í)Jd¤Kü?oˆ,÷hS²ºÖ^wì¬è|àµE+7¬³:oYÁ6îá© ·’øD»y‰><<ÿúÉ=»ªûŽÝþ-ôÅê+-;ü!'JbßÄHEíå½»HÉ4ž.mMÉ8ŽÞ¶«#ókŒŠ‚·¨€pÿ +Aø'ð`–èDEmùN8‚˜Ž^T "@ìI»«>iÜ“YÖr€É“žR`eÃ.a÷PxÊ1)j“0OùÐ+¬bÝŽ‚Áh”rØQqÜ«h° ë€îREáEaʘµDFHCèèø´Â0&7J¡ó¦¥’¨`1³É#1:ZVV”—‘‘•ò j+JèìÔ¸ð"&*·4x]Q««a5%gg‹lE0;OÁCÂËu—ï]¶`7!_ª4236`Þ™ŸOñËsaaº¨$¢P¡ŽKHˆ˜XÊO®Ôê«E™p§—ôÒH´ÉA`èY~†21YM+"ÂC¢Ò¢Š£™Ÿ?²Š/‹‚aq¢‚ðÒ¬´””4€ˆsüÄ $‰H½vî„;3«“ô‰•àáj~DE2祅% çVõ¨Œûâh»Íý°ae_Suþ0:4*#LêæJ¿3ê'dþòýwßïo ôÈg2•ÁYAô´¥“°îuiZûÑo÷£Ùç
+ÇóñÛ¸/¶Ã ñÔ‹Ðû·N×1NHJMߺÆe³ë™ë_hÝ{pÏŠÙ€‹&$Ñ£õzÛ{$3¬5[Ø`ô!uÆãÒ„JÐ^UwæˆÈ°ü&¶
+º¸ŠK¿›ær‘VÍM÷UçªJ<¸¬”mY’Ì­4úøÕ$erC&BO‰qȸñ¤?øØ:›æ‚îxP"ˆ2§ËâÊ ÉUG™ÓuðˆIî
+x
+M~ăvíŠc]‡¼[Œ#W ú A“¹ÐÂV+±µ=Çʈ<ŽEØ‚1WÃ3Æ
+û’È=æW:ZvëyMTÄ)4iŒÕ-`ë®6bù¡ÆkîbzÖ¬Ñ_Ð{7ž··tž™ÃD$'‡6þ¦ÎÈb#ÄJP"ó¨XMc롘ÆK°ãØõ>½§¾¨ˆ ÌVU›ìˆ¦
+t¦šŽCΡég—Ÿ;|­=g«78~êh ÞbÓÙTµ¼~­lkl€({çxÑcæÌä‘ç[,eÔáÑ¢í:qr"X´=Á!B4ég'®ÌØþÒö z/ƒ`>)<®Q sUŒ:+!/O”
+sÓ²@Du½ºž~l¸öMƒº&¬Š)Ë-HÎ×Z¦ë4ùtyIqWÍ1Z³mÛúõÛö·¶îßìØþmkÀϘ¥\lþÞܽû›öKmä}ăS›kÁlª‚w’oÁz¡3ÊÎÒ¤|ùò9䯅¢PE„L‘§ÎŽaÐN¼Ä+øñ šØQP™² --99 ãݹ™9¥¢W0•wË€Ü8ätö}RV^anê¸#Ûá._×c7´þ·W_Ù°¢C.íÖÚtÝ%å ª–H»Fê¼Ê…8ó¯®à„xUí‚üncË´M›Ã|ÜZúÔ*ßÚÍ ?èríhù×öGŽäKW
+Z°k9¹LNK°rDtÅ:Þß-rLt;Þoº1göÈë‡YáYv[ç`ï æ’Ž‡u |ÜÊ©µki­æQ„ãñpVGý>?rN¥ç]x„æprJÙëF†ìإ훣È?ŠUDoÕêÄ 5=%­@TZ&‡(ÄK.lyvçα'€W+(0i+ôl¥QÞÃ6?ºùÃlƒð
++p¡Ø¹°òƒnVØ1‚ ‡îžÀ;0
+S»Á¬$½¢5þÑÌ
+¼Xéªt‰õœDÆÖF׫³]m´:Ë“^i6@¬c:äigí¿i667"ÃzjiÒ¬€¬€‹ØÍ.*53°Ž®Ë¬ÊMe>Ckø°üZZÐvx’÷l§#8émµ!Òøð–ðˆ)?É!×GG Ê ²œí 7¸€Ôăkh™&0€~U¯€¡´Y‡ep'ƒ[¯(±û]|š/¹µ÷àžÒ¼HG€Ãê€Î˜¿ò››þÁ-/Õø  qZŒ7F¿É¶D÷¼ìD:#{L!–ß åôü?ÌÚD·¬ÍzkÉÃØQ
+ººX»—aµ‚n¡âdBß+Œ,Çë“·ðRMR‘ËoÛ–Ö»…µÿ${«ôhìÕó¨Vo{Ô€Jnq3 sRaâúpÌ6…ƒÄü{eˉ¼}G
+Õ&Ë9ð\V¬e^Ѷ\û4×°ÉP`p[ø„-yBíCu4—¥’@l¢gD<täLWW
+Æ¥ÿÔ¢¤ÂÎö~ ©½—«•þ1`Ïš)A4æÍúðý5µÙQÌÞ­u1×ì²/…§ÐÂÚsŠ’õÞ¢uÛ>žãâšU(›kâ÷&•X&%•zÑP¦`0%ˆ€’†²¬¼º à{P¯:F#««ßÜ7’võˆÑËô¶Wõ([Ïeó­È–:âW/-
+¬¶§/ÉiU5Ô<xâ-×qr5̤…ö&AõáW&"".*&”¸o„a4ž1^¼v4WÃ쮉{nUÿ…rƒÈ/ÀkÔrWÝ(‰Ï›Eo’¬ ?£&x= Ki4½âánæ%ý’ȶû"; ?¤ÎJš·{JÄ^Ò|÷£‰@í-ûGXÅ$DÄ„˜(겧­ˆl²ƒÙV=ï€áˆ©(^7ƒ3|ƒ,Œ ƒj£0!Ì™øÒU”J®Xâ<ÛkºÕ:l£Á½6‹”гi—vG!HErÄC |fURœ’\ 2’:µç¯¢±»…T·Ö„«9¶†Bü‰÷±åêõ!ž.
+[á ö‘Ï,X¿lÕŠ÷g¥öb’SÒ³`rr¶™C¬T襲ïIW¡þhàÝOL(NÅ…ü£Í¦·ö7X¿}Tm'«,1¯‘å½Êr«¦]W/|'B½G|Žû¡=î9cÆŒ°ŸkC47ñ#®Ôé4qiÌ¢UÇè/ ›ß_°ÆÉÕ‡ÁÑ\~ÖÄÄÄD…,è›®7V*=ïªÁøº‹Õ½â;캘ßZ|ŸºlÝڵˎ?è~m·Nù7w=&qÿ{ãŸ=»÷
+L™å=ÖÖTö{¦
+§’c.Þع'­n?ÎöO-…ÅtçK<ò:õÂü@Cå³Çõ¼b6‚MaÛ©†
+Dœ>B‡sò„䪳¸‡k¹L€ÞÆ?òµ‰©J(‚²@î 
+JÌ(±Û™”J‹CC$®õÛŽ_nýôN-ƒÞcWò‹j`r“™œŸQ&êÔM›UqRÊ÷Qßv½üœ‹‹¨ âgÀôlQ“ *
+p{G?:ÆF‹<Êa)@Ï^1‡Æ\xÄ€T_ãñ>êl× î8K€ôè??r=¨y†{朻f¨â€&R‘Xð#•P­êœä)´ê¶wØ€¹UHŒÍÓòah¶ÄüáX„ðòð d‰øÏ9€99æˆ{~ô‘#ê…†¢a¿½zõâH<¼ÜËf[Ãz úïîeCTFá^ûc“c`lâ`Ük›§²xÍ®œÁˆ×ˆx>»TÅ­^yƒÿ—w¼ ‰£ès
+[·«Ó£ :–“r¶OpýÆÆÒÁÏ?}îب¨?ì£üR‰‚Ñ “&…÷þ»ªÚ=B…Tidº2 àA'ø)šøäZT¢É‹cíz~Bzfb:­+(+eºtzÕ$±Y±ÿ[ñ{ÅZ—¡‹BäWo&* ^ÆÍ7wÿ…Í7?½vóͼ± 5ŒR
+å‰@hלX)¹„îž\
+ Î*}ŠìáÍÒ–9 U ìñUåéËíŸíÃÙGbCᣠŸþÅí:Œ°ÜøÑ@Ñ)ÍoeBÛWâ
+‘¢@®KÏä€3@¶Çøyi%™•¢W;DÌniÚ&"|ðoÝ'"´ E·Þ\ ÿÝ3B[¼øèr¤Yof• ú·j, í{ƒü÷JMëÞ6¬{˜hÔÔOÞÙšÿgëEàƒ/&PÆýRAÁŠÀ ]0×Õé*rø»s¯4vå!§3íÃãÚ…ÿ½ž6OE'_#ÎG¯çÿŸxübÊŸ*$ÿù€ A B"¼³åêÙ iŠ‹Þ îÌ`©¹ÉþG›–±o[¦õ|Xh(z(|ö/­J8Ǿ˜ñ†!bZÜm‘ÝÃ|ƒêáÿx#Æd¬buoæ*oz7èßþ&.óf¹”+å¦×uƒþüë:¡}2ºúOmjâdlMœÌ ÿ'ƒ£ao
+­ÿKÌ WËz¿·¿ÔLÀÃ_ú8ýÐŽÐ_Dƒß¸P8uÆÁcƒ§)< BÕ?WU½êÏèŠø­²(·¼qÐàÁ-¼-è» V6’B'E°X&‡!œÎáïСnÇ'~iqõ€%Èú´´zÆÆøßû±´õð· ‚˜aüï.¶ªv^ú(?EK‡Õ~ã¬{BëÞú^†ÞÍ…ÙZmrrª¶(9ÓÚº©<9%-5¹P›ÕŠôÖ}ز¿Pÿ ãhÜ
endstream
endobj
-4349 0 obj
-<< /Type /FontDescriptor /FontName /FVYUVB+LMMono9-Regular /Flags 4 /FontBBox [ -451 -318 734 1016 ] /Ascent 1016 /CapHeight 611 /Descent -318 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 4351 0 R /CIDSet 4350 0 R >>
+4353 0 obj
+<< /Type /FontDescriptor /FontName /TLOLYP+LMMono9-Regular /Flags 4 /FontBBox [ -451 -318 734 1016 ] /Ascent 1016 /CapHeight 611 /Descent -318 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 4355 0 R /CIDSet 4354 0 R >>
endobj
-4352 0 obj
-<< /Filter /FlateDecode /Length 855 >>
+4356 0 obj
+<< /Filter /FlateDecode /Length 852 >>
stream
-xÚ}–ÑNã8FïóÙ $æ¢Ó$Ž¡JmšH•–™ÑÀ ÝË’6Mª´½àí7Éù
-Ò,;H NíØßùíؽøãûÝlYw~f>GáèN}ågùív\\¬»ê´óíñ«÷µ¯Ï­‡/á÷¾«îü1¼Ì7ëMÛ? 7mõrªý¹×ÇVþ¹iß»Œó„—÷þ¯Yùð÷χÕìÏÛÛ®í®g?üóéeÛÏ¢ñ¡ûæø2tþm¿ph ?n §A|hºöKŽ¢hø hë¼Ûz‡`®ˆáüú©ië^9ÃÇ1u'aÝTGÑô·Ú u¾{=ýnÓ>uÁÍM8fnÇþuÊü)˜ëkß7ísxùqÄ¡ËÝi¿ñcœ0
-‹°öOÃÈC}¾nw>œî›zhmŽ¯ÿS„÷Gî_÷>L&Ž‰[uµ?ì·•ï·í³n†D‹ð¦~oë_Ú#žz|‡çãè­­úgÛ#Å«a¤(JãÅDùDN´ž(qP1‘- r¢ J"z.¡˜1#(È0ƒ(e̲Œ)rÐ
-Ê 5tÅsj»†Ô¶d>áçDø唟æÃ/M!üdä'’Ÿ…ðs"üÌ„Ÿ!™Á/¡º¿”êüœ?£1ñ3š]~$?‘ÖÊü kdä§dòƒRù‘3•ß5$?~)Lñs"üRV%ÅωðK©uŠŸÉO$?e‘Ÿ¿£?'ÂÏ('~ ënñ>œ?'ÂÏ°*?K-~™HëGÍ,~ óYüVÌâ—Ìâ—P ‹ŸÕ|øe"íO%Óþä]±ø%¬´ÅÏÒæðËDøYÜ~™Hû“,Nû“1~†=èäG'?*áôþ±#~™?£ùð3J†Ÿ¥J¿L¤óEóÉ,™üDò#u&?‘Ö5Ê´~"ü,+–é|ágÙÉ~™Hû÷+ürŒ®ð+ %Yrz.ÉR@9£äÙ‚#y:“ÿÈ9Ãè”DÎ Y¹1uNÈ’ÒÅ‘&[ASDió©(qLi H¯F^@è"e)!e–zBô,'Jt®WÚDzC¤.¡éEIÒñ~/ØxÝ÷öÛåZú~¸Y§Ë}º?Ç›³iýÛý¿ïöãSÓïôÅáü f¤oeð/ß“-«
+xÚ}–Ñjã8FïóÞ‹ÂÌE&¶eÉíP‰ã@ –if/S[í;8ÉEß~m/- Ý-´ôD²ô_²”‹¿î¦‹º{òSó-Ž~úCwê+?-n·ûÉÅŪ«N;ßx_ûúÜzøÝ÷]õàÑ—b³Ú´ÍñëÐyÓV¯§ÚŸ{}Þié_šö£Ë8OôåÑÿž>ÞÜÝü}?½¹½íÚîjúÓ¿œ^·ý4zlŽ¯Cçÿí ÑçQä—ïM×~’oq”m]t»Qï0™)b4;‡~nÚºWÎèiL=IÒ¨nª£(ü­vCƇÞG¿Û´ÏÝäú:š 37‡cÿ2ÌîúÚ÷Mû2ð§‡.§ýþÕq¢x2ŸGµFêóc»óÑltßÔCks|û"|<òø¶÷Q8!nÕÕþ°ßV¾ß¶/~r=” žG×ëág>ñmýG{ÌSOÏàÐáüo¿·Uÿlûq¤d9ŒÇY2Tr¢U ÔAe [Bë@9”Æô\@ cÆP
+¥aQƘdSä %”C+è’çÔv©mÁ|Âωð3Ê)?͇_–Aø9ÈÈO$? áçDø™K?C2ƒ_Ju ~Õ5ø9~Fcâg4»ürH~"Œ «bd¤,2‚2‘,“Ñ$#F5Ë0r"Œ2Ö!Ãȉ0ʨn†‘ÉH$#e‘‘ˆË0Êðs"üŒrâ—²Ò¿áÃ@ø9~†u°øYv«Å/iŨ™Å/e>‹_ÊYüR’YüR*añ³š¿\¤©dÚ‘¼¿”µµøYÚ~¹?‹»Ã/iG’ÅiG2¦ÃÏ°ëœüÈâäG%œÞ8ö Ã/ág4~FÉð³TÉá—‹t¢h>ù‘%—ŸH~¤Îå'Òú±F¹ÖO„ŸeÅr("ü,;9Ç/iâ~‰_Ñ%~%´ KAÏYJ¨`”‚œ£”ùœ#9œÀÉÕŸòšÈ!×D.EL]rMiË@I¬É–&QÚ"%I(m éÕ(JR¤,kHY …^e=×R{«%¤6…^©×PxQÒl|…?J4^pãMý~V§¾îÒp‡s¼+›Ö¿ßøûn?>~ÃW…ów–‘îÖ“¸++
endstream
endobj
425 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /FVYUVB+LMMono9-Regular /DescendantFonts [ 4353 0 R ] /ToUnicode 4352 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /TLOLYP+LMMono9-Regular /DescendantFonts [ 4357 0 R ] /ToUnicode 4356 0 R >>
endobj
-4353 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /FVYUVB+LMMono9-Regular /FontDescriptor 4349 0 R /W 4348 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4357 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /TLOLYP+LMMono9-Regular /FontDescriptor 4353 0 R /W 4352 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4354 0 obj
+4358 0 obj
[ 35 [ 580 ] 47 [ 624 ] 50 [ 558 ] 55 [ 536 ] 59 [ 641 ] 63 [ 613 ] 72 [ 513 ] 75 [ 747 ] 77 [ 613 ] 81 [ 636 ] 84 [ 558 ] 96 [ 602 ] 98 [ 458 ] 105 [ 591 ] 112 [ 613 ] 116 [ 613 ] ]
endobj
-4356 0 obj
+4360 0 obj
<< /Filter /FlateDecode /Length 23 >>
stream
xÚc````Td˜âÁ°À¡
Bˆ
endstream
endobj
-4357 0 obj
+4361 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 2190 >>
stream
xÚ}V TSç¾!Ü܈•k\›+÷^©ó”"„Ñj몢ˆX]©“Hø‘Ÿ@È_$’Üü
@@ -14470,31 +14404,31 @@ $á·¹?óÍ¢LÇtWSõ0”º‚ˆç9t`Ä&æiJ¬Bîo=Ý–N£F¶ÇØh2’+-R´i?ãrÊtzÚx,´-WÚì¥<–
çsåí¤×í‘éY%rÉ,F2› ¹;Ûç°ÙlvÛ>»kÔ#‘°îÞC^‡Ãát:’ÐÿäOŒÖ
endstream
endobj
-4355 0 obj
-<< /Type /FontDescriptor /FontName /SJLYVB+LMRomanCaps10-Regular /Flags 4 /FontBBox [ -496 -290 1501 1100 ] /Ascent 1100 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 106 /XHeight 514 /FontFile3 4357 0 R /CIDSet 4356 0 R >>
+4359 0 obj
+<< /Type /FontDescriptor /FontName /SJLYVB+LMRomanCaps10-Regular /Flags 4 /FontBBox [ -496 -290 1501 1100 ] /Ascent 1100 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 106 /XHeight 514 /FontFile3 4361 0 R /CIDSet 4360 0 R >>
endobj
-4358 0 obj
+4362 0 obj
<< /Filter /FlateDecode /Length 441 >>
stream
xÚ“_k³0Æïó)²‹BwጶӾ£«]Á±Ô2Þ]Úä´o &õ¢ßþMrtƒ1ÊÅŸç9'Ï9‰“«·2¸zÁì†Ñ-´º7‚ü¹jÈd²Ö¼¯Au/
endstream
endobj
-414 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /SJLYVB+LMRomanCaps10-Regular /DescendantFonts [ 4359 0 R ] /ToUnicode 4358 0 R >>
+412 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /SJLYVB+LMRomanCaps10-Regular /DescendantFonts [ 4363 0 R ] /ToUnicode 4362 0 R >>
endobj
-4359 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /SJLYVB+LMRomanCaps10-Regular /FontDescriptor 4355 0 R /W 4354 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4363 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /SJLYVB+LMRomanCaps10-Regular /FontDescriptor 4359 0 R /W 4358 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4360 0 obj
+4364 0 obj
[ 28 [ 500 ] 50 [ 444 ] 52 [ 778 ] 70 [ 528 ] 72 [ 278 ] 109 [ 556 ] 112 [ 528 ] 118 [ 528 ] ]
endobj
-4362 0 obj
+4366 0 obj
<< /Filter /FlateDecode /Length 23 >>
stream
xÚc``à``Ð``j````i
endstream
endobj
-4363 0 obj
+4367 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 1359 >>
stream
xÚ}”LgÇï
@@ -14505,10 +14439,10 @@ KR·mÍÎ),ÎÑÐÕ4Yf±’:ŠÖŒ6Í¿¿ôÙl¡ÅjÒßÔYQ[u”™6Ð5ˆ´ d’‹ä#&¤9%uSZ‹E‘¾F#gÑxÔ*{Q
ÄåôìøUŸÁ¨BuœxBSøú/sÇEB×Tó!¨…šÑØoçS_<ŸŠßï…¿ÆõrÕl=±ðX^_ÍV1 Š ±§ á‘ütˆíå@…¸û‰¢ŽXx$ÇûêžjZBl!<–wIP ý,/`<<Â/Ǥixa —ùy¬ÌÎÞ0ƒ50Ïím x8µïÁŽ`âWcÞ>ŸgL ¬…(/ôzêÓr®uKÕ±ãMb¦¨ŠÿF 1ü¼¸Úá4b_¶6ím™ =Ø“6Ÿp¡Œƒ(#Qòì• è™ûúæí•CÅLºš©i©Ž(P;Îí:TgùyôI…K¦ñaø¤¼§Æ9á ¿ûŸ”hS 7a?ÎÃ±È x¾0±ç4µ^k·!Äða1åo»YÌÅ6Ôåm!^ó]ý8pÅ$|ø—æ¾›‘þ‘U\ƒmj¨K‡k‰Ékç>uë0|³ÔËö£Bû½P¿P-ÔãEÂ=!9Nb¹h“›&29§qØÝJ3ÕjW#Óâtˆ«Ä`|ÄZ:Y»|À?ž!ü¼(c°JÇkøC 9Å5ƒ`F„X½Ïãì$:mí~
endstream
endobj
-4361 0 obj
-<< /Type /FontDescriptor /FontName /ZUCODC+LMRomanSlant10-Regular /Flags 4 /FontBBox [ -457 -290 1446 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle -10 /StemV 93 /XHeight 431 /FontFile3 4363 0 R /CIDSet 4362 0 R >>
+4365 0 obj
+<< /Type /FontDescriptor /FontName /ZUCODC+LMRomanSlant10-Regular /Flags 4 /FontBBox [ -457 -290 1446 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle -10 /StemV 93 /XHeight 431 /FontFile3 4367 0 R /CIDSet 4366 0 R >>
endobj
-4364 0 obj
+4368 0 obj
<< /Filter /FlateDecode /Length 406 >>
stream
xÚ’_KÃ0Åßó)®ƒùP›nº©Œ‚¶
@@ -14517,22 +14451,22 @@ xÚ’_KÃ0Åßó)®ƒùP›nº©Œ‚¶
n«ÂN'óãÜZ„‰ç$4ÏÇ®­êJî‘,l 4…Å£½R‚’ÿªÓàÚîZÁðz=TØg¥Ý:Ifסt–¤Ž¦“@W.=MsO—³P»t(ó4Ë=̓oNÍßü& ø]Ïî(¾ƒb½Ö6%^>7¾ø}¤­jËßþ_þTG«GòH½üù
endstream
endobj
-392 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ZUCODC+LMRomanSlant10-Regular /DescendantFonts [ 4365 0 R ] /ToUnicode 4364 0 R >>
+394 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ZUCODC+LMRomanSlant10-Regular /DescendantFonts [ 4369 0 R ] /ToUnicode 4368 0 R >>
endobj
-4365 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ZUCODC+LMRomanSlant10-Regular /FontDescriptor 4361 0 R /W 4360 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4369 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ZUCODC+LMRomanSlant10-Regular /FontDescriptor 4365 0 R /W 4364 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4366 0 obj
+4370 0 obj
[ 28 [ 511 ] 35 [ 460 ] 42 [ 716 460 ] 46 [ 755 511 ] 49 [ 678 460 ] 54 [ 653 307 ] 59 [ 460 ] 63 [ 511 358 ] 66 [ 307 ] 68 [ 307 ] 70 [ 460 627 256 ] 74 [ 897 818 ] 77 [ 562 ] 81 [ 511 ] 83 [ 678 511 ] 91 [ 460 ] 96 [ 422 562 409 ] 104 [ 716 332 ] 109 [ 537 ] 111 [ 743 460 ] 114 [ 664 743 464 ] 118 [ 486 ] 125 [ 562 ] 502 [ 307 ] ]
endobj
-4368 0 obj
+4372 0 obj
<< /Filter /FlateDecode /Length 28 >>
stream
xÚc``à0N\½%BàÁÑ], $&
endstream
endobj
-4369 0 obj
+4373 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 4953 >>
stream
xÚ­Y \w¾Ÿ'¢²´j³-3:m×£VÔêS[ë®·õDÅk‘+@8’ !!×$ÿ$ä á>"w@nQÐÖz»EÛ­îÖ­G·}Û½wÛmÿ“Þ¾7­¶ŸvŸ»ï%Ÿ\“Ìüç÷÷ýþÃA&ND8Î á{÷nÚ²oáŽ{$é±â¥KmÍŠMž §gÓs@0AÏDèYš˜@“\Z0‘xÐÀëþïà ÌÜ`noðÄÑh¦&šòw?: A8ÞgÏô4Ïaß…Þ ~)pà/Á?B‚& ädòd”ƒr¦ržýÞå_ [²dù‰4W&JJμºdɲWϯ Ö‡ ¶ÅƧJr2SE‚Xq‚`[˜`g˜`—$‡=*Ì—ˆqÂäØ´D$Q)< ÈÎÊ2I2I¶4sA˜ 2Y”)È‘ÈRì«L˜&ŒÍ&²Å B™ +Y(زoo¤`³Dœ%Ø!ŠŠ3…‚E‹‚L¡Pœ•%}}ñâ¬ì¤0‰,iq"û›ÌÅiã?Ê\8oÑæð]‘‹vlÝ°i×ÞMaYŠ,A¢D&HfÅŠÒ2þíãןwIdé±ië$q­ Bq–(+ao3‘‘—‘…H²YŠ¼Š¬@V"«‘Ÿ k‘õÈFd3²yÙ†lGv"È^$9ŒÄ ±H’ŒˆtD‚H’‰d!r¤€ó— ={›Ì$a"bçÌæTpþ>AÎ]0qÒDº}—3iÚ¤­“Þ:0ù•Éǧ̞òùÔO‚K‚?ýAvÈÂÏìzv泎i»§]™.þÅŒäçògò¯ÿPöüæçõ£¡!j/½ÈËùã—öÂùn-КÍÙzbob‡Ï
@@ -14562,31 +14496,31 @@ múŸÎfü^FñÿH¨ÅaýV·¢b]|øîÿ[ŸŸòÕ—•ÌkÂuG⇠ºíÀbuZHŸ½´©«Szr‰öÂýÞ¨>ÑÛ_üççj
o3ãOaæ¡:Õþ$d
endstream
endobj
-4367 0 obj
-<< /Type /FontDescriptor /FontName /OSSEGU+LMRoman10-Italic /Flags 4 /FontBBox [ -458 -290 1386 1125 ] /Ascent 1125 /CapHeight 683 /Descent -290 /ItalicAngle -15 /StemV 102 /XHeight 431 /FontFile3 4369 0 R /CIDSet 4368 0 R >>
+4371 0 obj
+<< /Type /FontDescriptor /FontName /OSSEGU+LMRoman10-Italic /Flags 4 /FontBBox [ -458 -290 1386 1125 ] /Ascent 1125 /CapHeight 683 /Descent -290 /ItalicAngle -15 /StemV 102 /XHeight 431 /FontFile3 4373 0 R /CIDSet 4372 0 R >>
endobj
-4370 0 obj
+4374 0 obj
<< /Filter /FlateDecode /Length 535 >>
stream
xÚ}”Koâ0…÷ùž]¤8Ä¥B‘xŽ"MKÕ0£Ù†Ø0‘ˆ%aÁ¿Û禕ªa‚ør®ïãèšÑ··Ì_Êú¨üé#g磌¯m¡üõKÞx£Ñ¦.®•Òý«RRÉAížÙ[[™êÙxnR]ö&8ÕÅå*Õõï •:—ú3ÄÖaãƒúíï³lûý§ÿãå½®rp?íóKYøÜž:”ýÅDÿ?•ÝQ™KóKµ]Yëg<rÎÍ‹­–뺲vÞ„ºd“¡ïS©eK­²£mÜ B&Ë¢'rßEe¬²‡³[׫*Õ§Ú[,Øä݈]ßÞ\×ÞdßJÕ–úÌÆwz41Ùµi.Êöø—$Lª“Im<zÍ+Å&vüTµìo÷|ø<s¸5Š…Ž4\ÔRuM^¨6×gå-Œ <a‹ù$žÒò‹Îqêxš€áçt>HÅŸ¼µ‰‚µIÄy$–Â)(-ͦ 4¢-´h 4  E Q - hDTA€(ç“£wn@”sš– TˆW T˜­AOЈh>ÊIÕ‰6 ­£Å;\Š8Õ²ø£k?cd‰à`Œ:‹à ÌiDèEÀÁ¾DðLP"Ê õ õI—4m<xì¬ò`ž`ܾØU³·æc³‹kÛšµvWËí®ÝÚR«Û×Ô=åwm‡¿Kû÷ë—Fa
endstream
endobj
377 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /OSSEGU+LMRoman10-Italic /DescendantFonts [ 4371 0 R ] /ToUnicode 4370 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /OSSEGU+LMRoman10-Italic /DescendantFonts [ 4375 0 R ] /ToUnicode 4374 0 R >>
endobj
-4371 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /OSSEGU+LMRoman10-Italic /FontDescriptor 4367 0 R /W 4366 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4375 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /OSSEGU+LMRoman10-Italic /FontDescriptor 4371 0 R /W 4370 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4372 0 obj
+4376 0 obj
[ 27 [ 869 559 ] 34 [ 818 639 575 ] 38 [ 575 575 ] 42 [ 831 511 ] 45 [ 319 882 639 ] 49 [ 756 527 575 ] 54 [ 724 351 575 575 904 575 ] 62 [ 900 639 383 436 319 ] 70 [ 607 692 319 ] 74 [ 1092 958 900 639 575 ] 80 [ 864 575 575 786 639 ] 88 [ 319 ] 90 [ 864 607 ] 95 [ 863 474 639 454 ] 100 [ 575 575 ] 104 [ 800 447 575 575 885 639 869 ] 112 [ 607 1189 831 869 607 ] 118 [ 607 ] 120 [ 511 575 671 ] 125 [ 639 ] 284 [ 575 ] 499 [ 571 571 ] ]
endobj
-4374 0 obj
+4378 0 obj
<< /Filter /FlateDecode /Length 32 >>
stream
xÚc``°6/þüxßoþýz€ 8p
endstream
endobj
-4375 0 obj
+4379 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 6950 >>
stream
xÚ•zXWÛö¬°;¨4ײƒ3«Q±¡Æ£± 5öŠ¨ E¥w–²¸»gYz"(‚°RDQ#¶±%Ñ?&Ƙb, 1Éû ÞïÿÏ‚1É›|ß}\8àÌٙ繟vßgPææ”D"â¶Áù½ [&®X¹.d·wð›SCvùš®,•âHdɉö”8B"rýDÞLlŽÇZš]¶4ï‰Ç§ìeKìÍwKGP”Ùc?ûA¢ÖrùMùÄr´éÄ`Ë1Ý’PC(–zB‰ä¶2‰õ?>rÚä©Sg,
@@ -14621,10 +14555,10 @@ w¢µ„Uüª:Þ-kéX ÁѬ»¾—Ã.<Fáp‡y<ïÀÛA‰ß€ˆÆ€7‡÷Ë]öMó^Ì9os‰ÚÈ®q>ü™¿óJê­‡Š«†
Ä5y°­"¿@Æ-Û°kŠed9P
endstream
endobj
-4373 0 obj
-<< /Type /FontDescriptor /FontName /XTBITZ+LMRoman10-Bold /Flags 4 /FontBBox [ -486 -295 1607 1133 ] /Ascent 1133 /CapHeight 686 /Descent -295 /ItalicAngle 0 /StemV 106 /XHeight 444 /FontFile3 4375 0 R /CIDSet 4374 0 R >>
+4377 0 obj
+<< /Type /FontDescriptor /FontName /XTBITZ+LMRoman10-Bold /Flags 4 /FontBBox [ -486 -295 1607 1133 ] /Ascent 1133 /CapHeight 686 /Descent -295 /ItalicAngle 0 /StemV 106 /XHeight 444 /FontFile3 4379 0 R /CIDSet 4378 0 R >>
endobj
-4376 0 obj
+4380 0 obj
<< /Filter /FlateDecode /Length 651 >>
stream
xÚ}”]‹â0†ïû+²‚sÑ1ýJœA?Fv>PY†½«Mt š–¶^øï7É{ª°È
@@ -14634,21 +14568,21 @@ xÚ}”]‹â0†ïû+²‚sÑ1ýJœA?Fv>PY†½«Mt š–¶^øï7É{ª°È
endstream
endobj
367 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /XTBITZ+LMRoman10-Bold /DescendantFonts [ 4377 0 R ] /ToUnicode 4376 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /XTBITZ+LMRoman10-Bold /DescendantFonts [ 4381 0 R ] /ToUnicode 4380 0 R >>
endobj
-4377 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /XTBITZ+LMRoman10-Bold /FontDescriptor 4373 0 R /W 4372 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4381 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /XTBITZ+LMRoman10-Bold /FontDescriptor 4377 0 R /W 4376 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4378 0 obj
+4382 0 obj
[ 89 [ 1161 ] ]
endobj
-4380 0 obj
+4384 0 obj
<< /Filter /FlateDecode /Length 12 >>
stream
xÚc`€
endstream
endobj
-4381 0 obj
+4385 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 514 >>
stream
xÚmQÏkQ~/YlžõÝ€š&£¨(šÝPõ x1%- i”4J=%ÛîKvɺ/ìnŒõ–ƒ nl¢%(µ("^=&±‚GÁ‹Ðƒˆx7Ϧw‚s˜™o憙#A@cq1_¼9[8››/°ÛŠy1™f†ê72ø1—Äy ñIÌãžò !M‚}"ìŽ>ÅÂc‚»g!|¿ï»¿ã~ò•œðÃr…#AßÐô qäû¦¤TêÂ4«¯XzUs`*•:Î÷— -AVY®±¦]ÓA1UÈJ0/Až5½ª§™ KTSŒ
@@ -14656,31 +14590,31 @@ xÚmQÏkQ~/YlžõÝ€š&£¨(šÝPõ x1%- i”4J=%ÛîKvɺ/ìnŒõ–ƒ nl¢%(µ("^=&±‚GÁ‹Ðƒˆx7Ϧ
é"4ljÙPµX£nŸ‘ ¨é64™U/ZÔ ŠMUh˜*µÀÑ(ÌÞX( 3ÈéËÔ´)$“
endstream
endobj
-4379 0 obj
-<< /Type /FontDescriptor /FontName /XNTVGR+LMRoman5-Bold /Flags 4 /FontBBox [ -630 -325 2006 1163 ] /Ascent 1163 /CapHeight 686 /Descent -325 /ItalicAngle 0 /StemV 145 /XHeight 444 /FontFile3 4381 0 R /CIDSet 4380 0 R >>
+4383 0 obj
+<< /Type /FontDescriptor /FontName /XNTVGR+LMRoman5-Bold /Flags 4 /FontBBox [ -630 -325 2006 1163 ] /Ascent 1163 /CapHeight 686 /Descent -325 /ItalicAngle 0 /StemV 145 /XHeight 444 /FontFile3 4385 0 R /CIDSet 4384 0 R >>
endobj
-4382 0 obj
+4386 0 obj
<< /Filter /FlateDecode /Length 358 >>
stream
xÚ}’Qkƒ0Çßó)n…öÁ;ú°"ÂÚ®CXÛa¥ôÕ&gÐD¢>øí—ÄÚ /ÿÿ¿»dòò}òÞ¹º¢÷:§`­ZÍÐÛ쳊L&[ÅÚes@äȵ^Á·Vì„ L7ñ6–¢™s,YÑr\ã¦5Þ„|Zì`šâÅ»Òógâ}íUfré­UÁ=jSRÑÆú Œc¸gÔµPrÁœRj6>$ߨÒ6Vÿþ€› Éõ®–— à‚5÷ȽYi&d“O]Ý`Ë\‘0?1bÝèÎñΈÔµ7˜Žé­ª- PEÀ17uÍ\Y‰àÛ®cnTÑt£í?Ò®BX¸8èQ™âXWCÉ’дO#wæ‰JþG§}Ö5ïCc>ƒAa?™¶u–o¦¥‹uÔÛܾ­hÇò g­ÖÝÍÎ!Z8!ñ1ÞJU6Ë-w.ÃÕ°ÑqG~:TÙ
endstream
endobj
366 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /XNTVGR+LMRoman5-Bold /DescendantFonts [ 4383 0 R ] /ToUnicode 4382 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /XNTVGR+LMRoman5-Bold /DescendantFonts [ 4387 0 R ] /ToUnicode 4386 0 R >>
endobj
-4383 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /XNTVGR+LMRoman5-Bold /FontDescriptor 4379 0 R /W 4378 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4387 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /XNTVGR+LMRoman5-Bold /FontDescriptor 4383 0 R /W 4382 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4384 0 obj
+4388 0 obj
[ 27 [ 531 531 ] 31 [ 531 ] 33 [ 531 ] 35 [ 531 531 ] 38 [ 531 531 531 531 531 531 531 ] 47 [ 531 ] 50 [ 531 531 531 ] 54 [ 531 531 531 531 ] 59 [ 531 ] 61 [ 531 531 531 531 531 531 ] 68 [ 531 ] 70 [ 531 531 531 ] 74 [ 531 531 ] 77 [ 531 531 531 531 531 531 531 531 531 531 ] 88 [ 531 ] 93 [ 531 531 ] 96 [ 531 531 531 ] 100 [ 531 531 531 531 531 531 531 531 ] 109 [ 531 531 ] 112 [ 531 ] 114 [ 531 ] 116 [ 531 ] 118 [ 531 ] 121 [ 531 ] ]
endobj
-4386 0 obj
+4390 0 obj
<< /Filter /FlateDecode /Length 25 >>
stream
xÚc``Œþi}ýõömï¿­r
endstream
endobj
-4387 0 obj
+4391 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 5721 >>
stream
xÚY \×ÖŸ2¡J]ã’©wRµ¶êVÛº Ô¥*¸Tqi]XÂNIH ì ë Ȳ "ˆ‚à†µ­­Ö´Ö¢ÑÚÚV­mŸ¾j_ß{gìµß÷Mújßïø%Ü™¹çœ{Ï9ÿsþåà@‰D¢Ñž«6z­^ç²ÒÓS­RϺV棱>ZÆ?ÏÇNˆŽâljx4ˆçļÂÁä$"cÄ;9<z—ô>Œý-[2Ž¢DÅÄÏAŠ0Ôi¼ð׸—&ZoŒqzrD‰¨ÑÔsÔ]ê7A®Tä$ùtµ3¦¹ºÎòPGÄh‚ƒtŠ®®3§X?_S¸OS,÷ñ U´¡Á
@@ -14713,10 +14647,10 @@ dºW÷·ŽÛg`èµ+­­ŽE…¹ù¥r›K¬Âù¤µ6(¿ÛaeZZX/ñŒï =ËûÝ´^¬þû§WÙšªô”.=-=1QÎtjªtÍÍÕµ{
¸³ð¤n`ï*â3ú%M†ƒ+ˆa‚ä ýLçñJq ·ì•¥ßK*Ÿ˜àh/íB«C&ý¦«$`
endstream
endobj
-4385 0 obj
-<< /Type /FontDescriptor /FontName /MOXNPT+LMMono8-Regular /Flags 4 /FontBBox [ -456 -320 743 1014 ] /Ascent 1014 /CapHeight 611 /Descent -320 /ItalicAngle 0 /StemV 177 /XHeight 431 /FontFile3 4387 0 R /CIDSet 4386 0 R >>
+4389 0 obj
+<< /Type /FontDescriptor /FontName /MOXNPT+LMMono8-Regular /Flags 4 /FontBBox [ -456 -320 743 1014 ] /Ascent 1014 /CapHeight 611 /Descent -320 /ItalicAngle 0 /StemV 177 /XHeight 431 /FontFile3 4391 0 R /CIDSet 4390 0 R >>
endobj
-4388 0 obj
+4392 0 obj
<< /Filter /FlateDecode /Length 645 >>
stream
xÚ}”Moâ0†ïùÞ=¤˜8¶i…øh%¤åC­z…Ä°‘À‰’pà߯íwÒJ+v+µôaÆžÇgz?¶»xš—G‹gÎ>LSÞêÌÄóÕ¡Šz½E™Ý®Æ¶kcr“wÑæ•më2Û™–õçËÅÒí“K^ÚìrËM—õ8ifÎ…ýNñuXo>ãÕæs½ÝÇ?W«Ò–£øÃœo—Cs¿h_´—üß<æ‚ìq…M~™º)JûʆϜs÷Å›ÍçåÕ¯‰¤Èô©°yMžìè­£aÂò"k‰ÂßìêúäïîMk®K{*£ñ˜ \å¢ië{p~Š›:7uaϬÿXÑ¥ìnUu1^‡ñh2a¹9¹]Ö‡«aöeî¢E{ÿG¾—ìï•aIà!t³27MuÈL}°g] ø„ßÝÏ$26ÿ+αêxº„î_%»PöûPû†3·çéphH½Òo’!29H 3¥ä¤°nÒ h„LŠ½€(6E‚™"‚™˜‚`¦Ò@"IÌÄ3
@@ -14728,21 +14662,21 @@ rµÆ Q°–¨ ÉÕ5yÂLS—ÐMoú¢éžñ ÞÓð^úWÚϦ¯’ÝêÚM0ÀÂŒðÓ¡°ækÆUeåW…ß0»)íióý)Œv
endstream
endobj
350 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /MOXNPT+LMMono8-Regular /DescendantFonts [ 4389 0 R ] /ToUnicode 4388 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /MOXNPT+LMMono8-Regular /DescendantFonts [ 4393 0 R ] /ToUnicode 4392 0 R >>
endobj
-4389 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /MOXNPT+LMMono8-Regular /FontDescriptor 4385 0 R /W 4384 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4393 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /MOXNPT+LMMono8-Regular /FontDescriptor 4389 0 R /W 4388 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4390 0 obj
+4394 0 obj
[ 28 [ 549 ] 47 [ 549 ] 50 [ 494 ] 59 [ 494 ] 66 [ 329 ] 75 [ 878 ] 77 [ 603 ] 81 [ 549 ] 84 [ 549 ] 91 [ 494 ] 96 [ 453 ] 98 [ 439 ] 105 [ 357 ] 109 [ 576 ] 116 [ 495 ] ]
endobj
-4392 0 obj
+4396 0 obj
<< /Filter /FlateDecode /Length 23 >>
stream
xÚc``à``TPñXàÂ
endstream
endobj
-4393 0 obj
+4397 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 2201 >>
stream
xÚ­V PéÞQ#EœÜ YÜ]ï§ÈÚS[[½ÃC
@@ -14755,10 +14689,10 @@ bEìe¬li“2vñ¿è½RÓ£÷%íIH=œ£Òªp©Àó •P"SÆ|…â³×TRQ$”½•OæIù„\%Qé öŠ€b¡-ÐN(JöC¡
«Å`F7fgidˆ¢Îë]ê{¿7á?uµ±ê¨¤Ê±íA# vvPv— Wã2I«‹Lõh> oÒ±1Ñ·S؇A Œ6k¨Z£ m¢ðÒßn
endstream
endobj
-4391 0 obj
-<< /Type /FontDescriptor /FontName /GAKDMK+LMRoman8-Italic /Flags 4 /FontBBox [ -489 -292 1472 1124 ] /Ascent 1124 /CapHeight 683 /Descent -292 /ItalicAngle -15 /StemV 110 /XHeight 431 /FontFile3 4393 0 R /CIDSet 4392 0 R >>
+4395 0 obj
+<< /Type /FontDescriptor /FontName /GAKDMK+LMRoman8-Italic /Flags 4 /FontBBox [ -489 -292 1472 1124 ] /Ascent 1124 /CapHeight 683 /Descent -292 /ItalicAngle -15 /StemV 110 /XHeight 431 /FontFile3 4397 0 R /CIDSet 4396 0 R >>
endobj
-4394 0 obj
+4398 0 obj
<< /Filter /FlateDecode /Length 432 >>
stream
xÚ}’Ëjë0†÷z
@@ -14767,22 +14701,22 @@ uH®eçâ¶C7Ó¦-I(Ý:Ò$GKF–yûJ»…’sþüÏå×hFWïÛèAè=D“F7ÐêÎpˆ–ëª!£Q¡yWƒ²¯
endstream
endobj
349 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /GAKDMK+LMRoman8-Italic /DescendantFonts [ 4395 0 R ] /ToUnicode 4394 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /GAKDMK+LMRoman8-Italic /DescendantFonts [ 4399 0 R ] /ToUnicode 4398 0 R >>
endobj
-4395 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /GAKDMK+LMRoman8-Italic /FontDescriptor 4391 0 R /W 4390 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4399 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /GAKDMK+LMRoman8-Italic /FontDescriptor 4395 0 R /W 4394 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4396 0 obj
+4400 0 obj
[ 51 [ 611 ] 56 [ 611 611 ] 78 [ 611 ] 82 [ 611 ] 100 [ 611 611 ] 106 [ 611 611 ] 121 [ 611 ] ]
endobj
-4398 0 obj
+4402 0 obj
<< /Filter /FlateDecode /Length 21 >>
stream
xÚc`
< 
endstream
endobj
-4399 0 obj
+4403 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 1695 >>
stream
xÚuU}PSWù%+…4-}Oß{¥ ¶…ÄBkQ·ŠP`@E ØÁ²Z‚y„„‡I
@@ -14797,10 +14731,10 @@ E±0Ò÷‡ý—§HÇwâ/ø²Ól:ÝNÒhÖWçòä$ô
±{>Þ4Ä`ûß·YQ$¶Õ4dì­—6}¼Ôh³¾ðóб{þÁ—FÏ}ƒÃp$ºŽp¤xse\ÞɦŽ£¿ëé«õ|Dž;2uükâ—ñwW¿÷›äÔ j@FQCCs³çÒÅA*<OøÞä¼0'àNÃiÅu
endstream
endobj
-4397 0 obj
-<< /Type /FontDescriptor /FontName /XENFPT+LMRoman6-Regular /Flags 4 /FontBBox [ -515 -298 1647 1125 ] /Ascent 1125 /CapHeight 683 /Descent -298 /ItalicAngle 0 /StemV 117 /XHeight 431 /FontFile3 4399 0 R /CIDSet 4398 0 R >>
+4401 0 obj
+<< /Type /FontDescriptor /FontName /XENFPT+LMRoman6-Regular /Flags 4 /FontBBox [ -515 -298 1647 1125 ] /Ascent 1125 /CapHeight 683 /Descent -298 /ItalicAngle 0 /StemV 117 /XHeight 431 /FontFile3 4403 0 R /CIDSet 4402 0 R >>
endobj
-4400 0 obj
+4404 0 obj
<< /Filter /FlateDecode /Length 404 >>
stream
xÚ}’K‹Â0…÷ùw‚.jSŸ£HÁ'fTT·5¹:›”´]øï'«0ŒSèãë=799Iãm»¦\0è¶)ì°P•fÌ?Óœ4 Ū e¹FäÈëj1†­Vl%4çÉ"‘¢lq"ÙµâX«þÍð"äSbçæÁq¹^mÁÇçNe©;¼T×TÔvDy5êÿ…`ªð¢
@@ -14808,22 +14742,22 @@ n˜/Ô…Pr Q›Rj~,%Ÿ«Ì®° áÝ%„µï³\ß­ÂÉ'Q¸`åÜ“e&*Û¼¿%f‰<+2™@hfE©oÎu‹„ÍQ yæ F³
endstream
endobj
347 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /XENFPT+LMRoman6-Regular /DescendantFonts [ 4401 0 R ] /ToUnicode 4400 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /XENFPT+LMRoman6-Regular /DescendantFonts [ 4405 0 R ] /ToUnicode 4404 0 R >>
endobj
-4401 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /XENFPT+LMRoman6-Regular /FontDescriptor 4397 0 R /W 4396 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4405 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /XENFPT+LMRoman6-Regular /FontDescriptor 4401 0 R /W 4400 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4402 0 obj
+4406 0 obj
[ 28 [ 510 ] 35 [ 549 ] 43 [ 472 ] 50 [ 472 531 ] 55 [ 325 531 531 ] 63 [ 549 ] 66 [ 253 ] 70 [ 519 ] 72 [ 253 ] 75 [ 844 ] 77 [ 549 531 ] 81 [ 531 531 ] 84 [ 549 ] 96 [ 363 ] 98 [ 407 ] 100 [ 531 531 ] 105 [ 384 531 531 ] 112 [ 490 ] 114 [ 726 ] 116 [ 490 ] 121 [ 531 ] ]
endobj
-4404 0 obj
+4408 0 obj
<< /Filter /FlateDecode /Length 24 >>
stream
xÚc``à0<¨4-ƒaMÁ

endstream
endobj
-4405 0 obj
+4409 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 2548 >>
stream
xÚmV TWž!L&jL+1€œŒZ-*¸`Šh "¢€¢Q0$PÑ¢‹
@@ -14844,10 +14778,10 @@ b£`÷ÅÅðóÉæBŸ“½SK)ßiº$ƒíàmEÞ CbÅcTEŠßYz,ª»ûóÚ¿×Ñ¿+«8+æÔrÛÂZúncãí[ÒGL@ä
„+¤ïú_\D¿eéÕ·S?|Þf­“5tíº) ¬–ÈMáúXúmíê-9”2íT·Nfü¢ÒÚ#2¼ÀË„ä~´È¹S}•¥„³¸í&6ß¹õ|àVTÃ&”šc5|:&)ÏO8Î$œ`?0¡Ý¼—ór×öW …wÍûÞÝkÞ7Ö 'þ³&c
endstream
endobj
-4403 0 obj
-<< /Type /FontDescriptor /FontName /PTIWQK+LMSans8-Regular /Flags 4 /FontBBox [ -446 -314 1510 1154 ] /Ascent 1154 /CapHeight 694 /Descent -314 /ItalicAngle 0 /StemV 98 /XHeight 444 /FontFile3 4405 0 R /CIDSet 4404 0 R >>
+4407 0 obj
+<< /Type /FontDescriptor /FontName /PTIWQK+LMSans8-Regular /Flags 4 /FontBBox [ -446 -314 1510 1154 ] /Ascent 1154 /CapHeight 694 /Descent -314 /ItalicAngle 0 /StemV 98 /XHeight 444 /FontFile3 4409 0 R /CIDSet 4408 0 R >>
endobj
-4406 0 obj
+4410 0 obj
<< /Filter /FlateDecode /Length 496 >>
stream
xÚ}“OÚ0Åïùî‰=dqH`…"-ÿ¤¨Ý]ºAm¯!h$p"'9ðíkû9»RE‹Êy3óÆžŒ¾ìsÿYÔGò£GÎÞ©­{U’¿~)o4ÚÔe%Ù½ C´}b{U—9ul¼Î6™¬º-Îdyé ªû¢+ù)1}Øø@¿üý!ûùý«ÿí%/d;÷ßéÜ_
@@ -14858,96 +14792,93 @@ A3”Ñ” ƒæˆ9å4í DÞÔÕ\€bÐ
endstream
endobj
346 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /PTIWQK+LMSans8-Regular /DescendantFonts [ 4407 0 R ] /ToUnicode 4406 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /PTIWQK+LMSans8-Regular /DescendantFonts [ 4411 0 R ] /ToUnicode 4410 0 R >>
endobj
-4407 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /PTIWQK+LMSans8-Regular /FontDescriptor 4403 0 R /W 4402 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4411 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /PTIWQK+LMSans8-Regular /FontDescriptor 4407 0 R /W 4406 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4408 0 obj
-[ 27 [ 796 531 ] 34 [ 752 590 ] 42 [ 767 472 295 295 ] 47 [ 590 ] 49 [ 723 472 ] 54 [ 693 325 531 531 834 531 ] 62 [ 796 590 354 383 295 ] 70 [ 561 664 295 ] 74 [ 973 885 ] 77 [ 590 531 ] 80 [ 826 531 531 723 590 413 413 ] 88 [ 295 826 ] 91 [ 561 ] 95 [ 782 414 590 419 ] 100 [ 531 531 531 ] 104 [ 767 413 531 531 ] 109 [ 590 ] 112 [ 561 1091 767 796 561 ] 118 [ 561 ] 121 [ 531 ] 123 [ 885 ] 125 [ 590 ] 284 [ 531 ] 499 [ 502 502 ] 502 [ 295 ] ]
+4412 0 obj
+[ 27 [ 796 531 ] 34 [ 752 590 ] 42 [ 767 472 295 295 ] 47 [ 590 ] 49 [ 723 472 531 ] 54 [ 693 325 ] 57 [ 531 834 531 ] 62 [ 796 590 354 383 295 ] 70 [ 561 664 295 ] 74 [ 973 885 ] 77 [ 590 ] 80 [ 826 531 531 723 590 413 413 ] 88 [ 295 826 ] 91 [ 561 ] 95 [ 782 414 590 419 ] 100 [ 531 531 531 354 767 413 531 531 ] 109 [ 590 ] 112 [ 561 1091 767 796 561 ] 118 [ 561 ] 121 [ 531 ] 123 [ 885 ] 125 [ 590 ] 284 [ 531 ] 499 [ 502 502 ] 502 [ 295 ] ]
endobj
-4410 0 obj
+4414 0 obj
<< /Filter /FlateDecode /Length 32 >>
stream
-xÚc``0°MþüxÛ¿‹ï¾ü
-aÀ 8
+xÚc``0°-.~¼åßÅ÷_~…0`œ@
+
endstream
endobj
-4411 0 obj
-<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 6724 >>
+4415 0 obj
+<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 6576 >>
stream
-xÚZ\׺ŸeÝT‚Êd-3:³öÀ-öÞbÅ"e© KY@@X:»œeYzïeaY ˆ`oQãÞˆ±ÅD½c¢¦h<ƒ‡ûî; Æx_rï}ï-üvö›™¯ÿÿ9+ úô!ÁÐÍËÖ,Ú°òƒµë6)ü\ügÙm’y†È]‚ÌŸ-çGò£€Ë'øžµà9!/íƒúZ ÷[õévD­ÃE·_w‰F„ w
-¾—ôÞmë¹ÖqÖ pwàô›–6èšÍÇ6ßQzªûýì÷¿,—äž9øðþC"‡Ú½1,…žC_b ·~yø7#ÖhÑMÖ]MÀ·›øía‚.0ØA®ÍªWq(šÿ/Q^’:+‚ WÇG%q(¸û( 6tÏlƇÔÕŸÅL}PãL¤³6°´–Î
-Ö‡„£t¢³Å@}žCe°@‚€„wEÖ¼!Ö <
-IJðôÜÇó8kþa¬-“ÊŽØ@alè¤öñ' \mÆ<GÖóvî `áç$š#ò!¯f&ì亿5’û/‰¨ƒÞ•m²« ¤ Å3ø>7M+Q‚¥žŽìnOÇhf—[ÕÁ@NU´%4ÜF–€Ô‚b¶©¶­¬•9yPîWÊä{-¦­»2CM]ãM‚ /øŒa×6-ÉY‘1ê¤ØÙÇ£KF23Ѧ“ÐËáÊO¿-W¢…Õ\¼V›ÏŒªÈB’Çn_$:è¹êØ rBóÐ |Ü ç¢Ð΃p´ÆvËcðÀ££Mc'ôêœö„âùuÐJ’ Ô I)±j64A1o<³nZ;œ
-„7rŠ¸d¥Š( 3°Ôáê²âºK+êìg‡„¨?¢^L€6pd#ì—ËYÃv
-§`GÆÉ­²)˜ 8˜t¬>Ÿu¸¢‘mªl5œ`ÚÛƒ·ÕqÖ]ž8ÁÏ™`ÉŽ} =ŒÐÞ¨1R¯q‚çIäb4)0t>ZÉ ‰o²±ð)ù<ßïCÎKåâ£ü&°“`Ì›$%¦Ã9eŸ º˜3Šýa˜¨ûáÛZ(x[ ?‰)‹ÞˆºUÃYA]'̸*ì‰gš:;:F“¨a'yÎP‡3»ÊŽúq~GÁgu4l—§ƒŠÎ¿¢‘hà¤1h ’@b<!uüU·Ò”.†Ò¬û•M 웆F*µØ¾Uؾ#&Øb˜ís6ÂqFa×p~‡¤G¿ëÔO íu¢¶ nåL¾¤Èoä`Òwä³\ùŒ^«gª|'²ö0õÕÃÄ𣒵hHN¢ÛÀÄ L0Á¤0ØÀ~àQú#êÿ^—•¤Å¥Öaá´­Rõ™ísu»U` nºƒg@%s!¨¯p¦0r±&g?¿€V&4
-wž~Åá~utÏªæ© rD÷ô«]pšÝo=¨¸pˆS7ød3”e.È)ààB’Zz(MÿWs°K-\y¥ùŠ-tªM¯µ©»taÃwJï4\ ì>—+)ŠnpŽØ•ìâĹ92/ÿرګ,Œ Š÷ ¦]Kåå,õEÀ¶(Ww'zÉ/›áP8Zœ¸sÚ·Ù§ˆ5nØ &2›År]PÍ~º2=+#‹ j>˜TÉ<ï¸vû@D}p5—Ÿk*;¦µLV'%EÒáyÑÅùEY,úD*ñH
-Ä­Câ›ÎPÚ2{ðCy“¾º ”«(2äÖ0ßB8(êK¶ÎwšÀR‹Ž_pôtYá…{Üâ8Ìåz¡Ã4öÜÇ®øÁ¦r¾‡/&›Rsn±å&1¯Fãu"Ÿr²§þPº#þÕ§¿OR1¯ƒãq"¼¹#Ì7PλŸbøð«zZ¼i«ðáM€Þ'©ù ¸±®QV†ßÈNšî´Ù7œMOÄ|wdæ½-Ж# †©mêî·KW‘/ï»x±`ÏZ…ÿ™ 5|×\äÂF!lÃHá
-j\MZónïñ‹þ0ØLÎSg0;å€.û[‰Í¶U#[lv%yG+3›-SÇÎcƒ±aø´yH™ðøïÀFý
-…6­AÐbfµæa«V'ër<ARîhœÙŽÏ²ñ¸(êUŠ1·š³ €Éû¨9ªß&þ¹ÄXáï¨ôñ¯¬7VV×â$=]wúH© *z<‡FAõœ?ˆàžÖæÉ¡±pÃý«9Ù¬¯ÒÃõ\™QÚTg·,II‹N¤CÃ"âY4YŠø
-Í{;‚âÉ@°kœùæ­m š©në™Aä8Ð^ÍñR«…ún$ŠNO‹Égòô¹¹zfv µ)¢îK¿
-ïÔÌ¿ì)Û7Z¿)X¬ó
-vÂî%Á*öÿ¡æ¨Xó,5>½gà‡WÛy²ò ùÁî u”€÷$0‘7Ç ~#'£!HòÔŠ¾hi=QɆ‘H,]6†nÓXêÑ‘4)›®S‡ûÇÈVœu} GÀÁp8ôa?x,™·Çvš“YSKY*›@û š|4×f÷WÕ—¶1Ÿ×®JÒqe;µ‡a”ý9FÙf”üBØ•K šŽÚ¦¢Ùxøì¡)pŸÂip7;S¨ 4fú($@#¿…i0Ž»û $à¨Ê<€büȼÕÚi»Þ8h $ÐP4t "0 ôj"|J~}±Ó²$Nš-
-Ö-`w¸3³Õ¥º1„ :¬>vœ>
-}½/LðË!üÅIÒR´Ñy,%Þp=œLÃð?dNeóó´Z=­OΈܱ=.žE4’*ÐJdE#å´ÿ€Í̹ïܪñ=/AäûH(^û±wNù*œ‰Åd*hrU”¢aõh ²§Ñ!L•†owb£14K¢“t Ù…ÇOde²†R\ ­è^òô†8ù#oÂÉ<+~s~&àé£ælÖI*B@‹Ú`»8”+• ¿kGídTP*ËA>‡‰U»8
-„TT€ò|¶Ã62¿T`+Î÷ƈnÀ»o:9H~ëÚ§¤Ç‡¢S>»Öšy’…™' úe<pý衺J-ý³`¡‰°S ÷²ë=öy3s×vâÚßøêÎWís¶à´¬5$˜ FÚm=i ‡¿¸úâÇ:ª¤«ä[I:È‹Œ1 )ìÚ$¯³5ñ(¤Â¹„s±×EƒåíÒÎ= Ÿ#Ü´&²èÎ;¹KÉ߶î±:8î¬І¼aòˆÏàj}ÁÞôZ°§Ùƒ¥Ú=ZÎ&Õ2_—Þ«3/ÈL‘ á\ÏQ,æ éâjmN¥ŽÕfÕƒRæ
-Ðxì®i=mõÍ4v.î ¤üû¼µ¤Ñ×à¼ÚyçæP6奘ê@£þ¬›þ=™@~i„Ä©¸%&ÇÆ+iyeTieY¡?< 5ñ>upfàÂeø첯ë$7uŽ­d[/ZSàxâ"ýùùËá¢
-4S¦gcRµ yLaÐÞÞ´ã5ê˜Ök³èÌŽ5[ÔúÔ± Z\Jörû=MñzV 6yYfÇTy珞;,¶Ãå,>¹D¶0dD1‘ ~/‡¶‘‘ 6/S›šÁ¦¥§eš-7_¾ý)f?ß<…ýòQ¬_%h< N y
-J$íþEýËÙÔøÍÙÉŒ<ñì]WÞü=죟­HeãµêŒ^MŸô(š¤‘‘lŠ&.NÍ
-Ú1Ôµ#Ðdr%ÉÚØ º»ˆôQ£YPM
-[–ÆRÒÔ¬ZPÂ@»Š ôq¾¹Õâaûž ®Åa³¸)7~z©_à¯pä¬|+¹\î![ ²Ð
-.`xà(Õ67~žÿbç íÏe/¨æø,|½êæØröŽáÂÕ»4eswê¹ÑÒ9xTEVKËk›|óC´ì™æ[ºb†²9U}3~Ì2—¨HÎO®Ô¬O¶Ü›ŸMGe"ö¸øÎñ£8ê4†K=¶,,=å…aJ…‰£Î,¬WVø("Ül^ÅpØw4ƒ pþøò™ÉæÔËuß;¿„ƒ¿§jø@¸suXüÕ^ËøÄ ’AËÅÖ…ͦÂüa—Î]8ó- û¿…±Ôd5oÊ´òËŒ8Êçä b;j?¯:Æ|×>ï£Ñ‹ ~è=Ù Á"*C4A4ωÍëh-·À¤#‚·Ð±8ö,¡Á—$²ý½·-&gl[»pFrËq~ýæ“›@=C“È%À~ødÿõ,=«ƒo{>'”·5 øF~”y-ÁKƒ¹Nœ#ÐÉ1×iÔd…Dбš¤ä8£'=ê+E‰y ÐUû± ±üG°— Ýt¾Xþ¢>Ñ»€ƒ“ÐsѾŒô„|&?#Ó áGÀ/*Ï6ä5i‡Y¿¾ B»¦›¯Ït±æçùz9#—ÝV|ýéÚÀ€$ IŠæÐônW4%åTm< jñÓ«É\€n7–=U¨‰Ìá²¢‹?t²
-Mì^Šå#Íòi€6žê•ç~—?_dyôè~%ŠÒ§Å2ùéYyi\Êg¥ݢ˜´4U!S˜–•väoå7×T]À
-weö:¨+ª×A>°‡ñ è5øˆ&'0œV©5 ¬-J«Í
-èÒèêzm¥Ù=î – q:?³{R“J¸ÉL€¹¢”´äœ4ºæ
-@j]iÔ–›Uܽ„¼-›“ùY§¡×¢‘»ý–-c‚"s—‘Z‘SKB B”ÑrçÓí¯²ÓX¸–ŸQu®)Û„cŽû¥¡«ŸAp¸V`¾¯K^Å\ñùŒý›óœrŒ+lœìQœçbÍ„mô*ݸö¹ì¢£7öžbÚ<?Î5]×u^¡§åJ6€©ªÍì¨ÐåQ>Œ÷ò—¡\Ì9ðä$} ü5ç ûsÙíì*¦áZÄ”R.w X¸‚îeßSîÓ¼§ÕtuÀÀa×£·Ë
- ‰‹IÁåœ2,E£Q  âçß5]ª«KØ[Å×xWÚ·:²<¿!ëð©mí3—Ç9­g«ÃÝkW1ÎîDbYü•äßW$~#øÑÿI`!Ùœ¡ráPÉŸ‰u/Ƹ&¸ÐÊܨÂ7Þ( ŸÛt¹®.>¼’í%íÿd,¶´gûâÿkéD4x§ysìcÝ¿U'
+xÚy \×¾ÿ„˜ *¢2ÆꌉûRÀ­Zê^W´*Š‹,a „%€€ì[ ! û¾…
+^ q®ðk)±Ô”µD’`ˆ ÄLj–cöJ8](>à5à ‘·¨K¼BœG.4g®8eàÇc~;H=èæà‘ƒk-œ,î±’9ä¦å&˯‡Nš6Ô0ô·aÃ' ϲ²³ê¦6ROFL1uD鈟%#tùå{I£¬G=EKé&eÌØ1sÇÔ¼oõþFh´ìiF¸ÝÈoô€‘Æ(Ò>!g‡bùÿ¤ªr¢˜HURL*‡B{ˆ‚ÂwÏgüHíþÓ ”Ù_T'8#éª .¯£³A†.ŸmƒÃE°F|Méâ@
+ ¶ëGÂqZÑÙR :Ï¡
+X$A@ ‡Á¯D–¼!Á <=jõ«Æ{0ðVWåÊç=’œ‘o!Ý÷F‡{ãy,ô$ŸYw̘·ÔM@E¤ÞPV^[½·$LÇÖ4w‚læìYÏùœœÜ¤Z­ú$Ð|¶,j“MÅÏù9øZWë‘Õ,µT¦ÓËŽ1¹ßf~Ç¡Õ'%Tí´ùÁÛ\›Úÿvé*œ¡c-{’q .`£Ñªýgð-Ìù9ø銟©=«á:É׋î¢á…,u
+ª.ÿí*Ý=ù+D³½Ãü*Å·3⽸ÞRÒK¿ˆ óã­Å”/dŸýÇ¢à7’UŸ.BbÍ„ÉâÆŒìã,äÄÔåç­‹6rzt_²`õ'Y$;«³9X]IJðôÜÇvœ%ÿ0Á
+îßl_>#ü0œM£ß1“sn]Ú.j r¤‘\•”}‚ã!©cïäy“}œÊ·1h8NC4ô§‰Ðê C“‘³'©% ÒöF°T­‡Â9Ô‰qö¨nå‚¥žh£Ïç©jb›«[ '™ööÐmõœe7.ðsFXo´‚C¯hÛ n ^ã/ÈÅhZpø"´šASßTcñSòyaÀ‡\,—‹?Œ ˜ÂNƒñoŠxœ˜:T|ŠèR®A#D½ßöBÑÛ^øYL™õgÔCçõÝ0ûª°/Ÿ™ªÜØxurŠšæ=Gɸ8WàŽƒÏëiØ&®ÌUÝ;CcÑ°iÐ0$ÄdœBªãU·
+Ò”%†Òœo«›80UjpåÂë{é­Ž ê€MAçvtPf|´“\öm‰.a£ŠÓ5s:Í©ígk¯vÜ¡˜Öi;vÎ2¯ßš@¶$<S}ÉÓœªAö-s ‘ÚCúüþoìBø³d“ËÎ,~SDÝ, ­k¢/_;üåÏ?a«z­$‹ìšÏRf-¾xïæÙ ×ös™'*N<åÿ)n£58ðÇŒð¨Q`
+¼kœÔ ìÃïôîúŸ'†¶ZQ[PµrFÒ6q0õ{òY¾|N:æÆùOemaÆ›tŒÃÊìÑ{%¸ºï
+°™Ù½
+ÃùÀ[˜ãßc¨=ÏÞ)þ¯}Î!ÁtgûÀhözäæòµÌ4ç•A±\úbêk4ñJQü¯:ñòî‰ËWò¶où'­ðNÏüë…}mûÆê7 ‹mþSÃNqYÇþÌü7Ûóf®SLÌ5í…°'>–@g4#»#Úf¢ùíwÃÐ ¸ºá,èŽDz$M˜= ÐØï`&L‚“¾úpÜG(΄ø üØ>ÓÚmšs¾8|$Ð(4j"0Iþj*%¿=ƒÃÙY9gõ…ëäéÊluÓ7…q!GT':èƒà³†£l“¾¥¼9u4ħŠ«uÓlõ ûF)¿ßø9ž¤qw…¼ÃH£i­ÊÇuwŠ¬Uk‚XwÇPk,¿j;Aíy®7ÏÓ8kÖÇO¬=ò
+9,VÚÅ1 ¬ª
+T²°¶‘…• 
+{q¾?Gü˜üêMkò§£äw˜ìT^ŠNûíj´7i3“öþëd8ôúñÃõÕZñWÉBSa·$¤ì f7x9îõeÚwãÞßøúî×í ¶à²¬
+7$a»¶õ•%óâꋟꩲž²ï$Y  :Ä'§³ö©>a
+fkÊqHErÉç®!³Fó;å?ž{@?G%¦²èî;µKÉßbåD-œôNÕhEÞ0z%esuþ`Ï*Úìnñb©v¯£gSë˜ûå÷êM9fHp¡÷8SÝ,±^“W­e59ûA9óŽh2׬>{3>…Ý˺()?‚·”4ù\׺îtgÓ_Š©.4î¯à믘õòf$~Ì`)ó”´„$%-¯Ž)¯®(6 ì‡áFÞ¯έ\¸ Ÿ]òµp½äáæî‰Õ,b÷‹Ö9¼HqþòC¸´
+Í•éØø MrSÜÇl·÷1Û$µ*>™õqÙ±®h ƒÏž9qñQ·²=Üoc$BD©Œ>æ¹ñ5¾;é•ŽËlp;‹OC.…-NÙ1L4HÚámd4H(اÉÈÍf3³2s -æ—oÄ~ÆÀáß<…ãòQ‚Ÿ\#hê„ÉBž‚I{àßÑàJ6#É!7‘g;U¦ë+[~€tól’&[•Ýoé“>CSU :šMW'&ª )™l^t`ž ƒ¤òÅ»v4jUÜဪ´/âÌÛoǬ¢=ƒ§O
+¼s:–-HK׎±sXŸYMY)«Óåètæî­mj=ÆŠc]3©BÎuo„ö$ð Äç÷Œ2‰¹&#„Û–™ž£*6—‹}‘·¨AœQ”w­pŸ¹.ï&&WÐG<±"ê"ÂT.Ͳ£€s[hÍgÛI8¡:q……ÓàNQNȨ¤û(ÐÃÿ6|ýø0Ö¡OlžBå“ÕO¨ËPW |oÊc$\¾Ûy§’½ŸÝuà"ÛQòÈe¦ü¸
+ušo<PU]Z—wð3—3‡åï($GÕÐjõS–ro?Up´•;|¨±å!m£‘l®Þ¬s°ž0Ž~͆½œ²U}õ ý¼óÆíŽú`Ÿ2¶Â ¸l7ö¹.ð3„¼¿¤ !76:-..•Eè¿ŠRûžÕÅæ&gb*ÂBôz¡H—²
+/Ç-KÊOû°jªŒufÉ~e•"ÊÃú—õP Gÿø§>!}þôò™ÑêôËõ?¸¾„# jù`¸
+“aUDÒŽ¸=æI)‹A4ƒVŠ!-‹‹ZŒÅ…£/»pæ;ž| g©ÈÂnƬ‡’ +Šr”ß© Žíªû¢æó}»ÝGã—-FƒÐY¡‘"*;.¨Chž›O½s ¦¼¥k}d­ïÉ|I"ë?àm9g›ý’9iG;XxÿÍ7·€j‡¦‘Ë-üðÉë9:V³
+Ôá»!V%’¹­ ^{ºXÇåÄ–~
+è´84µw^mZŸ è†Óýë¹?ÖŸ/²zõ¾Åè2‹™Â¬œ‚L®à÷Á½Ù¢øÌ̸b¦83§ìÄß.l©­¹€ îÙ× ž˜þ
+¥‰Ö9ÙpÓ^CÓ9PÁt
endstream
endobj
-4409 0 obj
-<< /Type /FontDescriptor /FontName /SEKAPH+LMRoman8-Regular /Flags 4 /FontBBox [ -456 -292 1497 1125 ] /Ascent 1125 /CapHeight 683 /Descent -292 /ItalicAngle 0 /StemV 98 /XHeight 431 /FontFile3 4411 0 R /CIDSet 4410 0 R >>
+4413 0 obj
+<< /Type /FontDescriptor /FontName /SVSURZ+LMRoman8-Regular /Flags 4 /FontBBox [ -456 -292 1497 1125 ] /Ascent 1125 /CapHeight 683 /Descent -292 /ItalicAngle 0 /StemV 98 /XHeight 431 /FontFile3 4415 0 R /CIDSet 4414 0 R >>
endobj
-4412 0 obj
-<< /Filter /FlateDecode /Length 638 >>
+4416 0 obj
+<< /Filter /FlateDecode /Length 640 >>
stream
-xÚ}”MÚ0†ïùî‰=dɧ + ¨¨û
-9dý;i)/¥úJ1}Øø(¹‡õÅî»ûú¶¯«LMݽ¼Ü®YëzfÕ±ì¯:ûÿ‰LGÙƒ(³e~ʶ+kõÂügÏóôƒµ*VuevØ9²d“Áû\ª¢%Uv2⎰¢Ì{"û?¯ô¨ÌâýëeµUçÚ™ÏÙDw.»¾½[ë'gòѲ-Õ…8êœÃ­i®Òø0ÏIVȳ.­gôžU’MÌö·…Ž–ýýѾÖïdeÂy]È®ÉrÙfê"¹‚—°ùFÿ%ŽTÅ_q«Ng N¾òh忳Öò—ºçE~bie‰ƒ‚
-'B•pJ-釖6ÈŒ,…>ªÄ ôãD1ˆMÑ2g ªIfDfDkĦ rE<S™Í@dF3¾Á,Âþ"˜q"r¡šäB„¹ð5f!:Äp‰6 ¸p"¸„8£§¢XŠ, ¢;ÂþbXÔžºÇ˜`€ÅðÔSŠqîf‚f1ÎÃLÁ%Ää9\Bœ'ìˆÃ%Æùq¸"L0¤š0 ©;&(ð+d†‚ÌÐ]Í s43"˜ LIÐ/ ót~œ>”“~=µO|ûžoýMZ"P
-â Y‚·Ô¾•æ…6wÓçý‘ßÚV_ö³7„¹J%?︦nÌ*û±—ãpQúØ8
+xÚ}”]‹â0†ïû+²‚sѱŸÉ8HA­‚°óºÃ²wµnÁ¦¥þûMòžŽ°ì쀃OÏÉ9ONl&ßÞOÒ =¶—]=´¹t×/YãL&i•Tý«”…,Æh÷ÌÞÛ:?ÈžM×»t§ÊþA'ïT~
+9fý;i%/¥º§˜>lz”?ÝÃÇáÇþ—ûýe_W™zr÷ò2\³Öõ̪cÙ_uöÿ™Ž²/¢Ì–ùmWÖê™ùžçéU¬ëÊì°sfdÉf£÷¹TEKªìdÄ?`E™÷Dö^éQ™Å‡[×Ëj§Îµ³X°™î\v}{³ÖÎì­-d[ª ›~á¨sCÓ\¥ñaž“$¬g]ZÏè5«$›™íï
+-ûÛWs¸¯9ÞÉË>„óº]“å²ÍÔE: =/a‹­þK©Š¿âVÎ@0~åÑÊg­)ä¯t!Ï‹üÄÒÚb(DŒh‰XBN„*á”ZÒ-m‘Y
+}T‰AèljÐ/|qdr@&Ñ™T“̈̈6ˆQMrE<S™ÍAdF¾Á%Âþti#"ªI.D˜ ßXŠÑ=ڂС{ˆS‰1½ÀRdIÅØvÃ3€u ³€úaföÃLPÌ%ÆIs˜ "˜Å8i3A—³æp qFœ\°#Ž™°æ0‹q~f‚ ©<CrÁ~/‚<ÑO'\yÑ1%A$‚§ÀÌý²à)èü8}('½?µO|ûžoýmZƒ"P
+â y‚·Ô¾•æ…6wÓçý‘m«/{ÙÂÜ ¥’Ÿw\S7f•ýØËq¼¨ ½m?¦4Žn
endstream
endobj
345 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /SEKAPH+LMRoman8-Regular /DescendantFonts [ 4413 0 R ] /ToUnicode 4412 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /SVSURZ+LMRoman8-Regular /DescendantFonts [ 4417 0 R ] /ToUnicode 4416 0 R >>
endobj
-4413 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /SEKAPH+LMRoman8-Regular /FontDescriptor 4409 0 R /W 4408 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4417 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /SVSURZ+LMRoman8-Regular /FontDescriptor 4413 0 R /W 4412 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4414 0 obj
+4418 0 obj
[638.9 ]
endobj
-4415 0 obj
+4419 0 obj
[446.4 446.4 0 877 0 0 0 0 0 569.4 569.4 ]
endobj
-4416 0 obj
+4420 0 obj
[668 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 607.3 ]
endobj
-4417 0 obj
+4421 0 obj
[570 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 277.8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 777.8 500 777.8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 520.6 0 0 600.2 0 0 0 0 0 0 0 0 0 571.5 ]
endobj
-4418 0 obj
+4422 0 obj
[388.9 388.9 0 777.8 0 0 0 0 500 500 500 0 500 0 0 0 0 0 0 0 0 777.8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 500 0 444.5 0 0 0 0 0 0 0 0 0 0 555.5 0 0 0 391.7 0 388.9 ]
endobj
-4419 0 obj
+4423 0 obj
[ 28 [ 525 ] 35 [ 525 525 ] 40 [ 525 525 525 525 ] 47 [ 525 ] 49 [ 525 525 ] 55 [ 525 ] 59 [ 525 ] 61 [ 525 ] 63 [ 525 ] 65 [ 525 525 ] 72 [ 525 525 ] 75 [ 525 ] 77 [ 525 ] 79 [ 525 ] 81 [ 525 525 ] 84 [ 525 525 525 ] 91 [ 525 ] 93 [ 525 525 ] 96 [ 525 525 525 ] 102 [ 525 525 ] 105 [ 525 ] 109 [ 525 ] 112 [ 525 ] 116 [ 525 ] 118 [ 525 ] ]
endobj
-4421 0 obj
+4425 0 obj
<< /Filter /FlateDecode /Length 23 >>
stream
xÚc``àø˜(šp5Oì±K
endstream
endobj
-4422 0 obj
+4426 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 4150 >>
stream
xÚ­XyT[U·¿nJ[ŠZ¾8Ü«ç¦vÔZZëÐ:tig±–KG(”!Ì%B ™Coæ2a
@@ -14969,10 +14900,10 @@ FÁRâ+æ“›ÝðÐíTÿ4Y¯hÚ”Æ5Äõ‡ÙLV°™\À…‰Œ‡Ón¶Ä‰ ¯|5*ÇÃãI1Ê?bT¨Œ`km^é~R.w¶:}]!ªï“Žs
¼‡½ÌžÍk¶:‰vYPœ«+`·/@»pKY¡vÊÚÛmž
endstream
endobj
-4420 0 obj
-<< /Type /FontDescriptor /FontName /YWBYKK+LMMono10-Italic /Flags 4 /FontBBox [ -491 -316 834 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle -15 /StemV 175 /XHeight 431 /FontFile3 4422 0 R /CIDSet 4421 0 R >>
+4424 0 obj
+<< /Type /FontDescriptor /FontName /YWBYKK+LMMono10-Italic /Flags 4 /FontBBox [ -491 -316 834 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle -15 /StemV 175 /XHeight 431 /FontFile3 4426 0 R /CIDSet 4425 0 R >>
endobj
-4423 0 obj
+4427 0 obj
<< /Filter /FlateDecode /Length 538 >>
stream
xÚ}”[oÚ@…ßý+¶HäÁa}[‡Y
@@ -14983,21 +14914,21 @@ ZZŠV ×óÁRìzNA®§#¸˜!†ëÈ‘SÀ 1b(„˜!‚Xƒ ag ¶”rP‚:8K^襮z!v¬@˜Vpd"& žÀ‹€zê
endstream
endobj
339 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /YWBYKK+LMMono10-Italic /DescendantFonts [ 4424 0 R ] /ToUnicode 4423 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /YWBYKK+LMMono10-Italic /DescendantFonts [ 4428 0 R ] /ToUnicode 4427 0 R >>
endobj
-4424 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /YWBYKK+LMMono10-Italic /FontDescriptor 4420 0 R /W 4419 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4428 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /YWBYKK+LMMono10-Italic /FontDescriptor 4424 0 R /W 4423 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4425 0 obj
+4429 0 obj
[ 28 [ 525 ] 35 [ 525 ] 43 [ 525 ] 47 [ 525 ] 50 [ 525 ] 55 [ 525 ] 63 [ 525 ] 66 [ 525 ] 70 [ 525 ] 72 [ 525 ] 75 [ 525 ] 77 [ 525 ] 81 [ 525 ] 84 [ 525 ] 96 [ 525 ] 98 [ 525 ] 105 [ 525 ] 109 [ 525 ] 112 [ 525 ] 114 [ 525 ] 118 [ 525 ] ]
endobj
-4427 0 obj
+4431 0 obj
<< /Filter /FlateDecode /Length 23 >>
stream
xÚc``àTdTšâÁ°Àe
endstream
endobj
-4428 0 obj
+4432 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 2337 >>
stream
xÚ•V{TWŸ
@@ -15016,10 +14947,10 @@ fTKw0V¸&Q¬«¥þ+<NnVš-ÅLWœÕNŸâê]ÌuIMa“&#?/¿
aA\PQRA‚• ºH¹¿CÀ¿à èq•pâ*­)9 —÷q\ÞÕâÉ_ê‚~Rüˆ¯$r
endstream
endobj
-4426 0 obj
-<< /Type /FontDescriptor /FontName /ESZHGF+LMMonoLt10-Bold /Flags 4 /FontBBox [ -454 -308 734 1039 ] /Ascent 1039 /CapHeight 611 /Descent -308 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 4428 0 R /CIDSet 4427 0 R >>
+4430 0 obj
+<< /Type /FontDescriptor /FontName /ESZHGF+LMMonoLt10-Bold /Flags 4 /FontBBox [ -454 -308 734 1039 ] /Ascent 1039 /CapHeight 611 /Descent -308 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 4432 0 R /CIDSet 4431 0 R >>
endobj
-4429 0 obj
+4433 0 obj
<< /Filter /FlateDecode /Length 459 >>
stream
xÚ}“Án£0†ï~
@@ -15032,21 +14963,21 @@ xÚ}“Án£0†ï~
endstream
endobj
338 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ESZHGF+LMMonoLt10-Bold /DescendantFonts [ 4430 0 R ] /ToUnicode 4429 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ESZHGF+LMMonoLt10-Bold /DescendantFonts [ 4434 0 R ] /ToUnicode 4433 0 R >>
endobj
-4430 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ESZHGF+LMMonoLt10-Bold /FontDescriptor 4426 0 R /W 4425 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4434 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ESZHGF+LMMonoLt10-Bold /FontDescriptor 4430 0 R /W 4429 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4431 0 obj
+4435 0 obj
[ 27 [ 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 ] 61 [ 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 ] 101 [ 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 525 ] 118 [ 525 ] 120 [ 525 525 ] 139 [ 525 ] 163 [ 525 ] 202 [ 525 ] 294 [ 525 ] 602 [ 525 ] ]
endobj
-4433 0 obj
+4437 0 obj
<< /Filter /FlateDecode /Length 36 >>
stream
xÚc``ÿÿÿÿ÷ÿ`â×b`P`€&¢€
endstream
endobj
-4434 0 obj
+4438 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 8560 >>
stream
xÚÍzy\××÷DÈ$*EeLÅŒ½ƒ»u¯[ÝwQP¬u ;B , KØ™°ï„}ßDÜ÷— ¶Vmmµ›Xí¦]Ÿ3í¥ïçú´ý=Ï?ïçóB˜pïÜ™{î=ç|Ï÷œaiIÛí[ìw­\?eƒ““<@þÖÌi›ež!~n
@@ -15077,10 +15008,10 @@ e"ëcšâ›Å|*›Ÿ›—ÆdV
Òbò54žI¦æ³ùùRþÀg£°þoìÉì¦ü&}ƒ¸µ¢¡å}¸E.Ëd4i1Åt©/,Ô3ߊ¨“晓Hm\RB"%,VøçøÑN;]·ù0J™Æ-nŸØ“ŒÑÆŦ0I‘BMR¾¦˜n&Scؘ)ÐÅ ù?}”Ìq-r¯: ÞÖrÁµƒnjÌ)®aò¢…ñ™9I¹tF÷ÜÖØö„àä øù„§œ,vQ)« e#">‹†³ýÚí"ÿÌÄFÄ 33yÇ6½÷;”£­&¼AÄBÓ{¼Smbò¹Uù°$?#ŸDŽ[ýfX d­ÖgéL?™åYVV­iÙº2]Þå–<«×¸Êáÿ%ù¿;TG³
endstream
endobj
-4432 0 obj
-<< /Type /FontDescriptor /FontName /VSFYBK+LMMono10-Regular /Flags 4 /FontBBox [ -451 -316 731 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 4434 0 R /CIDSet 4433 0 R >>
+4436 0 obj
+<< /Type /FontDescriptor /FontName /VSFYBK+LMMono10-Regular /Flags 4 /FontBBox [ -451 -316 731 1016 ] /Ascent 1016 /CapHeight 611 /Descent -316 /ItalicAngle 0 /StemV 175 /XHeight 431 /FontFile3 4438 0 R /CIDSet 4437 0 R >>
endobj
-4435 0 obj
+4439 0 obj
<< /Filter /FlateDecode /Length 757 >>
stream
xÚ}•]Kã@†ïó+f/½¨MæS¥ú e·*Vd÷²&Ón MJš^ôßïdÞ·
@@ -15088,22 +15019,22 @@ xÚ}•]Kã@†ïó+f/½¨MæS¥ú e·*Vd÷²&Ón MJš^ôßïdÞ·
endstream
endobj
337 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /VSFYBK+LMMono10-Regular /DescendantFonts [ 4436 0 R ] /ToUnicode 4435 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /VSFYBK+LMMono10-Regular /DescendantFonts [ 4440 0 R ] /ToUnicode 4439 0 R >>
endobj
-4436 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /VSFYBK+LMMono10-Regular /FontDescriptor 4432 0 R /W 4431 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4440 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /VSFYBK+LMMono10-Regular /FontDescriptor 4436 0 R /W 4435 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4437 0 obj
+4441 0 obj
[ 51 [ 569 ] 56 [ 569 569 ] 78 [ 569 ] 82 [ 569 ] 100 [ 569 569 ] 106 [ 569 569 ] 121 [ 569 ] ]
endobj
-4439 0 obj
+4443 0 obj
<< /Filter /FlateDecode /Length 21 >>
stream
xÚc`
< 
endstream
endobj
-4440 0 obj
+4444 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 1685 >>
stream
xÚuUkPTG¾óȆë(uGû^QWÂCÅøZ·`‰¸ òô±™Ë0Ì0çሠjÒ3GAŠG@^òX"")E0‚kŠZ]CP*–•X,PšÑ¾nócg´öÏVmwÕéîÓ§«¿ï;Ýu„XLÿÄÈÝá »¢câ¹Lµqs`<«µÔ&ïÞN~9¿*
@@ -15113,31 +15044,31 @@ GK›êtôËdžïýmšBó—áExáæÐà}½gËZªÝ5g:÷‚\þû¥~ÕóÛBc"õZŠOI
NÁbŽâC¤^ú®×r—`à)ê|*â+Ð%æM¤Ü× 1=ÛU8⦈ˆkQʨöR¡ ‡áyÑ Ä¶ËšªJ‰mž´Ñ¹ÃprŒú~_9&꾩ûR58WCW%Ù#B)_o-ZÈ««=%…Øä-/7ýlµ|D%2–]¨•‚¨DC°bTø¸ß™ðir8ö‡ÓálkQ(\ç-µ—:KÏ—:óÿàY
endstream
endobj
-4438 0 obj
-<< /Type /FontDescriptor /FontName /TFIASI+LMRoman7-Regular /Flags 4 /FontBBox [ -483 -292 1562 1124 ] /Ascent 1124 /CapHeight 683 /Descent -292 /ItalicAngle 0 /StemV 108 /XHeight 431 /FontFile3 4440 0 R /CIDSet 4439 0 R >>
+4442 0 obj
+<< /Type /FontDescriptor /FontName /TFIASI+LMRoman7-Regular /Flags 4 /FontBBox [ -483 -292 1562 1124 ] /Ascent 1124 /CapHeight 683 /Descent -292 /ItalicAngle 0 /StemV 108 /XHeight 431 /FontFile3 4444 0 R /CIDSet 4443 0 R >>
endobj
-4441 0 obj
+4445 0 obj
<< /Filter /FlateDecode /Length 405 >>
stream
xÚ}’]KÃ0†ïó+ŽwQ›îSeætPp›¬C¼í’³X“’¶û÷ž$ëQ ýxzÞ“¼y“ÞÍ[Í¥Ùc4¼ã°ÅÚ´V`´XëõžhKÔÍQ¢ìªõ#¼Y#rlàv‘=gZ5}gZœZ‰êwÑ•þ–¸yàv‡Ñn™Íó,z]mMYèi´Åc{*lÄ]×N5'Rÿ/ªÂUðü£­•ÑÜqÎéÇ‹– SºÖ,¾¸„¸ó}PZÚ‹UØ;ã,€T¢¹Š’¢rÍù¹n°ÌôÁ°Ù bšYÕ={×}o¬D«ô‘øw¤ÉÛª:¡óœ¥)H<ÐДѺ(b·üLRU5ç¿røîÙ+„ç$Fb]m¡ÈfOa¶¤+e¨å:]ûC@tŸÉµ$> ëi zݧ,¼<=y½zð4J<MF¦Æ&憞 <M/3ð4¸ô®Ü‚ÜÞ\󭵞ß@ŸËFi¼îqe*×åo8ºƒêh³d_K}÷O
endstream
endobj
336 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /TFIASI+LMRoman7-Regular /DescendantFonts [ 4442 0 R ] /ToUnicode 4441 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /TFIASI+LMRoman7-Regular /DescendantFonts [ 4446 0 R ] /ToUnicode 4445 0 R >>
endobj
-4442 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /TFIASI+LMRoman7-Regular /FontDescriptor 4438 0 R /W 4437 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4446 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /TFIASI+LMRoman7-Regular /FontDescriptor 4442 0 R /W 4441 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4443 0 obj
+4447 0 obj
[ 28 [ 481 ] 35 [ 517 ] 43 [ 444 ] 47 [ 517 ] 50 [ 444 ] 55 [ 306 ] 59 [ 500 ] 63 [ 517 333 ] 66 [ 239 ] 72 [ 239 ] 75 [ 794 ] 77 [ 517 ] 81 [ 500 ] 84 [ 517 ] 96 [ 342 556 383 ] 105 [ 361 ] 109 [ 517 ] 116 [ 461 ] 118 [ 461 ] ]
endobj
-4445 0 obj
+4449 0 obj
<< /Filter /FlateDecode /Length 23 >>
stream
xÚc``àT\0Ńá 
endstream
endobj
-4446 0 obj
+4450 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 2056 >>
stream
xÚuV Pgîf.Ô•qj»[ãm`
@@ -15152,92 +15083,101 @@ xÚuV Pgîf.Ô•qj»[ãm`
ƒL8Á.œÔ;Ñ1©mÏçì(¯`ç.¡°«¦¼¢Â)³¢pò
endstream
endobj
-4444 0 obj
-<< /Type /FontDescriptor /FontName /YSFAMU+LMSans10-Regular /Flags 4 /FontBBox [ -420 -309 1431 1154 ] /Ascent 1154 /CapHeight 694 /Descent -309 /ItalicAngle 0 /StemV 93 /XHeight 444 /FontFile3 4446 0 R /CIDSet 4445 0 R >>
+4448 0 obj
+<< /Type /FontDescriptor /FontName /YSFAMU+LMSans10-Regular /Flags 4 /FontBBox [ -420 -309 1431 1154 ] /Ascent 1154 /CapHeight 694 /Descent -309 /ItalicAngle 0 /StemV 93 /XHeight 444 /FontFile3 4450 0 R /CIDSet 4449 0 R >>
endobj
-4447 0 obj
+4451 0 obj
<< /Filter /FlateDecode /Length 464 >>
stream
xÚ}“Án£0†ï<…÷)=P I ©"¤– iÓV%»jÄžd-8äí×ö˜Vª6‰(óÏÌ?cgö㵸:@¸¸¥ä z5ja±kº`6Û*6¶ ‡g
endstream
endobj
335 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /YSFAMU+LMSans10-Regular /DescendantFonts [ 4448 0 R ] /ToUnicode 4447 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /YSFAMU+LMSans10-Regular /DescendantFonts [ 4452 0 R ] /ToUnicode 4451 0 R >>
endobj
-4448 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /YSFAMU+LMSans10-Regular /FontDescriptor 4444 0 R /W 4443 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4452 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /YSFAMU+LMSans10-Regular /FontDescriptor 4448 0 R /W 4447 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4449 0 obj
-[ 27 [ 750 500 ] 34 [ 708 556 500 ] 38 [ 500 500 ] 41 [ 278 722 444 278 278 764 556 ] 49 [ 681 444 500 778 278 653 306 500 500 785 500 ] 62 [ 750 556 333 361 278 514 306 778 528 625 278 ] 74 [ 917 833 750 556 500 ] 80 [ 778 500 500 681 556 389 389 ] 88 [ 278 778 778 528 472 ] 95 [ 736 392 556 394 278 500 500 ] 104 [ 722 389 500 500 750 556 ] 112 [ 528 1028 722 750 528 ] 118 [ 528 ] 120 [ 444 500 583 833 ] 125 [ 556 556 ] 168 [ 500 ] 199 [ 778 ] 251 [ 444 ] 277 [ 444 ] 280 [ 670 ] 284 [ 500 ] 319 [ 556 556 ] 499 [ 472 472 ] 502 [ 278 ] 612 [ 500 ] ]
+4453 0 obj
+[ 27 [ 750 500 ] 34 [ 708 556 500 ] 38 [ 500 500 ] 41 [ 278 722 444 278 278 764 556 ] 49 [ 681 444 500 778 278 653 306 500 500 785 500 ] 62 [ 750 556 333 361 278 514 306 778 528 625 278 ] 74 [ 917 833 750 556 500 ] 80 [ 778 500 500 681 556 389 389 ] 88 [ 278 778 778 528 ] 95 [ 736 392 556 394 278 500 500 ] 104 [ 722 389 500 500 750 556 ] 112 [ 528 1028 722 750 528 ] 118 [ 528 ] 120 [ 444 500 583 833 ] 125 [ 556 556 ] 168 [ 500 ] 199 [ 778 ] 251 [ 444 ] 277 [ 444 ] 280 [ 670 ] 284 [ 500 ] 319 [ 556 556 ] 499 [ 472 472 ] 502 [ 278 ] 612 [ 500 ] ]
endobj
-4451 0 obj
+4455 0 obj
<< /Filter /FlateDecode /Length 49 >>
stream
-xÚc``°®¯ÿüß¿ŸþüúÆ
+xÚc``°®¯ÿüß¿þüúÆ
endstream
endobj
-4452 0 obj
-<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 8702 >>
+4456 0 obj
+<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 8580 >>
stream
-xÚ½zx׶îYÆ€˜!{ ¡÷J ÔлéŽ÷&WlËEVÙ*î½É– ²±±é½7'@HB ˆ)'¡$$d³}ÏwG6î 'çœ÷î{’?Ùžͬõ¯½Öúÿ5# ¬¬@ÐÑâ-ööëF-_±6Ðß9`Âø1kÝ=e~Î!– ¹Ü h ¸÷¡€]8VÈÙYá¡ÖÂ=ÖVíóðÞ"õïXô!A
-zòŸ]6õæÚ¬ñY¶lXm=„t!Dψ¿ HA­€þg—8vüøÉóƒ¢B¼=½Âì&Ž?i´åsºÝ¼±vK]}#B}½íœÜì–Žµ[1Öne`¿ÕÛnx`€‹»—³Ÿ‡] ‡Ý:÷Mv²P÷P;Ï@YP舱vë¼¼Cí"C|íøß!î~îΡînv²
-Ð6²6z6€F·Í[™é ·-ñ/‰®¨**©ÈI©Ý®eë*g×0‡O»Md=ÈMªÏTËý%s¼C6:Ò”|ÆÓ‹-ö,Ô<WC¥óA¦ô|Þ·,þ䨔Ҏžïí°Å¥îÈÉæ»hz°iÛÄCÐbDf[ÄÞEgžÎ{AíocÑ2éƒé_caxZ|åÒWôƒqwp_ÐÞů\|C'÷dÛËIOµüSêÇ Sa¨ÿÃÖ¿±¸º']¶e*<iĵºôƒ
-õE4r!‹¡6»
-Z®”$'kÒ`–†Ý«ú.|·k ÷1à¿÷r’™ÉÉ€omJç2ÞØ„ô¯mrÒ\ú‚F[È3p×ÆPí´,Ó—IH€òΓÞJipÈô”èåPíE㑤?ܤK
-ÛÆ XiL“CE‚à’ì¦c³oÚ…Ž¢chã®óHÐ:-acuP•Ç@})‹ÈB˜.W*a|Ø<WTï±éÈ(¯ÂSð$ì„]ÑÇxZ‰¦>C,’ð ­–›Píã“`×]´ñ±›„ºK³ *Q­T¨ÁØ€¥ñ̆I{Ñ4õNóñÌ‹Ï:ÖE¥ð£ƒ‹"ª*J
-w~1»ñSÜ{&p/Üçùp$At ²Î¼³ð
-|%¸ÿJˆÖq6ÒêÐò€€ÐЀ€òÐêêòòj€oZýi›¢9áhý+Zb"G­ôRh“«WTPppaP}~^ZV6ÐÍ \é¸M¢Ph4J:9U™šsë"ùtN…æ6Y€ÀýÃ/PÜ aÛFÔ*Ek1ƒ&àÙïOà.b44­f‡õÅÂÈUž[@PÄÚ5C™¡yÊí&;Rù…øÂÙ‚£ìÞÕ™SfÑ+7Ÿ2£“|ΚýšmyüŠ[(w®¼¯™ü,)ý0ËýBRï¤+ö#ëœ*Ö3¸Û XŠ©gÑøÒþ]5&v IÍAR«(¨–Gªq«¿ƒÌ‰qð¬ØÊ7©N7Ñ ºsÕû¹twí ¦®y‡ƒ™ÍŽ†ê(Ú¦m_ÁΙï›ÑTÞï­h‹ 2éMÂ6;”- ã±!aóð÷]uJ’O³}?fM¨(D<Eî7L@ɯ‹•TŒÆT®Ãlk"™¨ýÜ[ÀJßö•¸sÑø—¢yFAÕ]”ØòzÕ$éRÕŠ$5ì5&0›]w6„±þ‡`K=jÄF=,}¾þ)î%ãóŸô¯#‰lö#a1»õ—â1‘vÏ´‹y™…7KþʪÚzšÍGJ Õ!·Í”ÖË÷»7ƒÈÒ˜¬e{$_6>ÖB?žxzü°sÇFéš·ìø†S´dMÀûáôÀŸÿŠD?Üý ,@?K׺m]åp¯Û¢í;•»
-é󗛯]¿´q>(m—JçÎÙ8}Êü wÏÔ\úŽ‡¢ç,QUäAÿ•<ÂŨÿ4vàTÛa›;z!-‰„± ýGql$Œˆ(†ù,÷7q~1,añ+~ßÐþ7ñŽÎ}y,÷£8ϲ¯#h]ÛimPQppP”hlß*Ú¡Õ&å0YúÔB-ÛˆÇÿ9IlÚò!>hFø&5 ÕµõVkˆ }d¢¸ß¸­ÒŽ8øsœÄ”V_w62M ªž5ûÔÚÑ0·ŽEšûäYoVÀÔŸQ`
-JS#:×€µ4ÙcPÀ[|š9‘M¾—a «–Ç„¨­­§´Á£vÃgo09Óï¾A:Èáb¾ã#±^´ç TíaÍáä\uv=‹¾Fb3îŠ$ä÷‡íÓçÃä|¯ŒŠ ¡Ã
-"*«óKÊAG˜Q—g£î¢ÍFôÁÝÏžV…õ¶Gž‡·~üI[©>½¸õh»uŸþ[b¼<ÚHR’REImr ƒz^}”›¦JMf©®TÁHŒØ±˜¡º®ÛÓK·±Iz%„4µ{xLŠaña2
-&å¥ëôiPÝpâ[æ˜i{T[à¡sÛL{ÁU¡ÎÀ-Ô#x;3oíñ³Ñ,5gŽF¯×d3µ…¦òòh“O¬Wòv–*í7åÊHž×H~þQ?ø0ÑfNÆw›ãׄœ/š.5㶒%0-&Qe)Çø\»·ÈO¶i.÷뛎Áf¦ù8T5½í¹À,Å*1Rq]E6m23Š5sC:ÚÂǭ¶P”"5“ØF%rýê=Y¿ò¡^îÁ.#±¦—â-u bsí¹ßMÀÃJÀ_ô‡ßõ'†3x%þOÄÎØMÆ“ÐÚë·+Îîbe¹{\³™L˜‘Ï¢yd£!õ²ÅMìR†ÖžÙ_VP†`Y|™-šô5äß}„rŠ”sQÜpia|[„£ÂÅPX^ë쬗1c.üÔÑèn
-gãvDùxÑ~¹îæ°*Ú×É•žÿ|²AÝ~9z³.öè¦*Pµa \É„8Am2ëk7×ÐXVX›TÅÌ“+Wn4Ä4„”±»êëS‹ê9L‡z +Säñttn|AVqzÀ 0! ÒøîñIa®Ìdø¢¬R[“ob©KòœŒ²ª=Ì8,ŒE]Ú»K×/Ø<bè£ÇìnاgÅ÷‘œÂvrä f´«³¸ãáwêk%?µŠ+'ëuÙ7@¹Y¬òš Ý÷9PïÅú•“¹ˆãð1÷—‡üчÄúº¯xº¼ûk¨ªcß\
-<ýõ…K
--it)izÚpí\V¸x´YWª•ðfÄÁ@Æs…NË›]¬É’Çѱñ³bFRuï_Ï=êòv=¿$/ÝØlEGF+#-û ½¨ºZ£®æ“\Ä'yD7ñuƒEõ&ê2w«ƒ? ‘Çò\e3]L賈;É]0ïPkSÃUžã¡ ã6ë5TÔõd—EâŽÅÌÈ’¥ÂªY¼î°‰û;I]y¿íB>Ï~ñ:°vU(¿
-%|+ü]øžÒƒg‰ƒ¡&*™Åíç°?wZdä›Mƒg½å*2nl9oW=êjÁd0<XÉrõZ)þ«‹(.551‹ÉÖgdxvÐÖC¤m¿&~î†/xÑø9T5ðH}ÕG¹ñuÅáú  ·ø‹²ãÍ>ˆ›íÀÌÛæ´"ý•¤¾Åÿ Å¥ÿ´
-ýXŠœð(^‰.Å‹ð<»ð¼c,¢¥hš„Àà<).ÂN7
-Óߣ<”ƒ†~q÷úhδp¹‰ß!>vÞµ0-)ê3ìî{Ä>_¥¿ŒB]QŸžñÄlZ†Ô®—9™cÀfÆɱô@²ž¯§á‰ò}à@åÁÒ=̾½2§
-¶Â ®q§;¸×`¾ÄS¹ ¯„ÜÔ¾f_r‚*»åÎåP–­˜}?²ä,¬8ƶó=Z?øZªã¸‡Ùó £uˆ³Ýè¢Ù¶î%¼¯‰ì_R¿µYq
-é³áßã~õgEúþ›ˆf‘Èß¾`÷Ýy±Í‡ÀTÖ©ÝZÅh¸Å ð3mäú›cM¶¯® ‚»T¯×ƒ¤‘ϱÕ,gGYh!ßЀké
-G¶ÝëíB²Ò#ÑËm&™IƤ6¯ÿæí|©/îñÙÔ¹®î%MA ¶jKhJR}ŽV®>Ê\?? ‹xú¿ž%=?#D÷p²TuÑ…
-g'f[È®K¡,ÕB nÇ¿C}Ð(úO¹ã€Fñœ}©¹.-³ŒÎÏ÷„¡>•ÿÌëÖ£ì@^÷ΊÇΧd¾GV3›üœ\‚r#µjv} ¶ºŽ¢i”‹ì¾} ¨Pâ)0g°x0n‘Fzû*e̦¤ùÕ¥µ'ŒÎk,#5ÓëÅ5²c^TpEÈ•ã Ò7 í´Œt/ªŠs¹ø ƒ%ƒF⾸÷Ó¡Hrµioµ‘Å‹ÞYd¼ º-õ
-”…‚Ø8ß m̼•­ˆDݯÞýêvóä ü¥üà«ŸÃÑÁG[}a´=õ¸ôÕ–Wk{Ý¥ÆÜ$îsé×x&V,Z
-¨s¼ËbË,óáýÎ|\Ž›Ïä73H
-3(ò€›¶ð4ăφ•áhƒYPoB­(ÃÔg@Û\n“4Ò2CCâH,ãÝESòòkÑ(¦¨ª³ØR%”‡Ñ|ÆzÃØAÀÕ2±ù`¼ì˜Ø¸’ƒ`Þ. /yE Ë®„Å •ïƒ§äYÚ•Ü„>‰@If´<Âö—+!&D›¨ßÑw¨—ôtÈ:r®¿»Çbø¨ 3úÈŒ?²°»É!bÍt»J‰Œ¤Ìßáj1îù$¾þZÕµK³²k¼Ò\†ºýtÁ$@cCþ݇äáœ-½³üæG¥àN噫·è;“N:{Õlcdµ¹ÄX}dÜ›[r뙦“² ñê5ÁŽ¬ÿVoUˆF¢I
-U'3IšdM-O‡…`ŸøNâxÀÂ
-rÕêüy±|Ñ ðËeÑ`ŒD±iº”\&×™Å+¼ÐÍ̲½-Úþ6¿çòùÿÌb®7ÛýJmú]Ñ¢ÚßOãÏtâø¹¦Ä'’V¨’Ô
-€G¶»àÉ\œHcP§¥Ò;ÏÀ
-þ¢*ÏE<”ØÆr45ít)ôÌaŸa¶}.žÂÉE½&]ÿÞcmHñÈaѶö6Q¢^ŸËäéÒsy§s©hF{ÚÿØÈg{îžètÑÞ¬F†Of'9ß,(j›+l³ïDJ ‘1c-ç®×£hT§Äñ8s8”2G£K¥+a oÇG*‘@'N ê¸,6U‘íŸ9§ôJD)|é2¼9–µãœGrT¾¼µ¶ø7Qlª>‰T—–—Êþ„êÆ "¹¡c“¾ã®èÛ¢#æÜ:ã7B´¼m­°Í§¯9’Üžjg±'ú}ˆ¶kvÕ´Z&4X¨¹n…z׎ùŒQF'¨ÕÉr€Åx–¢õ"µ>%Ã@ç ÷j-Hzͳ Ù—·¬˜<YœÈwÐåØŒ§áQD¬ÿö¡Lç ¡ádµ ·k£+‹èL½!= AÈMÄI"R¯TÑñ²h'MÇ´æú›iMÇ]%h¶Íá´”ŠËå×7µz}”®:ŒÅ4š»s÷îÃåýÍõMù-Su°¿&˜ñß ÓÆñÆSv¥êŒ¸:&!.EVÌšõ“(1 êÒèüüÌ- ry_ •(|›VÄ~U«Yu}Ž¥ÛVAõ¶µý×l]­ç×U˜µÌ1BÍ‘é“sóicuíù/Á7ÃDòܘ¸#H(Uç4§²Q£ÞÙÁQE÷ ‘s4Ûߣöÿ9Ìš‚è:A£N‰C±†çOF‘2Km0Ð °øÒèP1ôâùüÈvAÈjÑ:YàÂe u#% E²fC†±€®ˆ,‹Åù;4{¹Øtút9@ ¸Ù¢‹Gµ<˜«¡‰ëÃkU®«‚VYîÉuK wÄw#3g-Ê̶,¶Ü$ðu±Oá»ÐÏiÅ ¨ ƒÄb\ÓÞC”È×¾:6·Ý[ú€±­ŸQÐxeðØ ]—ÞN¹íõøqûôgfÕ¼à±.¬ï”YŸÐs šfƒ{¯GfN|SúÃ>¶æJêÍ[ô´é¸H¾ ŒÞ±Ößq[mú1Š•ŸƒÏÒ—` ßÈQ÷â¯3MLmKÔðb6ËÎ^ηòÛs¼T£
-h°O bFcÉFL°Xü?o õHø‡¸¼<þÅÍ#ÒŒ»! Ùzèàþ÷Þ<ÂñÕÒUD\ ­Ð†T&ULŒ§1‰½‘ˆ|z§ùòáªHÞŒ­õ¸Ö(xÕ‚<-?}lÚö¿Å I7Õ $‘F­†±|\Hüüþž ;ëÂJ€‹ZCûTÄ—•ì<»®y®;¢@]˜sÉff îº þ¥§ž±o"y =Î…ÅeïÎÿðþ6Fê¦N  e91E)€S>¼W/4ž-¯K ¬|;eBTk½…á£!|<¨“7 ßx…mE1µÒï¸Fµÿ•scqwÞ!ð¯z¯ÑoMRše&y¶POß1è蠟B¤ÔhuJ6Ï×Ê™AX`ÿўȇ›#µ`!¦z=ùæÀW€rˬ„‰Ul¢2&!˜ŽÊØQ¨
-À×+ „ê<]“þåÅ §sP˜bH‘O›»­*wØ[WTYІ¾ÿù—,×þî•
-Í\Ÿ!ç0RŠ“Y10Æ÷Úû {¯ÿ~L* Jàóà ¬åç^c=ôC‚ ¦XžZîo+3ró Q@všQ –®ógÝZw7w»ÒݨÕYŒH×éôç­­MMú4]š^¯OM3X÷øo¹?€š
+xÚ½zxWºöYÆ€˜!gLï½·PCコ÷Þ+¶å"«W¹ÙrA6¶16½÷æ,’PÚšÀ&”„„œ1ÇwŸ;²p7lv÷ÿïÿK~d{f4ó}ïùÊû~3ÂÊŠ}×Ì[¶lÞ†‘+V® ðsò?nô:70_§`ËÎE\n
+/7ÿ7»Ñ£íìBÜÜì<CCgŒæ1& Øc¬;LÈXߎƒBÆZ¾7zÑêUF¯XºàóUë?jçlçêêäå2æN¾ß°* ØÏÉwžk€³ÛRW7ÿP¯Ð(‚1D?b
+²vkíôŸÜÏ
+àåäh
+)ó÷ ñ÷/ ©ª*+«ø¶Õ¶Y šŽ6¾ ¥F!rÐH¯„4ºxFÖåå¦e€vVÀ*‡¹\­VÐÉ©ŠÔì;wɧs*4·
+Ì}‰â^
+[7£)Z‡4Ïùxw£Y ah ;´7F®öØ#Ö­ éÈSn/ÙžÊ/Å—®…-<Îî_“9y6Ýž±2ó3:Íç¬Ù·É–ǯ¨™rãÊz›ÉÏ“Ò²Ü/$•ÿAºb_²Îß±|#ƒ» Ž¥˜z> ‰¯ÜSmb—’Ô\$µŠ‚*Y4 ¶ûÙ‡92öå{CØ FåÙFº^{¡ê 0—ì­9ÅÔ6í²7³†h¨Š¢mZgóì‚ù¡Måýîׂ¶™ÐH“Î$lµCi° ç2¸ïÛªSü˜|fð™ÂšPa°x²Ìw’ß+©®Ø€Ù|Ö$@a¢¶ ï+yØW⎠ñ+Aó‚Ê{(±ùmÔ$iSUò$ä9&0[]vׇ²~G`sªÅF,y±ñî‰%cñŸô¯#‰l"a»õ•â1žvß´‡y•…WKþ†U¶v7 šŽ•CÊcBn'š%­“tk‘%1YË÷I¾¬?z¢™~2á측3æ‰ÒÚ7í
+ pa&Á—¥šê<K]‘eg”VîcÁ¡¡,êÔÖUºqáÖáC?yhoý8/~ˆ¬àd¶ƒ#_2£=Åõ¿cosù™e¡¸2²Nk¸ÊÌb¥ç<èƸͅ:OÖ·ŒlÏE‡O ¸?=ä÷>$ÖÕ~ÅÓå½_Ce-ûî(Ày=„ï?|rö}Û{P§kÈíu“«æ›Ïæ`¸[Í¢õäChö­±ÞÅk™©«=bX5úIL=ûB¼O^‘YY˜ý<È¢ä/7Î\¹lظàØŽÙ ‡hõ9
+QZ-=‡ ×’6è¿ÞvÞ~-Bô°·9ˆœ¥|‹Îp”[ÜŸÅ»ï:«ÝýròŽî­ûJÙ,dñíï[ÃvßøRi)<¾MHðÚöÁo3š)‚¼gK© ,'$©³ØÎâÂÕL9ßVïÍë¤ÕÖªÔ{XªÏî'iEh¹Ÿ/€Kƒvï)®4ñÁk3BdµY…¹p³m#²ZŽ¬~zHmåÜZí,Y%UŠœ&Bë[G>‡qžlÛrìÖõ›
+›©zdñºÝ&îï$uí㶠ù<{3üíÂÚU¢¼J”ð­ðð#¥ÏAuT2‹Ú.`?î¬ÈÈ7›PÏ~Ï ”d Ü1ÈrÞÎ:ÔÙ‚É x¸‚åê4$’ÿW'Q\jjbcÐeô<;hí&Ò´Ý¿_îú¿ð$¢á ¨¬ç‘úª}eÆ·‡ÿéÕ:ÚzêOÊŽ[4û(vžÁž™¿Ãqe
+xøè(ÎàDUýóÊü–kÿ&,UÿÌe “ª{r¿ô² >AãM{M¶MK£©—'yòü1ù— ¶EÙ;gûP§¹4îù×áÈêbcÓ¹RàCâ¸;×FoÔî 2ª
+Ì!ya1~‰®KN9?@R¾E÷C>ìØ'Òi^#&¾íÆì„—}Ù¨zxì(}
+.©Ç*öæÔ2‡j¼ì XJBdûèWì´0è°òÖi& qxe¡ÐO¤Èä•è2¼Æ“°3Ï;ÆàqhZ†F¢‰È Ê•âBüéÔ±#1ýW”‹²Ñ¿Ü{„.Ä™"3qãÚÅÇî{¦å-E½†¾ÆÝpÏXÀç«ô—‘¨3êöÓsž˜MËzÀaÀ>ÌÁ+ãèPr( >
+>Ô½Bë_Q¿µZqréóaÅŸüúŠôã6Í&‘5"¾}Éê½òb›_o Pi‡vk£‰°ÿ6 /À›Ìh”‘ëkŽ5Ù¾¾†òïQ=Þ’F¼ÀV³Â"@3ùŽÜH—;°mžïÉJ‡D¿‡Û,2“ŒImÚøÍûùRoÜíó©ó\ÜŠAl ÔÓ(„¤z¯:Zuœ¹yq"ñ6ô};KzqNˆîãd©j£
+™‡,DÙâR˜mÔmV,f#+̃Ôï]ñÝüú!eÇ\Oiµo•ã|%Ž±
+èKs¸„´®O&_QKèv2À (½÷ý> @ó<¦ÚxàÈ÷ ?báb÷-Û#@ÉG}ºãeMr/#Øåí}Ëvówg6\p82 ÷ –â \Œ$ Ÿ²Ôi$üáo¨;^#Ý·F{€Õ~;SB™~òälÔax·¾]ýòqþ!¸Ò
+Ýá–m|ówç³aU8ÚdÔ™PF Ê0õê×:Û"´L®8‡ñî¢É¹y5h$SXUYl‰ÊBi>c½`ì
+üDüú•Cà©—4¿‹m°hÞØ ëA]AmvcyT¹g’
+ª•àjé©úsÌ÷ûgLg©«3·ÎÚ°à Ø[$“AUÍ‘bj>Ï©ÃÌÜ%óáŽaÈô–Wæ÷¼º‹w}Ï«ñK1sÔÜÅ„Ö®çŸkËn$î$˜?)"?Eâ +†™ûht“¬Ûé´eÖ~ÄŒö0ìXÖN©Û'í‘Ô~<ô÷’ºˆœ´}ñü©ŠÃ'
+õW‡2“,>Õ« ¡‘t¢J¡Á8[¡j‘<ê!]Þ
+tÑhýx‰zY/÷ÍaÑ ŒD±iÚ”&GŸ™ÅëªOÐíÌÒ‚ýÍš¾6orøün6×™m ß„P[ÞÈÛATùùªý˜¿P{GÒre’Jðˆ6g<‰‹©õª´Tz÷9XÎ_T鱘‡ÛXŽ¦¦-Ù¬ñs̶ÍÓ9™H­S§ë>zìɯõ)îÙ,ÚÑÖ*JÔér˜\mzoât.ÍhKûù⼞»/:[¸?«á“™ÇI`Î3
+[ç [×w æ¯cÆXÎ]§6FùÓr¨J‰ãpæ0(E¶Z›JW4ÀbÞŽJ‘ŸNõùª¸,6UnðKœŒSúŒBÅ¢¾téß˃Ú~ÎcÙJÞZ[ü›(6U—ĪMËMeBu?ãz‘Lß¾I׎qgômá1sN-ñ;ùWÖºNØêÝÛInO5‡³Ø}‰>E;Õ{ª[,s,TŠ\¶CKûTÄJ'¨TÉ2€Åx6–¢"•.%COg ök,Hzη Ù›·¬ˆ<]”ÀwÐØŒ§áQD¬ßÎ!L‡|¯?ÝN-ÈšèŠB:S§O7
+òS1~›´š8ÞxÊ®D•CÇ$Ä¥ÈÁÊÙ³%fAm——Y¬Tï+¡…ïÐhùïkÔ«³/°tÇj¨Ú±®ïÚíkTá¼ñÚr³¦œùÁ"¨¹aºäœ<ÚXUsñKðÍPQ†,'FN'&î
+TJÙ1C©hP«v·3C'cá}hä̶E÷©ƒL#³:?:˜NP«RâÁ¬æù“Q¤ÈRéõty=,ú‡4:R=y=¢M¼F´!,`Ñr†º•
+ #Y³>ØO—Gæ‡F„ÅùÙ7y»Üxöl@ ¹9¢ËåÇ5ù<˜k ‰ëÅ+D®³ŒV[î„uI wÀw#3g-Ê4X‚-' F|S,Óù.ôsZQ=êÄ ±W·u%òµ/…ŽMç­C÷Ä–>`líc4ÜC¼ìtD7¥wSîz~~Ü9=߉Y=?hŒ3ë³(eöLz®~|ã0cÿ͈£Ì©oJ~8ÀV_K½}‡ž–- Ë–ƒQ»ÖùÙ3®kL?F±² ðÉyú
+læ9êZôu¦‰©iŽVÄf­‡sVð­ünÇô,Õ(@ºfÈ¿ù*ií.­óܳ~ƒ›"Ôû¯O dFaÉfL°Xü?oËuHø»¤»…ÜÿÅ-ÒŒ» ÙräðÁÞ²ÁñUÒeD\
+P®™0±’MTÄ$ÑQ»
+äàÃ|î…£5ïŸò ‘ýï>æC|ðœÏ\Ù?>è“DüÓ>”5¡@RlF‹Ò2Ã.&ŠÅgÈ2“Y4
+Ûˆx]þ5
+
+5
+¹Ý(FzgÙÕY³–-›5ëê²;w®^½>¸ëÝáZû­oêûÿ÷¾©>JnŒ´0ª0j—L&W
+½¨Ä
+…J¡fý&oŸ½|¹D¥R+U´R£ÔªÁ•eGfïž"QhôJ=£§éõi,šÙûñlï­äÖ¢©V¥ãõúò+Ûoû=”èÕ
+­‚Q‰-Ã)Bµš.œQýÙ… }fGÍ´o±Œ¥€V¬×ëôv÷ƒ#·¯\•h4ZŽÆ3{ÿ/žÍ†óåÀk´1Bð¥Í5ZDíziyt…GDl‚\øz¥†P•«§«Ó¿¼| dwŒçRô)²isp—Õeöûk +ÊÚÔû?ÿ’åÚ^ ЊŽ+;s¥B:¾SÎŹYii@£Õj ÔÆ*hŸä+V‚øø÷êùÞ7¨‹åÊÿù—x)ÏMêx¨hÅÿñ•ùà/hÊçzå 9ûRô„ÌŠ 4¾ßÖ Ýû÷R¡Wè7ˆ_¯gm,O÷àë!Ÿ1Ùòœ0´ 3r
+¿!Í(Ë6øŽµî ­»š»\ëjÔh-F¤kµº‹ÖÖ¦F]š6M§Ó¥¦é­»ý7)Å:‹
endstream
endobj
-4450 0 obj
-<< /Type /FontDescriptor /FontName /GHZSST+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 4452 0 R /CIDSet 4451 0 R >>
+4454 0 obj
+<< /Type /FontDescriptor /FontName /PAJJAT+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 4456 0 R /CIDSet 4455 0 R >>
endobj
-4453 0 obj
-<< /Filter /FlateDecode /Length 759 >>
+4457 0 obj
+<< /Filter /FlateDecode /Length 756 >>
stream
-xÚ…•_oÚ0Åßó)¼‡JÝ%‰›V lHë4M{£‰a‘ A!<ôÛÏö9À4­Z¥VýÙ×¾ç\ßØ7Ÿ^–½qÙ¼Ùž¼‹Å«=6§¶°½üq}ˆnn¦MqÚÛº{²¶´åyöø ^Ú¦XÚNÜæ‹é¢®ºÏ.xQ»SiÏQÿšØmU_C|q»²?z_¾þ\.W½o¯Í~]'qïÕnO»uÛ‹ý²UÕí\ø"…›M‹°ÑwÛ«¦~É]Çn`V—y³÷&QŸBEÿ,}SÕeKµâÍk’T”UÑ‘Âßbïªå/ßÝ/êM ‡¢ï2WÇ®}º?Gý綴mUoÅíG"]Ðòt8ì¬$âh4¥Ý¸½]žÖ{+ú¾‹ÒÍVÝû‡¥¸.Z½¬H'\4¥=Ö…m×õÖFCW†x$†s÷3Šl]þ5cÕÛèÎÿÞ_¦Š_ëÖo”LÜFq¬’Q <¥)æRÄIÊrd& š‚îIcO BvMBv9M¥Ì0Ã:šcH&˜Ë@P­IP- ¨–Ð"3d€[ JƒàA“XÇ=áH2;‘¨šÙ©¤bd‡E÷ z ÁƒB]<h<(T^Áƒ&ÁƒB<hU3;U“pjÂ9hI(ËàAÍAð Ið QÝ Ü‚@ð`H<Ô%ƒ‡” :Eö •Oá/ƒ‡ŒàÁØKÔ‚Êgè] Õ†ÕzPCµ!±{O³{p¶ª%:DCg†žÐÐiHÐ)¹'tJf‡Î ¥Qk2Ô‰ †:‘ÝP'‰ÕE «Kâ·‰zè4èÃNÆ9˜1{þÒ÷fòÇÈ¥Íô:Ê‘Ùuý5FžvÎ}'¦þBñ4Ç®³°6IPÇÙ
+xÚ…•Aoâ0…ïùÞC%zHIbdž
+!…$ªm‹
+Zí5M  ’( þýÚ~¬V[m¥Výì±ç½ñÄ~ø¶ÙúIÙ|jŸ?ìC÷͹+´Ÿ¾æ­÷ð°lŠóI×Û֥.¯³ý3ÛtM±Õ¥ë庮†G¼®‹ã¹Ôר-ô¡ªï!6íôO“¼¼$;ÿûëGsÊë0ð?ôá|Ì;?°ËvÕp4áÿ‰dfš}5ÍÜF?t×WMý̧ Ì@V—is²&{oLBÙø*}_ÕeGjÙ§Õî…+«b r‹“©–]¼½ôƒ>­ë}ãÍfll2WýÐ]œîGoüÞ•º«ê}%ÒmÏm{ÔV ¼ùœ•zoö6uzËOšmÖ¥™­†Ë—¥¸/Ú]ZÍ"Ç!$M©û6/t—×íÍL‚9›­ÌÏÜÓuù×|€UŸ{  ¸þ;™^§Š_yg7
+f£ áÜQêH‚¢sˆcŽH8ŠSt¤ Z‚¦ˆ$J°'!»$Bvž€–Ž"Êa
+:úEQï¢ò*¡.¿uºZü1rë@µ¼ÒHvAG%È“açÔö^d¯K+ìš¹µaˆ:fБ”:
+]åBúbw!}1 Њ#2 Ð$A._äN1æÃ]èî>{mÚ7àvMç®3w´{(Ü=loàªÖ··¤mZ»ÊýºGèú&Zz_y¿*@Ô}
endstream
endobj
334 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /GHZSST+LMRoman10-Regular /DescendantFonts [ 4454 0 R ] /ToUnicode 4453 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /PAJJAT+LMRoman10-Regular /DescendantFonts [ 4458 0 R ] /ToUnicode 4457 0 R >>
endobj
-4454 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /GHZSST+LMRoman10-Regular /FontDescriptor 4450 0 R /W 4449 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4458 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /PAJJAT+LMRoman10-Regular /FontDescriptor 4454 0 R /W 4453 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4455 0 obj
+4459 0 obj
[ 27 [ 850 547 ] 34 [ 800 625 575 ] 42 [ 813 500 ] 46 [ 862 625 ] 49 [ 738 513 563 ] 54 [ 707 344 563 563 ] 59 [ 563 ] 62 [ 880 625 ] 65 [ 419 313 ] 70 [ 594 676 313 ] 74 [ 1067 938 880 625 563 ] 80 [ 845 563 563 769 625 438 438 ] 88 [ 313 ] 90 [ 845 ] 96 [ 460 625 444 ] 100 [ 563 563 ] 104 [ 782 438 563 563 865 625 ] 112 [ 594 ] 114 [ 813 850 594 ] 118 [ 594 ] 120 [ 500 563 656 ] 125 [ 625 ] 499 [ 551 551 ] ]
endobj
-4457 0 obj
+4461 0 obj
<< /Filter /FlateDecode /Length 29 >>
stream
xÚc``°0.¾œ¼ïß‚7v=a H
endstream
endobj
-4458 0 obj
+4462 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 6187 >>
stream
xÚY XSWÚ¾’‹ˆÑr B®ÞÜw°:u+uÇ [«¸ÙÙÂNØINadY¢¸%(¶jµjÕZµZgZµÚÖŽu*ÕïâaæùOÀ™n3óÏÿIî¹ç|Ûy¿÷=QÖÖ”H$rð^¿xÉâ5“=V¯ó ŸþúÔE¡~–+Ë…àŒì8a%Œ Ü
@@ -15262,10 +15202,10 @@ Iq¯¾r0Ó«³Ð^hÆü‹4ãmtMìöfw7+ðè'o€ÓÙÎã~Í,xaÍ4½íãÀ⡘«èýºÃü¹Ö …õ챎„íF
ì ‡õ4ÈþmcG¥
endstream
endobj
-4456 0 obj
-<< /Type /FontDescriptor /FontName /XVCDCQ+LMRoman12-Bold /Flags 4 /FontBBox [ -476 -289 1577 1137 ] /Ascent 1137 /CapHeight 686 /Descent -289 /ItalicAngle 0 /StemV 104 /XHeight 444 /FontFile3 4458 0 R /CIDSet 4457 0 R >>
+4460 0 obj
+<< /Type /FontDescriptor /FontName /XVCDCQ+LMRoman12-Bold /Flags 4 /FontBBox [ -476 -289 1577 1137 ] /Ascent 1137 /CapHeight 686 /Descent -289 /ItalicAngle 0 /StemV 104 /XHeight 444 /FontFile3 4462 0 R /CIDSet 4461 0 R >>
endobj
-4459 0 obj
+4463 0 obj
<< /Filter /FlateDecode /Length 619 >>
stream
xÚ}”]‹â0†ïû+²‚sѱŸÉÌ mGv>Ve˜ÛÚD· iië…ÿ~“¼G…AVP|zNÎûž“&£_Ÿk&›­òãÇ€­TßœºJùù[Ùz£QÑT§£ÒûRRÉK´aŸ]S­ÕÀÆù²Xêzx0ÉK]NR]²î'ÍÕ¾Ö·«ÃÆõíåEþÇÿý¶jŽ¥#Þ¤Ø5›z8˜Üÿ¥1cwcÌ•øR]_7ú……A˜¯ZæÍÑöÖ{òÇ&Ç»ZËŽL²­µì…“u5¹ßêh†d¯Ïý ŽK½k¼é”MV&ØÝÙ9~ð&T]­÷l|סÉXŸÚö ¬xYƤڙÂf6ïåQ±‰m|)M´Î÷'p[±9·ŠEŽC˜­©ú¶¬TWê½ò¦f
@@ -15273,21 +15213,21 @@ xÚ}”]‹â0†ïû+²‚sѱŸÉÌ mGv>Ve˜ÛÚD· iië…ÿ~“¼G…AVP|zNÎûž“&£_Ÿk&›­òãÇ€­TßœºJùù[Ù
endstream
endobj
333 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /XVCDCQ+LMRoman12-Bold /DescendantFonts [ 4460 0 R ] /ToUnicode 4459 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /XVCDCQ+LMRoman12-Bold /DescendantFonts [ 4464 0 R ] /ToUnicode 4463 0 R >>
endobj
-4460 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /XVCDCQ+LMRoman12-Bold /FontDescriptor 4456 0 R /W 4455 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4464 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /XVCDCQ+LMRoman12-Bold /FontDescriptor 4460 0 R /W 4459 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4461 0 obj
+4465 0 obj
[ 66 [ 245 ] 77 [ 531 ] 81 [ 514 ] 84 [ 531 ] 105 [ 371 ] ]
endobj
-4463 0 obj
+4467 0 obj
<< /Filter /FlateDecode /Length 17 >>
stream
xÚc`€
endstream
endobj
-4464 0 obj
+4468 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 764 >>
stream
xÚmRkHQ¾ã®NÑÌmµZ›½‰VfûÀ,ìaàc·²Õ6Ý !
@@ -15296,31 +15236,31 @@ J‘j¨íB.Ô¨+S- ¥%—§E…h/ºŠ€(Ð~¥UvFÀ˜ÈšLOéÁúlÙ¹iÖIê¬ä}¢¨ˆÌûUÐÒQâuöÅ5²;
­KŠóWV¸Wv^wï¥Þ4ºÚÅZ¨¹ÔüÑy‰ùƒbÑÎX4=ÓÝMQ#§»c±Îh´3z6F¥ÿçE:’
endstream
endobj
-4462 0 obj
-<< /Type /FontDescriptor /FontName /BLRUUF+LMSans9-Regular /Flags 4 /FontBBox [ -433 -313 1466 1155 ] /Ascent 1155 /CapHeight 694 /Descent -313 /ItalicAngle 0 /StemV 95 /XHeight 444 /FontFile3 4464 0 R /CIDSet 4463 0 R >>
+4466 0 obj
+<< /Type /FontDescriptor /FontName /BLRUUF+LMSans9-Regular /Flags 4 /FontBBox [ -433 -313 1466 1155 ] /Ascent 1155 /CapHeight 694 /Descent -313 /ItalicAngle 0 /StemV 95 /XHeight 444 /FontFile3 4468 0 R /CIDSet 4467 0 R >>
endobj
-4465 0 obj
+4469 0 obj
<< /Filter /FlateDecode /Length 382 >>
stream
xÚ}R]kÂ0}ϯ¸{ô¡6uº¡”Âü‚‚_X{­ÉÕÚ¤¤íƒÿ~Ij†[!¥'÷Ü“sOÚyÙ%ÞW'ô^ûöXªZ3ôfë´ Î\±:GYm9ò¶ZN`§K°‚î,žÇRT=CŽ%ËjŽ-ë9iŠ!{tøåMWûãqé­ÖI*˱·ÇK¥Ú£¶é ªÌÿå)Âó"8‘OÔ¥PrAŸRj6’ÏTnÇ+‰³~kú,$×7Ÿp²®I0
endstream
endobj
332 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /BLRUUF+LMSans9-Regular /DescendantFonts [ 4466 0 R ] /ToUnicode 4465 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /BLRUUF+LMSans9-Regular /DescendantFonts [ 4470 0 R ] /ToUnicode 4469 0 R >>
endobj
-4466 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /BLRUUF+LMSans9-Regular /FontDescriptor 4462 0 R /W 4461 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4470 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /BLRUUF+LMSans9-Regular /FontDescriptor 4466 0 R /W 4465 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4467 0 obj
+4471 0 obj
[ 28 [ 514 ] 35 [ 571 ] 43 [ 457 286 286 ] 47 [ 571 ] 49 [ 699 457 ] 55 [ 314 ] 58 [ 807 514 ] 63 [ 571 ] 65 [ 371 286 ] 70 [ 542 642 286 ] 75 [ 856 ] 77 [ 571 ] 80 [ 799 514 ] 83 [ 699 571 400 400 ] 88 [ 286 ] 91 [ 542 ] 96 [ 402 ] 98 [ 405 ] 104 [ 742 400 ] 109 [ 571 ] 112 [ 542 1056 742 771 542 ] 118 [ 542 ] 125 [ 571 ] 251 [ 457 ] 502 [ 286 ] ]
endobj
-4469 0 obj
+4473 0 obj
<< /Filter /FlateDecode /Length 32 >>
stream
xÚc``àM4Lžro‚#¿XP
endstream
endobj
-4470 0 obj
+4474 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 4535 >>
stream
xÚµXy\×¾Ÿ€ÉP¤ ŒQ;ÓΤ.TqÁ¥^·.*miq£ŠŠU‘
@@ -15337,31 +15277,31 @@ qn0[é–CÃAF"½x¶ŽÆÖG+ Ñ唢¿‰3 ,YUL•µ¬ÔÊ݇{ ½â,«U‡‡,¥x£ï wZëî–~/$óØå]ãùT
3B9Ôð»ê÷éáüË$¸.Ùsø„NÝúÿ8¢Sõ‚·´1¹zgj^Ž.›ÅGâµIptW”W9h]˜÷èËj›3Œ®IÏ%tÉ¿t©¨°–”±f³Ù€97›~'vÍ–`Ì[z}Þð ˜Òk†n¬»ãMìqóz ˆŽw«}ž‰ ‚ïWVØ aý•>nÏ
endstream
endobj
-4468 0 obj
-<< /Type /FontDescriptor /FontName /KLWBRP+LMRoman9-Regular /Flags 4 /FontBBox [ -443 -292 1454 1128 ] /Ascent 1128 /CapHeight 683 /Descent -292 /ItalicAngle 0 /StemV 95 /XHeight 431 /FontFile3 4470 0 R /CIDSet 4469 0 R >>
+4472 0 obj
+<< /Type /FontDescriptor /FontName /KLWBRP+LMRoman9-Regular /Flags 4 /FontBBox [ -443 -292 1454 1128 ] /Ascent 1128 /CapHeight 683 /Descent -292 /ItalicAngle 0 /StemV 95 /XHeight 431 /FontFile3 4474 0 R /CIDSet 4473 0 R >>
endobj
-4471 0 obj
+4475 0 obj
<< /Filter /FlateDecode /Length 548 >>
stream
xÚ}”[¢0†ïùÝ 炱 ÐqbH<‘˜ƒQ³»·H«K"…¸ðßoÛ·8Éf]ßéýÞ´Œ¾íþ‚×'áOŸ)Ù‹¶îU!üÕ{Þx£Ñº.úJÈîC.øm_ÉNÕÅAtd¼Ú®·²ìžtòVמ‹!ëßIKq)åWŠ™CÆGñËÿþös¹ßùoïûºÊåÌß‹KÍ•OMÕ±ì®:ûÿ‰DGɃ(±m~Õ–µ|%Á3¥T?ØH¾ª+³aëMœJ2tŸKÉ•“JNF¸„„—EçÈþ•¶Ênm'ª­<×Þ|N&zrÙvêfU?y“OÅ…*å…ŒhÔ9‡¾i®Âè!ÔKSÂÅY·Ö}ä• ³þ–ëhÙÝùðUs¼5‚„–.j.Ú&/„ÊåExsmMÉ<ÓŸÔ’ÿ§¨::aøC¨ø+Ó(XéF”&Aj(œ‚BÐ4!sº
endstream
endobj
331 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /KLWBRP+LMRoman9-Regular /DescendantFonts [ 4472 0 R ] /ToUnicode 4471 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /KLWBRP+LMRoman9-Regular /DescendantFonts [ 4476 0 R ] /ToUnicode 4475 0 R >>
endobj
-4472 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /KLWBRP+LMRoman9-Regular /FontDescriptor 4468 0 R /W 4467 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4476 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /KLWBRP+LMRoman9-Regular /FontDescriptor 4472 0 R /W 4471 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4473 0 obj
+4477 0 obj
[ 27 [ 893 575 ] 35 [ 657 ] 43 [ 526 ] 96 [ 488 ] 98 [ 467 ] 105 [ 460 ] ]
endobj
-4475 0 obj
+4479 0 obj
<< /Filter /FlateDecode /Length 18 >>
stream
xÚc```
endstream
endobj
-4476 0 obj
+4480 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 1258 >>
stream
xÚmTmLSW¾—~Ü"]•^‹Úâ½Gãd-DñƒeNNˆÀƒM)ôR*]‹m¡”XçøÓAQðcê`lR>TÔm€M ó‡[21 ?Ì–,fºèâ’é{õ¸emÌ–,Ùûã9ç=ç9çÉóüxiJ*¥hšÖäenÉ(HÎÊγd´mÐo±[M‘‹ ‰Ë°’ã)q)-rQ"/JÉ"¥dZ)}qLÆË÷ÆK«eK)Šn™ÁS±O” áô‘21Òw+“(&Š¢) ¥¥PO©¿h ó‚« ©©k·Ú«=‹¹Ò…V§¦®y-‚ÐÊ4–WÙÝÎ* 2ÚL(Ó€² (ÇîŸZÐJ» • •Fk²W ¡Õ8‡™öšjç«TPiq"·ÝQ…«C°
@@ -15369,32 +15309,32 @@ F§`B56“à@®Jm{7¿
‰»Ýjöг{q¡U 9þL*ð6bÎÓˆ«½<é|ñHÆnþ¤·;Ú¬÷`}]{½®¶XÎnö_ïñMéØ3ƒ¸í&bª-ø¨ÿËàœ|†,—é#¬ÀÈc|)̺ün»À“»Ð¬!ûä0†d*ñvó˜eXœ?¦þâ`=D³ãâ­~M_ÞϽãÃÝ}ZØÃü¼õ[bÈ# ¦ì®ì»ôeýɶ
endstream
endobj
-4474 0 obj
-<< /Type /FontDescriptor /FontName /RMWBFT+LMRoman9-Bold /Flags 4 /FontBBox [ -501 -299 1649 1136 ] /Ascent 1136 /CapHeight 686 /Descent -299 /ItalicAngle 0 /StemV 110 /XHeight 444 /FontFile3 4476 0 R /CIDSet 4475 0 R >>
+4478 0 obj
+<< /Type /FontDescriptor /FontName /RMWBFT+LMRoman9-Bold /Flags 4 /FontBBox [ -501 -299 1649 1136 ] /Ascent 1136 /CapHeight 686 /Descent -299 /ItalicAngle 0 /StemV 110 /XHeight 444 /FontFile3 4480 0 R /CIDSet 4479 0 R >>
endobj
-4477 0 obj
+4481 0 obj
<< /Filter /FlateDecode /Length 388 >>
stream
xÚ}RMkÂ@½ï¯˜=ÄlTEVT+Ú^ãîÄ.˜Ý°Iþûî‡Q(Ò@B^Þ›™÷fÓ{ÙƒW®NŒ‡X«V3 VÛ¼"½ÞZ±¶DÙì9òŽ­°×Š±þ*]§R4#N%»´;ÕsQ‚g!;ú~‡íW²É‚÷íA•¹œ‰ºð€Ú’L4#ýG†‚g¸Ÿ¨k¡ä¢!¥Ô|x“|¥J¬&áÍ„ÝBH®oádý’h\°æ†Ü“•fC¶øx­,SY(²\Bx0dÝè«ó; á‡æ¨…<Cÿ™A#8¶UuAk(‰càX˜¾f/»¼Dmê”V4קñÙµB9y«Lq¬«œ¡ÎåÉÒħ1,7æŠ Jþ‡§¾êTxhÝë¬cØO®mŸ(1}(D±C+‡¦Æ<òÊéØ¡)uhæ9#qèÆÍ=šÄ~´›e]ÚUß7ÂZ­Í:Üy¸Ø6°x?²JU¶ÊÝßÍ¢ ùÝèèÖ
endstream
endobj
330 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /RMWBFT+LMRoman9-Bold /DescendantFonts [ 4478 0 R ] /ToUnicode 4477 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /RMWBFT+LMRoman9-Bold /DescendantFonts [ 4482 0 R ] /ToUnicode 4481 0 R >>
endobj
-4478 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /RMWBFT+LMRoman9-Bold /FontDescriptor 4474 0 R /W 4473 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4482 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /RMWBFT+LMRoman9-Bold /FontDescriptor 4478 0 R /W 4477 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4479 0 obj
+4483 0 obj
[ 28 [ 515 ] 33 [ 515 ] 47 [ 515 ] 55 [ 515 ] 59 [ 515 ] 66 [ 515 ] 77 [ 515 ] 81 [ 515 ] 84 [ 515 ] 88 [ 515 ] 96 [ 515 ] 105 [ 515 ] 114 [ 515 ] 118 [ 515 ] ]
endobj
-4481 0 obj
+4485 0 obj
<< /Filter /FlateDecode /Length 23 >>
stream
xÚc``àp`dP`ñhhpP
D)
endstream
endobj
-4482 0 obj
+4486 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 1845 >>
stream
xÚuV}TWŸ!É@5ÊšiZ©3£K- ˆ_EÛAE¥ž%1„L˜BD<u¡¼
@@ -15409,77 +15349,72 @@ oŒRWƒÉ§Ç<ï§|â Ơ‡ùP"‚{än£ËPÂq%e}åGÜ®þ©”Â(ï¼WÈ—N˜)QuoY—U–O&¿˜Pn^
g÷žÇ4úÊ8Ô‚û¼ÁE>*Ó`¨ÜzŠK@E%µ¡1«Î¬xŒºhàÒà@á,ý+ñ&p–³•Š_(½›ÈN(/è?=ûuÿ0Ý•ÂLïªDB½0O>`ôåRì ±ñ’F¢¾o§§n0Äkmè(V”Ô×®·Ò–ä× ÖF"ò’3Dg¿Ï·Ñïûñö^à¢?@·%ºÖî§âxSÛEÝþV÷ûÍý!6¶ËÎúMÈ:GÓž·`xý¼#qõNfª‚Ó4¼ áe'¯Ö_%#…ÚÁÀõl|ZQ“åñ»žúýuýJØæœeŠq?ôHÒR@8(«f©½u\Þoí!d¦­¹¹u8iwîì6sÕ;ÌÚÁí£YpoÊÛši¸PÐHú&N¥gúŸ ¿Òy¾«[â”Èj;„¤ørg³ RsJc¤Oét~šwú@û[“Ífk¶9ìR©ÛéúýMíÒÿ®ÌÞÀ
endstream
endobj
-4480 0 obj
-<< /Type /FontDescriptor /FontName /CKBVSC+LMMono12-Regular /Flags 4 /FontBBox [ -444 -311 715 1019 ] /Ascent 1019 /CapHeight 611 /Descent -311 /ItalicAngle 0 /StemV 172 /XHeight 431 /FontFile3 4482 0 R /CIDSet 4481 0 R >>
+4484 0 obj
+<< /Type /FontDescriptor /FontName /CKBVSC+LMMono12-Regular /Flags 4 /FontBBox [ -444 -311 715 1019 ] /Ascent 1019 /CapHeight 611 /Descent -311 /ItalicAngle 0 /StemV 172 /XHeight 431 /FontFile3 4486 0 R /CIDSet 4485 0 R >>
endobj
-4483 0 obj
+4487 0 obj
<< /Filter /FlateDecode /Length 428 >>
stream
xÚ}’]Oƒ0†ïû+êŽ`Dpf!qÌ%D§f,Æ[ÖžÍ&£%.öïm{†&F%ðpÞóõÒÉÅkÜ ½ƒàzÊè:=A±®[2™,5Pý3€
endstream
endobj
329 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /CKBVSC+LMMono12-Regular /DescendantFonts [ 4484 0 R ] /ToUnicode 4483 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /CKBVSC+LMMono12-Regular /DescendantFonts [ 4488 0 R ] /ToUnicode 4487 0 R >>
endobj
-4484 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /CKBVSC+LMMono12-Regular /FontDescriptor 4480 0 R /W 4479 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4488 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /CKBVSC+LMMono12-Regular /FontDescriptor 4484 0 R /W 4483 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4485 0 obj
-[ 28 [ 490 ] 45 [ 272 ] 54 [ 639 ] 57 [ 490 ] 59 [ 490 ] 66 [ 272 ] 74 [ 897 ] 77 [ 544 ] 83 [ 666 ] 88 [ 272 ] 105 [ 381 490 490 ] 118 [ 517 ] 121 [ 490 ] ]
+4489 0 obj
+[ 27 [ 734 490 ] 45 [ 272 ] 54 [ 639 ] 57 [ 490 ] 59 [ 490 ] 66 [ 272 ] 77 [ 544 ] 82 [ 490 666 ] 88 [ 272 ] 98 [ 386 ] 105 [ 381 ] 107 [ 490 ] 109 [ 544 ] 118 [ 517 ] 121 [ 490 ] ]
endobj
-4487 0 obj
+4491 0 obj
<< /Filter /FlateDecode /Length 24 >>
stream
-xÚc``à``a
-PPh`(`r
+xÚc````a
+P`1hPar
+Ôù
endstream
endobj
-4488 0 obj
-<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 2153 >>
+4492 0 obj
+<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 2279 >>
stream
-xÚuV Pgîa˜i¢81ÓŽ‰ÓØݦŒ«(‡'ñXQP‰ˆ¸rD%^Ã!Ðs®Dp`ø.„a†¡F£âŠQÜhPITp5R®„-´¬TjÿÆfFk©Tíî_ýÝõþ÷ê½÷½ïýõˆ³3"æDìù<<|Ïâ í!ÊäHzé2Eœ6)R5y¹…Ç~ \ Ö aç
-X‰%…,åÌù»
-Ï»:O¬áZÜDª7œh.‚N½?y~û”¸~Ìÿ¹¼p?)¸èú ââ„9¼Dþ)@3Rüÿ¹]æéí½Â_™’¡Jˆ‹×P˼½—/™<WS~žT`dt¢2M˜@EÒ1T 'µÝ“
-V¦ñÒj¡’¦¢ñ‘I±”2–
-S즴j…JMÅ©”Úõ"O*,>AM¥)U‰ÿU)’‘jE ¥¥c*J¯ ÂCè-JZC%D+hµ‚òð (µBAÅk4)k¼¼4Ú8O¥*Î+–×Q{%½SR{MÚylÙæ´ÕspèfOMº†ŠUª¨…&2!Iíù_IN ‚•ªäȤ1Ê(ÅÖ­IÐd ürC<UÈjd-â‡"Û‘Pd7’€B’!äÁä×Ldæ$¬ÎH!Ò'ð”;å8
-uÂqçxgƒó}ÑÑ+±pÿ’˜/u°ÈRÿäqšô«aTï€ «eéç²kÚP4D“©
-MV©£ëHôï]ú®¸.lÖVɺËj2ãwÅ$É$ê’ãO*𥟬i­È&±¿e=’AÇÈw¶ªÊ ľ/÷Åí’o ïÃ鯺ûësoì8M4ìÞVâÁ¹À’Aê+²-VyuIuE%‘t±Ç¾s÷¡#§=±™ìì¸Ìx±‹Ilå}žAŸ%Ϭ8zª¬Æl#¸õœ“,DN!èôd½_^×Õ€³Õ’±4UXqìVÖX !!21Möß½^‹ýº®—™:ÚˆJ[9ø„"°‚äËÖ…¡;!:&ó½…ÕÃc³40ÏÜA²Î(vsËÑè÷åÇ"H®ÝŸ 55^ ~¼¿"±BÙײ&µE­ÔiSRmÚ†&‹ÝNH`)`ÆE<H;»óAááøÈìÿ`Î6¢gŠ*îµ ç%Ö¤ç=q›£Ù;"KnÐàœ×[
-Ñ°wɤ׆îÉêucÉ KÀEÉž+Dá±LeåTàå&sU óÆ%¢Â‰~ñËêóá2oË.YÈó¦…¹Åç,…H/ŒîÅî³5|Ê{T ©€„AèhÔ4ôÞ’Ü]ñiZYð‹{Äݲ\û Wù˜«ïBÚv|CÂ`ô×¾k7oVî&¸£ÿKQRLJðµöòàÌ}taúŒYÈdcîCNp?O¥Þø›Fy§ÐôíSÌ…ø{¾÷÷G¯IÏÙ‘€s>GÂúw­2*†«
-Á™²ëÚ0ÔŸŽŒ
-ò‰»í£| ´ôY”žJ$“$䧸`}Öä|ÑႼ‚l¹Þ jˆ â§í›sÄG|±ºî6MbÒl`jÚäXw£«UªS3ËžûA!Qœ>4üš<~„oF¡ˆ‘v>£ÑƒX.×É´âüÃ9aú?ºd熀dœÛ.vÔ}÷}ƒÝ{—@êÚ•Wrˆz?ä\8—€…+wŸEÖ†ªæÆt‹2û]Ж«zñ§W6y­ŠØ²äös:‘š NÊmÓµ°;hFjéý°´“²vŒAt&HÄטx†1–k2äÙFCžžø„3‹°ùœÖ‹ŽU‚R ÇÂZA-Á¤F
-þìò•†lë7½ì‘ûž}|³xÆ;¥¥Çã‰5PNfý ü œºAÜ©þÓésx{f¥…<ÖÈ%“SÌLw]ÀÏ"ÈÚɹ„“ꬬTV”YÅD`X’—ë{Àu:3­wº¥Ðd.,,).4uV¹ºÚ•¦s‘ÉT\Rì:ƒýrÖø‡²©…`
+xÚu– PSW€ï%$7­˜¶IÓ­¹xîµc«åá»j×X)ˆ¸"V´¾@B@ äAÀŠ yp$ Ê+1áyÔ¶¾°ŠŠõA­mU:¶º¶Ö®´´Ûé:{®^f»7ºãîÌîž¹sÎÿü9ÿÿý3?Žc8ŽOx+öwb¦Ç¯LÔe§03f†%ª5&mŠ>p¹œ›Ä½C
+§ãR¶eé̆¬L:…I£ãÂé•át‚Î,H3é©:†NUg¤hÓi]:¤N¦MµÞ@kô:SŽáµp:)#Ó@›uú,Z8õj­:Å N£MLšZO3ÔtÌÚ5Iôrc¤ã3·©ƒš £iƒZMg9 ""Œ&M¸N¯‰Ht Ú'J†ˆ€]ØòU Iañ±Ño%¬y+ܘo¤Óuz:MmLÉÔÂÿë‘O :}vŠviš.U›¦fŒ™ÆLX$Š…as±ùØB,
+[‰%bk°d,ËIJ°l,+ –“RŒãR<?ô|Ðï¢ ¢[Á¯»ƒ‰×‹;$$fBN”ó¿Ë~€,ÚÊrÉfüaâK,W
+½¯Cå†NW8†&ˆ‘Kr†Ÿ!vA‡]• õ€!œÍ7aÙñ%t4S<D J~§IÑ·b™•Ý•‡*½­·¾6Ë|R‡†ýŠ}ó½ò¬i ‘h(-TÃÓ
+_pUCgC£tcÏ
endstream
endobj
-4486 0 obj
-<< /Type /FontDescriptor /FontName /ZYVUUY+LMRoman12-Regular /Flags 4 /FontBBox [ -422 -280 1394 1127 ] /Ascent 1127 /CapHeight 683 /Descent -280 /ItalicAngle 0 /StemV 91 /XHeight 431 /FontFile3 4488 0 R /CIDSet 4487 0 R >>
+4490 0 obj
+<< /Type /FontDescriptor /FontName /EIVVGN+LMRoman12-Regular /Flags 4 /FontBBox [ -422 -280 1394 1127 ] /Ascent 1127 /CapHeight 683 /Descent -280 /ItalicAngle 0 /StemV 91 /XHeight 431 /FontFile3 4492 0 R /CIDSet 4491 0 R >>
endobj
-4489 0 obj
-<< /Filter /FlateDecode /Length 443 >>
+4493 0 obj
+<< /Filter /FlateDecode /Length 449 >>
stream
-xÚ…’Mkã0†ïþÓC =¸–íÄÞ–`h ý"IËvoŽ4I±ddû_I·°lØ€ƒÏ;3¯F3¹x]‡·Bo1L¯¬°Óƒá–OuL&K͇UÿŒ(PŒÑî^ækìaZVËJÉþÒŠ+ŃÀQõoÑî¥ú‘¸>0ÝàïðÏÇûÛÛGøø´ÒM­â$\á~8Ô&d.m#ûƒ•ÿG 6 çÂà ½£é¤V7_1Æì‡{%JݸCvAt2
-Ñh}'•0'·°uÞƒ8!y"ÿÏ;-—¼>v=6•Úé`±€Èv–]oŽÞ÷e½Fª=LÏ™´¢õжt†€Ew¶¶ÓsÝ Dn•°QÙÏŽâ'islÏ1YæZ`×ÖM­ö,ìX‹û+Tâ¯8£¬íŽÐ
-Æ×x>†øgm\¡¸´…ËâÂQ²ô””žÒÌÓ,#ºö”Έî(/÷4Kˆ®‰n)oID5³{OóÔÓœý¢~˨CN2ª’¦DÔ/M<åä,§~ùÉ+è¬þln,¯ÆØ;ð‹àçì&,~ïJ«[—å¿dãÎ;zy¾
+xÚ…“Aoâ0…ïùÞ=¤qHÚ
+EÚºŠ´¥ Ôk°Ö±#'9ðïמ!­T-Z$ófÞËØL~¼oßÒ Lï9Û@g+ ,_ë6˜L–F è~ AŽÕ[#¶Ð³iY-+­ú;'®´8FÕ¿EÏpRúKâ}ØtáªÚï­Ã߯ÓÔ:N œ†smCîÛvª?;ù”Ì•Ù­2ÃA{°2ú‰Å÷œs÷ÃJËÒ4þ!» ºeÑý¨´´×´ìà³q¤ý•ðS4n[¾y{ézh*}4ÁbÁ"笺Þ^0÷]½Y Vé›Þ
+éDÛ¡mÏà1“pt³ÝžÖu,ò¨¤«ªþrs_M»K ,AŽ)²0º¶`k}‚`áÖÀ ¶xq¯"
endstream
endobj
328 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /ZYVUUY+LMRoman12-Regular /DescendantFonts [ 4490 0 R ] /ToUnicode 4489 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /EIVVGN+LMRoman12-Regular /DescendantFonts [ 4494 0 R ] /ToUnicode 4493 0 R >>
endobj
-4490 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /ZYVUUY+LMRoman12-Regular /FontDescriptor 4486 0 R /W 4485 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4494 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /EIVVGN+LMRoman12-Regular /FontDescriptor 4490 0 R /W 4489 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4491 0 obj
+4495 0 obj
[777.8 0 0 500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1000 ]
endobj
-4492 0 obj
+4496 0 obj
[ 66 [ 223 ] 77 [ 484 ] 81 [ 470 ] 84 [ 484 ] 105 [ 340 ] ]
endobj
-4494 0 obj
+4498 0 obj
<< /Filter /FlateDecode /Length 17 >>
stream
xÚc`€
endstream
endobj
-4495 0 obj
+4499 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 759 >>
stream
xÚuR]HQ¾×uM'×´Ý$uö&JîìfšôâØZù³¦n¡c;îŽN;23»«E˜ýàƒÙöPaPQ½(ê*YØßFB>ô¢XD܉1h†è%è»ðÝû{¾{¸‡A
@@ -15488,10 +15423,10 @@ xÚuR]HQ¾×uM'×´Ý$uö&JîìfšôâØZù³¦n¡c;îŽN;23»«E˜ýàƒÙöPaPQ½(ê*YØßFB>ô¢
Û'5;¶îÕ¬{ßk—-MW<sÏžŒŒ>¢ÒyÎPsÈ-úT‚2LDf_Le†qgìF,™ªñ .rÍ
endstream
endobj
-4493 0 obj
-<< /Type /FontDescriptor /FontName /BTPEXR+LMSans17-Regular /Flags 4 /FontBBox [ -395 -305 1355 1159 ] /Ascent 1159 /CapHeight 694 /Descent -305 /ItalicAngle 0 /StemV 87 /XHeight 431 /FontFile3 4495 0 R /CIDSet 4494 0 R >>
+4497 0 obj
+<< /Type /FontDescriptor /FontName /BTPEXR+LMSans17-Regular /Flags 4 /FontBBox [ -395 -305 1355 1159 ] /Ascent 1159 /CapHeight 694 /Descent -305 /ItalicAngle 0 /StemV 87 /XHeight 431 /FontFile3 4499 0 R /CIDSet 4498 0 R >>
endobj
-4496 0 obj
+4500 0 obj
<< /Filter /FlateDecode /Length 383 >>
stream
xÚ}R]kÂ0}ϯ¸{ô¡6u:™”Âü‚ÂüÀ–ákMn]À&%mü÷KR«0æ
@@ -15500,21 +15435,21 @@ Oªàd¾PWBÉCJ©ÙXI¾P…°"þÍ%øï\H®oVád“`\°ú†Ü›&*Ûœ\«‹X抄!øædQÕúê\ˆ¿Óµgè?ñh
endstream
endobj
326 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /BTPEXR+LMSans17-Regular /DescendantFonts [ 4497 0 R ] /ToUnicode 4496 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /BTPEXR+LMSans17-Regular /DescendantFonts [ 4501 0 R ] /ToUnicode 4500 0 R >>
endobj
-4497 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /BTPEXR+LMSans17-Regular /FontDescriptor 4493 0 R /W 4492 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4501 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /BTPEXR+LMSans17-Regular /FontDescriptor 4497 0 R /W 4496 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4498 0 obj
+4502 0 obj
[ 28 [ 459 ] 43 [ 406 ] 50 [ 406 ] 59 [ 459 ] 63 [ 511 ] 70 [ 485 ] 84 [ 511 ] 104 [ 668 ] ]
endobj
-4500 0 obj
+4504 0 obj
<< /Filter /FlateDecode /Length 20 >>
stream
xÚc``à`PdR
endstream
endobj
-4501 0 obj
+4505 0 obj
<< /Subtype /CIDFontType0C /Filter /FlateDecode /Length 1482 >>
stream
xÚ}UkPWÞ@’Eh³Æ²¸{u¨¨HÀרԱ­Tä¡BЊm!%‰$,y`
@@ -15526,10 +15461,10 @@ xÚ}UkPWÞ@’Eh³Æ²¸{u¨¨HÀרԱ­Tä¡BЊm!%‰$,y`
‚6Ša¨†VŠ<4º¢âÀQ’B;˜·“À@U]ãÆaxs.ÕHú~ƒé,.™Ë?êÈ2ß-ÝÑ®i€t]S‹˜X§ÔGH&1’)žÉî)ÍUUU5UGmõÑz‰Äín¨vÔÖ8NgdêŸ{0¼¬
endstream
endobj
-4499 0 obj
-<< /Type /FontDescriptor /FontName /RKQUSG+LMRoman17-Regular /Flags 4 /FontBBox [ -400 -286 1338 1125 ] /Ascent 1125 /CapHeight 683 /Descent -286 /ItalicAngle 0 /StemV 83 /XHeight 431 /FontFile3 4501 0 R /CIDSet 4500 0 R >>
+4503 0 obj
+<< /Type /FontDescriptor /FontName /RKQUSG+LMRoman17-Regular /Flags 4 /FontBBox [ -400 -286 1338 1125 ] /Ascent 1125 /CapHeight 683 /Descent -286 /ItalicAngle 0 /StemV 83 /XHeight 431 /FontFile3 4505 0 R /CIDSet 4504 0 R >>
endobj
-4502 0 obj
+4506 0 obj
<< /Filter /FlateDecode /Length 401 >>
stream
xÚ…’_OÂ0Åßû)®$ø0Ö
@@ -15538,12 +15473,12 @@ ag=’ë“[Ø[ï$¬9‘û²Ò¤e›ÓcÝ`™È\‘Ù B³²¨}t¾¯I¸Öµô/™4¢´­ªZC@IÇÜÌmrzÍJ„Ð&pS
endstream
endobj
325 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /RKQUSG+LMRoman17-Regular /DescendantFonts [ 4503 0 R ] /ToUnicode 4502 0 R >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /RKQUSG+LMRoman17-Regular /DescendantFonts [ 4507 0 R ] /ToUnicode 4506 0 R >>
endobj
-4503 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /RKQUSG+LMRoman17-Regular /FontDescriptor 4499 0 R /W 4498 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+4507 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /RKQUSG+LMRoman17-Regular /FontDescriptor 4503 0 R /W 4502 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-4505 0 obj
+4509 0 obj
<< /Length1 1401 /Length2 5895 /Length3 0 /Filter /FlateDecode /Length 6849 >>
stream
xÚtTSí²6EAB“Ò‚tHèMzïB”^Ò€P¡¤H“"½£€"UDš¨t¤i‚ M:Š Â~~çœïüÿZ÷®¬µ³ß™gfÞgfžÍÏcf!¦ŽÀÀ:4N ,RjC `’$üüÎù·À ‰õAaЊÿÐÄ"¡8‚M Š#
@@ -15569,10 +15504,10 @@ l/©Ð:diA®xmÄ·iQØâìÓ³gw¢m*˜Î“C7Ë‹HÕ<KÈðå ŒÙ!ðÄO ^v1|kú?Ncpv¢ßt.:¼ï>jsMg€}fh
Aü>Egiû÷(¼  oJÔ*ùh!¨cÎVBÔ”L4·Ÿi§3$éñ?ªhA2
endstream
endobj
-4504 0 obj
-<< /Type /FontDescriptor /FontName /DGBCZV+CMTT10 /Flags 4 /FontBBox [ -4 -233 537 696 ] /Ascent 611 /CapHeight 611 /Descent -222 /ItalicAngle 0 /StemV 69 /XHeight 431 /CharSet( /visiblespace) /FontFile 4505 0 R >>
+4508 0 obj
+<< /Type /FontDescriptor /FontName /DGBCZV+CMTT10 /Flags 4 /FontBBox [ -4 -233 537 696 ] /Ascent 611 /CapHeight 611 /Descent -222 /ItalicAngle 0 /StemV 69 /XHeight 431 /CharSet( /visiblespace) /FontFile 4509 0 R >>
endobj
-4507 0 obj
+4511 0 obj
<< /Length1 1808 /Length2 2831 /Length3 0 /Filter /FlateDecode /Length 3963 >>
stream
xÚµUy<TëÿÚ-á\û6«5kdoHÆZ)c挙fœ3fÆ2ÙJQ‘JQ¡èÞ,7Š­…eÉRÙ¿ù’(ÚDüÎp»Ýz}׼Μy>ïÏö¼Ÿ÷çß܉(
@@ -15588,10 +15523,10 @@ Zç,?¡™œÌüc΄®ùj^Ïœï­8SØò²cË)Æ5FQÚÞ¦)Óí—áÚu ¯FUgÔ%óŠßwRî(^Mc[7WÕÎœ
]|pãÐàªVq­{9ÀË—/>Xç]#€ØX¡a> œkÏ2¬»ÕÃ8÷ÜÈÒPô°ÌCýཙ+# Þ¹û©õ~¹90Ç/Àt‘ðü*¾ðôÌ©CUGêßo ð®IÞÐX^
endstream
endobj
-4506 0 obj
-<< /Type /FontDescriptor /FontName /MOFIWY+LMMathItalic10-Regular /Flags 4 /FontBBox [ -32 -250 1048 750 ] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 60 /XHeight 431 /CharSet( /arrowhookleft /greater /k /less /n /pi /slash /x) /FontFile 4507 0 R >>
+4510 0 obj
+<< /Type /FontDescriptor /FontName /MOFIWY+LMMathItalic10-Regular /Flags 4 /FontBBox [ -32 -250 1048 750 ] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 60 /XHeight 431 /CharSet( /arrowhookleft /greater /k /less /n /pi /slash /x) /FontFile 4511 0 R >>
endobj
-4509 0 obj
+4513 0 obj
<< /Length1 1670 /Length2 1620 /Length3 0 /Filter /FlateDecode /Length 2652 >>
stream
xÚµT{<Ti_6É´º#lÛ“VL™›;‰a afDÑî1óÌÌaæœiæLHˆÐz‰Òf+ÛE.‰¤>›[¯(]-ÕV[Q[ËæºP*¹Ôzϵ•wß?ßÏùÌ9óü®ßçû|ù¼
@@ -15615,10 +15550,10 @@ qßoœÃv&aÅ!æ)²¿î×þP~õ¥(pÙ$Á/Át
×Ñϸ>=Þ¢Û—µ<c†´2zR¤bÒèÛ)mÇì–ò¶ÞЭ…©;—$.h‰]xsÀð¹´²;ªúë¬
endstream
endobj
-4508 0 obj
-<< /Type /FontDescriptor /FontName /KDGSHG+LMMathItalic5-Regular /Flags 4 /FontBBox [ 0 -250 1349 750 ] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 84 /XHeight 431 /CharSet( /k) /FontFile 4509 0 R >>
+4512 0 obj
+<< /Type /FontDescriptor /FontName /KDGSHG+LMMathItalic5-Regular /Flags 4 /FontBBox [ 0 -250 1349 750 ] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 84 /XHeight 431 /CharSet( /k) /FontFile 4513 0 R >>
endobj
-4511 0 obj
+4515 0 obj
<< /Length1 1689 /Length2 1813 /Length3 0 /Filter /FlateDecode /Length 2856 >>
stream
xÚµTy\Lk×-uK%ÅÜõ(¥0[Ó¢B¦™iZGTʵÔiæÌÌÑtÎ4s¦¦º-¶ˆHDˆÄ I‘¥(âZ“¥å¢•("ÔåµDˆ{fâ¢÷¾¾Ÿó™sæù­ßçû|Í„À 2S€EÂ^Š“éšð€p±I¾ y.,RH  Sh4=– †pCÙ»º3.A°‡£#a B\õl
@@ -15634,10 +15569,10 @@ yÂwÜü¸m>†Ê9.¬!"Uèåª3CPµ-€Éóñâ“ý í¡ä
Ù[]õ¿/ Ù&@2¹ôöqf9>ºsÝõjÛ”Å+WÑõ„58P“2^7ºš±Ó*|KøÖŸÃ쟿µï^LãMßIáCiÑù…[›ÊΡmaWÚ²Ö%JüÖºçvKä= žÓ,\Ú&õÚÄ®ŸX¬9áí¡ôkÿHüTØá5.×~qϲ»nZõJ‡|§5'¹Ò‡i†‚Ñ­{?ÓS¶¡åWŠ¥ìtñ¯¶ pÞl_4ùã‘W¶/ŠË{fºŽSÌÃY9« 3¼s­œÂÀ3ÍœHŒTû½HöslôÝ_7zŸHŠÛË«¸UN²ô%ŸØ5Õä ŽvH×ÄL_eàÓÒdÐÐùS(O$­©#Ñu ÷4"Îå«Ëí–¯èR¾òæKu^Þ4Êyo©Wwà›s{æ´$Ùnð ïä- *ܽàëŽ>»ao|ÒpWAÕ£æì¥k{ò+ŽÕÍ|Yþväšç®cGŒ\¤écP’À•‘*׺oX¼Z÷¤Aà³XŠÃ²u;ÒˆÅáÃfÌ=3uø”øónžàéá`í¾ÚÌ‚àŠ¸¢w§Â†“uØ[:õû¬€¿°¨ÞðÎü
endstream
endobj
-4510 0 obj
-<< /Type /FontDescriptor /FontName /GFWWXD+LMMathItalic7-Regular /Flags 4 /FontBBox [ -1 -250 1171 750 ] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 72 /XHeight 431 /CharSet( /k /pi) /FontFile 4511 0 R >>
+4514 0 obj
+<< /Type /FontDescriptor /FontName /GFWWXD+LMMathItalic7-Regular /Flags 4 /FontBBox [ -1 -250 1171 750 ] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 72 /XHeight 431 /CharSet( /k /pi) /FontFile 4515 0 R >>
endobj
-4513 0 obj
+4517 0 obj
<< /Length1 1677 /Length2 1235 /Length3 0 /Filter /FlateDecode /Length 2254 >>
stream
xÚµTy\WW»`Í"^x!Ô'-9‘³®¤PHÑ$ŠUÁ!y!C’™830€‚ÖŠ*UðÂEQñ¨U©Êz ˆ¢(^»x`«µÔ…–¥o‚VaÝ?÷3ŸÌäýÎïû¾ïï¹NŠRð$2†’Ãñ… "2cta fÀÕþ¼™0ÞlÀ( â‹…BŽ«k01' )ÆÀ
@@ -15653,10 +15588,10 @@ VLÝfh¹3U²uv®âz•Ë©.á×Ù³LEÃl·L×á%yaÊ—z,ž« u߯!ö6^sn»]qÚ\¶ó=S[ÀXlʲí]ö¢X¹æICå
/>Êá–ë×(m¿-­Õçódæäú|!µq^kAÀÊ«±u„^ò•IO__Ðî¼Ï~¡g඄Õe#9‚ü²‚£–\¸ö±±gÝ’@ŸÖöH2·rMÏøó8ïµeCFyÁbmÉ–n÷ðs0Rg7H·ÄÕaSØOîÔgeüï6äxÿ;Í–
endstream
endobj
-4512 0 obj
-<< /Type /FontDescriptor /FontName /GLFSGS+LMMathItalic9-Regular /Flags 4 /FontBBox [ -29 -250 1075 750 ] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 28 /XHeight 431 /CharSet( /slash) /FontFile 4513 0 R >>
+4516 0 obj
+<< /Type /FontDescriptor /FontName /GLFSGS+LMMathItalic9-Regular /Flags 4 /FontBBox [ -29 -250 1075 750 ] /Ascent 694 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 28 /XHeight 431 /CharSet( /slash) /FontFile 4517 0 R >>
endobj
-4515 0 obj
+4519 0 obj
<< /Length1 1846 /Length2 22110 /Length3 0 /Filter /FlateDecode /Length 23294 >>
stream
xÚ´¸sxœíó>7j¬†Û¶mÛÙ8«±“ƶ­Æ¶7Nã¤ac7~Óçùøûû÷=öXÌ9¼ç:göÞ%'VR¥6³7J؃\虘x
@@ -15752,10 +15687,10 @@ cˆdw$ûÈÞwä(ßÍ<c‚|‹Ðõ Z§_rRIÅýo}[GÚe¿AûX¯PñýzëѠμË~ÜáÇm–ÏÑ™,¾E&‹kd&W
V—h‰˜Ô¸h7Sg5T%€ÂõdÔнxÙtP2{zïvòÞ5ìØè%Û| wÁÔµn.²;¿çòZƒ]Ä ²´Yõ´ß“%˜güŒ‰w;Åd›6Btšö‡K4¿¥B7Çn3Û³™Aèo-Në™3Kˆ=QÀÒç7–OëJø´tÚæ& ¦§@Gâ±,žúmÜ‚7i'‚£Ñ5)Ó>™·é`ט ]±îqp#é— E«zh!éEKÞm¦ÈI%Z“ þ9~`Gë5çéª[VÒŽ¿IÊè¹–ôãu}·ÛÏþœÿIbÜl/ÕYA±dK>@óuº¤¦T%sÊÎ ¼úš–ø+ßRøý¿‘+„u 5ÞkEM¹
endstream
endobj
-4514 0 obj
-<< /Type /FontDescriptor /FontName /DDAMXW+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 689 /CapHeight 689 /Descent -194 /ItalicAngle 0 /StemV 69 /XHeight 431 /CharSet( /a /c /equal /four /n /one /parenleft /parenright /plus /r /t /two /zero) /FontFile 4515 0 R >>
+4518 0 obj
+<< /Type /FontDescriptor /FontName /DDAMXW+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 689 /CapHeight 689 /Descent -194 /ItalicAngle 0 /StemV 69 /XHeight 431 /CharSet( /a /c /equal /four /n /one /parenleft /parenright /plus /r /t /two /zero) /FontFile 4519 0 R >>
endobj
-4517 0 obj
+4521 0 obj
<< /Length1 1715 /Length2 17571 /Length3 0 /Filter /FlateDecode /Length 18712 >>
stream
xÚ´÷stÝßö=ǶÛ¶ÕØvNl»I5vÛhÜØNÛ¶ó—¾ïG÷~ŸŸqÆÁžKs¯=ׯCA¢¤Ê bæ`”t°we`adæÈÉ«8ØÛs1¨
@@ -15823,10 +15758,10 @@ L ž©
ÜÁ¡^EuGí”|¼ØÊDgæ#ƒ‡-ŠŸpAꩇs‘þš&ežþyRqù}CIÝ@ͧ†“GG¸·ï²@>;ÑBáò¡Ïíø¾µˆ/úâͯ½Íôtj
endstream
endobj
-4516 0 obj
-<< /Type /FontDescriptor /FontName /LNPUMK+LMRoman7-Regular /Flags 4 /FontBBox [ -483 -292 1562 1124 ] /Ascent 689 /CapHeight 689 /Descent -194 /ItalicAngle 0 /StemV 79 /XHeight 431 /CharSet( /one /parenleft /parenright /plus /two) /FontFile 4517 0 R >>
+4520 0 obj
+<< /Type /FontDescriptor /FontName /LNPUMK+LMRoman7-Regular /Flags 4 /FontBBox [ -483 -292 1562 1124 ] /Ascent 689 /CapHeight 689 /Descent -194 /ItalicAngle 0 /StemV 79 /XHeight 431 /CharSet( /one /parenleft /parenright /plus /two) /FontFile 4521 0 R >>
endobj
-4519 0 obj
+4523 0 obj
<< /Length1 1699 /Length2 10474 /Length3 0 /Filter /FlateDecode /Length 11567 >>
stream
xÚµxeTÚ¶5Nqw îVÜݵH)N€à$¸/‡â®ÅÝÝ)VÜ)î^ Š=Úsï;÷žïýýFFdÙ^sÏ=×NFh)Õ5Y%ÌÁ¦ Y°„•“C ¬¢ tp`Õ
@@ -15868,10 +15803,10 @@ lŠ˜ÄÌÑPˆ9'󔦃âý&h–fL[mԓ莉y9ýa§\>ëç9èIÕ¥_§¸EóKŠÄËÏÃë1œE„¥ãÔ9©â
Ùj£Ì3zÝÕݳûQ&÷-¶?>kn£˜„~Yswź$m÷t¡ KÑFP Á)ÊûŽ*ãš5^*Š=¯Ö¢eD>Ï<¹­¶W¡NRí]ÚôI“åÉ:T¨Œú’¢Ë©W$2x |¶ÂÌ·e¼c¢®b‹­ð¿Ï‘¯Õ‘ ªäpõ$HLáž©D`Ô0àÉâÎtáp¦Ÿ ¦‹·1J^À"âF‰)ἦ–°wÓ©óЩ)³§¼›÷ÇürF»å
endstream
endobj
-4518 0 obj
-<< /Type /FontDescriptor /FontName /QNRZJS+LMSans9-Regular /Flags 4 /FontBBox [ -433 -313 1466 1155 ] /Ascent 694 /CapHeight 694 /Descent -194 /ItalicAngle 0 /StemV 96 /XHeight 444 /CharSet( /A /L /S /T /U /Y) /FontFile 4519 0 R >>
+4522 0 obj
+<< /Type /FontDescriptor /FontName /QNRZJS+LMSans9-Regular /Flags 4 /FontBBox [ -433 -313 1466 1155 ] /Ascent 694 /CapHeight 694 /Descent -194 /ItalicAngle 0 /StemV 96 /XHeight 444 /CharSet( /A /L /S /T /U /Y) /FontFile 4523 0 R >>
endobj
-4521 0 obj
+4525 0 obj
<< /Length1 1740 /Length2 1925 /Length3 0 /Filter /FlateDecode /Length 2996 >>
stream
xÚµTy<Tk¿¥¨‰’J²õefŒµáuk¬Ù'3²Vsp˜9gÌå">nŠŠQ ­„V*Y)"K劫ŽJŠu½gFÝ–ÏÛŸïg>gÎy~ßßò}~Ï÷÷hk0Yd €í0'Ó(æÀÙÅÂCXQ¼
@@ -15886,10 +15821,10 @@ Zé¦8iØ+w–™7»©Ä‹§zquߺg«¶w9j.Tq
ÏNQPv-.ô;ëe>¢VŸ8ãZ‚÷Ô&/Õ2¥´Ñ–ƒ?h ¬fx6×"ÙP¸öØKK£°™ku¼—9]_ÎÖXý |³®¾wZß_$ÛE£y•ÐÆûë7$¬âÿ'¯8áÍXáÙ'«}bË}m"c‹ÿšÑZrÓŸ¡Ú°ä‚Ⱥ±ÆlQyûÀü0ú.jãFôÎCËGÃhq6仦{Z{ñRW™ø!†ç4”YT»¡Â ggÝf GùzCB[oQ¯O¨o»óÀíXÿ¢yV‡~·¶¯ô,±"(ÓY¡|ÒÓüçŽ%-‰ÙŠãúsá–õôg[:ÿ éèôù
endstream
endobj
-4520 0 obj
-<< /Type /FontDescriptor /FontName /TNOUBP+LMMathSymbols10-Regular /Flags 4 /FontBBox [ -29 -960 1116 775 ] /Ascent 750 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 40 /XHeight 431 /CharSet( /arrowright /asteriskmath /minus) /FontFile 4521 0 R >>
+4524 0 obj
+<< /Type /FontDescriptor /FontName /TNOUBP+LMMathSymbols10-Regular /Flags 4 /FontBBox [ -29 -960 1116 775 ] /Ascent 750 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 40 /XHeight 431 /CharSet( /arrowright /asteriskmath /minus) /FontFile 4525 0 R >>
endobj
-4523 0 obj
+4527 0 obj
<< /Length1 1689 /Length2 1347 /Length3 0 /Filter /FlateDecode /Length 2378 >>
stream
xÚµTyT×v5µîR
@@ -15906,10 +15841,10 @@ cÊÒk©¥G<<[$…[æn›t©à`ÎÁ1@Yó‡(èÐÑÎu¾µ/†=Êó˜_z°á;ëÖ+ª‘”q¸íÚP—î×.îͼ處‰­Ÿ
¶zÂÿòÔFåŸÆÛy¦«õ£rÝ®,º×БÝÒ9÷võBG/ý§ëNrþáÍÁ
endstream
endobj
-4522 0 obj
-<< /Type /FontDescriptor /FontName /DTFCKV+LMMathSymbols6-Regular /Flags 4 /FontBBox [ -4 -948 1329 786 ] /Ascent 750 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 52 /XHeight 431 /CharSet( /asteriskmath) /FontFile 4523 0 R >>
+4526 0 obj
+<< /Type /FontDescriptor /FontName /DTFCKV+LMMathSymbols6-Regular /Flags 4 /FontBBox [ -4 -948 1329 786 ] /Ascent 750 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 52 /XHeight 431 /CharSet( /asteriskmath) /FontFile 4527 0 R >>
endobj
-4525 0 obj
+4529 0 obj
<< /Length1 1684 /Length2 1529 /Length3 0 /Filter /FlateDecode /Length 2571 >>
stream
xÚµTiX×.\
@@ -15927,10 +15862,10 @@ f|ê÷Ìew”k¼Ç¥Ç«ÏKggåYòççfô(lWÏû$¢•¯n:4ÿ׌/æT‡~ù£ûõ±±ßüåó’÷V¹6y¯(÷ÛÇm¸ù]ó
2“]ló‘þQÚ1z]dìVþÑÌfgÁ‹¦Î?™ÈùÓ:ôùŽ=»î–ÞÐïõ\d{7ò§6mù·jÙãfåï…ƒi›o–L䆬 8m_¡Úµ)'³7ØÅ|Þ·ËndéóÝÕyk“æùõ¶Ö%\v9ÊÛ/yš¶`›Oý´~Î}kyžW+àöD(ÿÓ‚S^rΠрðjüý3¯¶vÊN<ûí
endstream
endobj
-4524 0 obj
-<< /Type /FontDescriptor /FontName /CIXFWA+LMMathSymbols7-Regular /Flags 4 /FontBBox [ -15 -951 1252 782 ] /Ascent 750 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 49 /XHeight 431 /CharSet( /minus) /FontFile 4525 0 R >>
+4528 0 obj
+<< /Type /FontDescriptor /FontName /CIXFWA+LMMathSymbols7-Regular /Flags 4 /FontBBox [ -15 -951 1252 782 ] /Ascent 750 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 49 /XHeight 431 /CharSet( /minus) /FontFile 4529 0 R >>
endobj
-4527 0 obj
+4531 0 obj
<< /Length1 1748 /Length2 1585 /Length3 0 /Filter /FlateDecode /Length 2661 >>
stream
xÚµTiXWp”º *¸\@dѬ¬Ø
@@ -15950,212 +15885,212 @@ g]Ýqbã‰)@X÷ÀuêÌ‹,æåw£Ÿluˆ.9ѲgˆvßuÆQk•|LbÓ(ÛJ»¦+•&Ä»ÖÖ!gÙÍn×bóWÛÔUVŸõÍËI!%
§÷æÃù{'eFÉÿ1´ØŠùm\ȪëmÎ 3Z6Å\ÙmÊ<áI§¼¨ÄÜu®íž3úüƒ.QW}·ÞMò1)ëZfVÙ¹ü6{j”~YªÿF]¦w͆=”,ìÈÖÿµv,D8Uè87µŠ1íò4"ùPŸbh£niþ|Ü"³ÇÙMQ"ö&óTÂö{EÞ>‡~l“¼fÃŒöðÛ[ÊN³ïš7Úö ‹¹?´ÂÆ>µ-`™¿ö;W›´G½ž²!ÈåQõ‹“µ}Vû¯û¾®±’´966Œ9ùÉÄŸ4’ž«*àVž3mï±~PTQa’ùä7ŸŽU©öÁ©ïÔÌäÒ,ë/jÍJݾ‡õ}u5[3 %}Åôo¿Ì)ÆCÆ¢–2ýN'—ž®ÈÙ·*º‹7¿Æåÿ™µÉ5ûTNCIÚƒ`ï ùNs¾oÔýÜ»» -(4Å4Ëìzù¼Å±¥SÞŽÑý<*Xx3SVhzD2©!§-7gì+^ßïÛoR/6ü6˜éu4ÕsÜSVAÜ¢ÓMø Û²Z8
endstream
endobj
-4526 0 obj
-<< /Type /FontDescriptor /FontName /SRVGJC+LMMathSymbols9-Regular /Flags 4 /FontBBox [ -30 -958 1146 777 ] /Ascent 750 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 43 /XHeight 431 /CharSet( /angbracketleft /angbracketright /asteriskmath) /FontFile 4527 0 R >>
+4530 0 obj
+<< /Type /FontDescriptor /FontName /SRVGJC+LMMathSymbols9-Regular /Flags 4 /FontBBox [ -30 -958 1146 777 ] /Ascent 750 /CapHeight 683 /Descent -194 /ItalicAngle -14 /StemV 43 /XHeight 431 /CharSet( /angbracketleft /angbracketright /asteriskmath) /FontFile 4531 0 R >>
endobj
-4309 0 obj
+4313 0 obj
<< /Type /Encoding /Differences [ 25 /pi 44 /arrowhookleft 60 /less /slash /greater 107 /k 110 /n 120 /x ] >>
endobj
-4313 0 obj
+4317 0 obj
<< /Type /Encoding /Differences [ 0 /minus 3 /asteriskmath 33 /arrowright 104 /angbracketleft /angbracketright ] >>
endobj
-4311 0 obj
+4315 0 obj
<< /Type /Encoding /Differences [ 40 /parenleft /parenright 43 /plus 48 /zero /one /two 52 /four 61 /equal 65 /A 76 /L 83 /S /T /U 89 /Y 97 /a 99 /c 110 /n 114 /r 116 /t ] >>
endobj
-633 0 obj
-<< /Type /Font /Subtype /Type1 /BaseFont /DGBCZV+CMTT10 /FontDescriptor 4504 0 R /FirstChar 32 /LastChar 32 /Widths 4315 0 R >>
+641 0 obj
+<< /Type /Font /Subtype /Type1 /BaseFont /DGBCZV+CMTT10 /FontDescriptor 4508 0 R /FirstChar 32 /LastChar 32 /Widths 4319 0 R >>
endobj
341 0 obj
-<< /Type /Font /Subtype /Type1 /BaseFont /MOFIWY+LMMathItalic10-Regular /FontDescriptor 4506 0 R /FirstChar 25 /LastChar 120 /Widths 4417 0 R /Encoding 4309 0 R >>
+<< /Type /Font /Subtype /Type1 /BaseFont /MOFIWY+LMMathItalic10-Regular /FontDescriptor 4510 0 R /FirstChar 25 /LastChar 120 /Widths 4421 0 R /Encoding 4313 0 R >>
endobj
-519 0 obj
-<< /Type /Font /Subtype /Type1 /BaseFont /KDGSHG+LMMathItalic5-Regular /FontDescriptor 4508 0 R /FirstChar 107 /LastChar 107 /Widths 4340 0 R /Encoding 4309 0 R >>
+522 0 obj
+<< /Type /Font /Subtype /Type1 /BaseFont /KDGSHG+LMMathItalic5-Regular /FontDescriptor 4512 0 R /FirstChar 107 /LastChar 107 /Widths 4344 0 R /Encoding 4313 0 R >>
endobj
342 0 obj
-<< /Type /Font /Subtype /Type1 /BaseFont /GFWWXD+LMMathItalic7-Regular /FontDescriptor 4510 0 R /FirstChar 25 /LastChar 107 /Widths 4416 0 R /Encoding 4309 0 R >>
+<< /Type /Font /Subtype /Type1 /BaseFont /GFWWXD+LMMathItalic7-Regular /FontDescriptor 4514 0 R /FirstChar 25 /LastChar 107 /Widths 4420 0 R /Encoding 4313 0 R >>
endobj
-2313 0 obj
-<< /Type /Font /Subtype /Type1 /BaseFont /GLFSGS+LMMathItalic9-Regular /FontDescriptor 4512 0 R /FirstChar 61 /LastChar 61 /Widths 4310 0 R /Encoding 4309 0 R >>
+2310 0 obj
+<< /Type /Font /Subtype /Type1 /BaseFont /GLFSGS+LMMathItalic9-Regular /FontDescriptor 4516 0 R /FirstChar 61 /LastChar 61 /Widths 4314 0 R /Encoding 4313 0 R >>
endobj
327 0 obj
-<< /Type /Font /Subtype /Type1 /BaseFont /TNOUBP+LMMathSymbols10-Regular /FontDescriptor 4520 0 R /FirstChar 0 /LastChar 33 /Widths 4491 0 R /Encoding 4313 0 R >>
+<< /Type /Font /Subtype /Type1 /BaseFont /TNOUBP+LMMathSymbols10-Regular /FontDescriptor 4524 0 R /FirstChar 0 /LastChar 33 /Widths 4495 0 R /Encoding 4317 0 R >>
endobj
344 0 obj
-<< /Type /Font /Subtype /Type1 /BaseFont /DTFCKV+LMMathSymbols6-Regular /FontDescriptor 4522 0 R /FirstChar 3 /LastChar 3 /Widths 4414 0 R /Encoding 4313 0 R >>
+<< /Type /Font /Subtype /Type1 /BaseFont /DTFCKV+LMMathSymbols6-Regular /FontDescriptor 4526 0 R /FirstChar 3 /LastChar 3 /Widths 4418 0 R /Encoding 4317 0 R >>
endobj
-518 0 obj
-<< /Type /Font /Subtype /Type1 /BaseFont /CIXFWA+LMMathSymbols7-Regular /FontDescriptor 4524 0 R /FirstChar 0 /LastChar 0 /Widths 4341 0 R /Encoding 4313 0 R >>
+521 0 obj
+<< /Type /Font /Subtype /Type1 /BaseFont /CIXFWA+LMMathSymbols7-Regular /FontDescriptor 4528 0 R /FirstChar 0 /LastChar 0 /Widths 4345 0 R /Encoding 4317 0 R >>
endobj
-635 0 obj
-<< /Type /Font /Subtype /Type1 /BaseFont /SRVGJC+LMMathSymbols9-Regular /FontDescriptor 4526 0 R /FirstChar 3 /LastChar 105 /Widths 4314 0 R /Encoding 4313 0 R >>
+643 0 obj
+<< /Type /Font /Subtype /Type1 /BaseFont /SRVGJC+LMMathSymbols9-Regular /FontDescriptor 4530 0 R /FirstChar 3 /LastChar 105 /Widths 4318 0 R /Encoding 4317 0 R >>
endobj
340 0 obj
-<< /Type /Font /Subtype /Type1 /BaseFont /DDAMXW+LMRoman10-Regular /FontDescriptor 4514 0 R /FirstChar 40 /LastChar 116 /Widths 4418 0 R /Encoding 4311 0 R >>
+<< /Type /Font /Subtype /Type1 /BaseFont /DDAMXW+LMRoman10-Regular /FontDescriptor 4518 0 R /FirstChar 40 /LastChar 116 /Widths 4422 0 R /Encoding 4315 0 R >>
endobj
343 0 obj
-<< /Type /Font /Subtype /Type1 /BaseFont /LNPUMK+LMRoman7-Regular /FontDescriptor 4516 0 R /FirstChar 40 /LastChar 50 /Widths 4415 0 R /Encoding 4311 0 R >>
+<< /Type /Font /Subtype /Type1 /BaseFont /LNPUMK+LMRoman7-Regular /FontDescriptor 4520 0 R /FirstChar 40 /LastChar 50 /Widths 4419 0 R /Encoding 4315 0 R >>
endobj
-636 0 obj
-<< /Type /Font /Subtype /Type1 /BaseFont /QNRZJS+LMSans9-Regular /FontDescriptor 4518 0 R /FirstChar 65 /LastChar 89 /Widths 4312 0 R /Encoding 4311 0 R >>
+644 0 obj
+<< /Type /Font /Subtype /Type1 /BaseFont /QNRZJS+LMSans9-Regular /FontDescriptor 4522 0 R /FirstChar 65 /LastChar 89 /Widths 4316 0 R /Encoding 4315 0 R >>
endobj
353 0 obj
-<< /Type /Pages /Parent 4528 0 R /Count 10 /Kids [ 317 0 R 363 0 R 374 0 R 389 0 R 411 0 R 422 0 R 434 0 R 445 0 R 455 0 R 460 0 R ] >>
+<< /Type /Pages /Parent 4532 0 R /Count 10 /Kids [ 317 0 R 363 0 R 374 0 R 391 0 R 409 0 R 422 0 R 436 0 R 448 0 R 457 0 R 462 0 R ] >>
endobj
-472 0 obj
-<< /Type /Pages /Parent 4528 0 R /Count 10 /Kids [ 467 0 R 475 0 R 480 0 R 486 0 R 497 0 R 503 0 R 507 0 R 515 0 R 526 0 R 537 0 R ] >>
+475 0 obj
+<< /Type /Pages /Parent 4532 0 R /Count 10 /Kids [ 470 0 R 478 0 R 482 0 R 489 0 R 500 0 R 505 0 R 511 0 R 518 0 R 528 0 R 537 0 R ] >>
endobj
-545 0 obj
-<< /Type /Pages /Parent 4528 0 R /Count 10 /Kids [ 542 0 R 551 0 R 564 0 R 575 0 R 585 0 R 591 0 R 595 0 R 599 0 R 605 0 R 611 0 R ] >>
+554 0 obj
+<< /Type /Pages /Parent 4532 0 R /Count 10 /Kids [ 546 0 R 562 0 R 571 0 R 575 0 R 586 0 R 593 0 R 599 0 R 603 0 R 607 0 R 613 0 R ] >>
endobj
-627 0 obj
-<< /Type /Pages /Parent 4528 0 R /Count 10 /Kids [ 620 0 R 630 0 R 673 0 R 724 0 R 779 0 R 807 0 R 832 0 R 853 0 R 895 0 R 931 0 R ] >>
+622 0 obj
+<< /Type /Pages /Parent 4532 0 R /Count 10 /Kids [ 619 0 R 629 0 R 638 0 R 678 0 R 729 0 R 784 0 R 810 0 R 836 0 R 864 0 R 901 0 R ] >>
endobj
-1026 0 obj
-<< /Type /Pages /Parent 4528 0 R /Count 10 /Kids [ 991 0 R 1029 0 R 1085 0 R 1148 0 R 1207 0 R 1272 0 R 1339 0 R 1387 0 R 1432 0 R 1474 0 R ] >>
+1000 0 obj
+<< /Type /Pages /Parent 4532 0 R /Count 10 /Kids [ 945 0 R 1004 0 R 1040 0 R 1087 0 R 1150 0 R 1209 0 R 1274 0 R 1341 0 R 1384 0 R 1434 0 R ] >>
endobj
-1590 0 obj
-<< /Type /Pages /Parent 4528 0 R /Count 10 /Kids [ 1532 0 R 1593 0 R 1639 0 R 1687 0 R 1733 0 R 1785 0 R 1846 0 R 1890 0 R 1953 0 R 2008 0 R ] >>
+1522 0 obj
+<< /Type /Pages /Parent 4532 0 R /Count 10 /Kids [ 1472 0 R 1524 0 R 1582 0 R 1628 0 R 1681 0 R 1725 0 R 1777 0 R 1837 0 R 1886 0 R 1952 0 R ] >>
endobj
-2099 0 obj
-<< /Type /Pages /Parent 4528 0 R /Count 10 /Kids [ 2056 0 R 2101 0 R 2160 0 R 2225 0 R 2283 0 R 2335 0 R 2365 0 R 2403 0 R 2443 0 R 2489 0 R ] >>
+2041 0 obj
+<< /Type /Pages /Parent 4532 0 R /Count 10 /Kids [ 2003 0 R 2043 0 R 2094 0 R 2156 0 R 2219 0 R 2273 0 R 2321 0 R 2355 0 R 2393 0 R 2437 0 R ] >>
endobj
-2578 0 obj
-<< /Type /Pages /Parent 4528 0 R /Count 10 /Kids [ 2540 0 R 2581 0 R 2636 0 R 2677 0 R 2714 0 R 2767 0 R 2830 0 R 2876 0 R 2923 0 R 2979 0 R ] >>
+2547 0 obj
+<< /Type /Pages /Parent 4532 0 R /Count 10 /Kids [ 2489 0 R 2550 0 R 2590 0 R 2651 0 R 2679 0 R 2721 0 R 2775 0 R 2834 0 R 2879 0 R 2928 0 R ] >>
endobj
-3076 0 obj
-<< /Type /Pages /Parent 4528 0 R /Count 10 /Kids [ 3034 0 R 3078 0 R 3137 0 R 3197 0 R 3250 0 R 3288 0 R 3341 0 R 3393 0 R 3453 0 R 3509 0 R ] >>
+3034 0 obj
+<< /Type /Pages /Parent 4532 0 R /Count 10 /Kids [ 2982 0 R 3036 0 R 3082 0 R 3141 0 R 3196 0 R 3249 0 R 3287 0 R 3339 0 R 3391 0 R 3450 0 R ] >>
endobj
-3630 0 obj
-<< /Type /Pages /Parent 4528 0 R /Count 10 /Kids [ 3576 0 R 3632 0 R 3671 0 R 3722 0 R 3767 0 R 3819 0 R 3862 0 R 3918 0 R 3968 0 R 4022 0 R ] >>
+3569 0 obj
+<< /Type /Pages /Parent 4532 0 R /Count 10 /Kids [ 3505 0 R 3571 0 R 3626 0 R 3668 0 R 3717 0 R 3751 0 R 3792 0 R 3838 0 R 3886 0 R 3945 0 R ] >>
endobj
-4143 0 obj
-<< /Type /Pages /Parent 4529 0 R /Count 6 /Kids [ 4088 0 R 4145 0 R 4197 0 R 4227 0 R 4294 0 R 4305 0 R ] >>
+4047 0 obj
+<< /Type /Pages /Parent 4533 0 R /Count 7 /Kids [ 3996 0 R 4049 0 R 4115 0 R 4173 0 R 4229 0 R 4296 0 R 4309 0 R ] >>
endobj
-4528 0 obj
-<< /Type /Pages /Parent 4530 0 R /Count 100 /Kids [ 353 0 R 472 0 R 545 0 R 627 0 R 1026 0 R 1590 0 R 2099 0 R 2578 0 R 3076 0 R 3630 0 R ] >>
+4532 0 obj
+<< /Type /Pages /Parent 4534 0 R /Count 100 /Kids [ 353 0 R 475 0 R 554 0 R 622 0 R 1000 0 R 1522 0 R 2041 0 R 2547 0 R 3034 0 R 3569 0 R ] >>
endobj
-4529 0 obj
-<< /Type /Pages /Parent 4530 0 R /Count 6 /Kids [ 4143 0 R ] >>
+4533 0 obj
+<< /Type /Pages /Parent 4534 0 R /Count 7 /Kids [ 4047 0 R ] >>
endobj
-4530 0 obj
-<< /Type /Pages /Count 106 /Kids [ 4528 0 R 4529 0 R ] >>
+4534 0 obj
+<< /Type /Pages /Count 107 /Kids [ 4532 0 R 4533 0 R ] >>
endobj
-4531 0 obj
+4535 0 obj
<< /Type /Outlines /First 6 0 R /Last 314 0 R /Count 12 >>
endobj
314 0 obj
-<< /Title 315 0 R /A 312 0 R /Parent 4531 0 R /Prev 310 0 R >>
+<< /Title 315 0 R /A 312 0 R /Parent 4535 0 R /Prev 310 0 R >>
endobj
310 0 obj
-<< /Title 311 0 R /A 308 0 R /Parent 4531 0 R /Prev 202 0 R /Next 314 0 R >>
+<< /Title 311 0 R /A 308 0 R /Parent 4535 0 R /Prev 198 0 R /Next 314 0 R >>
endobj
306 0 obj
-<< /Title 307 0 R /A 304 0 R /Parent 270 0 R /Prev 302 0 R >>
+<< /Title 307 0 R /A 304 0 R /Parent 266 0 R /Prev 302 0 R >>
endobj
302 0 obj
-<< /Title 303 0 R /A 300 0 R /Parent 270 0 R /Prev 298 0 R /Next 306 0 R >>
+<< /Title 303 0 R /A 300 0 R /Parent 266 0 R /Prev 298 0 R /Next 306 0 R >>
endobj
298 0 obj
-<< /Title 299 0 R /A 296 0 R /Parent 270 0 R /Prev 294 0 R /Next 302 0 R >>
+<< /Title 299 0 R /A 296 0 R /Parent 266 0 R /Prev 294 0 R /Next 302 0 R >>
endobj
294 0 obj
-<< /Title 295 0 R /A 292 0 R /Parent 270 0 R /Prev 290 0 R /Next 298 0 R >>
+<< /Title 295 0 R /A 292 0 R /Parent 266 0 R /Prev 290 0 R /Next 298 0 R >>
endobj
290 0 obj
-<< /Title 291 0 R /A 288 0 R /Parent 270 0 R /Prev 286 0 R /Next 294 0 R >>
+<< /Title 291 0 R /A 288 0 R /Parent 266 0 R /Prev 286 0 R /Next 294 0 R >>
endobj
286 0 obj
-<< /Title 287 0 R /A 284 0 R /Parent 270 0 R /Prev 282 0 R /Next 290 0 R >>
+<< /Title 287 0 R /A 284 0 R /Parent 266 0 R /Prev 282 0 R /Next 290 0 R >>
endobj
282 0 obj
-<< /Title 283 0 R /A 280 0 R /Parent 270 0 R /Prev 278 0 R /Next 286 0 R >>
+<< /Title 283 0 R /A 280 0 R /Parent 266 0 R /Prev 278 0 R /Next 286 0 R >>
endobj
278 0 obj
-<< /Title 279 0 R /A 276 0 R /Parent 270 0 R /Prev 274 0 R /Next 282 0 R >>
+<< /Title 279 0 R /A 276 0 R /Parent 266 0 R /Prev 274 0 R /Next 282 0 R >>
endobj
274 0 obj
-<< /Title 275 0 R /A 272 0 R /Parent 270 0 R /Next 278 0 R >>
+<< /Title 275 0 R /A 272 0 R /Parent 266 0 R /Prev 270 0 R /Next 278 0 R >>
endobj
270 0 obj
-<< /Title 271 0 R /A 268 0 R /Parent 202 0 R /Prev 210 0 R /First 274 0 R /Last 306 0 R /Count -9 >>
+<< /Title 271 0 R /A 268 0 R /Parent 266 0 R /Next 274 0 R >>
endobj
266 0 obj
-<< /Title 267 0 R /A 264 0 R /Parent 210 0 R /Prev 262 0 R >>
+<< /Title 267 0 R /A 264 0 R /Parent 198 0 R /Prev 206 0 R /First 270 0 R /Last 306 0 R /Count -10 >>
endobj
262 0 obj
-<< /Title 263 0 R /A 260 0 R /Parent 210 0 R /Prev 258 0 R /Next 266 0 R >>
+<< /Title 263 0 R /A 260 0 R /Parent 206 0 R /Prev 258 0 R >>
endobj
258 0 obj
-<< /Title 259 0 R /A 256 0 R /Parent 210 0 R /Prev 254 0 R /Next 262 0 R >>
+<< /Title 259 0 R /A 256 0 R /Parent 206 0 R /Prev 254 0 R /Next 262 0 R >>
endobj
254 0 obj
-<< /Title 255 0 R /A 252 0 R /Parent 210 0 R /Prev 250 0 R /Next 258 0 R >>
+<< /Title 255 0 R /A 252 0 R /Parent 206 0 R /Prev 250 0 R /Next 258 0 R >>
endobj
250 0 obj
-<< /Title 251 0 R /A 248 0 R /Parent 210 0 R /Prev 246 0 R /Next 254 0 R >>
+<< /Title 251 0 R /A 248 0 R /Parent 206 0 R /Prev 246 0 R /Next 254 0 R >>
endobj
246 0 obj
-<< /Title 247 0 R /A 244 0 R /Parent 210 0 R /Prev 242 0 R /Next 250 0 R >>
+<< /Title 247 0 R /A 244 0 R /Parent 206 0 R /Prev 242 0 R /Next 250 0 R >>
endobj
242 0 obj
-<< /Title 243 0 R /A 240 0 R /Parent 210 0 R /Prev 238 0 R /Next 246 0 R >>
+<< /Title 243 0 R /A 240 0 R /Parent 206 0 R /Prev 238 0 R /Next 246 0 R >>
endobj
238 0 obj
-<< /Title 239 0 R /A 236 0 R /Parent 210 0 R /Prev 234 0 R /Next 242 0 R >>
+<< /Title 239 0 R /A 236 0 R /Parent 206 0 R /Prev 234 0 R /Next 242 0 R >>
endobj
234 0 obj
-<< /Title 235 0 R /A 232 0 R /Parent 210 0 R /Prev 230 0 R /Next 238 0 R >>
+<< /Title 235 0 R /A 232 0 R /Parent 206 0 R /Prev 230 0 R /Next 238 0 R >>
endobj
230 0 obj
-<< /Title 231 0 R /A 228 0 R /Parent 210 0 R /Prev 226 0 R /Next 234 0 R >>
+<< /Title 231 0 R /A 228 0 R /Parent 206 0 R /Prev 226 0 R /Next 234 0 R >>
endobj
226 0 obj
-<< /Title 227 0 R /A 224 0 R /Parent 210 0 R /Prev 222 0 R /Next 230 0 R >>
+<< /Title 227 0 R /A 224 0 R /Parent 206 0 R /Prev 222 0 R /Next 230 0 R >>
endobj
222 0 obj
-<< /Title 223 0 R /A 220 0 R /Parent 210 0 R /Prev 218 0 R /Next 226 0 R >>
+<< /Title 223 0 R /A 220 0 R /Parent 206 0 R /Prev 218 0 R /Next 226 0 R >>
endobj
218 0 obj
-<< /Title 219 0 R /A 216 0 R /Parent 210 0 R /Prev 214 0 R /Next 222 0 R >>
+<< /Title 219 0 R /A 216 0 R /Parent 206 0 R /Prev 214 0 R /Next 222 0 R >>
endobj
214 0 obj
-<< /Title 215 0 R /A 212 0 R /Parent 210 0 R /Next 218 0 R >>
+<< /Title 215 0 R /A 212 0 R /Parent 206 0 R /Prev 210 0 R /Next 218 0 R >>
endobj
210 0 obj
-<< /Title 211 0 R /A 208 0 R /Parent 202 0 R /Prev 206 0 R /Next 270 0 R /First 214 0 R /Last 266 0 R /Count -14 >>
+<< /Title 211 0 R /A 208 0 R /Parent 206 0 R /Next 214 0 R >>
endobj
206 0 obj
-<< /Title 207 0 R /A 204 0 R /Parent 202 0 R /Next 210 0 R >>
+<< /Title 207 0 R /A 204 0 R /Parent 198 0 R /Prev 202 0 R /Next 266 0 R /First 210 0 R /Last 262 0 R /Count -14 >>
endobj
202 0 obj
-<< /Title 203 0 R /A 200 0 R /Parent 4531 0 R /Prev 174 0 R /Next 310 0 R /First 206 0 R /Last 270 0 R /Count -3 >>
+<< /Title 203 0 R /A 200 0 R /Parent 198 0 R /Next 206 0 R >>
endobj
198 0 obj
-<< /Title 199 0 R /A 196 0 R /Parent 174 0 R /Prev 194 0 R >>
+<< /Title 199 0 R /A 196 0 R /Parent 4535 0 R /Prev 170 0 R /Next 310 0 R /First 202 0 R /Last 266 0 R /Count -3 >>
endobj
194 0 obj
-<< /Title 195 0 R /A 192 0 R /Parent 174 0 R /Prev 190 0 R /Next 198 0 R >>
+<< /Title 195 0 R /A 192 0 R /Parent 170 0 R /Prev 190 0 R >>
endobj
190 0 obj
-<< /Title 191 0 R /A 188 0 R /Parent 174 0 R /Prev 186 0 R /Next 194 0 R >>
+<< /Title 191 0 R /A 188 0 R /Parent 170 0 R /Prev 186 0 R /Next 194 0 R >>
endobj
186 0 obj
-<< /Title 187 0 R /A 184 0 R /Parent 174 0 R /Prev 182 0 R /Next 190 0 R >>
+<< /Title 187 0 R /A 184 0 R /Parent 170 0 R /Prev 182 0 R /Next 190 0 R >>
endobj
182 0 obj
-<< /Title 183 0 R /A 180 0 R /Parent 174 0 R /Prev 178 0 R /Next 186 0 R >>
+<< /Title 183 0 R /A 180 0 R /Parent 170 0 R /Prev 178 0 R /Next 186 0 R >>
endobj
178 0 obj
-<< /Title 179 0 R /A 176 0 R /Parent 174 0 R /Next 182 0 R >>
+<< /Title 179 0 R /A 176 0 R /Parent 170 0 R /Prev 174 0 R /Next 182 0 R >>
endobj
174 0 obj
-<< /Title 175 0 R /A 172 0 R /Parent 4531 0 R /Prev 150 0 R /Next 202 0 R /First 178 0 R /Last 198 0 R /Count -6 >>
+<< /Title 175 0 R /A 172 0 R /Parent 170 0 R /Next 178 0 R >>
endobj
170 0 obj
-<< /Title 171 0 R /A 168 0 R /Parent 150 0 R /Prev 166 0 R >>
+<< /Title 171 0 R /A 168 0 R /Parent 4535 0 R /Prev 150 0 R /Next 198 0 R /First 174 0 R /Last 194 0 R /Count -6 >>
endobj
166 0 obj
-<< /Title 167 0 R /A 164 0 R /Parent 150 0 R /Prev 162 0 R /Next 170 0 R >>
+<< /Title 167 0 R /A 164 0 R /Parent 150 0 R /Prev 162 0 R >>
endobj
162 0 obj
<< /Title 163 0 R /A 160 0 R /Parent 150 0 R /Prev 158 0 R /Next 166 0 R >>
@@ -16167,10 +16102,10 @@ endobj
<< /Title 155 0 R /A 152 0 R /Parent 150 0 R /Next 158 0 R >>
endobj
150 0 obj
-<< /Title 151 0 R /A 148 0 R /Parent 4531 0 R /Prev 146 0 R /Next 174 0 R /First 154 0 R /Last 170 0 R /Count -5 >>
+<< /Title 151 0 R /A 148 0 R /Parent 4535 0 R /Prev 146 0 R /Next 170 0 R /First 154 0 R /Last 166 0 R /Count -4 >>
endobj
146 0 obj
-<< /Title 147 0 R /A 144 0 R /Parent 4531 0 R /Prev 66 0 R /Next 150 0 R >>
+<< /Title 147 0 R /A 144 0 R /Parent 4535 0 R /Prev 66 0 R /Next 150 0 R >>
endobj
142 0 obj
<< /Title 143 0 R /A 140 0 R /Parent 66 0 R /Prev 138 0 R >>
@@ -16230,10 +16165,10 @@ endobj
<< /Title 71 0 R /A 68 0 R /Parent 66 0 R /Next 82 0 R /First 74 0 R /Last 78 0 R /Count -2 >>
endobj
66 0 obj
-<< /Title 67 0 R /A 64 0 R /Parent 4531 0 R /Prev 62 0 R /Next 146 0 R /First 70 0 R /Last 142 0 R /Count -7 >>
+<< /Title 67 0 R /A 64 0 R /Parent 4535 0 R /Prev 62 0 R /Next 146 0 R /First 70 0 R /Last 142 0 R /Count -7 >>
endobj
62 0 obj
-<< /Title 63 0 R /A 60 0 R /Parent 4531 0 R /Prev 34 0 R /Next 66 0 R >>
+<< /Title 63 0 R /A 60 0 R /Parent 4535 0 R /Prev 34 0 R /Next 66 0 R >>
endobj
58 0 obj
<< /Title 59 0 R /A 56 0 R /Parent 34 0 R /Prev 42 0 R >>
@@ -16254,7 +16189,7 @@ endobj
<< /Title 39 0 R /A 36 0 R /Parent 34 0 R /Next 42 0 R >>
endobj
34 0 obj
-<< /Title 35 0 R /A 32 0 R /Parent 4531 0 R /Prev 14 0 R /Next 62 0 R /First 38 0 R /Last 58 0 R /Count -3 >>
+<< /Title 35 0 R /A 32 0 R /Parent 4535 0 R /Prev 14 0 R /Next 62 0 R /First 38 0 R /Last 58 0 R /Count -3 >>
endobj
30 0 obj
<< /Title 31 0 R /A 28 0 R /Parent 14 0 R /Prev 26 0 R >>
@@ -16269,1907 +16204,1866 @@ endobj
<< /Title 19 0 R /A 16 0 R /Parent 14 0 R /Next 22 0 R >>
endobj
14 0 obj
-<< /Title 15 0 R /A 12 0 R /Parent 4531 0 R /Prev 10 0 R /Next 34 0 R /First 18 0 R /Last 30 0 R /Count -4 >>
+<< /Title 15 0 R /A 12 0 R /Parent 4535 0 R /Prev 10 0 R /Next 34 0 R /First 18 0 R /Last 30 0 R /Count -4 >>
endobj
10 0 obj
-<< /Title 11 0 R /A 8 0 R /Parent 4531 0 R /Prev 6 0 R /Next 14 0 R >>
+<< /Title 11 0 R /A 8 0 R /Parent 4535 0 R /Prev 6 0 R /Next 14 0 R >>
endobj
6 0 obj
-<< /Title 7 0 R /A 4 0 R /Parent 4531 0 R /Next 10 0 R >>
-endobj
-4532 0 obj
-<< /Names [ (Doc-Start) 324 0 R (HD.1) 634 0 R (HD.10) 645 0 R (HD.100) 743 0 R (HD.1000) 1731 0 R (HD.1001) 1736 0 R (HD.1002) 1737 0 R (HD.1003) 1738 0 R (HD.1004) 1739 0 R (HD.1005) 1740 0 R (HD.1006) 1741 0 R (HD.1007) 1742 0 R (HD.1008) 1743 0 R (HD.1009) 1744 0 R (HD.101) 744 0 R (HD.1010) 1745 0 R (HD.1011) 1746 0 R (HD.1012) 1747 0 R (HD.1013) 1748 0 R (HD.1014) 1749 0 R (HD.1015) 1750 0 R (HD.1016) 1751 0 R (HD.1017) 1752 0 R (HD.1018) 1753 0 R (HD.1019) 1754 0 R (HD.102) 745 0 R (HD.1020) 1755 0 R (HD.1021) 1756 0 R (HD.1022) 1757 0 R (HD.1023) 1758 0 R (HD.1024) 1759 0 R (HD.1025) 1760 0 R ] /Limits [ (Doc-Start) (HD.1025) ] >>
-endobj
-4533 0 obj
-<< /Names [ (HD.1026) 1761 0 R (HD.1027) 1762 0 R (HD.1028) 1763 0 R (HD.1029) 1764 0 R (HD.103) 746 0 R (HD.1030) 1765 0 R (HD.1031) 1766 0 R (HD.1032) 1767 0 R (HD.1033) 1768 0 R (HD.1034) 1769 0 R (HD.1035) 1770 0 R (HD.1036) 1771 0 R (HD.1037) 1772 0 R (HD.1038) 1773 0 R (HD.1039) 1774 0 R (HD.104) 747 0 R (HD.1040) 1775 0 R (HD.1041) 1776 0 R (HD.1042) 1777 0 R (HD.1043) 1778 0 R (HD.1044) 1779 0 R (HD.1045) 1780 0 R (HD.1046) 1781 0 R (HD.1047) 1782 0 R (HD.1048) 1783 0 R (HD.1049) 1788 0 R (HD.105) 748 0 R (HD.1050) 1789 0 R (HD.1051) 1790 0 R (HD.1052) 1791 0 R (HD.1053) 1792 0 R (HD.1054) 1793 0 R ] /Limits [ (HD.1026) (HD.1054) ] >>
-endobj
-4534 0 obj
-<< /Names [ (HD.1055) 1794 0 R (HD.1056) 1795 0 R (HD.1057) 1796 0 R (HD.1058) 1797 0 R (HD.1059) 1798 0 R (HD.106) 749 0 R (HD.1060) 1799 0 R (HD.1061) 1800 0 R (HD.1062) 1801 0 R (HD.1063) 1802 0 R (HD.1064) 1803 0 R (HD.1065) 1804 0 R (HD.1066) 1805 0 R (HD.1067) 1806 0 R (HD.1068) 1807 0 R (HD.1069) 1808 0 R (HD.107) 750 0 R (HD.1070) 1809 0 R (HD.1071) 1810 0 R (HD.1072) 1811 0 R (HD.1073) 1812 0 R (HD.1074) 1813 0 R (HD.1075) 1814 0 R (HD.1076) 1815 0 R (HD.1077) 1816 0 R (HD.1078) 1817 0 R (HD.1079) 1818 0 R (HD.108) 751 0 R (HD.1080) 1819 0 R (HD.1081) 1820 0 R (HD.1082) 1821 0 R (HD.1083) 1822 0 R ] /Limits [ (HD.1055) (HD.1083) ] >>
-endobj
-4535 0 obj
-<< /Names [ (HD.1084) 1823 0 R (HD.1085) 1824 0 R (HD.1086) 1825 0 R (HD.1087) 1826 0 R (HD.1088) 1827 0 R (HD.1089) 1828 0 R (HD.109) 752 0 R (HD.1090) 1829 0 R (HD.1091) 1830 0 R (HD.1092) 1831 0 R (HD.1093) 1832 0 R (HD.1094) 1833 0 R (HD.1095) 1834 0 R (HD.1096) 1835 0 R (HD.1097) 1836 0 R (HD.1098) 1837 0 R (HD.1099) 1838 0 R (HD.11) 646 0 R (HD.110) 753 0 R (HD.1100) 1839 0 R (HD.1101) 1840 0 R (HD.1102) 1841 0 R (HD.1103) 1842 0 R (HD.1104) 1843 0 R (HD.1105) 1844 0 R (HD.1106) 1849 0 R (HD.1107) 1850 0 R (HD.1108) 1851 0 R (HD.1109) 1852 0 R (HD.111) 754 0 R (HD.1110) 1853 0 R (HD.1111) 1854 0 R ] /Limits [ (HD.1084) (HD.1111) ] >>
+<< /Title 7 0 R /A 4 0 R /Parent 4535 0 R /Next 10 0 R >>
endobj
4536 0 obj
-<< /Names [ (HD.1112) 1855 0 R (HD.1113) 1856 0 R (HD.1114) 1857 0 R (HD.1115) 1858 0 R (HD.1116) 1859 0 R (HD.1117) 1860 0 R (HD.1118) 1861 0 R (HD.1119) 1862 0 R (HD.112) 755 0 R (HD.1120) 1863 0 R (HD.1121) 1864 0 R (HD.1122) 1865 0 R (HD.1123) 1866 0 R (HD.1124) 1867 0 R (HD.1125) 1868 0 R (HD.1126) 1869 0 R (HD.1127) 1870 0 R (HD.1128) 1871 0 R (HD.1129) 1872 0 R (HD.113) 756 0 R (HD.1130) 1873 0 R (HD.1131) 1874 0 R (HD.1132) 1875 0 R (HD.1133) 1876 0 R (HD.1134) 1877 0 R (HD.1135) 1878 0 R (HD.1136) 1879 0 R (HD.1137) 1880 0 R (HD.1138) 1881 0 R (HD.1139) 1882 0 R (HD.114) 757 0 R (HD.1140) 1883 0 R ] /Limits [ (HD.1112) (HD.1140) ] >>
+<< /Names [ (Doc-Start) 324 0 R (HD.1) 642 0 R (HD.10) 653 0 R (HD.100) 751 0 R (HD.1000) 1743 0 R (HD.1001) 1744 0 R (HD.1002) 1745 0 R (HD.1003) 1746 0 R (HD.1004) 1747 0 R (HD.1005) 1748 0 R (HD.1006) 1749 0 R (HD.1007) 1750 0 R (HD.1008) 1751 0 R (HD.1009) 1752 0 R (HD.101) 752 0 R (HD.1010) 1753 0 R (HD.1011) 1754 0 R (HD.1012) 1755 0 R (HD.1013) 1756 0 R (HD.1014) 1757 0 R (HD.1015) 1758 0 R (HD.1016) 1759 0 R (HD.1017) 1760 0 R (HD.1018) 1761 0 R (HD.1019) 1762 0 R (HD.102) 753 0 R (HD.1020) 1763 0 R (HD.1021) 1764 0 R (HD.1022) 1765 0 R (HD.1023) 1766 0 R (HD.1024) 1767 0 R (HD.1025) 1768 0 R ] /Limits [ (Doc-Start) (HD.1025) ] >>
endobj
4537 0 obj
-<< /Names [ (HD.1141) 1884 0 R (HD.1142) 1885 0 R (HD.1143) 1886 0 R (HD.1144) 1887 0 R (HD.1145) 1888 0 R (HD.1146) 1893 0 R (HD.1147) 1894 0 R (HD.1148) 1895 0 R (HD.1149) 1896 0 R (HD.115) 758 0 R (HD.1150) 1897 0 R (HD.1151) 1898 0 R (HD.1152) 1899 0 R (HD.1153) 1900 0 R (HD.1154) 1901 0 R (HD.1155) 1902 0 R (HD.1156) 1903 0 R (HD.1157) 1904 0 R (HD.1158) 1905 0 R (HD.1159) 1906 0 R (HD.116) 759 0 R (HD.1160) 1907 0 R (HD.1161) 1908 0 R (HD.1162) 1909 0 R (HD.1163) 1910 0 R (HD.1164) 1911 0 R (HD.1165) 1912 0 R (HD.1166) 1913 0 R (HD.1167) 1914 0 R (HD.1168) 1915 0 R (HD.1169) 1916 0 R (HD.117) 760 0 R ] /Limits [ (HD.1141) (HD.117) ] >>
+<< /Names [ (HD.1026) 1769 0 R (HD.1027) 1770 0 R (HD.1028) 1771 0 R (HD.1029) 1772 0 R (HD.103) 754 0 R (HD.1030) 1773 0 R (HD.1031) 1774 0 R (HD.1032) 1775 0 R (HD.1033) 1780 0 R (HD.1034) 1781 0 R (HD.1035) 1782 0 R (HD.1036) 1783 0 R (HD.1037) 1784 0 R (HD.1038) 1785 0 R (HD.1039) 1786 0 R (HD.104) 755 0 R (HD.1040) 1787 0 R (HD.1041) 1788 0 R (HD.1042) 1789 0 R (HD.1043) 1790 0 R (HD.1044) 1791 0 R (HD.1045) 1792 0 R (HD.1046) 1793 0 R (HD.1047) 1794 0 R (HD.1048) 1795 0 R (HD.1049) 1796 0 R (HD.105) 756 0 R (HD.1050) 1797 0 R (HD.1051) 1798 0 R (HD.1052) 1799 0 R (HD.1053) 1800 0 R (HD.1054) 1801 0 R ] /Limits [ (HD.1026) (HD.1054) ] >>
endobj
4538 0 obj
-<< /Names [ (HD.1170) 1917 0 R (HD.1171) 1918 0 R (HD.1172) 1919 0 R (HD.1173) 1920 0 R (HD.1174) 1921 0 R (HD.1175) 1922 0 R (HD.1176) 1923 0 R (HD.1177) 1924 0 R (HD.1178) 1925 0 R (HD.1179) 1926 0 R (HD.118) 761 0 R (HD.1180) 1927 0 R (HD.1181) 1928 0 R (HD.1182) 1929 0 R (HD.1183) 1930 0 R (HD.1184) 1931 0 R (HD.1185) 1932 0 R (HD.1186) 1933 0 R (HD.1187) 1934 0 R (HD.1188) 1935 0 R (HD.1189) 1936 0 R (HD.119) 762 0 R (HD.1190) 1937 0 R (HD.1191) 1938 0 R (HD.1192) 1939 0 R (HD.1193) 1940 0 R (HD.1194) 1941 0 R (HD.1195) 1942 0 R (HD.1196) 1943 0 R (HD.1197) 1944 0 R (HD.1198) 1945 0 R (HD.1199) 1946 0 R ] /Limits [ (HD.1170) (HD.1199) ] >>
+<< /Names [ (HD.1055) 1802 0 R (HD.1056) 1803 0 R (HD.1057) 1804 0 R (HD.1058) 1805 0 R (HD.1059) 1806 0 R (HD.106) 757 0 R (HD.1060) 1807 0 R (HD.1061) 1808 0 R (HD.1062) 1809 0 R (HD.1063) 1810 0 R (HD.1064) 1811 0 R (HD.1065) 1812 0 R (HD.1066) 1813 0 R (HD.1067) 1814 0 R (HD.1068) 1815 0 R (HD.1069) 1816 0 R (HD.107) 758 0 R (HD.1070) 1817 0 R (HD.1071) 1818 0 R (HD.1072) 1819 0 R (HD.1073) 1820 0 R (HD.1074) 1821 0 R (HD.1075) 1822 0 R (HD.1076) 1823 0 R (HD.1077) 1824 0 R (HD.1078) 1825 0 R (HD.1079) 1826 0 R (HD.108) 759 0 R (HD.1080) 1827 0 R (HD.1081) 1828 0 R (HD.1082) 1829 0 R (HD.1083) 1830 0 R ] /Limits [ (HD.1055) (HD.1083) ] >>
endobj
4539 0 obj
-<< /Names [ (HD.12) 647 0 R (HD.120) 763 0 R (HD.1200) 1947 0 R (HD.1201) 1948 0 R (HD.1202) 1949 0 R (HD.1203) 1950 0 R (HD.1204) 1951 0 R (HD.1205) 1956 0 R (HD.1206) 1957 0 R (HD.1207) 1958 0 R (HD.1208) 1959 0 R (HD.1209) 1960 0 R (HD.121) 764 0 R (HD.1210) 1961 0 R (HD.1211) 1962 0 R (HD.1212) 1963 0 R (HD.1213) 1964 0 R (HD.1214) 1965 0 R (HD.1215) 1966 0 R (HD.1216) 1967 0 R (HD.1217) 1968 0 R (HD.1218) 1969 0 R (HD.1219) 1970 0 R (HD.122) 765 0 R (HD.1220) 1971 0 R (HD.1221) 1972 0 R (HD.1222) 1973 0 R (HD.1223) 1974 0 R (HD.1224) 1975 0 R (HD.1225) 1976 0 R (HD.1226) 1977 0 R (HD.1227) 1978 0 R ] /Limits [ (HD.12) (HD.1227) ] >>
+<< /Names [ (HD.1084) 1831 0 R (HD.1085) 1832 0 R (HD.1086) 1833 0 R (HD.1087) 1834 0 R (HD.1088) 1835 0 R (HD.1089) 1840 0 R (HD.109) 760 0 R (HD.1090) 1841 0 R (HD.1091) 1842 0 R (HD.1092) 1843 0 R (HD.1093) 1844 0 R (HD.1094) 1845 0 R (HD.1095) 1846 0 R (HD.1096) 1847 0 R (HD.1097) 1848 0 R (HD.1098) 1849 0 R (HD.1099) 1850 0 R (HD.11) 654 0 R (HD.110) 761 0 R (HD.1100) 1851 0 R (HD.1101) 1852 0 R (HD.1102) 1853 0 R (HD.1103) 1854 0 R (HD.1104) 1855 0 R (HD.1105) 1856 0 R (HD.1106) 1857 0 R (HD.1107) 1858 0 R (HD.1108) 1859 0 R (HD.1109) 1860 0 R (HD.111) 762 0 R (HD.1110) 1861 0 R (HD.1111) 1862 0 R ] /Limits [ (HD.1084) (HD.1111) ] >>
endobj
4540 0 obj
-<< /Names [ (HD.1228) 1979 0 R (HD.1229) 1980 0 R (HD.123) 766 0 R (HD.1230) 1981 0 R (HD.1231) 1982 0 R (HD.1232) 1983 0 R (HD.1233) 1984 0 R (HD.1234) 1985 0 R (HD.1235) 1986 0 R (HD.1236) 1987 0 R (HD.1237) 1988 0 R (HD.1238) 1989 0 R (HD.1239) 1990 0 R (HD.124) 767 0 R (HD.1240) 1991 0 R (HD.1241) 1992 0 R (HD.1242) 1993 0 R (HD.1243) 1994 0 R (HD.1244) 1995 0 R (HD.1245) 1996 0 R (HD.1246) 1997 0 R (HD.1247) 1998 0 R (HD.1248) 1999 0 R (HD.1249) 2000 0 R (HD.125) 768 0 R (HD.1250) 2001 0 R (HD.1251) 2002 0 R (HD.1252) 2003 0 R (HD.1253) 2004 0 R (HD.1254) 2005 0 R (HD.1255) 2006 0 R (HD.1256) 2011 0 R ] /Limits [ (HD.1228) (HD.1256) ] >>
+<< /Names [ (HD.1112) 1863 0 R (HD.1113) 1864 0 R (HD.1114) 1865 0 R (HD.1115) 1866 0 R (HD.1116) 1867 0 R (HD.1117) 1868 0 R (HD.1118) 1869 0 R (HD.1119) 1870 0 R (HD.112) 763 0 R (HD.1120) 1871 0 R (HD.1121) 1872 0 R (HD.1122) 1873 0 R (HD.1123) 1874 0 R (HD.1124) 1875 0 R (HD.1125) 1876 0 R (HD.1126) 1877 0 R (HD.1127) 1878 0 R (HD.1128) 1879 0 R (HD.1129) 1880 0 R (HD.113) 764 0 R (HD.1130) 1881 0 R (HD.1131) 1882 0 R (HD.1132) 1883 0 R (HD.1133) 1884 0 R (HD.1134) 1889 0 R (HD.1135) 1890 0 R (HD.1136) 1891 0 R (HD.1137) 1892 0 R (HD.1138) 1893 0 R (HD.1139) 1894 0 R (HD.114) 765 0 R (HD.1140) 1895 0 R ] /Limits [ (HD.1112) (HD.1140) ] >>
endobj
4541 0 obj
-<< /Names [ (HD.1257) 2012 0 R (HD.1258) 2013 0 R (HD.1259) 2014 0 R (HD.126) 769 0 R (HD.1260) 2015 0 R (HD.1261) 2016 0 R (HD.1262) 2017 0 R (HD.1263) 2018 0 R (HD.1264) 2019 0 R (HD.1265) 2020 0 R (HD.1266) 2021 0 R (HD.1267) 2022 0 R (HD.1268) 2023 0 R (HD.1269) 2024 0 R (HD.127) 770 0 R (HD.1270) 2025 0 R (HD.1271) 2026 0 R (HD.1272) 2027 0 R (HD.1273) 2028 0 R (HD.1274) 2029 0 R (HD.1275) 2030 0 R (HD.1276) 2031 0 R (HD.1277) 2032 0 R (HD.1278) 2033 0 R (HD.1279) 2034 0 R (HD.128) 771 0 R (HD.1280) 2035 0 R (HD.1281) 2036 0 R (HD.1282) 2037 0 R (HD.1283) 2038 0 R (HD.1284) 2039 0 R (HD.1285) 2040 0 R ] /Limits [ (HD.1257) (HD.1285) ] >>
+<< /Names [ (HD.1141) 1896 0 R (HD.1142) 1897 0 R (HD.1143) 1898 0 R (HD.1144) 1899 0 R (HD.1145) 1900 0 R (HD.1146) 1901 0 R (HD.1147) 1902 0 R (HD.1148) 1903 0 R (HD.1149) 1904 0 R (HD.115) 766 0 R (HD.1150) 1905 0 R (HD.1151) 1906 0 R (HD.1152) 1907 0 R (HD.1153) 1908 0 R (HD.1154) 1909 0 R (HD.1155) 1910 0 R (HD.1156) 1911 0 R (HD.1157) 1912 0 R (HD.1158) 1913 0 R (HD.1159) 1914 0 R (HD.116) 767 0 R (HD.1160) 1915 0 R (HD.1161) 1916 0 R (HD.1162) 1917 0 R (HD.1163) 1918 0 R (HD.1164) 1919 0 R (HD.1165) 1920 0 R (HD.1166) 1921 0 R (HD.1167) 1922 0 R (HD.1168) 1923 0 R (HD.1169) 1924 0 R (HD.117) 768 0 R ] /Limits [ (HD.1141) (HD.117) ] >>
endobj
4542 0 obj
-<< /Names [ (HD.1286) 2041 0 R (HD.1287) 2042 0 R (HD.1288) 2043 0 R (HD.1289) 2044 0 R (HD.129) 772 0 R (HD.1290) 2045 0 R (HD.1291) 2046 0 R (HD.1292) 2047 0 R (HD.1293) 2048 0 R (HD.1294) 2049 0 R (HD.1295) 2050 0 R (HD.1296) 2051 0 R (HD.1297) 2052 0 R (HD.1298) 2053 0 R (HD.1299) 2054 0 R (HD.13) 648 0 R (HD.130) 773 0 R (HD.1300) 2059 0 R (HD.1301) 2060 0 R (HD.1302) 2061 0 R (HD.1303) 2062 0 R (HD.1304) 2063 0 R (HD.1305) 2064 0 R (HD.1306) 2065 0 R (HD.1307) 2066 0 R (HD.1308) 2067 0 R (HD.1309) 2068 0 R (HD.131) 774 0 R (HD.1310) 2069 0 R (HD.1311) 2070 0 R (HD.1312) 2071 0 R (HD.1313) 2072 0 R ] /Limits [ (HD.1286) (HD.1313) ] >>
+<< /Names [ (HD.1170) 1925 0 R (HD.1171) 1926 0 R (HD.1172) 1927 0 R (HD.1173) 1928 0 R (HD.1174) 1929 0 R (HD.1175) 1930 0 R (HD.1176) 1931 0 R (HD.1177) 1932 0 R (HD.1178) 1933 0 R (HD.1179) 1934 0 R (HD.118) 769 0 R (HD.1180) 1935 0 R (HD.1181) 1936 0 R (HD.1182) 1937 0 R (HD.1183) 1938 0 R (HD.1184) 1939 0 R (HD.1185) 1940 0 R (HD.1186) 1941 0 R (HD.1187) 1942 0 R (HD.1188) 1943 0 R (HD.1189) 1944 0 R (HD.119) 770 0 R (HD.1190) 1945 0 R (HD.1191) 1946 0 R (HD.1192) 1947 0 R (HD.1193) 1948 0 R (HD.1194) 1949 0 R (HD.1195) 1950 0 R (HD.1196) 1955 0 R (HD.1197) 1956 0 R (HD.1198) 1957 0 R (HD.1199) 1958 0 R ] /Limits [ (HD.1170) (HD.1199) ] >>
endobj
4543 0 obj
-<< /Names [ (HD.1314) 2073 0 R (HD.1315) 2074 0 R (HD.1316) 2075 0 R (HD.1317) 2076 0 R (HD.1318) 2077 0 R (HD.1319) 2078 0 R (HD.132) 775 0 R (HD.1320) 2079 0 R (HD.1321) 2080 0 R (HD.1322) 2081 0 R (HD.1323) 2082 0 R (HD.1324) 2083 0 R (HD.1325) 2084 0 R (HD.1326) 2085 0 R (HD.1327) 2086 0 R (HD.1328) 2087 0 R (HD.1329) 2088 0 R (HD.133) 776 0 R (HD.1330) 2089 0 R (HD.1331) 2090 0 R (HD.1332) 2091 0 R (HD.1333) 2092 0 R (HD.1334) 2093 0 R (HD.1335) 2094 0 R (HD.1336) 2095 0 R (HD.1337) 2096 0 R (HD.1338) 2097 0 R (HD.1339) 2098 0 R (HD.134) 777 0 R (HD.1340) 2104 0 R (HD.1341) 2105 0 R (HD.1342) 2106 0 R ] /Limits [ (HD.1314) (HD.1342) ] >>
+<< /Names [ (HD.12) 655 0 R (HD.120) 771 0 R (HD.1200) 1959 0 R (HD.1201) 1960 0 R (HD.1202) 1961 0 R (HD.1203) 1962 0 R (HD.1204) 1963 0 R (HD.1205) 1964 0 R (HD.1206) 1965 0 R (HD.1207) 1966 0 R (HD.1208) 1967 0 R (HD.1209) 1968 0 R (HD.121) 772 0 R (HD.1210) 1969 0 R (HD.1211) 1970 0 R (HD.1212) 1971 0 R (HD.1213) 1972 0 R (HD.1214) 1973 0 R (HD.1215) 1974 0 R (HD.1216) 1975 0 R (HD.1217) 1976 0 R (HD.1218) 1977 0 R (HD.1219) 1978 0 R (HD.122) 773 0 R (HD.1220) 1979 0 R (HD.1221) 1980 0 R (HD.1222) 1981 0 R (HD.1223) 1982 0 R (HD.1224) 1983 0 R (HD.1225) 1984 0 R (HD.1226) 1985 0 R (HD.1227) 1986 0 R ] /Limits [ (HD.12) (HD.1227) ] >>
endobj
4544 0 obj
-<< /Names [ (HD.1343) 2107 0 R (HD.1344) 2108 0 R (HD.1345) 2109 0 R (HD.1346) 2110 0 R (HD.1347) 2111 0 R (HD.1348) 2112 0 R (HD.1349) 2113 0 R (HD.135) 782 0 R (HD.1350) 2114 0 R (HD.1351) 2115 0 R (HD.1352) 2116 0 R (HD.1353) 2117 0 R (HD.1354) 2118 0 R (HD.1355) 2119 0 R (HD.1356) 2120 0 R (HD.1357) 2121 0 R (HD.1358) 2122 0 R (HD.1359) 2123 0 R (HD.136) 783 0 R (HD.1360) 2124 0 R (HD.1361) 2125 0 R (HD.1362) 2126 0 R (HD.1363) 2127 0 R (HD.1364) 2128 0 R (HD.1365) 2129 0 R (HD.1366) 2130 0 R (HD.1367) 2131 0 R (HD.1368) 2132 0 R (HD.1369) 2133 0 R (HD.137) 784 0 R (HD.1370) 2134 0 R (HD.1371) 2135 0 R ] /Limits [ (HD.1343) (HD.1371) ] >>
+<< /Names [ (HD.1228) 1987 0 R (HD.1229) 1988 0 R (HD.123) 774 0 R (HD.1230) 1989 0 R (HD.1231) 1990 0 R (HD.1232) 1991 0 R (HD.1233) 1992 0 R (HD.1234) 1993 0 R (HD.1235) 1994 0 R (HD.1236) 1995 0 R (HD.1237) 1996 0 R (HD.1238) 1997 0 R (HD.1239) 1998 0 R (HD.124) 775 0 R (HD.1240) 1999 0 R (HD.1241) 2000 0 R (HD.1242) 2001 0 R (HD.1243) 2006 0 R (HD.1244) 2007 0 R (HD.1245) 2008 0 R (HD.1246) 2009 0 R (HD.1247) 2010 0 R (HD.1248) 2011 0 R (HD.1249) 2012 0 R (HD.125) 776 0 R (HD.1250) 2013 0 R (HD.1251) 2014 0 R (HD.1252) 2015 0 R (HD.1253) 2016 0 R (HD.1254) 2017 0 R (HD.1255) 2018 0 R (HD.1256) 2019 0 R ] /Limits [ (HD.1228) (HD.1256) ] >>
endobj
4545 0 obj
-<< /Names [ (HD.1372) 2136 0 R (HD.1373) 2137 0 R (HD.1374) 2138 0 R (HD.1375) 2139 0 R (HD.1376) 2140 0 R (HD.1377) 2141 0 R (HD.1378) 2142 0 R (HD.1379) 2143 0 R (HD.138) 785 0 R (HD.1380) 2144 0 R (HD.1381) 2145 0 R (HD.1382) 2146 0 R (HD.1383) 2147 0 R (HD.1384) 2148 0 R (HD.1385) 2149 0 R (HD.1386) 2150 0 R (HD.1387) 2151 0 R (HD.1388) 2152 0 R (HD.1389) 2153 0 R (HD.139) 786 0 R (HD.1390) 2154 0 R (HD.1391) 2155 0 R (HD.1392) 2156 0 R (HD.1393) 2157 0 R (HD.1394) 2158 0 R (HD.1395) 2163 0 R (HD.1396) 2164 0 R (HD.1397) 2165 0 R (HD.1398) 2166 0 R (HD.1399) 2167 0 R (HD.14) 649 0 R (HD.140) 787 0 R ] /Limits [ (HD.1372) (HD.140) ] >>
+<< /Names [ (HD.1257) 2020 0 R (HD.1258) 2021 0 R (HD.1259) 2022 0 R (HD.126) 777 0 R (HD.1260) 2023 0 R (HD.1261) 2024 0 R (HD.1262) 2025 0 R (HD.1263) 2026 0 R (HD.1264) 2027 0 R (HD.1265) 2028 0 R (HD.1266) 2029 0 R (HD.1267) 2030 0 R (HD.1268) 2031 0 R (HD.1269) 2032 0 R (HD.127) 778 0 R (HD.1270) 2033 0 R (HD.1271) 2034 0 R (HD.1272) 2035 0 R (HD.1273) 2036 0 R (HD.1274) 2037 0 R (HD.1275) 2038 0 R (HD.1276) 2039 0 R (HD.1277) 2040 0 R (HD.1278) 2046 0 R (HD.1279) 2047 0 R (HD.128) 779 0 R (HD.1280) 2048 0 R (HD.1281) 2049 0 R (HD.1282) 2050 0 R (HD.1283) 2051 0 R (HD.1284) 2052 0 R (HD.1285) 2053 0 R ] /Limits [ (HD.1257) (HD.1285) ] >>
endobj
4546 0 obj
-<< /Names [ (HD.1400) 2168 0 R (HD.1401) 2169 0 R (HD.1402) 2170 0 R (HD.1403) 2171 0 R (HD.1404) 2172 0 R (HD.1405) 2173 0 R (HD.1406) 2174 0 R (HD.1407) 2175 0 R (HD.1408) 2176 0 R (HD.1409) 2177 0 R (HD.141) 788 0 R (HD.1410) 2178 0 R (HD.1411) 2179 0 R (HD.1412) 2180 0 R (HD.1413) 2181 0 R (HD.1414) 2182 0 R (HD.1415) 2183 0 R (HD.1416) 2184 0 R (HD.1417) 2185 0 R (HD.1418) 2186 0 R (HD.1419) 2187 0 R (HD.142) 789 0 R (HD.1420) 2188 0 R (HD.1421) 2189 0 R (HD.1422) 2190 0 R (HD.1423) 2191 0 R (HD.1424) 2192 0 R (HD.1425) 2193 0 R (HD.1426) 2194 0 R (HD.1427) 2195 0 R (HD.1428) 2196 0 R (HD.1429) 2197 0 R ] /Limits [ (HD.1400) (HD.1429) ] >>
+<< /Names [ (HD.1286) 2054 0 R (HD.1287) 2055 0 R (HD.1288) 2056 0 R (HD.1289) 2057 0 R (HD.129) 780 0 R (HD.1290) 2058 0 R (HD.1291) 2059 0 R (HD.1292) 2060 0 R (HD.1293) 2061 0 R (HD.1294) 2062 0 R (HD.1295) 2063 0 R (HD.1296) 2064 0 R (HD.1297) 2065 0 R (HD.1298) 2066 0 R (HD.1299) 2067 0 R (HD.13) 656 0 R (HD.130) 781 0 R (HD.1300) 2068 0 R (HD.1301) 2069 0 R (HD.1302) 2070 0 R (HD.1303) 2071 0 R (HD.1304) 2072 0 R (HD.1305) 2073 0 R (HD.1306) 2074 0 R (HD.1307) 2075 0 R (HD.1308) 2076 0 R (HD.1309) 2077 0 R (HD.131) 782 0 R (HD.1310) 2078 0 R (HD.1311) 2079 0 R (HD.1312) 2080 0 R (HD.1313) 2081 0 R ] /Limits [ (HD.1286) (HD.1313) ] >>
endobj
4547 0 obj
-<< /Names [ (HD.143) 790 0 R (HD.1430) 2198 0 R (HD.1431) 2199 0 R (HD.1432) 2200 0 R (HD.1433) 2201 0 R (HD.1434) 2202 0 R (HD.1435) 2203 0 R (HD.1436) 2204 0 R (HD.1437) 2205 0 R (HD.1438) 2206 0 R (HD.1439) 2207 0 R (HD.144) 791 0 R (HD.1440) 2208 0 R (HD.1441) 2209 0 R (HD.1442) 2210 0 R (HD.1443) 2211 0 R (HD.1444) 2212 0 R (HD.1445) 2213 0 R (HD.1446) 2214 0 R (HD.1447) 2215 0 R (HD.1448) 2216 0 R (HD.1449) 2217 0 R (HD.145) 792 0 R (HD.1450) 2218 0 R (HD.1451) 2219 0 R (HD.1452) 2220 0 R (HD.1453) 2221 0 R (HD.1454) 2222 0 R (HD.1455) 2223 0 R (HD.1456) 2228 0 R (HD.1457) 2229 0 R (HD.1458) 2230 0 R ] /Limits [ (HD.143) (HD.1458) ] >>
+<< /Names [ (HD.1314) 2082 0 R (HD.1315) 2083 0 R (HD.1316) 2084 0 R (HD.1317) 2085 0 R (HD.1318) 2086 0 R (HD.1319) 2087 0 R (HD.132) 787 0 R (HD.1320) 2088 0 R (HD.1321) 2089 0 R (HD.1322) 2090 0 R (HD.1323) 2091 0 R (HD.1324) 2092 0 R (HD.1325) 2097 0 R (HD.1326) 2098 0 R (HD.1327) 2099 0 R (HD.1328) 2100 0 R (HD.1329) 2101 0 R (HD.133) 788 0 R (HD.1330) 2102 0 R (HD.1331) 2103 0 R (HD.1332) 2104 0 R (HD.1333) 2105 0 R (HD.1334) 2106 0 R (HD.1335) 2107 0 R (HD.1336) 2108 0 R (HD.1337) 2109 0 R (HD.1338) 2110 0 R (HD.1339) 2111 0 R (HD.134) 789 0 R (HD.1340) 2112 0 R (HD.1341) 2113 0 R (HD.1342) 2114 0 R ] /Limits [ (HD.1314) (HD.1342) ] >>
endobj
4548 0 obj
-<< /Names [ (HD.1459) 2231 0 R (HD.146) 793 0 R (HD.1460) 2232 0 R (HD.1461) 2233 0 R (HD.1462) 2234 0 R (HD.1463) 2235 0 R (HD.1464) 2236 0 R (HD.1465) 2237 0 R (HD.1466) 2238 0 R (HD.1467) 2239 0 R (HD.1468) 2240 0 R (HD.1469) 2241 0 R (HD.147) 794 0 R (HD.1470) 2242 0 R (HD.1471) 2243 0 R (HD.1472) 2244 0 R (HD.1473) 2245 0 R (HD.1474) 2246 0 R (HD.1475) 2247 0 R (HD.1476) 2248 0 R (HD.1477) 2249 0 R (HD.1478) 2250 0 R (HD.1479) 2251 0 R (HD.148) 795 0 R (HD.1480) 2252 0 R (HD.1481) 2253 0 R (HD.1482) 2254 0 R (HD.1483) 2255 0 R (HD.1484) 2256 0 R (HD.1485) 2257 0 R (HD.1486) 2258 0 R (HD.1487) 2259 0 R ] /Limits [ (HD.1459) (HD.1487) ] >>
+<< /Names [ (HD.1343) 2115 0 R (HD.1344) 2116 0 R (HD.1345) 2117 0 R (HD.1346) 2118 0 R (HD.1347) 2119 0 R (HD.1348) 2120 0 R (HD.1349) 2121 0 R (HD.135) 790 0 R (HD.1350) 2122 0 R (HD.1351) 2123 0 R (HD.1352) 2124 0 R (HD.1353) 2125 0 R (HD.1354) 2126 0 R (HD.1355) 2127 0 R (HD.1356) 2128 0 R (HD.1357) 2129 0 R (HD.1358) 2130 0 R (HD.1359) 2131 0 R (HD.136) 791 0 R (HD.1360) 2132 0 R (HD.1361) 2133 0 R (HD.1362) 2134 0 R (HD.1363) 2135 0 R (HD.1364) 2136 0 R (HD.1365) 2137 0 R (HD.1366) 2138 0 R (HD.1367) 2139 0 R (HD.1368) 2140 0 R (HD.1369) 2141 0 R (HD.137) 792 0 R (HD.1370) 2142 0 R (HD.1371) 2143 0 R ] /Limits [ (HD.1343) (HD.1371) ] >>
endobj
4549 0 obj
-<< /Names [ (HD.1488) 2260 0 R (HD.1489) 2261 0 R (HD.149) 796 0 R (HD.1490) 2262 0 R (HD.1491) 2263 0 R (HD.1492) 2264 0 R (HD.1493) 2265 0 R (HD.1494) 2266 0 R (HD.1495) 2267 0 R (HD.1496) 2268 0 R (HD.1497) 2269 0 R (HD.1498) 2270 0 R (HD.1499) 2271 0 R (HD.15) 650 0 R (HD.150) 797 0 R (HD.1500) 2272 0 R (HD.1501) 2273 0 R (HD.1502) 2274 0 R (HD.1503) 2275 0 R (HD.1504) 2276 0 R (HD.1505) 2277 0 R (HD.1506) 2278 0 R (HD.1507) 2279 0 R (HD.1508) 2280 0 R (HD.1509) 2281 0 R (HD.151) 798 0 R (HD.1510) 2286 0 R (HD.1511) 2287 0 R (HD.1512) 2288 0 R (HD.1513) 2289 0 R (HD.1514) 2290 0 R (HD.1515) 2291 0 R ] /Limits [ (HD.1488) (HD.1515) ] >>
+<< /Names [ (HD.1372) 2144 0 R (HD.1373) 2145 0 R (HD.1374) 2146 0 R (HD.1375) 2147 0 R (HD.1376) 2148 0 R (HD.1377) 2149 0 R (HD.1378) 2150 0 R (HD.1379) 2151 0 R (HD.138) 793 0 R (HD.1380) 2152 0 R (HD.1381) 2153 0 R (HD.1382) 2154 0 R (HD.1383) 2159 0 R (HD.1384) 2160 0 R (HD.1385) 2161 0 R (HD.1386) 2162 0 R (HD.1387) 2163 0 R (HD.1388) 2164 0 R (HD.1389) 2165 0 R (HD.139) 794 0 R (HD.1390) 2166 0 R (HD.1391) 2167 0 R (HD.1392) 2168 0 R (HD.1393) 2169 0 R (HD.1394) 2170 0 R (HD.1395) 2171 0 R (HD.1396) 2172 0 R (HD.1397) 2173 0 R (HD.1398) 2174 0 R (HD.1399) 2175 0 R (HD.14) 657 0 R (HD.140) 795 0 R ] /Limits [ (HD.1372) (HD.140) ] >>
endobj
4550 0 obj
-<< /Names [ (HD.1516) 2292 0 R (HD.1517) 2293 0 R (HD.1518) 2294 0 R (HD.1519) 2295 0 R (HD.152) 799 0 R (HD.1520) 2296 0 R (HD.1521) 2297 0 R (HD.1522) 2298 0 R (HD.1523) 2299 0 R (HD.1524) 2300 0 R (HD.1525) 2301 0 R (HD.1526) 2302 0 R (HD.1527) 2303 0 R (HD.1528) 2304 0 R (HD.1529) 2305 0 R (HD.153) 800 0 R (HD.1530) 2306 0 R (HD.1531) 2307 0 R (HD.1532) 2308 0 R (HD.1533) 2309 0 R (HD.1534) 2310 0 R (HD.1535) 2311 0 R (HD.1536) 2312 0 R (HD.1537) 2314 0 R (HD.1538) 2315 0 R (HD.1539) 2316 0 R (HD.154) 801 0 R (HD.1540) 2317 0 R (HD.1541) 2318 0 R (HD.1542) 2319 0 R (HD.1543) 2320 0 R (HD.1544) 2321 0 R ] /Limits [ (HD.1516) (HD.1544) ] >>
+<< /Names [ (HD.1400) 2176 0 R (HD.1401) 2177 0 R (HD.1402) 2178 0 R (HD.1403) 2179 0 R (HD.1404) 2180 0 R (HD.1405) 2181 0 R (HD.1406) 2182 0 R (HD.1407) 2183 0 R (HD.1408) 2184 0 R (HD.1409) 2185 0 R (HD.141) 796 0 R (HD.1410) 2186 0 R (HD.1411) 2187 0 R (HD.1412) 2188 0 R (HD.1413) 2189 0 R (HD.1414) 2190 0 R (HD.1415) 2191 0 R (HD.1416) 2192 0 R (HD.1417) 2193 0 R (HD.1418) 2194 0 R (HD.1419) 2195 0 R (HD.142) 797 0 R (HD.1420) 2196 0 R (HD.1421) 2197 0 R (HD.1422) 2198 0 R (HD.1423) 2199 0 R (HD.1424) 2200 0 R (HD.1425) 2201 0 R (HD.1426) 2202 0 R (HD.1427) 2203 0 R (HD.1428) 2204 0 R (HD.1429) 2205 0 R ] /Limits [ (HD.1400) (HD.1429) ] >>
endobj
4551 0 obj
-<< /Names [ (HD.1545) 2322 0 R (HD.1546) 2323 0 R (HD.1547) 2324 0 R (HD.1548) 2325 0 R (HD.1549) 2326 0 R (HD.155) 802 0 R (HD.1550) 2327 0 R (HD.1551) 2328 0 R (HD.1552) 2329 0 R (HD.1553) 2330 0 R (HD.1554) 2331 0 R (HD.1555) 2332 0 R (HD.1556) 2333 0 R (HD.1557) 2338 0 R (HD.1558) 2339 0 R (HD.1559) 2340 0 R (HD.156) 803 0 R (HD.1560) 2341 0 R (HD.1561) 2342 0 R (HD.1562) 2343 0 R (HD.1563) 2344 0 R (HD.1564) 2345 0 R (HD.1565) 2346 0 R (HD.1566) 2347 0 R (HD.1567) 2348 0 R (HD.1568) 2349 0 R (HD.1569) 2350 0 R (HD.157) 804 0 R (HD.1570) 2351 0 R (HD.1571) 2352 0 R (HD.1572) 2353 0 R (HD.1573) 2354 0 R ] /Limits [ (HD.1545) (HD.1573) ] >>
+<< /Names [ (HD.143) 798 0 R (HD.1430) 2206 0 R (HD.1431) 2207 0 R (HD.1432) 2208 0 R (HD.1433) 2209 0 R (HD.1434) 2210 0 R (HD.1435) 2211 0 R (HD.1436) 2212 0 R (HD.1437) 2213 0 R (HD.1438) 2214 0 R (HD.1439) 2215 0 R (HD.144) 799 0 R (HD.1440) 2216 0 R (HD.1441) 2217 0 R (HD.1442) 2222 0 R (HD.1443) 2223 0 R (HD.1444) 2224 0 R (HD.1445) 2225 0 R (HD.1446) 2226 0 R (HD.1447) 2227 0 R (HD.1448) 2228 0 R (HD.1449) 2229 0 R (HD.145) 800 0 R (HD.1450) 2230 0 R (HD.1451) 2231 0 R (HD.1452) 2232 0 R (HD.1453) 2233 0 R (HD.1454) 2234 0 R (HD.1455) 2235 0 R (HD.1456) 2236 0 R (HD.1457) 2237 0 R (HD.1458) 2238 0 R ] /Limits [ (HD.143) (HD.1458) ] >>
endobj
4552 0 obj
-<< /Names [ (HD.1574) 2355 0 R (HD.1575) 2356 0 R (HD.1576) 2357 0 R (HD.1577) 2358 0 R (HD.1578) 2359 0 R (HD.1579) 2360 0 R (HD.158) 805 0 R (HD.1580) 2361 0 R (HD.1581) 2362 0 R (HD.1582) 2363 0 R (HD.1583) 2368 0 R (HD.1584) 2369 0 R (HD.1585) 2370 0 R (HD.1586) 2371 0 R (HD.1587) 2372 0 R (HD.1588) 2373 0 R (HD.1589) 2374 0 R (HD.159) 810 0 R (HD.1590) 2375 0 R (HD.1591) 2376 0 R (HD.1592) 2377 0 R (HD.1593) 2378 0 R (HD.1594) 2379 0 R (HD.1595) 2380 0 R (HD.1596) 2381 0 R (HD.1597) 2382 0 R (HD.1598) 2383 0 R (HD.1599) 2384 0 R (HD.16) 651 0 R (HD.160) 811 0 R (HD.1600) 2385 0 R (HD.1601) 2386 0 R ] /Limits [ (HD.1574) (HD.1601) ] >>
+<< /Names [ (HD.1459) 2239 0 R (HD.146) 801 0 R (HD.1460) 2240 0 R (HD.1461) 2241 0 R (HD.1462) 2242 0 R (HD.1463) 2243 0 R (HD.1464) 2244 0 R (HD.1465) 2245 0 R (HD.1466) 2246 0 R (HD.1467) 2247 0 R (HD.1468) 2248 0 R (HD.1469) 2249 0 R (HD.147) 802 0 R (HD.1470) 2250 0 R (HD.1471) 2251 0 R (HD.1472) 2252 0 R (HD.1473) 2253 0 R (HD.1474) 2254 0 R (HD.1475) 2255 0 R (HD.1476) 2256 0 R (HD.1477) 2257 0 R (HD.1478) 2258 0 R (HD.1479) 2259 0 R (HD.148) 803 0 R (HD.1480) 2260 0 R (HD.1481) 2261 0 R (HD.1482) 2262 0 R (HD.1483) 2263 0 R (HD.1484) 2264 0 R (HD.1485) 2265 0 R (HD.1486) 2266 0 R (HD.1487) 2267 0 R ] /Limits [ (HD.1459) (HD.1487) ] >>
endobj
4553 0 obj
-<< /Names [ (HD.1602) 2387 0 R (HD.1603) 2388 0 R (HD.1604) 2389 0 R (HD.1605) 2390 0 R (HD.1606) 2391 0 R (HD.1607) 2393 0 R (HD.1608) 2394 0 R (HD.1609) 2395 0 R (HD.161) 812 0 R (HD.1610) 2396 0 R (HD.1611) 2397 0 R (HD.1612) 2398 0 R (HD.1613) 2399 0 R (HD.1614) 2400 0 R (HD.1615) 2401 0 R (HD.1616) 2406 0 R (HD.1617) 2407 0 R (HD.1618) 2408 0 R (HD.1619) 2409 0 R (HD.162) 813 0 R (HD.1620) 2410 0 R (HD.1621) 2411 0 R (HD.1622) 2412 0 R (HD.1623) 2413 0 R (HD.1624) 2414 0 R (HD.1625) 2415 0 R (HD.1626) 2416 0 R (HD.1627) 2417 0 R (HD.1628) 2418 0 R (HD.1629) 2419 0 R (HD.163) 814 0 R (HD.1630) 2420 0 R ] /Limits [ (HD.1602) (HD.1630) ] >>
+<< /Names [ (HD.1488) 2268 0 R (HD.1489) 2269 0 R (HD.149) 804 0 R (HD.1490) 2270 0 R (HD.1491) 2271 0 R (HD.1492) 2276 0 R (HD.1493) 2277 0 R (HD.1494) 2278 0 R (HD.1495) 2279 0 R (HD.1496) 2280 0 R (HD.1497) 2281 0 R (HD.1498) 2282 0 R (HD.1499) 2283 0 R (HD.15) 658 0 R (HD.150) 805 0 R (HD.1500) 2284 0 R (HD.1501) 2285 0 R (HD.1502) 2286 0 R (HD.1503) 2287 0 R (HD.1504) 2288 0 R (HD.1505) 2289 0 R (HD.1506) 2290 0 R (HD.1507) 2291 0 R (HD.1508) 2292 0 R (HD.1509) 2293 0 R (HD.151) 806 0 R (HD.1510) 2294 0 R (HD.1511) 2295 0 R (HD.1512) 2296 0 R (HD.1513) 2297 0 R (HD.1514) 2298 0 R (HD.1515) 2299 0 R ] /Limits [ (HD.1488) (HD.1515) ] >>
endobj
4554 0 obj
-<< /Names [ (HD.1631) 2421 0 R (HD.1632) 2422 0 R (HD.1633) 2423 0 R (HD.1634) 2424 0 R (HD.1635) 2425 0 R (HD.1636) 2426 0 R (HD.1637) 2427 0 R (HD.1638) 2428 0 R (HD.1639) 2429 0 R (HD.164) 815 0 R (HD.1640) 2430 0 R (HD.1641) 2431 0 R (HD.1642) 2432 0 R (HD.1643) 2433 0 R (HD.1644) 2434 0 R (HD.1645) 2435 0 R (HD.1646) 2436 0 R (HD.1647) 2437 0 R (HD.1648) 2438 0 R (HD.1649) 2439 0 R (HD.165) 816 0 R (HD.1650) 2440 0 R (HD.1651) 2441 0 R (HD.1652) 2447 0 R (HD.1653) 2448 0 R (HD.1654) 2449 0 R (HD.1655) 2450 0 R (HD.1656) 2451 0 R (HD.1657) 2452 0 R (HD.1658) 2453 0 R (HD.1659) 2454 0 R (HD.166) 817 0 R ] /Limits [ (HD.1631) (HD.166) ] >>
+<< /Names [ (HD.1516) 2300 0 R (HD.1517) 2301 0 R (HD.1518) 2302 0 R (HD.1519) 2303 0 R (HD.152) 807 0 R (HD.1520) 2304 0 R (HD.1521) 2305 0 R (HD.1522) 2306 0 R (HD.1523) 2307 0 R (HD.1524) 2308 0 R (HD.1525) 2309 0 R (HD.1526) 2311 0 R (HD.1527) 2312 0 R (HD.1528) 2313 0 R (HD.1529) 2314 0 R (HD.153) 808 0 R (HD.1530) 2315 0 R (HD.1531) 2316 0 R (HD.1532) 2317 0 R (HD.1533) 2318 0 R (HD.1534) 2319 0 R (HD.1535) 2324 0 R (HD.1536) 2325 0 R (HD.1537) 2326 0 R (HD.1538) 2327 0 R (HD.1539) 2328 0 R (HD.154) 813 0 R (HD.1540) 2329 0 R (HD.1541) 2330 0 R (HD.1542) 2331 0 R (HD.1543) 2332 0 R (HD.1544) 2333 0 R ] /Limits [ (HD.1516) (HD.1544) ] >>
endobj
4555 0 obj
-<< /Names [ (HD.1660) 2455 0 R (HD.1661) 2456 0 R (HD.1662) 2457 0 R (HD.1663) 2458 0 R (HD.1664) 2459 0 R (HD.1665) 2460 0 R (HD.1666) 2461 0 R (HD.1667) 2462 0 R (HD.1668) 2463 0 R (HD.1669) 2464 0 R (HD.167) 818 0 R (HD.1670) 2465 0 R (HD.1671) 2466 0 R (HD.1672) 2467 0 R (HD.1673) 2468 0 R (HD.1674) 2469 0 R (HD.1675) 2470 0 R (HD.1676) 2471 0 R (HD.1677) 2472 0 R (HD.1678) 2473 0 R (HD.1679) 2474 0 R (HD.168) 819 0 R (HD.1680) 2475 0 R (HD.1681) 2476 0 R (HD.1682) 2477 0 R (HD.1683) 2478 0 R (HD.1684) 2479 0 R (HD.1685) 2480 0 R (HD.1686) 2482 0 R (HD.1687) 2483 0 R (HD.1688) 2484 0 R (HD.1689) 2485 0 R ] /Limits [ (HD.1660) (HD.1689) ] >>
+<< /Names [ (HD.1545) 2334 0 R (HD.1546) 2335 0 R (HD.1547) 2336 0 R (HD.1548) 2337 0 R (HD.1549) 2338 0 R (HD.155) 814 0 R (HD.1550) 2339 0 R (HD.1551) 2340 0 R (HD.1552) 2341 0 R (HD.1553) 2342 0 R (HD.1554) 2343 0 R (HD.1555) 2344 0 R (HD.1556) 2345 0 R (HD.1557) 2346 0 R (HD.1558) 2347 0 R (HD.1559) 2348 0 R (HD.156) 815 0 R (HD.1560) 2349 0 R (HD.1561) 2350 0 R (HD.1562) 2351 0 R (HD.1563) 2352 0 R (HD.1564) 2353 0 R (HD.1565) 2358 0 R (HD.1566) 2359 0 R (HD.1567) 2360 0 R (HD.1568) 2361 0 R (HD.1569) 2362 0 R (HD.157) 816 0 R (HD.1570) 2363 0 R (HD.1571) 2364 0 R (HD.1572) 2365 0 R (HD.1573) 2366 0 R ] /Limits [ (HD.1545) (HD.1573) ] >>
endobj
4556 0 obj
-<< /Names [ (HD.169) 820 0 R (HD.1690) 2486 0 R (HD.1691) 2487 0 R (HD.1692) 2492 0 R (HD.1693) 2493 0 R (HD.1694) 2494 0 R (HD.1695) 2495 0 R (HD.1696) 2496 0 R (HD.1697) 2497 0 R (HD.1698) 2498 0 R (HD.1699) 2499 0 R (HD.17) 652 0 R (HD.170) 821 0 R (HD.1700) 2500 0 R (HD.1701) 2501 0 R (HD.1702) 2502 0 R (HD.1703) 2503 0 R (HD.1704) 2504 0 R (HD.1705) 2505 0 R (HD.1706) 2506 0 R (HD.1707) 2507 0 R (HD.1708) 2508 0 R (HD.1709) 2509 0 R (HD.171) 822 0 R (HD.1710) 2510 0 R (HD.1711) 2511 0 R (HD.1712) 2512 0 R (HD.1713) 2513 0 R (HD.1714) 2514 0 R (HD.1715) 2515 0 R (HD.1716) 2516 0 R (HD.1717) 2517 0 R ] /Limits [ (HD.169) (HD.1717) ] >>
+<< /Names [ (HD.1574) 2367 0 R (HD.1575) 2368 0 R (HD.1576) 2369 0 R (HD.1577) 2370 0 R (HD.1578) 2371 0 R (HD.1579) 2372 0 R (HD.158) 817 0 R (HD.1580) 2373 0 R (HD.1581) 2375 0 R (HD.1582) 2376 0 R (HD.1583) 2377 0 R (HD.1584) 2378 0 R (HD.1585) 2379 0 R (HD.1586) 2380 0 R (HD.1587) 2381 0 R (HD.1588) 2382 0 R (HD.1589) 2383 0 R (HD.159) 818 0 R (HD.1590) 2384 0 R (HD.1591) 2385 0 R (HD.1592) 2386 0 R (HD.1593) 2387 0 R (HD.1594) 2388 0 R (HD.1595) 2389 0 R (HD.1596) 2390 0 R (HD.1597) 2391 0 R (HD.1598) 2396 0 R (HD.1599) 2397 0 R (HD.16) 659 0 R (HD.160) 819 0 R (HD.1600) 2398 0 R (HD.1601) 2399 0 R ] /Limits [ (HD.1574) (HD.1601) ] >>
endobj
4557 0 obj
-<< /Names [ (HD.1718) 2518 0 R (HD.1719) 2519 0 R (HD.172) 823 0 R (HD.1720) 2520 0 R (HD.1721) 2521 0 R (HD.1722) 2522 0 R (HD.1723) 2523 0 R (HD.1724) 2524 0 R (HD.1725) 2525 0 R (HD.1726) 2526 0 R (HD.1727) 2527 0 R (HD.1728) 2528 0 R (HD.1729) 2529 0 R (HD.173) 824 0 R (HD.1730) 2530 0 R (HD.1731) 2531 0 R (HD.1732) 2532 0 R (HD.1733) 2533 0 R (HD.1734) 2534 0 R (HD.1735) 2535 0 R (HD.1736) 2536 0 R (HD.1737) 2537 0 R (HD.1738) 2543 0 R (HD.1739) 2544 0 R (HD.174) 825 0 R (HD.1740) 2545 0 R (HD.1741) 2546 0 R (HD.1742) 2547 0 R (HD.1743) 2548 0 R (HD.1744) 2549 0 R (HD.1745) 2550 0 R (HD.1746) 2551 0 R ] /Limits [ (HD.1718) (HD.1746) ] >>
+<< /Names [ (HD.1602) 2400 0 R (HD.1603) 2401 0 R (HD.1604) 2402 0 R (HD.1605) 2403 0 R (HD.1606) 2404 0 R (HD.1607) 2405 0 R (HD.1608) 2406 0 R (HD.1609) 2407 0 R (HD.161) 820 0 R (HD.1610) 2408 0 R (HD.1611) 2409 0 R (HD.1612) 2410 0 R (HD.1613) 2411 0 R (HD.1614) 2412 0 R (HD.1615) 2413 0 R (HD.1616) 2414 0 R (HD.1617) 2415 0 R (HD.1618) 2416 0 R (HD.1619) 2417 0 R (HD.162) 821 0 R (HD.1620) 2418 0 R (HD.1621) 2419 0 R (HD.1622) 2420 0 R (HD.1623) 2421 0 R (HD.1624) 2422 0 R (HD.1625) 2423 0 R (HD.1626) 2425 0 R (HD.1627) 2426 0 R (HD.1628) 2427 0 R (HD.1629) 2428 0 R (HD.163) 822 0 R (HD.1630) 2429 0 R ] /Limits [ (HD.1602) (HD.1630) ] >>
endobj
4558 0 obj
-<< /Names [ (HD.1747) 2552 0 R (HD.1748) 2553 0 R (HD.1749) 2554 0 R (HD.175) 826 0 R (HD.1750) 2555 0 R (HD.1751) 2556 0 R (HD.1752) 2557 0 R (HD.1753) 2558 0 R (HD.1754) 2559 0 R (HD.1755) 2560 0 R (HD.1756) 2561 0 R (HD.1757) 2562 0 R (HD.1758) 2564 0 R (HD.1759) 2565 0 R (HD.176) 827 0 R (HD.1760) 2566 0 R (HD.1761) 2567 0 R (HD.1762) 2568 0 R (HD.1763) 2569 0 R (HD.1764) 2570 0 R (HD.1765) 2571 0 R (HD.1766) 2572 0 R (HD.1767) 2573 0 R (HD.1768) 2574 0 R (HD.1769) 2575 0 R (HD.177) 828 0 R (HD.1770) 2576 0 R (HD.1771) 2584 0 R (HD.1772) 2585 0 R (HD.1773) 2586 0 R (HD.1774) 2587 0 R (HD.1775) 2588 0 R ] /Limits [ (HD.1747) (HD.1775) ] >>
+<< /Names [ (HD.1631) 2430 0 R (HD.1632) 2431 0 R (HD.1633) 2432 0 R (HD.1634) 2433 0 R (HD.1635) 2434 0 R (HD.1636) 2435 0 R (HD.1637) 2440 0 R (HD.1638) 2441 0 R (HD.1639) 2442 0 R (HD.164) 823 0 R (HD.1640) 2443 0 R (HD.1641) 2444 0 R (HD.1642) 2445 0 R (HD.1643) 2446 0 R (HD.1644) 2447 0 R (HD.1645) 2448 0 R (HD.1646) 2449 0 R (HD.1647) 2450 0 R (HD.1648) 2451 0 R (HD.1649) 2452 0 R (HD.165) 824 0 R (HD.1650) 2453 0 R (HD.1651) 2454 0 R (HD.1652) 2455 0 R (HD.1653) 2456 0 R (HD.1654) 2457 0 R (HD.1655) 2458 0 R (HD.1656) 2459 0 R (HD.1657) 2460 0 R (HD.1658) 2461 0 R (HD.1659) 2462 0 R (HD.166) 825 0 R ] /Limits [ (HD.1631) (HD.166) ] >>
endobj
4559 0 obj
-<< /Names [ (HD.1776) 2589 0 R (HD.1777) 2590 0 R (HD.1778) 2591 0 R (HD.1779) 2592 0 R (HD.178) 829 0 R (HD.1780) 2593 0 R (HD.1781) 2594 0 R (HD.1782) 2595 0 R (HD.1783) 2596 0 R (HD.1784) 2597 0 R (HD.1785) 2598 0 R (HD.1786) 2599 0 R (HD.1787) 2600 0 R (HD.1788) 2601 0 R (HD.1789) 2602 0 R (HD.179) 830 0 R (HD.1790) 2603 0 R (HD.1791) 2604 0 R (HD.1792) 2605 0 R (HD.1793) 2606 0 R (HD.1794) 2607 0 R (HD.1795) 2608 0 R (HD.1796) 2609 0 R (HD.1797) 2610 0 R (HD.1798) 2611 0 R (HD.1799) 2612 0 R (HD.18) 653 0 R (HD.180) 835 0 R (HD.1800) 2613 0 R (HD.1801) 2614 0 R (HD.1802) 2615 0 R (HD.1803) 2616 0 R ] /Limits [ (HD.1776) (HD.1803) ] >>
+<< /Names [ (HD.1660) 2463 0 R (HD.1661) 2464 0 R (HD.1662) 2466 0 R (HD.1663) 2467 0 R (HD.1664) 2468 0 R (HD.1665) 2469 0 R (HD.1666) 2470 0 R (HD.1667) 2471 0 R (HD.1668) 2472 0 R (HD.1669) 2473 0 R (HD.167) 826 0 R (HD.1670) 2474 0 R (HD.1671) 2475 0 R (HD.1672) 2476 0 R (HD.1673) 2477 0 R (HD.1674) 2478 0 R (HD.1675) 2479 0 R (HD.1676) 2480 0 R (HD.1677) 2481 0 R (HD.1678) 2482 0 R (HD.1679) 2483 0 R (HD.168) 827 0 R (HD.1680) 2484 0 R (HD.1681) 2485 0 R (HD.1682) 2486 0 R (HD.1683) 2487 0 R (HD.1684) 2492 0 R (HD.1685) 2493 0 R (HD.1686) 2494 0 R (HD.1687) 2495 0 R (HD.1688) 2496 0 R (HD.1689) 2497 0 R ] /Limits [ (HD.1660) (HD.1689) ] >>
endobj
4560 0 obj
-<< /Names [ (HD.1804) 2617 0 R (HD.1805) 2618 0 R (HD.1806) 2619 0 R (HD.1807) 2620 0 R (HD.1808) 2621 0 R (HD.1809) 2622 0 R (HD.181) 836 0 R (HD.1810) 2623 0 R (HD.1811) 2624 0 R (HD.1812) 2625 0 R (HD.1813) 2626 0 R (HD.1814) 2627 0 R (HD.1815) 2628 0 R (HD.1816) 2629 0 R (HD.1817) 2630 0 R (HD.1818) 2631 0 R (HD.1819) 2632 0 R (HD.182) 837 0 R (HD.1820) 2633 0 R (HD.1821) 2634 0 R (HD.1822) 2639 0 R (HD.1823) 2640 0 R (HD.1824) 2641 0 R (HD.1825) 2642 0 R (HD.1826) 2643 0 R (HD.1827) 2644 0 R (HD.1828) 2645 0 R (HD.1829) 2646 0 R (HD.183) 838 0 R (HD.1830) 2647 0 R (HD.1831) 2648 0 R (HD.1832) 2649 0 R ] /Limits [ (HD.1804) (HD.1832) ] >>
+<< /Names [ (HD.169) 828 0 R (HD.1690) 2498 0 R (HD.1691) 2499 0 R (HD.1692) 2500 0 R (HD.1693) 2501 0 R (HD.1694) 2502 0 R (HD.1695) 2503 0 R (HD.1696) 2504 0 R (HD.1697) 2505 0 R (HD.1698) 2506 0 R (HD.1699) 2507 0 R (HD.17) 660 0 R (HD.170) 829 0 R (HD.1700) 2508 0 R (HD.1701) 2509 0 R (HD.1702) 2510 0 R (HD.1703) 2511 0 R (HD.1704) 2512 0 R (HD.1705) 2513 0 R (HD.1706) 2514 0 R (HD.1707) 2515 0 R (HD.1708) 2516 0 R (HD.1709) 2517 0 R (HD.171) 830 0 R (HD.1710) 2518 0 R (HD.1711) 2519 0 R (HD.1712) 2520 0 R (HD.1713) 2521 0 R (HD.1714) 2522 0 R (HD.1715) 2523 0 R (HD.1716) 2524 0 R (HD.1717) 2525 0 R ] /Limits [ (HD.169) (HD.1717) ] >>
endobj
4561 0 obj
-<< /Names [ (HD.1833) 2650 0 R (HD.1834) 2651 0 R (HD.1835) 2652 0 R (HD.1836) 2653 0 R (HD.1837) 2654 0 R (HD.1838) 2655 0 R (HD.1839) 2656 0 R (HD.184) 839 0 R (HD.1840) 2657 0 R (HD.1841) 2658 0 R (HD.1842) 2659 0 R (HD.1843) 2660 0 R (HD.1844) 2661 0 R (HD.1845) 2662 0 R (HD.1846) 2663 0 R (HD.1847) 2664 0 R (HD.1848) 2665 0 R (HD.1849) 2666 0 R (HD.185) 840 0 R (HD.1850) 2667 0 R (HD.1851) 2668 0 R (HD.1852) 2669 0 R (HD.1853) 2670 0 R (HD.1854) 2671 0 R (HD.1855) 2672 0 R (HD.1856) 2673 0 R (HD.1857) 2680 0 R (HD.1858) 2681 0 R (HD.1859) 2682 0 R (HD.186) 841 0 R (HD.1860) 2683 0 R (HD.1861) 2685 0 R ] /Limits [ (HD.1833) (HD.1861) ] >>
+<< /Names [ (HD.1718) 2526 0 R (HD.1719) 2527 0 R (HD.172) 831 0 R (HD.1720) 2528 0 R (HD.1721) 2529 0 R (HD.1722) 2530 0 R (HD.1723) 2531 0 R (HD.1724) 2532 0 R (HD.1725) 2533 0 R (HD.1726) 2534 0 R (HD.1727) 2535 0 R (HD.1728) 2536 0 R (HD.1729) 2537 0 R (HD.173) 832 0 R (HD.1730) 2538 0 R (HD.1731) 2539 0 R (HD.1732) 2540 0 R (HD.1733) 2541 0 R (HD.1734) 2542 0 R (HD.1735) 2543 0 R (HD.1736) 2544 0 R (HD.1737) 2545 0 R (HD.1738) 2546 0 R (HD.1739) 2553 0 R (HD.174) 833 0 R (HD.1740) 2554 0 R (HD.1741) 2555 0 R (HD.1742) 2556 0 R (HD.1743) 2558 0 R (HD.1744) 2559 0 R (HD.1745) 2560 0 R (HD.1746) 2561 0 R ] /Limits [ (HD.1718) (HD.1746) ] >>
endobj
4562 0 obj
-<< /Names [ (HD.1862) 2686 0 R (HD.1863) 2687 0 R (HD.1864) 2688 0 R (HD.1865) 2689 0 R (HD.1866) 2690 0 R (HD.1867) 2691 0 R (HD.1868) 2692 0 R (HD.1869) 2693 0 R (HD.187) 842 0 R (HD.1870) 2694 0 R (HD.1871) 2695 0 R (HD.1872) 2696 0 R (HD.1873) 2697 0 R (HD.1874) 2698 0 R (HD.1875) 2699 0 R (HD.1876) 2700 0 R (HD.1877) 2701 0 R (HD.1878) 2702 0 R (HD.1879) 2703 0 R (HD.188) 843 0 R (HD.1880) 2704 0 R (HD.1881) 2705 0 R (HD.1882) 2706 0 R (HD.1883) 2707 0 R (HD.1884) 2708 0 R (HD.1885) 2709 0 R (HD.1886) 2717 0 R (HD.1887) 2718 0 R (HD.1888) 2719 0 R (HD.1889) 2720 0 R (HD.189) 844 0 R (HD.1890) 2721 0 R ] /Limits [ (HD.1862) (HD.1890) ] >>
+<< /Names [ (HD.1747) 2562 0 R (HD.1748) 2563 0 R (HD.1749) 2564 0 R (HD.175) 834 0 R (HD.1750) 2565 0 R (HD.1751) 2566 0 R (HD.1752) 2567 0 R (HD.1753) 2568 0 R (HD.1754) 2569 0 R (HD.1755) 2570 0 R (HD.1756) 2571 0 R (HD.1757) 2572 0 R (HD.1758) 2573 0 R (HD.1759) 2574 0 R (HD.176) 839 0 R (HD.1760) 2575 0 R (HD.1761) 2576 0 R (HD.1762) 2577 0 R (HD.1763) 2578 0 R (HD.1764) 2579 0 R (HD.1765) 2580 0 R (HD.1766) 2581 0 R (HD.1767) 2582 0 R (HD.1768) 2583 0 R (HD.1769) 2584 0 R (HD.177) 840 0 R (HD.1770) 2585 0 R (HD.1771) 2586 0 R (HD.1772) 2593 0 R (HD.1773) 2594 0 R (HD.1774) 2595 0 R (HD.1775) 2596 0 R ] /Limits [ (HD.1747) (HD.1775) ] >>
endobj
4563 0 obj
-<< /Names [ (HD.1891) 2722 0 R (HD.1892) 2723 0 R (HD.1893) 2724 0 R (HD.1894) 2725 0 R (HD.1895) 2726 0 R (HD.1896) 2727 0 R (HD.1897) 2728 0 R (HD.1898) 2729 0 R (HD.1899) 2730 0 R (HD.19) 654 0 R (HD.190) 845 0 R (HD.1900) 2731 0 R (HD.1901) 2732 0 R (HD.1902) 2733 0 R (HD.1903) 2734 0 R (HD.1904) 2735 0 R (HD.1905) 2736 0 R (HD.1906) 2737 0 R (HD.1907) 2738 0 R (HD.1908) 2739 0 R (HD.1909) 2740 0 R (HD.191) 846 0 R (HD.1910) 2741 0 R (HD.1911) 2742 0 R (HD.1912) 2743 0 R (HD.1913) 2744 0 R (HD.1914) 2745 0 R (HD.1915) 2746 0 R (HD.1916) 2747 0 R (HD.1917) 2748 0 R (HD.1918) 2749 0 R (HD.1919) 2750 0 R ] /Limits [ (HD.1891) (HD.1919) ] >>
+<< /Names [ (HD.1776) 2597 0 R (HD.1777) 2598 0 R (HD.1778) 2599 0 R (HD.1779) 2600 0 R (HD.178) 841 0 R (HD.1780) 2601 0 R (HD.1781) 2602 0 R (HD.1782) 2603 0 R (HD.1783) 2604 0 R (HD.1784) 2605 0 R (HD.1785) 2606 0 R (HD.1786) 2607 0 R (HD.1787) 2608 0 R (HD.1788) 2609 0 R (HD.1789) 2610 0 R (HD.179) 842 0 R (HD.1790) 2611 0 R (HD.1791) 2612 0 R (HD.1792) 2613 0 R (HD.1793) 2614 0 R (HD.1794) 2615 0 R (HD.1795) 2616 0 R (HD.1796) 2617 0 R (HD.1797) 2618 0 R (HD.1798) 2619 0 R (HD.1799) 2620 0 R (HD.18) 661 0 R (HD.180) 843 0 R (HD.1800) 2621 0 R (HD.1801) 2622 0 R (HD.1802) 2623 0 R (HD.1803) 2624 0 R ] /Limits [ (HD.1776) (HD.1803) ] >>
endobj
4564 0 obj
-<< /Names [ (HD.192) 847 0 R (HD.1920) 2752 0 R (HD.1921) 2753 0 R (HD.1922) 2754 0 R (HD.1923) 2755 0 R (HD.1924) 2756 0 R (HD.1925) 2757 0 R (HD.1926) 2758 0 R (HD.1927) 2759 0 R (HD.1928) 2760 0 R (HD.1929) 2761 0 R (HD.193) 848 0 R (HD.1930) 2763 0 R (HD.1931) 2765 0 R (HD.1932) 2771 0 R (HD.1933) 2772 0 R (HD.1934) 2773 0 R (HD.1935) 2774 0 R (HD.1936) 2775 0 R (HD.1937) 2776 0 R (HD.1938) 2777 0 R (HD.1939) 2778 0 R (HD.194) 849 0 R (HD.1940) 2779 0 R (HD.1941) 2780 0 R (HD.1942) 2781 0 R (HD.1943) 2782 0 R (HD.1944) 2783 0 R (HD.1945) 2784 0 R (HD.1946) 2785 0 R (HD.1947) 2786 0 R (HD.1948) 2787 0 R ] /Limits [ (HD.192) (HD.1948) ] >>
+<< /Names [ (HD.1804) 2625 0 R (HD.1805) 2626 0 R (HD.1806) 2627 0 R (HD.1807) 2628 0 R (HD.1808) 2629 0 R (HD.1809) 2630 0 R (HD.181) 844 0 R (HD.1810) 2631 0 R (HD.1811) 2632 0 R (HD.1812) 2633 0 R (HD.1813) 2634 0 R (HD.1814) 2635 0 R (HD.1815) 2636 0 R (HD.1816) 2637 0 R (HD.1817) 2638 0 R (HD.1818) 2639 0 R (HD.1819) 2640 0 R (HD.182) 845 0 R (HD.1820) 2641 0 R (HD.1821) 2642 0 R (HD.1822) 2643 0 R (HD.1823) 2644 0 R (HD.1824) 2645 0 R (HD.1825) 2646 0 R (HD.1826) 2647 0 R (HD.1827) 2648 0 R (HD.1828) 2654 0 R (HD.1829) 2655 0 R (HD.183) 846 0 R (HD.1830) 2656 0 R (HD.1831) 2657 0 R (HD.1832) 2658 0 R ] /Limits [ (HD.1804) (HD.1832) ] >>
endobj
4565 0 obj
-<< /Names [ (HD.1949) 2788 0 R (HD.195) 850 0 R (HD.1950) 2789 0 R (HD.1951) 2790 0 R (HD.1952) 2791 0 R (HD.1953) 2792 0 R (HD.1954) 2793 0 R (HD.1955) 2794 0 R (HD.1956) 2795 0 R (HD.1957) 2796 0 R (HD.1958) 2797 0 R (HD.1959) 2798 0 R (HD.196) 851 0 R (HD.1960) 2799 0 R (HD.1961) 2800 0 R (HD.1962) 2801 0 R (HD.1963) 2802 0 R (HD.1964) 2803 0 R (HD.1965) 2804 0 R (HD.1966) 2805 0 R (HD.1967) 2806 0 R (HD.1968) 2807 0 R (HD.1969) 2808 0 R (HD.197) 856 0 R (HD.1970) 2809 0 R (HD.1971) 2810 0 R (HD.1972) 2811 0 R (HD.1973) 2812 0 R (HD.1974) 2813 0 R (HD.1975) 2814 0 R (HD.1976) 2815 0 R (HD.1977) 2816 0 R ] /Limits [ (HD.1949) (HD.1977) ] >>
+<< /Names [ (HD.1833) 2659 0 R (HD.1834) 2660 0 R (HD.1835) 2661 0 R (HD.1836) 2662 0 R (HD.1837) 2663 0 R (HD.1838) 2664 0 R (HD.1839) 2665 0 R (HD.184) 847 0 R (HD.1840) 2666 0 R (HD.1841) 2667 0 R (HD.1842) 2668 0 R (HD.1843) 2669 0 R (HD.1844) 2670 0 R (HD.1845) 2671 0 R (HD.1846) 2672 0 R (HD.1847) 2673 0 R (HD.1848) 2674 0 R (HD.1849) 2675 0 R (HD.185) 848 0 R (HD.1850) 2676 0 R (HD.1851) 2683 0 R (HD.1852) 2684 0 R (HD.1853) 2685 0 R (HD.1854) 2686 0 R (HD.1855) 2687 0 R (HD.1856) 2688 0 R (HD.1857) 2689 0 R (HD.1858) 2690 0 R (HD.1859) 2691 0 R (HD.186) 849 0 R (HD.1860) 2692 0 R (HD.1861) 2693 0 R ] /Limits [ (HD.1833) (HD.1861) ] >>
endobj
4566 0 obj
-<< /Names [ (HD.1978) 2817 0 R (HD.1979) 2818 0 R (HD.198) 857 0 R (HD.1980) 2819 0 R (HD.1981) 2820 0 R (HD.1982) 2821 0 R (HD.1983) 2822 0 R (HD.1984) 2823 0 R (HD.1985) 2824 0 R (HD.1986) 2825 0 R (HD.1987) 2826 0 R (HD.1988) 2827 0 R (HD.1989) 2828 0 R (HD.199) 858 0 R (HD.1990) 2833 0 R (HD.1991) 2834 0 R (HD.1992) 2835 0 R (HD.1993) 2836 0 R (HD.1994) 2837 0 R (HD.1995) 2839 0 R (HD.1996) 2840 0 R (HD.1997) 2841 0 R (HD.1998) 2842 0 R (HD.1999) 2844 0 R (HD.2) 637 0 R (HD.20) 655 0 R (HD.200) 859 0 R (HD.2000) 2845 0 R (HD.2001) 2846 0 R (HD.2002) 2847 0 R (HD.2003) 2848 0 R (HD.2004) 2849 0 R ] /Limits [ (HD.1978) (HD.2004) ] >>
+<< /Names [ (HD.1862) 2694 0 R (HD.1863) 2695 0 R (HD.1864) 2696 0 R (HD.1865) 2697 0 R (HD.1866) 2698 0 R (HD.1867) 2699 0 R (HD.1868) 2700 0 R (HD.1869) 2701 0 R (HD.187) 850 0 R (HD.1870) 2702 0 R (HD.1871) 2703 0 R (HD.1872) 2704 0 R (HD.1873) 2705 0 R (HD.1874) 2706 0 R (HD.1875) 2707 0 R (HD.1876) 2708 0 R (HD.1877) 2709 0 R (HD.1878) 2710 0 R (HD.1879) 2711 0 R (HD.188) 851 0 R (HD.1880) 2712 0 R (HD.1881) 2713 0 R (HD.1882) 2714 0 R (HD.1883) 2715 0 R (HD.1884) 2716 0 R (HD.1885) 2724 0 R (HD.1886) 2725 0 R (HD.1887) 2726 0 R (HD.1888) 2727 0 R (HD.1889) 2728 0 R (HD.189) 852 0 R (HD.1890) 2729 0 R ] /Limits [ (HD.1862) (HD.1890) ] >>
endobj
4567 0 obj
-<< /Names [ (HD.2005) 2850 0 R (HD.2006) 2851 0 R (HD.2007) 2852 0 R (HD.2008) 2853 0 R (HD.2009) 2854 0 R (HD.201) 860 0 R (HD.2010) 2855 0 R (HD.2011) 2856 0 R (HD.2012) 2857 0 R (HD.2013) 2858 0 R (HD.2014) 2859 0 R (HD.2015) 2860 0 R (HD.2016) 2861 0 R (HD.2017) 2862 0 R (HD.2018) 2863 0 R (HD.2019) 2864 0 R (HD.202) 861 0 R (HD.2020) 2865 0 R (HD.2021) 2866 0 R (HD.2022) 2867 0 R (HD.2023) 2868 0 R (HD.2024) 2869 0 R (HD.2025) 2870 0 R (HD.2026) 2871 0 R (HD.2027) 2872 0 R (HD.2028) 2873 0 R (HD.2029) 2879 0 R (HD.203) 862 0 R (HD.2030) 2880 0 R (HD.2031) 2881 0 R (HD.2032) 2882 0 R (HD.2033) 2883 0 R ] /Limits [ (HD.2005) (HD.2033) ] >>
+<< /Names [ (HD.1891) 2730 0 R (HD.1892) 2731 0 R (HD.1893) 2732 0 R (HD.1894) 2733 0 R (HD.1895) 2734 0 R (HD.1896) 2735 0 R (HD.1897) 2736 0 R (HD.1898) 2737 0 R (HD.1899) 2738 0 R (HD.19) 662 0 R (HD.190) 853 0 R (HD.1900) 2739 0 R (HD.1901) 2740 0 R (HD.1902) 2741 0 R (HD.1903) 2742 0 R (HD.1904) 2743 0 R (HD.1905) 2744 0 R (HD.1906) 2745 0 R (HD.1907) 2746 0 R (HD.1908) 2747 0 R (HD.1909) 2748 0 R (HD.191) 854 0 R (HD.1910) 2750 0 R (HD.1911) 2751 0 R (HD.1912) 2752 0 R (HD.1913) 2753 0 R (HD.1914) 2754 0 R (HD.1915) 2755 0 R (HD.1916) 2756 0 R (HD.1917) 2757 0 R (HD.1918) 2758 0 R (HD.1919) 2759 0 R ] /Limits [ (HD.1891) (HD.1919) ] >>
endobj
4568 0 obj
-<< /Names [ (HD.2034) 2884 0 R (HD.2035) 2885 0 R (HD.2036) 2886 0 R (HD.2037) 2888 0 R (HD.2038) 2890 0 R (HD.2039) 2891 0 R (HD.204) 863 0 R (HD.2040) 2892 0 R (HD.2041) 2893 0 R (HD.2042) 2894 0 R (HD.2043) 2895 0 R (HD.2044) 2896 0 R (HD.2045) 2897 0 R (HD.2046) 2898 0 R (HD.2047) 2899 0 R (HD.2048) 2900 0 R (HD.2049) 2901 0 R (HD.205) 864 0 R (HD.2050) 2902 0 R (HD.2051) 2903 0 R (HD.2052) 2904 0 R (HD.2053) 2905 0 R (HD.2054) 2906 0 R (HD.2055) 2907 0 R (HD.2056) 2908 0 R (HD.2057) 2909 0 R (HD.2058) 2910 0 R (HD.2059) 2911 0 R (HD.206) 865 0 R (HD.2060) 2912 0 R (HD.2061) 2913 0 R (HD.2062) 2914 0 R ] /Limits [ (HD.2034) (HD.2062) ] >>
+<< /Names [ (HD.192) 855 0 R (HD.1920) 2761 0 R (HD.1921) 2763 0 R (HD.1922) 2765 0 R (HD.1923) 2766 0 R (HD.1924) 2767 0 R (HD.1925) 2768 0 R (HD.1926) 2769 0 R (HD.1927) 2770 0 R (HD.1928) 2771 0 R (HD.1929) 2772 0 R (HD.193) 856 0 R (HD.1930) 2773 0 R (HD.1931) 2778 0 R (HD.1932) 2779 0 R (HD.1933) 2780 0 R (HD.1934) 2781 0 R (HD.1935) 2782 0 R (HD.1936) 2783 0 R (HD.1937) 2784 0 R (HD.1938) 2785 0 R (HD.1939) 2786 0 R (HD.194) 857 0 R (HD.1940) 2787 0 R (HD.1941) 2788 0 R (HD.1942) 2789 0 R (HD.1943) 2790 0 R (HD.1944) 2791 0 R (HD.1945) 2792 0 R (HD.1946) 2793 0 R (HD.1947) 2794 0 R (HD.1948) 2795 0 R ] /Limits [ (HD.192) (HD.1948) ] >>
endobj
4569 0 obj
-<< /Names [ (HD.2063) 2915 0 R (HD.2064) 2916 0 R (HD.2065) 2917 0 R (HD.2066) 2918 0 R (HD.2067) 2919 0 R (HD.2068) 2926 0 R (HD.2069) 2927 0 R (HD.207) 866 0 R (HD.2070) 2928 0 R (HD.2071) 2929 0 R (HD.2072) 2930 0 R (HD.2073) 2931 0 R (HD.2074) 2932 0 R (HD.2075) 2933 0 R (HD.2076) 2934 0 R (HD.2077) 2935 0 R (HD.2078) 2936 0 R (HD.2079) 2937 0 R (HD.208) 867 0 R (HD.2080) 2938 0 R (HD.2081) 2939 0 R (HD.2082) 2940 0 R (HD.2083) 2941 0 R (HD.2084) 2942 0 R (HD.2085) 2943 0 R (HD.2086) 2944 0 R (HD.2087) 2945 0 R (HD.2088) 2946 0 R (HD.2089) 2947 0 R (HD.209) 868 0 R (HD.2090) 2948 0 R (HD.2091) 2949 0 R ] /Limits [ (HD.2063) (HD.2091) ] >>
+<< /Names [ (HD.1949) 2796 0 R (HD.195) 858 0 R (HD.1950) 2797 0 R (HD.1951) 2798 0 R (HD.1952) 2799 0 R (HD.1953) 2800 0 R (HD.1954) 2801 0 R (HD.1955) 2802 0 R (HD.1956) 2803 0 R (HD.1957) 2804 0 R (HD.1958) 2805 0 R (HD.1959) 2806 0 R (HD.196) 859 0 R (HD.1960) 2807 0 R (HD.1961) 2808 0 R (HD.1962) 2809 0 R (HD.1963) 2810 0 R (HD.1964) 2811 0 R (HD.1965) 2812 0 R (HD.1966) 2813 0 R (HD.1967) 2814 0 R (HD.1968) 2815 0 R (HD.1969) 2816 0 R (HD.197) 860 0 R (HD.1970) 2817 0 R (HD.1971) 2818 0 R (HD.1972) 2819 0 R (HD.1973) 2820 0 R (HD.1974) 2821 0 R (HD.1975) 2822 0 R (HD.1976) 2823 0 R (HD.1977) 2824 0 R ] /Limits [ (HD.1949) (HD.1977) ] >>
endobj
4570 0 obj
-<< /Names [ (HD.2092) 2950 0 R (HD.2093) 2951 0 R (HD.2094) 2952 0 R (HD.2095) 2953 0 R (HD.2096) 2954 0 R (HD.2097) 2955 0 R (HD.2098) 2956 0 R (HD.2099) 2957 0 R (HD.21) 656 0 R (HD.210) 869 0 R (HD.2100) 2958 0 R (HD.2101) 2959 0 R (HD.2102) 2960 0 R (HD.2103) 2961 0 R (HD.2104) 2962 0 R (HD.2105) 2963 0 R (HD.2106) 2964 0 R (HD.2107) 2965 0 R (HD.2108) 2966 0 R (HD.2109) 2967 0 R (HD.211) 870 0 R (HD.2110) 2968 0 R (HD.2111) 2969 0 R (HD.2112) 2970 0 R (HD.2113) 2971 0 R (HD.2114) 2972 0 R (HD.2115) 2973 0 R (HD.2116) 2974 0 R (HD.2117) 2975 0 R (HD.2118) 2976 0 R (HD.2119) 2977 0 R (HD.212) 871 0 R ] /Limits [ (HD.2092) (HD.212) ] >>
+<< /Names [ (HD.1978) 2825 0 R (HD.1979) 2826 0 R (HD.198) 861 0 R (HD.1980) 2827 0 R (HD.1981) 2828 0 R (HD.1982) 2829 0 R (HD.1983) 2830 0 R (HD.1984) 2831 0 R (HD.1985) 2837 0 R (HD.1986) 2838 0 R (HD.1987) 2839 0 R (HD.1988) 2840 0 R (HD.1989) 2842 0 R (HD.199) 862 0 R (HD.1990) 2843 0 R (HD.1991) 2844 0 R (HD.1992) 2845 0 R (HD.1993) 2846 0 R (HD.1994) 2847 0 R (HD.1995) 2848 0 R (HD.1996) 2849 0 R (HD.1997) 2850 0 R (HD.1998) 2851 0 R (HD.1999) 2852 0 R (HD.2) 645 0 R (HD.20) 663 0 R (HD.200) 867 0 R (HD.2000) 2853 0 R (HD.2001) 2854 0 R (HD.2002) 2855 0 R (HD.2003) 2856 0 R (HD.2004) 2857 0 R ] /Limits [ (HD.1978) (HD.2004) ] >>
endobj
4571 0 obj
-<< /Names [ (HD.2120) 2982 0 R (HD.2121) 2983 0 R (HD.2122) 2984 0 R (HD.2123) 2985 0 R (HD.2124) 2986 0 R (HD.2125) 2987 0 R (HD.2126) 2988 0 R (HD.2127) 2989 0 R (HD.2128) 2990 0 R (HD.2129) 2991 0 R (HD.213) 872 0 R (HD.2130) 2992 0 R (HD.2131) 2993 0 R (HD.2132) 2994 0 R (HD.2133) 2995 0 R (HD.2134) 2996 0 R (HD.2135) 2997 0 R (HD.2136) 2998 0 R (HD.2137) 2999 0 R (HD.2138) 3000 0 R (HD.2139) 3001 0 R (HD.214) 873 0 R (HD.2140) 3002 0 R (HD.2141) 3003 0 R (HD.2142) 3004 0 R (HD.2143) 3005 0 R (HD.2144) 3006 0 R (HD.2145) 3007 0 R (HD.2146) 3008 0 R (HD.2147) 3009 0 R (HD.2148) 3010 0 R (HD.2149) 3011 0 R ] /Limits [ (HD.2120) (HD.2149) ] >>
+<< /Names [ (HD.2005) 2858 0 R (HD.2006) 2859 0 R (HD.2007) 2860 0 R (HD.2008) 2861 0 R (HD.2009) 2862 0 R (HD.201) 868 0 R (HD.2010) 2863 0 R (HD.2011) 2864 0 R (HD.2012) 2865 0 R (HD.2013) 2866 0 R (HD.2014) 2867 0 R (HD.2015) 2868 0 R (HD.2016) 2869 0 R (HD.2017) 2870 0 R (HD.2018) 2871 0 R (HD.2019) 2872 0 R (HD.202) 869 0 R (HD.2020) 2873 0 R (HD.2021) 2874 0 R (HD.2022) 2875 0 R (HD.2023) 2876 0 R (HD.2024) 2882 0 R (HD.2025) 2883 0 R (HD.2026) 2884 0 R (HD.2027) 2886 0 R (HD.2028) 2888 0 R (HD.2029) 2889 0 R (HD.203) 870 0 R (HD.2030) 2890 0 R (HD.2031) 2891 0 R (HD.2032) 2892 0 R (HD.2033) 2893 0 R ] /Limits [ (HD.2005) (HD.2033) ] >>
endobj
4572 0 obj
-<< /Names [ (HD.215) 874 0 R (HD.2150) 3012 0 R (HD.2151) 3013 0 R (HD.2152) 3014 0 R (HD.2153) 3015 0 R (HD.2154) 3016 0 R (HD.2155) 3017 0 R (HD.2156) 3018 0 R (HD.2157) 3019 0 R (HD.2158) 3020 0 R (HD.2159) 3021 0 R (HD.216) 875 0 R (HD.2160) 3022 0 R (HD.2161) 3023 0 R (HD.2162) 3025 0 R (HD.2163) 3026 0 R (HD.2164) 3028 0 R (HD.2165) 3029 0 R (HD.2166) 3030 0 R (HD.2167) 3031 0 R (HD.2168) 3032 0 R (HD.2169) 3037 0 R (HD.217) 876 0 R (HD.2170) 3039 0 R (HD.2171) 3040 0 R (HD.2172) 3041 0 R (HD.2173) 3042 0 R (HD.2174) 3043 0 R (HD.2175) 3044 0 R (HD.2176) 3045 0 R (HD.2177) 3046 0 R (HD.2178) 3047 0 R ] /Limits [ (HD.215) (HD.2178) ] >>
+<< /Names [ (HD.2034) 2894 0 R (HD.2035) 2895 0 R (HD.2036) 2896 0 R (HD.2037) 2897 0 R (HD.2038) 2898 0 R (HD.2039) 2899 0 R (HD.204) 871 0 R (HD.2040) 2900 0 R (HD.2041) 2901 0 R (HD.2042) 2902 0 R (HD.2043) 2903 0 R (HD.2044) 2904 0 R (HD.2045) 2905 0 R (HD.2046) 2906 0 R (HD.2047) 2907 0 R (HD.2048) 2908 0 R (HD.2049) 2909 0 R (HD.205) 872 0 R (HD.2050) 2910 0 R (HD.2051) 2911 0 R (HD.2052) 2912 0 R (HD.2053) 2913 0 R (HD.2054) 2914 0 R (HD.2055) 2915 0 R (HD.2056) 2916 0 R (HD.2057) 2917 0 R (HD.2058) 2918 0 R (HD.2059) 2919 0 R (HD.206) 873 0 R (HD.2060) 2920 0 R (HD.2061) 2921 0 R (HD.2062) 2922 0 R ] /Limits [ (HD.2034) (HD.2062) ] >>
endobj
4573 0 obj
-<< /Names [ (HD.2179) 3048 0 R (HD.218) 877 0 R (HD.2180) 3049 0 R (HD.2181) 3050 0 R (HD.2182) 3051 0 R (HD.2183) 3052 0 R (HD.2184) 3053 0 R (HD.2185) 3054 0 R (HD.2186) 3055 0 R (HD.2187) 3056 0 R (HD.2188) 3057 0 R (HD.2189) 3058 0 R (HD.219) 878 0 R (HD.2190) 3059 0 R (HD.2191) 3060 0 R (HD.2192) 3061 0 R (HD.2193) 3062 0 R (HD.2194) 3063 0 R (HD.2195) 3064 0 R (HD.2196) 3065 0 R (HD.2197) 3066 0 R (HD.2198) 3067 0 R (HD.2199) 3069 0 R (HD.22) 657 0 R (HD.220) 879 0 R (HD.2200) 3070 0 R (HD.2201) 3071 0 R (HD.2202) 3072 0 R (HD.2203) 3073 0 R (HD.2204) 3074 0 R (HD.2205) 3075 0 R (HD.2206) 3081 0 R ] /Limits [ (HD.2179) (HD.2206) ] >>
+<< /Names [ (HD.2063) 2923 0 R (HD.2064) 2924 0 R (HD.2065) 2931 0 R (HD.2066) 2932 0 R (HD.2067) 2933 0 R (HD.2068) 2934 0 R (HD.2069) 2935 0 R (HD.207) 874 0 R (HD.2070) 2936 0 R (HD.2071) 2937 0 R (HD.2072) 2938 0 R (HD.2073) 2939 0 R (HD.2074) 2940 0 R (HD.2075) 2941 0 R (HD.2076) 2942 0 R (HD.2077) 2943 0 R (HD.2078) 2944 0 R (HD.2079) 2945 0 R (HD.208) 875 0 R (HD.2080) 2946 0 R (HD.2081) 2947 0 R (HD.2082) 2948 0 R (HD.2083) 2949 0 R (HD.2084) 2950 0 R (HD.2085) 2951 0 R (HD.2086) 2952 0 R (HD.2087) 2953 0 R (HD.2088) 2954 0 R (HD.2089) 2955 0 R (HD.209) 876 0 R (HD.2090) 2956 0 R (HD.2091) 2957 0 R ] /Limits [ (HD.2063) (HD.2091) ] >>
endobj
4574 0 obj
-<< /Names [ (HD.2207) 3082 0 R (HD.2208) 3083 0 R (HD.2209) 3084 0 R (HD.221) 880 0 R (HD.2210) 3085 0 R (HD.2211) 3086 0 R (HD.2212) 3088 0 R (HD.2213) 3089 0 R (HD.2214) 3090 0 R (HD.2215) 3091 0 R (HD.2216) 3092 0 R (HD.2217) 3093 0 R (HD.2218) 3094 0 R (HD.2219) 3095 0 R (HD.222) 881 0 R (HD.2220) 3096 0 R (HD.2221) 3097 0 R (HD.2222) 3098 0 R (HD.2223) 3099 0 R (HD.2224) 3100 0 R (HD.2225) 3101 0 R (HD.2226) 3102 0 R (HD.2227) 3103 0 R (HD.2228) 3104 0 R (HD.2229) 3105 0 R (HD.223) 882 0 R (HD.2230) 3106 0 R (HD.2231) 3107 0 R (HD.2232) 3108 0 R (HD.2233) 3109 0 R (HD.2234) 3110 0 R (HD.2235) 3111 0 R ] /Limits [ (HD.2207) (HD.2235) ] >>
+<< /Names [ (HD.2092) 2958 0 R (HD.2093) 2959 0 R (HD.2094) 2960 0 R (HD.2095) 2961 0 R (HD.2096) 2962 0 R (HD.2097) 2963 0 R (HD.2098) 2964 0 R (HD.2099) 2965 0 R (HD.21) 664 0 R (HD.210) 877 0 R (HD.2100) 2966 0 R (HD.2101) 2967 0 R (HD.2102) 2968 0 R (HD.2103) 2969 0 R (HD.2104) 2970 0 R (HD.2105) 2971 0 R (HD.2106) 2972 0 R (HD.2107) 2973 0 R (HD.2108) 2974 0 R (HD.2109) 2975 0 R (HD.211) 878 0 R (HD.2110) 2976 0 R (HD.2111) 2977 0 R (HD.2112) 2978 0 R (HD.2113) 2979 0 R (HD.2114) 2980 0 R (HD.2115) 2985 0 R (HD.2116) 2986 0 R (HD.2117) 2987 0 R (HD.2118) 2988 0 R (HD.2119) 2989 0 R (HD.212) 879 0 R ] /Limits [ (HD.2092) (HD.212) ] >>
endobj
4575 0 obj
-<< /Names [ (HD.2236) 3112 0 R (HD.2237) 3113 0 R (HD.2238) 3114 0 R (HD.2239) 3115 0 R (HD.224) 883 0 R (HD.2240) 3116 0 R (HD.2241) 3118 0 R (HD.2242) 3119 0 R (HD.2243) 3120 0 R (HD.2244) 3121 0 R (HD.2245) 3122 0 R (HD.2246) 3123 0 R (HD.2247) 3124 0 R (HD.2248) 3125 0 R (HD.2249) 3126 0 R (HD.225) 884 0 R (HD.2250) 3127 0 R (HD.2251) 3128 0 R (HD.2252) 3129 0 R (HD.2253) 3130 0 R (HD.2254) 3131 0 R (HD.2255) 3132 0 R (HD.2256) 3133 0 R (HD.2257) 3134 0 R (HD.2258) 3140 0 R (HD.2259) 3141 0 R (HD.226) 885 0 R (HD.2260) 3142 0 R (HD.2261) 3143 0 R (HD.2262) 3144 0 R (HD.2263) 3145 0 R (HD.2264) 3146 0 R ] /Limits [ (HD.2236) (HD.2264) ] >>
+<< /Names [ (HD.2120) 2990 0 R (HD.2121) 2991 0 R (HD.2122) 2992 0 R (HD.2123) 2993 0 R (HD.2124) 2994 0 R (HD.2125) 2995 0 R (HD.2126) 2996 0 R (HD.2127) 2997 0 R (HD.2128) 2998 0 R (HD.2129) 2999 0 R (HD.213) 880 0 R (HD.2130) 3000 0 R (HD.2131) 3001 0 R (HD.2132) 3002 0 R (HD.2133) 3003 0 R (HD.2134) 3004 0 R (HD.2135) 3005 0 R (HD.2136) 3006 0 R (HD.2137) 3007 0 R (HD.2138) 3008 0 R (HD.2139) 3009 0 R (HD.214) 881 0 R (HD.2140) 3010 0 R (HD.2141) 3011 0 R (HD.2142) 3012 0 R (HD.2143) 3013 0 R (HD.2144) 3014 0 R (HD.2145) 3015 0 R (HD.2146) 3016 0 R (HD.2147) 3017 0 R (HD.2148) 3018 0 R (HD.2149) 3019 0 R ] /Limits [ (HD.2120) (HD.2149) ] >>
endobj
4576 0 obj
-<< /Names [ (HD.2265) 3147 0 R (HD.2266) 3148 0 R (HD.2267) 3149 0 R (HD.2268) 3150 0 R (HD.2269) 3151 0 R (HD.227) 886 0 R (HD.2270) 3152 0 R (HD.2271) 3153 0 R (HD.2272) 3154 0 R (HD.2273) 3155 0 R (HD.2274) 3156 0 R (HD.2275) 3157 0 R (HD.2276) 3158 0 R (HD.2277) 3159 0 R (HD.2278) 3160 0 R (HD.2279) 3161 0 R (HD.228) 887 0 R (HD.2280) 3162 0 R (HD.2281) 3163 0 R (HD.2282) 3165 0 R (HD.2283) 3167 0 R (HD.2284) 3168 0 R (HD.2285) 3169 0 R (HD.2286) 3170 0 R (HD.2287) 3171 0 R (HD.2288) 3172 0 R (HD.2289) 3173 0 R (HD.229) 888 0 R (HD.2290) 3174 0 R (HD.2291) 3175 0 R (HD.2292) 3176 0 R (HD.2293) 3177 0 R ] /Limits [ (HD.2265) (HD.2293) ] >>
+<< /Names [ (HD.215) 882 0 R (HD.2150) 3020 0 R (HD.2151) 3021 0 R (HD.2152) 3022 0 R (HD.2153) 3023 0 R (HD.2154) 3025 0 R (HD.2155) 3026 0 R (HD.2156) 3028 0 R (HD.2157) 3029 0 R (HD.2158) 3030 0 R (HD.2159) 3031 0 R (HD.216) 883 0 R (HD.2160) 3032 0 R (HD.2161) 3033 0 R (HD.2162) 3040 0 R (HD.2163) 3041 0 R (HD.2164) 3042 0 R (HD.2165) 3043 0 R (HD.2166) 3044 0 R (HD.2167) 3045 0 R (HD.2168) 3046 0 R (HD.2169) 3047 0 R (HD.217) 884 0 R (HD.2170) 3048 0 R (HD.2171) 3049 0 R (HD.2172) 3050 0 R (HD.2173) 3051 0 R (HD.2174) 3052 0 R (HD.2175) 3053 0 R (HD.2176) 3054 0 R (HD.2177) 3055 0 R (HD.2178) 3056 0 R ] /Limits [ (HD.215) (HD.2178) ] >>
endobj
4577 0 obj
-<< /Names [ (HD.2294) 3178 0 R (HD.2295) 3179 0 R (HD.2296) 3180 0 R (HD.2297) 3181 0 R (HD.2298) 3182 0 R (HD.2299) 3183 0 R (HD.23) 658 0 R (HD.230) 889 0 R (HD.2300) 3184 0 R (HD.2301) 3185 0 R (HD.2302) 3186 0 R (HD.2303) 3187 0 R (HD.2304) 3188 0 R (HD.2305) 3189 0 R (HD.2306) 3190 0 R (HD.2307) 3191 0 R (HD.2308) 3192 0 R (HD.2309) 3193 0 R (HD.231) 890 0 R (HD.2310) 3194 0 R (HD.2311) 3195 0 R (HD.2312) 3200 0 R (HD.2313) 3201 0 R (HD.2314) 3202 0 R (HD.2315) 3203 0 R (HD.2316) 3204 0 R (HD.2317) 3205 0 R (HD.2318) 3206 0 R (HD.2319) 3207 0 R (HD.232) 891 0 R (HD.2320) 3208 0 R (HD.2321) 3209 0 R ] /Limits [ (HD.2294) (HD.2321) ] >>
+<< /Names [ (HD.2179) 3057 0 R (HD.218) 885 0 R (HD.2180) 3058 0 R (HD.2181) 3059 0 R (HD.2182) 3060 0 R (HD.2183) 3061 0 R (HD.2184) 3062 0 R (HD.2185) 3063 0 R (HD.2186) 3064 0 R (HD.2187) 3065 0 R (HD.2188) 3066 0 R (HD.2189) 3067 0 R (HD.219) 886 0 R (HD.2190) 3068 0 R (HD.2191) 3070 0 R (HD.2192) 3071 0 R (HD.2193) 3072 0 R (HD.2194) 3073 0 R (HD.2195) 3074 0 R (HD.2196) 3075 0 R (HD.2197) 3076 0 R (HD.2198) 3077 0 R (HD.2199) 3078 0 R (HD.22) 665 0 R (HD.220) 887 0 R (HD.2200) 3079 0 R (HD.2201) 3080 0 R (HD.2202) 3085 0 R (HD.2203) 3086 0 R (HD.2204) 3088 0 R (HD.2205) 3089 0 R (HD.2206) 3090 0 R ] /Limits [ (HD.2179) (HD.2206) ] >>
endobj
4578 0 obj
-<< /Names [ (HD.2322) 3210 0 R (HD.2323) 3211 0 R (HD.2324) 3212 0 R (HD.2325) 3213 0 R (HD.2326) 3214 0 R (HD.2327) 3215 0 R (HD.2328) 3216 0 R (HD.2329) 3217 0 R (HD.233) 892 0 R (HD.2330) 3218 0 R (HD.2331) 3219 0 R (HD.2332) 3220 0 R (HD.2333) 3221 0 R (HD.2334) 3222 0 R (HD.2335) 3223 0 R (HD.2336) 3224 0 R (HD.2337) 3225 0 R (HD.2338) 3226 0 R (HD.2339) 3227 0 R (HD.234) 893 0 R (HD.2340) 3228 0 R (HD.2341) 3229 0 R (HD.2342) 3230 0 R (HD.2343) 3231 0 R (HD.2344) 3232 0 R (HD.2345) 3233 0 R (HD.2346) 3234 0 R (HD.2347) 3235 0 R (HD.2348) 3236 0 R (HD.2349) 3237 0 R (HD.235) 898 0 R (HD.2350) 3238 0 R ] /Limits [ (HD.2322) (HD.2350) ] >>
+<< /Names [ (HD.2207) 3091 0 R (HD.2208) 3092 0 R (HD.2209) 3093 0 R (HD.221) 888 0 R (HD.2210) 3094 0 R (HD.2211) 3095 0 R (HD.2212) 3096 0 R (HD.2213) 3097 0 R (HD.2214) 3098 0 R (HD.2215) 3099 0 R (HD.2216) 3100 0 R (HD.2217) 3101 0 R (HD.2218) 3102 0 R (HD.2219) 3103 0 R (HD.222) 889 0 R (HD.2220) 3104 0 R (HD.2221) 3105 0 R (HD.2222) 3106 0 R (HD.2223) 3107 0 R (HD.2224) 3108 0 R (HD.2225) 3109 0 R (HD.2226) 3110 0 R (HD.2227) 3111 0 R (HD.2228) 3112 0 R (HD.2229) 3113 0 R (HD.223) 890 0 R (HD.2230) 3114 0 R (HD.2231) 3115 0 R (HD.2232) 3116 0 R (HD.2233) 3118 0 R (HD.2234) 3119 0 R (HD.2235) 3120 0 R ] /Limits [ (HD.2207) (HD.2235) ] >>
endobj
4579 0 obj
-<< /Names [ (HD.2351) 3239 0 R (HD.2352) 3240 0 R (HD.2353) 3241 0 R (HD.2354) 3242 0 R (HD.2355) 3243 0 R (HD.2356) 3244 0 R (HD.2357) 3245 0 R (HD.2358) 3246 0 R (HD.2359) 3253 0 R (HD.236) 899 0 R (HD.2360) 3254 0 R (HD.2361) 3256 0 R (HD.2362) 3257 0 R (HD.2363) 3258 0 R (HD.2364) 3259 0 R (HD.2365) 3260 0 R (HD.2366) 3261 0 R (HD.2367) 3262 0 R (HD.2368) 3263 0 R (HD.2369) 3264 0 R (HD.237) 900 0 R (HD.2370) 3265 0 R (HD.2371) 3266 0 R (HD.2372) 3268 0 R (HD.2373) 3269 0 R (HD.2374) 3270 0 R (HD.2375) 3271 0 R (HD.2376) 3273 0 R (HD.2377) 3275 0 R (HD.2378) 3276 0 R (HD.2379) 3277 0 R (HD.238) 901 0 R ] /Limits [ (HD.2351) (HD.238) ] >>
+<< /Names [ (HD.2236) 3121 0 R (HD.2237) 3122 0 R (HD.2238) 3123 0 R (HD.2239) 3124 0 R (HD.224) 891 0 R (HD.2240) 3125 0 R (HD.2241) 3126 0 R (HD.2242) 3127 0 R (HD.2243) 3128 0 R (HD.2244) 3129 0 R (HD.2245) 3130 0 R (HD.2246) 3131 0 R (HD.2247) 3132 0 R (HD.2248) 3133 0 R (HD.2249) 3134 0 R (HD.225) 892 0 R (HD.2250) 3135 0 R (HD.2251) 3136 0 R (HD.2252) 3137 0 R (HD.2253) 3138 0 R (HD.2254) 3144 0 R (HD.2255) 3145 0 R (HD.2256) 3146 0 R (HD.2257) 3147 0 R (HD.2258) 3148 0 R (HD.2259) 3149 0 R (HD.226) 893 0 R (HD.2260) 3150 0 R (HD.2261) 3151 0 R (HD.2262) 3152 0 R (HD.2263) 3153 0 R (HD.2264) 3154 0 R ] /Limits [ (HD.2236) (HD.2264) ] >>
endobj
4580 0 obj
-<< /Names [ (HD.2380) 3278 0 R (HD.2381) 3279 0 R (HD.2382) 3280 0 R (HD.2383) 3281 0 R (HD.2384) 3282 0 R (HD.2385) 3283 0 R (HD.2386) 3284 0 R (HD.2387) 3285 0 R (HD.2388) 3292 0 R (HD.2389) 3293 0 R (HD.239) 902 0 R (HD.2390) 3294 0 R (HD.2391) 3295 0 R (HD.2392) 3296 0 R (HD.2393) 3297 0 R (HD.2394) 3298 0 R (HD.2395) 3299 0 R (HD.2396) 3300 0 R (HD.2397) 3301 0 R (HD.2398) 3302 0 R (HD.2399) 3303 0 R (HD.24) 659 0 R (HD.240) 903 0 R (HD.2400) 3304 0 R (HD.2401) 3305 0 R (HD.2402) 3306 0 R (HD.2403) 3307 0 R (HD.2404) 3308 0 R (HD.2405) 3309 0 R (HD.2406) 3310 0 R (HD.2407) 3311 0 R (HD.2408) 3312 0 R ] /Limits [ (HD.2380) (HD.2408) ] >>
+<< /Names [ (HD.2265) 3155 0 R (HD.2266) 3156 0 R (HD.2267) 3157 0 R (HD.2268) 3158 0 R (HD.2269) 3159 0 R (HD.227) 894 0 R (HD.2270) 3160 0 R (HD.2271) 3161 0 R (HD.2272) 3162 0 R (HD.2273) 3163 0 R (HD.2274) 3165 0 R (HD.2275) 3167 0 R (HD.2276) 3168 0 R (HD.2277) 3169 0 R (HD.2278) 3170 0 R (HD.2279) 3171 0 R (HD.228) 895 0 R (HD.2280) 3172 0 R (HD.2281) 3173 0 R (HD.2282) 3174 0 R (HD.2283) 3175 0 R (HD.2284) 3176 0 R (HD.2285) 3177 0 R (HD.2286) 3178 0 R (HD.2287) 3179 0 R (HD.2288) 3180 0 R (HD.2289) 3181 0 R (HD.229) 896 0 R (HD.2290) 3182 0 R (HD.2291) 3183 0 R (HD.2292) 3184 0 R (HD.2293) 3185 0 R ] /Limits [ (HD.2265) (HD.2293) ] >>
endobj
4581 0 obj
-<< /Names [ (HD.2409) 3313 0 R (HD.241) 904 0 R (HD.2410) 3314 0 R (HD.2411) 3315 0 R (HD.2412) 3316 0 R (HD.2413) 3317 0 R (HD.2414) 3318 0 R (HD.2415) 3319 0 R (HD.2416) 3320 0 R (HD.2417) 3321 0 R (HD.2418) 3322 0 R (HD.2419) 3323 0 R (HD.242) 905 0 R (HD.2420) 3324 0 R (HD.2421) 3325 0 R (HD.2422) 3326 0 R (HD.2423) 3327 0 R (HD.2424) 3328 0 R (HD.2425) 3329 0 R (HD.2426) 3330 0 R (HD.2427) 3331 0 R (HD.2428) 3332 0 R (HD.2429) 3333 0 R (HD.243) 906 0 R (HD.2430) 3334 0 R (HD.2431) 3335 0 R (HD.2432) 3336 0 R (HD.2433) 3337 0 R (HD.2434) 3344 0 R (HD.2435) 3345 0 R (HD.2436) 3346 0 R (HD.2437) 3347 0 R ] /Limits [ (HD.2409) (HD.2437) ] >>
+<< /Names [ (HD.2294) 3186 0 R (HD.2295) 3187 0 R (HD.2296) 3188 0 R (HD.2297) 3189 0 R (HD.2298) 3190 0 R (HD.2299) 3191 0 R (HD.23) 666 0 R (HD.230) 897 0 R (HD.2300) 3192 0 R (HD.2301) 3193 0 R (HD.2302) 3194 0 R (HD.2303) 3199 0 R (HD.2304) 3200 0 R (HD.2305) 3201 0 R (HD.2306) 3202 0 R (HD.2307) 3203 0 R (HD.2308) 3204 0 R (HD.2309) 3205 0 R (HD.231) 898 0 R (HD.2310) 3206 0 R (HD.2311) 3207 0 R (HD.2312) 3208 0 R (HD.2313) 3209 0 R (HD.2314) 3210 0 R (HD.2315) 3211 0 R (HD.2316) 3212 0 R (HD.2317) 3213 0 R (HD.2318) 3214 0 R (HD.2319) 3215 0 R (HD.232) 899 0 R (HD.2320) 3216 0 R (HD.2321) 3217 0 R ] /Limits [ (HD.2294) (HD.2321) ] >>
endobj
4582 0 obj
-<< /Names [ (HD.2438) 3348 0 R (HD.2439) 3349 0 R (HD.244) 907 0 R (HD.2440) 3350 0 R (HD.2441) 3351 0 R (HD.2442) 3352 0 R (HD.2443) 3353 0 R (HD.2444) 3354 0 R (HD.2445) 3355 0 R (HD.2446) 3356 0 R (HD.2447) 3357 0 R (HD.2448) 3358 0 R (HD.2449) 3359 0 R (HD.245) 908 0 R (HD.2450) 3360 0 R (HD.2451) 3361 0 R (HD.2452) 3362 0 R (HD.2453) 3363 0 R (HD.2454) 3364 0 R (HD.2455) 3365 0 R (HD.2456) 3366 0 R (HD.2457) 3367 0 R (HD.2458) 3368 0 R (HD.2459) 3369 0 R (HD.246) 909 0 R (HD.2460) 3370 0 R (HD.2461) 3371 0 R (HD.2462) 3372 0 R (HD.2463) 3373 0 R (HD.2464) 3374 0 R (HD.2465) 3375 0 R (HD.2466) 3376 0 R ] /Limits [ (HD.2438) (HD.2466) ] >>
+<< /Names [ (HD.2322) 3218 0 R (HD.2323) 3219 0 R (HD.2324) 3220 0 R (HD.2325) 3221 0 R (HD.2326) 3222 0 R (HD.2327) 3223 0 R (HD.2328) 3224 0 R (HD.2329) 3225 0 R (HD.233) 904 0 R (HD.2330) 3226 0 R (HD.2331) 3227 0 R (HD.2332) 3228 0 R (HD.2333) 3229 0 R (HD.2334) 3230 0 R (HD.2335) 3231 0 R (HD.2336) 3232 0 R (HD.2337) 3233 0 R (HD.2338) 3234 0 R (HD.2339) 3235 0 R (HD.234) 905 0 R (HD.2340) 3236 0 R (HD.2341) 3237 0 R (HD.2342) 3238 0 R (HD.2343) 3239 0 R (HD.2344) 3240 0 R (HD.2345) 3241 0 R (HD.2346) 3242 0 R (HD.2347) 3243 0 R (HD.2348) 3244 0 R (HD.2349) 3245 0 R (HD.235) 906 0 R (HD.2350) 3252 0 R ] /Limits [ (HD.2322) (HD.2350) ] >>
endobj
4583 0 obj
-<< /Names [ (HD.2467) 3377 0 R (HD.2468) 3378 0 R (HD.2469) 3379 0 R (HD.247) 910 0 R (HD.2470) 3380 0 R (HD.2471) 3381 0 R (HD.2472) 3382 0 R (HD.2473) 3383 0 R (HD.2474) 3384 0 R (HD.2475) 3385 0 R (HD.2476) 3386 0 R (HD.2477) 3387 0 R (HD.2478) 3388 0 R (HD.2479) 3389 0 R (HD.248) 911 0 R (HD.2480) 3391 0 R (HD.2481) 3397 0 R (HD.2482) 3398 0 R (HD.2483) 3399 0 R (HD.2484) 3400 0 R (HD.2485) 3402 0 R (HD.2486) 3403 0 R (HD.2487) 3404 0 R (HD.2488) 3405 0 R (HD.2489) 3406 0 R (HD.249) 912 0 R (HD.2490) 3407 0 R (HD.2491) 3408 0 R (HD.2492) 3409 0 R (HD.2493) 3410 0 R (HD.2494) 3411 0 R (HD.2495) 3412 0 R ] /Limits [ (HD.2467) (HD.2495) ] >>
+<< /Names [ (HD.2351) 3253 0 R (HD.2352) 3255 0 R (HD.2353) 3256 0 R (HD.2354) 3257 0 R (HD.2355) 3258 0 R (HD.2356) 3259 0 R (HD.2357) 3260 0 R (HD.2358) 3261 0 R (HD.2359) 3262 0 R (HD.236) 907 0 R (HD.2360) 3263 0 R (HD.2361) 3264 0 R (HD.2362) 3265 0 R (HD.2363) 3267 0 R (HD.2364) 3268 0 R (HD.2365) 3269 0 R (HD.2366) 3270 0 R (HD.2367) 3272 0 R (HD.2368) 3274 0 R (HD.2369) 3275 0 R (HD.237) 908 0 R (HD.2370) 3276 0 R (HD.2371) 3277 0 R (HD.2372) 3278 0 R (HD.2373) 3279 0 R (HD.2374) 3280 0 R (HD.2375) 3281 0 R (HD.2376) 3282 0 R (HD.2377) 3283 0 R (HD.2378) 3284 0 R (HD.2379) 3291 0 R (HD.238) 909 0 R ] /Limits [ (HD.2351) (HD.238) ] >>
endobj
4584 0 obj
-<< /Names [ (HD.2496) 3413 0 R (HD.2497) 3415 0 R (HD.2498) 3416 0 R (HD.2499) 3417 0 R (HD.25) 660 0 R (HD.250) 913 0 R (HD.2500) 3418 0 R (HD.2501) 3419 0 R (HD.2502) 3420 0 R (HD.2503) 3421 0 R (HD.2504) 3422 0 R (HD.2505) 3423 0 R (HD.2506) 3424 0 R (HD.2507) 3425 0 R (HD.2508) 3426 0 R (HD.2509) 3427 0 R (HD.251) 914 0 R (HD.2510) 3428 0 R (HD.2511) 3429 0 R (HD.2512) 3430 0 R (HD.2513) 3431 0 R (HD.2514) 3432 0 R (HD.2515) 3433 0 R (HD.2516) 3434 0 R (HD.2517) 3435 0 R (HD.2518) 3436 0 R (HD.2519) 3437 0 R (HD.252) 915 0 R (HD.2520) 3438 0 R (HD.2521) 3439 0 R (HD.2522) 3440 0 R (HD.2523) 3441 0 R ] /Limits [ (HD.2496) (HD.2523) ] >>
+<< /Names [ (HD.2380) 3292 0 R (HD.2381) 3293 0 R (HD.2382) 3294 0 R (HD.2383) 3295 0 R (HD.2384) 3296 0 R (HD.2385) 3297 0 R (HD.2386) 3298 0 R (HD.2387) 3299 0 R (HD.2388) 3300 0 R (HD.2389) 3301 0 R (HD.239) 910 0 R (HD.2390) 3302 0 R (HD.2391) 3303 0 R (HD.2392) 3304 0 R (HD.2393) 3305 0 R (HD.2394) 3306 0 R (HD.2395) 3307 0 R (HD.2396) 3308 0 R (HD.2397) 3309 0 R (HD.2398) 3310 0 R (HD.2399) 3311 0 R (HD.24) 667 0 R (HD.240) 911 0 R (HD.2400) 3312 0 R (HD.2401) 3313 0 R (HD.2402) 3314 0 R (HD.2403) 3315 0 R (HD.2404) 3316 0 R (HD.2405) 3317 0 R (HD.2406) 3318 0 R (HD.2407) 3319 0 R (HD.2408) 3320 0 R ] /Limits [ (HD.2380) (HD.2408) ] >>
endobj
4585 0 obj
-<< /Names [ (HD.2524) 3442 0 R (HD.2525) 3443 0 R (HD.2526) 3444 0 R (HD.2527) 3445 0 R (HD.2528) 3446 0 R (HD.2529) 3447 0 R (HD.253) 916 0 R (HD.2530) 3448 0 R (HD.2531) 3449 0 R (HD.2532) 3450 0 R (HD.2533) 3456 0 R (HD.2534) 3457 0 R (HD.2535) 3458 0 R (HD.2536) 3459 0 R (HD.2537) 3460 0 R (HD.2538) 3461 0 R (HD.2539) 3462 0 R (HD.254) 917 0 R (HD.2540) 3463 0 R (HD.2541) 3464 0 R (HD.2542) 3465 0 R (HD.2543) 3466 0 R (HD.2544) 3467 0 R (HD.2545) 3468 0 R (HD.2546) 3469 0 R (HD.2547) 3470 0 R (HD.2548) 3471 0 R (HD.2549) 3472 0 R (HD.255) 918 0 R (HD.2550) 3473 0 R (HD.2551) 3474 0 R (HD.2552) 3475 0 R ] /Limits [ (HD.2524) (HD.2552) ] >>
+<< /Names [ (HD.2409) 3321 0 R (HD.241) 912 0 R (HD.2410) 3322 0 R (HD.2411) 3323 0 R (HD.2412) 3324 0 R (HD.2413) 3325 0 R (HD.2414) 3326 0 R (HD.2415) 3327 0 R (HD.2416) 3328 0 R (HD.2417) 3329 0 R (HD.2418) 3330 0 R (HD.2419) 3331 0 R (HD.242) 913 0 R (HD.2420) 3332 0 R (HD.2421) 3333 0 R (HD.2422) 3334 0 R (HD.2423) 3335 0 R (HD.2424) 3342 0 R (HD.2425) 3343 0 R (HD.2426) 3344 0 R (HD.2427) 3345 0 R (HD.2428) 3346 0 R (HD.2429) 3347 0 R (HD.243) 914 0 R (HD.2430) 3348 0 R (HD.2431) 3349 0 R (HD.2432) 3350 0 R (HD.2433) 3351 0 R (HD.2434) 3352 0 R (HD.2435) 3353 0 R (HD.2436) 3354 0 R (HD.2437) 3355 0 R ] /Limits [ (HD.2409) (HD.2437) ] >>
endobj
4586 0 obj
-<< /Names [ (HD.2553) 3476 0 R (HD.2554) 3477 0 R (HD.2555) 3478 0 R (HD.2556) 3479 0 R (HD.2557) 3480 0 R (HD.2558) 3481 0 R (HD.2559) 3482 0 R (HD.256) 919 0 R (HD.2560) 3483 0 R (HD.2561) 3484 0 R (HD.2562) 3485 0 R (HD.2563) 3486 0 R (HD.2564) 3487 0 R (HD.2565) 3488 0 R (HD.2566) 3489 0 R (HD.2567) 3490 0 R (HD.2568) 3491 0 R (HD.2569) 3492 0 R (HD.257) 920 0 R (HD.2570) 3493 0 R (HD.2571) 3494 0 R (HD.2572) 3495 0 R (HD.2573) 3496 0 R (HD.2574) 3497 0 R (HD.2575) 3498 0 R (HD.2576) 3499 0 R (HD.2577) 3500 0 R (HD.2578) 3501 0 R (HD.2579) 3502 0 R (HD.258) 921 0 R (HD.2580) 3503 0 R (HD.2581) 3504 0 R ] /Limits [ (HD.2553) (HD.2581) ] >>
+<< /Names [ (HD.2438) 3356 0 R (HD.2439) 3357 0 R (HD.244) 915 0 R (HD.2440) 3358 0 R (HD.2441) 3359 0 R (HD.2442) 3360 0 R (HD.2443) 3361 0 R (HD.2444) 3362 0 R (HD.2445) 3363 0 R (HD.2446) 3364 0 R (HD.2447) 3365 0 R (HD.2448) 3366 0 R (HD.2449) 3367 0 R (HD.245) 916 0 R (HD.2450) 3368 0 R (HD.2451) 3369 0 R (HD.2452) 3370 0 R (HD.2453) 3371 0 R (HD.2454) 3372 0 R (HD.2455) 3373 0 R (HD.2456) 3374 0 R (HD.2457) 3375 0 R (HD.2458) 3376 0 R (HD.2459) 3377 0 R (HD.246) 917 0 R (HD.2460) 3378 0 R (HD.2461) 3379 0 R (HD.2462) 3380 0 R (HD.2463) 3381 0 R (HD.2464) 3382 0 R (HD.2465) 3383 0 R (HD.2466) 3384 0 R ] /Limits [ (HD.2438) (HD.2466) ] >>
endobj
4587 0 obj
-<< /Names [ (HD.2582) 3505 0 R (HD.2583) 3512 0 R (HD.2584) 3513 0 R (HD.2585) 3514 0 R (HD.2586) 3515 0 R (HD.2587) 3516 0 R (HD.2588) 3517 0 R (HD.2589) 3518 0 R (HD.259) 922 0 R (HD.2590) 3519 0 R (HD.2591) 3520 0 R (HD.2592) 3521 0 R (HD.2593) 3522 0 R (HD.2594) 3523 0 R (HD.2595) 3524 0 R (HD.2596) 3525 0 R (HD.2597) 3526 0 R (HD.2598) 3527 0 R (HD.2599) 3528 0 R (HD.26) 661 0 R (HD.260) 923 0 R (HD.2600) 3529 0 R (HD.2601) 3530 0 R (HD.2602) 3531 0 R (HD.2603) 3532 0 R (HD.2604) 3533 0 R (HD.2605) 3534 0 R (HD.2606) 3535 0 R (HD.2607) 3536 0 R (HD.2608) 3537 0 R (HD.2609) 3538 0 R (HD.261) 924 0 R ] /Limits [ (HD.2582) (HD.261) ] >>
+<< /Names [ (HD.2467) 3385 0 R (HD.2468) 3386 0 R (HD.2469) 3387 0 R (HD.247) 918 0 R (HD.2470) 3389 0 R (HD.2471) 3395 0 R (HD.2472) 3396 0 R (HD.2473) 3397 0 R (HD.2474) 3398 0 R (HD.2475) 3400 0 R (HD.2476) 3401 0 R (HD.2477) 3402 0 R (HD.2478) 3403 0 R (HD.2479) 3404 0 R (HD.248) 919 0 R (HD.2480) 3405 0 R (HD.2481) 3406 0 R (HD.2482) 3407 0 R (HD.2483) 3408 0 R (HD.2484) 3409 0 R (HD.2485) 3410 0 R (HD.2486) 3411 0 R (HD.2487) 3413 0 R (HD.2488) 3414 0 R (HD.2489) 3415 0 R (HD.249) 920 0 R (HD.2490) 3416 0 R (HD.2491) 3417 0 R (HD.2492) 3418 0 R (HD.2493) 3419 0 R (HD.2494) 3420 0 R (HD.2495) 3421 0 R ] /Limits [ (HD.2467) (HD.2495) ] >>
endobj
4588 0 obj
-<< /Names [ (HD.2610) 3539 0 R (HD.2611) 3540 0 R (HD.2612) 3541 0 R (HD.2613) 3542 0 R (HD.2614) 3543 0 R (HD.2615) 3544 0 R (HD.2616) 3545 0 R (HD.2617) 3546 0 R (HD.2618) 3547 0 R (HD.2619) 3548 0 R (HD.262) 925 0 R (HD.2620) 3549 0 R (HD.2621) 3550 0 R (HD.2622) 3551 0 R (HD.2623) 3552 0 R (HD.2624) 3553 0 R (HD.2625) 3554 0 R (HD.2626) 3555 0 R (HD.2627) 3556 0 R (HD.2628) 3557 0 R (HD.2629) 3558 0 R (HD.263) 926 0 R (HD.2630) 3559 0 R (HD.2631) 3560 0 R (HD.2632) 3561 0 R (HD.2633) 3562 0 R (HD.2634) 3563 0 R (HD.2635) 3564 0 R (HD.2636) 3565 0 R (HD.2637) 3566 0 R (HD.2638) 3567 0 R (HD.2639) 3568 0 R ] /Limits [ (HD.2610) (HD.2639) ] >>
+<< /Names [ (HD.2496) 3422 0 R (HD.2497) 3423 0 R (HD.2498) 3424 0 R (HD.2499) 3425 0 R (HD.25) 668 0 R (HD.250) 921 0 R (HD.2500) 3426 0 R (HD.2501) 3427 0 R (HD.2502) 3428 0 R (HD.2503) 3429 0 R (HD.2504) 3430 0 R (HD.2505) 3431 0 R (HD.2506) 3432 0 R (HD.2507) 3433 0 R (HD.2508) 3434 0 R (HD.2509) 3435 0 R (HD.251) 922 0 R (HD.2510) 3436 0 R (HD.2511) 3437 0 R (HD.2512) 3438 0 R (HD.2513) 3439 0 R (HD.2514) 3440 0 R (HD.2515) 3441 0 R (HD.2516) 3442 0 R (HD.2517) 3443 0 R (HD.2518) 3444 0 R (HD.2519) 3445 0 R (HD.252) 923 0 R (HD.2520) 3446 0 R (HD.2521) 3447 0 R (HD.2522) 3453 0 R (HD.2523) 3454 0 R ] /Limits [ (HD.2496) (HD.2523) ] >>
endobj
4589 0 obj
-<< /Names [ (HD.264) 927 0 R (HD.2640) 3569 0 R (HD.2641) 3570 0 R (HD.2642) 3571 0 R (HD.2643) 3572 0 R (HD.2644) 3573 0 R (HD.2645) 3574 0 R (HD.2646) 3579 0 R (HD.2647) 3580 0 R (HD.2648) 3581 0 R (HD.2649) 3582 0 R (HD.265) 928 0 R (HD.2650) 3583 0 R (HD.2651) 3584 0 R (HD.2652) 3585 0 R (HD.2653) 3586 0 R (HD.2654) 3587 0 R (HD.2655) 3588 0 R (HD.2656) 3589 0 R (HD.2657) 3590 0 R (HD.2658) 3591 0 R (HD.2659) 3592 0 R (HD.266) 929 0 R (HD.2660) 3593 0 R (HD.2661) 3594 0 R (HD.2662) 3595 0 R (HD.2663) 3596 0 R (HD.2664) 3597 0 R (HD.2665) 3598 0 R (HD.2666) 3599 0 R (HD.2667) 3600 0 R (HD.2668) 3601 0 R ] /Limits [ (HD.264) (HD.2668) ] >>
+<< /Names [ (HD.2524) 3455 0 R (HD.2525) 3456 0 R (HD.2526) 3457 0 R (HD.2527) 3458 0 R (HD.2528) 3459 0 R (HD.2529) 3460 0 R (HD.253) 924 0 R (HD.2530) 3461 0 R (HD.2531) 3462 0 R (HD.2532) 3463 0 R (HD.2533) 3464 0 R (HD.2534) 3465 0 R (HD.2535) 3466 0 R (HD.2536) 3467 0 R (HD.2537) 3468 0 R (HD.2538) 3469 0 R (HD.2539) 3470 0 R (HD.254) 925 0 R (HD.2540) 3471 0 R (HD.2541) 3472 0 R (HD.2542) 3473 0 R (HD.2543) 3474 0 R (HD.2544) 3475 0 R (HD.2545) 3476 0 R (HD.2546) 3477 0 R (HD.2547) 3478 0 R (HD.2548) 3479 0 R (HD.2549) 3480 0 R (HD.255) 926 0 R (HD.2550) 3481 0 R (HD.2551) 3482 0 R (HD.2552) 3483 0 R ] /Limits [ (HD.2524) (HD.2552) ] >>
endobj
4590 0 obj
-<< /Names [ (HD.2669) 3602 0 R (HD.267) 934 0 R (HD.2670) 3603 0 R (HD.2671) 3604 0 R (HD.2672) 3605 0 R (HD.2673) 3606 0 R (HD.2674) 3607 0 R (HD.2675) 3608 0 R (HD.2676) 3609 0 R (HD.2677) 3610 0 R (HD.2678) 3611 0 R (HD.2679) 3612 0 R (HD.268) 935 0 R (HD.2680) 3613 0 R (HD.2681) 3614 0 R (HD.2682) 3615 0 R (HD.2683) 3616 0 R (HD.2684) 3617 0 R (HD.2685) 3618 0 R (HD.2686) 3619 0 R (HD.2687) 3620 0 R (HD.2688) 3621 0 R (HD.2689) 3622 0 R (HD.269) 936 0 R (HD.2690) 3623 0 R (HD.2691) 3624 0 R (HD.2692) 3625 0 R (HD.2693) 3626 0 R (HD.2694) 3627 0 R (HD.2695) 3628 0 R (HD.2696) 3629 0 R (HD.2697) 3635 0 R ] /Limits [ (HD.2669) (HD.2697) ] >>
+<< /Names [ (HD.2553) 3484 0 R (HD.2554) 3485 0 R (HD.2555) 3486 0 R (HD.2556) 3487 0 R (HD.2557) 3488 0 R (HD.2558) 3489 0 R (HD.2559) 3490 0 R (HD.256) 927 0 R (HD.2560) 3491 0 R (HD.2561) 3492 0 R (HD.2562) 3493 0 R (HD.2563) 3494 0 R (HD.2564) 3495 0 R (HD.2565) 3496 0 R (HD.2566) 3497 0 R (HD.2567) 3498 0 R (HD.2568) 3499 0 R (HD.2569) 3500 0 R (HD.257) 928 0 R (HD.2570) 3501 0 R (HD.2571) 3508 0 R (HD.2572) 3509 0 R (HD.2573) 3510 0 R (HD.2574) 3511 0 R (HD.2575) 3512 0 R (HD.2576) 3513 0 R (HD.2577) 3514 0 R (HD.2578) 3515 0 R (HD.2579) 3516 0 R (HD.258) 929 0 R (HD.2580) 3517 0 R (HD.2581) 3518 0 R ] /Limits [ (HD.2553) (HD.2581) ] >>
endobj
4591 0 obj
-<< /Names [ (HD.2698) 3636 0 R (HD.2699) 3637 0 R (HD.27) 662 0 R (HD.270) 937 0 R (HD.2700) 3638 0 R (HD.2701) 3639 0 R (HD.2702) 3640 0 R (HD.2703) 3641 0 R (HD.2704) 3642 0 R (HD.2705) 3643 0 R (HD.2706) 3644 0 R (HD.2707) 3645 0 R (HD.2708) 3646 0 R (HD.2709) 3647 0 R (HD.271) 938 0 R (HD.2710) 3648 0 R (HD.2711) 3649 0 R (HD.2712) 3650 0 R (HD.2713) 3651 0 R (HD.2714) 3652 0 R (HD.2715) 3653 0 R (HD.2716) 3654 0 R (HD.2717) 3655 0 R (HD.2718) 3656 0 R (HD.2719) 3657 0 R (HD.272) 939 0 R (HD.2720) 3658 0 R (HD.2721) 3659 0 R (HD.2722) 3660 0 R (HD.2723) 3661 0 R (HD.2724) 3662 0 R (HD.2725) 3663 0 R ] /Limits [ (HD.2698) (HD.2725) ] >>
+<< /Names [ (HD.2582) 3519 0 R (HD.2583) 3520 0 R (HD.2584) 3521 0 R (HD.2585) 3522 0 R (HD.2586) 3523 0 R (HD.2587) 3524 0 R (HD.2588) 3525 0 R (HD.2589) 3526 0 R (HD.259) 930 0 R (HD.2590) 3527 0 R (HD.2591) 3528 0 R (HD.2592) 3529 0 R (HD.2593) 3530 0 R (HD.2594) 3531 0 R (HD.2595) 3532 0 R (HD.2596) 3533 0 R (HD.2597) 3534 0 R (HD.2598) 3535 0 R (HD.2599) 3536 0 R (HD.26) 669 0 R (HD.260) 931 0 R (HD.2600) 3537 0 R (HD.2601) 3538 0 R (HD.2602) 3539 0 R (HD.2603) 3540 0 R (HD.2604) 3541 0 R (HD.2605) 3542 0 R (HD.2606) 3543 0 R (HD.2607) 3544 0 R (HD.2608) 3545 0 R (HD.2609) 3546 0 R (HD.261) 932 0 R ] /Limits [ (HD.2582) (HD.261) ] >>
endobj
4592 0 obj
-<< /Names [ (HD.2726) 3664 0 R (HD.2727) 3665 0 R (HD.2728) 3666 0 R (HD.2729) 3667 0 R (HD.273) 940 0 R (HD.2730) 3668 0 R (HD.2731) 3669 0 R (HD.2732) 3674 0 R (HD.2733) 3675 0 R (HD.2734) 3676 0 R (HD.2735) 3677 0 R (HD.2736) 3678 0 R (HD.2737) 3679 0 R (HD.2738) 3680 0 R (HD.2739) 3681 0 R (HD.274) 941 0 R (HD.2740) 3682 0 R (HD.2741) 3683 0 R (HD.2742) 3684 0 R (HD.2743) 3685 0 R (HD.2744) 3686 0 R (HD.2745) 3687 0 R (HD.2746) 3688 0 R (HD.2747) 3689 0 R (HD.2748) 3690 0 R (HD.2749) 3691 0 R (HD.275) 942 0 R (HD.2750) 3692 0 R (HD.2751) 3693 0 R (HD.2752) 3694 0 R (HD.2753) 3695 0 R (HD.2754) 3696 0 R ] /Limits [ (HD.2726) (HD.2754) ] >>
+<< /Names [ (HD.2610) 3547 0 R (HD.2611) 3548 0 R (HD.2612) 3549 0 R (HD.2613) 3550 0 R (HD.2614) 3551 0 R (HD.2615) 3552 0 R (HD.2616) 3553 0 R (HD.2617) 3554 0 R (HD.2618) 3555 0 R (HD.2619) 3556 0 R (HD.262) 933 0 R (HD.2620) 3557 0 R (HD.2621) 3558 0 R (HD.2622) 3559 0 R (HD.2623) 3560 0 R (HD.2624) 3561 0 R (HD.2625) 3562 0 R (HD.2626) 3563 0 R (HD.2627) 3564 0 R (HD.2628) 3565 0 R (HD.2629) 3566 0 R (HD.263) 934 0 R (HD.2630) 3567 0 R (HD.2631) 3568 0 R (HD.2632) 3574 0 R (HD.2633) 3575 0 R (HD.2634) 3576 0 R (HD.2635) 3577 0 R (HD.2636) 3578 0 R (HD.2637) 3579 0 R (HD.2638) 3580 0 R (HD.2639) 3581 0 R ] /Limits [ (HD.2610) (HD.2639) ] >>
endobj
4593 0 obj
-<< /Names [ (HD.2755) 3697 0 R (HD.2756) 3698 0 R (HD.2757) 3699 0 R (HD.2758) 3700 0 R (HD.2759) 3701 0 R (HD.276) 943 0 R (HD.2760) 3702 0 R (HD.2761) 3703 0 R (HD.2762) 3704 0 R (HD.2763) 3705 0 R (HD.2764) 3706 0 R (HD.2765) 3707 0 R (HD.2766) 3708 0 R (HD.2767) 3709 0 R (HD.2768) 3710 0 R (HD.2769) 3711 0 R (HD.277) 944 0 R (HD.2770) 3712 0 R (HD.2771) 3713 0 R (HD.2772) 3714 0 R (HD.2773) 3715 0 R (HD.2774) 3716 0 R (HD.2775) 3717 0 R (HD.2776) 3718 0 R (HD.2777) 3719 0 R (HD.2778) 3720 0 R (HD.2779) 3725 0 R (HD.278) 945 0 R (HD.2780) 3726 0 R (HD.2781) 3727 0 R (HD.2782) 3728 0 R (HD.2783) 3729 0 R ] /Limits [ (HD.2755) (HD.2783) ] >>
+<< /Names [ (HD.264) 935 0 R (HD.2640) 3582 0 R (HD.2641) 3583 0 R (HD.2642) 3584 0 R (HD.2643) 3585 0 R (HD.2644) 3586 0 R (HD.2645) 3587 0 R (HD.2646) 3588 0 R (HD.2647) 3589 0 R (HD.2648) 3590 0 R (HD.2649) 3591 0 R (HD.265) 936 0 R (HD.2650) 3592 0 R (HD.2651) 3593 0 R (HD.2652) 3594 0 R (HD.2653) 3595 0 R (HD.2654) 3596 0 R (HD.2655) 3597 0 R (HD.2656) 3598 0 R (HD.2657) 3599 0 R (HD.2658) 3600 0 R (HD.2659) 3601 0 R (HD.266) 937 0 R (HD.2660) 3602 0 R (HD.2661) 3603 0 R (HD.2662) 3604 0 R (HD.2663) 3605 0 R (HD.2664) 3606 0 R (HD.2665) 3607 0 R (HD.2666) 3608 0 R (HD.2667) 3609 0 R (HD.2668) 3610 0 R ] /Limits [ (HD.264) (HD.2668) ] >>
endobj
4594 0 obj
-<< /Names [ (HD.2784) 3730 0 R (HD.2785) 3731 0 R (HD.2786) 3732 0 R (HD.2787) 3733 0 R (HD.2788) 3734 0 R (HD.2789) 3735 0 R (HD.279) 946 0 R (HD.2790) 3736 0 R (HD.2791) 3737 0 R (HD.2792) 3738 0 R (HD.2793) 3739 0 R (HD.2794) 3740 0 R (HD.2795) 3741 0 R (HD.2796) 3742 0 R (HD.2797) 3743 0 R (HD.2798) 3744 0 R (HD.2799) 3745 0 R (HD.28) 663 0 R (HD.280) 947 0 R (HD.2800) 3746 0 R (HD.2801) 3747 0 R (HD.2802) 3748 0 R (HD.2803) 3749 0 R (HD.2804) 3750 0 R (HD.2805) 3751 0 R (HD.2806) 3752 0 R (HD.2807) 3753 0 R (HD.2808) 3754 0 R (HD.2809) 3755 0 R (HD.281) 948 0 R (HD.2810) 3756 0 R (HD.2811) 3757 0 R ] /Limits [ (HD.2784) (HD.2811) ] >>
+<< /Names [ (HD.2669) 3611 0 R (HD.267) 938 0 R (HD.2670) 3612 0 R (HD.2671) 3613 0 R (HD.2672) 3614 0 R (HD.2673) 3615 0 R (HD.2674) 3616 0 R (HD.2675) 3617 0 R (HD.2676) 3618 0 R (HD.2677) 3619 0 R (HD.2678) 3620 0 R (HD.2679) 3621 0 R (HD.268) 939 0 R (HD.2680) 3622 0 R (HD.2681) 3623 0 R (HD.2682) 3624 0 R (HD.2683) 3629 0 R (HD.2684) 3630 0 R (HD.2685) 3631 0 R (HD.2686) 3632 0 R (HD.2687) 3633 0 R (HD.2688) 3634 0 R (HD.2689) 3635 0 R (HD.269) 940 0 R (HD.2690) 3636 0 R (HD.2691) 3637 0 R (HD.2692) 3638 0 R (HD.2693) 3639 0 R (HD.2694) 3640 0 R (HD.2695) 3641 0 R (HD.2696) 3642 0 R (HD.2697) 3643 0 R ] /Limits [ (HD.2669) (HD.2697) ] >>
endobj
4595 0 obj
-<< /Names [ (HD.2812) 3758 0 R (HD.2813) 3759 0 R (HD.2814) 3760 0 R (HD.2815) 3761 0 R (HD.2816) 3762 0 R (HD.2817) 3763 0 R (HD.2818) 3764 0 R (HD.2819) 3765 0 R (HD.282) 949 0 R (HD.2820) 3770 0 R (HD.2821) 3771 0 R (HD.2822) 3772 0 R (HD.2823) 3773 0 R (HD.2824) 3774 0 R (HD.2825) 3775 0 R (HD.2826) 3776 0 R (HD.2827) 3777 0 R (HD.2828) 3778 0 R (HD.2829) 3779 0 R (HD.283) 950 0 R (HD.2830) 3780 0 R (HD.2831) 3781 0 R (HD.2832) 3782 0 R (HD.2833) 3783 0 R (HD.2834) 3784 0 R (HD.2835) 3785 0 R (HD.2836) 3786 0 R (HD.2837) 3787 0 R (HD.2838) 3788 0 R (HD.2839) 3789 0 R (HD.284) 951 0 R (HD.2840) 3790 0 R ] /Limits [ (HD.2812) (HD.2840) ] >>
+<< /Names [ (HD.2698) 3644 0 R (HD.2699) 3645 0 R (HD.27) 670 0 R (HD.270) 941 0 R (HD.2700) 3646 0 R (HD.2701) 3647 0 R (HD.2702) 3648 0 R (HD.2703) 3649 0 R (HD.2704) 3650 0 R (HD.2705) 3651 0 R (HD.2706) 3652 0 R (HD.2707) 3653 0 R (HD.2708) 3654 0 R (HD.2709) 3655 0 R (HD.271) 942 0 R (HD.2710) 3656 0 R (HD.2711) 3657 0 R (HD.2712) 3658 0 R (HD.2713) 3659 0 R (HD.2714) 3660 0 R (HD.2715) 3661 0 R (HD.2716) 3662 0 R (HD.2717) 3663 0 R (HD.2718) 3664 0 R (HD.2719) 3665 0 R (HD.272) 943 0 R (HD.2720) 3666 0 R (HD.2721) 3671 0 R (HD.2722) 3672 0 R (HD.2723) 3673 0 R (HD.2724) 3674 0 R (HD.2725) 3675 0 R ] /Limits [ (HD.2698) (HD.2725) ] >>
endobj
4596 0 obj
-<< /Names [ (HD.2841) 3791 0 R (HD.2842) 3792 0 R (HD.2843) 3793 0 R (HD.2844) 3794 0 R (HD.2845) 3795 0 R (HD.2846) 3796 0 R (HD.2847) 3797 0 R (HD.2848) 3798 0 R (HD.2849) 3799 0 R (HD.285) 952 0 R (HD.2850) 3800 0 R (HD.2851) 3801 0 R (HD.2852) 3802 0 R (HD.2853) 3803 0 R (HD.2854) 3804 0 R (HD.2855) 3805 0 R (HD.2856) 3806 0 R (HD.2857) 3807 0 R (HD.2858) 3808 0 R (HD.2859) 3809 0 R (HD.286) 953 0 R (HD.2860) 3810 0 R (HD.2861) 3811 0 R (HD.2862) 3812 0 R (HD.2863) 3813 0 R (HD.2864) 3814 0 R (HD.2865) 3815 0 R (HD.2866) 3816 0 R (HD.2867) 3817 0 R (HD.2868) 3822 0 R (HD.2869) 3823 0 R (HD.287) 954 0 R ] /Limits [ (HD.2841) (HD.287) ] >>
+<< /Names [ (HD.2726) 3676 0 R (HD.2727) 3677 0 R (HD.2728) 3678 0 R (HD.2729) 3679 0 R (HD.273) 948 0 R (HD.2730) 3680 0 R (HD.2731) 3681 0 R (HD.2732) 3682 0 R (HD.2733) 3683 0 R (HD.2734) 3684 0 R (HD.2735) 3685 0 R (HD.2736) 3686 0 R (HD.2737) 3687 0 R (HD.2738) 3688 0 R (HD.2739) 3689 0 R (HD.274) 949 0 R (HD.2740) 3690 0 R (HD.2741) 3691 0 R (HD.2742) 3692 0 R (HD.2743) 3693 0 R (HD.2744) 3694 0 R (HD.2745) 3695 0 R (HD.2746) 3696 0 R (HD.2747) 3697 0 R (HD.2748) 3698 0 R (HD.2749) 3699 0 R (HD.275) 950 0 R (HD.2750) 3700 0 R (HD.2751) 3701 0 R (HD.2752) 3702 0 R (HD.2753) 3703 0 R (HD.2754) 3704 0 R ] /Limits [ (HD.2726) (HD.2754) ] >>
endobj
4597 0 obj
-<< /Names [ (HD.2870) 3824 0 R (HD.2871) 3825 0 R (HD.2872) 3826 0 R (HD.2873) 3827 0 R (HD.2874) 3828 0 R (HD.2875) 3829 0 R (HD.2876) 3830 0 R (HD.2877) 3831 0 R (HD.2878) 3832 0 R (HD.2879) 3833 0 R (HD.288) 955 0 R (HD.2880) 3834 0 R (HD.2881) 3835 0 R (HD.2882) 3836 0 R (HD.2883) 3837 0 R (HD.2884) 3838 0 R (HD.2885) 3839 0 R (HD.2886) 3840 0 R (HD.2887) 3841 0 R (HD.2888) 3842 0 R (HD.2889) 3843 0 R (HD.289) 956 0 R (HD.2890) 3844 0 R (HD.2891) 3845 0 R (HD.2892) 3846 0 R (HD.2893) 3847 0 R (HD.2894) 3848 0 R (HD.2895) 3849 0 R (HD.2896) 3850 0 R (HD.2897) 3851 0 R (HD.2898) 3852 0 R (HD.2899) 3853 0 R ] /Limits [ (HD.2870) (HD.2899) ] >>
+<< /Names [ (HD.2755) 3705 0 R (HD.2756) 3706 0 R (HD.2757) 3707 0 R (HD.2758) 3708 0 R (HD.2759) 3709 0 R (HD.276) 951 0 R (HD.2760) 3710 0 R (HD.2761) 3711 0 R (HD.2762) 3712 0 R (HD.2763) 3713 0 R (HD.2764) 3714 0 R (HD.2765) 3715 0 R (HD.2766) 3720 0 R (HD.2767) 3721 0 R (HD.2768) 3722 0 R (HD.2769) 3723 0 R (HD.277) 952 0 R (HD.2770) 3724 0 R (HD.2771) 3725 0 R (HD.2772) 3726 0 R (HD.2773) 3727 0 R (HD.2774) 3728 0 R (HD.2775) 3729 0 R (HD.2776) 3730 0 R (HD.2777) 3731 0 R (HD.2778) 3732 0 R (HD.2779) 3733 0 R (HD.278) 953 0 R (HD.2780) 3734 0 R (HD.2781) 3735 0 R (HD.2782) 3736 0 R (HD.2783) 3737 0 R ] /Limits [ (HD.2755) (HD.2783) ] >>
endobj
4598 0 obj
-<< /Names [ (HD.29) 664 0 R (HD.290) 957 0 R (HD.2900) 3854 0 R (HD.2901) 3855 0 R (HD.2902) 3856 0 R (HD.2903) 3857 0 R (HD.2904) 3858 0 R (HD.2905) 3859 0 R (HD.2906) 3860 0 R (HD.2907) 3865 0 R (HD.2908) 3866 0 R (HD.2909) 3867 0 R (HD.291) 958 0 R (HD.2910) 3868 0 R (HD.2911) 3869 0 R (HD.2912) 3870 0 R (HD.2913) 3871 0 R (HD.2914) 3872 0 R (HD.2915) 3873 0 R (HD.2916) 3874 0 R (HD.2917) 3875 0 R (HD.2918) 3876 0 R (HD.2919) 3877 0 R (HD.292) 959 0 R (HD.2920) 3878 0 R (HD.2921) 3879 0 R (HD.2922) 3880 0 R (HD.2923) 3881 0 R (HD.2924) 3882 0 R (HD.2925) 3883 0 R (HD.2926) 3884 0 R (HD.2927) 3885 0 R ] /Limits [ (HD.29) (HD.2927) ] >>
+<< /Names [ (HD.2784) 3738 0 R (HD.2785) 3739 0 R (HD.2786) 3740 0 R (HD.2787) 3741 0 R (HD.2788) 3742 0 R (HD.2789) 3743 0 R (HD.279) 954 0 R (HD.2790) 3744 0 R (HD.2791) 3745 0 R (HD.2792) 3746 0 R (HD.2793) 3747 0 R (HD.2794) 3748 0 R (HD.2795) 3749 0 R (HD.2796) 3754 0 R (HD.2797) 3755 0 R (HD.2798) 3756 0 R (HD.2799) 3757 0 R (HD.28) 671 0 R (HD.280) 955 0 R (HD.2800) 3758 0 R (HD.2801) 3759 0 R (HD.2802) 3760 0 R (HD.2803) 3761 0 R (HD.2804) 3762 0 R (HD.2805) 3763 0 R (HD.2806) 3764 0 R (HD.2807) 3765 0 R (HD.2808) 3766 0 R (HD.2809) 3767 0 R (HD.281) 956 0 R (HD.2810) 3768 0 R (HD.2811) 3769 0 R ] /Limits [ (HD.2784) (HD.2811) ] >>
endobj
4599 0 obj
-<< /Names [ (HD.2928) 3886 0 R (HD.2929) 3887 0 R (HD.293) 960 0 R (HD.2930) 3888 0 R (HD.2931) 3889 0 R (HD.2932) 3890 0 R (HD.2933) 3891 0 R (HD.2934) 3892 0 R (HD.2935) 3893 0 R (HD.2936) 3894 0 R (HD.2937) 3895 0 R (HD.2938) 3896 0 R (HD.2939) 3897 0 R (HD.294) 961 0 R (HD.2940) 3898 0 R (HD.2941) 3899 0 R (HD.2942) 3900 0 R (HD.2943) 3901 0 R (HD.2944) 3902 0 R (HD.2945) 3903 0 R (HD.2946) 3904 0 R (HD.2947) 3905 0 R (HD.2948) 3906 0 R (HD.2949) 3907 0 R (HD.295) 962 0 R (HD.2950) 3908 0 R (HD.2951) 3909 0 R (HD.2952) 3910 0 R (HD.2953) 3911 0 R (HD.2954) 3912 0 R (HD.2955) 3913 0 R (HD.2956) 3914 0 R ] /Limits [ (HD.2928) (HD.2956) ] >>
+<< /Names [ (HD.2812) 3770 0 R (HD.2813) 3771 0 R (HD.2814) 3772 0 R (HD.2815) 3773 0 R (HD.2816) 3774 0 R (HD.2817) 3775 0 R (HD.2818) 3776 0 R (HD.2819) 3777 0 R (HD.282) 957 0 R (HD.2820) 3778 0 R (HD.2821) 3779 0 R (HD.2822) 3780 0 R (HD.2823) 3781 0 R (HD.2824) 3782 0 R (HD.2825) 3783 0 R (HD.2826) 3784 0 R (HD.2827) 3785 0 R (HD.2828) 3786 0 R (HD.2829) 3787 0 R (HD.283) 958 0 R (HD.2830) 3788 0 R (HD.2831) 3789 0 R (HD.2832) 3790 0 R (HD.2833) 3795 0 R (HD.2834) 3796 0 R (HD.2835) 3797 0 R (HD.2836) 3798 0 R (HD.2837) 3799 0 R (HD.2838) 3800 0 R (HD.2839) 3801 0 R (HD.284) 959 0 R (HD.2840) 3802 0 R ] /Limits [ (HD.2812) (HD.2840) ] >>
endobj
4600 0 obj
-<< /Names [ (HD.2957) 3915 0 R (HD.2958) 3916 0 R (HD.2959) 3921 0 R (HD.296) 963 0 R (HD.2960) 3922 0 R (HD.2961) 3923 0 R (HD.2962) 3924 0 R (HD.2963) 3925 0 R (HD.2964) 3926 0 R (HD.2965) 3927 0 R (HD.2966) 3928 0 R (HD.2967) 3929 0 R (HD.2968) 3930 0 R (HD.2969) 3931 0 R (HD.297) 964 0 R (HD.2970) 3932 0 R (HD.2971) 3933 0 R (HD.2972) 3934 0 R (HD.2973) 3935 0 R (HD.2974) 3936 0 R (HD.2975) 3937 0 R (HD.2976) 3938 0 R (HD.2977) 3939 0 R (HD.2978) 3940 0 R (HD.2979) 3941 0 R (HD.298) 965 0 R (HD.2980) 3942 0 R (HD.2981) 3943 0 R (HD.2982) 3944 0 R (HD.2983) 3945 0 R (HD.2984) 3946 0 R (HD.2985) 3947 0 R ] /Limits [ (HD.2957) (HD.2985) ] >>
+<< /Names [ (HD.2841) 3803 0 R (HD.2842) 3804 0 R (HD.2843) 3805 0 R (HD.2844) 3806 0 R (HD.2845) 3807 0 R (HD.2846) 3808 0 R (HD.2847) 3809 0 R (HD.2848) 3810 0 R (HD.2849) 3811 0 R (HD.285) 960 0 R (HD.2850) 3812 0 R (HD.2851) 3813 0 R (HD.2852) 3814 0 R (HD.2853) 3815 0 R (HD.2854) 3816 0 R (HD.2855) 3817 0 R (HD.2856) 3818 0 R (HD.2857) 3819 0 R (HD.2858) 3820 0 R (HD.2859) 3821 0 R (HD.286) 961 0 R (HD.2860) 3822 0 R (HD.2861) 3823 0 R (HD.2862) 3824 0 R (HD.2863) 3825 0 R (HD.2864) 3826 0 R (HD.2865) 3827 0 R (HD.2866) 3828 0 R (HD.2867) 3829 0 R (HD.2868) 3830 0 R (HD.2869) 3831 0 R (HD.287) 962 0 R ] /Limits [ (HD.2841) (HD.287) ] >>
endobj
4601 0 obj
-<< /Names [ (HD.2986) 3948 0 R (HD.2987) 3949 0 R (HD.2988) 3950 0 R (HD.2989) 3951 0 R (HD.299) 966 0 R (HD.2990) 3952 0 R (HD.2991) 3953 0 R (HD.2992) 3954 0 R (HD.2993) 3955 0 R (HD.2994) 3956 0 R (HD.2995) 3957 0 R (HD.2996) 3958 0 R (HD.2997) 3959 0 R (HD.2998) 3960 0 R (HD.2999) 3961 0 R (HD.3) 638 0 R (HD.30) 665 0 R (HD.300) 967 0 R (HD.3000) 3962 0 R (HD.3001) 3963 0 R (HD.3002) 3964 0 R (HD.3003) 3965 0 R (HD.3004) 3966 0 R (HD.3005) 3971 0 R (HD.3006) 3972 0 R (HD.3007) 3973 0 R (HD.3008) 3974 0 R (HD.3009) 3975 0 R (HD.301) 968 0 R (HD.3010) 3976 0 R (HD.3011) 3977 0 R (HD.3012) 3978 0 R ] /Limits [ (HD.2986) (HD.3012) ] >>
+<< /Names [ (HD.2870) 3832 0 R (HD.2871) 3833 0 R (HD.2872) 3834 0 R (HD.2873) 3835 0 R (HD.2874) 3836 0 R (HD.2875) 3841 0 R (HD.2876) 3842 0 R (HD.2877) 3843 0 R (HD.2878) 3844 0 R (HD.2879) 3845 0 R (HD.288) 963 0 R (HD.2880) 3846 0 R (HD.2881) 3847 0 R (HD.2882) 3848 0 R (HD.2883) 3849 0 R (HD.2884) 3850 0 R (HD.2885) 3851 0 R (HD.2886) 3852 0 R (HD.2887) 3853 0 R (HD.2888) 3854 0 R (HD.2889) 3855 0 R (HD.289) 964 0 R (HD.2890) 3856 0 R (HD.2891) 3857 0 R (HD.2892) 3858 0 R (HD.2893) 3859 0 R (HD.2894) 3860 0 R (HD.2895) 3861 0 R (HD.2896) 3862 0 R (HD.2897) 3863 0 R (HD.2898) 3864 0 R (HD.2899) 3865 0 R ] /Limits [ (HD.2870) (HD.2899) ] >>
endobj
4602 0 obj
-<< /Names [ (HD.3013) 3979 0 R (HD.3014) 3980 0 R (HD.3015) 3981 0 R (HD.3016) 3982 0 R (HD.3017) 3983 0 R (HD.3018) 3984 0 R (HD.3019) 3985 0 R (HD.302) 969 0 R (HD.3020) 3986 0 R (HD.3021) 3987 0 R (HD.3022) 3988 0 R (HD.3023) 3989 0 R (HD.3024) 3990 0 R (HD.3025) 3991 0 R (HD.3026) 3992 0 R (HD.3027) 3993 0 R (HD.3028) 3994 0 R (HD.3029) 3995 0 R (HD.303) 970 0 R (HD.3030) 3996 0 R (HD.3031) 3997 0 R (HD.3032) 3998 0 R (HD.3033) 3999 0 R (HD.3034) 4000 0 R (HD.3035) 4001 0 R (HD.3036) 4002 0 R (HD.3037) 4003 0 R (HD.3038) 4004 0 R (HD.3039) 4005 0 R (HD.304) 971 0 R (HD.3040) 4006 0 R (HD.3041) 4007 0 R ] /Limits [ (HD.3013) (HD.3041) ] >>
+<< /Names [ (HD.29) 672 0 R (HD.290) 965 0 R (HD.2900) 3866 0 R (HD.2901) 3867 0 R (HD.2902) 3868 0 R (HD.2903) 3869 0 R (HD.2904) 3870 0 R (HD.2905) 3871 0 R (HD.2906) 3872 0 R (HD.2907) 3873 0 R (HD.2908) 3874 0 R (HD.2909) 3875 0 R (HD.291) 966 0 R (HD.2910) 3876 0 R (HD.2911) 3877 0 R (HD.2912) 3878 0 R (HD.2913) 3879 0 R (HD.2914) 3880 0 R (HD.2915) 3881 0 R (HD.2916) 3882 0 R (HD.2917) 3883 0 R (HD.2918) 3884 0 R (HD.2919) 3889 0 R (HD.292) 967 0 R (HD.2920) 3890 0 R (HD.2921) 3891 0 R (HD.2922) 3892 0 R (HD.2923) 3893 0 R (HD.2924) 3894 0 R (HD.2925) 3895 0 R (HD.2926) 3896 0 R (HD.2927) 3897 0 R ] /Limits [ (HD.29) (HD.2927) ] >>
endobj
4603 0 obj
-<< /Names [ (HD.3042) 4008 0 R (HD.3043) 4009 0 R (HD.3044) 4010 0 R (HD.3045) 4011 0 R (HD.3046) 4012 0 R (HD.3047) 4013 0 R (HD.3048) 4014 0 R (HD.3049) 4015 0 R (HD.305) 972 0 R (HD.3050) 4016 0 R (HD.3051) 4017 0 R (HD.3052) 4018 0 R (HD.3053) 4019 0 R (HD.3054) 4020 0 R (HD.3055) 4025 0 R (HD.3056) 4026 0 R (HD.3057) 4027 0 R (HD.3058) 4028 0 R (HD.3059) 4029 0 R (HD.306) 973 0 R (HD.3060) 4030 0 R (HD.3061) 4031 0 R (HD.3062) 4032 0 R (HD.3063) 4033 0 R (HD.3064) 4034 0 R (HD.3065) 4035 0 R (HD.3066) 4036 0 R (HD.3067) 4037 0 R (HD.3068) 4038 0 R (HD.3069) 4039 0 R (HD.307) 974 0 R (HD.3070) 4040 0 R ] /Limits [ (HD.3042) (HD.3070) ] >>
+<< /Names [ (HD.2928) 3898 0 R (HD.2929) 3899 0 R (HD.293) 968 0 R (HD.2930) 3900 0 R (HD.2931) 3901 0 R (HD.2932) 3902 0 R (HD.2933) 3903 0 R (HD.2934) 3904 0 R (HD.2935) 3905 0 R (HD.2936) 3906 0 R (HD.2937) 3907 0 R (HD.2938) 3908 0 R (HD.2939) 3909 0 R (HD.294) 969 0 R (HD.2940) 3910 0 R (HD.2941) 3911 0 R (HD.2942) 3912 0 R (HD.2943) 3913 0 R (HD.2944) 3914 0 R (HD.2945) 3915 0 R (HD.2946) 3916 0 R (HD.2947) 3917 0 R (HD.2948) 3918 0 R (HD.2949) 3919 0 R (HD.295) 970 0 R (HD.2950) 3920 0 R (HD.2951) 3921 0 R (HD.2952) 3922 0 R (HD.2953) 3923 0 R (HD.2954) 3924 0 R (HD.2955) 3925 0 R (HD.2956) 3926 0 R ] /Limits [ (HD.2928) (HD.2956) ] >>
endobj
4604 0 obj
-<< /Names [ (HD.3071) 4041 0 R (HD.3072) 4042 0 R (HD.3073) 4043 0 R (HD.3074) 4044 0 R (HD.3075) 4045 0 R (HD.3076) 4046 0 R (HD.3077) 4047 0 R (HD.3078) 4048 0 R (HD.3079) 4049 0 R (HD.308) 975 0 R (HD.3080) 4050 0 R (HD.3081) 4051 0 R (HD.3082) 4052 0 R (HD.3083) 4053 0 R (HD.3084) 4054 0 R (HD.3085) 4055 0 R (HD.3086) 4056 0 R (HD.3087) 4057 0 R (HD.3088) 4058 0 R (HD.3089) 4059 0 R (HD.309) 976 0 R (HD.3090) 4060 0 R (HD.3091) 4061 0 R (HD.3092) 4062 0 R (HD.3093) 4063 0 R (HD.3094) 4064 0 R (HD.3095) 4065 0 R (HD.3096) 4066 0 R (HD.3097) 4067 0 R (HD.3098) 4068 0 R (HD.3099) 4069 0 R (HD.31) 666 0 R ] /Limits [ (HD.3071) (HD.31) ] >>
+<< /Names [ (HD.2957) 3927 0 R (HD.2958) 3928 0 R (HD.2959) 3929 0 R (HD.296) 971 0 R (HD.2960) 3930 0 R (HD.2961) 3931 0 R (HD.2962) 3932 0 R (HD.2963) 3933 0 R (HD.2964) 3934 0 R (HD.2965) 3935 0 R (HD.2966) 3936 0 R (HD.2967) 3937 0 R (HD.2968) 3938 0 R (HD.2969) 3939 0 R (HD.297) 972 0 R (HD.2970) 3940 0 R (HD.2971) 3941 0 R (HD.2972) 3942 0 R (HD.2973) 3943 0 R (HD.2974) 3948 0 R (HD.2975) 3949 0 R (HD.2976) 3950 0 R (HD.2977) 3951 0 R (HD.2978) 3952 0 R (HD.2979) 3953 0 R (HD.298) 973 0 R (HD.2980) 3954 0 R (HD.2981) 3955 0 R (HD.2982) 3956 0 R (HD.2983) 3957 0 R (HD.2984) 3958 0 R (HD.2985) 3959 0 R ] /Limits [ (HD.2957) (HD.2985) ] >>
endobj
4605 0 obj
-<< /Names [ (HD.310) 977 0 R (HD.3100) 4070 0 R (HD.3101) 4071 0 R (HD.3102) 4072 0 R (HD.3103) 4073 0 R (HD.3104) 4074 0 R (HD.3105) 4075 0 R (HD.3106) 4076 0 R (HD.3107) 4077 0 R (HD.3108) 4078 0 R (HD.3109) 4079 0 R (HD.311) 978 0 R (HD.3110) 4080 0 R (HD.3111) 4081 0 R (HD.3112) 4082 0 R (HD.3113) 4083 0 R (HD.3114) 4084 0 R (HD.3115) 4085 0 R (HD.3116) 4086 0 R (HD.3117) 4091 0 R (HD.3118) 4092 0 R (HD.3119) 4093 0 R (HD.312) 979 0 R (HD.3120) 4094 0 R (HD.3121) 4095 0 R (HD.3122) 4096 0 R (HD.3123) 4097 0 R (HD.3124) 4098 0 R (HD.3125) 4099 0 R (HD.3126) 4100 0 R (HD.3127) 4101 0 R (HD.3128) 4102 0 R ] /Limits [ (HD.310) (HD.3128) ] >>
+<< /Names [ (HD.2986) 3960 0 R (HD.2987) 3961 0 R (HD.2988) 3962 0 R (HD.2989) 3963 0 R (HD.299) 974 0 R (HD.2990) 3964 0 R (HD.2991) 3965 0 R (HD.2992) 3966 0 R (HD.2993) 3967 0 R (HD.2994) 3968 0 R (HD.2995) 3969 0 R (HD.2996) 3970 0 R (HD.2997) 3971 0 R (HD.2998) 3972 0 R (HD.2999) 3973 0 R (HD.3) 646 0 R (HD.30) 673 0 R (HD.300) 975 0 R (HD.3000) 3974 0 R (HD.3001) 3975 0 R (HD.3002) 3976 0 R (HD.3003) 3977 0 R (HD.3004) 3978 0 R (HD.3005) 3979 0 R (HD.3006) 3980 0 R (HD.3007) 3981 0 R (HD.3008) 3982 0 R (HD.3009) 3983 0 R (HD.301) 976 0 R (HD.3010) 3984 0 R (HD.3011) 3985 0 R (HD.3012) 3986 0 R ] /Limits [ (HD.2986) (HD.3012) ] >>
endobj
4606 0 obj
-<< /Names [ (HD.3129) 4103 0 R (HD.313) 980 0 R (HD.3130) 4104 0 R (HD.3131) 4105 0 R (HD.3132) 4106 0 R (HD.3133) 4107 0 R (HD.3134) 4108 0 R (HD.3135) 4109 0 R (HD.3136) 4110 0 R (HD.3137) 4111 0 R (HD.3138) 4112 0 R (HD.3139) 4113 0 R (HD.314) 981 0 R (HD.3140) 4114 0 R (HD.3141) 4115 0 R (HD.3142) 4116 0 R (HD.3143) 4117 0 R (HD.3144) 4118 0 R (HD.3145) 4119 0 R (HD.3146) 4120 0 R (HD.3147) 4121 0 R (HD.3148) 4122 0 R (HD.3149) 4123 0 R (HD.315) 982 0 R (HD.3150) 4124 0 R (HD.3151) 4125 0 R (HD.3152) 4126 0 R (HD.3153) 4127 0 R (HD.3154) 4128 0 R (HD.3155) 4129 0 R (HD.3156) 4130 0 R (HD.3157) 4131 0 R ] /Limits [ (HD.3129) (HD.3157) ] >>
+<< /Names [ (HD.3013) 3987 0 R (HD.3014) 3988 0 R (HD.3015) 3989 0 R (HD.3016) 3990 0 R (HD.3017) 3991 0 R (HD.3018) 3992 0 R (HD.3019) 3993 0 R (HD.302) 977 0 R (HD.3020) 3994 0 R (HD.3021) 3999 0 R (HD.3022) 4000 0 R (HD.3023) 4001 0 R (HD.3024) 4002 0 R (HD.3025) 4003 0 R (HD.3026) 4004 0 R (HD.3027) 4005 0 R (HD.3028) 4006 0 R (HD.3029) 4007 0 R (HD.303) 978 0 R (HD.3030) 4008 0 R (HD.3031) 4009 0 R (HD.3032) 4010 0 R (HD.3033) 4011 0 R (HD.3034) 4012 0 R (HD.3035) 4013 0 R (HD.3036) 4014 0 R (HD.3037) 4015 0 R (HD.3038) 4016 0 R (HD.3039) 4017 0 R (HD.304) 979 0 R (HD.3040) 4018 0 R (HD.3041) 4019 0 R ] /Limits [ (HD.3013) (HD.3041) ] >>
endobj
4607 0 obj
-<< /Names [ (HD.3158) 4132 0 R (HD.3159) 4133 0 R (HD.316) 983 0 R (HD.3160) 4134 0 R (HD.3161) 4135 0 R (HD.3162) 4136 0 R (HD.3163) 4137 0 R (HD.3164) 4138 0 R (HD.3165) 4139 0 R (HD.3166) 4140 0 R (HD.3167) 4141 0 R (HD.3168) 4142 0 R (HD.3169) 4148 0 R (HD.317) 984 0 R (HD.3170) 4149 0 R (HD.3171) 4150 0 R (HD.3172) 4151 0 R (HD.3173) 4152 0 R (HD.3174) 4153 0 R (HD.3175) 4154 0 R (HD.3176) 4155 0 R (HD.3177) 4156 0 R (HD.3178) 4157 0 R (HD.3179) 4158 0 R (HD.318) 985 0 R (HD.3180) 4159 0 R (HD.3181) 4160 0 R (HD.3182) 4161 0 R (HD.3183) 4162 0 R (HD.3184) 4163 0 R (HD.3185) 4164 0 R (HD.3186) 4165 0 R ] /Limits [ (HD.3158) (HD.3186) ] >>
+<< /Names [ (HD.3042) 4020 0 R (HD.3043) 4021 0 R (HD.3044) 4022 0 R (HD.3045) 4023 0 R (HD.3046) 4024 0 R (HD.3047) 4025 0 R (HD.3048) 4026 0 R (HD.3049) 4027 0 R (HD.305) 980 0 R (HD.3050) 4028 0 R (HD.3051) 4029 0 R (HD.3052) 4030 0 R (HD.3053) 4031 0 R (HD.3054) 4032 0 R (HD.3055) 4033 0 R (HD.3056) 4034 0 R (HD.3057) 4035 0 R (HD.3058) 4036 0 R (HD.3059) 4037 0 R (HD.306) 981 0 R (HD.3060) 4038 0 R (HD.3061) 4039 0 R (HD.3062) 4040 0 R (HD.3063) 4041 0 R (HD.3064) 4042 0 R (HD.3065) 4043 0 R (HD.3066) 4044 0 R (HD.3067) 4045 0 R (HD.3068) 4046 0 R (HD.3069) 4052 0 R (HD.307) 982 0 R (HD.3070) 4053 0 R ] /Limits [ (HD.3042) (HD.3070) ] >>
endobj
4608 0 obj
-<< /Names [ (HD.3187) 4166 0 R (HD.3188) 4167 0 R (HD.3189) 4168 0 R (HD.319) 986 0 R (HD.3190) 4169 0 R (HD.3191) 4170 0 R (HD.3192) 4171 0 R (HD.3193) 4172 0 R (HD.3194) 4173 0 R (HD.3195) 4174 0 R (HD.3196) 4175 0 R (HD.3197) 4176 0 R (HD.3198) 4177 0 R (HD.3199) 4178 0 R (HD.32) 667 0 R (HD.320) 987 0 R (HD.3200) 4179 0 R (HD.3201) 4180 0 R (HD.3202) 4181 0 R (HD.3203) 4182 0 R (HD.3204) 4183 0 R (HD.3205) 4184 0 R (HD.3206) 4185 0 R (HD.3207) 4186 0 R (HD.3208) 4187 0 R (HD.3209) 4188 0 R (HD.321) 994 0 R (HD.3210) 4189 0 R (HD.3211) 4190 0 R (HD.3212) 4191 0 R (HD.3213) 4192 0 R (HD.3214) 4193 0 R ] /Limits [ (HD.3187) (HD.3214) ] >>
+<< /Names [ (HD.3071) 4054 0 R (HD.3072) 4055 0 R (HD.3073) 4056 0 R (HD.3074) 4057 0 R (HD.3075) 4058 0 R (HD.3076) 4059 0 R (HD.3077) 4060 0 R (HD.3078) 4061 0 R (HD.3079) 4062 0 R (HD.308) 983 0 R (HD.3080) 4063 0 R (HD.3081) 4064 0 R (HD.3082) 4065 0 R (HD.3083) 4066 0 R (HD.3084) 4067 0 R (HD.3085) 4068 0 R (HD.3086) 4069 0 R (HD.3087) 4070 0 R (HD.3088) 4071 0 R (HD.3089) 4072 0 R (HD.309) 984 0 R (HD.3090) 4073 0 R (HD.3091) 4074 0 R (HD.3092) 4075 0 R (HD.3093) 4076 0 R (HD.3094) 4077 0 R (HD.3095) 4078 0 R (HD.3096) 4079 0 R (HD.3097) 4080 0 R (HD.3098) 4081 0 R (HD.3099) 4082 0 R (HD.31) 674 0 R ] /Limits [ (HD.3071) (HD.31) ] >>
endobj
4609 0 obj
-<< /Names [ (HD.3215) 4194 0 R (HD.3216) 4195 0 R (HD.322) 995 0 R (HD.323) 996 0 R (HD.324) 997 0 R (HD.325) 998 0 R (HD.326) 999 0 R (HD.327) 1000 0 R (HD.328) 1001 0 R (HD.329) 1002 0 R (HD.33) 668 0 R (HD.330) 1003 0 R (HD.331) 1004 0 R (HD.332) 1005 0 R (HD.333) 1006 0 R (HD.334) 1007 0 R (HD.335) 1008 0 R (HD.336) 1009 0 R (HD.337) 1010 0 R (HD.338) 1011 0 R (HD.339) 1012 0 R (HD.34) 669 0 R (HD.340) 1013 0 R (HD.341) 1014 0 R (HD.342) 1015 0 R (HD.343) 1016 0 R (HD.344) 1017 0 R (HD.345) 1018 0 R (HD.346) 1019 0 R (HD.347) 1020 0 R (HD.348) 1021 0 R (HD.349) 1022 0 R ] /Limits [ (HD.3215) (HD.349) ] >>
+<< /Names [ (HD.310) 985 0 R (HD.3100) 4083 0 R (HD.3101) 4084 0 R (HD.3102) 4085 0 R (HD.3103) 4086 0 R (HD.3104) 4087 0 R (HD.3105) 4088 0 R (HD.3106) 4089 0 R (HD.3107) 4090 0 R (HD.3108) 4091 0 R (HD.3109) 4092 0 R (HD.311) 986 0 R (HD.3110) 4093 0 R (HD.3111) 4094 0 R (HD.3112) 4095 0 R (HD.3113) 4096 0 R (HD.3114) 4097 0 R (HD.3115) 4098 0 R (HD.3116) 4099 0 R (HD.3117) 4100 0 R (HD.3118) 4101 0 R (HD.3119) 4102 0 R (HD.312) 987 0 R (HD.3120) 4103 0 R (HD.3121) 4104 0 R (HD.3122) 4105 0 R (HD.3123) 4106 0 R (HD.3124) 4107 0 R (HD.3125) 4108 0 R (HD.3126) 4109 0 R (HD.3127) 4110 0 R (HD.3128) 4111 0 R ] /Limits [ (HD.310) (HD.3128) ] >>
endobj
4610 0 obj
-<< /Names [ (HD.35) 670 0 R (HD.350) 1023 0 R (HD.351) 1024 0 R (HD.352) 1025 0 R (HD.353) 1032 0 R (HD.354) 1033 0 R (HD.355) 1034 0 R (HD.356) 1035 0 R (HD.357) 1036 0 R (HD.358) 1037 0 R (HD.359) 1038 0 R (HD.36) 671 0 R (HD.360) 1039 0 R (HD.361) 1040 0 R (HD.362) 1041 0 R (HD.363) 1042 0 R (HD.364) 1043 0 R (HD.365) 1044 0 R (HD.366) 1045 0 R (HD.367) 1046 0 R (HD.368) 1047 0 R (HD.369) 1048 0 R (HD.37) 676 0 R (HD.370) 1049 0 R (HD.371) 1050 0 R (HD.372) 1051 0 R (HD.373) 1052 0 R (HD.374) 1053 0 R (HD.375) 1054 0 R (HD.376) 1055 0 R (HD.377) 1056 0 R (HD.378) 1057 0 R ] /Limits [ (HD.35) (HD.378) ] >>
+<< /Names [ (HD.3129) 4112 0 R (HD.313) 988 0 R (HD.3130) 4113 0 R (HD.3131) 4118 0 R (HD.3132) 4119 0 R (HD.3133) 4120 0 R (HD.3134) 4121 0 R (HD.3135) 4122 0 R (HD.3136) 4123 0 R (HD.3137) 4124 0 R (HD.3138) 4125 0 R (HD.3139) 4126 0 R (HD.314) 989 0 R (HD.3140) 4127 0 R (HD.3141) 4128 0 R (HD.3142) 4129 0 R (HD.3143) 4130 0 R (HD.3144) 4131 0 R (HD.3145) 4132 0 R (HD.3146) 4133 0 R (HD.3147) 4134 0 R (HD.3148) 4135 0 R (HD.3149) 4136 0 R (HD.315) 990 0 R (HD.3150) 4137 0 R (HD.3151) 4138 0 R (HD.3152) 4139 0 R (HD.3153) 4140 0 R (HD.3154) 4141 0 R (HD.3155) 4142 0 R (HD.3156) 4143 0 R (HD.3157) 4144 0 R ] /Limits [ (HD.3129) (HD.3157) ] >>
endobj
4611 0 obj
-<< /Names [ (HD.379) 1058 0 R (HD.38) 677 0 R (HD.380) 1059 0 R (HD.381) 1060 0 R (HD.382) 1061 0 R (HD.383) 1062 0 R (HD.384) 1063 0 R (HD.385) 1064 0 R (HD.386) 1065 0 R (HD.387) 1066 0 R (HD.388) 1067 0 R (HD.389) 1068 0 R (HD.39) 678 0 R (HD.390) 1069 0 R (HD.391) 1070 0 R (HD.392) 1071 0 R (HD.393) 1072 0 R (HD.394) 1073 0 R (HD.395) 1074 0 R (HD.396) 1075 0 R (HD.397) 1076 0 R (HD.398) 1077 0 R (HD.399) 1078 0 R (HD.4) 639 0 R (HD.40) 679 0 R (HD.400) 1079 0 R (HD.401) 1080 0 R (HD.402) 1081 0 R (HD.403) 1082 0 R (HD.404) 1083 0 R (HD.405) 1088 0 R (HD.406) 1089 0 R ] /Limits [ (HD.379) (HD.406) ] >>
+<< /Names [ (HD.3158) 4145 0 R (HD.3159) 4146 0 R (HD.316) 991 0 R (HD.3160) 4147 0 R (HD.3161) 4148 0 R (HD.3162) 4149 0 R (HD.3163) 4150 0 R (HD.3164) 4151 0 R (HD.3165) 4152 0 R (HD.3166) 4153 0 R (HD.3167) 4154 0 R (HD.3168) 4155 0 R (HD.3169) 4156 0 R (HD.317) 992 0 R (HD.3170) 4157 0 R (HD.3171) 4158 0 R (HD.3172) 4159 0 R (HD.3173) 4160 0 R (HD.3174) 4161 0 R (HD.3175) 4162 0 R (HD.3176) 4163 0 R (HD.3177) 4164 0 R (HD.3178) 4165 0 R (HD.3179) 4166 0 R (HD.318) 993 0 R (HD.3180) 4167 0 R (HD.3181) 4168 0 R (HD.3182) 4169 0 R (HD.3183) 4170 0 R (HD.3184) 4171 0 R (HD.3185) 4176 0 R (HD.3186) 4177 0 R ] /Limits [ (HD.3158) (HD.3186) ] >>
endobj
4612 0 obj
-<< /Names [ (HD.407) 1090 0 R (HD.408) 1091 0 R (HD.409) 1092 0 R (HD.41) 680 0 R (HD.410) 1093 0 R (HD.411) 1094 0 R (HD.412) 1095 0 R (HD.413) 1096 0 R (HD.414) 1097 0 R (HD.415) 1098 0 R (HD.416) 1099 0 R (HD.417) 1100 0 R (HD.418) 1101 0 R (HD.419) 1102 0 R (HD.42) 681 0 R (HD.420) 1103 0 R (HD.421) 1104 0 R (HD.422) 1105 0 R (HD.423) 1106 0 R (HD.424) 1107 0 R (HD.425) 1108 0 R (HD.426) 1109 0 R (HD.427) 1110 0 R (HD.428) 1111 0 R (HD.429) 1112 0 R (HD.43) 682 0 R (HD.430) 1113 0 R (HD.431) 1114 0 R (HD.432) 1115 0 R (HD.433) 1116 0 R (HD.434) 1117 0 R (HD.435) 1118 0 R ] /Limits [ (HD.407) (HD.435) ] >>
+<< /Names [ (HD.3187) 4178 0 R (HD.3188) 4179 0 R (HD.3189) 4180 0 R (HD.319) 994 0 R (HD.3190) 4181 0 R (HD.3191) 4182 0 R (HD.3192) 4183 0 R (HD.3193) 4184 0 R (HD.3194) 4185 0 R (HD.3195) 4186 0 R (HD.3196) 4187 0 R (HD.3197) 4188 0 R (HD.3198) 4189 0 R (HD.3199) 4190 0 R (HD.32) 675 0 R (HD.320) 995 0 R (HD.3200) 4191 0 R (HD.3201) 4192 0 R (HD.3202) 4193 0 R (HD.3203) 4194 0 R (HD.3204) 4195 0 R (HD.3205) 4196 0 R (HD.3206) 4197 0 R (HD.3207) 4198 0 R (HD.3208) 4199 0 R (HD.3209) 4200 0 R (HD.321) 996 0 R (HD.3210) 4201 0 R (HD.3211) 4202 0 R (HD.3212) 4203 0 R (HD.3213) 4204 0 R (HD.3214) 4205 0 R ] /Limits [ (HD.3187) (HD.3214) ] >>
endobj
4613 0 obj
-<< /Names [ (HD.436) 1119 0 R (HD.437) 1120 0 R (HD.438) 1121 0 R (HD.439) 1122 0 R (HD.44) 683 0 R (HD.440) 1123 0 R (HD.441) 1124 0 R (HD.442) 1125 0 R (HD.443) 1126 0 R (HD.444) 1127 0 R (HD.445) 1128 0 R (HD.446) 1129 0 R (HD.447) 1130 0 R (HD.448) 1131 0 R (HD.449) 1132 0 R (HD.45) 684 0 R (HD.450) 1133 0 R (HD.451) 1134 0 R (HD.452) 1135 0 R (HD.453) 1136 0 R (HD.454) 1137 0 R (HD.455) 1138 0 R (HD.456) 1139 0 R (HD.457) 1140 0 R (HD.458) 1141 0 R (HD.459) 1142 0 R (HD.46) 685 0 R (HD.460) 1143 0 R (HD.461) 1144 0 R (HD.462) 1145 0 R (HD.463) 1146 0 R (HD.464) 1151 0 R ] /Limits [ (HD.436) (HD.464) ] >>
+<< /Names [ (HD.3215) 4206 0 R (HD.3216) 4207 0 R (HD.3217) 4208 0 R (HD.3218) 4209 0 R (HD.322) 997 0 R (HD.323) 998 0 R (HD.324) 999 0 R (HD.325) 1007 0 R (HD.326) 1008 0 R (HD.327) 1009 0 R (HD.328) 1010 0 R (HD.329) 1011 0 R (HD.33) 676 0 R (HD.330) 1012 0 R (HD.331) 1013 0 R (HD.332) 1014 0 R (HD.333) 1015 0 R (HD.334) 1016 0 R (HD.335) 1017 0 R (HD.336) 1018 0 R (HD.337) 1019 0 R (HD.338) 1020 0 R (HD.339) 1021 0 R (HD.34) 681 0 R (HD.340) 1022 0 R (HD.341) 1023 0 R (HD.342) 1024 0 R (HD.343) 1025 0 R (HD.344) 1026 0 R (HD.345) 1027 0 R (HD.346) 1028 0 R (HD.347) 1029 0 R ] /Limits [ (HD.3215) (HD.347) ] >>
endobj
4614 0 obj
-<< /Names [ (HD.465) 1152 0 R (HD.466) 1153 0 R (HD.467) 1154 0 R (HD.468) 1155 0 R (HD.469) 1156 0 R (HD.47) 686 0 R (HD.470) 1157 0 R (HD.471) 1158 0 R (HD.472) 1159 0 R (HD.473) 1160 0 R (HD.474) 1161 0 R (HD.475) 1162 0 R (HD.476) 1163 0 R (HD.477) 1164 0 R (HD.478) 1165 0 R (HD.479) 1166 0 R (HD.48) 687 0 R (HD.480) 1167 0 R (HD.481) 1168 0 R (HD.482) 1169 0 R (HD.483) 1170 0 R (HD.484) 1171 0 R (HD.485) 1172 0 R (HD.486) 1173 0 R (HD.487) 1174 0 R (HD.488) 1175 0 R (HD.489) 1176 0 R (HD.49) 688 0 R (HD.490) 1177 0 R (HD.491) 1178 0 R (HD.492) 1179 0 R (HD.493) 1180 0 R ] /Limits [ (HD.465) (HD.493) ] >>
+<< /Names [ (HD.348) 1030 0 R (HD.349) 1031 0 R (HD.35) 682 0 R (HD.350) 1032 0 R (HD.351) 1033 0 R (HD.352) 1034 0 R (HD.353) 1035 0 R (HD.354) 1036 0 R (HD.355) 1037 0 R (HD.356) 1043 0 R (HD.357) 1044 0 R (HD.358) 1045 0 R (HD.359) 1046 0 R (HD.36) 683 0 R (HD.360) 1047 0 R (HD.361) 1048 0 R (HD.362) 1049 0 R (HD.363) 1050 0 R (HD.364) 1051 0 R (HD.365) 1052 0 R (HD.366) 1053 0 R (HD.367) 1054 0 R (HD.368) 1055 0 R (HD.369) 1056 0 R (HD.37) 684 0 R (HD.370) 1057 0 R (HD.371) 1058 0 R (HD.372) 1059 0 R (HD.373) 1060 0 R (HD.374) 1061 0 R (HD.375) 1062 0 R (HD.376) 1063 0 R ] /Limits [ (HD.348) (HD.376) ] >>
endobj
4615 0 obj
-<< /Names [ (HD.494) 1181 0 R (HD.495) 1182 0 R (HD.496) 1183 0 R (HD.497) 1184 0 R (HD.498) 1185 0 R (HD.499) 1186 0 R (HD.5) 640 0 R (HD.50) 689 0 R (HD.500) 1187 0 R (HD.501) 1188 0 R (HD.502) 1189 0 R (HD.503) 1190 0 R (HD.504) 1191 0 R (HD.505) 1192 0 R (HD.506) 1193 0 R (HD.507) 1194 0 R (HD.508) 1195 0 R (HD.509) 1196 0 R (HD.51) 690 0 R (HD.510) 1197 0 R (HD.511) 1198 0 R (HD.512) 1199 0 R (HD.513) 1200 0 R (HD.514) 1201 0 R (HD.515) 1202 0 R (HD.516) 1203 0 R (HD.517) 1204 0 R (HD.518) 1205 0 R (HD.519) 1210 0 R (HD.52) 691 0 R (HD.520) 1211 0 R (HD.521) 1212 0 R ] /Limits [ (HD.494) (HD.521) ] >>
+<< /Names [ (HD.377) 1064 0 R (HD.378) 1065 0 R (HD.379) 1066 0 R (HD.38) 685 0 R (HD.380) 1067 0 R (HD.381) 1068 0 R (HD.382) 1069 0 R (HD.383) 1070 0 R (HD.384) 1071 0 R (HD.385) 1072 0 R (HD.386) 1073 0 R (HD.387) 1074 0 R (HD.388) 1075 0 R (HD.389) 1076 0 R (HD.39) 686 0 R (HD.390) 1077 0 R (HD.391) 1078 0 R (HD.392) 1079 0 R (HD.393) 1080 0 R (HD.394) 1081 0 R (HD.395) 1082 0 R (HD.396) 1083 0 R (HD.397) 1084 0 R (HD.398) 1085 0 R (HD.399) 1090 0 R (HD.4) 647 0 R (HD.40) 687 0 R (HD.400) 1091 0 R (HD.401) 1092 0 R (HD.402) 1093 0 R (HD.403) 1094 0 R (HD.404) 1095 0 R ] /Limits [ (HD.377) (HD.404) ] >>
endobj
4616 0 obj
-<< /Names [ (HD.522) 1213 0 R (HD.523) 1214 0 R (HD.524) 1215 0 R (HD.525) 1216 0 R (HD.526) 1217 0 R (HD.527) 1218 0 R (HD.528) 1219 0 R (HD.529) 1220 0 R (HD.53) 692 0 R (HD.530) 1221 0 R (HD.531) 1222 0 R (HD.532) 1223 0 R (HD.533) 1224 0 R (HD.534) 1225 0 R (HD.535) 1226 0 R (HD.536) 1227 0 R (HD.537) 1228 0 R (HD.538) 1229 0 R (HD.539) 1230 0 R (HD.54) 693 0 R (HD.540) 1231 0 R (HD.541) 1232 0 R (HD.542) 1233 0 R (HD.543) 1234 0 R (HD.544) 1235 0 R (HD.545) 1236 0 R (HD.546) 1237 0 R (HD.547) 1238 0 R (HD.548) 1239 0 R (HD.549) 1240 0 R (HD.55) 694 0 R (HD.550) 1241 0 R ] /Limits [ (HD.522) (HD.550) ] >>
+<< /Names [ (HD.405) 1096 0 R (HD.406) 1097 0 R (HD.407) 1098 0 R (HD.408) 1099 0 R (HD.409) 1100 0 R (HD.41) 688 0 R (HD.410) 1101 0 R (HD.411) 1102 0 R (HD.412) 1103 0 R (HD.413) 1104 0 R (HD.414) 1105 0 R (HD.415) 1106 0 R (HD.416) 1107 0 R (HD.417) 1108 0 R (HD.418) 1109 0 R (HD.419) 1110 0 R (HD.42) 689 0 R (HD.420) 1111 0 R (HD.421) 1112 0 R (HD.422) 1113 0 R (HD.423) 1114 0 R (HD.424) 1115 0 R (HD.425) 1116 0 R (HD.426) 1117 0 R (HD.427) 1118 0 R (HD.428) 1119 0 R (HD.429) 1120 0 R (HD.43) 690 0 R (HD.430) 1121 0 R (HD.431) 1122 0 R (HD.432) 1123 0 R (HD.433) 1124 0 R ] /Limits [ (HD.405) (HD.433) ] >>
endobj
4617 0 obj
-<< /Names [ (HD.551) 1242 0 R (HD.552) 1243 0 R (HD.553) 1244 0 R (HD.554) 1245 0 R (HD.555) 1246 0 R (HD.556) 1247 0 R (HD.557) 1248 0 R (HD.558) 1249 0 R (HD.559) 1250 0 R (HD.56) 695 0 R (HD.560) 1251 0 R (HD.561) 1252 0 R (HD.562) 1253 0 R (HD.563) 1254 0 R (HD.564) 1255 0 R (HD.565) 1256 0 R (HD.566) 1257 0 R (HD.567) 1258 0 R (HD.568) 1259 0 R (HD.569) 1260 0 R (HD.57) 696 0 R (HD.570) 1261 0 R (HD.571) 1262 0 R (HD.572) 1263 0 R (HD.573) 1264 0 R (HD.574) 1265 0 R (HD.575) 1266 0 R (HD.576) 1267 0 R (HD.577) 1268 0 R (HD.578) 1269 0 R (HD.579) 1270 0 R (HD.58) 697 0 R ] /Limits [ (HD.551) (HD.58) ] >>
+<< /Names [ (HD.434) 1125 0 R (HD.435) 1126 0 R (HD.436) 1127 0 R (HD.437) 1128 0 R (HD.438) 1129 0 R (HD.439) 1130 0 R (HD.44) 691 0 R (HD.440) 1131 0 R (HD.441) 1132 0 R (HD.442) 1133 0 R (HD.443) 1134 0 R (HD.444) 1135 0 R (HD.445) 1136 0 R (HD.446) 1137 0 R (HD.447) 1138 0 R (HD.448) 1139 0 R (HD.449) 1140 0 R (HD.45) 692 0 R (HD.450) 1141 0 R (HD.451) 1142 0 R (HD.452) 1143 0 R (HD.453) 1144 0 R (HD.454) 1145 0 R (HD.455) 1146 0 R (HD.456) 1147 0 R (HD.457) 1148 0 R (HD.458) 1153 0 R (HD.459) 1154 0 R (HD.46) 693 0 R (HD.460) 1155 0 R (HD.461) 1156 0 R (HD.462) 1157 0 R ] /Limits [ (HD.434) (HD.462) ] >>
endobj
4618 0 obj
-<< /Names [ (HD.580) 1275 0 R (HD.581) 1276 0 R (HD.582) 1277 0 R (HD.583) 1278 0 R (HD.584) 1279 0 R (HD.585) 1280 0 R (HD.586) 1281 0 R (HD.587) 1282 0 R (HD.588) 1283 0 R (HD.589) 1284 0 R (HD.59) 698 0 R (HD.590) 1285 0 R (HD.591) 1286 0 R (HD.592) 1287 0 R (HD.593) 1288 0 R (HD.594) 1289 0 R (HD.595) 1290 0 R (HD.596) 1291 0 R (HD.597) 1292 0 R (HD.598) 1293 0 R (HD.599) 1294 0 R (HD.6) 641 0 R (HD.60) 699 0 R (HD.600) 1295 0 R (HD.601) 1296 0 R (HD.602) 1297 0 R (HD.603) 1298 0 R (HD.604) 1299 0 R (HD.605) 1300 0 R (HD.606) 1301 0 R (HD.607) 1302 0 R (HD.608) 1303 0 R ] /Limits [ (HD.580) (HD.608) ] >>
+<< /Names [ (HD.463) 1158 0 R (HD.464) 1159 0 R (HD.465) 1160 0 R (HD.466) 1161 0 R (HD.467) 1162 0 R (HD.468) 1163 0 R (HD.469) 1164 0 R (HD.47) 694 0 R (HD.470) 1165 0 R (HD.471) 1166 0 R (HD.472) 1167 0 R (HD.473) 1168 0 R (HD.474) 1169 0 R (HD.475) 1170 0 R (HD.476) 1171 0 R (HD.477) 1172 0 R (HD.478) 1173 0 R (HD.479) 1174 0 R (HD.48) 695 0 R (HD.480) 1175 0 R (HD.481) 1176 0 R (HD.482) 1177 0 R (HD.483) 1178 0 R (HD.484) 1179 0 R (HD.485) 1180 0 R (HD.486) 1181 0 R (HD.487) 1182 0 R (HD.488) 1183 0 R (HD.489) 1184 0 R (HD.49) 696 0 R (HD.490) 1185 0 R (HD.491) 1186 0 R ] /Limits [ (HD.463) (HD.491) ] >>
endobj
4619 0 obj
-<< /Names [ (HD.609) 1304 0 R (HD.61) 700 0 R (HD.610) 1305 0 R (HD.611) 1306 0 R (HD.612) 1307 0 R (HD.613) 1308 0 R (HD.614) 1309 0 R (HD.615) 1310 0 R (HD.616) 1311 0 R (HD.617) 1312 0 R (HD.618) 1313 0 R (HD.619) 1314 0 R (HD.62) 701 0 R (HD.620) 1315 0 R (HD.621) 1316 0 R (HD.622) 1317 0 R (HD.623) 1318 0 R (HD.624) 1319 0 R (HD.625) 1320 0 R (HD.626) 1321 0 R (HD.627) 1322 0 R (HD.628) 1323 0 R (HD.629) 1324 0 R (HD.63) 702 0 R (HD.630) 1325 0 R (HD.631) 1326 0 R (HD.632) 1327 0 R (HD.633) 1328 0 R (HD.634) 1329 0 R (HD.635) 1330 0 R (HD.636) 1331 0 R (HD.637) 1332 0 R ] /Limits [ (HD.609) (HD.637) ] >>
+<< /Names [ (HD.492) 1187 0 R (HD.493) 1188 0 R (HD.494) 1189 0 R (HD.495) 1190 0 R (HD.496) 1191 0 R (HD.497) 1192 0 R (HD.498) 1193 0 R (HD.499) 1194 0 R (HD.5) 648 0 R (HD.50) 697 0 R (HD.500) 1195 0 R (HD.501) 1196 0 R (HD.502) 1197 0 R (HD.503) 1198 0 R (HD.504) 1199 0 R (HD.505) 1200 0 R (HD.506) 1201 0 R (HD.507) 1202 0 R (HD.508) 1203 0 R (HD.509) 1204 0 R (HD.51) 698 0 R (HD.510) 1205 0 R (HD.511) 1206 0 R (HD.512) 1207 0 R (HD.513) 1212 0 R (HD.514) 1213 0 R (HD.515) 1214 0 R (HD.516) 1215 0 R (HD.517) 1216 0 R (HD.518) 1217 0 R (HD.519) 1218 0 R (HD.52) 699 0 R ] /Limits [ (HD.492) (HD.52) ] >>
endobj
4620 0 obj
-<< /Names [ (HD.638) 1333 0 R (HD.639) 1334 0 R (HD.64) 703 0 R (HD.640) 1335 0 R (HD.641) 1336 0 R (HD.642) 1337 0 R (HD.643) 1342 0 R (HD.644) 1343 0 R (HD.645) 1344 0 R (HD.646) 1345 0 R (HD.647) 1346 0 R (HD.648) 1347 0 R (HD.649) 1348 0 R (HD.65) 704 0 R (HD.650) 1349 0 R (HD.651) 1350 0 R (HD.652) 1351 0 R (HD.653) 1352 0 R (HD.654) 1353 0 R (HD.655) 1354 0 R (HD.656) 1355 0 R (HD.657) 1356 0 R (HD.658) 1357 0 R (HD.659) 1358 0 R (HD.66) 705 0 R (HD.660) 1359 0 R (HD.661) 1360 0 R (HD.662) 1361 0 R (HD.663) 1362 0 R (HD.664) 1363 0 R (HD.665) 1364 0 R (HD.666) 1365 0 R ] /Limits [ (HD.638) (HD.666) ] >>
+<< /Names [ (HD.520) 1219 0 R (HD.521) 1220 0 R (HD.522) 1221 0 R (HD.523) 1222 0 R (HD.524) 1223 0 R (HD.525) 1224 0 R (HD.526) 1225 0 R (HD.527) 1226 0 R (HD.528) 1227 0 R (HD.529) 1228 0 R (HD.53) 700 0 R (HD.530) 1229 0 R (HD.531) 1230 0 R (HD.532) 1231 0 R (HD.533) 1232 0 R (HD.534) 1233 0 R (HD.535) 1234 0 R (HD.536) 1235 0 R (HD.537) 1236 0 R (HD.538) 1237 0 R (HD.539) 1238 0 R (HD.54) 701 0 R (HD.540) 1239 0 R (HD.541) 1240 0 R (HD.542) 1241 0 R (HD.543) 1242 0 R (HD.544) 1243 0 R (HD.545) 1244 0 R (HD.546) 1245 0 R (HD.547) 1246 0 R (HD.548) 1247 0 R (HD.549) 1248 0 R ] /Limits [ (HD.520) (HD.549) ] >>
endobj
4621 0 obj
-<< /Names [ (HD.667) 1366 0 R (HD.668) 1367 0 R (HD.669) 1368 0 R (HD.67) 706 0 R (HD.670) 1369 0 R (HD.671) 1370 0 R (HD.672) 1371 0 R (HD.673) 1372 0 R (HD.674) 1373 0 R (HD.675) 1374 0 R (HD.676) 1375 0 R (HD.677) 1376 0 R (HD.678) 1377 0 R (HD.679) 1378 0 R (HD.68) 707 0 R (HD.680) 1379 0 R (HD.681) 1380 0 R (HD.682) 1381 0 R (HD.683) 1382 0 R (HD.684) 1383 0 R (HD.685) 1384 0 R (HD.686) 1385 0 R (HD.687) 1390 0 R (HD.688) 1391 0 R (HD.689) 1392 0 R (HD.69) 708 0 R (HD.690) 1393 0 R (HD.691) 1394 0 R (HD.692) 1395 0 R (HD.693) 1396 0 R (HD.694) 1397 0 R (HD.695) 1398 0 R ] /Limits [ (HD.667) (HD.695) ] >>
+<< /Names [ (HD.55) 702 0 R (HD.550) 1249 0 R (HD.551) 1250 0 R (HD.552) 1251 0 R (HD.553) 1252 0 R (HD.554) 1253 0 R (HD.555) 1254 0 R (HD.556) 1255 0 R (HD.557) 1256 0 R (HD.558) 1257 0 R (HD.559) 1258 0 R (HD.56) 703 0 R (HD.560) 1259 0 R (HD.561) 1260 0 R (HD.562) 1261 0 R (HD.563) 1262 0 R (HD.564) 1263 0 R (HD.565) 1264 0 R (HD.566) 1265 0 R (HD.567) 1266 0 R (HD.568) 1267 0 R (HD.569) 1268 0 R (HD.57) 704 0 R (HD.570) 1269 0 R (HD.571) 1270 0 R (HD.572) 1271 0 R (HD.573) 1272 0 R (HD.574) 1277 0 R (HD.575) 1278 0 R (HD.576) 1279 0 R (HD.577) 1280 0 R (HD.578) 1281 0 R ] /Limits [ (HD.55) (HD.578) ] >>
endobj
4622 0 obj
-<< /Names [ (HD.696) 1399 0 R (HD.697) 1400 0 R (HD.698) 1401 0 R (HD.699) 1402 0 R (HD.7) 642 0 R (HD.70) 709 0 R (HD.700) 1403 0 R (HD.701) 1404 0 R (HD.702) 1405 0 R (HD.703) 1406 0 R (HD.704) 1407 0 R (HD.705) 1408 0 R (HD.706) 1409 0 R (HD.707) 1410 0 R (HD.708) 1411 0 R (HD.709) 1412 0 R (HD.71) 710 0 R (HD.710) 1413 0 R (HD.711) 1414 0 R (HD.712) 1415 0 R (HD.713) 1416 0 R (HD.714) 1417 0 R (HD.715) 1418 0 R (HD.716) 1419 0 R (HD.717) 1420 0 R (HD.718) 1421 0 R (HD.719) 1422 0 R (HD.72) 711 0 R (HD.720) 1423 0 R (HD.721) 1424 0 R (HD.722) 1425 0 R (HD.723) 1426 0 R ] /Limits [ (HD.696) (HD.723) ] >>
+<< /Names [ (HD.579) 1282 0 R (HD.58) 705 0 R (HD.580) 1283 0 R (HD.581) 1284 0 R (HD.582) 1285 0 R (HD.583) 1286 0 R (HD.584) 1287 0 R (HD.585) 1288 0 R (HD.586) 1289 0 R (HD.587) 1290 0 R (HD.588) 1291 0 R (HD.589) 1292 0 R (HD.59) 706 0 R (HD.590) 1293 0 R (HD.591) 1294 0 R (HD.592) 1295 0 R (HD.593) 1296 0 R (HD.594) 1297 0 R (HD.595) 1298 0 R (HD.596) 1299 0 R (HD.597) 1300 0 R (HD.598) 1301 0 R (HD.599) 1302 0 R (HD.6) 649 0 R (HD.60) 707 0 R (HD.600) 1303 0 R (HD.601) 1304 0 R (HD.602) 1305 0 R (HD.603) 1306 0 R (HD.604) 1307 0 R (HD.605) 1308 0 R (HD.606) 1309 0 R ] /Limits [ (HD.579) (HD.606) ] >>
endobj
4623 0 obj
-<< /Names [ (HD.724) 1427 0 R (HD.725) 1428 0 R (HD.726) 1429 0 R (HD.727) 1430 0 R (HD.728) 1435 0 R (HD.729) 1436 0 R (HD.73) 712 0 R (HD.730) 1437 0 R (HD.731) 1438 0 R (HD.732) 1439 0 R (HD.733) 1440 0 R (HD.734) 1441 0 R (HD.735) 1442 0 R (HD.736) 1443 0 R (HD.737) 1444 0 R (HD.738) 1445 0 R (HD.739) 1446 0 R (HD.74) 713 0 R (HD.740) 1447 0 R (HD.741) 1448 0 R (HD.742) 1449 0 R (HD.743) 1450 0 R (HD.744) 1451 0 R (HD.745) 1452 0 R (HD.746) 1453 0 R (HD.747) 1454 0 R (HD.748) 1455 0 R (HD.749) 1456 0 R (HD.75) 714 0 R (HD.750) 1457 0 R (HD.751) 1458 0 R (HD.752) 1459 0 R ] /Limits [ (HD.724) (HD.752) ] >>
+<< /Names [ (HD.607) 1310 0 R (HD.608) 1311 0 R (HD.609) 1312 0 R (HD.61) 708 0 R (HD.610) 1313 0 R (HD.611) 1314 0 R (HD.612) 1315 0 R (HD.613) 1316 0 R (HD.614) 1317 0 R (HD.615) 1318 0 R (HD.616) 1319 0 R (HD.617) 1320 0 R (HD.618) 1321 0 R (HD.619) 1322 0 R (HD.62) 709 0 R (HD.620) 1323 0 R (HD.621) 1324 0 R (HD.622) 1325 0 R (HD.623) 1326 0 R (HD.624) 1327 0 R (HD.625) 1328 0 R (HD.626) 1329 0 R (HD.627) 1330 0 R (HD.628) 1331 0 R (HD.629) 1332 0 R (HD.63) 710 0 R (HD.630) 1333 0 R (HD.631) 1334 0 R (HD.632) 1335 0 R (HD.633) 1336 0 R (HD.634) 1337 0 R (HD.635) 1338 0 R ] /Limits [ (HD.607) (HD.635) ] >>
endobj
4624 0 obj
-<< /Names [ (HD.753) 1460 0 R (HD.754) 1461 0 R (HD.755) 1462 0 R (HD.756) 1463 0 R (HD.757) 1464 0 R (HD.758) 1465 0 R (HD.759) 1466 0 R (HD.76) 715 0 R (HD.760) 1467 0 R (HD.761) 1468 0 R (HD.762) 1469 0 R (HD.763) 1470 0 R (HD.764) 1471 0 R (HD.765) 1472 0 R (HD.766) 1477 0 R (HD.767) 1478 0 R (HD.768) 1479 0 R (HD.769) 1480 0 R (HD.77) 716 0 R (HD.770) 1481 0 R (HD.771) 1482 0 R (HD.772) 1483 0 R (HD.773) 1484 0 R (HD.774) 1485 0 R (HD.775) 1486 0 R (HD.776) 1487 0 R (HD.777) 1488 0 R (HD.778) 1489 0 R (HD.779) 1490 0 R (HD.78) 717 0 R (HD.780) 1491 0 R (HD.781) 1492 0 R ] /Limits [ (HD.753) (HD.781) ] >>
+<< /Names [ (HD.636) 1339 0 R (HD.637) 1344 0 R (HD.638) 1345 0 R (HD.639) 1346 0 R (HD.64) 711 0 R (HD.640) 1347 0 R (HD.641) 1348 0 R (HD.642) 1349 0 R (HD.643) 1350 0 R (HD.644) 1351 0 R (HD.645) 1352 0 R (HD.646) 1353 0 R (HD.647) 1354 0 R (HD.648) 1355 0 R (HD.649) 1356 0 R (HD.65) 712 0 R (HD.650) 1357 0 R (HD.651) 1358 0 R (HD.652) 1359 0 R (HD.653) 1360 0 R (HD.654) 1361 0 R (HD.655) 1362 0 R (HD.656) 1363 0 R (HD.657) 1364 0 R (HD.658) 1365 0 R (HD.659) 1366 0 R (HD.66) 713 0 R (HD.660) 1367 0 R (HD.661) 1368 0 R (HD.662) 1369 0 R (HD.663) 1370 0 R (HD.664) 1371 0 R ] /Limits [ (HD.636) (HD.664) ] >>
endobj
4625 0 obj
-<< /Names [ (HD.782) 1493 0 R (HD.783) 1494 0 R (HD.784) 1495 0 R (HD.785) 1496 0 R (HD.786) 1497 0 R (HD.787) 1498 0 R (HD.788) 1499 0 R (HD.789) 1500 0 R (HD.79) 718 0 R (HD.790) 1501 0 R (HD.791) 1502 0 R (HD.792) 1503 0 R (HD.793) 1504 0 R (HD.794) 1505 0 R (HD.795) 1506 0 R (HD.796) 1507 0 R (HD.797) 1508 0 R (HD.798) 1509 0 R (HD.799) 1510 0 R (HD.8) 643 0 R (HD.80) 719 0 R (HD.800) 1511 0 R (HD.801) 1512 0 R (HD.802) 1513 0 R (HD.803) 1514 0 R (HD.804) 1515 0 R (HD.805) 1516 0 R (HD.806) 1517 0 R (HD.807) 1518 0 R (HD.808) 1519 0 R (HD.809) 1520 0 R (HD.81) 720 0 R ] /Limits [ (HD.782) (HD.81) ] >>
+<< /Names [ (HD.665) 1372 0 R (HD.666) 1373 0 R (HD.667) 1374 0 R (HD.668) 1375 0 R (HD.669) 1376 0 R (HD.67) 714 0 R (HD.670) 1377 0 R (HD.671) 1378 0 R (HD.672) 1379 0 R (HD.673) 1380 0 R (HD.674) 1381 0 R (HD.675) 1382 0 R (HD.676) 1387 0 R (HD.677) 1388 0 R (HD.678) 1389 0 R (HD.679) 1390 0 R (HD.68) 715 0 R (HD.680) 1391 0 R (HD.681) 1392 0 R (HD.682) 1393 0 R (HD.683) 1394 0 R (HD.684) 1395 0 R (HD.685) 1396 0 R (HD.686) 1397 0 R (HD.687) 1398 0 R (HD.688) 1399 0 R (HD.689) 1400 0 R (HD.69) 716 0 R (HD.690) 1401 0 R (HD.691) 1402 0 R (HD.692) 1403 0 R (HD.693) 1404 0 R ] /Limits [ (HD.665) (HD.693) ] >>
endobj
4626 0 obj
-<< /Names [ (HD.810) 1521 0 R (HD.811) 1522 0 R (HD.812) 1523 0 R (HD.813) 1524 0 R (HD.814) 1525 0 R (HD.815) 1526 0 R (HD.816) 1527 0 R (HD.817) 1528 0 R (HD.818) 1529 0 R (HD.819) 1530 0 R (HD.82) 721 0 R (HD.820) 1535 0 R (HD.821) 1536 0 R (HD.822) 1537 0 R (HD.823) 1538 0 R (HD.824) 1539 0 R (HD.825) 1540 0 R (HD.826) 1541 0 R (HD.827) 1542 0 R (HD.828) 1543 0 R (HD.829) 1544 0 R (HD.83) 722 0 R (HD.830) 1545 0 R (HD.831) 1546 0 R (HD.832) 1547 0 R (HD.833) 1548 0 R (HD.834) 1549 0 R (HD.835) 1550 0 R (HD.836) 1551 0 R (HD.837) 1552 0 R (HD.838) 1553 0 R (HD.839) 1554 0 R ] /Limits [ (HD.810) (HD.839) ] >>
+<< /Names [ (HD.694) 1405 0 R (HD.695) 1406 0 R (HD.696) 1407 0 R (HD.697) 1408 0 R (HD.698) 1409 0 R (HD.699) 1410 0 R (HD.7) 650 0 R (HD.70) 717 0 R (HD.700) 1411 0 R (HD.701) 1412 0 R (HD.702) 1413 0 R (HD.703) 1414 0 R (HD.704) 1415 0 R (HD.705) 1416 0 R (HD.706) 1417 0 R (HD.707) 1418 0 R (HD.708) 1419 0 R (HD.709) 1420 0 R (HD.71) 718 0 R (HD.710) 1421 0 R (HD.711) 1422 0 R (HD.712) 1423 0 R (HD.713) 1424 0 R (HD.714) 1425 0 R (HD.715) 1426 0 R (HD.716) 1427 0 R (HD.717) 1428 0 R (HD.718) 1429 0 R (HD.719) 1430 0 R (HD.72) 719 0 R (HD.720) 1431 0 R (HD.721) 1432 0 R ] /Limits [ (HD.694) (HD.721) ] >>
endobj
4627 0 obj
-<< /Names [ (HD.84) 727 0 R (HD.840) 1555 0 R (HD.841) 1556 0 R (HD.842) 1557 0 R (HD.843) 1558 0 R (HD.844) 1559 0 R (HD.845) 1560 0 R (HD.846) 1561 0 R (HD.847) 1562 0 R (HD.848) 1563 0 R (HD.849) 1564 0 R (HD.85) 728 0 R (HD.850) 1565 0 R (HD.851) 1566 0 R (HD.852) 1567 0 R (HD.853) 1568 0 R (HD.854) 1569 0 R (HD.855) 1570 0 R (HD.856) 1571 0 R (HD.857) 1572 0 R (HD.858) 1573 0 R (HD.859) 1574 0 R (HD.86) 729 0 R (HD.860) 1575 0 R (HD.861) 1576 0 R (HD.862) 1577 0 R (HD.863) 1578 0 R (HD.864) 1579 0 R (HD.865) 1580 0 R (HD.866) 1581 0 R (HD.867) 1582 0 R (HD.868) 1583 0 R ] /Limits [ (HD.84) (HD.868) ] >>
+<< /Names [ (HD.722) 1437 0 R (HD.723) 1438 0 R (HD.724) 1439 0 R (HD.725) 1440 0 R (HD.726) 1441 0 R (HD.727) 1442 0 R (HD.728) 1443 0 R (HD.729) 1444 0 R (HD.73) 720 0 R (HD.730) 1445 0 R (HD.731) 1446 0 R (HD.732) 1447 0 R (HD.733) 1448 0 R (HD.734) 1449 0 R (HD.735) 1450 0 R (HD.736) 1451 0 R (HD.737) 1452 0 R (HD.738) 1453 0 R (HD.739) 1454 0 R (HD.74) 721 0 R (HD.740) 1455 0 R (HD.741) 1456 0 R (HD.742) 1457 0 R (HD.743) 1458 0 R (HD.744) 1459 0 R (HD.745) 1460 0 R (HD.746) 1461 0 R (HD.747) 1462 0 R (HD.748) 1463 0 R (HD.749) 1464 0 R (HD.75) 722 0 R (HD.750) 1465 0 R ] /Limits [ (HD.722) (HD.750) ] >>
endobj
4628 0 obj
-<< /Names [ (HD.869) 1584 0 R (HD.87) 730 0 R (HD.870) 1585 0 R (HD.871) 1586 0 R (HD.872) 1587 0 R (HD.873) 1588 0 R (HD.874) 1589 0 R (HD.875) 1596 0 R (HD.876) 1597 0 R (HD.877) 1598 0 R (HD.878) 1599 0 R (HD.879) 1600 0 R (HD.88) 731 0 R (HD.880) 1601 0 R (HD.881) 1602 0 R (HD.882) 1603 0 R (HD.883) 1604 0 R (HD.884) 1605 0 R (HD.885) 1606 0 R (HD.886) 1607 0 R (HD.887) 1608 0 R (HD.888) 1609 0 R (HD.889) 1610 0 R (HD.89) 732 0 R (HD.890) 1611 0 R (HD.891) 1612 0 R (HD.892) 1613 0 R (HD.893) 1614 0 R (HD.894) 1615 0 R (HD.895) 1616 0 R (HD.896) 1617 0 R (HD.897) 1618 0 R ] /Limits [ (HD.869) (HD.897) ] >>
+<< /Names [ (HD.751) 1466 0 R (HD.752) 1467 0 R (HD.753) 1468 0 R (HD.754) 1469 0 R (HD.755) 1470 0 R (HD.756) 1475 0 R (HD.757) 1476 0 R (HD.758) 1477 0 R (HD.759) 1478 0 R (HD.76) 723 0 R (HD.760) 1479 0 R (HD.761) 1480 0 R (HD.762) 1481 0 R (HD.763) 1482 0 R (HD.764) 1483 0 R (HD.765) 1484 0 R (HD.766) 1485 0 R (HD.767) 1486 0 R (HD.768) 1487 0 R (HD.769) 1488 0 R (HD.77) 724 0 R (HD.770) 1489 0 R (HD.771) 1490 0 R (HD.772) 1491 0 R (HD.773) 1492 0 R (HD.774) 1493 0 R (HD.775) 1494 0 R (HD.776) 1495 0 R (HD.777) 1496 0 R (HD.778) 1497 0 R (HD.779) 1498 0 R (HD.78) 725 0 R ] /Limits [ (HD.751) (HD.78) ] >>
endobj
4629 0 obj
-<< /Names [ (HD.898) 1619 0 R (HD.899) 1620 0 R (HD.9) 644 0 R (HD.90) 733 0 R (HD.900) 1621 0 R (HD.901) 1622 0 R (HD.902) 1623 0 R (HD.903) 1624 0 R (HD.904) 1625 0 R (HD.905) 1626 0 R (HD.906) 1627 0 R (HD.907) 1628 0 R (HD.908) 1629 0 R (HD.909) 1630 0 R (HD.91) 734 0 R (HD.910) 1631 0 R (HD.911) 1632 0 R (HD.912) 1633 0 R (HD.913) 1634 0 R (HD.914) 1635 0 R (HD.915) 1636 0 R (HD.916) 1637 0 R (HD.917) 1642 0 R (HD.918) 1643 0 R (HD.919) 1644 0 R (HD.92) 735 0 R (HD.920) 1645 0 R (HD.921) 1646 0 R (HD.922) 1647 0 R (HD.923) 1648 0 R (HD.924) 1649 0 R (HD.925) 1650 0 R ] /Limits [ (HD.898) (HD.925) ] >>
+<< /Names [ (HD.780) 1499 0 R (HD.781) 1500 0 R (HD.782) 1501 0 R (HD.783) 1502 0 R (HD.784) 1503 0 R (HD.785) 1504 0 R (HD.786) 1505 0 R (HD.787) 1506 0 R (HD.788) 1507 0 R (HD.789) 1508 0 R (HD.79) 726 0 R (HD.790) 1509 0 R (HD.791) 1510 0 R (HD.792) 1511 0 R (HD.793) 1512 0 R (HD.794) 1513 0 R (HD.795) 1514 0 R (HD.796) 1515 0 R (HD.797) 1516 0 R (HD.798) 1517 0 R (HD.799) 1518 0 R (HD.8) 651 0 R (HD.80) 727 0 R (HD.800) 1519 0 R (HD.801) 1520 0 R (HD.802) 1521 0 R (HD.803) 1527 0 R (HD.804) 1528 0 R (HD.805) 1529 0 R (HD.806) 1530 0 R (HD.807) 1531 0 R (HD.808) 1532 0 R ] /Limits [ (HD.780) (HD.808) ] >>
endobj
4630 0 obj
-<< /Names [ (HD.926) 1651 0 R (HD.927) 1652 0 R (HD.928) 1653 0 R (HD.929) 1654 0 R (HD.93) 736 0 R (HD.930) 1655 0 R (HD.931) 1656 0 R (HD.932) 1657 0 R (HD.933) 1658 0 R (HD.934) 1659 0 R (HD.935) 1660 0 R (HD.936) 1661 0 R (HD.937) 1662 0 R (HD.938) 1663 0 R (HD.939) 1664 0 R (HD.94) 737 0 R (HD.940) 1665 0 R (HD.941) 1666 0 R (HD.942) 1667 0 R (HD.943) 1668 0 R (HD.944) 1669 0 R (HD.945) 1670 0 R (HD.946) 1671 0 R (HD.947) 1672 0 R (HD.948) 1673 0 R (HD.949) 1674 0 R (HD.95) 738 0 R (HD.950) 1675 0 R (HD.951) 1676 0 R (HD.952) 1677 0 R (HD.953) 1678 0 R (HD.954) 1679 0 R ] /Limits [ (HD.926) (HD.954) ] >>
+<< /Names [ (HD.809) 1533 0 R (HD.81) 732 0 R (HD.810) 1534 0 R (HD.811) 1535 0 R (HD.812) 1536 0 R (HD.813) 1537 0 R (HD.814) 1538 0 R (HD.815) 1539 0 R (HD.816) 1540 0 R (HD.817) 1541 0 R (HD.818) 1542 0 R (HD.819) 1543 0 R (HD.82) 733 0 R (HD.820) 1544 0 R (HD.821) 1545 0 R (HD.822) 1546 0 R (HD.823) 1547 0 R (HD.824) 1548 0 R (HD.825) 1549 0 R (HD.826) 1550 0 R (HD.827) 1551 0 R (HD.828) 1552 0 R (HD.829) 1553 0 R (HD.83) 734 0 R (HD.830) 1554 0 R (HD.831) 1555 0 R (HD.832) 1556 0 R (HD.833) 1557 0 R (HD.834) 1558 0 R (HD.835) 1559 0 R (HD.836) 1560 0 R (HD.837) 1561 0 R ] /Limits [ (HD.809) (HD.837) ] >>
endobj
4631 0 obj
-<< /Names [ (HD.955) 1680 0 R (HD.956) 1681 0 R (HD.957) 1682 0 R (HD.958) 1683 0 R (HD.959) 1690 0 R (HD.96) 739 0 R (HD.960) 1691 0 R (HD.961) 1692 0 R (HD.962) 1693 0 R (HD.963) 1694 0 R (HD.964) 1695 0 R (HD.965) 1696 0 R (HD.966) 1697 0 R (HD.967) 1698 0 R (HD.968) 1699 0 R (HD.969) 1700 0 R (HD.97) 740 0 R (HD.970) 1701 0 R (HD.971) 1702 0 R (HD.972) 1703 0 R (HD.973) 1704 0 R (HD.974) 1705 0 R (HD.975) 1706 0 R (HD.976) 1707 0 R (HD.977) 1708 0 R (HD.978) 1709 0 R (HD.979) 1710 0 R (HD.98) 741 0 R (HD.980) 1711 0 R (HD.981) 1712 0 R (HD.982) 1713 0 R (HD.983) 1714 0 R ] /Limits [ (HD.955) (HD.983) ] >>
+<< /Names [ (HD.838) 1562 0 R (HD.839) 1563 0 R (HD.84) 735 0 R (HD.840) 1564 0 R (HD.841) 1565 0 R (HD.842) 1566 0 R (HD.843) 1567 0 R (HD.844) 1568 0 R (HD.845) 1569 0 R (HD.846) 1570 0 R (HD.847) 1571 0 R (HD.848) 1572 0 R (HD.849) 1573 0 R (HD.85) 736 0 R (HD.850) 1574 0 R (HD.851) 1575 0 R (HD.852) 1576 0 R (HD.853) 1577 0 R (HD.854) 1578 0 R (HD.855) 1579 0 R (HD.856) 1585 0 R (HD.857) 1586 0 R (HD.858) 1587 0 R (HD.859) 1588 0 R (HD.86) 737 0 R (HD.860) 1589 0 R (HD.861) 1590 0 R (HD.862) 1591 0 R (HD.863) 1592 0 R (HD.864) 1593 0 R (HD.865) 1594 0 R (HD.866) 1595 0 R ] /Limits [ (HD.838) (HD.866) ] >>
endobj
4632 0 obj
-<< /Names [ (HD.984) 1715 0 R (HD.985) 1716 0 R (HD.986) 1717 0 R (HD.987) 1718 0 R (HD.988) 1719 0 R (HD.989) 1720 0 R (HD.99) 742 0 R (HD.990) 1721 0 R (HD.991) 1722 0 R (HD.992) 1723 0 R (HD.993) 1724 0 R (HD.994) 1725 0 R (HD.995) 1726 0 R (HD.996) 1727 0 R (HD.997) 1728 0 R (HD.998) 1729 0 R (HD.999) 1730 0 R (Hfootnote.1) 348 0 R (Hfootnote.10) 415 0 R (Hfootnote.11) 416 0 R (Hfootnote.12) 417 0 R (Hfootnote.13) 426 0 R (Hfootnote.14) 427 0 R (Hfootnote.15) 438 0 R (Hfootnote.16) 439 0 R (Hfootnote.17) 450 0 R (Hfootnote.18) 451 0 R (Hfootnote.19) 463 0 R (Hfootnote.2) 352 0 R (Hfootnote.20) 470 0 R (Hfootnote.21) 471 0 R (Hfootnote.22) 489 0 R ] /Limits [ (HD.984) (Hfootnote.22) ] >>
+<< /Names [ (HD.867) 1596 0 R (HD.868) 1597 0 R (HD.869) 1598 0 R (HD.87) 738 0 R (HD.870) 1599 0 R (HD.871) 1600 0 R (HD.872) 1601 0 R (HD.873) 1602 0 R (HD.874) 1603 0 R (HD.875) 1604 0 R (HD.876) 1605 0 R (HD.877) 1606 0 R (HD.878) 1607 0 R (HD.879) 1608 0 R (HD.88) 739 0 R (HD.880) 1609 0 R (HD.881) 1610 0 R (HD.882) 1611 0 R (HD.883) 1612 0 R (HD.884) 1613 0 R (HD.885) 1614 0 R (HD.886) 1615 0 R (HD.887) 1616 0 R (HD.888) 1617 0 R (HD.889) 1618 0 R (HD.89) 740 0 R (HD.890) 1619 0 R (HD.891) 1620 0 R (HD.892) 1621 0 R (HD.893) 1622 0 R (HD.894) 1623 0 R (HD.895) 1624 0 R ] /Limits [ (HD.867) (HD.895) ] >>
endobj
4633 0 obj
-<< /Names [ (Hfootnote.23) 500 0 R (Hfootnote.24) 520 0 R (Hfootnote.25) 521 0 R (Hfootnote.26) 522 0 R (Hfootnote.27) 523 0 R (Hfootnote.28) 554 0 R (Hfootnote.29) 555 0 R (Hfootnote.3) 368 0 R (Hfootnote.30) 568 0 R (Hfootnote.31) 569 0 R (Hfootnote.32) 570 0 R (Hfootnote.33) 588 0 R (Hfootnote.34) 626 0 R (Hfootnote.35) 623 0 R (Hfootnote.36) 624 0 R (Hfootnote.37) 625 0 R (Hfootnote.38) 1684 0 R (Hfootnote.39) 2577 0 R (Hfootnote.4) 378 0 R (Hfootnote.40) 2710 0 R (Hfootnote.41) 2711 0 R (Hfootnote.42) 2920 0 R (Hfootnote.43) 3247 0 R (Hfootnote.44) 3338 0 R (Hfootnote.45) 3506 0 R (Hfootnote.5) 379 0 R (Hfootnote.6) 393 0 R (Hfootnote.7) 394 0 R (Hfootnote.8) 395 0 R (Hfootnote.9) 396 0 R (page.1) 323 0 R (page.10) 462 0 R ] /Limits [ (Hfootnote.23) (page.10) ] >>
+<< /Names [ (HD.896) 1631 0 R (HD.897) 1632 0 R (HD.898) 1633 0 R (HD.899) 1634 0 R (HD.9) 652 0 R (HD.90) 741 0 R (HD.900) 1635 0 R (HD.901) 1636 0 R (HD.902) 1637 0 R (HD.903) 1638 0 R (HD.904) 1639 0 R (HD.905) 1640 0 R (HD.906) 1641 0 R (HD.907) 1642 0 R (HD.908) 1643 0 R (HD.909) 1644 0 R (HD.91) 742 0 R (HD.910) 1645 0 R (HD.911) 1646 0 R (HD.912) 1647 0 R (HD.913) 1648 0 R (HD.914) 1649 0 R (HD.915) 1650 0 R (HD.916) 1651 0 R (HD.917) 1652 0 R (HD.918) 1653 0 R (HD.919) 1654 0 R (HD.92) 743 0 R (HD.920) 1655 0 R (HD.921) 1656 0 R (HD.922) 1657 0 R (HD.923) 1658 0 R ] /Limits [ (HD.896) (HD.923) ] >>
endobj
4634 0 obj
-<< /Names [ (page.100) 4024 0 R (page.101) 4090 0 R (page.102) 4147 0 R (page.103) 4199 0 R (page.104) 4229 0 R (page.105) 4296 0 R (page.106) 4307 0 R (page.11) 469 0 R (page.12) 477 0 R (page.13) 482 0 R (page.14) 488 0 R (page.15) 499 0 R (page.16) 505 0 R (page.17) 509 0 R (page.18) 517 0 R (page.19) 528 0 R (page.2) 365 0 R (page.20) 539 0 R (page.21) 544 0 R (page.22) 553 0 R (page.23) 566 0 R (page.24) 577 0 R (page.25) 587 0 R (page.26) 593 0 R (page.27) 597 0 R (page.28) 601 0 R (page.29) 607 0 R (page.3) 376 0 R (page.30) 613 0 R (page.31) 622 0 R (page.32) 632 0 R (page.33) 675 0 R ] /Limits [ (page.100) (page.33) ] >>
+<< /Names [ (HD.924) 1659 0 R (HD.925) 1660 0 R (HD.926) 1661 0 R (HD.927) 1662 0 R (HD.928) 1663 0 R (HD.929) 1664 0 R (HD.93) 744 0 R (HD.930) 1665 0 R (HD.931) 1666 0 R (HD.932) 1667 0 R (HD.933) 1668 0 R (HD.934) 1669 0 R (HD.935) 1670 0 R (HD.936) 1671 0 R (HD.937) 1672 0 R (HD.938) 1673 0 R (HD.939) 1674 0 R (HD.94) 745 0 R (HD.940) 1675 0 R (HD.941) 1676 0 R (HD.942) 1677 0 R (HD.943) 1678 0 R (HD.944) 1679 0 R (HD.945) 1684 0 R (HD.946) 1685 0 R (HD.947) 1686 0 R (HD.948) 1687 0 R (HD.949) 1688 0 R (HD.95) 746 0 R (HD.950) 1689 0 R (HD.951) 1690 0 R (HD.952) 1691 0 R ] /Limits [ (HD.924) (HD.952) ] >>
endobj
4635 0 obj
-<< /Names [ (page.34) 726 0 R (page.35) 781 0 R (page.36) 809 0 R (page.37) 834 0 R (page.38) 855 0 R (page.39) 897 0 R (page.4) 391 0 R (page.40) 933 0 R (page.41) 993 0 R (page.42) 1031 0 R (page.43) 1087 0 R (page.44) 1150 0 R (page.45) 1209 0 R (page.46) 1274 0 R (page.47) 1341 0 R (page.48) 1389 0 R (page.49) 1434 0 R (page.5) 413 0 R (page.50) 1476 0 R (page.51) 1534 0 R (page.52) 1595 0 R (page.53) 1641 0 R (page.54) 1689 0 R (page.55) 1735 0 R (page.56) 1787 0 R (page.57) 1848 0 R (page.58) 1892 0 R (page.59) 1955 0 R (page.6) 424 0 R (page.60) 2010 0 R (page.61) 2058 0 R (page.62) 2103 0 R ] /Limits [ (page.34) (page.62) ] >>
+<< /Names [ (HD.953) 1692 0 R (HD.954) 1693 0 R (HD.955) 1694 0 R (HD.956) 1695 0 R (HD.957) 1696 0 R (HD.958) 1697 0 R (HD.959) 1698 0 R (HD.96) 747 0 R (HD.960) 1699 0 R (HD.961) 1700 0 R (HD.962) 1701 0 R (HD.963) 1702 0 R (HD.964) 1703 0 R (HD.965) 1704 0 R (HD.966) 1705 0 R (HD.967) 1706 0 R (HD.968) 1707 0 R (HD.969) 1708 0 R (HD.97) 748 0 R (HD.970) 1709 0 R (HD.971) 1710 0 R (HD.972) 1711 0 R (HD.973) 1712 0 R (HD.974) 1713 0 R (HD.975) 1714 0 R (HD.976) 1715 0 R (HD.977) 1716 0 R (HD.978) 1717 0 R (HD.979) 1718 0 R (HD.98) 749 0 R (HD.980) 1719 0 R (HD.981) 1720 0 R ] /Limits [ (HD.953) (HD.981) ] >>
endobj
4636 0 obj
-<< /Names [ (page.63) 2162 0 R (page.64) 2227 0 R (page.65) 2285 0 R (page.66) 2337 0 R (page.67) 2367 0 R (page.68) 2405 0 R (page.69) 2445 0 R (page.7) 436 0 R (page.70) 2491 0 R (page.71) 2542 0 R (page.72) 2583 0 R (page.73) 2638 0 R (page.74) 2679 0 R (page.75) 2716 0 R (page.76) 2769 0 R (page.77) 2832 0 R (page.78) 2878 0 R (page.79) 2925 0 R (page.8) 447 0 R (page.80) 2981 0 R (page.81) 3036 0 R (page.82) 3080 0 R (page.83) 3139 0 R (page.84) 3199 0 R (page.85) 3252 0 R (page.86) 3290 0 R (page.87) 3343 0 R (page.88) 3395 0 R (page.89) 3455 0 R (page.9) 457 0 R (page.90) 3511 0 R (page.91) 3578 0 R ] /Limits [ (page.63) (page.91) ] >>
+<< /Names [ (HD.982) 1721 0 R (HD.983) 1722 0 R (HD.984) 1723 0 R (HD.985) 1728 0 R (HD.986) 1729 0 R (HD.987) 1730 0 R (HD.988) 1731 0 R (HD.989) 1732 0 R (HD.99) 750 0 R (HD.990) 1733 0 R (HD.991) 1734 0 R (HD.992) 1735 0 R (HD.993) 1736 0 R (HD.994) 1737 0 R (HD.995) 1738 0 R (HD.996) 1739 0 R (HD.997) 1740 0 R (HD.998) 1741 0 R (HD.999) 1742 0 R (Hfootnote.1) 348 0 R (Hfootnote.10) 426 0 R (Hfootnote.11) 427 0 R (Hfootnote.12) 428 0 R (Hfootnote.13) 429 0 R (Hfootnote.14) 440 0 R (Hfootnote.15) 441 0 R (Hfootnote.16) 442 0 R (Hfootnote.17) 453 0 R (Hfootnote.18) 454 0 R (Hfootnote.19) 465 0 R (Hfootnote.2) 352 0 R (Hfootnote.20) 473 0 R ] /Limits [ (HD.982) (Hfootnote.20) ] >>
endobj
4637 0 obj
-<< /Names [ (page.92) 3634 0 R (page.93) 3673 0 R (page.94) 3724 0 R (page.95) 3769 0 R (page.96) 3821 0 R (page.97) 3864 0 R (page.98) 3920 0 R (page.99) 3970 0 R (piton:passe) 449 0 R (piton:transpose) 448 0 R (section*.1) 2392 0 R (section*.10) 2838 0 R (section*.11) 2843 0 R (section*.12) 2887 0 R (section*.13) 2889 0 R (section*.14) 3024 0 R (section*.15) 3027 0 R (section*.16) 3038 0 R (section*.17) 3068 0 R (section*.18) 3087 0 R (section*.19) 3117 0 R (section*.2) 2446 0 R (section*.20) 3164 0 R (section*.21) 3166 0 R (section*.22) 3255 0 R (section*.23) 3267 0 R (section*.24) 3272 0 R (section*.25) 3274 0 R (section*.26) 3291 0 R (section*.27) 3390 0 R (section*.28) 3396 0 R (section*.29) 3401 0 R ] /Limits [ (page.92) (section*.29) ] >>
+<< /Names [ (Hfootnote.21) 474 0 R (Hfootnote.22) 492 0 R (Hfootnote.23) 508 0 R (Hfootnote.24) 523 0 R (Hfootnote.25) 524 0 R (Hfootnote.26) 531 0 R (Hfootnote.27) 532 0 R (Hfootnote.28) 552 0 R (Hfootnote.29) 553 0 R (Hfootnote.3) 368 0 R (Hfootnote.30) 550 0 R (Hfootnote.31) 551 0 R (Hfootnote.32) 581 0 R (Hfootnote.33) 596 0 R (Hfootnote.34) 635 0 R (Hfootnote.35) 632 0 R (Hfootnote.36) 633 0 R (Hfootnote.37) 634 0 R (Hfootnote.38) 1625 0 R (Hfootnote.39) 2587 0 R (Hfootnote.4) 378 0 R (Hfootnote.40) 2717 0 R (Hfootnote.41) 2718 0 R (Hfootnote.42) 2925 0 R (Hfootnote.43) 3246 0 R (Hfootnote.44) 3336 0 R (Hfootnote.45) 3502 0 R (Hfootnote.5) 379 0 R (Hfootnote.6) 395 0 R (Hfootnote.7) 396 0 R (Hfootnote.8) 397 0 R (Hfootnote.9) 398 0 R ] /Limits [ (Hfootnote.21) (Hfootnote.9) ] >>
endobj
4638 0 obj
-<< /Names [ (section*.3) 2481 0 R (section*.30) 3414 0 R (section*.31) 4200 0 R (section*.32) 4201 0 R (section*.33) 4202 0 R (section*.34) 4203 0 R (section*.35) 4204 0 R (section*.36) 4205 0 R (section*.37) 4206 0 R (section*.38) 4207 0 R (section*.39) 4208 0 R (section*.4) 2563 0 R (section*.40) 4209 0 R (section*.41) 4230 0 R (section*.42) 4231 0 R (section*.43) 4232 0 R (section*.44) 4233 0 R (section*.45) 4234 0 R (section*.46) 4235 0 R (section*.47) 4236 0 R (section*.5) 2684 0 R (section*.6) 2751 0 R (section*.7) 2762 0 R (section*.8) 2764 0 R (section*.9) 2770 0 R (section.0.1) 5 0 R (section.0.10) 201 0 R (section.0.11) 309 0 R (section.0.2) 9 0 R (section.0.3) 13 0 R (section.0.4) 33 0 R (section.0.5) 61 0 R ] /Limits [ (section*.3) (section.0.5) ] >>
+<< /Names [ (page.1) 323 0 R (page.10) 464 0 R (page.100) 3947 0 R (page.101) 3998 0 R (page.102) 4051 0 R (page.103) 4117 0 R (page.104) 4175 0 R (page.105) 4231 0 R (page.106) 4298 0 R (page.107) 4311 0 R (page.11) 472 0 R (page.12) 480 0 R (page.13) 484 0 R (page.14) 491 0 R (page.15) 502 0 R (page.16) 507 0 R (page.17) 513 0 R (page.18) 520 0 R (page.19) 530 0 R (page.2) 365 0 R (page.20) 539 0 R (page.21) 548 0 R (page.22) 564 0 R (page.23) 573 0 R (page.24) 577 0 R (page.25) 588 0 R (page.26) 595 0 R (page.27) 601 0 R (page.28) 605 0 R (page.29) 609 0 R (page.3) 376 0 R (page.30) 615 0 R ] /Limits [ (page.1) (page.30) ] >>
endobj
4639 0 obj
-<< /Names [ (section.0.6) 65 0 R (section.0.7) 145 0 R (section.0.8) 149 0 R (section.0.9) 173 0 R (subsection.0.10.1) 205 0 R (subsection.0.10.2) 209 0 R (subsection.0.10.3) 269 0 R (subsection.0.3.1) 17 0 R (subsection.0.3.2) 21 0 R (subsection.0.3.3) 25 0 R (subsection.0.3.4) 29 0 R (subsection.0.4.1) 37 0 R (subsection.0.4.2) 41 0 R (subsection.0.4.3) 57 0 R (subsection.0.6.1) 69 0 R (subsection.0.6.2) 81 0 R (subsection.0.6.3) 93 0 R (subsection.0.6.4) 97 0 R (subsection.0.6.5) 121 0 R (subsection.0.6.6) 137 0 R (subsection.0.6.7) 141 0 R (subsection.0.8.1) 153 0 R (subsection.0.8.2) 157 0 R (subsection.0.8.3) 161 0 R (subsection.0.8.4) 165 0 R (subsection.0.8.5) 169 0 R (subsection.0.9.1) 177 0 R (subsection.0.9.2) 181 0 R (subsection.0.9.3) 185 0 R (subsection.0.9.4) 189 0 R (subsection.0.9.5) 193 0 R (subsection.0.9.6) 197 0 R ] /Limits [ (section.0.6) (subsection.0.9.6) ] >>
+<< /Names [ (page.31) 621 0 R (page.32) 631 0 R (page.33) 640 0 R (page.34) 680 0 R (page.35) 731 0 R (page.36) 786 0 R (page.37) 812 0 R (page.38) 838 0 R (page.39) 866 0 R (page.4) 393 0 R (page.40) 903 0 R (page.41) 947 0 R (page.42) 1006 0 R (page.43) 1042 0 R (page.44) 1089 0 R (page.45) 1152 0 R (page.46) 1211 0 R (page.47) 1276 0 R (page.48) 1343 0 R (page.49) 1386 0 R (page.5) 411 0 R (page.50) 1436 0 R (page.51) 1474 0 R (page.52) 1526 0 R (page.53) 1584 0 R (page.54) 1630 0 R (page.55) 1683 0 R (page.56) 1727 0 R (page.57) 1779 0 R (page.58) 1839 0 R (page.59) 1888 0 R (page.6) 424 0 R ] /Limits [ (page.31) (page.6) ] >>
endobj
4640 0 obj
-<< /Names [ (subsubsection.0.10.2.1) 213 0 R (subsubsection.0.10.2.10) 249 0 R (subsubsection.0.10.2.11) 253 0 R (subsubsection.0.10.2.12) 257 0 R (subsubsection.0.10.2.13) 261 0 R (subsubsection.0.10.2.14) 265 0 R (subsubsection.0.10.2.2) 217 0 R (subsubsection.0.10.2.3) 221 0 R (subsubsection.0.10.2.4) 225 0 R (subsubsection.0.10.2.5) 229 0 R (subsubsection.0.10.2.6) 233 0 R (subsubsection.0.10.2.7) 237 0 R (subsubsection.0.10.2.8) 241 0 R (subsubsection.0.10.2.9) 245 0 R (subsubsection.0.10.3.1) 273 0 R (subsubsection.0.10.3.2) 277 0 R (subsubsection.0.10.3.3) 281 0 R (subsubsection.0.10.3.4) 285 0 R (subsubsection.0.10.3.5) 289 0 R (subsubsection.0.10.3.6) 293 0 R (subsubsection.0.10.3.7) 297 0 R (subsubsection.0.10.3.8) 301 0 R (subsubsection.0.10.3.9) 305 0 R (subsubsection.0.4.2.1) 45 0 R (subsubsection.0.4.2.2) 49 0 R (subsubsection.0.4.2.3) 53 0 R (subsubsection.0.6.1.1) 73 0 R (subsubsection.0.6.1.2) 77 0 R (subsubsection.0.6.2.1) 85 0 R (subsubsection.0.6.2.2) 89 0 R (subsubsection.0.6.4.1) 101 0 R (subsubsection.0.6.4.2) 105 0 R ] /Limits [ (subsubsection.0.10.2.1) (subsubsection.0.6.4.2) ] >>
+<< /Names [ (page.60) 1954 0 R (page.61) 2005 0 R (page.62) 2045 0 R (page.63) 2096 0 R (page.64) 2158 0 R (page.65) 2221 0 R (page.66) 2275 0 R (page.67) 2323 0 R (page.68) 2357 0 R (page.69) 2395 0 R (page.7) 438 0 R (page.70) 2439 0 R (page.71) 2491 0 R (page.72) 2552 0 R (page.73) 2592 0 R (page.74) 2653 0 R (page.75) 2681 0 R (page.76) 2723 0 R (page.77) 2777 0 R (page.78) 2836 0 R (page.79) 2881 0 R (page.8) 450 0 R (page.80) 2930 0 R (page.81) 2984 0 R (page.82) 3038 0 R (page.83) 3084 0 R (page.84) 3143 0 R (page.85) 3198 0 R (page.86) 3251 0 R (page.87) 3289 0 R (page.88) 3341 0 R (page.89) 3393 0 R ] /Limits [ (page.60) (page.89) ] >>
endobj
4641 0 obj
-<< /Names [ (subsubsection.0.6.4.3) 109 0 R (subsubsection.0.6.4.4) 113 0 R (subsubsection.0.6.4.5) 117 0 R (subsubsection.0.6.5.1) 125 0 R (subsubsection.0.6.5.2) 129 0 R (subsubsection.0.6.5.3) 133 0 R (toc1.1) 313 0 R ] /Limits [ (subsubsection.0.6.4.3) (toc1.1) ] >>
+<< /Names [ (page.9) 459 0 R (page.90) 3452 0 R (page.91) 3507 0 R (page.92) 3573 0 R (page.93) 3628 0 R (page.94) 3670 0 R (page.95) 3719 0 R (page.96) 3753 0 R (page.97) 3794 0 R (page.98) 3840 0 R (page.99) 3888 0 R (piton:passe) 452 0 R (piton:transpose) 451 0 R (section*.1) 2374 0 R (section*.10) 2832 0 R (section*.11) 2841 0 R (section*.12) 2885 0 R (section*.13) 2887 0 R (section*.14) 3024 0 R (section*.15) 3027 0 R (section*.16) 3039 0 R (section*.17) 3069 0 R (section*.18) 3087 0 R (section*.19) 3117 0 R (section*.2) 2424 0 R (section*.20) 3164 0 R (section*.21) 3166 0 R (section*.22) 3254 0 R (section*.23) 3266 0 R (section*.24) 3271 0 R (section*.25) 3273 0 R (section*.26) 3290 0 R ] /Limits [ (page.9) (section*.26) ] >>
endobj
4642 0 obj
-<< /Kids [ 4532 0 R 4533 0 R 4534 0 R 4535 0 R 4536 0 R 4537 0 R 4538 0 R 4539 0 R 4540 0 R 4541 0 R 4542 0 R 4543 0 R 4544 0 R 4545 0 R 4546 0 R 4547 0 R 4548 0 R 4549 0 R 4550 0 R 4551 0 R 4552 0 R 4553 0 R 4554 0 R 4555 0 R 4556 0 R 4557 0 R 4558 0 R 4559 0 R 4560 0 R 4561 0 R 4562 0 R 4563 0 R ] /Limits [ (Doc-Start) (HD.1919) ] >>
+<< /Names [ (section*.27) 3388 0 R (section*.28) 3394 0 R (section*.29) 3399 0 R (section*.3) 2465 0 R (section*.30) 3412 0 R (section*.31) 4210 0 R (section*.32) 4211 0 R (section*.33) 4212 0 R (section*.34) 4232 0 R (section*.35) 4233 0 R (section*.36) 4234 0 R (section*.37) 4235 0 R (section*.38) 4236 0 R (section*.39) 4237 0 R (section*.4) 2557 0 R (section*.40) 4238 0 R (section*.41) 4239 0 R (section*.5) 2682 0 R (section*.6) 2749 0 R (section*.7) 2760 0 R (section*.8) 2762 0 R (section*.9) 2764 0 R (section.0.1) 5 0 R (section.0.10) 197 0 R (section.0.11) 309 0 R (section.0.2) 9 0 R (section.0.3) 13 0 R (section.0.4) 33 0 R (section.0.5) 61 0 R (section.0.6) 65 0 R (section.0.7) 145 0 R (section.0.8) 149 0 R ] /Limits [ (section*.27) (section.0.8) ] >>
endobj
4643 0 obj
-<< /Kids [ 4564 0 R 4565 0 R 4566 0 R 4567 0 R 4568 0 R 4569 0 R 4570 0 R 4571 0 R 4572 0 R 4573 0 R 4574 0 R 4575 0 R 4576 0 R 4577 0 R 4578 0 R 4579 0 R 4580 0 R 4581 0 R 4582 0 R 4583 0 R 4584 0 R 4585 0 R 4586 0 R 4587 0 R 4588 0 R 4589 0 R 4590 0 R 4591 0 R 4592 0 R 4593 0 R 4594 0 R 4595 0 R ] /Limits [ (HD.192) (HD.2840) ] >>
+<< /Names [ (section.0.9) 169 0 R (subsection.0.10.1) 201 0 R (subsection.0.10.2) 205 0 R (subsection.0.10.3) 265 0 R (subsection.0.3.1) 17 0 R (subsection.0.3.2) 21 0 R (subsection.0.3.3) 25 0 R (subsection.0.3.4) 29 0 R (subsection.0.4.1) 37 0 R (subsection.0.4.2) 41 0 R (subsection.0.4.3) 57 0 R (subsection.0.6.1) 69 0 R (subsection.0.6.2) 81 0 R (subsection.0.6.3) 93 0 R (subsection.0.6.4) 97 0 R (subsection.0.6.5) 121 0 R (subsection.0.6.6) 137 0 R (subsection.0.6.7) 141 0 R (subsection.0.8.1) 153 0 R (subsection.0.8.2) 157 0 R (subsection.0.8.3) 161 0 R (subsection.0.8.4) 165 0 R (subsection.0.9.1) 173 0 R (subsection.0.9.2) 177 0 R (subsection.0.9.3) 181 0 R (subsection.0.9.4) 185 0 R (subsection.0.9.5) 189 0 R (subsection.0.9.6) 193 0 R (subsubsection.0.10.2.1) 209 0 R (subsubsection.0.10.2.10) 245 0 R (subsubsection.0.10.2.11) 249 0 R (subsubsection.0.10.2.12) 253 0 R ] /Limits [ (section.0.9) (subsubsection.0.10.2.12) ] >>
endobj
4644 0 obj
-<< /Kids [ 4596 0 R 4597 0 R 4598 0 R 4599 0 R 4600 0 R 4601 0 R 4602 0 R 4603 0 R 4604 0 R 4605 0 R 4606 0 R 4607 0 R 4608 0 R 4609 0 R 4610 0 R 4611 0 R 4612 0 R 4613 0 R 4614 0 R 4615 0 R 4616 0 R 4617 0 R 4618 0 R 4619 0 R 4620 0 R 4621 0 R 4622 0 R 4623 0 R 4624 0 R 4625 0 R 4626 0 R 4627 0 R ] /Limits [ (HD.2841) (HD.868) ] >>
+<< /Names [ (subsubsection.0.10.2.13) 257 0 R (subsubsection.0.10.2.14) 261 0 R (subsubsection.0.10.2.2) 213 0 R (subsubsection.0.10.2.3) 217 0 R (subsubsection.0.10.2.4) 221 0 R (subsubsection.0.10.2.5) 225 0 R (subsubsection.0.10.2.6) 229 0 R (subsubsection.0.10.2.7) 233 0 R (subsubsection.0.10.2.8) 237 0 R (subsubsection.0.10.2.9) 241 0 R (subsubsection.0.10.3.1) 269 0 R (subsubsection.0.10.3.10) 305 0 R (subsubsection.0.10.3.2) 273 0 R (subsubsection.0.10.3.3) 277 0 R (subsubsection.0.10.3.4) 281 0 R (subsubsection.0.10.3.5) 285 0 R (subsubsection.0.10.3.6) 289 0 R (subsubsection.0.10.3.7) 293 0 R (subsubsection.0.10.3.8) 297 0 R (subsubsection.0.10.3.9) 301 0 R (subsubsection.0.4.2.1) 45 0 R (subsubsection.0.4.2.2) 49 0 R (subsubsection.0.4.2.3) 53 0 R (subsubsection.0.6.1.1) 73 0 R (subsubsection.0.6.1.2) 77 0 R (subsubsection.0.6.2.1) 85 0 R (subsubsection.0.6.2.2) 89 0 R (subsubsection.0.6.4.1) 101 0 R (subsubsection.0.6.4.2) 105 0 R (subsubsection.0.6.4.3) 109 0 R (subsubsection.0.6.4.4) 113 0 R (subsubsection.0.6.4.5) 117 0 R ] /Limits [ (subsubsection.0.10.2.13) (subsubsection.0.6.4.5) ] >>
endobj
4645 0 obj
-<< /Kids [ 4628 0 R 4629 0 R 4630 0 R 4631 0 R 4632 0 R 4633 0 R 4634 0 R 4635 0 R 4636 0 R 4637 0 R 4638 0 R 4639 0 R 4640 0 R 4641 0 R ] /Limits [ (HD.869) (toc1.1) ] >>
+<< /Names [ (subsubsection.0.6.5.1) 125 0 R (subsubsection.0.6.5.2) 129 0 R (subsubsection.0.6.5.3) 133 0 R (toc1.1) 313 0 R ] /Limits [ (subsubsection.0.6.5.1) (toc1.1) ] >>
endobj
4646 0 obj
-<< /Kids [ 4642 0 R 4643 0 R 4644 0 R 4645 0 R ] /Limits [ (Doc-Start) (toc1.1) ] >>
+<< /Kids [ 4536 0 R 4537 0 R 4538 0 R 4539 0 R 4540 0 R 4541 0 R 4542 0 R 4543 0 R 4544 0 R 4545 0 R 4546 0 R 4547 0 R 4548 0 R 4549 0 R 4550 0 R 4551 0 R 4552 0 R 4553 0 R 4554 0 R 4555 0 R 4556 0 R 4557 0 R 4558 0 R 4559 0 R 4560 0 R 4561 0 R 4562 0 R 4563 0 R 4564 0 R 4565 0 R 4566 0 R 4567 0 R ] /Limits [ (Doc-Start) (HD.1919) ] >>
endobj
4647 0 obj
-<< /Dests 4646 0 R >>
+<< /Kids [ 4568 0 R 4569 0 R 4570 0 R 4571 0 R 4572 0 R 4573 0 R 4574 0 R 4575 0 R 4576 0 R 4577 0 R 4578 0 R 4579 0 R 4580 0 R 4581 0 R 4582 0 R 4583 0 R 4584 0 R 4585 0 R 4586 0 R 4587 0 R 4588 0 R 4589 0 R 4590 0 R 4591 0 R 4592 0 R 4593 0 R 4594 0 R 4595 0 R 4596 0 R 4597 0 R 4598 0 R 4599 0 R ] /Limits [ (HD.192) (HD.2840) ] >>
endobj
4648 0 obj
-<< /Type /Catalog /Pages 4530 0 R /Outlines 4531 0 R /Names 4647 0 R /PageMode/UseOutlines /OpenAction 316 0 R >>
+<< /Kids [ 4600 0 R 4601 0 R 4602 0 R 4603 0 R 4604 0 R 4605 0 R 4606 0 R 4607 0 R 4608 0 R 4609 0 R 4610 0 R 4611 0 R 4612 0 R 4613 0 R 4614 0 R 4615 0 R 4616 0 R 4617 0 R 4618 0 R 4619 0 R 4620 0 R 4621 0 R 4622 0 R 4623 0 R 4624 0 R 4625 0 R 4626 0 R 4627 0 R 4628 0 R 4629 0 R 4630 0 R 4631 0 R ] /Limits [ (HD.2841) (HD.866) ] >>
endobj
4649 0 obj
-<< /Author(\376\377\000F\000.\000\040\000P\000a\000n\000t\000i\000g\000n\000y\000\040\000,\000\040\000f\000p\000a\000n\000t\000i\000g\000n\000y\000@\000w\000a\000n\000a\000d\000o\000o\000.\000f\000r)/Title(\376\377\000T\000h\000e\000\040\000p\000a\000c\000k\000a\000g\000e\000\040\000p\000i\000t\000o\000n)/Subject()/Creator(LaTeX with hyperref)/Keywords() /Producer (LuaTeX-1.18.1) /CreationDate (D:20240523185009+02'00') /ModDate (D:20240523185009+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.1 (MiKTeX 24.4)) >>
+<< /Kids [ 4632 0 R 4633 0 R 4634 0 R 4635 0 R 4636 0 R 4637 0 R 4638 0 R 4639 0 R 4640 0 R 4641 0 R 4642 0 R 4643 0 R 4644 0 R 4645 0 R ] /Limits [ (HD.867) (toc1.1) ] >>
+endobj
+4650 0 obj
+<< /Kids [ 4646 0 R 4647 0 R 4648 0 R 4649 0 R ] /Limits [ (Doc-Start) (toc1.1) ] >>
+endobj
+4651 0 obj
+<< /Dests 4650 0 R >>
+endobj
+4652 0 obj
+<< /Type /Catalog /Pages 4534 0 R /Outlines 4535 0 R /Names 4651 0 R /PageMode/UseOutlines /OpenAction 316 0 R >>
+endobj
+4653 0 obj
+<< /Author(\376\377\000F\000.\000\040\000P\000a\000n\000t\000i\000g\000n\000y\000\040\000,\000\040\000f\000p\000a\000n\000t\000i\000g\000n\000y\000@\000w\000a\000n\000a\000d\000o\000o\000.\000f\000r)/Title(\376\377\000T\000h\000e\000\040\000p\000a\000c\000k\000a\000g\000e\000\040\000p\000i\000t\000o\000n)/Subject()/Creator(LaTeX with hyperref)/Keywords() /Producer (LuaTeX-1.18.1) /CreationDate (D:20240812173627+02'00') /ModDate (D:20240812173627+02'00') /Trapped /False /PTEX.FullBanner (This is LuaHBTeX, Version 1.18.1 (MiKTeX 24.4)) >>
endobj
xref
-0 4650
+0 4654
0000000000 65535 f
-0000606561 00000 n
-0000606606 00000 n
-0000606626 00000 n
+0000613551 00000 n
+0000613596 00000 n
+0000613616 00000 n
0000000020 00000 n
-0000024062 00000 n
-0000885545 00000 n
+0000024153 00000 n
+0000892406 00000 n
0000000067 00000 n
0000000167 00000 n
-0000029704 00000 n
-0000885458 00000 n
+0000029796 00000 n
+0000892319 00000 n
0000000214 00000 n
0000000315 00000 n
-0000029764 00000 n
-0000885332 00000 n
+0000029856 00000 n
+0000892193 00000 n
0000000363 00000 n
0000000503 00000 n
-0000029825 00000 n
-0000885258 00000 n
+0000029917 00000 n
+0000892119 00000 n
0000000556 00000 n
0000000708 00000 n
-0000029886 00000 n
-0000885171 00000 n
+0000029978 00000 n
+0000892032 00000 n
0000000761 00000 n
0000000979 00000 n
-0000029947 00000 n
-0000885084 00000 n
+0000030039 00000 n
+0000891945 00000 n
0000001032 00000 n
0000001248 00000 n
-0000035326 00000 n
-0000885010 00000 n
+0000035418 00000 n
+0000891871 00000 n
0000001301 00000 n
0000001530 00000 n
-0000042425 00000 n
-0000884884 00000 n
+0000042902 00000 n
+0000891745 00000 n
0000001578 00000 n
0000001684 00000 n
-0000042486 00000 n
-0000884810 00000 n
+0000042963 00000 n
+0000891671 00000 n
0000001737 00000 n
0000001991 00000 n
-0000054349 00000 n
-0000884686 00000 n
+0000060536 00000 n
+0000891547 00000 n
0000002044 00000 n
0000002148 00000 n
-0000054410 00000 n
-0000884612 00000 n
+0000060597 00000 n
+0000891473 00000 n
0000002206 00000 n
0000002348 00000 n
-0000059557 00000 n
-0000884525 00000 n
+0000060658 00000 n
+0000891386 00000 n
0000002406 00000 n
0000002629 00000 n
-0000064722 00000 n
-0000884451 00000 n
+0000065944 00000 n
+0000891312 00000 n
0000002687 00000 n
0000002864 00000 n
-0000064911 00000 n
-0000884377 00000 n
+0000066132 00000 n
+0000891238 00000 n
0000002917 00000 n
0000003117 00000 n
-0000068900 00000 n
-0000884288 00000 n
+0000070157 00000 n
+0000891149 00000 n
0000003165 00000 n
0000003505 00000 n
-0000073253 00000 n
-0000884160 00000 n
+0000079217 00000 n
+0000891021 00000 n
0000003553 00000 n
0000003682 00000 n
-0000073314 00000 n
-0000884049 00000 n
+0000079278 00000 n
+0000890910 00000 n
0000003735 00000 n
0000003933 00000 n
-0000073374 00000 n
-0000883975 00000 n
+0000079339 00000 n
+0000890836 00000 n
0000003991 00000 n
0000004110 00000 n
-0000078664 00000 n
-0000883901 00000 n
+0000079400 00000 n
+0000890762 00000 n
0000004168 00000 n
0000004287 00000 n
-0000082649 00000 n
-0000883777 00000 n
+0000083649 00000 n
+0000890638 00000 n
0000004340 00000 n
0000004554 00000 n
-0000082710 00000 n
-0000883703 00000 n
+0000083710 00000 n
+0000890564 00000 n
0000004612 00000 n
0000004764 00000 n
-0000082771 00000 n
-0000883629 00000 n
+0000087224 00000 n
+0000890490 00000 n
0000004822 00000 n
0000004989 00000 n
-0000089940 00000 n
-0000883542 00000 n
+0000091370 00000 n
+0000890403 00000 n
0000005042 00000 n
0000005244 00000 n
-0000094927 00000 n
-0000883415 00000 n
+0000095513 00000 n
+0000890276 00000 n
0000005297 00000 n
0000005505 00000 n
-0000094988 00000 n
-0000883337 00000 n
+0000095574 00000 n
+0000890198 00000 n
0000005564 00000 n
0000005742 00000 n
-0000098856 00000 n
-0000883245 00000 n
+0000099796 00000 n
+0000890106 00000 n
0000005801 00000 n
0000005994 00000 n
-0000098918 00000 n
-0000883153 00000 n
+0000099858 00000 n
+0000890014 00000 n
0000006053 00000 n
0000006266 00000 n
-0000098980 00000 n
-0000883061 00000 n
+0000104044 00000 n
+0000889922 00000 n
0000006325 00000 n
0000006513 00000 n
-0000102574 00000 n
-0000882983 00000 n
+0000104106 00000 n
+0000889844 00000 n
0000006572 00000 n
0000006785 00000 n
-0000108035 00000 n
-0000882853 00000 n
+0000108501 00000 n
+0000889714 00000 n
0000006839 00000 n
0000007048 00000 n
-0000108097 00000 n
-0000882774 00000 n
+0000108563 00000 n
+0000889635 00000 n
0000007107 00000 n
0000007430 00000 n
-0000108159 00000 n
-0000882681 00000 n
+0000108625 00000 n
+0000889542 00000 n
0000007489 00000 n
0000007866 00000 n
-0000111687 00000 n
-0000882602 00000 n
+0000113035 00000 n
+0000889463 00000 n
0000007925 00000 n
0000008322 00000 n
-0000117723 00000 n
-0000882510 00000 n
+0000117889 00000 n
+0000889371 00000 n
0000008376 00000 n
0000008633 00000 n
-0000117784 00000 n
-0000882432 00000 n
+0000122585 00000 n
+0000889293 00000 n
0000008687 00000 n
0000008794 00000 n
-0000117846 00000 n
-0000882339 00000 n
+0000128117 00000 n
+0000889200 00000 n
0000008843 00000 n
0000009009 00000 n
-0000121909 00000 n
-0000882206 00000 n
+0000128179 00000 n
+0000889067 00000 n
0000009058 00000 n
0000009140 00000 n
-0000121971 00000 n
-0000882127 00000 n
+0000128241 00000 n
+0000888988 00000 n
0000009194 00000 n
0000009319 00000 n
-0000122033 00000 n
-0000882034 00000 n
+0000131710 00000 n
+0000888895 00000 n
0000009373 00000 n
0000009597 00000 n
-0000126540 00000 n
-0000881941 00000 n
+0000136014 00000 n
+0000888802 00000 n
0000009651 00000 n
-0000009817 00000 n
-0000131616 00000 n
-0000881848 00000 n
-0000009871 00000 n
-0000010111 00000 n
-0000134939 00000 n
-0000881769 00000 n
-0000010165 00000 n
-0000010308 00000 n
-0000139455 00000 n
-0000881636 00000 n
-0000010357 00000 n
-0000010652 00000 n
-0000139517 00000 n
-0000881557 00000 n
-0000010706 00000 n
-0000010859 00000 n
-0000143047 00000 n
-0000881464 00000 n
-0000010913 00000 n
-0000011061 00000 n
-0000146638 00000 n
-0000881371 00000 n
-0000011115 00000 n
-0000011305 00000 n
-0000150029 00000 n
-0000881278 00000 n
-0000011359 00000 n
-0000011497 00000 n
-0000152201 00000 n
-0000881185 00000 n
-0000011551 00000 n
-0000011729 00000 n
-0000154201 00000 n
-0000881106 00000 n
-0000011783 00000 n
-0000012060 00000 n
-0000158712 00000 n
-0000880973 00000 n
-0000012110 00000 n
-0000012227 00000 n
-0000158774 00000 n
-0000880894 00000 n
-0000012282 00000 n
-0000012399 00000 n
-0000162705 00000 n
-0000880761 00000 n
-0000012454 00000 n
-0000012691 00000 n
-0000162767 00000 n
-0000880682 00000 n
-0000012751 00000 n
-0000012957 00000 n
-0000180318 00000 n
-0000880589 00000 n
-0000013017 00000 n
-0000013273 00000 n
-0000199859 00000 n
-0000880496 00000 n
-0000013333 00000 n
-0000013550 00000 n
-0000220528 00000 n
-0000880403 00000 n
-0000013610 00000 n
-0000013737 00000 n
-0000247081 00000 n
-0000880310 00000 n
-0000013797 00000 n
-0000013996 00000 n
-0000248313 00000 n
-0000880217 00000 n
-0000014056 00000 n
-0000014324 00000 n
-0000252671 00000 n
-0000880124 00000 n
-0000014384 00000 n
-0000014740 00000 n
-0000308873 00000 n
-0000880031 00000 n
-0000014800 00000 n
-0000014920 00000 n
-0000320013 00000 n
-0000879938 00000 n
-0000014980 00000 n
-0000015143 00000 n
-0000325909 00000 n
-0000879845 00000 n
-0000015204 00000 n
-0000015427 00000 n
-0000335723 00000 n
-0000879752 00000 n
-0000015488 00000 n
-0000015600 00000 n
-0000336434 00000 n
-0000879659 00000 n
-0000015661 00000 n
-0000015913 00000 n
-0000350746 00000 n
-0000879566 00000 n
-0000015974 00000 n
-0000016137 00000 n
-0000354756 00000 n
-0000879487 00000 n
-0000016198 00000 n
-0000016358 00000 n
-0000356117 00000 n
-0000879369 00000 n
-0000016413 00000 n
-0000016655 00000 n
-0000393772 00000 n
-0000879290 00000 n
-0000016715 00000 n
-0000016883 00000 n
-0000435167 00000 n
-0000879197 00000 n
-0000016943 00000 n
-0000017106 00000 n
-0000465155 00000 n
-0000879104 00000 n
-0000017166 00000 n
-0000017309 00000 n
-0000477452 00000 n
-0000879011 00000 n
-0000017369 00000 n
-0000017522 00000 n
-0000495129 00000 n
-0000878918 00000 n
-0000017582 00000 n
-0000017775 00000 n
-0000512527 00000 n
-0000878825 00000 n
-0000017835 00000 n
-0000018246 00000 n
-0000513174 00000 n
-0000878732 00000 n
-0000018306 00000 n
-0000018621 00000 n
-0000524998 00000 n
-0000878639 00000 n
-0000018681 00000 n
-0000018903 00000 n
-0000531630 00000 n
-0000878560 00000 n
-0000018963 00000 n
-0000019309 00000 n
-0000575224 00000 n
-0000878466 00000 n
-0000019359 00000 n
-0000019441 00000 n
-0000585853 00000 n
-0000878386 00000 n
-0000019485 00000 n
-0000019554 00000 n
-0000023057 00000 n
-0000023247 00000 n
-0000023558 00000 n
-0000023402 00000 n
-0000024248 00000 n
-0000019618 00000 n
-0000023938 00000 n
-0000024000 00000 n
-0000785985 00000 n
-0000783093 00000 n
-0000875028 00000 n
-0000780879 00000 n
-0000777205 00000 n
-0000773859 00000 n
-0000771227 00000 n
-0000764868 00000 n
-0000762755 00000 n
-0000754610 00000 n
-0000743649 00000 n
-0000739982 00000 n
-0000736879 00000 n
-0000726167 00000 n
-0000722216 00000 n
-0000875744 00000 n
-0000874306 00000 n
-0000874668 00000 n
-0000875920 00000 n
-0000875208 00000 n
-0000715529 00000 n
-0000706795 00000 n
-0000702560 00000 n
-0000024122 00000 n
-0000699450 00000 n
-0000695727 00000 n
-0000023750 00000 n
-0000024185 00000 n
-0000876267 00000 n
-0000023194 00000 n
-0000028848 00000 n
-0000029482 00000 n
-0000029004 00000 n
-0000029160 00000 n
-0000029321 00000 n
-0000034630 00000 n
-0000034791 00000 n
-0000030071 00000 n
-0000028650 00000 n
-0000024684 00000 n
-0000029642 00000 n
-0000688009 00000 n
-0000686220 00000 n
-0000030008 00000 n
-0000028787 00000 n
-0000034952 00000 n
-0000035108 00000 n
-0000041109 00000 n
-0000035513 00000 n
-0000034440 00000 n
-0000030325 00000 n
-0000035264 00000 n
-0000677253 00000 n
-0000035387 00000 n
-0000035450 00000 n
-0000034577 00000 n
-0000041264 00000 n
-0000042053 00000 n
+0000009891 00000 n
+0000136076 00000 n
+0000888723 00000 n
+0000009945 00000 n
+0000010088 00000 n
+0000142267 00000 n
+0000888590 00000 n
+0000010137 00000 n
+0000010432 00000 n
+0000142329 00000 n
+0000888511 00000 n
+0000010486 00000 n
+0000010639 00000 n
+0000145859 00000 n
+0000888418 00000 n
+0000010693 00000 n
+0000010841 00000 n
+0000149450 00000 n
+0000888325 00000 n
+0000010895 00000 n
+0000011085 00000 n
+0000152842 00000 n
+0000888232 00000 n
+0000011139 00000 n
+0000011277 00000 n
+0000155014 00000 n
+0000888139 00000 n
+0000011331 00000 n
+0000011509 00000 n
+0000157013 00000 n
+0000888060 00000 n
+0000011563 00000 n
+0000011840 00000 n
+0000161521 00000 n
+0000887927 00000 n
+0000011890 00000 n
+0000012007 00000 n
+0000161583 00000 n
+0000887848 00000 n
+0000012062 00000 n
+0000012179 00000 n
+0000165606 00000 n
+0000887715 00000 n
+0000012234 00000 n
+0000012471 00000 n
+0000165668 00000 n
+0000887636 00000 n
+0000012531 00000 n
+0000012737 00000 n
+0000183307 00000 n
+0000887543 00000 n
+0000012797 00000 n
+0000013053 00000 n
+0000203232 00000 n
+0000887450 00000 n
+0000013113 00000 n
+0000013330 00000 n
+0000225152 00000 n
+0000887357 00000 n
+0000013390 00000 n
+0000013517 00000 n
+0000251974 00000 n
+0000887264 00000 n
+0000013577 00000 n
+0000013776 00000 n
+0000255710 00000 n
+0000887171 00000 n
+0000013836 00000 n
+0000014104 00000 n
+0000257201 00000 n
+0000887078 00000 n
+0000014164 00000 n
+0000014520 00000 n
+0000312322 00000 n
+0000886985 00000 n
+0000014580 00000 n
+0000014700 00000 n
+0000323293 00000 n
+0000886892 00000 n
+0000014760 00000 n
+0000014923 00000 n
+0000329459 00000 n
+0000886799 00000 n
+0000014984 00000 n
+0000015207 00000 n
+0000336280 00000 n
+0000886706 00000 n
+0000015268 00000 n
+0000015380 00000 n
+0000339407 00000 n
+0000886613 00000 n
+0000015441 00000 n
+0000015693 00000 n
+0000354079 00000 n
+0000886520 00000 n
+0000015754 00000 n
+0000015917 00000 n
+0000355051 00000 n
+0000886441 00000 n
+0000015978 00000 n
+0000016138 00000 n
+0000360385 00000 n
+0000886322 00000 n
+0000016193 00000 n
+0000016435 00000 n
+0000360837 00000 n
+0000886243 00000 n
+0000016495 00000 n
+0000016749 00000 n
+0000398712 00000 n
+0000886150 00000 n
+0000016809 00000 n
+0000016977 00000 n
+0000440053 00000 n
+0000886057 00000 n
+0000017037 00000 n
+0000017200 00000 n
+0000470042 00000 n
+0000885964 00000 n
+0000017260 00000 n
+0000017403 00000 n
+0000482487 00000 n
+0000885871 00000 n
+0000017463 00000 n
+0000017616 00000 n
+0000500408 00000 n
+0000885778 00000 n
+0000017676 00000 n
+0000017869 00000 n
+0000517927 00000 n
+0000885685 00000 n
+0000017929 00000 n
+0000018340 00000 n
+0000518573 00000 n
+0000885592 00000 n
+0000018400 00000 n
+0000018715 00000 n
+0000534577 00000 n
+0000885499 00000 n
+0000018775 00000 n
+0000018997 00000 n
+0000541787 00000 n
+0000885420 00000 n
+0000019058 00000 n
+0000019409 00000 n
+0000585524 00000 n
+0000885326 00000 n
+0000019459 00000 n
+0000019541 00000 n
+0000592612 00000 n
+0000885246 00000 n
+0000019585 00000 n
+0000019654 00000 n
+0000023149 00000 n
+0000023339 00000 n
+0000023649 00000 n
+0000023494 00000 n
+0000024339 00000 n
+0000019718 00000 n
+0000024029 00000 n
+0000024091 00000 n
+0000792836 00000 n
+0000789944 00000 n
+0000881879 00000 n
+0000787730 00000 n
+0000783900 00000 n
+0000780554 00000 n
+0000777922 00000 n
+0000771563 00000 n
+0000769450 00000 n
+0000761305 00000 n
+0000750473 00000 n
+0000746806 00000 n
+0000743703 00000 n
+0000732991 00000 n
+0000729040 00000 n
+0000882595 00000 n
+0000881157 00000 n
+0000881519 00000 n
+0000882771 00000 n
+0000882059 00000 n
+0000722353 00000 n
+0000713766 00000 n
+0000709531 00000 n
+0000024213 00000 n
+0000706421 00000 n
+0000702698 00000 n
+0000023841 00000 n
+0000024276 00000 n
+0000883118 00000 n
+0000023286 00000 n
+0000028940 00000 n
+0000029574 00000 n
+0000029096 00000 n
+0000029252 00000 n
+0000029413 00000 n
+0000034722 00000 n
+0000034883 00000 n
+0000030163 00000 n
+0000028742 00000 n
+0000024775 00000 n
+0000029734 00000 n
+0000694980 00000 n
+0000693191 00000 n
+0000030100 00000 n
+0000028879 00000 n
+0000035044 00000 n
+0000035200 00000 n
+0000041273 00000 n
+0000035605 00000 n
+0000034532 00000 n
+0000030417 00000 n
+0000035356 00000 n
+0000684224 00000 n
+0000035479 00000 n
+0000035542 00000 n
+0000034669 00000 n
+0000041428 00000 n
+0000041584 00000 n
+0000041740 00000 n
+0000042530 00000 n
+0000042685 00000 n
+0000041896 00000 n
+0000042052 00000 n
0000042208 00000 n
-0000041420 00000 n
-0000041575 00000 n
-0000041731 00000 n
-0000041892 00000 n
-0000042797 00000 n
-0000040887 00000 n
-0000035780 00000 n
-0000042363 00000 n
-0000670492 00000 n
-0000042547 00000 n
-0000042610 00000 n
-0000042673 00000 n
-0000042735 00000 n
-0000041024 00000 n
-0000047964 00000 n
-0000048124 00000 n
-0000048285 00000 n
-0000048450 00000 n
-0000048615 00000 n
-0000048772 00000 n
-0000048931 00000 n
-0000049090 00000 n
-0000049246 00000 n
-0000053482 00000 n
-0000053957 00000 n
-0000054122 00000 n
-0000049652 00000 n
-0000047734 00000 n
-0000043064 00000 n
-0000049402 00000 n
-0000667696 00000 n
-0000049464 00000 n
-0000049527 00000 n
-0000049590 00000 n
-0000047871 00000 n
-0000053639 00000 n
-0000053800 00000 n
-0000054597 00000 n
-0000053284 00000 n
-0000049919 00000 n
-0000054287 00000 n
-0000663960 00000 n
-0000054471 00000 n
-0000054534 00000 n
-0000053421 00000 n
-0000058873 00000 n
-0000059028 00000 n
-0000059184 00000 n
-0000059341 00000 n
-0000059742 00000 n
-0000058683 00000 n
-0000054864 00000 n
-0000059495 00000 n
-0000652434 00000 n
-0000059617 00000 n
-0000059680 00000 n
-0000058820 00000 n
-0000064187 00000 n
-0000064347 00000 n
-0000064504 00000 n
-0000065096 00000 n
-0000064005 00000 n
-0000060009 00000 n
-0000064660 00000 n
-0000064783 00000 n
-0000064847 00000 n
-0000064972 00000 n
-0000065034 00000 n
-0000064142 00000 n
-0000073034 00000 n
-0000068961 00000 n
-0000068717 00000 n
-0000065402 00000 n
-0000068838 00000 n
-0000078290 00000 n
-0000073496 00000 n
-0000072868 00000 n
-0000069202 00000 n
-0000073191 00000 n
-0000073433 00000 n
-0000073005 00000 n
-0000078446 00000 n
-0000078851 00000 n
-0000078116 00000 n
-0000073776 00000 n
-0000078602 00000 n
-0000078725 00000 n
-0000078788 00000 n
-0000876420 00000 n
-0000078253 00000 n
-0000082832 00000 n
-0000082466 00000 n
-0000079105 00000 n
-0000082587 00000 n
-0000089403 00000 n
-0000086172 00000 n
-0000085989 00000 n
-0000083086 00000 n
-0000086110 00000 n
-0000089560 00000 n
-0000089719 00000 n
-0000090064 00000 n
-0000089221 00000 n
-0000086374 00000 n
-0000089878 00000 n
-0000090001 00000 n
-0000089358 00000 n
-0000094065 00000 n
-0000094226 00000 n
-0000094387 00000 n
-0000094548 00000 n
-0000094709 00000 n
-0000095113 00000 n
-0000093867 00000 n
-0000090318 00000 n
-0000094865 00000 n
-0000095050 00000 n
-0000094004 00000 n
-0000099042 00000 n
-0000098673 00000 n
-0000095380 00000 n
-0000098794 00000 n
-0000102636 00000 n
-0000102391 00000 n
-0000099270 00000 n
-0000102512 00000 n
-0000107345 00000 n
-0000107502 00000 n
-0000107659 00000 n
-0000107816 00000 n
-0000108471 00000 n
-0000107155 00000 n
-0000102812 00000 n
-0000107973 00000 n
-0000875386 00000 n
-0000874487 00000 n
-0000108220 00000 n
-0000108283 00000 n
-0000108346 00000 n
-0000108409 00000 n
-0000107292 00000 n
-0000111749 00000 n
-0000111504 00000 n
-0000108829 00000 n
-0000111625 00000 n
-0000116529 00000 n
-0000116690 00000 n
-0000116851 00000 n
-0000117011 00000 n
-0000117177 00000 n
-0000117343 00000 n
-0000117502 00000 n
-0000117908 00000 n
-0000116315 00000 n
-0000111938 00000 n
-0000117661 00000 n
-0000116452 00000 n
-0000122095 00000 n
-0000121726 00000 n
-0000118110 00000 n
-0000121847 00000 n
-0000876573 00000 n
-0000125844 00000 n
-0000126005 00000 n
-0000126166 00000 n
-0000126321 00000 n
-0000126727 00000 n
-0000125654 00000 n
-0000122297 00000 n
-0000126478 00000 n
-0000126601 00000 n
-0000126664 00000 n
-0000125791 00000 n
-0000130458 00000 n
-0000130615 00000 n
-0000130772 00000 n
-0000130932 00000 n
-0000131092 00000 n
-0000131249 00000 n
-0000131739 00000 n
-0000130252 00000 n
-0000126968 00000 n
-0000131429 00000 n
-0000648876 00000 n
-0000131491 00000 n
-0000131553 00000 n
-0000131677 00000 n
-0000130389 00000 n
-0000134565 00000 n
-0000134721 00000 n
-0000135001 00000 n
-0000134391 00000 n
-0000132006 00000 n
-0000134877 00000 n
-0000646677 00000 n
-0000634504 00000 n
-0000619850 00000 n
-0000134528 00000 n
-0000139058 00000 n
-0000139215 00000 n
-0000139641 00000 n
-0000138884 00000 n
-0000135245 00000 n
-0000139393 00000 n
-0000139579 00000 n
-0000139021 00000 n
-0000143109 00000 n
-0000142864 00000 n
-0000139882 00000 n
-0000142985 00000 n
-0000146700 00000 n
-0000146455 00000 n
-0000143272 00000 n
-0000146576 00000 n
-0000150091 00000 n
-0000149846 00000 n
-0000146889 00000 n
-0000149967 00000 n
-0000151817 00000 n
-0000151978 00000 n
-0000152263 00000 n
-0000151643 00000 n
-0000150267 00000 n
-0000152139 00000 n
-0000151780 00000 n
-0000153983 00000 n
-0000154263 00000 n
-0000153817 00000 n
-0000152426 00000 n
-0000154139 00000 n
-0000153954 00000 n
-0000158025 00000 n
-0000158180 00000 n
-0000158336 00000 n
-0000158493 00000 n
-0000159087 00000 n
-0000157835 00000 n
-0000154426 00000 n
-0000158650 00000 n
-0000158835 00000 n
-0000158898 00000 n
-0000158961 00000 n
-0000159024 00000 n
-0000876726 00000 n
-0000157972 00000 n
-0000165091 00000 n
-0000162522 00000 n
-0000159380 00000 n
-0000162643 00000 n
-0000874161 00000 n
-0000162829 00000 n
-0000875564 00000 n
-0000876094 00000 n
-0000162892 00000 n
-0000162955 00000 n
-0000163018 00000 n
-0000163081 00000 n
-0000163143 00000 n
-0000163206 00000 n
-0000163269 00000 n
-0000163332 00000 n
-0000163395 00000 n
-0000163458 00000 n
-0000163520 00000 n
-0000163583 00000 n
-0000163646 00000 n
-0000163709 00000 n
-0000163772 00000 n
-0000163835 00000 n
-0000163898 00000 n
-0000163961 00000 n
-0000164024 00000 n
-0000164086 00000 n
-0000164149 00000 n
-0000164212 00000 n
-0000164275 00000 n
-0000164338 00000 n
-0000164401 00000 n
-0000164464 00000 n
-0000164527 00000 n
-0000164590 00000 n
-0000164653 00000 n
-0000164716 00000 n
-0000164779 00000 n
-0000164842 00000 n
-0000164905 00000 n
-0000164967 00000 n
-0000165029 00000 n
-0000170786 00000 n
-0000167648 00000 n
-0000165321 00000 n
-0000167769 00000 n
-0000167831 00000 n
-0000167894 00000 n
-0000167956 00000 n
-0000168019 00000 n
-0000168082 00000 n
-0000168145 00000 n
-0000168208 00000 n
-0000168271 00000 n
-0000168334 00000 n
-0000168397 00000 n
-0000168460 00000 n
-0000168523 00000 n
-0000168586 00000 n
-0000168649 00000 n
-0000168711 00000 n
-0000168774 00000 n
-0000168837 00000 n
-0000168900 00000 n
-0000168963 00000 n
-0000169026 00000 n
-0000169089 00000 n
-0000169152 00000 n
-0000169215 00000 n
-0000169278 00000 n
-0000169341 00000 n
-0000169404 00000 n
-0000169467 00000 n
-0000169530 00000 n
-0000169593 00000 n
-0000169656 00000 n
-0000169719 00000 n
-0000169782 00000 n
-0000169845 00000 n
-0000169908 00000 n
-0000169970 00000 n
-0000170033 00000 n
-0000170096 00000 n
-0000170159 00000 n
-0000170222 00000 n
-0000170285 00000 n
-0000170348 00000 n
-0000170411 00000 n
-0000170474 00000 n
-0000170536 00000 n
-0000170599 00000 n
-0000170662 00000 n
-0000170724 00000 n
-0000176419 00000 n
-0000173033 00000 n
-0000170949 00000 n
-0000173154 00000 n
-0000173216 00000 n
-0000173279 00000 n
-0000173341 00000 n
-0000173404 00000 n
-0000173467 00000 n
-0000173530 00000 n
-0000173593 00000 n
-0000173656 00000 n
-0000173719 00000 n
-0000173782 00000 n
-0000173845 00000 n
-0000173908 00000 n
-0000173971 00000 n
-0000174034 00000 n
-0000174097 00000 n
-0000174160 00000 n
-0000174223 00000 n
-0000174286 00000 n
-0000174349 00000 n
-0000174412 00000 n
-0000174475 00000 n
-0000174538 00000 n
-0000174601 00000 n
-0000174663 00000 n
-0000174726 00000 n
-0000174789 00000 n
-0000174852 00000 n
-0000174915 00000 n
-0000174978 00000 n
-0000175037 00000 n
-0000175100 00000 n
-0000175163 00000 n
-0000175226 00000 n
-0000175289 00000 n
-0000175352 00000 n
-0000175415 00000 n
-0000175478 00000 n
-0000175541 00000 n
-0000175603 00000 n
-0000175666 00000 n
-0000175729 00000 n
-0000175792 00000 n
-0000175855 00000 n
-0000175918 00000 n
-0000175980 00000 n
-0000176043 00000 n
-0000176106 00000 n
-0000176169 00000 n
-0000176232 00000 n
-0000176295 00000 n
-0000176357 00000 n
-0000181135 00000 n
-0000179380 00000 n
-0000176582 00000 n
-0000179501 00000 n
-0000179563 00000 n
-0000179626 00000 n
-0000179688 00000 n
-0000179751 00000 n
-0000179814 00000 n
-0000179877 00000 n
-0000179940 00000 n
-0000180003 00000 n
-0000180066 00000 n
-0000180129 00000 n
-0000180192 00000 n
-0000180255 00000 n
-0000180380 00000 n
-0000180443 00000 n
-0000180506 00000 n
-0000180569 00000 n
-0000180632 00000 n
-0000180695 00000 n
-0000180757 00000 n
-0000180820 00000 n
-0000180883 00000 n
-0000180946 00000 n
-0000181009 00000 n
-0000181072 00000 n
-0000185819 00000 n
-0000184317 00000 n
-0000181337 00000 n
-0000184438 00000 n
-0000184500 00000 n
-0000184563 00000 n
-0000184626 00000 n
-0000184689 00000 n
-0000184752 00000 n
-0000184815 00000 n
-0000184878 00000 n
-0000184941 00000 n
-0000185003 00000 n
-0000185064 00000 n
-0000185127 00000 n
-0000185190 00000 n
-0000185253 00000 n
-0000185316 00000 n
-0000185379 00000 n
-0000185441 00000 n
-0000185504 00000 n
-0000185567 00000 n
-0000185630 00000 n
-0000185693 00000 n
-0000185756 00000 n
-0000190528 00000 n
-0000189276 00000 n
-0000185995 00000 n
-0000189397 00000 n
-0000189459 00000 n
-0000189522 00000 n
-0000189585 00000 n
-0000189648 00000 n
-0000189711 00000 n
-0000189774 00000 n
-0000189837 00000 n
-0000189899 00000 n
-0000189962 00000 n
-0000190025 00000 n
-0000190088 00000 n
-0000190150 00000 n
-0000190213 00000 n
-0000190276 00000 n
-0000190339 00000 n
-0000190402 00000 n
-0000190465 00000 n
-0000195625 00000 n
-0000193053 00000 n
-0000190717 00000 n
-0000193174 00000 n
-0000193236 00000 n
-0000193299 00000 n
-0000193362 00000 n
-0000193425 00000 n
-0000193487 00000 n
-0000193550 00000 n
-0000193613 00000 n
-0000193676 00000 n
-0000193739 00000 n
-0000193802 00000 n
-0000193865 00000 n
-0000193928 00000 n
-0000193991 00000 n
-0000194054 00000 n
-0000194116 00000 n
-0000194179 00000 n
-0000194242 00000 n
-0000194305 00000 n
-0000194368 00000 n
-0000194431 00000 n
-0000194493 00000 n
-0000194556 00000 n
-0000194619 00000 n
-0000194682 00000 n
-0000194745 00000 n
-0000194808 00000 n
-0000194871 00000 n
-0000194933 00000 n
-0000194996 00000 n
-0000195059 00000 n
-0000195122 00000 n
-0000195185 00000 n
-0000195248 00000 n
-0000195311 00000 n
-0000195373 00000 n
-0000195436 00000 n
-0000195499 00000 n
-0000195562 00000 n
-0000201116 00000 n
-0000198858 00000 n
-0000195801 00000 n
-0000198979 00000 n
-0000199041 00000 n
-0000199104 00000 n
-0000199167 00000 n
-0000199230 00000 n
-0000199293 00000 n
-0000199356 00000 n
-0000199419 00000 n
-0000199482 00000 n
-0000199545 00000 n
-0000199608 00000 n
-0000199671 00000 n
-0000199734 00000 n
-0000199796 00000 n
-0000199921 00000 n
-0000199984 00000 n
-0000200047 00000 n
-0000200110 00000 n
-0000200172 00000 n
-0000200235 00000 n
-0000200298 00000 n
-0000200361 00000 n
-0000200424 00000 n
-0000200487 00000 n
-0000200550 00000 n
-0000200613 00000 n
-0000200676 00000 n
-0000200738 00000 n
-0000200801 00000 n
-0000200864 00000 n
-0000200927 00000 n
-0000200990 00000 n
-0000201053 00000 n
-0000207151 00000 n
-0000203577 00000 n
-0000201318 00000 n
-0000203698 00000 n
-0000203760 00000 n
-0000203823 00000 n
-0000203885 00000 n
-0000203948 00000 n
-0000204011 00000 n
-0000204074 00000 n
-0000204137 00000 n
-0000204200 00000 n
-0000204263 00000 n
-0000204326 00000 n
-0000204389 00000 n
-0000204452 00000 n
-0000204515 00000 n
-0000204578 00000 n
-0000204640 00000 n
-0000204703 00000 n
-0000204764 00000 n
-0000204827 00000 n
-0000204890 00000 n
-0000204953 00000 n
-0000205016 00000 n
-0000205079 00000 n
-0000205142 00000 n
-0000205205 00000 n
-0000205268 00000 n
-0000205330 00000 n
-0000205393 00000 n
-0000205456 00000 n
-0000205519 00000 n
-0000205582 00000 n
-0000205645 00000 n
-0000205708 00000 n
-0000205771 00000 n
-0000205834 00000 n
-0000205896 00000 n
-0000205959 00000 n
-0000206022 00000 n
-0000206084 00000 n
-0000206147 00000 n
-0000206209 00000 n
-0000206272 00000 n
-0000206335 00000 n
-0000206398 00000 n
-0000206461 00000 n
-0000206524 00000 n
-0000206587 00000 n
-0000206650 00000 n
-0000206713 00000 n
-0000206776 00000 n
-0000206838 00000 n
-0000206901 00000 n
-0000206964 00000 n
-0000207027 00000 n
-0000207089 00000 n
-0000210421 00000 n
-0000210581 00000 n
-0000212844 00000 n
-0000210244 00000 n
-0000207314 00000 n
-0000210742 00000 n
-0000210804 00000 n
-0000210867 00000 n
-0000210929 00000 n
-0000210992 00000 n
-0000211055 00000 n
-0000211118 00000 n
-0000211181 00000 n
-0000211245 00000 n
-0000211309 00000 n
-0000211373 00000 n
-0000211437 00000 n
-0000211501 00000 n
-0000211565 00000 n
-0000211629 00000 n
-0000211693 00000 n
-0000211756 00000 n
-0000211820 00000 n
-0000211884 00000 n
-0000211948 00000 n
-0000212012 00000 n
-0000212076 00000 n
-0000212140 00000 n
-0000212204 00000 n
-0000212268 00000 n
-0000212332 00000 n
-0000212396 00000 n
-0000212460 00000 n
-0000212524 00000 n
-0000212588 00000 n
-0000212652 00000 n
-0000212716 00000 n
-0000212780 00000 n
-0000876879 00000 n
-0000210383 00000 n
-0000218471 00000 n
-0000214906 00000 n
-0000213007 00000 n
-0000215031 00000 n
-0000215095 00000 n
-0000215160 00000 n
-0000215225 00000 n
-0000215290 00000 n
-0000215354 00000 n
-0000215419 00000 n
-0000215484 00000 n
-0000215549 00000 n
-0000215614 00000 n
-0000215679 00000 n
-0000215744 00000 n
-0000215809 00000 n
-0000215874 00000 n
-0000215939 00000 n
-0000216004 00000 n
-0000216069 00000 n
-0000216134 00000 n
+0000042369 00000 n
+0000043274 00000 n
+0000041035 00000 n
+0000035872 00000 n
+0000042840 00000 n
+0000677463 00000 n
+0000043024 00000 n
+0000043087 00000 n
+0000043150 00000 n
+0000043212 00000 n
+0000041172 00000 n
+0000047828 00000 n
+0000047988 00000 n
+0000048149 00000 n
+0000048315 00000 n
+0000048480 00000 n
+0000053242 00000 n
+0000053399 00000 n
+0000053560 00000 n
+0000048707 00000 n
+0000047630 00000 n
+0000043541 00000 n
+0000048645 00000 n
+0000674667 00000 n
+0000047767 00000 n
+0000053721 00000 n
+0000053878 00000 n
+0000054035 00000 n
+0000054353 00000 n
+0000054517 00000 n
+0000054192 00000 n
+0000059694 00000 n
+0000054994 00000 n
+0000053012 00000 n
+0000048896 00000 n
+0000054681 00000 n
+0000670931 00000 n
+0000054743 00000 n
+0000054806 00000 n
+0000054869 00000 n
+0000054932 00000 n
+0000053149 00000 n
+0000059850 00000 n
+0000060005 00000 n
+0000060161 00000 n
+0000060318 00000 n
+0000060905 00000 n
+0000059496 00000 n
+0000055261 00000 n
+0000060474 00000 n
+0000659424 00000 n
+0000060719 00000 n
+0000060781 00000 n
+0000060843 00000 n
+0000059633 00000 n
+0000065408 00000 n
+0000065568 00000 n
+0000065725 00000 n
+0000066318 00000 n
+0000065226 00000 n
+0000061198 00000 n
+0000065882 00000 n
+0000066004 00000 n
+0000066068 00000 n
+0000066193 00000 n
+0000066256 00000 n
+0000065363 00000 n
+0000070217 00000 n
+0000069974 00000 n
+0000066624 00000 n
+0000070095 00000 n
+0000073995 00000 n
+0000074277 00000 n
+0000073829 00000 n
+0000070458 00000 n
+0000074152 00000 n
+0000074214 00000 n
+0000073966 00000 n
+0000078843 00000 n
+0000078999 00000 n
+0000079587 00000 n
+0000078669 00000 n
+0000074531 00000 n
+0000079155 00000 n
+0000079461 00000 n
+0000079524 00000 n
+0000883271 00000 n
+0000078806 00000 n
+0000083771 00000 n
+0000083466 00000 n
+0000079867 00000 n
+0000083587 00000 n
+0000087285 00000 n
+0000087041 00000 n
+0000084025 00000 n
+0000087162 00000 n
+0000090829 00000 n
+0000090986 00000 n
+0000091147 00000 n
+0000091493 00000 n
+0000090647 00000 n
+0000087513 00000 n
+0000091308 00000 n
+0000091431 00000 n
+0000090784 00000 n
+0000095131 00000 n
+0000095291 00000 n
+0000099255 00000 n
+0000099416 00000 n
+0000099577 00000 n
+0000095636 00000 n
+0000094957 00000 n
+0000091760 00000 n
+0000095451 00000 n
+0000095094 00000 n
+0000099981 00000 n
+0000099073 00000 n
+0000095838 00000 n
+0000099734 00000 n
+0000099920 00000 n
+0000099210 00000 n
+0000104168 00000 n
+0000103861 00000 n
+0000100274 00000 n
+0000103982 00000 n
+0000108125 00000 n
+0000108282 00000 n
+0000112660 00000 n
+0000108813 00000 n
+0000107951 00000 n
+0000104357 00000 n
+0000108439 00000 n
+0000882237 00000 n
+0000881338 00000 n
+0000108687 00000 n
+0000108750 00000 n
+0000108088 00000 n
+0000112817 00000 n
+0000113222 00000 n
+0000112486 00000 n
+0000109171 00000 n
+0000112973 00000 n
+0000113097 00000 n
+0000113160 00000 n
+0000112623 00000 n
+0000117497 00000 n
+0000117662 00000 n
+0000117951 00000 n
+0000117323 00000 n
+0000113463 00000 n
+0000117827 00000 n
+0000117460 00000 n
+0000121771 00000 n
+0000121927 00000 n
+0000122084 00000 n
+0000122241 00000 n
+0000122772 00000 n
+0000121581 00000 n
+0000118153 00000 n
+0000122397 00000 n
+0000655866 00000 n
+0000122459 00000 n
+0000122522 00000 n
+0000122647 00000 n
+0000122710 00000 n
+0000883424 00000 n
+0000121718 00000 n
+0000127241 00000 n
+0000127401 00000 n
+0000127567 00000 n
+0000127733 00000 n
+0000127894 00000 n
+0000128303 00000 n
+0000127043 00000 n
+0000123039 00000 n
+0000128055 00000 n
+0000127180 00000 n
+0000135295 00000 n
+0000135456 00000 n
+0000135617 00000 n
+0000135774 00000 n
+0000131772 00000 n
+0000131527 00000 n
+0000128531 00000 n
+0000131648 00000 n
+0000136200 00000 n
+0000135105 00000 n
+0000131961 00000 n
+0000135952 00000 n
+0000653667 00000 n
+0000641494 00000 n
+0000626840 00000 n
+0000136138 00000 n
+0000135242 00000 n
+0000137529 00000 n
+0000137685 00000 n
+0000137903 00000 n
+0000137355 00000 n
+0000136496 00000 n
+0000137841 00000 n
+0000137492 00000 n
+0000141870 00000 n
+0000142027 00000 n
+0000142453 00000 n
+0000141696 00000 n
+0000138053 00000 n
+0000142205 00000 n
+0000142391 00000 n
+0000141833 00000 n
+0000145921 00000 n
+0000145676 00000 n
+0000142694 00000 n
+0000145797 00000 n
+0000149512 00000 n
+0000149267 00000 n
+0000146084 00000 n
+0000149388 00000 n
+0000152904 00000 n
+0000152659 00000 n
+0000149701 00000 n
+0000152780 00000 n
+0000154630 00000 n
+0000154791 00000 n
+0000155076 00000 n
+0000154456 00000 n
+0000153080 00000 n
+0000154952 00000 n
+0000154593 00000 n
+0000156795 00000 n
+0000157075 00000 n
+0000156629 00000 n
+0000155239 00000 n
+0000156951 00000 n
+0000883577 00000 n
+0000156766 00000 n
+0000160834 00000 n
+0000160989 00000 n
+0000161145 00000 n
+0000161302 00000 n
+0000161896 00000 n
+0000160644 00000 n
+0000157238 00000 n
+0000161459 00000 n
+0000161644 00000 n
+0000161707 00000 n
+0000161770 00000 n
+0000161833 00000 n
+0000160781 00000 n
+0000167805 00000 n
+0000165423 00000 n
+0000162189 00000 n
+0000165544 00000 n
+0000881012 00000 n
+0000165730 00000 n
+0000882415 00000 n
+0000882945 00000 n
+0000165793 00000 n
+0000165856 00000 n
+0000165919 00000 n
+0000165981 00000 n
+0000166044 00000 n
+0000166107 00000 n
+0000166170 00000 n
+0000166233 00000 n
+0000166296 00000 n
+0000166359 00000 n
+0000166422 00000 n
+0000166485 00000 n
+0000166548 00000 n
+0000166611 00000 n
+0000166673 00000 n
+0000166736 00000 n
+0000166799 00000 n
+0000166862 00000 n
+0000166925 00000 n
+0000166988 00000 n
+0000167051 00000 n
+0000167114 00000 n
+0000167177 00000 n
+0000167240 00000 n
+0000167303 00000 n
+0000167366 00000 n
+0000167429 00000 n
+0000167492 00000 n
+0000167555 00000 n
+0000167618 00000 n
+0000167681 00000 n
+0000167743 00000 n
+0000173494 00000 n
+0000170361 00000 n
+0000168048 00000 n
+0000170482 00000 n
+0000170544 00000 n
+0000170607 00000 n
+0000170669 00000 n
+0000170732 00000 n
+0000170795 00000 n
+0000170858 00000 n
+0000170921 00000 n
+0000170984 00000 n
+0000171047 00000 n
+0000171109 00000 n
+0000171172 00000 n
+0000171235 00000 n
+0000171298 00000 n
+0000171361 00000 n
+0000171424 00000 n
+0000171487 00000 n
+0000171549 00000 n
+0000171612 00000 n
+0000171675 00000 n
+0000171738 00000 n
+0000171801 00000 n
+0000171864 00000 n
+0000171927 00000 n
+0000171990 00000 n
+0000172053 00000 n
+0000172116 00000 n
+0000172179 00000 n
+0000172242 00000 n
+0000172305 00000 n
+0000172366 00000 n
+0000172429 00000 n
+0000172492 00000 n
+0000172553 00000 n
+0000172616 00000 n
+0000172679 00000 n
+0000172742 00000 n
+0000172803 00000 n
+0000172866 00000 n
+0000172929 00000 n
+0000172992 00000 n
+0000173055 00000 n
+0000173118 00000 n
+0000173181 00000 n
+0000173244 00000 n
+0000173307 00000 n
+0000173370 00000 n
+0000173432 00000 n
+0000179067 00000 n
+0000175684 00000 n
+0000173657 00000 n
+0000175805 00000 n
+0000175867 00000 n
+0000175930 00000 n
+0000175992 00000 n
+0000176055 00000 n
+0000176118 00000 n
+0000176181 00000 n
+0000176244 00000 n
+0000176306 00000 n
+0000176369 00000 n
+0000176432 00000 n
+0000176494 00000 n
+0000176557 00000 n
+0000176620 00000 n
+0000176683 00000 n
+0000176746 00000 n
+0000176809 00000 n
+0000176872 00000 n
+0000176934 00000 n
+0000176997 00000 n
+0000177060 00000 n
+0000177123 00000 n
+0000177186 00000 n
+0000177249 00000 n
+0000177311 00000 n
+0000177374 00000 n
+0000177437 00000 n
+0000177500 00000 n
+0000177563 00000 n
+0000177626 00000 n
+0000177689 00000 n
+0000177752 00000 n
+0000177815 00000 n
+0000177877 00000 n
+0000177940 00000 n
+0000178003 00000 n
+0000178066 00000 n
+0000178129 00000 n
+0000178192 00000 n
+0000178255 00000 n
+0000178314 00000 n
+0000178377 00000 n
+0000178440 00000 n
+0000178503 00000 n
+0000178566 00000 n
+0000178629 00000 n
+0000178692 00000 n
+0000178755 00000 n
+0000178817 00000 n
+0000178880 00000 n
+0000178943 00000 n
+0000179005 00000 n
+0000184124 00000 n
+0000182496 00000 n
+0000179230 00000 n
+0000182617 00000 n
+0000182679 00000 n
+0000182741 00000 n
+0000182804 00000 n
+0000182867 00000 n
+0000182930 00000 n
+0000182993 00000 n
+0000183056 00000 n
+0000183119 00000 n
+0000183182 00000 n
+0000183245 00000 n
+0000183369 00000 n
+0000183432 00000 n
+0000183495 00000 n
+0000183558 00000 n
+0000183621 00000 n
+0000183684 00000 n
+0000183747 00000 n
+0000183810 00000 n
+0000183872 00000 n
+0000183935 00000 n
+0000183998 00000 n
+0000184061 00000 n
+0000188858 00000 n
+0000187294 00000 n
+0000184339 00000 n
+0000187415 00000 n
+0000187477 00000 n
+0000187540 00000 n
+0000187603 00000 n
+0000187666 00000 n
+0000187729 00000 n
+0000187792 00000 n
+0000187854 00000 n
+0000187917 00000 n
+0000187980 00000 n
+0000188043 00000 n
+0000188106 00000 n
+0000188169 00000 n
+0000188231 00000 n
+0000188293 00000 n
+0000188356 00000 n
+0000188419 00000 n
+0000188482 00000 n
+0000188545 00000 n
+0000188607 00000 n
+0000188670 00000 n
+0000188733 00000 n
+0000188796 00000 n
+0000194289 00000 n
+0000192597 00000 n
+0000189047 00000 n
+0000192718 00000 n
+0000192780 00000 n
+0000192843 00000 n
+0000192906 00000 n
+0000192969 00000 n
+0000193032 00000 n
+0000193095 00000 n
+0000193158 00000 n
+0000193221 00000 n
+0000193284 00000 n
+0000193347 00000 n
+0000193410 00000 n
+0000193473 00000 n
+0000193536 00000 n
+0000193599 00000 n
+0000193662 00000 n
+0000193725 00000 n
+0000193788 00000 n
+0000193851 00000 n
+0000193914 00000 n
+0000193977 00000 n
+0000194039 00000 n
+0000194102 00000 n
+0000194165 00000 n
+0000194227 00000 n
+0000199654 00000 n
+0000197396 00000 n
+0000194478 00000 n
+0000197517 00000 n
+0000197579 00000 n
+0000197642 00000 n
+0000197705 00000 n
+0000197768 00000 n
+0000197831 00000 n
+0000197894 00000 n
+0000197957 00000 n
+0000198020 00000 n
+0000198083 00000 n
+0000198146 00000 n
+0000198209 00000 n
+0000198272 00000 n
+0000198335 00000 n
+0000198398 00000 n
+0000198461 00000 n
+0000198524 00000 n
+0000198587 00000 n
+0000198650 00000 n
+0000198712 00000 n
+0000198775 00000 n
+0000198838 00000 n
+0000198901 00000 n
+0000198964 00000 n
+0000199027 00000 n
+0000199090 00000 n
+0000199153 00000 n
+0000199215 00000 n
+0000199278 00000 n
+0000199341 00000 n
+0000199404 00000 n
+0000199466 00000 n
+0000199529 00000 n
+0000199592 00000 n
+0000205306 00000 n
+0000202545 00000 n
+0000199843 00000 n
+0000202666 00000 n
+0000202728 00000 n
+0000202791 00000 n
+0000202854 00000 n
+0000202917 00000 n
+0000202980 00000 n
+0000203043 00000 n
+0000203106 00000 n
+0000203169 00000 n
+0000203294 00000 n
+0000203357 00000 n
+0000203420 00000 n
+0000203483 00000 n
+0000203546 00000 n
+0000203609 00000 n
+0000203672 00000 n
+0000203735 00000 n
+0000203798 00000 n
+0000203860 00000 n
+0000203923 00000 n
+0000203986 00000 n
+0000204049 00000 n
+0000204112 00000 n
+0000204175 00000 n
+0000204238 00000 n
+0000204301 00000 n
+0000204363 00000 n
+0000204426 00000 n
+0000204489 00000 n
+0000204552 00000 n
+0000204615 00000 n
+0000204678 00000 n
+0000204741 00000 n
+0000204804 00000 n
+0000204867 00000 n
+0000204930 00000 n
+0000204993 00000 n
+0000205056 00000 n
+0000205119 00000 n
+0000205182 00000 n
+0000205244 00000 n
+0000211457 00000 n
+0000208005 00000 n
+0000205482 00000 n
+0000208127 00000 n
+0000208189 00000 n
+0000208252 00000 n
+0000208314 00000 n
+0000208377 00000 n
+0000208440 00000 n
+0000208503 00000 n
+0000208566 00000 n
+0000208629 00000 n
+0000208691 00000 n
+0000208754 00000 n
+0000208817 00000 n
+0000208880 00000 n
+0000208943 00000 n
+0000209006 00000 n
+0000209069 00000 n
+0000209132 00000 n
+0000209195 00000 n
+0000209257 00000 n
+0000209320 00000 n
+0000209383 00000 n
+0000209446 00000 n
+0000209509 00000 n
+0000209572 00000 n
+0000209634 00000 n
+0000209697 00000 n
+0000209760 00000 n
+0000209823 00000 n
+0000209886 00000 n
+0000209949 00000 n
+0000210011 00000 n
+0000210074 00000 n
+0000210137 00000 n
+0000210200 00000 n
+0000210263 00000 n
+0000210326 00000 n
+0000210389 00000 n
+0000210452 00000 n
+0000210515 00000 n
+0000210577 00000 n
+0000210640 00000 n
+0000210703 00000 n
+0000210766 00000 n
+0000210829 00000 n
+0000210892 00000 n
+0000210955 00000 n
+0000211018 00000 n
+0000211081 00000 n
+0000211143 00000 n
+0000211206 00000 n
+0000211269 00000 n
+0000211332 00000 n
+0000211395 00000 n
+0000883730 00000 n
+0000214904 00000 n
+0000215065 00000 n
+0000217302 00000 n
+0000214722 00000 n
+0000211620 00000 n
+0000215227 00000 n
+0000215291 00000 n
+0000215356 00000 n
+0000215421 00000 n
+0000215486 00000 n
+0000215551 00000 n
+0000215615 00000 n
+0000215680 00000 n
+0000215745 00000 n
+0000215810 00000 n
+0000215875 00000 n
+0000215940 00000 n
+0000216005 00000 n
+0000216070 00000 n
+0000216135 00000 n
0000216199 00000 n
-0000216262 00000 n
-0000216327 00000 n
-0000216392 00000 n
-0000216457 00000 n
-0000216522 00000 n
-0000216587 00000 n
-0000216652 00000 n
-0000216717 00000 n
-0000216782 00000 n
-0000216847 00000 n
-0000216912 00000 n
-0000216977 00000 n
-0000217042 00000 n
-0000217107 00000 n
+0000216264 00000 n
+0000216329 00000 n
+0000216394 00000 n
+0000216459 00000 n
+0000216524 00000 n
+0000216589 00000 n
+0000216653 00000 n
+0000216718 00000 n
+0000216783 00000 n
+0000216848 00000 n
+0000216913 00000 n
+0000216978 00000 n
+0000217043 00000 n
+0000217108 00000 n
0000217172 00000 n
0000217237 00000 n
-0000217301 00000 n
-0000217366 00000 n
-0000217431 00000 n
-0000217496 00000 n
-0000217561 00000 n
-0000217626 00000 n
-0000217691 00000 n
-0000217756 00000 n
-0000217821 00000 n
-0000217886 00000 n
-0000217951 00000 n
-0000218016 00000 n
-0000218081 00000 n
-0000218146 00000 n
-0000218211 00000 n
-0000218276 00000 n
-0000218341 00000 n
-0000218406 00000 n
-0000224416 00000 n
-0000220339 00000 n
-0000218635 00000 n
-0000220464 00000 n
-0000220591 00000 n
-0000220656 00000 n
-0000220721 00000 n
-0000220786 00000 n
-0000220851 00000 n
-0000220916 00000 n
-0000220981 00000 n
-0000221045 00000 n
-0000221110 00000 n
-0000221175 00000 n
-0000221240 00000 n
-0000221305 00000 n
-0000221370 00000 n
-0000221435 00000 n
-0000221500 00000 n
-0000221565 00000 n
-0000221630 00000 n
-0000221693 00000 n
-0000221758 00000 n
-0000221823 00000 n
-0000221888 00000 n
-0000221953 00000 n
-0000222018 00000 n
-0000222083 00000 n
-0000222148 00000 n
-0000222213 00000 n
-0000222278 00000 n
-0000222342 00000 n
-0000222407 00000 n
-0000222472 00000 n
-0000222537 00000 n
-0000222602 00000 n
-0000222667 00000 n
-0000222732 00000 n
-0000222797 00000 n
-0000222862 00000 n
-0000222927 00000 n
-0000222991 00000 n
-0000223056 00000 n
-0000223121 00000 n
-0000223186 00000 n
-0000223251 00000 n
-0000223316 00000 n
-0000223381 00000 n
-0000223446 00000 n
-0000223511 00000 n
-0000223574 00000 n
-0000223639 00000 n
-0000223704 00000 n
-0000223769 00000 n
-0000223834 00000 n
-0000223899 00000 n
-0000223964 00000 n
-0000224029 00000 n
-0000224094 00000 n
-0000224158 00000 n
-0000224223 00000 n
-0000224288 00000 n
-0000224352 00000 n
-0000230474 00000 n
-0000226720 00000 n
-0000224580 00000 n
-0000226845 00000 n
-0000226909 00000 n
-0000226974 00000 n
-0000227038 00000 n
-0000227103 00000 n
-0000227168 00000 n
-0000227233 00000 n
-0000227298 00000 n
-0000227363 00000 n
-0000227428 00000 n
-0000227493 00000 n
-0000227558 00000 n
-0000227622 00000 n
-0000227687 00000 n
-0000227752 00000 n
-0000227817 00000 n
-0000227882 00000 n
-0000227947 00000 n
-0000228011 00000 n
-0000228076 00000 n
-0000228141 00000 n
-0000228205 00000 n
-0000228270 00000 n
-0000228335 00000 n
-0000228400 00000 n
-0000228465 00000 n
-0000228530 00000 n
-0000228595 00000 n
-0000228659 00000 n
-0000228724 00000 n
-0000228789 00000 n
-0000228854 00000 n
-0000228919 00000 n
-0000228984 00000 n
-0000229049 00000 n
-0000229114 00000 n
-0000229179 00000 n
-0000229243 00000 n
-0000229308 00000 n
-0000229373 00000 n
-0000229438 00000 n
-0000229503 00000 n
-0000229568 00000 n
-0000229633 00000 n
-0000229698 00000 n
-0000229763 00000 n
-0000229827 00000 n
-0000229892 00000 n
-0000229957 00000 n
-0000230022 00000 n
-0000230087 00000 n
-0000230152 00000 n
-0000230216 00000 n
-0000230281 00000 n
-0000230346 00000 n
-0000230410 00000 n
-0000236951 00000 n
-0000232807 00000 n
-0000230651 00000 n
-0000232932 00000 n
-0000232996 00000 n
-0000233061 00000 n
-0000233125 00000 n
-0000233190 00000 n
-0000233255 00000 n
-0000233320 00000 n
-0000233385 00000 n
-0000233450 00000 n
-0000233515 00000 n
-0000233580 00000 n
-0000233643 00000 n
-0000233708 00000 n
-0000233773 00000 n
-0000233838 00000 n
-0000233903 00000 n
-0000233968 00000 n
-0000234033 00000 n
-0000234098 00000 n
-0000234163 00000 n
-0000234227 00000 n
-0000234292 00000 n
-0000234357 00000 n
-0000234422 00000 n
-0000234487 00000 n
-0000234552 00000 n
-0000234617 00000 n
-0000234682 00000 n
-0000234747 00000 n
-0000234811 00000 n
-0000234876 00000 n
-0000234941 00000 n
-0000235006 00000 n
-0000235071 00000 n
-0000235136 00000 n
-0000235201 00000 n
-0000235266 00000 n
-0000235331 00000 n
-0000235395 00000 n
-0000235460 00000 n
-0000235525 00000 n
-0000235590 00000 n
-0000235655 00000 n
-0000235720 00000 n
-0000235785 00000 n
-0000235850 00000 n
-0000235915 00000 n
-0000235979 00000 n
-0000236044 00000 n
-0000236109 00000 n
-0000236174 00000 n
-0000236239 00000 n
-0000236304 00000 n
-0000236369 00000 n
-0000236434 00000 n
-0000236499 00000 n
-0000236564 00000 n
-0000236628 00000 n
-0000236693 00000 n
-0000236758 00000 n
-0000236823 00000 n
-0000236887 00000 n
-0000243308 00000 n
-0000239032 00000 n
-0000237115 00000 n
-0000239157 00000 n
-0000239221 00000 n
-0000239286 00000 n
-0000239350 00000 n
-0000239415 00000 n
-0000239480 00000 n
-0000239545 00000 n
-0000239610 00000 n
-0000239675 00000 n
-0000239740 00000 n
-0000239805 00000 n
-0000239870 00000 n
-0000239934 00000 n
-0000239999 00000 n
-0000240064 00000 n
-0000240129 00000 n
-0000240194 00000 n
-0000240259 00000 n
-0000240324 00000 n
-0000240389 00000 n
-0000240454 00000 n
-0000240518 00000 n
-0000240583 00000 n
-0000240648 00000 n
-0000240713 00000 n
-0000240778 00000 n
-0000240843 00000 n
-0000240908 00000 n
-0000240973 00000 n
-0000241038 00000 n
-0000241102 00000 n
-0000241167 00000 n
-0000241232 00000 n
-0000241297 00000 n
-0000241362 00000 n
-0000241427 00000 n
-0000241492 00000 n
-0000241557 00000 n
-0000241622 00000 n
-0000241686 00000 n
-0000241751 00000 n
-0000241816 00000 n
-0000241881 00000 n
-0000241946 00000 n
-0000242011 00000 n
-0000242076 00000 n
-0000242141 00000 n
-0000242206 00000 n
-0000242270 00000 n
-0000242335 00000 n
-0000242400 00000 n
-0000242465 00000 n
-0000242530 00000 n
-0000242595 00000 n
-0000242660 00000 n
-0000242725 00000 n
-0000242790 00000 n
-0000242854 00000 n
-0000242919 00000 n
-0000242984 00000 n
-0000243049 00000 n
-0000243114 00000 n
-0000243179 00000 n
-0000243244 00000 n
-0000248827 00000 n
-0000245661 00000 n
-0000243459 00000 n
-0000245786 00000 n
-0000245850 00000 n
-0000245915 00000 n
-0000245979 00000 n
-0000246044 00000 n
-0000246109 00000 n
-0000246174 00000 n
-0000246239 00000 n
-0000246304 00000 n
-0000246368 00000 n
-0000246433 00000 n
-0000246498 00000 n
-0000246563 00000 n
-0000246628 00000 n
-0000246693 00000 n
-0000246758 00000 n
-0000246823 00000 n
-0000246888 00000 n
-0000246953 00000 n
-0000247018 00000 n
-0000247144 00000 n
-0000247209 00000 n
-0000247274 00000 n
-0000247339 00000 n
-0000247404 00000 n
-0000247469 00000 n
-0000247534 00000 n
-0000247599 00000 n
-0000247664 00000 n
-0000247729 00000 n
-0000247793 00000 n
-0000247858 00000 n
-0000247923 00000 n
-0000247988 00000 n
-0000248053 00000 n
-0000248118 00000 n
-0000248183 00000 n
-0000248248 00000 n
-0000248375 00000 n
-0000248440 00000 n
-0000248505 00000 n
-0000248569 00000 n
-0000248634 00000 n
-0000248699 00000 n
-0000248763 00000 n
-0000254420 00000 n
-0000251509 00000 n
-0000249004 00000 n
-0000251634 00000 n
-0000251698 00000 n
-0000251763 00000 n
-0000251827 00000 n
-0000251892 00000 n
-0000251957 00000 n
-0000252022 00000 n
-0000252087 00000 n
-0000252152 00000 n
-0000252217 00000 n
-0000252282 00000 n
-0000252347 00000 n
-0000252412 00000 n
-0000252477 00000 n
-0000252542 00000 n
-0000252607 00000 n
-0000252734 00000 n
-0000252799 00000 n
-0000252864 00000 n
-0000252929 00000 n
-0000252992 00000 n
-0000253057 00000 n
-0000253122 00000 n
-0000253187 00000 n
-0000253252 00000 n
-0000253317 00000 n
-0000253382 00000 n
-0000253447 00000 n
-0000253512 00000 n
-0000253576 00000 n
-0000253641 00000 n
-0000253706 00000 n
-0000253771 00000 n
-0000253836 00000 n
-0000253901 00000 n
-0000253966 00000 n
-0000254031 00000 n
-0000254096 00000 n
-0000254160 00000 n
-0000254225 00000 n
-0000254290 00000 n
-0000254355 00000 n
-0000260239 00000 n
-0000257586 00000 n
-0000254610 00000 n
-0000257711 00000 n
-0000257775 00000 n
-0000257840 00000 n
-0000257904 00000 n
-0000257969 00000 n
-0000258034 00000 n
-0000258099 00000 n
-0000258164 00000 n
-0000258229 00000 n
-0000258294 00000 n
-0000258359 00000 n
-0000258423 00000 n
-0000258488 00000 n
-0000258553 00000 n
-0000258618 00000 n
-0000258683 00000 n
-0000258748 00000 n
-0000258813 00000 n
-0000258878 00000 n
-0000258943 00000 n
-0000259008 00000 n
-0000259073 00000 n
-0000259138 00000 n
-0000259203 00000 n
-0000259268 00000 n
-0000259333 00000 n
-0000259398 00000 n
-0000259463 00000 n
-0000259528 00000 n
-0000259593 00000 n
-0000259658 00000 n
-0000259723 00000 n
-0000259786 00000 n
-0000259851 00000 n
-0000259916 00000 n
-0000259981 00000 n
-0000260046 00000 n
-0000260111 00000 n
-0000260175 00000 n
-0000266376 00000 n
-0000262684 00000 n
-0000260416 00000 n
-0000262809 00000 n
-0000262873 00000 n
-0000262938 00000 n
-0000263002 00000 n
-0000263067 00000 n
-0000263132 00000 n
-0000263197 00000 n
-0000263262 00000 n
-0000263327 00000 n
-0000263392 00000 n
-0000263457 00000 n
-0000263522 00000 n
-0000263586 00000 n
-0000263651 00000 n
-0000263716 00000 n
-0000263781 00000 n
-0000263845 00000 n
-0000263910 00000 n
-0000263975 00000 n
-0000264040 00000 n
-0000264105 00000 n
-0000264170 00000 n
-0000264235 00000 n
-0000264300 00000 n
-0000264364 00000 n
-0000264429 00000 n
-0000264494 00000 n
-0000264559 00000 n
-0000264624 00000 n
-0000264689 00000 n
-0000264754 00000 n
-0000264819 00000 n
-0000264884 00000 n
-0000264948 00000 n
-0000265013 00000 n
-0000265078 00000 n
-0000265143 00000 n
-0000265208 00000 n
-0000265273 00000 n
-0000265338 00000 n
-0000265403 00000 n
-0000265468 00000 n
-0000265533 00000 n
-0000265598 00000 n
-0000265663 00000 n
-0000265728 00000 n
-0000265793 00000 n
-0000265858 00000 n
-0000265923 00000 n
-0000265988 00000 n
-0000266053 00000 n
-0000266118 00000 n
-0000266183 00000 n
-0000266248 00000 n
-0000266312 00000 n
-0000272344 00000 n
-0000268587 00000 n
-0000266540 00000 n
-0000268712 00000 n
-0000268776 00000 n
-0000268841 00000 n
+0000214864 00000 n
+0000223039 00000 n
+0000220060 00000 n
+0000217479 00000 n
+0000220185 00000 n
+0000220249 00000 n
+0000220314 00000 n
+0000220378 00000 n
+0000220442 00000 n
+0000220507 00000 n
+0000220572 00000 n
+0000220637 00000 n
+0000220702 00000 n
+0000220767 00000 n
+0000220832 00000 n
+0000220897 00000 n
+0000220962 00000 n
+0000221027 00000 n
+0000221092 00000 n
+0000221157 00000 n
+0000221222 00000 n
+0000221287 00000 n
+0000221352 00000 n
+0000221416 00000 n
+0000221481 00000 n
+0000221546 00000 n
+0000221611 00000 n
+0000221676 00000 n
+0000221741 00000 n
+0000221806 00000 n
+0000221871 00000 n
+0000221936 00000 n
+0000222001 00000 n
+0000222066 00000 n
+0000222131 00000 n
+0000222196 00000 n
+0000222261 00000 n
+0000222326 00000 n
+0000222391 00000 n
+0000222456 00000 n
+0000222521 00000 n
+0000222586 00000 n
+0000222650 00000 n
+0000222715 00000 n
+0000222780 00000 n
+0000222845 00000 n
+0000222910 00000 n
+0000222975 00000 n
+0000229040 00000 n
+0000224963 00000 n
+0000223216 00000 n
+0000225088 00000 n
+0000225215 00000 n
+0000225280 00000 n
+0000225345 00000 n
+0000225410 00000 n
+0000225475 00000 n
+0000225540 00000 n
+0000225605 00000 n
+0000225669 00000 n
+0000225734 00000 n
+0000225799 00000 n
+0000225864 00000 n
+0000225929 00000 n
+0000225994 00000 n
+0000226059 00000 n
+0000226124 00000 n
+0000226189 00000 n
+0000226254 00000 n
+0000226317 00000 n
+0000226382 00000 n
+0000226447 00000 n
+0000226512 00000 n
+0000226577 00000 n
+0000226642 00000 n
+0000226707 00000 n
+0000226772 00000 n
+0000226837 00000 n
+0000226902 00000 n
+0000226966 00000 n
+0000227031 00000 n
+0000227096 00000 n
+0000227161 00000 n
+0000227226 00000 n
+0000227291 00000 n
+0000227356 00000 n
+0000227421 00000 n
+0000227486 00000 n
+0000227551 00000 n
+0000227615 00000 n
+0000227680 00000 n
+0000227745 00000 n
+0000227810 00000 n
+0000227875 00000 n
+0000227940 00000 n
+0000228005 00000 n
+0000228070 00000 n
+0000228135 00000 n
+0000228198 00000 n
+0000228263 00000 n
+0000228328 00000 n
+0000228393 00000 n
+0000228458 00000 n
+0000228523 00000 n
+0000228588 00000 n
+0000228653 00000 n
+0000228718 00000 n
+0000228782 00000 n
+0000228847 00000 n
+0000228912 00000 n
+0000228976 00000 n
+0000235033 00000 n
+0000231276 00000 n
+0000229204 00000 n
+0000231401 00000 n
+0000231465 00000 n
+0000231530 00000 n
+0000231594 00000 n
+0000231659 00000 n
+0000231724 00000 n
+0000231789 00000 n
+0000231854 00000 n
+0000231919 00000 n
+0000231984 00000 n
+0000232049 00000 n
+0000232114 00000 n
+0000232178 00000 n
+0000232243 00000 n
+0000232308 00000 n
+0000232373 00000 n
+0000232438 00000 n
+0000232503 00000 n
+0000232568 00000 n
+0000232633 00000 n
+0000232698 00000 n
+0000232762 00000 n
+0000232827 00000 n
+0000232892 00000 n
+0000232957 00000 n
+0000233022 00000 n
+0000233087 00000 n
+0000233152 00000 n
+0000233217 00000 n
+0000233282 00000 n
+0000233347 00000 n
+0000233412 00000 n
+0000233477 00000 n
+0000233542 00000 n
+0000233607 00000 n
+0000233672 00000 n
+0000233737 00000 n
+0000233801 00000 n
+0000233866 00000 n
+0000233931 00000 n
+0000233996 00000 n
+0000234061 00000 n
+0000234126 00000 n
+0000234191 00000 n
+0000234256 00000 n
+0000234321 00000 n
+0000234385 00000 n
+0000234450 00000 n
+0000234515 00000 n
+0000234580 00000 n
+0000234645 00000 n
+0000234710 00000 n
+0000234775 00000 n
+0000234840 00000 n
+0000234905 00000 n
+0000234969 00000 n
+0000241558 00000 n
+0000237412 00000 n
+0000235210 00000 n
+0000237537 00000 n
+0000237601 00000 n
+0000237666 00000 n
+0000237730 00000 n
+0000237795 00000 n
+0000237860 00000 n
+0000237925 00000 n
+0000237990 00000 n
+0000238055 00000 n
+0000238120 00000 n
+0000238185 00000 n
+0000238250 00000 n
+0000238315 00000 n
+0000238380 00000 n
+0000238445 00000 n
+0000238510 00000 n
+0000238575 00000 n
+0000238640 00000 n
+0000238705 00000 n
+0000238770 00000 n
+0000238834 00000 n
+0000238899 00000 n
+0000238964 00000 n
+0000239029 00000 n
+0000239094 00000 n
+0000239159 00000 n
+0000239224 00000 n
+0000239289 00000 n
+0000239354 00000 n
+0000239418 00000 n
+0000239483 00000 n
+0000239548 00000 n
+0000239613 00000 n
+0000239678 00000 n
+0000239743 00000 n
+0000239808 00000 n
+0000239873 00000 n
+0000239938 00000 n
+0000240002 00000 n
+0000240067 00000 n
+0000240132 00000 n
+0000240197 00000 n
+0000240262 00000 n
+0000240327 00000 n
+0000240392 00000 n
+0000240457 00000 n
+0000240522 00000 n
+0000240586 00000 n
+0000240651 00000 n
+0000240716 00000 n
+0000240781 00000 n
+0000240846 00000 n
+0000240911 00000 n
+0000240976 00000 n
+0000241041 00000 n
+0000241106 00000 n
+0000241171 00000 n
+0000241235 00000 n
+0000241300 00000 n
+0000241365 00000 n
+0000241430 00000 n
+0000241494 00000 n
+0000247915 00000 n
+0000243639 00000 n
+0000241722 00000 n
+0000243764 00000 n
+0000243828 00000 n
+0000243893 00000 n
+0000243957 00000 n
+0000244022 00000 n
+0000244087 00000 n
+0000244152 00000 n
+0000244217 00000 n
+0000244282 00000 n
+0000244347 00000 n
+0000244412 00000 n
+0000244477 00000 n
+0000244541 00000 n
+0000244606 00000 n
+0000244671 00000 n
+0000244736 00000 n
+0000244801 00000 n
+0000244866 00000 n
+0000244931 00000 n
+0000244996 00000 n
+0000245061 00000 n
+0000245125 00000 n
+0000245190 00000 n
+0000245255 00000 n
+0000245320 00000 n
+0000245385 00000 n
+0000245450 00000 n
+0000245515 00000 n
+0000245580 00000 n
+0000245645 00000 n
+0000245709 00000 n
+0000245774 00000 n
+0000245839 00000 n
+0000245904 00000 n
+0000245969 00000 n
+0000246034 00000 n
+0000246099 00000 n
+0000246164 00000 n
+0000246229 00000 n
+0000246293 00000 n
+0000246358 00000 n
+0000246423 00000 n
+0000246488 00000 n
+0000246553 00000 n
+0000246618 00000 n
+0000246683 00000 n
+0000246748 00000 n
+0000246813 00000 n
+0000246877 00000 n
+0000246942 00000 n
+0000247007 00000 n
+0000247072 00000 n
+0000247137 00000 n
+0000247202 00000 n
+0000247267 00000 n
+0000247332 00000 n
+0000247397 00000 n
+0000247461 00000 n
+0000247526 00000 n
+0000247591 00000 n
+0000247656 00000 n
+0000247721 00000 n
+0000247786 00000 n
+0000247851 00000 n
+0000253140 00000 n
+0000250358 00000 n
+0000248066 00000 n
+0000250483 00000 n
+0000250547 00000 n
+0000250612 00000 n
+0000250676 00000 n
+0000250741 00000 n
+0000250806 00000 n
+0000250871 00000 n
+0000250936 00000 n
+0000251001 00000 n
+0000251066 00000 n
+0000251131 00000 n
+0000251196 00000 n
+0000251261 00000 n
+0000251326 00000 n
+0000251391 00000 n
+0000251455 00000 n
+0000251520 00000 n
+0000251585 00000 n
+0000251650 00000 n
+0000251715 00000 n
+0000251780 00000 n
+0000251844 00000 n
+0000251909 00000 n
+0000252037 00000 n
+0000252102 00000 n
+0000252167 00000 n
+0000252232 00000 n
+0000252297 00000 n
+0000252362 00000 n
+0000252427 00000 n
+0000252492 00000 n
+0000252557 00000 n
+0000252622 00000 n
+0000252687 00000 n
+0000252751 00000 n
+0000252816 00000 n
+0000252881 00000 n
+0000252946 00000 n
+0000253011 00000 n
+0000253075 00000 n
+0000258822 00000 n
+0000255521 00000 n
+0000253330 00000 n
+0000255646 00000 n
+0000255773 00000 n
+0000255837 00000 n
+0000255902 00000 n
+0000255967 00000 n
+0000256032 00000 n
+0000256097 00000 n
+0000256162 00000 n
+0000256227 00000 n
+0000256292 00000 n
+0000256357 00000 n
+0000256422 00000 n
+0000256487 00000 n
+0000256552 00000 n
+0000256617 00000 n
+0000256682 00000 n
+0000256747 00000 n
+0000256812 00000 n
+0000256877 00000 n
+0000256942 00000 n
+0000257007 00000 n
+0000257072 00000 n
+0000257136 00000 n
+0000257264 00000 n
+0000257329 00000 n
+0000257394 00000 n
+0000257459 00000 n
+0000257524 00000 n
+0000257589 00000 n
+0000257654 00000 n
+0000257719 00000 n
+0000257784 00000 n
+0000257849 00000 n
+0000257914 00000 n
+0000257979 00000 n
+0000258044 00000 n
+0000258109 00000 n
+0000258174 00000 n
+0000258239 00000 n
+0000258304 00000 n
+0000258369 00000 n
+0000258434 00000 n
+0000258499 00000 n
+0000258564 00000 n
+0000258629 00000 n
+0000258694 00000 n
+0000258758 00000 n
+0000264460 00000 n
+0000262065 00000 n
+0000259012 00000 n
+0000262190 00000 n
+0000262254 00000 n
+0000262319 00000 n
+0000262384 00000 n
+0000262449 00000 n
+0000262514 00000 n
+0000262579 00000 n
+0000262644 00000 n
+0000262709 00000 n
+0000262774 00000 n
+0000262839 00000 n
+0000262904 00000 n
+0000262968 00000 n
+0000263033 00000 n
+0000263098 00000 n
+0000263163 00000 n
+0000263228 00000 n
+0000263293 00000 n
+0000263358 00000 n
+0000263423 00000 n
+0000263488 00000 n
+0000263553 00000 n
+0000263618 00000 n
+0000263683 00000 n
+0000263747 00000 n
+0000263812 00000 n
+0000263877 00000 n
+0000263942 00000 n
+0000264007 00000 n
+0000264072 00000 n
+0000264137 00000 n
+0000264202 00000 n
+0000264267 00000 n
+0000264332 00000 n
+0000264396 00000 n
+0000270592 00000 n
+0000267354 00000 n
+0000264650 00000 n
+0000267479 00000 n
+0000267543 00000 n
+0000267608 00000 n
+0000267672 00000 n
+0000267736 00000 n
+0000267801 00000 n
+0000267866 00000 n
+0000267931 00000 n
+0000267996 00000 n
+0000268061 00000 n
+0000268126 00000 n
+0000268191 00000 n
+0000268256 00000 n
+0000268321 00000 n
+0000268385 00000 n
+0000268450 00000 n
+0000268515 00000 n
+0000268580 00000 n
+0000268645 00000 n
+0000268710 00000 n
+0000268775 00000 n
+0000268840 00000 n
0000268905 00000 n
0000268970 00000 n
0000269035 00000 n
@@ -18177,8 +18071,8 @@ xref
0000269165 00000 n
0000269230 00000 n
0000269295 00000 n
-0000269360 00000 n
-0000269425 00000 n
+0000269359 00000 n
+0000269424 00000 n
0000269489 00000 n
0000269554 00000 n
0000269619 00000 n
@@ -18187,249 +18081,254 @@ xref
0000269814 00000 n
0000269879 00000 n
0000269944 00000 n
-0000270009 00000 n
-0000270074 00000 n
-0000270139 00000 n
-0000270204 00000 n
-0000270269 00000 n
+0000270008 00000 n
+0000270073 00000 n
+0000270138 00000 n
+0000270203 00000 n
+0000270268 00000 n
0000270333 00000 n
0000270398 00000 n
0000270463 00000 n
0000270528 00000 n
-0000270593 00000 n
-0000270658 00000 n
-0000270723 00000 n
-0000270788 00000 n
-0000270853 00000 n
-0000270917 00000 n
-0000270982 00000 n
-0000271047 00000 n
-0000271112 00000 n
-0000271177 00000 n
-0000271242 00000 n
-0000271307 00000 n
-0000271372 00000 n
-0000271437 00000 n
-0000271501 00000 n
-0000271566 00000 n
-0000271631 00000 n
-0000271696 00000 n
-0000271761 00000 n
-0000271826 00000 n
-0000271891 00000 n
-0000271956 00000 n
-0000272021 00000 n
-0000272086 00000 n
-0000272151 00000 n
-0000272216 00000 n
-0000272281 00000 n
-0000877042 00000 n
-0000282008 00000 n
-0000278345 00000 n
-0000275432 00000 n
-0000272508 00000 n
-0000275557 00000 n
-0000275621 00000 n
-0000275685 00000 n
-0000275750 00000 n
-0000275815 00000 n
-0000275880 00000 n
-0000275945 00000 n
-0000276010 00000 n
-0000276075 00000 n
-0000276140 00000 n
-0000276205 00000 n
-0000276270 00000 n
-0000276335 00000 n
-0000276400 00000 n
-0000276465 00000 n
-0000276529 00000 n
-0000276594 00000 n
-0000276659 00000 n
-0000276724 00000 n
-0000276789 00000 n
-0000276854 00000 n
-0000276919 00000 n
-0000276984 00000 n
-0000277049 00000 n
-0000277112 00000 n
-0000277177 00000 n
-0000277242 00000 n
-0000277307 00000 n
-0000277372 00000 n
-0000277437 00000 n
-0000277502 00000 n
-0000277567 00000 n
-0000277632 00000 n
-0000277697 00000 n
-0000277762 00000 n
-0000277827 00000 n
-0000277892 00000 n
-0000277957 00000 n
-0000278021 00000 n
-0000278086 00000 n
-0000278151 00000 n
-0000278215 00000 n
-0000278280 00000 n
-0000285019 00000 n
-0000281835 00000 n
-0000278509 00000 n
-0000282166 00000 n
-0000282230 00000 n
-0000282295 00000 n
-0000282360 00000 n
-0000282425 00000 n
-0000282490 00000 n
-0000282554 00000 n
-0000282619 00000 n
-0000282684 00000 n
-0000282749 00000 n
-0000282813 00000 n
-0000282878 00000 n
-0000282943 00000 n
-0000283008 00000 n
-0000283073 00000 n
-0000283138 00000 n
-0000283203 00000 n
-0000283268 00000 n
-0000283333 00000 n
-0000283398 00000 n
-0000283463 00000 n
-0000283528 00000 n
-0000283593 00000 n
-0000283658 00000 n
-0000283723 00000 n
-0000283788 00000 n
-0000283853 00000 n
-0000283918 00000 n
-0000283983 00000 n
-0000284047 00000 n
-0000284112 00000 n
-0000284177 00000 n
-0000284241 00000 n
-0000284306 00000 n
-0000284371 00000 n
-0000284436 00000 n
-0000284500 00000 n
-0000284565 00000 n
-0000284630 00000 n
-0000284695 00000 n
-0000284760 00000 n
-0000284825 00000 n
-0000284890 00000 n
-0000284955 00000 n
+0000883893 00000 n
+0000276957 00000 n
+0000273332 00000 n
+0000270782 00000 n
+0000273457 00000 n
+0000273521 00000 n
+0000273586 00000 n
+0000273650 00000 n
+0000273715 00000 n
+0000273780 00000 n
+0000273845 00000 n
+0000273910 00000 n
+0000273975 00000 n
+0000274040 00000 n
+0000274105 00000 n
+0000274170 00000 n
+0000274234 00000 n
+0000274299 00000 n
+0000274364 00000 n
+0000274429 00000 n
+0000274494 00000 n
+0000274559 00000 n
+0000274624 00000 n
+0000274689 00000 n
+0000274754 00000 n
+0000274818 00000 n
+0000274883 00000 n
+0000274948 00000 n
+0000275013 00000 n
+0000275078 00000 n
+0000275143 00000 n
+0000275208 00000 n
+0000275273 00000 n
+0000275338 00000 n
+0000275402 00000 n
+0000275467 00000 n
+0000275532 00000 n
+0000275597 00000 n
+0000275661 00000 n
+0000275726 00000 n
+0000275791 00000 n
+0000275856 00000 n
+0000275921 00000 n
+0000275986 00000 n
+0000276051 00000 n
+0000276116 00000 n
+0000276181 00000 n
+0000276246 00000 n
+0000276311 00000 n
+0000276376 00000 n
+0000276441 00000 n
+0000276505 00000 n
+0000276570 00000 n
+0000276635 00000 n
+0000276700 00000 n
+0000276764 00000 n
+0000276829 00000 n
+0000276893 00000 n
+0000280198 00000 n
+0000283081 00000 n
+0000280025 00000 n
+0000277121 00000 n
+0000280356 00000 n
+0000280420 00000 n
+0000280485 00000 n
+0000280550 00000 n
+0000280615 00000 n
+0000280680 00000 n
+0000280745 00000 n
+0000280809 00000 n
+0000280874 00000 n
+0000280939 00000 n
+0000281004 00000 n
+0000281069 00000 n
+0000281134 00000 n
+0000281199 00000 n
+0000281264 00000 n
+0000281329 00000 n
+0000281393 00000 n
+0000281458 00000 n
+0000281523 00000 n
+0000281588 00000 n
+0000281653 00000 n
+0000281718 00000 n
+0000281783 00000 n
+0000281848 00000 n
+0000281913 00000 n
0000281977 00000 n
-0000290955 00000 n
-0000288044 00000 n
-0000285248 00000 n
-0000288169 00000 n
-0000288233 00000 n
-0000288298 00000 n
-0000288362 00000 n
-0000288427 00000 n
-0000288492 00000 n
-0000288557 00000 n
-0000288622 00000 n
-0000288687 00000 n
-0000288752 00000 n
-0000288817 00000 n
-0000288880 00000 n
-0000288945 00000 n
-0000289010 00000 n
-0000289075 00000 n
-0000289140 00000 n
-0000289205 00000 n
-0000289270 00000 n
-0000289334 00000 n
-0000289399 00000 n
-0000289464 00000 n
-0000289529 00000 n
-0000289594 00000 n
-0000289659 00000 n
-0000289724 00000 n
-0000289789 00000 n
-0000289854 00000 n
-0000289918 00000 n
-0000289983 00000 n
-0000290048 00000 n
-0000290113 00000 n
-0000290178 00000 n
-0000290243 00000 n
-0000290308 00000 n
-0000290373 00000 n
-0000290438 00000 n
-0000290503 00000 n
-0000290568 00000 n
-0000290633 00000 n
-0000290698 00000 n
-0000290763 00000 n
-0000290828 00000 n
-0000290891 00000 n
-0000296929 00000 n
-0000293627 00000 n
-0000291119 00000 n
-0000293752 00000 n
-0000293816 00000 n
-0000293881 00000 n
-0000293945 00000 n
-0000294010 00000 n
-0000294075 00000 n
-0000294140 00000 n
-0000294205 00000 n
-0000294270 00000 n
-0000294335 00000 n
-0000294400 00000 n
-0000294465 00000 n
-0000294529 00000 n
-0000294594 00000 n
-0000294659 00000 n
-0000294724 00000 n
-0000294789 00000 n
-0000294853 00000 n
-0000294918 00000 n
-0000294983 00000 n
-0000295048 00000 n
-0000295113 00000 n
-0000295178 00000 n
-0000295243 00000 n
-0000295308 00000 n
-0000295373 00000 n
-0000295437 00000 n
-0000295502 00000 n
-0000295567 00000 n
-0000295632 00000 n
-0000295697 00000 n
-0000295762 00000 n
-0000295827 00000 n
-0000295892 00000 n
-0000295957 00000 n
-0000296022 00000 n
-0000296087 00000 n
-0000296152 00000 n
-0000296217 00000 n
-0000296282 00000 n
-0000296346 00000 n
-0000296411 00000 n
-0000296476 00000 n
-0000296541 00000 n
-0000296606 00000 n
-0000296671 00000 n
-0000296736 00000 n
-0000296801 00000 n
-0000296865 00000 n
-0000303419 00000 n
-0000299532 00000 n
-0000297106 00000 n
-0000299657 00000 n
-0000299721 00000 n
-0000299786 00000 n
-0000299851 00000 n
+0000282042 00000 n
+0000282107 00000 n
+0000282172 00000 n
+0000282236 00000 n
+0000282301 00000 n
+0000282366 00000 n
+0000282431 00000 n
+0000282496 00000 n
+0000282561 00000 n
+0000282626 00000 n
+0000282691 00000 n
+0000282756 00000 n
+0000282821 00000 n
+0000282886 00000 n
+0000282951 00000 n
+0000283016 00000 n
+0000280167 00000 n
+0000289431 00000 n
+0000286069 00000 n
+0000283297 00000 n
+0000286194 00000 n
+0000286258 00000 n
+0000286322 00000 n
+0000286387 00000 n
+0000286452 00000 n
+0000286517 00000 n
+0000286582 00000 n
+0000286647 00000 n
+0000286712 00000 n
+0000286777 00000 n
+0000286842 00000 n
+0000286906 00000 n
+0000286971 00000 n
+0000287036 00000 n
+0000287101 00000 n
+0000287165 00000 n
+0000287230 00000 n
+0000287295 00000 n
+0000287360 00000 n
+0000287425 00000 n
+0000287490 00000 n
+0000287554 00000 n
+0000287619 00000 n
+0000287684 00000 n
+0000287749 00000 n
+0000287814 00000 n
+0000287879 00000 n
+0000287944 00000 n
+0000288009 00000 n
+0000288073 00000 n
+0000288138 00000 n
+0000288203 00000 n
+0000288268 00000 n
+0000288331 00000 n
+0000288396 00000 n
+0000288461 00000 n
+0000288526 00000 n
+0000288591 00000 n
+0000288656 00000 n
+0000288721 00000 n
+0000288786 00000 n
+0000288851 00000 n
+0000288915 00000 n
+0000288980 00000 n
+0000289045 00000 n
+0000289110 00000 n
+0000289175 00000 n
+0000289240 00000 n
+0000289305 00000 n
+0000289369 00000 n
+0000295231 00000 n
+0000292447 00000 n
+0000289608 00000 n
+0000292572 00000 n
+0000292636 00000 n
+0000292701 00000 n
+0000292766 00000 n
+0000292831 00000 n
+0000292896 00000 n
+0000292961 00000 n
+0000293026 00000 n
+0000293091 00000 n
+0000293156 00000 n
+0000293221 00000 n
+0000293286 00000 n
+0000293351 00000 n
+0000293416 00000 n
+0000293480 00000 n
+0000293545 00000 n
+0000293610 00000 n
+0000293675 00000 n
+0000293740 00000 n
+0000293805 00000 n
+0000293870 00000 n
+0000293935 00000 n
+0000294000 00000 n
+0000294065 00000 n
+0000294130 00000 n
+0000294195 00000 n
+0000294260 00000 n
+0000294325 00000 n
+0000294390 00000 n
+0000294454 00000 n
+0000294519 00000 n
+0000294584 00000 n
+0000294649 00000 n
+0000294714 00000 n
+0000294779 00000 n
+0000294844 00000 n
+0000294909 00000 n
+0000294974 00000 n
+0000295038 00000 n
+0000295103 00000 n
+0000295167 00000 n
+0000301278 00000 n
+0000297974 00000 n
+0000295395 00000 n
+0000298099 00000 n
+0000298163 00000 n
+0000298228 00000 n
+0000298292 00000 n
+0000298357 00000 n
+0000298422 00000 n
+0000298487 00000 n
+0000298552 00000 n
+0000298617 00000 n
+0000298682 00000 n
+0000298747 00000 n
+0000298812 00000 n
+0000298877 00000 n
+0000298942 00000 n
+0000299007 00000 n
+0000299072 00000 n
+0000299136 00000 n
+0000299201 00000 n
+0000299266 00000 n
+0000299331 00000 n
+0000299396 00000 n
+0000299461 00000 n
+0000299526 00000 n
+0000299591 00000 n
+0000299655 00000 n
+0000299720 00000 n
+0000299785 00000 n
+0000299850 00000 n
0000299915 00000 n
0000299980 00000 n
0000300045 00000 n
0000300110 00000 n
0000300175 00000 n
-0000300240 00000 n
+0000300239 00000 n
0000300304 00000 n
0000300369 00000 n
0000300434 00000 n
@@ -18438,1724 +18337,1712 @@ xref
0000300629 00000 n
0000300694 00000 n
0000300759 00000 n
-0000300823 00000 n
-0000300888 00000 n
-0000300953 00000 n
-0000301018 00000 n
-0000301083 00000 n
-0000301148 00000 n
-0000301213 00000 n
-0000301278 00000 n
-0000301343 00000 n
-0000301407 00000 n
-0000301472 00000 n
-0000301537 00000 n
-0000301602 00000 n
-0000301667 00000 n
-0000301732 00000 n
-0000301797 00000 n
-0000301862 00000 n
-0000301927 00000 n
-0000301991 00000 n
-0000302056 00000 n
-0000302121 00000 n
-0000302186 00000 n
-0000302251 00000 n
-0000302316 00000 n
-0000302381 00000 n
-0000302446 00000 n
-0000302511 00000 n
-0000302575 00000 n
-0000302640 00000 n
-0000302705 00000 n
-0000302770 00000 n
-0000302835 00000 n
-0000302900 00000 n
-0000302965 00000 n
-0000303030 00000 n
-0000303095 00000 n
-0000303160 00000 n
-0000303224 00000 n
-0000303289 00000 n
-0000303354 00000 n
-0000309261 00000 n
-0000306413 00000 n
-0000303583 00000 n
-0000306538 00000 n
-0000306602 00000 n
-0000306667 00000 n
-0000306731 00000 n
-0000306796 00000 n
-0000306861 00000 n
-0000306926 00000 n
-0000306991 00000 n
-0000307056 00000 n
-0000307121 00000 n
-0000307185 00000 n
-0000307250 00000 n
-0000307315 00000 n
-0000307380 00000 n
-0000307445 00000 n
-0000307510 00000 n
-0000307575 00000 n
-0000307640 00000 n
-0000307705 00000 n
-0000307769 00000 n
-0000307834 00000 n
-0000307899 00000 n
-0000307964 00000 n
-0000308029 00000 n
-0000308094 00000 n
-0000308159 00000 n
-0000308224 00000 n
-0000308289 00000 n
-0000308354 00000 n
-0000308419 00000 n
-0000308484 00000 n
-0000308549 00000 n
-0000308614 00000 n
-0000308679 00000 n
-0000308743 00000 n
-0000308808 00000 n
-0000308936 00000 n
-0000309001 00000 n
-0000309066 00000 n
-0000309131 00000 n
-0000309196 00000 n
-0000315397 00000 n
-0000311381 00000 n
-0000309438 00000 n
-0000311506 00000 n
-0000311570 00000 n
-0000311635 00000 n
-0000311699 00000 n
-0000311764 00000 n
-0000311829 00000 n
-0000311894 00000 n
-0000311959 00000 n
-0000312024 00000 n
-0000312089 00000 n
-0000312154 00000 n
-0000312219 00000 n
-0000312283 00000 n
-0000312348 00000 n
-0000312413 00000 n
-0000312478 00000 n
-0000312543 00000 n
-0000312608 00000 n
-0000312673 00000 n
-0000312738 00000 n
-0000312803 00000 n
-0000312867 00000 n
-0000312932 00000 n
-0000312997 00000 n
-0000313062 00000 n
-0000313127 00000 n
-0000313192 00000 n
-0000313257 00000 n
-0000313322 00000 n
-0000313387 00000 n
-0000313450 00000 n
-0000313515 00000 n
-0000313580 00000 n
-0000313645 00000 n
-0000313710 00000 n
-0000313775 00000 n
-0000313840 00000 n
-0000313905 00000 n
-0000313970 00000 n
-0000314035 00000 n
-0000314100 00000 n
-0000314165 00000 n
-0000314230 00000 n
-0000314295 00000 n
-0000314360 00000 n
-0000314425 00000 n
-0000314490 00000 n
-0000314555 00000 n
-0000314620 00000 n
-0000314684 00000 n
-0000314749 00000 n
-0000314814 00000 n
-0000314879 00000 n
-0000314944 00000 n
-0000315009 00000 n
-0000315074 00000 n
-0000315139 00000 n
-0000315204 00000 n
-0000315269 00000 n
-0000315333 00000 n
-0000321306 00000 n
-0000317747 00000 n
-0000315574 00000 n
-0000317872 00000 n
-0000317936 00000 n
-0000318001 00000 n
-0000318065 00000 n
-0000318130 00000 n
-0000318195 00000 n
-0000318260 00000 n
-0000318325 00000 n
-0000318390 00000 n
-0000318455 00000 n
-0000318520 00000 n
-0000318585 00000 n
-0000318649 00000 n
-0000318714 00000 n
-0000318779 00000 n
-0000318844 00000 n
-0000318909 00000 n
-0000318974 00000 n
-0000319039 00000 n
-0000319104 00000 n
-0000319169 00000 n
-0000319233 00000 n
-0000319298 00000 n
-0000319363 00000 n
-0000319428 00000 n
-0000319493 00000 n
-0000319558 00000 n
-0000319623 00000 n
-0000319688 00000 n
-0000319753 00000 n
-0000319818 00000 n
-0000319883 00000 n
-0000319948 00000 n
-0000320076 00000 n
-0000320141 00000 n
-0000320206 00000 n
-0000320271 00000 n
-0000320336 00000 n
-0000320401 00000 n
-0000320464 00000 n
-0000320529 00000 n
-0000320594 00000 n
-0000320659 00000 n
-0000320724 00000 n
-0000320789 00000 n
-0000320854 00000 n
-0000320919 00000 n
-0000320984 00000 n
-0000321048 00000 n
-0000321113 00000 n
-0000321178 00000 n
-0000321242 00000 n
-0000327399 00000 n
-0000324293 00000 n
-0000321483 00000 n
-0000324418 00000 n
-0000324482 00000 n
-0000324547 00000 n
-0000324611 00000 n
-0000324676 00000 n
-0000324741 00000 n
-0000324806 00000 n
-0000324871 00000 n
-0000324936 00000 n
-0000325001 00000 n
-0000325066 00000 n
-0000325131 00000 n
-0000325195 00000 n
-0000325260 00000 n
-0000325325 00000 n
-0000325390 00000 n
-0000325455 00000 n
-0000325520 00000 n
-0000325585 00000 n
-0000325650 00000 n
-0000325714 00000 n
-0000325779 00000 n
-0000325844 00000 n
-0000325972 00000 n
-0000326037 00000 n
-0000326102 00000 n
-0000326166 00000 n
-0000326231 00000 n
-0000326296 00000 n
-0000326361 00000 n
-0000326426 00000 n
-0000326491 00000 n
-0000326556 00000 n
-0000326621 00000 n
-0000326686 00000 n
-0000326750 00000 n
-0000326815 00000 n
-0000326880 00000 n
-0000326945 00000 n
-0000327010 00000 n
-0000327074 00000 n
-0000327139 00000 n
-0000327204 00000 n
-0000327269 00000 n
-0000327334 00000 n
-0000332954 00000 n
-0000330170 00000 n
-0000327589 00000 n
-0000330295 00000 n
-0000330359 00000 n
-0000330424 00000 n
-0000330488 00000 n
-0000330553 00000 n
-0000330618 00000 n
-0000330683 00000 n
-0000330748 00000 n
-0000330813 00000 n
-0000330877 00000 n
-0000330940 00000 n
-0000331005 00000 n
-0000331070 00000 n
-0000331135 00000 n
-0000331200 00000 n
-0000331265 00000 n
-0000331330 00000 n
-0000331395 00000 n
-0000331460 00000 n
-0000331525 00000 n
-0000331590 00000 n
-0000331655 00000 n
-0000331720 00000 n
-0000331785 00000 n
-0000331850 00000 n
-0000331915 00000 n
-0000331980 00000 n
-0000332045 00000 n
-0000332110 00000 n
-0000332175 00000 n
-0000332240 00000 n
-0000332305 00000 n
-0000332370 00000 n
-0000332435 00000 n
-0000332500 00000 n
-0000332564 00000 n
-0000332629 00000 n
-0000332694 00000 n
-0000332759 00000 n
-0000332824 00000 n
-0000332889 00000 n
-0000877206 00000 n
-0000339091 00000 n
-0000335210 00000 n
-0000333131 00000 n
-0000335335 00000 n
-0000335399 00000 n
-0000335464 00000 n
-0000335528 00000 n
-0000335593 00000 n
-0000335658 00000 n
-0000335786 00000 n
-0000335851 00000 n
-0000335916 00000 n
-0000335981 00000 n
-0000336046 00000 n
-0000336111 00000 n
-0000336174 00000 n
-0000336239 00000 n
-0000336304 00000 n
-0000336369 00000 n
-0000336497 00000 n
-0000336562 00000 n
-0000336627 00000 n
-0000336692 00000 n
-0000336757 00000 n
-0000336822 00000 n
-0000336887 00000 n
-0000336951 00000 n
-0000337015 00000 n
-0000337080 00000 n
-0000337145 00000 n
-0000337210 00000 n
-0000337275 00000 n
-0000337340 00000 n
-0000337405 00000 n
-0000337470 00000 n
-0000337535 00000 n
-0000337600 00000 n
-0000337665 00000 n
-0000337729 00000 n
-0000337794 00000 n
-0000337859 00000 n
-0000337924 00000 n
-0000337989 00000 n
-0000338054 00000 n
-0000338119 00000 n
-0000338184 00000 n
-0000338249 00000 n
-0000338314 00000 n
-0000338379 00000 n
-0000338443 00000 n
-0000338508 00000 n
-0000338573 00000 n
-0000338638 00000 n
-0000338703 00000 n
-0000338768 00000 n
-0000338833 00000 n
-0000338898 00000 n
-0000338963 00000 n
-0000339027 00000 n
-0000345427 00000 n
-0000341283 00000 n
-0000339255 00000 n
-0000341408 00000 n
-0000341472 00000 n
-0000341537 00000 n
-0000341601 00000 n
-0000341666 00000 n
-0000341731 00000 n
-0000341796 00000 n
-0000341861 00000 n
-0000341925 00000 n
-0000341990 00000 n
-0000342055 00000 n
-0000342120 00000 n
-0000342185 00000 n
-0000342249 00000 n
-0000342314 00000 n
-0000342379 00000 n
-0000342444 00000 n
-0000342509 00000 n
-0000342574 00000 n
-0000342639 00000 n
-0000342704 00000 n
-0000342769 00000 n
-0000342834 00000 n
-0000342899 00000 n
-0000342964 00000 n
-0000343029 00000 n
-0000343094 00000 n
-0000343159 00000 n
-0000343224 00000 n
-0000343289 00000 n
-0000343354 00000 n
-0000343419 00000 n
-0000343484 00000 n
-0000343549 00000 n
-0000343614 00000 n
-0000343679 00000 n
-0000343744 00000 n
-0000343809 00000 n
-0000343873 00000 n
-0000343938 00000 n
-0000344003 00000 n
-0000344068 00000 n
-0000344133 00000 n
-0000344197 00000 n
-0000344262 00000 n
-0000344327 00000 n
-0000344392 00000 n
-0000344457 00000 n
-0000344522 00000 n
-0000344585 00000 n
-0000344650 00000 n
-0000344715 00000 n
-0000344780 00000 n
-0000344845 00000 n
-0000344910 00000 n
-0000344975 00000 n
-0000345040 00000 n
-0000345105 00000 n
-0000345169 00000 n
-0000345234 00000 n
-0000345299 00000 n
-0000345363 00000 n
-0000351261 00000 n
-0000347507 00000 n
-0000345578 00000 n
-0000347632 00000 n
-0000347696 00000 n
-0000347761 00000 n
-0000347825 00000 n
-0000347890 00000 n
-0000347955 00000 n
-0000348020 00000 n
-0000348085 00000 n
-0000348150 00000 n
-0000348215 00000 n
-0000348280 00000 n
-0000348345 00000 n
-0000348409 00000 n
-0000348474 00000 n
-0000348539 00000 n
-0000348604 00000 n
-0000348669 00000 n
-0000348734 00000 n
-0000348799 00000 n
-0000348864 00000 n
-0000348929 00000 n
-0000348993 00000 n
-0000349058 00000 n
-0000349123 00000 n
-0000349188 00000 n
-0000349253 00000 n
-0000349318 00000 n
-0000349383 00000 n
-0000349447 00000 n
-0000349512 00000 n
-0000349577 00000 n
-0000349642 00000 n
-0000349707 00000 n
-0000349772 00000 n
-0000349837 00000 n
-0000349901 00000 n
-0000349966 00000 n
-0000350031 00000 n
-0000350096 00000 n
-0000350161 00000 n
-0000350226 00000 n
-0000350291 00000 n
-0000350356 00000 n
-0000350421 00000 n
-0000350486 00000 n
-0000350551 00000 n
-0000350616 00000 n
-0000350681 00000 n
-0000350809 00000 n
-0000350874 00000 n
-0000350939 00000 n
-0000351004 00000 n
-0000351069 00000 n
-0000351133 00000 n
-0000351197 00000 n
-0000357475 00000 n
-0000354113 00000 n
-0000351425 00000 n
-0000354238 00000 n
-0000354302 00000 n
-0000354367 00000 n
-0000354431 00000 n
-0000354496 00000 n
-0000354561 00000 n
-0000354626 00000 n
-0000354691 00000 n
-0000354819 00000 n
-0000354884 00000 n
-0000354949 00000 n
-0000355014 00000 n
-0000355078 00000 n
-0000355143 00000 n
-0000355208 00000 n
-0000355273 00000 n
-0000355338 00000 n
-0000355403 00000 n
-0000355468 00000 n
-0000355533 00000 n
-0000355598 00000 n
-0000355662 00000 n
-0000355727 00000 n
-0000355792 00000 n
-0000355857 00000 n
-0000355922 00000 n
-0000355987 00000 n
-0000356052 00000 n
-0000874848 00000 n
-0000356180 00000 n
-0000356245 00000 n
-0000356310 00000 n
-0000356374 00000 n
-0000356439 00000 n
-0000356504 00000 n
-0000356569 00000 n
-0000356634 00000 n
-0000356699 00000 n
-0000356763 00000 n
-0000356828 00000 n
-0000356893 00000 n
-0000356958 00000 n
-0000357023 00000 n
-0000357088 00000 n
-0000357153 00000 n
-0000357217 00000 n
-0000357282 00000 n
-0000357347 00000 n
-0000357411 00000 n
-0000362848 00000 n
-0000360973 00000 n
-0000357706 00000 n
-0000361098 00000 n
-0000361162 00000 n
-0000361227 00000 n
-0000361291 00000 n
-0000361356 00000 n
-0000361421 00000 n
-0000361486 00000 n
-0000361551 00000 n
-0000361616 00000 n
-0000361681 00000 n
-0000361746 00000 n
-0000361809 00000 n
-0000361874 00000 n
-0000361939 00000 n
-0000362004 00000 n
-0000362069 00000 n
-0000362134 00000 n
-0000362199 00000 n
-0000362264 00000 n
-0000362329 00000 n
-0000362394 00000 n
-0000362459 00000 n
-0000362524 00000 n
-0000362589 00000 n
-0000362654 00000 n
-0000362719 00000 n
-0000362783 00000 n
-0000368124 00000 n
-0000365730 00000 n
-0000363064 00000 n
-0000365855 00000 n
-0000365919 00000 n
-0000365984 00000 n
-0000366049 00000 n
-0000366114 00000 n
-0000366178 00000 n
-0000366243 00000 n
-0000366308 00000 n
-0000366373 00000 n
-0000366438 00000 n
-0000366503 00000 n
-0000366568 00000 n
-0000366632 00000 n
-0000366697 00000 n
-0000366762 00000 n
-0000366827 00000 n
-0000366892 00000 n
-0000366957 00000 n
-0000367022 00000 n
-0000367087 00000 n
-0000367152 00000 n
-0000367217 00000 n
-0000367282 00000 n
-0000367346 00000 n
-0000367411 00000 n
-0000367476 00000 n
-0000367540 00000 n
-0000367605 00000 n
-0000367669 00000 n
-0000367734 00000 n
-0000367799 00000 n
-0000367864 00000 n
-0000367929 00000 n
-0000367994 00000 n
-0000368059 00000 n
-0000372967 00000 n
-0000370444 00000 n
-0000368340 00000 n
-0000370569 00000 n
-0000370633 00000 n
-0000370698 00000 n
-0000370763 00000 n
-0000370828 00000 n
-0000370892 00000 n
-0000370957 00000 n
-0000371022 00000 n
-0000371087 00000 n
-0000371152 00000 n
-0000371217 00000 n
-0000371282 00000 n
-0000371347 00000 n
-0000371412 00000 n
-0000371477 00000 n
-0000371542 00000 n
-0000371607 00000 n
-0000371670 00000 n
-0000371735 00000 n
-0000371800 00000 n
-0000371865 00000 n
-0000371930 00000 n
-0000371995 00000 n
-0000372060 00000 n
-0000372125 00000 n
-0000372190 00000 n
-0000372254 00000 n
-0000372319 00000 n
-0000372384 00000 n
-0000372449 00000 n
-0000372514 00000 n
-0000372578 00000 n
-0000372643 00000 n
-0000372708 00000 n
-0000372773 00000 n
-0000372838 00000 n
-0000372902 00000 n
-0000378325 00000 n
-0000375411 00000 n
-0000373157 00000 n
-0000375536 00000 n
-0000375600 00000 n
-0000375664 00000 n
-0000375729 00000 n
-0000375794 00000 n
-0000375859 00000 n
-0000375924 00000 n
-0000375989 00000 n
-0000376054 00000 n
-0000376118 00000 n
-0000376183 00000 n
-0000376248 00000 n
-0000376313 00000 n
-0000376378 00000 n
-0000376443 00000 n
-0000376508 00000 n
-0000376573 00000 n
-0000376638 00000 n
-0000376703 00000 n
-0000376768 00000 n
-0000376833 00000 n
-0000376898 00000 n
-0000376963 00000 n
-0000377028 00000 n
-0000377093 00000 n
-0000377158 00000 n
-0000377222 00000 n
-0000377287 00000 n
-0000377352 00000 n
-0000377417 00000 n
-0000377482 00000 n
-0000377547 00000 n
-0000377612 00000 n
-0000377677 00000 n
-0000377742 00000 n
-0000377807 00000 n
-0000377872 00000 n
-0000377936 00000 n
-0000378001 00000 n
-0000378066 00000 n
-0000378131 00000 n
-0000378196 00000 n
-0000378260 00000 n
-0000383613 00000 n
-0000380437 00000 n
-0000378541 00000 n
-0000380562 00000 n
-0000380626 00000 n
-0000380691 00000 n
-0000380755 00000 n
-0000380820 00000 n
-0000380885 00000 n
-0000380950 00000 n
-0000381015 00000 n
-0000381080 00000 n
-0000381145 00000 n
-0000381209 00000 n
-0000381274 00000 n
-0000381339 00000 n
-0000381404 00000 n
-0000381469 00000 n
-0000381534 00000 n
-0000381599 00000 n
-0000381663 00000 n
-0000381728 00000 n
-0000381793 00000 n
-0000381858 00000 n
-0000381923 00000 n
-0000381988 00000 n
-0000382053 00000 n
-0000382118 00000 n
-0000382183 00000 n
-0000382248 00000 n
-0000382313 00000 n
-0000382378 00000 n
-0000382443 00000 n
-0000382508 00000 n
-0000382573 00000 n
-0000382638 00000 n
-0000382703 00000 n
-0000382768 00000 n
-0000382833 00000 n
-0000382898 00000 n
-0000382963 00000 n
-0000383028 00000 n
-0000383093 00000 n
-0000383158 00000 n
-0000383223 00000 n
-0000383288 00000 n
-0000383353 00000 n
-0000383418 00000 n
-0000383483 00000 n
-0000383548 00000 n
-0000386910 00000 n
-0000389402 00000 n
-0000386737 00000 n
-0000383790 00000 n
-0000387068 00000 n
-0000387132 00000 n
-0000387197 00000 n
-0000387262 00000 n
-0000387327 00000 n
-0000387392 00000 n
-0000387457 00000 n
-0000387522 00000 n
-0000387587 00000 n
-0000387652 00000 n
-0000387716 00000 n
-0000387781 00000 n
-0000387846 00000 n
-0000387911 00000 n
-0000387976 00000 n
-0000388041 00000 n
-0000388106 00000 n
-0000388171 00000 n
-0000388236 00000 n
-0000388301 00000 n
-0000388366 00000 n
-0000388431 00000 n
-0000388495 00000 n
-0000388560 00000 n
-0000388624 00000 n
-0000388689 00000 n
-0000388754 00000 n
-0000388819 00000 n
-0000388884 00000 n
-0000388949 00000 n
-0000389014 00000 n
-0000389079 00000 n
-0000389144 00000 n
-0000389209 00000 n
-0000389274 00000 n
-0000389338 00000 n
-0000877370 00000 n
-0000386879 00000 n
-0000396104 00000 n
-0000392544 00000 n
-0000389670 00000 n
-0000392669 00000 n
-0000392733 00000 n
-0000392798 00000 n
-0000392862 00000 n
-0000392927 00000 n
-0000392992 00000 n
-0000393057 00000 n
-0000393122 00000 n
-0000393187 00000 n
-0000393252 00000 n
-0000393317 00000 n
-0000393382 00000 n
-0000393447 00000 n
-0000393512 00000 n
-0000393577 00000 n
-0000393642 00000 n
-0000393707 00000 n
-0000393835 00000 n
-0000393900 00000 n
-0000393964 00000 n
-0000394029 00000 n
-0000394094 00000 n
-0000394159 00000 n
-0000394224 00000 n
-0000394289 00000 n
-0000394354 00000 n
-0000394419 00000 n
-0000394484 00000 n
-0000394548 00000 n
-0000394613 00000 n
-0000394678 00000 n
-0000394743 00000 n
-0000394808 00000 n
-0000394873 00000 n
-0000394938 00000 n
-0000395003 00000 n
-0000395068 00000 n
-0000395132 00000 n
-0000395197 00000 n
-0000395262 00000 n
-0000395327 00000 n
-0000395392 00000 n
-0000395457 00000 n
-0000395522 00000 n
-0000395587 00000 n
-0000395652 00000 n
-0000395716 00000 n
-0000395781 00000 n
-0000395846 00000 n
-0000395911 00000 n
-0000395976 00000 n
-0000396040 00000 n
-0000402081 00000 n
-0000399622 00000 n
-0000396307 00000 n
-0000399747 00000 n
-0000399811 00000 n
-0000399876 00000 n
-0000399940 00000 n
-0000400005 00000 n
-0000400070 00000 n
-0000400135 00000 n
-0000400200 00000 n
-0000400265 00000 n
-0000400330 00000 n
-0000400395 00000 n
-0000400460 00000 n
-0000400524 00000 n
-0000400589 00000 n
-0000400654 00000 n
-0000400719 00000 n
-0000400784 00000 n
-0000400849 00000 n
-0000400914 00000 n
-0000400979 00000 n
-0000401044 00000 n
-0000401108 00000 n
-0000401173 00000 n
-0000401238 00000 n
-0000401303 00000 n
-0000401368 00000 n
-0000401432 00000 n
-0000401497 00000 n
-0000401562 00000 n
-0000401627 00000 n
-0000401692 00000 n
-0000401757 00000 n
-0000401822 00000 n
-0000401887 00000 n
-0000401952 00000 n
-0000402016 00000 n
-0000405720 00000 n
-0000405877 00000 n
-0000408174 00000 n
-0000405538 00000 n
-0000402297 00000 n
-0000406034 00000 n
-0000406098 00000 n
-0000406161 00000 n
-0000406226 00000 n
-0000406291 00000 n
-0000406356 00000 n
-0000406420 00000 n
-0000406485 00000 n
-0000406550 00000 n
-0000406615 00000 n
-0000406680 00000 n
-0000406745 00000 n
-0000406810 00000 n
-0000406875 00000 n
-0000406940 00000 n
-0000407005 00000 n
-0000407070 00000 n
-0000407135 00000 n
-0000407200 00000 n
-0000407265 00000 n
-0000407330 00000 n
-0000407395 00000 n
-0000407460 00000 n
-0000407525 00000 n
-0000407590 00000 n
-0000407655 00000 n
-0000407720 00000 n
-0000407784 00000 n
-0000407849 00000 n
-0000407914 00000 n
-0000407979 00000 n
-0000408044 00000 n
-0000408109 00000 n
-0000405680 00000 n
-0000413421 00000 n
-0000410056 00000 n
-0000408442 00000 n
-0000410181 00000 n
-0000410245 00000 n
-0000410310 00000 n
-0000410375 00000 n
-0000410440 00000 n
-0000410505 00000 n
-0000410570 00000 n
-0000410635 00000 n
-0000410700 00000 n
-0000410765 00000 n
-0000410829 00000 n
-0000410894 00000 n
-0000410959 00000 n
-0000411024 00000 n
-0000411089 00000 n
-0000411154 00000 n
-0000411219 00000 n
-0000411284 00000 n
-0000411349 00000 n
-0000411413 00000 n
-0000411478 00000 n
-0000411543 00000 n
-0000411608 00000 n
-0000411673 00000 n
-0000411738 00000 n
-0000411803 00000 n
-0000411868 00000 n
-0000411933 00000 n
-0000411997 00000 n
-0000412062 00000 n
-0000412127 00000 n
-0000412192 00000 n
-0000412257 00000 n
-0000412322 00000 n
-0000412387 00000 n
-0000412452 00000 n
-0000412515 00000 n
-0000412580 00000 n
-0000412645 00000 n
-0000412710 00000 n
-0000412775 00000 n
-0000412838 00000 n
-0000412903 00000 n
-0000412968 00000 n
-0000413033 00000 n
-0000413098 00000 n
-0000413163 00000 n
-0000413227 00000 n
-0000413292 00000 n
-0000413356 00000 n
-0000419403 00000 n
-0000415387 00000 n
-0000413585 00000 n
-0000415512 00000 n
-0000415576 00000 n
-0000415640 00000 n
-0000415705 00000 n
-0000415770 00000 n
-0000415835 00000 n
-0000415900 00000 n
-0000415965 00000 n
-0000416030 00000 n
-0000416095 00000 n
-0000416160 00000 n
-0000416224 00000 n
-0000416289 00000 n
-0000416354 00000 n
-0000416419 00000 n
-0000416484 00000 n
-0000416549 00000 n
-0000416614 00000 n
-0000416679 00000 n
-0000416744 00000 n
-0000416808 00000 n
-0000416873 00000 n
-0000416938 00000 n
-0000417003 00000 n
-0000417068 00000 n
-0000417133 00000 n
-0000417198 00000 n
-0000417263 00000 n
-0000417328 00000 n
-0000417392 00000 n
-0000417457 00000 n
-0000417522 00000 n
-0000417587 00000 n
-0000417652 00000 n
-0000417717 00000 n
-0000417782 00000 n
-0000417847 00000 n
-0000417912 00000 n
-0000417976 00000 n
-0000418041 00000 n
-0000418106 00000 n
-0000418171 00000 n
-0000418236 00000 n
-0000418301 00000 n
-0000418366 00000 n
-0000418431 00000 n
-0000418496 00000 n
-0000418560 00000 n
-0000418625 00000 n
-0000418690 00000 n
-0000418755 00000 n
-0000418820 00000 n
-0000418885 00000 n
-0000418950 00000 n
-0000419015 00000 n
-0000419080 00000 n
-0000419144 00000 n
-0000419209 00000 n
-0000419274 00000 n
-0000419339 00000 n
-0000425505 00000 n
-0000422659 00000 n
-0000419593 00000 n
-0000422784 00000 n
-0000422848 00000 n
-0000422913 00000 n
-0000422977 00000 n
-0000423042 00000 n
-0000423107 00000 n
-0000423172 00000 n
-0000423236 00000 n
-0000423301 00000 n
-0000423366 00000 n
-0000423431 00000 n
-0000423496 00000 n
-0000423560 00000 n
-0000423625 00000 n
-0000423690 00000 n
-0000423755 00000 n
-0000423820 00000 n
-0000423885 00000 n
-0000423950 00000 n
-0000424015 00000 n
-0000424079 00000 n
-0000424144 00000 n
-0000424209 00000 n
-0000424274 00000 n
-0000424339 00000 n
-0000424404 00000 n
-0000424469 00000 n
-0000424534 00000 n
-0000424598 00000 n
-0000424663 00000 n
-0000424728 00000 n
-0000424793 00000 n
-0000424858 00000 n
-0000424923 00000 n
-0000424988 00000 n
-0000425053 00000 n
-0000425118 00000 n
-0000425183 00000 n
-0000425247 00000 n
-0000425312 00000 n
-0000425377 00000 n
-0000425441 00000 n
-0000428852 00000 n
-0000431800 00000 n
-0000428679 00000 n
-0000425721 00000 n
-0000429010 00000 n
-0000429074 00000 n
-0000429139 00000 n
-0000429204 00000 n
-0000429269 00000 n
-0000429334 00000 n
-0000429399 00000 n
-0000429464 00000 n
-0000429529 00000 n
-0000429594 00000 n
-0000429658 00000 n
-0000429723 00000 n
-0000429787 00000 n
-0000429852 00000 n
-0000429917 00000 n
-0000429982 00000 n
-0000430047 00000 n
-0000430112 00000 n
-0000430177 00000 n
-0000430242 00000 n
-0000430307 00000 n
-0000430372 00000 n
-0000430437 00000 n
-0000430502 00000 n
-0000430567 00000 n
-0000430632 00000 n
-0000430697 00000 n
-0000430762 00000 n
-0000430827 00000 n
-0000430892 00000 n
-0000430957 00000 n
-0000431021 00000 n
-0000431086 00000 n
-0000431151 00000 n
-0000431216 00000 n
-0000431281 00000 n
-0000431346 00000 n
-0000431411 00000 n
-0000431476 00000 n
-0000431541 00000 n
-0000431606 00000 n
-0000431671 00000 n
-0000431736 00000 n
-0000428821 00000 n
-0000437954 00000 n
-0000434329 00000 n
-0000432081 00000 n
-0000434454 00000 n
-0000434518 00000 n
-0000434583 00000 n
-0000434647 00000 n
-0000434712 00000 n
-0000434777 00000 n
-0000434842 00000 n
-0000434907 00000 n
-0000434972 00000 n
-0000435037 00000 n
-0000435102 00000 n
-0000435230 00000 n
-0000435295 00000 n
-0000435360 00000 n
-0000435425 00000 n
-0000435490 00000 n
-0000435555 00000 n
-0000435620 00000 n
-0000435685 00000 n
-0000435750 00000 n
-0000435815 00000 n
-0000435880 00000 n
-0000435945 00000 n
-0000436008 00000 n
-0000436073 00000 n
-0000436138 00000 n
-0000436203 00000 n
-0000436268 00000 n
-0000436333 00000 n
-0000436398 00000 n
-0000436463 00000 n
-0000436528 00000 n
-0000436593 00000 n
-0000436658 00000 n
-0000436723 00000 n
-0000436788 00000 n
-0000436853 00000 n
-0000436918 00000 n
-0000436983 00000 n
-0000437048 00000 n
-0000437112 00000 n
-0000437177 00000 n
-0000437242 00000 n
-0000437307 00000 n
-0000437372 00000 n
-0000437437 00000 n
-0000437502 00000 n
-0000437567 00000 n
-0000437632 00000 n
-0000437696 00000 n
-0000437761 00000 n
-0000437826 00000 n
-0000437890 00000 n
-0000444002 00000 n
-0000440508 00000 n
-0000438131 00000 n
-0000440633 00000 n
-0000440697 00000 n
-0000440762 00000 n
-0000440826 00000 n
-0000440891 00000 n
-0000440956 00000 n
-0000441021 00000 n
-0000441086 00000 n
-0000441151 00000 n
-0000441215 00000 n
-0000441280 00000 n
-0000441345 00000 n
-0000441410 00000 n
-0000441475 00000 n
-0000441540 00000 n
-0000441605 00000 n
-0000441670 00000 n
-0000441734 00000 n
-0000441799 00000 n
-0000441864 00000 n
-0000441929 00000 n
-0000441994 00000 n
-0000442059 00000 n
-0000442124 00000 n
-0000442189 00000 n
-0000442254 00000 n
-0000442318 00000 n
-0000442383 00000 n
-0000442448 00000 n
-0000442513 00000 n
-0000442578 00000 n
-0000442643 00000 n
-0000442708 00000 n
-0000442773 00000 n
-0000442838 00000 n
-0000442902 00000 n
-0000442967 00000 n
-0000443032 00000 n
-0000443097 00000 n
-0000443162 00000 n
-0000443227 00000 n
-0000443292 00000 n
-0000443357 00000 n
-0000443422 00000 n
-0000443486 00000 n
-0000443550 00000 n
-0000443615 00000 n
-0000443679 00000 n
-0000443744 00000 n
-0000443809 00000 n
-0000443874 00000 n
-0000443938 00000 n
-0000449578 00000 n
-0000446861 00000 n
-0000444179 00000 n
-0000446986 00000 n
-0000447050 00000 n
-0000447115 00000 n
-0000447179 00000 n
-0000447244 00000 n
-0000447309 00000 n
-0000447374 00000 n
-0000447439 00000 n
-0000447502 00000 n
-0000447567 00000 n
-0000447632 00000 n
-0000447697 00000 n
-0000447762 00000 n
-0000447827 00000 n
-0000447892 00000 n
-0000447957 00000 n
-0000448022 00000 n
-0000448087 00000 n
-0000448152 00000 n
-0000448217 00000 n
-0000448282 00000 n
-0000448347 00000 n
-0000448412 00000 n
-0000448477 00000 n
-0000448542 00000 n
-0000448607 00000 n
-0000448672 00000 n
-0000448737 00000 n
-0000448802 00000 n
-0000448867 00000 n
-0000448932 00000 n
-0000448997 00000 n
-0000449062 00000 n
-0000449126 00000 n
-0000449191 00000 n
-0000449256 00000 n
-0000449320 00000 n
-0000449385 00000 n
-0000449450 00000 n
-0000449514 00000 n
-0000877534 00000 n
-0000455380 00000 n
-0000451690 00000 n
-0000449781 00000 n
-0000451815 00000 n
-0000451879 00000 n
-0000451944 00000 n
-0000452008 00000 n
-0000452073 00000 n
-0000452138 00000 n
-0000452203 00000 n
-0000452268 00000 n
-0000452332 00000 n
-0000452396 00000 n
-0000452461 00000 n
-0000452526 00000 n
-0000452591 00000 n
-0000452656 00000 n
-0000452721 00000 n
-0000452786 00000 n
-0000452851 00000 n
-0000452916 00000 n
-0000452981 00000 n
-0000453046 00000 n
-0000453111 00000 n
-0000453176 00000 n
-0000453241 00000 n
-0000453306 00000 n
-0000453370 00000 n
-0000453435 00000 n
-0000453500 00000 n
-0000453565 00000 n
-0000453630 00000 n
-0000453695 00000 n
-0000453760 00000 n
-0000453825 00000 n
-0000453890 00000 n
-0000453954 00000 n
-0000454019 00000 n
-0000454084 00000 n
-0000454149 00000 n
-0000454214 00000 n
-0000454278 00000 n
-0000454343 00000 n
-0000454408 00000 n
-0000454473 00000 n
-0000454538 00000 n
-0000454603 00000 n
-0000454668 00000 n
-0000454733 00000 n
-0000454798 00000 n
-0000454863 00000 n
-0000454928 00000 n
-0000454993 00000 n
-0000455058 00000 n
-0000455122 00000 n
-0000455187 00000 n
-0000455252 00000 n
-0000455316 00000 n
-0000464284 00000 n
-0000461146 00000 n
-0000457325 00000 n
-0000455583 00000 n
-0000457450 00000 n
-0000457514 00000 n
-0000457579 00000 n
-0000457643 00000 n
-0000457708 00000 n
-0000457773 00000 n
-0000457838 00000 n
-0000457903 00000 n
-0000457968 00000 n
-0000458033 00000 n
-0000458098 00000 n
-0000458163 00000 n
-0000458227 00000 n
-0000458292 00000 n
-0000458357 00000 n
-0000458422 00000 n
-0000458487 00000 n
-0000458552 00000 n
-0000458617 00000 n
-0000458682 00000 n
-0000458747 00000 n
-0000458811 00000 n
-0000458876 00000 n
-0000458941 00000 n
-0000459006 00000 n
-0000459071 00000 n
-0000459135 00000 n
-0000459200 00000 n
-0000459264 00000 n
-0000459329 00000 n
-0000459394 00000 n
-0000459459 00000 n
-0000459524 00000 n
-0000459589 00000 n
-0000459654 00000 n
-0000459719 00000 n
-0000459784 00000 n
-0000459849 00000 n
-0000459913 00000 n
-0000459978 00000 n
-0000460043 00000 n
-0000460108 00000 n
-0000460173 00000 n
-0000460238 00000 n
-0000460303 00000 n
-0000460368 00000 n
-0000460433 00000 n
-0000460497 00000 n
-0000460562 00000 n
-0000460627 00000 n
-0000460692 00000 n
-0000460757 00000 n
-0000460822 00000 n
-0000460887 00000 n
-0000460952 00000 n
-0000461017 00000 n
-0000461081 00000 n
-0000467682 00000 n
-0000464111 00000 n
-0000461310 00000 n
-0000464442 00000 n
-0000464506 00000 n
-0000464571 00000 n
-0000464636 00000 n
-0000464701 00000 n
-0000464766 00000 n
-0000464830 00000 n
-0000464895 00000 n
-0000464960 00000 n
-0000465025 00000 n
-0000465090 00000 n
-0000465218 00000 n
-0000465283 00000 n
-0000465348 00000 n
-0000465413 00000 n
-0000465478 00000 n
-0000465543 00000 n
-0000465608 00000 n
-0000465673 00000 n
-0000465738 00000 n
-0000465803 00000 n
-0000465866 00000 n
-0000465931 00000 n
-0000465996 00000 n
-0000466061 00000 n
-0000466126 00000 n
-0000466191 00000 n
-0000466256 00000 n
-0000466321 00000 n
-0000466386 00000 n
-0000466450 00000 n
-0000466515 00000 n
-0000466580 00000 n
-0000466645 00000 n
-0000466710 00000 n
-0000466775 00000 n
-0000466840 00000 n
-0000466905 00000 n
-0000466970 00000 n
-0000467034 00000 n
-0000467099 00000 n
-0000467164 00000 n
-0000467229 00000 n
-0000467294 00000 n
-0000467359 00000 n
-0000467424 00000 n
-0000467489 00000 n
-0000467554 00000 n
-0000467618 00000 n
-0000464253 00000 n
-0000472259 00000 n
-0000469937 00000 n
-0000467937 00000 n
-0000470062 00000 n
-0000470126 00000 n
-0000470191 00000 n
-0000470256 00000 n
-0000470319 00000 n
-0000470384 00000 n
-0000470449 00000 n
-0000470514 00000 n
-0000470579 00000 n
-0000470643 00000 n
-0000470708 00000 n
-0000470773 00000 n
-0000470838 00000 n
-0000470903 00000 n
-0000470968 00000 n
-0000471033 00000 n
-0000471097 00000 n
-0000471162 00000 n
-0000471226 00000 n
-0000471290 00000 n
-0000471354 00000 n
-0000471417 00000 n
-0000471482 00000 n
-0000471546 00000 n
-0000471611 00000 n
-0000471676 00000 n
-0000471739 00000 n
-0000471804 00000 n
-0000471869 00000 n
-0000471934 00000 n
-0000471999 00000 n
-0000472064 00000 n
-0000472129 00000 n
-0000472194 00000 n
-0000474959 00000 n
-0000478357 00000 n
-0000474786 00000 n
-0000472475 00000 n
-0000475117 00000 n
-0000475181 00000 n
-0000475245 00000 n
-0000475310 00000 n
-0000475375 00000 n
-0000475440 00000 n
-0000475505 00000 n
-0000475570 00000 n
-0000475635 00000 n
-0000475700 00000 n
-0000475765 00000 n
-0000475829 00000 n
-0000475894 00000 n
-0000475959 00000 n
-0000476024 00000 n
-0000476089 00000 n
-0000476154 00000 n
-0000476219 00000 n
-0000476284 00000 n
-0000476349 00000 n
-0000476413 00000 n
-0000476478 00000 n
-0000476543 00000 n
-0000476608 00000 n
-0000476673 00000 n
-0000476738 00000 n
-0000476803 00000 n
-0000476868 00000 n
-0000476933 00000 n
-0000476998 00000 n
-0000477063 00000 n
-0000477128 00000 n
-0000477193 00000 n
-0000477258 00000 n
-0000477322 00000 n
-0000477387 00000 n
-0000477514 00000 n
-0000477579 00000 n
-0000477644 00000 n
-0000477708 00000 n
-0000477773 00000 n
-0000477838 00000 n
-0000477903 00000 n
-0000477968 00000 n
-0000478033 00000 n
-0000478098 00000 n
-0000478163 00000 n
-0000478228 00000 n
-0000478293 00000 n
-0000474928 00000 n
-0000484494 00000 n
-0000481191 00000 n
-0000478586 00000 n
-0000481316 00000 n
-0000481380 00000 n
-0000481445 00000 n
-0000481509 00000 n
-0000481574 00000 n
-0000481639 00000 n
-0000481704 00000 n
-0000481769 00000 n
-0000481834 00000 n
-0000481899 00000 n
-0000481964 00000 n
-0000482028 00000 n
-0000482093 00000 n
-0000482158 00000 n
-0000482223 00000 n
-0000482288 00000 n
-0000482353 00000 n
-0000482418 00000 n
-0000482483 00000 n
-0000482548 00000 n
-0000482612 00000 n
-0000482677 00000 n
-0000482742 00000 n
-0000482807 00000 n
-0000482872 00000 n
-0000482937 00000 n
-0000483002 00000 n
-0000483067 00000 n
-0000483132 00000 n
-0000483196 00000 n
-0000483261 00000 n
-0000483326 00000 n
-0000483391 00000 n
-0000483456 00000 n
-0000483521 00000 n
-0000483586 00000 n
-0000483651 00000 n
-0000483716 00000 n
-0000483781 00000 n
-0000483846 00000 n
-0000483911 00000 n
-0000483975 00000 n
-0000484040 00000 n
-0000484105 00000 n
-0000484170 00000 n
-0000484235 00000 n
-0000484300 00000 n
-0000484365 00000 n
-0000484429 00000 n
-0000490294 00000 n
+0000300824 00000 n
+0000300889 00000 n
+0000300954 00000 n
+0000301019 00000 n
+0000301084 00000 n
+0000301149 00000 n
+0000301214 00000 n
+0000307678 00000 n
+0000303858 00000 n
+0000301455 00000 n
+0000303983 00000 n
+0000304047 00000 n
+0000304112 00000 n
+0000304176 00000 n
+0000304241 00000 n
+0000304306 00000 n
+0000304371 00000 n
+0000304436 00000 n
+0000304501 00000 n
+0000304566 00000 n
+0000304631 00000 n
+0000304696 00000 n
+0000304760 00000 n
+0000304825 00000 n
+0000304890 00000 n
+0000304955 00000 n
+0000305020 00000 n
+0000305085 00000 n
+0000305150 00000 n
+0000305215 00000 n
+0000305280 00000 n
+0000305344 00000 n
+0000305409 00000 n
+0000305474 00000 n
+0000305539 00000 n
+0000305604 00000 n
+0000305669 00000 n
+0000305734 00000 n
+0000305799 00000 n
+0000305864 00000 n
+0000305928 00000 n
+0000305993 00000 n
+0000306058 00000 n
+0000306123 00000 n
+0000306188 00000 n
+0000306253 00000 n
+0000306318 00000 n
+0000306383 00000 n
+0000306448 00000 n
+0000306512 00000 n
+0000306577 00000 n
+0000306642 00000 n
+0000306707 00000 n
+0000306772 00000 n
+0000306837 00000 n
+0000306902 00000 n
+0000306967 00000 n
+0000307032 00000 n
+0000307096 00000 n
+0000307161 00000 n
+0000307226 00000 n
+0000307291 00000 n
+0000307356 00000 n
+0000307421 00000 n
+0000307486 00000 n
+0000307550 00000 n
+0000307614 00000 n
+0000313680 00000 n
+0000310512 00000 n
+0000307842 00000 n
+0000310637 00000 n
+0000310701 00000 n
+0000310766 00000 n
+0000310830 00000 n
+0000310895 00000 n
+0000310960 00000 n
+0000311025 00000 n
+0000311090 00000 n
+0000311155 00000 n
+0000311220 00000 n
+0000311285 00000 n
+0000311348 00000 n
+0000311413 00000 n
+0000311478 00000 n
+0000311543 00000 n
+0000311607 00000 n
+0000311672 00000 n
+0000311737 00000 n
+0000311802 00000 n
+0000311867 00000 n
+0000311932 00000 n
+0000311997 00000 n
+0000312062 00000 n
+0000312127 00000 n
+0000312192 00000 n
+0000312257 00000 n
+0000312385 00000 n
+0000312450 00000 n
+0000312514 00000 n
+0000312579 00000 n
+0000312644 00000 n
+0000312709 00000 n
+0000312774 00000 n
+0000312839 00000 n
+0000312904 00000 n
+0000312968 00000 n
+0000313033 00000 n
+0000313098 00000 n
+0000313163 00000 n
+0000313228 00000 n
+0000313293 00000 n
+0000313358 00000 n
+0000313423 00000 n
+0000313488 00000 n
+0000313553 00000 n
+0000313616 00000 n
+0000319925 00000 n
+0000315719 00000 n
+0000313857 00000 n
+0000315844 00000 n
+0000315908 00000 n
+0000315973 00000 n
+0000316037 00000 n
+0000316102 00000 n
+0000316167 00000 n
+0000316232 00000 n
+0000316297 00000 n
+0000316362 00000 n
+0000316427 00000 n
+0000316492 00000 n
+0000316557 00000 n
+0000316621 00000 n
+0000316686 00000 n
+0000316751 00000 n
+0000316816 00000 n
+0000316881 00000 n
+0000316946 00000 n
+0000317011 00000 n
+0000317076 00000 n
+0000317141 00000 n
+0000317205 00000 n
+0000317270 00000 n
+0000317335 00000 n
+0000317400 00000 n
+0000317465 00000 n
+0000317530 00000 n
+0000317595 00000 n
+0000317660 00000 n
+0000317725 00000 n
+0000317789 00000 n
+0000317854 00000 n
+0000317919 00000 n
+0000317984 00000 n
+0000318049 00000 n
+0000318114 00000 n
+0000318179 00000 n
+0000318244 00000 n
+0000318309 00000 n
+0000318373 00000 n
+0000318438 00000 n
+0000318503 00000 n
+0000318568 00000 n
+0000318633 00000 n
+0000318697 00000 n
+0000318762 00000 n
+0000318827 00000 n
+0000318892 00000 n
+0000318957 00000 n
+0000319022 00000 n
+0000319087 00000 n
+0000319152 00000 n
+0000319217 00000 n
+0000319278 00000 n
+0000319343 00000 n
+0000319408 00000 n
+0000319473 00000 n
+0000319538 00000 n
+0000319603 00000 n
+0000319668 00000 n
+0000319733 00000 n
+0000319798 00000 n
+0000319861 00000 n
+0000325628 00000 n
+0000322326 00000 n
+0000320102 00000 n
+0000322451 00000 n
+0000322515 00000 n
+0000322580 00000 n
+0000322644 00000 n
+0000322709 00000 n
+0000322774 00000 n
+0000322839 00000 n
+0000322904 00000 n
+0000322968 00000 n
+0000323033 00000 n
+0000323098 00000 n
+0000323163 00000 n
+0000323228 00000 n
+0000323356 00000 n
+0000323421 00000 n
+0000323486 00000 n
+0000323551 00000 n
+0000323616 00000 n
+0000323681 00000 n
+0000323746 00000 n
+0000323811 00000 n
+0000323876 00000 n
+0000323941 00000 n
+0000324006 00000 n
+0000324071 00000 n
+0000324136 00000 n
+0000324200 00000 n
+0000324265 00000 n
+0000324330 00000 n
+0000324395 00000 n
+0000324460 00000 n
+0000324525 00000 n
+0000324590 00000 n
+0000324655 00000 n
+0000324720 00000 n
+0000324784 00000 n
+0000324849 00000 n
+0000324914 00000 n
+0000324979 00000 n
+0000325044 00000 n
+0000325109 00000 n
+0000325174 00000 n
+0000325239 00000 n
+0000325304 00000 n
+0000325368 00000 n
+0000325433 00000 n
+0000325498 00000 n
+0000325563 00000 n
+0000331467 00000 n
+0000328946 00000 n
+0000325805 00000 n
+0000329071 00000 n
+0000329135 00000 n
+0000329200 00000 n
+0000329265 00000 n
+0000329330 00000 n
+0000329395 00000 n
+0000329522 00000 n
+0000329587 00000 n
+0000329652 00000 n
+0000329717 00000 n
+0000329782 00000 n
+0000329846 00000 n
+0000329911 00000 n
+0000329976 00000 n
+0000330041 00000 n
+0000330106 00000 n
+0000330171 00000 n
+0000330236 00000 n
+0000330301 00000 n
+0000330366 00000 n
+0000330430 00000 n
+0000330495 00000 n
+0000330560 00000 n
+0000330624 00000 n
+0000330689 00000 n
+0000330754 00000 n
+0000330819 00000 n
+0000330884 00000 n
+0000330949 00000 n
+0000331014 00000 n
+0000331079 00000 n
+0000331143 00000 n
+0000331208 00000 n
+0000331273 00000 n
+0000331338 00000 n
+0000331403 00000 n
+0000884057 00000 n
+0000336990 00000 n
+0000333691 00000 n
+0000331657 00000 n
+0000333816 00000 n
+0000333880 00000 n
+0000333945 00000 n
+0000334009 00000 n
+0000334074 00000 n
+0000334139 00000 n
+0000334203 00000 n
+0000334268 00000 n
+0000334332 00000 n
+0000334397 00000 n
+0000334462 00000 n
+0000334526 00000 n
+0000334591 00000 n
+0000334656 00000 n
+0000334721 00000 n
+0000334786 00000 n
+0000334851 00000 n
+0000334916 00000 n
+0000334981 00000 n
+0000335046 00000 n
+0000335111 00000 n
+0000335176 00000 n
+0000335241 00000 n
+0000335306 00000 n
+0000335371 00000 n
+0000335436 00000 n
+0000335501 00000 n
+0000335566 00000 n
+0000335630 00000 n
+0000335695 00000 n
+0000335760 00000 n
+0000335825 00000 n
+0000335890 00000 n
+0000335955 00000 n
+0000336020 00000 n
+0000336085 00000 n
+0000336150 00000 n
+0000336215 00000 n
+0000336343 00000 n
+0000336408 00000 n
+0000336473 00000 n
+0000336538 00000 n
+0000336602 00000 n
+0000336667 00000 n
+0000336732 00000 n
+0000336797 00000 n
+0000336862 00000 n
+0000336926 00000 n
+0000343232 00000 n
+0000339218 00000 n
+0000337154 00000 n
+0000339343 00000 n
+0000339470 00000 n
+0000339534 00000 n
+0000339599 00000 n
+0000339664 00000 n
+0000339729 00000 n
+0000339794 00000 n
+0000339859 00000 n
+0000339924 00000 n
+0000339989 00000 n
+0000340054 00000 n
+0000340119 00000 n
+0000340184 00000 n
+0000340247 00000 n
+0000340312 00000 n
+0000340377 00000 n
+0000340442 00000 n
+0000340507 00000 n
+0000340572 00000 n
+0000340637 00000 n
+0000340702 00000 n
+0000340767 00000 n
+0000340832 00000 n
+0000340897 00000 n
+0000340961 00000 n
+0000341026 00000 n
+0000341091 00000 n
+0000341156 00000 n
+0000341221 00000 n
+0000341286 00000 n
+0000341351 00000 n
+0000341416 00000 n
+0000341481 00000 n
+0000341546 00000 n
+0000341611 00000 n
+0000341676 00000 n
+0000341740 00000 n
+0000341805 00000 n
+0000341870 00000 n
+0000341935 00000 n
+0000342000 00000 n
+0000342065 00000 n
+0000342130 00000 n
+0000342195 00000 n
+0000342260 00000 n
+0000342325 00000 n
+0000342389 00000 n
+0000342454 00000 n
+0000342519 00000 n
+0000342584 00000 n
+0000342649 00000 n
+0000342714 00000 n
+0000342779 00000 n
+0000342844 00000 n
+0000342909 00000 n
+0000342974 00000 n
+0000343038 00000 n
+0000343103 00000 n
+0000343168 00000 n
+0000349630 00000 n
+0000345619 00000 n
+0000343396 00000 n
+0000345744 00000 n
+0000345808 00000 n
+0000345872 00000 n
+0000345937 00000 n
+0000346002 00000 n
+0000346067 00000 n
+0000346132 00000 n
+0000346197 00000 n
+0000346262 00000 n
+0000346327 00000 n
+0000346390 00000 n
+0000346455 00000 n
+0000346520 00000 n
+0000346585 00000 n
+0000346650 00000 n
+0000346715 00000 n
+0000346780 00000 n
+0000346845 00000 n
+0000346910 00000 n
+0000346975 00000 n
+0000347039 00000 n
+0000347104 00000 n
+0000347169 00000 n
+0000347234 00000 n
+0000347299 00000 n
+0000347364 00000 n
+0000347429 00000 n
+0000347494 00000 n
+0000347559 00000 n
+0000347624 00000 n
+0000347689 00000 n
+0000347754 00000 n
+0000347818 00000 n
+0000347883 00000 n
+0000347948 00000 n
+0000348013 00000 n
+0000348078 00000 n
+0000348143 00000 n
+0000348208 00000 n
+0000348273 00000 n
+0000348338 00000 n
+0000348402 00000 n
+0000348467 00000 n
+0000348532 00000 n
+0000348597 00000 n
+0000348662 00000 n
+0000348727 00000 n
+0000348792 00000 n
+0000348857 00000 n
+0000348922 00000 n
+0000348983 00000 n
+0000349048 00000 n
+0000349113 00000 n
+0000349178 00000 n
+0000349243 00000 n
+0000349308 00000 n
+0000349373 00000 n
+0000349438 00000 n
+0000349503 00000 n
+0000349566 00000 n
+0000355307 00000 n
+0000351749 00000 n
+0000349794 00000 n
+0000351874 00000 n
+0000351938 00000 n
+0000352003 00000 n
+0000352067 00000 n
+0000352132 00000 n
+0000352197 00000 n
+0000352262 00000 n
+0000352327 00000 n
+0000352392 00000 n
+0000352457 00000 n
+0000352522 00000 n
+0000352587 00000 n
+0000352651 00000 n
+0000352716 00000 n
+0000352781 00000 n
+0000352846 00000 n
+0000352911 00000 n
+0000352976 00000 n
+0000353040 00000 n
+0000353105 00000 n
+0000353170 00000 n
+0000353235 00000 n
+0000353300 00000 n
+0000353365 00000 n
+0000353429 00000 n
+0000353494 00000 n
+0000353559 00000 n
+0000353624 00000 n
+0000353689 00000 n
+0000353754 00000 n
+0000353819 00000 n
+0000353884 00000 n
+0000353949 00000 n
+0000354014 00000 n
+0000354142 00000 n
+0000354207 00000 n
+0000354272 00000 n
+0000354337 00000 n
+0000354402 00000 n
+0000354467 00000 n
+0000354532 00000 n
+0000354597 00000 n
+0000354661 00000 n
+0000354726 00000 n
+0000354791 00000 n
+0000354856 00000 n
+0000354921 00000 n
+0000354986 00000 n
+0000355114 00000 n
+0000355179 00000 n
+0000355243 00000 n
+0000361093 00000 n
+0000357991 00000 n
+0000355471 00000 n
+0000358116 00000 n
+0000358180 00000 n
+0000358245 00000 n
+0000358309 00000 n
+0000358374 00000 n
+0000358439 00000 n
+0000358504 00000 n
+0000358569 00000 n
+0000358634 00000 n
+0000358699 00000 n
+0000358764 00000 n
+0000358829 00000 n
+0000358894 00000 n
+0000358958 00000 n
+0000359023 00000 n
+0000359088 00000 n
+0000359153 00000 n
+0000359218 00000 n
+0000359283 00000 n
+0000359348 00000 n
+0000359413 00000 n
+0000359477 00000 n
+0000359542 00000 n
+0000359607 00000 n
+0000359672 00000 n
+0000359737 00000 n
+0000359802 00000 n
+0000359867 00000 n
+0000359932 00000 n
+0000359997 00000 n
+0000360060 00000 n
+0000360125 00000 n
+0000360190 00000 n
+0000360255 00000 n
+0000360320 00000 n
+0000881699 00000 n
+0000360448 00000 n
+0000360513 00000 n
+0000360577 00000 n
+0000360642 00000 n
+0000360707 00000 n
+0000360772 00000 n
+0000360900 00000 n
+0000360964 00000 n
+0000361029 00000 n
+0000366913 00000 n
+0000364779 00000 n
+0000361337 00000 n
+0000364904 00000 n
+0000364968 00000 n
+0000365033 00000 n
+0000365098 00000 n
+0000365163 00000 n
+0000365228 00000 n
+0000365293 00000 n
+0000365358 00000 n
+0000365423 00000 n
+0000365488 00000 n
+0000365553 00000 n
+0000365618 00000 n
+0000365683 00000 n
+0000365748 00000 n
+0000365813 00000 n
+0000365878 00000 n
+0000365941 00000 n
+0000366006 00000 n
+0000366071 00000 n
+0000366136 00000 n
+0000366201 00000 n
+0000366266 00000 n
+0000366331 00000 n
+0000366396 00000 n
+0000366461 00000 n
+0000366526 00000 n
+0000366591 00000 n
+0000366655 00000 n
+0000366720 00000 n
+0000366785 00000 n
+0000366849 00000 n
+0000372287 00000 n
+0000369894 00000 n
+0000367129 00000 n
+0000370019 00000 n
+0000370083 00000 n
+0000370148 00000 n
+0000370213 00000 n
+0000370278 00000 n
+0000370342 00000 n
+0000370407 00000 n
+0000370472 00000 n
+0000370537 00000 n
+0000370602 00000 n
+0000370667 00000 n
+0000370732 00000 n
+0000370797 00000 n
+0000370862 00000 n
+0000370927 00000 n
+0000370992 00000 n
+0000371056 00000 n
+0000371120 00000 n
+0000371184 00000 n
+0000371249 00000 n
+0000371314 00000 n
+0000371379 00000 n
+0000371444 00000 n
+0000371509 00000 n
+0000371574 00000 n
+0000371639 00000 n
+0000371704 00000 n
+0000371769 00000 n
+0000371834 00000 n
+0000371899 00000 n
+0000371963 00000 n
+0000372028 00000 n
+0000372093 00000 n
+0000372158 00000 n
+0000372223 00000 n
+0000377845 00000 n
+0000375064 00000 n
+0000372503 00000 n
+0000375189 00000 n
+0000375253 00000 n
+0000375318 00000 n
+0000375383 00000 n
+0000375448 00000 n
+0000375513 00000 n
+0000375577 00000 n
+0000375642 00000 n
+0000375707 00000 n
+0000375772 00000 n
+0000375837 00000 n
+0000375902 00000 n
+0000375967 00000 n
+0000376032 00000 n
+0000376097 00000 n
+0000376162 00000 n
+0000376226 00000 n
+0000376291 00000 n
+0000376356 00000 n
+0000376421 00000 n
+0000376485 00000 n
+0000376550 00000 n
+0000376615 00000 n
+0000376680 00000 n
+0000376745 00000 n
+0000376810 00000 n
+0000376875 00000 n
+0000376940 00000 n
+0000377005 00000 n
+0000377070 00000 n
+0000377134 00000 n
+0000377198 00000 n
+0000377263 00000 n
+0000377328 00000 n
+0000377393 00000 n
+0000377458 00000 n
+0000377523 00000 n
+0000377587 00000 n
+0000377652 00000 n
+0000377717 00000 n
+0000377781 00000 n
+0000383339 00000 n
+0000380038 00000 n
+0000378048 00000 n
+0000380163 00000 n
+0000380227 00000 n
+0000380292 00000 n
+0000380356 00000 n
+0000380421 00000 n
+0000380486 00000 n
+0000380551 00000 n
+0000380616 00000 n
+0000380681 00000 n
+0000380746 00000 n
+0000380811 00000 n
+0000380876 00000 n
+0000380941 00000 n
+0000381006 00000 n
+0000381070 00000 n
+0000381135 00000 n
+0000381200 00000 n
+0000381265 00000 n
+0000381330 00000 n
+0000381394 00000 n
+0000381459 00000 n
+0000381524 00000 n
+0000381589 00000 n
+0000381654 00000 n
+0000381719 00000 n
+0000381784 00000 n
+0000381849 00000 n
+0000381913 00000 n
+0000381978 00000 n
+0000382043 00000 n
+0000382108 00000 n
+0000382173 00000 n
+0000382238 00000 n
+0000382303 00000 n
+0000382368 00000 n
+0000382433 00000 n
+0000382498 00000 n
+0000382563 00000 n
+0000382628 00000 n
+0000382693 00000 n
+0000382756 00000 n
+0000382821 00000 n
+0000382886 00000 n
+0000382951 00000 n
+0000383015 00000 n
+0000383080 00000 n
+0000383145 00000 n
+0000383210 00000 n
+0000383275 00000 n
+0000389158 00000 n
+0000385401 00000 n
+0000383542 00000 n
+0000385526 00000 n
+0000385590 00000 n
+0000385655 00000 n
+0000385720 00000 n
+0000385785 00000 n
+0000385850 00000 n
+0000385914 00000 n
+0000385979 00000 n
+0000386044 00000 n
+0000386109 00000 n
+0000386174 00000 n
+0000386239 00000 n
+0000386304 00000 n
+0000386369 00000 n
+0000386434 00000 n
+0000386499 00000 n
+0000386564 00000 n
+0000386629 00000 n
+0000386694 00000 n
+0000386759 00000 n
+0000386824 00000 n
+0000386889 00000 n
+0000386954 00000 n
+0000387019 00000 n
+0000387084 00000 n
+0000387149 00000 n
+0000387214 00000 n
+0000387279 00000 n
+0000387343 00000 n
+0000387408 00000 n
+0000387473 00000 n
+0000387538 00000 n
+0000387603 00000 n
+0000387668 00000 n
+0000387733 00000 n
+0000387798 00000 n
+0000387863 00000 n
+0000387928 00000 n
+0000387993 00000 n
+0000388058 00000 n
+0000388123 00000 n
+0000388188 00000 n
+0000388253 00000 n
+0000388316 00000 n
+0000388381 00000 n
+0000388446 00000 n
+0000388511 00000 n
+0000388576 00000 n
+0000388641 00000 n
+0000388706 00000 n
+0000388771 00000 n
+0000388836 00000 n
+0000388900 00000 n
+0000388965 00000 n
+0000389030 00000 n
+0000389094 00000 n
+0000884221 00000 n
+0000392778 00000 n
+0000395269 00000 n
+0000392605 00000 n
+0000389335 00000 n
+0000392936 00000 n
+0000393000 00000 n
+0000393065 00000 n
+0000393130 00000 n
+0000393195 00000 n
+0000393260 00000 n
+0000393324 00000 n
+0000393389 00000 n
+0000393454 00000 n
+0000393519 00000 n
+0000393584 00000 n
+0000393649 00000 n
+0000393713 00000 n
+0000393778 00000 n
+0000393843 00000 n
+0000393908 00000 n
+0000393973 00000 n
+0000394038 00000 n
+0000394103 00000 n
+0000394167 00000 n
+0000394232 00000 n
+0000394297 00000 n
+0000394362 00000 n
+0000394427 00000 n
+0000394492 00000 n
+0000394557 00000 n
+0000394622 00000 n
+0000394687 00000 n
+0000394751 00000 n
+0000394816 00000 n
+0000394881 00000 n
+0000394946 00000 n
+0000395011 00000 n
+0000395075 00000 n
+0000395140 00000 n
+0000395205 00000 n
+0000392747 00000 n
+0000402407 00000 n
+0000398523 00000 n
+0000395537 00000 n
+0000398648 00000 n
+0000398775 00000 n
+0000398840 00000 n
+0000398905 00000 n
+0000398970 00000 n
+0000399035 00000 n
+0000399100 00000 n
+0000399165 00000 n
+0000399230 00000 n
+0000399295 00000 n
+0000399360 00000 n
+0000399425 00000 n
+0000399490 00000 n
+0000399555 00000 n
+0000399620 00000 n
+0000399685 00000 n
+0000399749 00000 n
+0000399814 00000 n
+0000399879 00000 n
+0000399944 00000 n
+0000400009 00000 n
+0000400074 00000 n
+0000400139 00000 n
+0000400204 00000 n
+0000400269 00000 n
+0000400333 00000 n
+0000400398 00000 n
+0000400463 00000 n
+0000400528 00000 n
+0000400593 00000 n
+0000400658 00000 n
+0000400723 00000 n
+0000400788 00000 n
+0000400853 00000 n
+0000400918 00000 n
+0000400982 00000 n
+0000401047 00000 n
+0000401112 00000 n
+0000401177 00000 n
+0000401242 00000 n
+0000401307 00000 n
+0000401372 00000 n
+0000401437 00000 n
+0000401502 00000 n
+0000401565 00000 n
+0000401630 00000 n
+0000401695 00000 n
+0000401760 00000 n
+0000401825 00000 n
+0000401890 00000 n
+0000401955 00000 n
+0000402020 00000 n
+0000402085 00000 n
+0000402149 00000 n
+0000402214 00000 n
+0000402279 00000 n
+0000402343 00000 n
+0000410606 00000 n
+0000407002 00000 n
+0000405320 00000 n
+0000402597 00000 n
+0000405445 00000 n
+0000405509 00000 n
+0000405574 00000 n
+0000405638 00000 n
+0000405703 00000 n
+0000405768 00000 n
+0000405833 00000 n
+0000405898 00000 n
+0000405963 00000 n
+0000406028 00000 n
+0000406093 00000 n
+0000406158 00000 n
+0000406223 00000 n
+0000406288 00000 n
+0000406353 00000 n
+0000406418 00000 n
+0000406483 00000 n
+0000406547 00000 n
+0000406612 00000 n
+0000406677 00000 n
+0000406742 00000 n
+0000406807 00000 n
+0000406872 00000 n
+0000406937 00000 n
+0000410763 00000 n
+0000413383 00000 n
+0000410424 00000 n
+0000407218 00000 n
+0000410920 00000 n
+0000410984 00000 n
+0000411048 00000 n
+0000411113 00000 n
+0000411178 00000 n
+0000411243 00000 n
+0000411308 00000 n
+0000411373 00000 n
+0000411438 00000 n
+0000411503 00000 n
+0000411566 00000 n
+0000411631 00000 n
+0000411696 00000 n
+0000411761 00000 n
+0000411826 00000 n
+0000411891 00000 n
+0000411956 00000 n
+0000412021 00000 n
+0000412086 00000 n
+0000412151 00000 n
+0000412215 00000 n
+0000412280 00000 n
+0000412345 00000 n
+0000412410 00000 n
+0000412475 00000 n
+0000412540 00000 n
+0000412605 00000 n
+0000412670 00000 n
+0000412735 00000 n
+0000412800 00000 n
+0000412865 00000 n
+0000412930 00000 n
+0000412994 00000 n
+0000413059 00000 n
+0000413124 00000 n
+0000413189 00000 n
+0000413254 00000 n
+0000413319 00000 n
+0000410566 00000 n
+0000418865 00000 n
+0000415437 00000 n
+0000413638 00000 n
+0000415562 00000 n
+0000415626 00000 n
+0000415691 00000 n
+0000415755 00000 n
+0000415820 00000 n
+0000415885 00000 n
+0000415950 00000 n
+0000416015 00000 n
+0000416080 00000 n
+0000416145 00000 n
+0000416210 00000 n
+0000416275 00000 n
+0000416339 00000 n
+0000416404 00000 n
+0000416469 00000 n
+0000416534 00000 n
+0000416599 00000 n
+0000416664 00000 n
+0000416729 00000 n
+0000416794 00000 n
+0000416859 00000 n
+0000416923 00000 n
+0000416988 00000 n
+0000417053 00000 n
+0000417118 00000 n
+0000417183 00000 n
+0000417248 00000 n
+0000417312 00000 n
+0000417377 00000 n
+0000417442 00000 n
+0000417507 00000 n
+0000417572 00000 n
+0000417636 00000 n
+0000417701 00000 n
+0000417766 00000 n
+0000417831 00000 n
+0000417896 00000 n
+0000417961 00000 n
+0000418025 00000 n
+0000418090 00000 n
+0000418154 00000 n
+0000418219 00000 n
+0000418283 00000 n
+0000418348 00000 n
+0000418413 00000 n
+0000418477 00000 n
+0000418542 00000 n
+0000418607 00000 n
+0000418672 00000 n
+0000418737 00000 n
+0000418801 00000 n
+0000424678 00000 n
+0000420923 00000 n
+0000419055 00000 n
+0000421048 00000 n
+0000421112 00000 n
+0000421177 00000 n
+0000421241 00000 n
+0000421306 00000 n
+0000421371 00000 n
+0000421436 00000 n
+0000421501 00000 n
+0000421566 00000 n
+0000421631 00000 n
+0000421696 00000 n
+0000421761 00000 n
+0000421825 00000 n
+0000421890 00000 n
+0000421955 00000 n
+0000422020 00000 n
+0000422085 00000 n
+0000422150 00000 n
+0000422215 00000 n
+0000422280 00000 n
+0000422345 00000 n
+0000422409 00000 n
+0000422474 00000 n
+0000422539 00000 n
+0000422604 00000 n
+0000422669 00000 n
+0000422734 00000 n
+0000422799 00000 n
+0000422864 00000 n
+0000422929 00000 n
+0000422993 00000 n
+0000423058 00000 n
+0000423123 00000 n
+0000423188 00000 n
+0000423253 00000 n
+0000423318 00000 n
+0000423383 00000 n
+0000423448 00000 n
+0000423513 00000 n
+0000423577 00000 n
+0000423642 00000 n
+0000423707 00000 n
+0000423772 00000 n
+0000423837 00000 n
+0000423902 00000 n
+0000423967 00000 n
+0000424032 00000 n
+0000424097 00000 n
+0000424161 00000 n
+0000424225 00000 n
+0000424290 00000 n
+0000424355 00000 n
+0000424420 00000 n
+0000424485 00000 n
+0000424550 00000 n
+0000424614 00000 n
+0000431011 00000 n
+0000428229 00000 n
+0000424868 00000 n
+0000428354 00000 n
+0000428418 00000 n
+0000428483 00000 n
+0000428547 00000 n
+0000428612 00000 n
+0000428677 00000 n
+0000428741 00000 n
+0000428806 00000 n
+0000428871 00000 n
+0000428936 00000 n
+0000429001 00000 n
+0000429066 00000 n
+0000429131 00000 n
+0000429196 00000 n
+0000429260 00000 n
+0000429325 00000 n
+0000429390 00000 n
+0000429455 00000 n
+0000429520 00000 n
+0000429585 00000 n
+0000429650 00000 n
+0000429715 00000 n
+0000429780 00000 n
+0000429845 00000 n
+0000429910 00000 n
+0000429975 00000 n
+0000430040 00000 n
+0000430105 00000 n
+0000430170 00000 n
+0000430235 00000 n
+0000430300 00000 n
+0000430364 00000 n
+0000430429 00000 n
+0000430494 00000 n
+0000430559 00000 n
+0000430624 00000 n
+0000430689 00000 n
+0000430753 00000 n
+0000430818 00000 n
+0000430883 00000 n
+0000430947 00000 n
+0000434029 00000 n
+0000437101 00000 n
+0000433856 00000 n
+0000431240 00000 n
+0000434187 00000 n
+0000434251 00000 n
+0000434316 00000 n
+0000434380 00000 n
+0000434445 00000 n
+0000434508 00000 n
+0000434573 00000 n
+0000434637 00000 n
+0000434702 00000 n
+0000434767 00000 n
+0000434832 00000 n
+0000434897 00000 n
+0000434962 00000 n
+0000435027 00000 n
+0000435092 00000 n
+0000435157 00000 n
+0000435222 00000 n
+0000435286 00000 n
+0000435351 00000 n
+0000435416 00000 n
+0000435481 00000 n
+0000435546 00000 n
+0000435611 00000 n
+0000435676 00000 n
+0000435741 00000 n
+0000435806 00000 n
+0000435870 00000 n
+0000435935 00000 n
+0000436000 00000 n
+0000436065 00000 n
+0000436130 00000 n
+0000436195 00000 n
+0000436260 00000 n
+0000436325 00000 n
+0000436390 00000 n
+0000436454 00000 n
+0000436519 00000 n
+0000436583 00000 n
+0000436648 00000 n
+0000436713 00000 n
+0000436777 00000 n
+0000436842 00000 n
+0000436907 00000 n
+0000436972 00000 n
+0000437037 00000 n
+0000433998 00000 n
+0000443034 00000 n
+0000439540 00000 n
+0000437369 00000 n
+0000439665 00000 n
+0000439729 00000 n
+0000439794 00000 n
+0000439858 00000 n
+0000439923 00000 n
+0000439988 00000 n
+0000440116 00000 n
+0000440180 00000 n
+0000440245 00000 n
+0000440310 00000 n
+0000440375 00000 n
+0000440440 00000 n
+0000440505 00000 n
+0000440570 00000 n
+0000440634 00000 n
+0000440699 00000 n
+0000440764 00000 n
+0000440829 00000 n
+0000440894 00000 n
+0000440959 00000 n
+0000441024 00000 n
+0000441089 00000 n
+0000441154 00000 n
+0000441217 00000 n
+0000441282 00000 n
+0000441347 00000 n
+0000441412 00000 n
+0000441477 00000 n
+0000441542 00000 n
+0000441607 00000 n
+0000441672 00000 n
+0000441736 00000 n
+0000441801 00000 n
+0000441866 00000 n
+0000441931 00000 n
+0000441996 00000 n
+0000442061 00000 n
+0000442126 00000 n
+0000442191 00000 n
+0000442256 00000 n
+0000442320 00000 n
+0000442385 00000 n
+0000442450 00000 n
+0000442515 00000 n
+0000442580 00000 n
+0000442645 00000 n
+0000442710 00000 n
+0000442775 00000 n
+0000442840 00000 n
+0000442904 00000 n
+0000442969 00000 n
+0000449156 00000 n
+0000445789 00000 n
+0000443211 00000 n
+0000445914 00000 n
+0000445978 00000 n
+0000446043 00000 n
+0000446108 00000 n
+0000446173 00000 n
+0000446238 00000 n
+0000446302 00000 n
+0000446367 00000 n
+0000446432 00000 n
+0000446497 00000 n
+0000446562 00000 n
+0000446627 00000 n
+0000446692 00000 n
+0000446757 00000 n
+0000446822 00000 n
+0000446887 00000 n
+0000446952 00000 n
+0000447016 00000 n
+0000447081 00000 n
+0000447146 00000 n
+0000447211 00000 n
+0000447276 00000 n
+0000447341 00000 n
+0000447406 00000 n
+0000447471 00000 n
+0000447536 00000 n
+0000447600 00000 n
+0000447665 00000 n
+0000447730 00000 n
+0000447795 00000 n
+0000447860 00000 n
+0000447925 00000 n
+0000447990 00000 n
+0000448055 00000 n
+0000448120 00000 n
+0000448185 00000 n
+0000448250 00000 n
+0000448315 00000 n
+0000448380 00000 n
+0000448445 00000 n
+0000448510 00000 n
+0000448574 00000 n
+0000448639 00000 n
+0000448704 00000 n
+0000448768 00000 n
+0000448833 00000 n
+0000448898 00000 n
+0000448963 00000 n
+0000449027 00000 n
+0000449092 00000 n
+0000884385 00000 n
+0000454968 00000 n
+0000452057 00000 n
+0000449346 00000 n
+0000452182 00000 n
+0000452246 00000 n
+0000452310 00000 n
+0000452375 00000 n
+0000452440 00000 n
+0000452505 00000 n
+0000452570 00000 n
+0000452635 00000 n
+0000452700 00000 n
+0000452764 00000 n
+0000452829 00000 n
+0000452894 00000 n
+0000452959 00000 n
+0000453024 00000 n
+0000453089 00000 n
+0000453154 00000 n
+0000453218 00000 n
+0000453283 00000 n
+0000453348 00000 n
+0000453413 00000 n
+0000453478 00000 n
+0000453543 00000 n
+0000453608 00000 n
+0000453673 00000 n
+0000453738 00000 n
+0000453803 00000 n
+0000453868 00000 n
+0000453932 00000 n
+0000453997 00000 n
+0000454062 00000 n
+0000454127 00000 n
+0000454192 00000 n
+0000454256 00000 n
+0000454321 00000 n
+0000454386 00000 n
+0000454451 00000 n
+0000454516 00000 n
+0000454581 00000 n
+0000454646 00000 n
+0000454710 00000 n
+0000454775 00000 n
+0000454840 00000 n
+0000454904 00000 n
+0000460687 00000 n
+0000457000 00000 n
+0000455171 00000 n
+0000457125 00000 n
+0000457189 00000 n
+0000457254 00000 n
+0000457318 00000 n
+0000457381 00000 n
+0000457446 00000 n
+0000457511 00000 n
+0000457576 00000 n
+0000457641 00000 n
+0000457706 00000 n
+0000457769 00000 n
+0000457834 00000 n
+0000457899 00000 n
+0000457964 00000 n
+0000458029 00000 n
+0000458093 00000 n
+0000458158 00000 n
+0000458223 00000 n
+0000458288 00000 n
+0000458353 00000 n
+0000458418 00000 n
+0000458483 00000 n
+0000458548 00000 n
+0000458613 00000 n
+0000458677 00000 n
+0000458742 00000 n
+0000458807 00000 n
+0000458872 00000 n
+0000458937 00000 n
+0000459002 00000 n
+0000459067 00000 n
+0000459132 00000 n
+0000459197 00000 n
+0000459261 00000 n
+0000459325 00000 n
+0000459390 00000 n
+0000459455 00000 n
+0000459520 00000 n
+0000459585 00000 n
+0000459650 00000 n
+0000459715 00000 n
+0000459780 00000 n
+0000459845 00000 n
+0000459910 00000 n
+0000459975 00000 n
+0000460040 00000 n
+0000460105 00000 n
+0000460170 00000 n
+0000460235 00000 n
+0000460300 00000 n
+0000460365 00000 n
+0000460429 00000 n
+0000460494 00000 n
+0000460559 00000 n
+0000460623 00000 n
+0000469171 00000 n
+0000466014 00000 n
+0000462518 00000 n
+0000460890 00000 n
+0000462643 00000 n
+0000462707 00000 n
+0000462772 00000 n
+0000462836 00000 n
+0000462901 00000 n
+0000462966 00000 n
+0000463031 00000 n
+0000463096 00000 n
+0000463161 00000 n
+0000463226 00000 n
+0000463291 00000 n
+0000463356 00000 n
+0000463420 00000 n
+0000463485 00000 n
+0000463550 00000 n
+0000463615 00000 n
+0000463680 00000 n
+0000463745 00000 n
+0000463810 00000 n
+0000463875 00000 n
+0000463940 00000 n
+0000464004 00000 n
+0000464068 00000 n
+0000464133 00000 n
+0000464197 00000 n
+0000464262 00000 n
+0000464327 00000 n
+0000464392 00000 n
+0000464457 00000 n
+0000464522 00000 n
+0000464587 00000 n
+0000464651 00000 n
+0000464716 00000 n
+0000464781 00000 n
+0000464846 00000 n
+0000464911 00000 n
+0000464976 00000 n
+0000465041 00000 n
+0000465106 00000 n
+0000465171 00000 n
+0000465235 00000 n
+0000465300 00000 n
+0000465365 00000 n
+0000465430 00000 n
+0000465495 00000 n
+0000465560 00000 n
+0000465625 00000 n
+0000465690 00000 n
+0000465755 00000 n
+0000465819 00000 n
+0000465884 00000 n
+0000465949 00000 n
+0000472569 00000 n
+0000468998 00000 n
+0000466178 00000 n
+0000469329 00000 n
+0000469393 00000 n
+0000469458 00000 n
+0000469523 00000 n
+0000469588 00000 n
+0000469653 00000 n
+0000469717 00000 n
+0000469782 00000 n
+0000469847 00000 n
+0000469912 00000 n
+0000469977 00000 n
+0000470105 00000 n
+0000470170 00000 n
+0000470235 00000 n
+0000470300 00000 n
+0000470365 00000 n
+0000470430 00000 n
+0000470495 00000 n
+0000470560 00000 n
+0000470625 00000 n
+0000470690 00000 n
+0000470753 00000 n
+0000470818 00000 n
+0000470883 00000 n
+0000470948 00000 n
+0000471013 00000 n
+0000471078 00000 n
+0000471143 00000 n
+0000471208 00000 n
+0000471273 00000 n
+0000471337 00000 n
+0000471402 00000 n
+0000471467 00000 n
+0000471532 00000 n
+0000471597 00000 n
+0000471662 00000 n
+0000471727 00000 n
+0000471792 00000 n
+0000471857 00000 n
+0000471921 00000 n
+0000471986 00000 n
+0000472051 00000 n
+0000472116 00000 n
+0000472181 00000 n
+0000472246 00000 n
+0000472311 00000 n
+0000472376 00000 n
+0000472441 00000 n
+0000472505 00000 n
+0000469140 00000 n
+0000477331 00000 n
+0000475004 00000 n
+0000472824 00000 n
+0000475129 00000 n
+0000475193 00000 n
+0000475258 00000 n
+0000475323 00000 n
+0000475386 00000 n
+0000475451 00000 n
+0000475516 00000 n
+0000475581 00000 n
+0000475646 00000 n
+0000475710 00000 n
+0000475775 00000 n
+0000475840 00000 n
+0000475905 00000 n
+0000475970 00000 n
+0000476035 00000 n
+0000476100 00000 n
+0000476164 00000 n
+0000476229 00000 n
+0000476294 00000 n
+0000476359 00000 n
+0000476424 00000 n
+0000476488 00000 n
+0000476552 00000 n
+0000476616 00000 n
+0000476681 00000 n
+0000476746 00000 n
+0000476811 00000 n
+0000476876 00000 n
+0000476941 00000 n
+0000477006 00000 n
+0000477071 00000 n
+0000477136 00000 n
+0000477201 00000 n
+0000477266 00000 n
+0000480059 00000 n
+0000483393 00000 n
+0000479886 00000 n
+0000477560 00000 n
+0000480217 00000 n
+0000480281 00000 n
+0000480345 00000 n
+0000480410 00000 n
+0000480475 00000 n
+0000480540 00000 n
+0000480605 00000 n
+0000480670 00000 n
+0000480735 00000 n
+0000480800 00000 n
+0000480865 00000 n
+0000480930 00000 n
+0000480994 00000 n
+0000481059 00000 n
+0000481124 00000 n
+0000481189 00000 n
+0000481254 00000 n
+0000481319 00000 n
+0000481384 00000 n
+0000481449 00000 n
+0000481514 00000 n
+0000481578 00000 n
+0000481643 00000 n
+0000481708 00000 n
+0000481773 00000 n
+0000481838 00000 n
+0000481903 00000 n
+0000481968 00000 n
+0000482032 00000 n
+0000482097 00000 n
+0000482162 00000 n
+0000482227 00000 n
+0000482292 00000 n
+0000482357 00000 n
+0000482422 00000 n
+0000482550 00000 n
+0000482615 00000 n
+0000482680 00000 n
+0000482745 00000 n
+0000482810 00000 n
+0000482875 00000 n
+0000482939 00000 n
+0000483004 00000 n
+0000483069 00000 n
+0000483134 00000 n
+0000483199 00000 n
+0000483264 00000 n
+0000483329 00000 n
+0000480028 00000 n
+0000489526 00000 n
+0000486223 00000 n
+0000483622 00000 n
+0000486348 00000 n
+0000486412 00000 n
+0000486477 00000 n
0000486541 00000 n
-0000484697 00000 n
-0000486666 00000 n
-0000486730 00000 n
-0000486794 00000 n
-0000486859 00000 n
-0000486924 00000 n
-0000486989 00000 n
-0000487054 00000 n
-0000487118 00000 n
-0000487183 00000 n
-0000487248 00000 n
-0000487313 00000 n
-0000487378 00000 n
-0000487443 00000 n
-0000487508 00000 n
-0000487573 00000 n
-0000487637 00000 n
-0000487702 00000 n
-0000487767 00000 n
-0000487832 00000 n
-0000487897 00000 n
-0000487961 00000 n
-0000488026 00000 n
-0000488091 00000 n
-0000488156 00000 n
-0000488221 00000 n
-0000488286 00000 n
-0000488351 00000 n
-0000488416 00000 n
-0000488480 00000 n
-0000488545 00000 n
-0000488610 00000 n
-0000488675 00000 n
-0000488740 00000 n
-0000488805 00000 n
-0000488870 00000 n
-0000488935 00000 n
-0000489000 00000 n
-0000489063 00000 n
-0000489128 00000 n
-0000489193 00000 n
-0000489258 00000 n
-0000489323 00000 n
-0000489388 00000 n
-0000489453 00000 n
-0000489518 00000 n
-0000489583 00000 n
-0000489647 00000 n
-0000489712 00000 n
-0000489777 00000 n
-0000489842 00000 n
-0000489907 00000 n
-0000489972 00000 n
-0000490037 00000 n
-0000490102 00000 n
-0000490167 00000 n
-0000490230 00000 n
-0000492896 00000 n
-0000496489 00000 n
-0000492723 00000 n
-0000490471 00000 n
-0000493054 00000 n
-0000493118 00000 n
-0000493183 00000 n
-0000493247 00000 n
-0000493312 00000 n
-0000493376 00000 n
-0000493441 00000 n
-0000493506 00000 n
-0000493571 00000 n
-0000493636 00000 n
-0000493701 00000 n
-0000493766 00000 n
-0000493831 00000 n
-0000493896 00000 n
-0000493960 00000 n
-0000494025 00000 n
-0000494090 00000 n
-0000494155 00000 n
-0000494220 00000 n
-0000494285 00000 n
-0000494350 00000 n
-0000494415 00000 n
-0000494480 00000 n
-0000494545 00000 n
-0000494610 00000 n
-0000494675 00000 n
-0000494740 00000 n
-0000494805 00000 n
-0000494870 00000 n
-0000494934 00000 n
-0000494999 00000 n
-0000495064 00000 n
-0000495192 00000 n
-0000495257 00000 n
-0000495322 00000 n
-0000495387 00000 n
-0000495452 00000 n
-0000495517 00000 n
-0000495582 00000 n
-0000495646 00000 n
-0000495711 00000 n
-0000495776 00000 n
-0000495841 00000 n
-0000495906 00000 n
-0000495971 00000 n
-0000496036 00000 n
-0000496101 00000 n
-0000496166 00000 n
-0000496230 00000 n
-0000496295 00000 n
-0000496360 00000 n
-0000496425 00000 n
-0000492865 00000 n
-0000503133 00000 n
-0000498857 00000 n
-0000496718 00000 n
-0000498982 00000 n
-0000499046 00000 n
-0000499111 00000 n
+0000486606 00000 n
+0000486671 00000 n
+0000486736 00000 n
+0000486801 00000 n
+0000486866 00000 n
+0000486931 00000 n
+0000486996 00000 n
+0000487060 00000 n
+0000487125 00000 n
+0000487190 00000 n
+0000487255 00000 n
+0000487320 00000 n
+0000487385 00000 n
+0000487450 00000 n
+0000487515 00000 n
+0000487580 00000 n
+0000487644 00000 n
+0000487709 00000 n
+0000487774 00000 n
+0000487839 00000 n
+0000487904 00000 n
+0000487969 00000 n
+0000488034 00000 n
+0000488099 00000 n
+0000488164 00000 n
+0000488228 00000 n
+0000488293 00000 n
+0000488358 00000 n
+0000488423 00000 n
+0000488488 00000 n
+0000488553 00000 n
+0000488618 00000 n
+0000488683 00000 n
+0000488748 00000 n
+0000488813 00000 n
+0000488878 00000 n
+0000488943 00000 n
+0000489007 00000 n
+0000489072 00000 n
+0000489137 00000 n
+0000489202 00000 n
+0000489267 00000 n
+0000489332 00000 n
+0000489397 00000 n
+0000489461 00000 n
+0000495439 00000 n
+0000491752 00000 n
+0000489729 00000 n
+0000491877 00000 n
+0000491941 00000 n
+0000492005 00000 n
+0000492069 00000 n
+0000492134 00000 n
+0000492199 00000 n
+0000492264 00000 n
+0000492328 00000 n
+0000492393 00000 n
+0000492458 00000 n
+0000492523 00000 n
+0000492588 00000 n
+0000492653 00000 n
+0000492718 00000 n
+0000492783 00000 n
+0000492848 00000 n
+0000492912 00000 n
+0000492977 00000 n
+0000493042 00000 n
+0000493107 00000 n
+0000493171 00000 n
+0000493236 00000 n
+0000493301 00000 n
+0000493365 00000 n
+0000493430 00000 n
+0000493495 00000 n
+0000493560 00000 n
+0000493625 00000 n
+0000493690 00000 n
+0000493755 00000 n
+0000493820 00000 n
+0000493885 00000 n
+0000493950 00000 n
+0000494014 00000 n
+0000494079 00000 n
+0000494144 00000 n
+0000494209 00000 n
+0000494274 00000 n
+0000494339 00000 n
+0000494404 00000 n
+0000494469 00000 n
+0000494534 00000 n
+0000494597 00000 n
+0000494662 00000 n
+0000494727 00000 n
+0000494792 00000 n
+0000494857 00000 n
+0000494922 00000 n
+0000494987 00000 n
+0000495052 00000 n
+0000495117 00000 n
+0000495181 00000 n
+0000495246 00000 n
+0000495311 00000 n
+0000495375 00000 n
+0000498110 00000 n
+0000501639 00000 n
+0000497937 00000 n
+0000495642 00000 n
+0000498268 00000 n
+0000498332 00000 n
+0000498397 00000 n
+0000498461 00000 n
+0000498526 00000 n
+0000498591 00000 n
+0000498656 00000 n
+0000498721 00000 n
+0000498786 00000 n
+0000498850 00000 n
+0000498915 00000 n
+0000498980 00000 n
+0000499045 00000 n
+0000499110 00000 n
0000499175 00000 n
0000499240 00000 n
0000499305 00000 n
0000499370 00000 n
-0000499435 00000 n
-0000499500 00000 n
-0000499565 00000 n
-0000499630 00000 n
-0000499695 00000 n
+0000499434 00000 n
+0000499499 00000 n
+0000499564 00000 n
+0000499629 00000 n
+0000499694 00000 n
0000499759 00000 n
0000499824 00000 n
0000499889 00000 n
@@ -20166,1125 +20053,1177 @@ xref
0000500214 00000 n
0000500279 00000 n
0000500343 00000 n
-0000500408 00000 n
-0000500473 00000 n
-0000500538 00000 n
-0000500603 00000 n
-0000500668 00000 n
-0000500733 00000 n
-0000500798 00000 n
-0000500863 00000 n
-0000500927 00000 n
-0000500992 00000 n
-0000501057 00000 n
-0000501122 00000 n
-0000501187 00000 n
-0000501252 00000 n
-0000501317 00000 n
-0000501382 00000 n
-0000501447 00000 n
-0000501511 00000 n
-0000501576 00000 n
-0000501641 00000 n
-0000501706 00000 n
-0000501771 00000 n
-0000501836 00000 n
-0000501901 00000 n
-0000501966 00000 n
-0000502031 00000 n
-0000502095 00000 n
-0000502160 00000 n
-0000502225 00000 n
-0000502290 00000 n
-0000502355 00000 n
-0000502420 00000 n
-0000502485 00000 n
-0000502550 00000 n
-0000502615 00000 n
-0000502679 00000 n
-0000502744 00000 n
-0000502809 00000 n
-0000502874 00000 n
-0000502939 00000 n
-0000503004 00000 n
-0000503069 00000 n
-0000509337 00000 n
-0000505841 00000 n
-0000503284 00000 n
-0000505966 00000 n
-0000506030 00000 n
-0000506095 00000 n
-0000506159 00000 n
-0000506224 00000 n
-0000506289 00000 n
-0000506354 00000 n
-0000506419 00000 n
-0000506484 00000 n
-0000506549 00000 n
-0000506614 00000 n
-0000506679 00000 n
-0000506743 00000 n
-0000506808 00000 n
-0000506873 00000 n
-0000506938 00000 n
-0000507003 00000 n
-0000507068 00000 n
-0000507133 00000 n
-0000507197 00000 n
-0000507262 00000 n
-0000507327 00000 n
-0000507392 00000 n
-0000507457 00000 n
-0000507522 00000 n
-0000507587 00000 n
-0000507652 00000 n
-0000507717 00000 n
-0000507781 00000 n
-0000507846 00000 n
-0000507911 00000 n
-0000507976 00000 n
-0000508040 00000 n
-0000508105 00000 n
-0000508170 00000 n
-0000508235 00000 n
-0000508300 00000 n
-0000508365 00000 n
-0000508430 00000 n
+0000500471 00000 n
+0000500536 00000 n
+0000500601 00000 n
+0000500666 00000 n
+0000500731 00000 n
+0000500796 00000 n
+0000500861 00000 n
+0000500926 00000 n
+0000500991 00000 n
+0000501055 00000 n
+0000501120 00000 n
+0000501185 00000 n
+0000501250 00000 n
+0000501315 00000 n
+0000501380 00000 n
+0000501445 00000 n
+0000501510 00000 n
+0000501575 00000 n
+0000498079 00000 n
+0000508318 00000 n
+0000504172 00000 n
+0000501868 00000 n
+0000504297 00000 n
+0000504361 00000 n
+0000504426 00000 n
+0000504491 00000 n
+0000504555 00000 n
+0000504620 00000 n
+0000504685 00000 n
+0000504750 00000 n
+0000504815 00000 n
+0000504880 00000 n
+0000504945 00000 n
+0000505010 00000 n
+0000505075 00000 n
+0000505139 00000 n
+0000505204 00000 n
+0000505269 00000 n
+0000505334 00000 n
+0000505399 00000 n
+0000505464 00000 n
+0000505529 00000 n
+0000505594 00000 n
+0000505659 00000 n
+0000505723 00000 n
+0000505788 00000 n
+0000505853 00000 n
+0000505918 00000 n
+0000505983 00000 n
+0000506048 00000 n
+0000506113 00000 n
+0000506178 00000 n
+0000506243 00000 n
+0000506308 00000 n
+0000506373 00000 n
+0000506438 00000 n
+0000506503 00000 n
+0000506568 00000 n
+0000506633 00000 n
+0000506698 00000 n
+0000506763 00000 n
+0000506828 00000 n
+0000506893 00000 n
+0000506957 00000 n
+0000507022 00000 n
+0000507087 00000 n
+0000507152 00000 n
+0000507217 00000 n
+0000507282 00000 n
+0000507347 00000 n
+0000507412 00000 n
+0000507477 00000 n
+0000507541 00000 n
+0000507606 00000 n
+0000507671 00000 n
+0000507736 00000 n
+0000507801 00000 n
+0000507866 00000 n
+0000507931 00000 n
+0000507996 00000 n
+0000508061 00000 n
+0000508125 00000 n
+0000508190 00000 n
+0000508254 00000 n
+0000884549 00000 n
+0000514458 00000 n
+0000510962 00000 n
0000508495 00000 n
-0000508560 00000 n
-0000508625 00000 n
-0000508690 00000 n
-0000508755 00000 n
-0000508820 00000 n
-0000508885 00000 n
-0000508950 00000 n
-0000509015 00000 n
-0000509079 00000 n
-0000509144 00000 n
-0000509209 00000 n
-0000509273 00000 n
-0000877698 00000 n
-0000514600 00000 n
-0000512014 00000 n
-0000509501 00000 n
-0000512139 00000 n
-0000512203 00000 n
-0000512268 00000 n
-0000512332 00000 n
-0000512397 00000 n
-0000512462 00000 n
-0000512590 00000 n
-0000512655 00000 n
-0000512720 00000 n
-0000512785 00000 n
-0000512850 00000 n
-0000512915 00000 n
-0000512979 00000 n
-0000513044 00000 n
-0000513109 00000 n
-0000513237 00000 n
-0000513302 00000 n
-0000513367 00000 n
-0000513432 00000 n
-0000513497 00000 n
-0000513562 00000 n
-0000513626 00000 n
-0000513691 00000 n
-0000513756 00000 n
-0000513821 00000 n
-0000513886 00000 n
-0000513951 00000 n
-0000514016 00000 n
-0000514080 00000 n
-0000514145 00000 n
-0000514210 00000 n
-0000514275 00000 n
-0000514340 00000 n
-0000514405 00000 n
-0000514470 00000 n
-0000514535 00000 n
-0000520527 00000 n
-0000517292 00000 n
-0000514803 00000 n
-0000517417 00000 n
-0000517481 00000 n
-0000517546 00000 n
-0000517611 00000 n
-0000517676 00000 n
-0000517741 00000 n
-0000517806 00000 n
-0000517871 00000 n
-0000517936 00000 n
-0000518001 00000 n
-0000518066 00000 n
-0000518130 00000 n
-0000518195 00000 n
-0000518260 00000 n
-0000518325 00000 n
-0000518390 00000 n
-0000518454 00000 n
-0000518519 00000 n
-0000518584 00000 n
-0000518649 00000 n
-0000518714 00000 n
-0000518779 00000 n
-0000518844 00000 n
-0000518909 00000 n
-0000518974 00000 n
-0000519037 00000 n
-0000519102 00000 n
-0000519167 00000 n
-0000519232 00000 n
-0000519297 00000 n
-0000519362 00000 n
-0000519427 00000 n
-0000519492 00000 n
-0000519557 00000 n
-0000519622 00000 n
-0000519686 00000 n
-0000519751 00000 n
-0000519816 00000 n
-0000519881 00000 n
-0000519946 00000 n
-0000520011 00000 n
-0000520076 00000 n
-0000520141 00000 n
-0000520206 00000 n
-0000520271 00000 n
-0000520336 00000 n
-0000520401 00000 n
-0000520465 00000 n
-0000526160 00000 n
-0000523252 00000 n
-0000520717 00000 n
-0000523377 00000 n
-0000523441 00000 n
-0000523506 00000 n
-0000523571 00000 n
-0000523636 00000 n
-0000523700 00000 n
-0000523765 00000 n
-0000523830 00000 n
-0000523895 00000 n
-0000523960 00000 n
-0000524025 00000 n
-0000524090 00000 n
-0000524155 00000 n
-0000524219 00000 n
-0000524284 00000 n
-0000524349 00000 n
-0000524414 00000 n
-0000524479 00000 n
-0000524544 00000 n
-0000524609 00000 n
-0000524674 00000 n
-0000524739 00000 n
-0000524804 00000 n
-0000524868 00000 n
-0000524933 00000 n
-0000525060 00000 n
-0000525123 00000 n
-0000525188 00000 n
-0000525253 00000 n
-0000525318 00000 n
-0000525383 00000 n
-0000525448 00000 n
-0000525513 00000 n
-0000525578 00000 n
-0000525643 00000 n
-0000525708 00000 n
-0000525772 00000 n
-0000525837 00000 n
-0000525902 00000 n
-0000525967 00000 n
-0000526032 00000 n
-0000526097 00000 n
-0000532145 00000 n
-0000528781 00000 n
-0000526350 00000 n
-0000528906 00000 n
-0000528970 00000 n
-0000529035 00000 n
-0000529099 00000 n
-0000529164 00000 n
-0000529229 00000 n
-0000529294 00000 n
-0000529359 00000 n
-0000529424 00000 n
-0000529489 00000 n
-0000529554 00000 n
-0000529619 00000 n
-0000529683 00000 n
-0000529748 00000 n
-0000529813 00000 n
-0000529878 00000 n
-0000529943 00000 n
-0000530008 00000 n
-0000530073 00000 n
-0000530138 00000 n
-0000530203 00000 n
-0000530267 00000 n
-0000530332 00000 n
-0000530397 00000 n
-0000530462 00000 n
-0000530527 00000 n
-0000530592 00000 n
-0000530657 00000 n
-0000530722 00000 n
-0000530787 00000 n
-0000530852 00000 n
-0000530917 00000 n
-0000530982 00000 n
-0000531047 00000 n
-0000531112 00000 n
-0000531177 00000 n
-0000531242 00000 n
-0000531307 00000 n
-0000531372 00000 n
-0000531437 00000 n
-0000531500 00000 n
-0000531565 00000 n
-0000531693 00000 n
-0000531758 00000 n
-0000531822 00000 n
-0000531887 00000 n
-0000531952 00000 n
-0000532017 00000 n
-0000532082 00000 n
-0000538050 00000 n
-0000535334 00000 n
-0000532335 00000 n
-0000535459 00000 n
-0000535523 00000 n
-0000535588 00000 n
-0000535652 00000 n
-0000535717 00000 n
-0000535781 00000 n
-0000535846 00000 n
-0000535911 00000 n
-0000535976 00000 n
-0000536040 00000 n
-0000536105 00000 n
-0000536170 00000 n
-0000536235 00000 n
-0000536300 00000 n
-0000536365 00000 n
-0000536430 00000 n
-0000536495 00000 n
-0000536559 00000 n
-0000536624 00000 n
-0000536689 00000 n
-0000536754 00000 n
-0000536818 00000 n
-0000536883 00000 n
-0000536948 00000 n
-0000537013 00000 n
-0000537078 00000 n
-0000537143 00000 n
-0000537208 00000 n
-0000537273 00000 n
-0000537338 00000 n
-0000537403 00000 n
-0000537468 00000 n
-0000537533 00000 n
-0000537598 00000 n
-0000537663 00000 n
-0000537728 00000 n
-0000537793 00000 n
-0000537857 00000 n
-0000537922 00000 n
-0000537986 00000 n
-0000544459 00000 n
-0000540898 00000 n
-0000538253 00000 n
-0000541023 00000 n
-0000541087 00000 n
-0000541152 00000 n
-0000541217 00000 n
-0000541281 00000 n
-0000541346 00000 n
-0000541411 00000 n
-0000541476 00000 n
-0000541541 00000 n
-0000541606 00000 n
-0000541671 00000 n
-0000541736 00000 n
-0000541801 00000 n
-0000541866 00000 n
-0000541931 00000 n
-0000541996 00000 n
-0000542060 00000 n
-0000542125 00000 n
-0000542190 00000 n
-0000542255 00000 n
-0000542320 00000 n
-0000542385 00000 n
-0000542450 00000 n
-0000542515 00000 n
-0000542580 00000 n
-0000542644 00000 n
-0000542709 00000 n
-0000542774 00000 n
-0000542839 00000 n
-0000542904 00000 n
-0000542969 00000 n
-0000543034 00000 n
-0000543099 00000 n
-0000543164 00000 n
-0000543229 00000 n
-0000543294 00000 n
-0000543359 00000 n
-0000543424 00000 n
-0000543489 00000 n
-0000543554 00000 n
-0000543619 00000 n
-0000543684 00000 n
-0000543749 00000 n
-0000543814 00000 n
-0000543879 00000 n
-0000543944 00000 n
-0000544008 00000 n
-0000544073 00000 n
-0000544138 00000 n
-0000544203 00000 n
-0000544268 00000 n
-0000544333 00000 n
-0000544397 00000 n
-0000550898 00000 n
-0000547725 00000 n
-0000544649 00000 n
-0000547850 00000 n
-0000547914 00000 n
-0000547979 00000 n
-0000548043 00000 n
-0000548108 00000 n
-0000548173 00000 n
-0000548238 00000 n
-0000548303 00000 n
-0000548368 00000 n
-0000548433 00000 n
-0000548498 00000 n
-0000548563 00000 n
-0000548628 00000 n
-0000548693 00000 n
-0000548758 00000 n
-0000548822 00000 n
-0000548887 00000 n
-0000548952 00000 n
-0000549017 00000 n
-0000549081 00000 n
-0000549146 00000 n
-0000549211 00000 n
-0000549276 00000 n
-0000549341 00000 n
-0000549406 00000 n
-0000549471 00000 n
-0000549536 00000 n
-0000549600 00000 n
-0000549665 00000 n
-0000549730 00000 n
-0000549795 00000 n
-0000549860 00000 n
-0000549925 00000 n
-0000549990 00000 n
-0000550055 00000 n
-0000550120 00000 n
-0000550185 00000 n
-0000550250 00000 n
-0000550315 00000 n
-0000550380 00000 n
-0000550445 00000 n
-0000550510 00000 n
-0000550575 00000 n
-0000550640 00000 n
-0000550705 00000 n
-0000550770 00000 n
-0000550834 00000 n
-0000557042 00000 n
-0000553612 00000 n
-0000551101 00000 n
-0000553737 00000 n
-0000553801 00000 n
-0000553866 00000 n
-0000553930 00000 n
-0000553995 00000 n
-0000554060 00000 n
-0000554125 00000 n
-0000554189 00000 n
-0000554254 00000 n
-0000554319 00000 n
-0000554384 00000 n
-0000554449 00000 n
-0000554514 00000 n
-0000554579 00000 n
-0000554644 00000 n
-0000554709 00000 n
-0000554774 00000 n
-0000554838 00000 n
-0000554903 00000 n
-0000554968 00000 n
-0000555033 00000 n
-0000555098 00000 n
-0000555163 00000 n
-0000555226 00000 n
-0000555291 00000 n
-0000555355 00000 n
-0000555420 00000 n
-0000555485 00000 n
-0000555550 00000 n
-0000555615 00000 n
-0000555680 00000 n
-0000555745 00000 n
-0000555810 00000 n
-0000555875 00000 n
-0000555940 00000 n
-0000556005 00000 n
-0000556069 00000 n
-0000556134 00000 n
-0000556199 00000 n
-0000556264 00000 n
-0000556329 00000 n
-0000556394 00000 n
-0000556459 00000 n
-0000556524 00000 n
-0000556589 00000 n
-0000556654 00000 n
-0000556719 00000 n
-0000556784 00000 n
-0000556849 00000 n
-0000556914 00000 n
-0000556978 00000 n
-0000563537 00000 n
-0000559327 00000 n
-0000557245 00000 n
-0000559452 00000 n
-0000559516 00000 n
-0000559581 00000 n
-0000559645 00000 n
-0000559710 00000 n
-0000559775 00000 n
-0000559840 00000 n
-0000559905 00000 n
-0000559970 00000 n
-0000560035 00000 n
-0000560100 00000 n
-0000560165 00000 n
-0000560229 00000 n
-0000560294 00000 n
-0000560359 00000 n
-0000560424 00000 n
-0000560489 00000 n
-0000560554 00000 n
-0000560619 00000 n
-0000560684 00000 n
-0000560749 00000 n
-0000560813 00000 n
-0000560878 00000 n
-0000560943 00000 n
-0000561008 00000 n
-0000561073 00000 n
-0000561138 00000 n
-0000561203 00000 n
-0000561268 00000 n
-0000561333 00000 n
-0000561397 00000 n
-0000561462 00000 n
-0000561527 00000 n
-0000561592 00000 n
-0000561657 00000 n
-0000561722 00000 n
-0000561787 00000 n
-0000561852 00000 n
-0000561917 00000 n
-0000561981 00000 n
-0000562046 00000 n
-0000562111 00000 n
-0000562176 00000 n
-0000562241 00000 n
-0000562306 00000 n
-0000562371 00000 n
-0000562436 00000 n
-0000562501 00000 n
-0000562566 00000 n
-0000562631 00000 n
-0000562696 00000 n
-0000562760 00000 n
-0000562825 00000 n
-0000562890 00000 n
-0000562955 00000 n
-0000563020 00000 n
-0000563085 00000 n
-0000563150 00000 n
-0000563215 00000 n
-0000563280 00000 n
-0000563344 00000 n
-0000563409 00000 n
-0000563473 00000 n
-0000569442 00000 n
-0000565879 00000 n
-0000563701 00000 n
-0000566004 00000 n
-0000566068 00000 n
-0000566133 00000 n
-0000566197 00000 n
-0000566262 00000 n
-0000566327 00000 n
-0000566392 00000 n
-0000566457 00000 n
-0000566522 00000 n
-0000566587 00000 n
-0000566652 00000 n
-0000566717 00000 n
-0000566781 00000 n
-0000566846 00000 n
-0000566911 00000 n
-0000566976 00000 n
-0000567041 00000 n
-0000567106 00000 n
-0000567171 00000 n
-0000567236 00000 n
-0000567301 00000 n
-0000567365 00000 n
-0000567430 00000 n
-0000567495 00000 n
-0000567560 00000 n
-0000567625 00000 n
-0000567690 00000 n
-0000567754 00000 n
-0000567819 00000 n
-0000567884 00000 n
-0000567949 00000 n
-0000568014 00000 n
-0000568079 00000 n
-0000568144 00000 n
-0000568209 00000 n
-0000568274 00000 n
-0000568339 00000 n
-0000568404 00000 n
-0000568469 00000 n
-0000568534 00000 n
-0000568599 00000 n
-0000568664 00000 n
-0000568729 00000 n
-0000568794 00000 n
-0000568858 00000 n
-0000568923 00000 n
-0000568988 00000 n
-0000569053 00000 n
-0000569118 00000 n
-0000569183 00000 n
-0000569248 00000 n
-0000569313 00000 n
-0000569378 00000 n
-0000877862 00000 n
-0000575287 00000 n
-0000571920 00000 n
-0000569619 00000 n
-0000572045 00000 n
-0000572109 00000 n
-0000572174 00000 n
-0000572239 00000 n
-0000572304 00000 n
-0000572369 00000 n
-0000572434 00000 n
-0000572499 00000 n
-0000572564 00000 n
-0000572629 00000 n
-0000572693 00000 n
-0000572758 00000 n
-0000572823 00000 n
-0000572888 00000 n
-0000572953 00000 n
-0000573018 00000 n
-0000573083 00000 n
-0000573148 00000 n
-0000573213 00000 n
-0000573277 00000 n
-0000573342 00000 n
-0000573407 00000 n
-0000573472 00000 n
-0000573537 00000 n
-0000573602 00000 n
-0000573667 00000 n
-0000573732 00000 n
-0000573797 00000 n
-0000573861 00000 n
-0000573926 00000 n
-0000573991 00000 n
-0000574056 00000 n
-0000574121 00000 n
-0000574186 00000 n
-0000574251 00000 n
-0000574316 00000 n
-0000574381 00000 n
-0000574445 00000 n
-0000574510 00000 n
-0000574575 00000 n
-0000574640 00000 n
-0000574705 00000 n
-0000574770 00000 n
-0000574835 00000 n
-0000574900 00000 n
-0000574965 00000 n
-0000575029 00000 n
-0000575094 00000 n
-0000575159 00000 n
-0000578611 00000 n
-0000577782 00000 n
-0000575531 00000 n
-0000577907 00000 n
-0000577971 00000 n
-0000578035 00000 n
-0000578099 00000 n
-0000578163 00000 n
-0000578227 00000 n
-0000578291 00000 n
-0000578355 00000 n
-0000578419 00000 n
-0000578483 00000 n
-0000578547 00000 n
-0000583005 00000 n
-0000583160 00000 n
-0000583315 00000 n
-0000583471 00000 n
-0000583630 00000 n
-0000583791 00000 n
-0000583952 00000 n
-0000584112 00000 n
-0000584268 00000 n
-0000584429 00000 n
-0000584590 00000 n
-0000584757 00000 n
-0000584924 00000 n
-0000585090 00000 n
-0000585251 00000 n
-0000594578 00000 n
-0000585979 00000 n
-0000582706 00000 n
-0000578788 00000 n
-0000585405 00000 n
-0000585469 00000 n
-0000585533 00000 n
-0000585597 00000 n
-0000585661 00000 n
-0000585725 00000 n
-0000585789 00000 n
-0000585916 00000 n
-0000582848 00000 n
-0000594734 00000 n
-0000594894 00000 n
-0000595061 00000 n
-0000595227 00000 n
-0000595387 00000 n
-0000595553 00000 n
-0000595719 00000 n
-0000595880 00000 n
-0000596040 00000 n
-0000596207 00000 n
-0000596373 00000 n
-0000596540 00000 n
-0000596706 00000 n
-0000596873 00000 n
-0000597033 00000 n
-0000597199 00000 n
-0000597366 00000 n
-0000597533 00000 n
-0000597693 00000 n
-0000597854 00000 n
-0000598010 00000 n
-0000598166 00000 n
-0000598326 00000 n
-0000598487 00000 n
-0000598647 00000 n
-0000598808 00000 n
-0000598968 00000 n
-0000599124 00000 n
-0000599284 00000 n
-0000599445 00000 n
-0000599606 00000 n
-0000599767 00000 n
-0000599928 00000 n
-0000600089 00000 n
-0000600246 00000 n
-0000600407 00000 n
-0000600569 00000 n
-0000600737 00000 n
-0000600904 00000 n
-0000601072 00000 n
-0000601240 00000 n
-0000601408 00000 n
-0000601576 00000 n
-0000601744 00000 n
-0000601912 00000 n
-0000602080 00000 n
-0000602249 00000 n
-0000602418 00000 n
-0000602587 00000 n
-0000602756 00000 n
-0000602925 00000 n
-0000603087 00000 n
-0000603254 00000 n
-0000603420 00000 n
-0000605196 00000 n
-0000603650 00000 n
-0000593919 00000 n
-0000586169 00000 n
-0000603586 00000 n
-0000594061 00000 n
-0000605364 00000 n
-0000605532 00000 n
-0000605699 00000 n
-0000605867 00000 n
-0000606034 00000 n
-0000606202 00000 n
-0000606423 00000 n
-0000604969 00000 n
-0000603788 00000 n
-0000606359 00000 n
-0000605111 00000 n
-0000873706 00000 n
-0000606679 00000 n
-0000873968 00000 n
-0000606706 00000 n
-0000873834 00000 n
-0000606799 00000 n
-0000607038 00000 n
-0000607063 00000 n
-0000619048 00000 n
-0000607291 00000 n
-0000607394 00000 n
-0000619290 00000 n
-0000620014 00000 n
-0000620248 00000 n
-0000633680 00000 n
-0000620564 00000 n
-0000620667 00000 n
-0000633914 00000 n
-0000634660 00000 n
-0000634886 00000 n
-0000645920 00000 n
-0000635033 00000 n
-0000635131 00000 n
-0000646160 00000 n
-0000646838 00000 n
-0000647069 00000 n
-0000648180 00000 n
-0000647124 00000 n
-0000647221 00000 n
-0000648423 00000 n
-0000649033 00000 n
-0000649237 00000 n
-0000649264 00000 n
-0000649291 00000 n
-0000651666 00000 n
-0000649483 00000 n
-0000649589 00000 n
-0000651914 00000 n
-0000652597 00000 n
-0000652807 00000 n
-0000662782 00000 n
-0000653420 00000 n
-0000653547 00000 n
-0000663022 00000 n
-0000664117 00000 n
-0000664321 00000 n
-0000666925 00000 n
-0000664522 00000 n
-0000664628 00000 n
-0000667172 00000 n
-0000667859 00000 n
-0000668069 00000 n
-0000669754 00000 n
-0000668182 00000 n
-0000668288 00000 n
-0000670003 00000 n
-0000670656 00000 n
-0000670867 00000 n
-0000676391 00000 n
-0000671220 00000 n
-0000671331 00000 n
-0000676635 00000 n
-0000677411 00000 n
-0000677616 00000 n
-0000685246 00000 n
-0000678074 00000 n
-0000678189 00000 n
-0000685486 00000 n
-0000686376 00000 n
-0000686579 00000 n
-0000687329 00000 n
-0000686613 00000 n
-0000686708 00000 n
-0000687568 00000 n
-0000688164 00000 n
-0000688366 00000 n
-0000694759 00000 n
-0000688823 00000 n
-0000688931 00000 n
-0000694999 00000 n
-0000695884 00000 n
-0000696088 00000 n
-0000698692 00000 n
-0000696278 00000 n
-0000696384 00000 n
-0000698935 00000 n
-0000699607 00000 n
-0000699811 00000 n
-0000701831 00000 n
-0000699925 00000 n
-0000700029 00000 n
-0000702073 00000 n
-0000702718 00000 n
-0000702923 00000 n
-0000705976 00000 n
-0000703214 00000 n
-0000703321 00000 n
-0000706216 00000 n
-0000706952 00000 n
-0000707156 00000 n
-0000714567 00000 n
-0000707621 00000 n
-0000707736 00000 n
-0000714808 00000 n
-0000715687 00000 n
-0000715892 00000 n
-0000715919 00000 n
-0000715980 00000 n
-0000716173 00000 n
-0000716414 00000 n
-0000716631 00000 n
-0000721353 00000 n
-0000716990 00000 n
-0000717096 00000 n
-0000721595 00000 n
-0000722373 00000 n
-0000722577 00000 n
-0000725385 00000 n
-0000722835 00000 n
-0000722941 00000 n
-0000725625 00000 n
-0000726324 00000 n
-0000726528 00000 n
-0000735798 00000 n
-0000727012 00000 n
-0000727131 00000 n
-0000736039 00000 n
-0000737037 00000 n
-0000737242 00000 n
-0000739252 00000 n
-0000737356 00000 n
-0000737460 00000 n
-0000739494 00000 n
-0000740140 00000 n
-0000740345 00000 n
-0000742861 00000 n
-0000740592 00000 n
-0000740698 00000 n
-0000743102 00000 n
-0000743807 00000 n
-0000744012 00000 n
-0000753526 00000 n
-0000744585 00000 n
-0000744717 00000 n
-0000753768 00000 n
-0000754769 00000 n
-0000754975 00000 n
-0000761813 00000 n
-0000755407 00000 n
-0000755519 00000 n
-0000762053 00000 n
-0000762911 00000 n
-0000763114 00000 n
-0000764163 00000 n
-0000763192 00000 n
-0000763292 00000 n
-0000764403 00000 n
-0000765025 00000 n
-0000765229 00000 n
-0000770355 00000 n
-0000765598 00000 n
-0000765713 00000 n
-0000770596 00000 n
-0000771385 00000 n
-0000771590 00000 n
-0000773149 00000 n
-0000771683 00000 n
-0000771784 00000 n
-0000773388 00000 n
-0000774014 00000 n
-0000774216 00000 n
-0000776453 00000 n
-0000774395 00000 n
-0000774501 00000 n
-0000776694 00000 n
-0000777363 00000 n
-0000777568 00000 n
-0000780111 00000 n
-0000777744 00000 n
-0000777851 00000 n
-0000780353 00000 n
-0000781038 00000 n
-0000781244 00000 n
-0000781342 00000 n
-0000782386 00000 n
-0000781420 00000 n
-0000781520 00000 n
-0000782627 00000 n
-0000783251 00000 n
-0000783456 00000 n
-0000785259 00000 n
-0000783567 00000 n
-0000783670 00000 n
-0000785501 00000 n
-0000786144 00000 n
-0000793321 00000 n
-0000786350 00000 n
-0000797639 00000 n
-0000793554 00000 n
-0000800702 00000 n
-0000797928 00000 n
-0000803919 00000 n
-0000800941 00000 n
-0000806539 00000 n
-0000804163 00000 n
-0000830201 00000 n
-0000806784 00000 n
-0000849343 00000 n
-0000830508 00000 n
-0000861305 00000 n
-0000849615 00000 n
-0000864673 00000 n
-0000861555 00000 n
-0000867446 00000 n
-0000864946 00000 n
-0000870391 00000 n
-0000867698 00000 n
-0000873420 00000 n
-0000870637 00000 n
-0000877989 00000 n
-0000878150 00000 n
-0000878232 00000 n
-0000878309 00000 n
-0000885618 00000 n
-0000886283 00000 n
-0000886952 00000 n
-0000887621 00000 n
-0000888287 00000 n
-0000888956 00000 n
-0000889624 00000 n
-0000890295 00000 n
-0000890959 00000 n
-0000891628 00000 n
-0000892297 00000 n
-0000892963 00000 n
-0000893632 00000 n
-0000894301 00000 n
-0000894966 00000 n
-0000895637 00000 n
-0000896305 00000 n
-0000896974 00000 n
-0000897640 00000 n
-0000898309 00000 n
-0000898978 00000 n
-0000899644 00000 n
-0000900313 00000 n
-0000900981 00000 n
-0000901652 00000 n
-0000902317 00000 n
-0000902986 00000 n
-0000903655 00000 n
-0000904321 00000 n
-0000904990 00000 n
-0000905659 00000 n
-0000906328 00000 n
-0000906996 00000 n
-0000907664 00000 n
-0000908333 00000 n
-0000908995 00000 n
-0000909664 00000 n
-0000910333 00000 n
-0000911002 00000 n
-0000911667 00000 n
-0000912338 00000 n
-0000913006 00000 n
-0000913672 00000 n
-0000914341 00000 n
-0000915010 00000 n
-0000915679 00000 n
-0000916345 00000 n
-0000917014 00000 n
-0000917682 00000 n
-0000918350 00000 n
-0000919019 00000 n
-0000919688 00000 n
-0000920357 00000 n
-0000921023 00000 n
-0000921692 00000 n
-0000922361 00000 n
-0000923026 00000 n
-0000923697 00000 n
-0000924365 00000 n
-0000925034 00000 n
-0000925700 00000 n
-0000926369 00000 n
-0000927038 00000 n
-0000927704 00000 n
-0000928373 00000 n
-0000929041 00000 n
-0000929712 00000 n
-0000930376 00000 n
-0000931045 00000 n
-0000931714 00000 n
-0000932376 00000 n
-0000933045 00000 n
-0000933714 00000 n
-0000934380 00000 n
-0000935048 00000 n
-0000935717 00000 n
-0000936386 00000 n
-0000937052 00000 n
-0000937687 00000 n
-0000938321 00000 n
-0000938953 00000 n
-0000939588 00000 n
-0000940223 00000 n
-0000940858 00000 n
-0000941490 00000 n
-0000942125 00000 n
-0000942759 00000 n
-0000943393 00000 n
-0000944028 00000 n
-0000944663 00000 n
-0000945298 00000 n
-0000945930 00000 n
-0000946565 00000 n
-0000947200 00000 n
-0000947831 00000 n
-0000948468 00000 n
-0000949102 00000 n
-0000949737 00000 n
-0000950369 00000 n
-0000951004 00000 n
-0000951639 00000 n
-0000952357 00000 n
-0000953155 00000 n
-0000953811 00000 n
-0000954472 00000 n
-0000955141 00000 n
-0000955916 00000 n
-0000956707 00000 n
-0000957622 00000 n
-0000958763 00000 n
-0000959052 00000 n
-0000959408 00000 n
-0000959761 00000 n
-0000960114 00000 n
-0000960304 00000 n
-0000960407 00000 n
-0000960447 00000 n
-0000960579 00000 n
+0000511087 00000 n
+0000511151 00000 n
+0000511216 00000 n
+0000511280 00000 n
+0000511345 00000 n
+0000511410 00000 n
+0000511475 00000 n
+0000511540 00000 n
+0000511605 00000 n
+0000511670 00000 n
+0000511735 00000 n
+0000511800 00000 n
+0000511864 00000 n
+0000511929 00000 n
+0000511994 00000 n
+0000512059 00000 n
+0000512124 00000 n
+0000512189 00000 n
+0000512254 00000 n
+0000512319 00000 n
+0000512384 00000 n
+0000512448 00000 n
+0000512513 00000 n
+0000512578 00000 n
+0000512643 00000 n
+0000512708 00000 n
+0000512773 00000 n
+0000512838 00000 n
+0000512903 00000 n
+0000512968 00000 n
+0000513032 00000 n
+0000513097 00000 n
+0000513162 00000 n
+0000513227 00000 n
+0000513292 00000 n
+0000513357 00000 n
+0000513422 00000 n
+0000513487 00000 n
+0000513551 00000 n
+0000513616 00000 n
+0000513681 00000 n
+0000513746 00000 n
+0000513811 00000 n
+0000513876 00000 n
+0000513941 00000 n
+0000514006 00000 n
+0000514071 00000 n
+0000514136 00000 n
+0000514201 00000 n
+0000514266 00000 n
+0000514331 00000 n
+0000514394 00000 n
+0000519996 00000 n
+0000517219 00000 n
+0000514622 00000 n
+0000517344 00000 n
+0000517408 00000 n
+0000517473 00000 n
+0000517537 00000 n
+0000517602 00000 n
+0000517667 00000 n
+0000517732 00000 n
+0000517797 00000 n
+0000517862 00000 n
+0000517988 00000 n
+0000518053 00000 n
+0000518118 00000 n
+0000518183 00000 n
+0000518248 00000 n
+0000518313 00000 n
+0000518378 00000 n
+0000518443 00000 n
+0000518508 00000 n
+0000518636 00000 n
+0000518700 00000 n
+0000518765 00000 n
+0000518830 00000 n
+0000518895 00000 n
+0000518960 00000 n
+0000519025 00000 n
+0000519090 00000 n
+0000519155 00000 n
+0000519220 00000 n
+0000519284 00000 n
+0000519349 00000 n
+0000519414 00000 n
+0000519479 00000 n
+0000519544 00000 n
+0000519609 00000 n
+0000519674 00000 n
+0000519738 00000 n
+0000519803 00000 n
+0000519868 00000 n
+0000519932 00000 n
+0000525951 00000 n
+0000522843 00000 n
+0000520199 00000 n
+0000522968 00000 n
+0000523032 00000 n
+0000523097 00000 n
+0000523162 00000 n
+0000523227 00000 n
+0000523292 00000 n
+0000523357 00000 n
+0000523421 00000 n
+0000523486 00000 n
+0000523551 00000 n
+0000523616 00000 n
+0000523681 00000 n
+0000523746 00000 n
+0000523811 00000 n
+0000523876 00000 n
+0000523941 00000 n
+0000524006 00000 n
+0000524071 00000 n
+0000524136 00000 n
+0000524201 00000 n
+0000524266 00000 n
+0000524330 00000 n
+0000524395 00000 n
+0000524460 00000 n
+0000524525 00000 n
+0000524590 00000 n
+0000524655 00000 n
+0000524720 00000 n
+0000524785 00000 n
+0000524850 00000 n
+0000524915 00000 n
+0000524980 00000 n
+0000525045 00000 n
+0000525110 00000 n
+0000525174 00000 n
+0000525239 00000 n
+0000525304 00000 n
+0000525369 00000 n
+0000525434 00000 n
+0000525499 00000 n
+0000525564 00000 n
+0000525629 00000 n
+0000525693 00000 n
+0000525758 00000 n
+0000525823 00000 n
+0000525887 00000 n
+0000531520 00000 n
+0000529384 00000 n
+0000526141 00000 n
+0000529509 00000 n
+0000529573 00000 n
+0000529638 00000 n
+0000529703 00000 n
+0000529768 00000 n
+0000529833 00000 n
+0000529898 00000 n
+0000529963 00000 n
+0000530028 00000 n
+0000530092 00000 n
+0000530157 00000 n
+0000530222 00000 n
+0000530287 00000 n
+0000530352 00000 n
+0000530417 00000 n
+0000530482 00000 n
+0000530547 00000 n
+0000530612 00000 n
+0000530677 00000 n
+0000530742 00000 n
+0000530807 00000 n
+0000530871 00000 n
+0000530936 00000 n
+0000531000 00000 n
+0000531065 00000 n
+0000531130 00000 n
+0000531195 00000 n
+0000531260 00000 n
+0000531325 00000 n
+0000531390 00000 n
+0000531455 00000 n
+0000536847 00000 n
+0000534193 00000 n
+0000531710 00000 n
+0000534318 00000 n
+0000534382 00000 n
+0000534447 00000 n
+0000534512 00000 n
+0000534640 00000 n
+0000534705 00000 n
+0000534770 00000 n
+0000534835 00000 n
+0000534900 00000 n
+0000534965 00000 n
+0000535030 00000 n
+0000535095 00000 n
+0000535160 00000 n
+0000535225 00000 n
+0000535290 00000 n
+0000535354 00000 n
+0000535419 00000 n
+0000535484 00000 n
+0000535549 00000 n
+0000535614 00000 n
+0000535679 00000 n
+0000535744 00000 n
+0000535809 00000 n
+0000535874 00000 n
+0000535939 00000 n
+0000536004 00000 n
+0000536069 00000 n
+0000536134 00000 n
+0000536199 00000 n
+0000536264 00000 n
+0000536329 00000 n
+0000536394 00000 n
+0000536459 00000 n
+0000536524 00000 n
+0000536589 00000 n
+0000536654 00000 n
+0000536718 00000 n
+0000536783 00000 n
+0000542822 00000 n
+0000539846 00000 n
+0000537024 00000 n
+0000539971 00000 n
+0000540035 00000 n
+0000540100 00000 n
+0000540164 00000 n
+0000540229 00000 n
+0000540294 00000 n
+0000540359 00000 n
+0000540424 00000 n
+0000540489 00000 n
+0000540554 00000 n
+0000540619 00000 n
+0000540684 00000 n
+0000540748 00000 n
+0000540813 00000 n
+0000540878 00000 n
+0000540943 00000 n
+0000541008 00000 n
+0000541073 00000 n
+0000541138 00000 n
+0000541203 00000 n
+0000541268 00000 n
+0000541332 00000 n
+0000541397 00000 n
+0000541462 00000 n
+0000541527 00000 n
+0000541592 00000 n
+0000541657 00000 n
+0000541722 00000 n
+0000541850 00000 n
+0000541915 00000 n
+0000541980 00000 n
+0000542045 00000 n
+0000542110 00000 n
+0000542175 00000 n
+0000542240 00000 n
+0000542305 00000 n
+0000542370 00000 n
+0000542433 00000 n
+0000542498 00000 n
+0000542563 00000 n
+0000542628 00000 n
+0000542693 00000 n
+0000542757 00000 n
+0000548732 00000 n
+0000545692 00000 n
+0000543012 00000 n
+0000545817 00000 n
+0000545881 00000 n
+0000545946 00000 n
+0000546010 00000 n
+0000546075 00000 n
+0000546140 00000 n
+0000546205 00000 n
+0000546270 00000 n
+0000546335 00000 n
+0000546400 00000 n
+0000546465 00000 n
+0000546530 00000 n
+0000546595 00000 n
+0000546660 00000 n
+0000546725 00000 n
+0000546788 00000 n
+0000546853 00000 n
+0000546918 00000 n
+0000546983 00000 n
+0000547048 00000 n
+0000547113 00000 n
+0000547178 00000 n
+0000547243 00000 n
+0000547308 00000 n
+0000547373 00000 n
+0000547438 00000 n
+0000547503 00000 n
+0000547568 00000 n
+0000547633 00000 n
+0000547698 00000 n
+0000547763 00000 n
+0000547826 00000 n
+0000547891 00000 n
+0000547956 00000 n
+0000548021 00000 n
+0000548086 00000 n
+0000548151 00000 n
+0000548216 00000 n
+0000548281 00000 n
+0000548346 00000 n
+0000548411 00000 n
+0000548476 00000 n
+0000548540 00000 n
+0000548605 00000 n
+0000548668 00000 n
+0000555219 00000 n
+0000551462 00000 n
+0000548935 00000 n
+0000551587 00000 n
+0000551651 00000 n
+0000551716 00000 n
+0000551780 00000 n
+0000551845 00000 n
+0000551910 00000 n
+0000551975 00000 n
+0000552040 00000 n
+0000552105 00000 n
+0000552170 00000 n
+0000552235 00000 n
+0000552300 00000 n
+0000552364 00000 n
+0000552429 00000 n
+0000552494 00000 n
+0000552559 00000 n
+0000552624 00000 n
+0000552689 00000 n
+0000552754 00000 n
+0000552819 00000 n
+0000552884 00000 n
+0000552949 00000 n
+0000553014 00000 n
+0000553079 00000 n
+0000553144 00000 n
+0000553209 00000 n
+0000553274 00000 n
+0000553339 00000 n
+0000553404 00000 n
+0000553469 00000 n
+0000553534 00000 n
+0000553599 00000 n
+0000553664 00000 n
+0000553729 00000 n
+0000553794 00000 n
+0000553859 00000 n
+0000553924 00000 n
+0000553989 00000 n
+0000554054 00000 n
+0000554119 00000 n
+0000554183 00000 n
+0000554248 00000 n
+0000554313 00000 n
+0000554378 00000 n
+0000554443 00000 n
+0000554508 00000 n
+0000554573 00000 n
+0000554638 00000 n
+0000554703 00000 n
+0000554768 00000 n
+0000554833 00000 n
+0000554898 00000 n
+0000554963 00000 n
+0000555027 00000 n
+0000555092 00000 n
+0000555157 00000 n
+0000561665 00000 n
+0000558427 00000 n
+0000555409 00000 n
+0000558552 00000 n
+0000558616 00000 n
+0000558681 00000 n
+0000558745 00000 n
+0000558810 00000 n
+0000558875 00000 n
+0000558940 00000 n
+0000559005 00000 n
+0000559070 00000 n
+0000559135 00000 n
+0000559200 00000 n
+0000559265 00000 n
+0000559330 00000 n
+0000559395 00000 n
+0000559460 00000 n
+0000559525 00000 n
+0000559590 00000 n
+0000559655 00000 n
+0000559720 00000 n
+0000559785 00000 n
+0000559850 00000 n
+0000559915 00000 n
+0000559980 00000 n
+0000560045 00000 n
+0000560110 00000 n
+0000560175 00000 n
+0000560240 00000 n
+0000560305 00000 n
+0000560370 00000 n
+0000560435 00000 n
+0000560500 00000 n
+0000560565 00000 n
+0000560630 00000 n
+0000560695 00000 n
+0000560760 00000 n
+0000560823 00000 n
+0000560888 00000 n
+0000560953 00000 n
+0000561018 00000 n
+0000561083 00000 n
+0000561148 00000 n
+0000561213 00000 n
+0000561278 00000 n
+0000561343 00000 n
+0000561407 00000 n
+0000561472 00000 n
+0000561537 00000 n
+0000561601 00000 n
+0000567827 00000 n
+0000564525 00000 n
+0000561868 00000 n
+0000564650 00000 n
+0000564714 00000 n
+0000564779 00000 n
+0000564844 00000 n
+0000564909 00000 n
+0000564973 00000 n
+0000565038 00000 n
+0000565103 00000 n
+0000565168 00000 n
+0000565233 00000 n
+0000565298 00000 n
+0000565363 00000 n
+0000565428 00000 n
+0000565493 00000 n
+0000565558 00000 n
+0000565623 00000 n
+0000565688 00000 n
+0000565753 00000 n
+0000565818 00000 n
+0000565883 00000 n
+0000565948 00000 n
+0000566013 00000 n
+0000566077 00000 n
+0000566142 00000 n
+0000566207 00000 n
+0000566272 00000 n
+0000566337 00000 n
+0000566402 00000 n
+0000566467 00000 n
+0000566531 00000 n
+0000566596 00000 n
+0000566661 00000 n
+0000566726 00000 n
+0000566791 00000 n
+0000566856 00000 n
+0000566921 00000 n
+0000566985 00000 n
+0000567050 00000 n
+0000567115 00000 n
+0000567180 00000 n
+0000567245 00000 n
+0000567310 00000 n
+0000567375 00000 n
+0000567440 00000 n
+0000567504 00000 n
+0000567569 00000 n
+0000567634 00000 n
+0000567699 00000 n
+0000567763 00000 n
+0000884713 00000 n
+0000574234 00000 n
+0000570024 00000 n
+0000568017 00000 n
+0000570149 00000 n
+0000570213 00000 n
+0000570278 00000 n
+0000570342 00000 n
+0000570407 00000 n
+0000570472 00000 n
+0000570537 00000 n
+0000570602 00000 n
+0000570667 00000 n
+0000570732 00000 n
+0000570797 00000 n
+0000570862 00000 n
+0000570926 00000 n
+0000570991 00000 n
+0000571056 00000 n
+0000571121 00000 n
+0000571186 00000 n
+0000571251 00000 n
+0000571316 00000 n
+0000571381 00000 n
+0000571446 00000 n
+0000571510 00000 n
+0000571575 00000 n
+0000571640 00000 n
+0000571705 00000 n
+0000571770 00000 n
+0000571835 00000 n
+0000571900 00000 n
+0000571965 00000 n
+0000572030 00000 n
+0000572094 00000 n
+0000572159 00000 n
+0000572224 00000 n
+0000572289 00000 n
+0000572354 00000 n
+0000572419 00000 n
+0000572484 00000 n
+0000572549 00000 n
+0000572614 00000 n
+0000572679 00000 n
+0000572744 00000 n
+0000572809 00000 n
+0000572873 00000 n
+0000572938 00000 n
+0000573003 00000 n
+0000573068 00000 n
+0000573133 00000 n
+0000573198 00000 n
+0000573263 00000 n
+0000573328 00000 n
+0000573393 00000 n
+0000573457 00000 n
+0000573522 00000 n
+0000573587 00000 n
+0000573652 00000 n
+0000573717 00000 n
+0000573782 00000 n
+0000573847 00000 n
+0000573912 00000 n
+0000573977 00000 n
+0000574041 00000 n
+0000574106 00000 n
+0000574170 00000 n
+0000580455 00000 n
+0000576765 00000 n
+0000574398 00000 n
+0000576890 00000 n
+0000576954 00000 n
+0000577019 00000 n
+0000577083 00000 n
+0000577148 00000 n
+0000577213 00000 n
+0000577278 00000 n
+0000577343 00000 n
+0000577408 00000 n
+0000577473 00000 n
+0000577538 00000 n
+0000577603 00000 n
+0000577667 00000 n
+0000577732 00000 n
+0000577797 00000 n
+0000577862 00000 n
+0000577927 00000 n
+0000577992 00000 n
+0000578057 00000 n
+0000578122 00000 n
+0000578187 00000 n
+0000578252 00000 n
+0000578316 00000 n
+0000578381 00000 n
+0000578446 00000 n
+0000578511 00000 n
+0000578576 00000 n
+0000578641 00000 n
+0000578706 00000 n
+0000578771 00000 n
+0000578836 00000 n
+0000578901 00000 n
+0000578965 00000 n
+0000579030 00000 n
+0000579095 00000 n
+0000579160 00000 n
+0000579225 00000 n
+0000579290 00000 n
+0000579355 00000 n
+0000579420 00000 n
+0000579485 00000 n
+0000579549 00000 n
+0000579614 00000 n
+0000579679 00000 n
+0000579743 00000 n
+0000579808 00000 n
+0000579873 00000 n
+0000579938 00000 n
+0000580003 00000 n
+0000580068 00000 n
+0000580133 00000 n
+0000580198 00000 n
+0000580263 00000 n
+0000580327 00000 n
+0000580391 00000 n
+0000585779 00000 n
+0000583129 00000 n
+0000580632 00000 n
+0000583254 00000 n
+0000583318 00000 n
+0000583383 00000 n
+0000583447 00000 n
+0000583512 00000 n
+0000583577 00000 n
+0000583642 00000 n
+0000583707 00000 n
+0000583772 00000 n
+0000583837 00000 n
+0000583902 00000 n
+0000583967 00000 n
+0000584031 00000 n
+0000584096 00000 n
+0000584161 00000 n
+0000584226 00000 n
+0000584291 00000 n
+0000584356 00000 n
+0000584421 00000 n
+0000584486 00000 n
+0000584551 00000 n
+0000584615 00000 n
+0000584680 00000 n
+0000584745 00000 n
+0000584810 00000 n
+0000584875 00000 n
+0000584940 00000 n
+0000585005 00000 n
+0000585070 00000 n
+0000585135 00000 n
+0000585199 00000 n
+0000585264 00000 n
+0000585329 00000 n
+0000585394 00000 n
+0000585459 00000 n
+0000585587 00000 n
+0000585651 00000 n
+0000585715 00000 n
+0000589859 00000 n
+0000590015 00000 n
+0000590170 00000 n
+0000590326 00000 n
+0000590486 00000 n
+0000590647 00000 n
+0000590807 00000 n
+0000590967 00000 n
+0000591123 00000 n
+0000591283 00000 n
+0000591444 00000 n
+0000591611 00000 n
+0000591777 00000 n
+0000591942 00000 n
+0000601102 00000 n
+0000592739 00000 n
+0000589569 00000 n
+0000586036 00000 n
+0000592101 00000 n
+0000592165 00000 n
+0000592229 00000 n
+0000592293 00000 n
+0000592357 00000 n
+0000592421 00000 n
+0000592484 00000 n
+0000592548 00000 n
+0000592675 00000 n
+0000589711 00000 n
+0000601258 00000 n
+0000601414 00000 n
+0000601574 00000 n
+0000601741 00000 n
+0000601908 00000 n
+0000602069 00000 n
+0000602236 00000 n
+0000602403 00000 n
+0000602564 00000 n
+0000602725 00000 n
+0000602892 00000 n
+0000603059 00000 n
+0000603226 00000 n
+0000603393 00000 n
+0000603560 00000 n
+0000603720 00000 n
+0000603886 00000 n
+0000604053 00000 n
+0000604220 00000 n
+0000604379 00000 n
+0000604540 00000 n
+0000604696 00000 n
+0000604850 00000 n
+0000605010 00000 n
+0000605169 00000 n
+0000605330 00000 n
+0000605488 00000 n
+0000605644 00000 n
+0000605805 00000 n
+0000605965 00000 n
+0000606126 00000 n
+0000606286 00000 n
+0000606447 00000 n
+0000606608 00000 n
+0000606765 00000 n
+0000606927 00000 n
+0000607089 00000 n
+0000607257 00000 n
+0000607424 00000 n
+0000607592 00000 n
+0000607760 00000 n
+0000607927 00000 n
+0000608095 00000 n
+0000608262 00000 n
+0000608430 00000 n
+0000608598 00000 n
+0000608766 00000 n
+0000608935 00000 n
+0000609103 00000 n
+0000609272 00000 n
+0000609439 00000 n
+0000609600 00000 n
+0000609765 00000 n
+0000611850 00000 n
+0000609995 00000 n
+0000600452 00000 n
+0000592903 00000 n
+0000609931 00000 n
+0000600594 00000 n
+0000612018 00000 n
+0000612186 00000 n
+0000612353 00000 n
+0000612521 00000 n
+0000612688 00000 n
+0000612856 00000 n
+0000613023 00000 n
+0000613192 00000 n
+0000613413 00000 n
+0000611605 00000 n
+0000610133 00000 n
+0000613349 00000 n
+0000611747 00000 n
+0000880557 00000 n
+0000613669 00000 n
+0000880819 00000 n
+0000613696 00000 n
+0000880685 00000 n
+0000613789 00000 n
+0000614028 00000 n
+0000614053 00000 n
+0000626038 00000 n
+0000614281 00000 n
+0000614384 00000 n
+0000626280 00000 n
+0000627004 00000 n
+0000627238 00000 n
+0000640670 00000 n
+0000627554 00000 n
+0000627657 00000 n
+0000640904 00000 n
+0000641650 00000 n
+0000641876 00000 n
+0000652910 00000 n
+0000642023 00000 n
+0000642121 00000 n
+0000653150 00000 n
+0000653828 00000 n
+0000654059 00000 n
+0000655170 00000 n
+0000654114 00000 n
+0000654211 00000 n
+0000655413 00000 n
+0000656023 00000 n
+0000656227 00000 n
+0000656254 00000 n
+0000656281 00000 n
+0000658656 00000 n
+0000656473 00000 n
+0000656579 00000 n
+0000658904 00000 n
+0000659587 00000 n
+0000659797 00000 n
+0000669756 00000 n
+0000660413 00000 n
+0000660544 00000 n
+0000669996 00000 n
+0000671088 00000 n
+0000671292 00000 n
+0000673896 00000 n
+0000671493 00000 n
+0000671599 00000 n
+0000674143 00000 n
+0000674830 00000 n
+0000675040 00000 n
+0000676725 00000 n
+0000675153 00000 n
+0000675259 00000 n
+0000676974 00000 n
+0000677627 00000 n
+0000677838 00000 n
+0000683362 00000 n
+0000678191 00000 n
+0000678302 00000 n
+0000683606 00000 n
+0000684382 00000 n
+0000684587 00000 n
+0000692217 00000 n
+0000685045 00000 n
+0000685160 00000 n
+0000692457 00000 n
+0000693347 00000 n
+0000693550 00000 n
+0000694300 00000 n
+0000693584 00000 n
+0000693679 00000 n
+0000694539 00000 n
+0000695135 00000 n
+0000695337 00000 n
+0000701730 00000 n
+0000695794 00000 n
+0000695902 00000 n
+0000701970 00000 n
+0000702855 00000 n
+0000703059 00000 n
+0000705663 00000 n
+0000703249 00000 n
+0000703355 00000 n
+0000705906 00000 n
+0000706578 00000 n
+0000706782 00000 n
+0000708802 00000 n
+0000706896 00000 n
+0000707000 00000 n
+0000709044 00000 n
+0000709689 00000 n
+0000709894 00000 n
+0000712947 00000 n
+0000710185 00000 n
+0000710292 00000 n
+0000713187 00000 n
+0000713923 00000 n
+0000714127 00000 n
+0000721389 00000 n
+0000714591 00000 n
+0000714706 00000 n
+0000721630 00000 n
+0000722511 00000 n
+0000722716 00000 n
+0000722743 00000 n
+0000722804 00000 n
+0000722997 00000 n
+0000723238 00000 n
+0000723455 00000 n
+0000728177 00000 n
+0000723814 00000 n
+0000723920 00000 n
+0000728419 00000 n
+0000729197 00000 n
+0000729401 00000 n
+0000732209 00000 n
+0000729659 00000 n
+0000729765 00000 n
+0000732449 00000 n
+0000733148 00000 n
+0000733352 00000 n
+0000742622 00000 n
+0000733836 00000 n
+0000733955 00000 n
+0000742863 00000 n
+0000743861 00000 n
+0000744066 00000 n
+0000746076 00000 n
+0000744180 00000 n
+0000744284 00000 n
+0000746318 00000 n
+0000746964 00000 n
+0000747169 00000 n
+0000749685 00000 n
+0000747416 00000 n
+0000747522 00000 n
+0000749926 00000 n
+0000750631 00000 n
+0000750836 00000 n
+0000760224 00000 n
+0000751405 00000 n
+0000751537 00000 n
+0000760466 00000 n
+0000761464 00000 n
+0000761670 00000 n
+0000768508 00000 n
+0000762102 00000 n
+0000762214 00000 n
+0000768748 00000 n
+0000769606 00000 n
+0000769809 00000 n
+0000770858 00000 n
+0000769887 00000 n
+0000769987 00000 n
+0000771098 00000 n
+0000771720 00000 n
+0000771924 00000 n
+0000777050 00000 n
+0000772293 00000 n
+0000772408 00000 n
+0000777291 00000 n
+0000778080 00000 n
+0000778285 00000 n
+0000779844 00000 n
+0000778378 00000 n
+0000778479 00000 n
+0000780083 00000 n
+0000780709 00000 n
+0000780911 00000 n
+0000783148 00000 n
+0000781090 00000 n
+0000781196 00000 n
+0000783389 00000 n
+0000784058 00000 n
+0000784263 00000 n
+0000786956 00000 n
+0000784463 00000 n
+0000784570 00000 n
+0000787198 00000 n
+0000787889 00000 n
+0000788095 00000 n
+0000788193 00000 n
+0000789237 00000 n
+0000788271 00000 n
+0000788371 00000 n
+0000789478 00000 n
+0000790102 00000 n
+0000790307 00000 n
+0000792110 00000 n
+0000790418 00000 n
+0000790521 00000 n
+0000792352 00000 n
+0000792995 00000 n
+0000800172 00000 n
+0000793201 00000 n
+0000804490 00000 n
+0000800405 00000 n
+0000807553 00000 n
+0000804779 00000 n
+0000810770 00000 n
+0000807792 00000 n
+0000813390 00000 n
+0000811014 00000 n
+0000837052 00000 n
+0000813635 00000 n
+0000856194 00000 n
+0000837359 00000 n
+0000868156 00000 n
+0000856466 00000 n
+0000871524 00000 n
+0000868406 00000 n
+0000874297 00000 n
+0000871797 00000 n
+0000877242 00000 n
+0000874549 00000 n
+0000880271 00000 n
+0000877488 00000 n
+0000884849 00000 n
+0000885010 00000 n
+0000885092 00000 n
+0000885169 00000 n
+0000892479 00000 n
+0000893144 00000 n
+0000893813 00000 n
+0000894482 00000 n
+0000895148 00000 n
+0000895817 00000 n
+0000896485 00000 n
+0000897156 00000 n
+0000897820 00000 n
+0000898489 00000 n
+0000899158 00000 n
+0000899824 00000 n
+0000900493 00000 n
+0000901162 00000 n
+0000901827 00000 n
+0000902498 00000 n
+0000903166 00000 n
+0000903835 00000 n
+0000904501 00000 n
+0000905170 00000 n
+0000905839 00000 n
+0000906505 00000 n
+0000907174 00000 n
+0000907842 00000 n
+0000908513 00000 n
+0000909178 00000 n
+0000909847 00000 n
+0000910516 00000 n
+0000911182 00000 n
+0000911851 00000 n
+0000912520 00000 n
+0000913189 00000 n
+0000913857 00000 n
+0000914525 00000 n
+0000915194 00000 n
+0000915856 00000 n
+0000916525 00000 n
+0000917194 00000 n
+0000917863 00000 n
+0000918528 00000 n
+0000919199 00000 n
+0000919867 00000 n
+0000920533 00000 n
+0000921202 00000 n
+0000921871 00000 n
+0000922540 00000 n
+0000923206 00000 n
+0000923875 00000 n
+0000924543 00000 n
+0000925211 00000 n
+0000925880 00000 n
+0000926549 00000 n
+0000927218 00000 n
+0000927884 00000 n
+0000928553 00000 n
+0000929222 00000 n
+0000929887 00000 n
+0000930558 00000 n
+0000931226 00000 n
+0000931895 00000 n
+0000932561 00000 n
+0000933230 00000 n
+0000933899 00000 n
+0000934565 00000 n
+0000935234 00000 n
+0000935902 00000 n
+0000936573 00000 n
+0000937237 00000 n
+0000937906 00000 n
+0000938575 00000 n
+0000939237 00000 n
+0000939906 00000 n
+0000940575 00000 n
+0000941241 00000 n
+0000941909 00000 n
+0000942578 00000 n
+0000943247 00000 n
+0000943913 00000 n
+0000944552 00000 n
+0000945187 00000 n
+0000945819 00000 n
+0000946454 00000 n
+0000947089 00000 n
+0000947724 00000 n
+0000948355 00000 n
+0000948992 00000 n
+0000949626 00000 n
+0000950258 00000 n
+0000950893 00000 n
+0000951528 00000 n
+0000952163 00000 n
+0000952795 00000 n
+0000953430 00000 n
+0000954064 00000 n
+0000954698 00000 n
+0000955333 00000 n
+0000955968 00000 n
+0000956603 00000 n
+0000957235 00000 n
+0000957870 00000 n
+0000958505 00000 n
+0000959213 00000 n
+0000960026 00000 n
+0000960681 00000 n
+0000961338 00000 n
+0000962009 00000 n
+0000962769 00000 n
+0000963557 00000 n
+0000964522 00000 n
+0000965659 00000 n
+0000965852 00000 n
+0000966208 00000 n
+0000966561 00000 n
+0000966914 00000 n
+0000967104 00000 n
+0000967207 00000 n
+0000967247 00000 n
+0000967379 00000 n
trailer
-<< /Size 4650 /Root 4648 0 R /Info 4649 0 R /ID [ <D64F3A26FAAB7864F77EB030AC63CA56> <D64F3A26FAAB7864F77EB030AC63CA56> ] >>
+<< /Size 4654 /Root 4652 0 R /Info 4653 0 R /ID [ <C8B3E43F752B280EC22277DF5BEE0C11> <C8B3E43F752B280EC22277DF5BEE0C11> ] >>
startxref
-961140
+967940
%%EOF
diff --git a/Master/texmf-dist/doc/lualatex/tango/README b/Master/texmf-dist/doc/lualatex/tango/README
index 1d621867107..014ae456a22 100644
--- a/Master/texmf-dist/doc/lualatex/tango/README
+++ b/Master/texmf-dist/doc/lualatex/tango/README
@@ -1,12 +1,19 @@
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
-This version number is 0.7.2
+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
+0.7.1 First release (2024-07-08)
2 License
Tango is released under Latex public project licence (LPPL), version 1.3c
@@ -14,7 +21,7 @@ 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/latex/tango/tango.cls
+TEXMF/tex/lualatex/tango/tango.cls
4 Usage
\documentclass[<options>]{tango}
diff --git a/Master/texmf-dist/doc/lualatex/tango/tango-en.pdf b/Master/texmf-dist/doc/lualatex/tango/tango-en.pdf
index 3447817ff14..d7969f1cb58 100644
--- a/Master/texmf-dist/doc/lualatex/tango/tango-en.pdf
+++ 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
index 99a6399dce2..bf7995ef176 100644
--- a/Master/texmf-dist/doc/lualatex/tango/tango-en.tex
+++ b/Master/texmf-dist/doc/lualatex/tango/tango-en.tex
@@ -26,8 +26,9 @@
\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}}}
-\date{\today\\v. 0.7.2}
+\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
@@ -63,13 +64,11 @@ Default values are in bold red. Bold options marked with a \TO{\textbf{star*}} c
\hline\endhead
\hline\multicolumn{2}{r}{\emph{Continued next page}}\endfoot
\hline\endlastfoot
-\TO{french}&\TO{french=true/\DO{false}}. Adaptation to the French language and reserved names for the tango class (theorem gives \emph{e.g.} théorème). Mandatory use for French-speaking users. This option is also passed to the babel package.\\
+
\hline
-\TO{<language options>}& Tango will pass other language options to the \TO{babel} package. Note that
-\begin{itemize}
-\item Only English and French languages are fully implemented.
-\item Even English-speaking people must pass a language option (\TO{english, british, UKenglish, USenglish} or \TO{american}) for \TO{babel} to the tango class.
-\end{itemize}
+\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}).\\
@@ -262,8 +261,7 @@ Provided commands are:
\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!
-For now, only the English and French languages are fully supported. With other languages, you benefit from the \TO{babel} facilities, but the \enquote{tango words} will remain defined by:
-\begin{verbatim}
+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}
@@ -276,7 +274,19 @@ For now, only the English and French languages are fully supported. With other l
\newcommand\TgoExercisesSubsectionName{Exercises}
\newcommand\TgoExercisesSectionName{Exercises}
\end{verbatim}
-If you want to use tango with a new language, here is what you can do:
+
+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.
diff --git a/Master/texmf-dist/doc/lualatex/tango/tango-fr.pdf b/Master/texmf-dist/doc/lualatex/tango/tango-fr.pdf
index 08767d91551..a4438d58ded 100644
--- a/Master/texmf-dist/doc/lualatex/tango/tango-fr.pdf
+++ 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
index 06cd61f378d..1ed1a70abff 100644
--- a/Master/texmf-dist/doc/lualatex/tango/tango-fr.tex
+++ b/Master/texmf-dist/doc/lualatex/tango/tango-fr.tex
@@ -26,8 +26,9 @@
\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}}}
-\date{\today\\v. 0.7.2}
+\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
@@ -59,14 +60,9 @@ Les valeurs par défaut sont présentées en bleu gras. Les options en gras, mar
\hline\endhead
\hline\multicolumn{2}{r}{\emph{Voir page suivante}}\endfoot
\hline\endlastfoot
-\hline\endlastfoot
-\TO{french}&\TO{french=true/\DO{false}}. Adaptation à la langue française et noms définis par la classe tango (\frquote{Theorem} donne par exemple \frquote{Théorème}). Usage indispensable pour les utilisateurs de langue française. Cette option est également passée au package babel.\\
-\hline
-\TO{<options de langue>}& Tango transmettra au package \TO{babel} toutes les options de langue. Notez bien que :
-\begin{itemize}
-\item Seuls l'anglais et le français sont complètement implémentés.
-\item Même les locuteurs anglais doivent passer une option de langue pour \TO{babel} (\TO{english, british, UKenglish, USenglish} ou \TO{american}) à la classe tango.
-\end{itemize}
+\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}).\\
@@ -275,24 +271,8 @@ Les commandes proposées par tango sont :
\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:
-\begin{tcolorbox}
-\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}
-\end{tcolorbox}
+Tango possède également certains mots réservés qui sont (lorsque l'option french est passée à tango) :
-Au chargement du français par babel (déclenché par l'option french), les traductions suivantes sont effectuées:
\begin{tcolorbox}
\begin{verbatim}
\renewcommand\TgoTheoremName{Théorème}
@@ -309,7 +289,16 @@ Au chargement du français par babel (déclenché par l'option french), les trad
\end{verbatim}
\end{tcolorbox}
-Pour l'instant seules les langues anglaise et française sont pleinement supportées par tango. Les autres langues bénéficient des facilités offertes par babel, mais les mots réservés de tango ne sont pas traduits.
+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.
diff --git a/Master/texmf-dist/doc/luatex/luamplib/NEWS b/Master/texmf-dist/doc/luatex/luamplib/NEWS
index 57324895f82..82e82632f62 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/NEWS
+++ b/Master/texmf-dist/doc/luatex/luamplib/NEWS
@@ -1,8 +1,47 @@
History of the luamplib package
+2024/08/03 2.34.5
+ * provide 'withgroupbbox' macro for transparency group to enable users to
+ control the bounding box
+
+ * write down the width/height/depth values of mplibgroup to the log file
+
+2024/07/31 2.34.4
+ * 'withpattern' operator accepts a <textual picture> as well as a <path>
+ for its operand. Thus users can give pattern effect to the result of btex
+ command or infont operator.
+
+ * fix regarding line width in mplibgraphictext
+
+2024/07/27 2.34.3
+ * in DVI mode, use LaTeX's shipout hooks to generate new XObjects
+ or to put resources to pageresources. (in plain, load atbegshi.sty)
+
+ * fix shading to allow the even-odd rule
+
+2024/07/24 2.34.2
+ * With the newly introduced macros, \mplibgroup ... \endmplibgroup, users
+ can define a transparency group or a normal form XObject from TeX side.
+ The LaTeX environment 'mplibgroup' is identical to this pair of macros.
+ See the document for details.
+
+ * document: be more precise about the color effect of a transparency group
+
+ * remove trailing zeros from numeric objects to get smaller PDF
+
+2024/07/19 2.34.1
+ * transparency group is available with plain format as well.
+ * transparency group once used is reusable in the TeX code or
+ in other MetaPost code chunks. see the document for details.
+
+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 fade routine to get possibly smaller pdf file
+ * improve fading routine to get possibly smaller pdf file
2024/07/08 2.33.0
* provide a new metapost operator 'withfademethod' and related macros,
diff --git a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
index a8bea32e1ae..7682155b3ce 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 50a5778870c..8435ee070ca 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex
+++ b/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex
@@ -246,19 +246,19 @@ draw mpliboutlinetext.b ("$\displaystyle\frac{1}{1-x^2}$")
\endmpfig
\par\leavevmode
\mppattern{mypatt}
- \mpfig
- picture q;
- q := btex Q etex;
- fill bbox q withcolor .8[red,white];
- draw q withcolor .8red;
- \endmpfig
+[
+ xstep = 5, ystep = 6,
+ matrix = "rotated 90 scaled .75",
+]
+\mpfig
+draw (origin--right+up) scaled 5 withcolor 1/3[blue,white] ;
+draw (up--right) scaled 5 withcolor 1/3[red,white] ;
+\endmpfig
\endmppattern
\mpfig
- fill fullcircle scaled 100 withpostscript "collect";
- draw unitsquare shifted - center unitsquare scaled 45
- withpattern "mypatt"
- withpostscript "evenodd"
- ;
+draw unitsquare shifted -center unitsquare scaled 45 withpostscript "collect" ;
+draw fullcircle scaled 100 withpattern "mypatt" withpen pencircle scaled 1
+ withcolor \mpcolor{red!50!blue!50} withpostscript "evenodd" ;
\endmpfig
\begin{mppattern}{pattuncolored}
[
@@ -271,6 +271,7 @@ draw mpliboutlinetext.b ("$\displaystyle\frac{1}{1-x^2}$")
picture tex;
tex = mpliboutlinetext.p ("\bfseries \TeX");
for i=1 upto mpliboutlinenum:
+ draw image(
j:=0;
for item within mpliboutlinepic[i]:
j:=j+1;
@@ -279,15 +280,16 @@ draw mpliboutlinetext.b ("$\displaystyle\frac{1}{1-x^2}$")
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
+ )
+ withfademethod "linear"
+ ;
endfor
\endmpfig
-\par
+\par\leavevmode
\mpfig
picture mill; mill = btex \includegraphics[width=100bp]{mill} etex;
draw mill;
@@ -295,10 +297,52 @@ draw mpliboutlinetext.b ("$\displaystyle\frac{1}{1-x^2}$")
draw mill
withfademethod "circular"
withfadecenter (center mill, center mill)
- withfaderadius (20, abs(lrcorner mill - llcorner mill)/2)
+ withfaderadius (30, 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"
+ withgroupname "test:#1"
+ withtransparency (1,.5)
+ ;
+ currentpicture := currentpicture scaled 2/3;
+ \endmpfig
+}%
+\hbox{\test{isolated,knockout}\,\test{isolated}\vbox to\MPheight{\vss\hbox{~isolated}\vss}}%
+\hbox{\test{knockout}\,\test{}}%
+\hbox to\MPwidth{\hss knockout\hss}%
+\leavevmode
+\mpfig usemplibgroup "test:isolated,knockout" scaled 2/3 rotated 15 ; \endmpfig
+\usemplibgroup{test:isolated,knockout}%
+\begin{mplibgroup}{mytex}[matrix="rotated 15"] \TeX \end{mplibgroup}%
+\hbox to0pt{\hss\vrule width.5pt height5pt depth5pt\hss}%
+\hbox to0pt{\hss\vrule width10pt height.25pt depth.25pt\hss}%
+\usemplibgroup{mytex}%
+\mpfig usemplibgroup "mytex"; draw (left--right) scaled 5; draw (up--down) scaled 5; \endmpfig
+\par
+\mpfig
+ picture test; test = mplibgraphictext "\textbf{MPLIB}"
+ fakebold 1 fillcolor "red!70" drawcolor .7red scaled 7;
+ draw test withpattern "mypatt" ;
+\endmpfig
\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 dde6fbfb10a..05c2f8138d5 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-plain.tex
+++ b/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-plain.tex
@@ -1,4 +1,4 @@
-\input luaotfload.sty
+%\input luaotfload.sty
\input miniltx
\input color
\definecolor{orange}{cmyk}{0,.5,1,0}
@@ -263,6 +263,7 @@ draw mpliboutlinetext.b ("$\overbrace{x+\cdots+x}^k$")
\mpfig
picture tex;
tex = mpliboutlinetext.p ("\bf \TeX");
+ draw image(
for i=1 upto mpliboutlinenum:
j:=0;
for item within mpliboutlinepic[i]:
@@ -272,13 +273,50 @@ draw mpliboutlinetext.b ("$\overbrace{x+\cdots+x}^k$")
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
+ )
+ withfademethod "linear"
+ ;
+\endmpfig
+\par\leavevmode
+\mpfig
+fill fullcircle scaled 125 withcolor 2/3[blue,white];
+fill fullcircle scaled 80 withcolor 2/3[red,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 ""
+ withgroupname "testTRgroup"
+ withprescript "tr_transparency=.3"
+ ;
+\endmpfig
+\mpfig
+fill fullcircle scaled 125 withcolor 2/3[red,white];
+fill fullcircle scaled 80 withcolor 2/3[blue,white];
+usemplibgroup "testTRgroup"
+ withfademethod "circular"
+ withfaderadius (0,60)
+ ;
+\endmpfig
+\mplibgroup{mytex}[matrix="rotated 15"] \TeX \endmplibgroup
+\hbox to0pt{\hss\vrule width.5pt height5pt depth5pt\hss}%
+\hbox to0pt{\hss\vrule width10pt height.25pt depth.25pt\hss}%
+\usemplibgroup{mytex}%
+\mpfig usemplibgroup "mytex"; draw (left--right) scaled 5; draw (up--down) scaled 5; \endmpfig
+\par
+\mpfig
+ picture test; test = mplibgraphictext "\bf MPLIB"
+ fakebold 1 fillcolor .7[white,blue] drawcolor .7blue scaled 7;
+ draw test withpattern "pattuncolored" ;
\endmpfig
\tracingcommands0
diff --git a/Master/texmf-dist/doc/man/man1/citeproc-lua.1 b/Master/texmf-dist/doc/man/man1/citeproc-lua.1
index 2f51415907c..63c3c992d78 100644
--- a/Master/texmf-dist/doc/man/man1/citeproc-lua.1
+++ b/Master/texmf-dist/doc/man/man1/citeproc-lua.1
@@ -1,4 +1,4 @@
-.TH citeproc-lua 1 "0.5.0"
+.TH citeproc-lua 1 "0.6.0"
.SH NAME
citeproc-lua \- make CSL citations and bibliography for LaTeX
.SH SYNOPSIS
diff --git a/Master/texmf-dist/doc/man/man1/citeproc-lua.man1.pdf b/Master/texmf-dist/doc/man/man1/citeproc-lua.man1.pdf
index 353bc49d1fc..c420331dc24 100644
--- a/Master/texmf-dist/doc/man/man1/citeproc-lua.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/citeproc-lua.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/man/man1/dviasm.man1.pdf b/Master/texmf-dist/doc/man/man1/dviasm.man1.pdf
index df9680f5a3b..93019642713 100644
--- a/Master/texmf-dist/doc/man/man1/dviasm.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/dviasm.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/man/man1/pagelayoutapi.man1.pdf b/Master/texmf-dist/doc/man/man1/pagelayoutapi.man1.pdf
index 493cc4b9053..34b112c7e12 100644
--- a/Master/texmf-dist/doc/man/man1/pagelayoutapi.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/pagelayoutapi.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/man/man1/textestvis.man1.pdf b/Master/texmf-dist/doc/man/man1/textestvis.man1.pdf
index a80e47cc034..9c7afd85bf4 100644
--- a/Master/texmf-dist/doc/man/man1/textestvis.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/textestvis.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/plain/pwebmac/README.md b/Master/texmf-dist/doc/plain/pwebmac/README.md
index f2554f6fb9c..8d0c1d16674 100644
--- a/Master/texmf-dist/doc/plain/pwebmac/README.md
+++ b/Master/texmf-dist/doc/plain/pwebmac/README.md
@@ -38,4 +38,4 @@ file), and `hitex` creates HINT output that can be viewed with the
The `pwebmac` package is free software and may be used without constraints.
-This is version **4.12** of the `pwebmac` package — 2024-05-24, Andreas Scherer.
+This is version **5.0** of the `pwebmac` package — 2024-08-12, Andreas Scherer.
diff --git a/Master/texmf-dist/doc/plain/pwebmac/editorsnote.tex b/Master/texmf-dist/doc/plain/pwebmac/editorsnote.tex
new file mode 100644
index 00000000000..06c21010d9c
--- /dev/null
+++ b/Master/texmf-dist/doc/plain/pwebmac/editorsnote.tex
@@ -0,0 +1,22 @@
+\font\ninett=cmtt9
+
+\def\editorsnote{\noindent Editor's Note: The present variant of
+ this {\ninett C/WEB} source file has been modified for use in
+ the \TeX~Live system.}
+
+\def\changedsections{\jobname.chs}
+\def\readchanges{\input \changedsections}
+\newread\testread \newwrite\writechanges
+\openin\testread=\changedsections\relax
+\ifeof\testread % First run
+ \let\readchanges=\relax
+ \let\CH=\ch
+ \def\ch#1.{\begingroup
+ \let\\=\BS \let\*=\let \let\ch=\relax
+ \immediate\openout\writechanges=\changedsections
+ \immediate\write\writechanges{\par\noindent\ch#1.}
+ \immediate\closeout\writechanges
+ \let\ch=\CH \ch#1.
+ \endgroup}
+\else\closein\testread % Second run
+\fi
diff --git a/Master/texmf-dist/doc/plain/pwebmac/index.md b/Master/texmf-dist/doc/plain/pwebmac/index.md
index 711e0c2ba92..870b524af00 100644
--- a/Master/texmf-dist/doc/plain/pwebmac/index.md
+++ b/Master/texmf-dist/doc/plain/pwebmac/index.md
@@ -61,7 +61,9 @@ directly.
[`WEBMAN`](web/webman.pdf) \|
[`WEAVE`](web/weave.pdf)+[`chg`](web/weave-changes.pdf) \|
[`TANGLE`](web/tangle.pdf)+[`chg`](web/tangle-changes.pdf) \|
- [`TWILL`](web/twill.pdf) \]
+ [`TWILL`](web/twill.pdf)[^1] \]
+
+[^1]: `TWILL` is presented here as a changed variant of `WEAVE`.
## Complementary WEB programs by other authors
@@ -81,13 +83,20 @@ directly.
[`COMMON`](cweb/common.pdf)+[`chg`](cweb/common-changes.pdf) \|
[`CTANGLE`](cweb/ctangle.pdf)+[`chg`](cweb/ctangle-changes.pdf) \|
[`CWEAVE`](cweb/cweave.pdf)+[`chg`](cweb/cweave-changes.pdf) \|\
- [`CTWILL`](cweb/ctwill.pdf) \|
+ [`CTWILL`](cweb/ctwill.pdf)[^2] \|
[`REFSORT`](cweb/refsort.pdf)+[`chg`](cweb/refsort-changes.pdf) \|
[`TWINX`](cweb/twinx.pdf)+[`chg`](cweb/twinx-changes.pdf) \]
* `ctie/` \[ [`CTIE`](ctie/ctie.pdf)+[`chg`](ctie/ctie-changes.pdf) \]
* `tie/` \[ [`TIE`](tie/tie.pdf)+[`chg`](tie/tie-changes.pdf) \]
* `hitex/` \[ [`HiTeX`](hitex/hitex.pdf) \]
-* `mp/` \[ [`MetaPost`](mp/mp.pdf) \]
+* `mp/` \[ [`MP`](mp/mp.pdf) \| [`MPOST`](mp/mpost.pdf) \][^3]
+
+[^2]: `CTWILL` is presented here in its own format with “mini-indexes†for
+ every two consecutive pages.
+
+[^3]: `MP` and `MPOST` have received quite a few changes “behind the scenes†in
+ order to present them in this collection; see project
+ [`mplibdir`](https://github.com/ascherer/mplibdir) for details.
## Errata for “Computers & Typesetting†by Donald E.\ Knuth
@@ -109,4 +118,4 @@ directly.
## Happy C/WEB Programming!
-2024-05-20 Andreas Scherer
+2024-08-11 Andreas Scherer
diff --git a/Master/texmf-dist/doc/plain/pwebmac/makeall b/Master/texmf-dist/doc/plain/pwebmac/makeall
index 6be5b6e91a2..0b42f35ee87 100644
--- a/Master/texmf-dist/doc/plain/pwebmac/makeall
+++ b/Master/texmf-dist/doc/plain/pwebmac/makeall
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
PROG=$(basename $0)
@@ -11,7 +11,7 @@ Test driver for 'pwebmac.tex' in combination with various TeX engines.
Produce TeX output in DVI, PDF or HINT format from a set of C/WEB programs
included in the 'TeX Live' source tree.
-Options are (--long options only with GNU getopt):
+Options are (--long options only with Linux-getopt):
-c, --changes Apply change file to C/WEB source
-f, --files STRING Process only subset of C/WEB programs
-h, --help Print this help message and exit
@@ -28,7 +28,7 @@ HELP
LONGOPTS=changes,files:,help,new,outdir:,pdftocfront,tex:,validpdf
SHRTOPTS=cf:hno:pt:v
-CHANGES=false # apply changefile to C/WEB source
+CHANGES= # apply changefile to C/WEB source
FILESELECT=false # user-defined '--files' selection
NEW=false # '\input pwebmac' instead of '\input webmac' for PDF et al.
OUTDIR=. # path where the resulting tarballs are placed
@@ -36,6 +36,9 @@ PDFTOCFRONT=false # push table-of-contents to front of PDF output
TEX=tex # or 'pdftex' or 'xetex' or 'hitex' or 'luatex'
VALID=false # give 'pdftex' a chance to produce valid output
+# Extra material -- unpublished
+LOCALSTUFF=/opt/github/web
+
# Initial list of C/WEB sources to process, overridable with option '-f':
KNUTHWHERE=$(locate /bibtex.web)
if [ -z "$KNUTHWHERE" ]
@@ -46,7 +49,8 @@ KNUTHWARE=$(dirname $KNUTHWHERE)
FILES="$KNUTHWARE/*.web pdftex.web xetex.web twill"
WEBINPUTS=$KNUTHWARE//:
-FILES="$FILES common ctangle cweave ctwill refsort twinx ctie tie hitex mp"
+FILES="$FILES common ctangle cweave ctwill refsort twinx ctie tie hitex \
+ mp mpost mpmath mpmathbinary mpmathdecimal mpmathdouble mpstrings tfmin"
CWEBINPUTS=$KNUTHWARE//:
KNUTHWHERE=$(locate /glue.web)
@@ -58,7 +62,7 @@ fi
export WEBINPUTS CWEBINPUTS
-getopt -T >/dev/null
+getopt -T >/dev/null && true # keep going
if [ $? -eq 4 ] # Check for Linux-getopt with extensions
then OPTS=$(getopt -n $PROG -o $SHRTOPTS -l $LONGOPTS -- "$@")
@@ -73,7 +77,7 @@ fi
while true
do
case "$1" in
- -c | --changes ) CHANGES=true; shift ;;
+ -c | --changes ) CHANGES="-changes"; shift ;;
-f | --files ) FILES="$2"; FILESELECT=true; shift 2 ;;
-h | --help ) usage; exit 0 ;;
-n | --new ) NEW=true; shift ;;
@@ -106,50 +110,51 @@ case "$TEX" in
pdftex | luatex ) # actually only necessary for 'pwebmac.tex'
VALID=true ;;
- tex ) # plain TeX
- XETEX="$XETEX --no-pdf" # XeTeX's extended DVI format
+ * ) # plain TeX and XeTeX use different approaches
+ [ tex = "$TEX" ] && XETEX="$XETEX --no-pdf"
+ # XeTeX's extended DVI format
VALID=false ;;
-
- * ) VALID=false ;; # plain TeX and XeTeX use different approach
esac
# Valid PDF output from 'pdftex' and 'luatex': In 'pwebmac.tex' set '\countD'
# to the actual number of @<named modules@>, not the number of all sections.
-if $VALID
+if $VALID && { [ pdftex = "$TEX" ] || [ luatex = "$TEX" ]; }
then
NEW=true # PDF output requires 'pwebmac.tex'
TEX="$TEX --shell-escape"
fi
# Use alternative TeX macros more suited for PDF output.
-if $NEW
-then WEAVE="$WEAVE -p"
-fi
+[ -n "$CHANGES" ] && NEW=true
+$NEW && WEAVE="$WEAVE -p"
-# WEB and CWEB programs we want to get formatted
+# Loop over WEB and CWEB programs we want to get formatted
for f in $FILES
do
f=$(basename $f .web)
case $f in
pdftex ) # Fix several 'Overfull \hbox'es
- tie -m $f.web $f.web /opt/github/web/$f.ch ;;
+ tie -m $f.web $f.web $LOCALSTUFF/$f.ch ;;
- hitex | mp ) # Beautifications for 'hitex.w' and 'mp.w'
- tie -m $f.w $f.w /opt/github/web/$f.ch ;;
+ mp | mpost | mpmath* | mpstrings | tfmin )
+ # Beautifications for MetaPost
+ tie -m $f.w $f.w $LOCALSTUFF/$f.ch ;;
weave | twill )
- cp $KNUTHWARE/weave.web .
if [ "$HITEX" = "$TEX" ] # Fix non-constant factor
- then $SED_I -e "s/\\\\the\\\\hsize/460pt/" weave.web
+ then
+ cp $KNUTHWARE/weave.web .
+ $SED_I weave.web -e 's/\\the\\hsize/460pt/'
fi ;;
esac
- if $CHANGES
+ if [ -n "$CHANGES" ]
then
case $f in
# These are changes in and of themselves
- ctwill | twill | glue | hitex | mp ) continue ;;
+ ctwill | twill | glue | hitex | mp | mpost | \
+ mpmath* | mpstrings | tfmin ) continue ;;
# CWEB programs have individual changefiles
common ) $CWEAVE $f comm-w2c ;;
@@ -162,93 +167,82 @@ do
# main WEB programs have complex change files
tex | mf | pdftex | xetex )
WEBINPUTS=.:$KNUTHWARE/../../Work//:$WEBINPUTS: \
- $WEAVE $f $f-final
-
- # FIX: XeTeX uses '\pdfTeX' from section 114,
- # which is not changed and thus 'disappears';
- # repeat in preamble.
- if [ xetex = $f ]
- then $SED_I -e "s/\(\\\\let\\\\maybe\)/\\\\def\\\\pdfTeX{pdf\\\\TeX}\n\1/" $f.tex
- fi ;;
+ $WEAVE $f $f-final ;;
# all other WEB codes have singular changefiles
* ) $WEAVE $f $f ;;
esac
# only document changed modules/sections
- $SED_I -e "s/\(\\\\let\\\\maybe=\)\\\\iftrue/\1\\\\iffalse/" \
- $f.tex
- else
+ $SED_I $f.tex -e '/\\let\\maybe/s/\\iftrue/\\iffalse/'
+ else # -z $CHANGES
case $f in
- ctwill )
- # apply tons of editorial changes to 'ctwill.w'
- if [ "$HITEX" = "$TEX" ]
- then ctie -m $f.w cweave.w $f-w2c.ch $f-hint.ch
- else ctie -m $f.w cweave.w $f-w2c.ch $f-mini.ch
- fi
+ ctwill ) # apply tons of editorial changes to 'ctwill.w'
+ [ "$HITEX" = "$TEX" ] &&
+ ctie -m $f.w cweave.w $f-w2c.ch $f-hint.ch ||
+ ctie -m $f.w cweave.w $f-w2c.ch $f-mini.ch
$CTWILL $f # prime the pump
$CTWILL $f ;; # get decent answers
c* | refsort | twinx | tie ) $CWEAVE $f ;;
+ hitex ) $CWEAVE $f || true ;; # lots of unused sections
- hitex | mp ) CWEBINPUTS=.: $CWEAVE $f ;;
+ mp | mpost | mpmath* | mpstrings | tfmin )
+ CWEBINPUTS=.: $CWEAVE $f ;;
- twill )
- WEBINPUTS=.:$WEBINPUTS \
- tie -m $f.web weave.web weave.ch weav-$f.ch
- WEBINPUTS=.: $WEAVE $f ;;
+ twill ) WEBINPUTS=.:$WEBINPUTS \
+ tie -c $f.ch weave.web weave.ch weav-$f.ch
+ WEBINPUTS=.:$WEBINPUTS $WEAVE weave $f $f ;;
- pdftex | weave ) WEBINPUTS=.: $WEAVE $f ;;
+ pdftex | weave ) WEBINPUTS=.:$WEBINPUTS $WEAVE $f ;;
* ) $WEAVE $f ;;
esac
- fi
+ fi # $CHANGES
# 'pwebmac' is for WEB only; do nothing for CWEB programs
- if $NEW && echo $f | grep -v -q -E '^c|refsort|twinx|tie|hitex|mp'
+ if $NEW && echo $f | grep -v -q -E \
+ '^c|refsort|twinx|tie|hitex|^mp|tfmin'
then
# timestamp on table-of-contents page or the first page
case $f in
bibtex | patgen | tangle | weave | twill )
- $SED_I -e "s/\(\\\\def\\\\title\)/\\\\datecontentspage\n\1/" $f.tex ;;
+ $SED_I $f.tex -e 's/\\def\\title{/\\datecontentspage\n&/' ;; # }
mf | tex | pdftex | xetex )
- $SED_I -e "s/\(\\\\def\\\\topofcontents\)/\\\\datethis\n\\\\emergencystretch=.1\\\\hsize\n\1/" $f.tex
-
# amend '\N' redefinition for PDF outlines in
# Metafont and TeX (also pdfTeX and XeTeX)
# 'pwebmac' defines headers differently
- $SED_I -e "s/\(\\\\outer\\\\def\\\\N.*{\)/\1%/" \
- -e "s/\\\\def\\\\rhead\(.*}\)/\\\\gtitle=\1\\\\MN#1.\\\\vfill\\\\eject/" \
- $f.tex
-
+ cat > texmf-pdf.sed << 'FI'
+s/\\outer\\def\\N.*{/&%/
+s/\\def\\rhead\({.*}\)/\\gtitle=\1\\MN#1.\\vfill\\eject/
+s/\\def\\title{/\\datethis\n\\emergencystretch=.1\\hsize\n&/
+FI
# active links in PDF outlines/bookmarks
- cat > texmf-pdf.patch << FI
- \ifpdf{\toksF={}\makeoutlinetoks{[#2] #3}\outlinedone\outlinedone}\fi
+ cat > texmf-pdf.patch1 << FI
+ \ifpdf{\makeoutlinetoks{[#2] #3}\outlinedone}\fi
FI
- $SED_I -e "/\\\\outer\\\\def\\\\N/ {
- r texmf-pdf.patch
- }" $f.tex
-
- $SED_I -e "s/{\\\\the\\\\pageno}}}\\\\next/{\\\\the\\\\pageno}{\\\\the\\\\toksE}}}\\\\next/" $f.tex
-
- cat > texmf-pdf.patch << FI
+ cat >> texmf-pdf.sed << 'FI'
+/\\outer\\def\\N/r texmf-pdf.patch1
+s/{\\the\\pageno}/&{\\the\\toksE}/
+FI
+ cat > texmf-pdf.patch2 << FI
\ifpdflua\relax\else
\ifpdf\special{pdf: outline 0 << /Title (\the\toksE) /Dest
[ @thispage /FitH @ypos ] >>}\fi\fi
FI
- $SED_I -e "/ \\\\edef\\\\next/ {
- r texmf-pdf.patch
- }" $f.tex
- rm texmf-pdf.patch ;;
-
- * ) $SED_I -e "s/\(\\\\def\\\\botofcontents\)/%\1/" \
- -e "s/ \\\\centerline{\(\\\\hsize\)/\\\\def\\\\covernote{\1/" \
- -e "s/\(Publishing Company.}}\)}/\1\n\\\\datecontentspage/" \
- -e "s/\(trademark of the American Mathematical Society.}}\)}/\1\n\\\\datecontentspage/" \
- $f.tex ;;
+ cat >> texmf-pdf.sed << 'FI'
+/\\edef\\next/r texmf-pdf.patch2
+FI
+ $SED_I $f.tex -f texmf-pdf.sed
+ rm -f texmf-pdf.* ;;
+
+ * ) $SED_I $f.tex -e '/\\def\\botofcontents/d' \
+ -e 's/ \\centerline{\(\\hsize\)/\\def\\covernote{\1/' \
+ -e 's/\(Publishing Company.}}\)}/\1\n\\datecontentspage/' \
+ -e 's/\(Mathematical Society.}}\)}/\1\n\\datecontentspage/' ;;
esac
- fi
+ fi # $NEW
# special treatment for individual C/WEB programs
case $f in
@@ -258,56 +252,92 @@ FI
# 'E' no longer free to be active character
# fix table-of-contents page for bibtex
# FIX: don't wait for Oren Patashnik.
- bibtex ) $SED_I -e "s/\\\\def\\\\titlepage{F}/\\\\titletrue/" $f.tex
- if ! $CHANGES
- then $SED_I -e "71,78d" $f.tex
- fi ;;
+ bibtex ) $SED_I $f.tex -e 's/\\def\\titlepage{F}/\\titletrue/'
+ [ -z "$CHANGES" ] && $SED_I $f.tex -e "71,78d" ;;
+
+ # FIX: GFtoDVI uses 'Metafont' in a module name;
+ # this should appear correctly in the bookmarks, too.
+ gftodvi ) $NEW && $SED_I $f.tex \
+ -e 's/\\def\\(/\\ifpdf\\sanitizecommand\\MF{Metafont}\\fi\n\n&/' ;; # )
# FIX: 'glue.web' obviously uses an old 'webmac.tex'.
- glue ) $SED_I -e "s/\(\\\\def\\\\title{GLUE}\)/\1\n\\\\pageno=\\\\contentspagenumber \\\\advance\\\\pageno by1\\\\relax/" \
- -e "s/titlefalse/titletrue/" $f.tex ;;
+ glue ) $SED_I $f.tex -e 's/titlefalse/titletrue/' \
+ -e 's/\\def\\title{GLUE}/&\n\\pageno=\\contentspagenumber \\advance\\pageno by1\\relax/' ;;
+
+ # FIX: Metafont uses '\over' in several module names;
+ # this should appear correctly in the bookmarks, too.
+ mf ) $NEW && $SED_I $f.tex \
+ -e 's/\\def\\(/\\ifpdf\n\\sanitizecommand\\MF{Metafont}\n\\sanitizecommand\\over{\/}\n\\sanitizecommand\\langle{<}\n\\sanitizecommand\\rangle{>}\n\\fi\n\n&/' ;; # )
+
+ # FIX: MFT uses '\pb' in several module names;
+ # this should appear correctly in the bookmarks, too.
+ mft ) $NEW && $SED_I $f.tex \
+ -e 's/\\def\\pb.*/&\n\\ifpdf\\sanitizecommand\\pb{\|...\|}\\fi/' ;;
# FIX: pdfTeX uses '\pdfTeX' in section names; these should
# appear correctly in the bookmarks, too.
- pdftex )
- if $NEW && [ tex != "$TEX" ] && [ "$HITEX" != "$TEX" ]
- then $SED_I -e "s/\(\\\\def\\\\pdfTeX{pdf\\\\TeX}\)/\1 \\\\sanitizecommand\\\\pdfTeX{pdfTeX}\\\\sanitizecommand\\\\eTeX{e-TeX}/" $f.tex
- fi ;;
+ pdftex ) $NEW && $SED_I $f.tex \
+ -e 's/\\def\\pdfeTeX{pdf\\eTeX}/&\n\\ifpdf\n\\sanitizecommand\\pdfTeX{pdfTeX}\n\\sanitizecommand\\eTeX{e-TeX}\n\\sanitizecommand\\over{\/}\n\\fi/' ;;
# FIX: weave uses '\max' in name of module 173; this should
# appear correctly in the bookmarks, too.
- weave )
- if $NEW && [ tex != "$TEX" ] && [ "$HITEX" != "$TEX" ]
- then $SED_I -e "s/\(\\\\def\\\\({}\)/\\\\sanitizecommand\\\\max{max}\n\1/" $f.tex
- fi ;;
+ weave ) $NEW && $SED_I $f.tex \
+ -e 's/\\def\\({}/\\ifpdf\\sanitizecommand\\max{max}\\fi\n&/' ;; # )
# FIX: purge obsolete macros from XeTeX.
- xetex ) $SED_I -e "/\\\\input xewebmac/d" $f.tex ;;
+ # FIX: XeTeX uses '\pdfTeX' from section 114, which is not
+ # changed and thus 'disappears'; repeat in preamble.
+ # FIX: apply '\sanitizecommand' for bookmarks.
+ xetex ) $SED_I $f.tex -e '/\\input xewebmac/d' \
+ -e 's/\\let\\maybe/\\def\\pdfTeX{pdf\\TeX}\n&/'
+ $NEW && $SED_I $f.tex \
+ -e 's/\\def\\pdfTeX{pdf\\TeX}/&\n\\ifpdf\\sanitizecommand\\pdfTeX{pdfTeX}\\fi/' \
+ -e 's/\\def\\eTeX/\\ifpdf\n\\sanitizecommand\\eTeX{e-TeX}\n\\sanitizecommand\\over{\/}\n\\fi\n&/' ;;
# timestamp on table-of-contents page or the first page
- hitex | mp ) $SED_I -e "s/\(\\\\def\\\\topofcontents\)/\\\\datethis\n\\\\emergencystretch=.1\\\\hsize\n\1/" $f.tex ;;
+ hitex | mp ) $SED_I $f.tex -e 's/\\def\\topofcontents/\\datethis\n\\emergencystretch=.1\\hsize\n&/' ;;
+ common | ctangle | cweave | ctie | tie ) $SED_I $f.tex -e 's/\\def\\botofcontents/\\datethis\n&/' ;;
+ mpost | mpmath* | mpstrings | tfmin ) $SED_I $f.tex -e 's/\\def\\title{/\\datecontentspage\n\n&/' ;; # }
esac
# shift table-of-contents pages to the front in PDF
if $PDFTOCFRONT && echo $f | grep -v -q -E 'ctwill|hitex'
+ then $SED_I $f.tex \
+ -e '0,/\\N[1{]/s/\\N[1{]/\\input pdfwebtocfront\n\n&/'
+ fi # $PDFTOCFRONT
+
+ if [ -n "$CHANGES" ] || [ twill = "$f" ]
then
- $SED_I -e "0,/\\\\N[1{]/s/\(\\\\N[1{]\)/\\\\input pdfwebtocfront\n\n\1/" $f.tex
+ # We add an Editor's Note and the list of changed
+ # sections on the ToC page.
+ cp $LOCALSTUFF/editorsnote.tex .
- # only XeTeX can process XETEX.WEB
- if [ xetex = $f ]
- then $XETEX $f # run XeTeX twice
- else $TEX $f # run TeX twice
- fi
+ case $f in
+ mf ) $SED_I $f.tex -e 's/\\datethis/\\input editorsnote.tex\n\\def&{\\def\\startsection{\\leftline{\\sc\\today\\ at \\hours}\n \\medskip\\editorsnote\\readchanges\\bigskip\n \\let\\startsection=\\stsec\\stsec}}\n&/' ;;
- # run TEX.WEB three times to fix table-of-contents
- if [ tex = $f ]
- then $TEX $f
- fi
- fi
+ # TeX and XeTeX grow significantly for TeX Live
+ # so there's enough room on the last ToC page.
+ pdftex | tex | xetex ) $SED_I $f.tex \
+ -e '/\\datethis/d' \
+ -e 's/\(\\def\\botofcontents\).*/\\input editorsnote.tex\n\1{\\hsize6.5in\\vskip 0pt plus 1filll\n \\editorsnote\\readchanges\\medskip\\noindent\\sc\\today\\ at \\hours}/' \
+ -e 's/\\input pdfwebtocfront/&\n\n\\def\\tocpages{2}/' ;;
- case $f in
- xetex ) $XETEX $f ;; # only XeTeX can process XETEX.WEB
+ bibtex | patgen | tangle | weave | refsort | twinx ) $SED_I $f.tex -e 's/\\date.*/\\input editorsnote\n\\def\\covernote{\\vbox{\\editorsnote\\readchanges\\par}}\n\\datecontentspage/' ;;
+
+ common | ctangle | cweave | ctie | tie ) $SED_I $f.tex \
+ -e 's/\\def\\covernote/\\input editorsnote.tex\n&/' \
+ -e 's/^}}/\\bigskip\\editorsnote\\readchanges\\par&/' ;;
+
+ twill ) $SED_I $f.tex \
+ -e 's/\\datecontentspage/\\input editorsnote.tex\n\\def\\covernote{\\vbox{\\editorsnote\\readchanges\\par}}\n&/' ;;
+ * ) $SED_I $f.tex \
+ -e 's/\\def\\title{/\\input editorsnote.tex\n&/' \
+ -e 's/\\vbox{\\ninerm/&\\editorsnote\\readchanges\\medskip/' ;;
+ esac
+ fi # $CHANGES
+
+ case $f in
ctwill ) # gives two different outcomes
if [ "$HITEX" = "$TEX" ] # sort mini-indexes
then # directly in the TeX file
@@ -318,124 +348,98 @@ FI
fi
$TEX $f ;;
- refsort ) $TEX -interaction nonstopmode $f ;;
-
- * ) $TEX $f ;;
+ * ) # run TeX twice
+ if $PDFTOCFRONT || [ -n "$CHANGES" ]
+ then # only XeTeX can process XETEX.WEB
+ [ xetex = $f ] && $XETEX $f || $TEX $f
+ fi
+ [ xetex = $f ] && $XETEX $f || $TEX $f ;;
esac
done
+# create tarballs w/o changes for publication
if ( $PDFTOCFRONT || [ "$HITEX" = "$TEX" ] ) && ! $FILESELECT
then
- # create tarballs w/o changes for publication
- if $CHANGES
+ if [ -z "$CHANGES" ]
then
- for f in *.$PDF
- do
- case $f in *-changes.$PDF ) rm -f $f; continue ;;
- esac
- mv $f $(basename $f .$PDF)-changes.$PDF
+ export TEXINPUTS=.:$(kpsewhich --var-value=TEXMFDIST)//:$KNUTHWARE//
+ touch pages.tex # let 'manmac' produce output at all
+
+ $TEX -jobname=errorlog $LOCALSTUFF/Xerrorlog.tex
+ for f in one two three four five six seven eight nine ten \
+ eleven twelve
+ do $TEX -jobname errata.$f errata.$f
done
- if [ "$HITEX" = "$TEX" ]
- then
- rm -f xetex-changes.pdf
- mv xetex.pdf xetex-changes.pdf
- fi
- $PAX "$OUTDIR/etc-changes.tar.gz" -s ,^,etc/, \
- vftovp-changes.$PDF vptovf-changes.$PDF
- $PAX "$OUTDIR/mf-changes.tar.gz" -s ,^,mf/, \
- mf-changes.$PDF
- $PAX "$OUTDIR/mfware-changes.tar.gz" -s ,^,mfware/, \
- gftodvi-changes.$PDF gftopk-changes.$PDF \
- gftype-changes.$PDF mft-changes.$PDF
- $PAX "$OUTDIR/tex-changes.tar.gz" -s ,^,tex/, \
- tex-changes.$PDF
- $PAX "$OUTDIR/texware-changes.tar.gz" -s ,^,texware/, \
- dvitype-changes.$PDF pltotf-changes.$PDF \
- pooltype-changes.$PDF tftopl-changes.$PDF
- $PAX "$OUTDIR/web-changes.tar.gz" -s ,^,web/, \
- tangle-changes.$PDF weave-changes.$PDF
- $PAX "$OUTDIR/bibtex-changes.tar.gz" -s ,^,bibtex/, \
- bibtex-changes.$PDF
- $PAX "$OUTDIR/other-changes.tar.gz" -s ,^,other/, \
- dvicopy-changes.$PDF patgen-changes.$PDF \
- pktogf-changes.$PDF pktype-changes.$PDF
- $PAX "$OUTDIR/pdftex-changes.tar.gz" -s ,^,pdftex/, \
- pdftex-changes.$PDF
- $PAX "$OUTDIR/xetex-changes.tar.gz" -s ,^,xetex/, \
- xetex-changes.pdf
- $PAX "$OUTDIR/ctie-changes.tar.gz" -s ,^,ctie/, \
- ctie-changes.$PDF
- $PAX "$OUTDIR/tie-changes.tar.gz" -s ,^,tie/, \
- tie-changes.$PDF
- $PAX "$OUTDIR/cweb-changes.tar.gz" -s ,^,cweb/, \
- common-changes.$PDF ctangle-changes.$PDF \
- cweave-changes.$PDF refsort-changes.$PDF \
- twinx-changes.$PDF
- else
+ $TEX errata
+ $PAX "$OUTDIR/errata.tar.gz" -s ,^,errata/, err*.$PDF
+
+ $PAX "$OUTDIR/hitex.tar.gz" -s ,^,hitex/, hitex.$PDF
+ $PAX "$OUTDIR/mp.tar.gz" -s ,^,mp/, mp.$PDF mpost.$PDF
+
# Finally, build the remaining documents
# * TeX and Metafont test routines
# * WEB and CWEB manuals
- export TEXINPUTS=.:$(kpsewhich --var-value=TEXMFDIST)//:$KNUTHWARE//
-
rm -f trapman.tex webman.tex cwebman.tex
# FIX: Prepare 'trapman' for automatic processing; several
# input files are renamed in TeX Live (in fact, there are
# additional files for MetaPost).
- f=$(kpsewhich -engine tex trapman)
- tie -m $(basename $f) $f /opt/github/web/$(basename $f .tex).ch
-
# Prepare 'webman' with section links and bookmarks.
- f=$(kpsewhich -engine tex webman)
- tie -m $(basename $f) $f /opt/github/web/$(basename $f .tex).ch
+ for f in trapman webman
+ do
+ f=$(kpsewhich -engine tex $f)
+ tie -m $(basename $f) $f $LOCALSTUFF/$(basename $f .tex).ch
+ done
# Prepare 'cwebman' with footnotes describing the extended CWEB.
f=$(kpsewhich -engine tex cwebman)
tie -m $(basename $f) $f $(basename $f .tex)-w2c.ch
- if [ "$HITEX" = "$TEX" ]
- then $SED_I -e "s/\(\\\\input cwebmac\)/\1\n\\\\input hiplainpage/" cwebman.tex
- fi
-
- touch pages.tex # let 'manmac' produce output at all
for f in tripman trapman webman cwebman
do $TEX $f
done
- $TEX -jobname=errorlog /opt/github/web/Xerrorlog.tex
-
- for f in one two three four five six seven eight nine ten \
- eleven twelve
- do $TEX -jobname errata.$f errata.$f
- done
-
- $TEX errata
-
- $PAX "$OUTDIR/errata.tar.gz" -s ,^,errata/, \
- errorlog.$PDF errata.*.$PDF errata.$PDF
- $PAX "$OUTDIR/etc.tar.gz" -s ,^,etc/, vftovp.$PDF vptovf.$PDF
$PAX "$OUTDIR/mf.tar.gz" -s ,^,mf/, mf.$PDF trapman.$PDF
- $PAX "$OUTDIR/mfware.tar.gz" -s ,^,mfware/, \
- gftodvi.$PDF gftopk.$PDF gftype.$PDF mft.$PDF
$PAX "$OUTDIR/tex.tar.gz" -s ,^,tex/, \
glue.$PDF tex.$PDF tripman.$PDF
- $PAX "$OUTDIR/texware.tar.gz" -s ,^,texware/, \
- dvitype.$PDF pltotf.$PDF pooltype.$PDF tftopl.$PDF
$PAX "$OUTDIR/web.tar.gz" -s ,^,web/, \
webman.$PDF tangle.$PDF weave.$PDF twill.$PDF
- $PAX "$OUTDIR/bibtex.tar.gz" -s ,^,bibtex/, bibtex.$PDF
- $PAX "$OUTDIR/other.tar.gz" -s ,^,other/, \
- dvicopy.$PDF patgen.$PDF pktogf.$PDF pktype.$PDF
- $PAX "$OUTDIR/hitex.tar.gz" -s ,^,hitex/, hitex.$PDF
- $PAX "$OUTDIR/mp.tar.gz" -s ,^,mp/, mp.$PDF
- $PAX "$OUTDIR/pdftex.tar.gz" -s ,^,pdftex/, pdftex.$PDF
- $PAX "$OUTDIR/xetex.tar.gz" -s ,^,xetex/, xetex.pdf
- $PAX "$OUTDIR/ctie.tar.gz" -s ,^,ctie/, ctie.$PDF
- $PAX "$OUTDIR/tie.tar.gz" -s ,^,tie/, tie.$PDF
$PAX "$OUTDIR/cweb.tar.gz" -s ,^,cweb/, \
cwebman.$PDF common.$PDF ctangle.$PDF cweave.$PDF \
ctwill.$PDF refsort.$PDF twinx.$PDF
- fi
+ else # -n $CHANGES
+ for f in *.$PDF
+ do
+ case $f in *$CHANGES.$PDF ) rm -f $f; continue ;; esac
+ mv $f $(basename $f .$PDF)$CHANGES.$PDF
+ done
+ [ "$HITEX" = "$TEX" ] && mv -f xetex.pdf xetex$CHANGES.pdf
+ $PAX "$OUTDIR/mf$CHANGES.tar.gz" -s ,^,mf/, mf$CHANGES.$PDF
+ $PAX "$OUTDIR/tex$CHANGES.tar.gz" -s ,^,tex/, tex$CHANGES.$PDF
+ $PAX "$OUTDIR/web$CHANGES.tar.gz" -s ,^,web/, \
+ tangle$CHANGES.$PDF weave$CHANGES.$PDF
+ $PAX "$OUTDIR/cweb$CHANGES.tar.gz" -s ,^,cweb/, \
+ common$CHANGES.$PDF ctangle$CHANGES.$PDF \
+ cweave$CHANGES.$PDF refsort$CHANGES.$PDF \
+ twinx$CHANGES.$PDF
+ fi # $CHANGES
+
+ $PAX "$OUTDIR/etc$CHANGES.tar.gz" -s ,^,etc/, \
+ vftovp$CHANGES.$PDF vptovf$CHANGES.$PDF
+ $PAX "$OUTDIR/mfware$CHANGES.tar.gz" -s ,^,mfware/, \
+ gftodvi$CHANGES.$PDF gftopk$CHANGES.$PDF \
+ gftype$CHANGES.$PDF mft$CHANGES.$PDF
+ $PAX "$OUTDIR/texware$CHANGES.tar.gz" -s ,^,texware/, \
+ dvitype$CHANGES.$PDF pltotf$CHANGES.$PDF \
+ pooltype$CHANGES.$PDF tftopl$CHANGES.$PDF
+ $PAX "$OUTDIR/other$CHANGES.tar.gz" -s ,^,other/, \
+ dvicopy$CHANGES.$PDF patgen$CHANGES.$PDF \
+ pktogf$CHANGES.$PDF pktype$CHANGES.$PDF
+ $PAX "$OUTDIR/xetex$CHANGES.tar.gz" -s ,^,xetex/, \
+ xetex$CHANGES.pdf
+ for f in bibtex pdftex ctie tie
+ do $PAX "$OUTDIR/$f$CHANGES.tar.gz" -s ,^,$f/, $f$CHANGES.$PDF
+ done
# Notes to self:
# (1) Create a user-friendly central entrypoint with
diff --git a/Master/texmf-dist/doc/plain/pwebmac/webman.ch b/Master/texmf-dist/doc/plain/pwebmac/webman.ch
index 1817ab46659..f3e5a8a31e3 100644
--- a/Master/texmf-dist/doc/plain/pwebmac/webman.ch
+++ b/Master/texmf-dist/doc/plain/pwebmac/webman.ch
@@ -56,6 +56,12 @@
\else Appendix~#1\fi}
@z
+@x l.21
+\def\runninghead{{\tentt WEB} USER MANUAL}
+@y
+\def\runninghead{{\ninett WEB} USER MANUAL}
+@z
+
@x l.34
\vskip 15pt plus 3pt minus 3pt
\noindent This memo describes how to write programs in the
@@ -64,22 +70,27 @@
This memo describes how to write programs in the
@z
-@x l.180
-\yskip\item{1)} A \TeX\ part, containing explanatory material about what
+@x l.126
+well known work of Pierre-Arnoul de Marneffe [``Holon programming: A
+survey,'' Univ.\ de Liege, Service Informatique, Liege, Belgium, 1973; 135
@y
-\yskip\itemitem{1)} A \TeX\ part, containing explanatory material about what
+well known work of Pierre-Arnoul de Marneffe [``\pdfURL{Holon programming:
+A survey}{https://github.com/holon-scribe/holon-programming},'' Univ.\ de
+Li\`ege, Service d'Informatique, Li\`ege, Belgium, 1973; 135
@z
-@x l.183
-\item{2)} A definition part, containing macro definitions that serve as
+@x l.180
+\yskip\item{1)} A \TeX\ part, containing explanatory material about what
@y
-\itemitem{2)} A definition part, containing macro definitions that serve as
+\begingroup\parindent=2.5em
+\yskip\item{1)} A \TeX\ part, containing explanatory material about what
@z
-@x l.187
-\item{3)} A \PASCAL\ part, containing a piece of the program that
+@x l.190
+that its structure is readily perceived.
@y
-\itemitem{3)} A \PASCAL\ part, containing a piece of the program that
+that its structure is readily perceived.\par
+\endgroup
@z
@x l.304
@@ -102,14 +113,29 @@ program for \.{TANGLE}, in \pdfURL{Appendix~E}{tangle.pdf},
gives precise details about this
@z
-@x l.626
+@x l.628
outputs of \.{WEAVE} and \.{TANGLE} (see Appendix~C\null). Meta-comments
@y
outputs of \.{WEAVE} (see \Appendix B\null) and \.{TANGLE}
(see \Appendix C\null). Meta-comments
@z
-@x l.893
+@x l.788
+\yskip\itemitem{a)}Comments in \PASCAL\ text should appear only after
+@y
+\yskip
+\begingroup\parindent=1.5em
+\itemitem{a)}Comments in \PASCAL\ text should appear only after
+@z
+
+@x l.796
+statements.
+@y
+statements.\par
+\endgroup
+@z
+
+@x l.895
examples of ``real'' programs. Appendix~A shows the \.{WEB} input that
generated modules 55--59 of the \.{WEAVE} program; Appendix~B shows the
corresponding \TeX\ code output by \.{WEAVE}; and Appendix~C shows excerpts
@@ -119,7 +145,7 @@ generated modules 55--59 of the \.{WEAVE} program; \Appendix B shows the
corresponding \TeX\ code output by \.{WEAVE}; and \Appendix C shows excerpts
@z
-@x l.900
+@x l.901
report, in Appendices D and~E. The reader should first compare Appendix~A
to the corresponding portion of Appendix~D; then the same material should
be compared to Appendices B and~C. Finally, if time permits, the reader may
@@ -133,7 +159,7 @@ studying the complete programs in Appendices \pdfURL{D}{weave.pdf}
and~\pdfURL{E}{tangle.pdf}, since \.{WEAVE}
@z
-@x l.908
+@x l.909
Finally, Appendix F is the `\.{webmac}' file that sets \TeX\ up to accept
the output of \.{WEAVE}; Appendix~G discusses how to use some of its macros
to vary the output formats; and Appendix~H discusses what needs to be done
@@ -145,7 +171,7 @@ engines; \Appendix G discusses how to use some of these macros
to vary the output formats; and \Appendix H discusses what needs to be done
@z
-@x l.913
+@x l.914
The programs in Appendices D and E will optionally keep statistics on
@y
The programs in Appendices \pdfURL{D}{weave.pdf} and \pdfURL{E}{tangle.pdf}
@@ -153,9 +179,11 @@ will optionally keep statistics on
@z
@x l.989
+ \def\runninghead{APPENDIX A --- {\tentt WEB} FILE FORMAT}
\section Appendix A.
This excerpt from \.{WEAVE.WEB} produced modules 55--59 in Appendix~D.
@y
+ \def\runninghead{APPENDIX A --- {\ninett WEB} FILE FORMAT}
\def\bkminfo{WEB file format}
\section Appendix A.
This excerpt from \.{WEAVE.WEB} produced modules 55--59 in
@@ -169,9 +197,11 @@ ASCII codes is $c_1c_2\ldots c_n$, its hash value will be
@z
@x l.1061
+ \def\runninghead{APPENDIX B --- TRANSLATION BY {\tentt WEAVE}}
\section Appendix B.
This excerpt from \.{WEAVE.TEX} corresponds to Appendix A.
@y
+ \def\runninghead{APPENDIX B --- TRANSLATION BY {\ninett WEAVE}}
\def\bkminfo{Translations by WEAVE}
\section Appendix B.
This excerpt from \.{WEAVE.TEX} corresponds to \Appendix A.
@@ -190,8 +220,10 @@ ASCII codes is $c_1c_2\ldots c_n$, its hash value will be
@z
@x l.1143
+ \def\runninghead{APPENDIX C --- TRANSLATION BY {\tentt TANGLE}}
\section Appendix C.
@y
+ \def\runninghead{APPENDIX C --- TRANSLATION BY {\ninett TANGLE}}
\def\bkminfo{Translation by TANGLE}
\section Appendix C.
@z
@@ -543,35 +575,35 @@ The macros in \.{webmac} and \.{pwebmac} make it possible to produce
a variety of formats
@z
-@x l.1425
+@x l.1463
in small caps. For example, Appendix~D was produced after saying
@y
in small caps. For example, \pdfURL{Appendix~D}{weave.pdf} was produced
after saying
@z
-@x l.1468
+@x l.1469
\.{\\pageno=\\contentspagenumber} \.{\\advance\\pageno by 1}'. (Appendix~D
@y
\.{\\pageno=\\contentspagenumber} \.{\\advance\\pageno by 1}'.
(\pdfURL{Appendix~D}{weave.pdf}
@z
-@x l.1479
+@x l.1480
For example, Appendix~D was produced with the following definitions:
@y
For example, \pdfURL{Appendix~D}{weave.pdf} was produced with the following
definitions:
@z
-@x l.1491
+@x l.1492
for every starred module. For example, when Appendix~D was being generated,
@y
for every starred module. For example, when \pdfURL{Appendix~D}{weave.pdf}
was being generated,
@z
-@x l.569
+@x l.1569
\.{\\ch}, \.{\\fin}, and \.{\\con}. \.{WEAVE} itself need not be changed.
@y
\.{\\ch}, \.{\\fin}, and \.{\\con}. \.{WEAVE} itself need not be changed.
@@ -582,7 +614,7 @@ and run \TeX\ \\{twice} on your woven \.{WEB} document, in order to shift the
table-of-contents to the front of the {\mc PDF} output.
@z
-@x l.1583
+@x l.1584
dependencies'' in the index of Appendix~E above, and figure out what changes
@y
dependencies'' in the index of \pdfURL{Appendix~E}{tangle.pdf} above,
@@ -595,25 +627,25 @@ first change files; then you can sure that your compiler will handle
first change files; then you can be sure that your compiler will handle
@z
-@x l.1609
+@x l.1610
the index to Appendix~D.
@y
the index to \pdfURL{Appendix~D}{weave.pdf}.
@z
-@x l.1616
+@x l.1617
Appendix~E. This listing will incorporate your changes.
@y
\pdfURL{Appendix~E}{tangle.pdf}. This listing will incorporate your changes.
@z
-@x l.1620
+@x l.1621
Appendix~D that incorporates your changes.
@y
\pdfURL{Appendix~D}{weave.pdf} that incorporates your changes.
@z
-@x l.1632
+@x l.1631
\def\substep(10.#1){\par\hangindent 4em\noindent
\hbox to 4em{\hfil(10.#1) }\ignorespaces}
@y
@@ -621,7 +653,7 @@ Appendix~D that incorporates your changes.
\hbox to 3em{\hfil(10.#1) }\ignorespaces}
@z
-@x l.1666
+@x l.1667
computer by following Appendices D and E. Then you have to simulate the
@y
computer by following Appendices \pdfURL{D}{weave.pdf}
diff --git a/Master/texmf-dist/doc/platex/pxjahyper/LICENSE b/Master/texmf-dist/doc/platex/pxjahyper/LICENSE
index 5cf6f6fb2de..7b1201927e0 100644
--- a/Master/texmf-dist/doc/platex/pxjahyper/LICENSE
+++ b/Master/texmf-dist/doc/platex/pxjahyper/LICENSE
@@ -1,6 +1,6 @@
The MIT License
-Copyright (c) 2012-2023 Takayuki YATO (aka. "ZR")
+Copyright (c) 2012-2024 Takayuki YATO (aka. "ZR")
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md b/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md
index 57a117c3d59..88d23a45da5 100644
--- a/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md
+++ b/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md
@@ -73,6 +73,14 @@ pxjahyper-enc パッケージ ー 文字コード設定
更新履歴
--------
+ * Version 1.4 〈2024/08/14〉
+ - 設定キー `fallback-warn` を追加。
+ - 設定キー `fallback-cidm` を追加。
+ - `force-unicode` オプションをéžæŽ¨å¥¨ã¨ã—ã€è­¦å‘Šã‚’出ã™ã€‚
+ - 開発者用命令 `\pxjahyperBadCharacter` を追加。
+ - オプション `autodvidriver`ã€`fallback-geta`ã€`fallback-delete`
+ ã‚’éžæŽ¨å¥¨ã«ã™ã‚‹ã€‚
+
* Version 1.3 〈2023/03/01〉
- “pTeX + hyperref unicode モードâ€ã‚’æ­£å¼ã«ã‚µãƒãƒ¼ãƒˆã™ã‚‹ã€‚ã“ã‚Œã«
ä¼´ã„ã€unicode モードã«é–¢ã™ã‚‹è­¦å‘Šã‚’削除。
diff --git a/Master/texmf-dist/doc/platex/pxjahyper/README.md b/Master/texmf-dist/doc/platex/pxjahyper/README.md
index b6193b16987..5b13a6de890 100644
--- a/Master/texmf-dist/doc/platex/pxjahyper/README.md
+++ b/Master/texmf-dist/doc/platex/pxjahyper/README.md
@@ -52,6 +52,7 @@ the PDF strings in the output DVI file.
Revision History
----------------
+ * Version 1.4 〈2024/08/14〉
* Version 1.3 〈2023/03/01〉
* Version 1.2a 〈2022/10/19〉
* Version 1.2 〈2022/05/27〉
diff --git a/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.pdf b/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.pdf
index e1b4fbe07a2..07d88e51e90 100644
--- a/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.pdf
+++ b/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex b/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex
index 20d410ba65c..28745c5fe6a 100644
--- a/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex
+++ b/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex
@@ -17,8 +17,8 @@
\usepackage{shortvrb}
\MakeShortVerb{\|}
\usepackage[verb]{bxghost}
-\newcommand{\PkgVersion}{1.3}
-\newcommand{\PkgDate}{2023/03/01}
+\newcommand{\PkgVersion}{1.4}
+\newcommand{\PkgDate}{2024/08/14}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$}
\newcommand{\Note}{\par\noindent ※}
@@ -37,7 +37,14 @@
(u){\pLaTeX} + hyperref + dvipdfmxã®çµ„ã¿åˆã‚ã›ã§
日本語をå«ã‚€\Strong{PDF文字列}%
-(“ã—ãŠã‚Šâ€ãªã©ã®æ–‡æ›¸æƒ…å ±ã®æ–‡å­—列)
+(“ã—ãŠã‚Šâ€ãªã©ã®æ–‡æ›¸æƒ…å ±ã®æ–‡å­—列
+\footnote{例ãˆã°ã€|\hypersetup|ã®|pdftitle|キーã«æŒ‡å®šã™ã‚‹æ–‡å­—列ã¯
+ 「PDF文字列ã€ã®ä¸€ç¨®ã§ã‚る。
+ ã¾ãŸã€|\section|命令ã®å¼•æ•°ã®ãƒ†ã‚­ã‚¹ãƒˆã¯
+ 「{\TeX}ã§çµ„版ã™ã‚‹ç‰ˆé¢å‡ºåŠ›ã€ã¨ã€ŒPDF文字列ã€
+ ã®ä¸¡æ–¹ã«ä½¿ã‚れる。
+ 後者ã®ã‚ˆã†ãªç®‡æ‰€ã§ã€Œ{\TeX}ã®ç‰ˆé¢å‡ºåŠ›ã€ã¨ã€ŒPDF文字列ã€ã‚’
+ 別ã«æŒ‡å®šã—ãŸã„å ´åˆã¯|\texorpdfstring|ã¨ã„ã†å‘½ä»¤ãŒåˆ©ç”¨ã§ãる。})
ã‚’ã‚‚ã¤PDF文書を作æˆã™ã‚‹å ´åˆã«å¿…è¦ã¨ãªã‚‹æ©Ÿèƒ½ã‚’æä¾›ã™ã‚‹ã€‚
\begin{itemize}
\item dvipdfmx用ã®ã€Œtounicode specialã€ã«ã¤ã„ã¦ã€
@@ -69,6 +76,17 @@
\usepackage[オプション,...]{pxjahyper}
\end{verbatim}\end{quote}
+\paragraph{plautopatchã¨ã®é–¢ä¿‚}
+\Pkg{plautopatch}パッケージãŒäº‹å‰ã«èª­ã¿è¾¼ã¾ã‚Œã¦ã„ã‚‹å ´åˆã¯ã€
+\Pkg{hyperref}ãŒèª­ã¿è¾¼ã¾ã‚Œã‚‹ã¨ãã®ç›´å¾Œã«è‡ªå‹•çš„ã«\Pkg{pxjahyper}ãŒ
+オプション無ã—ã§èª­ã¿è¾¼ã¾ã‚Œã‚‹ã€‚
+ã‚‚ã—何らã‹ã®ã‚ªãƒ—ションを指定ã—ãŸã„å ´åˆã¯ã€
+\Pkg{hyperref}ã®èª­è¾¼ã‚ˆã‚Šå‰ã«|\PassOptionsToPackage|ã§
+オプションを指定ã™ã‚‹å¿…è¦ãŒã‚る。
+\begin{quote}\small\begin{verbatim}
+\PassOptionsToPackage[nopapersize]{pxjahyper}
+\end{verbatim}\end{quote}
+
\paragraph{使用å¯èƒ½ãªã‚ªãƒ—ション}\mbox{}
\begin{itemize}
\item \Strong{設定キー記述}\Means
@@ -80,17 +98,24 @@
\end{verbatim}\end{quote}
ã¨æŒ‡å®šã™ã‚‹ã¨ã€è¡¨ç¾ä¸èƒ½æ–‡å­—を代替ã™ã‚‹ã‚²ã‚¿æ–‡å­—ãŒå‡ºåŠ›ã•ã‚Œãªããªã‚‹ã€‚
\item \Strong{ドライãƒã‚ªãƒ—ション}\Means
- |dvipdfmx|ã€|dvips|ã€ãŠã‚ˆã³|nodvidriver|%
- (ドライãƒä¾å­˜å‹•ä½œã®ç„¡åŠ¹åŒ–を明示的ã«æŒ‡ç¤ºã€
- ç¾çŠ¶ã§ã¯ã»ã¨ã‚“ã©ã®å‹•ä½œãŒç„¡åŠ¹ã«ãªã‚‹ï¼‰
- ãŒæŒ‡å®šã§ãる。
- \Note 1.0版ã«ãŠã„ã¦|nodvidriver|ã®éžæŽ¨å¥¨ã®åˆ¥åã®|none|ã¯
- \Strong{廃止}ã•ã‚ŒãŸã€‚
- %(0.5版ã‹ã‚‰éžæŽ¨å¥¨ã ã£ãŸã€‚)
-\item |resetdvidriver|(既定)\Means
- ドライãƒã‚ªãƒ—ションを\Pkg{hyperref}ã®ãƒ‰ãƒ©ã‚¤ãƒæŒ‡å®šã‹ã‚‰è‡ªå‹•çš„ã«åˆ¤å®šã™ã‚‹ã€‚
- \Note 1.1版ã«ãŠã„ã¦åå‰ã‚’|auto|ã‹ã‚‰|resetdvidriver|ã«å¤‰æ›´ã—ãŸã€‚
- æ—§åã®|auto|ã¯\Strong{éžæŽ¨å¥¨}ã¨ã™ã‚‹ã€‚
+ 以下ã®å€¤ãŒæŒ‡å®šã§ãる。
+ \begin{itemize}
+ \item |dvipdfmx|
+ \item |dvips|
+ \item |resetdvidriver|(既定)\Means
+ \Pkg{hyperref}ã®ãƒ‰ãƒ©ã‚¤ãƒæŒ‡å®šã‹ã‚‰è‡ªå‹•çš„ã«åˆ¤å®šã™ã‚‹ã€‚
+ \Note 1.1版ã«ãŠã„ã¦åå‰ã‚’|auto|ã‹ã‚‰|resetdvidriver|ã«å¤‰æ›´ã—ãŸã€‚
+ æ—§åã®|auto|%
+ \footnote{1.0版ã§ã¯|autodvidriver|ã¨ã—ã¦ã„ãŸãŒã€
+ ã“ã®æ—§åã‚‚\Strong{éžæŽ¨å¥¨}ã¨ã™ã‚‹ã€‚}%
+ ã¯\Strong{éžæŽ¨å¥¨}ã¨ã™ã‚‹ã€‚
+ \item |nodvidriver|\Means
+ ドライãƒä¾å­˜å‹•ä½œã®ç„¡åŠ¹åŒ–を明示的ã«æŒ‡ç¤ºã™ã‚‹ã€‚
+ ã»ã¨ã‚“ã©ã®å‹•ä½œãŒç„¡åŠ¹ã«ãªã‚‹ã€‚
+ \footnote{1.0版ã«ãŠã„ã¦|nodvidriver|ã®éžæŽ¨å¥¨ã®åˆ¥åã®|none|ã¯
+ \Strong{廃止}ã•ã‚ŒãŸã€‚}
+ %(0.5版ã‹ã‚‰éžæŽ¨å¥¨ã ã£ãŸã€‚)
+ \end{itemize}
\item |tounicode|(既定)\Means
以下ã®2ã¤ã®è¨­å®šã‚’è¡Œã†ã€‚
\begin{enumerate}
@@ -123,7 +148,8 @@
\paragraph{上級者å‘ã‘オプション}\mbox{}
\begin{itemize}
-\item |otfmacros|(既定)\Means
+\item |otfmacros|(既定
+ \footnote{0.6版より既定を|otfmacros|ã«å¤‰æ›´ã—ãŸã€‚})\Means
\Pkg{japanese-otf}付属ã®\Pkg{ajmacros}パッケージãŒæä¾›ã™ã‚‹
文字入力命令(|\ajMaru|ã€|\ajLig|等)をPDF文字列中ã§
“å¯èƒ½ãªé™ã‚Šâ€ä½¿ãˆã‚‹ã‚ˆã†ã«ã™ã‚‹ã€‚
@@ -131,7 +157,6 @@
\Note |otfmacros|を有効ã«ã™ã‚‹å ´åˆã¯|otfcid|も有効ã«ã™ã‚‹å¿…è¦ãŒã‚る。
\item |nootfmacros|\Means
|otfmacros|ã®å¦å®šã€‚
- \Note 0.6版より既定を|otfmacros|ã«å¤‰æ›´ã—ãŸã€‚
\item |otfutf|(既定)\Means
\Pkg{japanese-otf}パッケージã®|\UTF|命令をPDF文字列中ã§
使ãˆã‚‹ã‚ˆã†ã«ã™ã‚‹ã€‚
@@ -151,17 +176,28 @@
\Note 詳細ã¯\ref{ssec:disablecmds}節をå‚照。
\item |nodisablecmds|\Means
|disablecmds|ã®å¦å®šã€‚
-\item |bigcode|(既定)\Means
+\item |charcmds|(既定)\Means
+ {\LaTeX}標準ã®æ–‡å­—命令をPDF文字列中ã§ä½¿ãˆã‚‹ã‚ˆã†ã«ã™ã‚‹ã€‚
+\item |nocharcmds|\Means
+ |charcmds|ã®å¦å®šã€‚
+\item |bigcode|(既定
+ \footnote{0.3a版より既定を|bigcode|ã«å¤‰æ›´ã—ãŸã€‚})\Means
{\upTeX}ã§ã®ToUnicode CMapã¨ã—ã¦UTF8-UTF16を用ã„る。
%(当該ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒå­˜åœ¨ã™ã‚‹å¿…è¦ãŒã‚る。)
\item |nobigcode|\Means
|bigcode|ã®å¦å®šã€‚
{\upTeX}ã§ã®ToUnicode CMapã¨ã—ã¦UTF8-UCS2を用ã„る。
- \Note 0.3a版より既定を|bigcode|ã«å¤‰æ›´ã—ãŸã€‚
-\item |force-unicode|\Means
+\item |jacommentline|(既定)\Means
+ \Pkg{hyperref}ãŒå‡ºåŠ›ã™ã‚‹|.out|ファイルã®å…ˆé ­ã«æ—¥æœ¬èªžã®æ–‡å­—ã‚’å«ã‚€
+ コメント行を出力ã™ã‚‹ã€‚
+ \Note {\pTeX}系エンジンã®ã€Œå…¥åŠ›æ¼¢å­—コード自動判定ã€ã«å¯¾ã™ã‚‹å¯¾ç­–。
+\item |jacommentline|\Means
+ |jacommentline|ã®å¦å®šã€‚
+ \Note ä¸å…·åˆãŒç™ºç”Ÿã—ãŸã¨ãã®ãŸã‚ã«ç„¡åŠ¹åŒ–ã§ãるよã†ã«ã—ã¦ã„る。
+\item |force-unicode|(1.4版ã§\Strong{éžæŽ¨å¥¨})\Means
ã“ã®ã‚ªãƒ—ションã¯ä½•ã‚‚ã—ãªã„。
- \Note {\pLaTeX}ã§ã®â€œunicodeモードâ€ãŒæ­£å¼ã«ã‚µãƒãƒ¼ãƒˆã•ã‚ŒãŸãŸã‚
- ã“ã®ã‚ªãƒ—ションã¯ä¸è¦ã«ãªã£ãŸã€‚
+ \footnote{{\pLaTeX}ã§ã®â€œunicodeモードâ€ãŒæ­£å¼ã«ã‚µãƒãƒ¼ãƒˆã•ã‚ŒãŸãŸã‚
+ ã“ã®ã‚ªãƒ—ションã¯ä¸è¦ã«ãªã£ãŸã€‚}
\end{itemize}
%===========================================================
@@ -185,6 +221,9 @@
\begin{itemize}
\item |fallback=|\Meta{値}\Means
PDF文字列中ã§è¡¨ç¾ä¸èƒ½ãªæ–‡å­—ã«ã¤ã„ã¦ã®ä»£æ›¿å‡ºåŠ›ã®æ–¹æ³•ã‚’指定ã™ã‚‹ã€‚
+ \footnote{1.1版ã§ã¯ãƒ‘ッケージオプション
+ (|fallback-geta|ï¼|fallback-delete|)
+ ã¨ã—ã¦æä¾›ã—ã¦ã„ãŸãŒã€ã“ã®æ–¹å¼ã¯\Strong{éžæŽ¨å¥¨}ã¨ã™ã‚‹ã€‚}
\begin{itemize}
\item |geta|(既定)\Means
表ç¾ä¸èƒ½ãªæ–‡å­—をゲタ記å·ï¼ˆã€“)ã«ç½®ãæ›ãˆã‚‹ã€‚
@@ -193,6 +232,20 @@
\end{itemize}
\Note 以下ã€ãƒ‘ッケージ動作ã®è§£èª¬ä¸­ã§ã€Œã‚²ã‚¿è¨˜å·ã‚’出力ã€ã¨
ã‚ã‚‹å ´åˆã¯å®Ÿéš›ã«ã¯ã“ã®è¨­å®šã«å¾“ã†ã€‚
+\item |fallback-warn=|\Meta{真å½å€¤}%
+ \footnote{真å½å€¤ã¯|true|ï¼|false|ã§æŒ‡å®šã™ã‚‹ã€‚}\Means
+ PDF文字列中ã®è¡¨ç¾ä¸èƒ½ãªæ–‡å­—ã«ã¤ã„ã¦ã€Œã‚²ã‚¿è¨˜å·ã‚’出力ã€ã™ã‚‹éš›ã«
+ 警告を出ã™ã‹ã€‚
+ 既定値ã¯çœŸã€‚
+\item |fallback-cidm=|\Meta{真å½å€¤}\Means
+ \Pkg{japanese-otf}パッケージã®AJ1\Strong{以外}ã®CID入力命令
+ (|\CIDC|・|\CIDK|・|\CIDT|)
+ ã«ã¤ã„ã¦ã€PDF文字列中ã§ã€Œã‚²ã‚¿è¨˜å·ã‚’出力ã€ã™ã‚‹å‹•ä½œã«ç½®ãæ›ãˆã‚‹ã‹ã€‚
+ 既定値ã¯çœŸã€‚
+ \Note ã“れらã®å‘½ä»¤ã‚’サãƒãƒ¼ãƒˆã™ã‚‹ã‚ˆã†ãªï¼ˆæœ¬ãƒ‘ッケージã¨ã¯åˆ¥ã®ï¼‰
+ 何らã‹ã®æ©Ÿèƒ½ã‚’利用ã™ã‚‹å ´åˆã«ã¯å½ã«è¨­å®šã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œãªã„。
+ \footnote{ãŸã ã—ã€æœ¬ãƒ‘ッケージã«ã‚ˆã‚‹å†å®šç¾©ã¯â€œå„ªå…ˆåº¦ã‚’下ã’ã¦â€ã„ã‚‹
+ ã®ã§ã€è¨­å®šãŒä¸è¦ã§ã‚ã‚‹å ´åˆã‚‚ã‚る。}
\end{itemize}
%-------------------
@@ -218,14 +271,15 @@ Unicode符å·å€¤å…¥åŠ›ç”¨ã®å‘½ä»¤ãŒä½¿ã£ã¦ã„ã‚‹ã‚‚ã®ã§ã‚る。
\begin{itemize}
\item |out2uni|ã¾ãŸã¯|convbkmk|ãŒæœ‰åŠ¹ã®
å ´åˆã¯ã€ã‚¨ã‚¹ã‚±ãƒ¼ãƒ—表記(|\0xUUUU|)を出力ã™ã‚‹ã€‚
- \item エンジンãŒ{\upLaTeX}ã®å ´åˆã€ã‚ã‚‹ã„ã¯â€œunicodeモードâ€
+ \item エンジンãŒ{\upLaTeX}ã®å ´åˆã€
+ ã‚ã‚‹ã„ã¯\Pkg{hyperref}ã®â€œunicodeモードâ€
(\ref{sec:Unicode-mode}節)ãŒæœ‰åŠ¹ã®å ´åˆã¯ã€
当該ã®Unicode文字自体を書ã„ãŸã®ã¨åŒç­‰ã«ãªã‚‹ã€‚
\item 上記以外ã§ã€{\TeX} Live 2022以é™ã®{\pLaTeX}ã®å ´åˆ
\footnote{正確ã«ã„ã†ã¨ã€|\Uchar|ã¨|\ucs|プリミティブをもã¤
{\TLe-(u)\pTeX}エンジンã§ã‚ã‚‹å ´åˆã€‚}%
- ã¯ã€å½“該ã®Unicode文字ã«å¯¾å¿œã™ã‚‹JIS符å·ç³»ã®æ–‡å­—を書ã„ãŸã®ã¨åŒç­‰ã«ãªã‚‹ã€‚
- JIS符å·ç³»ã«ãªã„文字ã®å ´åˆã¯å‡ºåŠ›ã§ããªã„ã®ã§è­¦å‘Šã‚’出ã—ã ä¸Šã§
+ ã¯ã€å½“該ã®Unicode文字ã«â€œå¯¾å¿œâ€ã™ã‚‹JIS符å·ç³»ã®æ–‡å­—を書ã„ãŸã®ã¨åŒç­‰ã«ãªã‚‹ã€‚
+ “対応â€ã™ã‚‹æ–‡å­—ãŒãªã„å ´åˆã¯å‡ºåŠ›ã§ããªã„ã®ã§
ゲタ記å·ã‚’出力ã™ã‚‹ã€‚
\end{itemize}
\item ã©ã®æ¡ä»¶ã«ã‚‚当ã¦ã¯ã¾ã‚‰ãªã„å ´åˆã¯ã€|\Ux|ã¯ç„¡åŠ¹ã«ãªã‚‹
@@ -249,7 +303,7 @@ PDF文字列中ã®å‹•ä½œãŒä»¥ä¸‹ã®ã‚ˆã†ã«å¤‰æ›´ã•ã‚Œã‚‹ã€‚
|\UTF|もゲタ記å·ã«ãªã‚‹ã€‚}%
ã«ãªã‚‹ã€‚
\item ãれ以外ã®å ´åˆã¯ã€
- 常ã«ï¼ˆè­¦å‘Šã‚’出ã—ãŸä¸Šã§ï¼‰ã‚²ã‚¿è¨˜å·ã‚’出力ã™ã‚‹ã€‚
+ 常ã«ã‚²ã‚¿è¨˜å·ã‚’出力ã™ã‚‹ã€‚
\end{itemize}
\Note |\UTF|命令ã®å¤šè¨€èªžç‰ˆã€
@@ -266,7 +320,7 @@ PDF文字列中ã§|\CID|ãŒâ€œå¯èƒ½ãªé™ã‚Šâ€ä½¿ãˆã‚‹ã‚ˆã†ã«ã™ã‚‹ã€‚
\begin{itemize}
\item 当該ã®AJ1ã®ã‚°ãƒªãƒ•ã«â€œå¯¾å¿œâ€ã™ã‚‹\textbf{å˜ç‹¬ã®}Unicode文字ãŒ
ã‚ã‚Œã°ãれを出力ã—ã€ãªã‘ã‚Œã°
- (警告を出ã—ãŸä¸Šã§ï¼‰ã‚²ã‚¿è¨˜å·ã‚’出力ã™ã‚‹ã€‚
+ ゲタ記å·ã‚’出力ã™ã‚‹ã€‚
\footnote{旧版ã§ã¯å‰Šé™¤ã—ã¦ã„ãŸãŒã€ä»–ã®åŒæ§˜ã®å ´åˆã¨åˆã‚ã›ã‚‹ãŸã‚
1.0版よりゲタ記å·ã‚’出力ã™ã‚‹ä»•æ§˜ã‚’変更ã—ãŸã€‚}
\Note 例ãˆã°ã€|\CID{8226}|(ローマ数字12)ã¯Unicode文字ã®
@@ -275,14 +329,17 @@ PDF文字列中ã§|\CID|ãŒâ€œå¯èƒ½ãªé™ã‚Šâ€ä½¿ãˆã‚‹ã‚ˆã†ã«ã™ã‚‹ã€‚
å˜ç‹¬ã®Unicode文字ãŒãªã„ã®ã§ã€ã‚²ã‚¿è¨˜å·ã«ç½®ãæ›ãˆã‚‰ã‚Œã‚‹ã€‚
\item ãŸã ã—|\Ux|命令(\ref{ssec:ux-command}節å‚照)ãŒ
無効ã«ãªã‚‹å ´åˆã¯ã€ãã‚‚ãã‚‚Unicode文字も出力ã§ããªã„ãŸã‚ã€
- 常ã«ï¼ˆè­¦å‘Šã‚’出ã—ãŸä¸Šã§ï¼‰ã‚²ã‚¿è¨˜å·ã‚’出力ã™ã‚‹ã€‚
- çµå±€æƒ…å ±ã¯æ¬ è½ã™ã‚‹ãŒã€ãã‚Œã§ã‚‚未定義動作(エラーã«ãªã‚Šãˆã‚‹ï¼‰
+ 常ã«ã‚²ã‚¿è¨˜å·ã‚’出力ã™ã‚‹ã€‚
+ çµå±€æƒ…å ±ã¯æ¬ è½ã™ã‚‹ãŒã€ãã‚Œã§ã‚‚未定義動作(エラーã«ãªã‚‹å¯èƒ½æ€§ã‚‚ã‚る)
よりã¯å¥½ã¾ã—ã„ã§ã‚ã‚ã†ã€‚
\end{itemize}
+|\CID|命令ã®å¤šè¨€èªžç‰ˆã€
+ã™ãªã‚ã¡|\CIDC|・|\CIDK|・|\CIDT|命令ã«ã¤ã„ã¦ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œãªã„ã®ã§ã€
+常ã«ã‚²ã‚¿è¨˜å·ã‚’出力ã™ã‚‹ã€‚
+
\Note |otfcid|ã®åˆ©ç”¨ã«ã¯ã€ã‚¨ãƒ³ã‚¸ãƒ³ã®{\eTeX}æ‹¡å¼µãŠã‚ˆã³
\Pkg{etoolbox}ã¨\Pkg{bxjatoucs}パッケージãŒå¿…è¦ã€‚
-\Note |\CID|命令ã®å¤šè¨€èªžç‰ˆã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œãªã„。
\paragraph{ajmacrosパッケージã®å‘½ä»¤}
本パッケージã§|otfmacros|オプションを有効ã«ã—ãŸå ´åˆã¯ã€
diff --git a/Master/texmf-dist/doc/support/latexindent/README b/Master/texmf-dist/doc/support/latexindent/README
index 4e7614af59e..3bd2dbfe981 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.3, 2024-07-14
+ latexindent.pl, version 3.24.4, 2024-07-18
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 c22386d80d0..8f0cf208e28 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.3 2024-07-14",
+ "description": "latexindent.pl YAML schema helper, V3.24.4 2024-07-18",
"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 ebfe16f0e05..19361f5268a 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/texplate/README.md b/Master/texmf-dist/doc/support/texplate/README.md
index 43673ed9178..ea0f023a35b 100644
--- a/Master/texmf-dist/doc/support/texplate/README.md
+++ b/Master/texmf-dist/doc/support/texplate/README.md
@@ -4,19 +4,26 @@
![Minimum JRE: 8.0](https://img.shields.io/badge/Minimum_JRE-8.0-blue.svg?style=flat-square)
![Current version](https://img.shields.io/badge/dynamic/json.svg?color=blue&label=Latest%20release&query=%24.0.name&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F13793875%2Frepository%2Ftags&style=flat-square)
-TeXplate is a tool for creating document structures based on templates. The application name is a word play on _TeX_ and _template_, so the purpose seems quite obvious: we want to provide an easy and straightforward framework for reducing the typical code boilerplate when writing TeX documents. Also note that one can easily extrapolate the use beyond articles and theses: the application is powerful enough to generate _any_ text-based structure, given that a corresponding template exists.
+TeXplate is a tool for creating document structures based on templates. The
+application name is a word play on _TeX_ and _template_, so the purpose seems
+quite obvious: we want to provide an easy and straightforward framework for
+reducing the typical code boilerplate when writing TeX documents. Also note that
+one can easily extrapolate the use beyond articles and theses: the application
+is powerful enough to generate _any_ text-based structure, given that a
+corresponding template exists.
## Basic use
-Our tool is a typical command line application, so we need to invoke it by simply typing `texplate` in the terminal:
+Our tool is a typical command line application, so we need to invoke it by
+simply typing `texplate` in the terminal:
```bash
$ texplate
______ __ __ ___ __
-/\__ _\ /\ \ /\ \ /\_ \ /\ \__
-\/_/\ \/ __ \ `\`\/'/' _____\//\ \ __ \ \ ,_\ __
- \ \ \ /'__`\`\/ > < /\ '__`\\ \ \ /'__`\ \ \ \/ /'__`\
- \ \ \/\ __/ \/'/\`\\ \ \L\ \\_\ \_/\ \L\.\_\ \ \_/\ __/
+/\__ _\ /\ \ /\ \ /\_ \ /\ \__
+\/_/\ \/ __ \ `\`\/'/' _____\//\ \ __ \ \ ,_\ __
+ \ \ \ /'__`\`\/ > < /\ '__`\\ \ \ /'__`\ \ \ \/ /'__`\
+ \ \ \/\ __/ \/'/\`\\ \ \L\ \\_\ \_/\ \L\.\_\ \ \_/\ __/
\ \_\ \____\ /\_\\ \_\ \ ,__//\____\ \__/.\_\\ \__\ \____\
\/_/\/____/ \/_/ \/_/\ \ \/ \/____/\/__/\/_/ \/__/\/____/
\ \_\
@@ -55,23 +62,42 @@ Usage: texplate [-c=<configuration>] -o=<output> [-t=<template>]
-Provided that TeXplate is properly available in the underlying operating system, we will get a lovely, colorful output in our terminal, along with a couple of scary messages telling that some required options are missing. Our tool provides four options, described as follows. Strictly speaking, there is only one mandatory option. The remainder might be optional, depending on certain scenarios.
+Provided that TeXplate is properly available in the underlying operating system,
+we will get a lovely, colorful output in our terminal, along with a couple of
+scary messages telling that some required options are missing. Our tool provides
+four options, described as follows. Strictly speaking, there is only one
+mandatory option. The remainder might be optional, depending on certain
+scenarios.
### Output
-Referred as either`-o` (short representation) or `--output` (long representation), this option holds the output file in which the chosen template will be effectively written. The name is arbitrary, so you can use anything to your heart's desires. Keep in mind, however, that an existing file will be mercilessly overwritten. Also, make sure the path has the proper permissions for writing the output file.
+Referred as either`-o` (short representation) or `--output` (long
+representation), this option holds the output file in which the chosen template
+will be effectively written. The name is arbitrary, so you can use anything to
+your heart's desires. Keep in mind, however, that an existing file will be
+mercilessly overwritten. Also, make sure the path has the proper permissions for
+writing the output file.
### Template
-Referred as either `-t` (short representation) or `--template` (long representation), this option holds the reference to the template to be potentially merged with data and properly generated. The provided string should match the template identifier, otherwise TeXplate will raise an error complaining about the missing reference.
+Referred as either `-t` (short representation) or `--template` (long
+representation), this option holds the reference to the template to be
+potentially merged with data and properly generated. The provided string should
+match the template identifier, otherwise TeXplate will raise an error
+complaining about the missing reference.
### Map
-Referred as either `-m` (short representation) or `--map` (long representation), this option holds a map entry, defined as a `key=value` ordered pair (mind the `=` symbol used as entry separator). This option can be used multiple times. The map entry denotes a variable in the template context, where the key is the variable name and the value is set to be the initial state of such variable.
+Referred as either `-m` (short representation) or `--map` (long representation),
+this option holds a map entry, defined as a `key=value` ordered pair (mind the
+`=` symbol used as entry separator). This option can be used multiple times. The
+map entry denotes a variable in the template context, where the key is the
+variable name and the value is set to be the initial state of such variable.
## Examples
-For instance, let us generate a document named `doc1.tex`, based on the standard `article` class:
+For instance, let us generate a document named `doc1.tex`, based on the standard
+`article` class:
```bash
$ texplate -t article -o doc1.tex
@@ -103,7 +129,8 @@ Done! Enjoy your template!
Written: 112 B
```
-And that is it! We provided the template name (`-t article`) and the output (`-o doc1.tex`). Checking the contents of `doc1.tex`:
+And that is it! We provided the template name (`-t article`) and the output (`-o
+doc1.tex`). Checking the contents of `doc1.tex`:
```tex
\documentclass{article}
@@ -116,13 +143,18 @@ And that is it! We provided the template name (`-t article`) and the output (`-o
\end{document}
```
-We could enhance the template generation by providing further options to it. Let us say we want to include A4 as the paper size for our document and use XeTeX as engine. The command line is as follows (we omitted the full output for reducing verbosity):
+We could enhance the template generation by providing further options to it. Let
+us say we want to include A4 as the paper size for our document and use XeTeX as
+engine. The command line is as follows (we omitted the full output for reducing
+verbosity):
```bash
$ texplate -t article -o doc2.tex -m options=a4paper -m xetex=true
```
-For this example, we added two map entries referring to the class option and the support for newer engines (please refer to the user manual for more details on template options). The newly generated `doc2.tex` document is as follows:
+For this example, we added two map entries referring to the class option and the
+support for newer engines (please refer to the user manual for more details on
+template options). The newly generated `doc2.tex` document is as follows:
```tex
\documentclass[a4paper]{article}
@@ -159,13 +191,20 @@ Checking the contents of `doc3.tex`:
\end{document}
```
-And that is it! Make sure to take a look at the user manual to learn more about TeXplate!
+And that is it! Make sure to take a look at the user manual to learn more about
+TeXplate!
## License
-This application is licensed under the [New BSD License](https://opensource.org/licenses/BSD-3-Clause). Please note that the New BSD License has been verified as a GPL-compatible free software license by the [Free Software Foundation](http://www.fsf.org/), and has been vetted as an open source license by the [Open Source Initiative](http://www.opensource.org/).
+This application is licensed under the
+[New BSD License](https://opensource.org/licenses/BSD-3-Clause). Please note
+that the New BSD License has been verified as a GPL-compatible free software
+license by the [Free Software Foundation](http://www.fsf.org/), and has been
+vetted as an open source license by the
+[Open Source Initiative](http://www.opensource.org/).
## The team
-TeXplate is brought to you by Ben Frank and Paulo Cereda. If you want to support TeX development by a donation, the best way to do this is donating to the [TeX Users Group](https://www.tug.org/donate.html).
-
+TeXplate is brought to you by the Island of TeX. If you want to support TeX
+development by a donation, the best way to do this is donating to the
+[TeX Users Group](https://www.tug.org/donate.html).
diff --git a/Master/texmf-dist/doc/support/texplate/texplate-manual.pdf b/Master/texmf-dist/doc/support/texplate/texplate-manual.pdf
index 6f20dd4c2f3..96d574ace68 100644
--- a/Master/texmf-dist/doc/support/texplate/texplate-manual.pdf
+++ b/Master/texmf-dist/doc/support/texplate/texplate-manual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/texplate/texplate-manual.tex b/Master/texmf-dist/doc/support/texplate/texplate-manual.tex
index a56911ab727..1de47ab1497 100644
--- a/Master/texmf-dist/doc/support/texplate/texplate-manual.tex
+++ b/Master/texmf-dist/doc/support/texplate/texplate-manual.tex
@@ -17,7 +17,7 @@
\newcommand{\shortopt}[1]{{\ttfamily-#1}}
\newcommand{\longopt}[1]{{\ttfamily{-}{-}#1}}
\newcommand{\macro}[1]{{\ttfamily\textbackslash#1}}
-\newcommand{\texplateversion}{1.0.4}
+\newcommand{\texplateversion}{1.0.6}
\title{A gentle introduction to \texplate:\\ a document structure creation tool}
\author{Island of \TeX}
@@ -624,7 +624,23 @@ Happy \TeX ing with \texplate!
\chapter*{Changelog}
-\section*{1.0.4 (current)}
+\section*{1.0.6 (current)}
+
+\subsection*{Fixed}
+
+\begin{itemize}
+\item Application version is now retrieved from the manifest (regression fix).
+\end{itemize}
+
+\section*{1.0.5 (2024-08-01)}
+
+\subsection*{Changed}
+
+\begin{itemize}
+\item Updated dependencies to close a security vulnerability.
+\end{itemize}
+
+\section*{1.0.4 (2021-07-27)}
\subsection*{Fixed}
diff --git a/Master/texmf-dist/dvips/pst-coil/pst-coil.pro b/Master/texmf-dist/dvips/pst-coil/pst-coil.pro
index 9513e991946..b5484af58c7 100644
--- a/Master/texmf-dist/dvips/pst-coil/pst-coil.pro
+++ b/Master/texmf-dist/dvips/pst-coil/pst-coil.pro
@@ -41,8 +41,8 @@
/roundValue ED
/relativePeriod ED
/Periods ED
- /y1 ED /x1 ED /y0 ED /x0 ED
- y1 y0 sub x1 x0 sub 2 copy Pyth
+ /y_1 ED /x_1 ED /y_0 ED /x_0 ED
+ y_1 y_0 sub x_1 x_0 sub 2 copy Pyth
dup /TotalLength ED
ArmA sub ArmB sub /SinLength ED
Atan /RotAngle ED
@@ -54,7 +54,7 @@
/dxStep SinLength 360 div def % the default step for x pos
/xStep 360 PointsPerPeriod div def % the step for the for loop
/mtrx CM def
- x0 y0 translate
+ x_0 y_0 translate
RotAngle rotate
1 0 0 0 ArrowA ArmA 0 lineto
1 xStep 360 { % PointsPerPeriod times
@@ -77,7 +77,9 @@
BeginAngle 180 div AspectCos mul add BeginAngle cos
/lineto load stopped { moveto } if
BeginAngle Inc EndAngle { CoilLoop } for
- EndAngle CoilLoop mtrx setmatrix } def
+ EndAngle CoilLoop mtrx setmatrix
+} def
+%
/ZigZag { 15 dict begin
/ArmB ED /ArmA ED
2 div /w ED
@@ -109,7 +111,7 @@
%/psi ang 90 sub theta sub def % angle of B from center if bow>0
/rho HalfLength theta sin div def % radius of circle
bow 0 gt { /direc 1 def /thetaB ang 90 sub theta sub def } % travel B to A in pos drn
- { /direc -1 def /thetaB ang 90 add theta add def } ifelse % travel B to A in neg drn
+ { /direc -1 def /thetaB ang 90 add theta add def } ifelse % travel B to A in neg drn
%thetaB=angle from center to B
rho thetaB 180 add PtoC translate % origin now at center
/h h rho div RadtoDeg def
@@ -123,9 +125,14 @@
/arg thetaB ArmB direc mul add def % argument for 2nd point
% thetaB = direc = bow = HalfLength = theta = rho = arg = h = n =
mark rho thetaB PtoC rho arg PtoC /arg arg h 2 div add def
- n { w 0 gt { rhoo }{ rhoi } ifelse arg PtoC /w w neg def /arg arg h add def } repeat
+ n {
+ w 0 gt { rhoo }{ rhoi } ifelse
+ arg PtoC
+ /w w neg def
+ /arg arg h add def
+ } repeat
rho thetaB theta2 ArmA sub direc mul add PtoC rho thetaB theta2 direc mul add PtoC
- } def
+} def
%
end
% END pst-coil.pro
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_2eszu7.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_2eszu7.enc
index 5e0fc4b38e6..5b8cf7d7bb6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_2eszu7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_2eszu7.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_2eszu7a6f5pihgy63ufa3oo53g
-% Encoding created by otftotfm on Mon Jun 3 08:21:40 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:08 2024
% Command line follows encoding
/AutoEnc_2eszu7a6f5pihgy63ufa3oo53g [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_2hbdle.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_2hbdle.enc
index 79c777033e4..e02ccbdeca3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_2hbdle.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_2hbdle.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_2hbdle6scqqvwquik2mloewhha
-% Encoding created by otftotfm on Mon Jun 3 08:21:43 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:11 2024
% Command line follows encoding
/AutoEnc_2hbdle6scqqvwquik2mloewhha [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_2j6faw.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_2j6faw.enc
index 0764e4447db..d71d61ea170 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_2j6faw.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_2j6faw.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g
-% Encoding created by otftotfm on Mon Jun 3 08:21:27 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:16 2024
% Command line follows encoding
/AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_2qiiap.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_2qiiap.enc
index c8eafdc4c69..21a92e728cb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_2qiiap.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_2qiiap.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_2qiiapqo34donbs3yqnbk2nv3e
-% Encoding created by otftotfm on Mon Jun 3 08:22:03 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:35 2024
% Command line follows encoding
/AutoEnc_2qiiapqo34donbs3yqnbk2nv3e [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_3erjze.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_3erjze.enc
index 787865c760d..98c5adab084 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_3erjze.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_3erjze.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_3erjzexoluefphd3t3glzewwbc
-% Encoding created by otftotfm on Mon Jun 3 08:22:06 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:37 2024
% Command line follows encoding
/AutoEnc_3erjzexoluefphd3t3glzewwbc [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_4er2ou.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_4er2ou.enc
index 4fcf27dfd23..e9ef33d7aca 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_4er2ou.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_4er2ou.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_4er2oufhothrvoalsnupyw2d3f
-% Encoding created by otftotfm on Mon Jun 3 08:21:28 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:18 2024
% Command line follows encoding
/AutoEnc_4er2oufhothrvoalsnupyw2d3f [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_4nafnj.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_4nafnj.enc
index 17cb3df2230..165db5fd2b7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_4nafnj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_4nafnj.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_4nafnjraacunhork56emqsz24g
-% Encoding created by otftotfm on Mon Jun 3 08:21:18 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:01 2024
% Command line follows encoding
/AutoEnc_4nafnjraacunhork56emqsz24g [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_4vrfuq.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_4vrfuq.enc
index 5b2200e497e..6456dd331a0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_4vrfuq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_4vrfuq.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih
-% Encoding created by otftotfm on Mon Jun 3 08:21:53 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:42 2024
% Command line follows encoding
/AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_4vsefk.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_4vsefk.enc
index 982ed22265c..901b2c95067 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_4vsefk.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_4vsefk.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_4vsefkumzmh2bzpyordblncs3f
-% Encoding created by otftotfm on Mon Jun 3 08:21:26 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:15 2024
% Command line follows encoding
/AutoEnc_4vsefkumzmh2bzpyordblncs3f [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_535mcm.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_535mcm.enc
index 7ae0a138785..5b27526f033 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_535mcm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_535mcm.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_535mcmkatc3k7okg5zkd62wnwd
-% Encoding created by otftotfm on Mon Jun 3 08:21:46 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:29 2024
% Command line follows encoding
/AutoEnc_535mcmkatc3k7okg5zkd62wnwd [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_5eobdx.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_5eobdx.enc
index fbd6115aa78..0ebf66d00eb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_5eobdx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_5eobdx.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_5eobdximarbz54xttb4sm2kdud
-% Encoding created by otftotfm on Mon Jun 3 08:21:28 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:17 2024
% Command line follows encoding
/AutoEnc_5eobdximarbz54xttb4sm2kdud [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_5g5vl7.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_5g5vl7.enc
index 408c8cd8a76..b895f7ed54b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_5g5vl7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_5g5vl7.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe
-% Encoding created by otftotfm on Mon Jun 3 08:21:38 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:06 2024
% Command line follows encoding
/AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_5nplrd.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_5nplrd.enc
index 746d6375f82..e94b2100a91 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_5nplrd.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_5nplrd.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_5nplrdzykufffahiv5w7fphj6g
-% Encoding created by otftotfm on Mon Jun 3 08:21:57 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:46 2024
% Command line follows encoding
/AutoEnc_5nplrdzykufffahiv5w7fphj6g [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_6kirfz.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_6kirfz.enc
index aeec00e537e..55641993bf8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_6kirfz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_6kirfz.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb
-% Encoding created by otftotfm on Mon Jun 3 08:21:35 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:24 2024
% Command line follows encoding
/AutoEnc_6kirfzgy3qgjv2nfz6k5f5yffb [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_6mzsut.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_6mzsut.enc
index 3af71229c5e..e336b375994 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_6mzsut.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_6mzsut.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_6mzsut43zqq4lwldjh3irqozvg
-% Encoding created by otftotfm on Mon Jun 3 08:21:30 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:19 2024
% Command line follows encoding
/AutoEnc_6mzsut43zqq4lwldjh3irqozvg [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_7lzoym.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_7lzoym.enc
index d8f2e5f79cf..ee31e7bce8b 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_7lzoym.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_7lzoym.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_7lzoymb2wet4ejapw73pluelih
-% Encoding created by otftotfm on Mon Jun 3 08:21:50 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:40 2024
% Command line follows encoding
/AutoEnc_7lzoymb2wet4ejapw73pluelih [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_7sifzs.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_7sifzs.enc
index 5802141c90f..70bc8f4b50e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_7sifzs.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_7sifzs.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_7sifzs3povdhgbdceidql4wixf
-% Encoding created by otftotfm on Mon Jun 3 08:21:41 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:09 2024
% Command line follows encoding
/AutoEnc_7sifzs3povdhgbdceidql4wixf [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_7wd7je.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_7wd7je.enc
index 104ee5a013a..0310178d7d4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_7wd7je.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_7wd7je.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_7wd7jeaent3sj525defnqmlc3a
-% Encoding created by otftotfm on Mon Jun 3 08:21:34 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:23 2024
% Command line follows encoding
/AutoEnc_7wd7jeaent3sj525defnqmlc3a [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_alnhow.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_alnhow.enc
index f0422af5783..201487524c7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_alnhow.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_alnhow.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_alnhow5k56mgx4u4busf2jq7oc
-% Encoding created by otftotfm on Mon Jun 3 08:21:49 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:32 2024
% Command line follows encoding
/AutoEnc_alnhow5k56mgx4u4busf2jq7oc [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_atb2gm.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_atb2gm.enc
index f6d9234021b..fec74785467 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_atb2gm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_atb2gm.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_atb2gmtmls5nswm6yzyxijpwia
-% Encoding created by otftotfm on Mon Jun 3 08:21:58 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:47 2024
% Command line follows encoding
/AutoEnc_atb2gmtmls5nswm6yzyxijpwia [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_c4gqgp.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_c4gqgp.enc
index 93efc3e6cdb..67375f2c5e7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_c4gqgp.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_c4gqgp.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg
-% Encoding created by otftotfm on Mon Jun 3 08:21:22 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:14 2024
% Command line follows encoding
/AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_d7xkyr.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_d7xkyr.enc
index fcfb48b222b..f02b393c815 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_d7xkyr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_d7xkyr.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_d7xkyr425wbffbcqjppsmxikcg
-% Encoding created by otftotfm on Mon Jun 3 08:21:43 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:11 2024
% Command line follows encoding
/AutoEnc_d7xkyr425wbffbcqjppsmxikcg [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_dbackh.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_dbackh.enc
index d57427c2b05..ca09ac59d79 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_dbackh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_dbackh.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_dbackhi6pvphoypq66ehc33d3f
-% Encoding created by otftotfm on Mon Jun 3 08:21:17 2024
+% Encoding created by otftotfm on Sun Jul 21 14:43:59 2024
% Command line follows encoding
/AutoEnc_dbackhi6pvphoypq66ehc33d3f [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_dw56zz.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_dw56zz.enc
index aea9a7a519d..57486d98f41 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_dw56zz.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_dw56zz.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_dw56zz725rfgkmlvojqz6v7lva
-% Encoding created by otftotfm on Mon Jun 3 08:21:58 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:47 2024
% Command line follows encoding
/AutoEnc_dw56zz725rfgkmlvojqz6v7lva [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_dxxiiy.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_dxxiiy.enc
index fc1727ef02e..a8a416a81ce 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_dxxiiy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_dxxiiy.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_dxxiiybxnhhlouauw3rlqxo33d
-% Encoding created by otftotfm on Mon Jun 3 08:21:39 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:07 2024
% Command line follows encoding
/AutoEnc_dxxiiybxnhhlouauw3rlqxo33d [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_dydq3d.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_dydq3d.enc
index d39f3f1e214..b640806fb59 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_dydq3d.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_dydq3d.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_dydq3dq35yi5oslvq2t467lexf
-% Encoding created by otftotfm on Mon Jun 3 08:21:45 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:28 2024
% Command line follows encoding
/AutoEnc_dydq3dq35yi5oslvq2t467lexf [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_e2angy.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_e2angy.enc
index 272d51337f9..bd2e4414adb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_e2angy.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_e2angy.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_e2angygmuvvocd7xfckmfysctc
-% Encoding created by otftotfm on Mon Jun 3 08:21:24 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:04 2024
% Command line follows encoding
/AutoEnc_e2angygmuvvocd7xfckmfysctc [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_eb524t.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_eb524t.enc
index aad24c1c729..6b1f8f9ff32 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_eb524t.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_eb524t.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_eb524t77jhbble6z2w2zqzjzwb
-% Encoding created by otftotfm on Mon Jun 3 08:21:40 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:09 2024
% Command line follows encoding
/AutoEnc_eb524t77jhbble6z2w2zqzjzwb [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_fhg7wq.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_fhg7wq.enc
index 9b0465b169f..b6e45e77d3a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_fhg7wq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_fhg7wq.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_fhg7wqte3kwubg7ztq7czxibmb
-% Encoding created by otftotfm on Mon Jun 3 08:22:06 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:38 2024
% Command line follows encoding
/AutoEnc_fhg7wqte3kwubg7ztq7czxibmb [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_fjcuys.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_fjcuys.enc
index 0c52ead6e23..5ca2038d483 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_fjcuys.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_fjcuys.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_fjcuysocgz2yaptdavib26uxsa
-% Encoding created by otftotfm on Mon Jun 3 08:21:16 2024
+% Encoding created by otftotfm on Sun Jul 21 14:43:59 2024
% Command line follows encoding
/AutoEnc_fjcuysocgz2yaptdavib26uxsa [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_gktvs3.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_gktvs3.enc
index 1c5c3e1802d..bce06983211 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_gktvs3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_gktvs3.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_gktvs32iienhfw5kxnfiasu5eb
-% Encoding created by otftotfm on Mon Jun 3 08:21:29 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:18 2024
% Command line follows encoding
/AutoEnc_gktvs32iienhfw5kxnfiasu5eb [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_hwfs67.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_hwfs67.enc
index f13b9f099de..454312b626e 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_hwfs67.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_hwfs67.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_hwfs67fezbrr67nl7f7pwq6fib
-% Encoding created by otftotfm on Mon Jun 3 08:21:45 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:28 2024
% Command line follows encoding
/AutoEnc_hwfs67fezbrr67nl7f7pwq6fib [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_ifhpre.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_ifhpre.enc
index e52dcbc36d5..d7cd9b92b1f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_ifhpre.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_ifhpre.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ifhpre5ohw56txqybr4lbhkfeh
-% Encoding created by otftotfm on Mon Jun 3 08:21:25 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:06 2024
% Command line follows encoding
/AutoEnc_ifhpre5ohw56txqybr4lbhkfeh [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_ilb24p.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_ilb24p.enc
index bd0a339bd63..1f34ec4cb38 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_ilb24p.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_ilb24p.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ilb24pr2hmz3ktady5tx53tvrc
-% Encoding created by otftotfm on Mon Jun 3 08:21:50 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:40 2024
% Command line follows encoding
/AutoEnc_ilb24pr2hmz3ktady5tx53tvrc [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_jp6lmu.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_jp6lmu.enc
index 3bfe6fe7094..eb38417a245 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_jp6lmu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_jp6lmu.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc
-% Encoding created by otftotfm on Mon Jun 3 08:22:01 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:50 2024
% Command line follows encoding
/AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_la6rhc.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_la6rhc.enc
index 2ad3d6a231e..4956b20c746 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_la6rhc.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_la6rhc.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_la6rhca2nfyga6ki2ylwvzngdc
-% Encoding created by otftotfm on Mon Jun 3 08:21:37 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:26 2024
% Command line follows encoding
/AutoEnc_la6rhca2nfyga6ki2ylwvzngdc [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_ldcvmr.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_ldcvmr.enc
index caad76ade0f..9ea92aee659 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_ldcvmr.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_ldcvmr.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg
-% Encoding created by otftotfm on Mon Jun 3 08:21:51 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:33 2024
% Command line follows encoding
/AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_m67s2q.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_m67s2q.enc
index c242c72f4da..7db545b3221 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_m67s2q.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_m67s2q.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_m67s2q2if7mnc2weihu36ssjlc
-% Encoding created by otftotfm on Mon Jun 3 08:21:33 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:22 2024
% Command line follows encoding
/AutoEnc_m67s2q2if7mnc2weihu36ssjlc [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_ncilqg.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_ncilqg.enc
index 77efc6af6e5..56796c814f8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_ncilqg.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_ncilqg.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_ncilqga2wq6gokxg37hztx5vhd
-% Encoding created by otftotfm on Mon Jun 3 08:21:51 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:33 2024
% Command line follows encoding
/AutoEnc_ncilqga2wq6gokxg37hztx5vhd [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_nghkwv.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_nghkwv.enc
index fe51a21afec..7c74749e128 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_nghkwv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_nghkwv.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_nghkwvud4qcjbasji7abq43ang
-% Encoding created by otftotfm on Mon Jun 3 08:21:19 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:01 2024
% Command line follows encoding
/AutoEnc_nghkwvud4qcjbasji7abq43ang [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_nqur7h.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_nqur7h.enc
index 778f99a0b43..a1e1d9758cf 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_nqur7h.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_nqur7h.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg
-% Encoding created by otftotfm on Mon Jun 3 08:22:02 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:51 2024
% Command line follows encoding
/AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_p7ome7.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_p7ome7.enc
index fac267376e9..f59480afc79 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_p7ome7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_p7ome7.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf
-% Encoding created by otftotfm on Mon Jun 3 08:21:21 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:13 2024
% Command line follows encoding
/AutoEnc_p7ome7icqp3vzmtbnbpmkxf3gf [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_pm4uzf.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_pm4uzf.enc
index 2ccc5243a23..32d3da698a6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_pm4uzf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_pm4uzf.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_pm4uzfahvu7dsrii4trlz2xrag
-% Encoding created by otftotfm on Mon Jun 3 08:21:17 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:00 2024
% Command line follows encoding
/AutoEnc_pm4uzfahvu7dsrii4trlz2xrag [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_qigq3r.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_qigq3r.enc
index 95191aaf252..7823e1edba6 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_qigq3r.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_qigq3r.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_qigq3r6kkeutdpom7fe2yym7ee
-% Encoding created by otftotfm on Mon Jun 3 08:21:59 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:48 2024
% Command line follows encoding
/AutoEnc_qigq3r6kkeutdpom7fe2yym7ee [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_qrjy3o.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_qrjy3o.enc
index 1176317d270..e086321164d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_qrjy3o.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_qrjy3o.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_qrjy3ofpciutx5lfus5irfzcwg
-% Encoding created by otftotfm on Mon Jun 3 08:21:33 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:23 2024
% Command line follows encoding
/AutoEnc_qrjy3ofpciutx5lfus5irfzcwg [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_qs7fbx.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_qs7fbx.enc
index 99bc1e1d833..b1f58709b68 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_qs7fbx.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_qs7fbx.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_qs7fbx5isogj6aotrzbcf2fatf
-% Encoding created by otftotfm on Mon Jun 3 08:21:52 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:34 2024
% Command line follows encoding
/AutoEnc_qs7fbx5isogj6aotrzbcf2fatf [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_r7dcdh.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_r7dcdh.enc
index 829fcd4eccd..b2222f2d0c3 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_r7dcdh.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_r7dcdh.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh
-% Encoding created by otftotfm on Mon Jun 3 08:22:01 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:50 2024
% Command line follows encoding
/AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_rhm4ae.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_rhm4ae.enc
index 7b8d1faf11a..bca65ac59a7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_rhm4ae.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_rhm4ae.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_rhm4ae5n65jzxhmuodotowe3ie
-% Encoding created by otftotfm on Mon Jun 3 08:21:22 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:13 2024
% Command line follows encoding
/AutoEnc_rhm4ae5n65jzxhmuodotowe3ie [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_rvrggq.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_rvrggq.enc
index 54057c52541..44df398ad82 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_rvrggq.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_rvrggq.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_rvrggqrpyoajvnhcmba77jodeb
-% Encoding created by otftotfm on Mon Jun 3 08:21:24 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:05 2024
% Command line follows encoding
/AutoEnc_rvrggqrpyoajvnhcmba77jodeb [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_rx5biu.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_rx5biu.enc
index dd61f44b9e1..117b51ce2f2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_rx5biu.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_rx5biu.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_rx5biu5iitvjafup5ep7azzwqd
-% Encoding created by otftotfm on Mon Jun 3 08:21:21 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:04 2024
% Command line follows encoding
/AutoEnc_rx5biu5iitvjafup5ep7azzwqd [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_sa5d62.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_sa5d62.enc
index 5a25c8b4b51..54ed65ea055 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_sa5d62.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_sa5d62.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_sa5d626bmdnz7pskrtlomjwjsa
-% Encoding created by otftotfm on Mon Jun 3 08:21:26 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:15 2024
% Command line follows encoding
/AutoEnc_sa5d626bmdnz7pskrtlomjwjsa [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_sct77m.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_sct77m.enc
index 7c6be5c7639..27aa7575e44 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_sct77m.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_sct77m.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_sct77mjyojz7cxoff2fnlhe6dh
-% Encoding created by otftotfm on Mon Jun 3 08:22:07 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:39 2024
% Command line follows encoding
/AutoEnc_sct77mjyojz7cxoff2fnlhe6dh [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_soeko7.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_soeko7.enc
index 688141c5f34..af056765cc2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_soeko7.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_soeko7.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_soeko72tkqp5mq3cwi6dbzftwa
-% Encoding created by otftotfm on Mon Jun 3 08:21:50 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:41 2024
% Command line follows encoding
/AutoEnc_soeko72tkqp5mq3cwi6dbzftwa [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_t7d4ag.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_t7d4ag.enc
index 6b095229b38..8ae47315105 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_t7d4ag.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_t7d4ag.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_t7d4agwowidxbbzcqecpxwmpgf
-% Encoding created by otftotfm on Mon Jun 3 08:21:25 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:05 2024
% Command line follows encoding
/AutoEnc_t7d4agwowidxbbzcqecpxwmpgf [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_tbdiwj.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_tbdiwj.enc
index ccbe6439ac8..df2eba4e3cf 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_tbdiwj.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_tbdiwj.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_tbdiwje4bw76f7vvgcrib5fzae
-% Encoding created by otftotfm on Mon Jun 3 08:21:32 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:21 2024
% Command line follows encoding
/AutoEnc_tbdiwje4bw76f7vvgcrib5fzae [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_tugio2.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_tugio2.enc
index e76d33b1968..9ac416a61c7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_tugio2.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_tugio2.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_tugio2zn7n7qj7dokwog42wabb
-% Encoding created by otftotfm on Mon Jun 3 08:21:53 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:41 2024
% Command line follows encoding
/AutoEnc_tugio2zn7n7qj7dokwog42wabb [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_u6d4hm.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_u6d4hm.enc
index cb7621d7a30..a4e58b0efeb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_u6d4hm.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_u6d4hm.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge
-% Encoding created by otftotfm on Mon Jun 3 08:22:03 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:34 2024
% Command line follows encoding
/AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_uqxpwn.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_uqxpwn.enc
index 59c585820b0..d8c867a2813 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_uqxpwn.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_uqxpwn.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf
-% Encoding created by otftotfm on Mon Jun 3 08:21:31 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:20 2024
% Command line follows encoding
/AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_vai6ks.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_vai6ks.enc
index e44955a3197..f680a35fdcb 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_vai6ks.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_vai6ks.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_vai6ks3cv4tazwhjlqpiw7prze
-% Encoding created by otftotfm on Mon Jun 3 08:21:20 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:03 2024
% Command line follows encoding
/AutoEnc_vai6ks3cv4tazwhjlqpiw7prze [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_vv455d.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_vv455d.enc
index 023396af53d..37b67eef1fd 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_vv455d.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_vv455d.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_vv455d2uhxryhqknbxnoewzika
-% Encoding created by otftotfm on Mon Jun 3 08:21:31 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:21 2024
% Command line follows encoding
/AutoEnc_vv455d2uhxryhqknbxnoewzika [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_wkwe3q.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_wkwe3q.enc
index b4b817781fd..692ca7f76b0 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_wkwe3q.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_wkwe3q.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd
-% Encoding created by otftotfm on Mon Jun 3 08:21:36 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:26 2024
% Command line follows encoding
/AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_wusj3d.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_wusj3d.enc
index 883baf519bc..e8e80599bac 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_wusj3d.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_wusj3d.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_wusj3dovxz6g662phxe2hbnlgf
-% Encoding created by otftotfm on Mon Jun 3 08:21:15 2024
+% Encoding created by otftotfm on Sun Jul 21 14:43:58 2024
% Command line follows encoding
/AutoEnc_wusj3dovxz6g662phxe2hbnlgf [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_wwi77p.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_wwi77p.enc
index 18975491ebd..22fb211cc43 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_wwi77p.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_wwi77p.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_wwi77p5o5xmphvqrokewxarg5b
-% Encoding created by otftotfm on Mon Jun 3 08:21:51 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:41 2024
% Command line follows encoding
/AutoEnc_wwi77p5o5xmphvqrokewxarg5b [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_wydlop.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_wydlop.enc
index b3513c97378..7d698a055cd 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_wydlop.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_wydlop.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd
-% Encoding created by otftotfm on Mon Jun 3 08:21:52 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:34 2024
% Command line follows encoding
/AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_y2gbot.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_y2gbot.enc
index 51cf7619283..acc2515ec6d 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_y2gbot.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_y2gbot.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_y2gbotzqwkqzz56xfakanbnmfa
-% Encoding created by otftotfm on Mon Jun 3 08:21:20 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:02 2024
% Command line follows encoding
/AutoEnc_y2gbotzqwkqzz56xfakanbnmfa [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_y74d4a.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_y74d4a.enc
index aea23167811..e275b136595 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_y74d4a.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_y74d4a.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_y74d4a4koxcokubnvx36iwf23d
-% Encoding created by otftotfm on Mon Jun 3 08:21:54 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:43 2024
% Command line follows encoding
/AutoEnc_y74d4a4koxcokubnvx36iwf23d [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_yql4fv.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_yql4fv.enc
index ee5e6e3cba8..0e31021db73 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_yql4fv.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_yql4fv.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb
-% Encoding created by otftotfm on Mon Jun 3 08:21:23 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:14 2024
% Command line follows encoding
/AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_yur7kb.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_yur7kb.enc
index 5ab224bfba0..c5c141d0281 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_yur7kb.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_yur7kb.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_yur7kbdpi53abvssphlvppb5vc
-% Encoding created by otftotfm on Mon Jun 3 08:22:04 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:36 2024
% Command line follows encoding
/AutoEnc_yur7kbdpi53abvssphlvppb5vc [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_z4lkq6.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_z4lkq6.enc
index af0318b4191..02874f6fccd 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_z4lkq6.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_z4lkq6.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_z4lkq6f2v5epiwbfloel6jbuia
-% Encoding created by otftotfm on Mon Jun 3 08:21:36 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:25 2024
% Command line follows encoding
/AutoEnc_z4lkq6f2v5epiwbfloel6jbuia [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_zbxsaf.enc b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_zbxsaf.enc
index 135a2bc96f3..466ac150832 100644
--- a/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_zbxsaf.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/junicode/jncd_zbxsaf.enc
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_zbxsafbvfbbegsrut4auxxhfuf
-% Encoding created by otftotfm on Mon Jun 3 08:21:42 2024
+% Encoding created by otftotfm on Sun Jul 21 14:44:10 2024
% Command line follows encoding
/AutoEnc_zbxsafbvfbbegsrut4auxxhfuf [
%00
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_2k4lec.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_2k4lec.enc
new file mode 100644
index 00000000000..5c16476508f
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_2k4lec.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_2k4lecik2wfvlsvcu2lchypc5g
+% Encoding created by otftotfm on Mon Aug 5 23:45:15 2024
+% Command line follows encoding
+/AutoEnc_2k4lecik2wfvlsvcu2lchypc5g [
+%00
+ /f_f.liga /Euro /f_f_i.liga /f_f_l.liga /fraction /dotaccent /hungarumlaut /ogonek
+ /fl /f_b.liga /.notdef /f_j.liga /fi /f_h.liga /f_k.liga /f_t.liga
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+ /eight.lf /nine.lf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl MFBOldstyle-Regular.otf MFBOldstyle-Regular-lf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_2r5ytu.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_2r5ytu.enc
new file mode 100644
index 00000000000..5e00c5cbd69
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_2r5ytu.enc
@@ -0,0 +1,67 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_2r5ytu4o4u4xqkb7tlgy7zwnva
+% Encoding created by otftotfm on Mon Aug 5 23:45:16 2024
+% Command line follows encoding
+/AutoEnc_2r5ytu4o4u4xqkb7tlgy7zwnva [
+%00
+ /grave.sc /acute.sc /circumflex.sc /tilde.sc /dieresis.sc /dotbelowcomb /ring.sc /caron.sc
+ /breve.sc /macron.sc /dotaccent.sc /cedilla /hookabovecomb.sc /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /uni2080 /dotlessi.sc /uni1EF6 /uni1EF7.sc /uni1EF4 /uni1EF5.sc /Dcroat /dcroat.sc
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+ /eight.lf /nine.lf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /uni00AD
+%80
+ /Agrave /Aacute /Atilde /uni1EA2 /uni1EA0 /Acircumflex /uni1EA6 /uni1EA4
+ /uni1EAA /uni1EA8 /uni1EAC /Abreve /uni1EB0 /uni1EAE /uni1EB4 /uni1EB2
+%90
+ /uni1EB6 /Egrave /Eacute /uni1EBC /uni1EBA /uni1EB8 /Ecircumflex /uni1EC0
+ /uni1EBE /uni1EC4 /uni1EC2 /uni1EC6 /Igrave /Iacute /Itilde /uni1EC8
+%A0
+ /agrave.sc /aacute.sc /atilde.sc /uni1EA3.sc /uni1EA1.sc /acircumflex.sc /uni1EA7.sc /uni1EA5.sc
+ /uni1EAB.sc /uni1EA9.sc /uni1EAD.sc /abreve.sc /uni1EB1.sc /uni1EAF.sc /uni1EB5.sc /uni1EB3.sc
+%B0
+ /uni1EB7.sc /egrave.sc /eacute.sc /uni1EBD.sc /uni1EBB.sc /uni1EB9.sc /ecircumflex.sc /uni1EC1.sc
+ /uni1EBF.sc /uni1EC5.sc /uni1EC3.sc /uni1EC7.sc /igrave.sc /iacute.sc /itilde.sc /uni1EC9.sc
+%C0
+ /uni1ECA /Ograve /Oacute /Otilde /uni1ECE /uni1ECC /Ocircumflex /uni1ED2
+ /uni1ED0 /uni1ED6 /uni1ED4 /uni1ED8 /Ohorn /uni1EDC /uni1EDA /uni1EE0
+%D0
+ /uni1EDE /uni1EE2 /Ugrave /Uacute /Utilde /uni1EE6 /uni1EE4 /Uhorn
+ /uni1EEA /uni1EE8 /uni1EEE /uni1EEC /uni1EF0 /Ygrave /Yacute /uni1EF8
+%E0
+ /uni1ECB.sc /ograve.sc /oacute.sc /otilde.sc /uni1ECF.sc /uni1ECD.sc /ocircumflex.sc /uni1ED3.sc
+ /uni1ED1.sc /uni1ED7.sc /uni1ED5.sc /uni1ED9.sc /ohorn.sc /uni1EDD.sc /uni1EDB.sc /uni1EE1.sc
+%F0
+ /uni1EDF.sc /uni1EE3.sc /ugrave.sc /uacute.sc /utilde.sc /uni1EE7.sc /uni1EE5.sc /uhorn.sc
+ /uni1EEB.sc /uni1EE9.sc /uni1EEF.sc /uni1EED.sc /uni1EF1.sc /ygrave.sc /yacute.sc /uni1EF9.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t5
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --feature=kern --feature=liga --feature=lnum --feature=pnum
+% --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =:
+% SSsmall --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall
+% --unicoding=ffi =: FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =:
+% FFLsmall MFBOldstyle-Regular.otf MFBOldstyle-Regular-lf-sc-t5'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_5lrov3.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_5lrov3.enc
new file mode 100644
index 00000000000..7a562706f38
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_5lrov3.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_5lrov32z5fsqywm2faiucousah
+% Encoding created by otftotfm on Mon Aug 5 23:45:15 2024
+% Command line follows encoding
+/AutoEnc_5lrov32z5fsqywm2faiucousah [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /cedilla /ogonek /quotesinglbase /C /exclam
+%10
+ /exclamdown /question /quotedblbase /questiondown /asterisk /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /endash /.notdef
+%20
+ /.notdef /bar /.notdef /.notdef /dollar /.notdef /.notdef /quotesingle
+ /.notdef /.notdef /.notdef /.notdef /comma /.notdef /period /fraction
+%30
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /minus /.notdef /.notdef
+%40
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%50
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni03A9
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%60
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%70
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%80
+ /.notdef /.notdef /.notdef /.notdef /dagger /daggerdbl /.notdef /perthousand
+ /bullet /.notdef /.notdef /.notdef /florin /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /lira /.notdef /.notdef /.notdef /.notdef /trademark
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /cent /sterling /currency /yen /brokenbar /section
+ /.notdef /copyright /ordfeminine /.notdef /logicalnot /.notdef /registered /.notdef
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /.notdef /uni00B5 /paragraph /periodcentered
+ /.notdef /uni00B9 /ordmasculine /radical /onequarter /onehalf /threequarters /Euro
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /multiply /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /divide /.notdef
+ /.notdef /.notdef /.notdef /fl /l /fi /i /f
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ts1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=TEX TEXT COMPANION SYMBOLS 1---TS1 --feature=onum
+% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl MFBOldstyle-Regular.otf
+% MFBOldstyle-Regular-tosf-ts1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_6mghgo.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_6mghgo.enc
new file mode 100644
index 00000000000..8da3ef60479
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_6mghgo.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_6mghgo6i4fo2zwcclkxw55uy4b
+% Encoding created by otftotfm on Mon Aug 5 23:45:18 2024
+% Command line follows encoding
+/AutoEnc_6mghgo6i4fo2zwcclkxw55uy4b [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi.sc /uni0237.sc /grave.sc /acute.sc /caron.sc /breve.sc /macron.sc /ring.sc
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /.notdef /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex.sc /dotaccent.sc
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut.sc /tilde.sc /dieresis.sc
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=pnum --feature=smcp --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall MFBOldstyle-Regular.otf
+% MFBOldstyle-Regular-osf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_73nks5.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_73nks5.enc
new file mode 100644
index 00000000000..15488ee39da
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_73nks5.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_73nks5xpjecrfajnhprhdsspuf
+% Encoding created by otftotfm on Mon Aug 5 23:45:14 2024
+% Command line follows encoding
+/AutoEnc_73nks5xpjecrfajnhprhdsspuf [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /uni2080 /dotlessi /uni0237 /f_f.liga /fi /fl /f_f_i.liga /f_f_l.liga
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /f_b.liga /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /f_h.liga /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl MFBOldstyle-Regular.otf MFBOldstyle-Regular-tosf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_777sfz.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_777sfz.enc
new file mode 100644
index 00000000000..9583c33cbb5
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_777sfz.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_777sfz6kvd6vtcrsxpw47y5fng
+% Encoding created by otftotfm on Mon Aug 5 23:45:20 2024
+% Command line follows encoding
+/AutoEnc_777sfz6kvd6vtcrsxpw47y5fng [
+%00
+ /grave /acute /circumflex /tilde /dieresis /dotbelowcomb /ring /caron
+ /breve /macron /dotaccent /cedilla /hookabovecomb /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /uni2080 /dotlessi /uni1EF6 /uni1EF7 /uni1EF4 /uni1EF5 /Dcroat /dcroat
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /uni2070 /uni00B9 /uni00B2 /uni00B3 /uni2074 /uni2075 /uni2076 /uni2077
+ /uni2078 /uni2079 /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /uni00AD
+%80
+ /Agrave /Aacute /Atilde /uni1EA2 /uni1EA0 /Acircumflex /uni1EA6 /uni1EA4
+ /uni1EAA /uni1EA8 /uni1EAC /Abreve /uni1EB0 /uni1EAE /uni1EB4 /uni1EB2
+%90
+ /uni1EB6 /Egrave /Eacute /uni1EBC /uni1EBA /uni1EB8 /Ecircumflex /uni1EC0
+ /uni1EBE /uni1EC4 /uni1EC2 /uni1EC6 /Igrave /Iacute /Itilde /uni1EC8
+%A0
+ /agrave /aacute /atilde /uni1EA3 /uni1EA1 /acircumflex /uni1EA7 /uni1EA5
+ /uni1EAB /uni1EA9 /uni1EAD /abreve /uni1EB1 /uni1EAF /uni1EB5 /uni1EB3
+%B0
+ /uni1EB7 /egrave /eacute /uni1EBD /uni1EBB /uni1EB9 /ecircumflex /uni1EC1
+ /uni1EBF /uni1EC5 /uni1EC3 /uni1EC7 /igrave /iacute /itilde /uni1EC9
+%C0
+ /uni1ECA /Ograve /Oacute /Otilde /uni1ECE /uni1ECC /Ocircumflex /uni1ED2
+ /uni1ED0 /uni1ED6 /uni1ED4 /uni1ED8 /Ohorn /uni1EDC /uni1EDA /uni1EE0
+%D0
+ /uni1EDE /uni1EE2 /Ugrave /Uacute /Utilde /uni1EE6 /uni1EE4 /Uhorn
+ /uni1EEA /uni1EE8 /uni1EEE /uni1EEC /uni1EF0 /Ygrave /Yacute /uni1EF8
+%E0
+ /uni1ECB /ograve /oacute /otilde /uni1ECF /uni1ECD /ocircumflex /uni1ED3
+ /uni1ED1 /uni1ED7 /uni1ED5 /uni1ED9 /ohorn /uni1EDD /uni1EDB /uni1EE1
+%F0
+ /uni1EDF /uni1EE3 /ugrave /uacute /utilde /uni1EE7 /uni1EE5 /uhorn
+ /uni1EEB /uni1EE9 /uni1EEF /uni1EED /uni1EF1 /ygrave /yacute /uni1EF9
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t5
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --feature=sups --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f
+% f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} *
+% MFBOldstyle-Regular.otf MFBOldstyle-Regular-sup-t5'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_7nlkbe.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_7nlkbe.enc
new file mode 100644
index 00000000000..ab4105235bc
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_7nlkbe.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_7nlkbe5nk6t5wmyizyclpmezcf
+% Encoding created by otftotfm on Mon Aug 5 23:45:17 2024
+% Command line follows encoding
+/AutoEnc_7nlkbe5nk6t5wmyizyclpmezcf [
+%00
+ /f_f.liga /Euro /f_f_i.liga /f_f_l.liga /fraction /dotaccent /hungarumlaut /ogonek
+ /fl /f_b.liga /.notdef /f_j.liga /fi /f_h.liga /f_k.liga /f_t.liga
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl MFBOldstyle-Regular.otf MFBOldstyle-Regular-osf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_7q6l4s.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_7q6l4s.enc
new file mode 100644
index 00000000000..315880a1a92
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_7q6l4s.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh
+% Encoding created by otftotfm on Mon Aug 5 23:45:19 2024
+% Command line follows encoding
+/AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh [
+%00
+ /grave /acute /circumflex /tilde /dieresis /dotbelowcomb /ring /caron
+ /breve /macron /dotaccent /cedilla /hookabovecomb /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /uni2080 /dotlessi /uni1EF6 /uni1EF7 /uni1EF4 /uni1EF5 /Dcroat /dcroat
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /uni2080 /uni2081 /uni2082 /uni2083 /uni2084 /uni2085 /uni2086 /uni2087
+ /uni2088 /uni2089 /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /uni00AD
+%80
+ /Agrave /Aacute /Atilde /uni1EA2 /uni1EA0 /Acircumflex /uni1EA6 /uni1EA4
+ /uni1EAA /uni1EA8 /uni1EAC /Abreve /uni1EB0 /uni1EAE /uni1EB4 /uni1EB2
+%90
+ /uni1EB6 /Egrave /Eacute /uni1EBC /uni1EBA /uni1EB8 /Ecircumflex /uni1EC0
+ /uni1EBE /uni1EC4 /uni1EC2 /uni1EC6 /Igrave /Iacute /Itilde /uni1EC8
+%A0
+ /agrave /aacute /atilde /uni1EA3 /uni1EA1 /acircumflex /uni1EA7 /uni1EA5
+ /uni1EAB /uni1EA9 /uni1EAD /abreve /uni1EB1 /uni1EAF /uni1EB5 /uni1EB3
+%B0
+ /uni1EB7 /egrave /eacute /uni1EBD /uni1EBB /uni1EB9 /ecircumflex /uni1EC1
+ /uni1EBF /uni1EC5 /uni1EC3 /uni1EC7 /igrave /iacute /itilde /uni1EC9
+%C0
+ /uni1ECA /Ograve /Oacute /Otilde /uni1ECE /uni1ECC /Ocircumflex /uni1ED2
+ /uni1ED0 /uni1ED6 /uni1ED4 /uni1ED8 /Ohorn /uni1EDC /uni1EDA /uni1EE0
+%D0
+ /uni1EDE /uni1EE2 /Ugrave /Uacute /Utilde /uni1EE6 /uni1EE4 /Uhorn
+ /uni1EEA /uni1EE8 /uni1EEE /uni1EEC /uni1EF0 /Ygrave /Yacute /uni1EF8
+%E0
+ /uni1ECB /ograve /oacute /otilde /uni1ECF /uni1ECD /ocircumflex /uni1ED3
+ /uni1ED1 /uni1ED7 /uni1ED5 /uni1ED9 /ohorn /uni1EDD /uni1EDB /uni1EE1
+%F0
+ /uni1EDF /uni1EE3 /ugrave /uacute /utilde /uni1EE7 /uni1EE5 /uhorn
+ /uni1EEB /uni1EE9 /uni1EEF /uni1EED /uni1EF1 /ygrave /yacute /uni1EF9
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t5
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --feature=sinf --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f
+% f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} *
+% MFBOldstyle-Regular.otf MFBOldstyle-Regular-inf-t5'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_ahcimn.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_ahcimn.enc
new file mode 100644
index 00000000000..b1a6856a6af
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_ahcimn.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ahcimng7tjjvztjdn3tsyh2jwf
+% Encoding created by otftotfm on Mon Aug 5 23:45:14 2024
+% Command line follows encoding
+/AutoEnc_ahcimng7tjjvztjdn3tsyh2jwf [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent.sc /hungarumlaut.sc /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi.sc /uni0237.sc /grave.sc /acute.sc /caron.sc /breve.sc /macron.sc /ring.sc
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex.sc /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde.sc /dieresis.sc
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex.sc /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde.sc /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis.sc /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron.sc
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute.sc /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% MFBOldstyle-Regular.otf MFBOldstyle-Regular-tosf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_bgdhbr.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_bgdhbr.enc
new file mode 100644
index 00000000000..5e30deda098
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_bgdhbr.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_bgdhbrd4akym74hy6a5lgmcate
+% Encoding created by otftotfm on Mon Aug 5 23:45:19 2024
+% Command line follows encoding
+/AutoEnc_bgdhbrd4akym74hy6a5lgmcate [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni03A9 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /.notdef /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /uni2080 /uni2081 /uni2082 /uni2083 /uni2084 /uni2085 /uni2086 /uni2087
+ /uni2088 /uni2089 /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=sinf --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * MFBOldstyle-Regular.otf
+% MFBOldstyle-Regular-inf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_cgi3xl.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_cgi3xl.enc
new file mode 100644
index 00000000000..a1b1776219d
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_cgi3xl.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_cgi3xl52uwpg5zsjwybttwenng
+% Encoding created by otftotfm on Mon Aug 5 23:45:13 2024
+% Command line follows encoding
+/AutoEnc_cgi3xl52uwpg5zsjwybttwenng [
+%00
+ /grave /acute /circumflex /tilde /dieresis /dotbelowcomb /ring /caron
+ /breve /macron /dotaccent /cedilla /hookabovecomb /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /uni2080 /dotlessi /uni1EF6 /uni1EF7 /uni1EF4 /uni1EF5 /Dcroat /dcroat
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.numr /one.numr /two.numr /three.numr /four.numr /five.numr /six.numr /seven.numr
+ /eight.numr /nine.numr /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /uni00AD
+%80
+ /Agrave /Aacute /Atilde /uni1EA2 /uni1EA0 /Acircumflex /uni1EA6 /uni1EA4
+ /uni1EAA /uni1EA8 /uni1EAC /Abreve /uni1EB0 /uni1EAE /uni1EB4 /uni1EB2
+%90
+ /uni1EB6 /Egrave /Eacute /uni1EBC /uni1EBA /uni1EB8 /Ecircumflex /uni1EC0
+ /uni1EBE /uni1EC4 /uni1EC2 /uni1EC6 /Igrave /Iacute /Itilde /uni1EC8
+%A0
+ /agrave /aacute /atilde /uni1EA3 /uni1EA1 /acircumflex /uni1EA7 /uni1EA5
+ /uni1EAB /uni1EA9 /uni1EAD /abreve /uni1EB1 /uni1EAF /uni1EB5 /uni1EB3
+%B0
+ /uni1EB7 /egrave /eacute /uni1EBD /uni1EBB /uni1EB9 /ecircumflex /uni1EC1
+ /uni1EBF /uni1EC5 /uni1EC3 /uni1EC7 /igrave /iacute /itilde /uni1EC9
+%C0
+ /uni1ECA /Ograve /Oacute /Otilde /uni1ECE /uni1ECC /Ocircumflex /uni1ED2
+ /uni1ED0 /uni1ED6 /uni1ED4 /uni1ED8 /Ohorn /uni1EDC /uni1EDA /uni1EE0
+%D0
+ /uni1EDE /uni1EE2 /Ugrave /Uacute /Utilde /uni1EE6 /uni1EE4 /Uhorn
+ /uni1EEA /uni1EE8 /uni1EEE /uni1EEC /uni1EF0 /Ygrave /Yacute /uni1EF8
+%E0
+ /uni1ECB /ograve /oacute /otilde /uni1ECF /uni1ECD /ocircumflex /uni1ED3
+ /uni1ED1 /uni1ED7 /uni1ED5 /uni1ED9 /ohorn /uni1EDD /uni1EDB /uni1EE1
+%F0
+ /uni1EDF /uni1EE3 /ugrave /uacute /utilde /uni1EE7 /uni1EE5 /uhorn
+ /uni1EEB /uni1EE9 /uni1EEF /uni1EED /uni1EF1 /ygrave /yacute /uni1EF9
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t5
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --feature=numr --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f
+% f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} *
+% MFBOldstyle-Regular.otf MFBOldstyle-Regular-numr-t5'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_cwrjrk.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_cwrjrk.enc
new file mode 100644
index 00000000000..e36c8db9bc7
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_cwrjrk.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh
+% Encoding created by otftotfm on Mon Aug 5 23:45:13 2024
+% Command line follows encoding
+/AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni03A9 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /.notdef /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_f.liga /f_f_i.liga /f_f_l.liga /f_b.liga /f_h.liga /f_j.liga /f_k.liga /f_t.liga
+ /f_f_b.liga /f_f_f.liga /Lslash /f_f_h.liga /f_f_j.liga /f_f_k.liga /f_f_t.liga /f_f_f_b.liga
+%90
+ /f_f_f_h.liga /f_f_f_i.liga /f_f_f_j.liga /f_f_f_k.liga /f_f_f_l.liga /f_f_f_t.liga /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% MFBOldstyle-Regular.otf MFBOldstyle-Regular-tosf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_e5y2zy.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_e5y2zy.enc
new file mode 100644
index 00000000000..77f868d2b60
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_e5y2zy.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc
+% Encoding created by otftotfm on Mon Aug 5 23:45:12 2024
+% Command line follows encoding
+/AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni03A9 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /.notdef /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.numr /one.numr /two.numr /three.numr /four.numr /five.numr /six.numr /seven.numr
+ /eight.numr /nine.numr /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=numr --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * MFBOldstyle-Regular.otf
+% MFBOldstyle-Regular-numr-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_fy4cgk.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_fy4cgk.enc
new file mode 100644
index 00000000000..16c57286647
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_fy4cgk.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_fy4cgkjk47io5vdxcmrl3tmq4d
+% Encoding created by otftotfm on Mon Aug 5 23:45:18 2024
+% Command line follows encoding
+/AutoEnc_fy4cgkjk47io5vdxcmrl3tmq4d [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent.sc /hungarumlaut.sc /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi.sc /uni0237.sc /grave.sc /acute.sc /caron.sc /breve.sc /macron.sc /ring.sc
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex.sc /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde.sc /dieresis.sc
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex.sc /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde.sc /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis.sc /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron.sc
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute.sc /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% MFBOldstyle-Regular.otf MFBOldstyle-Regular-osf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_hi6bgi.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_hi6bgi.enc
new file mode 100644
index 00000000000..7a4bfdaba5f
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_hi6bgi.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e
+% Encoding created by otftotfm on Mon Aug 5 23:45:15 2024
+% Command line follows encoding
+/AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni03A9 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /.notdef /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+ /eight.lf /nine.lf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_f.liga /f_f_i.liga /f_f_l.liga /f_b.liga /f_h.liga /f_j.liga /f_k.liga /f_t.liga
+ /f_f_b.liga /f_f_f.liga /Lslash /f_f_h.liga /f_f_j.liga /f_f_k.liga /f_f_t.liga /f_f_f_b.liga
+%90
+ /f_f_f_h.liga /f_f_f_i.liga /f_f_f_j.liga /f_f_f_k.liga /f_f_f_l.liga /f_f_f_t.liga /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% MFBOldstyle-Regular.otf MFBOldstyle-Regular-lf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_ikcbof.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_ikcbof.enc
new file mode 100644
index 00000000000..b46e832215c
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_ikcbof.enc
@@ -0,0 +1,67 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ikcbofmmzjk2yaxfbmq4w4tfcd
+% Encoding created by otftotfm on Mon Aug 5 23:45:18 2024
+% Command line follows encoding
+/AutoEnc_ikcbofmmzjk2yaxfbmq4w4tfcd [
+%00
+ /grave.sc /acute.sc /circumflex.sc /tilde.sc /dieresis.sc /dotbelowcomb /ring.sc /caron.sc
+ /breve.sc /macron.sc /dotaccent.sc /cedilla /hookabovecomb.sc /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /uni2080 /dotlessi.sc /uni1EF6 /uni1EF7.sc /uni1EF4 /uni1EF5.sc /Dcroat /dcroat.sc
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /uni00AD
+%80
+ /Agrave /Aacute /Atilde /uni1EA2 /uni1EA0 /Acircumflex /uni1EA6 /uni1EA4
+ /uni1EAA /uni1EA8 /uni1EAC /Abreve /uni1EB0 /uni1EAE /uni1EB4 /uni1EB2
+%90
+ /uni1EB6 /Egrave /Eacute /uni1EBC /uni1EBA /uni1EB8 /Ecircumflex /uni1EC0
+ /uni1EBE /uni1EC4 /uni1EC2 /uni1EC6 /Igrave /Iacute /Itilde /uni1EC8
+%A0
+ /agrave.sc /aacute.sc /atilde.sc /uni1EA3.sc /uni1EA1.sc /acircumflex.sc /uni1EA7.sc /uni1EA5.sc
+ /uni1EAB.sc /uni1EA9.sc /uni1EAD.sc /abreve.sc /uni1EB1.sc /uni1EAF.sc /uni1EB5.sc /uni1EB3.sc
+%B0
+ /uni1EB7.sc /egrave.sc /eacute.sc /uni1EBD.sc /uni1EBB.sc /uni1EB9.sc /ecircumflex.sc /uni1EC1.sc
+ /uni1EBF.sc /uni1EC5.sc /uni1EC3.sc /uni1EC7.sc /igrave.sc /iacute.sc /itilde.sc /uni1EC9.sc
+%C0
+ /uni1ECA /Ograve /Oacute /Otilde /uni1ECE /uni1ECC /Ocircumflex /uni1ED2
+ /uni1ED0 /uni1ED6 /uni1ED4 /uni1ED8 /Ohorn /uni1EDC /uni1EDA /uni1EE0
+%D0
+ /uni1EDE /uni1EE2 /Ugrave /Uacute /Utilde /uni1EE6 /uni1EE4 /Uhorn
+ /uni1EEA /uni1EE8 /uni1EEE /uni1EEC /uni1EF0 /Ygrave /Yacute /uni1EF8
+%E0
+ /uni1ECB.sc /ograve.sc /oacute.sc /otilde.sc /uni1ECF.sc /uni1ECD.sc /ocircumflex.sc /uni1ED3.sc
+ /uni1ED1.sc /uni1ED7.sc /uni1ED5.sc /uni1ED9.sc /ohorn.sc /uni1EDD.sc /uni1EDB.sc /uni1EE1.sc
+%F0
+ /uni1EDF.sc /uni1EE3.sc /ugrave.sc /uacute.sc /utilde.sc /uni1EE7.sc /uni1EE5.sc /uhorn.sc
+ /uni1EEB.sc /uni1EE9.sc /uni1EEF.sc /uni1EED.sc /uni1EF1.sc /ygrave.sc /yacute.sc /uni1EF9.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t5
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --feature=kern --feature=liga --feature=onum --feature=pnum
+% --feature=smcp --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =:
+% SSsmall --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall
+% --unicoding=ffi =: FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =:
+% FFLsmall MFBOldstyle-Regular.otf MFBOldstyle-Regular-osf-sc-t5'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_in623c.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_in623c.enc
new file mode 100644
index 00000000000..bc6c94ce0cf
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_in623c.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_in623cj3knes7lnso6hltdatyf
+% Encoding created by otftotfm on Mon Aug 5 23:45:20 2024
+% Command line follows encoding
+/AutoEnc_in623cj3knes7lnso6hltdatyf [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni03A9 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /.notdef /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /uni2070 /uni00B9 /uni00B2 /uni00B3 /uni2074 /uni2075 /uni2076 /uni2077
+ /uni2078 /uni2079 /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=sups --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * MFBOldstyle-Regular.otf
+% MFBOldstyle-Regular-sup-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_jaulpu.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_jaulpu.enc
new file mode 100644
index 00000000000..3be86f7aebb
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_jaulpu.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_jaulpudaso23auq4gblystdt4f
+% Encoding created by otftotfm on Mon Aug 5 23:45:19 2024
+% Command line follows encoding
+/AutoEnc_jaulpudaso23auq4gblystdt4f [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /uni2080 /dotlessi /uni0237 /.notdef /fi /fl /.notdef /.notdef
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.dnom /one.dnom /two.dnom /three.dnom /four.dnom /five.dnom /six.dnom /seven.dnom
+ /eight.dnom /nine.dnom /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /.notdef /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /.notdef /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=dnom
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * MFBOldstyle-Regular.otf
+% MFBOldstyle-Regular-dnom-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_kod5rh.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_kod5rh.enc
new file mode 100644
index 00000000000..9d1b52854eb
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_kod5rh.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_kod5rhatuhycv25ljuqjpdknae
+% Encoding created by otftotfm on Mon Aug 5 23:45:16 2024
+% Command line follows encoding
+/AutoEnc_kod5rhatuhycv25ljuqjpdknae [
+%00
+ /grave.sc /acute.sc /circumflex.sc /tilde.sc /dieresis.sc /hungarumlaut.sc /ring.sc /caron.sc
+ /breve.sc /macron.sc /dotaccent.sc /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /uni2080 /dotlessi.sc /uni0237.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+ /eight.lf /nine.lf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /.notdef /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /.notdef /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% MFBOldstyle-Regular.otf MFBOldstyle-Regular-lf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_kosxnn.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_kosxnn.enc
new file mode 100644
index 00000000000..a948ab15ca7
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_kosxnn.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_kosxnnoffdfmoxhhu6p5o7mihd
+% Encoding created by otftotfm on Mon Aug 5 23:45:17 2024
+% Command line follows encoding
+/AutoEnc_kosxnnoffdfmoxhhu6p5o7mihd [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni03A9 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /.notdef /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /f_f.liga /f_f_i.liga /f_f_l.liga /f_b.liga /f_h.liga /f_j.liga /f_k.liga /f_t.liga
+ /f_f_b.liga /f_f_f.liga /Lslash /f_f_h.liga /f_f_j.liga /f_f_k.liga /f_f_t.liga /f_f_f_b.liga
+%90
+ /f_f_f_h.liga /f_f_f_i.liga /f_f_f_j.liga /f_f_f_k.liga /f_f_f_l.liga /f_f_f_t.liga /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=pnum --ligkern=f i =: fi --ligkern=f l =: fl
+% --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl
+% MFBOldstyle-Regular.otf MFBOldstyle-Regular-osf-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_nduqlz.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_nduqlz.enc
new file mode 100644
index 00000000000..b340f3002c0
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_nduqlz.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud
+% Encoding created by otftotfm on Mon Aug 5 23:45:20 2024
+% Command line follows encoding
+/AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /fl /.notdef /.notdef /.notdef /fi /.notdef /.notdef /.notdef
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /uni2070 /uni00B9 /uni00B2 /uni00B3 /uni2074 /uni2075 /uni2076 /uni2077
+ /uni2078 /uni2079 /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sups
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * MFBOldstyle-Regular.otf
+% MFBOldstyle-Regular-sup-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_nrcrlb.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_nrcrlb.enc
new file mode 100644
index 00000000000..4195f17d7f1
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_nrcrlb.enc
@@ -0,0 +1,67 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_nrcrlbklwnd2ct5bgdechurqqb
+% Encoding created by otftotfm on Mon Aug 5 23:45:14 2024
+% Command line follows encoding
+/AutoEnc_nrcrlbklwnd2ct5bgdechurqqb [
+%00
+ /grave.sc /acute.sc /circumflex.sc /tilde.sc /dieresis.sc /dotbelowcomb /ring.sc /caron.sc
+ /breve.sc /macron.sc /dotaccent.sc /cedilla /hookabovecomb.sc /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /uni2080 /dotlessi.sc /uni1EF6 /uni1EF7.sc /uni1EF4 /uni1EF5.sc /Dcroat /dcroat.sc
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /uni00AD
+%80
+ /Agrave /Aacute /Atilde /uni1EA2 /uni1EA0 /Acircumflex /uni1EA6 /uni1EA4
+ /uni1EAA /uni1EA8 /uni1EAC /Abreve /uni1EB0 /uni1EAE /uni1EB4 /uni1EB2
+%90
+ /uni1EB6 /Egrave /Eacute /uni1EBC /uni1EBA /uni1EB8 /Ecircumflex /uni1EC0
+ /uni1EBE /uni1EC4 /uni1EC2 /uni1EC6 /Igrave /Iacute /Itilde /uni1EC8
+%A0
+ /agrave.sc /aacute.sc /atilde.sc /uni1EA3.sc /uni1EA1.sc /acircumflex.sc /uni1EA7.sc /uni1EA5.sc
+ /uni1EAB.sc /uni1EA9.sc /uni1EAD.sc /abreve.sc /uni1EB1.sc /uni1EAF.sc /uni1EB5.sc /uni1EB3.sc
+%B0
+ /uni1EB7.sc /egrave.sc /eacute.sc /uni1EBD.sc /uni1EBB.sc /uni1EB9.sc /ecircumflex.sc /uni1EC1.sc
+ /uni1EBF.sc /uni1EC5.sc /uni1EC3.sc /uni1EC7.sc /igrave.sc /iacute.sc /itilde.sc /uni1EC9.sc
+%C0
+ /uni1ECA /Ograve /Oacute /Otilde /uni1ECE /uni1ECC /Ocircumflex /uni1ED2
+ /uni1ED0 /uni1ED6 /uni1ED4 /uni1ED8 /Ohorn /uni1EDC /uni1EDA /uni1EE0
+%D0
+ /uni1EDE /uni1EE2 /Ugrave /Uacute /Utilde /uni1EE6 /uni1EE4 /Uhorn
+ /uni1EEA /uni1EE8 /uni1EEE /uni1EEC /uni1EF0 /Ygrave /Yacute /uni1EF8
+%E0
+ /uni1ECB.sc /ograve.sc /oacute.sc /otilde.sc /uni1ECF.sc /uni1ECD.sc /ocircumflex.sc /uni1ED3.sc
+ /uni1ED1.sc /uni1ED7.sc /uni1ED5.sc /uni1ED9.sc /ohorn.sc /uni1EDD.sc /uni1EDB.sc /uni1EE1.sc
+%F0
+ /uni1EDF.sc /uni1EE3.sc /ugrave.sc /uacute.sc /utilde.sc /uni1EE7.sc /uni1EE5.sc /uhorn.sc
+ /uni1EEB.sc /uni1EE9.sc /uni1EEF.sc /uni1EED.sc /uni1EF1.sc /ygrave.sc /yacute.sc /uni1EF9.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t5
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --feature=kern --feature=liga --feature=onum --feature=smcp
+% --feature=tnum --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff
+% --ligkern=ff i =: ffi --ligkern=ff l =: ffl --unicoding=germandbls =:
+% SSsmall --unicoding=ff =: FFsmall --unicoding=fi =: FIsmall
+% --unicoding=ffi =: FFIsmall --unicoding=fl =: FLsmall --unicoding=ffl =:
+% FFLsmall MFBOldstyle-Regular.otf MFBOldstyle-Regular-tosf-sc-t5'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_oyw33c.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_oyw33c.enc
new file mode 100644
index 00000000000..7ae09f6d511
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_oyw33c.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_oyw33c2h3oyy6rdgmggfawuoud
+% Encoding created by otftotfm on Mon Aug 5 23:45:14 2024
+% Command line follows encoding
+/AutoEnc_oyw33c2h3oyy6rdgmggfawuoud [
+%00
+ /grave /acute /circumflex /tilde /dieresis /dotbelowcomb /ring /caron
+ /breve /macron /dotaccent /cedilla /hookabovecomb /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /uni2080 /dotlessi /uni1EF6 /uni1EF7 /uni1EF4 /uni1EF5 /Dcroat /dcroat
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /uni00AD
+%80
+ /Agrave /Aacute /Atilde /uni1EA2 /uni1EA0 /Acircumflex /uni1EA6 /uni1EA4
+ /uni1EAA /uni1EA8 /uni1EAC /Abreve /uni1EB0 /uni1EAE /uni1EB4 /uni1EB2
+%90
+ /uni1EB6 /Egrave /Eacute /uni1EBC /uni1EBA /uni1EB8 /Ecircumflex /uni1EC0
+ /uni1EBE /uni1EC4 /uni1EC2 /uni1EC6 /Igrave /Iacute /Itilde /uni1EC8
+%A0
+ /agrave /aacute /atilde /uni1EA3 /uni1EA1 /acircumflex /uni1EA7 /uni1EA5
+ /uni1EAB /uni1EA9 /uni1EAD /abreve /uni1EB1 /uni1EAF /uni1EB5 /uni1EB3
+%B0
+ /uni1EB7 /egrave /eacute /uni1EBD /uni1EBB /uni1EB9 /ecircumflex /uni1EC1
+ /uni1EBF /uni1EC5 /uni1EC3 /uni1EC7 /igrave /iacute /itilde /uni1EC9
+%C0
+ /uni1ECA /Ograve /Oacute /Otilde /uni1ECE /uni1ECC /Ocircumflex /uni1ED2
+ /uni1ED0 /uni1ED6 /uni1ED4 /uni1ED8 /Ohorn /uni1EDC /uni1EDA /uni1EE0
+%D0
+ /uni1EDE /uni1EE2 /Ugrave /Uacute /Utilde /uni1EE6 /uni1EE4 /Uhorn
+ /uni1EEA /uni1EE8 /uni1EEE /uni1EEC /uni1EF0 /Ygrave /Yacute /uni1EF8
+%E0
+ /uni1ECB /ograve /oacute /otilde /uni1ECF /uni1ECD /ocircumflex /uni1ED3
+ /uni1ED1 /uni1ED7 /uni1ED5 /uni1ED9 /ohorn /uni1EDD /uni1EDB /uni1EE1
+%F0
+ /uni1EDF /uni1EE3 /ugrave /uacute /utilde /uni1EE7 /uni1EE5 /uhorn
+ /uni1EEB /uni1EE9 /uni1EEF /uni1EED /uni1EF1 /ygrave /yacute /uni1EF9
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t5
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --feature=kern --feature=liga --feature=onum --feature=tnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl MFBOldstyle-Regular.otf
+% MFBOldstyle-Regular-tosf-t5'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_q4fonx.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_q4fonx.enc
new file mode 100644
index 00000000000..eb179e0b156
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_q4fonx.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g
+% Encoding created by otftotfm on Mon Aug 5 23:45:19 2024
+% Command line follows encoding
+/AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /fl /.notdef /.notdef /.notdef /fi /.notdef /.notdef /.notdef
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.dnom /one.dnom /two.dnom /three.dnom /four.dnom /five.dnom /six.dnom /seven.dnom
+ /eight.dnom /nine.dnom /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=dnom
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * MFBOldstyle-Regular.otf
+% MFBOldstyle-Regular-dnom-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_qmdrba.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_qmdrba.enc
new file mode 100644
index 00000000000..e3ee5ef937c
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_qmdrba.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_qmdrbau3qho7wzvgdp4updvdxd
+% Encoding created by otftotfm on Mon Aug 5 23:45:15 2024
+% Command line follows encoding
+/AutoEnc_qmdrbau3qho7wzvgdp4updvdxd [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi.sc /uni0237.sc /grave.sc /acute.sc /caron.sc /breve.sc /macron.sc /ring.sc
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /.notdef /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+ /eight.lf /nine.lf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex.sc /dotaccent.sc
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut.sc /tilde.sc /dieresis.sc
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=lnum --feature=pnum --feature=smcp --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall MFBOldstyle-Regular.otf
+% MFBOldstyle-Regular-lf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_radqz3.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_radqz3.enc
new file mode 100644
index 00000000000..c658ad3fc46
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_radqz3.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_radqz3tuq35ucoeetjpj4dtaoe
+% Encoding created by otftotfm on Mon Aug 5 23:45:14 2024
+% Command line follows encoding
+/AutoEnc_radqz3tuq35ucoeetjpj4dtaoe [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni03A9 /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi.sc /uni0237.sc /grave.sc /acute.sc /caron.sc /breve.sc /macron.sc /ring.sc
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /.notdef /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex.sc /dotaccent.sc
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /endash /emdash /hungarumlaut.sc /tilde.sc /dieresis.sc
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=kern --feature=liga
+% --feature=onum --feature=smcp --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =: FFsmall
+% --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall --unicoding=fl =:
+% FLsmall --unicoding=ffl =: FFLsmall MFBOldstyle-Regular.otf
+% MFBOldstyle-Regular-tosf-sc-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_rxfd27.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_rxfd27.enc
new file mode 100644
index 00000000000..676053755aa
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_rxfd27.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd
+% Encoding created by otftotfm on Mon Aug 5 23:45:13 2024
+% Command line follows encoding
+/AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd [
+%00
+ /f_f.liga /Euro /f_f_i.liga /f_f_l.liga /fraction /dotaccent /hungarumlaut /ogonek
+ /fl /f_b.liga /.notdef /f_j.liga /fi /f_h.liga /f_k.liga /f_t.liga
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=onum --feature=tnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl MFBOldstyle-Regular.otf MFBOldstyle-Regular-tosf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_s7hq75.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_s7hq75.enc
new file mode 100644
index 00000000000..c2e3b15b9fd
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_s7hq75.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_s7hq7555ku6wpqltvtwpifv4nh
+% Encoding created by otftotfm on Mon Aug 5 23:45:14 2024
+% Command line follows encoding
+/AutoEnc_s7hq7555ku6wpqltvtwpifv4nh [
+%00
+ /grave.sc /acute.sc /circumflex.sc /tilde.sc /dieresis.sc /hungarumlaut.sc /ring.sc /caron.sc
+ /breve.sc /macron.sc /dotaccent.sc /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /uni2080 /dotlessi.sc /uni0237.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.tf /one.tf /two.tf /three.tf /four.tf /five.tf /six.tf /seven.tf
+ /eight.tf /nine.tf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /.notdef /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /.notdef /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=smcp --feature=tnum --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% MFBOldstyle-Regular.otf MFBOldstyle-Regular-tosf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_sbbrr6.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_sbbrr6.enc
new file mode 100644
index 00000000000..80989372fc9
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_sbbrr6.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_sbbrr6nlw2mftfr36dqzfbpjfa
+% Encoding created by otftotfm on Mon Aug 5 23:45:15 2024
+% Command line follows encoding
+/AutoEnc_sbbrr6nlw2mftfr36dqzfbpjfa [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent.sc /hungarumlaut.sc /ogonek
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /dotlessi.sc /uni0237.sc /grave.sc /acute.sc /caron.sc /breve.sc /macron.sc /ring.sc
+ /cedilla /.notdef /ae.sc /oe.sc /oslash.sc /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+ /eight.lf /nine.lf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex.sc /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /tilde.sc /dieresis.sc
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex.sc /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash.sc /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde.sc /trademark /scaron.sc /guilsinglright /oe.sc /zcaron.sc /asciitilde /Ydieresis
+%A0
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis.sc /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron.sc
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute.sc /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /.notdef
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /divide
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /ydieresis.sc
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% MFBOldstyle-Regular.otf MFBOldstyle-Regular-lf-sc-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_traljt.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_traljt.enc
new file mode 100644
index 00000000000..9a3929d4642
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_traljt.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_traljtgjhzanuqiozmg6tgnoaa
+% Encoding created by otftotfm on Mon Aug 5 23:45:15 2024
+% Command line follows encoding
+/AutoEnc_traljtgjhzanuqiozmg6tgnoaa [
+%00
+ /grave /acute /circumflex /tilde /dieresis /dotbelowcomb /ring /caron
+ /breve /macron /dotaccent /cedilla /hookabovecomb /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /uni2080 /dotlessi /uni1EF6 /uni1EF7 /uni1EF4 /uni1EF5 /Dcroat /dcroat
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+ /eight.lf /nine.lf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /uni00AD
+%80
+ /Agrave /Aacute /Atilde /uni1EA2 /uni1EA0 /Acircumflex /uni1EA6 /uni1EA4
+ /uni1EAA /uni1EA8 /uni1EAC /Abreve /uni1EB0 /uni1EAE /uni1EB4 /uni1EB2
+%90
+ /uni1EB6 /Egrave /Eacute /uni1EBC /uni1EBA /uni1EB8 /Ecircumflex /uni1EC0
+ /uni1EBE /uni1EC4 /uni1EC2 /uni1EC6 /Igrave /Iacute /Itilde /uni1EC8
+%A0
+ /agrave /aacute /atilde /uni1EA3 /uni1EA1 /acircumflex /uni1EA7 /uni1EA5
+ /uni1EAB /uni1EA9 /uni1EAD /abreve /uni1EB1 /uni1EAF /uni1EB5 /uni1EB3
+%B0
+ /uni1EB7 /egrave /eacute /uni1EBD /uni1EBB /uni1EB9 /ecircumflex /uni1EC1
+ /uni1EBF /uni1EC5 /uni1EC3 /uni1EC7 /igrave /iacute /itilde /uni1EC9
+%C0
+ /uni1ECA /Ograve /Oacute /Otilde /uni1ECE /uni1ECC /Ocircumflex /uni1ED2
+ /uni1ED0 /uni1ED6 /uni1ED4 /uni1ED8 /Ohorn /uni1EDC /uni1EDA /uni1EE0
+%D0
+ /uni1EDE /uni1EE2 /Ugrave /Uacute /Utilde /uni1EE6 /uni1EE4 /Uhorn
+ /uni1EEA /uni1EE8 /uni1EEE /uni1EEC /uni1EF0 /Ygrave /Yacute /uni1EF8
+%E0
+ /uni1ECB /ograve /oacute /otilde /uni1ECF /uni1ECD /ocircumflex /uni1ED3
+ /uni1ED1 /uni1ED7 /uni1ED5 /uni1ED9 /ohorn /uni1EDD /uni1EDB /uni1EE1
+%F0
+ /uni1EDF /uni1EE3 /ugrave /uacute /utilde /uni1EE7 /uni1EE5 /uhorn
+ /uni1EEB /uni1EE9 /uni1EEF /uni1EED /uni1EF1 /ygrave /yacute /uni1EF9
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t5
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --feature=kern --feature=liga --feature=lnum --feature=pnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl MFBOldstyle-Regular.otf
+% MFBOldstyle-Regular-lf-t5'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_uyp43f.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_uyp43f.enc
new file mode 100644
index 00000000000..91c6de46efe
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_uyp43f.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_uyp43f4zbdh7c77o2tguyfnzld
+% Encoding created by otftotfm on Mon Aug 5 23:45:15 2024
+% Command line follows encoding
+/AutoEnc_uyp43f4zbdh7c77o2tguyfnzld [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /uni2080 /dotlessi /uni0237 /f_f.liga /fi /fl /f_f_i.liga /f_f_l.liga
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.lf /one.lf /two.lf /three.lf /four.lf /five.lf /six.lf /seven.lf
+ /eight.lf /nine.lf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /f_b.liga /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /f_h.liga /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=lnum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl MFBOldstyle-Regular.otf MFBOldstyle-Regular-lf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_wvbwpg.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_wvbwpg.enc
new file mode 100644
index 00000000000..5d2941ad731
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_wvbwpg.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_wvbwpghbptug5txt4ipvhokzvc
+% Encoding created by otftotfm on Mon Aug 5 23:45:13 2024
+% Command line follows encoding
+/AutoEnc_wvbwpghbptug5txt4ipvhokzvc [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /uni2080 /dotlessi /uni0237 /.notdef /fi /fl /.notdef /.notdef
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.numr /one.numr /two.numr /three.numr /four.numr /five.numr /six.numr /seven.numr
+ /eight.numr /nine.numr /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /.notdef /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /.notdef /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=numr
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * MFBOldstyle-Regular.otf
+% MFBOldstyle-Regular-numr-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_x5sf3h.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_x5sf3h.enc
new file mode 100644
index 00000000000..702ba8a9bf7
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_x5sf3h.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia
+% Encoding created by otftotfm on Mon Aug 5 23:45:19 2024
+% Command line follows encoding
+/AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /fl /.notdef /.notdef /.notdef /fi /.notdef /.notdef /.notdef
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /uni2080 /uni2081 /uni2082 /uni2083 /uni2084 /uni2085 /uni2086 /uni2087
+ /uni2088 /uni2089 /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=sinf
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * MFBOldstyle-Regular.otf
+% MFBOldstyle-Regular-inf-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_xkajg4.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_xkajg4.enc
new file mode 100644
index 00000000000..a9e3e5710e0
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_xkajg4.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_xkajg4wyz7lspgdrvvtosil3pf
+% Encoding created by otftotfm on Mon Aug 5 23:45:19 2024
+% Command line follows encoding
+/AutoEnc_xkajg4wyz7lspgdrvvtosil3pf [
+%00
+ /.notdef /uni2206 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /uni03A9 /.notdef /fi /fl /.notdef /.notdef
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /.notdef /exclam /quotedblright /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.dnom /one.dnom /two.dnom /three.dnom /four.dnom /five.dnom /six.dnom /seven.dnom
+ /eight.dnom /nine.dnom /colon /semicolon /exclamdown /equal /questiondown /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /Lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /lslash /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ot1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=TEX TEXT --feature=dnom --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl --ligkern=* {KL} * MFBOldstyle-Regular.otf
+% MFBOldstyle-Regular-dnom-ot1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_xqrvjh.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_xqrvjh.enc
new file mode 100644
index 00000000000..353cf77f404
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_xqrvjh.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_xqrvjhmrxuhmdm554es7oy5vhe
+% Encoding created by otftotfm on Mon Aug 5 23:45:18 2024
+% Command line follows encoding
+/AutoEnc_xqrvjhmrxuhmdm554es7oy5vhe [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /uni2080 /dotlessi /uni0237 /f_f.liga /fi /fl /f_f_i.liga /f_f_l.liga
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /f_b.liga /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /f_h.liga /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=pnum --ligkern=f i =: fi
+% --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi --ligkern=ff
+% l =: ffl MFBOldstyle-Regular.otf MFBOldstyle-Regular-osf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_xx37di.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_xx37di.enc
new file mode 100644
index 00000000000..e29f5eb525f
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_xx37di.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_xx37di7ztc4454rmsdjna6hdlc
+% Encoding created by otftotfm on Mon Aug 5 23:45:20 2024
+% Command line follows encoding
+/AutoEnc_xx37di7ztc4454rmsdjna6hdlc [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /uni2080 /dotlessi /uni0237 /.notdef /fi /fl /.notdef /.notdef
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /uni2070 /uni00B9 /uni00B2 /uni00B3 /uni2074 /uni2075 /uni2076 /uni2077
+ /uni2078 /uni2079 /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /.notdef /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /.notdef /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=sups
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * MFBOldstyle-Regular.otf
+% MFBOldstyle-Regular-sup-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_y2ngde.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_y2ngde.enc
new file mode 100644
index 00000000000..94436951fe4
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_y2ngde.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_y2ngdewhza2rnatva56dgdk7od
+% Encoding created by otftotfm on Mon Aug 5 23:45:18 2024
+% Command line follows encoding
+/AutoEnc_y2ngdewhza2rnatva56dgdk7od [
+%00
+ /grave /acute /circumflex /tilde /dieresis /dotbelowcomb /ring /caron
+ /breve /macron /dotaccent /cedilla /hookabovecomb /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /uni2080 /dotlessi /uni1EF6 /uni1EF7 /uni1EF4 /uni1EF5 /Dcroat /dcroat
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /uni00AD
+%80
+ /Agrave /Aacute /Atilde /uni1EA2 /uni1EA0 /Acircumflex /uni1EA6 /uni1EA4
+ /uni1EAA /uni1EA8 /uni1EAC /Abreve /uni1EB0 /uni1EAE /uni1EB4 /uni1EB2
+%90
+ /uni1EB6 /Egrave /Eacute /uni1EBC /uni1EBA /uni1EB8 /Ecircumflex /uni1EC0
+ /uni1EBE /uni1EC4 /uni1EC2 /uni1EC6 /Igrave /Iacute /Itilde /uni1EC8
+%A0
+ /agrave /aacute /atilde /uni1EA3 /uni1EA1 /acircumflex /uni1EA7 /uni1EA5
+ /uni1EAB /uni1EA9 /uni1EAD /abreve /uni1EB1 /uni1EAF /uni1EB5 /uni1EB3
+%B0
+ /uni1EB7 /egrave /eacute /uni1EBD /uni1EBB /uni1EB9 /ecircumflex /uni1EC1
+ /uni1EBF /uni1EC5 /uni1EC3 /uni1EC7 /igrave /iacute /itilde /uni1EC9
+%C0
+ /uni1ECA /Ograve /Oacute /Otilde /uni1ECE /uni1ECC /Ocircumflex /uni1ED2
+ /uni1ED0 /uni1ED6 /uni1ED4 /uni1ED8 /Ohorn /uni1EDC /uni1EDA /uni1EE0
+%D0
+ /uni1EDE /uni1EE2 /Ugrave /Uacute /Utilde /uni1EE6 /uni1EE4 /Uhorn
+ /uni1EEA /uni1EE8 /uni1EEE /uni1EEC /uni1EF0 /Ygrave /Yacute /uni1EF8
+%E0
+ /uni1ECB /ograve /oacute /otilde /uni1ECF /uni1ECD /ocircumflex /uni1ED3
+ /uni1ED1 /uni1ED7 /uni1ED5 /uni1ED9 /ohorn /uni1EDD /uni1EDB /uni1EE1
+%F0
+ /uni1EDF /uni1EE3 /ugrave /uacute /utilde /uni1EE7 /uni1EE5 /uhorn
+ /uni1EEB /uni1EE9 /uni1EEF /uni1EED /uni1EF1 /ygrave /yacute /uni1EF9
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t5
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --feature=kern --feature=liga --feature=onum --feature=pnum
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl MFBOldstyle-Regular.otf
+% MFBOldstyle-Regular-osf-t5'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_y57hi6.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_y57hi6.enc
new file mode 100644
index 00000000000..d563d341bb6
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_y57hi6.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_y57hi666jserhrhbhmnbx23otg
+% Encoding created by otftotfm on Mon Aug 5 23:45:13 2024
+% Command line follows encoding
+/AutoEnc_y57hi666jserhrhbhmnbx23otg [
+%00
+ /.notdef /Euro /.notdef /.notdef /fraction /dotaccent /hungarumlaut /ogonek
+ /fl /.notdef /.notdef /.notdef /fi /.notdef /.notdef /.notdef
+%10
+ /dotlessi /uni0237 /grave /acute /caron /breve /macron /ring
+ /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash
+%20
+ /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.numr /one.numr /two.numr /three.numr /four.numr /five.numr /six.numr /seven.numr
+ /eight.numr /nine.numr /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /circumflex /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /tilde /dieresis
+%80
+ /Lslash /quotesingle /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft /OE /Zcaron /asciicircum /minus
+%90
+ /lslash /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron /guilsinglright /oe /zcaron /asciitilde /Ydieresis
+%A0
+ /.notdef /exclamdown /cent /sterling /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /uni00AD /registered /macron
+%B0
+ /degree /plusminus /uni00B2 /uni00B3 /acute /uni00B5 /paragraph /periodcentered
+ /cedilla /uni00B9 /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_ly1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=TEX TYPEWRITER AND WINDOWS ANSI --feature=numr
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * MFBOldstyle-Regular.otf
+% MFBOldstyle-Regular-numr-ly1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_ybcvk5.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_ybcvk5.enc
new file mode 100644
index 00000000000..3f529142397
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_ybcvk5.enc
@@ -0,0 +1,65 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ybcvk5dbtub7oamhocouu77wtb
+% Encoding created by otftotfm on Mon Aug 5 23:45:19 2024
+% Command line follows encoding
+/AutoEnc_ybcvk5dbtub7oamhocouu77wtb [
+%00
+ /grave /acute /circumflex /tilde /dieresis /hungarumlaut /ring /caron
+ /breve /macron /dotaccent /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /uni2080 /dotlessi /uni0237 /.notdef /fi /fl /.notdef /.notdef
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /uni2080 /uni2081 /uni2082 /uni2083 /uni2084 /uni2085 /uni2086 /uni2087
+ /uni2088 /uni2089 /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /.notdef /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat /section
+%A0
+ /abreve /aogonek /cacute /ccaron /dcaron /ecaron /eogonek /gbreve
+ /lacute /lcaron /lslash /nacute /ncaron /.notdef /ohungarumlaut /racute
+%B0
+ /rcaron /sacute /scaron /scedilla /tcaron /uni0163 /uhungarumlaut /uring
+ /ydieresis /zacute /zcaron /zdotaccent /ij /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E
+%E0
+ /agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+%F0
+ /eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /oe
+ /oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /germandbls
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=sinf
+% --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i
+% =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} * MFBOldstyle-Regular.otf
+% MFBOldstyle-Regular-inf-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_yjlipp.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_yjlipp.enc
new file mode 100644
index 00000000000..01c0f8bde19
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_yjlipp.enc
@@ -0,0 +1,64 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_yjlipp4r7qgmsukh4tqlarf47f
+% Encoding created by otftotfm on Mon Aug 5 23:45:19 2024
+% Command line follows encoding
+/AutoEnc_yjlipp4r7qgmsukh4tqlarf47f [
+%00
+ /grave /acute /circumflex /tilde /dieresis /dotbelowcomb /ring /caron
+ /breve /macron /dotaccent /cedilla /hookabovecomb /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /uni2080 /dotlessi /uni1EF6 /uni1EF7 /uni1EF4 /uni1EF5 /Dcroat /dcroat
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.dnom /one.dnom /two.dnom /three.dnom /four.dnom /five.dnom /six.dnom /seven.dnom
+ /eight.dnom /nine.dnom /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde /uni00AD
+%80
+ /Agrave /Aacute /Atilde /uni1EA2 /uni1EA0 /Acircumflex /uni1EA6 /uni1EA4
+ /uni1EAA /uni1EA8 /uni1EAC /Abreve /uni1EB0 /uni1EAE /uni1EB4 /uni1EB2
+%90
+ /uni1EB6 /Egrave /Eacute /uni1EBC /uni1EBA /uni1EB8 /Ecircumflex /uni1EC0
+ /uni1EBE /uni1EC4 /uni1EC2 /uni1EC6 /Igrave /Iacute /Itilde /uni1EC8
+%A0
+ /agrave /aacute /atilde /uni1EA3 /uni1EA1 /acircumflex /uni1EA7 /uni1EA5
+ /uni1EAB /uni1EA9 /uni1EAD /abreve /uni1EB1 /uni1EAF /uni1EB5 /uni1EB3
+%B0
+ /uni1EB7 /egrave /eacute /uni1EBD /uni1EBB /uni1EB9 /ecircumflex /uni1EC1
+ /uni1EBF /uni1EC5 /uni1EC3 /uni1EC7 /igrave /iacute /itilde /uni1EC9
+%C0
+ /uni1ECA /Ograve /Oacute /Otilde /uni1ECE /uni1ECC /Ocircumflex /uni1ED2
+ /uni1ED0 /uni1ED6 /uni1ED4 /uni1ED8 /Ohorn /uni1EDC /uni1EDA /uni1EE0
+%D0
+ /uni1EDE /uni1EE2 /Ugrave /Uacute /Utilde /uni1EE6 /uni1EE4 /Uhorn
+ /uni1EEA /uni1EE8 /uni1EEE /uni1EEC /uni1EF0 /Ygrave /Yacute /uni1EF8
+%E0
+ /uni1ECB /ograve /oacute /otilde /uni1ECF /uni1ECD /ocircumflex /uni1ED3
+ /uni1ED1 /uni1ED7 /uni1ED5 /uni1ED9 /ohorn /uni1EDD /uni1EDB /uni1EE1
+%F0
+ /uni1EDF /uni1EE3 /ugrave /uacute /utilde /uni1EE7 /uni1EE5 /uhorn
+ /uni1EEB /uni1EE9 /uni1EEF /uni1EED /uni1EF1 /ygrave /yacute /uni1EF9
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t5
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --feature=dnom --ligkern=f i =: fi --ligkern=f l =: fl --ligkern=f
+% f =: ff --ligkern=ff i =: ffi --ligkern=ff l =: ffl --ligkern=* {KL} *
+% MFBOldstyle-Regular.otf MFBOldstyle-Regular-dnom-t5'
diff --git a/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_ztec7x.enc b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_ztec7x.enc
new file mode 100644
index 00000000000..20f675eddda
--- /dev/null
+++ b/Master/texmf-dist/fonts/enc/dvips/mfb-oldstyle/a_ztec7x.enc
@@ -0,0 +1,68 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_ztec7xsyrpjk3i77hncyph2ksb
+% Encoding created by otftotfm on Mon Aug 5 23:45:18 2024
+% Command line follows encoding
+/AutoEnc_ztec7xsyrpjk3i77hncyph2ksb [
+%00
+ /grave.sc /acute.sc /circumflex.sc /tilde.sc /dieresis.sc /hungarumlaut.sc /ring.sc /caron.sc
+ /breve.sc /macron.sc /dotaccent.sc /cedilla /ogonek /quotesinglbase /guilsinglleft /guilsinglright
+%10
+ /quotedblleft /quotedblright /quotedblbase /guillemotleft /guillemotright /endash /emdash /.notdef
+ /uni2080 /dotlessi.sc /uni0237.sc /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+ /.notdef /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+%30
+ /zero.osf /one.osf /two.osf /three.osf /four.osf /five.osf /six.osf /seven.osf
+ /eight.osf /nine.osf /colon /semicolon /less /equal /greater /question
+%40
+ /at /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+%60
+ /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc
+ /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc
+%70
+ /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc
+ /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen
+%80
+ /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve
+ /Lacute /Lcaron /Lslash /Nacute /Ncaron /.notdef /Ohungarumlaut /Racute
+%90
+ /Rcaron /Sacute /Scaron /Scedilla /Tcaron /uni0162 /Uhungarumlaut /Uring
+ /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dcroat.sc /section
+%A0
+ /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc
+ /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /.notdef /ohungarumlaut.sc /racute.sc
+%B0
+ /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc /tcaron.sc /uni0163.sc /uhungarumlaut.sc /uring.sc
+ /ydieresis.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown /questiondown /sterling
+%C0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+%D0
+ /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE
+ /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /uni1E9E
+%E0
+ /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc
+ /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc
+%F0
+ /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc
+ /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /.notdef
+] def
+% Command line: 'otftotfm --automatic --encoding=fontools_t1
+% --tfm-directory=fonts/tfm/dbmiller/mfb-oldstyle
+% --vf-directory=fonts/vf/dbmiller/mfb-oldstyle
+% --type1-directory=fonts/type1/dbmiller/mfb-oldstyle
+% --encoding-directory=fonts/enc/dvips/mfb-oldstyle
+% --map-file=fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map --no-updmap
+% --force --coding-scheme=EXTENDED TEX FONT ENCODING - LATIN --feature=kern
+% --feature=liga --feature=onum --feature=pnum --feature=smcp --ligkern=f i
+% =: fi --ligkern=f l =: fl --ligkern=f f =: ff --ligkern=ff i =: ffi
+% --ligkern=ff l =: ffl --unicoding=germandbls =: SSsmall --unicoding=ff =:
+% FFsmall --unicoding=fi =: FIsmall --unicoding=ffi =: FFIsmall
+% --unicoding=fl =: FLsmall --unicoding=ffl =: FFLsmall
+% MFBOldstyle-Regular.otf MFBOldstyle-Regular-osf-sc-t1'
diff --git a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconseight.enc b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconseight.enc
index 3a3c95aa605..12af26002d8 100644
--- a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconseight.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconseight.enc
@@ -1,4 +1,8 @@
/simpleiconseight [
+/namecheapicon
+/namemcicon
+/namesiloicon
+/namuwikiicon
/nanoicon
/nasaicon
/nationalgridicon
@@ -175,6 +179,7 @@
/osmcicon
/osuicon
/ottoicon
+/outlineicon
/overcasticon
/overleaficon
/ovhicon
@@ -250,9 +255,4 @@
/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 8108fa1151b..0e52cd29399 100644
--- a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsfive.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsfive.enc
@@ -52,6 +52,7 @@
/glitchicon
/globusicon
/glovoicon
+/gltficon
/gmailicon
/gnomeicon
/gnometerminalicon
@@ -254,5 +255,4 @@
/humblebundleicon
/hungryjacksicon
/husqvarnaicon
-/hypericon
] def
diff --git a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsnine.enc b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsnine.enc
index ae46e45136c..6fe36ad64f2 100644
--- a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsnine.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsnine.enc
@@ -1,4 +1,9 @@
/simpleiconsnine [
+/piaggiogroupicon
+/piaproicon
+/picardsurgelesicon
+/picartodottvicon
+/picnicicon
/picpayicon
/picrewicon
/picxyicon
@@ -250,9 +255,4 @@
/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 84949ec80f0..46f4bd3333f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsoneone.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsoneone.enc
@@ -1,4 +1,9 @@
/simpleiconsoneone [
+/sparkasseicon
+/sparkfunicon
+/sparkposticon
+/spdxicon
+/speakerdeckicon
/spectrumicon
/speedtesticon
/speedypageicon
@@ -250,9 +255,4 @@
/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 d3c912e4b3f..040ac80a539 100644
--- a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonethree.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonethree.enc
@@ -1,4 +1,9 @@
/simpleiconsonethree [
+/wpexplorericon
+/wprocketicon
+/writedotasicon
+/wweicon
+/wwiseicon
/wykopicon
/wyzeicon
/xicon
@@ -59,6 +64,7 @@
/zenodoicon
/zensaricon
/zerodhaicon
+/zerotiericon
/zerplyicon
/zettlricon
/zhihuicon
@@ -248,10 +254,4 @@
/.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 25c47546a26..9375dba1cac 100644
--- a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonetwo.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonetwo.enc
@@ -1,4 +1,9 @@
/simpleiconsonetwo [
+/transmissionicon
+/transportforirelandicon
+/transportforlondonicon
+/travisciicon
+/treehouseicon
/trelloicon
/trendmicroicon
/treyarchicon
@@ -250,9 +255,4 @@
/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 99a27e3e86a..4a2d981f1bc 100644
--- a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonezero.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsonezero.enc
@@ -1,4 +1,9 @@
/simpleiconsonezero [
+/renrenicon
+/repliticon
+/republicofgamersicon
+/rescripticon
+/rescuetimeicon
/researchgateicon
/resendicon
/resharpericon
@@ -250,9 +255,4 @@
/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 01e72955e49..3ae335fcca7 100644
--- a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsseven.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconsseven.enc
@@ -1,4 +1,5 @@
/simpleiconsseven [
+/leroymerlinicon
/leslibrairesicon
/lessicon
/letsencrypticon
@@ -46,12 +47,14 @@
/listmonkicon
/liticon
/litecoinicon
+/literalicon
/litiengineicon
/livechaticon
/livejournalicon
/livewireicon
/llvmicon
/lmmsicon
+/lobstersicon
/localicon
/lodashicon
/logitechicon
@@ -182,6 +185,7 @@
/milvusicon
/mindsicon
/minetesticon
+/mingww64icon
/miniicon
/minioicon
/mintlifyicon
@@ -251,8 +255,4 @@
/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 88585be9faa..5a52bf24945 100644
--- a/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconssix.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/simpleicons/simpleiconssix.enc
@@ -1,4 +1,5 @@
/simpleiconssix [
+/hypericon
/hyperskillicon
/hypothesisicon
/hyprlandicon
@@ -254,5 +255,4 @@
/leptosicon
/lequipeicon
/lernaicon
-/leroymerlinicon
] def
diff --git a/Master/texmf-dist/fonts/map/dvips/junicode/Junicode.map b/Master/texmf-dist/fonts/map/dvips/junicode/Junicode.map
index 62df30f4238..00d4efa4075 100644
--- a/Master/texmf-dist/fonts/map/dvips/junicode/Junicode.map
+++ b/Master/texmf-dist/fonts/map/dvips/junicode/Junicode.map
@@ -9,14 +9,23 @@ Junicode-BoldItalic-osf-sc-t1--base Junicode-BoldItalic "AutoEnc_nghkwvud4qcjbas
Junicode-BoldItalic-osf-sc-ly1--base Junicode-BoldItalic "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-sc-lgr Junicode-BoldItalic "AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont" <[jncd_vai6ks.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-osf-ts1--base Junicode-BoldItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-BoldItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-sup-lgr Junicode-BoldItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.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-inf-ly1 Junicode-BoldItalic "AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont" <[jncd_t7d4ag.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-inf-lgr Junicode-BoldItalic "AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont" <[jncd_ifhpre.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-ot1 Junicode-BoldItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-t1--base Junicode-BoldItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-ly1 Junicode-BoldItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-lgr Junicode-BoldItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-BoldItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-sc-lgr Junicode-BoldItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-lf-ts1--base Junicode-BoldItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-BoldItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-BoldItalic.pfb
+Junicode-BoldItalic-sup-lgr Junicode-BoldItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-ot1 Junicode-BoldItalic "AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont" <[jncd_sa5d62.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-t1--base Junicode-BoldItalic "AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont" <[jncd_4vsefk.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tosf-ly1 Junicode-BoldItalic "AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont" <[jncd_2j6faw.enc <Junicode-BoldItalic.pfb
@@ -35,15 +44,6 @@ Junicode-BoldItalic-tlf-sc-t1--base Junicode-BoldItalic "AutoEnc_z4lkq6f2v5epiwb
Junicode-BoldItalic-tlf-sc-ly1--base Junicode-BoldItalic "AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont" <[jncd_wkwe3q.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-sc-lgr Junicode-BoldItalic "AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont" <[jncd_la6rhc.enc <Junicode-BoldItalic.pfb
Junicode-BoldItalic-tlf-ts1--base Junicode-BoldItalic "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-ot1 Junicode-BoldItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-t1--base Junicode-BoldItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-ly1 Junicode-BoldItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-lgr Junicode-BoldItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-BoldItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-sc-lgr Junicode-BoldItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-BoldItalic.pfb
-Junicode-BoldItalic-lf-ts1--base Junicode-BoldItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-BoldItalic.pfb
Junicode-Bold-osf-ot1 Junicode-Bold "AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont" <[jncd_dydq3d.enc <Junicode-Bold.pfb
Junicode-Bold-osf-t1--base Junicode-Bold "AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont" <[jncd_hwfs67.enc <Junicode-Bold.pfb
Junicode-Bold-osf-ly1 Junicode-Bold "AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont" <[jncd_535mcm.enc <Junicode-Bold.pfb
@@ -53,14 +53,23 @@ Junicode-Bold-osf-sc-t1--base Junicode-Bold "AutoEnc_nghkwvud4qcjbasji7abq43ang
Junicode-Bold-osf-sc-ly1--base Junicode-Bold "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-Bold.pfb
Junicode-Bold-osf-sc-lgr Junicode-Bold "AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont" <[jncd_alnhow.enc <Junicode-Bold.pfb
Junicode-Bold-osf-ts1--base Junicode-Bold "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-Bold.pfb
-Junicode-Bold-sup-ot1 Junicode-Bold "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-Bold.pfb
-Junicode-Bold-sup-t1--base Junicode-Bold "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-Bold.pfb
-Junicode-Bold-sup-ly1 Junicode-Bold "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-Bold.pfb
-Junicode-Bold-sup-lgr Junicode-Bold "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-Bold.pfb
Junicode-Bold-inf-ot1 Junicode-Bold "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-Bold.pfb
Junicode-Bold-inf-t1--base Junicode-Bold "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-Bold.pfb
Junicode-Bold-inf-ly1 Junicode-Bold "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-Bold.pfb
Junicode-Bold-inf-lgr Junicode-Bold "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-Bold.pfb
+Junicode-Bold-lf-ot1 Junicode-Bold "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-Bold.pfb
+Junicode-Bold-lf-t1--base Junicode-Bold "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-Bold.pfb
+Junicode-Bold-lf-ly1 Junicode-Bold "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-Bold.pfb
+Junicode-Bold-lf-lgr Junicode-Bold "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-Bold "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-Bold.pfb
+Junicode-Bold-lf-sc-lgr Junicode-Bold "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-Bold.pfb
+Junicode-Bold-lf-ts1--base Junicode-Bold "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-Bold.pfb
+Junicode-Bold-sup-ot1 Junicode-Bold "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-Bold.pfb
+Junicode-Bold-sup-t1--base Junicode-Bold "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-Bold.pfb
+Junicode-Bold-sup-ly1 Junicode-Bold "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-Bold.pfb
+Junicode-Bold-sup-lgr Junicode-Bold "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-ot1 Junicode-Bold "AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont" <[jncd_tugio2.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-t1--base Junicode-Bold "AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont" <[jncd_4vrfuq.enc <Junicode-Bold.pfb
Junicode-Bold-tosf-ly1 Junicode-Bold "AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont" <[jncd_y74d4a.enc <Junicode-Bold.pfb
@@ -79,15 +88,6 @@ Junicode-Bold-tlf-sc-t1--base Junicode-Bold "AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc
Junicode-Bold-tlf-sc-ly1--base Junicode-Bold "AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont" <[jncd_r7dcdh.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-sc-lgr Junicode-Bold "AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont" <[jncd_nqur7h.enc <Junicode-Bold.pfb
Junicode-Bold-tlf-ts1--base Junicode-Bold "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-Bold.pfb
-Junicode-Bold-lf-ot1 Junicode-Bold "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-Bold.pfb
-Junicode-Bold-lf-t1--base Junicode-Bold "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-Bold.pfb
-Junicode-Bold-lf-ly1 Junicode-Bold "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-Bold.pfb
-Junicode-Bold-lf-lgr Junicode-Bold "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-Bold "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-Bold.pfb
-Junicode-Bold-lf-sc-lgr Junicode-Bold "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-Bold.pfb
-Junicode-Bold-lf-ts1--base Junicode-Bold "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-Bold.pfb
Junicode-CondItalic-osf-ot1 Junicode-CondItalic "AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont" <[jncd_wusj3d.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-t1--base Junicode-CondItalic "AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont" <[jncd_fjcuys.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-ly1 Junicode-CondItalic "AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont" <[jncd_dbackh.enc <Junicode-CondItalic.pfb
@@ -97,14 +97,23 @@ Junicode-CondItalic-osf-sc-t1--base Junicode-CondItalic "AutoEnc_nghkwvud4qcjbas
Junicode-CondItalic-osf-sc-ly1--base Junicode-CondItalic "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-sc-lgr Junicode-CondItalic "AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont" <[jncd_vai6ks.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-osf-ts1--base Junicode-CondItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-CondItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-sup-lgr Junicode-CondItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.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-inf-ly1 Junicode-CondItalic "AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont" <[jncd_t7d4ag.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-inf-lgr Junicode-CondItalic "AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont" <[jncd_ifhpre.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-ot1 Junicode-CondItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-t1--base Junicode-CondItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-ly1 Junicode-CondItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-lgr Junicode-CondItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-CondItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-sc-lgr Junicode-CondItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-lf-ts1--base Junicode-CondItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-CondItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-CondItalic.pfb
+Junicode-CondItalic-sup-lgr Junicode-CondItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-ot1 Junicode-CondItalic "AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont" <[jncd_sa5d62.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-t1--base Junicode-CondItalic "AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont" <[jncd_4vsefk.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tosf-ly1 Junicode-CondItalic "AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont" <[jncd_2j6faw.enc <Junicode-CondItalic.pfb
@@ -123,15 +132,6 @@ Junicode-CondItalic-tlf-sc-t1--base Junicode-CondItalic "AutoEnc_z4lkq6f2v5epiwb
Junicode-CondItalic-tlf-sc-ly1--base Junicode-CondItalic "AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont" <[jncd_wkwe3q.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-sc-lgr Junicode-CondItalic "AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont" <[jncd_la6rhc.enc <Junicode-CondItalic.pfb
Junicode-CondItalic-tlf-ts1--base Junicode-CondItalic "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-ot1 Junicode-CondItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-t1--base Junicode-CondItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-ly1 Junicode-CondItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-lgr Junicode-CondItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-CondItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-sc-lgr Junicode-CondItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-CondItalic.pfb
-Junicode-CondItalic-lf-ts1--base Junicode-CondItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-CondItalic.pfb
Junicode-CondLightItalic-osf-ot1 Junicode-CondLightItalic "AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont" <[jncd_wusj3d.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-t1--base Junicode-CondLightItalic "AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont" <[jncd_fjcuys.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-ly1 Junicode-CondLightItalic "AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont" <[jncd_dbackh.enc <Junicode-CondLightItalic.pfb
@@ -141,14 +141,23 @@ Junicode-CondLightItalic-osf-sc-t1--base Junicode-CondLightItalic "AutoEnc_nghkw
Junicode-CondLightItalic-osf-sc-ly1--base Junicode-CondLightItalic "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-sc-lgr Junicode-CondLightItalic "AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont" <[jncd_vai6ks.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-osf-ts1--base Junicode-CondLightItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-CondLightItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-sup-lgr Junicode-CondLightItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.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-inf-ly1 Junicode-CondLightItalic "AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont" <[jncd_t7d4ag.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-inf-lgr Junicode-CondLightItalic "AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont" <[jncd_ifhpre.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-ot1 Junicode-CondLightItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-t1--base Junicode-CondLightItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-ly1 Junicode-CondLightItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-lgr Junicode-CondLightItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-CondLightItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-sc-lgr Junicode-CondLightItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-lf-ts1--base Junicode-CondLightItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-CondLightItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-CondLightItalic.pfb
+Junicode-CondLightItalic-sup-lgr Junicode-CondLightItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-ot1 Junicode-CondLightItalic "AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont" <[jncd_sa5d62.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-t1--base Junicode-CondLightItalic "AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont" <[jncd_4vsefk.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tosf-ly1 Junicode-CondLightItalic "AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont" <[jncd_2j6faw.enc <Junicode-CondLightItalic.pfb
@@ -167,15 +176,6 @@ Junicode-CondLightItalic-tlf-sc-t1--base Junicode-CondLightItalic "AutoEnc_z4lkq
Junicode-CondLightItalic-tlf-sc-ly1--base Junicode-CondLightItalic "AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont" <[jncd_wkwe3q.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-sc-lgr Junicode-CondLightItalic "AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont" <[jncd_la6rhc.enc <Junicode-CondLightItalic.pfb
Junicode-CondLightItalic-tlf-ts1--base Junicode-CondLightItalic "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-ot1 Junicode-CondLightItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-t1--base Junicode-CondLightItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-ly1 Junicode-CondLightItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-lgr Junicode-CondLightItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-CondLightItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-sc-lgr Junicode-CondLightItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-CondLightItalic.pfb
-Junicode-CondLightItalic-lf-ts1--base Junicode-CondLightItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-CondLightItalic.pfb
Junicode-CondLight-osf-ot1 Junicode-CondLight "AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont" <[jncd_dydq3d.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-t1--base Junicode-CondLight "AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont" <[jncd_hwfs67.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-ly1 Junicode-CondLight "AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont" <[jncd_535mcm.enc <Junicode-CondLight.pfb
@@ -185,14 +185,23 @@ Junicode-CondLight-osf-sc-t1--base Junicode-CondLight "AutoEnc_nghkwvud4qcjbasji
Junicode-CondLight-osf-sc-ly1--base Junicode-CondLight "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-sc-lgr Junicode-CondLight "AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont" <[jncd_alnhow.enc <Junicode-CondLight.pfb
Junicode-CondLight-osf-ts1--base Junicode-CondLight "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-CondLight.pfb
-Junicode-CondLight-sup-ot1 Junicode-CondLight "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-CondLight.pfb
-Junicode-CondLight-sup-t1--base Junicode-CondLight "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-CondLight.pfb
-Junicode-CondLight-sup-ly1 Junicode-CondLight "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-CondLight.pfb
-Junicode-CondLight-sup-lgr Junicode-CondLight "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-CondLight.pfb
Junicode-CondLight-inf-ot1 Junicode-CondLight "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-CondLight.pfb
Junicode-CondLight-inf-t1--base Junicode-CondLight "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-CondLight.pfb
Junicode-CondLight-inf-ly1 Junicode-CondLight "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-CondLight.pfb
Junicode-CondLight-inf-lgr Junicode-CondLight "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-CondLight.pfb
+Junicode-CondLight-lf-ot1 Junicode-CondLight "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-CondLight.pfb
+Junicode-CondLight-lf-t1--base Junicode-CondLight "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-CondLight.pfb
+Junicode-CondLight-lf-ly1 Junicode-CondLight "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-CondLight.pfb
+Junicode-CondLight-lf-lgr Junicode-CondLight "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-CondLight "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-CondLight.pfb
+Junicode-CondLight-lf-sc-lgr Junicode-CondLight "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-CondLight.pfb
+Junicode-CondLight-lf-ts1--base Junicode-CondLight "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-CondLight.pfb
+Junicode-CondLight-sup-ot1 Junicode-CondLight "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-CondLight.pfb
+Junicode-CondLight-sup-t1--base Junicode-CondLight "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-CondLight.pfb
+Junicode-CondLight-sup-ly1 Junicode-CondLight "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-CondLight.pfb
+Junicode-CondLight-sup-lgr Junicode-CondLight "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-ot1 Junicode-CondLight "AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont" <[jncd_tugio2.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-t1--base Junicode-CondLight "AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont" <[jncd_4vrfuq.enc <Junicode-CondLight.pfb
Junicode-CondLight-tosf-ly1 Junicode-CondLight "AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont" <[jncd_y74d4a.enc <Junicode-CondLight.pfb
@@ -211,15 +220,6 @@ Junicode-CondLight-tlf-sc-t1--base Junicode-CondLight "AutoEnc_jp6lmumstwyqqcqhh
Junicode-CondLight-tlf-sc-ly1--base Junicode-CondLight "AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont" <[jncd_r7dcdh.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-sc-lgr Junicode-CondLight "AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont" <[jncd_nqur7h.enc <Junicode-CondLight.pfb
Junicode-CondLight-tlf-ts1--base Junicode-CondLight "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-CondLight.pfb
-Junicode-CondLight-lf-ot1 Junicode-CondLight "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-CondLight.pfb
-Junicode-CondLight-lf-t1--base Junicode-CondLight "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-CondLight.pfb
-Junicode-CondLight-lf-ly1 Junicode-CondLight "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-CondLight.pfb
-Junicode-CondLight-lf-lgr Junicode-CondLight "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-CondLight "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-CondLight.pfb
-Junicode-CondLight-lf-sc-lgr Junicode-CondLight "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-CondLight.pfb
-Junicode-CondLight-lf-ts1--base Junicode-CondLight "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-CondLight.pfb
Junicode-CondMediumItalic-osf-ot1 Junicode-CondMediumItalic "AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont" <[jncd_wusj3d.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-t1--base Junicode-CondMediumItalic "AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont" <[jncd_fjcuys.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-ly1 Junicode-CondMediumItalic "AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont" <[jncd_dbackh.enc <Junicode-CondMediumItalic.pfb
@@ -229,14 +229,23 @@ Junicode-CondMediumItalic-osf-sc-t1--base Junicode-CondMediumItalic "AutoEnc_ngh
Junicode-CondMediumItalic-osf-sc-ly1--base Junicode-CondMediumItalic "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-sc-lgr Junicode-CondMediumItalic "AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont" <[jncd_vai6ks.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-osf-ts1--base Junicode-CondMediumItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-CondMediumItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-sup-lgr Junicode-CondMediumItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.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-inf-ly1 Junicode-CondMediumItalic "AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont" <[jncd_t7d4ag.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-inf-lgr Junicode-CondMediumItalic "AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont" <[jncd_ifhpre.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-ot1 Junicode-CondMediumItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-t1--base Junicode-CondMediumItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-ly1 Junicode-CondMediumItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-lgr Junicode-CondMediumItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-CondMediumItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-sc-lgr Junicode-CondMediumItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-lf-ts1--base Junicode-CondMediumItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-CondMediumItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-CondMediumItalic.pfb
+Junicode-CondMediumItalic-sup-lgr Junicode-CondMediumItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-ot1 Junicode-CondMediumItalic "AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont" <[jncd_sa5d62.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-t1--base Junicode-CondMediumItalic "AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont" <[jncd_4vsefk.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tosf-ly1 Junicode-CondMediumItalic "AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont" <[jncd_2j6faw.enc <Junicode-CondMediumItalic.pfb
@@ -255,15 +264,6 @@ Junicode-CondMediumItalic-tlf-sc-t1--base Junicode-CondMediumItalic "AutoEnc_z4l
Junicode-CondMediumItalic-tlf-sc-ly1--base Junicode-CondMediumItalic "AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont" <[jncd_wkwe3q.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-sc-lgr Junicode-CondMediumItalic "AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont" <[jncd_la6rhc.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMediumItalic-tlf-ts1--base Junicode-CondMediumItalic "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-ot1 Junicode-CondMediumItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-t1--base Junicode-CondMediumItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-ly1 Junicode-CondMediumItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-lgr Junicode-CondMediumItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-CondMediumItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-sc-lgr Junicode-CondMediumItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-CondMediumItalic.pfb
-Junicode-CondMediumItalic-lf-ts1--base Junicode-CondMediumItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-CondMediumItalic.pfb
Junicode-CondMedium-osf-ot1 Junicode-CondMedium "AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont" <[jncd_dydq3d.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-t1--base Junicode-CondMedium "AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont" <[jncd_hwfs67.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-ly1 Junicode-CondMedium "AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont" <[jncd_535mcm.enc <Junicode-CondMedium.pfb
@@ -273,14 +273,23 @@ Junicode-CondMedium-osf-sc-t1--base Junicode-CondMedium "AutoEnc_nghkwvud4qcjbas
Junicode-CondMedium-osf-sc-ly1--base Junicode-CondMedium "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-sc-lgr Junicode-CondMedium "AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont" <[jncd_alnhow.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-osf-ts1--base Junicode-CondMedium "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-sup-ot1 Junicode-CondMedium "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-sup-t1--base Junicode-CondMedium "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-sup-ly1 Junicode-CondMedium "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-sup-lgr Junicode-CondMedium "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-inf-ot1 Junicode-CondMedium "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-inf-t1--base Junicode-CondMedium "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-inf-ly1 Junicode-CondMedium "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-inf-lgr Junicode-CondMedium "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-lf-ot1 Junicode-CondMedium "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-lf-t1--base Junicode-CondMedium "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-lf-ly1 Junicode-CondMedium "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-lf-lgr Junicode-CondMedium "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-CondMedium "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-lf-sc-lgr Junicode-CondMedium "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-lf-ts1--base Junicode-CondMedium "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-sup-ot1 Junicode-CondMedium "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-sup-t1--base Junicode-CondMedium "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-sup-ly1 Junicode-CondMedium "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-CondMedium.pfb
+Junicode-CondMedium-sup-lgr Junicode-CondMedium "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-ot1 Junicode-CondMedium "AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont" <[jncd_tugio2.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-t1--base Junicode-CondMedium "AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont" <[jncd_4vrfuq.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tosf-ly1 Junicode-CondMedium "AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont" <[jncd_y74d4a.enc <Junicode-CondMedium.pfb
@@ -299,15 +308,6 @@ Junicode-CondMedium-tlf-sc-t1--base Junicode-CondMedium "AutoEnc_jp6lmumstwyqqcq
Junicode-CondMedium-tlf-sc-ly1--base Junicode-CondMedium "AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont" <[jncd_r7dcdh.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-sc-lgr Junicode-CondMedium "AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont" <[jncd_nqur7h.enc <Junicode-CondMedium.pfb
Junicode-CondMedium-tlf-ts1--base Junicode-CondMedium "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-lf-ot1 Junicode-CondMedium "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-lf-t1--base Junicode-CondMedium "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-lf-ly1 Junicode-CondMedium "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-lf-lgr Junicode-CondMedium "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-CondMedium "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-lf-sc-lgr Junicode-CondMedium "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-CondMedium.pfb
-Junicode-CondMedium-lf-ts1--base Junicode-CondMedium "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-CondMedium.pfb
Junicode-Cond-osf-ot1 Junicode-Cond "AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont" <[jncd_dydq3d.enc <Junicode-Cond.pfb
Junicode-Cond-osf-t1--base Junicode-Cond "AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont" <[jncd_hwfs67.enc <Junicode-Cond.pfb
Junicode-Cond-osf-ly1 Junicode-Cond "AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont" <[jncd_535mcm.enc <Junicode-Cond.pfb
@@ -317,14 +317,23 @@ Junicode-Cond-osf-sc-t1--base Junicode-Cond "AutoEnc_nghkwvud4qcjbasji7abq43ang
Junicode-Cond-osf-sc-ly1--base Junicode-Cond "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-Cond.pfb
Junicode-Cond-osf-sc-lgr Junicode-Cond "AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont" <[jncd_alnhow.enc <Junicode-Cond.pfb
Junicode-Cond-osf-ts1--base Junicode-Cond "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-Cond.pfb
-Junicode-Cond-sup-ot1 Junicode-Cond "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-Cond.pfb
-Junicode-Cond-sup-t1--base Junicode-Cond "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-Cond.pfb
-Junicode-Cond-sup-ly1 Junicode-Cond "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-Cond.pfb
-Junicode-Cond-sup-lgr Junicode-Cond "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-Cond.pfb
Junicode-Cond-inf-ot1 Junicode-Cond "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-Cond.pfb
Junicode-Cond-inf-t1--base Junicode-Cond "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-Cond.pfb
Junicode-Cond-inf-ly1 Junicode-Cond "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-Cond.pfb
Junicode-Cond-inf-lgr Junicode-Cond "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-Cond.pfb
+Junicode-Cond-lf-ot1 Junicode-Cond "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-Cond.pfb
+Junicode-Cond-lf-t1--base Junicode-Cond "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-Cond.pfb
+Junicode-Cond-lf-ly1 Junicode-Cond "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-Cond.pfb
+Junicode-Cond-lf-lgr Junicode-Cond "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-Cond "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-Cond.pfb
+Junicode-Cond-lf-sc-lgr Junicode-Cond "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-Cond.pfb
+Junicode-Cond-lf-ts1--base Junicode-Cond "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-Cond.pfb
+Junicode-Cond-sup-ot1 Junicode-Cond "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-Cond.pfb
+Junicode-Cond-sup-t1--base Junicode-Cond "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-Cond.pfb
+Junicode-Cond-sup-ly1 Junicode-Cond "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-Cond.pfb
+Junicode-Cond-sup-lgr Junicode-Cond "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-ot1 Junicode-Cond "AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont" <[jncd_tugio2.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-t1--base Junicode-Cond "AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont" <[jncd_4vrfuq.enc <Junicode-Cond.pfb
Junicode-Cond-tosf-ly1 Junicode-Cond "AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont" <[jncd_y74d4a.enc <Junicode-Cond.pfb
@@ -343,15 +352,6 @@ Junicode-Cond-tlf-sc-t1--base Junicode-Cond "AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc
Junicode-Cond-tlf-sc-ly1--base Junicode-Cond "AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont" <[jncd_r7dcdh.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-sc-lgr Junicode-Cond "AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont" <[jncd_nqur7h.enc <Junicode-Cond.pfb
Junicode-Cond-tlf-ts1--base Junicode-Cond "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-Cond.pfb
-Junicode-Cond-lf-ot1 Junicode-Cond "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-Cond.pfb
-Junicode-Cond-lf-t1--base Junicode-Cond "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-Cond.pfb
-Junicode-Cond-lf-ly1 Junicode-Cond "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-Cond.pfb
-Junicode-Cond-lf-lgr Junicode-Cond "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-Cond "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-Cond.pfb
-Junicode-Cond-lf-sc-lgr Junicode-Cond "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-Cond.pfb
-Junicode-Cond-lf-ts1--base Junicode-Cond "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-Cond.pfb
Junicode-ExpBoldItalic-osf-ot1 Junicode-ExpBoldItalic "AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont" <[jncd_wusj3d.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-t1--base Junicode-ExpBoldItalic "AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont" <[jncd_fjcuys.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-ly1 Junicode-ExpBoldItalic "AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont" <[jncd_dbackh.enc <Junicode-ExpBoldItalic.pfb
@@ -361,14 +361,23 @@ Junicode-ExpBoldItalic-osf-sc-t1--base Junicode-ExpBoldItalic "AutoEnc_nghkwvud4
Junicode-ExpBoldItalic-osf-sc-ly1--base Junicode-ExpBoldItalic "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-sc-lgr Junicode-ExpBoldItalic "AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont" <[jncd_vai6ks.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-osf-ts1--base Junicode-ExpBoldItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-ExpBoldItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-sup-lgr Junicode-ExpBoldItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.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-inf-ly1 Junicode-ExpBoldItalic "AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont" <[jncd_t7d4ag.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-inf-lgr Junicode-ExpBoldItalic "AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont" <[jncd_ifhpre.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-ot1 Junicode-ExpBoldItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-t1--base Junicode-ExpBoldItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-ly1 Junicode-ExpBoldItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-lgr Junicode-ExpBoldItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-ExpBoldItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-sc-lgr Junicode-ExpBoldItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-lf-ts1--base Junicode-ExpBoldItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-ExpBoldItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-ExpBoldItalic.pfb
+Junicode-ExpBoldItalic-sup-lgr Junicode-ExpBoldItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-ot1 Junicode-ExpBoldItalic "AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont" <[jncd_sa5d62.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-t1--base Junicode-ExpBoldItalic "AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont" <[jncd_4vsefk.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tosf-ly1 Junicode-ExpBoldItalic "AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont" <[jncd_2j6faw.enc <Junicode-ExpBoldItalic.pfb
@@ -387,15 +396,6 @@ Junicode-ExpBoldItalic-tlf-sc-t1--base Junicode-ExpBoldItalic "AutoEnc_z4lkq6f2v
Junicode-ExpBoldItalic-tlf-sc-ly1--base Junicode-ExpBoldItalic "AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont" <[jncd_wkwe3q.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-sc-lgr Junicode-ExpBoldItalic "AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont" <[jncd_la6rhc.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBoldItalic-tlf-ts1--base Junicode-ExpBoldItalic "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-ot1 Junicode-ExpBoldItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-t1--base Junicode-ExpBoldItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-ly1 Junicode-ExpBoldItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-lgr Junicode-ExpBoldItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-ExpBoldItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-sc-lgr Junicode-ExpBoldItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-ExpBoldItalic.pfb
-Junicode-ExpBoldItalic-lf-ts1--base Junicode-ExpBoldItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-ExpBoldItalic.pfb
Junicode-ExpBold-osf-ot1 Junicode-ExpBold "AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont" <[jncd_dydq3d.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-t1--base Junicode-ExpBold "AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont" <[jncd_hwfs67.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-ly1 Junicode-ExpBold "AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont" <[jncd_535mcm.enc <Junicode-ExpBold.pfb
@@ -405,14 +405,23 @@ Junicode-ExpBold-osf-sc-t1--base Junicode-ExpBold "AutoEnc_nghkwvud4qcjbasji7abq
Junicode-ExpBold-osf-sc-ly1--base Junicode-ExpBold "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-sc-lgr Junicode-ExpBold "AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont" <[jncd_alnhow.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-osf-ts1--base Junicode-ExpBold "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-sup-ot1 Junicode-ExpBold "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-sup-t1--base Junicode-ExpBold "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-sup-ly1 Junicode-ExpBold "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-sup-lgr Junicode-ExpBold "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-inf-ot1 Junicode-ExpBold "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-inf-t1--base Junicode-ExpBold "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-inf-ly1 Junicode-ExpBold "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-inf-lgr Junicode-ExpBold "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-lf-ot1 Junicode-ExpBold "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-lf-t1--base Junicode-ExpBold "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-lf-ly1 Junicode-ExpBold "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-lf-lgr Junicode-ExpBold "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-ExpBold "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-lf-sc-lgr Junicode-ExpBold "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-lf-ts1--base Junicode-ExpBold "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-sup-ot1 Junicode-ExpBold "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-sup-t1--base Junicode-ExpBold "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-sup-ly1 Junicode-ExpBold "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-ExpBold.pfb
+Junicode-ExpBold-sup-lgr Junicode-ExpBold "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-ot1 Junicode-ExpBold "AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont" <[jncd_tugio2.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-t1--base Junicode-ExpBold "AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont" <[jncd_4vrfuq.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tosf-ly1 Junicode-ExpBold "AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont" <[jncd_y74d4a.enc <Junicode-ExpBold.pfb
@@ -431,15 +440,6 @@ Junicode-ExpBold-tlf-sc-t1--base Junicode-ExpBold "AutoEnc_jp6lmumstwyqqcqhhhfcd
Junicode-ExpBold-tlf-sc-ly1--base Junicode-ExpBold "AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont" <[jncd_r7dcdh.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-sc-lgr Junicode-ExpBold "AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont" <[jncd_nqur7h.enc <Junicode-ExpBold.pfb
Junicode-ExpBold-tlf-ts1--base Junicode-ExpBold "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-lf-ot1 Junicode-ExpBold "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-lf-t1--base Junicode-ExpBold "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-lf-ly1 Junicode-ExpBold "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-lf-lgr Junicode-ExpBold "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-ExpBold "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-lf-sc-lgr Junicode-ExpBold "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-ExpBold.pfb
-Junicode-ExpBold-lf-ts1--base Junicode-ExpBold "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-ExpBold.pfb
Junicode-ExpItalic-osf-ot1 Junicode-ExpItalic "AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont" <[jncd_wusj3d.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-t1--base Junicode-ExpItalic "AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont" <[jncd_fjcuys.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-ly1 Junicode-ExpItalic "AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont" <[jncd_dbackh.enc <Junicode-ExpItalic.pfb
@@ -449,14 +449,23 @@ Junicode-ExpItalic-osf-sc-t1--base Junicode-ExpItalic "AutoEnc_nghkwvud4qcjbasji
Junicode-ExpItalic-osf-sc-ly1--base Junicode-ExpItalic "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-sc-lgr Junicode-ExpItalic "AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont" <[jncd_vai6ks.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-osf-ts1--base Junicode-ExpItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-ExpItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-sup-lgr Junicode-ExpItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.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-inf-ly1 Junicode-ExpItalic "AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont" <[jncd_t7d4ag.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-inf-lgr Junicode-ExpItalic "AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont" <[jncd_ifhpre.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-ot1 Junicode-ExpItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-t1--base Junicode-ExpItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-ly1 Junicode-ExpItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-lgr Junicode-ExpItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-ExpItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-sc-lgr Junicode-ExpItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-lf-ts1--base Junicode-ExpItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-ExpItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-ExpItalic.pfb
+Junicode-ExpItalic-sup-lgr Junicode-ExpItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-ot1 Junicode-ExpItalic "AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont" <[jncd_sa5d62.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-t1--base Junicode-ExpItalic "AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont" <[jncd_4vsefk.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tosf-ly1 Junicode-ExpItalic "AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont" <[jncd_2j6faw.enc <Junicode-ExpItalic.pfb
@@ -475,15 +484,6 @@ Junicode-ExpItalic-tlf-sc-t1--base Junicode-ExpItalic "AutoEnc_z4lkq6f2v5epiwbfl
Junicode-ExpItalic-tlf-sc-ly1--base Junicode-ExpItalic "AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont" <[jncd_wkwe3q.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-sc-lgr Junicode-ExpItalic "AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont" <[jncd_la6rhc.enc <Junicode-ExpItalic.pfb
Junicode-ExpItalic-tlf-ts1--base Junicode-ExpItalic "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-ot1 Junicode-ExpItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-t1--base Junicode-ExpItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-ly1 Junicode-ExpItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-lgr Junicode-ExpItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-ExpItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-sc-lgr Junicode-ExpItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-ExpItalic.pfb
-Junicode-ExpItalic-lf-ts1--base Junicode-ExpItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-ExpItalic.pfb
Junicode-ExpMediumItalic-osf-ot1 Junicode-ExpMediumItalic "AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont" <[jncd_wusj3d.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-t1--base Junicode-ExpMediumItalic "AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont" <[jncd_fjcuys.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-ly1 Junicode-ExpMediumItalic "AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont" <[jncd_dbackh.enc <Junicode-ExpMediumItalic.pfb
@@ -493,14 +493,23 @@ Junicode-ExpMediumItalic-osf-sc-t1--base Junicode-ExpMediumItalic "AutoEnc_nghkw
Junicode-ExpMediumItalic-osf-sc-ly1--base Junicode-ExpMediumItalic "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-sc-lgr Junicode-ExpMediumItalic "AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont" <[jncd_vai6ks.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-osf-ts1--base Junicode-ExpMediumItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-ExpMediumItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-sup-lgr Junicode-ExpMediumItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.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-inf-ly1 Junicode-ExpMediumItalic "AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont" <[jncd_t7d4ag.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-inf-lgr Junicode-ExpMediumItalic "AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont" <[jncd_ifhpre.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-ot1 Junicode-ExpMediumItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-t1--base Junicode-ExpMediumItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-ly1 Junicode-ExpMediumItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-lgr Junicode-ExpMediumItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-ExpMediumItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-sc-lgr Junicode-ExpMediumItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-lf-ts1--base Junicode-ExpMediumItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-ExpMediumItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-ExpMediumItalic.pfb
+Junicode-ExpMediumItalic-sup-lgr Junicode-ExpMediumItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-ot1 Junicode-ExpMediumItalic "AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont" <[jncd_sa5d62.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-t1--base Junicode-ExpMediumItalic "AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont" <[jncd_4vsefk.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tosf-ly1 Junicode-ExpMediumItalic "AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont" <[jncd_2j6faw.enc <Junicode-ExpMediumItalic.pfb
@@ -519,15 +528,6 @@ Junicode-ExpMediumItalic-tlf-sc-t1--base Junicode-ExpMediumItalic "AutoEnc_z4lkq
Junicode-ExpMediumItalic-tlf-sc-ly1--base Junicode-ExpMediumItalic "AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont" <[jncd_wkwe3q.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-sc-lgr Junicode-ExpMediumItalic "AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont" <[jncd_la6rhc.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMediumItalic-tlf-ts1--base Junicode-ExpMediumItalic "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-ot1 Junicode-ExpMediumItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-t1--base Junicode-ExpMediumItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-ly1 Junicode-ExpMediumItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-lgr Junicode-ExpMediumItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-ExpMediumItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-sc-lgr Junicode-ExpMediumItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-ExpMediumItalic.pfb
-Junicode-ExpMediumItalic-lf-ts1--base Junicode-ExpMediumItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-ExpMediumItalic.pfb
Junicode-ExpMedium-osf-ot1 Junicode-ExpMedium "AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont" <[jncd_dydq3d.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-t1--base Junicode-ExpMedium "AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont" <[jncd_hwfs67.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-ly1 Junicode-ExpMedium "AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont" <[jncd_535mcm.enc <Junicode-ExpMedium.pfb
@@ -537,14 +537,23 @@ Junicode-ExpMedium-osf-sc-t1--base Junicode-ExpMedium "AutoEnc_nghkwvud4qcjbasji
Junicode-ExpMedium-osf-sc-ly1--base Junicode-ExpMedium "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-sc-lgr Junicode-ExpMedium "AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont" <[jncd_alnhow.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-osf-ts1--base Junicode-ExpMedium "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-sup-ot1 Junicode-ExpMedium "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-sup-t1--base Junicode-ExpMedium "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-sup-ly1 Junicode-ExpMedium "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-sup-lgr Junicode-ExpMedium "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-inf-ot1 Junicode-ExpMedium "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-inf-t1--base Junicode-ExpMedium "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-inf-ly1 Junicode-ExpMedium "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-inf-lgr Junicode-ExpMedium "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-lf-ot1 Junicode-ExpMedium "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-lf-t1--base Junicode-ExpMedium "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-lf-ly1 Junicode-ExpMedium "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-lf-lgr Junicode-ExpMedium "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-ExpMedium "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-lf-sc-lgr Junicode-ExpMedium "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-lf-ts1--base Junicode-ExpMedium "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-sup-ot1 Junicode-ExpMedium "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-sup-t1--base Junicode-ExpMedium "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-sup-ly1 Junicode-ExpMedium "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-ExpMedium.pfb
+Junicode-ExpMedium-sup-lgr Junicode-ExpMedium "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-ot1 Junicode-ExpMedium "AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont" <[jncd_tugio2.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-t1--base Junicode-ExpMedium "AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont" <[jncd_4vrfuq.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tosf-ly1 Junicode-ExpMedium "AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont" <[jncd_y74d4a.enc <Junicode-ExpMedium.pfb
@@ -563,15 +572,6 @@ Junicode-ExpMedium-tlf-sc-t1--base Junicode-ExpMedium "AutoEnc_jp6lmumstwyqqcqhh
Junicode-ExpMedium-tlf-sc-ly1--base Junicode-ExpMedium "AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont" <[jncd_r7dcdh.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-sc-lgr Junicode-ExpMedium "AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont" <[jncd_nqur7h.enc <Junicode-ExpMedium.pfb
Junicode-ExpMedium-tlf-ts1--base Junicode-ExpMedium "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-lf-ot1 Junicode-ExpMedium "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-lf-t1--base Junicode-ExpMedium "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-lf-ly1 Junicode-ExpMedium "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-lf-lgr Junicode-ExpMedium "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-ExpMedium "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-lf-sc-lgr Junicode-ExpMedium "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-ExpMedium.pfb
-Junicode-ExpMedium-lf-ts1--base Junicode-ExpMedium "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-ExpMedium.pfb
Junicode-Exp-osf-ot1 Junicode-Exp "AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont" <[jncd_dydq3d.enc <Junicode-Exp.pfb
Junicode-Exp-osf-t1--base Junicode-Exp "AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont" <[jncd_hwfs67.enc <Junicode-Exp.pfb
Junicode-Exp-osf-ly1 Junicode-Exp "AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont" <[jncd_535mcm.enc <Junicode-Exp.pfb
@@ -581,14 +581,23 @@ Junicode-Exp-osf-sc-t1--base Junicode-Exp "AutoEnc_nghkwvud4qcjbasji7abq43ang Re
Junicode-Exp-osf-sc-ly1--base Junicode-Exp "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-Exp.pfb
Junicode-Exp-osf-sc-lgr Junicode-Exp "AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont" <[jncd_alnhow.enc <Junicode-Exp.pfb
Junicode-Exp-osf-ts1--base Junicode-Exp "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-Exp.pfb
-Junicode-Exp-sup-ot1 Junicode-Exp "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-Exp.pfb
-Junicode-Exp-sup-t1--base Junicode-Exp "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-Exp.pfb
-Junicode-Exp-sup-ly1 Junicode-Exp "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-Exp.pfb
-Junicode-Exp-sup-lgr Junicode-Exp "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-Exp.pfb
Junicode-Exp-inf-ot1 Junicode-Exp "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-Exp.pfb
Junicode-Exp-inf-t1--base Junicode-Exp "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-Exp.pfb
Junicode-Exp-inf-ly1 Junicode-Exp "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-Exp.pfb
Junicode-Exp-inf-lgr Junicode-Exp "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-Exp.pfb
+Junicode-Exp-lf-ot1 Junicode-Exp "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-Exp.pfb
+Junicode-Exp-lf-t1--base Junicode-Exp "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-Exp.pfb
+Junicode-Exp-lf-ly1 Junicode-Exp "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-Exp.pfb
+Junicode-Exp-lf-lgr Junicode-Exp "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-Exp "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-Exp.pfb
+Junicode-Exp-lf-sc-lgr Junicode-Exp "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-Exp.pfb
+Junicode-Exp-lf-ts1--base Junicode-Exp "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-Exp.pfb
+Junicode-Exp-sup-ot1 Junicode-Exp "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-Exp.pfb
+Junicode-Exp-sup-t1--base Junicode-Exp "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-Exp.pfb
+Junicode-Exp-sup-ly1 Junicode-Exp "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-Exp.pfb
+Junicode-Exp-sup-lgr Junicode-Exp "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-ot1 Junicode-Exp "AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont" <[jncd_tugio2.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-t1--base Junicode-Exp "AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont" <[jncd_4vrfuq.enc <Junicode-Exp.pfb
Junicode-Exp-tosf-ly1 Junicode-Exp "AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont" <[jncd_y74d4a.enc <Junicode-Exp.pfb
@@ -607,15 +616,6 @@ Junicode-Exp-tlf-sc-t1--base Junicode-Exp "AutoEnc_jp6lmumstwyqqcqhhhfcdbp3kc Re
Junicode-Exp-tlf-sc-ly1--base Junicode-Exp "AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont" <[jncd_r7dcdh.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-sc-lgr Junicode-Exp "AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont" <[jncd_nqur7h.enc <Junicode-Exp.pfb
Junicode-Exp-tlf-ts1--base Junicode-Exp "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-Exp.pfb
-Junicode-Exp-lf-ot1 Junicode-Exp "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-Exp.pfb
-Junicode-Exp-lf-t1--base Junicode-Exp "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-Exp.pfb
-Junicode-Exp-lf-ly1 Junicode-Exp "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-Exp.pfb
-Junicode-Exp-lf-lgr Junicode-Exp "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-Exp "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-Exp.pfb
-Junicode-Exp-lf-sc-lgr Junicode-Exp "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-Exp.pfb
-Junicode-Exp-lf-ts1--base Junicode-Exp "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-Exp.pfb
Junicode-ExpSmBoldItalic-osf-ot1 Junicode-ExpSmBoldItalic "AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont" <[jncd_wusj3d.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-t1--base Junicode-ExpSmBoldItalic "AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont" <[jncd_fjcuys.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-ly1 Junicode-ExpSmBoldItalic "AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont" <[jncd_dbackh.enc <Junicode-ExpSmBoldItalic.pfb
@@ -625,14 +625,23 @@ Junicode-ExpSmBoldItalic-osf-sc-t1--base Junicode-ExpSmBoldItalic "AutoEnc_nghkw
Junicode-ExpSmBoldItalic-osf-sc-ly1--base Junicode-ExpSmBoldItalic "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-sc-lgr Junicode-ExpSmBoldItalic "AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont" <[jncd_vai6ks.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-osf-ts1--base Junicode-ExpSmBoldItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-ExpSmBoldItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-sup-lgr Junicode-ExpSmBoldItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.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-inf-ly1 Junicode-ExpSmBoldItalic "AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont" <[jncd_t7d4ag.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-inf-lgr Junicode-ExpSmBoldItalic "AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont" <[jncd_ifhpre.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-ot1 Junicode-ExpSmBoldItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-t1--base Junicode-ExpSmBoldItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-ly1 Junicode-ExpSmBoldItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-lgr Junicode-ExpSmBoldItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-ExpSmBoldItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-sc-lgr Junicode-ExpSmBoldItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-lf-ts1--base Junicode-ExpSmBoldItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-ExpSmBoldItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-ExpSmBoldItalic.pfb
+Junicode-ExpSmBoldItalic-sup-lgr Junicode-ExpSmBoldItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-ot1 Junicode-ExpSmBoldItalic "AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont" <[jncd_sa5d62.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-t1--base Junicode-ExpSmBoldItalic "AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont" <[jncd_4vsefk.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tosf-ly1 Junicode-ExpSmBoldItalic "AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont" <[jncd_2j6faw.enc <Junicode-ExpSmBoldItalic.pfb
@@ -651,15 +660,6 @@ Junicode-ExpSmBoldItalic-tlf-sc-t1--base Junicode-ExpSmBoldItalic "AutoEnc_z4lkq
Junicode-ExpSmBoldItalic-tlf-sc-ly1--base Junicode-ExpSmBoldItalic "AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont" <[jncd_wkwe3q.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-sc-lgr Junicode-ExpSmBoldItalic "AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont" <[jncd_la6rhc.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBoldItalic-tlf-ts1--base Junicode-ExpSmBoldItalic "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-ot1 Junicode-ExpSmBoldItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-t1--base Junicode-ExpSmBoldItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-ly1 Junicode-ExpSmBoldItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-lgr Junicode-ExpSmBoldItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-ExpSmBoldItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-sc-lgr Junicode-ExpSmBoldItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-ExpSmBoldItalic.pfb
-Junicode-ExpSmBoldItalic-lf-ts1--base Junicode-ExpSmBoldItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-ExpSmBoldItalic.pfb
Junicode-ExpSmBold-osf-ot1 Junicode-ExpSmBold "AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont" <[jncd_dydq3d.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-t1--base Junicode-ExpSmBold "AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont" <[jncd_hwfs67.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-ly1 Junicode-ExpSmBold "AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont" <[jncd_535mcm.enc <Junicode-ExpSmBold.pfb
@@ -669,14 +669,23 @@ Junicode-ExpSmBold-osf-sc-t1--base Junicode-ExpSmBold "AutoEnc_nghkwvud4qcjbasji
Junicode-ExpSmBold-osf-sc-ly1--base Junicode-ExpSmBold "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-sc-lgr Junicode-ExpSmBold "AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont" <[jncd_alnhow.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-osf-ts1--base Junicode-ExpSmBold "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-sup-ot1 Junicode-ExpSmBold "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-sup-t1--base Junicode-ExpSmBold "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-sup-ly1 Junicode-ExpSmBold "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-sup-lgr Junicode-ExpSmBold "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-inf-ot1 Junicode-ExpSmBold "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-inf-t1--base Junicode-ExpSmBold "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-inf-ly1 Junicode-ExpSmBold "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-inf-lgr Junicode-ExpSmBold "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-lf-ot1 Junicode-ExpSmBold "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-lf-t1--base Junicode-ExpSmBold "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-lf-ly1 Junicode-ExpSmBold "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-lf-lgr Junicode-ExpSmBold "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-ExpSmBold "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-lf-sc-lgr Junicode-ExpSmBold "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-lf-ts1--base Junicode-ExpSmBold "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-sup-ot1 Junicode-ExpSmBold "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-sup-t1--base Junicode-ExpSmBold "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-sup-ly1 Junicode-ExpSmBold "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-ExpSmBold.pfb
+Junicode-ExpSmBold-sup-lgr Junicode-ExpSmBold "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-ot1 Junicode-ExpSmBold "AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont" <[jncd_tugio2.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-t1--base Junicode-ExpSmBold "AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont" <[jncd_4vrfuq.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tosf-ly1 Junicode-ExpSmBold "AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont" <[jncd_y74d4a.enc <Junicode-ExpSmBold.pfb
@@ -695,15 +704,6 @@ Junicode-ExpSmBold-tlf-sc-t1--base Junicode-ExpSmBold "AutoEnc_jp6lmumstwyqqcqhh
Junicode-ExpSmBold-tlf-sc-ly1--base Junicode-ExpSmBold "AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont" <[jncd_r7dcdh.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-sc-lgr Junicode-ExpSmBold "AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont" <[jncd_nqur7h.enc <Junicode-ExpSmBold.pfb
Junicode-ExpSmBold-tlf-ts1--base Junicode-ExpSmBold "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-lf-ot1 Junicode-ExpSmBold "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-lf-t1--base Junicode-ExpSmBold "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-lf-ly1 Junicode-ExpSmBold "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-lf-lgr Junicode-ExpSmBold "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-ExpSmBold "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-lf-sc-lgr Junicode-ExpSmBold "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-ExpSmBold.pfb
-Junicode-ExpSmBold-lf-ts1--base Junicode-ExpSmBold "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-ExpSmBold.pfb
Junicode-Italic-osf-ot1 Junicode-Italic "AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont" <[jncd_wusj3d.enc <Junicode-Italic.pfb
Junicode-Italic-osf-t1--base Junicode-Italic "AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont" <[jncd_fjcuys.enc <Junicode-Italic.pfb
Junicode-Italic-osf-ly1 Junicode-Italic "AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont" <[jncd_dbackh.enc <Junicode-Italic.pfb
@@ -713,14 +713,23 @@ Junicode-Italic-osf-sc-t1--base Junicode-Italic "AutoEnc_nghkwvud4qcjbasji7abq43
Junicode-Italic-osf-sc-ly1--base Junicode-Italic "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-Italic.pfb
Junicode-Italic-osf-sc-lgr Junicode-Italic "AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont" <[jncd_vai6ks.enc <Junicode-Italic.pfb
Junicode-Italic-osf-ts1--base Junicode-Italic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-Italic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-Italic.pfb
-Junicode-Italic-sup-lgr Junicode-Italic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.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-inf-ly1 Junicode-Italic "AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont" <[jncd_t7d4ag.enc <Junicode-Italic.pfb
Junicode-Italic-inf-lgr Junicode-Italic "AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont" <[jncd_ifhpre.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-ot1 Junicode-Italic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-t1--base Junicode-Italic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-ly1 Junicode-Italic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-lgr Junicode-Italic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-Italic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-sc-lgr Junicode-Italic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-Italic.pfb
+Junicode-Italic-lf-ts1--base Junicode-Italic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-Italic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-Italic.pfb
+Junicode-Italic-sup-lgr Junicode-Italic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-ot1 Junicode-Italic "AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont" <[jncd_sa5d62.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-t1--base Junicode-Italic "AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont" <[jncd_4vsefk.enc <Junicode-Italic.pfb
Junicode-Italic-tosf-ly1 Junicode-Italic "AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont" <[jncd_2j6faw.enc <Junicode-Italic.pfb
@@ -739,15 +748,6 @@ Junicode-Italic-tlf-sc-t1--base Junicode-Italic "AutoEnc_z4lkq6f2v5epiwbfloel6jb
Junicode-Italic-tlf-sc-ly1--base Junicode-Italic "AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont" <[jncd_wkwe3q.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-sc-lgr Junicode-Italic "AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont" <[jncd_la6rhc.enc <Junicode-Italic.pfb
Junicode-Italic-tlf-ts1--base Junicode-Italic "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-ot1 Junicode-Italic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-t1--base Junicode-Italic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-ly1 Junicode-Italic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-lgr Junicode-Italic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-Italic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-sc-lgr Junicode-Italic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-Italic.pfb
-Junicode-Italic-lf-ts1--base Junicode-Italic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-Italic.pfb
Junicode-LightItalic-osf-ot1 Junicode-LightItalic "AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont" <[jncd_wusj3d.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-t1--base Junicode-LightItalic "AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont" <[jncd_fjcuys.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-ly1 Junicode-LightItalic "AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont" <[jncd_dbackh.enc <Junicode-LightItalic.pfb
@@ -757,14 +757,23 @@ Junicode-LightItalic-osf-sc-t1--base Junicode-LightItalic "AutoEnc_nghkwvud4qcjb
Junicode-LightItalic-osf-sc-ly1--base Junicode-LightItalic "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-sc-lgr Junicode-LightItalic "AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont" <[jncd_vai6ks.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-osf-ts1--base Junicode-LightItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-LightItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-sup-lgr Junicode-LightItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.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-inf-ly1 Junicode-LightItalic "AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont" <[jncd_t7d4ag.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-inf-lgr Junicode-LightItalic "AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont" <[jncd_ifhpre.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-ot1 Junicode-LightItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-t1--base Junicode-LightItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-ly1 Junicode-LightItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-lgr Junicode-LightItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-LightItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-sc-lgr Junicode-LightItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-lf-ts1--base Junicode-LightItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-LightItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-LightItalic.pfb
+Junicode-LightItalic-sup-lgr Junicode-LightItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-ot1 Junicode-LightItalic "AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont" <[jncd_sa5d62.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-t1--base Junicode-LightItalic "AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont" <[jncd_4vsefk.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tosf-ly1 Junicode-LightItalic "AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont" <[jncd_2j6faw.enc <Junicode-LightItalic.pfb
@@ -783,15 +792,6 @@ Junicode-LightItalic-tlf-sc-t1--base Junicode-LightItalic "AutoEnc_z4lkq6f2v5epi
Junicode-LightItalic-tlf-sc-ly1--base Junicode-LightItalic "AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont" <[jncd_wkwe3q.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-sc-lgr Junicode-LightItalic "AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont" <[jncd_la6rhc.enc <Junicode-LightItalic.pfb
Junicode-LightItalic-tlf-ts1--base Junicode-LightItalic "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-ot1 Junicode-LightItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-t1--base Junicode-LightItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-ly1 Junicode-LightItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-lgr Junicode-LightItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-LightItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-sc-lgr Junicode-LightItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-LightItalic.pfb
-Junicode-LightItalic-lf-ts1--base Junicode-LightItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-LightItalic.pfb
Junicode-Light-osf-ot1 Junicode-Light "AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont" <[jncd_dydq3d.enc <Junicode-Light.pfb
Junicode-Light-osf-t1--base Junicode-Light "AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont" <[jncd_hwfs67.enc <Junicode-Light.pfb
Junicode-Light-osf-ly1 Junicode-Light "AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont" <[jncd_535mcm.enc <Junicode-Light.pfb
@@ -801,14 +801,23 @@ Junicode-Light-osf-sc-t1--base Junicode-Light "AutoEnc_nghkwvud4qcjbasji7abq43an
Junicode-Light-osf-sc-ly1--base Junicode-Light "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-Light.pfb
Junicode-Light-osf-sc-lgr Junicode-Light "AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont" <[jncd_alnhow.enc <Junicode-Light.pfb
Junicode-Light-osf-ts1--base Junicode-Light "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-Light.pfb
-Junicode-Light-sup-ot1 Junicode-Light "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-Light.pfb
-Junicode-Light-sup-t1--base Junicode-Light "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-Light.pfb
-Junicode-Light-sup-ly1 Junicode-Light "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-Light.pfb
-Junicode-Light-sup-lgr Junicode-Light "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-Light.pfb
Junicode-Light-inf-ot1 Junicode-Light "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-Light.pfb
Junicode-Light-inf-t1--base Junicode-Light "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-Light.pfb
Junicode-Light-inf-ly1 Junicode-Light "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-Light.pfb
Junicode-Light-inf-lgr Junicode-Light "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-Light.pfb
+Junicode-Light-lf-ot1 Junicode-Light "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-Light.pfb
+Junicode-Light-lf-t1--base Junicode-Light "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-Light.pfb
+Junicode-Light-lf-ly1 Junicode-Light "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-Light.pfb
+Junicode-Light-lf-lgr Junicode-Light "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-Light "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-Light.pfb
+Junicode-Light-lf-sc-lgr Junicode-Light "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-Light.pfb
+Junicode-Light-lf-ts1--base Junicode-Light "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-Light.pfb
+Junicode-Light-sup-ot1 Junicode-Light "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-Light.pfb
+Junicode-Light-sup-t1--base Junicode-Light "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-Light.pfb
+Junicode-Light-sup-ly1 Junicode-Light "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-Light.pfb
+Junicode-Light-sup-lgr Junicode-Light "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-Light.pfb
Junicode-Light-tosf-ot1 Junicode-Light "AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont" <[jncd_tugio2.enc <Junicode-Light.pfb
Junicode-Light-tosf-t1--base Junicode-Light "AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont" <[jncd_4vrfuq.enc <Junicode-Light.pfb
Junicode-Light-tosf-ly1 Junicode-Light "AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont" <[jncd_y74d4a.enc <Junicode-Light.pfb
@@ -827,15 +836,6 @@ Junicode-Light-tlf-sc-t1--base Junicode-Light "AutoEnc_jp6lmumstwyqqcqhhhfcdbp3k
Junicode-Light-tlf-sc-ly1--base Junicode-Light "AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont" <[jncd_r7dcdh.enc <Junicode-Light.pfb
Junicode-Light-tlf-sc-lgr Junicode-Light "AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont" <[jncd_nqur7h.enc <Junicode-Light.pfb
Junicode-Light-tlf-ts1--base Junicode-Light "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-Light.pfb
-Junicode-Light-lf-ot1 Junicode-Light "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-Light.pfb
-Junicode-Light-lf-t1--base Junicode-Light "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-Light.pfb
-Junicode-Light-lf-ly1 Junicode-Light "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-Light.pfb
-Junicode-Light-lf-lgr Junicode-Light "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-Light "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-Light.pfb
-Junicode-Light-lf-sc-lgr Junicode-Light "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-Light.pfb
-Junicode-Light-lf-ts1--base Junicode-Light "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-Light.pfb
Junicode-MediumItalic-osf-ot1 Junicode-MediumItalic "AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont" <[jncd_wusj3d.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-t1--base Junicode-MediumItalic "AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont" <[jncd_fjcuys.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-ly1 Junicode-MediumItalic "AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont" <[jncd_dbackh.enc <Junicode-MediumItalic.pfb
@@ -845,14 +845,23 @@ Junicode-MediumItalic-osf-sc-t1--base Junicode-MediumItalic "AutoEnc_nghkwvud4qc
Junicode-MediumItalic-osf-sc-ly1--base Junicode-MediumItalic "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-sc-lgr Junicode-MediumItalic "AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont" <[jncd_vai6ks.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-osf-ts1--base Junicode-MediumItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-MediumItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-sup-lgr Junicode-MediumItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.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-inf-ly1 Junicode-MediumItalic "AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont" <[jncd_t7d4ag.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-inf-lgr Junicode-MediumItalic "AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont" <[jncd_ifhpre.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-ot1 Junicode-MediumItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-t1--base Junicode-MediumItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-ly1 Junicode-MediumItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-lgr Junicode-MediumItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-MediumItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-sc-lgr Junicode-MediumItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-lf-ts1--base Junicode-MediumItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-MediumItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-MediumItalic.pfb
+Junicode-MediumItalic-sup-lgr Junicode-MediumItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-ot1 Junicode-MediumItalic "AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont" <[jncd_sa5d62.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-t1--base Junicode-MediumItalic "AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont" <[jncd_4vsefk.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tosf-ly1 Junicode-MediumItalic "AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont" <[jncd_2j6faw.enc <Junicode-MediumItalic.pfb
@@ -871,15 +880,6 @@ Junicode-MediumItalic-tlf-sc-t1--base Junicode-MediumItalic "AutoEnc_z4lkq6f2v5e
Junicode-MediumItalic-tlf-sc-ly1--base Junicode-MediumItalic "AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont" <[jncd_wkwe3q.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-sc-lgr Junicode-MediumItalic "AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont" <[jncd_la6rhc.enc <Junicode-MediumItalic.pfb
Junicode-MediumItalic-tlf-ts1--base Junicode-MediumItalic "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-ot1 Junicode-MediumItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-t1--base Junicode-MediumItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-ly1 Junicode-MediumItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-lgr Junicode-MediumItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-MediumItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-sc-lgr Junicode-MediumItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-MediumItalic.pfb
-Junicode-MediumItalic-lf-ts1--base Junicode-MediumItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-MediumItalic.pfb
Junicode-Medium-osf-ot1 Junicode-Medium "AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont" <[jncd_dydq3d.enc <Junicode-Medium.pfb
Junicode-Medium-osf-t1--base Junicode-Medium "AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont" <[jncd_hwfs67.enc <Junicode-Medium.pfb
Junicode-Medium-osf-ly1 Junicode-Medium "AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont" <[jncd_535mcm.enc <Junicode-Medium.pfb
@@ -889,14 +889,23 @@ Junicode-Medium-osf-sc-t1--base Junicode-Medium "AutoEnc_nghkwvud4qcjbasji7abq43
Junicode-Medium-osf-sc-ly1--base Junicode-Medium "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-Medium.pfb
Junicode-Medium-osf-sc-lgr Junicode-Medium "AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont" <[jncd_alnhow.enc <Junicode-Medium.pfb
Junicode-Medium-osf-ts1--base Junicode-Medium "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-Medium.pfb
-Junicode-Medium-sup-ot1 Junicode-Medium "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-Medium.pfb
-Junicode-Medium-sup-t1--base Junicode-Medium "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-Medium.pfb
-Junicode-Medium-sup-ly1 Junicode-Medium "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-Medium.pfb
-Junicode-Medium-sup-lgr Junicode-Medium "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-Medium.pfb
Junicode-Medium-inf-ot1 Junicode-Medium "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-Medium.pfb
Junicode-Medium-inf-t1--base Junicode-Medium "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-Medium.pfb
Junicode-Medium-inf-ly1 Junicode-Medium "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-Medium.pfb
Junicode-Medium-inf-lgr Junicode-Medium "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-Medium.pfb
+Junicode-Medium-lf-ot1 Junicode-Medium "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-Medium.pfb
+Junicode-Medium-lf-t1--base Junicode-Medium "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-Medium.pfb
+Junicode-Medium-lf-ly1 Junicode-Medium "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-Medium.pfb
+Junicode-Medium-lf-lgr Junicode-Medium "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-Medium "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-Medium.pfb
+Junicode-Medium-lf-sc-lgr Junicode-Medium "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-Medium.pfb
+Junicode-Medium-lf-ts1--base Junicode-Medium "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-Medium.pfb
+Junicode-Medium-sup-ot1 Junicode-Medium "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-Medium.pfb
+Junicode-Medium-sup-t1--base Junicode-Medium "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-Medium.pfb
+Junicode-Medium-sup-ly1 Junicode-Medium "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-Medium.pfb
+Junicode-Medium-sup-lgr Junicode-Medium "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-ot1 Junicode-Medium "AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont" <[jncd_tugio2.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-t1--base Junicode-Medium "AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont" <[jncd_4vrfuq.enc <Junicode-Medium.pfb
Junicode-Medium-tosf-ly1 Junicode-Medium "AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont" <[jncd_y74d4a.enc <Junicode-Medium.pfb
@@ -915,15 +924,6 @@ Junicode-Medium-tlf-sc-t1--base Junicode-Medium "AutoEnc_jp6lmumstwyqqcqhhhfcdbp
Junicode-Medium-tlf-sc-ly1--base Junicode-Medium "AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont" <[jncd_r7dcdh.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-sc-lgr Junicode-Medium "AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont" <[jncd_nqur7h.enc <Junicode-Medium.pfb
Junicode-Medium-tlf-ts1--base Junicode-Medium "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-Medium.pfb
-Junicode-Medium-lf-ot1 Junicode-Medium "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-Medium.pfb
-Junicode-Medium-lf-t1--base Junicode-Medium "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-Medium.pfb
-Junicode-Medium-lf-ly1 Junicode-Medium "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-Medium.pfb
-Junicode-Medium-lf-lgr Junicode-Medium "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-Medium "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-Medium.pfb
-Junicode-Medium-lf-sc-lgr Junicode-Medium "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-Medium.pfb
-Junicode-Medium-lf-ts1--base Junicode-Medium "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-Medium.pfb
Junicode-Regular-osf-ot1 Junicode-Regular "AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont" <[jncd_dydq3d.enc <Junicode-Regular.pfb
Junicode-Regular-osf-t1--base Junicode-Regular "AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont" <[jncd_hwfs67.enc <Junicode-Regular.pfb
Junicode-Regular-osf-ly1 Junicode-Regular "AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont" <[jncd_535mcm.enc <Junicode-Regular.pfb
@@ -933,14 +933,23 @@ Junicode-Regular-osf-sc-t1--base Junicode-Regular "AutoEnc_nghkwvud4qcjbasji7abq
Junicode-Regular-osf-sc-ly1--base Junicode-Regular "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-Regular.pfb
Junicode-Regular-osf-sc-lgr Junicode-Regular "AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont" <[jncd_alnhow.enc <Junicode-Regular.pfb
Junicode-Regular-osf-ts1--base Junicode-Regular "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-Regular.pfb
-Junicode-Regular-sup-ot1 Junicode-Regular "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-Regular.pfb
-Junicode-Regular-sup-t1--base Junicode-Regular "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-Regular.pfb
-Junicode-Regular-sup-ly1 Junicode-Regular "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-Regular.pfb
-Junicode-Regular-sup-lgr Junicode-Regular "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-Regular.pfb
Junicode-Regular-inf-ot1 Junicode-Regular "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-Regular.pfb
Junicode-Regular-inf-t1--base Junicode-Regular "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-Regular.pfb
Junicode-Regular-inf-ly1 Junicode-Regular "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-Regular.pfb
Junicode-Regular-inf-lgr Junicode-Regular "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-Regular.pfb
+Junicode-Regular-lf-ot1 Junicode-Regular "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-Regular.pfb
+Junicode-Regular-lf-t1--base Junicode-Regular "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-Regular.pfb
+Junicode-Regular-lf-ly1 Junicode-Regular "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-Regular.pfb
+Junicode-Regular-lf-lgr Junicode-Regular "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-Regular "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-Regular.pfb
+Junicode-Regular-lf-sc-lgr Junicode-Regular "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-Regular.pfb
+Junicode-Regular-lf-ts1--base Junicode-Regular "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-Regular.pfb
+Junicode-Regular-sup-ot1 Junicode-Regular "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-Regular.pfb
+Junicode-Regular-sup-t1--base Junicode-Regular "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-Regular.pfb
+Junicode-Regular-sup-ly1 Junicode-Regular "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-Regular.pfb
+Junicode-Regular-sup-lgr Junicode-Regular "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-ot1 Junicode-Regular "AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont" <[jncd_tugio2.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-t1--base Junicode-Regular "AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont" <[jncd_4vrfuq.enc <Junicode-Regular.pfb
Junicode-Regular-tosf-ly1 Junicode-Regular "AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont" <[jncd_y74d4a.enc <Junicode-Regular.pfb
@@ -959,15 +968,6 @@ Junicode-Regular-tlf-sc-t1--base Junicode-Regular "AutoEnc_jp6lmumstwyqqcqhhhfcd
Junicode-Regular-tlf-sc-ly1--base Junicode-Regular "AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont" <[jncd_r7dcdh.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-sc-lgr Junicode-Regular "AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont" <[jncd_nqur7h.enc <Junicode-Regular.pfb
Junicode-Regular-tlf-ts1--base Junicode-Regular "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-Regular.pfb
-Junicode-Regular-lf-ot1 Junicode-Regular "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-Regular.pfb
-Junicode-Regular-lf-t1--base Junicode-Regular "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-Regular.pfb
-Junicode-Regular-lf-ly1 Junicode-Regular "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-Regular.pfb
-Junicode-Regular-lf-lgr Junicode-Regular "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-Regular "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-Regular.pfb
-Junicode-Regular-lf-sc-lgr Junicode-Regular "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-Regular.pfb
-Junicode-Regular-lf-ts1--base Junicode-Regular "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-Regular.pfb
Junicode-SmBoldItalic-osf-ot1 Junicode-SmBoldItalic "AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont" <[jncd_wusj3d.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-t1--base Junicode-SmBoldItalic "AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont" <[jncd_fjcuys.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-ly1 Junicode-SmBoldItalic "AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont" <[jncd_dbackh.enc <Junicode-SmBoldItalic.pfb
@@ -977,14 +977,23 @@ Junicode-SmBoldItalic-osf-sc-t1--base Junicode-SmBoldItalic "AutoEnc_nghkwvud4qc
Junicode-SmBoldItalic-osf-sc-ly1--base Junicode-SmBoldItalic "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-sc-lgr Junicode-SmBoldItalic "AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont" <[jncd_vai6ks.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-osf-ts1--base Junicode-SmBoldItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-SmBoldItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-sup-lgr Junicode-SmBoldItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.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-inf-ly1 Junicode-SmBoldItalic "AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont" <[jncd_t7d4ag.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-inf-lgr Junicode-SmBoldItalic "AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont" <[jncd_ifhpre.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-ot1 Junicode-SmBoldItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-t1--base Junicode-SmBoldItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-ly1 Junicode-SmBoldItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-lgr Junicode-SmBoldItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmBoldItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-sc-lgr Junicode-SmBoldItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-lf-ts1--base Junicode-SmBoldItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-SmBoldItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-SmBoldItalic.pfb
+Junicode-SmBoldItalic-sup-lgr Junicode-SmBoldItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-ot1 Junicode-SmBoldItalic "AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont" <[jncd_sa5d62.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-t1--base Junicode-SmBoldItalic "AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont" <[jncd_4vsefk.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tosf-ly1 Junicode-SmBoldItalic "AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont" <[jncd_2j6faw.enc <Junicode-SmBoldItalic.pfb
@@ -1003,15 +1012,6 @@ Junicode-SmBoldItalic-tlf-sc-t1--base Junicode-SmBoldItalic "AutoEnc_z4lkq6f2v5e
Junicode-SmBoldItalic-tlf-sc-ly1--base Junicode-SmBoldItalic "AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont" <[jncd_wkwe3q.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-sc-lgr Junicode-SmBoldItalic "AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont" <[jncd_la6rhc.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBoldItalic-tlf-ts1--base Junicode-SmBoldItalic "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-ot1 Junicode-SmBoldItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-t1--base Junicode-SmBoldItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-ly1 Junicode-SmBoldItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-lgr Junicode-SmBoldItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmBoldItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-sc-lgr Junicode-SmBoldItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-SmBoldItalic.pfb
-Junicode-SmBoldItalic-lf-ts1--base Junicode-SmBoldItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmBoldItalic.pfb
Junicode-SmBold-osf-ot1 Junicode-SmBold "AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont" <[jncd_dydq3d.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-t1--base Junicode-SmBold "AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont" <[jncd_hwfs67.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-ly1 Junicode-SmBold "AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont" <[jncd_535mcm.enc <Junicode-SmBold.pfb
@@ -1021,14 +1021,23 @@ Junicode-SmBold-osf-sc-t1--base Junicode-SmBold "AutoEnc_nghkwvud4qcjbasji7abq43
Junicode-SmBold-osf-sc-ly1--base Junicode-SmBold "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-sc-lgr Junicode-SmBold "AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont" <[jncd_alnhow.enc <Junicode-SmBold.pfb
Junicode-SmBold-osf-ts1--base Junicode-SmBold "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmBold.pfb
-Junicode-SmBold-sup-ot1 Junicode-SmBold "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-SmBold.pfb
-Junicode-SmBold-sup-t1--base Junicode-SmBold "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-SmBold.pfb
-Junicode-SmBold-sup-ly1 Junicode-SmBold "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-SmBold.pfb
-Junicode-SmBold-sup-lgr Junicode-SmBold "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-SmBold.pfb
Junicode-SmBold-inf-ot1 Junicode-SmBold "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-SmBold.pfb
Junicode-SmBold-inf-t1--base Junicode-SmBold "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-SmBold.pfb
Junicode-SmBold-inf-ly1 Junicode-SmBold "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-SmBold.pfb
Junicode-SmBold-inf-lgr Junicode-SmBold "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-SmBold.pfb
+Junicode-SmBold-lf-ot1 Junicode-SmBold "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-SmBold.pfb
+Junicode-SmBold-lf-t1--base Junicode-SmBold "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-SmBold.pfb
+Junicode-SmBold-lf-ly1 Junicode-SmBold "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-SmBold.pfb
+Junicode-SmBold-lf-lgr Junicode-SmBold "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmBold "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-SmBold.pfb
+Junicode-SmBold-lf-sc-lgr Junicode-SmBold "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-SmBold.pfb
+Junicode-SmBold-lf-ts1--base Junicode-SmBold "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmBold.pfb
+Junicode-SmBold-sup-ot1 Junicode-SmBold "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-SmBold.pfb
+Junicode-SmBold-sup-t1--base Junicode-SmBold "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-SmBold.pfb
+Junicode-SmBold-sup-ly1 Junicode-SmBold "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-SmBold.pfb
+Junicode-SmBold-sup-lgr Junicode-SmBold "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-ot1 Junicode-SmBold "AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont" <[jncd_tugio2.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-t1--base Junicode-SmBold "AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont" <[jncd_4vrfuq.enc <Junicode-SmBold.pfb
Junicode-SmBold-tosf-ly1 Junicode-SmBold "AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont" <[jncd_y74d4a.enc <Junicode-SmBold.pfb
@@ -1047,15 +1056,6 @@ Junicode-SmBold-tlf-sc-t1--base Junicode-SmBold "AutoEnc_jp6lmumstwyqqcqhhhfcdbp
Junicode-SmBold-tlf-sc-ly1--base Junicode-SmBold "AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont" <[jncd_r7dcdh.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-sc-lgr Junicode-SmBold "AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont" <[jncd_nqur7h.enc <Junicode-SmBold.pfb
Junicode-SmBold-tlf-ts1--base Junicode-SmBold "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-SmBold.pfb
-Junicode-SmBold-lf-ot1 Junicode-SmBold "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-SmBold.pfb
-Junicode-SmBold-lf-t1--base Junicode-SmBold "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-SmBold.pfb
-Junicode-SmBold-lf-ly1 Junicode-SmBold "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-SmBold.pfb
-Junicode-SmBold-lf-lgr Junicode-SmBold "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmBold "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-SmBold.pfb
-Junicode-SmBold-lf-sc-lgr Junicode-SmBold "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-SmBold.pfb
-Junicode-SmBold-lf-ts1--base Junicode-SmBold "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmBold.pfb
Junicode-SmCondItalic-osf-ot1 Junicode-SmCondItalic "AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont" <[jncd_wusj3d.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-t1--base Junicode-SmCondItalic "AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont" <[jncd_fjcuys.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-ly1 Junicode-SmCondItalic "AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont" <[jncd_dbackh.enc <Junicode-SmCondItalic.pfb
@@ -1065,14 +1065,23 @@ Junicode-SmCondItalic-osf-sc-t1--base Junicode-SmCondItalic "AutoEnc_nghkwvud4qc
Junicode-SmCondItalic-osf-sc-ly1--base Junicode-SmCondItalic "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-sc-lgr Junicode-SmCondItalic "AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont" <[jncd_vai6ks.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-osf-ts1--base Junicode-SmCondItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-SmCondItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-sup-lgr Junicode-SmCondItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.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-inf-ly1 Junicode-SmCondItalic "AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont" <[jncd_t7d4ag.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-inf-lgr Junicode-SmCondItalic "AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont" <[jncd_ifhpre.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-ot1 Junicode-SmCondItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-t1--base Junicode-SmCondItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-ly1 Junicode-SmCondItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-lgr Junicode-SmCondItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmCondItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-sc-lgr Junicode-SmCondItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-lf-ts1--base Junicode-SmCondItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-SmCondItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-SmCondItalic.pfb
+Junicode-SmCondItalic-sup-lgr Junicode-SmCondItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-ot1 Junicode-SmCondItalic "AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont" <[jncd_sa5d62.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-t1--base Junicode-SmCondItalic "AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont" <[jncd_4vsefk.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tosf-ly1 Junicode-SmCondItalic "AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont" <[jncd_2j6faw.enc <Junicode-SmCondItalic.pfb
@@ -1091,15 +1100,6 @@ Junicode-SmCondItalic-tlf-sc-t1--base Junicode-SmCondItalic "AutoEnc_z4lkq6f2v5e
Junicode-SmCondItalic-tlf-sc-ly1--base Junicode-SmCondItalic "AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont" <[jncd_wkwe3q.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-sc-lgr Junicode-SmCondItalic "AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont" <[jncd_la6rhc.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondItalic-tlf-ts1--base Junicode-SmCondItalic "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-ot1 Junicode-SmCondItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-t1--base Junicode-SmCondItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-ly1 Junicode-SmCondItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-lgr Junicode-SmCondItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmCondItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-sc-lgr Junicode-SmCondItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-SmCondItalic.pfb
-Junicode-SmCondItalic-lf-ts1--base Junicode-SmCondItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmCondItalic.pfb
Junicode-SmCondLightItalic-osf-ot1 Junicode-SmCondLightItalic "AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont" <[jncd_wusj3d.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-t1--base Junicode-SmCondLightItalic "AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont" <[jncd_fjcuys.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-ly1 Junicode-SmCondLightItalic "AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont" <[jncd_dbackh.enc <Junicode-SmCondLightItalic.pfb
@@ -1109,14 +1109,23 @@ Junicode-SmCondLightItalic-osf-sc-t1--base Junicode-SmCondLightItalic "AutoEnc_n
Junicode-SmCondLightItalic-osf-sc-ly1--base Junicode-SmCondLightItalic "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-sc-lgr Junicode-SmCondLightItalic "AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont" <[jncd_vai6ks.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-osf-ts1--base Junicode-SmCondLightItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-SmCondLightItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-sup-lgr Junicode-SmCondLightItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.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-inf-ly1 Junicode-SmCondLightItalic "AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont" <[jncd_t7d4ag.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-inf-lgr Junicode-SmCondLightItalic "AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont" <[jncd_ifhpre.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-ot1 Junicode-SmCondLightItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-t1--base Junicode-SmCondLightItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-ly1 Junicode-SmCondLightItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-lgr Junicode-SmCondLightItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmCondLightItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-sc-lgr Junicode-SmCondLightItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-lf-ts1--base Junicode-SmCondLightItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-SmCondLightItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-SmCondLightItalic.pfb
+Junicode-SmCondLightItalic-sup-lgr Junicode-SmCondLightItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-ot1 Junicode-SmCondLightItalic "AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont" <[jncd_sa5d62.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-t1--base Junicode-SmCondLightItalic "AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont" <[jncd_4vsefk.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tosf-ly1 Junicode-SmCondLightItalic "AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont" <[jncd_2j6faw.enc <Junicode-SmCondLightItalic.pfb
@@ -1135,15 +1144,6 @@ Junicode-SmCondLightItalic-tlf-sc-t1--base Junicode-SmCondLightItalic "AutoEnc_z
Junicode-SmCondLightItalic-tlf-sc-ly1--base Junicode-SmCondLightItalic "AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont" <[jncd_wkwe3q.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-sc-lgr Junicode-SmCondLightItalic "AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont" <[jncd_la6rhc.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLightItalic-tlf-ts1--base Junicode-SmCondLightItalic "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-ot1 Junicode-SmCondLightItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-t1--base Junicode-SmCondLightItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-ly1 Junicode-SmCondLightItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-lgr Junicode-SmCondLightItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmCondLightItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-sc-lgr Junicode-SmCondLightItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-SmCondLightItalic.pfb
-Junicode-SmCondLightItalic-lf-ts1--base Junicode-SmCondLightItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmCondLightItalic.pfb
Junicode-SmCondLight-osf-ot1 Junicode-SmCondLight "AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont" <[jncd_dydq3d.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-t1--base Junicode-SmCondLight "AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont" <[jncd_hwfs67.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-ly1 Junicode-SmCondLight "AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont" <[jncd_535mcm.enc <Junicode-SmCondLight.pfb
@@ -1153,14 +1153,23 @@ Junicode-SmCondLight-osf-sc-t1--base Junicode-SmCondLight "AutoEnc_nghkwvud4qcjb
Junicode-SmCondLight-osf-sc-ly1--base Junicode-SmCondLight "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-sc-lgr Junicode-SmCondLight "AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont" <[jncd_alnhow.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-osf-ts1--base Junicode-SmCondLight "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-sup-ot1 Junicode-SmCondLight "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-sup-t1--base Junicode-SmCondLight "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-sup-ly1 Junicode-SmCondLight "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-sup-lgr Junicode-SmCondLight "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-inf-ot1 Junicode-SmCondLight "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-inf-t1--base Junicode-SmCondLight "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-inf-ly1 Junicode-SmCondLight "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-inf-lgr Junicode-SmCondLight "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-lf-ot1 Junicode-SmCondLight "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-lf-t1--base Junicode-SmCondLight "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-lf-ly1 Junicode-SmCondLight "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-lf-lgr Junicode-SmCondLight "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmCondLight "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-lf-sc-lgr Junicode-SmCondLight "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-lf-ts1--base Junicode-SmCondLight "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-sup-ot1 Junicode-SmCondLight "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-sup-t1--base Junicode-SmCondLight "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-sup-ly1 Junicode-SmCondLight "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-SmCondLight.pfb
+Junicode-SmCondLight-sup-lgr Junicode-SmCondLight "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-ot1 Junicode-SmCondLight "AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont" <[jncd_tugio2.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-t1--base Junicode-SmCondLight "AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont" <[jncd_4vrfuq.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tosf-ly1 Junicode-SmCondLight "AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont" <[jncd_y74d4a.enc <Junicode-SmCondLight.pfb
@@ -1179,15 +1188,6 @@ Junicode-SmCondLight-tlf-sc-t1--base Junicode-SmCondLight "AutoEnc_jp6lmumstwyqq
Junicode-SmCondLight-tlf-sc-ly1--base Junicode-SmCondLight "AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont" <[jncd_r7dcdh.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-sc-lgr Junicode-SmCondLight "AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont" <[jncd_nqur7h.enc <Junicode-SmCondLight.pfb
Junicode-SmCondLight-tlf-ts1--base Junicode-SmCondLight "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-lf-ot1 Junicode-SmCondLight "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-lf-t1--base Junicode-SmCondLight "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-lf-ly1 Junicode-SmCondLight "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-lf-lgr Junicode-SmCondLight "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmCondLight "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-lf-sc-lgr Junicode-SmCondLight "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-SmCondLight.pfb
-Junicode-SmCondLight-lf-ts1--base Junicode-SmCondLight "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmCondLight.pfb
Junicode-SmCondMediumItalic-osf-ot1 Junicode-SmCondMediumItalic "AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont" <[jncd_wusj3d.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-t1--base Junicode-SmCondMediumItalic "AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont" <[jncd_fjcuys.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-ly1 Junicode-SmCondMediumItalic "AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont" <[jncd_dbackh.enc <Junicode-SmCondMediumItalic.pfb
@@ -1197,14 +1197,23 @@ Junicode-SmCondMediumItalic-osf-sc-t1--base Junicode-SmCondMediumItalic "AutoEnc
Junicode-SmCondMediumItalic-osf-sc-ly1--base Junicode-SmCondMediumItalic "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-sc-lgr Junicode-SmCondMediumItalic "AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont" <[jncd_vai6ks.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-osf-ts1--base Junicode-SmCondMediumItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-SmCondMediumItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-sup-lgr Junicode-SmCondMediumItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.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-inf-ly1 Junicode-SmCondMediumItalic "AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont" <[jncd_t7d4ag.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-inf-lgr Junicode-SmCondMediumItalic "AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont" <[jncd_ifhpre.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-ot1 Junicode-SmCondMediumItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-t1--base Junicode-SmCondMediumItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-ly1 Junicode-SmCondMediumItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-lgr Junicode-SmCondMediumItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmCondMediumItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-sc-lgr Junicode-SmCondMediumItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-lf-ts1--base Junicode-SmCondMediumItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-SmCondMediumItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-SmCondMediumItalic.pfb
+Junicode-SmCondMediumItalic-sup-lgr Junicode-SmCondMediumItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-ot1 Junicode-SmCondMediumItalic "AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont" <[jncd_sa5d62.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-t1--base Junicode-SmCondMediumItalic "AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont" <[jncd_4vsefk.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tosf-ly1 Junicode-SmCondMediumItalic "AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont" <[jncd_2j6faw.enc <Junicode-SmCondMediumItalic.pfb
@@ -1223,15 +1232,6 @@ Junicode-SmCondMediumItalic-tlf-sc-t1--base Junicode-SmCondMediumItalic "AutoEnc
Junicode-SmCondMediumItalic-tlf-sc-ly1--base Junicode-SmCondMediumItalic "AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont" <[jncd_wkwe3q.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-sc-lgr Junicode-SmCondMediumItalic "AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont" <[jncd_la6rhc.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMediumItalic-tlf-ts1--base Junicode-SmCondMediumItalic "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-ot1 Junicode-SmCondMediumItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-t1--base Junicode-SmCondMediumItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-ly1 Junicode-SmCondMediumItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-lgr Junicode-SmCondMediumItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmCondMediumItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-sc-lgr Junicode-SmCondMediumItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-SmCondMediumItalic.pfb
-Junicode-SmCondMediumItalic-lf-ts1--base Junicode-SmCondMediumItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmCondMediumItalic.pfb
Junicode-SmCondMedium-osf-ot1 Junicode-SmCondMedium "AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont" <[jncd_dydq3d.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-t1--base Junicode-SmCondMedium "AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont" <[jncd_hwfs67.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-ly1 Junicode-SmCondMedium "AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont" <[jncd_535mcm.enc <Junicode-SmCondMedium.pfb
@@ -1241,14 +1241,23 @@ Junicode-SmCondMedium-osf-sc-t1--base Junicode-SmCondMedium "AutoEnc_nghkwvud4qc
Junicode-SmCondMedium-osf-sc-ly1--base Junicode-SmCondMedium "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-sc-lgr Junicode-SmCondMedium "AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont" <[jncd_alnhow.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-osf-ts1--base Junicode-SmCondMedium "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-sup-ot1 Junicode-SmCondMedium "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-sup-t1--base Junicode-SmCondMedium "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-sup-ly1 Junicode-SmCondMedium "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-sup-lgr Junicode-SmCondMedium "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-inf-ot1 Junicode-SmCondMedium "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-inf-t1--base Junicode-SmCondMedium "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-inf-ly1 Junicode-SmCondMedium "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-inf-lgr Junicode-SmCondMedium "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-lf-ot1 Junicode-SmCondMedium "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-lf-t1--base Junicode-SmCondMedium "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-lf-ly1 Junicode-SmCondMedium "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-lf-lgr Junicode-SmCondMedium "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmCondMedium "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-lf-sc-lgr Junicode-SmCondMedium "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-lf-ts1--base Junicode-SmCondMedium "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-sup-ot1 Junicode-SmCondMedium "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-sup-t1--base Junicode-SmCondMedium "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-sup-ly1 Junicode-SmCondMedium "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-SmCondMedium.pfb
+Junicode-SmCondMedium-sup-lgr Junicode-SmCondMedium "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-ot1 Junicode-SmCondMedium "AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont" <[jncd_tugio2.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-t1--base Junicode-SmCondMedium "AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont" <[jncd_4vrfuq.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tosf-ly1 Junicode-SmCondMedium "AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont" <[jncd_y74d4a.enc <Junicode-SmCondMedium.pfb
@@ -1267,15 +1276,6 @@ Junicode-SmCondMedium-tlf-sc-t1--base Junicode-SmCondMedium "AutoEnc_jp6lmumstwy
Junicode-SmCondMedium-tlf-sc-ly1--base Junicode-SmCondMedium "AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont" <[jncd_r7dcdh.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-sc-lgr Junicode-SmCondMedium "AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont" <[jncd_nqur7h.enc <Junicode-SmCondMedium.pfb
Junicode-SmCondMedium-tlf-ts1--base Junicode-SmCondMedium "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-lf-ot1 Junicode-SmCondMedium "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-lf-t1--base Junicode-SmCondMedium "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-lf-ly1 Junicode-SmCondMedium "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-lf-lgr Junicode-SmCondMedium "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmCondMedium "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-lf-sc-lgr Junicode-SmCondMedium "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-SmCondMedium.pfb
-Junicode-SmCondMedium-lf-ts1--base Junicode-SmCondMedium "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmCondMedium.pfb
Junicode-SmCond-osf-ot1 Junicode-SmCond "AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont" <[jncd_dydq3d.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-t1--base Junicode-SmCond "AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont" <[jncd_hwfs67.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-ly1 Junicode-SmCond "AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont" <[jncd_535mcm.enc <Junicode-SmCond.pfb
@@ -1285,14 +1285,23 @@ Junicode-SmCond-osf-sc-t1--base Junicode-SmCond "AutoEnc_nghkwvud4qcjbasji7abq43
Junicode-SmCond-osf-sc-ly1--base Junicode-SmCond "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-sc-lgr Junicode-SmCond "AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont" <[jncd_alnhow.enc <Junicode-SmCond.pfb
Junicode-SmCond-osf-ts1--base Junicode-SmCond "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmCond.pfb
-Junicode-SmCond-sup-ot1 Junicode-SmCond "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-SmCond.pfb
-Junicode-SmCond-sup-t1--base Junicode-SmCond "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-SmCond.pfb
-Junicode-SmCond-sup-ly1 Junicode-SmCond "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-SmCond.pfb
-Junicode-SmCond-sup-lgr Junicode-SmCond "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-SmCond.pfb
Junicode-SmCond-inf-ot1 Junicode-SmCond "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-SmCond.pfb
Junicode-SmCond-inf-t1--base Junicode-SmCond "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-SmCond.pfb
Junicode-SmCond-inf-ly1 Junicode-SmCond "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-SmCond.pfb
Junicode-SmCond-inf-lgr Junicode-SmCond "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-SmCond.pfb
+Junicode-SmCond-lf-ot1 Junicode-SmCond "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-SmCond.pfb
+Junicode-SmCond-lf-t1--base Junicode-SmCond "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-SmCond.pfb
+Junicode-SmCond-lf-ly1 Junicode-SmCond "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-SmCond.pfb
+Junicode-SmCond-lf-lgr Junicode-SmCond "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmCond "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-SmCond.pfb
+Junicode-SmCond-lf-sc-lgr Junicode-SmCond "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-SmCond.pfb
+Junicode-SmCond-lf-ts1--base Junicode-SmCond "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmCond.pfb
+Junicode-SmCond-sup-ot1 Junicode-SmCond "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-SmCond.pfb
+Junicode-SmCond-sup-t1--base Junicode-SmCond "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-SmCond.pfb
+Junicode-SmCond-sup-ly1 Junicode-SmCond "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-SmCond.pfb
+Junicode-SmCond-sup-lgr Junicode-SmCond "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-ot1 Junicode-SmCond "AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont" <[jncd_tugio2.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-t1--base Junicode-SmCond "AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont" <[jncd_4vrfuq.enc <Junicode-SmCond.pfb
Junicode-SmCond-tosf-ly1 Junicode-SmCond "AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont" <[jncd_y74d4a.enc <Junicode-SmCond.pfb
@@ -1311,15 +1320,6 @@ Junicode-SmCond-tlf-sc-t1--base Junicode-SmCond "AutoEnc_jp6lmumstwyqqcqhhhfcdbp
Junicode-SmCond-tlf-sc-ly1--base Junicode-SmCond "AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont" <[jncd_r7dcdh.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-sc-lgr Junicode-SmCond "AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont" <[jncd_nqur7h.enc <Junicode-SmCond.pfb
Junicode-SmCond-tlf-ts1--base Junicode-SmCond "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-SmCond.pfb
-Junicode-SmCond-lf-ot1 Junicode-SmCond "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-SmCond.pfb
-Junicode-SmCond-lf-t1--base Junicode-SmCond "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-SmCond.pfb
-Junicode-SmCond-lf-ly1 Junicode-SmCond "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-SmCond.pfb
-Junicode-SmCond-lf-lgr Junicode-SmCond "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmCond "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-SmCond.pfb
-Junicode-SmCond-lf-sc-lgr Junicode-SmCond "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-SmCond.pfb
-Junicode-SmCond-lf-ts1--base Junicode-SmCond "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmCond.pfb
Junicode-SmExpBoldItalic-osf-ot1 Junicode-SmExpBoldItalic "AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont" <[jncd_wusj3d.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-t1--base Junicode-SmExpBoldItalic "AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont" <[jncd_fjcuys.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-ly1 Junicode-SmExpBoldItalic "AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont" <[jncd_dbackh.enc <Junicode-SmExpBoldItalic.pfb
@@ -1329,14 +1329,23 @@ Junicode-SmExpBoldItalic-osf-sc-t1--base Junicode-SmExpBoldItalic "AutoEnc_nghkw
Junicode-SmExpBoldItalic-osf-sc-ly1--base Junicode-SmExpBoldItalic "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-sc-lgr Junicode-SmExpBoldItalic "AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont" <[jncd_vai6ks.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-osf-ts1--base Junicode-SmExpBoldItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-SmExpBoldItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-sup-lgr Junicode-SmExpBoldItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.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-inf-ly1 Junicode-SmExpBoldItalic "AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont" <[jncd_t7d4ag.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-inf-lgr Junicode-SmExpBoldItalic "AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont" <[jncd_ifhpre.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-ot1 Junicode-SmExpBoldItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-t1--base Junicode-SmExpBoldItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-ly1 Junicode-SmExpBoldItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-lgr Junicode-SmExpBoldItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmExpBoldItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-sc-lgr Junicode-SmExpBoldItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-lf-ts1--base Junicode-SmExpBoldItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-SmExpBoldItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-SmExpBoldItalic.pfb
+Junicode-SmExpBoldItalic-sup-lgr Junicode-SmExpBoldItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-ot1 Junicode-SmExpBoldItalic "AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont" <[jncd_sa5d62.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-t1--base Junicode-SmExpBoldItalic "AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont" <[jncd_4vsefk.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tosf-ly1 Junicode-SmExpBoldItalic "AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont" <[jncd_2j6faw.enc <Junicode-SmExpBoldItalic.pfb
@@ -1355,15 +1364,6 @@ Junicode-SmExpBoldItalic-tlf-sc-t1--base Junicode-SmExpBoldItalic "AutoEnc_z4lkq
Junicode-SmExpBoldItalic-tlf-sc-ly1--base Junicode-SmExpBoldItalic "AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont" <[jncd_wkwe3q.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-sc-lgr Junicode-SmExpBoldItalic "AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont" <[jncd_la6rhc.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBoldItalic-tlf-ts1--base Junicode-SmExpBoldItalic "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-ot1 Junicode-SmExpBoldItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-t1--base Junicode-SmExpBoldItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-ly1 Junicode-SmExpBoldItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-lgr Junicode-SmExpBoldItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmExpBoldItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-sc-lgr Junicode-SmExpBoldItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-SmExpBoldItalic.pfb
-Junicode-SmExpBoldItalic-lf-ts1--base Junicode-SmExpBoldItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmExpBoldItalic.pfb
Junicode-SmExpBold-osf-ot1 Junicode-SmExpBold "AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont" <[jncd_dydq3d.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-t1--base Junicode-SmExpBold "AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont" <[jncd_hwfs67.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-ly1 Junicode-SmExpBold "AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont" <[jncd_535mcm.enc <Junicode-SmExpBold.pfb
@@ -1373,14 +1373,23 @@ Junicode-SmExpBold-osf-sc-t1--base Junicode-SmExpBold "AutoEnc_nghkwvud4qcjbasji
Junicode-SmExpBold-osf-sc-ly1--base Junicode-SmExpBold "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-sc-lgr Junicode-SmExpBold "AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont" <[jncd_alnhow.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-osf-ts1--base Junicode-SmExpBold "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-sup-ot1 Junicode-SmExpBold "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-sup-t1--base Junicode-SmExpBold "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-sup-ly1 Junicode-SmExpBold "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-sup-lgr Junicode-SmExpBold "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-inf-ot1 Junicode-SmExpBold "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-inf-t1--base Junicode-SmExpBold "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-inf-ly1 Junicode-SmExpBold "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-inf-lgr Junicode-SmExpBold "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-lf-ot1 Junicode-SmExpBold "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-lf-t1--base Junicode-SmExpBold "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-lf-ly1 Junicode-SmExpBold "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-lf-lgr Junicode-SmExpBold "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmExpBold "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-lf-sc-lgr Junicode-SmExpBold "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-lf-ts1--base Junicode-SmExpBold "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-sup-ot1 Junicode-SmExpBold "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-sup-t1--base Junicode-SmExpBold "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-sup-ly1 Junicode-SmExpBold "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-SmExpBold.pfb
+Junicode-SmExpBold-sup-lgr Junicode-SmExpBold "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-ot1 Junicode-SmExpBold "AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont" <[jncd_tugio2.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-t1--base Junicode-SmExpBold "AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont" <[jncd_4vrfuq.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tosf-ly1 Junicode-SmExpBold "AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont" <[jncd_y74d4a.enc <Junicode-SmExpBold.pfb
@@ -1399,15 +1408,6 @@ Junicode-SmExpBold-tlf-sc-t1--base Junicode-SmExpBold "AutoEnc_jp6lmumstwyqqcqhh
Junicode-SmExpBold-tlf-sc-ly1--base Junicode-SmExpBold "AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont" <[jncd_r7dcdh.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-sc-lgr Junicode-SmExpBold "AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont" <[jncd_nqur7h.enc <Junicode-SmExpBold.pfb
Junicode-SmExpBold-tlf-ts1--base Junicode-SmExpBold "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-lf-ot1 Junicode-SmExpBold "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-lf-t1--base Junicode-SmExpBold "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-lf-ly1 Junicode-SmExpBold "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-lf-lgr Junicode-SmExpBold "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmExpBold "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-lf-sc-lgr Junicode-SmExpBold "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-SmExpBold.pfb
-Junicode-SmExpBold-lf-ts1--base Junicode-SmExpBold "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmExpBold.pfb
Junicode-SmExpItalic-osf-ot1 Junicode-SmExpItalic "AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont" <[jncd_wusj3d.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-t1--base Junicode-SmExpItalic "AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont" <[jncd_fjcuys.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-ly1 Junicode-SmExpItalic "AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont" <[jncd_dbackh.enc <Junicode-SmExpItalic.pfb
@@ -1417,14 +1417,23 @@ Junicode-SmExpItalic-osf-sc-t1--base Junicode-SmExpItalic "AutoEnc_nghkwvud4qcjb
Junicode-SmExpItalic-osf-sc-ly1--base Junicode-SmExpItalic "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-sc-lgr Junicode-SmExpItalic "AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont" <[jncd_vai6ks.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-osf-ts1--base Junicode-SmExpItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-SmExpItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-sup-lgr Junicode-SmExpItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.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-inf-ly1 Junicode-SmExpItalic "AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont" <[jncd_t7d4ag.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-inf-lgr Junicode-SmExpItalic "AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont" <[jncd_ifhpre.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-ot1 Junicode-SmExpItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-t1--base Junicode-SmExpItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-ly1 Junicode-SmExpItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-lgr Junicode-SmExpItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmExpItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-sc-lgr Junicode-SmExpItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-lf-ts1--base Junicode-SmExpItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-SmExpItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-SmExpItalic.pfb
+Junicode-SmExpItalic-sup-lgr Junicode-SmExpItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-ot1 Junicode-SmExpItalic "AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont" <[jncd_sa5d62.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-t1--base Junicode-SmExpItalic "AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont" <[jncd_4vsefk.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tosf-ly1 Junicode-SmExpItalic "AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont" <[jncd_2j6faw.enc <Junicode-SmExpItalic.pfb
@@ -1443,15 +1452,6 @@ Junicode-SmExpItalic-tlf-sc-t1--base Junicode-SmExpItalic "AutoEnc_z4lkq6f2v5epi
Junicode-SmExpItalic-tlf-sc-ly1--base Junicode-SmExpItalic "AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont" <[jncd_wkwe3q.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-sc-lgr Junicode-SmExpItalic "AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont" <[jncd_la6rhc.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpItalic-tlf-ts1--base Junicode-SmExpItalic "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-ot1 Junicode-SmExpItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-t1--base Junicode-SmExpItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-ly1 Junicode-SmExpItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-lgr Junicode-SmExpItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmExpItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-sc-lgr Junicode-SmExpItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-SmExpItalic.pfb
-Junicode-SmExpItalic-lf-ts1--base Junicode-SmExpItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmExpItalic.pfb
Junicode-SmExpMediumItalic-osf-ot1 Junicode-SmExpMediumItalic "AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont" <[jncd_wusj3d.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-t1--base Junicode-SmExpMediumItalic "AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont" <[jncd_fjcuys.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-ly1 Junicode-SmExpMediumItalic "AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont" <[jncd_dbackh.enc <Junicode-SmExpMediumItalic.pfb
@@ -1461,6 +1461,23 @@ Junicode-SmExpMediumItalic-osf-sc-t1--base Junicode-SmExpMediumItalic "AutoEnc_n
Junicode-SmExpMediumItalic-osf-sc-ly1--base Junicode-SmExpMediumItalic "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-sc-lgr Junicode-SmExpMediumItalic "AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont" <[jncd_vai6ks.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-osf-ts1--base Junicode-SmExpMediumItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-inf-ly1 Junicode-SmExpMediumItalic "AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont" <[jncd_t7d4ag.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-inf-lgr Junicode-SmExpMediumItalic "AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont" <[jncd_ifhpre.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-ot1 Junicode-SmExpMediumItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-t1--base Junicode-SmExpMediumItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-ly1 Junicode-SmExpMediumItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-lgr Junicode-SmExpMediumItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmExpMediumItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-sc-lgr Junicode-SmExpMediumItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-lf-ts1--base Junicode-SmExpMediumItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-SmExpMediumItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-SmExpMediumItalic.pfb
+Junicode-SmExpMediumItalic-sup-lgr Junicode-SmExpMediumItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-ot1 Junicode-SmExpMediumItalic "AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont" <[jncd_sa5d62.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-t1--base Junicode-SmExpMediumItalic "AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont" <[jncd_4vsefk.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-ly1 Junicode-SmExpMediumItalic "AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont" <[jncd_2j6faw.enc <Junicode-SmExpMediumItalic.pfb
@@ -1470,10 +1487,6 @@ Junicode-SmExpMediumItalic-tosf-sc-t1--base Junicode-SmExpMediumItalic "AutoEnc_
Junicode-SmExpMediumItalic-tosf-sc-ly1--base Junicode-SmExpMediumItalic "AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont" <[jncd_6mzsut.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-sc-lgr Junicode-SmExpMediumItalic "AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont" <[jncd_uqxpwn.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tosf-ts1--base Junicode-SmExpMediumItalic "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.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-sup-ly1 Junicode-SmExpMediumItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-sup-lgr Junicode-SmExpMediumItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-ot1 Junicode-SmExpMediumItalic "AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont" <[jncd_tbdiwj.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-t1--base Junicode-SmExpMediumItalic "AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont" <[jncd_m67s2q.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-ly1 Junicode-SmExpMediumItalic "AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont" <[jncd_qrjy3o.enc <Junicode-SmExpMediumItalic.pfb
@@ -1483,19 +1496,6 @@ Junicode-SmExpMediumItalic-tlf-sc-t1--base Junicode-SmExpMediumItalic "AutoEnc_z
Junicode-SmExpMediumItalic-tlf-sc-ly1--base Junicode-SmExpMediumItalic "AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont" <[jncd_wkwe3q.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-sc-lgr Junicode-SmExpMediumItalic "AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont" <[jncd_la6rhc.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMediumItalic-tlf-ts1--base Junicode-SmExpMediumItalic "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.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-inf-ly1 Junicode-SmExpMediumItalic "AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont" <[jncd_t7d4ag.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-inf-lgr Junicode-SmExpMediumItalic "AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont" <[jncd_ifhpre.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-ot1 Junicode-SmExpMediumItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-t1--base Junicode-SmExpMediumItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-ly1 Junicode-SmExpMediumItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-lgr Junicode-SmExpMediumItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmExpMediumItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-sc-lgr Junicode-SmExpMediumItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-SmExpMediumItalic.pfb
-Junicode-SmExpMediumItalic-lf-ts1--base Junicode-SmExpMediumItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmExpMediumItalic.pfb
Junicode-SmExpMedium-osf-ot1 Junicode-SmExpMedium "AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont" <[jncd_dydq3d.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-t1--base Junicode-SmExpMedium "AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont" <[jncd_hwfs67.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-ly1 Junicode-SmExpMedium "AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont" <[jncd_535mcm.enc <Junicode-SmExpMedium.pfb
@@ -1505,6 +1505,23 @@ Junicode-SmExpMedium-osf-sc-t1--base Junicode-SmExpMedium "AutoEnc_nghkwvud4qcjb
Junicode-SmExpMedium-osf-sc-ly1--base Junicode-SmExpMedium "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-sc-lgr Junicode-SmExpMedium "AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont" <[jncd_alnhow.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-osf-ts1--base Junicode-SmExpMedium "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-inf-ot1 Junicode-SmExpMedium "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-inf-t1--base Junicode-SmExpMedium "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-inf-ly1 Junicode-SmExpMedium "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-inf-lgr Junicode-SmExpMedium "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-lf-ot1 Junicode-SmExpMedium "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-lf-t1--base Junicode-SmExpMedium "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-lf-ly1 Junicode-SmExpMedium "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-lf-lgr Junicode-SmExpMedium "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmExpMedium "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-lf-sc-lgr Junicode-SmExpMedium "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-lf-ts1--base Junicode-SmExpMedium "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-sup-ot1 Junicode-SmExpMedium "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-sup-t1--base Junicode-SmExpMedium "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-sup-ly1 Junicode-SmExpMedium "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-SmExpMedium.pfb
+Junicode-SmExpMedium-sup-lgr Junicode-SmExpMedium "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-ot1 Junicode-SmExpMedium "AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont" <[jncd_tugio2.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-t1--base Junicode-SmExpMedium "AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont" <[jncd_4vrfuq.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-ly1 Junicode-SmExpMedium "AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont" <[jncd_y74d4a.enc <Junicode-SmExpMedium.pfb
@@ -1514,10 +1531,6 @@ Junicode-SmExpMedium-tosf-sc-t1--base Junicode-SmExpMedium "AutoEnc_gktvs32iienh
Junicode-SmExpMedium-tosf-sc-ly1--base Junicode-SmExpMedium "AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont" <[jncd_6mzsut.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-sc-lgr Junicode-SmExpMedium "AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont" <[jncd_5nplrd.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tosf-ts1--base Junicode-SmExpMedium "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-sup-ot1 Junicode-SmExpMedium "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-sup-t1--base Junicode-SmExpMedium "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-sup-ly1 Junicode-SmExpMedium "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-sup-lgr Junicode-SmExpMedium "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-ot1 Junicode-SmExpMedium "AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont" <[jncd_atb2gm.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-t1--base Junicode-SmExpMedium "AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont" <[jncd_dw56zz.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-ly1 Junicode-SmExpMedium "AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont" <[jncd_qigq3r.enc <Junicode-SmExpMedium.pfb
@@ -1527,19 +1540,6 @@ Junicode-SmExpMedium-tlf-sc-t1--base Junicode-SmExpMedium "AutoEnc_jp6lmumstwyqq
Junicode-SmExpMedium-tlf-sc-ly1--base Junicode-SmExpMedium "AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont" <[jncd_r7dcdh.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-sc-lgr Junicode-SmExpMedium "AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont" <[jncd_nqur7h.enc <Junicode-SmExpMedium.pfb
Junicode-SmExpMedium-tlf-ts1--base Junicode-SmExpMedium "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-inf-ot1 Junicode-SmExpMedium "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-inf-t1--base Junicode-SmExpMedium "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-inf-ly1 Junicode-SmExpMedium "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-inf-lgr Junicode-SmExpMedium "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-lf-ot1 Junicode-SmExpMedium "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-lf-t1--base Junicode-SmExpMedium "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-lf-ly1 Junicode-SmExpMedium "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-lf-lgr Junicode-SmExpMedium "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmExpMedium "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-lf-sc-lgr Junicode-SmExpMedium "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-SmExpMedium.pfb
-Junicode-SmExpMedium-lf-ts1--base Junicode-SmExpMedium "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmExpMedium.pfb
Junicode-SmExp-osf-ot1 Junicode-SmExp "AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont" <[jncd_dydq3d.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-t1--base Junicode-SmExp "AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont" <[jncd_hwfs67.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-ly1 Junicode-SmExp "AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont" <[jncd_535mcm.enc <Junicode-SmExp.pfb
@@ -1549,6 +1549,23 @@ Junicode-SmExp-osf-sc-t1--base Junicode-SmExp "AutoEnc_nghkwvud4qcjbasji7abq43an
Junicode-SmExp-osf-sc-ly1--base Junicode-SmExp "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-sc-lgr Junicode-SmExp "AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont" <[jncd_alnhow.enc <Junicode-SmExp.pfb
Junicode-SmExp-osf-ts1--base Junicode-SmExp "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmExp.pfb
+Junicode-SmExp-inf-ot1 Junicode-SmExp "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-SmExp.pfb
+Junicode-SmExp-inf-t1--base Junicode-SmExp "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-SmExp.pfb
+Junicode-SmExp-inf-ly1 Junicode-SmExp "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-SmExp.pfb
+Junicode-SmExp-inf-lgr Junicode-SmExp "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-SmExp.pfb
+Junicode-SmExp-lf-ot1 Junicode-SmExp "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-SmExp.pfb
+Junicode-SmExp-lf-t1--base Junicode-SmExp "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-SmExp.pfb
+Junicode-SmExp-lf-ly1 Junicode-SmExp "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-SmExp.pfb
+Junicode-SmExp-lf-lgr Junicode-SmExp "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmExp "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-SmExp.pfb
+Junicode-SmExp-lf-sc-lgr Junicode-SmExp "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-SmExp.pfb
+Junicode-SmExp-lf-ts1--base Junicode-SmExp "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmExp.pfb
+Junicode-SmExp-sup-ot1 Junicode-SmExp "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-SmExp.pfb
+Junicode-SmExp-sup-t1--base Junicode-SmExp "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-SmExp.pfb
+Junicode-SmExp-sup-ly1 Junicode-SmExp "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-SmExp.pfb
+Junicode-SmExp-sup-lgr Junicode-SmExp "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-ot1 Junicode-SmExp "AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont" <[jncd_tugio2.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-t1--base Junicode-SmExp "AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont" <[jncd_4vrfuq.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-ly1 Junicode-SmExp "AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont" <[jncd_y74d4a.enc <Junicode-SmExp.pfb
@@ -1558,10 +1575,6 @@ Junicode-SmExp-tosf-sc-t1--base Junicode-SmExp "AutoEnc_gktvs32iienhfw5kxnfiasu5
Junicode-SmExp-tosf-sc-ly1--base Junicode-SmExp "AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont" <[jncd_6mzsut.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-sc-lgr Junicode-SmExp "AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont" <[jncd_5nplrd.enc <Junicode-SmExp.pfb
Junicode-SmExp-tosf-ts1--base Junicode-SmExp "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-SmExp.pfb
-Junicode-SmExp-sup-ot1 Junicode-SmExp "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-SmExp.pfb
-Junicode-SmExp-sup-t1--base Junicode-SmExp "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-SmExp.pfb
-Junicode-SmExp-sup-ly1 Junicode-SmExp "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-SmExp.pfb
-Junicode-SmExp-sup-lgr Junicode-SmExp "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-ot1 Junicode-SmExp "AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont" <[jncd_atb2gm.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-t1--base Junicode-SmExp "AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont" <[jncd_dw56zz.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-ly1 Junicode-SmExp "AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont" <[jncd_qigq3r.enc <Junicode-SmExp.pfb
@@ -1571,19 +1584,6 @@ Junicode-SmExp-tlf-sc-t1--base Junicode-SmExp "AutoEnc_jp6lmumstwyqqcqhhhfcdbp3k
Junicode-SmExp-tlf-sc-ly1--base Junicode-SmExp "AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont" <[jncd_r7dcdh.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-sc-lgr Junicode-SmExp "AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont" <[jncd_nqur7h.enc <Junicode-SmExp.pfb
Junicode-SmExp-tlf-ts1--base Junicode-SmExp "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-SmExp.pfb
-Junicode-SmExp-inf-ot1 Junicode-SmExp "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-SmExp.pfb
-Junicode-SmExp-inf-t1--base Junicode-SmExp "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-SmExp.pfb
-Junicode-SmExp-inf-ly1 Junicode-SmExp "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-SmExp.pfb
-Junicode-SmExp-inf-lgr Junicode-SmExp "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-SmExp.pfb
-Junicode-SmExp-lf-ot1 Junicode-SmExp "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-SmExp.pfb
-Junicode-SmExp-lf-t1--base Junicode-SmExp "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-SmExp.pfb
-Junicode-SmExp-lf-ly1 Junicode-SmExp "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-SmExp.pfb
-Junicode-SmExp-lf-lgr Junicode-SmExp "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmExp "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-SmExp.pfb
-Junicode-SmExp-lf-sc-lgr Junicode-SmExp "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-SmExp.pfb
-Junicode-SmExp-lf-ts1--base Junicode-SmExp "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmExp.pfb
Junicode-SmExpSmBoldItalic-osf-ot1 Junicode-SmExpSmBoldItalic "AutoEnc_wusj3dovxz6g662phxe2hbnlgf ReEncodeFont" <[jncd_wusj3d.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-t1--base Junicode-SmExpSmBoldItalic "AutoEnc_fjcuysocgz2yaptdavib26uxsa ReEncodeFont" <[jncd_fjcuys.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-ly1 Junicode-SmExpSmBoldItalic "AutoEnc_dbackhi6pvphoypq66ehc33d3f ReEncodeFont" <[jncd_dbackh.enc <Junicode-SmExpSmBoldItalic.pfb
@@ -1593,6 +1593,23 @@ Junicode-SmExpSmBoldItalic-osf-sc-t1--base Junicode-SmExpSmBoldItalic "AutoEnc_n
Junicode-SmExpSmBoldItalic-osf-sc-ly1--base Junicode-SmExpSmBoldItalic "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-sc-lgr Junicode-SmExpSmBoldItalic "AutoEnc_vai6ks3cv4tazwhjlqpiw7prze ReEncodeFont" <[jncd_vai6ks.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-osf-ts1--base Junicode-SmExpSmBoldItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-inf-ly1 Junicode-SmExpSmBoldItalic "AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont" <[jncd_t7d4ag.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-inf-lgr Junicode-SmExpSmBoldItalic "AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont" <[jncd_ifhpre.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-ot1 Junicode-SmExpSmBoldItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-t1--base Junicode-SmExpSmBoldItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-ly1 Junicode-SmExpSmBoldItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-lgr Junicode-SmExpSmBoldItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmExpSmBoldItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-sc-lgr Junicode-SmExpSmBoldItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-lf-ts1--base Junicode-SmExpSmBoldItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.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-sup-ly1 Junicode-SmExpSmBoldItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-SmExpSmBoldItalic.pfb
+Junicode-SmExpSmBoldItalic-sup-lgr Junicode-SmExpSmBoldItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-ot1 Junicode-SmExpSmBoldItalic "AutoEnc_sa5d626bmdnz7pskrtlomjwjsa ReEncodeFont" <[jncd_sa5d62.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-t1--base Junicode-SmExpSmBoldItalic "AutoEnc_4vsefkumzmh2bzpyordblncs3f ReEncodeFont" <[jncd_4vsefk.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-ly1 Junicode-SmExpSmBoldItalic "AutoEnc_2j6fawkcx54mvxw3mssjbzqp3g ReEncodeFont" <[jncd_2j6faw.enc <Junicode-SmExpSmBoldItalic.pfb
@@ -1602,10 +1619,6 @@ Junicode-SmExpSmBoldItalic-tosf-sc-t1--base Junicode-SmExpSmBoldItalic "AutoEnc_
Junicode-SmExpSmBoldItalic-tosf-sc-ly1--base Junicode-SmExpSmBoldItalic "AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont" <[jncd_6mzsut.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-sc-lgr Junicode-SmExpSmBoldItalic "AutoEnc_uqxpwnxkkdkb7fzfgkpleiazhf ReEncodeFont" <[jncd_uqxpwn.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tosf-ts1--base Junicode-SmExpSmBoldItalic "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.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-sup-ly1 Junicode-SmExpSmBoldItalic "AutoEnc_c4gqgpgh6wa6yjzh62v7jmdrrg ReEncodeFont" <[jncd_c4gqgp.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-sup-lgr Junicode-SmExpSmBoldItalic "AutoEnc_yql4fvvd5uqhbltdmpnsifcmxb ReEncodeFont" <[jncd_yql4fv.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-ot1 Junicode-SmExpSmBoldItalic "AutoEnc_tbdiwje4bw76f7vvgcrib5fzae ReEncodeFont" <[jncd_tbdiwj.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-t1--base Junicode-SmExpSmBoldItalic "AutoEnc_m67s2q2if7mnc2weihu36ssjlc ReEncodeFont" <[jncd_m67s2q.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-ly1 Junicode-SmExpSmBoldItalic "AutoEnc_qrjy3ofpciutx5lfus5irfzcwg ReEncodeFont" <[jncd_qrjy3o.enc <Junicode-SmExpSmBoldItalic.pfb
@@ -1615,19 +1628,6 @@ Junicode-SmExpSmBoldItalic-tlf-sc-t1--base Junicode-SmExpSmBoldItalic "AutoEnc_z
Junicode-SmExpSmBoldItalic-tlf-sc-ly1--base Junicode-SmExpSmBoldItalic "AutoEnc_wkwe3q7wlan5ofn6n7ibrb2dfd ReEncodeFont" <[jncd_wkwe3q.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-sc-lgr Junicode-SmExpSmBoldItalic "AutoEnc_la6rhca2nfyga6ki2ylwvzngdc ReEncodeFont" <[jncd_la6rhc.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBoldItalic-tlf-ts1--base Junicode-SmExpSmBoldItalic "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.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-inf-ly1 Junicode-SmExpSmBoldItalic "AutoEnc_t7d4agwowidxbbzcqecpxwmpgf ReEncodeFont" <[jncd_t7d4ag.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-inf-lgr Junicode-SmExpSmBoldItalic "AutoEnc_ifhpre5ohw56txqybr4lbhkfeh ReEncodeFont" <[jncd_ifhpre.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-ot1 Junicode-SmExpSmBoldItalic "AutoEnc_5g5vl7nvthtqqrvsz3tzsq5ppe ReEncodeFont" <[jncd_5g5vl7.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-t1--base Junicode-SmExpSmBoldItalic "AutoEnc_dxxiiybxnhhlouauw3rlqxo33d ReEncodeFont" <[jncd_dxxiiy.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-ly1 Junicode-SmExpSmBoldItalic "AutoEnc_2eszu7a6f5pihgy63ufa3oo53g ReEncodeFont" <[jncd_2eszu7.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-lgr Junicode-SmExpSmBoldItalic "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmExpSmBoldItalic "AutoEnc_2hbdle6scqqvwquik2mloewhha ReEncodeFont" <[jncd_2hbdle.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-sc-lgr Junicode-SmExpSmBoldItalic "AutoEnc_d7xkyr425wbffbcqjppsmxikcg ReEncodeFont" <[jncd_d7xkyr.enc <Junicode-SmExpSmBoldItalic.pfb
-Junicode-SmExpSmBoldItalic-lf-ts1--base Junicode-SmExpSmBoldItalic "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmExpSmBoldItalic.pfb
Junicode-SmExpSmBold-osf-ot1 Junicode-SmExpSmBold "AutoEnc_dydq3dq35yi5oslvq2t467lexf ReEncodeFont" <[jncd_dydq3d.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-t1--base Junicode-SmExpSmBold "AutoEnc_hwfs67fezbrr67nl7f7pwq6fib ReEncodeFont" <[jncd_hwfs67.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-ly1 Junicode-SmExpSmBold "AutoEnc_535mcmkatc3k7okg5zkd62wnwd ReEncodeFont" <[jncd_535mcm.enc <Junicode-SmExpSmBold.pfb
@@ -1637,6 +1637,23 @@ Junicode-SmExpSmBold-osf-sc-t1--base Junicode-SmExpSmBold "AutoEnc_nghkwvud4qcjb
Junicode-SmExpSmBold-osf-sc-ly1--base Junicode-SmExpSmBold "AutoEnc_y2gbotzqwkqzz56xfakanbnmfa ReEncodeFont" <[jncd_y2gbot.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-sc-lgr Junicode-SmExpSmBold "AutoEnc_alnhow5k56mgx4u4busf2jq7oc ReEncodeFont" <[jncd_alnhow.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-osf-ts1--base Junicode-SmExpSmBold "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-inf-ot1 Junicode-SmExpSmBold "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-inf-t1--base Junicode-SmExpSmBold "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-inf-ly1 Junicode-SmExpSmBold "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-inf-lgr Junicode-SmExpSmBold "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-lf-ot1 Junicode-SmExpSmBold "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-lf-t1--base Junicode-SmExpSmBold "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-lf-ly1 Junicode-SmExpSmBold "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-lf-lgr Junicode-SmExpSmBold "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmExpSmBold "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-lf-sc-lgr Junicode-SmExpSmBold "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-lf-ts1--base Junicode-SmExpSmBold "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-sup-ot1 Junicode-SmExpSmBold "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-sup-t1--base Junicode-SmExpSmBold "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-sup-ly1 Junicode-SmExpSmBold "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-SmExpSmBold.pfb
+Junicode-SmExpSmBold-sup-lgr Junicode-SmExpSmBold "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-ot1 Junicode-SmExpSmBold "AutoEnc_tugio2zn7n7qj7dokwog42wabb ReEncodeFont" <[jncd_tugio2.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-t1--base Junicode-SmExpSmBold "AutoEnc_4vrfuqoxaft5izbfyxb5iox3ih ReEncodeFont" <[jncd_4vrfuq.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-ly1 Junicode-SmExpSmBold "AutoEnc_y74d4a4koxcokubnvx36iwf23d ReEncodeFont" <[jncd_y74d4a.enc <Junicode-SmExpSmBold.pfb
@@ -1646,10 +1663,6 @@ Junicode-SmExpSmBold-tosf-sc-t1--base Junicode-SmExpSmBold "AutoEnc_gktvs32iienh
Junicode-SmExpSmBold-tosf-sc-ly1--base Junicode-SmExpSmBold "AutoEnc_6mzsut43zqq4lwldjh3irqozvg ReEncodeFont" <[jncd_6mzsut.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-sc-lgr Junicode-SmExpSmBold "AutoEnc_5nplrdzykufffahiv5w7fphj6g ReEncodeFont" <[jncd_5nplrd.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tosf-ts1--base Junicode-SmExpSmBold "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-sup-ot1 Junicode-SmExpSmBold "AutoEnc_ilb24pr2hmz3ktady5tx53tvrc ReEncodeFont" <[jncd_ilb24p.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-sup-t1--base Junicode-SmExpSmBold "AutoEnc_7lzoymb2wet4ejapw73pluelih ReEncodeFont" <[jncd_7lzoym.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-sup-ly1 Junicode-SmExpSmBold "AutoEnc_soeko72tkqp5mq3cwi6dbzftwa ReEncodeFont" <[jncd_soeko7.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-sup-lgr Junicode-SmExpSmBold "AutoEnc_wwi77p5o5xmphvqrokewxarg5b ReEncodeFont" <[jncd_wwi77p.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-ot1 Junicode-SmExpSmBold "AutoEnc_atb2gmtmls5nswm6yzyxijpwia ReEncodeFont" <[jncd_atb2gm.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-t1--base Junicode-SmExpSmBold "AutoEnc_dw56zz725rfgkmlvojqz6v7lva ReEncodeFont" <[jncd_dw56zz.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-ly1 Junicode-SmExpSmBold "AutoEnc_qigq3r6kkeutdpom7fe2yym7ee ReEncodeFont" <[jncd_qigq3r.enc <Junicode-SmExpSmBold.pfb
@@ -1659,16 +1672,3 @@ Junicode-SmExpSmBold-tlf-sc-t1--base Junicode-SmExpSmBold "AutoEnc_jp6lmumstwyqq
Junicode-SmExpSmBold-tlf-sc-ly1--base Junicode-SmExpSmBold "AutoEnc_r7dcdhm7xkinky6eor3s5jxzrh ReEncodeFont" <[jncd_r7dcdh.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-sc-lgr Junicode-SmExpSmBold "AutoEnc_nqur7hhhb3sgu3ynn56adiqzvg ReEncodeFont" <[jncd_nqur7h.enc <Junicode-SmExpSmBold.pfb
Junicode-SmExpSmBold-tlf-ts1--base Junicode-SmExpSmBold "AutoEnc_vv455d2uhxryhqknbxnoewzika ReEncodeFont" <[jncd_vv455d.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-inf-ot1 Junicode-SmExpSmBold "AutoEnc_ldcvmrfllg5ebu6xfrdp3ppfeg ReEncodeFont" <[jncd_ldcvmr.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-inf-t1--base Junicode-SmExpSmBold "AutoEnc_ncilqga2wq6gokxg37hztx5vhd ReEncodeFont" <[jncd_ncilqg.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-inf-ly1 Junicode-SmExpSmBold "AutoEnc_wydlopw4j4qfjfidf6b7dnxkhd ReEncodeFont" <[jncd_wydlop.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-inf-lgr Junicode-SmExpSmBold "AutoEnc_qs7fbx5isogj6aotrzbcf2fatf ReEncodeFont" <[jncd_qs7fbx.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-lf-ot1 Junicode-SmExpSmBold "AutoEnc_u6d4hmbwchomr7a5qjuvyb4jge ReEncodeFont" <[jncd_u6d4hm.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-lf-t1--base Junicode-SmExpSmBold "AutoEnc_2qiiapqo34donbs3yqnbk2nv3e ReEncodeFont" <[jncd_2qiiap.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-lf-ly1 Junicode-SmExpSmBold "AutoEnc_yur7kbdpi53abvssphlvppb5vc ReEncodeFont" <[jncd_yur7kb.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-lf-lgr Junicode-SmExpSmBold "AutoEnc_eb524t77jhbble6z2w2zqzjzwb ReEncodeFont" <[jncd_eb524t.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-sc-ly1--base Junicode-SmExpSmBold "AutoEnc_fhg7wqte3kwubg7ztq7czxibmb ReEncodeFont" <[jncd_fhg7wq.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-lf-sc-lgr Junicode-SmExpSmBold "AutoEnc_sct77mjyojz7cxoff2fnlhe6dh ReEncodeFont" <[jncd_sct77m.enc <Junicode-SmExpSmBold.pfb
-Junicode-SmExpSmBold-lf-ts1--base Junicode-SmExpSmBold "AutoEnc_rx5biu5iitvjafup5ep7azzwqd ReEncodeFont" <[jncd_rx5biu.enc <Junicode-SmExpSmBold.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map b/Master/texmf-dist/fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map
new file mode 100644
index 00000000000..1c0ecf615b3
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvips/mfb-oldstyle/MFBOldstyle.map
@@ -0,0 +1,106 @@
+% Automatically maintained by otftotfm or other programs. Do not edit.
+
+MFBOldstyle-Regular-numr-ot1 MFBOldstyle-Regular "AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont" <[a_e5y2zy.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-ly1--base MFBOldstyle-Regular "AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont" <[a_y57hi6.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-t1--base MFBOldstyle-Regular "AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont" <[a_wvbwpg.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-t5--base MFBOldstyle-Regular "AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont" <[a_cgi3xl.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ot1 MFBOldstyle-Regular "AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont" <[a_cwrjrk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ly1--base MFBOldstyle-Regular "AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont" <[a_rxfd27.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-t1--base MFBOldstyle-Regular "AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont" <[a_73nks5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-t5--base MFBOldstyle-Regular "AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont" <[a_oyw33c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-ot1--base MFBOldstyle-Regular "AutoEnc_radqz3tuq35ucoeetjpj4dtaoe ReEncodeFont" <[a_radqz3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-ly1--base MFBOldstyle-Regular "AutoEnc_ahcimng7tjjvztjdn3tsyh2jwf ReEncodeFont" <[a_ahcimn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-t1--base MFBOldstyle-Regular "AutoEnc_s7hq7555ku6wpqltvtwpifv4nh ReEncodeFont" <[a_s7hq75.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-t5--base MFBOldstyle-Regular "AutoEnc_nrcrlbklwnd2ct5bgdechurqqb ReEncodeFont" <[a_nrcrlb.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ts1--base MFBOldstyle-Regular "AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont" <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ot1 MFBOldstyle-Regular "AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont" <[a_hi6bgi.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ly1--base MFBOldstyle-Regular "AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont" <[a_2k4lec.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-t1--base MFBOldstyle-Regular "AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont" <[a_uyp43f.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-t5--base MFBOldstyle-Regular "AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont" <[a_traljt.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-ot1--base MFBOldstyle-Regular "AutoEnc_qmdrbau3qho7wzvgdp4updvdxd ReEncodeFont" <[a_qmdrba.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-ly1--base MFBOldstyle-Regular "AutoEnc_sbbrr6nlw2mftfr36dqzfbpjfa ReEncodeFont" <[a_sbbrr6.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-t1--base MFBOldstyle-Regular "AutoEnc_kod5rhatuhycv25ljuqjpdknae ReEncodeFont" <[a_kod5rh.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-t5--base MFBOldstyle-Regular "AutoEnc_2r5ytu4o4u4xqkb7tlgy7zwnva ReEncodeFont" <[a_2r5ytu.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ts1--base MFBOldstyle-Regular "AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont" <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ot1 MFBOldstyle-Regular "AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont" <[a_cwrjrk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ly1--base MFBOldstyle-Regular "AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont" <[a_rxfd27.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-t1--base MFBOldstyle-Regular "AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont" <[a_73nks5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-t5--base MFBOldstyle-Regular "AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont" <[a_oyw33c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-ot1--base MFBOldstyle-Regular "AutoEnc_radqz3tuq35ucoeetjpj4dtaoe ReEncodeFont" <[a_radqz3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-ly1--base MFBOldstyle-Regular "AutoEnc_ahcimng7tjjvztjdn3tsyh2jwf ReEncodeFont" <[a_ahcimn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-t1--base MFBOldstyle-Regular "AutoEnc_s7hq7555ku6wpqltvtwpifv4nh ReEncodeFont" <[a_s7hq75.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-t5--base MFBOldstyle-Regular "AutoEnc_nrcrlbklwnd2ct5bgdechurqqb ReEncodeFont" <[a_nrcrlb.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ts1--base MFBOldstyle-Regular "AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont" <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ot1 MFBOldstyle-Regular "AutoEnc_kosxnnoffdfmoxhhu6p5o7mihd ReEncodeFont" <[a_kosxnn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ly1--base MFBOldstyle-Regular "AutoEnc_7nlkbe5nk6t5wmyizyclpmezcf ReEncodeFont" <[a_7nlkbe.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-t1--base MFBOldstyle-Regular "AutoEnc_xqrvjhmrxuhmdm554es7oy5vhe ReEncodeFont" <[a_xqrvjh.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-t5--base MFBOldstyle-Regular "AutoEnc_y2ngdewhza2rnatva56dgdk7od ReEncodeFont" <[a_y2ngde.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-ot1--base MFBOldstyle-Regular "AutoEnc_6mghgo6i4fo2zwcclkxw55uy4b ReEncodeFont" <[a_6mghgo.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-ly1--base MFBOldstyle-Regular "AutoEnc_fy4cgkjk47io5vdxcmrl3tmq4d ReEncodeFont" <[a_fy4cgk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-t1--base MFBOldstyle-Regular "AutoEnc_ztec7xsyrpjk3i77hncyph2ksb ReEncodeFont" <[a_ztec7x.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-t5--base MFBOldstyle-Regular "AutoEnc_ikcbofmmzjk2yaxfbmq4w4tfcd ReEncodeFont" <[a_ikcbof.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ts1--base MFBOldstyle-Regular "AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont" <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-ot1 MFBOldstyle-Regular "AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont" <[a_bgdhbr.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-ly1--base MFBOldstyle-Regular "AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont" <[a_x5sf3h.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-t1--base MFBOldstyle-Regular "AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont" <[a_ybcvk5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-t5--base MFBOldstyle-Regular "AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont" <[a_7q6l4s.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-ot1 MFBOldstyle-Regular "AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont" <[a_xkajg4.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-ly1--base MFBOldstyle-Regular "AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont" <[a_q4fonx.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-t1--base MFBOldstyle-Regular "AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont" <[a_jaulpu.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-t5--base MFBOldstyle-Regular "AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont" <[a_yjlipp.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-ot1 MFBOldstyle-Regular "AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont" <[a_in623c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-ly1--base MFBOldstyle-Regular "AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont" <[a_nduqlz.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-t1--base MFBOldstyle-Regular "AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont" <[a_xx37di.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-t5--base MFBOldstyle-Regular "AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont" <[a_777sfz.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Bold-numr-ot1 MFBOldstyle-Bold "AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont" <[a_e5y2zy.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-ly1--base MFBOldstyle-Bold "AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont" <[a_y57hi6.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-t1--base MFBOldstyle-Bold "AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont" <[a_wvbwpg.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-t5--base MFBOldstyle-Bold "AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont" <[a_cgi3xl.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ot1 MFBOldstyle-Bold "AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont" <[a_hi6bgi.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ly1--base MFBOldstyle-Bold "AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont" <[a_2k4lec.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-t1--base MFBOldstyle-Bold "AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont" <[a_uyp43f.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-t5--base MFBOldstyle-Bold "AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont" <[a_traljt.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ts1--base MFBOldstyle-Bold "AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont" <[a_5lrov3.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ot1 MFBOldstyle-Bold "AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont" <[a_cwrjrk.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ly1--base MFBOldstyle-Bold "AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont" <[a_rxfd27.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-t1--base MFBOldstyle-Bold "AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont" <[a_73nks5.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-t5--base MFBOldstyle-Bold "AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont" <[a_oyw33c.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ts1--base MFBOldstyle-Bold "AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont" <[a_5lrov3.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-ot1 MFBOldstyle-Bold "AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont" <[a_bgdhbr.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-ly1--base MFBOldstyle-Bold "AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont" <[a_x5sf3h.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-t1--base MFBOldstyle-Bold "AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont" <[a_ybcvk5.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-t5--base MFBOldstyle-Bold "AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont" <[a_7q6l4s.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-ot1 MFBOldstyle-Bold "AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont" <[a_xkajg4.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-ly1--base MFBOldstyle-Bold "AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont" <[a_q4fonx.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-t1--base MFBOldstyle-Bold "AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont" <[a_jaulpu.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-t5--base MFBOldstyle-Bold "AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont" <[a_yjlipp.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-ot1 MFBOldstyle-Bold "AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont" <[a_in623c.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-ly1--base MFBOldstyle-Bold "AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont" <[a_nduqlz.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-t1--base MFBOldstyle-Bold "AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont" <[a_xx37di.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-t5--base MFBOldstyle-Bold "AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont" <[a_777sfz.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Italic-numr-ot1 MFBOldstyle-Italic "AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont" <[a_e5y2zy.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-ly1--base MFBOldstyle-Italic "AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont" <[a_y57hi6.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-t1--base MFBOldstyle-Italic "AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont" <[a_wvbwpg.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-t5--base MFBOldstyle-Italic "AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont" <[a_cgi3xl.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ot1 MFBOldstyle-Italic "AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont" <[a_hi6bgi.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ly1--base MFBOldstyle-Italic "AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont" <[a_2k4lec.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-t1--base MFBOldstyle-Italic "AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont" <[a_uyp43f.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-t5--base MFBOldstyle-Italic "AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont" <[a_traljt.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ts1--base MFBOldstyle-Italic "AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont" <[a_5lrov3.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ot1 MFBOldstyle-Italic "AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont" <[a_cwrjrk.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ly1--base MFBOldstyle-Italic "AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont" <[a_rxfd27.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-t1--base MFBOldstyle-Italic "AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont" <[a_73nks5.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-t5--base MFBOldstyle-Italic "AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont" <[a_oyw33c.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ts1--base MFBOldstyle-Italic "AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont" <[a_5lrov3.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-ot1 MFBOldstyle-Italic "AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont" <[a_bgdhbr.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-ly1--base MFBOldstyle-Italic "AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont" <[a_x5sf3h.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-t1--base MFBOldstyle-Italic "AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont" <[a_ybcvk5.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-t5--base MFBOldstyle-Italic "AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont" <[a_7q6l4s.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-ot1 MFBOldstyle-Italic "AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont" <[a_xkajg4.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-ly1--base MFBOldstyle-Italic "AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont" <[a_q4fonx.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-t1--base MFBOldstyle-Italic "AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont" <[a_jaulpu.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-t5--base MFBOldstyle-Italic "AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont" <[a_yjlipp.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-ot1 MFBOldstyle-Italic "AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont" <[a_in623c.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-ly1--base MFBOldstyle-Italic "AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont" <[a_nduqlz.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-t1--base MFBOldstyle-Italic "AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont" <[a_xx37di.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-t5--base MFBOldstyle-Italic "AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont" <[a_777sfz.enc <MFBOldstyle-Italic.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/niceframe-type1/niceframe.map b/Master/texmf-dist/fonts/map/dvips/niceframe-type1/niceframe.map
index dba36b1b170..5ad17c38ff8 100644
--- a/Master/texmf-dist/fonts/map/dvips/niceframe-type1/niceframe.map
+++ b/Master/texmf-dist/fonts/map/dvips/niceframe-type1/niceframe.map
@@ -2,4 +2,4 @@ umranda umranda <umranda.pfb
umrandb umrandb <umrandb.pfb
dingbat dingbat <dingbat.pfb
karta15 karta15 <karta15.pfb
-bbding10 bbding10 <bbding10.pfb
+bbding10 bbding <bbding10.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/updmap/ps2pk.map b/Master/texmf-dist/fonts/map/dvips/updmap/ps2pk.map
index 50a1f659474..176233908d6 100644
--- a/Master/texmf-dist/fonts/map/dvips/updmap/ps2pk.map
+++ b/Master/texmf-dist/fonts/map/dvips/updmap/ps2pk.map
@@ -13710,6 +13710,111 @@ Lbstr-Regular-lf-ot1--lcdfj Lbstr-RegularLCDFJ " " <Lbstr-RegularLCDFJ.pfb
Lbstr-Regular-lf-t1--base Lbstr-Regular " AutoEnc_2rydtxan5zvryhkciglaoeolte ReEncodeFont " <[lbstr_2rydtx.enc <Lbstr-Regular.pfb
Lbstr-Regular-lf-t1--lcdfj Lbstr-RegularLCDFJ " " <Lbstr-RegularLCDFJ.pfb
Lbstr-Regular-lf-ts1--base Lbstr-Regular " AutoEnc_t7yaonlyowlpa3ms34zhn2lipa ReEncodeFont " <[lbstr_t7yaon.enc <Lbstr-Regular.pfb
+% MFBOldstyle.map
+MFBOldstyle-Bold-dnom-ly1--base MFBOldstyle-Bold " AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont " <[a_q4fonx.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-ot1 MFBOldstyle-Bold " AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont " <[a_xkajg4.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-t1--base MFBOldstyle-Bold " AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont " <[a_jaulpu.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-t5--base MFBOldstyle-Bold " AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont " <[a_yjlipp.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-ly1--base MFBOldstyle-Bold " AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont " <[a_x5sf3h.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-ot1 MFBOldstyle-Bold " AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont " <[a_bgdhbr.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-t1--base MFBOldstyle-Bold " AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont " <[a_ybcvk5.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-t5--base MFBOldstyle-Bold " AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont " <[a_7q6l4s.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ly1--base MFBOldstyle-Bold " AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont " <[a_2k4lec.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ot1 MFBOldstyle-Bold " AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont " <[a_hi6bgi.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-t1--base MFBOldstyle-Bold " AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont " <[a_uyp43f.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-t5--base MFBOldstyle-Bold " AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont " <[a_traljt.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ts1--base MFBOldstyle-Bold " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-ly1--base MFBOldstyle-Bold " AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont " <[a_y57hi6.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-ot1 MFBOldstyle-Bold " AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont " <[a_e5y2zy.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-t1--base MFBOldstyle-Bold " AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont " <[a_wvbwpg.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-t5--base MFBOldstyle-Bold " AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont " <[a_cgi3xl.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-ly1--base MFBOldstyle-Bold " AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont " <[a_nduqlz.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-ot1 MFBOldstyle-Bold " AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont " <[a_in623c.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-t1--base MFBOldstyle-Bold " AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont " <[a_xx37di.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-t5--base MFBOldstyle-Bold " AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont " <[a_777sfz.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ly1--base MFBOldstyle-Bold " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ot1 MFBOldstyle-Bold " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-t1--base MFBOldstyle-Bold " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-t5--base MFBOldstyle-Bold " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ts1--base MFBOldstyle-Bold " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Italic-dnom-ly1--base MFBOldstyle-Italic " AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont " <[a_q4fonx.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-ot1 MFBOldstyle-Italic " AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont " <[a_xkajg4.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-t1--base MFBOldstyle-Italic " AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont " <[a_jaulpu.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-t5--base MFBOldstyle-Italic " AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont " <[a_yjlipp.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-ly1--base MFBOldstyle-Italic " AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont " <[a_x5sf3h.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-ot1 MFBOldstyle-Italic " AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont " <[a_bgdhbr.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-t1--base MFBOldstyle-Italic " AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont " <[a_ybcvk5.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-t5--base MFBOldstyle-Italic " AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont " <[a_7q6l4s.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ly1--base MFBOldstyle-Italic " AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont " <[a_2k4lec.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ot1 MFBOldstyle-Italic " AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont " <[a_hi6bgi.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-t1--base MFBOldstyle-Italic " AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont " <[a_uyp43f.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-t5--base MFBOldstyle-Italic " AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont " <[a_traljt.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ts1--base MFBOldstyle-Italic " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-ly1--base MFBOldstyle-Italic " AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont " <[a_y57hi6.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-ot1 MFBOldstyle-Italic " AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont " <[a_e5y2zy.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-t1--base MFBOldstyle-Italic " AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont " <[a_wvbwpg.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-t5--base MFBOldstyle-Italic " AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont " <[a_cgi3xl.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-ly1--base MFBOldstyle-Italic " AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont " <[a_nduqlz.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-ot1 MFBOldstyle-Italic " AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont " <[a_in623c.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-t1--base MFBOldstyle-Italic " AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont " <[a_xx37di.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-t5--base MFBOldstyle-Italic " AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont " <[a_777sfz.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ly1--base MFBOldstyle-Italic " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ot1 MFBOldstyle-Italic " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-t1--base MFBOldstyle-Italic " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-t5--base MFBOldstyle-Italic " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ts1--base MFBOldstyle-Italic " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Regular-dnom-ly1--base MFBOldstyle-Regular " AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont " <[a_q4fonx.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-ot1 MFBOldstyle-Regular " AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont " <[a_xkajg4.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-t1--base MFBOldstyle-Regular " AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont " <[a_jaulpu.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-t5--base MFBOldstyle-Regular " AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont " <[a_yjlipp.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-ly1--base MFBOldstyle-Regular " AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont " <[a_x5sf3h.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-ot1 MFBOldstyle-Regular " AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont " <[a_bgdhbr.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-t1--base MFBOldstyle-Regular " AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont " <[a_ybcvk5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-t5--base MFBOldstyle-Regular " AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont " <[a_7q6l4s.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ly1--base MFBOldstyle-Regular " AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont " <[a_2k4lec.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ot1 MFBOldstyle-Regular " AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont " <[a_hi6bgi.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_sbbrr6nlw2mftfr36dqzfbpjfa ReEncodeFont " <[a_sbbrr6.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_qmdrbau3qho7wzvgdp4updvdxd ReEncodeFont " <[a_qmdrba.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-t1--base MFBOldstyle-Regular " AutoEnc_kod5rhatuhycv25ljuqjpdknae ReEncodeFont " <[a_kod5rh.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-t5--base MFBOldstyle-Regular " AutoEnc_2r5ytu4o4u4xqkb7tlgy7zwnva ReEncodeFont " <[a_2r5ytu.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-t1--base MFBOldstyle-Regular " AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont " <[a_uyp43f.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-t5--base MFBOldstyle-Regular " AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont " <[a_traljt.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-ly1--base MFBOldstyle-Regular " AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont " <[a_y57hi6.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-ot1 MFBOldstyle-Regular " AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont " <[a_e5y2zy.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-t1--base MFBOldstyle-Regular " AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont " <[a_wvbwpg.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-t5--base MFBOldstyle-Regular " AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont " <[a_cgi3xl.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ly1--base MFBOldstyle-Regular " AutoEnc_7nlkbe5nk6t5wmyizyclpmezcf ReEncodeFont " <[a_7nlkbe.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ot1 MFBOldstyle-Regular " AutoEnc_kosxnnoffdfmoxhhu6p5o7mihd ReEncodeFont " <[a_kosxnn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_fy4cgkjk47io5vdxcmrl3tmq4d ReEncodeFont " <[a_fy4cgk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_6mghgo6i4fo2zwcclkxw55uy4b ReEncodeFont " <[a_6mghgo.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-t1--base MFBOldstyle-Regular " AutoEnc_ztec7xsyrpjk3i77hncyph2ksb ReEncodeFont " <[a_ztec7x.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-t5--base MFBOldstyle-Regular " AutoEnc_ikcbofmmzjk2yaxfbmq4w4tfcd ReEncodeFont " <[a_ikcbof.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-t1--base MFBOldstyle-Regular " AutoEnc_xqrvjhmrxuhmdm554es7oy5vhe ReEncodeFont " <[a_xqrvjh.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-t5--base MFBOldstyle-Regular " AutoEnc_y2ngdewhza2rnatva56dgdk7od ReEncodeFont " <[a_y2ngde.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-ly1--base MFBOldstyle-Regular " AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont " <[a_nduqlz.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-ot1 MFBOldstyle-Regular " AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont " <[a_in623c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-t1--base MFBOldstyle-Regular " AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont " <[a_xx37di.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-t5--base MFBOldstyle-Regular " AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont " <[a_777sfz.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ly1--base MFBOldstyle-Regular " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ot1 MFBOldstyle-Regular " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_ahcimng7tjjvztjdn3tsyh2jwf ReEncodeFont " <[a_ahcimn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_radqz3tuq35ucoeetjpj4dtaoe ReEncodeFont " <[a_radqz3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-t1--base MFBOldstyle-Regular " AutoEnc_s7hq7555ku6wpqltvtwpifv4nh ReEncodeFont " <[a_s7hq75.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-t5--base MFBOldstyle-Regular " AutoEnc_nrcrlbklwnd2ct5bgdechurqqb ReEncodeFont " <[a_nrcrlb.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-t1--base MFBOldstyle-Regular " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-t5--base MFBOldstyle-Regular " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ly1--base MFBOldstyle-Regular " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ot1 MFBOldstyle-Regular " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_ahcimng7tjjvztjdn3tsyh2jwf ReEncodeFont " <[a_ahcimn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_radqz3tuq35ucoeetjpj4dtaoe ReEncodeFont " <[a_radqz3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-t1--base MFBOldstyle-Regular " AutoEnc_s7hq7555ku6wpqltvtwpifv4nh ReEncodeFont " <[a_s7hq75.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-t5--base MFBOldstyle-Regular " AutoEnc_nrcrlbklwnd2ct5bgdechurqqb ReEncodeFont " <[a_nrcrlb.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-t1--base MFBOldstyle-Regular " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-t5--base MFBOldstyle-Regular " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
% Magra.map
Magra-Bold-tlf-ly1--base Magra-Bold " AutoEnc_jqnft226aq65e6b7bxb7ls5dse ReEncodeFont " <[a_jqnft2.enc <Magra-Bold.pfb
Magra-Bold-tlf-ot1 Magra-Bold " AutoEnc_dip3eq74jkh4yw4fsunpbvmjqc ReEncodeFont " <[a_dip3eq.enc <Magra-Bold.pfb
@@ -33508,7 +33613,7 @@ rnorasi_o-osf Norasi-Oblique " LTHEncoding ReEncodeFont " <lthtlwg-osf.enc <nora
rnorasi_o-osf-sc Norasi-Oblique " LTHEncoding ReEncodeFont " <lthtlwg-osf-sc.enc <norasi_o.pfb
rnorasi_o-sc Norasi-Oblique " LTHEncoding ReEncodeFont " <lthtlwg-sc.enc <norasi_o.pfb
% niceframe.map
-bbding10 bbding10 <bbding10.pfb
+bbding10 bbding <bbding10.pfb
dingbat dingbat <dingbat.pfb
karta15 karta15 <karta15.pfb
umranda umranda <umranda.pfb
diff --git a/Master/texmf-dist/fonts/map/dvips/updmap/psfonts.map b/Master/texmf-dist/fonts/map/dvips/updmap/psfonts.map
index 0091f23bbc7..37e80a3e35d 100644
--- a/Master/texmf-dist/fonts/map/dvips/updmap/psfonts.map
+++ b/Master/texmf-dist/fonts/map/dvips/updmap/psfonts.map
@@ -13710,6 +13710,111 @@ Lbstr-Regular-lf-ot1--lcdfj Lbstr-RegularLCDFJ " " <Lbstr-RegularLCDFJ.pfb
Lbstr-Regular-lf-t1--base Lbstr-Regular " AutoEnc_2rydtxan5zvryhkciglaoeolte ReEncodeFont " <[lbstr_2rydtx.enc <Lbstr-Regular.pfb
Lbstr-Regular-lf-t1--lcdfj Lbstr-RegularLCDFJ " " <Lbstr-RegularLCDFJ.pfb
Lbstr-Regular-lf-ts1--base Lbstr-Regular " AutoEnc_t7yaonlyowlpa3ms34zhn2lipa ReEncodeFont " <[lbstr_t7yaon.enc <Lbstr-Regular.pfb
+% MFBOldstyle.map
+MFBOldstyle-Bold-dnom-ly1--base MFBOldstyle-Bold " AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont " <[a_q4fonx.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-ot1 MFBOldstyle-Bold " AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont " <[a_xkajg4.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-t1--base MFBOldstyle-Bold " AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont " <[a_jaulpu.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-t5--base MFBOldstyle-Bold " AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont " <[a_yjlipp.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-ly1--base MFBOldstyle-Bold " AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont " <[a_x5sf3h.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-ot1 MFBOldstyle-Bold " AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont " <[a_bgdhbr.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-t1--base MFBOldstyle-Bold " AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont " <[a_ybcvk5.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-t5--base MFBOldstyle-Bold " AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont " <[a_7q6l4s.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ly1--base MFBOldstyle-Bold " AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont " <[a_2k4lec.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ot1 MFBOldstyle-Bold " AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont " <[a_hi6bgi.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-t1--base MFBOldstyle-Bold " AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont " <[a_uyp43f.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-t5--base MFBOldstyle-Bold " AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont " <[a_traljt.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ts1--base MFBOldstyle-Bold " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-ly1--base MFBOldstyle-Bold " AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont " <[a_y57hi6.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-ot1 MFBOldstyle-Bold " AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont " <[a_e5y2zy.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-t1--base MFBOldstyle-Bold " AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont " <[a_wvbwpg.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-t5--base MFBOldstyle-Bold " AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont " <[a_cgi3xl.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-ly1--base MFBOldstyle-Bold " AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont " <[a_nduqlz.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-ot1 MFBOldstyle-Bold " AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont " <[a_in623c.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-t1--base MFBOldstyle-Bold " AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont " <[a_xx37di.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-t5--base MFBOldstyle-Bold " AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont " <[a_777sfz.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ly1--base MFBOldstyle-Bold " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ot1 MFBOldstyle-Bold " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-t1--base MFBOldstyle-Bold " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-t5--base MFBOldstyle-Bold " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ts1--base MFBOldstyle-Bold " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Italic-dnom-ly1--base MFBOldstyle-Italic " AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont " <[a_q4fonx.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-ot1 MFBOldstyle-Italic " AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont " <[a_xkajg4.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-t1--base MFBOldstyle-Italic " AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont " <[a_jaulpu.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-t5--base MFBOldstyle-Italic " AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont " <[a_yjlipp.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-ly1--base MFBOldstyle-Italic " AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont " <[a_x5sf3h.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-ot1 MFBOldstyle-Italic " AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont " <[a_bgdhbr.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-t1--base MFBOldstyle-Italic " AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont " <[a_ybcvk5.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-t5--base MFBOldstyle-Italic " AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont " <[a_7q6l4s.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ly1--base MFBOldstyle-Italic " AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont " <[a_2k4lec.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ot1 MFBOldstyle-Italic " AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont " <[a_hi6bgi.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-t1--base MFBOldstyle-Italic " AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont " <[a_uyp43f.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-t5--base MFBOldstyle-Italic " AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont " <[a_traljt.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ts1--base MFBOldstyle-Italic " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-ly1--base MFBOldstyle-Italic " AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont " <[a_y57hi6.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-ot1 MFBOldstyle-Italic " AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont " <[a_e5y2zy.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-t1--base MFBOldstyle-Italic " AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont " <[a_wvbwpg.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-t5--base MFBOldstyle-Italic " AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont " <[a_cgi3xl.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-ly1--base MFBOldstyle-Italic " AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont " <[a_nduqlz.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-ot1 MFBOldstyle-Italic " AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont " <[a_in623c.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-t1--base MFBOldstyle-Italic " AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont " <[a_xx37di.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-t5--base MFBOldstyle-Italic " AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont " <[a_777sfz.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ly1--base MFBOldstyle-Italic " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ot1 MFBOldstyle-Italic " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-t1--base MFBOldstyle-Italic " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-t5--base MFBOldstyle-Italic " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ts1--base MFBOldstyle-Italic " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Regular-dnom-ly1--base MFBOldstyle-Regular " AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont " <[a_q4fonx.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-ot1 MFBOldstyle-Regular " AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont " <[a_xkajg4.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-t1--base MFBOldstyle-Regular " AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont " <[a_jaulpu.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-t5--base MFBOldstyle-Regular " AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont " <[a_yjlipp.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-ly1--base MFBOldstyle-Regular " AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont " <[a_x5sf3h.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-ot1 MFBOldstyle-Regular " AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont " <[a_bgdhbr.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-t1--base MFBOldstyle-Regular " AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont " <[a_ybcvk5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-t5--base MFBOldstyle-Regular " AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont " <[a_7q6l4s.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ly1--base MFBOldstyle-Regular " AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont " <[a_2k4lec.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ot1 MFBOldstyle-Regular " AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont " <[a_hi6bgi.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_sbbrr6nlw2mftfr36dqzfbpjfa ReEncodeFont " <[a_sbbrr6.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_qmdrbau3qho7wzvgdp4updvdxd ReEncodeFont " <[a_qmdrba.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-t1--base MFBOldstyle-Regular " AutoEnc_kod5rhatuhycv25ljuqjpdknae ReEncodeFont " <[a_kod5rh.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-t5--base MFBOldstyle-Regular " AutoEnc_2r5ytu4o4u4xqkb7tlgy7zwnva ReEncodeFont " <[a_2r5ytu.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-t1--base MFBOldstyle-Regular " AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont " <[a_uyp43f.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-t5--base MFBOldstyle-Regular " AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont " <[a_traljt.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-ly1--base MFBOldstyle-Regular " AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont " <[a_y57hi6.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-ot1 MFBOldstyle-Regular " AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont " <[a_e5y2zy.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-t1--base MFBOldstyle-Regular " AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont " <[a_wvbwpg.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-t5--base MFBOldstyle-Regular " AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont " <[a_cgi3xl.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ly1--base MFBOldstyle-Regular " AutoEnc_7nlkbe5nk6t5wmyizyclpmezcf ReEncodeFont " <[a_7nlkbe.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ot1 MFBOldstyle-Regular " AutoEnc_kosxnnoffdfmoxhhu6p5o7mihd ReEncodeFont " <[a_kosxnn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_fy4cgkjk47io5vdxcmrl3tmq4d ReEncodeFont " <[a_fy4cgk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_6mghgo6i4fo2zwcclkxw55uy4b ReEncodeFont " <[a_6mghgo.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-t1--base MFBOldstyle-Regular " AutoEnc_ztec7xsyrpjk3i77hncyph2ksb ReEncodeFont " <[a_ztec7x.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-t5--base MFBOldstyle-Regular " AutoEnc_ikcbofmmzjk2yaxfbmq4w4tfcd ReEncodeFont " <[a_ikcbof.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-t1--base MFBOldstyle-Regular " AutoEnc_xqrvjhmrxuhmdm554es7oy5vhe ReEncodeFont " <[a_xqrvjh.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-t5--base MFBOldstyle-Regular " AutoEnc_y2ngdewhza2rnatva56dgdk7od ReEncodeFont " <[a_y2ngde.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-ly1--base MFBOldstyle-Regular " AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont " <[a_nduqlz.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-ot1 MFBOldstyle-Regular " AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont " <[a_in623c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-t1--base MFBOldstyle-Regular " AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont " <[a_xx37di.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-t5--base MFBOldstyle-Regular " AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont " <[a_777sfz.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ly1--base MFBOldstyle-Regular " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ot1 MFBOldstyle-Regular " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_ahcimng7tjjvztjdn3tsyh2jwf ReEncodeFont " <[a_ahcimn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_radqz3tuq35ucoeetjpj4dtaoe ReEncodeFont " <[a_radqz3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-t1--base MFBOldstyle-Regular " AutoEnc_s7hq7555ku6wpqltvtwpifv4nh ReEncodeFont " <[a_s7hq75.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-t5--base MFBOldstyle-Regular " AutoEnc_nrcrlbklwnd2ct5bgdechurqqb ReEncodeFont " <[a_nrcrlb.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-t1--base MFBOldstyle-Regular " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-t5--base MFBOldstyle-Regular " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ly1--base MFBOldstyle-Regular " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ot1 MFBOldstyle-Regular " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_ahcimng7tjjvztjdn3tsyh2jwf ReEncodeFont " <[a_ahcimn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_radqz3tuq35ucoeetjpj4dtaoe ReEncodeFont " <[a_radqz3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-t1--base MFBOldstyle-Regular " AutoEnc_s7hq7555ku6wpqltvtwpifv4nh ReEncodeFont " <[a_s7hq75.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-t5--base MFBOldstyle-Regular " AutoEnc_nrcrlbklwnd2ct5bgdechurqqb ReEncodeFont " <[a_nrcrlb.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-t1--base MFBOldstyle-Regular " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-t5--base MFBOldstyle-Regular " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
% Magra.map
Magra-Bold-tlf-ly1--base Magra-Bold " AutoEnc_jqnft226aq65e6b7bxb7ls5dse ReEncodeFont " <[a_jqnft2.enc <Magra-Bold.pfb
Magra-Bold-tlf-ot1 Magra-Bold " AutoEnc_dip3eq74jkh4yw4fsunpbvmjqc ReEncodeFont " <[a_dip3eq.enc <Magra-Bold.pfb
@@ -33508,7 +33613,7 @@ rnorasi_o-osf Norasi-Oblique " LTHEncoding ReEncodeFont " <lthtlwg-osf.enc <nora
rnorasi_o-osf-sc Norasi-Oblique " LTHEncoding ReEncodeFont " <lthtlwg-osf-sc.enc <norasi_o.pfb
rnorasi_o-sc Norasi-Oblique " LTHEncoding ReEncodeFont " <lthtlwg-sc.enc <norasi_o.pfb
% niceframe.map
-bbding10 bbding10 <bbding10.pfb
+bbding10 bbding <bbding10.pfb
dingbat dingbat <dingbat.pfb
karta15 karta15 <karta15.pfb
umranda umranda <umranda.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 827ffd57e3c..ce3b283b551 100644
--- a/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_pk.map
+++ b/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_pk.map
@@ -9165,6 +9165,111 @@ Lbstr-Regular-lf-ot1--lcdfj Lbstr-RegularLCDFJ " " <Lbstr-RegularLCDFJ.pfb
Lbstr-Regular-lf-t1--base Lbstr-Regular " AutoEnc_2rydtxan5zvryhkciglaoeolte ReEncodeFont " <[lbstr_2rydtx.enc <Lbstr-Regular.pfb
Lbstr-Regular-lf-t1--lcdfj Lbstr-RegularLCDFJ " " <Lbstr-RegularLCDFJ.pfb
Lbstr-Regular-lf-ts1--base Lbstr-Regular " AutoEnc_t7yaonlyowlpa3ms34zhn2lipa ReEncodeFont " <[lbstr_t7yaon.enc <Lbstr-Regular.pfb
+% MFBOldstyle.map
+MFBOldstyle-Bold-dnom-ly1--base MFBOldstyle-Bold " AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont " <[a_q4fonx.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-ot1 MFBOldstyle-Bold " AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont " <[a_xkajg4.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-t1--base MFBOldstyle-Bold " AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont " <[a_jaulpu.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-t5--base MFBOldstyle-Bold " AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont " <[a_yjlipp.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-ly1--base MFBOldstyle-Bold " AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont " <[a_x5sf3h.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-ot1 MFBOldstyle-Bold " AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont " <[a_bgdhbr.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-t1--base MFBOldstyle-Bold " AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont " <[a_ybcvk5.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-t5--base MFBOldstyle-Bold " AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont " <[a_7q6l4s.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ly1--base MFBOldstyle-Bold " AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont " <[a_2k4lec.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ot1 MFBOldstyle-Bold " AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont " <[a_hi6bgi.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-t1--base MFBOldstyle-Bold " AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont " <[a_uyp43f.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-t5--base MFBOldstyle-Bold " AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont " <[a_traljt.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ts1--base MFBOldstyle-Bold " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-ly1--base MFBOldstyle-Bold " AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont " <[a_y57hi6.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-ot1 MFBOldstyle-Bold " AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont " <[a_e5y2zy.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-t1--base MFBOldstyle-Bold " AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont " <[a_wvbwpg.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-t5--base MFBOldstyle-Bold " AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont " <[a_cgi3xl.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-ly1--base MFBOldstyle-Bold " AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont " <[a_nduqlz.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-ot1 MFBOldstyle-Bold " AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont " <[a_in623c.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-t1--base MFBOldstyle-Bold " AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont " <[a_xx37di.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-t5--base MFBOldstyle-Bold " AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont " <[a_777sfz.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ly1--base MFBOldstyle-Bold " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ot1 MFBOldstyle-Bold " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-t1--base MFBOldstyle-Bold " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-t5--base MFBOldstyle-Bold " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ts1--base MFBOldstyle-Bold " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Italic-dnom-ly1--base MFBOldstyle-Italic " AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont " <[a_q4fonx.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-ot1 MFBOldstyle-Italic " AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont " <[a_xkajg4.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-t1--base MFBOldstyle-Italic " AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont " <[a_jaulpu.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-t5--base MFBOldstyle-Italic " AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont " <[a_yjlipp.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-ly1--base MFBOldstyle-Italic " AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont " <[a_x5sf3h.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-ot1 MFBOldstyle-Italic " AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont " <[a_bgdhbr.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-t1--base MFBOldstyle-Italic " AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont " <[a_ybcvk5.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-t5--base MFBOldstyle-Italic " AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont " <[a_7q6l4s.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ly1--base MFBOldstyle-Italic " AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont " <[a_2k4lec.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ot1 MFBOldstyle-Italic " AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont " <[a_hi6bgi.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-t1--base MFBOldstyle-Italic " AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont " <[a_uyp43f.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-t5--base MFBOldstyle-Italic " AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont " <[a_traljt.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ts1--base MFBOldstyle-Italic " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-ly1--base MFBOldstyle-Italic " AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont " <[a_y57hi6.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-ot1 MFBOldstyle-Italic " AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont " <[a_e5y2zy.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-t1--base MFBOldstyle-Italic " AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont " <[a_wvbwpg.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-t5--base MFBOldstyle-Italic " AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont " <[a_cgi3xl.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-ly1--base MFBOldstyle-Italic " AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont " <[a_nduqlz.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-ot1 MFBOldstyle-Italic " AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont " <[a_in623c.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-t1--base MFBOldstyle-Italic " AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont " <[a_xx37di.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-t5--base MFBOldstyle-Italic " AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont " <[a_777sfz.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ly1--base MFBOldstyle-Italic " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ot1 MFBOldstyle-Italic " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-t1--base MFBOldstyle-Italic " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-t5--base MFBOldstyle-Italic " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ts1--base MFBOldstyle-Italic " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Regular-dnom-ly1--base MFBOldstyle-Regular " AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont " <[a_q4fonx.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-ot1 MFBOldstyle-Regular " AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont " <[a_xkajg4.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-t1--base MFBOldstyle-Regular " AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont " <[a_jaulpu.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-t5--base MFBOldstyle-Regular " AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont " <[a_yjlipp.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-ly1--base MFBOldstyle-Regular " AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont " <[a_x5sf3h.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-ot1 MFBOldstyle-Regular " AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont " <[a_bgdhbr.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-t1--base MFBOldstyle-Regular " AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont " <[a_ybcvk5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-t5--base MFBOldstyle-Regular " AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont " <[a_7q6l4s.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ly1--base MFBOldstyle-Regular " AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont " <[a_2k4lec.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ot1 MFBOldstyle-Regular " AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont " <[a_hi6bgi.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_sbbrr6nlw2mftfr36dqzfbpjfa ReEncodeFont " <[a_sbbrr6.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_qmdrbau3qho7wzvgdp4updvdxd ReEncodeFont " <[a_qmdrba.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-t1--base MFBOldstyle-Regular " AutoEnc_kod5rhatuhycv25ljuqjpdknae ReEncodeFont " <[a_kod5rh.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-t5--base MFBOldstyle-Regular " AutoEnc_2r5ytu4o4u4xqkb7tlgy7zwnva ReEncodeFont " <[a_2r5ytu.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-t1--base MFBOldstyle-Regular " AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont " <[a_uyp43f.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-t5--base MFBOldstyle-Regular " AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont " <[a_traljt.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-ly1--base MFBOldstyle-Regular " AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont " <[a_y57hi6.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-ot1 MFBOldstyle-Regular " AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont " <[a_e5y2zy.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-t1--base MFBOldstyle-Regular " AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont " <[a_wvbwpg.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-t5--base MFBOldstyle-Regular " AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont " <[a_cgi3xl.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ly1--base MFBOldstyle-Regular " AutoEnc_7nlkbe5nk6t5wmyizyclpmezcf ReEncodeFont " <[a_7nlkbe.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ot1 MFBOldstyle-Regular " AutoEnc_kosxnnoffdfmoxhhu6p5o7mihd ReEncodeFont " <[a_kosxnn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_fy4cgkjk47io5vdxcmrl3tmq4d ReEncodeFont " <[a_fy4cgk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_6mghgo6i4fo2zwcclkxw55uy4b ReEncodeFont " <[a_6mghgo.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-t1--base MFBOldstyle-Regular " AutoEnc_ztec7xsyrpjk3i77hncyph2ksb ReEncodeFont " <[a_ztec7x.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-t5--base MFBOldstyle-Regular " AutoEnc_ikcbofmmzjk2yaxfbmq4w4tfcd ReEncodeFont " <[a_ikcbof.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-t1--base MFBOldstyle-Regular " AutoEnc_xqrvjhmrxuhmdm554es7oy5vhe ReEncodeFont " <[a_xqrvjh.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-t5--base MFBOldstyle-Regular " AutoEnc_y2ngdewhza2rnatva56dgdk7od ReEncodeFont " <[a_y2ngde.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-ly1--base MFBOldstyle-Regular " AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont " <[a_nduqlz.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-ot1 MFBOldstyle-Regular " AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont " <[a_in623c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-t1--base MFBOldstyle-Regular " AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont " <[a_xx37di.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-t5--base MFBOldstyle-Regular " AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont " <[a_777sfz.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ly1--base MFBOldstyle-Regular " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ot1 MFBOldstyle-Regular " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_ahcimng7tjjvztjdn3tsyh2jwf ReEncodeFont " <[a_ahcimn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_radqz3tuq35ucoeetjpj4dtaoe ReEncodeFont " <[a_radqz3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-t1--base MFBOldstyle-Regular " AutoEnc_s7hq7555ku6wpqltvtwpifv4nh ReEncodeFont " <[a_s7hq75.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-t5--base MFBOldstyle-Regular " AutoEnc_nrcrlbklwnd2ct5bgdechurqqb ReEncodeFont " <[a_nrcrlb.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-t1--base MFBOldstyle-Regular " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-t5--base MFBOldstyle-Regular " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ly1--base MFBOldstyle-Regular " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ot1 MFBOldstyle-Regular " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_ahcimng7tjjvztjdn3tsyh2jwf ReEncodeFont " <[a_ahcimn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_radqz3tuq35ucoeetjpj4dtaoe ReEncodeFont " <[a_radqz3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-t1--base MFBOldstyle-Regular " AutoEnc_s7hq7555ku6wpqltvtwpifv4nh ReEncodeFont " <[a_s7hq75.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-t5--base MFBOldstyle-Regular " AutoEnc_nrcrlbklwnd2ct5bgdechurqqb ReEncodeFont " <[a_nrcrlb.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-t1--base MFBOldstyle-Regular " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-t5--base MFBOldstyle-Regular " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
% Magra.map
Magra-Bold-tlf-ly1--base Magra-Bold " AutoEnc_jqnft226aq65e6b7bxb7ls5dse ReEncodeFont " <[a_jqnft2.enc <Magra-Bold.pfb
Magra-Bold-tlf-ot1 Magra-Bold " AutoEnc_dip3eq74jkh4yw4fsunpbvmjqc ReEncodeFont " <[a_dip3eq.enc <Magra-Bold.pfb
@@ -28963,7 +29068,7 @@ rnorasi_o-osf Norasi-Oblique " LTHEncoding ReEncodeFont " <lthtlwg-osf.enc <nora
rnorasi_o-osf-sc Norasi-Oblique " LTHEncoding ReEncodeFont " <lthtlwg-osf-sc.enc <norasi_o.pfb
rnorasi_o-sc Norasi-Oblique " LTHEncoding ReEncodeFont " <lthtlwg-sc.enc <norasi_o.pfb
% niceframe.map
-bbding10 bbding10 <bbding10.pfb
+bbding10 bbding <bbding10.pfb
dingbat dingbat <dingbat.pfb
karta15 karta15 <karta15.pfb
umranda umranda <umranda.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 0091f23bbc7..37e80a3e35d 100644
--- a/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_t1.map
+++ b/Master/texmf-dist/fonts/map/dvips/updmap/psfonts_t1.map
@@ -13710,6 +13710,111 @@ Lbstr-Regular-lf-ot1--lcdfj Lbstr-RegularLCDFJ " " <Lbstr-RegularLCDFJ.pfb
Lbstr-Regular-lf-t1--base Lbstr-Regular " AutoEnc_2rydtxan5zvryhkciglaoeolte ReEncodeFont " <[lbstr_2rydtx.enc <Lbstr-Regular.pfb
Lbstr-Regular-lf-t1--lcdfj Lbstr-RegularLCDFJ " " <Lbstr-RegularLCDFJ.pfb
Lbstr-Regular-lf-ts1--base Lbstr-Regular " AutoEnc_t7yaonlyowlpa3ms34zhn2lipa ReEncodeFont " <[lbstr_t7yaon.enc <Lbstr-Regular.pfb
+% MFBOldstyle.map
+MFBOldstyle-Bold-dnom-ly1--base MFBOldstyle-Bold " AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont " <[a_q4fonx.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-ot1 MFBOldstyle-Bold " AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont " <[a_xkajg4.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-t1--base MFBOldstyle-Bold " AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont " <[a_jaulpu.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-t5--base MFBOldstyle-Bold " AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont " <[a_yjlipp.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-ly1--base MFBOldstyle-Bold " AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont " <[a_x5sf3h.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-ot1 MFBOldstyle-Bold " AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont " <[a_bgdhbr.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-t1--base MFBOldstyle-Bold " AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont " <[a_ybcvk5.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-t5--base MFBOldstyle-Bold " AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont " <[a_7q6l4s.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ly1--base MFBOldstyle-Bold " AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont " <[a_2k4lec.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ot1 MFBOldstyle-Bold " AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont " <[a_hi6bgi.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-t1--base MFBOldstyle-Bold " AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont " <[a_uyp43f.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-t5--base MFBOldstyle-Bold " AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont " <[a_traljt.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ts1--base MFBOldstyle-Bold " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-ly1--base MFBOldstyle-Bold " AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont " <[a_y57hi6.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-ot1 MFBOldstyle-Bold " AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont " <[a_e5y2zy.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-t1--base MFBOldstyle-Bold " AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont " <[a_wvbwpg.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-t5--base MFBOldstyle-Bold " AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont " <[a_cgi3xl.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-ly1--base MFBOldstyle-Bold " AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont " <[a_nduqlz.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-ot1 MFBOldstyle-Bold " AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont " <[a_in623c.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-t1--base MFBOldstyle-Bold " AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont " <[a_xx37di.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-t5--base MFBOldstyle-Bold " AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont " <[a_777sfz.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ly1--base MFBOldstyle-Bold " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ot1 MFBOldstyle-Bold " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-t1--base MFBOldstyle-Bold " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-t5--base MFBOldstyle-Bold " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ts1--base MFBOldstyle-Bold " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Italic-dnom-ly1--base MFBOldstyle-Italic " AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont " <[a_q4fonx.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-ot1 MFBOldstyle-Italic " AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont " <[a_xkajg4.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-t1--base MFBOldstyle-Italic " AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont " <[a_jaulpu.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-t5--base MFBOldstyle-Italic " AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont " <[a_yjlipp.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-ly1--base MFBOldstyle-Italic " AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont " <[a_x5sf3h.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-ot1 MFBOldstyle-Italic " AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont " <[a_bgdhbr.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-t1--base MFBOldstyle-Italic " AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont " <[a_ybcvk5.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-t5--base MFBOldstyle-Italic " AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont " <[a_7q6l4s.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ly1--base MFBOldstyle-Italic " AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont " <[a_2k4lec.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ot1 MFBOldstyle-Italic " AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont " <[a_hi6bgi.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-t1--base MFBOldstyle-Italic " AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont " <[a_uyp43f.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-t5--base MFBOldstyle-Italic " AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont " <[a_traljt.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ts1--base MFBOldstyle-Italic " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-ly1--base MFBOldstyle-Italic " AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont " <[a_y57hi6.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-ot1 MFBOldstyle-Italic " AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont " <[a_e5y2zy.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-t1--base MFBOldstyle-Italic " AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont " <[a_wvbwpg.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-t5--base MFBOldstyle-Italic " AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont " <[a_cgi3xl.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-ly1--base MFBOldstyle-Italic " AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont " <[a_nduqlz.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-ot1 MFBOldstyle-Italic " AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont " <[a_in623c.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-t1--base MFBOldstyle-Italic " AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont " <[a_xx37di.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-t5--base MFBOldstyle-Italic " AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont " <[a_777sfz.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ly1--base MFBOldstyle-Italic " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ot1 MFBOldstyle-Italic " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-t1--base MFBOldstyle-Italic " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-t5--base MFBOldstyle-Italic " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ts1--base MFBOldstyle-Italic " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Regular-dnom-ly1--base MFBOldstyle-Regular " AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont " <[a_q4fonx.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-ot1 MFBOldstyle-Regular " AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont " <[a_xkajg4.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-t1--base MFBOldstyle-Regular " AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont " <[a_jaulpu.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-t5--base MFBOldstyle-Regular " AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont " <[a_yjlipp.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-ly1--base MFBOldstyle-Regular " AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont " <[a_x5sf3h.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-ot1 MFBOldstyle-Regular " AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont " <[a_bgdhbr.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-t1--base MFBOldstyle-Regular " AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont " <[a_ybcvk5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-t5--base MFBOldstyle-Regular " AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont " <[a_7q6l4s.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ly1--base MFBOldstyle-Regular " AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont " <[a_2k4lec.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ot1 MFBOldstyle-Regular " AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont " <[a_hi6bgi.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_sbbrr6nlw2mftfr36dqzfbpjfa ReEncodeFont " <[a_sbbrr6.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_qmdrbau3qho7wzvgdp4updvdxd ReEncodeFont " <[a_qmdrba.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-t1--base MFBOldstyle-Regular " AutoEnc_kod5rhatuhycv25ljuqjpdknae ReEncodeFont " <[a_kod5rh.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-t5--base MFBOldstyle-Regular " AutoEnc_2r5ytu4o4u4xqkb7tlgy7zwnva ReEncodeFont " <[a_2r5ytu.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-t1--base MFBOldstyle-Regular " AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont " <[a_uyp43f.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-t5--base MFBOldstyle-Regular " AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont " <[a_traljt.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-ly1--base MFBOldstyle-Regular " AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont " <[a_y57hi6.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-ot1 MFBOldstyle-Regular " AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont " <[a_e5y2zy.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-t1--base MFBOldstyle-Regular " AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont " <[a_wvbwpg.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-t5--base MFBOldstyle-Regular " AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont " <[a_cgi3xl.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ly1--base MFBOldstyle-Regular " AutoEnc_7nlkbe5nk6t5wmyizyclpmezcf ReEncodeFont " <[a_7nlkbe.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ot1 MFBOldstyle-Regular " AutoEnc_kosxnnoffdfmoxhhu6p5o7mihd ReEncodeFont " <[a_kosxnn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_fy4cgkjk47io5vdxcmrl3tmq4d ReEncodeFont " <[a_fy4cgk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_6mghgo6i4fo2zwcclkxw55uy4b ReEncodeFont " <[a_6mghgo.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-t1--base MFBOldstyle-Regular " AutoEnc_ztec7xsyrpjk3i77hncyph2ksb ReEncodeFont " <[a_ztec7x.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-t5--base MFBOldstyle-Regular " AutoEnc_ikcbofmmzjk2yaxfbmq4w4tfcd ReEncodeFont " <[a_ikcbof.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-t1--base MFBOldstyle-Regular " AutoEnc_xqrvjhmrxuhmdm554es7oy5vhe ReEncodeFont " <[a_xqrvjh.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-t5--base MFBOldstyle-Regular " AutoEnc_y2ngdewhza2rnatva56dgdk7od ReEncodeFont " <[a_y2ngde.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-ly1--base MFBOldstyle-Regular " AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont " <[a_nduqlz.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-ot1 MFBOldstyle-Regular " AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont " <[a_in623c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-t1--base MFBOldstyle-Regular " AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont " <[a_xx37di.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-t5--base MFBOldstyle-Regular " AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont " <[a_777sfz.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ly1--base MFBOldstyle-Regular " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ot1 MFBOldstyle-Regular " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_ahcimng7tjjvztjdn3tsyh2jwf ReEncodeFont " <[a_ahcimn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_radqz3tuq35ucoeetjpj4dtaoe ReEncodeFont " <[a_radqz3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-t1--base MFBOldstyle-Regular " AutoEnc_s7hq7555ku6wpqltvtwpifv4nh ReEncodeFont " <[a_s7hq75.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-t5--base MFBOldstyle-Regular " AutoEnc_nrcrlbklwnd2ct5bgdechurqqb ReEncodeFont " <[a_nrcrlb.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-t1--base MFBOldstyle-Regular " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-t5--base MFBOldstyle-Regular " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ly1--base MFBOldstyle-Regular " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ot1 MFBOldstyle-Regular " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_ahcimng7tjjvztjdn3tsyh2jwf ReEncodeFont " <[a_ahcimn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_radqz3tuq35ucoeetjpj4dtaoe ReEncodeFont " <[a_radqz3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-t1--base MFBOldstyle-Regular " AutoEnc_s7hq7555ku6wpqltvtwpifv4nh ReEncodeFont " <[a_s7hq75.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-t5--base MFBOldstyle-Regular " AutoEnc_nrcrlbklwnd2ct5bgdechurqqb ReEncodeFont " <[a_nrcrlb.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-t1--base MFBOldstyle-Regular " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-t5--base MFBOldstyle-Regular " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
% Magra.map
Magra-Bold-tlf-ly1--base Magra-Bold " AutoEnc_jqnft226aq65e6b7bxb7ls5dse ReEncodeFont " <[a_jqnft2.enc <Magra-Bold.pfb
Magra-Bold-tlf-ot1 Magra-Bold " AutoEnc_dip3eq74jkh4yw4fsunpbvmjqc ReEncodeFont " <[a_dip3eq.enc <Magra-Bold.pfb
@@ -33508,7 +33613,7 @@ rnorasi_o-osf Norasi-Oblique " LTHEncoding ReEncodeFont " <lthtlwg-osf.enc <nora
rnorasi_o-osf-sc Norasi-Oblique " LTHEncoding ReEncodeFont " <lthtlwg-osf-sc.enc <norasi_o.pfb
rnorasi_o-sc Norasi-Oblique " LTHEncoding ReEncodeFont " <lthtlwg-sc.enc <norasi_o.pfb
% niceframe.map
-bbding10 bbding10 <bbding10.pfb
+bbding10 bbding <bbding10.pfb
dingbat dingbat <dingbat.pfb
karta15 karta15 <karta15.pfb
umranda umranda <umranda.pfb
diff --git a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex.map b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex.map
index f009582c8bc..09e0f2bc272 100644
--- a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex.map
+++ b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex.map
@@ -13710,6 +13710,111 @@ Lbstr-Regular-lf-ot1--lcdfj Lbstr-RegularLCDFJ " " <Lbstr-RegularLCDFJ.pfb
Lbstr-Regular-lf-t1--base Lbstr-Regular " AutoEnc_2rydtxan5zvryhkciglaoeolte ReEncodeFont " <[lbstr_2rydtx.enc <Lbstr-Regular.pfb
Lbstr-Regular-lf-t1--lcdfj Lbstr-RegularLCDFJ " " <Lbstr-RegularLCDFJ.pfb
Lbstr-Regular-lf-ts1--base Lbstr-Regular " AutoEnc_t7yaonlyowlpa3ms34zhn2lipa ReEncodeFont " <[lbstr_t7yaon.enc <Lbstr-Regular.pfb
+% MFBOldstyle.map
+MFBOldstyle-Bold-dnom-ly1--base MFBOldstyle-Bold " AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont " <[a_q4fonx.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-ot1 MFBOldstyle-Bold " AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont " <[a_xkajg4.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-t1--base MFBOldstyle-Bold " AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont " <[a_jaulpu.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-t5--base MFBOldstyle-Bold " AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont " <[a_yjlipp.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-ly1--base MFBOldstyle-Bold " AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont " <[a_x5sf3h.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-ot1 MFBOldstyle-Bold " AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont " <[a_bgdhbr.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-t1--base MFBOldstyle-Bold " AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont " <[a_ybcvk5.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-t5--base MFBOldstyle-Bold " AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont " <[a_7q6l4s.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ly1--base MFBOldstyle-Bold " AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont " <[a_2k4lec.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ot1 MFBOldstyle-Bold " AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont " <[a_hi6bgi.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-t1--base MFBOldstyle-Bold " AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont " <[a_uyp43f.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-t5--base MFBOldstyle-Bold " AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont " <[a_traljt.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ts1--base MFBOldstyle-Bold " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-ly1--base MFBOldstyle-Bold " AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont " <[a_y57hi6.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-ot1 MFBOldstyle-Bold " AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont " <[a_e5y2zy.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-t1--base MFBOldstyle-Bold " AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont " <[a_wvbwpg.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-t5--base MFBOldstyle-Bold " AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont " <[a_cgi3xl.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-ly1--base MFBOldstyle-Bold " AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont " <[a_nduqlz.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-ot1 MFBOldstyle-Bold " AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont " <[a_in623c.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-t1--base MFBOldstyle-Bold " AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont " <[a_xx37di.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-t5--base MFBOldstyle-Bold " AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont " <[a_777sfz.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ly1--base MFBOldstyle-Bold " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ot1 MFBOldstyle-Bold " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-t1--base MFBOldstyle-Bold " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-t5--base MFBOldstyle-Bold " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ts1--base MFBOldstyle-Bold " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Italic-dnom-ly1--base MFBOldstyle-Italic " AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont " <[a_q4fonx.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-ot1 MFBOldstyle-Italic " AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont " <[a_xkajg4.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-t1--base MFBOldstyle-Italic " AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont " <[a_jaulpu.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-t5--base MFBOldstyle-Italic " AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont " <[a_yjlipp.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-ly1--base MFBOldstyle-Italic " AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont " <[a_x5sf3h.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-ot1 MFBOldstyle-Italic " AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont " <[a_bgdhbr.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-t1--base MFBOldstyle-Italic " AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont " <[a_ybcvk5.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-t5--base MFBOldstyle-Italic " AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont " <[a_7q6l4s.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ly1--base MFBOldstyle-Italic " AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont " <[a_2k4lec.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ot1 MFBOldstyle-Italic " AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont " <[a_hi6bgi.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-t1--base MFBOldstyle-Italic " AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont " <[a_uyp43f.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-t5--base MFBOldstyle-Italic " AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont " <[a_traljt.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ts1--base MFBOldstyle-Italic " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-ly1--base MFBOldstyle-Italic " AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont " <[a_y57hi6.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-ot1 MFBOldstyle-Italic " AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont " <[a_e5y2zy.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-t1--base MFBOldstyle-Italic " AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont " <[a_wvbwpg.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-t5--base MFBOldstyle-Italic " AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont " <[a_cgi3xl.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-ly1--base MFBOldstyle-Italic " AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont " <[a_nduqlz.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-ot1 MFBOldstyle-Italic " AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont " <[a_in623c.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-t1--base MFBOldstyle-Italic " AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont " <[a_xx37di.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-t5--base MFBOldstyle-Italic " AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont " <[a_777sfz.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ly1--base MFBOldstyle-Italic " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ot1 MFBOldstyle-Italic " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-t1--base MFBOldstyle-Italic " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-t5--base MFBOldstyle-Italic " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ts1--base MFBOldstyle-Italic " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Regular-dnom-ly1--base MFBOldstyle-Regular " AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont " <[a_q4fonx.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-ot1 MFBOldstyle-Regular " AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont " <[a_xkajg4.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-t1--base MFBOldstyle-Regular " AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont " <[a_jaulpu.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-t5--base MFBOldstyle-Regular " AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont " <[a_yjlipp.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-ly1--base MFBOldstyle-Regular " AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont " <[a_x5sf3h.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-ot1 MFBOldstyle-Regular " AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont " <[a_bgdhbr.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-t1--base MFBOldstyle-Regular " AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont " <[a_ybcvk5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-t5--base MFBOldstyle-Regular " AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont " <[a_7q6l4s.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ly1--base MFBOldstyle-Regular " AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont " <[a_2k4lec.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ot1 MFBOldstyle-Regular " AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont " <[a_hi6bgi.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_sbbrr6nlw2mftfr36dqzfbpjfa ReEncodeFont " <[a_sbbrr6.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_qmdrbau3qho7wzvgdp4updvdxd ReEncodeFont " <[a_qmdrba.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-t1--base MFBOldstyle-Regular " AutoEnc_kod5rhatuhycv25ljuqjpdknae ReEncodeFont " <[a_kod5rh.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-t5--base MFBOldstyle-Regular " AutoEnc_2r5ytu4o4u4xqkb7tlgy7zwnva ReEncodeFont " <[a_2r5ytu.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-t1--base MFBOldstyle-Regular " AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont " <[a_uyp43f.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-t5--base MFBOldstyle-Regular " AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont " <[a_traljt.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-ly1--base MFBOldstyle-Regular " AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont " <[a_y57hi6.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-ot1 MFBOldstyle-Regular " AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont " <[a_e5y2zy.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-t1--base MFBOldstyle-Regular " AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont " <[a_wvbwpg.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-t5--base MFBOldstyle-Regular " AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont " <[a_cgi3xl.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ly1--base MFBOldstyle-Regular " AutoEnc_7nlkbe5nk6t5wmyizyclpmezcf ReEncodeFont " <[a_7nlkbe.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ot1 MFBOldstyle-Regular " AutoEnc_kosxnnoffdfmoxhhu6p5o7mihd ReEncodeFont " <[a_kosxnn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_fy4cgkjk47io5vdxcmrl3tmq4d ReEncodeFont " <[a_fy4cgk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_6mghgo6i4fo2zwcclkxw55uy4b ReEncodeFont " <[a_6mghgo.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-t1--base MFBOldstyle-Regular " AutoEnc_ztec7xsyrpjk3i77hncyph2ksb ReEncodeFont " <[a_ztec7x.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-t5--base MFBOldstyle-Regular " AutoEnc_ikcbofmmzjk2yaxfbmq4w4tfcd ReEncodeFont " <[a_ikcbof.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-t1--base MFBOldstyle-Regular " AutoEnc_xqrvjhmrxuhmdm554es7oy5vhe ReEncodeFont " <[a_xqrvjh.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-t5--base MFBOldstyle-Regular " AutoEnc_y2ngdewhza2rnatva56dgdk7od ReEncodeFont " <[a_y2ngde.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-ly1--base MFBOldstyle-Regular " AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont " <[a_nduqlz.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-ot1 MFBOldstyle-Regular " AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont " <[a_in623c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-t1--base MFBOldstyle-Regular " AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont " <[a_xx37di.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-t5--base MFBOldstyle-Regular " AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont " <[a_777sfz.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ly1--base MFBOldstyle-Regular " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ot1 MFBOldstyle-Regular " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_ahcimng7tjjvztjdn3tsyh2jwf ReEncodeFont " <[a_ahcimn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_radqz3tuq35ucoeetjpj4dtaoe ReEncodeFont " <[a_radqz3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-t1--base MFBOldstyle-Regular " AutoEnc_s7hq7555ku6wpqltvtwpifv4nh ReEncodeFont " <[a_s7hq75.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-t5--base MFBOldstyle-Regular " AutoEnc_nrcrlbklwnd2ct5bgdechurqqb ReEncodeFont " <[a_nrcrlb.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-t1--base MFBOldstyle-Regular " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-t5--base MFBOldstyle-Regular " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ly1--base MFBOldstyle-Regular " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ot1 MFBOldstyle-Regular " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_ahcimng7tjjvztjdn3tsyh2jwf ReEncodeFont " <[a_ahcimn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_radqz3tuq35ucoeetjpj4dtaoe ReEncodeFont " <[a_radqz3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-t1--base MFBOldstyle-Regular " AutoEnc_s7hq7555ku6wpqltvtwpifv4nh ReEncodeFont " <[a_s7hq75.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-t5--base MFBOldstyle-Regular " AutoEnc_nrcrlbklwnd2ct5bgdechurqqb ReEncodeFont " <[a_nrcrlb.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-t1--base MFBOldstyle-Regular " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-t5--base MFBOldstyle-Regular " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
% Magra.map
Magra-Bold-tlf-ly1--base Magra-Bold " AutoEnc_jqnft226aq65e6b7bxb7ls5dse ReEncodeFont " <[a_jqnft2.enc <Magra-Bold.pfb
Magra-Bold-tlf-ot1 Magra-Bold " AutoEnc_dip3eq74jkh4yw4fsunpbvmjqc ReEncodeFont " <[a_dip3eq.enc <Magra-Bold.pfb
@@ -33508,7 +33613,7 @@ rnorasi_o-osf Norasi-Oblique " LTHEncoding ReEncodeFont " <lthtlwg-osf.enc <nora
rnorasi_o-osf-sc Norasi-Oblique " LTHEncoding ReEncodeFont " <lthtlwg-osf-sc.enc <norasi_o.pfb
rnorasi_o-sc Norasi-Oblique " LTHEncoding ReEncodeFont " <lthtlwg-sc.enc <norasi_o.pfb
% niceframe.map
-bbding10 bbding10 <bbding10.pfb
+bbding10 bbding <bbding10.pfb
dingbat dingbat <dingbat.pfb
karta15 karta15 <karta15.pfb
umranda umranda <umranda.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 f009582c8bc..09e0f2bc272 100644
--- a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_dl14.map
+++ b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_dl14.map
@@ -13710,6 +13710,111 @@ Lbstr-Regular-lf-ot1--lcdfj Lbstr-RegularLCDFJ " " <Lbstr-RegularLCDFJ.pfb
Lbstr-Regular-lf-t1--base Lbstr-Regular " AutoEnc_2rydtxan5zvryhkciglaoeolte ReEncodeFont " <[lbstr_2rydtx.enc <Lbstr-Regular.pfb
Lbstr-Regular-lf-t1--lcdfj Lbstr-RegularLCDFJ " " <Lbstr-RegularLCDFJ.pfb
Lbstr-Regular-lf-ts1--base Lbstr-Regular " AutoEnc_t7yaonlyowlpa3ms34zhn2lipa ReEncodeFont " <[lbstr_t7yaon.enc <Lbstr-Regular.pfb
+% MFBOldstyle.map
+MFBOldstyle-Bold-dnom-ly1--base MFBOldstyle-Bold " AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont " <[a_q4fonx.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-ot1 MFBOldstyle-Bold " AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont " <[a_xkajg4.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-t1--base MFBOldstyle-Bold " AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont " <[a_jaulpu.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-t5--base MFBOldstyle-Bold " AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont " <[a_yjlipp.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-ly1--base MFBOldstyle-Bold " AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont " <[a_x5sf3h.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-ot1 MFBOldstyle-Bold " AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont " <[a_bgdhbr.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-t1--base MFBOldstyle-Bold " AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont " <[a_ybcvk5.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-t5--base MFBOldstyle-Bold " AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont " <[a_7q6l4s.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ly1--base MFBOldstyle-Bold " AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont " <[a_2k4lec.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ot1 MFBOldstyle-Bold " AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont " <[a_hi6bgi.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-t1--base MFBOldstyle-Bold " AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont " <[a_uyp43f.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-t5--base MFBOldstyle-Bold " AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont " <[a_traljt.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ts1--base MFBOldstyle-Bold " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-ly1--base MFBOldstyle-Bold " AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont " <[a_y57hi6.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-ot1 MFBOldstyle-Bold " AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont " <[a_e5y2zy.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-t1--base MFBOldstyle-Bold " AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont " <[a_wvbwpg.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-t5--base MFBOldstyle-Bold " AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont " <[a_cgi3xl.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-ly1--base MFBOldstyle-Bold " AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont " <[a_nduqlz.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-ot1 MFBOldstyle-Bold " AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont " <[a_in623c.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-t1--base MFBOldstyle-Bold " AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont " <[a_xx37di.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-t5--base MFBOldstyle-Bold " AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont " <[a_777sfz.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ly1--base MFBOldstyle-Bold " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ot1 MFBOldstyle-Bold " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-t1--base MFBOldstyle-Bold " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-t5--base MFBOldstyle-Bold " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ts1--base MFBOldstyle-Bold " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Italic-dnom-ly1--base MFBOldstyle-Italic " AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont " <[a_q4fonx.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-ot1 MFBOldstyle-Italic " AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont " <[a_xkajg4.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-t1--base MFBOldstyle-Italic " AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont " <[a_jaulpu.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-t5--base MFBOldstyle-Italic " AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont " <[a_yjlipp.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-ly1--base MFBOldstyle-Italic " AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont " <[a_x5sf3h.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-ot1 MFBOldstyle-Italic " AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont " <[a_bgdhbr.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-t1--base MFBOldstyle-Italic " AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont " <[a_ybcvk5.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-t5--base MFBOldstyle-Italic " AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont " <[a_7q6l4s.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ly1--base MFBOldstyle-Italic " AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont " <[a_2k4lec.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ot1 MFBOldstyle-Italic " AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont " <[a_hi6bgi.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-t1--base MFBOldstyle-Italic " AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont " <[a_uyp43f.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-t5--base MFBOldstyle-Italic " AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont " <[a_traljt.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ts1--base MFBOldstyle-Italic " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-ly1--base MFBOldstyle-Italic " AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont " <[a_y57hi6.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-ot1 MFBOldstyle-Italic " AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont " <[a_e5y2zy.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-t1--base MFBOldstyle-Italic " AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont " <[a_wvbwpg.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-t5--base MFBOldstyle-Italic " AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont " <[a_cgi3xl.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-ly1--base MFBOldstyle-Italic " AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont " <[a_nduqlz.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-ot1 MFBOldstyle-Italic " AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont " <[a_in623c.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-t1--base MFBOldstyle-Italic " AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont " <[a_xx37di.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-t5--base MFBOldstyle-Italic " AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont " <[a_777sfz.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ly1--base MFBOldstyle-Italic " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ot1 MFBOldstyle-Italic " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-t1--base MFBOldstyle-Italic " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-t5--base MFBOldstyle-Italic " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ts1--base MFBOldstyle-Italic " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Regular-dnom-ly1--base MFBOldstyle-Regular " AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont " <[a_q4fonx.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-ot1 MFBOldstyle-Regular " AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont " <[a_xkajg4.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-t1--base MFBOldstyle-Regular " AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont " <[a_jaulpu.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-t5--base MFBOldstyle-Regular " AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont " <[a_yjlipp.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-ly1--base MFBOldstyle-Regular " AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont " <[a_x5sf3h.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-ot1 MFBOldstyle-Regular " AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont " <[a_bgdhbr.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-t1--base MFBOldstyle-Regular " AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont " <[a_ybcvk5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-t5--base MFBOldstyle-Regular " AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont " <[a_7q6l4s.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ly1--base MFBOldstyle-Regular " AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont " <[a_2k4lec.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ot1 MFBOldstyle-Regular " AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont " <[a_hi6bgi.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_sbbrr6nlw2mftfr36dqzfbpjfa ReEncodeFont " <[a_sbbrr6.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_qmdrbau3qho7wzvgdp4updvdxd ReEncodeFont " <[a_qmdrba.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-t1--base MFBOldstyle-Regular " AutoEnc_kod5rhatuhycv25ljuqjpdknae ReEncodeFont " <[a_kod5rh.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-t5--base MFBOldstyle-Regular " AutoEnc_2r5ytu4o4u4xqkb7tlgy7zwnva ReEncodeFont " <[a_2r5ytu.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-t1--base MFBOldstyle-Regular " AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont " <[a_uyp43f.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-t5--base MFBOldstyle-Regular " AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont " <[a_traljt.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-ly1--base MFBOldstyle-Regular " AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont " <[a_y57hi6.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-ot1 MFBOldstyle-Regular " AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont " <[a_e5y2zy.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-t1--base MFBOldstyle-Regular " AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont " <[a_wvbwpg.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-t5--base MFBOldstyle-Regular " AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont " <[a_cgi3xl.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ly1--base MFBOldstyle-Regular " AutoEnc_7nlkbe5nk6t5wmyizyclpmezcf ReEncodeFont " <[a_7nlkbe.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ot1 MFBOldstyle-Regular " AutoEnc_kosxnnoffdfmoxhhu6p5o7mihd ReEncodeFont " <[a_kosxnn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_fy4cgkjk47io5vdxcmrl3tmq4d ReEncodeFont " <[a_fy4cgk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_6mghgo6i4fo2zwcclkxw55uy4b ReEncodeFont " <[a_6mghgo.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-t1--base MFBOldstyle-Regular " AutoEnc_ztec7xsyrpjk3i77hncyph2ksb ReEncodeFont " <[a_ztec7x.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-t5--base MFBOldstyle-Regular " AutoEnc_ikcbofmmzjk2yaxfbmq4w4tfcd ReEncodeFont " <[a_ikcbof.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-t1--base MFBOldstyle-Regular " AutoEnc_xqrvjhmrxuhmdm554es7oy5vhe ReEncodeFont " <[a_xqrvjh.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-t5--base MFBOldstyle-Regular " AutoEnc_y2ngdewhza2rnatva56dgdk7od ReEncodeFont " <[a_y2ngde.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-ly1--base MFBOldstyle-Regular " AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont " <[a_nduqlz.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-ot1 MFBOldstyle-Regular " AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont " <[a_in623c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-t1--base MFBOldstyle-Regular " AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont " <[a_xx37di.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-t5--base MFBOldstyle-Regular " AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont " <[a_777sfz.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ly1--base MFBOldstyle-Regular " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ot1 MFBOldstyle-Regular " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_ahcimng7tjjvztjdn3tsyh2jwf ReEncodeFont " <[a_ahcimn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_radqz3tuq35ucoeetjpj4dtaoe ReEncodeFont " <[a_radqz3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-t1--base MFBOldstyle-Regular " AutoEnc_s7hq7555ku6wpqltvtwpifv4nh ReEncodeFont " <[a_s7hq75.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-t5--base MFBOldstyle-Regular " AutoEnc_nrcrlbklwnd2ct5bgdechurqqb ReEncodeFont " <[a_nrcrlb.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-t1--base MFBOldstyle-Regular " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-t5--base MFBOldstyle-Regular " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ly1--base MFBOldstyle-Regular " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ot1 MFBOldstyle-Regular " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_ahcimng7tjjvztjdn3tsyh2jwf ReEncodeFont " <[a_ahcimn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_radqz3tuq35ucoeetjpj4dtaoe ReEncodeFont " <[a_radqz3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-t1--base MFBOldstyle-Regular " AutoEnc_s7hq7555ku6wpqltvtwpifv4nh ReEncodeFont " <[a_s7hq75.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-t5--base MFBOldstyle-Regular " AutoEnc_nrcrlbklwnd2ct5bgdechurqqb ReEncodeFont " <[a_nrcrlb.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-t1--base MFBOldstyle-Regular " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-t5--base MFBOldstyle-Regular " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
% Magra.map
Magra-Bold-tlf-ly1--base Magra-Bold " AutoEnc_jqnft226aq65e6b7bxb7ls5dse ReEncodeFont " <[a_jqnft2.enc <Magra-Bold.pfb
Magra-Bold-tlf-ot1 Magra-Bold " AutoEnc_dip3eq74jkh4yw4fsunpbvmjqc ReEncodeFont " <[a_dip3eq.enc <Magra-Bold.pfb
@@ -33508,7 +33613,7 @@ rnorasi_o-osf Norasi-Oblique " LTHEncoding ReEncodeFont " <lthtlwg-osf.enc <nora
rnorasi_o-osf-sc Norasi-Oblique " LTHEncoding ReEncodeFont " <lthtlwg-osf-sc.enc <norasi_o.pfb
rnorasi_o-sc Norasi-Oblique " LTHEncoding ReEncodeFont " <lthtlwg-sc.enc <norasi_o.pfb
% niceframe.map
-bbding10 bbding10 <bbding10.pfb
+bbding10 bbding <bbding10.pfb
dingbat dingbat <dingbat.pfb
karta15 karta15 <karta15.pfb
umranda umranda <umranda.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 440afc98f65..cc9bb147b7f 100644
--- a/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_ndl14.map
+++ b/Master/texmf-dist/fonts/map/pdftex/updmap/pdftex_ndl14.map
@@ -13710,6 +13710,111 @@ Lbstr-Regular-lf-ot1--lcdfj Lbstr-RegularLCDFJ " " <Lbstr-RegularLCDFJ.pfb
Lbstr-Regular-lf-t1--base Lbstr-Regular " AutoEnc_2rydtxan5zvryhkciglaoeolte ReEncodeFont " <[lbstr_2rydtx.enc <Lbstr-Regular.pfb
Lbstr-Regular-lf-t1--lcdfj Lbstr-RegularLCDFJ " " <Lbstr-RegularLCDFJ.pfb
Lbstr-Regular-lf-ts1--base Lbstr-Regular " AutoEnc_t7yaonlyowlpa3ms34zhn2lipa ReEncodeFont " <[lbstr_t7yaon.enc <Lbstr-Regular.pfb
+% MFBOldstyle.map
+MFBOldstyle-Bold-dnom-ly1--base MFBOldstyle-Bold " AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont " <[a_q4fonx.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-ot1 MFBOldstyle-Bold " AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont " <[a_xkajg4.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-t1--base MFBOldstyle-Bold " AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont " <[a_jaulpu.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-dnom-t5--base MFBOldstyle-Bold " AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont " <[a_yjlipp.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-ly1--base MFBOldstyle-Bold " AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont " <[a_x5sf3h.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-ot1 MFBOldstyle-Bold " AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont " <[a_bgdhbr.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-t1--base MFBOldstyle-Bold " AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont " <[a_ybcvk5.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-inf-t5--base MFBOldstyle-Bold " AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont " <[a_7q6l4s.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ly1--base MFBOldstyle-Bold " AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont " <[a_2k4lec.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ot1 MFBOldstyle-Bold " AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont " <[a_hi6bgi.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-t1--base MFBOldstyle-Bold " AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont " <[a_uyp43f.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-t5--base MFBOldstyle-Bold " AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont " <[a_traljt.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-lf-ts1--base MFBOldstyle-Bold " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-ly1--base MFBOldstyle-Bold " AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont " <[a_y57hi6.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-ot1 MFBOldstyle-Bold " AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont " <[a_e5y2zy.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-t1--base MFBOldstyle-Bold " AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont " <[a_wvbwpg.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-numr-t5--base MFBOldstyle-Bold " AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont " <[a_cgi3xl.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-ly1--base MFBOldstyle-Bold " AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont " <[a_nduqlz.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-ot1 MFBOldstyle-Bold " AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont " <[a_in623c.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-t1--base MFBOldstyle-Bold " AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont " <[a_xx37di.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-sup-t5--base MFBOldstyle-Bold " AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont " <[a_777sfz.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ly1--base MFBOldstyle-Bold " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ot1 MFBOldstyle-Bold " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-t1--base MFBOldstyle-Bold " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-t5--base MFBOldstyle-Bold " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Bold-tlf-ts1--base MFBOldstyle-Bold " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Bold.pfb
+MFBOldstyle-Italic-dnom-ly1--base MFBOldstyle-Italic " AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont " <[a_q4fonx.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-ot1 MFBOldstyle-Italic " AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont " <[a_xkajg4.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-t1--base MFBOldstyle-Italic " AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont " <[a_jaulpu.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-dnom-t5--base MFBOldstyle-Italic " AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont " <[a_yjlipp.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-ly1--base MFBOldstyle-Italic " AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont " <[a_x5sf3h.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-ot1 MFBOldstyle-Italic " AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont " <[a_bgdhbr.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-t1--base MFBOldstyle-Italic " AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont " <[a_ybcvk5.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-inf-t5--base MFBOldstyle-Italic " AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont " <[a_7q6l4s.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ly1--base MFBOldstyle-Italic " AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont " <[a_2k4lec.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ot1 MFBOldstyle-Italic " AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont " <[a_hi6bgi.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-t1--base MFBOldstyle-Italic " AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont " <[a_uyp43f.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-t5--base MFBOldstyle-Italic " AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont " <[a_traljt.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-lf-ts1--base MFBOldstyle-Italic " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-ly1--base MFBOldstyle-Italic " AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont " <[a_y57hi6.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-ot1 MFBOldstyle-Italic " AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont " <[a_e5y2zy.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-t1--base MFBOldstyle-Italic " AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont " <[a_wvbwpg.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-numr-t5--base MFBOldstyle-Italic " AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont " <[a_cgi3xl.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-ly1--base MFBOldstyle-Italic " AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont " <[a_nduqlz.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-ot1 MFBOldstyle-Italic " AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont " <[a_in623c.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-t1--base MFBOldstyle-Italic " AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont " <[a_xx37di.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-sup-t5--base MFBOldstyle-Italic " AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont " <[a_777sfz.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ly1--base MFBOldstyle-Italic " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ot1 MFBOldstyle-Italic " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-t1--base MFBOldstyle-Italic " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-t5--base MFBOldstyle-Italic " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Italic-tlf-ts1--base MFBOldstyle-Italic " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Italic.pfb
+MFBOldstyle-Regular-dnom-ly1--base MFBOldstyle-Regular " AutoEnc_q4fonxqbpf7hbgtfm4hwp7lr2g ReEncodeFont " <[a_q4fonx.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-ot1 MFBOldstyle-Regular " AutoEnc_xkajg4wyz7lspgdrvvtosil3pf ReEncodeFont " <[a_xkajg4.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-t1--base MFBOldstyle-Regular " AutoEnc_jaulpudaso23auq4gblystdt4f ReEncodeFont " <[a_jaulpu.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-dnom-t5--base MFBOldstyle-Regular " AutoEnc_yjlipp4r7qgmsukh4tqlarf47f ReEncodeFont " <[a_yjlipp.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-ly1--base MFBOldstyle-Regular " AutoEnc_x5sf3hbtjbytdskpkk5qlkkqia ReEncodeFont " <[a_x5sf3h.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-ot1 MFBOldstyle-Regular " AutoEnc_bgdhbrd4akym74hy6a5lgmcate ReEncodeFont " <[a_bgdhbr.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-t1--base MFBOldstyle-Regular " AutoEnc_ybcvk5dbtub7oamhocouu77wtb ReEncodeFont " <[a_ybcvk5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-inf-t5--base MFBOldstyle-Regular " AutoEnc_7q6l4sra6mbj4kn56zbxpulgmh ReEncodeFont " <[a_7q6l4s.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ly1--base MFBOldstyle-Regular " AutoEnc_2k4lecik2wfvlsvcu2lchypc5g ReEncodeFont " <[a_2k4lec.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ot1 MFBOldstyle-Regular " AutoEnc_hi6bgiqjidr37cjaog2bb5qe3e ReEncodeFont " <[a_hi6bgi.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_sbbrr6nlw2mftfr36dqzfbpjfa ReEncodeFont " <[a_sbbrr6.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_qmdrbau3qho7wzvgdp4updvdxd ReEncodeFont " <[a_qmdrba.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-t1--base MFBOldstyle-Regular " AutoEnc_kod5rhatuhycv25ljuqjpdknae ReEncodeFont " <[a_kod5rh.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-sc-t5--base MFBOldstyle-Regular " AutoEnc_2r5ytu4o4u4xqkb7tlgy7zwnva ReEncodeFont " <[a_2r5ytu.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-t1--base MFBOldstyle-Regular " AutoEnc_uyp43f4zbdh7c77o2tguyfnzld ReEncodeFont " <[a_uyp43f.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-t5--base MFBOldstyle-Regular " AutoEnc_traljtgjhzanuqiozmg6tgnoaa ReEncodeFont " <[a_traljt.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-lf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-ly1--base MFBOldstyle-Regular " AutoEnc_y57hi666jserhrhbhmnbx23otg ReEncodeFont " <[a_y57hi6.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-ot1 MFBOldstyle-Regular " AutoEnc_e5y2zyfxudjmcl7mwipwlc6jqc ReEncodeFont " <[a_e5y2zy.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-t1--base MFBOldstyle-Regular " AutoEnc_wvbwpghbptug5txt4ipvhokzvc ReEncodeFont " <[a_wvbwpg.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-numr-t5--base MFBOldstyle-Regular " AutoEnc_cgi3xl52uwpg5zsjwybttwenng ReEncodeFont " <[a_cgi3xl.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ly1--base MFBOldstyle-Regular " AutoEnc_7nlkbe5nk6t5wmyizyclpmezcf ReEncodeFont " <[a_7nlkbe.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ot1 MFBOldstyle-Regular " AutoEnc_kosxnnoffdfmoxhhu6p5o7mihd ReEncodeFont " <[a_kosxnn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_fy4cgkjk47io5vdxcmrl3tmq4d ReEncodeFont " <[a_fy4cgk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_6mghgo6i4fo2zwcclkxw55uy4b ReEncodeFont " <[a_6mghgo.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-t1--base MFBOldstyle-Regular " AutoEnc_ztec7xsyrpjk3i77hncyph2ksb ReEncodeFont " <[a_ztec7x.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-sc-t5--base MFBOldstyle-Regular " AutoEnc_ikcbofmmzjk2yaxfbmq4w4tfcd ReEncodeFont " <[a_ikcbof.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-t1--base MFBOldstyle-Regular " AutoEnc_xqrvjhmrxuhmdm554es7oy5vhe ReEncodeFont " <[a_xqrvjh.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-t5--base MFBOldstyle-Regular " AutoEnc_y2ngdewhza2rnatva56dgdk7od ReEncodeFont " <[a_y2ngde.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-osf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-ly1--base MFBOldstyle-Regular " AutoEnc_nduqlz5hpbp6yec7xvz3aqfkud ReEncodeFont " <[a_nduqlz.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-ot1 MFBOldstyle-Regular " AutoEnc_in623cj3knes7lnso6hltdatyf ReEncodeFont " <[a_in623c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-t1--base MFBOldstyle-Regular " AutoEnc_xx37di7ztc4454rmsdjna6hdlc ReEncodeFont " <[a_xx37di.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-sup-t5--base MFBOldstyle-Regular " AutoEnc_777sfz6kvd6vtcrsxpw47y5fng ReEncodeFont " <[a_777sfz.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ly1--base MFBOldstyle-Regular " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ot1 MFBOldstyle-Regular " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_ahcimng7tjjvztjdn3tsyh2jwf ReEncodeFont " <[a_ahcimn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_radqz3tuq35ucoeetjpj4dtaoe ReEncodeFont " <[a_radqz3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-t1--base MFBOldstyle-Regular " AutoEnc_s7hq7555ku6wpqltvtwpifv4nh ReEncodeFont " <[a_s7hq75.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-sc-t5--base MFBOldstyle-Regular " AutoEnc_nrcrlbklwnd2ct5bgdechurqqb ReEncodeFont " <[a_nrcrlb.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-t1--base MFBOldstyle-Regular " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-t5--base MFBOldstyle-Regular " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tlf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ly1--base MFBOldstyle-Regular " AutoEnc_rxfd27c4q4ljq5rmtmpdz7vyhd ReEncodeFont " <[a_rxfd27.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ot1 MFBOldstyle-Regular " AutoEnc_cwrjrkkwp4fsvjcf2vrb25ppqh ReEncodeFont " <[a_cwrjrk.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-ly1--base MFBOldstyle-Regular " AutoEnc_ahcimng7tjjvztjdn3tsyh2jwf ReEncodeFont " <[a_ahcimn.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-ot1--base MFBOldstyle-Regular " AutoEnc_radqz3tuq35ucoeetjpj4dtaoe ReEncodeFont " <[a_radqz3.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-t1--base MFBOldstyle-Regular " AutoEnc_s7hq7555ku6wpqltvtwpifv4nh ReEncodeFont " <[a_s7hq75.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-sc-t5--base MFBOldstyle-Regular " AutoEnc_nrcrlbklwnd2ct5bgdechurqqb ReEncodeFont " <[a_nrcrlb.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-t1--base MFBOldstyle-Regular " AutoEnc_73nks5xpjecrfajnhprhdsspuf ReEncodeFont " <[a_73nks5.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-t5--base MFBOldstyle-Regular " AutoEnc_oyw33c2h3oyy6rdgmggfawuoud ReEncodeFont " <[a_oyw33c.enc <MFBOldstyle-Regular.pfb
+MFBOldstyle-Regular-tosf-ts1--base MFBOldstyle-Regular " AutoEnc_5lrov32z5fsqywm2faiucousah ReEncodeFont " <[a_5lrov3.enc <MFBOldstyle-Regular.pfb
% Magra.map
Magra-Bold-tlf-ly1--base Magra-Bold " AutoEnc_jqnft226aq65e6b7bxb7ls5dse ReEncodeFont " <[a_jqnft2.enc <Magra-Bold.pfb
Magra-Bold-tlf-ot1 Magra-Bold " AutoEnc_dip3eq74jkh4yw4fsunpbvmjqc ReEncodeFont " <[a_dip3eq.enc <Magra-Bold.pfb
@@ -33508,7 +33613,7 @@ rnorasi_o-osf Norasi-Oblique " LTHEncoding ReEncodeFont " <lthtlwg-osf.enc <nora
rnorasi_o-osf-sc Norasi-Oblique " LTHEncoding ReEncodeFont " <lthtlwg-osf-sc.enc <norasi_o.pfb
rnorasi_o-sc Norasi-Oblique " LTHEncoding ReEncodeFont " <lthtlwg-sc.enc <norasi_o.pfb
% niceframe.map
-bbding10 bbding10 <bbding10.pfb
+bbding10 bbding <bbding10.pfb
dingbat dingbat <dingbat.pfb
karta15 karta15 <karta15.pfb
umranda umranda <umranda.pfb
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Bold.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Bold.otf
index 3613476b107..bfa141a2d2e 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Bold.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Bold.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-BoldItalic.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-BoldItalic.otf
index bf5ba9db38c..9df0e6f03b7 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-BoldItalic.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-BoldItalic.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Cond.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Cond.otf
index 664f9c36a09..fb802d5b851 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Cond.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Cond.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondItalic.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondItalic.otf
index 57356547131..6fc8b89209f 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondItalic.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondItalic.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondLight.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondLight.otf
index f188c9972dc..ba6b2afa228 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondLight.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondLight.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondLightItalic.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondLightItalic.otf
index 1158f5978ec..b7b96b073ed 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondLightItalic.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondLightItalic.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondMedium.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondMedium.otf
index ffe1423c686..74f88c7704e 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondMedium.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondMedium.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondMediumItalic.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondMediumItalic.otf
index 99fe53ae50f..46775e44d91 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondMediumItalic.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-CondMediumItalic.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Exp.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Exp.otf
index 07c41aed291..dcf8846f3bd 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Exp.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Exp.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpBold.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpBold.otf
index b11a870595b..82c510ad7c4 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpBold.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpBold.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpBoldItalic.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpBoldItalic.otf
index aca56644043..c748edd4574 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpBoldItalic.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpBoldItalic.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpItalic.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpItalic.otf
index d6e490f0d18..8f04efa4017 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpItalic.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpItalic.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpMedium.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpMedium.otf
index 7002d165393..a8157cb4dd1 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpMedium.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpMedium.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpMediumItalic.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpMediumItalic.otf
index 14c3d82855c..83e1dffc5e9 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpMediumItalic.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpMediumItalic.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpSmBold.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpSmBold.otf
index 4394637220c..03ce068f7f8 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpSmBold.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpSmBold.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpSmBoldItalic.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpSmBoldItalic.otf
index fec2f5e7e59..7c3535e7c44 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpSmBoldItalic.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-ExpSmBoldItalic.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Italic.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Italic.otf
index 5909de2141d..b1056965b9f 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Italic.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Italic.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Light.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Light.otf
index 4972a025efb..c30c569b84c 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Light.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Light.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-LightItalic.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-LightItalic.otf
index 7fe901b2fb7..9c0373b326a 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-LightItalic.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-LightItalic.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Medium.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Medium.otf
index ebf89d74892..2c86b54f9de 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Medium.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Medium.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-MediumItalic.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-MediumItalic.otf
index 6091cf3c6ff..a77843a27c4 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-MediumItalic.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-MediumItalic.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Regular.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Regular.otf
index f7cf4b93969..c00004164c9 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Regular.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-Regular.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmBold.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmBold.otf
index ad5273bc97e..94170c35a1e 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmBold.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmBold.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmBoldItalic.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmBoldItalic.otf
index 96ec2f7b581..cfa29511131 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmBoldItalic.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmBoldItalic.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCond.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCond.otf
index 3183caa0eef..296e9a8538c 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCond.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCond.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondItalic.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondItalic.otf
index d4ac44ec528..6e60370c875 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondItalic.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondItalic.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondLight.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondLight.otf
index 07160f60cd0..f8ae72c72aa 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondLight.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondLight.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondLightItalic.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondLightItalic.otf
index 3f132817108..64ab2c428b8 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondLightItalic.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondLightItalic.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondMedium.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondMedium.otf
index 7cf6b1e0c9d..9cf4ea7c167 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondMedium.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondMedium.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondMediumItalic.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondMediumItalic.otf
index 6bd498cbae1..4b9325d120b 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondMediumItalic.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmCondMediumItalic.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExp.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExp.otf
index 81fd07fbe02..486ceb00bda 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExp.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExp.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpBold.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpBold.otf
index 35303e94086..cdaba019677 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpBold.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpBold.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpBoldItalic.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpBoldItalic.otf
index baf5fc43901..efa709148e9 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpBoldItalic.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpBoldItalic.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpItalic.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpItalic.otf
index 797bf6e224b..d9c4d05134f 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpItalic.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpItalic.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpMedium.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpMedium.otf
index 553b37bfdcb..a14e92af208 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpMedium.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpMedium.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpMediumItalic.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpMediumItalic.otf
index 572d694e0f7..4631c510675 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpMediumItalic.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpMediumItalic.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpSmBold.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpSmBold.otf
index d230661c40b..dd66f29cc07 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpSmBold.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpSmBold.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpSmBoldItalic.otf b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpSmBoldItalic.otf
index f6217deef59..6113ed55702 100644
--- a/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpSmBoldItalic.otf
+++ b/Master/texmf-dist/fonts/opentype/public/junicode/Junicode-SmExpSmBoldItalic.otf
Binary files differ
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/mfb-oldstyle/MFBOldstyle-Bold.otf b/Master/texmf-dist/fonts/opentype/public/mfb-oldstyle/MFBOldstyle-Bold.otf
new file mode 100644
index 00000000000..e1b4ddf2994
--- /dev/null
+++ b/Master/texmf-dist/fonts/opentype/public/mfb-oldstyle/MFBOldstyle-Bold.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/mfb-oldstyle/MFBOldstyle-Italic.otf b/Master/texmf-dist/fonts/opentype/public/mfb-oldstyle/MFBOldstyle-Italic.otf
new file mode 100644
index 00000000000..af808c4137a
--- /dev/null
+++ b/Master/texmf-dist/fonts/opentype/public/mfb-oldstyle/MFBOldstyle-Italic.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/mfb-oldstyle/MFBOldstyle-Regular.otf b/Master/texmf-dist/fonts/opentype/public/mfb-oldstyle/MFBOldstyle-Regular.otf
new file mode 100644
index 00000000000..fb2831e8d32
--- /dev/null
+++ b/Master/texmf-dist/fonts/opentype/public/mfb-oldstyle/MFBOldstyle-Regular.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 e72d49b1f77..a9e64b29784 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/tfm/public/bxjatoucs/bxjatoucs-tojis.tfm b/Master/texmf-dist/fonts/tfm/public/bxjatoucs/bxjatoucs-tojis.tfm
new file mode 100644
index 00000000000..fc0ede1a9d1
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/bxjatoucs/bxjatoucs-tojis.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-ly1.tfm
index 904a7f4ebd9..c9fececc4e6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-ot1.tfm
index 4b930f54997..3a696cbb203 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-sc-ly1.tfm
index 563a54e964b..ac0db271eb3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-sc-ot1.tfm
index 35d9c5c19b5..5d592b607b5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-sc-t1.tfm
index 658a477e617..f306ad768ea 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-t1.tfm
index 865197fbf6e..d6e38dc5ff4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-ly1.tfm
index c539849bad0..8a8bc6fd53f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-ot1.tfm
index b91e6f3751f..c7e753b8129 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-sc-ly1.tfm
index 2c120443dc5..ef829e30716 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-sc-ot1.tfm
index 4e235e690d9..edd33d469a9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-sc-t1.tfm
index 292e4e760db..204727e6e4a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-t1.tfm
index 62c51cebd23..05135bcc219 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-ly1.tfm
index e8680d6302d..ecb2a333378 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-ot1.tfm
index 9ae26e8f9c7..2c3f0178df7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-sc-ly1.tfm
index af8657d378c..5683b4f94ea 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-sc-ot1.tfm
index 7802144e67f..457a994c6dc 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-sc-t1.tfm
index 2c6ba4b1f91..aa7fdcd78cc 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-t1.tfm
index a1140d93e68..0c56b8473f7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-ly1.tfm
index 46217807da5..2a9e1574c3d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-ot1.tfm
index f7fa1b01219..aec1fd1ad2a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-sc-ly1.tfm
index 5fe8c3b0c9b..f2dd35b283d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-sc-ot1.tfm
index 3852cf60e93..8f3b15e94f2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-sc-t1.tfm
index 373ffdd1f2c..03b52cf974b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-t1.tfm
index 0d7052f5c3e..d8d392ee276 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Bold-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-inf-ly1.tfm
index 293411dab4e..0c75d97fcb6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-inf-ot1.tfm
index 7726290b3aa..c90cd9820af 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-inf-t1--base.tfm
index 7a91506a622..8d9caa70655 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-inf-t1.tfm
index 3472f38139a..224b652dadf 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-lf-ly1.tfm
index 1411a5f3f46..33e5179747a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-lf-ot1.tfm
index a81d8f15c59..e97a241f7a2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-lf-t1--base.tfm
index 78a86f66715..669dae30f46 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-lf-t1.tfm
index 43dc26ea89d..c4f3c5b3b56 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-lgr.tfm
index f72e90c742f..e74ac49df68 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-ly1.tfm
index b76da111e05..0598f919d49 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-ot1.tfm
index 47a621278cd..061235c90b5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-lgr.tfm
index 3a3cfd44f33..c15074c2903 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-ly1--base.tfm
index 66d9b8761b1..7daf8cdbf03 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-ly1.tfm
index 3420570e93e..a0564658b8b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-ot1--base.tfm
index de8dde14e37..752c28e1b87 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-ot1.tfm
index 9541dee598c..649e8a6078e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-t1--base.tfm
index 3427766a11e..be95c35ee7c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-t1.tfm
index aeabd2f2034..80673007178 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-t1--base.tfm
index b2460d69f2a..3cd9a388de0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-t1.tfm
index 61ca23b01ab..daac4ee8959 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-sup-ly1.tfm
index 90e9606ec8f..cbb6e01bcab 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-sup-ot1.tfm
index b8e4b6daf01..e69032fd483 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-sup-t1--base.tfm
index c2d376fbc26..a1e99f04110 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-sup-t1.tfm
index 2b7afbd9d08..5bb6e7f7f33 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tlf-ly1.tfm
index 624f88763e4..72d7ad5c949 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tlf-ot1.tfm
index bfc833ec60b..36f1dc80954 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tlf-t1--base.tfm
index 7b767f416ec..1b484bb8570 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tlf-t1.tfm
index e8cab8dae1c..b4d59114b14 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tosf-ly1.tfm
index 2695a636425..84bfde2b67c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tosf-ot1.tfm
index f851d1a34f4..8dd0291c967 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tosf-t1--base.tfm
index b8537470770..1912a78ab74 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tosf-t1.tfm
index 873ebccdbb6..2f53962c23f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-BoldItalic-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-ly1.tfm
index 04f8af32f0c..48505a17217 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-ot1.tfm
index 72e07bec2fd..a6487b95eb8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-sc-ly1.tfm
index ca1a2827824..39930894132 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-sc-ot1.tfm
index 411fa00395f..180158a69a6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-sc-t1.tfm
index 13ac99bb1e6..3a4bb92117e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-t1.tfm
index 44a8f4887d3..338baf3ba23 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-ly1.tfm
index 6eec38db32c..0a20fce6294 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-ot1.tfm
index a0b5bffe916..79371cf2da4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-sc-ly1.tfm
index d9b09f2685a..36c51969588 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-sc-ot1.tfm
index 1a8642e4314..997bdc6f0f3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-sc-t1.tfm
index ab593233451..64ed7f1f40e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-t1.tfm
index 36e174cdee6..2712c39d5a9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-ly1.tfm
index e461bc93c6b..1dd4e1daa22 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-ot1.tfm
index ea44a4b3abb..72310cdd260 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-sc-ly1.tfm
index be60655a86c..d769f61836d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-sc-ot1.tfm
index e7e16e06b73..fe117b082a9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-sc-t1.tfm
index 10323e235a4..11a39b52916 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-t1.tfm
index 6085e95e7a6..c1e7a1d97a4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-ly1.tfm
index 08d494cd2ec..1228237cb67 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-ot1.tfm
index f93c2af61b0..cbca8e3eaa5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-sc-ly1.tfm
index 50598e33ddc..9f454f616e4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-sc-ot1.tfm
index c9771afa7a4..baa42fb9510 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-sc-t1.tfm
index eb3ecc14e6c..c3f74329445 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-t1.tfm
index 93306aaae9b..5ae4bbb5c12 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Cond-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-inf-ly1.tfm
index 2badb3fa991..4e2cd4f0dcc 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-inf-ot1.tfm
index 82e5aa274fd..69abb5eed98 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-inf-t1--base.tfm
index fb91f16a726..61608d2aa0d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-inf-t1.tfm
index ac5c1c4f90b..cf5d326a16e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-lf-ly1.tfm
index 29bdd46cbad..ffff9fbc63d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-lf-ot1.tfm
index b78cebd64de..54731cf6bab 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-lf-t1--base.tfm
index 3c392462c9a..c53b2854405 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-lf-t1.tfm
index 888384d290f..9722c2d4d14 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-lgr.tfm
index 8390cdc6433..f5007878356 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-ly1.tfm
index 7eeeebb3657..7bf713f25ec 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-ot1.tfm
index 02885d46807..f7ea5d7989d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-lgr.tfm
index 91bd78e5049..bf9719bb3d9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-ly1--base.tfm
index f35731c15be..a6f06cff375 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-ly1.tfm
index 814cef77303..942021a1922 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-ot1--base.tfm
index f2a5ece9f09..fe112bfbb6d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-ot1.tfm
index 3f5e1fb9c8c..f59a694d63d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-t1--base.tfm
index 8c38721935c..5b4507835eb 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-t1.tfm
index 7d8fbf30e2a..cdf83c1e1a8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-t1--base.tfm
index 3c1c2964762..bd880b2fde5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-t1.tfm
index 7e8d036ccf5..61ac887ccdf 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-sup-ly1.tfm
index 04a979e487a..f55847aaad8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-sup-ot1.tfm
index bf7e92067d0..98d42690992 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-sup-t1--base.tfm
index 67706815602..9218f951b39 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-sup-t1.tfm
index fe7015ec5df..dd64039f617 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tlf-ly1.tfm
index a5ce55ef68a..f7318f4e3e4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tlf-ot1.tfm
index 3b7d3285a25..6e24c51c9d4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tlf-t1--base.tfm
index 716da69ea0a..efb8eda9d07 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tlf-t1.tfm
index 96bfac69217..e7091ad26de 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tosf-ly1.tfm
index 3b4c0f5ba47..f604b3ac98b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tosf-ot1.tfm
index ee16751841e..4b3016054c0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tosf-t1--base.tfm
index 7b07c9d7316..aa17c80dfc0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tosf-t1.tfm
index fbccddb00da..eadb5d5c5e9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondItalic-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-ly1.tfm
index a1a78d8a60b..bd6f814618b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-ot1.tfm
index 2066f03c649..02d5fd50770 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-sc-ly1.tfm
index 8c967fb2c74..8e69b5b19ff 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-sc-ot1.tfm
index e455d30a68d..53eb328f99c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-sc-t1.tfm
index 82c64931600..d7cfe0461d3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-t1.tfm
index 883345cad45..902082d18a2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-ly1.tfm
index bbfcd0f6514..6c712bd79e9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-ot1.tfm
index 02116cc5f20..54b782225ea 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-sc-ly1.tfm
index 0fd165b98a9..13eedf98c16 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-sc-ot1.tfm
index 76f12bbc233..cecdf7a7da9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-sc-t1.tfm
index 58a80467b27..d87905ba06d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-t1.tfm
index da73fbd51b2..5c797d3116d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-ly1.tfm
index 4484c11dae2..8d3c80fc6f0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-ot1.tfm
index 2b9f2e71d06..19f96c6b268 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-sc-ly1.tfm
index 76647d81b11..80fa7429f35 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-sc-ot1.tfm
index 37136d0f0c0..96f7e142fdf 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-sc-t1.tfm
index da0c1df26af..935489cdf1f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-t1.tfm
index c7d34af69e6..b6e2f23c4f0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-ly1.tfm
index 5838540d54e..6ff24c3f6e6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-ot1.tfm
index ed3e39fc1d4..4598bd0e42b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-sc-ly1.tfm
index e194733863b..ef1d9303add 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-sc-ot1.tfm
index bc23f2ac02a..649030156b6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-sc-t1.tfm
index 4b7b53306a2..5374a29835d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-t1.tfm
index 15a46b521cd..24d2f5a768c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLight-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-inf-ly1.tfm
index 9ade8705ed1..5dd226b540f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-inf-ot1.tfm
index e9ab6886c95..5fb61339f12 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-inf-t1--base.tfm
index 65fd3ab262d..b2533c89027 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-inf-t1.tfm
index ba94bb3da54..a43d62ce4ef 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-lf-ly1.tfm
index b7802f0f09d..4dd754271d3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-lf-ot1.tfm
index 5f4f5cbab3c..aa63bd9dc62 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-lf-t1--base.tfm
index 7aa06804eae..41b73d5bd96 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-lf-t1.tfm
index 5ebb9ed1788..7c9c5aad85b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-lgr.tfm
index f28d380515e..c38ecec88b0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-ly1.tfm
index 11bad95184d..150fbefc18f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-ot1.tfm
index f93a4bf3598..81406ab091c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-lgr.tfm
index e0c8a027c6d..15367716905 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-ly1--base.tfm
index 5f4fcd721a3..a351ed8d6e6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-ly1.tfm
index 78a8b957263..192e5e0577d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-ot1--base.tfm
index df30ee06804..b7eb5475ac3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-ot1.tfm
index ac34a2ac0f2..873023bc4af 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-t1--base.tfm
index 4e0e7319ee6..86de20534ee 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-t1.tfm
index 9888c15de13..18a8e737e8d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-t1--base.tfm
index 2c3cdfadfb6..ac05561409d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-t1.tfm
index 36824b14606..28b92fb21df 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-sup-ly1.tfm
index 5fcabd1e99f..ecb76e8590c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-sup-ot1.tfm
index 8f35e47db61..8b6d02581b9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-sup-t1--base.tfm
index 046311aa3cf..8b5a525818d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-sup-t1.tfm
index 76005b3afe5..303d7a7d5eb 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tlf-ly1.tfm
index 93df7ab4e83..f5087e7046a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tlf-ot1.tfm
index e8bbbceab35..7614d4869bb 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tlf-t1--base.tfm
index 5d5325d3402..cbe42e831f5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tlf-t1.tfm
index c995d5cbe67..5e8090bedc8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tosf-ly1.tfm
index beba1d5cfb5..e0a8589d40e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tosf-ot1.tfm
index 3838de50d20..48524848d0d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tosf-t1--base.tfm
index fa55ed75be2..9574d6f041a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tosf-t1.tfm
index da6053f3b99..34f50842e2f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondLightItalic-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-ly1.tfm
index 63930881a1e..79f63c3d7d7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-ot1.tfm
index a1082d601b8..a9efb2769d9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-sc-ly1.tfm
index a162afdef01..f4e058c210a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-sc-ot1.tfm
index 578e01bd645..5dacdb47db9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-sc-t1.tfm
index 35ee7b22290..4913434f3ae 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-t1.tfm
index be3103e7b1a..6ebdacd4cf0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-ly1.tfm
index 1f1029ba888..c7c90b00009 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-ot1.tfm
index 2dd6d87d2b7..d62ca061d6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-sc-ly1.tfm
index 6efa0fe8a82..5ae8ea522b4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-sc-ot1.tfm
index 4a2b909a083..e413e89cab7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-sc-t1.tfm
index fade3a141c7..47011756e3a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-t1.tfm
index be6ce09f2c1..7e3e58e9f97 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-ly1.tfm
index 5ba70a8bfc5..b6563ce1188 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-ot1.tfm
index 6fc40a00023..45667ce6293 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-sc-ly1.tfm
index dd652685533..e3cdc5fe4c2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-sc-ot1.tfm
index e6cb4a68cf5..95edf288820 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-sc-t1.tfm
index a1b96211fc1..3596e0fb580 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-t1.tfm
index 1edfe516548..7a8d662ebb1 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-ly1.tfm
index 36893acefd1..ee40ec4ad9b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-ot1.tfm
index 2581a05683c..a81c95f91a9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-sc-ly1.tfm
index 78fd5140c30..12dfaa5dbda 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-sc-ot1.tfm
index 77127c8d25f..58cc1490813 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-sc-t1.tfm
index 2d0b21ed376..399971d902e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-t1.tfm
index 098123d9b26..53f3566cf43 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMedium-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-inf-ly1.tfm
index dd65123283e..5b504494441 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-inf-ot1.tfm
index 323840e404d..2788f9bad03 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-inf-t1--base.tfm
index d6690cd7d25..30dd9c97e07 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-inf-t1.tfm
index b358e17d22f..d33270ab289 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-lf-ly1.tfm
index 78bf57695a6..fff431da475 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-lf-ot1.tfm
index b760668b8e1..0e2c2c15d9d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-lf-t1--base.tfm
index db63da002f6..41e35aa0770 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-lf-t1.tfm
index bf9f837cca7..318d9c37fc7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-lgr.tfm
index 1f666561770..af4c47ccdc7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-ly1.tfm
index 0a5b4ebe279..ff06453968a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-ot1.tfm
index 0c5f848560c..801495a4f7d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-lgr.tfm
index 434eec83ff4..f7cc1d97992 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-ly1--base.tfm
index c90b0b98bf7..5c00e836baa 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-ly1.tfm
index ced81bb3d6b..621105d7a7a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-ot1--base.tfm
index 14ea42c89e2..e72ce0e5580 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-ot1.tfm
index 0a9b85bc9d5..2c16852f850 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-t1--base.tfm
index 55f3a72d8cb..7fc98f5ee15 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-t1.tfm
index ce1b8847ac9..26b4b521a0d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-t1--base.tfm
index 6b72886c5d1..3ec4d5ce31e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-t1.tfm
index abbd320b97e..adf3ba90e79 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-sup-ly1.tfm
index 70b28dcab7f..11886954ff0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-sup-ot1.tfm
index 4ac0e1c20a4..18fd17b283f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-sup-t1--base.tfm
index 5ae1197e386..97070ff3b1c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-sup-t1.tfm
index 8c65643c25e..3946422b2d8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tlf-ly1.tfm
index 4582af98749..664cde9c164 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tlf-ot1.tfm
index bdeb08fc087..c905a0eddef 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tlf-t1--base.tfm
index 27d7c01db40..82248905411 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tlf-t1.tfm
index 413851c7cd4..43157bb4312 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tosf-ly1.tfm
index c9745508dc1..5581e6eb601 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tosf-ot1.tfm
index 960967d542b..3b6efa75d39 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tosf-t1--base.tfm
index 0b48a7995ad..439840c184e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tosf-t1.tfm
index b45bc5124fb..195d242620e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-CondMediumItalic-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-ly1.tfm
index 242659dc71e..a68b33927ff 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-ot1.tfm
index 0c74ae757e8..976e21e01ce 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-sc-ly1.tfm
index 59683ecff24..c9368c2d7e2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-sc-ot1.tfm
index fb29b2d90b9..d9418b74a91 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-sc-t1.tfm
index 858d661aa96..35e5d949c89 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-t1.tfm
index 467d8cb5983..b08d23f58eb 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-ly1.tfm
index fc08ae80c49..604521684f4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-ot1.tfm
index 07389e44337..30f9e0313b5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-sc-ly1.tfm
index 942d589e549..b3f30f2e159 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-sc-ot1.tfm
index 9db37a8feb2..02a46f2f92f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-sc-t1.tfm
index 76ff3ee3013..9a1915d4f94 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-t1.tfm
index 1b749ab4eac..5f9b8500dbd 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-ly1.tfm
index 8299c055f7d..44f4b2cfdff 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-ot1.tfm
index a677f2c0730..c60c412d763 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-sc-ly1.tfm
index e1deb54d154..f723de9162c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-sc-ot1.tfm
index a4f8c195982..3eef6635c2e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-sc-t1.tfm
index eb4f8bd8859..ffbe892b7bf 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-t1.tfm
index fba56a68248..81476c4a259 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-ly1.tfm
index 9f0e39102c2..48a9c963382 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-ot1.tfm
index a0250c3ab3d..e8f6b6a6686 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-sc-ly1.tfm
index 4707618717a..d872c4396f4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-sc-ot1.tfm
index ef53abfe895..6aba2fe6b57 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-sc-t1.tfm
index f08f84a73ea..b42ecb08392 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-t1.tfm
index 11e5f7e299a..f1f708f6eaa 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Exp-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-ly1.tfm
index 3bcea813b5f..50384c272a1 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-ot1.tfm
index 338ead31a79..882bed4ff5c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-sc-ly1.tfm
index a61cd16a2b4..5f96c986fc7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-sc-ot1.tfm
index 082b47c4600..180500a0563 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-sc-t1.tfm
index f5aac2fddf1..8157729be05 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-t1.tfm
index bf94d60b7aa..8a7d8e0b466 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-ly1.tfm
index 56de40ac6c9..64f8f2d4c96 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-ot1.tfm
index 56daf518eec..ab8d09490b2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-sc-ly1.tfm
index a3fa26b4562..cb4279eb7b3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-sc-ot1.tfm
index 57b2cd3be22..119ff020ac4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-sc-t1.tfm
index 03eb2f042d3..e5a64f8c279 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-t1.tfm
index b657e694fac..d86f332c879 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-ly1.tfm
index de1087dbd99..6441dd6d4ea 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-ot1.tfm
index 7153aec6e25..afb7db1ae02 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-sc-ly1.tfm
index 4aa05a322bd..759fda1aa2d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-sc-ot1.tfm
index f9c1cc9ca52..1c1d3ff1039 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-sc-t1.tfm
index 869bea1899b..14ee715ff1a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-t1.tfm
index a2ff64e84d4..3d58264b8ea 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-ly1.tfm
index 86597b3f5f5..0af944ede3c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-ot1.tfm
index 74f8ed85f55..e445563ca4a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-sc-ly1.tfm
index c6367075e60..d49958fecd0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-sc-ot1.tfm
index 6577a504f11..8bc0d430693 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-sc-t1.tfm
index da4b5916005..14331959a20 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-t1.tfm
index 9d4803fef1e..ea6c41914f2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBold-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-inf-ly1.tfm
index 5c84b3de34d..87954506ce3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-inf-ot1.tfm
index 93d6340a59f..21857dd239a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-inf-t1--base.tfm
index 6c3de324534..d61eb600e9c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-inf-t1.tfm
index 401ab512b5f..decdaf5631e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-lf-ly1.tfm
index 86a88d15a59..c5e369ed7ac 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-lf-ot1.tfm
index e6b528bd99c..d5137600aa4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-lf-t1--base.tfm
index c3250577f02..34c6088245c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-lf-t1.tfm
index 2388df940cf..220bb93fcf0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-lgr.tfm
index 4bfb01cd550..bed1d68e67c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-ly1.tfm
index 45b75f80801..7aec742fea7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-ot1.tfm
index 43c4ec78c31..a6f3a8d4dfe 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-lgr.tfm
index 4005619cfaa..c4dc93760b7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-ly1--base.tfm
index e82d5940a6d..8d6540abe36 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-ly1.tfm
index 9b11e5925d7..3126ee49109 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-ot1--base.tfm
index a890df3103b..031b3ef1996 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-ot1.tfm
index e91b295e609..d672f27124e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-t1--base.tfm
index 583bb1fa72e..cc1180ee191 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-t1.tfm
index 6565968a9f3..262a9616d9c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-t1--base.tfm
index 75df27e69ef..5b6a7287bb2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-t1.tfm
index 73dfef5013c..231e5565f40 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-sup-ly1.tfm
index 9b955d0b89d..314b965edb4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-sup-ot1.tfm
index 13478f1aba8..ccee240b3f8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-sup-t1--base.tfm
index 527d7a3e25e..ae399ba9089 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-sup-t1.tfm
index 8420b421c8b..7df2a2d26a0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tlf-ly1.tfm
index 8f1e59d7826..6ae795b5607 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tlf-ot1.tfm
index 2d312f2da1f..2740f5abec7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tlf-t1--base.tfm
index 4a7cb792da3..78b9d4502ab 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tlf-t1.tfm
index 99c7d0fc1c9..29f43e8e6d3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tosf-ly1.tfm
index f0e9f8232d8..d083c3909fb 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tosf-ot1.tfm
index 3b072ea7de8..95c04349c54 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tosf-t1--base.tfm
index 2497d596a3a..840cbfd12f9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tosf-t1.tfm
index 26a9105968a..4a9442a6e3f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpBoldItalic-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-inf-ly1.tfm
index 067bce0c16f..ea7b09af6ee 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-inf-ot1.tfm
index 42940c55a44..5578851fb59 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-inf-t1--base.tfm
index 34085b5d716..1cc2f9505b8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-inf-t1.tfm
index e224fb1219c..db4210bb9ea 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-lf-ly1.tfm
index dd70c97cd3d..b8d55b496c6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-lf-ot1.tfm
index f92c2a05500..c1423357de6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-lf-t1--base.tfm
index 3b08a7facbf..461031c7bb6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-lf-t1.tfm
index cf11214f094..ac6b683d3f6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-lgr.tfm
index 9355f00eb9d..9c64712dde1 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-ly1.tfm
index e04f29f6a39..f04abcc9b89 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-ot1.tfm
index 4440526c615..a24453b8f1c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-lgr.tfm
index ee430921baa..8dfec0fba6d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-ly1--base.tfm
index f102cb41d33..1719caa5d24 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-ly1.tfm
index 1e8fa26b8a8..be03cefde4f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-ot1--base.tfm
index 4c2140a5180..1958b77b769 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-ot1.tfm
index 06cee6e6439..b88b5e64f5d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-t1--base.tfm
index cc9570f9cc2..080605ca8be 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-t1.tfm
index 2cba4b4a12c..7284c8ce905 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-t1--base.tfm
index f844473c8b9..97c1b7cf1ba 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-t1.tfm
index 31bcd45bc42..27dd8da584d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-sup-ly1.tfm
index 9c4fac28ed3..e97b8735e55 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-sup-ot1.tfm
index dbfe03810ea..f70f97e44e5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-sup-t1--base.tfm
index 7d446f448d7..e7ad01ba15f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-sup-t1.tfm
index 5586563c57d..e43f226d365 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tlf-ly1.tfm
index 40307c3043a..e1436bbc8d8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tlf-ot1.tfm
index 1c9b1a060cf..e9b7fd223dc 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tlf-t1--base.tfm
index d905906b3ac..e68d4993cc6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tlf-t1.tfm
index 00a59f415ff..a508b7859f4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tosf-ly1.tfm
index f060b305fdd..c85d97f852c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tosf-ot1.tfm
index 31c0daa2fdb..0e579a3817d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tosf-t1--base.tfm
index 063d160ff94..98950dcf4d7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tosf-t1.tfm
index 9a61925fe7d..696b8784d36 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpItalic-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-ly1.tfm
index 6c36b72ea99..e307deac386 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-ot1.tfm
index 0128881ba06..6674950b6ad 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-sc-ly1.tfm
index ab1635fc4f2..7c482aa10c0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-sc-ot1.tfm
index 51d2db61f80..a1cd50e0558 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-sc-t1.tfm
index 1d0b8a5c1c9..fa096bd7a2b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-t1.tfm
index 8aff5aef5e8..4accf028498 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-ly1.tfm
index ff34ba239f9..ba113350e07 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-ot1.tfm
index 7e852ac1aac..46df9f89df2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-sc-ly1.tfm
index 5e7750c885c..18a1fa1bfa6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-sc-ot1.tfm
index 2326dc75867..d2fb34c762f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-sc-t1.tfm
index 17324aa94ea..77f1524575d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-t1.tfm
index cd20248bd9f..46644c06a70 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-ly1.tfm
index 13e7a4842c0..308069127a0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-ot1.tfm
index 202d7f42e5d..0f12bb80198 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-sc-ly1.tfm
index 91ca5683202..5125de16c8e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-sc-ot1.tfm
index eb59a5e5db7..d23299baa95 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-sc-t1.tfm
index d1ae1a404b1..fb2a25850d3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-t1.tfm
index fa4488c957b..978bb1cae71 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-ly1.tfm
index 87a0bc8bc7c..4db791f37db 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-ot1.tfm
index 8a531118a54..2dd7e82d2ce 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-sc-ly1.tfm
index 05a1205bef1..5c940854c32 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-sc-ot1.tfm
index d597f60c0c6..0854bfae276 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-sc-t1.tfm
index eb8dedb1800..598407ffb2d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-t1.tfm
index 08131d56e39..15a7f78ce0e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMedium-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-inf-ly1.tfm
index b92dd7c6921..df754afa594 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-inf-ot1.tfm
index 37f7c0b8025..bd1fff93edf 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-inf-t1--base.tfm
index cfcea0bab5d..ad3c2728c02 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-inf-t1.tfm
index ae8f51556c5..23efcc24a26 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-lf-ly1.tfm
index e2824742297..4e76f8c4cdd 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-lf-ot1.tfm
index a24f5b20365..b2870056e0a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-lf-t1--base.tfm
index ea5214cebdc..48929fba0e4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-lf-t1.tfm
index a02a5e89805..bb86bc25567 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-lgr.tfm
index f544a87fd84..3eeab926cc8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-ly1.tfm
index 21ff24a5af7..58b69eb535c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-ot1.tfm
index 9211edabd1d..9ed4caa4075 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-lgr.tfm
index 297a9616e15..583916f880c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-ly1--base.tfm
index 28a123b2eea..c119623dbca 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-ly1.tfm
index eff587e7718..5c00304c456 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-ot1--base.tfm
index 8a59bee566a..c0557763e53 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-ot1.tfm
index 994b177a2cf..51b7f3f8440 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-t1--base.tfm
index 2e97b13000e..3ca640ba232 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-t1.tfm
index ff7b1476ab3..f307f41b002 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-t1--base.tfm
index 6722d220a17..408fa41d1c1 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-t1.tfm
index 69087a016e5..a77cc47657b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-sup-ly1.tfm
index 00ef768f406..3d068caeb33 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-sup-ot1.tfm
index 900947813e5..baf58159538 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-sup-t1--base.tfm
index 27b18d744d3..af3f3e887e8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-sup-t1.tfm
index b5fc1450e71..5ecd6139a34 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tlf-ly1.tfm
index f949c08483d..4998297bb6d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tlf-ot1.tfm
index 9adee2c450d..0674d976001 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tlf-t1--base.tfm
index 7f26c4fe598..0c8f679a016 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tlf-t1.tfm
index 1977b459bcc..734bc90ba38 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tosf-ly1.tfm
index 7f3bd66cd07..1c3646017bb 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tosf-ot1.tfm
index 614cf5afc62..2f8fbbe4983 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tosf-t1--base.tfm
index d0b622e830b..cbc3ad459f6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tosf-t1.tfm
index b3a98347b3e..6b0641e92e5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpMediumItalic-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-ly1.tfm
index b3cf212136b..ffbf7865363 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-ot1.tfm
index ffa11ef128f..816db33e914 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-sc-ly1.tfm
index ea671717664..a0c3b5b875e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-sc-ot1.tfm
index 493f8c01218..8776e2e27be 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-sc-t1.tfm
index e64ce5f093a..329980674b4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-t1.tfm
index 24526aa01cb..076ec1f9a3b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-ly1.tfm
index 5865b9fa5fb..ef6a8853ee9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-ot1.tfm
index 4bf6ddde33c..b81174e965e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-sc-ly1.tfm
index 4536e05acd5..044cb04bb4b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-sc-ot1.tfm
index 6c9e3b92f22..fc929c9fabc 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-sc-t1.tfm
index 730c714b012..1f826cc305a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-t1.tfm
index 503702f2ffe..dc2e601f59e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-ly1.tfm
index 9e230ca6c1c..17eb7bd77ec 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-ot1.tfm
index c5ea5d401a0..3706063319d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-sc-ly1.tfm
index 42f2d19772f..026a89e2e38 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-sc-ot1.tfm
index ce2dd8213b3..ac8b1d445ed 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-sc-t1.tfm
index 99212791aa1..cd76a52acf9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-t1.tfm
index 1031f917d75..00b512bee36 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-ly1.tfm
index 035a064a054..d84e5ecb832 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-ot1.tfm
index 5520a3a4d8a..ac083796035 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-sc-ly1.tfm
index a27ee685275..ac00e92dae6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-sc-ot1.tfm
index 60d585f05c0..ae9ff4bceb4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-sc-t1.tfm
index ff6591f08ee..1668d435f9f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-t1.tfm
index fb1f0c9b4da..7e2bec34ec7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBold-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-inf-ly1.tfm
index bcc1acc11f1..955e2f2e2a8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-inf-ot1.tfm
index 1effd1bcbaa..a7b44e2da09 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-inf-t1--base.tfm
index 3080d44d4c1..23e94b9c5a6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-inf-t1.tfm
index 567e1767540..ecec20779e4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-lf-ly1.tfm
index a45d0f99aa3..b36a2185231 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-lf-ot1.tfm
index 4c696b8b709..dafb75686c0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-lf-t1--base.tfm
index d0857df6ac4..28e56eb0262 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-lf-t1.tfm
index 7571b241162..319e0e6e3a3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-lgr.tfm
index b4ff4fe86a6..3d83408059f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-ly1.tfm
index 82dd5ac154a..799b531117d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-ot1.tfm
index b9dbda6e649..862c4d4349f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-lgr.tfm
index f1e8d07db4f..55fafae63d0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ly1--base.tfm
index 58985957b21..eed7a0c81a4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ly1.tfm
index cdf67ce86d4..b88dbe11e65 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ot1--base.tfm
index 1b6673c9a4f..11a473cc0d6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ot1.tfm
index 090b80bb4cd..8075966e2e6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-t1--base.tfm
index 1c3c27f0077..74729f159cf 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-t1.tfm
index 6ae304c37cf..2aa2e727fe9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-t1--base.tfm
index 09afcca46ad..778e60c1c9b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-t1.tfm
index 28cfbe2ac91..d6b9b07edcb 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-sup-ly1.tfm
index fffa27d4eea..76557e64f10 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-sup-ot1.tfm
index 3e141d5e03d..67175402df1 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-sup-t1--base.tfm
index a454607c2e2..72139d0bc04 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-sup-t1.tfm
index 92a2a8903a5..3a2c98c6c7b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tlf-ly1.tfm
index 9ca1a560748..fd61441dd98 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tlf-ot1.tfm
index adc99ddf1a4..bb5982f63a6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tlf-t1--base.tfm
index 033e8e001c8..b03e4fc3836 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tlf-t1.tfm
index 17b1155ad9a..7c1e59cf2a7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tosf-ly1.tfm
index f115265ddce..5cdf935a930 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tosf-ot1.tfm
index ae831e07671..e7e17a48aa7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tosf-t1--base.tfm
index e8620532323..c4ac59a674f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tosf-t1.tfm
index 0a550a0f21e..24cf235fc7b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-ExpSmBoldItalic-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-inf-ly1.tfm
index 62f9921c46c..1ca3be672e5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-inf-ot1.tfm
index 2eb42033c48..011ee30ffee 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-inf-t1--base.tfm
index 17fcb0d075b..b072017a41c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-inf-t1.tfm
index 412e8154551..aa1d9ab1226 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-lf-ly1.tfm
index ee55eec8733..e36a12c24e5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-lf-ot1.tfm
index 59041b62f73..d3f186d4e0c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-lf-t1--base.tfm
index 608753d166e..5ed3ccca293 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-lf-t1.tfm
index 3e9100bfb6d..b5b6ca92854 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-lgr.tfm
index a32be4836b0..c6fe34c63ee 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-ly1.tfm
index 654f1caae23..69642d37045 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-ot1.tfm
index 3d4f4896c95..7737ce977a6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-lgr.tfm
index 3484d8e2dc4..a3f9d838da4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-ly1--base.tfm
index fede7122e14..fa717001a43 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-ly1.tfm
index 87008bd3768..913a4c73546 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-ot1--base.tfm
index b96b8042168..4e9f27899f2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-ot1.tfm
index d0b3415d5ce..13d0521f3f8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-t1--base.tfm
index fa546a2e47e..98cda7d1bb3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-t1.tfm
index e3029f70e2e..e0b27581a75 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-t1--base.tfm
index 65e83cf8699..b560c6290d1 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-t1.tfm
index 4bf70807b5a..b8b5040c995 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-sup-ly1.tfm
index eb3240cf7a5..718b601bf87 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-sup-ot1.tfm
index 8c1281fe08e..be5658cfa22 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-sup-t1--base.tfm
index 38e89336049..be6ed6b26c3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-sup-t1.tfm
index a3bb561773b..7447541c4da 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tlf-ly1.tfm
index 94cdaa0cd1f..3f2e193edfa 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tlf-ot1.tfm
index 316e35a05e1..7b0301b26cb 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tlf-t1--base.tfm
index a4bda0d4bae..ae69b10bef5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tlf-t1.tfm
index 10d68a1521d..c410820523e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tosf-ly1.tfm
index e399ed81f5f..09a0af355b2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tosf-ot1.tfm
index 54b7f9dbd4e..a1644b5664e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tosf-t1--base.tfm
index f4b0ab84ed2..926b19b3611 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tosf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tosf-t1.tfm
index 02a95e6717d..2a8b01f2913 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Italic-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-ly1.tfm
index f0f5646f058..60bea165ec2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-ot1.tfm
index c984b895cbf..b1845c65198 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-sc-ly1.tfm
index 330dba80bcc..4f5332740ae 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-sc-ot1.tfm
index ad44eaec0cf..c677065182d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-sc-t1.tfm
index 30356cc217d..8a6f3d10953 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-t1.tfm
index 2e09daa28e2..950ad24c558 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-ly1.tfm
index 8b555bea31f..5f48ba15725 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-ot1.tfm
index 8442dadcc0b..dedbe9ce33d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-sc-ly1.tfm
index b28e9d4124c..9f9475d0ec6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-sc-ot1.tfm
index a6f23b4649f..effedc41d8e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-sc-t1.tfm
index b39de400d04..39bd9893ac5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-t1.tfm
index b97a26b76bb..c2f6b772bf8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-ly1.tfm
index 49c86a5771b..0d86424d46b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-ot1.tfm
index b58817dd227..e78aa1ff53d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-sc-ly1.tfm
index d776f651856..a26a3b1acb8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-sc-ot1.tfm
index 03d581311ec..ce2d467a4ac 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-sc-t1.tfm
index 18b197a66a2..4de352175da 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-t1.tfm
index 1d4aab67ddc..88148f79d36 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-ly1.tfm
index c460908c85d..5c2859a86db 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-ot1.tfm
index 25c7fa15865..f800eaf236e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-sc-ly1.tfm
index d36340b8df3..870273bdc5e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-sc-ot1.tfm
index 2a9ac45ce51..677918655e1 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-sc-t1.tfm
index d9443898a3c..defcc2a7eba 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-t1.tfm
index 1598c3b02c0..0619cce8d99 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Light-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-inf-ly1.tfm
index b8e22cdb3b4..c8e559b8e21 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-inf-ot1.tfm
index 0032472e553..ec0e01668d0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-inf-t1--base.tfm
index e2e94e386c8..6dccd5a0072 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-inf-t1.tfm
index 291ba19a671..fb4fd363ac2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-lf-ly1.tfm
index a443e566f25..5f6cee7a9fe 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-lf-ot1.tfm
index fc6cfc7b45e..5aa3ab9cff7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-lf-t1--base.tfm
index a8d033d47c7..4a1fdaf06da 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-lf-t1.tfm
index 85063d13024..2aa9b611af5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-lgr.tfm
index 7f6b18a54af..65f13441b34 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-ly1.tfm
index a4b0ed37566..2e94238a388 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-ot1.tfm
index bd30a19b917..e8bc68886e3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-lgr.tfm
index e0e7e6abd57..267a9cf38f9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-ly1--base.tfm
index ca52ac11a96..e8a7798c5f6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-ly1.tfm
index 67f38fe5ef4..e6103f5d7c3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-ot1--base.tfm
index 546fb230f99..173b451b122 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-ot1.tfm
index 34d41a4377c..34efd688b2b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-t1--base.tfm
index 116ba46860b..e0ba85e29d1 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-t1.tfm
index ba56e203b5d..8b7c6e4053b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-t1--base.tfm
index 0208a166ffd..ed19a644f0e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-t1.tfm
index d4dff6f1f8d..4f0e9b30d02 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-sup-ly1.tfm
index af983df1cc3..b69f4766d5f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-sup-ot1.tfm
index a3cf83ae8f5..8cae199f1bb 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-sup-t1--base.tfm
index a68a3d9256f..e29a80ede23 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-sup-t1.tfm
index 6c5657ed1a6..4d0104f5a47 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tlf-ly1.tfm
index 4e30b042631..6283bc67377 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tlf-ot1.tfm
index 2009e68741f..ffcb4e4ff0b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tlf-t1--base.tfm
index bca73e6b426..33aa84bddda 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tlf-t1.tfm
index 950ab69c2c1..23d03d4ba69 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tosf-ly1.tfm
index 5b12d6abf1c..d6f7a5580e4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tosf-ot1.tfm
index 09b1afe1cd7..7ac6c60979b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tosf-t1--base.tfm
index d15a64db9bc..9451a51778e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tosf-t1.tfm
index 28b2f3c45c2..7b253e4fb5d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-LightItalic-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-ly1.tfm
index 9778bc08c21..fc88a0225db 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-ot1.tfm
index 0362a78f1d2..46e413d70d5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-sc-ly1.tfm
index 3f4c92763d2..69e5991d78a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-sc-ot1.tfm
index fd1dbe6e228..42703ec72f0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-sc-t1.tfm
index 8c1f5aa0523..224140b2e05 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-t1.tfm
index 544c98306ba..221031070d7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-ly1.tfm
index a6afcb3040b..c0cae7c8be2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-ot1.tfm
index 402fa820864..22881b2fd26 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-sc-ly1.tfm
index 0de68f99a6e..af3e03b5c9d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-sc-ot1.tfm
index 0645542ee62..074327c3eac 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-sc-t1.tfm
index 9f8982ee31a..cb5214808b3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-t1.tfm
index 9df911d1bc9..6604bfc332f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-ly1.tfm
index 68af14f98a0..c3928ff7245 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-ot1.tfm
index 059fabc1d47..04bea9ec3ff 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-sc-ly1.tfm
index 5a65dab8042..bde063c3229 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-sc-ot1.tfm
index 0328c680602..759c71873fa 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-sc-t1.tfm
index 79268504f4d..1793e1eac1c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-t1.tfm
index 7c513ec28d2..bd0960dfd3c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-ly1.tfm
index 850c148c372..a75b2979bb7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-ot1.tfm
index 4455f162797..da0a455f87c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-sc-ly1.tfm
index babc0f52378..4cd53ca9a08 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-sc-ot1.tfm
index ff683e54ebc..5677adcb9cf 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-sc-t1.tfm
index ba346812256..27b4332a4a6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-t1.tfm
index b58e526e0bb..abf8b6167f1 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Medium-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-inf-ly1.tfm
index e9eb66bdfd2..775f69aa714 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-inf-ot1.tfm
index 9b61b95b402..1e39ea79d39 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-inf-t1--base.tfm
index a574905b09a..b3b1ebf0e15 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-inf-t1.tfm
index da265b34212..72e53446423 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-lf-ly1.tfm
index 23b8eb21570..0dcd91873bc 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-lf-ot1.tfm
index ff326b28218..8f8dd4b778d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-lf-t1--base.tfm
index 1cef1f934fc..97994e2e5ae 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-lf-t1.tfm
index 84392dc89bc..2afff20eb4f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-lgr.tfm
index fcf1f5ac9d8..2b444c28c9f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-ly1.tfm
index cf2d799942d..3969dfd4f92 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-ot1.tfm
index 19c4d127c66..13b3f3fe4a9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-lgr.tfm
index 0a426b2a8ae..a0d97b12f8b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-ly1--base.tfm
index 9e4235748b5..497ce4f915c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-ly1.tfm
index 5aa66d260f6..4a8b9b9f18d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-ot1--base.tfm
index d471b0138e3..6bc63edcb96 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-ot1.tfm
index e766f40e06c..a3bb230f2db 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-t1--base.tfm
index 1c333795937..b9a96ab2337 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-t1.tfm
index 723bfa8d9a9..9f7b39c9691 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-t1--base.tfm
index b76461bcf44..45c1be0b681 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-t1.tfm
index 18830fdbbe2..abdbd99fd29 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-sup-ly1.tfm
index 52712488fa1..3212e887662 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-sup-ot1.tfm
index 4a5c36af950..e07874d77de 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-sup-t1--base.tfm
index cb2702cc3ab..f20021b403e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-sup-t1.tfm
index ffa13b7b1fe..a8002509495 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tlf-ly1.tfm
index 7c6154eaf6a..75928b1eec6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tlf-ot1.tfm
index 8bc53e49ed6..3182493bdb8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tlf-t1--base.tfm
index 9d27de287d2..5619f428250 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tlf-t1.tfm
index c5d9e210106..522a159fba0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tosf-ly1.tfm
index 4120606cab9..2d54b627dcd 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tosf-ot1.tfm
index 37ffc4ef338..5e0b39b6ca3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tosf-t1--base.tfm
index d52a3aeadd8..264a222b50d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tosf-t1.tfm
index 14292305bcf..c075f37a4fb 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-MediumItalic-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-ly1.tfm
index 06ae7366556..d266ca78018 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-ot1.tfm
index 7a824c64db7..ca0e0523dbc 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-sc-ly1.tfm
index 58b1b29025f..6e74be7fe17 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-sc-ot1.tfm
index aceb4d12351..a5de1991014 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-sc-t1.tfm
index 7b4f90f2f7f..4a4c412ef27 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-t1.tfm
index 182cd9fbe7d..89b1be9915d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-ly1.tfm
index aa04d805bfd..cb77144a908 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-ot1.tfm
index d1889bf92a5..3165990695e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-sc-ly1.tfm
index 6a158cfca46..45cb08910e3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-sc-ot1.tfm
index de0ac0cbfe1..5a9298dda73 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-sc-t1.tfm
index 9cabe36e461..a5d91981d0b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-t1.tfm
index 3099e69caa8..8969629f9b7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-ly1.tfm
index 2cfae1efe37..84eedeecb84 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-ot1.tfm
index 405cbf291a5..473e60bb795 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-sc-ly1.tfm
index f16ba8e5c60..02ffd064ec9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-sc-ot1.tfm
index a9456d03f9b..5c536f28b52 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-sc-t1.tfm
index 76e3843b7e1..c9dc8666578 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-t1.tfm
index 605150b3a62..23ff0724690 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-ly1.tfm
index 0c98a85d861..959a7cb5c4e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-ot1.tfm
index 3ca87868b30..ef228f2ba61 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-sc-ly1.tfm
index 9d0064fbd94..45fc9fed420 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-sc-ot1.tfm
index e6e554a20c5..0d9e91d9f91 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-sc-t1.tfm
index 9ac1adf90e8..e6d6dfcea76 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-t1.tfm
index 1ad7c4dca1b..d101b4f3f92 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-Regular-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-ly1.tfm
index 3ba2232f033..d22b6620880 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-ot1.tfm
index d7768be363f..1ff21e2868f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-sc-ly1.tfm
index 765a3acc8b2..042fd0ef4fa 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-sc-ot1.tfm
index 5ada9f7fd9b..cd223a7a0b5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-sc-t1.tfm
index 4822e5b64b3..0bbd459da75 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-t1.tfm
index 6d7a40a764e..cfa125d3f2f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-ly1.tfm
index 8bcc451b229..2cce1ff3f4c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-ot1.tfm
index dd286a9a401..ee39e09fbdf 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-sc-ly1.tfm
index 973aa766dfc..ded6aee007e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-sc-ot1.tfm
index 3fdabd52771..58c1ead1770 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-sc-t1.tfm
index 8b0a40ba2c3..abff1029e0a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-t1.tfm
index 1a32246aeac..c8191e46b2b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-ly1.tfm
index e798c950aee..11c5591c2dc 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-ot1.tfm
index 594856ead61..8d5b579a8bd 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-sc-ly1.tfm
index 722f720ad64..be8fa524c6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-sc-ot1.tfm
index 227890e7fed..70a10c21334 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-sc-t1.tfm
index 98a4f35f062..76c9b447fd5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-t1.tfm
index 7b887e1156e..db0e41694ec 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-ly1.tfm
index dd2c451547e..b47322fd437 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-ot1.tfm
index dbb50976fa4..a833ace98cd 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-sc-ly1.tfm
index cb128295908..9e02e1bfbe6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-sc-ot1.tfm
index fe3d3d0b23a..69c3747fcc8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-sc-t1.tfm
index 4c4c1c057f9..6300223e20c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-t1.tfm
index 90df70913ef..e4d01c21d23 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBold-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-inf-ly1.tfm
index 3bb67fedb29..8adcf933b73 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-inf-ot1.tfm
index 1b5c1151329..734baa3b345 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-inf-t1--base.tfm
index 9531f7e2dbd..677f7440965 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-inf-t1.tfm
index 3b7cadb23a4..7b817100a93 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-lf-ly1.tfm
index 529a3e22d9f..a6dc4a58635 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-lf-ot1.tfm
index 9a206c5003a..8045edaa025 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-lf-t1--base.tfm
index bc7e1377765..ba4be4bf727 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-lf-t1.tfm
index a9125d1ffcf..609986a6e68 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-lgr.tfm
index 13d5b9fc469..5fb1fff63bc 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-ly1.tfm
index 285f96e2ebf..46927b11a82 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-ot1.tfm
index b03e444ce60..dc17f82ab0d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-lgr.tfm
index 969dd6695fe..637da225e7a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-ly1--base.tfm
index e208c6bb92e..69738822728 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-ly1.tfm
index 2211e0722e9..0caf8ea6f28 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-ot1--base.tfm
index aebcd139988..fc773498c75 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-ot1.tfm
index 775a00de261..9614fe6a770 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-t1--base.tfm
index a7ba12bfec9..025f0f79ba2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-t1.tfm
index e840b0285d4..7e66389366f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-t1--base.tfm
index 6112ce71135..ed3f2aca68c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-t1.tfm
index 957e99509e2..58d03472112 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-sup-ly1.tfm
index 76984b0a6cf..d8d924ff61e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-sup-ot1.tfm
index d181277ab2f..a01f7ce1b84 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-sup-t1--base.tfm
index b6c4ebd5967..b15914ebedb 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-sup-t1.tfm
index 46a66c350c3..90f51e5abec 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tlf-ly1.tfm
index 4dda0dbdffa..5026543036c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tlf-ot1.tfm
index 14d5a9d5f77..afa7f833f5b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tlf-t1--base.tfm
index 47fa96cf515..6aec9234a2a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tlf-t1.tfm
index 6ff88e50ad5..867e4dee5f5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tosf-ly1.tfm
index 3754febe765..dc04089578c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tosf-ot1.tfm
index e68dc98f158..e7277c7cf04 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tosf-t1--base.tfm
index 6a4461467a8..e4e47d3b453 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tosf-t1.tfm
index c100439f5c8..80868b734c7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmBoldItalic-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-ly1.tfm
index 75179b97ed9..3ddda7b95ad 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-ot1.tfm
index 489cf8c6832..bfa6f42dbf0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-sc-ly1.tfm
index 45397537fc7..827965c6547 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-sc-ot1.tfm
index 0a93e701139..c640a469fe6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-sc-t1.tfm
index a7777d3bdba..baaf944c61f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-t1.tfm
index 4bf2eee5429..0c13eb38d4e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-ly1.tfm
index 737ae3cda0e..9a35daa6f6e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-ot1.tfm
index 800a1e5f719..60843c2c2a3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-sc-ly1.tfm
index eb1e3a5691e..9ee023f73a1 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-sc-ot1.tfm
index c2e0e1f9533..2307b6c070c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-sc-t1.tfm
index c1d4a5f544c..0f9c8b87294 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-t1.tfm
index c84dfcfa358..33b67de40b6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-ly1.tfm
index 5bb31749d33..c75b3aae697 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-ot1.tfm
index a035666c133..832ab445809 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-sc-ly1.tfm
index 52408a80b9d..05b2b503265 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-sc-ot1.tfm
index 3ad0b429317..1de4a5ba2dd 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-sc-t1.tfm
index f6d0032b315..9ee37b0102f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-t1.tfm
index f83e00d4b76..d5ab7736fe2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-ly1.tfm
index cd60d291403..7db23173790 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-ot1.tfm
index 6e87b84374c..07d24784d79 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-sc-ly1.tfm
index 7b1746c69d8..78db0c90a25 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-sc-ot1.tfm
index 6014bb2e98a..0e7d3f8e7d3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-sc-t1.tfm
index 3407e962f6b..015e4f240a5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-t1.tfm
index 7fd2dcc0099..48b66d5f77f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCond-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-inf-ly1.tfm
index 0ae2c80510e..1805f14c40e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-inf-ot1.tfm
index 810f23515a2..63c044ef190 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-inf-t1--base.tfm
index c899ada1996..5808ecf4d8c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-inf-t1.tfm
index 7c41d456ef3..8b55e44e639 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-lf-ly1.tfm
index eda07283752..b904da8cd51 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-lf-ot1.tfm
index 93c67003738..95c98e25f65 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-lf-t1--base.tfm
index 8afc0f6976d..29a3025c887 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-lf-t1.tfm
index f6e4ce69119..b14e4188998 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-lgr.tfm
index 9d1c892b3c9..c9efa165c8d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-ly1.tfm
index 2bc93692cc9..2fbff44574f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-ot1.tfm
index 3b91fec4b72..49d8e56ff08 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-lgr.tfm
index 72ef704d217..7b708abbaa1 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-ly1--base.tfm
index 27fb8d47d51..fe1cd35deac 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-ly1.tfm
index 469574b07b6..364799b507d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-ot1--base.tfm
index 84bad6d518f..292196764c5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-ot1.tfm
index 4248bbff85d..ef1ae5a735d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-t1--base.tfm
index d75ed0d2d16..d2227eea723 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-t1.tfm
index 84435a31c4b..e006964675d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-t1--base.tfm
index 1fdc283260e..dd74a1e124e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-t1.tfm
index 144e9aa8a93..0ec9fef9c21 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-sup-ly1.tfm
index 610ab37ffa0..d669db770ff 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-sup-ot1.tfm
index a783c287242..6c036c5b325 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-sup-t1--base.tfm
index 93d4e0965c1..820009cc473 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-sup-t1.tfm
index 022e4739219..da48b560da1 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tlf-ly1.tfm
index cd65e08779f..0a07d4b61ac 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tlf-ot1.tfm
index 1d1834b0482..092011e00c1 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tlf-t1--base.tfm
index f8c44dfe83e..dd5c880f0a0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tlf-t1.tfm
index e1079af544e..281b47cbcb9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tosf-ly1.tfm
index 8ff17c42347..9377e0ae9a0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tosf-ot1.tfm
index 64854efb3f0..d085a37a93d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tosf-t1--base.tfm
index 9a12fb01a8d..633ea6a4dd2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tosf-t1.tfm
index b2d635078fe..9bd7ff81c06 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondItalic-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-ly1.tfm
index 6b716a8c4a0..0880424550a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-ot1.tfm
index 45ae9aebbe2..4d28da7b2fb 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-sc-ly1.tfm
index 9c8ffbdabaa..f4d4a528e96 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-sc-ot1.tfm
index dc3253eb96c..8ef20883575 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-sc-t1.tfm
index 9dd88cb1cab..4af8d977966 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-t1.tfm
index 72989b30db7..e9ad4a6566f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-ly1.tfm
index 94beee71d21..d3d2f8b5f03 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-ot1.tfm
index 1b3f13b965f..748684e4604 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-sc-ly1.tfm
index d360583b0da..67b32062dd5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-sc-ot1.tfm
index 4358a57b0df..576d6fd172c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-sc-t1.tfm
index f1c8cb6ff69..3c3750b0dd8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-t1.tfm
index 4a52688b1c2..865cd696658 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-ly1.tfm
index 0e081e70e42..d882168a68a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-ot1.tfm
index 866b6ec00e5..6d2fd8de60c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-sc-ly1.tfm
index 5bb8e8b0070..c575af0789a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-sc-ot1.tfm
index 8cc3a51ec1c..9e723e0c0e4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-sc-t1.tfm
index cccca5d7116..c2fb5f1c36a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-t1.tfm
index b52c541b196..da745de7135 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-ly1.tfm
index 6bd3667d4f7..64f4c159e19 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-ot1.tfm
index b6ff6454d27..85464787d83 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-sc-ly1.tfm
index cd11ce1a5d9..df0d607c7cb 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-sc-ot1.tfm
index a03da8778de..41568852875 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-sc-t1.tfm
index 44bdb0451ee..4cad98a05a0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-t1.tfm
index b8f901e04de..eba0828f455 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLight-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-inf-ly1.tfm
index a124b2225ad..cebb9ea77c5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-inf-ot1.tfm
index 05fc6450cf3..b9b429c61c3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-inf-t1--base.tfm
index 7397ffac137..0a774eeb52d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-inf-t1.tfm
index 5b292b2190b..28c42a42ac7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-lf-ly1.tfm
index 02ddfdca088..5beb3d6e034 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-lf-ot1.tfm
index 692a94a1728..e19edb977d4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-lf-t1--base.tfm
index 0c6168c3be4..2d30d96272b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-lf-t1.tfm
index e34107161bc..d6b1dc432d5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-lgr.tfm
index 6ba679b81a5..c8f3ac81c4c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-ly1.tfm
index f507c9292b9..ddde152b63d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-ot1.tfm
index c0ffa27d6ef..d46e94f3083 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-lgr.tfm
index 23eabb9e8e8..22d422c4748 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-ly1--base.tfm
index 35fe0ac4a3b..cd6be6cd7d4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-ly1.tfm
index 0627af754be..f81ff1614db 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-ot1--base.tfm
index 0ae3a6ef6f5..b38fc473102 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-ot1.tfm
index af00d0e6130..a10f394824e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-t1--base.tfm
index 9b5c68725e6..151dd62070c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-t1.tfm
index e105f7d0bec..186ee1e77fd 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-t1--base.tfm
index 6db5c869fe3..cd7cda76f20 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-t1.tfm
index f5a91274041..e60cff988f2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-sup-ly1.tfm
index c598e482121..a6fc877b097 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-sup-ot1.tfm
index cf6fb376169..36d8b09912a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-sup-t1--base.tfm
index e6717a8da54..1d014b435da 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-sup-t1.tfm
index 812e9755beb..b2118226fe9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tlf-ly1.tfm
index 13253ea0f8a..3e8b44037c2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tlf-ot1.tfm
index 36d788aff86..fce20222d4a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tlf-t1--base.tfm
index a19902f6537..e08636df94e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tlf-t1.tfm
index 2af986027c8..3725a4b212b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tosf-ly1.tfm
index d818beff8e7..9e4f9401997 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tosf-ot1.tfm
index b613480d68b..2f5a8f74cfb 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tosf-t1--base.tfm
index 7c2e8956e97..c72c566ab18 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tosf-t1.tfm
index 7967809c4b9..eefbc73a8b9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondLightItalic-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-ly1.tfm
index dd4672082ee..294a81ac11f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-ot1.tfm
index 5982d2c624e..9df64272237 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-sc-ly1.tfm
index 3f23b0bc220..5c1c0982ac1 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-sc-ot1.tfm
index f26cacd5874..bc8aedfe844 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-sc-t1.tfm
index 30fafda8be9..3414b9531b8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-t1.tfm
index d07f5525473..ae0fdb512e4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-ly1.tfm
index 84c91d38abd..6fbeb0b87c7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-ot1.tfm
index a6fba084c7d..2f63db545bf 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-sc-ly1.tfm
index f1cc5452d0c..ae648e6c4f3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-sc-ot1.tfm
index 550fd669176..771ee3f651c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-sc-t1.tfm
index 3e0f13f5a9c..ba9c9b7512c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-t1.tfm
index 8fefae49ae6..cf3461bd75a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-ly1.tfm
index 9cb6aec42a4..79ffadbb829 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-ot1.tfm
index b4955f1df9a..a5af334bd75 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-sc-ly1.tfm
index 273dfab1db7..68b71805691 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-sc-ot1.tfm
index 6289109e302..cd0b7411fde 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-sc-t1.tfm
index eb69ce7d3a5..1a8fbc9fc7e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-t1.tfm
index 95f9b562569..813c8e70e40 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-ly1.tfm
index 7fc4bdd3ea8..f211221716d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-ot1.tfm
index 1f5da058b58..97626ec627a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-sc-ly1.tfm
index 8bcdc659ef1..839637fd76d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-sc-ot1.tfm
index 398abb85849..bd6023d2649 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-sc-t1.tfm
index 960de907f5b..225bc42f0f7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-t1.tfm
index 60e99c416bf..7405866807f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMedium-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-inf-ly1.tfm
index cbc33f9052a..1a4713253c7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-inf-ot1.tfm
index 10d876ef168..2bb1f159688 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-inf-t1--base.tfm
index 2123a1f4d91..47d0cb6ca8c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-inf-t1.tfm
index f4ed98f1a4e..f08a71e1a08 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-lf-ly1.tfm
index f080ebb6d50..99111f88eeb 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-lf-ot1.tfm
index a45776e5881..ea533bfd729 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-lf-t1--base.tfm
index b0b5b965c23..28d8cecc884 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-lf-t1.tfm
index dde82d44f01..52ff0c19999 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-lgr.tfm
index c6428d3b264..ddfd4cc11eb 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-ly1.tfm
index 4b63f2a21a9..7270084317f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-ot1.tfm
index f459e9526c2..fe0779b1382 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-lgr.tfm
index fdf1683f8ab..0a61f1232d2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ly1--base.tfm
index de4e1585366..bf9207029ab 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ly1.tfm
index d2573aa981e..10a974d9070 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ot1--base.tfm
index 8be9dab0d53..827261ba340 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ot1.tfm
index 780675464a6..23afe6493e5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-t1--base.tfm
index b86611e832c..28299d2b5cb 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-t1.tfm
index c3d26a34151..8661d8ebd4f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-t1--base.tfm
index dc7eada03f9..b901b3c2aff 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-t1.tfm
index 48f1ec74ad4..7e110d62162 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-sup-ly1.tfm
index 577ba12ab49..f39810aae4c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-sup-ot1.tfm
index 9757921bbff..0476dbca64d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-sup-t1--base.tfm
index 26973782d39..0b89c112866 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-sup-t1.tfm
index f4623eff086..eaab9fddd2b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tlf-ly1.tfm
index 6a2c13ab2e2..990d902d26e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tlf-ot1.tfm
index 614af71070b..b6aa76d8e65 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tlf-t1--base.tfm
index 6056c27889b..68d8fbdc486 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tlf-t1.tfm
index e3a82a70158..7b5e7371756 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tosf-ly1.tfm
index 483ecf96098..ef9aae8941a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tosf-ot1.tfm
index 3ccac30cd4a..974b13ef648 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tosf-t1--base.tfm
index b895612f3bf..7df68d27a89 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tosf-t1.tfm
index ca96122699d..0eff85f1780 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmCondMediumItalic-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-ly1.tfm
index 33f72bb28dd..2309f4f19b0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-ot1.tfm
index 83ee69e1882..7fdaedfaf47 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-sc-ly1.tfm
index e8d26eea4cb..925634ecb7b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-sc-ot1.tfm
index 302fdf4f8f7..11281bb4049 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-sc-t1.tfm
index 75523909625..dfc1e731e0d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-t1.tfm
index a60974f38c2..e476f156164 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-ly1.tfm
index c4890147f3e..d25e3eccd6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-ot1.tfm
index 56e91152b4c..5706a675711 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-sc-ly1.tfm
index 5e8a9c6fe5b..02ef641dee7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-sc-ot1.tfm
index a3fe1e6e5eb..e4617700096 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-sc-t1.tfm
index f57f0e29426..12f522e8052 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-t1.tfm
index 55d9c06359a..9bd6b279030 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-ly1.tfm
index fba9e4666e7..b0b2a3aab95 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-ot1.tfm
index deacc2d7bef..a11c99af569 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-sc-ly1.tfm
index e9c205bf45a..dde2b0b59cd 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-sc-ot1.tfm
index 4b0ae23c6fa..6ef8d39ef79 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-sc-t1.tfm
index 3e48dd1515d..e1d35f10fc4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-t1.tfm
index 71feca98f72..5304e439a40 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-ly1.tfm
index 11cf17b71e5..838713eb282 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-ot1.tfm
index 281114f771d..d82768bc5a1 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-sc-ly1.tfm
index 6937de791c7..719ad9e00c3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-sc-ot1.tfm
index 08ee1e6e208..997a19c3cd0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-sc-t1.tfm
index 937662e77db..8628b027ebd 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-t1.tfm
index 5e677502a47..682d96dc34a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExp-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-ly1.tfm
index 824008cac1c..0085685d594 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-ot1.tfm
index 5e3c78d724e..147f6d2401b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-sc-ly1.tfm
index b7cfc15157a..dcdc614446d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-sc-ot1.tfm
index 7923c5de0c2..1e6803131f1 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-sc-t1.tfm
index b28fe2c7023..d1670fafe96 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-t1.tfm
index 2b64da3b20a..4feb3b6c4ca 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-ly1.tfm
index f2c0709f6b6..970b69646b5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-ot1.tfm
index 451b2f48a59..ee3bf2fb504 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-sc-ly1.tfm
index 1460b35629a..a83fc32c033 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-sc-ot1.tfm
index a3e6cf8cdea..8e9989c7908 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-sc-t1.tfm
index ed6537c7670..a3dbde1c1a1 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-t1.tfm
index 1c4d3bd4308..a5adb4375c3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-ly1.tfm
index d66f42b8cb5..765c2bf1d80 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-ot1.tfm
index b3b40a5a34d..a01ba294e5c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-sc-ly1.tfm
index 17395f3392b..8736553af82 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-sc-ot1.tfm
index 74a1263a762..8d9e4011ee8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-sc-t1.tfm
index e7f4724d4b6..1209eebcdc9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-t1.tfm
index 7c3b07200c1..d343590195a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-ly1.tfm
index 93a60fec061..3d6e5a2b3d8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-ot1.tfm
index b522bb4f329..b3ed10a42f3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-sc-ly1.tfm
index aee796fa16d..9cea23df4d8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-sc-ot1.tfm
index 6c38bcb3718..7bee1e5be1d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-sc-t1.tfm
index c9d5e7305f6..5cd22a7def2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-t1.tfm
index 9873c3685e6..22d5973d5c8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBold-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-inf-ly1.tfm
index c551872bec8..17a3e93af60 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-inf-ot1.tfm
index b7265c91e72..83993468bb5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-inf-t1--base.tfm
index 6a51011eed7..7838af6ca15 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-inf-t1.tfm
index 7a2998d50c8..4ddd7e57cf8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-lf-ly1.tfm
index 9999f73fe28..551e9552664 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-lf-ot1.tfm
index d44c9fb701b..1fe0b79418b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-lf-t1--base.tfm
index 06ea353fd09..3766ba0d6a8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-lf-t1.tfm
index f795ed65c4b..f8b6f664891 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-lgr.tfm
index 0dd3791cf12..eb4c99ad71b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-ly1.tfm
index 30bca48442c..14abc130a21 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-ot1.tfm
index e8e91f82db3..d585f0e2e68 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-lgr.tfm
index 172deb879a2..c5fa66f0b30 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ly1--base.tfm
index 71e7ea3eacc..b11efe1e3b9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ly1.tfm
index dd69fd1a5fe..2e828add8e3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ot1--base.tfm
index 50002adf095..7009110250d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ot1.tfm
index c8b37596f9c..8f68dcf06a4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-t1--base.tfm
index a2fee6a4bcd..e51d979258c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-t1.tfm
index 5c681be6a28..b2bdf7e6f5d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-t1--base.tfm
index d16db4e2d1b..c083c29b988 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-t1.tfm
index 2b66e599529..65a2181ecfb 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-sup-ly1.tfm
index 03f605151dc..b9ac14bd88a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-sup-ot1.tfm
index 7d15d1d886e..002ea9bb13b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-sup-t1--base.tfm
index 2cbba31dab6..391da081a65 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-sup-t1.tfm
index 147f4c04e31..e459d5af60f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tlf-ly1.tfm
index 9cc59aeaf0e..1902ba7ee95 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tlf-ot1.tfm
index 08a6ef38ff2..a7fb687bac3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tlf-t1--base.tfm
index e8831ae8047..f5290f7c3cd 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tlf-t1.tfm
index c5c2c2d35e3..f81a99d4cc5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tosf-ly1.tfm
index a0cf5f807bb..98c9d9114a6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tosf-ot1.tfm
index 5fe4ec4cb28..a9187572267 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tosf-t1--base.tfm
index 2e37c42c600..ae6ef694eda 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tosf-t1.tfm
index 1cc89e39e74..69a9ff56da9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpBoldItalic-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-inf-ly1.tfm
index c8bef5725de..18ceb7239c1 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-inf-ot1.tfm
index 22df571309a..7e7a1dde7ce 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-inf-t1--base.tfm
index d4714719e38..0255fefd6ee 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-inf-t1.tfm
index cf3c16a7840..b5072432b3c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-lf-ly1.tfm
index e42c75fd79c..80ba31df4c6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-lf-ot1.tfm
index 83b69e1a0b4..3c3fdc624b2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-lf-t1--base.tfm
index 0ee0dfe0f83..d1f607224d3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-lf-t1.tfm
index b9c965ff072..c56e1512a28 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-lgr.tfm
index 1256f825360..760be8a04ee 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-ly1.tfm
index be6988e381b..f8eeb912763 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-ot1.tfm
index 17524f55e80..6dec5a56c7b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-lgr.tfm
index 6090bf0ad7d..a9591aea6d2 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-ly1--base.tfm
index 7d018cb28f5..7ef983aa7fc 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-ly1.tfm
index c3ad8d4cb34..30899943bee 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-ot1--base.tfm
index 75f0facc370..fa71539479d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-ot1.tfm
index 7ddd1cd6fbf..f12c3dfd49e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-t1--base.tfm
index 4564bbc73d0..0684ffb3206 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-t1.tfm
index b66fdc89833..4b27f24b655 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-t1--base.tfm
index e8a5da12b8e..15786108622 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-t1.tfm
index c0702d41aa3..02935d5fcc3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-sup-ly1.tfm
index 7a4e580f55f..fe7fd2df03d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-sup-ot1.tfm
index 64bd8e55711..58bb6938e46 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-sup-t1--base.tfm
index 77d240d807c..b44fb207075 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-sup-t1.tfm
index 1914abab013..1d3015ab882 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tlf-ly1.tfm
index b60771441f9..48c10829234 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tlf-ot1.tfm
index 218bb06e6bc..974babc09c4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tlf-t1--base.tfm
index 4657f9dccd2..4f0f52af23d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tlf-t1.tfm
index fe64ffb4d8e..3bf17cb0e51 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tosf-ly1.tfm
index cc6cec84ee4..559ec5fce19 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tosf-ot1.tfm
index 52750d81268..8dd74ea8cbf 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tosf-t1--base.tfm
index 77c0c0f9f0a..1f4a1ec7788 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tosf-t1.tfm
index 27f3ea5bcf2..d819c993f5a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpItalic-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-ly1.tfm
index 7b096ecaf7d..3342289b7b8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-ot1.tfm
index 6bbbb62a284..670bd53a2a3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-sc-ly1.tfm
index 49657354926..bc0aa4eebeb 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-sc-ot1.tfm
index 15cabe23a85..fd102e2a0ef 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-sc-t1.tfm
index 9ff304e87fe..fe02c55268a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-t1.tfm
index 6066ce47ac9..014df01187b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-ly1.tfm
index f4012ad7745..c74e9b2642a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-ot1.tfm
index b06b1885d4d..9484ea67e37 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-sc-ly1.tfm
index 3c63eba03e6..f2889602b84 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-sc-ot1.tfm
index f294c160a6a..44fb0de4be7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-sc-t1.tfm
index 76acfa65931..6dce08f0487 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-t1.tfm
index eb751da1454..e56ca209879 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-ly1.tfm
index 1b005983458..5078070679f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-ot1.tfm
index d78798af0d5..af50d5c1ed0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-sc-ly1.tfm
index de19f1c8a1c..f7d6d65d10f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-sc-ot1.tfm
index 91360919bf0..2913099c880 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-sc-t1.tfm
index d1339b96577..5c92f5c1fd8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-t1.tfm
index 1aa09e923c8..1049f67c3d4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-ly1.tfm
index 0c35ebd3e7e..08f855ad6e5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-ot1.tfm
index ea22176fc40..eeb7faba5f3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-sc-ly1.tfm
index 8be3e2de3d9..632d913f908 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-sc-ot1.tfm
index d9511b6d47f..61d3a92122d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-sc-t1.tfm
index b4f80f32515..047ef56153d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-t1.tfm
index fb17150b01d..e6b76ca133e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMedium-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-inf-ly1.tfm
index cc3d905a84b..c6b7a2a364a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-inf-ot1.tfm
index 71cb8d7c571..be90122db21 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-inf-t1--base.tfm
index 231832d45c5..db23b87c0f5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-inf-t1.tfm
index e67b9e8874d..f2bf1ca18ef 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-lf-ly1.tfm
index ede8873dd23..adaa59b8140 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-lf-ot1.tfm
index a923ff4b995..56086e6524c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-lf-t1--base.tfm
index dfdd14a4330..3bb4b648602 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-lf-t1.tfm
index ed80d4e684b..e35dfbf3840 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-lgr.tfm
index 3f111d4675c..94d8f3e307b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-ly1.tfm
index 2c267c66433..236c97c9d8e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-ot1.tfm
index 0218c764fba..0b79b20ca74 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-lgr.tfm
index 4cc64c4469f..779774674f6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ly1--base.tfm
index 887c57712a8..0ab5b15f23e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ly1.tfm
index 12603e46290..eca30aa8cdf 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ot1--base.tfm
index aea7a46320a..b1d837c3c80 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ot1.tfm
index 66262bbc637..ee0ee45691f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-t1--base.tfm
index e0c63e4ff61..8b023fc34ea 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-t1.tfm
index 06247382eff..65514a09b71 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-t1--base.tfm
index b46c621c2c1..67f6ce1331b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-t1.tfm
index 6509eb4b10e..324999a053d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-sup-ly1.tfm
index 43bf723c68d..e20c61a2ced 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-sup-ot1.tfm
index 9acd0640214..f5589856a0e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-sup-t1--base.tfm
index c87d03d46a9..580043c5ca1 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-sup-t1.tfm
index 85702018440..fe6d752b0bf 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tlf-ly1.tfm
index 1643329ce40..25a6aee00f8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tlf-ot1.tfm
index 20cb59190b6..e1c16dd22d9 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tlf-t1--base.tfm
index 1285f1dfe5d..4990c09d3aa 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tlf-t1.tfm
index 00a649bf3f0..8aceda7413b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tosf-ly1.tfm
index e94fd4f4595..d6c7abb6296 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tosf-ot1.tfm
index 44ef4a8b55c..866e18fe7c8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tosf-t1--base.tfm
index d0260406d78..ae49aef0bca 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tosf-t1.tfm
index 78e7c9259c0..7934154bfd6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpMediumItalic-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-ly1.tfm
index 1d8094be987..0c230c96b52 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-ot1.tfm
index 758e264dab4..e88024218c7 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-sc-ly1.tfm
index 9838d6a4afd..95d55909923 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-sc-ot1.tfm
index d436bb6ed38..11ab97c4d05 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-sc-t1.tfm
index 136c8eaf880..7aed18552e4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-t1.tfm
index 6649276b388..e9ac050b6dd 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-ly1.tfm
index c5cf88490cc..e0951b55e48 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-ot1.tfm
index 7fa04c6e19a..fe20ea26b5b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-sc-ly1.tfm
index 850830985d0..c964d98e855 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-sc-ot1.tfm
index af70dd94f99..24053acd42e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-sc-t1.tfm
index cb8b27fe7db..f85478ccfc8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-t1.tfm
index c8194e5e045..09d67d70262 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-ly1.tfm
index dc060c3a768..7795b367f90 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-ot1.tfm
index 45f153f8387..69b1430c79e 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-sc-ly1.tfm
index e19cf4de798..02f6368258a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-sc-ot1.tfm
index c09776655cf..93910da4cf5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-sc-t1.tfm
index 2aab6c141fe..248e9d0bb4b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-t1.tfm
index ddbb256d366..811adc46fdd 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-ly1.tfm
index 8bc7bc77595..ea5a89ef7af 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-ot1.tfm
index 58d5c5f5c1d..9aafdfd714a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-sc-ly1.tfm
index c9a927f3a87..3ec6c9739ea 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-sc-ot1.tfm
index f38546cb0b2..4079b022969 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-sc-t1.tfm
index 71c120f204b..765b40ecd47 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-t1.tfm
index 0badf086ca5..5b30e10dfcf 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBold-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-inf-ly1.tfm
index 428281a3274..1e000de2587 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-inf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-inf-ot1.tfm
index 5820be6aeca..2357421084f 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-inf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-inf-t1--base.tfm
index 2611f05daa0..bf3a3858ad5 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-inf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-inf-t1.tfm
index 8b0b03fea40..93711a0f673 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-inf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-lf-ly1.tfm
index c27d6f56831..3fd369c80a8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-lf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-lf-ot1.tfm
index 23c835f7918..23dc00812e8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-lf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-lf-t1--base.tfm
index b0ba6342afc..49f280df427 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-lf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-lf-t1.tfm
index eedf6da7177..af26bd8c30a 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-lf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-lgr.tfm
index aa9b3ebff30..d6c27848728 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-ly1.tfm
index bbacb01a7cb..b28d379e184 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-ot1.tfm
index dda4e86c9fa..66756bb9083 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-lgr.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-lgr.tfm
index 620d4ffd4d1..23958e07835 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-lgr.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-lgr.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ly1--base.tfm
index 38da3c6725e..bec59845358 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ly1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ly1.tfm
index 2de8cff8f53..a1fa9cbc4d0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ot1--base.tfm
index 087c9de25a2..2c0f06351c6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ot1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ot1.tfm
index 2408f44c58d..24baa1e57e8 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-t1--base.tfm
index 4a6b756a08b..948ef4bb876 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-t1.tfm
index e2321537afc..cbef46908e6 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-t1--base.tfm
index 2f9cb073379..e9c8a3e6b43 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-t1.tfm
index 79400ae680c..5113d311d6b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-sup-ly1.tfm
index 168444fc522..eeed5e9a38c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-sup-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-sup-ot1.tfm
index 9a7914cd75d..d54a783714d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-sup-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-sup-t1--base.tfm
index f97190e6568..f4ba079047c 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-sup-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-sup-t1.tfm
index f3994a20bb5..4bf3ca8b34b 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-sup-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tlf-ly1.tfm
index 4cdf8ed3a2d..ece94ab47d0 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tlf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tlf-ot1.tfm
index 2843139b5b7..ef0fa18eceb 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tlf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tlf-t1--base.tfm
index eb22cd6d547..99d5b148723 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tlf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tlf-t1.tfm
index 850ce1f2981..f51af7f3a08 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tlf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tosf-ly1.tfm
index df46e175cff..4cbb234f3a4 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tosf-ly1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tosf-ot1.tfm
index e255633b0a8..21887cf4584 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tosf-ot1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tosf-t1--base.tfm
index 0f5a85a6a2a..14329d8b17d 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tosf-t1--base.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tosf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tosf-t1.tfm
index ca468b71eaf..6d3045a85c3 100644
--- a/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tosf-t1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/junicode/Junicode-SmExpSmBoldItalic-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-ly1--base.tfm
new file mode 100644
index 00000000000..ab656860698
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-ly1.tfm
new file mode 100644
index 00000000000..4a8afeee6e2
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-ot1.tfm
new file mode 100644
index 00000000000..28f50d11e78
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t1--base.tfm
new file mode 100644
index 00000000000..5cc8b4d8865
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t1.tfm
new file mode 100644
index 00000000000..33aeef71a04
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t5--base.tfm
new file mode 100644
index 00000000000..6119aeacaaa
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t5.tfm
new file mode 100644
index 00000000000..55e4d29e812
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-ly1--base.tfm
new file mode 100644
index 00000000000..58acdc70baf
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-ly1.tfm
new file mode 100644
index 00000000000..817fde10a55
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-ot1.tfm
new file mode 100644
index 00000000000..ef8bbc435c3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t1--base.tfm
new file mode 100644
index 00000000000..4c449e362f8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t1.tfm
new file mode 100644
index 00000000000..966251e0207
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t5--base.tfm
new file mode 100644
index 00000000000..b55764f13cc
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t5.tfm
new file mode 100644
index 00000000000..9aa434bdf08
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ly1--base.tfm
new file mode 100644
index 00000000000..d90d369ed08
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ly1.tfm
new file mode 100644
index 00000000000..23522ffefe4
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ot1.tfm
new file mode 100644
index 00000000000..0a3866e5810
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t1--base.tfm
new file mode 100644
index 00000000000..d999453024a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t1.tfm
new file mode 100644
index 00000000000..5eeb0dc7709
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t5--base.tfm
new file mode 100644
index 00000000000..4bf222c114e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t5.tfm
new file mode 100644
index 00000000000..07d267f5886
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ts1--base.tfm
new file mode 100644
index 00000000000..80710f276a5
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ts1.tfm
new file mode 100644
index 00000000000..ace3336c0f2
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-ly1--base.tfm
new file mode 100644
index 00000000000..69bd9021bd7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-ly1.tfm
new file mode 100644
index 00000000000..14494706ab9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-ot1.tfm
new file mode 100644
index 00000000000..38a5e881f38
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t1--base.tfm
new file mode 100644
index 00000000000..6eb2034ac71
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t1.tfm
new file mode 100644
index 00000000000..c1f8eff8541
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t5--base.tfm
new file mode 100644
index 00000000000..998ecbe5b2f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t5.tfm
new file mode 100644
index 00000000000..3138be8d097
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-ly1--base.tfm
new file mode 100644
index 00000000000..69bd9021bd7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-ly1.tfm
new file mode 100644
index 00000000000..14494706ab9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-ot1.tfm
new file mode 100644
index 00000000000..38a5e881f38
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t1--base.tfm
new file mode 100644
index 00000000000..6eb2034ac71
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t1.tfm
new file mode 100644
index 00000000000..c1f8eff8541
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t5--base.tfm
new file mode 100644
index 00000000000..dd9f8ce0506
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t5.tfm
new file mode 100644
index 00000000000..32c2dea83a0
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ly1--base.tfm
new file mode 100644
index 00000000000..eb9338120fb
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ly1.tfm
new file mode 100644
index 00000000000..4c21407c1d8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ot1.tfm
new file mode 100644
index 00000000000..20387443f1d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t1--base.tfm
new file mode 100644
index 00000000000..18c3457a4c3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t1.tfm
new file mode 100644
index 00000000000..00ce4b2b68c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t5--base.tfm
new file mode 100644
index 00000000000..ca7c246c294
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t5.tfm
new file mode 100644
index 00000000000..7d897d3d1c1
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ts1--base.tfm
new file mode 100644
index 00000000000..80710f276a5
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ts1.tfm
new file mode 100644
index 00000000000..ace3336c0f2
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-ly1--base.tfm
new file mode 100644
index 00000000000..696b86d4dc8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-ly1.tfm
new file mode 100644
index 00000000000..78b166b06ce
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-ot1.tfm
new file mode 100644
index 00000000000..e246c54604c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t1--base.tfm
new file mode 100644
index 00000000000..f9a4629f34a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t1.tfm
new file mode 100644
index 00000000000..10e95110ea3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t5--base.tfm
new file mode 100644
index 00000000000..3023e6f4be0
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t5.tfm
new file mode 100644
index 00000000000..9e529f9c155
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-ly1--base.tfm
new file mode 100644
index 00000000000..95e8a035df7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-ly1.tfm
new file mode 100644
index 00000000000..c83defcd1f4
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-ot1.tfm
new file mode 100644
index 00000000000..7270df32c2b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t1--base.tfm
new file mode 100644
index 00000000000..562a0d8aa0d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t1.tfm
new file mode 100644
index 00000000000..4ea188d24c1
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t5--base.tfm
new file mode 100644
index 00000000000..17c2f1989f3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t5.tfm
new file mode 100644
index 00000000000..fddec980afc
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ly1--base.tfm
new file mode 100644
index 00000000000..681d54fe0c5
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ly1.tfm
new file mode 100644
index 00000000000..451140f4b64
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ot1.tfm
new file mode 100644
index 00000000000..e8c5221f344
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t1--base.tfm
new file mode 100644
index 00000000000..655fb2ef389
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t1.tfm
new file mode 100644
index 00000000000..604d8bae71b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t5--base.tfm
new file mode 100644
index 00000000000..6bf92f16d22
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t5.tfm
new file mode 100644
index 00000000000..8c80f9c0d33
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ts1--base.tfm
new file mode 100644
index 00000000000..acc3bc2cada
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ts1.tfm
new file mode 100644
index 00000000000..8495b58ee7e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-ly1--base.tfm
new file mode 100644
index 00000000000..5e69c030831
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-ly1.tfm
new file mode 100644
index 00000000000..c3da9a5d163
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-ot1.tfm
new file mode 100644
index 00000000000..29305444df8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t1--base.tfm
new file mode 100644
index 00000000000..b1afb760194
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t1.tfm
new file mode 100644
index 00000000000..a7e492dc951
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t5--base.tfm
new file mode 100644
index 00000000000..0c50c41d627
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t5.tfm
new file mode 100644
index 00000000000..c5a505ed316
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-ly1--base.tfm
new file mode 100644
index 00000000000..fa73536183b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-ly1.tfm
new file mode 100644
index 00000000000..5faab3aed48
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-ot1.tfm
new file mode 100644
index 00000000000..73a050d3ba9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t1--base.tfm
new file mode 100644
index 00000000000..d0d5a5999de
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t1.tfm
new file mode 100644
index 00000000000..d15cbec9563
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t5--base.tfm
new file mode 100644
index 00000000000..bc3d828aa21
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t5.tfm
new file mode 100644
index 00000000000..42159a80652
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ly1--base.tfm
new file mode 100644
index 00000000000..a9b562cabe3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ly1.tfm
new file mode 100644
index 00000000000..18d96dc4dc3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ot1.tfm
new file mode 100644
index 00000000000..0562f627b92
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t1--base.tfm
new file mode 100644
index 00000000000..8c3b3c6c073
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t1.tfm
new file mode 100644
index 00000000000..49a484b544c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t5--base.tfm
new file mode 100644
index 00000000000..80269b1af44
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t5.tfm
new file mode 100644
index 00000000000..367767a67c3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ts1--base.tfm
new file mode 100644
index 00000000000..acc3bc2cada
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ts1.tfm
new file mode 100644
index 00000000000..8495b58ee7e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-ly1--base.tfm
new file mode 100644
index 00000000000..e21d972a4f9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-ly1.tfm
new file mode 100644
index 00000000000..cc809465e09
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-ot1.tfm
new file mode 100644
index 00000000000..783209454ac
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t1--base.tfm
new file mode 100644
index 00000000000..53f49763e0e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t1.tfm
new file mode 100644
index 00000000000..261545d8842
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t5--base.tfm
new file mode 100644
index 00000000000..3e1713c5841
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t5.tfm
new file mode 100644
index 00000000000..48523c412fe
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-ly1--base.tfm
new file mode 100644
index 00000000000..c89d4cebd10
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-ly1.tfm
new file mode 100644
index 00000000000..b65b37fcd87
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-ot1.tfm
new file mode 100644
index 00000000000..78cb252d5ad
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t1--base.tfm
new file mode 100644
index 00000000000..2a3c09e2b9d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t1.tfm
new file mode 100644
index 00000000000..bb425bc2133
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t5--base.tfm
new file mode 100644
index 00000000000..2b8e4e15eca
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t5.tfm
new file mode 100644
index 00000000000..c549aac9809
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ly1--base.tfm
new file mode 100644
index 00000000000..0dc9f53ab90
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ly1.tfm
new file mode 100644
index 00000000000..cfa0820a2db
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ot1.tfm
new file mode 100644
index 00000000000..aedb56cc735
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ly1--base.tfm
new file mode 100644
index 00000000000..d832931f9e2
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ly1.tfm
new file mode 100644
index 00000000000..5c62833ead7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ot1--base.tfm
new file mode 100644
index 00000000000..899d2708a08
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ot1.tfm
new file mode 100644
index 00000000000..1351444573d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t1--base.tfm
new file mode 100644
index 00000000000..6c1a3e6ae97
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t1.tfm
new file mode 100644
index 00000000000..39abe3e0168
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t5--base.tfm
new file mode 100644
index 00000000000..83b85905c39
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t5.tfm
new file mode 100644
index 00000000000..bc68ebfee7a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t1--base.tfm
new file mode 100644
index 00000000000..16120b72f1d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t1.tfm
new file mode 100644
index 00000000000..130a263037a
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t5--base.tfm
new file mode 100644
index 00000000000..737a8ea5d1e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t5.tfm
new file mode 100644
index 00000000000..d67957726ff
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ts1--base.tfm
new file mode 100644
index 00000000000..cb6f446d18d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ts1.tfm
new file mode 100644
index 00000000000..6f50790784d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-ly1--base.tfm
new file mode 100644
index 00000000000..ea91d3345f3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-ly1.tfm
new file mode 100644
index 00000000000..fbd9c3b15d6
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-ot1.tfm
new file mode 100644
index 00000000000..e533a5dd890
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t1--base.tfm
new file mode 100644
index 00000000000..f13828b69b3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t1.tfm
new file mode 100644
index 00000000000..8d0dc1a7cdd
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t5--base.tfm
new file mode 100644
index 00000000000..a9fc972caa4
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t5.tfm
new file mode 100644
index 00000000000..0ca8001b91c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ly1--base.tfm
new file mode 100644
index 00000000000..b147a7e6748
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ly1.tfm
new file mode 100644
index 00000000000..b5f872191e5
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ot1.tfm
new file mode 100644
index 00000000000..de62f49dfc3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ly1--base.tfm
new file mode 100644
index 00000000000..7261d52d3c9
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ly1.tfm
new file mode 100644
index 00000000000..7c08faf016b
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ot1--base.tfm
new file mode 100644
index 00000000000..63fd46ab058
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ot1.tfm
new file mode 100644
index 00000000000..9c9a49d437d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t1--base.tfm
new file mode 100644
index 00000000000..71bafb2aafc
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t1.tfm
new file mode 100644
index 00000000000..02c6daf8f9e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t5--base.tfm
new file mode 100644
index 00000000000..d0fd5ff9d17
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t5.tfm
new file mode 100644
index 00000000000..42e7cfffd25
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t1--base.tfm
new file mode 100644
index 00000000000..40a804b11cf
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t1.tfm
new file mode 100644
index 00000000000..db649379cf0
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t5--base.tfm
new file mode 100644
index 00000000000..55ba76ac3ab
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t5.tfm
new file mode 100644
index 00000000000..56d65654681
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ts1--base.tfm
new file mode 100644
index 00000000000..cb6f446d18d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ts1.tfm
new file mode 100644
index 00000000000..6f50790784d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-ly1--base.tfm
new file mode 100644
index 00000000000..ea91d3345f3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-ly1.tfm
new file mode 100644
index 00000000000..fbd9c3b15d6
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-ot1.tfm
new file mode 100644
index 00000000000..e533a5dd890
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t1--base.tfm
new file mode 100644
index 00000000000..f13828b69b3
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t1.tfm
new file mode 100644
index 00000000000..8d0dc1a7cdd
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t5--base.tfm
new file mode 100644
index 00000000000..45723c37aec
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t5.tfm
new file mode 100644
index 00000000000..b4b9b773c61
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ly1--base.tfm
new file mode 100644
index 00000000000..a69f4eb68cc
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ly1.tfm
new file mode 100644
index 00000000000..fa405f24b11
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ot1.tfm
new file mode 100644
index 00000000000..7997f2cd9f4
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ly1--base.tfm
new file mode 100644
index 00000000000..980ad31486f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ly1.tfm
new file mode 100644
index 00000000000..2a3af573e05
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ot1--base.tfm
new file mode 100644
index 00000000000..06a7054477c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ot1.tfm
new file mode 100644
index 00000000000..c69705dc24c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t1--base.tfm
new file mode 100644
index 00000000000..61b26c0e26c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t1.tfm
new file mode 100644
index 00000000000..cdf1192ac8d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t5--base.tfm
new file mode 100644
index 00000000000..2e522c3e141
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t5.tfm
new file mode 100644
index 00000000000..6d473fdfaec
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t1--base.tfm
new file mode 100644
index 00000000000..8010ef8c1e8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t1.tfm
new file mode 100644
index 00000000000..a62dd226bf4
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t5--base.tfm
new file mode 100644
index 00000000000..cc72e41ee1e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t5.tfm
new file mode 100644
index 00000000000..71fa1507806
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ts1--base.tfm
new file mode 100644
index 00000000000..cb6f446d18d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ts1.tfm
new file mode 100644
index 00000000000..6f50790784d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ts1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ly1--base.tfm
new file mode 100644
index 00000000000..a69f4eb68cc
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ly1.tfm
new file mode 100644
index 00000000000..fa405f24b11
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ot1.tfm
new file mode 100644
index 00000000000..7997f2cd9f4
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ly1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ly1--base.tfm
new file mode 100644
index 00000000000..980ad31486f
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ly1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ly1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ly1.tfm
new file mode 100644
index 00000000000..2a3af573e05
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ly1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ot1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ot1--base.tfm
new file mode 100644
index 00000000000..06a7054477c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ot1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ot1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ot1.tfm
new file mode 100644
index 00000000000..c69705dc24c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ot1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t1--base.tfm
new file mode 100644
index 00000000000..61b26c0e26c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t1.tfm
new file mode 100644
index 00000000000..cdf1192ac8d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t5--base.tfm
new file mode 100644
index 00000000000..2e522c3e141
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t5.tfm
new file mode 100644
index 00000000000..6d473fdfaec
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t1--base.tfm
new file mode 100644
index 00000000000..8010ef8c1e8
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t1.tfm
new file mode 100644
index 00000000000..a62dd226bf4
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t5--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t5--base.tfm
new file mode 100644
index 00000000000..cc72e41ee1e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t5--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t5.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t5.tfm
new file mode 100644
index 00000000000..71fa1507806
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t5.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ts1--base.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ts1--base.tfm
new file mode 100644
index 00000000000..cb6f446d18d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ts1--base.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ts1.tfm b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ts1.tfm
new file mode 100644
index 00000000000..6f50790784d
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ts1.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 b4235e1383d..d6c879976f6 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 64d30d85da8..b68b69fca96 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--simpleiconsnine.tfm b/Master/texmf-dist/fonts/tfm/public/simpleicons/SimpleIcons--simpleiconsnine.tfm
index 3e064bfe80e..2d2fe76223e 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 d6ef6cd797d..b3812fe15c9 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 f4d014c1652..9fb0fea1ae9 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 92869b87a55..db863592aa1 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 82ed66afe8b..c1d0ea8c422 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 132d34cd11e..eb313b97a58 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 6a64b552290..22f323a9353 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/truetype/public/junicodevf/JunicodeVF-Italic.ttf b/Master/texmf-dist/fonts/truetype/public/junicodevf/JunicodeVF-Italic.ttf
index 8a1a9005e4b..b4721bdbade 100644
--- a/Master/texmf-dist/fonts/truetype/public/junicodevf/JunicodeVF-Italic.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/junicodevf/JunicodeVF-Italic.ttf
Binary files differ
diff --git a/Master/texmf-dist/fonts/truetype/public/junicodevf/JunicodeVF-Roman.ttf b/Master/texmf-dist/fonts/truetype/public/junicodevf/JunicodeVF-Roman.ttf
index e71b9c448d6..48b55d4ebb4 100644
--- a/Master/texmf-dist/fonts/truetype/public/junicodevf/JunicodeVF-Roman.ttf
+++ b/Master/texmf-dist/fonts/truetype/public/junicodevf/JunicodeVF-Roman.ttf
Binary files differ
diff --git a/Master/texmf-dist/fonts/truetype/public/luacensor/Redacted-Regular.ttf b/Master/texmf-dist/fonts/truetype/public/luacensor/Redacted-Regular.ttf
new file mode 100644
index 00000000000..0fc7a65888d
--- /dev/null
+++ b/Master/texmf-dist/fonts/truetype/public/luacensor/Redacted-Regular.ttf
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Bold.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Bold.pfb
index edd4cd797cc..49f321b62d3 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Bold.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Bold.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-BoldItalic.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-BoldItalic.pfb
index e5ccaf0dfe9..36ad0aa6b0e 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-BoldItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-BoldItalic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Cond.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Cond.pfb
index 0c850950221..9dceacd6a48 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Cond.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Cond.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondItalic.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondItalic.pfb
index 7d6524970be..11ae3de845a 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondItalic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondLight.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondLight.pfb
index 21d173b7680..d07009c9822 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondLight.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondLight.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondLightItalic.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondLightItalic.pfb
index 8b864ae3c35..d8ac987ee5c 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondLightItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondLightItalic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondMedium.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondMedium.pfb
index cd4e0efab61..35097092fe0 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondMedium.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondMedium.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondMediumItalic.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondMediumItalic.pfb
index 398826e2b3b..5544671f3cd 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondMediumItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-CondMediumItalic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Exp.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Exp.pfb
index e045bf1720d..8c2cc08b977 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Exp.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Exp.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpBold.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpBold.pfb
index c4dc0ad3a42..70bcf61b49e 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpBold.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpBold.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpBoldItalic.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpBoldItalic.pfb
index d9b2de9aa5f..3e707c0b237 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpBoldItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpBoldItalic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpItalic.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpItalic.pfb
index 063511abbc0..7e59a5d7468 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpItalic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpMedium.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpMedium.pfb
index 4e899397d18..89085474053 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpMedium.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpMedium.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpMediumItalic.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpMediumItalic.pfb
index 6e8d45c897c..73a08595349 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpMediumItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpMediumItalic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpSmBold.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpSmBold.pfb
index 727f4184105..44c38f65679 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpSmBold.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpSmBold.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpSmBoldItalic.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpSmBoldItalic.pfb
index e7f38b1dd19..19276e370e3 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpSmBoldItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-ExpSmBoldItalic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Italic.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Italic.pfb
index 1fc5d00395a..e329a8e6c64 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Italic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Italic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Light.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Light.pfb
index 13525038efc..3f28616f65b 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Light.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Light.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-LightItalic.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-LightItalic.pfb
index bd76881136e..11abab6d474 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-LightItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-LightItalic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Medium.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Medium.pfb
index 63c6a4033c3..a86b6f66f96 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Medium.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Medium.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-MediumItalic.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-MediumItalic.pfb
index 1e8507e2173..c62d59cbbe7 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-MediumItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-MediumItalic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Regular.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Regular.pfb
index 0d9dfe01ca1..adbcb9a1dcb 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Regular.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-Regular.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmBold.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmBold.pfb
index 9f711147b73..bd9280e6a4a 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmBold.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmBold.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmBoldItalic.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmBoldItalic.pfb
index c9c39778a19..e8b65a74c58 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmBoldItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmBoldItalic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCond.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCond.pfb
index 1191b980166..eb040e2c63b 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCond.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCond.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondItalic.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondItalic.pfb
index e275dfbc399..f1ea39c93bc 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondItalic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondLight.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondLight.pfb
index 23a2c1d6e24..e57dfd7df38 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondLight.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondLight.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondLightItalic.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondLightItalic.pfb
index aa87645983a..f2d014b40ff 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondLightItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondLightItalic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondMedium.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondMedium.pfb
index 5028af88726..91460077919 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondMedium.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondMedium.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondMediumItalic.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondMediumItalic.pfb
index 47d7661b6b1..b5bdd1ca2c2 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondMediumItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmCondMediumItalic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExp.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExp.pfb
index 40266063ec0..01bd9c21fd3 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExp.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExp.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpBold.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpBold.pfb
index c1c473b9b86..c5b4ad4a24d 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpBold.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpBold.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpBoldItalic.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpBoldItalic.pfb
index 48c131c62e6..50c86be0083 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpBoldItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpBoldItalic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpItalic.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpItalic.pfb
index c76792b3761..51bac5d9715 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpItalic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpMedium.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpMedium.pfb
index d14ac74d04d..7f80e859d06 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpMedium.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpMedium.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpMediumItalic.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpMediumItalic.pfb
index c645de9d7d7..a7aa60d5f60 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpMediumItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpMediumItalic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpSmBold.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpSmBold.pfb
index bea5fa74b1b..f27245c3b40 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpSmBold.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpSmBold.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpSmBoldItalic.pfb b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpSmBoldItalic.pfb
index 03fbdc2761b..97ab102db1e 100644
--- a/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpSmBoldItalic.pfb
+++ b/Master/texmf-dist/fonts/type1/public/junicode/Junicode-SmExpSmBoldItalic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/mfb-oldstyle/MFBOldstyle-Bold.pfb b/Master/texmf-dist/fonts/type1/public/mfb-oldstyle/MFBOldstyle-Bold.pfb
new file mode 100644
index 00000000000..966d7abb782
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/mfb-oldstyle/MFBOldstyle-Bold.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/mfb-oldstyle/MFBOldstyle-Italic.pfb b/Master/texmf-dist/fonts/type1/public/mfb-oldstyle/MFBOldstyle-Italic.pfb
new file mode 100644
index 00000000000..794b6902891
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/mfb-oldstyle/MFBOldstyle-Italic.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/mfb-oldstyle/MFBOldstyle-Regular.pfb b/Master/texmf-dist/fonts/type1/public/mfb-oldstyle/MFBOldstyle-Regular.pfb
new file mode 100644
index 00000000000..726fcaebbeb
--- /dev/null
+++ b/Master/texmf-dist/fonts/type1/public/mfb-oldstyle/MFBOldstyle-Regular.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 f5f6978feec..6a4a2785252 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/junicode/Junicode-BoldItalic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-inf-t1.vf
index 7f67b5328eb..e48ab4b2282 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-lf-t1.vf
index f302b873c6a..8434bcbc5ee 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-osf-sc-ly1.vf
index 83818e3cec6..2dc18ae98b7 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-osf-sc-ot1.vf
index 57d6acecd6e..65f591bd2cf 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-osf-sc-t1.vf
index 33e8ed869f1..5e9d81d3486 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-osf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-osf-t1.vf
index 202c634f2a2..2a0adc030e2 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-sup-t1.vf
index 4b331d8dce6..1d825c27a10 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-tlf-t1.vf
index 5407a613aa1..70becaee0a4 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-tosf-t1.vf
index 097e47f7b20..40efe170bef 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-BoldItalic-tosf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-inf-t1.vf
index 15bbe3295ad..e1ffd48cc4f 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-lf-t1.vf
index 1afe1472bc9..e3c56fc6a7d 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-osf-sc-ly1.vf
index d0af7fe6a25..ba16c3a2833 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-osf-sc-ot1.vf
index 67d7c0e30b4..c60dcbf622a 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-osf-sc-t1.vf
index b74886d2e8a..206fa85eb94 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-osf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-osf-t1.vf
index 475bf0c820b..96707a9de03 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-sup-t1.vf
index 092f1eedb99..5817f0f1db2 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-tlf-t1.vf
index b42740948c9..4e1dd22e255 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-tosf-t1.vf
index 86e16043e46..0c18a0e75b8 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondItalic-tosf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-inf-t1.vf
index 45e918ab874..eb8b64590c9 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-lf-t1.vf
index 05affaf1ad0..af9ab69e838 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-osf-sc-ly1.vf
index 73e07239e9e..592bab0eda3 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-osf-sc-ot1.vf
index f3c8bd5ff46..351e61b3a80 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-osf-sc-t1.vf
index 8799cc3b081..b2c0740175b 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-osf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-osf-t1.vf
index 61456080d7f..bd146feee10 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-sup-t1.vf
index 8c3eff2e166..38b7780fbd2 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-tlf-t1.vf
index c343587539f..d20b7b57fb0 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-tosf-t1.vf
index b48fa1a4f91..35de677e9ac 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondLightItalic-tosf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-inf-t1.vf
index 43f94a2e2de..b5b24dac13c 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-lf-t1.vf
index e3731d2132d..f721ce960d9 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-osf-sc-ly1.vf
index 57f110f156c..a8d0e939d67 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-osf-sc-ot1.vf
index fbfa53b81fc..b84dc3447b7 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-osf-sc-t1.vf
index d9efbece69f..40fb9763f67 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-osf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-osf-t1.vf
index a51dc1d1de3..c91c5599c8c 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-sup-t1.vf
index 96eba9d2b1e..5c19ad39435 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-tlf-t1.vf
index 1d5a7584315..002f3e614e8 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-tosf-t1.vf
index ae0441bba60..36eb836fcea 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-CondMediumItalic-tosf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-inf-t1.vf
index e99988e780e..4491eb212ee 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-lf-t1.vf
index 5e0a42de9e7..f9398efc7a2 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-osf-sc-ly1.vf
index ae8075abdc3..6f44a9c7948 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-osf-sc-ot1.vf
index b3ad38f0171..26853f35c87 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-osf-sc-t1.vf
index 8396090459f..ad97fbe7691 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-osf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-osf-t1.vf
index 49557ac9a63..b22e61acea6 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-sup-t1.vf
index 91ab4b2d5be..d8e2eb8d2b7 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-tlf-t1.vf
index 45c645b69d3..48389164bad 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-tosf-t1.vf
index 94d9845ce7c..3b5b2398453 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpBoldItalic-tosf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-inf-t1.vf
index f1758005b26..e018cc84609 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-lf-t1.vf
index 360fbbfb5f5..1c2abae718d 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-osf-sc-ly1.vf
index a4dd33b6f19..f8f7ea19765 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-osf-sc-ot1.vf
index dd7b790e7e1..a0addf9aa1a 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-osf-sc-t1.vf
index 337db5a85e5..aff3da68c97 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-osf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-osf-t1.vf
index 8bcdfa7eff3..a5204eb575d 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-sup-t1.vf
index ad3c0bfbe76..234e3cd9dbd 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-tlf-t1.vf
index 1fdd4e2f842..d959a064f4f 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-tosf-t1.vf
index b76a83ec6e5..bc6e5ed5521 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpItalic-tosf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-inf-t1.vf
index 4b4ea9d6bdc..356859b59f8 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-lf-t1.vf
index 528881c3818..fdeb4acd5bd 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-osf-sc-ly1.vf
index ace569b959e..968a19cf700 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-osf-sc-ot1.vf
index 5ba5525f339..800772a5872 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-osf-sc-t1.vf
index 7ff3f67ab16..0b4a642aa5a 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-osf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-osf-t1.vf
index e08f210173d..c80db1b9d2e 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-sup-t1.vf
index 42fea6676fd..e8c7ca35b5a 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-tlf-t1.vf
index f9811b38bb9..a36dd92f9bc 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-tosf-t1.vf
index fe1879ca92d..57a046ace66 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpMediumItalic-tosf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-inf-t1.vf
index 97c6fc6f8aa..45448cb474b 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-lf-t1.vf
index e04bd30cd84..3dd4cd3a19e 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ly1.vf
index 3b407952e9f..29dd7c4575c 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ot1.vf
index 26043afbdbd..75ac8f6c68a 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-t1.vf
index 0d438f2469b..854c96fe4ae 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-osf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-osf-t1.vf
index 68645e720c1..d71cc0c39e1 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-sup-t1.vf
index b084d6ad829..5d63928ee56 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-tlf-t1.vf
index 2040ed666f8..88b33cb68e8 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-tosf-t1.vf
index cedeb82170c..bde99e594fe 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-ExpSmBoldItalic-tosf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-inf-t1.vf
index cf233cf58d3..08d8488e7c6 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-lf-t1.vf
index ed4d01f20d7..1363f485458 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-osf-sc-ly1.vf
index cb4a1797fed..e812d5d4a2c 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-osf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-osf-sc-ot1.vf
index cd82660cfe3..5d8deeef2be 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-osf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-osf-sc-t1.vf
index bc6da91c34d..fa09b91f3e1 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-osf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-osf-t1.vf
index 31cbdf209df..e0b84203055 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-sup-t1.vf
index eb0bbd3eba2..03842f39bd6 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-tlf-t1.vf
index 3243d3cd5e9..3e7ead94000 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-tosf-t1.vf
index 862644afc16..30c6bb2d627 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-Italic-tosf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-inf-t1.vf
index b0da941b3a0..7347dbd3c04 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-lf-t1.vf
index a1c1cac256a..d29aff1f4c8 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-osf-sc-ly1.vf
index a48aeb086ed..c9f73726511 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-osf-sc-ot1.vf
index dfb869011a3..5ba7ea530c3 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-osf-sc-t1.vf
index 1a07f88ee40..b604f6a3083 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-osf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-osf-t1.vf
index c10284e253c..b94dc2288b6 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-sup-t1.vf
index 28e26c83b7d..e87f49ab331 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-tlf-t1.vf
index 1a35c9dfc68..af0ea077026 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-tosf-t1.vf
index 4d4c461da6c..d0e87d3541e 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-LightItalic-tosf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-inf-t1.vf
index 597938950c2..3cf5d54c585 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-lf-t1.vf
index e7e2832add2..24e5ce7c529 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-osf-sc-ly1.vf
index 7c33fa04814..40a3d2fbf23 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-osf-sc-ot1.vf
index 5ef85ecf04a..ee9815d51ad 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-osf-sc-t1.vf
index 426d4a8aeb5..605fb23fe93 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-osf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-osf-t1.vf
index caa3d6b3471..bf112ef7950 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-sup-t1.vf
index 9ed3ff40f04..35b428a0bab 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-tlf-t1.vf
index 23085b01366..5cab472a5d6 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-tosf-t1.vf
index e49b474cb9e..7fbba6367c4 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-MediumItalic-tosf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-inf-t1.vf
index 3d6a1d0e403..dfa33e55f6a 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-lf-t1.vf
index 0dcc044a0e2..42bd0d9d8d8 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-osf-sc-ly1.vf
index dc1d4c2d2de..6de7038fe8f 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-osf-sc-ot1.vf
index 8fe24d3c34e..c5ab63046c4 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-osf-sc-t1.vf
index a321d0bc5e5..ce6f4b2f472 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-osf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-osf-t1.vf
index 9ba048d2f07..453c56cde90 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-sup-t1.vf
index 181f83b0502..a4e79d8111e 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-tlf-t1.vf
index 6cfe398929e..37cb8a2402d 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-tosf-t1.vf
index b4b8381e83b..37e003bc923 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmBoldItalic-tosf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-inf-t1.vf
index 89dd9240d23..1e107d90622 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-lf-t1.vf
index 461be8b0a86..8e6d08b417d 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-osf-sc-ly1.vf
index 278568dae7b..9a0b6b19a30 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-osf-sc-ot1.vf
index b82397482ad..6f62a2cffa6 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-osf-sc-t1.vf
index 90131b29980..ac9cd42e5ae 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-osf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-osf-t1.vf
index 59e557b4aef..d7e4ae3f5e7 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-sup-t1.vf
index 0b9b69a109d..1e4b2c4d322 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-tlf-t1.vf
index 3ad5c5ab86d..b48240b3ec8 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-tosf-t1.vf
index 42ae93fc68d..df4c48f0a71 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondItalic-tosf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-inf-t1.vf
index c4af13af027..5b5a8eb83d3 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-lf-t1.vf
index ce7a2da120f..bc9bbefd85b 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-osf-sc-ly1.vf
index d30adc283c4..fdb3b65b049 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-osf-sc-ot1.vf
index f6435fe8414..0a9b6f76ed8 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-osf-sc-t1.vf
index e25eefda353..6ca8b4ed4d6 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-osf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-osf-t1.vf
index 7e4d0f34954..b6405f38c6b 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-sup-t1.vf
index 4279b74a6d3..3a0e24eec2a 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-tlf-t1.vf
index d4ff7ab6767..1322ab7cce0 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-tosf-t1.vf
index 92293718637..0cf76035602 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondLightItalic-tosf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-inf-t1.vf
index 5f47cba2e60..178e13f3d8a 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-lf-t1.vf
index ac9af2cc4b5..dc0a3ce62d7 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ly1.vf
index 9f1e429c7b7..2eb3d1a3733 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ot1.vf
index e2e32eea4ca..081e03b60a7 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-osf-sc-t1.vf
index 2dd95b5bfb6..55b6a9b3504 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-osf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-osf-t1.vf
index 2322333613d..f9c7207ab56 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-sup-t1.vf
index 7bfd3fe91b7..f5ee5e6c43b 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-tlf-t1.vf
index 3fda7cc204c..b3bedfa2f2a 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-tosf-t1.vf
index a37e7a4a091..05364ba1381 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmCondMediumItalic-tosf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-inf-t1.vf
index 18b4033e8dc..a38ea1292f9 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-lf-t1.vf
index b34178f0f68..85064e5e10c 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ly1.vf
index 91494315dfe..d231bab002a 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ot1.vf
index 8070c033239..abd5fb50fd1 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-osf-sc-t1.vf
index 3f2ae1b12a4..29014bef5c4 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-osf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-osf-t1.vf
index 09173273a9b..c61fe5657d9 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-sup-t1.vf
index ff3d7d47121..75531977a30 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-tlf-t1.vf
index c7f93488ab0..14a0e9d20ae 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-tosf-t1.vf
index bcf4ddb70e1..65f94bb488e 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpBoldItalic-tosf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-inf-t1.vf
index 9bf28f9c0ac..c9f6045292d 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-lf-t1.vf
index b38e7cbfc86..151e81a5c62 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-osf-sc-ly1.vf
index d6c5a25f236..2771d0d89b4 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-osf-sc-ot1.vf
index 5275f4bd9cb..3459b592ea9 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-osf-sc-t1.vf
index 475c8e14376..4aca7c7784d 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-osf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-osf-t1.vf
index 5d762bff15a..11a575ea1e9 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-sup-t1.vf
index fbd8ff26b70..b188b2cc3f2 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-tlf-t1.vf
index a7c416ceb22..9dc7b8bd68d 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-tosf-t1.vf
index 7c273c059a7..46d39f252e8 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpItalic-tosf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-inf-t1.vf
index 20383b5c11e..ce2d31c9821 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-lf-t1.vf
index caeafcef415..511abfe55cf 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ly1.vf
index 1b776c57ba4..a891913f51d 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ot1.vf
index 0f09941fed0..88d262eb89e 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-osf-sc-t1.vf
index e221bc1fc37..dc444267c32 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-osf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-osf-t1.vf
index 4dc3d9c356b..6212d500304 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-sup-t1.vf
index 9735916031e..3139ba92e52 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-tlf-t1.vf
index 816248faf09..9f3822417f8 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-tosf-t1.vf
index 262e3013cd8..6de0aefc7ed 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpMediumItalic-tosf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-inf-t1.vf
index 69e0132800f..cd00d399f8e 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-inf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-lf-t1.vf
index 1b00113a0ab..3bc75e55e2a 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-lf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ly1.vf
index 6e3dd6f4ead..f20ed3ef8f1 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ly1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ot1.vf
index 33efeb108d9..44a0190e09c 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ot1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-t1.vf
index 331fdf99f92..f88326be5e7 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-osf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-osf-t1.vf
index ac30c9660f0..92e029ff58b 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-osf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-sup-t1.vf
index a7e114fe854..090bf697c84 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-sup-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-tlf-t1.vf
index 9517b12cbb0..3de06945dea 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-tlf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-tosf-t1.vf
index 4c7833622e9..d52cbe5f9ee 100644
--- a/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-tosf-t1.vf
+++ b/Master/texmf-dist/fonts/vf/public/junicode/Junicode-SmExpSmBoldItalic-tosf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-ly1.vf
new file mode 100644
index 00000000000..32888926948
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t1.vf
new file mode 100644
index 00000000000..f3aa8d93211
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t5.vf
new file mode 100644
index 00000000000..3f9040f0332
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-dnom-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-inf-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-inf-ly1.vf
new file mode 100644
index 00000000000..b2d5e11164b
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-inf-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t1.vf
new file mode 100644
index 00000000000..7c98aba79d9
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t5.vf
new file mode 100644
index 00000000000..d162b2fd92d
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-inf-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ly1.vf
new file mode 100644
index 00000000000..0c7c3d16765
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t1.vf
new file mode 100644
index 00000000000..97883bfed85
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t5.vf
new file mode 100644
index 00000000000..965310941ff
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-lf-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ts1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ts1.vf
new file mode 100644
index 00000000000..da2e9e24b0c
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-lf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-numr-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-numr-ly1.vf
new file mode 100644
index 00000000000..bcab2615ac9
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-numr-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t1.vf
new file mode 100644
index 00000000000..39eae226916
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t5.vf
new file mode 100644
index 00000000000..229c7747599
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-numr-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-sup-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-sup-ly1.vf
new file mode 100644
index 00000000000..3e786ee2e4a
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-sup-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t1.vf
new file mode 100644
index 00000000000..f59f68a6678
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t5.vf
new file mode 100644
index 00000000000..397ab30d671
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-sup-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ly1.vf
new file mode 100644
index 00000000000..9cd58462c08
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t1.vf
new file mode 100644
index 00000000000..7a07ce984ac
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t5.vf
new file mode 100644
index 00000000000..ea1e6c26afe
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ts1.vf
new file mode 100644
index 00000000000..f2a3a223158
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Bold-tlf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-ly1.vf
new file mode 100644
index 00000000000..124ee91311e
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t1.vf
new file mode 100644
index 00000000000..18d55756b84
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t5.vf
new file mode 100644
index 00000000000..e056b058623
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-dnom-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-inf-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-inf-ly1.vf
new file mode 100644
index 00000000000..46b50c2d748
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-inf-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t1.vf
new file mode 100644
index 00000000000..81dea6ffcdf
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t5.vf
new file mode 100644
index 00000000000..bc81c4f05f4
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-inf-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ly1.vf
new file mode 100644
index 00000000000..018e7da9f53
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t1.vf
new file mode 100644
index 00000000000..26285062cc2
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t5.vf
new file mode 100644
index 00000000000..4bdcb308832
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-lf-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ts1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ts1.vf
new file mode 100644
index 00000000000..851a5443bb5
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-lf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-numr-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-numr-ly1.vf
new file mode 100644
index 00000000000..6e99fa87de4
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-numr-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t1.vf
new file mode 100644
index 00000000000..25fd6d8918a
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t5.vf
new file mode 100644
index 00000000000..3f47618fad6
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-numr-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-sup-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-sup-ly1.vf
new file mode 100644
index 00000000000..1b90b655b66
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-sup-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t1.vf
new file mode 100644
index 00000000000..0b3320418df
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t5.vf
new file mode 100644
index 00000000000..25c95f33708
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-sup-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ly1.vf
new file mode 100644
index 00000000000..7010a956f40
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t1.vf
new file mode 100644
index 00000000000..99d4ebeb4a7
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t5.vf
new file mode 100644
index 00000000000..1369c412572
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ts1.vf
new file mode 100644
index 00000000000..2a099e55fe9
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Italic-tlf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-ly1.vf
new file mode 100644
index 00000000000..b71a6a57f73
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t1.vf
new file mode 100644
index 00000000000..4faa659d2ff
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t5.vf
new file mode 100644
index 00000000000..2fb6628f3cd
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-dnom-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-inf-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-inf-ly1.vf
new file mode 100644
index 00000000000..f909a1d6808
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-inf-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t1.vf
new file mode 100644
index 00000000000..e184f3621ab
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t5.vf
new file mode 100644
index 00000000000..43adaafd9cb
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-inf-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ly1.vf
new file mode 100644
index 00000000000..7f7280879a5
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ly1.vf
new file mode 100644
index 00000000000..303f74d45e9
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ot1.vf
new file mode 100644
index 00000000000..25a726c5d30
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t1.vf
new file mode 100644
index 00000000000..b122330c290
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t5.vf
new file mode 100644
index 00000000000..ee1654cecfb
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-sc-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t1.vf
new file mode 100644
index 00000000000..b375cc89533
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t5.vf
new file mode 100644
index 00000000000..4ee8e5d63bc
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ts1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ts1.vf
new file mode 100644
index 00000000000..a8b8ddb5714
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-lf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-numr-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-numr-ly1.vf
new file mode 100644
index 00000000000..9165553e191
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-numr-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t1.vf
new file mode 100644
index 00000000000..cb93a6595ba
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t5.vf
new file mode 100644
index 00000000000..0429635f220
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-numr-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ly1.vf
new file mode 100644
index 00000000000..72f9baef651
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ly1.vf
new file mode 100644
index 00000000000..51647d521fd
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ot1.vf
new file mode 100644
index 00000000000..99a89314f7a
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t1.vf
new file mode 100644
index 00000000000..76d0d120d36
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t5.vf
new file mode 100644
index 00000000000..8dfe8e35690
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-sc-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t1.vf
new file mode 100644
index 00000000000..5be2b214cd0
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t5.vf
new file mode 100644
index 00000000000..4c2c2481638
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ts1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ts1.vf
new file mode 100644
index 00000000000..e4df6b15ccb
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-osf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-sup-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-sup-ly1.vf
new file mode 100644
index 00000000000..e8f95400382
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-sup-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t1.vf
new file mode 100644
index 00000000000..8be31e4a1ce
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t5.vf
new file mode 100644
index 00000000000..27eeb79dc4b
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-sup-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ly1.vf
new file mode 100644
index 00000000000..aa94b799f5c
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ly1.vf
new file mode 100644
index 00000000000..b38f178a86f
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ot1.vf
new file mode 100644
index 00000000000..a36902cd2c4
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t1.vf
new file mode 100644
index 00000000000..6ad06e20d6f
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t5.vf
new file mode 100644
index 00000000000..abf9f91032e
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-sc-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t1.vf
new file mode 100644
index 00000000000..e0da0c301cd
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t5.vf
new file mode 100644
index 00000000000..c55f2b788b1
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ts1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ts1.vf
new file mode 100644
index 00000000000..9b4786c6310
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tlf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ly1.vf
new file mode 100644
index 00000000000..abbbccce8e7
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ly1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ly1.vf
new file mode 100644
index 00000000000..5b6edd84b0f
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ly1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ot1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ot1.vf
new file mode 100644
index 00000000000..534bf84922e
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-ot1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t1.vf
new file mode 100644
index 00000000000..ca21098044e
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t5.vf
new file mode 100644
index 00000000000..712e2877982
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-sc-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t1.vf
new file mode 100644
index 00000000000..82a4a4ad1eb
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t1.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t5.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t5.vf
new file mode 100644
index 00000000000..77a87099850
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-t5.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ts1.vf b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ts1.vf
new file mode 100644
index 00000000000..b85e3f22f36
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/mfb-oldstyle/MFBOldstyle-Regular-tosf-ts1.vf
Binary files differ
diff --git a/Master/texmf-dist/ls-R b/Master/texmf-dist/ls-R
index 3961b415925..3a7b08ef6c0 100644
--- a/Master/texmf-dist/ls-R
+++ b/Master/texmf-dist/ls-R
@@ -4282,6 +4282,7 @@ xtables-mkiv.tex
./doc/context/third:
calendar-examples
+chat
circuitikz
collating-marks
context-notes-zh-cn
@@ -4309,6 +4310,11 @@ README.md
VERSION
calendar-examples.md
+./doc/context/third/chat:
+LICENSE
+README.md
+VERSION
+
./doc/context/third/circuitikz:
circuitikz-context.pdf
circuitikz-context.tex
@@ -4800,6 +4806,7 @@ bguq
bitter
blacklettert1
boisik
+bonum-otf
bookhands
boondox
brushscr
@@ -5021,6 +5028,7 @@ memdesign
merriweather
metafont-beginners
metsymb
+mfb-oldstyle
mflogo-font
miama
mintspirit
@@ -5798,6 +5806,12 @@ table.tex
testfont.pdf
testfont.tex
+./doc/fonts/bonum-otf:
+Changes
+README.md
+bonum-otf-doc.pdf
+bonum-otf-doc.tex
+
./doc/fonts/bookhands:
README.PRW
allsqrcaps.pdf
@@ -7656,6 +7670,7 @@ in_tex.tex
junicode-samples.pdf
junicode-samples.tex
tag_key_ins.tex
+upperpua.tex
./doc/fonts/junicodevf:
About.tex
@@ -7676,6 +7691,7 @@ in_tex.tex
junicodevf-samples.pdf
junicodevf-samples.tex
tag_key_ins.tex
+upperpua.tex
./doc/fonts/kerkis:
License.txt
@@ -8145,6 +8161,13 @@ metsymb_mwe.pdf
metsymb_mwe.py
testfont.pdf
+./doc/fonts/mfb-oldstyle:
+COPYING
+MFBOldStyle-CharacterMap.pdf
+README
+mfb-oldstyle-doc.pdf
+mfb-oldstyle-doc.tex
+
./doc/fonts/mflogo-font:
README
@@ -14156,6 +14179,7 @@ bewerbung
bez123
bfh-ci
bgteubner
+bib2qr
bibarts
biblatex
biblatex-abnt
@@ -14680,6 +14704,7 @@ doctools
documentation
docutils
doi
+doibanner
doipubmed
dot2texi
dotarrow
@@ -14935,6 +14960,7 @@ filedate
filehook
fileinfo
filemod
+fillwith
fink
finstrut
first-latex-doc
@@ -15163,6 +15189,7 @@ hausarbeit-jura
havannah
hc
he-she
+hebdomon
hebrew-fonts
hecthese
hep
@@ -15221,6 +15248,7 @@ hvpygmentex
hvqrurl
hwemoji
hycolor
+hypcap
hypdestopt
hypdoc
hypdvips
@@ -15963,6 +15991,7 @@ pgfopts
pgfornament
pgfornament-han
pgfplots
+pgfplotsthemebeamer
phfcc
phfextendedabstract
phffullpagefigure
@@ -16019,6 +16048,7 @@ polyglossia
polyhedra
polynom
polynomial
+polyomino
polytable
postage
postcards
@@ -16500,6 +16530,7 @@ tdclock
tdsfrmath
technics
ted
+telprint
templates-fenn
templates-sommer
templatetools
@@ -16864,6 +16895,7 @@ worldflags
wrapfig
wrapfig2
wrapstuff
+wrapstuff-doc-en
writeongrid
wsemclassic
wtref
@@ -19130,6 +19162,7 @@ institute_logo_darkmode.png
./doc/latex/beamertheme-rainbow:
DEPENDS.txt
README.md
+beamertheme-rainbow-doc-settings.sty
beamertheme-rainbow-doc.pdf
beamertheme-rainbow-doc.tex
@@ -19490,6 +19523,10 @@ usefiles.txt
verzeichnisse.tex
vorwort.tex
+./doc/latex/bib2qr:
+README.md
+bib2qr.pdf
+
./doc/latex/bibarts:
COPYING
README.txt
@@ -25626,6 +25663,10 @@ docutils.sty.txt
./doc/latex/doi:
README.md
+./doc/latex/doibanner:
+README.md
+doibanner.pdf
+
./doc/latex/doipubmed:
CHANGES
README
@@ -28132,6 +28173,13 @@ readprov.pdf
README
filemod.pdf
+./doc/latex/fillwith:
+MANIFEST.md
+README.md
+fillwith-example.pdf
+fillwith-example.tex
+fillwith.pdf
+
./doc/latex/fink:
NEWS
README
@@ -28650,11 +28698,11 @@ test-fontaxes.tex
CHANGELOG.md
README.txt
beery.cls
-fontscale-manual-table-classic.tex
-fontscale-manual-table-font-steps.tex
-fontscale-manual-table-modular-musical.tex
-fontscale-manual.pdf
-fontscale-manual.tex
+fontscale-table-classic.tex
+fontscale-table-font-steps.tex
+fontscale-table-musical.tex
+fontscale.pdf
+fontscale.tex
./doc/latex/fontsetup:
README
@@ -30928,6 +30976,15 @@ README
he-she.pdf
he-she.tex
+./doc/latex/hebdomon:
+HebdomonGuide.pdf
+HebdomonGuide.tex
+README.md
+figures
+
+./doc/latex/hebdomon/figures:
+innsbruck.jpg
+
./doc/latex/hebrew-fonts:
README.md
hebfontenc.pdf
@@ -31625,6 +31682,10 @@ hwemoji.tex
README.md
hycolor.pdf
+./doc/latex/hypcap:
+README.md
+hypcap.pdf
+
./doc/latex/hypdestopt:
README.md
hypdestopt.dtx
@@ -32811,6 +32872,7 @@ README.md
./doc/latex/jigsaw:
DEPENDS.txt
README.md
+jigsaw-doc-settings.sty
jigsaw-doc.pdf
jigsaw-doc.tex
@@ -33006,6 +33068,7 @@ jsonparse-doc.tex
./doc/latex/jsonparse/jason:
jason.pdf
jason.svg
+jason.tex
./doc/latex/jumplines:
README
@@ -36266,9 +36329,8 @@ magicnum.txt
./doc/latex/magicwatermark:
README.md
-magicwatermark-en.pdf
-magicwatermark-en.tex
magicwatermark.pdf
+magicwatermark.tex
./doc/latex/mahjong:
LICENSE
@@ -36279,8 +36341,10 @@ mahjong.pdf
mahjong.tex
./doc/latex/mailing:
+CATALOG
+MANIFEST
+README
mailing.pdf
-manifest.txt
./doc/latex/mailmerge:
README
@@ -36550,10 +36614,6 @@ ChangeLog.md
README.md
mathastext.pdf
mathastext.tex
-mathastexttestalphabets.tex
-mathastexttestmathversions.tex
-mathastexttestunicodelinux.tex
-mathastexttestunicodemacos.tex
./doc/latex/mathcommand:
README.md
@@ -36897,10 +36957,12 @@ README
menukeys.pdf
./doc/latex/mercatormap:
-README
+CHANGES.md
+README.md
mercatormap-example.tex
mercatormap.bib
mercatormap.doc.abstract.tex
+mercatormap.doc.animations.tex
mercatormap.doc.definition.tex
mercatormap.doc.drawing.tex
mercatormap.doc.examples.tex
@@ -36912,7 +36974,6 @@ mercatormap.doc.orthodromes.tex
mercatormap.doc.routes.tex
mercatormap.doc.scales.tex
mercatormap.doc.sty
-mercatormap.doc.versionhistory.tex
mercatormap.pdf
mercatormap.tex
@@ -37312,20 +37373,20 @@ font_samples
./doc/latex/mitthesis/examples/cover_page_samples:
No_cc_license.pdf
One_author_one_degree.pdf
+One_author_one_degree_two_departments.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
./doc/latex/mitthesis/examples/cover_page_samples/latex_sources:
No_cc_license.tex
One_author_one_degree.tex
+One_author_one_degree_two_departments.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
@@ -37444,7 +37505,6 @@ CHANGELOG
KNOWN_BUGS
LICENSE.txt
README.md
-commons
manual
picture.eps
picture.jpg
@@ -37452,9 +37512,6 @@ publications.bib
signature.png
template.tex
-./doc/latex/moderncv/commons:
-colors.tex
-
./doc/latex/moderncv/manual:
moderncv_userguide.pdf
moderncv_userguide.tex
@@ -38878,7 +38935,6 @@ fibnum.pdf
flags.pdf
holtxdoc.pdf
hypbmsec.pdf
-hypcap.pdf
hypgotoe-example.tex
hypgotoe.pdf
hyphsubst.pdf
@@ -38905,7 +38961,6 @@ tabularht-example2.tex
tabularht.pdf
tabularkv-example.tex
tabularkv.pdf
-telprint.pdf
thepdfnumber.pdf
twoopt.pdf
@@ -40038,6 +40093,13 @@ pgfplotsexample.tex
pgfplotstable.pdf
pgfplotstodo.pdf
+./doc/latex/pgfplotsthemebeamer:
+DEPENDS.txt
+README.md
+pgfplotsthemebeamer-doc-settings.sty
+pgfplotsthemebeamer-doc.pdf
+pgfplotsthemebeamer-doc.tex
+
./doc/latex/phfcc:
README.md
phfcc.pdf
@@ -40521,6 +40583,11 @@ polynom.pdf
README
polynomial.pdf
+./doc/latex/polyomino:
+README.md
+polyomino.pdf
+polyomino.tex
+
./doc/latex/polytable:
README
polytable.pdf
@@ -44951,14 +45018,20 @@ subdepth.pdf
README.md
./doc/latex/subeqn:
-manifest.txt
+CATALOG
+MANIFEST
+README
+subeqn-sample.pdf
+subeqn-sample.tex
subeqn.pdf
-subeqn.tex
./doc/latex/subeqnarray:
-manifest.txt
+CATALOG
+MANIFEST
+README
+subeqnarray-sample.pdf
+subeqnarray-sample.tex
subeqnarray.pdf
-subeqnarray.tex
./doc/latex/subfig:
README
@@ -45061,9 +45134,9 @@ superiors-doc.tex
./doc/latex/supertabular:
CATALOG
-ChangeLog
MANIFEST
README
+supertabular.bug
supertabular.pdf
./doc/latex/suppose:
@@ -45451,6 +45524,8 @@ ex-tagpdf-template.pdf
ex-tagpdf-template.tex
global-ex.png
link-figure-input.tex
+pac2024-report.png
+pac2024-version.png
pac3.PNG
tagpdf-code.pdf
tagpdf-code.tex
@@ -45589,6 +45664,10 @@ README
ted-fr.pdf
ted.pdf
+./doc/latex/telprint:
+README.md
+telprint.pdf
+
./doc/latex/templates-fenn:
diabetes.tex
dinbrief.tex
@@ -46711,6 +46790,7 @@ tikz3d-fr-doc.tex
./doc/latex/tikzbricks:
DEPENDS.txt
README.md
+tikzbricks-doc-settings.sty
tikzbricks-doc.pdf
tikzbricks-doc.tex
@@ -52088,6 +52168,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
@@ -53806,9 +53891,10 @@ demotut3.dat
tut3.tex
./doc/lualatex/luacensor:
-README
-luacensor.pdf
-luacensor.tex
+OFL.txt
+README.txt
+luacensor-documentation.pdf
+luacensor-documentation.tex
./doc/lualatex/luacode:
News
@@ -58571,6 +58657,7 @@ present-transitions.tex
./doc/plain/pwebmac:
README.md
Xerrorlog.tex
+editorsnote.tex
index.md
makeall
trapman.ch
@@ -67666,6 +67753,7 @@ mdsymbol
merriweather
metapost
metsymb
+mfb-oldstyle
miama
mintspirit
mnsymbol
@@ -71625,6 +71713,49 @@ groff.enc
./fonts/enc/dvips/metsymb:
metsymb.enc
+./fonts/enc/dvips/mfb-oldstyle:
+a_2k4lec.enc
+a_2r5ytu.enc
+a_5lrov3.enc
+a_6mghgo.enc
+a_73nks5.enc
+a_777sfz.enc
+a_7nlkbe.enc
+a_7q6l4s.enc
+a_ahcimn.enc
+a_bgdhbr.enc
+a_cgi3xl.enc
+a_cwrjrk.enc
+a_e5y2zy.enc
+a_fy4cgk.enc
+a_hi6bgi.enc
+a_ikcbof.enc
+a_in623c.enc
+a_jaulpu.enc
+a_kod5rh.enc
+a_kosxnn.enc
+a_nduqlz.enc
+a_nrcrlb.enc
+a_oyw33c.enc
+a_q4fonx.enc
+a_qmdrba.enc
+a_radqz3.enc
+a_rxfd27.enc
+a_s7hq75.enc
+a_sbbrr6.enc
+a_traljt.enc
+a_uyp43f.enc
+a_wvbwpg.enc
+a_x5sf3h.enc
+a_xkajg4.enc
+a_xqrvjh.enc
+a_xx37di.enc
+a_y2ngde.enc
+a_y57hi6.enc
+a_ybcvk5.enc
+a_yjlipp.enc
+a_ztec7x.enc
+
./fonts/enc/dvips/miama:
lgr-miama.enc
ot1-miama.enc
@@ -74095,6 +74226,7 @@ mdsymbol
merriweather
metapost
metsymb
+mfb-oldstyle
mflogo-font
miama
mintspirit
@@ -74960,6 +75092,9 @@ troff.map
./fonts/map/dvips/metsymb:
metsymb.map
+./fonts/map/dvips/mfb-oldstyle:
+MFBOldstyle.map
+
./fonts/map/dvips/mflogo-font:
mflogo.map
@@ -76519,6 +76654,7 @@ logix
luapstricks
mdsymbol
metsymb
+mfb-oldstyle
miama
missaali
mnsymbol
@@ -77807,6 +77943,11 @@ MdSymbol-Semibold.otf
./fonts/opentype/public/metsymb:
metsymb.otf
+./fonts/opentype/public/mfb-oldstyle:
+MFBOldstyle-Bold.otf
+MFBOldstyle-Italic.otf
+MFBOldstyle-Regular.otf
+
./fonts/opentype/public/miama:
miama.otf
@@ -110426,6 +110567,7 @@ mathpazo
mdputu
mdsymbol
metsymb
+mfb-oldstyle
mflogo
miama
mlmodern
@@ -112708,6 +112850,7 @@ burm.tfm
./fonts/tfm/public/bxjatoucs:
bxjatoucs-cid.tfm
bxjatoucs-jis.tfm
+bxjatoucs-tojis.tfm
./fonts/tfm/public/calligra:
callig15.tfm
@@ -139309,6 +139452,196 @@ MdSymbolF-Semibold.tfm
./fonts/tfm/public/metsymb:
metsymb.tfm
+./fonts/tfm/public/mfb-oldstyle:
+MFBOldstyle-Bold-dnom-ly1--base.tfm
+MFBOldstyle-Bold-dnom-ly1.tfm
+MFBOldstyle-Bold-dnom-ot1.tfm
+MFBOldstyle-Bold-dnom-t1--base.tfm
+MFBOldstyle-Bold-dnom-t1.tfm
+MFBOldstyle-Bold-dnom-t5--base.tfm
+MFBOldstyle-Bold-dnom-t5.tfm
+MFBOldstyle-Bold-inf-ly1--base.tfm
+MFBOldstyle-Bold-inf-ly1.tfm
+MFBOldstyle-Bold-inf-ot1.tfm
+MFBOldstyle-Bold-inf-t1--base.tfm
+MFBOldstyle-Bold-inf-t1.tfm
+MFBOldstyle-Bold-inf-t5--base.tfm
+MFBOldstyle-Bold-inf-t5.tfm
+MFBOldstyle-Bold-lf-ly1--base.tfm
+MFBOldstyle-Bold-lf-ly1.tfm
+MFBOldstyle-Bold-lf-ot1.tfm
+MFBOldstyle-Bold-lf-t1--base.tfm
+MFBOldstyle-Bold-lf-t1.tfm
+MFBOldstyle-Bold-lf-t5--base.tfm
+MFBOldstyle-Bold-lf-t5.tfm
+MFBOldstyle-Bold-lf-ts1--base.tfm
+MFBOldstyle-Bold-lf-ts1.tfm
+MFBOldstyle-Bold-numr-ly1--base.tfm
+MFBOldstyle-Bold-numr-ly1.tfm
+MFBOldstyle-Bold-numr-ot1.tfm
+MFBOldstyle-Bold-numr-t1--base.tfm
+MFBOldstyle-Bold-numr-t1.tfm
+MFBOldstyle-Bold-numr-t5--base.tfm
+MFBOldstyle-Bold-numr-t5.tfm
+MFBOldstyle-Bold-sup-ly1--base.tfm
+MFBOldstyle-Bold-sup-ly1.tfm
+MFBOldstyle-Bold-sup-ot1.tfm
+MFBOldstyle-Bold-sup-t1--base.tfm
+MFBOldstyle-Bold-sup-t1.tfm
+MFBOldstyle-Bold-sup-t5--base.tfm
+MFBOldstyle-Bold-sup-t5.tfm
+MFBOldstyle-Bold-tlf-ly1--base.tfm
+MFBOldstyle-Bold-tlf-ly1.tfm
+MFBOldstyle-Bold-tlf-ot1.tfm
+MFBOldstyle-Bold-tlf-t1--base.tfm
+MFBOldstyle-Bold-tlf-t1.tfm
+MFBOldstyle-Bold-tlf-t5--base.tfm
+MFBOldstyle-Bold-tlf-t5.tfm
+MFBOldstyle-Bold-tlf-ts1--base.tfm
+MFBOldstyle-Bold-tlf-ts1.tfm
+MFBOldstyle-Italic-dnom-ly1--base.tfm
+MFBOldstyle-Italic-dnom-ly1.tfm
+MFBOldstyle-Italic-dnom-ot1.tfm
+MFBOldstyle-Italic-dnom-t1--base.tfm
+MFBOldstyle-Italic-dnom-t1.tfm
+MFBOldstyle-Italic-dnom-t5--base.tfm
+MFBOldstyle-Italic-dnom-t5.tfm
+MFBOldstyle-Italic-inf-ly1--base.tfm
+MFBOldstyle-Italic-inf-ly1.tfm
+MFBOldstyle-Italic-inf-ot1.tfm
+MFBOldstyle-Italic-inf-t1--base.tfm
+MFBOldstyle-Italic-inf-t1.tfm
+MFBOldstyle-Italic-inf-t5--base.tfm
+MFBOldstyle-Italic-inf-t5.tfm
+MFBOldstyle-Italic-lf-ly1--base.tfm
+MFBOldstyle-Italic-lf-ly1.tfm
+MFBOldstyle-Italic-lf-ot1.tfm
+MFBOldstyle-Italic-lf-t1--base.tfm
+MFBOldstyle-Italic-lf-t1.tfm
+MFBOldstyle-Italic-lf-t5--base.tfm
+MFBOldstyle-Italic-lf-t5.tfm
+MFBOldstyle-Italic-lf-ts1--base.tfm
+MFBOldstyle-Italic-lf-ts1.tfm
+MFBOldstyle-Italic-numr-ly1--base.tfm
+MFBOldstyle-Italic-numr-ly1.tfm
+MFBOldstyle-Italic-numr-ot1.tfm
+MFBOldstyle-Italic-numr-t1--base.tfm
+MFBOldstyle-Italic-numr-t1.tfm
+MFBOldstyle-Italic-numr-t5--base.tfm
+MFBOldstyle-Italic-numr-t5.tfm
+MFBOldstyle-Italic-sup-ly1--base.tfm
+MFBOldstyle-Italic-sup-ly1.tfm
+MFBOldstyle-Italic-sup-ot1.tfm
+MFBOldstyle-Italic-sup-t1--base.tfm
+MFBOldstyle-Italic-sup-t1.tfm
+MFBOldstyle-Italic-sup-t5--base.tfm
+MFBOldstyle-Italic-sup-t5.tfm
+MFBOldstyle-Italic-tlf-ly1--base.tfm
+MFBOldstyle-Italic-tlf-ly1.tfm
+MFBOldstyle-Italic-tlf-ot1.tfm
+MFBOldstyle-Italic-tlf-t1--base.tfm
+MFBOldstyle-Italic-tlf-t1.tfm
+MFBOldstyle-Italic-tlf-t5--base.tfm
+MFBOldstyle-Italic-tlf-t5.tfm
+MFBOldstyle-Italic-tlf-ts1--base.tfm
+MFBOldstyle-Italic-tlf-ts1.tfm
+MFBOldstyle-Regular-dnom-ly1--base.tfm
+MFBOldstyle-Regular-dnom-ly1.tfm
+MFBOldstyle-Regular-dnom-ot1.tfm
+MFBOldstyle-Regular-dnom-t1--base.tfm
+MFBOldstyle-Regular-dnom-t1.tfm
+MFBOldstyle-Regular-dnom-t5--base.tfm
+MFBOldstyle-Regular-dnom-t5.tfm
+MFBOldstyle-Regular-inf-ly1--base.tfm
+MFBOldstyle-Regular-inf-ly1.tfm
+MFBOldstyle-Regular-inf-ot1.tfm
+MFBOldstyle-Regular-inf-t1--base.tfm
+MFBOldstyle-Regular-inf-t1.tfm
+MFBOldstyle-Regular-inf-t5--base.tfm
+MFBOldstyle-Regular-inf-t5.tfm
+MFBOldstyle-Regular-lf-ly1--base.tfm
+MFBOldstyle-Regular-lf-ly1.tfm
+MFBOldstyle-Regular-lf-ot1.tfm
+MFBOldstyle-Regular-lf-sc-ly1--base.tfm
+MFBOldstyle-Regular-lf-sc-ly1.tfm
+MFBOldstyle-Regular-lf-sc-ot1--base.tfm
+MFBOldstyle-Regular-lf-sc-ot1.tfm
+MFBOldstyle-Regular-lf-sc-t1--base.tfm
+MFBOldstyle-Regular-lf-sc-t1.tfm
+MFBOldstyle-Regular-lf-sc-t5--base.tfm
+MFBOldstyle-Regular-lf-sc-t5.tfm
+MFBOldstyle-Regular-lf-t1--base.tfm
+MFBOldstyle-Regular-lf-t1.tfm
+MFBOldstyle-Regular-lf-t5--base.tfm
+MFBOldstyle-Regular-lf-t5.tfm
+MFBOldstyle-Regular-lf-ts1--base.tfm
+MFBOldstyle-Regular-lf-ts1.tfm
+MFBOldstyle-Regular-numr-ly1--base.tfm
+MFBOldstyle-Regular-numr-ly1.tfm
+MFBOldstyle-Regular-numr-ot1.tfm
+MFBOldstyle-Regular-numr-t1--base.tfm
+MFBOldstyle-Regular-numr-t1.tfm
+MFBOldstyle-Regular-numr-t5--base.tfm
+MFBOldstyle-Regular-numr-t5.tfm
+MFBOldstyle-Regular-osf-ly1--base.tfm
+MFBOldstyle-Regular-osf-ly1.tfm
+MFBOldstyle-Regular-osf-ot1.tfm
+MFBOldstyle-Regular-osf-sc-ly1--base.tfm
+MFBOldstyle-Regular-osf-sc-ly1.tfm
+MFBOldstyle-Regular-osf-sc-ot1--base.tfm
+MFBOldstyle-Regular-osf-sc-ot1.tfm
+MFBOldstyle-Regular-osf-sc-t1--base.tfm
+MFBOldstyle-Regular-osf-sc-t1.tfm
+MFBOldstyle-Regular-osf-sc-t5--base.tfm
+MFBOldstyle-Regular-osf-sc-t5.tfm
+MFBOldstyle-Regular-osf-t1--base.tfm
+MFBOldstyle-Regular-osf-t1.tfm
+MFBOldstyle-Regular-osf-t5--base.tfm
+MFBOldstyle-Regular-osf-t5.tfm
+MFBOldstyle-Regular-osf-ts1--base.tfm
+MFBOldstyle-Regular-osf-ts1.tfm
+MFBOldstyle-Regular-sup-ly1--base.tfm
+MFBOldstyle-Regular-sup-ly1.tfm
+MFBOldstyle-Regular-sup-ot1.tfm
+MFBOldstyle-Regular-sup-t1--base.tfm
+MFBOldstyle-Regular-sup-t1.tfm
+MFBOldstyle-Regular-sup-t5--base.tfm
+MFBOldstyle-Regular-sup-t5.tfm
+MFBOldstyle-Regular-tlf-ly1--base.tfm
+MFBOldstyle-Regular-tlf-ly1.tfm
+MFBOldstyle-Regular-tlf-ot1.tfm
+MFBOldstyle-Regular-tlf-sc-ly1--base.tfm
+MFBOldstyle-Regular-tlf-sc-ly1.tfm
+MFBOldstyle-Regular-tlf-sc-ot1--base.tfm
+MFBOldstyle-Regular-tlf-sc-ot1.tfm
+MFBOldstyle-Regular-tlf-sc-t1--base.tfm
+MFBOldstyle-Regular-tlf-sc-t1.tfm
+MFBOldstyle-Regular-tlf-sc-t5--base.tfm
+MFBOldstyle-Regular-tlf-sc-t5.tfm
+MFBOldstyle-Regular-tlf-t1--base.tfm
+MFBOldstyle-Regular-tlf-t1.tfm
+MFBOldstyle-Regular-tlf-t5--base.tfm
+MFBOldstyle-Regular-tlf-t5.tfm
+MFBOldstyle-Regular-tlf-ts1--base.tfm
+MFBOldstyle-Regular-tlf-ts1.tfm
+MFBOldstyle-Regular-tosf-ly1--base.tfm
+MFBOldstyle-Regular-tosf-ly1.tfm
+MFBOldstyle-Regular-tosf-ot1.tfm
+MFBOldstyle-Regular-tosf-sc-ly1--base.tfm
+MFBOldstyle-Regular-tosf-sc-ly1.tfm
+MFBOldstyle-Regular-tosf-sc-ot1--base.tfm
+MFBOldstyle-Regular-tosf-sc-ot1.tfm
+MFBOldstyle-Regular-tosf-sc-t1--base.tfm
+MFBOldstyle-Regular-tosf-sc-t1.tfm
+MFBOldstyle-Regular-tosf-sc-t5--base.tfm
+MFBOldstyle-Regular-tosf-sc-t5.tfm
+MFBOldstyle-Regular-tosf-t1--base.tfm
+MFBOldstyle-Regular-tosf-t1.tfm
+MFBOldstyle-Regular-tosf-t5--base.tfm
+MFBOldstyle-Regular-tosf-t5.tfm
+MFBOldstyle-Regular-tosf-ts1--base.tfm
+MFBOldstyle-Regular-tosf-ts1.tfm
+
./fonts/tfm/public/mflogo:
logosl8.tfm
@@ -166667,6 +167000,7 @@ junicodevf
khatalmaqala
lexend
logix
+luacensor
luwiantype
marcellus
marvosym
@@ -166981,6 +167315,9 @@ LexendZetta-Regular.ttf
logix.ttf
logixMono.ttf
+./fonts/truetype/public/luacensor:
+Redacted-Regular.ttf
+
./fonts/truetype/public/luwiantype:
LuwianFont.ttf
@@ -168914,6 +169251,7 @@ mathdesign
mathpazo
mdsymbol
metsymb
+mfb-oldstyle
miama
mlmodern
mnsymbol
@@ -174070,6 +174408,11 @@ MdSymbolF-Semibold.pfb
./fonts/type1/public/metsymb:
metsymb.pfb
+./fonts/type1/public/mfb-oldstyle:
+MFBOldstyle-Bold.pfb
+MFBOldstyle-Italic.pfb
+MFBOldstyle-Regular.pfb
+
./fonts/type1/public/miama:
miama.pfb
@@ -186213,6 +186556,7 @@ marcellus
mathdesign
mathpazo
mdputu
+mfb-oldstyle
montserrat
morisawa
nanumtype1
@@ -198065,6 +198409,92 @@ mdputubi8t.vf
mdputuri7t.vf
mdputuri8t.vf
+./fonts/vf/public/mfb-oldstyle:
+MFBOldstyle-Bold-dnom-ly1.vf
+MFBOldstyle-Bold-dnom-t1.vf
+MFBOldstyle-Bold-dnom-t5.vf
+MFBOldstyle-Bold-inf-ly1.vf
+MFBOldstyle-Bold-inf-t1.vf
+MFBOldstyle-Bold-inf-t5.vf
+MFBOldstyle-Bold-lf-ly1.vf
+MFBOldstyle-Bold-lf-t1.vf
+MFBOldstyle-Bold-lf-t5.vf
+MFBOldstyle-Bold-lf-ts1.vf
+MFBOldstyle-Bold-numr-ly1.vf
+MFBOldstyle-Bold-numr-t1.vf
+MFBOldstyle-Bold-numr-t5.vf
+MFBOldstyle-Bold-sup-ly1.vf
+MFBOldstyle-Bold-sup-t1.vf
+MFBOldstyle-Bold-sup-t5.vf
+MFBOldstyle-Bold-tlf-ly1.vf
+MFBOldstyle-Bold-tlf-t1.vf
+MFBOldstyle-Bold-tlf-t5.vf
+MFBOldstyle-Bold-tlf-ts1.vf
+MFBOldstyle-Italic-dnom-ly1.vf
+MFBOldstyle-Italic-dnom-t1.vf
+MFBOldstyle-Italic-dnom-t5.vf
+MFBOldstyle-Italic-inf-ly1.vf
+MFBOldstyle-Italic-inf-t1.vf
+MFBOldstyle-Italic-inf-t5.vf
+MFBOldstyle-Italic-lf-ly1.vf
+MFBOldstyle-Italic-lf-t1.vf
+MFBOldstyle-Italic-lf-t5.vf
+MFBOldstyle-Italic-lf-ts1.vf
+MFBOldstyle-Italic-numr-ly1.vf
+MFBOldstyle-Italic-numr-t1.vf
+MFBOldstyle-Italic-numr-t5.vf
+MFBOldstyle-Italic-sup-ly1.vf
+MFBOldstyle-Italic-sup-t1.vf
+MFBOldstyle-Italic-sup-t5.vf
+MFBOldstyle-Italic-tlf-ly1.vf
+MFBOldstyle-Italic-tlf-t1.vf
+MFBOldstyle-Italic-tlf-t5.vf
+MFBOldstyle-Italic-tlf-ts1.vf
+MFBOldstyle-Regular-dnom-ly1.vf
+MFBOldstyle-Regular-dnom-t1.vf
+MFBOldstyle-Regular-dnom-t5.vf
+MFBOldstyle-Regular-inf-ly1.vf
+MFBOldstyle-Regular-inf-t1.vf
+MFBOldstyle-Regular-inf-t5.vf
+MFBOldstyle-Regular-lf-ly1.vf
+MFBOldstyle-Regular-lf-sc-ly1.vf
+MFBOldstyle-Regular-lf-sc-ot1.vf
+MFBOldstyle-Regular-lf-sc-t1.vf
+MFBOldstyle-Regular-lf-sc-t5.vf
+MFBOldstyle-Regular-lf-t1.vf
+MFBOldstyle-Regular-lf-t5.vf
+MFBOldstyle-Regular-lf-ts1.vf
+MFBOldstyle-Regular-numr-ly1.vf
+MFBOldstyle-Regular-numr-t1.vf
+MFBOldstyle-Regular-numr-t5.vf
+MFBOldstyle-Regular-osf-ly1.vf
+MFBOldstyle-Regular-osf-sc-ly1.vf
+MFBOldstyle-Regular-osf-sc-ot1.vf
+MFBOldstyle-Regular-osf-sc-t1.vf
+MFBOldstyle-Regular-osf-sc-t5.vf
+MFBOldstyle-Regular-osf-t1.vf
+MFBOldstyle-Regular-osf-t5.vf
+MFBOldstyle-Regular-osf-ts1.vf
+MFBOldstyle-Regular-sup-ly1.vf
+MFBOldstyle-Regular-sup-t1.vf
+MFBOldstyle-Regular-sup-t5.vf
+MFBOldstyle-Regular-tlf-ly1.vf
+MFBOldstyle-Regular-tlf-sc-ly1.vf
+MFBOldstyle-Regular-tlf-sc-ot1.vf
+MFBOldstyle-Regular-tlf-sc-t1.vf
+MFBOldstyle-Regular-tlf-sc-t5.vf
+MFBOldstyle-Regular-tlf-t1.vf
+MFBOldstyle-Regular-tlf-t5.vf
+MFBOldstyle-Regular-tlf-ts1.vf
+MFBOldstyle-Regular-tosf-ly1.vf
+MFBOldstyle-Regular-tosf-sc-ly1.vf
+MFBOldstyle-Regular-tosf-sc-ot1.vf
+MFBOldstyle-Regular-tosf-sc-t1.vf
+MFBOldstyle-Regular-tosf-sc-t5.vf
+MFBOldstyle-Regular-tosf-t1.vf
+MFBOldstyle-Regular-tosf-t5.vf
+MFBOldstyle-Regular-tosf-ts1.vf
+
./fonts/vf/public/montserrat:
Montserrat-Black-dnom-ly1.vf
Montserrat-Black-dnom-t1.vf
@@ -208334,11 +208764,10 @@ citeproc-element.lua
citeproc-engine.lua
citeproc-ir-node.lua
citeproc-journal-data.lua
-citeproc-latex-core.lua
citeproc-latex-data.lua
citeproc-latex-parser.lua
-citeproc-latex.lua
citeproc-lua.lua
+citeproc-manager.lua
citeproc-node-bibliography.lua
citeproc-node-choose.lua
citeproc-node-citation.lua
@@ -211757,6 +212186,7 @@ beton
bewerbung
bez123
bgteubner
+bib2qr
bibarts
biblatex-archaeology
biblatex-bath
@@ -212025,6 +212455,7 @@ docmute
docshots
doctools
documentation
+doibanner
doipubmed
dotarrow
dotseqn
@@ -212175,6 +212606,7 @@ filecontentsdef
filedate
filehook
fileinfo
+fillwith
fink
finstrut
firstaid
@@ -212342,6 +212774,7 @@ huawei
hulipsum
hustthesis
hycolor
+hypcap
hypdoc
hyper
hyperbar
@@ -212499,7 +212932,6 @@ lwarp
macrolist
macroswap
magicnum
-magicwatermark
mahjong
mailing
mailmerge
@@ -213008,6 +213440,7 @@ tangocolors
tcldoc
tdsfrmath
ted
+telprint
templatetools
tengwarscript
tensor
@@ -213863,6 +214296,10 @@ hhsubfigure.dtx
hhsubfigure.ins
ltxdoc.cfg
+./source/latex/bib2qr:
+bib2qr.dtx
+bib2qr.ins
+
./source/latex/bibarts:
bibsort.c
@@ -215193,6 +215630,10 @@ doctools.ins
documentation.dtx
documentation.ins
+./source/latex/doibanner:
+doibanner.dtx
+doibanner.ins
+
./source/latex/doipubmed:
doipubmed.dtx
doipubmed.ins
@@ -215876,6 +216317,10 @@ gather.tex
myfilist.tex
readprov.tex
+./source/latex/fillwith:
+fillwith.dtx
+fillwith.ins
+
./source/latex/fink:
fink.dtx
fink.ins
@@ -216723,6 +217168,9 @@ hustthesis.ins
./source/latex/hycolor:
hycolor.dtx
+./source/latex/hypcap:
+hypcap.dtx
+
./source/latex/hypdoc:
hypdoc.dtx
@@ -217747,9 +218195,6 @@ macroswap.ins
./source/latex/magicnum:
magicnum.dtx
-./source/latex/magicwatermark:
-magicwatermark.dtx
-
./source/latex/mahjong:
Makefile
mahjong.dtx
@@ -218689,7 +219134,6 @@ fibnum.dtx
flags.dtx
holtxdoc.dtx
hypbmsec.dtx
-hypcap.dtx
hypgotoe.dtx
hyphsubst.dtx
ifdraft.dtx
@@ -218709,7 +219153,6 @@ stackrel.dtx
stampinclude.dtx
tabularht.dtx
tabularkv.dtx
-telprint.dtx
thepdfnumber.dtx
twoopt.dtx
@@ -220330,6 +220773,9 @@ tdsfrmath.ins
./source/latex/ted:
ted.dtx
+./source/latex/telprint:
+telprint.dtx
+
./source/latex/templatetools:
templatetools.dtx
templatetools.ins
@@ -222580,6 +223026,7 @@ cslatex
csplain
eplain
fontinst
+fonts
generic
hitex
jadetex
@@ -226177,6 +226624,7 @@ cont-sys.mkxl
advice
asymptote
calendar-examples
+chat
circuitikz
collargs
collating-marks
@@ -226219,6 +226667,9 @@ Menu-calendar.mkiv
Photocalendar.mkiv
Sundata-calendar.mkiv
+./tex/context/third/chat:
+t-chat.mkiv
+
./tex/context/third/circuitikz:
t-circuitikz-0.8.3.tex
t-circuitikz-0.9.3.tex
@@ -226750,6 +227201,12 @@ resetosf.mtx
textcomp.mtx
unsetnum.mtx
+./tex/fonts:
+bonum-otf
+
+./tex/fonts/bonum-otf:
+bonum-otf.sty
+
./tex/generic:
2up
abbr
@@ -230252,7 +230709,6 @@ pdfcrypt.sty
protecteddef.sty
rotchiffre.sty
setouterhbox.sty
-telprint.sty
thepdfnumber.sty
./tex/generic/ofs:
@@ -232104,6 +232560,7 @@ esopic-hooks.4ht
esperant.4ht
esperanto.4ht
estonian.4ht
+esvect.4ht
eucal.4ht
euler.4ht
europecv.4ht
@@ -233072,6 +233529,7 @@ bez123
bfh-ci
bgteubner
bguq
+bib2qr
bibarts
bibcop
biblatex
@@ -233640,6 +234098,7 @@ doctools
documentation
docutils
doi
+doibanner
doipubmed
domitian
dot2texi
@@ -233912,6 +234371,7 @@ filedate
filehook
fileinfo
filemod
+fillwith
fink
finstrut
fira
@@ -234174,6 +234634,7 @@ hausarbeit-jura
havannah
hc
he-she
+hebdomon
hebrew-fonts
hecthese
helmholtz-ellis-ji-notation
@@ -234239,6 +234700,7 @@ hvpygmentex
hvqrurl
hwemoji
hycolor
+hypcap
hypdestopt
hypdoc
hypdvips
@@ -234653,6 +235115,7 @@ method
metre
metrix
metsymb
+mfb-oldstyle
mfirstuc
mflogo
mfnfss
@@ -234998,6 +235461,7 @@ pgfopts
pgfornament
pgfornament-han
pgfplots
+pgfplotsthemebeamer
phaistos
phfcc
phfextendedabstract
@@ -235062,6 +235526,7 @@ polyglossia
polyhedra
polynom
polynomial
+polyomino
polytable
postage
postcards
@@ -235657,6 +236122,7 @@ tdclock
tdsfrmath
technics
ted
+telprint
templatetools
tempora
tengwarscript
@@ -238040,7 +238506,6 @@ beamerthemepureminimalistic.sty
./tex/latex/beamertheme-rainbow:
beamercolorthemerainbow.sty
-beamertheme-rainbow-doc-settings.sty
./tex/latex/beamertheme-saintpetersburg:
beamercolorthemeSaintPetersburg.sty
@@ -238252,6 +238717,9 @@ begriff-bguq.sty
bguq.cfg
bguq.sty
+./tex/latex/bib2qr:
+bib2qr.sty
+
./tex/latex/bibarts:
bibarts.sty
@@ -239477,10 +239945,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
@@ -242987,6 +243473,9 @@ docutils.sty
./tex/latex/doi:
doi.sty
+./tex/latex/doibanner:
+doibanner.sty
+
./tex/latex/doipubmed:
doipubmed.sty
@@ -244446,6 +244935,9 @@ readprov.sty
filemod-expmin.sty
filemod.sty
+./tex/latex/fillwith:
+fillwith.sty
+
./tex/latex/fink:
fink.sty
@@ -246380,6 +246872,9 @@ hcslides.cls
./tex/latex/he-she:
he-she.sty
+./tex/latex/hebdomon:
+hebdomon.cls
+
./tex/latex/hebrew-fonts:
8859-8.def
cp1255.def
@@ -246731,6 +247226,9 @@ hwemoji.sty
hycolor.sty
xcolor-patch.sty
+./tex/latex/hypcap:
+hypcap.sty
+
./tex/latex/hypdestopt:
hypdestopt.sty
@@ -247964,7 +248462,6 @@ CaJ-UnOv1-PTV.pdf
JeuxCartes.sty
./tex/latex/jigsaw:
-jigsaw-doc-settings.sty
jigsaw.sty
./tex/latex/jkmath:
@@ -251213,6 +251710,45 @@ metrix.sty
metsymb.sty
umetsymb.fd
+./tex/latex/mfb-oldstyle:
+LY1MFBOldstyle-Dnom.fd
+LY1MFBOldstyle-Inf.fd
+LY1MFBOldstyle-LF.fd
+LY1MFBOldstyle-Numr.fd
+LY1MFBOldstyle-OsF.fd
+LY1MFBOldstyle-Sup.fd
+LY1MFBOldstyle-TLF.fd
+LY1MFBOldstyle-TOsF.fd
+OT1MFBOldstyle-Dnom.fd
+OT1MFBOldstyle-Inf.fd
+OT1MFBOldstyle-LF.fd
+OT1MFBOldstyle-Numr.fd
+OT1MFBOldstyle-OsF.fd
+OT1MFBOldstyle-Sup.fd
+OT1MFBOldstyle-TLF.fd
+OT1MFBOldstyle-TOsF.fd
+T1MFBOldstyle-Dnom.fd
+T1MFBOldstyle-Inf.fd
+T1MFBOldstyle-LF.fd
+T1MFBOldstyle-Numr.fd
+T1MFBOldstyle-OsF.fd
+T1MFBOldstyle-Sup.fd
+T1MFBOldstyle-TLF.fd
+T1MFBOldstyle-TOsF.fd
+T5MFBOldstyle-Dnom.fd
+T5MFBOldstyle-Inf.fd
+T5MFBOldstyle-LF.fd
+T5MFBOldstyle-Numr.fd
+T5MFBOldstyle-OsF.fd
+T5MFBOldstyle-Sup.fd
+T5MFBOldstyle-TLF.fd
+T5MFBOldstyle-TOsF.fd
+TS1MFBOldstyle-LF.fd
+TS1MFBOldstyle-OsF.fd
+TS1MFBOldstyle-TLF.fd
+TS1MFBOldstyle-TOsF.fd
+mfb-oldstyle.sty
+
./tex/latex/mfirstuc:
mfirstuc-2021-10-15.sty
mfirstuc-english.sty
@@ -251813,6 +252349,7 @@ moderncvcolorgrey.sty
moderncvcolororange.sty
moderncvcolorpurple.sty
moderncvcolorred.sty
+moderncvcolors.tex
moderncvcompatibility.sty
moderncvdebugtools.sty
moderncvfooti.sty
@@ -253099,7 +253636,6 @@ enparen.sty
flags.sty
holtxdoc.sty
hypbmsec.sty
-hypcap.sty
hypgotoe.sty
ifdraft.sty
pdfcolparallel.sty
@@ -254400,6 +254936,9 @@ pgfregressiontest.sty
tikzlibrarypgfplots.clickable.code.tex
tikzlibrarypgfplotsclickable.code.tex
+./tex/latex/pgfplotsthemebeamer:
+pgfplotsthemebeamer.sty
+
./tex/latex/phaistos:
phaistos.sty
@@ -255019,6 +255558,9 @@ polynom.sty
./tex/latex/polynomial:
polynomial.sty
+./tex/latex/polyomino:
+polyomino.sty
+
./tex/latex/polytable:
polytable.sty
@@ -258491,6 +259033,9 @@ technics.sty
./tex/latex/ted:
ted.sty
+./tex/latex/telprint:
+telprint.sty
+
./tex/latex/templatetools:
templatetools.sty
@@ -259113,7 +259658,6 @@ tikz2d-fr.sty
tikz3d-fr.sty
./tex/latex/tikzbricks:
-tikzbricks-doc-settings.sty
tikzbricks.sty
./tex/latex/tikzcodeblocks:
@@ -276445,6 +276989,7 @@ Sf-Kp-Sc
Spectral
TeXGyreTermes
TeXGyreTermesX
+TeXvect10
Tt-Kp
Tt-Kp-Exp
URW_Chancery_L
@@ -276863,6 +277408,9 @@ ntxdenoms-Regular-ly1.htf
ntxdenoms-Regular-ot1.htf
ntxdenoms-Regular-t1.htf
+./tex4ht/ht-fonts/unicode/TeXvect10:
+vect10.htf
+
./tex4ht/ht-fonts/unicode/Tt-Kp:
jkpttmn8t.htf
jkpttosmn8t.htf
diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc-bibtex-parser.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-bibtex-parser.lua
index 39f4826ca1b..27d6ff3dc8a 100644
--- a/Master/texmf-dist/scripts/citation-style-language/citeproc-bibtex-parser.lua
+++ b/Master/texmf-dist/scripts/citation-style-language/citeproc-bibtex-parser.lua
@@ -117,7 +117,7 @@ local function concat_strings(pieces, strings)
if piece_str then
value = value .. piece_str
else
- util.warning(string.format('String name "%s" is undefined."', piece.name))
+ util.warning(string.format("String name '%s' is undefined.", piece.name))
end
end
end
@@ -311,7 +311,7 @@ end
function bibtex_parser.split_name_parts(str)
str = util.strip(str)
if string.match(str, ",$") then
- util.warning(string.format('Name "%s" has has a comma at the end.', str))
+ util.warning(string.format("Name '%s' has has a comma at the end.", str))
str = string.gsub(str, ",$", '')
end
@@ -339,7 +339,7 @@ function bibtex_parser.split_name_parts(str)
elseif #parts == 3 then
name = bibtex_parser._split_last_jr_first_parts(parts)
elseif #parts > 3 then
- util.error(string.format('Too many commas in name "%s"', str))
+ util.error(string.format("Too many commas in name '%s'", str))
name = bibtex_parser._split_last_jr_first_parts(util.slice(parts, 1, 3))
end
@@ -407,7 +407,7 @@ function bibtex_parser._split_extended_name_format(parts)
key, value = string.match(part, '^"([a-zA-Z]+%-?i?)%s*=%s*(.-)%s*"%s*$')
end
if not key then
- util.error(string.format('Invalid extended name part "%s"', part))
+ util.error(string.format("Invalid extended name part '%s'", part))
end
if key == "given" then
diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc-bibtex2csl.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-bibtex2csl.lua
index cc4cf2580f2..a2979748f09 100644
--- a/Master/texmf-dist/scripts/citation-style-language/citeproc-bibtex2csl.lua
+++ b/Master/texmf-dist/scripts/citation-style-language/citeproc-bibtex2csl.lua
@@ -374,6 +374,9 @@ end
function bibtex2csl._parse_edtf_date(str)
local date_range = util.split(str, "/")
+ if str == "" then
+ return nil
+ end
if #date_range == 1 then
date_range = util.split(str, util.unicode["en dash"])
end
diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc-cli.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-cli.lua
index 83e6d35e9b1..6a86fa4b240 100644
--- a/Master/texmf-dist/scripts/citation-style-language/citeproc-cli.lua
+++ b/Master/texmf-dist/scripts/citation-style-language/citeproc-cli.lua
@@ -11,10 +11,10 @@ local cli = {}
local lpeg = require("lpeg")
require("lualibs")
+local citeproc_manager = require("citeproc-manager")
local citeproc = require("citeproc")
local bibtex2csl -- = require("citeproc-bibtex-parser") -- load on demand
local util = require("citeproc-util")
-local core = require("citeproc-latex-core")
local latex_parser = require("citeproc-latex-parser")
@@ -82,116 +82,6 @@ local function convert_bib(path, output_path)
end
-local balanced = lpeg.P{ "{" * lpeg.V(1)^0 * "}" + (1 - lpeg.S"{}") }
-
-
----@param text string
----@return string?
-local function get_command_argument(text, command)
- if string.match(text, command) then
- local grammar = (lpeg.P(command) * lpeg.S(" \t\r\n")^0 * lpeg.C(balanced) + 1)^0
- local argument = grammar:match(text)
- if not argument then
- return nil
- end
- argument = string.sub(argument, 2, -2)
- return argument
- end
- return nil
-end
-
-
-
----comment
----@param aux_file any
----@return string
----@return string[]
----@return Citation[]
----@return table<string, string>
----@return string[]
-local function read_aux_file(aux_file)
- local csl_style = nil
- local csl_data_files = {}
- local csl_citations = {}
- local csl_options = {}
- local csl_bibliographies = {}
-
- local file = io.open(aux_file)
- if not file then
- util.error(string.format("Couldn't open file %s", aux_file))
- return csl_style, csl_data_files, csl_citations, csl_options, csl_bibliographies
- end
- for line in file:lines() do
- -- TODO: Use lpeg-based method and detect multiple lines
- local style = get_command_argument(line, "\\csl@aux@style")
- if style then
- csl_style = style
- else
- local data = get_command_argument(line, "\\csl@aux@data")
- if data then
- for _, bib_file in ipairs(latex_parser.parse_seq(data)) do
- table.insert(csl_data_files, bib_file)
- end
- else
- local cite = get_command_argument(line, "\\csl@aux@cite")
- if cite then
- local citation = core.make_citation(cite)
- table.insert(csl_citations, citation)
- else
- local options = get_command_argument(line, "\\csl@aux@options")
- if options then
- options = latex_parser.parse_prop(options)
- for key, value in pairs(options) do
- csl_options[key] = value
- end
- else
- local bib = get_command_argument(line, "\\csl@aux@bibliography")
- if bib then
- table.insert(csl_bibliographies, bib)
- else
- local sub_aux_file = get_command_argument(line, "\\@input")
- if sub_aux_file and util.endswith(sub_aux_file, ".aux") then
- local style_name, data_files, citations, opts, bibs = read_aux_file(sub_aux_file)
- if style_name then
- csl_style = style_name
- end
- util.extend(csl_data_files, data_files)
- util.extend(csl_citations, citations)
- util.extend(csl_citations, citations)
- for key, value in pairs(opts) do
- csl_options[key] = value
- end
- util.extend(csl_bibliographies, bibs)
- end
- end
- end
- end
- end
- end
- end
- file:close()
-
- return csl_style, csl_data_files, csl_citations, csl_options, csl_bibliographies
-end
-
-
-local function get_undefined_info(core, citation)
- local res = ""
- for _, cite_item in ipairs(citation.citationItems) do
- if not core.item_dict[cite_item.id] then
- if res ~= "" then
- res = res .. ","
- end
- res = res .. cite_item.id
- end
- end
- if res ~= "" then
- res = string.format("\\cslsetup{undefined-cites={%s}}", res)
- end
- return res
-end
-
-
---@param aux_file string
local function process_aux_file(aux_file)
if not util.endswith(aux_file, ".aux") then
@@ -204,73 +94,17 @@ local function process_aux_file(aux_file)
util.info(banner)
util.info(string.format("The top-level auxiliary file: %s", aux_file))
- local style_name, bib_files, citations, csl_options, bibliographies = read_aux_file(aux_file)
-
- if style_name and style_name ~= "" then
- util.info(string.format("The style file: %s.csl", style_name))
- else
- util.warning("Missing style name. Will use default APA style.")
- style_name = "apa"
- end
-
- if #citations == 0 then
- util.error(string.format("No citation commands in file %s", aux_file))
- end
-
- if #bib_files == 0 then
- util.warning("empty bibliography data files")
- else
- for i, bib_file in ipairs(bib_files) do
- util.info(string.format("Database file #%d: %s", i, bib_file))
- end
- end
-
- local lang = csl_options.locale
-
- local engine = core.init(style_name, bib_files, lang)
- if not engine then
- error("citeproc-lua: fails in initialize engine")
- end
- if csl_options.linking then
- engine:enable_linking()
- end
- local style_class = engine:get_style_class()
-
- if style_class == "in-text" then
- for _, citation in ipairs(citations) do
- citation.properties.noteIndex = 0
- end
- end
-
- local citation_strings = core.process_citations(engine, citations)
-
- -- util.debug(citation_strings)
+ local csl_citation_manager = citeproc_manager.CslCitationManager:new()
- local output_string = string.format("\\cslsetup{class = %s}\n\n", style_class)
-
- for _, citation in ipairs(citations) do
- local citation_id = citation.citationID
- if citation_id ~= "@nocite" then
- local citation_str = citation_strings[citation_id]
- local undefined_entry_info = get_undefined_info(core, citation)
- output_string = output_string .. string.format("\\cslcitation{%s}{%s%s}\n",
- citation_id, undefined_entry_info, citation_str)
- end
- end
-
- output_string = output_string .. "\n"
- local categories_str = csl_options["categories"]
- if categories_str then
- core.set_categories(engine, categories_str)
+ local aux_content = util.read_file(aux_file)
+ if not aux_content then
+ return
end
- for _, bib_filter_str in ipairs(bibliographies) do
- local result = core.make_bibliography(engine, bib_filter_str)
- output_string = output_string .. "\n\n\n" .. result
- end
+ local bbl_str = csl_citation_manager:read_aux_file(aux_content)
local output_path = string.gsub(aux_file, "%.aux$", ".bbl")
- util.write_file(output_string, output_path)
+ util.write_file(bbl_str, output_path)
util.quiet_mode = false;
if util.num_errors > 1 then
diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc-context.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-context.lua
index 13618b407aa..e63c087dc51 100644
--- a/Master/texmf-dist/scripts/citation-style-language/citeproc-context.lua
+++ b/Master/texmf-dist/scripts/citation-style-language/citeproc-context.lua
@@ -297,7 +297,7 @@ end
function Context:get_macro(name)
local res = self.style.macros[name]
if not res then
- util.error(string.format('Undefined macro "%s"', name))
+ util.error(string.format("Undefined macro '%s'", name))
end
return res
end
@@ -363,7 +363,7 @@ end
function IrState:push_macro(macro_name)
for _, name in ipairs(macro_name) do
if name == macro_name then
- util.error(string.format('Recursive macro "%s".', macro_name))
+ util.error(string.format("Recursive macro '%s'.", macro_name))
end
table.insert(self.macro_stack, macro_name)
end
diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc-element.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-element.lua
index 2fb19b4848c..18d92b33383 100644
--- a/Master/texmf-dist/scripts/citation-style-language/citeproc-element.lua
+++ b/Master/texmf-dist/scripts/citation-style-language/citeproc-element.lua
@@ -384,10 +384,20 @@ function Element:apply_strip_periods(str)
end
+---@param number string Non-empty string
+---@param variable string
+---@param form string
+---@param context Context
+---@return string
function Element:format_number(number, variable, form, context)
number = util.strip(number)
if variable == "locator" then
- variable = context:get_variable("label")
+ local locator_variable = context:get_variable("label")
+ if not locator_variable or type(locator_variable) ~= "string" then
+ util.error("Invalid locator label")
+ locator_variable = "page"
+ end
+ variable = locator_variable
end
form = form or "numeric"
local number_part_list = self:split_number_parts_lpeg(number, context)
@@ -431,9 +441,11 @@ function Element:format_number(number, variable, form, context)
return res
end
----comment
----@param number any
----@param context any
+---@alias NumberToken {type: string, value: string, delimiter_type: string}
+
+---@param number string
+---@param context Context
+---@return NumberToken[]
function Element:parse_number_tokens(number, context)
local and_text = "and"
local and_symbol = "&"
@@ -465,10 +477,15 @@ function Element:parse_number_tokens(number, context)
value = token,
}
end
- local grammer = l.Ct(token_patt * (delimiter * token_patt)^0)
+ local grammer = l.Ct((token_patt * (delimiter * token_patt)^0)^-1)
local tokens = grammer:match(number)
-- util.debug(tokens)
+ if not tokens then
+ return {}
+ end
+ ---@cast tokens NumberToken[]
+
for i, token in ipairs(tokens) do
if token.type == "string" then
token.value = string.gsub(token.value, "\\%-", "-")
diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc-engine.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-engine.lua
index 6bd1d9a3254..042c37414a0 100644
--- a/Master/texmf-dist/scripts/citation-style-language/citeproc-engine.lua
+++ b/Master/texmf-dist/scripts/citation-style-language/citeproc-engine.lua
@@ -103,6 +103,10 @@ local Registry = {}
---@field cite_first_note_numbers table<ItemId, NoteIndex>
local CiteProc = {}
+---@class CiteProcSys
+---@field retrieveLocale fun(LanguageCode): string?
+---@field retrieveItem fun(ItemId): ItemData?
+
---comment
---@param sys table
---@param style string
@@ -192,7 +196,7 @@ end
function CiteProc:check_valid_citation_element()
if not self.style.citation then
if self.style.info and self.style.info.independent_parent then
- util.error(string.format('This is a dependent style linked to "%s".', self.style.info.independent_parent))
+ util.error(string.format("This is a dependent style linked to '%s'.", self.style.info.independent_parent))
else
util.error('No <citation> in style.')
end
@@ -213,8 +217,10 @@ function CiteProc:updateItems(ids)
local loaded_ids = {}
for _, id in ipairs(ids) do
- table.insert(cite_items, {id = id})
- loaded_ids[id] = true
+ if not loaded_ids[id] then
+ table.insert(cite_items, {id = id})
+ loaded_ids[id] = true
+ end
end
for _, id in ipairs(self.registry.uncited_list) do
if not loaded_ids[id] then
@@ -737,6 +743,8 @@ function CiteProc:makeCitationCluster(citation_items)
return res
end
+---@param bibsection any
+---@return [{[string]: string | number | boolean}, string[]]
function CiteProc:makeBibliography(bibsection)
-- The bibsection works as a filter described in
-- <https://citeproc-js.readthedocs.io/en/latest/running.html#selective-output-with-makebibliography>.
@@ -981,7 +989,6 @@ function CiteProc:_retrieve_item(id)
local res = {}
local item = self.sys.retrieveItem(id)
if not item then
- util.warning(string.format("Didn't find a database entry for '%s'", id))
return nil
end
@@ -1139,7 +1146,7 @@ function CiteProc:get_system_locale(lang)
local locale_str = self.sys.retrieveLocale(lang)
if not locale_str then
- util.warning(string.format("Failed to retrieve locale \"%s\"", lang))
+ util.warning(string.format("Failed to retrieve locale '%s'", lang))
return nil
end
local locale_xml = dom.parse(locale_str)
diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc-latex-core.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-latex-core.lua
deleted file mode 100644
index 3057c5d1e2b..00000000000
--- a/Master/texmf-dist/scripts/citation-style-language/citeproc-latex-core.lua
+++ /dev/null
@@ -1,525 +0,0 @@
---
--- Copyright (c) 2021-2024 Zeping Lee
--- Released under the MIT license.
--- Repository: https://github.com/zepinglee/citeproc-lua
---
-
-local core = {}
-
-require("lualibs")
-local json_decode = utilities.json.tolua
-
-local citeproc = require("citeproc")
-local bibtex_data = require("citeproc-bibtex-data")
-local bibtex_parser = require("citeproc-bibtex-parser")
-local latex_parser = require("citeproc-latex-parser")
-local yaml -- = require("citeproc-yaml") -- load on demand
-local bibtex2csl -- = require("citeproc-bibtex2csl") -- load on demand
-local unicode = require("citeproc-unicode")
-local util = citeproc.util
-
-
-core.locale_file_format = "csl-locales-%s.xml"
-core.uncited_ids = {}
-core.uncite_all_items = false
-
-core.item_list = {}
-core.item_dict = {}
-
----@param file_name string
----@param ftype "bib"?
----@param file_info string
----@return string? contents
-function core.read_file(file_name, ftype, file_info)
- if file_info then
- file_info = unicode.capitalize(file_info)
- else
- file_info = "File"
- end
- local path = kpse.find_file(file_name, ftype)
- if not path then
- if ftype and not util.endswith(file_name, ftype) then
- file_name = file_name .. ftype
- end
- util.error(string.format('%s "%s" not found', file_info, file_name))
- return nil
- end
- local file = io.open(path, "r")
- if not file then
- util.error(string.format('Cannot open %s "%s"', file_info, path))
- return nil
- end
- local contents = file:read("*a")
- contents = util.remove_bom(contents)
- file:close()
- return contents
-end
-
-
----@param filename string
----@return string file
----@return string format
----@return string? contents
-local function read_data_file(filename)
- local file = filename
- local format = "json"
- local contents = nil
-
- if util.endswith(filename, ".json") then
- format = "json"
- contents = core.read_file(filename, nil, "database file")
- elseif string.match(filename, "%.ya?ml$") then
- format = "yaml"
- contents = core.read_file(filename, nil, "database file")
- elseif util.endswith(filename, ".bib") then
- format = "bibtex"
- contents = core.read_file(filename, "bib", "database file")
- else
- file = filename .. ".json"
- local path = kpse.find_file(file)
- if path then
- format = "json"
- contents = core.read_file(file, nil, "database file")
- else
- path = kpse.find_file(filename .. ".yaml") or kpse.find_file(filename .. ".yml")
- if path then
- format = "yaml"
- file = filename .. string.match(path, "%.ya?ml$")
- contents = core.read_file(path, nil, "database file")
- else
- path = kpse.find_file(filename, "bib")
- if path then
- file = filename .. ".bib"
- format = "bibtex"
- contents = core.read_file(filename, "bib", "database file")
- else
- util.error(string.format('Cannot find database file "%s"', filename .. ".json"))
- return file, format, nil
- end
- end
- end
- end
- return file, format, contents
-end
-
-
-local function read_data_files(data_files)
- local item_list = {}
- local item_dict = {}
-
- --- Store BibTeX entries for later resolving crossref
- ---@type table<string, BibtexEntry>
- local bibtex_entries = {}
- ---@type table<string, string>
- local bibtex_strings = {}
- for name, macro in pairs(bibtex_data.macros) do
- bibtex_strings[name] = macro.value
- end
- ---@type BibtexEntry[]
- local entries_with_crossref = {}
-
- for _, data_file in ipairs(data_files) do
- -- local file_name, csl_items = read_data_file(data_file)
-
- local csl_items = {}
-
- local file, format, contents = read_data_file(data_file)
-
- if contents then
-
- if format == "json" then
- local ok, res = pcall(json_decode, contents)
- if ok and res then
- ---@cast res CslData
- csl_items = res
- else
- util.error(string.format('JSON decode error in file "%s".', file))
- end
-
- elseif format == "yaml" then
- yaml = yaml or require("citeproc-yaml")
- local ok, res = pcall(yaml.parse, contents)
- if ok and res then
- ---@cast res CslData
- csl_items = res
- else
- util.error(string.format('YAML decode error in file "%s".', file))
- end
-
- elseif format == "bibtex" then
- local bib_data, exceptions = bibtex_parser.parse(contents, bibtex_strings)
- if bib_data then
- bibtex2csl = bibtex2csl or require("citeproc-bibtex2csl")
- csl_items = bibtex2csl.convert_to_csl_data(bib_data, true, true, true, true)
- for _, entry in ipairs(bib_data.entries) do
- if not bibtex_entries[entry.key] then
- bibtex_entries[entry.key] = entry
- if entry.fields.crossref then
- table.insert(entries_with_crossref, entry)
- end
- end
- end
- for string_name, value in pairs(bib_data.strings) do
- bibtex_strings[string_name] = value
- end
- end
- end
-
- for _, item in ipairs(csl_items) do
- local id = item.id
- if item_dict[id] then
- util.warning(string.format('Duplicate entry key "%s" in "%s".', id, file))
- else
- item_dict[id] = item
- table.insert(item_list, item)
- end
- end
-
- end
- end
-
- bibtex_parser.resolve_crossrefs(entries_with_crossref, bibtex_entries)
-
- for _, entry in ipairs(entries_with_crossref) do
- local new_item = bibtex2csl.convert_to_csl_item(entry, true, true, true, true)
- item_dict[new_item.id] = new_item
- for i, item in ipairs(item_list) do
- if item.id == new_item.id then
- item_list[i] = new_item
- break
- end
- end
- end
-
- return item_list, item_dict
-end
-
-
-function core.make_citeproc_sys(data_files)
- core.item_list, core.item_dict = read_data_files(data_files)
- local citeproc_sys = {
- retrieveLocale = function (lang)
- local locale_file_format = core.locale_file_format or "locales-%s.xml"
- local filename = string.format(locale_file_format, lang)
- return core.read_file(filename)
- end,
- retrieveItem = function (id)
- local res = core.item_dict[id]
- return res
- end
- }
-
- return citeproc_sys
-end
-
----comment
----@param style_name string
----@param data_files string[]
----@param lang string?
----@return CiteProc?
-function core.init(style_name, data_files, lang)
- if style_name == "" or #data_files == 0 then
- return nil
- end
- local style = core.read_file(style_name .. ".csl", nil, "style")
- if not style then
- util.error(string.format('Failed to load style "%s.csl"', style_name))
- return nil
- end
-
- local force_lang = nil
- if lang and lang ~= "" then
- force_lang = true
- else
- lang = nil
- end
-
- local citeproc_sys = core.make_citeproc_sys(data_files)
- local engine = citeproc.new(citeproc_sys, style, lang, force_lang)
-
- if engine:is_dependent_style() then
- local default_locale = engine.style.default_locale;
- local parent_style_link = engine:get_independent_parent()
- if not parent_style_link then
- return nil
- end
- local parent_style_id = string.match(string.gsub(parent_style_link, "/+$", ""), "[^/]+$")
- util.info(string.format('Style "%s" is a dependent style linked to "%s".', style_name, parent_style_id))
- style = core.read_file(parent_style_id .. ".csl", nil, "style")
- if not style then
- util.error(string.format('Failed to load style "%s.csl"', parent_style_id))
- return nil
- end
- engine = citeproc.new(citeproc_sys, style, lang, force_lang)
- engine.style.default_locale = default_locale
- end
-
- return engine
-end
-
-local function parse_latex_seq(s)
- local t = {}
- for item in string.gmatch(s, "(%b{})") do
- item = string.sub(item, 2, -2)
- table.insert(t, item)
- end
- return t
-end
-
-local function parse_latex_prop(s)
- local t = {}
- for key, value in string.gmatch(s, "([%w%-]+)%s*=%s*(%b{})") do
- value = string.sub(value, 2, -2)
- if value == "true" then
- value = true
- elseif value == "false" then
- value = false
- end
- t[key] = value
- end
- return t
-end
-
-function core.make_citation(citation_info)
- -- `citation_info`: "citationID={ITEM-1@2},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={3}}"
- -- util.debug(citation_info)
- local citation = parse_latex_prop(citation_info)
- -- assert(citation.citationID)
- -- assert(citation.citationItems)
- -- assert(citation.properties)
-
- citation.citationItems = parse_latex_seq(citation.citationItems)
-
- for i, item in ipairs(citation.citationItems) do
- local citation_item = parse_latex_prop(item)
- if citation_item.prefix then
- -- util.debug(citation_item.prefix)
- citation_item.prefix = latex_parser.latex_to_pseudo_html(citation_item.prefix, true, false)
- -- util.debug(citation_item.prefix)
- end
- if citation_item.suffix then
- citation_item.suffix = latex_parser.latex_to_pseudo_html(citation_item.suffix, true, false)
- end
- citation.citationItems[i] = citation_item
- end
-
- citation.properties = parse_latex_prop(citation.properties)
- local note_index = citation.properties.noteIndex
- if not note_index or note_index == "" then
- citation.properties.noteIndex = 0
- elseif type(note_index) == "string" and string.match(note_index, "^%d+$") then
- citation.properties.noteIndex = tonumber(note_index)
- else
- util.error(string.format('Invalid note index "%s".', note_index))
- end
-
- -- util.debug(citation)
- return citation
-end
-
-
----@param engine CiteProc
----@param citations CitationData[]
----@return table<CitationId, string>
-function core.process_citations(engine, citations)
- local citations_pre = {}
-
- local citation_strings = {}
-
- core.update_cited_and_uncited_ids(engine, citations)
-
- for _, citation in ipairs(citations) do
- if citation.citationID ~= "@nocite" then
- -- local res = engine:processCitationCluster(citation, citations_pre, {})
- -- for _, tuple in ipairs(res[2]) do
- -- local citation_str = tuple[2]
- -- local citation_id = tuple[3]
- -- citation_strings[citation_id] = citation_str
- -- util.debug(citation_str)
- -- end
-
- local citation_str = engine:process_citation(citation)
- citation_strings[citation.citationID] = citation_str
-
- table.insert(citations_pre, {citation.citationID, citation.properties.noteIndex})
- end
- end
-
- return citation_strings
-end
-
-function core.update_cited_and_uncited_ids(engine, citations)
- local id_list = {}
- local id_map = {} -- Boolean map for checking if id in list
- local uncited_id_list = {}
- local uncited_id_map = {}
-
- for _, citation in ipairs(citations) do
- if citation.citationID == "@nocite" then
- for _, cite_item in ipairs(citation.citationItems) do
- if cite_item.id == "*" then
- if not core.uncite_all_items then
- for _, item in ipairs(core.item_list) do
- if not uncited_id_map[item.id] then
- table.insert(uncited_id_list, item.id)
- uncited_id_map[item.id] = true
- end
- end
- core.uncite_all_items = true
- end
- elseif not uncited_id_map[cite_item.id] then
- table.insert(uncited_id_list, cite_item.id)
- uncited_id_map[cite_item.id] = true
- end
- end
-
- else -- Real citation
- for _, cite_item in ipairs(citation.citationItems) do
- if not id_map[cite_item.id] then
- table.insert(id_list, cite_item.id)
- id_map[cite_item.id] = true
- end
- end
-
- end
- end
-
- engine:updateItems(id_list)
- engine:updateUncitedItems(uncited_id_list)
-
-end
-
-
----Convert to a filter object described in
---- <https://citeproc-js.readthedocs.io/en/latest/running.html#selective-output-with-makebibliography>
----@param filter_str string e.g., "type={book},notcategory={csl},notcategory={tex}"
----@return table
-function core.parser_filter(filter_str)
- local conditions = {}
- for i, condition in ipairs(latex_parser.parse_seq(filter_str)) do
- local negative
- local field, value = string.match(condition, "(%w+)%s*=%s*{([^}]+)}")
- if field then
- if string.match(field, "^not") then
- negative = true
- field = string.gsub(field, "^not", "")
- end
- if field == "category" then
- field = "categories"
- end
- if field == "keyword" or field == "type" or field == "categories" then
- table.insert(conditions, {
- field = field,
- value = value,
- negative = negative,
- })
- end
- end
- end
- -- util.debug(conditions)
- return {select = conditions}
-end
-
----comment
----@param engine CiteProc
----@param option_str string
----@return unknown
-function core.make_bibliography(engine, option_str)
- local filter
- local options = {}
- if option_str and option_str ~= "" then
- options = latex_parser.parse_prop(option_str)
- filter = core.parser_filter(option_str)
- end
- local result = engine:makeBibliography(filter)
-
- local params = result[1]
- local bib_items = result[2]
-
- local res = ""
-
- ---@type table<string, any>
- local bib_options = {
- index = options.index or "1"
- }
-
- local bib_option_map = {
- ["second-field-align"] = "second-field-align",
- ["hanging-indent"] = "hangingindent",
- ["entry-spacing"] = "entryspacing",
- ["line-spacing"] = "linespacing",
- ["widest-label"] = "widest_label",
- }
- local bib_option_order = {
- "index",
- "second-field-align",
- "hanging-indent",
- "line-spacing",
- "entry-spacing",
- "widest-label",
- }
-
- for option, param in pairs(bib_option_map) do
- if params[param] then
- bib_options[option] = params[param]
- end
- end
-
- local bib_option_list = {}
- for _, option in ipairs(bib_option_order) do
- local value = bib_options[option]
- if value and value ~= "" then
- table.insert(bib_option_list, string.format("%s = %s", option, tostring(value)))
- end
- end
- local bib_options_str = table.concat(bib_option_list, ", ")
-
- -- util.debug(params.bibstart)
- -- if params.bibstart then
- -- res = res .. params.bibstart
- -- end
-
- local bibstart = string.format("\\begin{thebibliography}{%s}\n", bib_options_str)
- res = res .. bibstart
-
-
- for _, bib_item in ipairs(bib_items) do
- res = res .. "\n" .. bib_item
- end
-
- if params.bibend then
- res = res .. "\n" .. params.bibend
- end
- return res
-end
-
-
-function core.set_categories(engine, categories_str)
- -- util.debug(categories_str)
- local category_dict = latex_parser.parse_prop(categories_str)
- for category, keys in pairs(category_dict) do
- category_dict[category] = latex_parser.parse_seq(keys)
- end
- for category, keys in pairs(category_dict) do
- for _, key in ipairs(keys) do
- local item = engine.registry.registry[key]
- if item then
- if not item.categories then
- item.categories = {}
- end
- if not util.in_list(category, item.categories) then
- table.insert(item.categories, category)
- end
- else
- util.error(string.format("Invalid citation key '%s'.", key))
- end
- end
- end
- -- for id, item in pairs(csl.engine.registry.registry) do
- -- util.debug(id)
- -- util.debug(item.categories)
- -- end
-end
-
-
-return core
diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc-latex-parser.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-latex-parser.lua
index 9eab31b36c3..55235ff3166 100644
--- a/Master/texmf-dist/scripts/citation-style-language/citeproc-latex-parser.lua
+++ b/Master/texmf-dist/scripts/citation-style-language/citeproc-latex-parser.lua
@@ -8,7 +8,7 @@ local latex_parser = {}
local bibtex_parser
local latex_data
-local markup
+local markup
local util
if kpse then
latex_data = require("citeproc-latex-data")
@@ -365,6 +365,7 @@ function latex_parser.convert_cs_to_inlines(tokens, i, strict, case_protection)
return inlines, i
end
+-- TODO: raise a warning for unrecognized LaTeX command like `\switchargs`
function latex_parser.convert_group_to_inlines(token, strict, case_protection, force_add_braces)
if case_protection then
local first_token = token.contents[1]
diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc-latex.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-latex.lua
deleted file mode 100644
index 98a5a24ea07..00000000000
--- a/Master/texmf-dist/scripts/citation-style-language/citeproc-latex.lua
+++ /dev/null
@@ -1,183 +0,0 @@
---
--- Copyright (c) 2021-2024 Zeping Lee
--- Released under the MIT license.
--- Repository: https://github.com/zepinglee/citeproc-lua
---
-
-local csl = {}
-
-local citeproc = require("citeproc")
-local util = citeproc.util
-require("lualibs")
-local core = require("citeproc-latex-core")
-local latex_parser = require("citeproc-latex-parser")
-
-
-csl.initialized = "false"
-csl.id_list = {}
-csl.id_map = {} -- Boolean map for checking if id in list
-csl.uncited_id_list = {}
-csl.uncited_id_map = {}
-csl.citations_pre = {}
-
-csl.preview_mode = false -- Whether to use citeproc:preview_citation
-
-
-function csl.init(style_name, bib_files, lang)
- if string.match(bib_files, "^%s*$") then
- bib_files = {}
- else
- bib_files = util.split(util.strip(bib_files), "%s*,%s*")
- end
-
- csl.engine = core.init(style_name, bib_files, lang)
-
- if csl.engine and csl.engine.style.citation then
- csl.initialized = "true"
- else
- return
- end
-
- -- csl.init is called via \AtBeginDocument and it's executed after
- -- loading .aux file. The csl.id_list are already registered.
- csl.engine:updateItems(csl.id_list)
-
- if core.uncite_all_items then
- for _, item in ipairs(core.item_list) do
- if not csl.uncited_id_map[item.id] then
- table.insert(csl.uncited_id_list, item.id)
- csl.uncited_id_map[item.id] = true
- end
- end
- end
- csl.engine:updateUncitedItems(csl.uncited_id_list)
- csl.style_class = csl.engine:get_style_class()
-end
-
-
-function csl.get_style_class()
- tex.sprint(csl.style_class)
-end
-
-
-function csl.register_citation_info(citation_info)
- local citation = core.make_citation(citation_info)
- if citation.citationID == "@nocite" then
- for _, cite_item in ipairs(citation.citationItems) do
- if cite_item.id == "*" then
- -- \nocite all items
- core.uncite_all_items = true
-
- elseif not csl.uncited_id_map[cite_item.id] then
- table.insert(csl.uncited_id_list, cite_item.id)
- csl.uncited_id_map[cite_item.id] = true
- end
- end
-
- else
- for _, cite_item in ipairs(citation.citationItems) do
- if not csl.id_map[cite_item.id] then
- table.insert(csl.id_list, cite_item.id)
- csl.id_map[cite_item.id] = true
- end
- end
- end
-end
-
-
-function csl.enable_linking()
- csl.engine:enable_linking()
-end
-
-
----comment
----@param citation_info string
-function csl.cite(citation_info)
- -- "citationID={ITEM-UNAVAILABLE@1},citationItems={{id={ITEM-UNAVAILABLE}}},properties={noteIndex={1}}"
- if not csl.engine then
- util.error("CSL engine is not initialized.")
- end
-
- -- util.debug(citation_info)
- local citation = core.make_citation(citation_info)
- -- util.debug(citation)
-
- local citation_str
- if csl.preview_mode then
- -- TODO: preview mode in first pass of \blockquote of csquotes
- -- citation_str = csl.engine:preview_citation(citation)
- citation_str = ""
- else
- citation_str = csl.engine:process_citation(citation)
- end
- -- util.debug(citation_str)
-
- -- tex.sprint(citation_str)
- -- tex.setcatcode(35, 12) -- #
- -- tex.setcatcode(37, 12) -- %
- -- token.set_macro("l__csl_citation_tl", citation_str)
- -- Don't use `token.set_macro`.
- -- See <https://github.com/zepinglee/citeproc-lua/issues/42>
- -- and <https://tex.stackexchange.com/questions/519954/backslashes-in-macros-defined-in-lua-code>.
- tex.sprint(string.format("\\expandafter\\def\\csname l__csl_citation_tl\\endcsname{%s}", citation_str))
-
- for _, cite_item in ipairs(citation.citationItems) do
- if not core.item_dict[cite_item.id] then
- tex.print(string.format("\\cslsetup{undefined-cites = {%s}}", cite_item.id))
- end
- end
-
- table.insert(csl.citations_pre, {citation.citationID, citation.properties.noteIndex})
-end
-
-
-function csl.nocite(ids_string)
- local uncited_ids = util.split(ids_string, "%s*,%s*")
- for _, uncited_id in ipairs(uncited_ids) do
- if uncited_id == "*" then
- if csl.engine then
- for id, _ in pairs(core.item_dict) do
- if not csl.uncited_id_map[id] then
- table.insert(csl.uncited_id_list, id)
- csl.uncited_id_map[id] = true
- end
- end
- csl.engine:updateUncitedItems(csl.uncited_id_list)
- else
- core.uncite_all_items = true
- end
- else
- if not csl.uncited_id_map[uncited_id] then
- table.insert(csl.uncited_id_list, uncited_id)
- csl.uncited_id_map[uncited_id] = true
- if csl.engine then
- csl.engine:updateUncitedItems(csl.uncited_id_list)
- end
- end
- end
- end
-end
-
-
-function csl.bibliography(filter_str)
- if not csl.engine then
- util.error("CSL engine is not initialized.")
- return
- end
-
- -- util.debug(filter)
- local result = core.make_bibliography(csl.engine, filter_str)
- -- util.debug(result)
-
- -- token.set_macro("g__csl_bibliography_tl", result)
-
- tex.print(util.split(result, "\n"))
-end
-
-
-function csl.set_categories(categories_str)
- core.set_categories(csl.engine, categories_str)
-end
-
-
-return csl
diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc-manager.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-manager.lua
new file mode 100644
index 00000000000..883b254f14e
--- /dev/null
+++ b/Master/texmf-dist/scripts/citation-style-language/citeproc-manager.lua
@@ -0,0 +1,916 @@
+--
+-- Copyright (c) 2021-2024 Zeping Lee
+-- Released under the MIT license.
+-- Repository: https://github.com/zepinglee/citeproc-lua
+--
+
+local citeproc_manager = {}
+
+require("lualibs")
+local json_decode = utilities.json.tolua
+
+local citeproc = require("citeproc")
+local bibtex_data = require("citeproc-bibtex-data")
+local bibtex_parser = require("citeproc-bibtex-parser")
+local latex_parser = require("citeproc-latex-parser")
+local util = citeproc.util
+local unicode = require("citeproc-unicode")
+
+
+---@param file_name string
+---@param ftype "bib" | nil
+---@param file_info string
+---@return string? contents
+local function read_file(file_name, ftype, file_info)
+ if file_info then
+ file_info = unicode.capitalize(file_info)
+ else
+ file_info = "File"
+ end
+ local path
+ if ftype then
+ path = kpse.find_file(file_name, ftype)
+ else
+ path = kpse.find_file(file_name)
+ end
+
+ if not path then
+ if ftype and not util.endswith(file_name, ftype) then
+ file_name = file_name .. ftype
+ end
+ util.error(string.format("%s '%s' not found", file_info, file_name))
+ return nil
+ end
+ local file = io.open(path, "r")
+ if not file then
+ util.error(string.format("Cannot open %s '%s'", file_info, path))
+ return nil
+ end
+ local contents = file:read("*a")
+ contents = util.remove_bom(contents)
+ file:close()
+ return contents
+end
+
+
+---@param filename string
+---@return string file
+---@return string format
+---@return string? contents
+local function read_data_file(filename)
+ local file = filename
+ local format = "json"
+ local contents = nil
+
+ if util.endswith(filename, ".json") then
+ format = "json"
+ contents = read_file(filename, nil, "database file")
+ elseif string.match(filename, "%.ya?ml$") then
+ format = "yaml"
+ contents = read_file(filename, nil, "database file")
+ elseif util.endswith(filename, ".bib") then
+ format = "bibtex"
+ contents = read_file(filename, "bib", "database file")
+ else
+ file = filename .. ".json"
+ local path = kpse.find_file(file)
+ if path then
+ format = "json"
+ contents = read_file(file, nil, "database file")
+ else
+ path = kpse.find_file(filename .. ".yaml") or kpse.find_file(filename .. ".yml")
+ if path then
+ format = "yaml"
+ file = filename .. string.match(path, "%.ya?ml$")
+ contents = read_file(path, nil, "database file")
+ else
+ path = kpse.find_file(filename, "bib")
+ if path then
+ file = filename .. ".bib"
+ format = "bibtex"
+ contents = read_file(filename, "bib", "database file")
+ else
+ util.error(string.format("Cannot find database file '%s'", filename .. ".json"))
+ return file, format, nil
+ end
+ end
+ end
+ end
+ return file, format, contents
+end
+
+
+---@param data_files FilePath[]
+---@return ItemData[]
+---@return table<ItemId, ItemData>
+local function read_data_files(data_files)
+ local item_list = {}
+ local item_dict = {}
+
+ --- Store BibTeX entries for later resolving crossref
+ ---@type table<string, BibtexEntry>
+ local bibtex_entries = {}
+ ---@type table<string, string>
+ local bibtex_strings = {}
+ for name, macro in pairs(bibtex_data.macros) do
+ bibtex_strings[name] = macro.value
+ end
+ ---@type BibtexEntry[]
+ local entries_with_crossref = {}
+
+ for _, data_file in ipairs(data_files) do
+ -- local file_name, csl_items = read_data_file(data_file)
+
+ local csl_items = {}
+
+ local file, format, contents = read_data_file(data_file)
+
+ if contents then
+
+ if format == "json" then
+ local ok, res = pcall(json_decode, contents)
+ if ok and res then
+ ---@cast res CslData
+ csl_items = res
+ else
+ util.error(string.format("JSON decode error in file '%s'.", file))
+ end
+
+ elseif format == "yaml" then
+ yaml = yaml or require("citeproc-yaml")
+ local ok, res = pcall(yaml.parse, contents)
+ if ok and res then
+ ---@cast res CslData
+ csl_items = res
+ else
+ util.error(string.format("YAML decode error in file '%s'.", file))
+ end
+
+ elseif format == "bibtex" then
+ local bib_data, exceptions = bibtex_parser.parse(contents, bibtex_strings)
+ if bib_data then
+ bibtex2csl = bibtex2csl or require("citeproc-bibtex2csl")
+ csl_items = bibtex2csl.convert_to_csl_data(bib_data, true, true, true, true)
+ for _, entry in ipairs(bib_data.entries) do
+ if not bibtex_entries[entry.key] then
+ bibtex_entries[entry.key] = entry
+ if entry.fields.crossref then
+ table.insert(entries_with_crossref, entry)
+ end
+ end
+ end
+ for string_name, value in pairs(bib_data.strings) do
+ bibtex_strings[string_name] = value
+ end
+ end
+ end
+
+ for _, item in ipairs(csl_items) do
+ local id = item.id
+ if item_dict[id] then
+ util.warning(string.format("Duplicate entry key '%s' in '%s'.", id, file))
+ else
+ item_dict[id] = item
+ table.insert(item_list, item)
+ end
+ end
+
+ end
+ end
+
+ bibtex_parser.resolve_crossrefs(entries_with_crossref, bibtex_entries)
+
+ for _, entry in ipairs(entries_with_crossref) do
+ local new_item = bibtex2csl.convert_to_csl_item(entry, true, true, true, true)
+ item_dict[new_item.id] = new_item
+ for i, item in ipairs(item_list) do
+ if item.id == new_item.id then
+ item_list[i] = new_item
+ break
+ end
+ end
+ end
+
+ return item_list, item_dict
+end
+
+
+---@param item_dict table<ItemId, ItemData>
+---@return CiteProcSys
+local function make_citeproc_sys(item_dict)
+ local citeproc_sys = {
+ retrieveLocale = function (lang)
+ local locale_file_format = "csl-locales-%s.xml"
+ local filename = string.format(locale_file_format, lang)
+ return read_file(filename, nil, "locale file")
+ end,
+ retrieveItem = function (id)
+ local res = item_dict[id]
+ if not res and not luatexbase then
+ util.warning(string.format("Didn't find a database entry for '%s'", id))
+ end
+ return res
+ end
+ }
+ return citeproc_sys
+end
+
+
+---@alias StyleId string
+---@alias FilePath string
+---@alias LanguageCode string
+
+---@class RefSection
+---@field initialized boolean
+---@field style_id string?
+---@field bib_resources FilePath[]
+---@field lang LanguageCode?
+---@field engine CiteProc?
+---@field cited_ids ItemId[]
+---@field uncited_ids ItemId[]
+---@field items ItemData[]
+---@field item_dict table<ItemId, ItemData>
+---@field citations CitationData[]
+---@field citations_pre table[]
+---@field bibliography_configs string[]
+local RefSection = {}
+
+---@return RefSection
+function RefSection:new()
+ ---@type RefSection
+ local ref_section = {
+ initialized = false,
+ style_id = nil,
+ bib_resources = {},
+ lang = nil,
+ engine = nil,
+ cited_ids = {},
+ uncited_ids = {},
+ items = {},
+ item_dict = {},
+ citations = {},
+ citations_pre = {},
+ bibliography_configs = {},
+ }
+ setmetatable(ref_section, self)
+ self.__index = self
+ return ref_section
+end
+
+function RefSection:make_citeproc_engine()
+ if not self.style_id or self.style_id == "" then
+ self.style_id = "apa"
+ end
+ local style = read_file(self.style_id .. ".csl", nil, "style")
+ if not style then
+ return
+ end
+
+ self.items, self.item_dict = read_data_files(self.bib_resources)
+ local citeproc_sys = make_citeproc_sys(self.item_dict)
+
+ local force_lang = false
+ if self.lang and self.lang ~= "" then
+ force_lang = true
+ else
+ self.lang = nil
+ end
+
+ self.engine = citeproc.new(citeproc_sys, style, self.lang, force_lang)
+ self:_check_dependent_style(citeproc_sys)
+
+ if self.engine and self.engine.style.citation then
+ self.initialized = true
+ end
+
+ self.engine:updateItems(self.cited_ids)
+
+ self:_update_uncited_items()
+
+end
+
+---@param citeproc_sys CiteProcSys
+function RefSection:_check_dependent_style(citeproc_sys)
+ if self.engine:is_dependent_style() then
+ local default_locale = self.engine.style.default_locale;
+ local parent_style_link = self.engine:get_independent_parent()
+ if not parent_style_link then
+ return nil
+ end
+ local parent_style_id = string.match(string.gsub(parent_style_link, "/+$", ""), "[^/]+$")
+ util.info(string.format('Style "%s" is a dependent style linked to "%s".', self.style_id, parent_style_id))
+ local style = read_file(parent_style_id .. ".csl", nil, "style")
+ if not style then
+ util.error(string.format("Failed to load style '%s.csl'", parent_style_id))
+ return nil
+ end
+ local force_lang = false
+ if self.lang and self.lang ~= "" then
+ force_lang = true
+ else
+ self.lang = nil
+ end
+ self.engine = citeproc.new(citeproc_sys, style, self.lang, force_lang)
+ self.engine.style.default_locale = default_locale
+ end
+end
+
+function RefSection:_update_uncited_items()
+ local uncited_ids = {}
+ for _, id in ipairs(self.uncited_ids) do
+ if id == "*" then
+ for _, item in ipairs(self.items) do
+ table.insert(uncited_ids, item.id)
+ end
+ break
+ else
+ table.insert(uncited_ids, id)
+ end
+ end
+ if self.initialized then
+ self.engine:updateUncitedItems(uncited_ids)
+ end
+ self.uncited_ids = uncited_ids
+end
+
+
+---@class CslCitationManager
+---@field global_ref_section RefSection
+---@field max_ref_section_index integer
+---@field ref_section_index integer
+---@field ref_sections table<integer, RefSection>
+---@field ref_section RefSection
+---@field hyperref_loaded boolean
+local CslCitationManager = {}
+
+---@return CslCitationManager
+function CslCitationManager:new()
+ local ref_section = RefSection:new()
+ ---@type CslCitationManager
+ local o = {
+ -- global_style_id = "apa",
+ -- global_bib_resources = {},
+ -- global_lang = nil,
+ global_ref_section = ref_section,
+ max_ref_section_index = 0,
+ ref_section_index = 0,
+ ref_sections = {
+ [0] = ref_section,
+ },
+ ref_section = ref_section,
+
+ hyperref_loaded = false,
+ }
+
+ setmetatable(o, self)
+ self.__index = self
+ return o
+end
+
+--- The init method is called via \AtBeginDocument after loading .aux file.
+--- The ref_section.cited_ids are already registered.
+---@param style_id StyleId
+---@param bib_resources_str FilePathsString
+---@param lang LanguageCode?
+function CslCitationManager:init(style_id, bib_resources_str, lang)
+ local global_ref_section = self.global_ref_section
+ global_ref_section.style_id = "apa"
+ if style_id and style_id ~= "" then
+ global_ref_section.style_id = style_id
+ end
+ global_ref_section.bib_resources = util.split(util.strip(bib_resources_str), "%s*,%s*")
+ if lang and lang ~= "" then
+ global_ref_section.lang = lang
+ end
+
+ global_ref_section:make_citeproc_engine()
+ if self.hyperref_loaded then
+ global_ref_section.engine:enable_linking()
+ end
+ self.ref_section_index = 0
+end
+
+
+function CslCitationManager:get_style_class()
+ if not self.ref_section then
+ return nil
+ end
+ if self.ref_section.engine then
+ return self.ref_section.engine:get_style_class()
+ else
+ return nil
+ end
+end
+
+---@alias FilePathsString string
+
+---@param style_id string?
+---@param bib_resources_str FilePathsString?
+---@param lang LanguageCode?
+function CslCitationManager:begin_ref_section(style_id, bib_resources_str, lang)
+ self.max_ref_section_index = self.max_ref_section_index + 1
+ self.ref_section_index = self.max_ref_section_index
+ self.ref_section = self.ref_sections[self.ref_section_index]
+ if not self.ref_section then
+ self.ref_section = RefSection:new()
+ self.ref_sections[self.ref_section_index] = self.ref_section
+ end
+
+ self.ref_section.style_id = style_id or self.global_ref_section.style_id
+ self.ref_section.bib_resources = self.global_ref_section.bib_resources
+ if bib_resources_str and bib_resources_str ~= "" then
+ self.ref_section.bib_resources = util.split(util.strip(bib_resources_str), "%s*,%s*")
+ end
+ self.ref_section.lang = self.global_ref_section.lang
+ if lang and lang ~= "" then
+ self.ref_section.lang = lang
+ end
+ -- self.ref_section.force_lang = force_lang or false
+
+ self.ref_section:make_citeproc_engine()
+
+ if self.hyperref_loaded then
+ self.ref_section.engine:enable_linking()
+ end
+
+end
+
+
+function CslCitationManager:end_ref_section()
+ self.ref_section_index = 0
+ self.ref_section = self.ref_sections[0]
+end
+
+
+---This method is called from the `\csl@aux@cite` command from `.aux` file.
+---@param ref_section_index_str string
+---@param citation_info string
+function CslCitationManager:register_citation_info(ref_section_index_str, citation_info)
+ local ref_section_index = tonumber(ref_section_index_str)
+ if not ref_section_index then
+ util.error(string.format("Invalid refsetion index '%s'", ref_section_index_str))
+ return
+ end
+ local ref_section = self.ref_sections[ref_section_index]
+ if not ref_section then
+ ref_section = RefSection:new()
+ self.ref_sections[ref_section_index] = ref_section
+ end
+
+ local citation = self:_make_citation(citation_info)
+
+ for _, cite_item in ipairs(citation.citationItems) do
+ if citation.citationID == "@nocite" then
+ table.insert(ref_section.uncited_ids, cite_item.id)
+ else
+ table.insert(ref_section.cited_ids, cite_item.id)
+ end
+ end
+end
+
+function CslCitationManager:enable_linking()
+ self.hyperref_loaded = true
+ if self.ref_section.engine then
+ self.ref_section.engine:enable_linking()
+ end
+end
+
+
+---@param citation_info string
+function CslCitationManager:cite(citation_info)
+ if not self.ref_section then
+ util.error("Refsection is not initialized.")
+ return
+ end
+ local engine = self.ref_section.engine
+ if not engine then
+ util.error("CSL engine is not initialized.")
+ return
+ end
+
+ -- util.debug(citation_info)
+ local citation = self:_make_citation(citation_info)
+ -- util.debug(citation)
+
+ local citation_str
+ -- if preview_mode then
+ -- -- TODO: preview mode in first pass of \blockquote of csquotes
+ -- -- citation_str = engine:preview_citation(citation)
+ -- citation_str = ""
+ -- else
+ citation_str = engine:process_citation(citation)
+ -- end
+ -- util.debug(citation_str)
+
+ -- tex.sprint(citation_str)
+ -- tex.setcatcode(35, 12) -- #
+ -- tex.setcatcode(37, 12) -- %
+ -- token.set_macro("l__csl_citation_tl", citation_str)
+ -- Don't use `token.set_macro`.
+ -- See <https://github.com/zepinglee/citeproc-lua/issues/42>
+ -- and <https://tex.stackexchange.com/questions/519954/backslashes-in-macros-defined-in-lua-code>.
+ tex.sprint(string.format("\\expandafter\\def\\csname l__csl_citation_tl\\endcsname{%s}", citation_str))
+
+ table.insert(self.ref_section.citations_pre, {citation.citationID, citation.properties.noteIndex})
+end
+
+local function parse_latex_seq(s)
+ local t = {}
+ for item in string.gmatch(s, "(%b{})") do
+ item = string.sub(item, 2, -2)
+ table.insert(t, item)
+ end
+ return t
+end
+
+local function parse_latex_prop(s)
+ local t = {}
+ for key, value in string.gmatch(s, "([%w%-]+)%s*=%s*(%b{})") do
+ value = string.sub(value, 2, -2)
+ if value == "true" then
+ value = true
+ elseif value == "false" then
+ value = false
+ end
+ t[key] = value
+ end
+ return t
+end
+
+---@param citation_info string
+---@return CitationData
+function CslCitationManager:_make_citation(citation_info)
+ -- `citation_info`: "citationID={ITEM-1@2},citationItems={{id={ITEM-1},label={page},locator={6}}},properties={noteIndex={3}}"
+ -- util.debug(citation_info)
+ local citation = parse_latex_prop(citation_info)
+ -- assert(citation.citationID)
+ -- assert(citation.citationItems)
+ -- assert(citation.properties)
+
+ citation.citationItems = parse_latex_seq(citation.citationItems)
+
+ for i, item in ipairs(citation.citationItems) do
+ local citation_item = parse_latex_prop(item)
+ if citation_item.prefix then
+ -- util.debug(citation_item.prefix)
+ citation_item.prefix = latex_parser.latex_to_pseudo_html(citation_item.prefix, true, false)
+ -- util.debug(citation_item.prefix)
+ end
+ if citation_item.suffix then
+ citation_item.suffix = latex_parser.latex_to_pseudo_html(citation_item.suffix, true, false)
+ end
+ citation.citationItems[i] = citation_item
+ end
+
+ citation.properties = parse_latex_prop(citation.properties)
+ local note_index = citation.properties.noteIndex
+ if not note_index or note_index == "" then
+ citation.properties.noteIndex = 0
+ elseif type(note_index) == "string" and string.match(note_index, "^%d+$") then
+ citation.properties.noteIndex = tonumber(note_index)
+ else
+ util.error(string.format("Invalid note index '%s'.", note_index))
+ end
+
+ -- util.debug(citation)
+ return citation
+end
+
+---@param ids_string string The list of item IDs separated by commas
+function CslCitationManager:nocite(ids_string)
+ local uncited_ids = util.split(util.strip(ids_string), "%s*,%s*")
+
+ local engine = self.ref_section.engine
+ if not engine then
+ for _, id in ipairs(uncited_ids) do
+ table.insert(self.ref_section.uncited_ids, id)
+ end
+ return
+ end
+
+ for _, id in ipairs(uncited_ids) do
+ if id == "*" then
+ for _, item in ipairs(self.ref_section.items) do
+ table.insert(self.ref_section.uncited_ids, item.id)
+ end
+ break
+ else
+ table.insert(self.ref_section.uncited_ids, id)
+ end
+ end
+ engine:updateUncitedItems(self.ref_section.uncited_ids)
+end
+
+
+---@param filter_str string
+function CslCitationManager:bibliography(filter_str)
+ if not self.ref_section then
+ util.error("Refsection is not initialized.")
+ return
+ end
+ local bib_lines = self:make_bibliography(filter_str)
+ tex.print(util.split(table.concat(bib_lines, "\n"), "\n"))
+end
+
+---@param filter_str string
+---@return string[]
+function CslCitationManager:make_bibliography(filter_str)
+ local engine = self.ref_section.engine
+ if not engine then
+ util.error("CSL engine is not initialized.")
+ return {}
+ end
+ local filter
+ local options = {}
+ if filter_str and filter_str ~= "" then
+ options = latex_parser.parse_prop(filter_str)
+ filter = self:_parser_filter(filter_str)
+ -- util.debug(filter)
+ end
+ local result = engine:makeBibliography(filter)
+
+ local params = result[1]
+ local bib_items = result[2]
+
+ ---@type table<string, any>
+ local bib_options = {
+ index = options.index or "1"
+ }
+
+ local bib_option_map = {
+ ["second-field-align"] = "second-field-align",
+ ["hanging-indent"] = "hangingindent",
+ ["entry-spacing"] = "entryspacing",
+ ["line-spacing"] = "linespacing",
+ ["widest-label"] = "widest_label",
+ }
+ local bib_option_order = {
+ "index",
+ "second-field-align",
+ "hanging-indent",
+ "line-spacing",
+ "entry-spacing",
+ "widest-label",
+ }
+
+ for option, param in pairs(bib_option_map) do
+ if params[param] then
+ bib_options[option] = params[param]
+ end
+ end
+
+ local bib_option_list = {}
+ for _, option in ipairs(bib_option_order) do
+ local value = bib_options[option]
+ if value and value ~= "" then
+ table.insert(bib_option_list, string.format("%s = %s", option, tostring(value)))
+ end
+ end
+ local bib_options_str = table.concat(bib_option_list, ", ")
+
+ local bibstart = string.format("\\begin{thebibliography}{%s}\n", bib_options_str)
+ local bib_lines = {}
+ table.insert(bib_lines, bibstart)
+
+ for _, bib_item in ipairs(bib_items) do
+ table.insert(bib_lines, bib_item)
+ end
+
+ if params.bibend then
+ table.insert(bib_lines, params.bibend)
+ end
+ return bib_lines
+end
+
+function CslCitationManager:set_categories(categories_str)
+ if self.ref_section.engine then
+
+ local category_dict = latex_parser.parse_prop(categories_str)
+ for category, keys in pairs(category_dict) do
+ category_dict[category] = latex_parser.parse_seq(keys)
+ end
+ for category, keys in pairs(category_dict) do
+ for _, key in ipairs(keys) do
+ local item = self.ref_section.engine.registry.registry[key]
+ if item then
+ if not item.categories then
+ -- TODO: Extend ItemData field types
+ item.categories = {}
+ end
+ if not util.in_list(category, item.categories) then
+ table.insert(item.categories, category)
+ end
+ else
+ util.error(string.format("Invalid citation key '%s'.", key))
+ end
+ end
+ end
+ end
+end
+
+local command_info = {
+ {"\\csl@aux@style", 2},
+ {"\\csl@aux@data", 2},
+ {"\\csl@aux@cite", 2},
+ {"\\csl@aux@options", 2},
+ {"\\csl@aux@bibliography", 2},
+ {"\\@input", 1},
+}
+
+local balanced = lpeg.P{ "{" * ((1 - lpeg.S"{}") + lpeg.V(1))^0 * "}" }
+
+---@param text string
+---@param num_args integer?
+---@return string[]
+local function get_command_arguments(text, command, num_args)
+ num_args = num_args or 1
+ local grammar = lpeg.P(command) * lpeg.Ct((lpeg.S(" \t\r\n")^0 * lpeg.C(balanced))^num_args)
+ local arguments = grammar:match(text)
+ if not arguments then
+ return {}
+ end
+ ---@cast arguments string[]
+ for i, argument in ipairs(arguments) do
+ arguments[i] = string.sub(argument, 2, -2)
+ end
+ return arguments
+end
+
+---Convert to a filter object described in
+--- <https://citeproc-js.readthedocs.io/en/latest/running.html#selective-output-with-makebibliography>
+---@param filter_str string e.g., "type={book},notcategory={csl},notcategory={tex}"
+---@return table
+function CslCitationManager:_parser_filter(filter_str)
+ local conditions = {}
+ for i, condition in ipairs(latex_parser.parse_seq(filter_str)) do
+ local negative
+ local field, value = string.match(condition, "(%w+)%s*=%s*{([^}]+)}")
+ if field then
+ if string.match(field, "^not") then
+ negative = true
+ field = string.gsub(field, "^not", "")
+ end
+ if field == "category" then
+ field = "categories"
+ end
+ if field == "keyword" or field == "type" or field == "categories" then
+ table.insert(conditions, {
+ field = field,
+ value = value,
+ negative = negative,
+ })
+ end
+ end
+ end
+ -- util.debug(conditions)
+ return {select = conditions}
+end
+
+
+
+---@param aux_content string
+---@return string
+function CslCitationManager:read_aux_file(aux_content)
+ local command_arguments = self:_get_csl_commands(aux_content)
+
+ -- First pass, only register infomation
+ for _, command_argument in ipairs(command_arguments) do
+ local command, ref_section_index, content = table.unpack(command_argument)
+
+ local ref_section = self.ref_sections[ref_section_index]
+ self.ref_section = ref_section
+ if not ref_section then
+ ref_section = RefSection:new()
+ self.ref_sections[ref_section_index] = ref_section
+ self.ref_section = ref_section
+ end
+ if command == "\\csl@aux@style" then
+ ref_section.style_id = content
+ elseif command == "\\csl@aux@data" then
+ util.extend(ref_section.bib_resources, util.split(content, "%s*,%s*"))
+ elseif command == "\\csl@aux@cite" then
+ self:register_citation_info(tostring(ref_section_index), content)
+ -- TODO: refsection bib resources
+ -- elseif command == "\\csl@aux@bibliography" then
+ -- -- table.insert(ref_section.bibliography_configs, content)
+ end
+ end
+
+ local global_style = self.global_ref_section.style_id
+ if global_style and global_style ~= "" then
+ util.info(string.format("Global style file: %s.csl", global_style))
+ else
+ util.warning("Missing global style name. Will use default APA style.")
+ self.global_ref_section.style_id = "apa"
+ end
+
+ -- if #citations == 0 then
+ -- util.error(string.format("No citation commands in file %s", aux_file))
+ -- end
+
+ -- if #bib_files == 0 then
+ -- util.warning("empty bibliography data files")
+ -- else
+ -- for i, bib_file in ipairs(bib_files) do
+ -- util.info(string.format("Database file #%d: %s", i, bib_file))
+ -- end
+ -- end
+
+ -- Second pass, only register infomation
+ local output_lines = {}
+ for _, command_argument in ipairs(command_arguments) do
+ local command, ref_section_index, content = table.unpack(command_argument)
+
+ local ref_section = self.ref_sections[ref_section_index]
+ assert(ref_section)
+ self.ref_section = ref_section
+
+ if command == "\\csl@aux@cite" then
+ if not ref_section.engine then
+ if not ref_section.style_id or ref_section.style_id == "" then
+ ref_section.style_id = self.global_ref_section.style_id
+ end
+ if #ref_section.bib_resources == 0 then
+ ref_section.bib_resources = self.global_ref_section.bib_resources
+ end
+ if not ref_section.lang or ref_section.lang == "" then
+ ref_section.lang = self.global_ref_section.lang
+ end
+ ref_section:make_citeproc_engine()
+ if self.hyperref_loaded then
+ ref_section.engine:enable_linking()
+ end
+ local style_class = ref_section.engine:get_style_class()
+ local style_class_setup = string.format("\\csloptions{%d}{class = {%s = %s}}", ref_section_index, ref_section.style_id, style_class)
+ table.insert(output_lines, style_class_setup)
+ end
+ self:register_citation_info(tostring(ref_section_index), content)
+ if ref_section.engine then
+ local citation = self:_make_citation(content)
+ local citation_str = ref_section.engine:process_citation(citation)
+
+ table.insert(output_lines, string.format("\\cslcitation{%s}{%s}", citation.citationID, citation_str))
+ end
+
+ elseif command == "\\csl@aux@bibliography" then
+ if not ref_section.engine then
+ ref_section:make_citeproc_engine()
+ end
+ if ref_section.engine then
+ local bib_lines = self:make_bibliography(content)
+ table.insert(output_lines, "")
+ util.extend(output_lines, bib_lines)
+ table.insert(output_lines, "")
+ end
+
+ elseif command == "\\csl@aux@options" then
+ local options = latex_parser.parse_prop(content)
+ if options.categories then
+ self:set_categories(options.categories)
+ end
+ if options.locale and options.locale ~= "" then
+ ref_section.lang = options.locale
+ end
+ -- TODO: == "true"?
+ if options.linking then
+ self.hyperref_loaded = true
+ end
+ end
+ end
+ return table.concat(output_lines, "\n") .. "\n"
+end
+
+---@param aux_content string
+---@return [string, integer, string][]
+function CslCitationManager:_get_csl_commands(aux_content)
+ ---@type [string, integer, string][]
+ local command_arguments = {}
+ for _, line in ipairs(util.split(aux_content, "%s*\n")) do
+ for _, command_argment in ipairs(command_info) do
+ local command, num_args = table.unpack(command_argment)
+ if util.startswith(line, command) then
+ local arguments = get_command_arguments(line, command, num_args)
+ if command == "\\@input" then
+ local sub_aux_file = arguments[1]
+ self:read_aux_file(sub_aux_file)
+ else
+ local ref_section_index = tonumber(arguments[1])
+ if not ref_section_index then
+ util.error(string.format("Invalid refsection index '%s'.", ref_section_index))
+ return {}
+ end
+ local content = util.strip(arguments[2])
+ table.insert(command_arguments, {command, ref_section_index, content})
+ end
+ break
+
+ end
+ end
+ end
+ return command_arguments
+end
+
+
+citeproc_manager.CslCitationManager = CslCitationManager
+
+return citeproc_manager
diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc-node-choose.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-node-choose.lua
index b3c827dc623..cb1bd77d796 100644
--- a/Master/texmf-dist/scripts/citation-style-language/citeproc-node-choose.lua
+++ b/Master/texmf-dist/scripts/citation-style-language/citeproc-node-choose.lua
@@ -253,8 +253,8 @@ function If:evaluate_condition(condition, state, context)
local variable = condition.value
local variable_type = util.variable_types[variable] or "standard"
- if variable_type ~= "standard" and variable_type ~= "number" then
- util.warning(string.format('Expecting number variable for condition "is-numeric", got %s "%s"', variable_type, variable))
+ if variable_type ~= "standard" and variable_type ~= "number" then
+ util.warning(string.format("Expecting number variable for condition 'is-numeric', got %s '%s'", variable_type, variable))
return false
end
@@ -263,7 +263,7 @@ function If:evaluate_condition(condition, state, context)
return false
end
if type(value) ~= "string" and type(value) ~= "number" then
- util.error(string.format('Expecting a string or number for variable "%s", got "%s"', variable, type(value)))
+ util.error(string.format("Expecting a string or number for variable '%s', got '%s'", variable, type(value)))
end
return util.is_numeric(value)
@@ -273,7 +273,7 @@ function If:evaluate_condition(condition, state, context)
local variable_type = util.variable_types[variable] or "standard"
if variable_type ~= "date" then
- util.warning(string.format('Expecting date variable for condition "is-uncertain-date", got "%s"', variable_type, variable))
+ util.warning(string.format("Expecting date variable for condition 'is-uncertain-date', got '%s'", variable_type, variable))
return false
end
local value = context:get_variable(variable)
@@ -283,6 +283,10 @@ function If:evaluate_condition(condition, state, context)
return self:is_uncertain_date(value)
elseif condition.condition == "locator" then
+ local locator = context:get_variable("locator")
+ if not locator or locator == "" then
+ return false
+ end
local locator_label = context:get_variable("label")
if locator_label == "sub verbo" then
locator_label = "sub-verbo"
diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc-node-citation.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-node-citation.lua
index 45e1335b309..28eeba9aaa1 100644
--- a/Master/texmf-dist/scripts/citation-style-language/citeproc-node-citation.lua
+++ b/Master/texmf-dist/scripts/citation-style-language/citeproc-node-citation.lua
@@ -41,6 +41,7 @@ local Micro = output.Micro
local Formatted = output.Formatted
local PlainText = output.PlainText
local InlineElement = output.InlineElement
+local UndefinedCite = output.UndefinedCite
local CiteInline = output.CiteInline
local DisamStringFormat = output.DisamStringFormat
local SortStringFormat = output.SortStringFormat
@@ -470,7 +471,7 @@ function Citation:build_ambiguous_ir(cite_item, output_format, engine)
if context.reference then
ir = self:build_ir(engine, state, context, active_layout)
else
- ir = Rendered:new({Formatted:new({PlainText:new(tostring(cite_item.id))}, {["font-weight"] = "bold"})}, self)
+ ir = Rendered:new({UndefinedCite:new({PlainText:new(tostring(cite_item.id))}, cite_item)}, self)
end
ir.cite_item = cite_item
diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc-node-names.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-node-names.lua
index cc5a21ca557..10781e12132 100644
--- a/Master/texmf-dist/scripts/citation-style-language/citeproc-node-names.lua
+++ b/Master/texmf-dist/scripts/citation-style-language/citeproc-node-names.lua
@@ -131,7 +131,7 @@ function Names:from_node(node)
child.after_name = true
end
else
- util.warning(string.format('Unknown element "%s".', element_name))
+ util.warning(string.format("Unknown element '%s'.", element_name))
end
end
o:get_delimiter_attribute(node)
diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc-node-number.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-node-number.lua
index b8a55d3c669..0be68cba0f8 100644
--- a/Master/texmf-dist/scripts/citation-style-language/citeproc-node-number.lua
+++ b/Master/texmf-dist/scripts/citation-style-language/citeproc-node-number.lua
@@ -59,8 +59,9 @@ function Number:build_ir(engine, state, context)
local number
if not state.suppressed[self.variable] then
number = context:get_variable(self.variable, self.form)
+ ---@cast number string | number?
end
- if not number then
+ if not number or number == "" then
local ir = Rendered:new({}, self)
ir.group_var = GroupVar.Missing
return ir
diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc-node-sort.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-node-sort.lua
index e97b378bf03..262d11edae0 100644
--- a/Master/texmf-dist/scripts/citation-style-language/citeproc-node-sort.lua
+++ b/Master/texmf-dist/scripts/citation-style-language/citeproc-node-sort.lua
@@ -77,7 +77,7 @@ function Sort:sort(items, state, context)
if uca_languages[language] then
Sort.collator = uca_languages[language](Sort.collator)
else
- util.warning(string.format('Locale "%s" is not provided by lua-uca. The sorting order may be incorrect.', lang))
+ util.warning(string.format("Locale '%s' is not provided by lua-uca. The sorting order may be incorrect.", lang))
end
end
end
diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc-node-text.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-node-text.lua
index 99b20f8142e..c3f6af2eecd 100644
--- a/Master/texmf-dist/scripts/citation-style-language/citeproc-node-text.lua
+++ b/Master/texmf-dist/scripts/citation-style-language/citeproc-node-text.lua
@@ -86,6 +86,7 @@ function Text:build_ir(engine, state, context)
if self.variable then
ir = self:build_variable_ir(engine, state, context)
elseif self.macro then
+ -- util.debug(self.macro)
ir = self:build_macro_ir(engine, state, context)
elseif self.term then
ir = self:build_term_ir(engine, state, context)
@@ -108,9 +109,10 @@ function Text:build_variable_ir(engine, state, context)
if not state.suppressed[variable] then
text = context:get_variable(variable, self.form)
+ ---@case text string | number?
end
- if not text then
+ if not text or text == "" then
local ir = Rendered:new({}, self)
ir.group_var = GroupVar.Missing
return ir
diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc-output.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-output.lua
index d335807b977..ec50f433aa2 100644
--- a/Master/texmf-dist/scripts/citation-style-language/citeproc-output.lua
+++ b/Master/texmf-dist/scripts/citation-style-language/citeproc-output.lua
@@ -93,19 +93,28 @@ function InlineElement:new(inlines)
end
-function InlineElement:_debug()
- local text = self._type .. "("
+function InlineElement:_debug(level)
+ level = level or 0
+ local text = ""
+ if level == 0 then
+ text = "\n"
+ end
+ text = text .. self._type
+ if self.formatting then
+ text = text .. "["
+ for attr, value in pairs(self.formatting) do
+ text = text .. attr .. '="' .. value .. '"'
+ end
+ text = text .. "]"
+ end
+ text = text .. "("
if self.value then
text = text .. '"' .. self.value .. '"'
elseif self.inlines then
- local inlines_text = ""
for _, inline in ipairs(self.inlines) do
- if inlines_text ~= "" then
- inlines_text = inlines_text .. ", "
- end
- inlines_text = inlines_text .. inline:_debug()
+ text = text .. "\n" .. string.rep(" ", level + 1) .. inline:_debug(level + 1) .. ", "
end
- text = text .. inlines_text
+ text = text .. "\n" .. string.rep(" ", level)
end
text = text .. ")"
return text
@@ -292,6 +301,23 @@ function CiteInline:new(inlines, cite_item)
end
+---@class UndefinedCite: InlineElement
+---@field cite_item CitationItem
+local UndefinedCite = InlineElement:derive("UndefinedCite")
+
+---@param inlines InlineElement[]
+---@param cite_item CitationItem
+---@return UndefinedCite
+function UndefinedCite:new(inlines, cite_item)
+ local o = InlineElement.new(self)
+ o.inlines = inlines
+ o.cite_item = cite_item
+ setmetatable(o, self)
+ return o
+end
+
+
+
---@param text string
---@param context Context?
---@param is_external boolean?
@@ -864,6 +890,7 @@ function OutputFormat:is_sentence_case(inlines)
or util.is_instance(inline, NoCase)
or util.is_instance(inline, NoDecor)
or util.is_instance(inline, CiteInline)
+ or util.is_instance(inline, UndefinedCite)
or (util.is_instance(inline, Formatted)
and inline.formatting["font-variant"] ~= "small-caps"
and inline.formatting["vertical-align"] ~= "sup"
@@ -953,7 +980,8 @@ function OutputFormat:apply_text_case_inner(inlines, text_case, seen_one, is_upp
(inline._type == "Formatted" and inline.formatting["vertical-align"] == "sub") then
seen_one = seen_one or inline_contains_word(inline)
- elseif inline._type == "Formatted" or inline._type == "Quoted" or inline._type == "CiteInline" then
+ elseif inline._type == "Formatted" or inline._type == "Quoted"
+ or inline._type == "CiteInline" or inline._type == "UndefinedCite" then
seen_one = self:apply_text_case_inner(inline.inlines, text_case, seen_one, is_uppercase) or seen_one
end
@@ -1273,7 +1301,6 @@ function OutputFormat:flip_flop(inlines, state)
elseif inline._type == "Code" or
inline._type == "MathML" or
inline._type == "MathTeX" then
- return
elseif inline.inlines then -- Div, ...
self:flip_flop(inline.inlines, state)
@@ -1336,7 +1363,6 @@ function OutputFormat:flip_flop_micro_inlines(inlines, state)
elseif inline._type == "Code" or
inline._type == "MathML" or
inline._type == "MathTeX" then
- return
elseif inline.inlines then -- Div, ...
self:flip_flop_micro_inlines(inline.inlines, state)
@@ -1475,8 +1501,8 @@ local function normalise_text_elements(inlines)
idx = idx + 1
end
- elseif (first._type == "Formatted" or first._type == "CiteInline")
- and second._type == "PlainText" then
+ elseif (first._type == "Formatted" or first._type == "CiteInline"
+ or first._type == "UndefinedCite") and second._type == "PlainText" then
local success = smash_just_punc(first, second)
if success then
if second.value == "" then
@@ -1572,7 +1598,8 @@ function OutputFormat:move_punctuation(inlines, punctuation_in_quote)
for _, inline in ipairs(inlines) do
if inline._type == "Quoted" or inline._type == "Formatted" or
- inline._type == "Div" or inline._type == "CiteInline" then
+ inline._type == "Div" or inline._type == "CiteInline"
+ or inline._type == "UndefinedCite" then
self:move_punctuation(inline.inlines)
end
end
@@ -1635,6 +1662,9 @@ function Markup:write_inline(inline, context)
elseif inline._type == "CiteInline" then
return self:write_cite(inline, context)
+ elseif inline._type == "UndefinedCite" then
+ return self:write_undefined_cite(inline, context)
+
elseif inline._type == "Code" then
return self:write_code(inline, context)
@@ -1686,6 +1716,11 @@ function Markup:write_cite(inline, context)
return self:write_inlines(inline.inlines, context)
end
+function Markup:write_undefined_cite(inline, context)
+ local bold_inline = Formatted:new({PlainText:new(inline.cite_item.id)}, {["font-weight"] = "bold"})
+ return self:write_formatted(bold_inline, context)
+end
+
function Markup:write_code(inline, context)
return inline.value
end
@@ -1831,6 +1866,10 @@ function LatexWriter:write_cite(inline, context)
return str
end
+function LatexWriter:write_undefined_cite(inline, context)
+ return string.format("\\cslundefinedcite{%s}", inline.cite_item.id)
+end
+
function LatexWriter:write_code(inline, context)
return inline.value
end
@@ -2155,6 +2194,7 @@ output_module.Quoted = Quoted
output_module.Linked = Linked
output_module.Div = Div
output_module.CiteInline = CiteInline
+output_module.UndefinedCite = UndefinedCite
output_module.Code = Code
output_module.MathTeX = MathTeX
output_module.MathTML = MathML
diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc-util.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc-util.lua
index 47ccc8bde66..c0ff5e5731a 100644
--- a/Master/texmf-dist/scripts/citation-style-language/citeproc-util.lua
+++ b/Master/texmf-dist/scripts/citation-style-language/citeproc-util.lua
@@ -78,7 +78,7 @@ function util.to_boolean(str)
elseif str == "false" then
return false
else
- util.warning(string.format('Invalid boolean string "%s"', str))
+ util.warning(string.format("Invalid boolean string '%s'", str))
return false
end
end
@@ -133,7 +133,7 @@ util.logging_file = nil
function util.set_logging_file(path)
util.logging_file = io.open(path, "w")
if not util.logging_file then
- util.error(string.format('Cannot write to "%s".', path))
+ util.error(string.format("Cannot write to '%s'.", path))
end
util.logging_file = io.open(path, 'a')
end
@@ -150,20 +150,24 @@ util.num_errors = 0
util.num_warnings = 0
+---@param message string
function util.error(message)
util.num_errors = util.num_errors + 1
if luatexbase then
- -- The luatexbase.module_error() prints the traceback, which causes panic
- -- luatexbase.module_error("citeproc", message)
-
- -- TODO: Enhance the error output. Make it like `\msg_error`.
- texio.write_nl("term", "\n")
- tex.error("Module citeproc Error: " .. message)
-
- -- tex.print(string.format("\\PackageError{citation-style-language}{%s}{}", message))
-
+ -- Run in LuaLaTeX
+ tex.print(string.format("\\csname msg_error:nnn\\endcsname{citeproc}{citeproc-error}{%s}", message))
+ -- Don't use the following methods.
+ -- `error()` prints long traceback when run in LuaLaTeX.
+ -- texio.write_nl("term", "\n")
+ -- `tex.error()` prints annoying `\lua_now:e #1->` when called from LaTeX3 interface.
+ -- `luatexbase.module_error()` prints traceback.
+ -- tex.print(string.format("\\PackageError{CSL}{%s}{}", message))
else
- message = "Error: " .. message
+ -- Run in citeproc-lua script
+ -- This format is used by latexmk. DO NOT change.
+ message = "Error: " .. message
+ -- Following bibtex and biber, the error message is printed to stdout rather than stderr.
+ -- And the error doesn't break the execution of the script.
print(message)
if util.logging_file then
util.logging_file:write(message .. "\n")
@@ -176,12 +180,10 @@ util.warning_enabled = true
function util.warning(message)
util.num_warnings = util.num_warnings + 1
if luatexbase then
- texio.write_nl("term", "\n")
- luatexbase.module_warning("citeproc", message)
-
- -- tex.print(string.format("\\PackageWarning{citation-style-language}{%s}{}", message))
+ tex.print(string.format("\\csname msg_warning:nnn\\endcsname{citeproc}{citeproc-warning}{%s}", message))
else
+ -- This format is used by latexmk. DO NOT change.
message = "Warning: " .. message
if util.logging_file then
util.logging_file:write(message .. "\n")
@@ -207,8 +209,15 @@ local remove_all_metatables = nil
function util.debug(obj)
local text
- if type(obj) == "table" and obj._debug then
- text = obj:_debug()
+ if type(obj) == "table" and (obj._debug or (obj[1] and obj[1]._debug)) then
+ if obj._debug then
+ text = obj:_debug()
+ else
+ text = ""
+ for _, child in ipairs(obj) do
+ text = text .. child:_debug()
+ end
+ end
else
if not inspect then
inspect = require("inspect")
@@ -243,6 +252,9 @@ function util.split(str, sep, maxsplit)
if sep == "" then
util.error("Empty separator")
end
+ if str == "" then
+ return {}
+ end
if string.find(str, sep) == nil then
return { str }
end
@@ -368,6 +380,8 @@ function util.concat_list(first, second)
return res
end
+---@param str string
+---@return string
function util.lstrip (str)
if not str then
error("Invalid input")
@@ -376,6 +390,21 @@ function util.lstrip (str)
return res
end
+---@param str string
+---@param prefix string
+---@return string
+function util.remove_prefix(str, prefix)
+ if type(str) ~= "string" or type(prefix) ~= "string" then
+ error("Invalid input")
+ end
+ if util.startswith(str, prefix) then
+ return string.sub(str, #prefix + 1)
+ end
+ return str
+end
+
+---@param str string
+---@return string
function util.rstrip (str)
if not str then
error("Invalid input")
@@ -384,13 +413,15 @@ function util.rstrip (str)
return res
end
+---@param str string
+---@return string
function util.strip (str)
return util.lstrip(util.rstrip(str))
end
function util.startswith(str, prefix)
if type(str) ~= "string" then
- util.error(string.format('\n%s\n"%s" is not a string.', debug.traceback(), str))
+ util.error(string.format("\n%s\n'%s' is not a string.", debug.traceback(), str))
end
return string.sub(str, 1, #prefix) == prefix
end
@@ -1140,7 +1171,7 @@ function util.read_file(path, allowe_missing)
local file = io.open(path, "r")
if not file then
if not allowe_missing then
- util.error(string.format('Cannot open file "%s".', path))
+ util.error(string.format("Cannot open file '%s'.", path))
end
return nil
end
@@ -1156,7 +1187,7 @@ end
function util.write_file(text, path)
local file = io.open(path, "w")
if not file then
- util.error(string.format('Cannot write to file "%s".', path))
+ util.error(string.format("Cannot write to file '%s'.", path))
return
end
file:write(text)
@@ -1286,7 +1317,7 @@ util.trigraph = "Aaaa00:AaAa00:AaAA00:AAAA00"
---@return { authors: integer[], year: integer }
function util.get_trigraph_param(trigraph)
if not trigraph or string.sub(trigraph, 1, 1) ~= "A" then
- util.error(string.format('Bad trigraph definition: "%s"', trigraph))
+ util.error(string.format("Bad trigraph definition: '%s'", trigraph))
end
local param = {
authors = {},
@@ -1303,7 +1334,7 @@ function util.get_trigraph_param(trigraph)
elseif char == "0" then
param.year = param.year + 1
else
- util.error(string.format('Invalid character "%s" in trigraph definition "%s"', char, trigraph))
+ util.error(string.format("Invalid character '%s' in trigraph definition '%s'", char, trigraph))
end
end
return param
diff --git a/Master/texmf-dist/scripts/citation-style-language/citeproc.lua b/Master/texmf-dist/scripts/citation-style-language/citeproc.lua
index 1d7f76b81e7..d0e89efac74 100755
--- a/Master/texmf-dist/scripts/citation-style-language/citeproc.lua
+++ b/Master/texmf-dist/scripts/citation-style-language/citeproc.lua
@@ -16,7 +16,7 @@ else
util = require("citeproc.util")
end
-citeproc.__VERSION__ = "0.5.0"
+citeproc.__VERSION__ = "0.6.0"
citeproc.new = engine.CiteProc.new
citeproc.util = util
diff --git a/Master/texmf-dist/scripts/dviasm/dviasm.py b/Master/texmf-dist/scripts/dviasm/dviasm.py
index 046306035aa..6f99c8a5697 100755
--- a/Master/texmf-dist/scripts/dviasm/dviasm.py
+++ b/Master/texmf-dist/scripts/dviasm/dviasm.py
@@ -6,7 +6,7 @@
# Copyright (C) 2007-2008 by Jin-Hwan Cho <chofchof@ktug.or.kr>
# Copyright (C) 2011-2017 by Khaled Hosny <khaledhosny@eglug.org>
# Copyright (C) 2019 by Arthur Reutenauer <arthur@reutenauer.eu>
-# Copyright (C) 2019-2023 by Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+# Copyright (C) 2019-2024 by Hironobu Yamashita <h.y.acetaminophen@gmail.com>
#
# 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
@@ -192,12 +192,56 @@ def UCS2toJIS(c):
if len(s) == 1: return ord(s)
else: return (s[3] << 8) + s[4]
+def XUnicodeDecode(s): # dirty hack to handle >= 0x110000
+ t = []
+ i = 1
+ while i < len(s)-1:
+ c = -1
+ if s[i] == '\\':
+ if s[i+1] == 'x':
+ try:
+ c = int(s[i+2:i+4],16)
+ i += 4
+ except ValueError:
+ warning('Invalid escape sequence \\x ignored!')
+ i += 2
+ elif s[i+1] == 'u':
+ try:
+ c = int(s[i+2:i+6],16)
+ i += 6
+ except ValueError:
+ warning('Invalid escape sequence \\u ignored!')
+ i += 2
+ elif s[i+1] == 'U':
+ try:
+ c = int(s[i+2:i+10],16)
+ i += 10
+ except ValueError:
+ warning('Invalid escape sequence \\U ignored!')
+ i += 2
+ else:
+ if i+1 < len(s)-1:
+ c = ord(s[i+1])
+ i += 2
+ else:
+ warning('Invalid escape character \\ ignored!')
+ i += 1
+ else:
+ c = ord(s[i])
+ i += 1
+ if is_ptex: c = UCS2toJIS(chr(c))
+ if c >= 0: t.append(c)
+ return t
+
def GetStrUTF8(s): # used in Parse()
if len(s) > 1 and ((s[0] == "'" and s[-1] == "'") or (s[0] == '"' and s[-1] == '"')):
- t = s[1:-1].encode('raw_unicode_escape').decode('unicode_escape')
- if is_ptex: return [UCS2toJIS(c) for c in t]
- else: return [ord(c) for c in t]
- else: return ''
+ try: # This should work for valid Unicode
+ t = s[1:-1].encode('raw_unicode_escape').decode('unicode_escape')
+ if is_ptex: return [UCS2toJIS(c) for c in t]
+ else: return [ord(c) for c in t]
+ except UnicodeDecodeError: # e.g. for upTeX >= 0x110000
+ return XUnicodeDecode(s)
+ else: return ''
def PutStrASCII(t): # used in Dump()
s = ''
@@ -206,8 +250,7 @@ def PutStrASCII(t): # used in Dump()
elif 32 <= o < 127: s += chr(o)
elif o < 256: s += ('\\x%02x' % o)
elif o < 65536: s += ('\\u%04x' % o)
- else:
- warning('Not support characters > 65535; may skip %d.\n' % o)
+ else: s += ('\\U%08x' % o)
return "'%s'" % s
def PutStrLatin1(t): # used in Dump()
@@ -217,8 +260,7 @@ def PutStrLatin1(t): # used in Dump()
elif 32 <= o < 127 or 161 <= o < 256: s += chr(o)
elif o < 256: s += ('\\x%02x' % o)
elif o < 65536: s += ('\\u%04x' % o)
- else:
- warning('Not support characters > 65535; may skip %d.\n' % o)
+ else: s += ('\\U%08x' % o)
return "'%s'" % s
def DecodeISO2022JP(c):
@@ -240,7 +282,12 @@ def PutStrUTF8(t): # used in Dump()
elif o < 128: s += ('\\x%02x' % o)
elif is_ptex:
s += DecodeISO2022JP(o)
- else: s += chr(o)
+ else:
+ try: s += chr(o)
+ except ValueError: # upTeX may have >= 0x110000
+ if o < 256: s += '\\x%02x' % o
+ elif o < 65536: s += '\\u%04x' % o
+ else: s += '\\U%08x' % o
return "'%s'" % s
def IsFontChanged(f, z):
@@ -1174,12 +1221,12 @@ binary format. It is fully documented at
Please report bugs to
https://github.com/aminophen/dviasm"""
- version = """This is %prog-20230823
+ version = """This is %prog-20240725
Copyright (C) 2007-2008 by Jin-Hwan Cho <chofchof@ktug.or.kr>
Copyright (C) 2011-2017 by Khaled Hosny <khaledhosny@eglug.org>
Copyright (C) 2019 by Arthur Reutenauer <arthur@reutenauer.eu>
-Copyright (C) 2019-2022 by Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+Copyright (C) 2019-2024 by Hironobu Yamashita <h.y.acetaminophen@gmail.com>
This 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/latexindent/LatexIndent/Version.pm b/Master/texmf-dist/scripts/latexindent/LatexIndent/Version.pm
index a2483231fdc..039d492356b 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.3';
-our $versionDate = '2024-07-14';
+our $versionNumber = '3.24.4';
+our $versionDate = '2024-07-18';
1
diff --git a/Master/texmf-dist/scripts/latexindent/LatexIndent/Wrap.pm b/Master/texmf-dist/scripts/latexindent/LatexIndent/Wrap.pm
index 334902dc663..1116b05fa83 100644
--- a/Master/texmf-dist/scripts/latexindent/LatexIndent/Wrap.pm
+++ b/Master/texmf-dist/scripts/latexindent/LatexIndent/Wrap.pm
@@ -659,6 +659,13 @@ sub text_wrap_comment_blocks {
# call the text wrapping routine
my $columns = ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{columns};
+ # fail gracefully if columns == 0
+ if ($columns==0){
+ $logger->warn("* textWrapOptions: columns is set to 0, can't text wrap with this");
+ ${ ${ $mainSettings{modifyLineBreaks}{textWrapOptions} }{comments} }{wrap} = 0;
+ return;
+ }
+
#
# text wrap comment blocks
#
diff --git a/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml b/Master/texmf-dist/scripts/latexindent/defaultSettings.yaml
index e16617db147..7ad03f254bc 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.3, 2024-07-14
+# latexindent.pl, version 3.24.4, 2024-07-18
#
# 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 2b9791e5c8c..a467fb420e2 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.3, 2024-07-14
+# latexindent.pl, version 3.24.4, 2024-07-18
#
# 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/pagelayout/pagelayoutapi b/Master/texmf-dist/scripts/pagelayout/pagelayoutapi
index be034baaa7c..1232ae3ab74 100755
--- a/Master/texmf-dist/scripts/pagelayout/pagelayoutapi
+++ b/Master/texmf-dist/scripts/pagelayout/pagelayoutapi
@@ -13,7 +13,7 @@
# LaTeX version 2008/05/04 or later.
#
-version=1.1.0
+version=1.1.1
_convert() {
turbo=$1
diff --git a/Master/texmf-dist/scripts/pagelayout/textestvis b/Master/texmf-dist/scripts/pagelayout/textestvis
index 8ddcde77e15..8120a7ba1f5 100755
--- a/Master/texmf-dist/scripts/pagelayout/textestvis
+++ b/Master/texmf-dist/scripts/pagelayout/textestvis
@@ -13,7 +13,7 @@
# LaTeX version 2008/05/04 or later.
#
-version=1.1.0
+version=1.1.1
OK="$( tput setaf 2 )•$( tput sgr0 )"
FAILED="$( tput setaf 1 )$( tput bold )x$( tput sgr0 )"
@@ -122,13 +122,13 @@ test() {
fi
fi
- magick convert -density $2 -quiet $tmpdir/$name.pdf $tmpdir/$name.png
+ magick -density $2 -quiet $tmpdir/$name.pdf $tmpdir/$name.png
if [ -f "$tmpdir/$name.png" ]; then
mv $tmpdir/$name.png $tmpdir/$name-0.png
fi
if [ -f "$name.approved.pdf" ]; then
- magick convert -density $2 -quiet $name.approved.pdf $tmpdir/$name.approved.png
+ magick -density $2 -quiet $name.approved.pdf $tmpdir/$name.approved.png
if [ -f "$tmpdir/$name.approved.png" ]; then
mv $tmpdir/$name.approved.png $tmpdir/$name.approved-0.png
fi
@@ -311,11 +311,11 @@ compare() {
spacer=""
if [ -f "$filea" ]; then
if [ -f "$fileb" ]; then
- magick convert -density $1 -quiet $filea $tmpdir/$basenamea.png
+ magick -density $1 -quiet $filea $tmpdir/$basenamea.png
if [ -f "$tmpdir/$basenamea.png" ]; then
mv $tmpdir/$basenamea.png $tmpdir/$basenamea-0.png
fi
- magick convert -density $1 -quiet $fileb $tmpdir/$basenameb.png
+ magick -density $1 -quiet $fileb $tmpdir/$basenameb.png
if [ -f "$tmpdir/$basenameb.png" ]; then
mv $tmpdir/$basenameb.png $tmpdir/$basenameb-0.png
fi
diff --git a/Master/texmf-dist/scripts/texlive/extractbb.lua b/Master/texmf-dist/scripts/texlive/extractbb.lua
index db63bd01bc4..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"
@@ -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,58 +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
--- But on Macs we get /Library/TeX/texbin. What to do?
--- (Frank msg to tex-live 8jul24.)
--- 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
@@ -234,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
@@ -244,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/texplate/texplate.jar b/Master/texmf-dist/scripts/texplate/texplate.jar
index a709b338682..a4729dab090 100644
--- a/Master/texmf-dist/scripts/texplate/texplate.jar
+++ b/Master/texmf-dist/scripts/texplate/texplate.jar
Binary files differ
diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
index 1ec34d6f5b2..b52e5c67e76 100644
--- a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
+++ b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
@@ -75,7 +75,7 @@ Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%<frenchb>\ProvidesLanguage{frenchb}
%<lua>--[[
%<lua> File `frenchb.lua’ generated from frenchb.dtx
- [2024-06-26 v3.6b French support from the babel system]
+ [2024-07-25 v3.6c French support from the babel system]
%<lua> Copyright © 2014-2024 Daniel Flipo
%<lua> <daniel (dot) flipo (at) free (dot) fr>
%<lua> License LPPL: see french.ldf.
@@ -2782,7 +2782,7 @@ return french_punctuation
% \changes{v3.2c}{2016/05/14}{New definition based on
% \cs{FB@spacing@off} common to all engines.}
%
-% \changes{v3.6b}{2024/06/25}{\cs{NoAutoSpacing} must be inhibited
+% \changes{v3.6b}{2024/06/26}{\cs{NoAutoSpacing} must be inhibited
% in bookmarks.}
%
% \begin{macrocode}
@@ -4582,6 +4582,10 @@ return french_punctuation
\@onlypreamble\frenchbsetup
% \end{macrocode}
%
+% \changes{v3.6c}{2024/07/25}{Removed spurious @ in
+% \cs{FBCompactItemize@setup} and \cs{FBListOldLayout@setup}
+% commands’ names.}
+%
% The following commands, defined with property |.code| in
% |DeclareKeys{}|, execute some post-treatment required to
% immediately take the flags value into account.
@@ -4623,14 +4627,14 @@ return french_punctuation
Reported}%
\fi
}
-\newcommand*{\FB@ListOldLayout@setup}[1]%
+\newcommand*{\FBListOldLayout@setup}[1]%
{\csname FBListOldLayout#1\endcsname
\ifFBListOldLayout
\FBStandardEnumerateEnvtrue
\renewcommand*{\FrenchLabelItem}{\textendash}%
\fi
}
-\newcommand*{\FB@CompactItemize@setup}[1]%
+\newcommand*{\FBCompactItemize@setup}[1]%
{\csname FBCompactItemize#1\endcsname
\ifFBCompactItemize
\FBStandardItemizeEnvfalse
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 6bf8ba7fcef..bf7907c9dec 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,50 @@
+2024-08-13 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (amsfonts.4ht): fixed support for \mathbb and
+ \mathfrak.
+
+ * tex4ht-jats.tex (jats.4ht): added support for LaTeX
+ bibliographies.
+
+2024-08-11 Karl Berry <karl@freefriends.org>
+
+ * tex4ht-mathml.tex (html-mml.4ht): copyright 2024.
+
+2024-08-02 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-mathml.tex (mathml.4ht): added "texsource" option. It will
+ keep the original LaTeX code as an annotation in MathML.
+ https://chat.stackexchange.com/rooms/154333/discussion-on-question-by-yannisl-alternatives-to-mathml-for-pdf-tagging
+
+ * tex4ht-4ht.tex (esvect.4ht),
+ * tex4ht-mathml.tex (mathml.4ht): added support for the Esvect
+ package.
+ https://tex.stackexchange.com/a/723587/2891
+
+2024-07-31 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-fonts-noncjk.tex (
+ ./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/TeXvect10/vect10.htf
+ ): Added support for the vector font from the Esvect package.
+ https://tex.stackexchange.com/q/723560/2891
+
+2024-07-28 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): don't add spaces after
+ LaTeX commands.
+
+2024-07-26 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (tagpdf-hooks.4ht, tagpdf-base-hooks.4ht): removed
+ \__tag_whatsits definitions, they fix is no longer necessary.
+ https://github.com/michal-h21/make4ht/issues/145#issuecomment-2085215582
+
+2024-07-07 Karl Berry <karl@freefriends.org>
+
+ * Makefile (tex4ht_env_derived),
+ * tex4ht-env.tex: no longer generate tex4ht.env, just
+ .env-unix and .env-win32, since those are the only ones we use.
+
2024-07-06 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-html4.tex (html4.4ht): added itemize+ option. It will keep
diff --git a/Master/texmf-dist/source/generic/tex4ht/Makefile b/Master/texmf-dist/source/generic/tex4ht/Makefile
index fd6995f4a59..5328185f784 100644
--- a/Master/texmf-dist/source/generic/tex4ht/Makefile
+++ b/Master/texmf-dist/source/generic/tex4ht/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 1503 2024-04-18 22:51:03Z karl $
+# $Id: Makefile 1538 2024-07-07 15:55:16Z karl $
# This file is public domain. Originally written 2010, Karl Berry.
# Assumes GNU make.
@@ -138,7 +138,7 @@ tex4ht_docbook_xtpipes_derived = docbook.4xt $(wd)/src/DbUtilities.java
endif
derived += $(tex4ht_env_derived)
-tex4ht_env_derived = tex4ht.env-unix tex4ht.env-win32 tex4ht.env
+tex4ht_env_derived = tex4ht.env-unix tex4ht.env-win32
derived += $(tex4ht_fonts_cjk_derived)
tex4ht_fonts_cjk_derived = \
diff --git a/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex b/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
index 7bc692fff6d..c57dbe10626 100644
--- a/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
@@ -1,4 +1,4 @@
-% $Id: mktex4ht-cnf.tex 1523 2024-05-27 14:16:04Z michal_h21 $
+% $Id: mktex4ht-cnf.tex 1542 2024-08-02 14:58:42Z michal_h21 $
% Manually-maintained file, listing *.4ht files created by tex4ht-4ht.tex.
% Read by tex4ht-cond4ht.
%
@@ -415,4 +415,5 @@
\AddFile{9}{fontawesome5}
\AddFile{9}{mhchem}
\AddFile{9}{chemfig}
+\AddFile{9}{esvect}
% \AddFile{9}{mktex4ht}
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index f3617f37572..7c0609dc174 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 1536 2024-07-03 12:08:13Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1546 2024-08-13 19:30:20Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2024 TeX Users Group
@@ -5100,13 +5100,14 @@ as it leads to a fatal error.
\Configure{PackageHooks}{tagpdf.sty}{tagpdf-hooks.4ht}
>>>
+% This is no longer useful, it was fixed in tagpdf code
+% \cs_set_protected:Npn \__tag_whatsits: {}
+
\<tagpdf-hooks.4ht\><<<
% tagpdf-hooks.4ht (|version), generated from |jobname.tex
% Copyright 2022-2024 TeX Users Group
|<TeX4ht license text|>
\ExplSyntaxOn
-% ignore tagpdf's specials
-\cs_set_protected:Npn \__tag_whatsits: {}
\ExplSyntaxOff
\:AtEndOfPackage{%
\RenewDocumentCommand \tagpdfsetup { m }{}
@@ -5118,16 +5119,17 @@ as it leads to a fatal error.
\Configure{PackageHooks}{tagpdf-base.sty}{tagpdf-base-hooks.4ht}
>>>
-This file can be used explicitly, we need to provide the whatsits command
-here as well.
+This file can be used explicitly, we used to provide the whatsits command
+here as well, but it is no longer neeeded.
+
+% ignore tagpdf's specials
+% we use csname, because \ExplSyntaxOn .. Off caused catcode issues
+% \expandafter\def\csname __tag_whatsits:\endcsname{}
\<tagpdf-base-hooks.4ht\><<<
% tagpd-base-hooks.4ht (|version), generated from |jobname.tex
% Copyright 2024 TeX Users Group
|<TeX4ht license text|>
-% ignore tagpdf's specials
-% we use csname, because \ExplSyntaxOn .. Off caused catcode issues
-\expandafter\def\csname __tag_whatsits:\endcsname{}
\endinput
>>> \AddFile{9}{tagpdf-base-hooks}
@@ -22277,14 +22279,14 @@ $$
\<amsfonts sty\><<<<
\NewConfigure{mathbb}{2}
-\def\:temp#1{{\a:mathbb \o:@mathbb:{#1}\b:mathbb}}
-\HLet\@mathbb\:temp
+\def\:temp#1{{\a:mathbb \o:mathbb:{#1}\b:mathbb}}
+\HLet\mathbb\:temp
>>>
\<amsfonts sty\><<<<
\NewConfigure{mathfrak}{2}
-\def\:temp#1{{\a:mathfrak \o:@mathfrak:{#1}\b:mathfrak}}
-\HLet\@mathfrak\:temp
+\def\:temp#1{{\a:mathfrak \o:mathfrak:{#1}\b:mathfrak}}
+\HLet\mathfrak\:temp
>>>
Commands like \''\rm' need low level implemetation through
@@ -31408,6 +31410,20 @@ for output formats.
\ExplSyntaxOff
>>>
+%%%%%%%%%%%%%%%
+\Section{Esvect}
+%%%%%%%%%%%%%%%
+
+\<esvect.4ht\><<<
+% esvect.4ht (|version), generated from |jobname.tex
+% Copyright 2024 TeX Users Group
+|<TeX4ht license text|>
+|<esvect redefinitions|>
+
+\Hinput{esvect}
+\endinput
+>>> \AddFile{9}{esvect}
+
%%%%%%%%%%%%%
\Section{Ushort}
%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-env.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-env.tex
index 5d66aa43d02..3ac0f4443d4 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-env.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-env.tex
@@ -1,8 +1,8 @@
-% $Id: tex4ht-env.tex 1419 2023-12-11 23:23:52Z karl $
+% $Id: tex4ht-env.tex 1538 2024-07-07 15:55:16Z karl $
% latex tex4ht-env
% or htlatex tex4ht-env "xhtml,3"
%
-% Copyright 2009-2023 TeX Users Group
+% Copyright 2009-2024 TeX Users Group
% Copyright 1997-2009 Eitan M. Gurari
% Released under LPPL 1.3c+.
% See tex4ht-cpright.tex for license text.
@@ -1650,27 +1650,30 @@ Note: the permission option `S' takes into account also trailing spaces.
\<unix copyright\><<<
% tex4ht.env-unix (@version), generated from @jobname.tex
-% (can be used as ~/.tex4ht)
-% Copyright 2009-2023 TeX Users Group
+% Copyright 2009-2024 TeX Users Group
% Copyright @CopyYear.1997. Eitan M. Gurari
@<TeX4ht copyright@>>>>
\<private copyright\><<<
% tex4ht.env (private) (@version), generated from @jobname.tex
% (can be used as ~/.tex4ht)
-% Copyright 2009-2023 TeX Users Group
+% Copyright 2009-2024 TeX Users Group
% Copyright @CopyYear.1997. Eitan M. Gurari
@<TeX4ht copyright@>>>>
\<win32 copyright\><<<
% tex4ht.env-win32 (@version), generated from @jobname.tex
-% Copyright 2009-2023 TeX Users Group
+% Copyright 2009-2024 TeX Users Group
% Copyright @CopyYear.1997. Eitan M. Gurari
@<TeX4ht copyright@>>>>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\OutputCode\<tex4ht\>
+% Let's no longer create tex4ht.env; it's too easy to mistakenly update
+% a system version with it. Post-Eitan, we haven't tried to keep it in
+% sync with the others.
+%\OutputCode\<tex4ht\>
+
\OutputCodE\<tex4ht.env-unix\>
\OutputCodE\<tex4ht.env-win32\>
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-fonts-noncjk.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-fonts-noncjk.tex
index ae68aa34d59..0e22004638e 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-fonts-noncjk.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-fonts-noncjk.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-fonts-noncjk.tex 1517 2024-05-10 11:27:42Z michal_h21 $
+% $Id: tex4ht-fonts-noncjk.tex 1541 2024-07-31 10:01:14Z michal_h21 $
% tex tex4ht-fonts-noncjk
% or ht tex tex4ht-fonts-noncjk
%
@@ -24483,6 +24483,69 @@ fplmbb 49 90
+\Section{Esvect}
+
+Font file for the Esvect package.
+
+% writing vect10.htf hash: d9018d0b41b7639bd8c3bf0419c3b8a5
+\<vect10\><<<
+vect10 0 47
+'&#x60;' '' grave 0 % generated from vect10.tfm, 2024-07-31-11:51
+'&#x00B4;' '' acute 1 % Copyright 2024 TeX Users Group
+'&#x02C6;' '' circumflex 2 %
+'&#x02DC;' '' tilde 3 % This work may be distributed and/or modified under the
+'&#x00A8;' '' dieresis 4 % conditions of the LaTeX Project Public License, either
+'&#x02DD;' '' hungarumlaut 5 % version 1.3c of this license or (at your option) any
+'&#x02DA;' '' ring 6 % later version. The latest version of this license is in
+'&#x02C7;' '' caron 7 % http://www.latex-project.org/lppl.txt
+'&#x02D8;' '' breve 8 % 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>.
+'' '' %
+'&#x201C;' '' quotedblleft 16 % If you modify this program, changing the
+'&#x201D;' '' quotedblright 17 % version identification would be appreciated.
+'&#x201E;' '' quotedblbase 18
+'&#x00AB;' '' guillemotleft 19
+'&#x00BB;' '' guillemotright 20
+'&#x2013;' '' endash 21
+'&#x2014;' '' emdash 22
+'&#x200C;' '' cwm 23
+'&#x2030;' '' perthousand 24
+'' ''
+'' ''
+'' ''
+'' ''
+'' ''
+'' ''
+'' ''
+' ' '' space 32
+'!' '' exclam 33
+'"' '' quotedbl 34
+'#' '' numbersign 35
+'$' '' dollar 36
+'%' '' percent 37
+'&amp;' '' ampersand 38
+'&#x2019;' '' quoteright 39
+'(' '' parenleft 40
+')' '' parenright 41
+'*' '' asterisk 42
+'+' '' plus 43
+',' '' comma 44
+'-' '' hyphen 45
+'.' '' period 46
+'/' '' slash 47
+vect10 0 47
+htfcss: vect10 font-family: 'TeXvect10', serif;
+
+>>>
+\AddFont{vect10}{unicode/TeXvect10/vect10}{}
+
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-jats.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-jats.tex
index e54de5ad206..16182ba8f5c 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-jats.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-jats.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-jats.tex 1473 2024-02-23 12:26:51Z michal_h21 $
+% $Id: tex4ht-jats.tex 1545 2024-08-13 19:02:54Z michal_h21 $
% compile 3 times: latex tex4ht-jats
% or xhlatex tex4ht-jats "html,3,sections+"
%
@@ -201,6 +201,7 @@ Configurations that are shared only for article and report
|<latex footnotes|>
|<latex quotes|>
|<latex lists|>
+|<latex bibliography|>
>>>
\<shared article,report\><<<
@@ -841,6 +842,29 @@ them separatelly.
{\EndNoFonts\HCode{</term><def>}\HtmlParOn|<list par|>}
>>>
+
+We cannot create a structured bibliographic record for plain LaTeX references, so we
+at least mark individual entries.
+
+Entry id is set on the label element. The id comes from a child xref element that is removed
+by make4ht. Ideally, it should be set on ref, but we need to use label here, to catch
+potential entry number.
+
+
+\<latex bibliography\><<<
+\ConfigureList{thebibliography}%
+ {\ifvmode\IgnorePar\fi \EndP \HCode{<ref-list>}\let\en:bib=\empty}
+ {\en:bib \ifvmode\IgnorePar\fi \EndP \HCode{</ref-list>}}
+ {\en:bib\def\en:bib{\HCode{</mixed-citation></ref>}}%
+ \HCode{<ref><label>}%
+ \Configure{HtmlPar}%
+ {\EndP}%
+ {\EndP}%
+ {} {}%
+ }
+ {\HCode{</label><mixed-citation>}}
+>>>
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\chapter{Packages}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex
index 23ca24a586c..25f324ab7fa 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-mathjax.tex 1474 2024-02-25 16:27:19Z karl $
+% $Id: tex4ht-mathjax.tex 1540 2024-07-28 17:10:17Z michal_h21 $
% compile: latex tex4ht-mathjax
%
% Copyright 2018-2024 TeX Users Group
@@ -37,12 +37,14 @@ in LaTeX kernel now.
\<required packages\><<<
>>>
-The \verb|\alteqtoks| command saves the used command in HTML. It uses detokenize command
-to insert arguments verbatim. The side effect of this is that detokeize inserts space
+The \verb|\alteqtoks| command prints the used LaTeX math code to the output document in
+verbatim.
+
+In the past, we used \verb|\detokenize|. The side effect of this is that detokeize inserts space
after each control sequence. This is completely valid TeX code, but earlier versions of
MathJax didn't like that, rendering resulted in error.
-Fortunatelly, MathJax 3 supports these spaces, so we can remove regular expressions for space handling.
+Fortunatelly, MathJax 3 supports these spaces, so we could remove regular expressions for space handling.
The original code was this:
% % convert \ { to \:{
@@ -52,14 +54,24 @@ The original code was this:
% % replace \\:{ back to \\ { -- this can be introduced by the previous regex
% \regex_replace_all:nnN { \x{5C} \x{5C} \x{3A} \x{7B} } { \x{5C} \x{5C} \x{20} \x{7B} } \l_tmpa_tl
+Now (July 2024), when I researched another issue, I've found that it is actually possible to avoid these
+extra spaces using LaTeX 3 commands. The inspiration comes from
+\Link[https://tex.stackexchange.com/a/44444/2891]this Bruno Le Foch\EndLink.
+One ongoing issue is that newlines are not presented. But they weren't preserved with \verb|\detokenize|
+either, so it shouldn't be a problem.
+
-We still use regula expressions to escape invalid XML characters to entities, so it works only with LaTeX.
+We still use regular expressions to escape invalid XML characters to entities, so it works only with LaTeX.
\<defined commands\><<<
\ExplSyntaxOn
\cs_new_protected:Npn \alteqtoks #1
{
- \tl_set:Ne \l_tmpa_tl {\detokenize{#1}}
+ % save tokens, but preserve spaces
+ % https://tex.stackexchange.com/a/44444/2891
+ \tl_set:Nn \l_tmpa_tl {#1}
+ \regex_replace_all:nnN { . } { \c{string} \0 } \l_tmpa_tl
+ \tl_set:Nx \l_tmpa_tl { \l_tmpa_tl }
% % replace < > and & with xml entities
\regex_replace_all:nnN { \x{26} } { &amp; } \l_tmpa_tl
\regex_replace_all:nnN { \x{3C} } { &lt; } \l_tmpa_tl
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex
index e7f496d6bf0..c8298dfadb7 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-mathml.tex 1495 2024-03-21 16:39:31Z michal_h21 $$
+% $Id: tex4ht-mathml.tex 1543 2024-08-02 20:01:17Z michal_h21 $$
% compile 3 times: latex tex4ht-mathltx
% or xhlatex tex4ht-mathltx "html,3,sections+"
%
@@ -1939,6 +1939,189 @@ primes.
\fi
>>>
+
+We may want to include LaTeX source as an annotation in MathML. In particular LaTeX PDF tagging code can use
+this feature. We will not use it by default, but only with texsource option, as it can potentially
+break some functionality.
+
+The code is based on the LaTeX MathJax code, but heavily modified.
+
+\<configure html-mml latex\><<<
+\:CheckOption{texsource}\if:Option
+
+\newtoks\mmleqtoks
+\ExplSyntaxOn
+\cs_new_protected:Npn \mmlalteqtoks #1
+{
+ % save tokens, but preserve spaces
+ % https://tex.stackexchange.com/a/44444/2891
+ \tl_set:Nn \l_tmpa_tl {#1}
+ \regex_replace_all:nnN { . } { \c{string} \0 } \l_tmpa_tl
+ \tl_set:Nx \l_tmpa_tl { \l_tmpa_tl }
+ % % replace < > and & with xml entities
+ \regex_replace_all:nnN { \x{26} } { &amp; } \l_tmpa_tl
+ \regex_replace_all:nnN { \x{3C} } { &lt; } \l_tmpa_tl
+ \regex_replace_all:nnN { \x{3E} } { &gt; } \l_tmpa_tl
+ % \regex_replace_all:nnN { \n } {\HCode{ \Hnewline }} \l_tmpa_tl
+ % replace \par command with blank lines
+ \regex_replace_all:nnN { \x{5C}par\b } {\x{A}\x{A}} \l_tmpa_tl
+ \tl_set:Nx \mmleqtoks{ \l_tmpa_tl }
+
+ %\HCode{\l_tmpb_tl}
+}
+\ExplSyntaxOff
+
+
+\def\AltMath#1${\mmlalteqtoks{#1}%
+ #1\HCode{</\a:mathml mrow><\a:mathml annotation encoding="application/x-tex">\mmleqtoks</\a:mathml annotation>}$}
+\Configure{$}{\Configure{@math}{display="inline"}\DviMath\HCode{<\a:mathml semantics><\a:mathml mrow>}}{\HCode{</\a:mathml semantics>}\EndDviMath}{\expandafter\AltMath}
+
+\def\AltMathParen#1\){\mmlalteqtoks{#1}%
+ #1\HCode{</\a:mathml mrow><a\a:mathml nnotation encoding="application/x-tex">\mmleqtoks</\a:mathml annotation>}$}
+
+\def\AltMathParen#1\){\mmlalteqtoks{#1}#1\HCode{</\a:mathml mrow><\a:mathml annotation encoding="application/x-tex">\mmleqtoks</\a:mathml annotation>}\)}
+%\Configure{()}{\Configure{@math}{display="inline"}\DviMath\HCode{<\a:mathml semantics><\a:mathml mrow>}\AltMathParen$}{\EndDviMath\HCode{</\a:mathml semantics>}}
+\Configure{()}
+ {\Configure{@math}{%\a:mathml
+ display="inline"
+}\csname a:mathml()\endcsname
+\DviMath\HCode{<\a:mathml semantics><\a:mathml mrow>}$\expandafter\AltMathParen}
+{$\HCode{</\a:mathml semantics>}\EndDviMath\csname b:mathml()\endcsname}
+
+
+\long\def\AltDisplay#1\]{\mmlalteqtoks{#1}#1\HCode{</\a:mathml mrow><\a:mathml annotation encoding="application/x-tex">\mmleqtoks</\a:mathml annotation></\a:mathml semantics>}\]}
+\Configure{[]}{\Configure{@math}{display="block"}\DviMath$$\DisplayMathtrue\HCode{<\a:mathml semantics><\a:mathml mrow>}\AltDisplay}{$$\EndDviMath}
+
+
+% \long\def\MMLAltlDisplayDollars#1$${\mmlalteqtoks{\[#1\]}#1\HCode{</\a:mathml mrow><\a:mathml annotation encoding="application/x-tex">\mmleqtoks</\a:mathml annotation>}$$}
+
+% configuarartion of display math doesn't work yet. need to investigate it.
+% \Configure{$$}
+% {\Configure{@math}{%\a:mathml
+% display="block"
+% }\IgnorePar
+% \ifvmode\else \HCode{<!--tex4ht:inline-->}\fi
+% \EndP\DviMath\HCode{<\a:mathml semantics><\a:mathml mrow>}}
+% {\HCode{</\a:mathml semantics>}\EndDviMath\ShowPar\par{\csname HCondtrue\endcsname\noindent}}
+% {\DisplayMathtrue\expandafter\MMLAltlDisplayDollars}
+
+
+% \renewcommand\eqannotate[1]{\mmlalteqtoks{#1}\HCode{<\a:mathml semantics><\a:mathml mrow>}#1\HCode{</\a:mathml mrow><\a:mathml annotation encoding="application/x-tex">\mmleqtoks</\a:mathml annotation></\a:mathml semantics>}}
+
+
+% environment support
+\newcommand\MMLVerbMathToks[2]{%
+ \mmlalteqtoks{\begin{#2}
+ #1
+ \end{#2}}%
+ \begingroup%
+ \ifvmode\IgnorePar\fi\EndP\Configure{@math}{display="block"}\DviMath\DisplayMathtrue\HCode{<\a:mathml semantics><\a:mathml mrow>}
+ \Configure{$$}{}{}{}
+ \begin{old#2}
+ #1
+ \end{old#2}
+ \HCode{</\a:mathml mrow><\a:mathml annotation encoding="application/x-tex">}
+ \HCode{\mmleqtoks}
+ \HCode{</\a:mathml annotation></\a:mathml semantics>}
+ \EndDviMath
+ \endgroup
+}
+
+% we must handle equations separatelly.
+% it is a bit messy
+\newcommand\MMLVerbMathToksEquation[2]{%
+ \mmlalteqtoks{\begin{#2}
+ #1
+ \end{#2}}%
+ \begingroup%
+ \def\@tempa{#2}%
+ \def\@equationname{equation}%
+ \def\mlabeledtr{mtr}
+ \ifx\@equationname\@tempa%
+ \def\mlabeledtr{mlabeledtr} % this element can be used to print the equation number, but it is supported only by MathJax
+ \fi
+ \ifvmode\IgnorePar\fi\EndP\Configure{@math}{display="block"}\DviMath\DisplayMathtrue\HCode{<\a:mathml semantics><\a:mathml mrow><\a:mathml mtable><\a:mathml \mlabeledtr><\a:mathml mtd>}%
+ \ifx\@equationname\@tempa%
+ \incr@eqnum%
+ \print@eqnum%
+ \HCode{</\a:mathml mtd><\a:mathml mtd>}%
+ \fi
+ #1%
+ \HCode{</\a:mathml mtd></\a:mathml \mlabeledtr></\a:mathml mtable></\a:mathml mrow><\a:mathml annotation encoding="application/x-tex">}%
+ \HCode{\mmleqtoks}%
+ \HCode{</\a:mathml annotation></\a:mathml semantics>}%
+ \EndDviMath%
+ \endgroup%
+}
+
+\ExplSyntaxOn
+\newcommand\MMLVerbMath[1]{%
+ \cs_if_exist:cTF{#1}{
+ \expandafter\let\csname old#1\expandafter\endcsname\csname #1\endcsname
+ \expandafter\let\csname endold#1\expandafter\endcsname\csname end#1\endcsname
+ \RenewDocumentEnvironment{#1}{+!b}{%
+ \NoFonts\expandafter\MMLVerbMathToks\expandafter{##1}{#1}\EndNoFonts%
+ }{}
+ }{}%
+}
+
+\newcommand\MMLVerbEquation[1]{%
+ \cs_if_exist:cTF{#1}{
+ \expandafter\let\csname old#1\expandafter\endcsname\csname #1\endcsname
+ \expandafter\let\csname endold#1\expandafter\endcsname\csname end#1\endcsname
+ \RenewDocumentEnvironment{#1}{+!b}{%
+ \NoFonts\expandafter\MMLVerbMathToksEquation\expandafter{##1}{#1}\EndNoFonts%
+ }{}
+ }{}%
+}
+\ExplSyntaxOff
+
+% \MMLVerbEquation{equation}
+% \MMLVerbEquation{equation*}
+
+\fi
+>>>
+
+\<configure html-mml amsmath\><<<
+\:CheckOption{texsource}\if:Option
+\MMLVerbMath{subarray}
+\MMLVerbMath{smallmatrix}
+\MMLVerbMath{matrix}
+\MMLVerbMath{pmatrix}
+\MMLVerbMath{bmatrix}
+\MMLVerbMath{Bmatrix}
+\MMLVerbMath{vmatrix}
+\MMLVerbMath{Vmatrix}
+\MMLVerbMath{cases}
+\MMLVerbMath{subequations}
+\MMLVerbMath{aligned}
+\MMLVerbMath{alignedat}
+\MMLVerbMath{gathered}
+\MMLVerbMath{gather}
+\MMLVerbMath{gather*}
+\MMLVerbMath{alignat}
+\MMLVerbMath{alignat*}
+\MMLVerbMath{xalignat}
+\MMLVerbMath{xalignat*}
+\MMLVerbMath{xxalignat}
+\MMLVerbMath{align}
+\MMLVerbMath{align*}
+\MMLVerbMath{flalign}
+\MMLVerbMath{flalign*}
+\MMLVerbMath{split}
+\MMLVerbMath{multline}
+\MMLVerbMath{multline*}
+% equations fails with errors, even though it worked in a .cfg
+% I will need to investigate it more
+% \MMLVerbEquation{equation}
+% \MMLVerbEquation{equation*}
+\MMLVerbMath{math}
+\MMLVerbMath{displaymath}
+\MMLVerbMath{eqnarray}
+\MMLVerbMath{eqnarray*}
+\fi
+>>>
+
%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{plain.sty}
%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -5703,6 +5886,25 @@ elements that are printed to support the munderover element easily.
>>>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\section{esvec}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+We need to redefine these commands only for MathML. By default, Esvect produces images, which is OK.
+
+\<configure mathml esvect\><<<
+\def\:tempa#1{%
+ \bgroup\HCode{<\a:mathml mover><\a:mathml mrow>}#1\HCode{</\a:mathml mrow><\a:mathml mo>&rarr;</\a:mathml mo></\a:mathml mover>}\egroup
+}
+
+\HLet\ESV@vecteur\:tempa
+\def\:tempa#1#2{%
+ \ESV@vecteur{{#1}\sb{#2}}
+}
+\HLet\vvstar\:tempa
+
+>>>
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\chapter{Notes}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/expl3.dtx
index 8387c0c44e6..64c65d0ff76 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/expl3.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/expl3.dtx
@@ -24,7 +24,7 @@
%
%<*driver|generic|package|2ekernel>
%</driver|generic|package|2ekernel>
-\def\ExplFileDate{2024-06-19}%
+\def\ExplFileDate{2024-07-20}%
%<*driver>
\documentclass[full]{l3doc}
\usepackage{graphicx}
@@ -51,7 +51,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3basics.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3basics.dtx
index 26265f5625a..ad15d79653e 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3basics.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3basics.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3bitset.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3bitset.dtx
index 0cc8b996e2e..2b62c68b4a0 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3bitset.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3bitset.dtx
@@ -42,7 +42,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3bootstrap.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3bootstrap.dtx
index 1eaab88c971..7f4eba752be 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3bootstrap.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3bootstrap.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3box.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3box.dtx
index 871ed5f2ce2..532ec6a7d8e 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3box.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3box.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -906,9 +906,9 @@
% \begin{syntax}
% \cs{box_set_trim:Nnnnn} \meta{box} \Arg{left} \Arg{bottom} \Arg{right} \Arg{top}
% \end{syntax}
-% Adjusts the bounding box of the \meta{box} \meta{left} is removed from
+% Adjusts the bounding box of the \meta{box}: \meta{left} is removed from
% the left-hand edge of the bounding box, \meta{right} from the right-hand
-% edge and so fourth. All adjustments are \meta{dim exprs}.
+% edge, and so forth. All adjustments are \meta{dim exprs}.
% Material outside of the bounding box is still displayed in the output
% unless \cs{box_set_clipped:N} is subsequently applied.
% The updated \meta{box} is an
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3cctab.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3cctab.dtx
index 3b756ac739a..92f134aa934 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3cctab.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3cctab.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3clist.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3clist.dtx
index 175dba141d0..f8d1eeaea8f 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3clist.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3clist.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3coffins.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3coffins.dtx
index 76ef5c69067..afbd1bd3945 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3coffins.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3coffins.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3color.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3color.dtx
index ca29c87bae2..117a468d218 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3color.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3color.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -103,7 +103,7 @@
% \begin{itemize}
% \item \texttt{Gray} Grayscale color, with a single axis running from
% $0$ (fully black) to $15$ (fully white)
-% \item \texttt{hsb} Hue-saturation-brightness color, with three axes,all
+% \item \texttt{hsb} Hue-saturation-brightness color, with three axes, all
% real values in the range $[0,1]$ for hue saturation and brightness
% \item \texttt{Hsb} Hue-saturation-brightness color, with three axes, integer
% in the range $[0,360]$ for hue, real values in the range $[0,1]$ for
@@ -406,20 +406,20 @@
%
% \begin{function}{\color_export:nnN}
% \begin{syntax}
-% \cs{color_export:nnN} \Arg{color expression} \Arg{format} \Arg{tl}
+% \cs{color_export:nnN} \Arg{color expression} \Arg{format} \meta{tl var}
% \end{syntax}
% Parses the \meta{color expression} as described earlier,
% then converts to the \meta{format} specified and assigns the data to the
-% \meta{tl}.
+% \meta{tl var}.
% \end{function}
%
% \begin{function}{\color_export:nnnN}
% \begin{syntax}
-% \cs{color_export:nnnN} \Arg{model} \Arg{value(s)} \Arg{format} \Arg{tl}
+% \cs{color_export:nnnN} \Arg{model} \Arg{value(s)} \Arg{format} \meta{tl var}
% \end{syntax}
% Expresses the combination of \meta{model} and \meta{value(s)} in an
% internal representation, then converts to the \meta{format} specified and
-% assigns the data to the \meta{tl}.
+% assigns the data to the \meta{tl var}.
% \end{function}
%
% \section{Creating new color models}
@@ -495,7 +495,7 @@
%
% Color profiles are used to ensure color accuracy by linking to collaboration.
% Applying a profile can be used to standardise color which is otherwise
-% device-dependence.
+% device-dependent.
%
% \begin{function}[added = 2021-02-23]{\color_profile_apply:nn}
% \begin{syntax}
@@ -697,14 +697,14 @@
% \begin{macro}{\@@_convert:nnnN, \@@_convert:nVnN, \@@_convert:nnVN}
% \begin{macro}[EXP]
% {
-% \@@_convert_gray_gray:w
-% \@@_convert_gray_rgb:w
-% \@@_convert_gray_cmyk:w
-% \@@_convert_cmyk_gray:w
-% \@@_convert_cmyk_rgb:w
-% \@@_convert_cmyk_cmyk:w
-% \@@_convert_rgb_gray:w
-% \@@_convert_rgb_rgb:w
+% \@@_convert_gray_gray:w,
+% \@@_convert_gray_rgb:w,
+% \@@_convert_gray_cmyk:w,
+% \@@_convert_cmyk_gray:w,
+% \@@_convert_cmyk_rgb:w,
+% \@@_convert_cmyk_cmyk:w,
+% \@@_convert_rgb_gray:w,
+% \@@_convert_rgb_rgb:w,
% \@@_convert_rgb_cmyk:w
% }
% \begin{macro}[EXP]{\@@_convert_rgb_cmyk:nnn}
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3debug.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3debug.dtx
index 777dce794df..4e578ee9b6d 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3debug.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3debug.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -69,7 +69,7 @@
%
% Standard file identification.
% \begin{macrocode}
-\ProvidesExplFile{l3debug.def}{2024-06-19}{}{L3 Debugging support}
+\ProvidesExplFile{l3debug.def}{2024-07-20}{}{L3 Debugging support}
% \end{macrocode}
%
% \begin{variable}{\s_@@_stop}
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3deprecation.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3deprecation.dtx
index 3374bf451fd..697f235311a 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3deprecation.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3deprecation.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -505,10 +505,10 @@
{ \text_uppercase:nn {#1} {#2} }
\__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \text_titlecase_first:n }
\cs_new:Npn \tl_mixed_case:n #1
- { \text_titlecase_first:n {#1} }
+ { \text_titlecase_first:n { \text_lowercase:n {#1} } }
\__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \text_titlecase_first:nn }
\cs_new:Npn \tl_mixed_case:nn #1#2
- { \text_titlecase_first:nn {#1} {#2} }
+ { \text_titlecase_first:nn {#1} { \text_lowercase:n {#2} } }
% \end{macrocode}
% \end{macro}
%
@@ -571,7 +571,7 @@
% \char_lower_case:N, \char_upper_case:N,
% \char_mixed_case:Nn, \char_fold_case:N,
% \char_str_lower_case:N, \char_str_upper_case:N,
-% \char_str_mixed_case:Nn, \char_str_fold_case:N,
+% \char_str_mixed_case:N, \char_str_fold_case:N,
% }
% \begin{macrocode}
\__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \text_lowercase:n }
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3doc.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3doc.dtx
index 65250e78a4b..751d4f4e145 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3doc.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3doc.dtx
@@ -71,7 +71,7 @@ and all files in that bundle must be distributed together.
% This isn't included in the typeset documentation because it's a bit
% ugly:
%<*class>
-\ProvidesExplClass{l3doc}{2024-06-19}{}
+\ProvidesExplClass{l3doc}{2024-07-20}{}
{L3 Experimental documentation class}
%</class>
% \fi
@@ -84,7 +84,7 @@ and all files in that bundle must be distributed together.
% require you to do updates, if the class changes.}}
%
% \author{\Team}
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
% \maketitle
% \tableofcontents
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3docstrip.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3docstrip.dtx
index af953848502..199801ff3b1 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3docstrip.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3docstrip.dtx
@@ -63,7 +63,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3expan.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3expan.dtx
index 09ef3306ac8..499c94587e4 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3expan.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3expan.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3file.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3file.dtx
index 6b1f21c00c3..039c4eecb8e 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3file.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3file.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3flag.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3flag.dtx
index e9733bff57b..690347426f7 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3flag.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3flag.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-assign.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-assign.dtx
index 98b71f34aa3..e1b3bc788b0 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-assign.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-assign.dtx
@@ -42,7 +42,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
% \maketitle
%
% \begin{documentation}
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-aux.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-aux.dtx
index e05cc1e4395..4c39e81f461 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-aux.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-aux.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-basics.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-basics.dtx
index d72a54eace1..a93ff90291b 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-basics.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-basics.dtx
@@ -42,7 +42,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-convert.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-convert.dtx
index 435c4ac38e8..9b5b66f8151 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-convert.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-convert.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-expo.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-expo.dtx
index 83af683de1f..e9dcdf66467 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-expo.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-expo.dtx
@@ -42,7 +42,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-extended.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-extended.dtx
index 5f5bd618f41..24f1e5c1279 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-extended.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-extended.dtx
@@ -42,7 +42,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-functions.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-functions.dtx
index da79f1f5562..2c5eb9602ff 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-functions.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-functions.dtx
@@ -42,7 +42,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-logic.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-logic.dtx
index 96efa4b7572..9d39f4f67e7 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-logic.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-logic.dtx
@@ -42,7 +42,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-parse.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-parse.dtx
index 00244bc2fb7..191ab2755c6 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-parse.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-parse.dtx
@@ -42,7 +42,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-random.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-random.dtx
index 9722b5eea08..dd407047197 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-random.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-random.dtx
@@ -42,7 +42,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-round.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-round.dtx
index 1a407cfcfa8..ad209342152 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-round.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-round.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-symbolic.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-symbolic.dtx
index eb8b3cc212c..8223419f66d 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-symbolic.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-symbolic.dtx
@@ -42,7 +42,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-traps.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-traps.dtx
index 358bbc63826..7f22a2d137f 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-traps.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-traps.dtx
@@ -42,7 +42,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
% \maketitle
%
% \begin{documentation}
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-trig.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-trig.dtx
index 75731af7efe..b7b67c94457 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-trig.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-trig.dtx
@@ -42,7 +42,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-types.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-types.dtx
index e19c8b8fda4..d969f76bdc5 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-types.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp-types.dtx
@@ -42,7 +42,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp.dtx
index 3095b53b7ef..8e37a55799e 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3fp.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3fp.dtx
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -773,7 +773,7 @@
% The result may contain other functions, which are
% then replaced by their results if they have any. For instance,
% \begin{quote}
-% \cs{fp_new_function:n} |{ foo }| \\
+% \cs{fp_new_function:n} |{ npow }| \\
% \cs{fp_set_function:nnn} |{ npow } { a,b } { a**b }| \\
% \cs{fp_show:n} |{ npow(16,0.25) } }|
% \end{quote}
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3fparray.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3fparray.dtx
index 696bf2befac..9592671ae39 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3fparray.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3fparray.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3int.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3int.dtx
index 6dc750369d4..4b0d251cab5 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3int.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3int.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -100,21 +100,6 @@
% restricted-expandable functions can both be used, and \cs{exp_not:n}
% and its variants have no effect while \cs{exp_not:N} may incorrectly
% interrupt the expression.
-% \begin{texnote}
-% Exactly two expansions are needed to evaluate \cs{int_eval:n}.
-% The result is \emph{not} an \meta{internal integer}, and therefore
-% should be terminated by a space if used in \cs{int_value:w} or in
-% a \TeX{}-style integer assignment.
-%
-% As all \TeX{} integers, integer operands can also be:
-% \tn{value}\Arg{\LaTeXe{} counter}; dimension or skip variables,
-% converted to integers in~\texttt{sp}; the character code of some
-% character given as \texttt{`}\meta{char} or
-% \texttt{`\textbackslash}\meta{char}; octal numbers given as
-% \texttt{'} followed by digits from \texttt{0} to \texttt{7}; or
-% hexadecimal numbers given as |"| followed by digits and upper case
-% letters from \texttt{A} to~\texttt{F}.
-% \end{texnote}
%
% \begin{function}[EXP]{\int_eval:n}
% \begin{syntax}
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3intarray.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3intarray.dtx
index 2a8a5240b3d..4be0ca6be64 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3intarray.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3intarray.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3kernel-functions.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3kernel-functions.dtx
index 89abe0ae6c5..5d5758a6afd 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3kernel-functions.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3kernel-functions.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3keys.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3keys.dtx
index 3291f086e25..db580c525cb 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3keys.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3keys.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -649,15 +649,13 @@
% { key } % Name of choice key
% { choice-a , choice-b , choice-c } % Valid choices
% { \exp_not:n {#1} } % Invalid choice given
-% %
-% %
% }
% \end{verbatim}
%
% Multiple choices are created in a very similar manner to mutually-exclusive
% choices, using the properties \texttt{.multichoice:} and
% \texttt{.multichoices:nn}. As with mutually exclusive choices, multiple
-% choices are define as sub-keys. Thus both
+% choices are defined as sub-keys. Thus both
% \begin{verbatim}
% \keys_define:nn { mymodule }
% {
@@ -1926,19 +1924,21 @@
% \end{macro}
%
% \begin{macro}{\@@_define_code:n}
-% \begin{macro}[EXP]{\@@_define_code:TF}
+% \begin{macro}[EXP]{\@@_define_code:nnn}
% \begin{macro}[EXP]{\@@_define_code:w}
% Two possible cases. If there is a value for the key, then just use
% the function. If not, then a check to make sure there is no need for
% a value with the property. If there should be one then complain,
-% otherwise execute it. There is no need to check for a |:| as if it
-% was missing the earlier tests would have failed.
+% otherwise execute it. For a \LaTeXe{} property like |.code| which
+% doesn't contain a |:|, treat it as having arity 1 and pass the
+% (empty) value to it.
% \begin{macrocode}
\cs_new_protected:Npn \@@_define_code:n #1
{
\bool_if:NTF \l_@@_no_value_bool
{
- \@@_define_code:TF
+ \@@_define_code:nnn
+ { \use:c { \c_@@_props_root_str \l_@@_property_str } {#1} }
{ \use:c { \c_@@_props_root_str \l_@@_property_str } }
{
\msg_error:nnee { keys } { property-requires-value }
@@ -1947,7 +1947,7 @@
}
{ \use:c { \c_@@_props_root_str \l_@@_property_str } {#1} }
}
-\cs_new:Npe \@@_define_code:TF
+\cs_new:Npe \@@_define_code:nnn
{
\exp_not:N \exp_after:wN \exp_not:N \@@_define_code:w
\exp_not:N \l_@@_property_str
@@ -1959,7 +1959,15 @@
\cs_new:Npn \exp_not:N \@@_define_code:w
#1 \c_colon_str #2 \c_colon_str #3 \exp_not:N \s_@@_stop
}
- { \tl_if_empty:nTF {#2} }
+ {
+ \tl_if_empty:nTF {#3}
+ { \use_i:nnn }
+ {
+ \tl_if_empty:nTF {#2}
+ { \use_ii:nnn }
+ { \use_iii:nnn }
+ }
+ }
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3legacy.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3legacy.dtx
index 3ff5c60c725..b5ef8968278 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3legacy.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3legacy.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3luatex.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3luatex.dtx
index 3df2c8015a1..aa7724a8ce8 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3luatex.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3luatex.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3msg.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3msg.dtx
index d4ce94ea013..66e7ac82828 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3msg.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3msg.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3names.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3names.dtx
index 12e881781b3..1cb0d132ae4 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3names.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3names.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3pdf.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3pdf.dtx
index aed2fa02e24..34118c371a4 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3pdf.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3pdf.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -70,8 +70,8 @@
% \cs{pdf_object_write:nnn} \Arg{object} \Arg{type} \Arg{content}
% \end{syntax}
% Writes the \meta{content} as content of the \meta{object}. Depending on the
-% \meta{type} declared for the object, the format required for the
-% \meta{data} will vary
+% \meta{type} declared for the object, the format required for
+% \meta{content} will vary:
% \begin{itemize}
% \item[\texttt{array}] A space-separated list of values
% \item[\texttt{dict}] Key--value pairs in the form
@@ -159,7 +159,7 @@
% \cs{pdf_object_unnamed_write:nn} \Arg{type} \Arg{content}
% \end{syntax}
% Writes the \meta{content} as content of an anonymous object. Depending on the
-% \meta{type}, the format required for the \meta{data} will vary
+% \meta{type}, the format required for \meta{content} will vary:
% \begin{itemize}
% \item[\texttt{array}] A space-separated list of values
% \item[\texttt{dict}] Key--value pairs in the form
@@ -251,9 +251,9 @@
%
% \section{Destinations}
%
-% Destinations are the places a link jumped too.
-% Unlike the name may suggest they don't described
-% an exact location in the PDF. Instead a destination contains a reference to
+% Destinations are the places a link jumped to.
+% Unlike the name may suggest, they don't describe
+% an exact location in the PDF. Instead, a destination contains a reference to
% a page along with an instruction how to display this page.
% The normally used \enquote{XYZ \textit{top left zoom}} for example instructs
% the viewer to show the page with the given \textit{zoom} and
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3prg.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3prg.dtx
index 92bcf69e60b..ac6131d6ff1 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3prg.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3prg.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3prop.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3prop.dtx
index 70bd8bcf1cc..fd0d8e167df 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3prop.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3prop.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -181,11 +181,11 @@
% \prop_gset_from_keyval:Nn, \prop_gset_from_keyval:cn,
% }
% \begin{syntax}
-% \cs{prop_set_from_keyval:Nn} \meta{property list}
-% \{
-% \meta{key1} |=| \meta{value1} |,|
-% \meta{key2} |=| \meta{value2} |,| \ldots{}
-% \}
+% \cs{prop_set_from_keyval:Nn} \meta{property list} \\
+% ~~\{ \\
+% ~~~~\meta{key1} |=| \meta{value1} |,| \\
+% ~~~~\meta{key2} |=| \meta{value2} |,| \ldots{} \\
+% ~~\}
% \end{syntax}
% Sets \meta{property list} to contain key--value pairs given in the second
% argument. If duplicate keys appear only the last of the values is kept.
@@ -205,11 +205,11 @@
% \begin{function}[added = 2017-11-28, updated = 2021-11-07]
% {\prop_const_from_keyval:Nn, \prop_const_from_keyval:cn}
% \begin{syntax}
-% \cs{prop_const_from_keyval:Nn} \meta{property list}
-% \{
-% \meta{key1} |=| \meta{value1} |,|
-% \meta{key2} |=| \meta{value2} |,| \ldots{}
-% \}
+% \cs{prop_const_from_keyval:Nn} \meta{property list} \\
+% ~~\{ \\
+% ~~~~\meta{key1} |=| \meta{value1} |,| \\
+% ~~~~\meta{key2} |=| \meta{value2} |,| \ldots{} \\
+% ~~\}
% \end{syntax}
% Creates a new constant \enquote{flat} \meta{property list} or raises
% an error if the
@@ -224,11 +224,11 @@
% \begin{function}[added = 2024-02-12]
% {\prop_const_linked_from_keyval:Nn, \prop_const_linked_from_keyval:cn}
% \begin{syntax}
-% \cs{prop_const_linked_from_keyval:Nn} \meta{prop~var}
-% \{
-% \meta{key1} |=| \meta{value1} |,|
-% \meta{key2} |=| \meta{value2} |,| \ldots{}
-% \}
+% \cs{prop_const_linked_from_keyval:Nn} \meta{prop~var} \\
+% ~~\{ \\
+% ~~~~\meta{key1} |=| \meta{value1} |,| \\
+% ~~~~\meta{key2} |=| \meta{value2} |,| \ldots{} \\
+% ~~\}
% \end{syntax}
% Creates a new constant \enquote{linked} \meta{prop~var} or raises an
% error if the
@@ -347,11 +347,11 @@
% \prop_gput_from_keyval:Nn, \prop_gput_from_keyval:cn,
% }
% \begin{syntax}
-% \cs{prop_put_from_keyval:Nn} \meta{property list}
-% \{
-% \meta{key1} |=| \meta{value1} |,|
-% \meta{key2} |=| \meta{value2} |,| \ldots{}
-% \}
+% \cs{prop_put_from_keyval:Nn} \meta{property list} \\
+% ~~\{ \\
+% ~~~~\meta{key1} |=| \meta{value1} |,| \\
+% ~~~~\meta{key2} |=| \meta{value2} |,| \ldots{} \\
+% ~~\}
% \end{syntax}
% Updates the \meta{property list} by adding entries for each key--value
% pair given in the second argument. The addition is done through
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3quark.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3quark.dtx
index ae2e5b2ace2..ad78a12bd29 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3quark.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3quark.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3regex.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3regex.dtx
index f5557a0bdc6..c3d5de27cbd 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3regex.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3regex.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3seq.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3seq.dtx
index 8771429150b..413e20f8caa 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3seq.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3seq.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3skip.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3skip.dtx
index c53e3c82f0f..9bea4c7b145 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3skip.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3skip.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3sort.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3sort.dtx
index aabf9137451..a86f916d241 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3sort.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3sort.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3str-convert.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3str-convert.dtx
index 579deac4fc2..40618958969 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3str-convert.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3str-convert.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3str.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3str.dtx
index 211769877c3..2be2b105ce4 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3str.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3str.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -757,7 +757,7 @@
% \item Case changing text for typesetting: see the
% \cs[index=text_lowercase:n]{text_lowercase:n(n)},
% \cs[index=text_uppercase:n]{text_uppercase:n(n)} and
-% \cs[index=text_titlecase_all:n]{text_titlecase_(all|once):n(n)} functions which
+% \cs[index=text_titlecase_all:n]{text_titlecase_(all|first):n(n)} functions which
% correctly deal with context-dependence and other factors appropriate
% to text case changing.
% \end{itemize}
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3sys.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3sys.dtx
index 699e3480972..1db09f95505 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3sys.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3sys.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3text-case.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3text-case.dtx
index 915b8e1cd95..134e2508b73 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3text-case.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3text-case.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3text-map.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3text-map.dtx
index b29dbbf0caa..e3586164c5a 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3text-map.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3text-map.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3text-purify.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3text-purify.dtx
index 2fe35a21e71..d22ee1bc3e0 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3text-purify.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3text-purify.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3text.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3text.dtx
index 472fc7d9bc0..9a4c4f244e8 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3text.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3text.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -65,11 +65,11 @@
% \end{syntax}
% Takes user input \meta{text} and expands the content.
% Protected commands (typically
-% formatting) are left in place, and no processing takes place of
+% formatting) are left in place, and no processing of
% math mode material (as delimited by pairs given in
% \cs{l_text_math_delims_tl} or as the argument to commands listed
-% in \cs{l_text_math_arg_tl}). Commands which are neither engine-
-% nor \LaTeX{} protected are expanded exhaustively.
+% in \cs{l_text_math_arg_tl}) takes place. Commands which are neither engine-
+% nor \LaTeX{}-protected are expanded exhaustively.
% Any commands listed in \cs{l_text_expand_exclude_tl} are excluded from
% expansion, as are those in \cs{l_text_case_exclude_arg_tl} and
% \cs{l_text_math_arg_tl}.
@@ -114,8 +114,8 @@
% \end{function}
%
% Upper- and lowercase have the obvious meanings. Titlecasing may be regarded
-% informally as converting the first character of the \meta{tokens} to
-% uppercase. However, the process is more complex
+% informally as converting the first \emph{non-space} character of the
+% \meta{tokens} to uppercase. However, the process is more complex
% than this as there are some situations where a single lowercase character
% maps to a special form, for example \texttt{ij} in Dutch which becomes
% \texttt{IJ}. There are two functions available for titlecasing: one which
@@ -214,8 +214,8 @@
% \text_declare_uppercase_mapping:nnn
% }
% \begin{syntax}
-% \cs{text_declare_lowercase_mapping:nn} \Arg{codeppoint} \Arg{replacement}
-% \cs{text_declare_lowercase_mapping:nnn} \Arg{BCP-47} \Arg{codeppoint} \Arg{replacement}
+% \cs{text_declare_lowercase_mapping:nn} \Arg{codepoint} \Arg{replacement}
+% \cs{text_declare_lowercase_mapping:nnn} \Arg{BCP-47} \Arg{codepoint} \Arg{replacement}
% \end{syntax}
% Declares that the \meta{replacement} tokens should be used when case mapping
% the \meta{codepoint}, rather than the standard mapping given in the
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3tl-analysis.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3tl-analysis.dtx
index 53a8842b6f7..600da3985db 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3tl-analysis.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3tl-analysis.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3tl-build.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3tl-build.dtx
index abd6f971935..e484c5b1c59 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3tl-build.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3tl-build.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3tl.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3tl.dtx
index da498dcf9cc..84f2c367986 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3tl.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3tl.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3token.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3token.dtx
index 34387ca6b0a..c028310326b 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3token.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3token.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex-dev/l3kernel/l3unicode.dtx b/Master/texmf-dist/source/latex-dev/l3kernel/l3unicode.dtx
index 5ca6ffbf41d..532eb315d35 100644
--- a/Master/texmf-dist/source/latex-dev/l3kernel/l3unicode.dtx
+++ b/Master/texmf-dist/source/latex-dev/l3kernel/l3unicode.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-06-19}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/bib2qr/bib2qr.dtx b/Master/texmf-dist/source/latex/bib2qr/bib2qr.dtx
new file mode 100644
index 00000000000..980c2002c22
--- /dev/null
+++ b/Master/texmf-dist/source/latex/bib2qr/bib2qr.dtx
@@ -0,0 +1,594 @@
+% \iffalse meta-comment
+%
+% Copyright (C) 2024 Christian Schreinemachers
+%
+% 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
+%
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2008-05-04 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The current maintainer of this work is Christian Schreinemachers.
+%
+% This work consists of the files
+% README.md
+% bib2qr.dtx
+% bib2qr.ins
+% and the derived files
+% bib2qr.sty
+% bib2qr.pdf
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% \fi
+% \iffalse
+%<package>\NeedsTeXFormat{LaTeX2e}
+%<package>\ProvidesPackage{bib2qr}
+%<package> [2024-07-31 v0.2 Cite BibTeX entries with QR codes]
+%
+%<*driver>
+\documentclass[a4paper]{ltxdoc}
+\usepackage[T1]{fontenc}
+\usepackage[toc]{multitoc}
+\usepackage{geometry}
+\usepackage{fancyvrb}
+% Declare example reference entries
+\begin{filecontents}[overwrite]{example-references.bib}
+ @software{bib2qr,
+ author = {Schreinemachers, Christian},
+ title = {bib2qr - A LaTeX package for citing BibTeX entries with QR codes},
+ url = {https://codeberg.org/Cs137/bib2qr/releases/tag/v0.2},
+ version = {v0.2},
+ date = {2024-07-31}
+ }
+ @article{Doe2024,
+ author = {Doe, Jane},
+ title = {A comprehensive study on example generation},
+ journal = {Journal of Examples},
+ year = {2024},
+ volume = {42},
+ pages = {1982--2024},
+ doi = {10.1234/example.2024.001}
+ }
+ @article{Mustermann2023,
+ author = {Mustermann, Erika},
+ title = {Limitations in including electronic references in articles},
+ journal = {Journal of Examples},
+ year = {2023},
+ volume = {23},
+ pages = {624--666}
+ }
+\end{filecontents}
+\usepackage[style=authoryear,sorting=none]{biblatex}
+\addbibresource{example-references.bib}
+\usepackage[%
+ pdfusetitle,%
+ hyperindex=false,%
+ pdfsubject={LaTeX package documentation},%
+ pdfkeywords={bib2qr, biblatex, latex, qrcode, documentation}%
+]{hyperref}
+\usepackage{scrextend}
+\usepackage{cleveref}
+\usepackage[qrwidth=1.25cm]{bib2qr}
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+\DoNotIndex{\begin,\DeclareBibliographyDriver,\DeclareCiteCommand,\DeclareFieldFormat,
+ \DeclareKeys,\dimexpr,\edef,\end,\equal,\fullcite,\hspace,\IfBeginWith,
+ \ifboolexpr,\iffieldundef,\ifthenelse,\linewidth,\multicitedelim,
+ \NewDocumentCommand,\newcommand,\noindent,\par,\parindent,\printfield,
+ \ProcessKeyOptions,\qrcode,\RequirePackage,\relax,\SetKeys,\space,
+ \thefield,\usebibmacro,\usedriver}
+\setcounter{IndexColumns}{2}
+\setlength{\IndexMin}{40ex}
+\setlength{\columnseprule}{.4pt}
+\addtolength{\oddsidemargin}{2cm}
+\addtolength{\textwidth}{-2cm}
+\begin{document}
+ \DocInput{bib2qr.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \pagestyle{headings}
+%
+% \newcommand*{\package}[1]{\textsf{#1}}
+% \newcommand*{\ctanpkg}[1]{\href{https://ctan.org/pkg/#1}{\package{#1}}}
+% \newcommand*{\opt}[1]{\texttt{#1}}
+% \newcommand*{\default}[1]{(default: \opt{#1})}
+%
+%
+% ^^A -----------------------------
+%
+% \changes{v0.2}{2024-07-31}{%
+% Initial release,
+% convert into dtx,
+% add documentation,
+% rename internal macros,
+% add \opt{qrdelimiter} option
+% }
+% \changes{v0.1}{2024/06/16}{Initial version}
+%
+% \GetFileInfo{bib2qr.sty}
+%
+%
+% ^^A -----------------------------
+%
+% \title{The \package{bib2qr} package}
+% \author{Christian Schreinemachers}
+% \date{%
+% Released \filedate\thanks{%
+% \package{bib2qr}~\fileversion
+% ~(\href{https://codeberg.org/Cs137/bib2qr/releases/tag/\fileversion}{source code})}%
+% }
+% \maketitle
+%
+%
+% ^^A -----------------------------
+%
+% \begingroup
+% \hypersetup{
+% linkcolor=.,
+% citecolor=.,
+% urlcolor=.,
+% }
+% \begin{abstract}
+% The \package{bib2qr} package provides functionality to cite BibTeX entries
+% with QR codes for easy sharing and referencing. The target of the QR code
+% is the entry's digital object identifier (DOI), or URL if no DOI exists.
+% It is realised in the \cs{qrcite} macro, via the \LaTeX{} packages
+% \package{biblatex} and \package{qrcode}. In addition to the \cs{qrcite}
+% command, the package contains the \cs{qrfullcite} macro, which requires
+% only a BibTeX key as argument and allows to generate output that might
+% look as follows:\\
+% \textcolor{red}{\qrfullcite[noindent]{bib2qr}}
+% \end{abstract}
+% \endgroup
+%
+%
+% ^^A -----------------------------
+%
+% \tableofcontents
+%
+%
+% ^^A -----------------------------
+%
+% \section{Introduction}
+% ^^A
+% I like to include \href{https://en.wikipedia.org/wiki/QR_code}{quick-response (QR) codes}
+% of references on slides created with \LaTeX{} \ctanpkg{beamer}. Previously,
+% I did this by using the \ctanpkg{qrcode} package and manually declaring the
+% URL of the reference's digital object identifier (DOI). Occasionally, I also
+% add human-readable information generated via \cs{fullcite} from the
+% \ctanpkg{biblatex} package.
+%
+% To avoid manually declaring the URL and calling two separate commands for QR
+% codes and human-readable citations, I developed this \LaTeX{} package. It
+% automates the inclusion of QR codes by a \package{biblatex} bibliography
+% driver\footnote{%
+% \href{http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/biblatex.pdf\#page=166}
+% {\package{biblatex} documentation p.\,166 (v3.20)}%
+% },
+% which uses field formats to display QR codes for the entry's \opt{doi}
+% and \opt{url} fields with the \package{qrcode} package. You can cite any
+% reference from your bibliography with this driver by declaring its \meta{key}
+% to the \cs{qrcite} command. The latter is a cite command\footnote{%
+% \href{http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/biblatex.pdf\#page=186}%
+% {\package{biblatex} documentation p.\,186 (v3.20)}%
+% \label{biblatexCiteCommand}%
+% },
+% which ensures that any referenced QR code is also listed in the reference list.
+%
+% For the inclusion of both, QR codes and human-readable citation information
+% in a single step, I introduced the \cs{qrfullcite} command. It applies the
+% \cs{qrcite} command and the \cs{fullcite} command from the \package{biblatex}
+% package, ensuring clarity and ease of reference not only on \package{beamer}
+% slides, but in any \LaTeX{} document.
+%
+%
+% ^^A -----------------------------
+%
+% \section{Usage}
+% ^^A
+% Load the package in your document's preamble and specify any of the
+% options described in the next subsection as follows:
+%
+% \begin{quote}
+% \cs{usepackage}\oarg{option(s)}\{bib2qr\}
+% \end{quote}
+%
+%
+% ^^A -----------------------------
+%
+% \subsection{Options}
+% ^^A
+% In order to change the default behaviour of this package, declare one
+% or more of the options described in this subsection with your desired
+% value.
+%
+% \begin{description}
+%
+% \item[\opt{doiurlbase=\meta{string}}] \default{https://doi.org/}
+% specifies the prefix to convert a DOI string into its URL. If the DOI
+% string starts with \meta{doiurlbase}, it is used as is to generate a
+% QR code. Otherwise, the DOI string is appended to \meta{doiurlbase} to
+% form the DOI's URL, which is then used to generate the QR code.
+% In normal use cases this option does not require any adjustment.
+%
+% \item[\opt{qrdelimiter=\meta{sepcode}}] \default{\cs{space}}
+% specifies the delimiter of QR codes generated by \cs{qrcite} in multicite
+% mode. It is shown between the individual QR codes of multiple references
+% created by \cs{qrcite}\marg{key1,key2,\dots keyN} and \emph{``\dots is
+% arbitrary code to be executed after each iteration...''}\,\footref{biblatexCiteCommand}.
+% The examples shown in this document were generated considering the
+% default \opt{qrdelimiter}.
+%
+% \item[\opt{qrversion=\meta{version specification}}] \default{0}
+% sets the version of the QR code. Consult the \package{qrcode} documentation
+% for details about the \meta{version specification}\footnote{%
+% \href{http://mirrors.ctan.org/macros/latex/contrib/qrcode/qrcode.pdf\#page=3}
+% {\package{qrcode} documentation p.\,3 (v1.51)}%
+% }.
+% The examples shown in this document were generated considering the
+% default \opt{qrversion}.
+%
+% \item[\opt{qrwidth=\meta{dimen}}] \default{2cm}
+% sets the width of the QR code. The value is used to determine the
+% width for the output of the \cs{fullcite} macro and is passed to
+% \package{qrcode} as \opt{height} option. The default value is quite
+% suitable for usage in \LaTeX{} \package{beamer} slides, but in such
+% documents as this one, a smaller width might be desired. The examples
+% shown in this document were generated using \opt{qrwidth=1.25cm}.
+%
+% \end{description}
+%
+%
+% ^^A -----------------------------
+%
+% \subsection{Macros}
+% ^^A
+% \subsubsection*{\cs{qrcite}\marg{key(s)}}
+%
+% \DescribeMacro{\qrcite}
+% QR code(s) with a link to the reference's DOI or URL can be generated
+% using the \cs{qrcite} command. The target of the QR code is the entry's
+% DOI converted into a URL, or the URL iteself. In case the BibTeX entry has
+% no DOI and no URL, it does nothing besides raising a warning.
+% ^^A
+% The output for some example entries is shown underneath. If you
+% would like to replicate the examples, you can find the entries
+% sources as \cref{ssec:example_bib}. The colours are defined in the
+% examples, as this functionality is out of scope of the package
+% \package{bib2qr}. Moreover, \package{hyperlink} is configured in such
+% a way that the links in the following examples consider the font colour,
+% usually links would be presented in the colour defined as \opt{linkcolor}.
+%
+% The example displayed in blue was created via \textcolor{blue}{%
+% \cs{qrcite\{bib2qr\}}}. The QR code in red next to it was generated
+% via \textcolor{red}{\cs{qrcite\{Doe2024\}}}. The entry of the latter has a
+% DOI, while the entry of the blue example represents a BibTeX entry without
+% a DOI, but there is a value assigned to its URL field.
+% ^^A
+% The macro \cs{qrcite} is a cite command, thus it can be used to cite multiple
+% references, as shown in black (\cs{qrcite\{bib2qr,Doe2024\}}), and entries
+% cited via \cs{qrcite} are included in the document's bibliography
+% (cf. \cref{ssec:example_ref}).
+%
+% \begingroup
+% \hypersetup{
+% linkcolor=.,
+% citecolor=.,
+% urlcolor=.,
+% }
+%
+% \par\smallskip%
+% \noindent%
+% \textcolor{blue}{\qrcite{bib2qr}}
+% \textcolor{red}{\qrcite{Doe2024}}
+% \qrcite{bib2qr,Doe2024}
+% \par\medskip%
+%
+% \subsubsection*{\cs{qrfullcite}\marg{key}}
+%
+% \DescribeMacro{\qrfullcite}
+% This command displays the QR code of a BibTeX entry's DOI link or URL and
+% a full citation. The QR code is generated by \cs{qrcite} and the full
+% citation by \cs{fullcite}, provided by the package \package{biblatex}.
+% Each output is presented in individual minipages which are placed next to
+% each other, as shown in the examples underneath
+% (\textcolor{blue}{\cs{qrfullcite\{bib2qr\}}},
+% \textcolor{red}{\cs{qrfullcite[noindent]\{Doe2024\}}}).
+%
+% Please note that \cs{qrfullcite} does \textbf{not} support group
+% citations and accepts only a single \meta{key} as argument.
+%
+% \textcolor{blue}{\qrfullcite{bib2qr}}%
+% \medskip%
+% \textcolor{red}{\qrfullcite[noindent]{Doe2024}}%
+% \medskip%
+% \endgroup
+%
+% The output of \cs{qrfullcite} is considered as its own paragraph, thus it
+% may be indented, like in this document (see blue example). You can prevent
+% the latter by providing the \opt{noindent} option when calling the macro,
+% as done in the red example.
+%
+% The first minipage has the width of the package option \opt{qrwidth}
+% and displays the output of \cs{qrcite}\marg{key}. The second minipage
+% occupies the remaining width of \cs{linewidth} considering a gap of
+% \opt{0.5em} and \cs{parindent}, if the latter is not deactivated via the
+% \opt{noindent} option. It shows the output of \cs{fullcite}\marg{key}.
+%
+%
+% ^^A -----------------------------
+%
+% \subsection{Hints}
+% ^^A
+% If the \package{hyperref} package is loaded, not only the DOI/URL strings,
+% but also the QR codes are presented as links. It was modified in this
+% document to allow you to distinguish the output of the individual macro calls
+% in a better way. The previous example without any modifications of the
+% document settings and without deactivating the indentation looks as follows:\\
+%
+% \qrfullcite{Doe2024}%
+%
+%
+% ^^A -----------------------------
+%
+% \subsection{Known limitations}
+% ^^A
+% In case no QR code can be generated by \cs{qrcite} called via \cs{qrfullcite},
+% the output of \cs{fullcite} is nevertheless indented by the width assigned to
+% the \opt{qrwidth} package option and the length of the gap of \opt{0.5em}),
+% as shown in orange below (\textcolor{orange}{\cs{qrcite\{Mustermann2023\}}}).
+%
+% \textcolor{orange}{\qrfullcite{Mustermann2023}}%
+%
+%
+% ^^A -----------------------------
+%
+% \MaybeStop{
+%
+% \IndexPrologue{%
+% \section{Index}
+% Numbers written in italic refer to the page where the corresponding entry
+% is described; numbers underlined refer to the code line of the definition;
+% numbers in roman refer to the code lines where the entry is used.
+% }
+% \PrintIndex
+%
+% \GlossaryPrologue{%
+% \section{Change History}
+% The changes listed in this section aim to provide a brief overview of the
+% changes introduced into the package \package{bib2qr}. The
+% \href{https://codeberg.org/Cs137/bib2qr/}{package repository on Codeberg}
+% contains a
+% \href{https://codeberg.org/Cs137/bib2qr/src/branch/main/CHANGELOG.md}{changelog file},
+% consult it to read a detailed description of the changes introduced into
+% this package.
+% }
+% \PrintChanges
+%
+% ^^A -----------------------------
+%
+% \newpage
+% \appendix
+%
+% \section{Appendix}
+%
+% The examples presented in this document are based on the
+% BibTeX entries listed in \ref{ssec:example_bib} and result
+% in the bibliography shown as \ref{ssec:example_ref} (\package{biblatex}
+% options: \opt{style=authoryear}, \opt{sorting=none}).
+%
+% \subsection{Example BibTeX entries}
+% \label{ssec:example_bib}
+% \small{%
+% \VerbatimInput[firstline=5]{example-references.bib}
+% }
+%
+% \subsection{Example bibliography}
+% \label{ssec:example_ref}
+% \printbibliography[heading=none]
+%
+% }
+%
+%
+% ^^A -----------------------------
+%
+% \section{Implementation}
+% ^^A
+%
+% \subsection{Dependencies}
+% ^^A
+% In order to use \package{bib2qr}, the \LaTeX{} packages
+% \ctanpkg{biblatex},
+% \ctanpkg{ifthen},
+% \ctanpkg{qrcode}, and
+% \ctanpkg{xstring}
+% are required as package dependencies.
+% \iffalse
+%<*package>
+% \fi
+% \begin{macrocode}
+\RequirePackage{biblatex}
+\RequirePackage{ifthen}
+\RequirePackage{qrcode}
+\RequirePackage{xstring}
+% \end{macrocode}
+%
+%
+% \subsection{Options}
+% ^^A
+% The package options are internally available as \cs{@bibiiqr@}\meta{option}.
+% \begin{macrocode}
+\DeclareKeys[@bibiiqr]{
+ doiurlbase.store = \@bibiiqr@doiurlbase,
+ doiurlbase.usage = load,
+ qrdelimiter.store = \@bibiiqr@qrdelimiter,
+ qrdelimiter.usage = load,
+ qrversion.store = \@bibiiqr@qrversion,
+ qrversion.usage = load,
+ qrwidth.store = \@bibiiqr@qrwidth,
+ qrwidth.usage = load,
+}%
+% \end{macrocode}
+%
+% \subsubsection*{Assignement of default values}
+% \begin{macrocode}
+\SetKeys[@bibiiqr]{
+ doiurlbase=https://doi.org/,
+ qrdelimiter=\space,
+ qrversion=0,
+ qrwidth=2cm,
+}%
+% \end{macrocode}
+%
+% \subsubsection*{Processing of package options}
+% \begin{macrocode}
+\ProcessKeyOptions[@bibiiqr]\relax
+% \end{macrocode}
+%
+% \subsection{Macros}
+%
+% \begin{macro}{\@bibiiqr@showqr}
+% \marg{string}\\
+% Display a string as QR code considering the package options \opt{qrversion}
+% and \opt{qrwidth}.
+% \begin{macrocode}
+\newcommand\@bibiiqr@showqr[1]{%
+ \qrcode[height=\@bibiiqr@qrwidth,version=\@bibiiqr@qrversion]{#1}%
+}%
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \subsubsection{Field formats}
+%
+% Custom field formats are defined to display a QR code of an entry's
+% \texttt{doi} and \texttt{url}.
+%
+% \begin{macro}{@bibiiqr@fldFmtDoi}
+% Field format to display a DOI field's value (converted into an URL
+% considering the option \opt{@bibiiqr@doiurlbase}) as QR code using
+% macro \cs{@bibiiqr@showqr}.
+% \begin{macrocode}
+\DeclareFieldFormat{@bibiiqr@fldFmtDoi}{%
+ \IfBeginWith{#1}{\@bibiiqr@doiurlbase}%
+ {\@bibiiqr@showqr{#1}}%
+ {\@bibiiqr@showqr{\@bibiiqr@doiurlbase#1}}%
+}%
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{@bibiiqr@fldFmtUrl}
+% Field format to display an URL field's value as QR code using \cs{@bibiiqr@showqr}.
+% \begin{macrocode}
+\DeclareFieldFormat{@bibiiqr@fldFmtUrl}{\@bibiiqr@showqr{#1}}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \subsubsection{Bibliography driver}
+%
+% \begin{macro}{@bibiiqr@bibDrvQR}
+% This bibliography driver
+% allows to display the QR code of an entry's DOI-, or URL field.
+% It applies the \cs{printfield}\oarg{format}\marg{field} macro, which is
+% provided by the \package{biblatex} package to displpay a QR code using the
+% \texttt{@bibiiqr@fldFmtDoi} or \texttt{@bibiiqr@fldFmtUrl} field format and
+% the corresponding field, respectively.
+%
+% The DOI is preferred and the URL is only used if no value is assigned to
+% the DOI field. If neither the DOI, nor the URL field contains a value, a
+% package warning is raised.
+%
+% \begin{macrocode}
+\DeclareBibliographyDriver{@bibiiqr@bibDrvQR}{%
+ \usebibmacro{begentry}%
+ \ifboolexpr{test{\iffieldundef{doi}}}
+ {%
+ \ifboolexpr{test{\iffieldundef{url}}}%
+% \end{macrocode}
+% The entry has no DOI and no URL: Raise a warning.
+% \begin{macrocode}
+ {%
+ \PackageWarning{bib2qr}%
+ {BibTeX entry without DOI or URL: \thefield{entrykey}}{}%
+ }%
+% \end{macrocode}
+% The entry has no DOI but an URL: Display the \texttt{url} field's
+% value using the \texttt{@bibiiqr@fldFmtUrl} field format.
+% \begin{macrocode}
+ {\printfield[@bibiiqr@fldFmtUrl]{url}}%
+ }%
+% \end{macrocode}
+% The entry has a DOI: Display the \texttt{doi} field's value using
+% the \texttt{@bibiiqr@fldFmtDoi} field format.
+% \begin{macrocode}
+ {\printfield[@bibiiqr@fldFmtDoi]{doi}}%
+ \usebibmacro{finentry}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \subsubsection{Author commands}
+%
+% \begin{macro}{\qrcite}
+% \marg{key(s)}\\
+% Display the QR code of a BibTeX entry's DOI link or URL by introducing the
+% cite command \cs{qrcite}\marg{key}, which makes use of the previously
+% defined bibliography driver \texttt{@bibiiqr@bibDrvQR}. It requires at least
+% one BibTeX \marg{key} as argument.
+% \begin{macrocode}
+\DeclareCiteCommand{\qrcite}
+ {\usebibmacro{prenote}}%
+ {\usedriver{}{@bibiiqr@bibDrvQR}}%
+ {\@bibiiqr@qrdelimiter}%
+ {\usebibmacro{postnote}}%
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\qrfullcite}
+% \changes{v0.2}{2024-07-31}{Add \opt{noindent} option}
+% \oarg{option(s)}\marg{key}\\
+% Display the QR code of a singe BibTeX entry's DOI link or URL and a full
+% citation of it. Specify \opt{noindent} as option, if the output should not
+% be indented.
+% \begin{macrocode}
+\NewDocumentCommand{\qrfullcite}{O{}m}{%
+ \par%
+ \ifthenelse{\equal{#1}{noindent}}{%
+ \noindent%
+ \edef\@bibiiqr@mpiiwidth{\dimexpr\linewidth-\@bibiiqr@qrwidth-0.5em}%
+ }{%
+ \edef\@bibiiqr@mpiiwidth{%
+ \dimexpr\linewidth-\parindent-\@bibiiqr@qrwidth-0.5em}%
+ }%
+ \begin{minipage}[t]{\@bibiiqr@qrwidth}
+ \qrcite{#2}%
+ \end{minipage}
+ \hspace{0.5em}%
+ \begin{minipage}{\@bibiiqr@mpiiwidth}
+ \fullcite{#2}%
+ \end{minipage}
+ \par%
+}%
+% \end{macrocode}
+% \end{macro}
+%
+% \iffalse
+%</package>
+% \fi
+%
+%
+% ^^A -----------------------------
+%
+% \Finale
+
diff --git a/Master/texmf-dist/source/latex/bib2qr/bib2qr.ins b/Master/texmf-dist/source/latex/bib2qr/bib2qr.ins
new file mode 100644
index 00000000000..7894fdb8e38
--- /dev/null
+++ b/Master/texmf-dist/source/latex/bib2qr/bib2qr.ins
@@ -0,0 +1,85 @@
+%%
+%% Copyright (C) 2024 Christian Schreinemachers
+%%
+%% 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
+%%
+%% and version 1.3c or later is part of all distributions of
+%% LaTeX version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The current maintainer of this work is Christian Schreinemachers.
+%%
+%% This work consists of the files
+%% README.md
+%% bib2qr.dtx
+%% bib2qr.ins
+%% and the derived files
+%% bib2qr.sty
+%% bib2qr.pdf
+%%
+This work has the LPPL maintenance status `maintained'.
+
+The current maintainer of this work is Christian Schreinemachers.
+
+This work consists of the files
+ README.md
+ bib2qr.dtx
+ bib2qr.ins
+and the derived files
+ bib2qr.sty
+ bib2qr.pdf
+\input docstrip.tex
+\keepsilent
+
+\preamble
+
+Copyright (C) 2024 Christian Schreinemachers
+
+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
+
+and version 1.3c or later is part of all distributions of LaTeX
+version 2008-05-04 or later.
+
+This work has the LPPL maintenance status `maintained'.
+
+The current maintainer of this work is
+ Christian Schreinemachers.
+
+This work consists of the files
+ bib2qr.dtx
+ bib2qr.ins
+and the derived files
+ bib2qr.sty
+ bib2qr.pdf
+
+\endpreamble
+\askforoverwritefalse
+\generate{\file{bib2qr.sty}{\from{bib2qr.dtx}{package}}}
+
+\obeyspaces
+\Msg{****************************************************}
+\Msg{* To finish the installation you have to move the *}
+\Msg{* following file into a directory searched by TeX: *}
+\Msg{* *}
+\Msg{* bib2qr.sty *}
+\Msg{* *}
+\Msg{* To produce the documentation run the file *}
+\Msg{* bib2qr.dtx through LaTeX. *}
+\Msg{* *}
+\Msg{* Happy TeXing! *}
+\Msg{****************************************************}
+\endbatchfile
+%%
+%% End of file `bib2qr.ins'.
+
diff --git a/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx b/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
index d8708af2d9f..9b4b59c73d2 100644
--- a/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
+++ b/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
@@ -56,7 +56,8 @@
%<*driver>
\ProvidesFile{bxjscls.dtx}
%</driver>
- [2024/01/22 v2.9b BXJS document classes]
+ [2024/07/19 v2.9c BXJS document classes]
+% [2024/01/22 v2.9b BXJS document classes]
% [2023/08/02 v2.9a BXJS document classes]
% [2023/07/17 v2.9 BXJS document classes]
% [2023/07/01 v2.8b BXJS document classes]
@@ -5515,6 +5516,20 @@
%
% \section{文書ã®ãƒžãƒ¼ã‚¯ã‚¢ãƒƒãƒ—}
%
+% \begin{ZRnote}
+% \begin{macro}{\bxjs@phantomsection}
+% |hyperref| ãŒèª­ã¿è¾¼ã¾ã‚Œã¦ã„ã‚‹å ´åˆã« |\phantomsection| を実行ã™ã‚‹ã€‚
+% \begin{macrocode}
+\let\bxjs@phantomsection\relax
+\g@addto@macro\bxjs@begin@document@hook{%
+ \@ifpackageloaded{hyperref}{%
+ \let\bxjs@phantomsection\phantomsection
+ }{}%
+}
+% \end{macrocode}
+% \end{macro}
+% \end{ZRnote}
+%
% \subsection{表題}
%
% \begin{macro}{\title}
@@ -8288,8 +8303,15 @@
\fi
\columnseprule.4pt \columnsep 2\jsZw
\ifx\multicols\@undefined
-%<book|report> \twocolumn[\@makeschapterhead{\indexname}%
-%<book|report> \addcontentsline{toc}{chapter}{\indexname}]%
+% \end{macrocode}
+% \begin{ZRnote}
+% |hyperref| 使用時ã«ç´¢å¼•ã¸ã®ãƒªãƒ³ã‚¯ãŒæ­£å¸¸ã«ä½œã‚‰ã‚Œã‚‹ã‚ˆã†ã«ã€
+% |hyperref| ã®èª¬æ˜Žæ›¸ã®è§£èª¬ã«å¾“ã£ã¦ |\phantomsection| ã‚’é…ç½®ã—ãŸã€‚
+% \end{ZRnote}
+% \begin{macrocode}
+%<book|report> \twocolumn[\bxjs@phantomsection
+%<book|report> \addcontentsline{toc}{chapter}{\indexname}%
+%<book|report> \@makeschapterhead{\indexname}]%
%<!book&!report> \def\presectionname{}\def\postsectionname{}%
%<!book&!report> \twocolumn[\section*{\indexname}]%
\else
@@ -10847,6 +10869,56 @@
% \end{macrocode}
% \end{macro}
%
+% \paragraph{bmパッケージ対策}
+%
+% |\reDeclareMathAlphabet| ã‚’é©ç”¨ã—ãŸæ•°å¼è‹±å­—フォント命令ã¯
+% 通常ã®å ´åˆã¨ã¯å®šç¾©æ–‡ã®å½¢ãŒç•°ãªã‚‹ã€‚
+% ã“ã®ãŸã‚ |bm| パッケージを利用ã—㦠|\bm{\mathrm{A}}| ã‚’
+% 実行ã™ã‚‹ã¨ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã™ã‚‹ã€‚
+% ã“れを回é¿ã™ã‚‹ãŸã‚ã€
+% 「|\bm| ã®å¼•æ•°ä¸­ã§ã¯æ•°å¼è‹±å­—フォントã®å’Œæ–‡é€£å‹•ã‚’無効ã«ã™ã‚‹ã€
+% ã“ã¨ã«ã™ã‚‹ã€‚
+%
+% |\reDeclareMathAlphabet| ã®é©ç”¨ã«ã‚ˆã‚Šä¾‹ãˆã° |\mathrm| ã¯
+% 以下ã®ã‚ˆã†ã«å¤‰æ›´ã•ã‚Œã‚‹ã€‚
+% \begin{itemize}
+% \item é©ç”¨å‰ã¯ |\mathrm| ã®ä¸€å›žå±•é–‹ã¯ %
+% |\protect\|[|mathrm|\verb*| |] ã§ã‚る。
+% \item é©ç”¨å¾Œã¯ |\mathrm| ã®ä¸€å›žå±•é–‹ãŒ %
+% |\protect\|[|mathrm|\verb*| |] ã«ãªã‚‹ã€‚
+% \item |\|[|mathrm|\verb*| |] ã®ä¸€å›žå±•é–‹ã¯ä»¥ä¸‹ã®ã‚ˆã†ã«ãªã‚‹ã€‚\\
+% |\DualLang@mathalph@bet{\RDMAorg@mathrm}{\RDMAorg@mathmc}|
+% \item |\RDMAorg@mathrm| ã®ä¸€å›žå±•é–‹ã¯ |\|[|mathrm|\verb*| |] ã«ãªã‚‹ã€‚
+% \end{itemize}
+%
+% \begin{macro}{\bxjs@patch@RDMA@for@bm}
+% |\reDeclareMathAlphabet| ã®æ©Ÿèƒ½ã«å¯¾ã—㦠|bm| パッケージ対策ã®
+% パッãƒã‚’当ã¦ã‚‹ã€‚
+% \begin{macrocode}
+\@onlypreamble\bxjs@patch@RDMA@for@bm
+\def\bxjs@patch@RDMA@for@bm{%
+% \end{macrocode}
+% 実際ã«æ”¹å¤‰ã™ã‚‹ã®ã¯ |\DualLang@mathalph@bet| ã§ã‚る。
+% \begin{macrocode}
+ \let\bxjs@org@DualLang@mathalph@bet\DualLang@mathalph@bet
+ \def\DualLang@mathalph@bet{%
+% \end{macrocode}
+% |\bm| ã®å¼•æ•°ã®ä¸­
+% (ãã“ã§ã¯ |\bm| ㌠|\@firstofone| ã«ç­‰ç½®ã•ã‚Œã¦ã„ã‚‹ã®ã§
+% ã“れを判定ã«åˆ©ç”¨ã™ã‚‹ï¼‰
+% ã§ã¯ã€|\DualLang@mathalph@bet| ã‚’ |\@firstoftwo| ã®å‹•ä½œã«å¤‰ãˆã‚‹ã€‚
+% ã“ã‚Œã«ã‚ˆã‚Šã€|\mathrm| ã®
+% (|\protect| を無視ã™ã‚‹å ´åˆã®ï¼‰
+% 先頭完全展開形ãŒã€ã€Œé©ç”¨ã€å‰ã®ã‚‚ã®ã¨ä¸€è‡´ã™ã‚‹ã€‚
+% ã“ã®ãŸã‚ |\bm| ã¯ã€Œé©ç”¨ã€ã®å½±éŸ¿ã‚’å—ã‘ãšã«æ­£å¸¸å‹•ä½œã§ãる。
+% \begin{macrocode}
+ \ifx\bm\@firstofone \expandafter\@firstoftwo
+ \else \expandafter\bxjs@org@DualLang@mathalph@bet
+ \fi}%
+}
+% \end{macrocode}
+% \end{macro}
+%
%^^A----------------
% \subsection{{\pTeX}用設定}
%
@@ -11124,19 +11196,12 @@
\g@addto@macro\bxjs@begin@document@hook{%
\ifx\reDeclareMathAlphabet\@undefined\else
% \end{macrocode}
-% |\reDeclareMathAlphabet| ã‚’é©ç”¨ã—ãŸæ•°å¼è‹±å­—フォント命令ã¯{\LaTeX}ã®
-% 通常ã®å‘½ä»¤ã¨ã¯å®šç¾©æ–‡ã®å½¢ãŒç•°ãªã‚‹ã€‚
-% ã“ã®ãŸã‚ |bm| パッケージを読ã¿è¾¼ã‚“㧠|\bm{\mathrm{A}}| ã‚’
-% 実行ã™ã‚‹ã¨ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã™ã‚‹ã€‚
-% ã“れを回é¿ã™ã‚‹ãŸã‚ã®æš«å®šå¯¾å¿œã¨ã—ã¦ã€|bm| ãŒèª­ã¿è¾¼ã¾ã‚ŒãŸå ´åˆã¯
-% æ•°å¼è‹±å­—フォントã®å’Œæ–‡é€£å‹•ã‚’無効ã«ã™ã‚‹ã€‚
-% \TODO ユーザãŒæ•°å¼è‹±å­—フォントã®å’Œæ–‡é€£å‹•ã‚’制御ã§ãるよã†ã«ã™ã‚‹ã€‚
+% |bm| パッケージãŒèª­è¾¼æ¸ˆã§ã‚ã‚Œã°ãƒ‘ッãƒã‚’é©ç”¨ã™ã‚‹ã€‚
% \begin{macrocode}
- \@ifpackageloaded{bm}{}{%else
+ \@ifpackageloaded{bm}{\bxjs@patch@RDMA@for@bm}{}%
\reDeclareMathAlphabet{\mathrm}{\@mathrm}{\@mathmc}%
\reDeclareMathAlphabet{\mathbf}{\@mathbf}{\@mathgt}%
\reDeclareMathAlphabet{\mathsf}{\@mathsf}{\@mathgt}%
- }%
\fi}
\fi
% \end{macrocode}
@@ -11544,6 +11609,7 @@
\@ltj@match@familytrue
\fi
\g@addto@macro\bxjs@begin@document@hook{%
+ \@ifpackageloaded{bm}{\bxjs@patch@RDMA@for@bm}{}%
\reDeclareMathAlphabet{\mathrm}{\mathrm}{\mathmc}%
\reDeclareMathAlphabet{\mathbf}{\mathbf}{\mathgt}%
\reDeclareMathAlphabet{\mathsf}{\mathsf}{\mathgt}}%
diff --git a/Master/texmf-dist/source/latex/changebar/changebar.dtx b/Master/texmf-dist/source/latex/changebar/changebar.dtx
index 406ccf52903..58df74102c3 100644
--- a/Master/texmf-dist/source/latex/changebar/changebar.dtx
+++ b/Master/texmf-dist/source/latex/changebar/changebar.dtx
@@ -24,7 +24,7 @@
% and covered by LPPL is defined by the unpacking scripts (with
% extension .ins) which are part of the distribution.
% \fi
-% \CheckSum{2954}
+% \CheckSum{2948}
%
%\iffalse
% This file is built for \LaTeXe, so we make sure an error is
@@ -39,7 +39,7 @@
\ProvidesFile{changebar.dtx}
%</dtx>
%<+package>\ProvidesPackage{changebar}
- [2024/01/09 v3.7d Indicate changes with marginal bars]
+ [2024/07/17 v3.7e Indicate changes with marginal bars]
% \end{macrocode}
%
% \section{A driver for this document}
@@ -137,7 +137,10 @@
% \changes{v3.6e}{2023/08/13}{Added supprt for luaTeX}
% \changes{v3.7b}{2023/12/28}{Added a few lines that were inadvertantly removed}
% \changes{v3.7b}{2023/12/30}{the cb2-file use delimiting chars may
-% change meaning when they end up in the wrong situation}
+% change meaning when they end up in the wrong situation}
+% \changes{v3.7e}{2024/07/17}{The us of the character `;´ as a string
+% separator clashes with it's active variant when babel/french has
+% been loaded}
%
% \title{The Changebar package
% \thanks{This file has version number \fileversion,
@@ -229,9 +232,7 @@
% \changes{v3.6a}{2011/04/30}{XeTeX added}
% \item Xe\TeX
% \changes{3.6e}{2023/08/13}{luaTeX added}
-% \begin{changebar}
% \item lua\TeX
-% \end{changebar}
% \end{itemize}
% The drivers are represented in the normal typewriter method of
% typing these names, or by the same entirely in lower case.
@@ -752,7 +753,7 @@
% \item V\TeX
% \item PDF\TeX
% \item Xe\TeX
-% \cbstart\item luaTeX\cbend
+% \item luaTeX
% \end{itemize}
%
% The intent is that the driver names should be case-insensitive,
@@ -799,10 +800,17 @@
% \end{macrocode}
% Redefine the |\cb@pdfxy| macro to write point coordinates to the
% \file{.cb2} file.
-% \changes{v3.7b}{2023/12/30}{use ¨;¨ instead of ¨,¨ as delimiter}
+% \changes{v3.7b}{2023/12/30}{use ";" instead of "," as delimiter}
+% \changes{v3.7e}{2024/07/17}{Use "/" instead of ";" as delimiter}
% \begin{macrocode}
\gdef\cb@pdfxy##1##2##3##4##5{%
- \immediate\write\cb@writexy{##1.##2p##3;##4;##5}%
+% \end{macrocode}
+% \begin{changebar}
+% \begin{macrocode}
+ \immediate\write\cb@writexy{##1.##2p##3/##4/##5}%
+% \end{macrocode}
+% \end{changebar}
+% \begin{macrocode}
\expandafter\gdef\csname cb@##1.##2\endcsname{##3,##4,##5}}
\else\cb@pdftexerror\fi\fi\fi}
% \end{macrocode}
@@ -837,10 +845,17 @@
% \end{macrocode}
% Redefine the |\cb@pdfxy| macro to write point coordinates to the
% \file{.cb2} file.
-% \changes{v3.7b}{2023/12/30}{use ¨;¨ instead of ¨,¨ as delimiter}
+% \changes{v3.7b}{2023/12/30}{use ";" instead of "," as delimiter}
+% \changes{v3.7e}{2024/07/17}{Use "/" instead of ";" as delimiter}
% \begin{macrocode}
\gdef\cb@pdfxy##1##2##3##4##5{%
- \immediate\write\cb@writexy{##1.##2p##3;##4;##5}%
+% \end{macrocode}
+% \begin{changebar}
+% \begin{macrocode}
+ \immediate\write\cb@writexy{##1.##2p##3/##4/##5}%
+% \end{macrocode}
+% \end{changebar}
+% \begin{macrocode}
\expandafter\gdef\csname cb@##1.##2\endcsname{##3,##4,##5}}
\gdef\sec@nd@ftw@##1 ##2{##2}
\fi}
@@ -854,7 +869,6 @@
{You are not using XeLaTeX}}
% \end{macrocode}
%
-% \begin{changebar}
% \begin{macrocode}
\DeclareOption{luaTeX}{\cb@luatexcheck}
\DeclareOption{luatex}{\cb@luatexcheck}
@@ -877,10 +891,17 @@
% \end{macrocode}
% Redefine the |\cb@pdfxy| macro to write point coordinates to the
% \file{.cb2} file.
-% \changes{v3.7b}{2023/12/30}{use ¨;¨ instead of ¨,¨ as delimiter}
+% \changes{v3.7b}{2023/12/30}{use ";" instead of ",¨ as delimiter}
+% \changes{v3.7e}{2024/07/17}{Use "/" instead of ";" as delimiter}
% \begin{macrocode}
\gdef\cb@pdfxy##1##2##3##4##5{%
- \immediate\write\cb@writexy{##1.##2p##3;##4;##5}%
+% \end{macrocode}
+% \begin{changebar}
+% \begin{macrocode}
+ \immediate\write\cb@writexy{##1.##2p##3/##4/##5}%
+% \end{macrocode}
+% \end{changebar}
+% \begin{macrocode}
\expandafter\gdef\csname cb@##1.##2\endcsname{##3,##4,##5}}
\fi}
% \end{macrocode}
@@ -892,7 +913,6 @@
{luaTeX option cannot be used}%
{You are not using luaLaTeX}}
% \end{macrocode}
-% \end{changebar}
%
% The new features of \LaTeXe\ make it possible to implement the
% \Lopt{outerbars} option.
@@ -1120,6 +1140,8 @@
% compatibility mode}
% \changes{v3.3e}{1998/02/24}{Added \cs{Textures}}
% \changes{v3.5a}{2005/05/23}{Added 'PDFtex' option}
+% \changes{v3.6a}{2011/04/30}{Added 'XeTeX' option}
+% \changes{v3.6e}{2023/08/13}{Added 'luaTeX' option}
% \begin{macrocode}
\if@compatibility
\def\driver#1{%
@@ -1132,17 +1154,9 @@
\def\Textures{TEXTURES}%
\def\VTeX{VTEX}%
\def\pdfTeX{PDFTEX}%
-% \end{macrocode}
-% \changes{v3.6a}{2011/04/30}{Added 'XeTeX' option}
-% \begin{macrocode}
\def\xeTeX{XETEX}
-% \end{macrocode}
-% \changes{v3.6e}{2023/08/13}{Added 'luaTeX' option}
-% \begin{changebar}
-% \begin{macrocode}
\def\luaTeX{LUATEX}
% \end{macrocode}
-% \end{changebar}
%
% The choice has to be communicated to the macro
% \verb=\cb@setup@specials= that will be called from within
@@ -1150,6 +1164,7 @@
% \verb=\cb@driver@setup= is used. It receives a numeric value
% using \verb=\chardef=.
% \changes{v3.6a}{2011/04/30}{Added 'XeTeX' option}
+% \changes{v3.6e}{2023/08/13}{Added 'luaTeX' option}
% \begin{macrocode}
\global\chardef\cb@driver@setup=0\relax
\ifx\tempa\LN \global\chardef\cb@driver@setup=0\fi
@@ -1160,14 +1175,7 @@
\ifx\tempa\VTeX \global\chardef\cb@driver@setup=5\fi
\ifx\tempa\pdfTeX \cb@pdftexcheck\fi
\ifx\tempa\xeTeX \cb@xetexcheck\fi
-% \end{macrocode}
-% \changes{v3.6e}{2023/08/13}{Added 'luaTeX' option}
-% \begin{changebar}
-% \begin{macrocode}
\ifx\tempa\luaTeX \cb@luatexcheck\fi
-% \end{macrocode}
-% \end{changebar}
-% \begin{macrocode}
\egroup}
% \end{macrocode}
% We add \verb+\driver+ to \verb+\@preamblecmds+, which is a
@@ -1464,11 +1472,22 @@
% When the point is found it is removed from |\cb@pdfpoints|. \#9
% contains the cumulative head of the list to construct the new list
% with the entry removed. \#3--\#8 are for pattern matching.
-% \changes{v3.7b}{2023/12/30}{use ¨;¨ instead of ¨,¨ as delimiter}
+% \changes{v3.7b}{2023/12/30}{use ";" instead of "," as delimiter}
+% \changes{v3.7e}{2024/07/17}{Use "/" instead of ";" as delimiter}
+% \begin{changebar}
+% \begin{macrocode}
+ \def\cb@pdffind##1##2##3.##4p##5/##6/##7pt##8\relax##9{%
+% \end{macrocode}
+% \end{changebar}
% \begin{macrocode}
- \def\cb@pdffind##1##2##3.##4p##5;##6;##7pt##8\relax##9{%
\def\cb@next{%
- \cb@pdffind{##1}{##2}##8\relax{##9##3.##4p##5;##6;##7pt}}%
+% \end{macrocode}
+% \begin{changebar}
+% \begin{macrocode}
+ \cb@pdffind{##1}{##2}##8\relax{##9##3.##4p##5/##6/##7pt}}%
+% \end{macrocode}
+% \end{changebar}
+% \begin{macrocode}
\ifnum ##1=##3
\ifnum ##2=##4
\def\cb@pdfx{##5sp}%
@@ -1519,8 +1538,13 @@
% \begin{macro}{\cb@pdfparsexy}
% The |\cb@pdfparsexy| macro extracts the pagecount from an entry read in
% from the \file{.cb2} file.
+% \changes{v3.7e}{2024/07/17}{Use "/" instead of ";" as delimiter}
+% \begin{changebar}
+% \begin{macrocode}
+ \def\cb@pdfparsexy##1.##2p##3/##4/##5pt{%
+% \end{macrocode}
+% \end{changebar}
% \begin{macrocode}
- \def\cb@pdfparsexy##1.##2p##3;##4;##5pt{%
\def\cb@pdfpg{##2}}%
% \end{macrocode}
% \end{macro}
@@ -1565,7 +1589,7 @@
% In order to get things in the right spot we need a little scaling
% factor. We define it here.
% \begin{macrocode}
-\def\cb@pdf@scale{0.996264009963}
+ \def\cb@pdf@scale{0.996264009963}
% \end{macrocode}
% \end{macro}
%
@@ -1636,14 +1660,12 @@
% \begin{macrocode}
\gdef\cb@checkPdfxy##1##2##3##4##5{%
\cb@@findpdfpoint{##1}{##2}%
-% \end{macrocdode}
-% \begin{changebar}
-% \begin{macrocode
+% \end{macrocode}
+% \begin{macrocode}
\ifdim##3sp=\cb@pdfx\relax
\ifdim##4sp=\cb@pdfy\relax
-% \end{macrocdode}
-% \end{changebar}
-% \begin{macrocode
+% \end{macrocode}
+% \begin{macrocode}
\ifdim##5=\cb@pdfz\relax
\else
\cb@error
@@ -1741,11 +1763,22 @@
% When the point is found it is removed from |\cb@pdfpoints|. \#9
% contains the cumulative head of the list to construct the new list
% with the entry removed. \#3--\#8 are for pattern matching.
-% \changes{v3.7b}{2023/12/30}{use ¨;¨ instead of ¨,¨ as delimiter}
+% \changes{v3.7b}{2023/12/30}{use ";" instead of "," as delimiter}
+% \changes{v3.7e}{2024/07/17}{Use "/" instead of ";" as delimiter}
+% \begin{changebar}
+% \begin{macrocode}
+ \def\cb@pdffind##1##2##3.##4p##5/##6/##7pt##8\relax##9{%
+% \end{macrocode}
+% \end{changebar}
% \begin{macrocode}
- \def\cb@pdffind##1##2##3.##4p##5;##6;##7pt##8\relax##9{%
\def\cb@next{%
- \cb@pdffind{##1}{##2}##8\relax{##9##3.##4p##5;##6;##7pt}}%
+% \end{macrocode}
+% \begin{changebar}
+% \begin{macrocode}
+ \cb@pdffind{##1}{##2}##8\relax{##9##3.##4p##5/##6/##7pt}}%
+% \end{macrocode}
+% \end{changebar}
+% \begin{macrocode}
\ifnum ##1=##3
\ifnum ##2=##4
\def\cb@pdfx{##5sp}%
@@ -1796,8 +1829,13 @@
% \begin{macro}{\cb@pdfparsexy}
% The |\cb@pdfparsexy| macro extracts the pagecount from an entry read in
% from the \file{.cb2} file.
+% \changes{v3.7e}{2024/07/17}{Use "/" instead of ";" as delimiter}
+% \begin{changebar}
+% \begin{macrocode}
+ \def\cb@pdfparsexy##1.##2p##3/##4/##5pt{%
+% \end{macrocode}
+% \end{changebar}
% \begin{macrocode}
- \def\cb@pdfparsexy##1.##2p##3;##4;##5pt{%
\def\cb@pdfpg{##2}}%
% \end{macrocode}
% \end{macro}
@@ -1842,7 +1880,7 @@
% In order to get things in the right spot we need a little scaling
% factor. We define it here.
% \begin{macrocode}
-\def\cb@pdf@scale{0.996264009963}
+ \def\cb@pdf@scale{0.996264009963}
% \end{macrocode}
% \end{macro}
%
@@ -1934,7 +1972,6 @@
\let\cb@resetpoints\relax
% \end{macrocode}
%
-% \begin{changebar}
% \changes{v3.6e}{2023/08/13}{lua\TeX{} support added}
% The code for lua\TeX{}, like for pdf\TeX\ and Xe\TeX,
% is more elaborate as the calculations have to
@@ -2012,11 +2049,22 @@
% When the point is found it is removed from |\cb@pdfpoints|. \#9
% contains the cumulative head of the list to construct the new list
% with the entry removed. \#3--\#8 are for pattern matching.
-% \changes{v3.7b}{2023/12/30}{use ¨;¨ instead of ¨,¨ as delimiter}
+% \changes{v3.7b}{2023/12/30}{use ";" instead of "," as delimiter}
+% \changes{v3.7e}{2024/07/17}{Use "/" instead of ";" as delimiter}
+% \begin{changebar}
+% \begin{macrocode}
+ \def\cb@pdffind##1##2##3.##4p##5/##6/##7pt##8\relax##9{%
+% \end{macrocode}
+% \end{changebar}
% \begin{macrocode}
- \def\cb@pdffind##1##2##3.##4p##5;##6;##7pt##8\relax##9{%
\def\cb@next{%
- \cb@pdffind{##1}{##2}##8\relax{##9##3.##4p##5;##6;##7pt}}%
+% \end{macrocode}
+% \begin{changebar}
+% \begin{macrocode}
+ \cb@pdffind{##1}{##2}##8\relax{##9##3.##4p##5/##6/##7pt}}%
+% \end{macrocode}
+% \end{changebar}
+% \begin{macrocode}
\ifnum ##1=##3
\ifnum ##2=##4
\def\cb@pdfx{##5sp}%
@@ -2067,8 +2115,13 @@
% \begin{macro}{\cb@pdfparsexy}
% The |\cb@pdfparsexy| macro extracts the pagecount from an entry read in
% from the \file{.cb2} file.
+% \changes{v3.7e}{2024/07/17}{Use "/" instead of ";" as delimiter}
+% \begin{changebar}
+% \begin{macrocode}
+ \def\cb@pdfparsexy##1.##2p##3/##4/##5pt{%
+% \end{macrocode}
+% \end{changebar}
% \begin{macrocode}
- \def\cb@pdfparsexy##1.##2p##3;##4;##5pt{%
\def\cb@pdfpg{##2}}%
% \end{macrocode}
% \end{macro}
@@ -2113,7 +2166,7 @@
% In order to get things in the right spot we need a little scaling
% factor. We define it here.
% \begin{macrocode}
-\def\cb@pdf@scale{0.996264009963}
+ \def\cb@pdf@scale{0.996264009963}
% \end{macrocode}
% \end{macro}
%
@@ -2203,7 +2256,6 @@
\def\cb@maxpoint{9999999}
\let\cb@resetpoints\relax
% \end{macrocode}
-%\end{changebar}
%
% When code for other drivers should be added it can be inserted
% here. When someone makes a mistake and somehow selects an
@@ -2296,7 +2348,7 @@
\newcommand*{\nochangebars}{%
\def\cb@start[##1]{\ignorespaces}%
\def\cb@delete[##1]{}%
- \def\cb@end{\ignorespacesafterend}
+ \def\cb@end{\ignorespacesafterend}%
}
% \end{macrocode}
% \end{macro}
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 cab40dfb504..a750c136f54 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
@@ -28,7 +28,7 @@
%<class>\NeedsTeXFormat{LaTeX2e}[2021/06/01]
%<class>\ProvidesClass{cjs-rcs-article}%
%<*class>
-[2024/07/14 v1.1 Article class for The Canadian Journal of
+[2024/07/30 v1.1a Article class for The Canadian Journal of
Statistics | La revue canadienne de statistique]
%</class>
%<*driver>
@@ -296,6 +296,10 @@
% 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.}
+% \changes{1.1a}{2024-07-25}{Fix the command \cs{proglang} that would
+% disable hyphenation for the rest of the document. With thanks to
+% Enrico Gregorio (egreg) for the heads up in person at TUG 2024.}
+% \changes{1.1a}{2024-07-25}{Make the command \cs{proglang} robust.}
%
% \ifenglish%
% \title[Guide to the class {\CJSclass}]{%
@@ -3867,12 +3871,12 @@
% The decorative element is created using plain {\TeX} rules. Its
% height and depth are identical to the journal information.
% \begin{macrocode}
-\setbox\z@=\vbox{\sffamily\hbox{\CJS@journalname}\hbox{\bfseries V,}}
\newsavebox\CJS@journalornament
\setbox\CJS@journalornament=\vbox{%
+ \setbox\z@=\vbox{\sffamily\hbox{\CJS@journalname}\hbox{\bfseries V,}}
\setbox\tw@\hbox{\vrule \@width4pt\@height\ht\z@\@depth\dp\z@}
- \hbox{\textcolor{CJSpink}{\copy\tw@}\kern2pt%
- \textcolor{CJSred}{\copy\tw@}\kern2pt%
+ \hbox{\textcolor{CJSpink}{\copy\tw@}\kern2pt
+ \textcolor{CJSred}{\copy\tw@}\kern2pt
\textcolor{CJSyellow}{\copy\tw@}\kern6pt}}
% \end{macrocode}
%
@@ -4735,7 +4739,7 @@
\setbox\CJS@licencebox=\vbox{%
\CJS@setlicencefont
\ifCJS@specialack\CJS@specialackstatement\fi
- \ifdefempty{\CJS@licence}{\CJS@licencesample}{\CJS@licence}}
+ \ifdefempty{\CJS@licence}{\CJS@licencesample}{\CJS@licence}}%
\setlength\CJS@licenceht{\dimexpr\ht\CJS@licencebox+\dp\CJS@licencebox}}
% \end{macrocode}
% \end{macro}
@@ -4759,14 +4763,17 @@
% Inspired by the package \pkg{ccicons} (not used by the class since
% \pkg{fontawesome5} contains all the Creative Commons icons).
%
+% \changes{1.1a}{2024-07-25}{Implementation: fix the generation of
+% spacing in the \cs{ccby*} commands.}
% \begin{macro}{\ccby,\ccby*}
% The command \cmd{\ccby} typesets the icons for the Attribution
% licence: {\ccby}.
% \begin{macrocode}
\newcommand*\ccby{\ccby@\@ifstar{~\faCopyright[regular]}\relax}
+\def\CJS@fakern{\kern0.1em}
\def\ccby@{\mbox{%
- \faCreativeCommons\kern0.1em%
- \faCreativeCommonsBy\kern0.1em}}
+ \faCreativeCommons\CJS@fakern
+ \faCreativeCommonsBy\CJS@fakern}}
% \end{macrocode}
% \end{macro}
%
@@ -4776,8 +4783,8 @@
% \begin{macrocode}
\newcommand*\ccbysa{\ccbysa@\@ifstar{~\faCopyright[regular]}\relax}
\def\ccbysa@{\mbox{%
- \faCreativeCommons\kern0.1em%
- \faCreativeCommonsBy\kern0.1em%
+ \faCreativeCommons\CJS@fakern
+ \faCreativeCommonsBy\CJS@fakern
\faCreativeCommonsSa}}
% \end{macrocode}
% \end{macro}
@@ -4788,8 +4795,8 @@
% \begin{macrocode}
\newcommand*\ccbync{\ccbync@\@ifstar{~\faCopyright[regular]}\relax}
\def\ccbync@{\mbox{%
- \faCreativeCommons\kern0.1em%
- \faCreativeCommonsBy\kern0.1em%
+ \faCreativeCommons\CJS@fakern
+ \faCreativeCommonsBy\CJS@fakern
\faCreativeCommonsNc}}
% \end{macrocode}
% \end{macro}
@@ -4801,9 +4808,9 @@
% \begin{macrocode}
\newcommand*\ccbyncsa{\ccbyncsa@\@ifstar{~\faCopyright[regular]}\relax}
\def\ccbyncsa@{\mbox{%
- \faCreativeCommons\kern0.1em%
- \faCreativeCommonsBy\kern0.1em%
- \faCreativeCommonsNc\kern0.1em%
+ \faCreativeCommons\CJS@fakern
+ \faCreativeCommonsBy\CJS@fakern
+ \faCreativeCommonsNc\CJS@fakern
\faCreativeCommonsSa}}
% \end{macrocode}
% \end{macro}
@@ -4814,8 +4821,8 @@
% \begin{macrocode}
\newcommand*\ccbynd{\ccbynd@\@ifstar{~\faCopyright[regular]}\relax}
\def\ccbynd@{\mbox{%
- \faCreativeCommons\kern0.1em%
- \faCreativeCommonsBy\kern0.1em%
+ \faCreativeCommons\CJS@fakern
+ \faCreativeCommonsBy\CJS@fakern
\faCreativeCommonsNd}}
% \end{macrocode}
% \end{macro}
@@ -4826,9 +4833,9 @@
% \begin{macrocode}
\newcommand*\ccbyncnd{\ccbyncnd@\@ifstar{~\faCopyright[regular]}\relax}
\def\ccbyncnd@{\mbox{%
- \faCreativeCommons\kern0.1em%
- \faCreativeCommonsBy\kern0.1em%
- \faCreativeCommonsNc\kern0.1em%
+ \faCreativeCommons\CJS@fakern
+ \faCreativeCommonsBy\CJS@fakern
+ \faCreativeCommonsNc\CJS@fakern
\faCreativeCommonsNd}}
% \end{macrocode}
% \end{macro}
@@ -4950,6 +4957,8 @@
% \subsection{Computer code and software}
% \label{sec:implementation:software}
%
+% \changes{1.1a}{2024-07-25}{Implementation: prevent hyphenation in
+% \cs{proglang} using a simple \cs{mbox}.}
% \begin{macro}{\proglang}
% The command \cmd{\proglang} provides a means to uniformly typeset
% the name of a software or programming language. The command also
@@ -4957,7 +4966,7 @@
% shortcuts to the most common languages. Notice that the
% \cmd{\Cpplang} case is specially crafted.
% \begin{macrocode}
-\newcommand*\proglang[1]{{\hyphenchar\font=-1 #1}}
+\newrobustcmd*\proglang[1]{\mbox{#1}}
\newcommand*\Rlang{\proglang{R}}
\newcommand*\SASlang{\proglang{SAS}}
\newcommand*\SPSSlang{\proglang{SPSS}}
@@ -5178,18 +5187,20 @@
% \end{macrocode}
% \end{macro}
%
+% \changes{1.1a}{2024-07-25}{Implementation: replace box registers
+% \cs{@ne} and \cs{thr@@} by \cs{z@} and \cs{tw@}.}
% We also define a decorative element similar to the one used on the
% title page, only adapted for a single line content. To create a
% balanced element, we use the height of a letter with an ascender and
% the depth of the old-style number 4.
% \begin{macrocode}
-\setbox\@ne=\vbox{\hbox{\firaoldstyle\small l4}}
\newsavebox\CJS@historyornament
\setbox\CJS@historyornament=\vbox{%
- \setbox\thr@@\hbox{\vrule \@width1.5pt\@height\ht\@ne\@depth\dp\@ne}
- \hbox{\textcolor{CJSpink}{\copy\thr@@}\kern.75pt%
- \textcolor{CJSred}{\copy\thr@@}\kern.75pt%
- \textcolor{CJSyellow}{\copy\thr@@}\kern3pt}}
+ \setbox\z@=\vbox{\hbox{\firaoldstyle\small l4}}
+ \setbox\tw@\hbox{\vrule \@width1.5pt\@height\ht\z@\@depth\dp\z@}
+ \hbox{\textcolor{CJSpink}{\copy\tw@}\kern.75pt
+ \textcolor{CJSred}{\copy\tw@}\kern.75pt
+ \textcolor{CJSyellow}{\copy\tw@}\kern3pt}}
% \end{macrocode}
%
% Finally, the history information, when present, is printed at the
diff --git a/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-english.mbs b/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-english.mbs
index b23be11c434..18f0ccbd780 100644
--- a/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-english.mbs
+++ b/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-english.mbs
@@ -31,7 +31,7 @@
%-------------------------------------------------------------------
% Begin module:
%\fi
- % \ProvidesFile{cjs-rcs-english.mbs}[2024/07/14 v1.1 (VG, PWD)]
+ % \ProvidesFile{cjs-rcs-english.mbs}[2024/07/30 v1.1a (VG, PWD)]
%\iffalse
%<*a&!a>
% The following ensures that the driver part is not seen by makebst
@@ -87,7 +87,7 @@
%% Configuration of the glossary
\addto\extrasenglish{%
- \def\glossaryname{Version history}}
+ \def\glossaryname{History of changes}}
\GlossaryPrologue{\section*{\glossaryname}%
\addcontentsline{toc}{section}{\glossaryname}}
\setlength{\GlossaryMin}{5cm}
@@ -125,8 +125,6 @@
% 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/source/latex/cjs-rcs-article/cjs-rcs-french.mbs b/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-french.mbs
index 748d449383b..4d3a76021c9 100644
--- a/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-french.mbs
+++ b/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-french.mbs
@@ -31,7 +31,7 @@
%-------------------------------------------------------------------
% Begin module:
%\fi
- % \ProvidesFile{cjs-rcs-french.mbs}[2024/07/14 v1.1 (VG, PWD)]
+ % \ProvidesFile{cjs-rcs-french.mbs}[2024/07/30 v1.1a (VG, PWD)]
%\iffalse
%<*a&!a>
% The following ensures that the driver part is not seen by makebst
@@ -87,7 +87,7 @@
%% Configuration of the glossary
\addto\extrasenglish{%
- \def\glossaryname{Version history}}
+ \def\glossaryname{History of changes}}
\GlossaryPrologue{\section*{\glossaryname}%
\addcontentsline{toc}{section}{\glossaryname}}
\setlength{\GlossaryMin}{5cm}
@@ -125,8 +125,6 @@
% 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/source/latex/cjs-rcs-article/cjs-rcs-merlin.mbs b/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-merlin.mbs
index 75ca76a256f..cf79365ffd2 100644
--- a/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-merlin.mbs
+++ b/Master/texmf-dist/source/latex/cjs-rcs-article/cjs-rcs-merlin.mbs
@@ -32,7 +32,7 @@
% -------------------------------------------------------------------
% Name and version information of the main mbs file:
%\fi
- % \ProvidesFile{cjs-rcs-merlin.mbs}[2023/11/29 v1.0 (VG, PWD, AO, DPC)]
+ % \ProvidesFile{cjs-rcs-merlin.mbs}[2024/07/30 v1.1a (VG, PWD, AO, DPC)]
%\iffalse
%</!tail>
%<*a&!a>
@@ -92,7 +92,7 @@
%% Configuration of the glossary
\addto\extrasenglish{%
- \def\glossaryname{Version history}}
+ \def\glossaryname{History of changes}}
\GlossaryPrologue{\section*{\glossaryname}%
\addcontentsline{toc}{section}{\glossaryname}}
\setlength{\GlossaryMin}{5cm}
@@ -133,7 +133,6 @@
% 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/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/doibanner/doibanner.dtx b/Master/texmf-dist/source/latex/doibanner/doibanner.dtx
new file mode 100644
index 00000000000..e004b53e313
--- /dev/null
+++ b/Master/texmf-dist/source/latex/doibanner/doibanner.dtx
@@ -0,0 +1,412 @@
+% \iffalse meta-comment
+%
+% Copyright (C) 2024 Christian Schreinemachers
+%
+% 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
+%
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2008-05-04 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The current maintainer of this work is Christian Schreinemachers.
+%
+% This work consists of the files
+% doibanner.dtx
+% doibanner.ins
+% README.md
+% and the derived files
+% doibanner.sty
+% doibanner.pdf
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% \fi
+% \iffalse
+%<package>\NeedsTeXFormat{LaTeX2e}
+%<package>\ProvidesPackage{doibanner}
+%<package> [2024-07-28 v0.3 Generate DOI banners and links]
+%
+%<*driver>
+\documentclass[a4paper]{ltxdoc}
+\usepackage[%
+ pdfusetitle,%
+ hyperindex=false,%
+ pdfsubject={LaTeX package documentation},%
+ pdfkeywords={doibanner, latex, documentation}%
+]{hyperref}
+\usepackage{doibanner}
+\usepackage[toc]{multitoc}
+\usepackage{geometry}
+\usepackage{fancyvrb}
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+\DoNotIndex{\adjustbox,\begin,\bfseries,\DeclareKeys,\definecolor,\end,\fill,
+ \fontfamily,\href,\IfBooleanTF,\Large,\NewDocumentCommand,\node,
+ \ProcessKeyOptions,\RequirePackage,\relax,\selectfont,\SetKeys,
+ \sfdefault,\tikzstyle}
+\setcounter{IndexColumns}{2}
+\setlength{\IndexMin}{40ex}
+\setlength{\columnseprule}{.4pt}
+\addtolength{\oddsidemargin}{2cm}
+\addtolength{\textwidth}{-2cm}
+\begin{document}
+ \DocInput{doibanner.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \pagestyle{headings}
+%
+% \newcommand*{\package}[1]{\textsf{#1}}
+% \newcommand*{\opt}[1]{\texttt{#1}}
+% \newcommand*{\default}[1]{(default: \opt{#1})}
+%
+%
+% ^^A -----------------------------
+%
+% \changes{v0.3}{2024-07-28}{%
+% Add package options \opt{width} and \opt{label},
+% fix mistakes,
+% improve documentation,
+% remove unnecessary dependencies}
+% \changes{v0.2}{2024-07-23}{%
+% Initial release,
+% convert into dtx,
+% add documentation,
+% add \opt{urlbase} package option}
+% \changes{v0.1}{2021/05/09}{Initial version}
+%
+% \GetFileInfo{doibanner.sty}
+%
+%
+% ^^A -----------------------------
+%
+% \title{The \package{doibanner} package}
+% \author{Christian Schreinemachers}
+% \date{%
+% Released \filedate\thanks{%
+% \package{doibanner}~\fileversion
+% ~(\href{https://codeberg.org/Cs137/doibanner/releases/tag/\fileversion}{source code})}%
+% }
+% \maketitle
+%
+%
+% ^^A -----------------------------
+%
+% \begin{abstract}
+% The \package{doibanner} package allows to generate a banner for a declared
+% \href{https://www.doi.org/the-identifier/what-is-a-doi/}{digital object identifier}
+% (DOI). It provides the \cs{doibanner} macro, which draws the banner using
+% \package{TikZ} and adds a link via \package{hyperref}, if desired. Its
+% output can be scaled by \package{adjustbox} and it might look as follows:
+% \par\medskip\centering{\doibanner*[width=5cm]{xx.xxxx/yyyyyy.zzzzzzzz}}
+% \end{abstract}
+%
+%
+% ^^A -----------------------------
+%
+% \tableofcontents
+%
+%
+% ^^A -----------------------------
+%
+% \section{Introduction}
+% ^^A
+% I published several documents on \href{https://zenodo.org/}{\emph{Zenodo}},
+% a general-purpose open repository. They offer to register a
+% \href{https://www.doi.org/the-identifier/what-is-a-doi/}{digital object identifier}
+% (DOI) for an entry and download a banner of it. The latter can be added to
+% contents foreseen for the entry, or e.g. when referring to the entry in a
+% slide deck.
+%
+% Since I frequently use such banners in \LaTeX{} documents, I decided to
+% create a package that generates a similar banner and includes a link to the
+% corresponding URL. Additionally, this package eliminates the need to
+% manually download the banner and manage a file that might be used across
+% multiple documents.
+%
+% Due to the motivation, the resulting banner is heavily inspired by the
+% design applied in the banner offered by \emph{Zenodo}. It is drawn using
+% the \package{tikz} package, a link to its URL can be included with
+% \package{hyperref}, and it can be scaled using \package{adjustbox}.
+%
+% The application of this package is not limited to \emph{Zenodo}
+% depositions, it can be used to create a banner for a DOI that can
+% be included in any \LaTeX{} document.
+%
+%
+% ^^A -----------------------------
+%
+% \section{Usage}
+% ^^A
+% Load the package in your document's preamble and specify any of the
+% options described in the next subsection as follows:
+%
+% \begin{quote}
+% \cs{usepackage}\oarg{option(s)}\{doibanner\}
+% \end{quote}
+%
+%
+% ^^A -----------------------------
+%
+% \subsection{Options}
+% ^^A
+% In order to change the default behaviour of this package, declare one
+% or more of the options described in this subsection with your desired
+% value.
+%
+% \DescribeMacro{label=\meta{string}}
+% \default{DOI} specifies the label (left part) of the DOI banner generated
+% by \cs{doibanner}. The widths of the left and right part of the banner
+% are fixed and do currently not take the length of the text displayed on
+% top into account. Consequently, only a short expression should be declared
+% as value for the option \opt{label}.
+%
+% \DescribeMacro{urlbase=\meta{string}}
+% \default{https://doi.org/} specifies the base URL to convert a DOI string
+% into its URL, for normal use cases this does not require any adjustment.
+%
+% \DescribeMacro{width=\meta{dimen}}
+% \default{3.6cm} specifies the total width of the DOI banner generated by
+% \cs{doibanner}. The widths of the individual parts of the banner are
+% fixed and can currently not be changed.
+%
+%
+% ^^A -----------------------------
+%
+% \subsection{Macros}
+% ^^A
+% \subsubsection*{\cs{doibanner}\oarg{dimen}\marg{string}}
+%
+% A DOI banner can be created using the command \cs{doibanner}, which requires
+% a DOI string as argument. Moreover, a \oarg{dimen} option can be defined.
+% The latter specifies the banner's width. If it is not declared, the value
+% of the \opt{width} package option is taken into account \default{3.6cm}.
+%
+% \DescribeMacro{\doibanner}
+% An execution of \cs{doibanner\{xx.xxxx/yyyyyy.zzzzzzzz\}} results in this
+% banner: \doibanner{xx.xxxx/yyyyyy.zzzzzzzz} If a banner with a width of
+% let's say 3\,cm is desired, it can be achieved by specifying the macro option
+% \opt{width} accordingly (\cs{doibanner}\opt{[width=3cm]\{xx.xxxx/yyyyyy.zzzzzzzz\}}):
+% \doibanner[width=3cm]{xx.xxxx/yyyyyy.zzzzzzzz}
+%
+% \DescribeMacro{\doibanner*}
+% The starred version of the command leads to the same banner, but it does
+% not contain a link to the DOI's URL:
+% \doibanner*{xx.xxxx/yyyyyy.zzzzzzzz}
+%
+% \subsubsection*{\cs{doiurl}\marg{string}}
+% ^^A
+% \DescribeMacro{\doiurl}
+% An URL is generated by appending the provided \emph{string} to the string
+% defined as the package option \opt{urlbase}. The resulting link is labelled
+% with the DOI string.
+% A call of \cs{doiurl\{xx.xxxx/yyyyyy.zzzzzzzz\}} results in
+% \doiurl{xx.xxxx/yyyyyy.zzzzzzzz}.
+%
+% \DescribeMacro{\doiurl*}
+% The command is also available as starred version, which prints the full
+% URL instead of the DOI string and does not include a link. Its output for
+% the aforementioned example is as follows:
+% \doiurl*{xx.xxxx/yyyyyy.zzzzzzzz}.
+%
+%
+% ^^A -----------------------------
+%
+% ^^A \section{Known limitations}
+% ^^A ^^A
+% ^^A \begin{itemize}
+% ^^A \item
+% ^^A \end{itemize}
+%
+%
+% ^^A -----------------------------
+%
+% \MaybeStop{
+%
+% \IndexPrologue{%
+% \section{Index}
+% Numbers written in italic refer to the page where the corresponding entry
+% is described; numbers underlined refer to the code line of the definition;
+% numbers in roman refer to the code lines where the entry is used.
+% }
+% \PrintIndex
+%
+% \GlossaryPrologue{%
+% \section{Change History}
+% The changes listed in this section aim to provide a brief overview of the
+% changes introduced into the package \package{doibanner}. The
+% \href{https://codeberg.org/Cs137/doibanner/}{package repository on Codeberg}
+% contains a
+% \href{https://codeberg.org/Cs137/doibanner/src/branch/main/CHANGELOG.md}{changelog file},
+% consult it to read a detailed description of the changes introduced into
+% this package.
+% }
+% \PrintChanges
+%
+% }
+%
+%
+% ^^A -----------------------------
+%
+% \section{Implementation}
+%
+% \subsection{Dependencies}
+% ^^A
+% In order to use \package{doibanner}, the packages
+% \href{https://www.ctan.org/pkg/adjustbox}{\package{adjustbox}},
+% \href{https://www.ctan.org/pkg/hyperref}{\package{hyperref}}, and
+% \href{https://www.ctan.org/pkg/tikz}{\package{tkiz}}
+% are required as package dependencies.
+%
+% \iffalse
+%<*package>
+% \fi
+% \begin{macrocode}
+\RequirePackage{adjustbox}
+\RequirePackage{hyperref}
+\RequirePackage{tikz}
+% \end{macrocode}
+%
+%
+% ^^A -----------------------------
+%
+% \subsection{Constants}
+% ^^A
+% Definition of colours for the banner areas and labels, custom colour
+% definitions are currently not supported.
+% \begin{macrocode}
+\definecolor{leftcolor}{RGB}{82,82,82}
+\definecolor{rightcolor}{RGB}{6,119,183}
+%
+\definecolor{toptextcolor}{RGB}{235,235,235}
+\definecolor{bottomtextcolor}{RGB}{59,59,59}
+% \end{macrocode}
+% ^^A
+% Definition of font and colour for the banner's top and bottom text layers.
+% \begin{macrocode}
+\tikzstyle{toptextstyle} = [
+ font=\fontfamily{\sfdefault}\selectfont\bfseries\Large,toptextcolor]
+\tikzstyle{bottomtextstyle} = [
+ font=\fontfamily{\sfdefault}\selectfont\bfseries\Large,bottomtextcolor]
+% \end{macrocode}
+%
+%
+% ^^A -----------------------------
+%
+% \subsection{Options}
+% ^^A
+% The package options are internally available as \cs{@doibanner@}\meta{option}.
+% \begin{macrocode}
+\DeclareKeys[@doibanner]{
+ label.store = \@doibanner@label,
+ label.usage = load,
+ urlbase.store = \@doibanner@urlbase,
+ urlbase.usage = load,
+ width.store = \@doibanner@width,
+ width.usage = load,
+}
+% \end{macrocode}
+%
+% \subsubsection*{Assignement of default values}
+% \begin{macrocode}
+\SetKeys[@doibanner]{
+ label=DOI,
+ urlbase=https://doi.org/,
+ width=3.6cm,
+}
+% \end{macrocode}
+%
+% \subsubsection*{Processing of package options}
+% \begin{macrocode}
+\ProcessKeyOptions[@doibanner]\relax
+% \end{macrocode}
+%
+%
+% ^^A -----------------------------
+%
+% \subsection{Macros}
+%
+% \changes{v0.2}{2024-07-23}{Remove \cs{doi} macro}
+%
+% \begin{macro}{\doiurl}
+% \changes{v0.2}{2024-07-23}{Remove trailing space}
+% \oarg{dimen}\\
+% The \meta{string} is appended to the package option \opt{urlbase} to
+% generate the URL.
+% \begin{macrocode}
+\NewDocumentCommand\doiurl{s m}{%
+ \IfBooleanTF#1
+ {\@doibanner@urlbase#2}%
+ {\href{\@doibanner@urlbase#2}{#2}}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@doibanner@draw}
+% \changes{v0.3}{2024-07-28}{Rename macro, remove top part}
+% \oarg{dimen}\marg{string}\\
+% Draw the DOI banner including its \opt{label} and \meta{string}, provide
+% \opt{width=\meta{dimen}} to define the banners width as well.
+% \begin{macrocode}
+\NewDocumentCommand\@doibanner@draw{o m}{%
+ \adjustbox{#1}{%
+ \begin{tikzpicture}
+% left part
+ \fill [leftcolor,draw]
+ (1.5,0) --
+ ++(0,.8) {[rounded corners=5] --
+ ++(-1.5,0) --
+ ++(0,-.8)} --
+ cycle
+ {};
+ \node[bottomtextstyle] at (.75,.35) {\@doibanner@label};
+ \node[toptextstyle] at (.75,.4) {\@doibanner@label};
+% right part
+ \fill [rightcolor,draw]
+ (1.5,0) {[rounded corners=5] --
+ ++(6.5,0) --
+ ++(0,.8)} --
+ ++(-6.5,0) --
+ cycle
+ {};
+ \node[bottomtextstyle] at (4.75,.35) {#2};
+ \node[toptextstyle] at (4.75,.4) {#2};
+ \end{tikzpicture}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\doibanner}
+% \changes{v0.3}{2024-07-28}{Add \opt{width} option}
+% \changes{v0.2}{2024-07-23}{Remove trailing space}
+% \oarg{dimen}\marg{string}\\
+% Display the DOI banner with or without (*) a link to its URL. Specify a
+% \oarg{dimen}, if you want a banner width deviating from the one defined
+% as \opt{width} package option.
+% \begin{macrocode}
+\NewDocumentCommand\doibanner{s O{width=\@doibanner@width} m}{%
+ \IfBooleanTF#1
+ {\@doibanner@draw[#2]{#3}}%
+ {\href{\@doibanner@urlbase#3}{\@doibanner@draw[#2]{#3}}}%
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \iffalse
+%</package>
+% \fi
+%
+% \Finale
+\endinput
+%%
+%% End of file `doibanner.dtx'.
+
diff --git a/Master/texmf-dist/source/latex/doibanner/doibanner.ins b/Master/texmf-dist/source/latex/doibanner/doibanner.ins
new file mode 100644
index 00000000000..97cfbb3fbb1
--- /dev/null
+++ b/Master/texmf-dist/source/latex/doibanner/doibanner.ins
@@ -0,0 +1,85 @@
+%%
+%% Copyright (C) 2024 Christian Schreinemachers
+%%
+%% 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
+%%
+%% and version 1.3c or later is part of all distributions of
+%% LaTeX version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The current maintainer of this work is Christian Schreinemachers.
+%%
+%% This work consists of the files
+%% doibanner.dtx
+%% doibanner.ins
+%% README.md
+%% and the derived files
+%% doibanner.sty
+%% doibanner.pdf
+%%
+This work has the LPPL maintenance status `maintained'.
+
+The current maintainer of this work is Christian Schreinemachers.
+
+This work consists of the files
+ doibanner.dtx
+ doibanner.ins
+ README.md
+and the derived files
+ doibanner.sty
+ doibanner.pdf
+\input docstrip.tex
+\keepsilent
+
+\preamble
+
+Copyright (C) 2024 Christian Schreinemachers
+
+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
+
+and version 1.3c or later is part of all distributions of LaTeX
+version 2008-05-04 or later.
+
+This work has the LPPL maintenance status `maintained'.
+
+The current maintainer of this work is
+ Christian Schreinemachers.
+
+This work consists of the files
+ doibanner.dtx
+ doibanner.ins
+and the derived files
+ doibanner.sty
+ doibanner.pdf
+
+\endpreamble
+\askforoverwritefalse
+\generate{\file{doibanner.sty}{\from{doibanner.dtx}{package}}}
+
+\obeyspaces
+\Msg{****************************************************}
+\Msg{* To finish the installation you have to move the *}
+\Msg{* following file into a directory searched by TeX: *}
+\Msg{* *}
+\Msg{* doibanner.sty *}
+\Msg{* *}
+\Msg{* To produce the documentation run the file *}
+\Msg{* bib2qr.dtx through LaTeX. *}
+\Msg{* *}
+\Msg{* Happy TeXing! *}
+\Msg{****************************************************}
+\endbatchfile
+%%
+%% End of file `doibanner.ins'.
+
diff --git a/Master/texmf-dist/source/latex/easybook/easybook.dtx b/Master/texmf-dist/source/latex/easybook/easybook.dtx
index 803ccc09afd..10d1c35ccf0 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/07/15}{2024cs}
+\ProvidesExplClass{easybook}{2024/08/08}{2024di}
{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/07/15}{2024cs}
+\ProvidesExplPackage{easybase}{2024/08/08}{2024di}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -313,7 +313,7 @@
\cs_generate_variant:Nn \seq_set_from_clist:Nn { No }
\cs_generate_variant:Nn \ctex_define:nn { nx }
\cs_generate_variant:Nn \eb_set_hyperref:n { x }
-\cs_generate_variant:Nn \eb_at_begin_environment:nn { on }
+\cs_generate_variant:Nn \eb_at_begin_environment:nn { o }
\cs_generate_variant:Nn \tl_if_novalue:nF { V }
\cs_set_protected:Npn \ctex_define:nn #1
@@ -332,7 +332,7 @@
\clist_map_inline:nn {#1}
{ \AtBeginEnvironment{##1}{#2} }
}
-\cs_new_protected:Npn \eb_at_end_preamble:n
+\cs_set_protected:Npn \ctex_before_end_preamble:n
{ \BeforeBeginEnvironment{document} }
\cs_new_protected:Npn \eb_if_package_loaded:nnF #1#2#3
{
@@ -452,9 +452,9 @@
\seq_set_from_clist:Nn \l__eb_module_paths_seq
{
- tools,font,space,
- bib,thmt,toc,
- hdr,float,ref,geo
+ tools,font,space,bib,
+ thmt,toc,hdr,float,
+ ref,geo,cap
}
\seq_map_inline:Nn \l__eb_module_paths_seq
{
@@ -509,7 +509,6 @@
\ebloadpackage
{
[text]{spbmark},
- [normalem]{ulem},
[{shortlabels,inline}]{enumitem},
chemformula,siunitx,pifont,
geometry,marginnote,
@@ -878,7 +877,7 @@
\str_case:nnF {#1}
{
{ bottom }
- { \bool_set_true:N \l__eb_fnpara_bottom_bool }
+ { \PushFntBottom }
{ flush }
{
\tl_set:Nn \l__eb_footnote_value_tl { plain }
@@ -911,7 +910,6 @@
}
}
-\bool_new:N \l__eb_fnpara_bottom_bool
\tl_new:N \l__eb_fnmarktext_format_tl
\tl_new:N \l__eb_fncustom_format_tl
\clist_new:N \l__eb_footnote_value_clist
@@ -959,7 +957,7 @@
unknown .code:n = \eb_msg_deprecated_option:n { hdr }
}
-\eb_at_end_preamble:n
+\ctex_before_end_preamble:n
{
\bool_if:NT \l__eb_chap_counter_withpart_bool
{ \counterwithin*{chapter}{part} }
@@ -969,58 +967,91 @@
{ page } { \counterwithin*{footnote}{page} }
}
{ \counterwithout*{footnote}{chapter} }
- \eb_fnpara_if_pos_bottom:
}
-\cs_new_protected:Npn \setspread #1 { \linespread{#1}\selectfont }
-\cs_new:Npn \eb@ifvoid #1#2#3 { \ifvoid #1#2\else #3\fi }
-\cs_new_protected:Npn \eb_fnpara_if_pos_bottom:
+
+\def\@if@footnotes@TF #1#2 {\ifvoid\footins #2\else #1\fi}
+\def\@outputbox@removebskip
{
- \bool_if:NT \l__eb_fnpara_bottom_bool
+ \ifx\@textbottom\relax\else
+ \@outputbox@append
+ {
+ \@tempskipa\lastskip
+ \ifnum\gluestretchorder\@tempskipa>\z@
+ \vskip -\@tempskipa
+ \xdef\@outputbox@reinsertbskip
+ {\noexpand\@outputbox@append{\vskip\the\@tempskipa}}
+ \else
+ \global\let\@outputbox@reinsertbskip\relax
+ \fi
+ }
+ \fi
+ }
+\let\@outputbox@reinsertbskip\relax
+\def\@outputbox@append #1
+ {
+ \setbox\@outputbox\vbox
{
- \IfPackageLoadedTF{footmisc}
- {\msg_warning:nn { easybase } { bottom-not-compatible }}
+ \boxmaxdepth\@maxdepth
+ \dimen@\dp\@outputbox
+ \unvbox\@outputbox
+ #1
+ }
+ }
+\def\@outputbox@attachfloats{\@combinefloats}
+\NewHook{makecol/footins/before}
+\NewHook{makecol/footins/begin}
+\def\@outputbox@appendfootnotes
+ {
+ \@if@footnotes@TF
+ {
+ \UseHook{makecol/footins/before}
+ \@outputbox@append
{
- \cs_set:Npn \@makecol
- {
- \setbox\@outputbox\box\@cclv
- \let\@elt\relax
- \xdef\@freelist{\@freelist\@midlist}
- \global\let\@midlist\@empty
- \@combinefloats
- \eb@ifvoid\footins{}
- {
- \setbox\@outputbox\vbox
- {
- \boxmaxdepth\@maxdepth
- \unvbox\@outputbox
- \vfill\relax
- \vskip\skip\footins
- \color@begingroup
- \normalcolor\footnoterule
- \unvbox\footins
- \color@endgroup
- }
- }
- \eb@ifvoid\@kludgeins
- {\@makespecialcolbox}
- {
- \setbox\@outputbox\vbox to\@colht
- {
- \@texttop\dimen@\dp\@outputbox
- \unvbox\@outputbox
- \vskip -\dimen@\@textbottom
- }
- }
- \global\maxdepth\@maxdepth
- }
+ \vskip\skip\footins
+ \UseHook{makecol/footins/begin}
+ \color@begingroup
+ \normalcolor
+ \footnoterule
+ \@nameuse{pdfcolfoot@current}
+ \unvbox\footins
+ \color@endgroup
}
+ }{}
+ }
+\def\@makenormalcolbox
+ {
+ \setbox\@outputbox\vbox to\@colht
+ {
+ \@texttop
+ \dimen@\dp\@outputbox
+ \unvbox\@outputbox
+ \vskip -\dimen@
+ \@textbottom
}
}
-\msg_new:nnn { easybase } { bottom-not-compatible }
+\cs_new_protected:Npn \PushFntBottom
{
- Not~compatible~with~the~'footmisc'~package. \\
- Please~use~the~'bottom'~option~of~'footmisc'~package.
+ \cs_set:Npn \@makecol
+ {
+ \setbox\@outputbox\box\@cclv
+ \@outputbox@removebskip
+ \let\@elt\relax
+ \xdef\@freelist{\@freelist\@midlist}
+ \global\let\@midlist\@empty
+ \@outputbox@attachfloats
+ \@if@footnotes@TF
+ {\@outputbox@append{\vfill}}
+ {\@outputbox@reinsertbskip}
+ \@outputbox@appendfootnotes
+ \ifvbox\@kludgeins
+ \@makespecialcolbox
+ \else
+ \@makenormalcolbox
+ \fi
+ \global\maxdepth\@maxdepth
+ }
}
+\@onlypreamble\PushFntBottom
\cs_new_protected:Npn \eb_footnote_direct_hang:
{
@@ -1076,6 +1107,7 @@
\l__eb_fnpara_format_tl{#1}
\tl_if_eq:NnT \l__eb_footnote_value_tl { hang } { \par }
}
+\cs_new_protected:Npn \setspread #1 { \linespread{#1}\selectfont }
\clist_map_inline:nn { \@footnotetext,\@mpfootnotetext }
{
\eb_patch_cmd:Nnn #1
@@ -1091,12 +1123,12 @@
\ctex_at_end_package:nn { footmisc }
{
\eb_package_date_check:nn { footmisc } { 2022/02/10 }
- \boolfalse{FN@setspace}
- \ifbool{FN@para}{}
+ \ifboolexpr{not (bool {FN@para} or bool {FN@sidefn})}
{
+ \boolfalse{FN@setspace}
\cs_set_eq:NN \@makefntext \eb@@makefntext
\cs_set_eq:NN \@footnotetext \eb@@footnotetext
- }
+ }{}
\ifboolexpr
{
bool {FN@hangfoot} or
@@ -1410,29 +1442,32 @@
\ctex_define:nn { tools }
{
- hyphen-figure .tl_set:N = \l__eb_hyphen_figure_tl,
- hyphen-table .tl_set:N = \l__eb_hyphen_table_tl,
- hyphen-listing .tl_set:N = \l__eb_hyphen_listing_tl,
- hyphen-equation .tl_set:N = \l__eb_hyphen_equation_tl,
- hyphen-every .meta:n =
+ hyphen-figure .tl_set:N = \l__eb_hyphen_figure_tl,
+ hyphen-table .tl_set:N = \l__eb_hyphen_table_tl,
+ hyphen-lstlisting .tl_set:N = \l__eb_hyphen_lstlisting_tl,
+ hyphen-equation .tl_set:N = \l__eb_hyphen_equation_tl,
+ hyphen-every .meta:n =
{
- hyphen-figure = {#1},hyphen-table = {#1},
- hyphen-listing = {#1},hyphen-equation = {#1}
+ hyphen-figure = {#1},hyphen-table = {#1},
+ hyphen-lstlisting = {#1},hyphen-equation = {#1}
},
- hyphen-every .initial:n = .,
- unknown .code:n = \eb_msg_deprecated_option:n { tools }
+ hyphen-every .initial:n = .,
+ unknown .code:n = \eb_msg_deprecated_option:n { tools }
}
-\clist_map_inline:nn
- { figure,table,listing,equation }
+\AtBeginDocument
{
- \cs_set:cpn { the#1 }
+ \clist_map_inline:nn
+ { figure,table,lstlisting,equation }
{
- \int_compare:nNnT { \c@chapter } > { 0 }
+ \cs_set:cpn { the#1 }
{
- \thechapter
- \tl_use:c { l__eb_hyphen_#1_tl }
+ \int_compare:nNnT { \c@chapter } > { 0 }
+ {
+ \thechapter
+ \tl_use:c { l__eb_hyphen_#1_tl }
+ }
+ \int_to_arabic:v { c@#1 }
}
- \int_to_arabic:v { c@#1 }
}
}
@@ -1471,7 +1506,7 @@
\tl_set:Nn \eb@toc@title@level {#1}
\eb_toc_extract_level:
},
- level .initial:e =
+ level .initial:x =
{
\bool_if:NTF \l__eb_class_mode_book_bool
{ \exp_not:N \bichapter* }
@@ -1614,8 +1649,9 @@
{ \protect\numberline{#3}{#4} }
}
}
-\cs_new_protected:Npn \AllotCaptionExt #1#2
+\cs_new_protected:Npn \AssignCaptionExt #1#2
{ \tl_set:cn { ext@#1 } {#2} }
+\cs_set_eq:NN \AllotCaptionExt \AssignCaptionExt
\ctex_define:n
{
bicontentsname .tl_set:N = \bicontentsname,
@@ -1813,6 +1849,8 @@
hang .initial:n = true,
pagenumwd .code:n = \contentsmargin{#1},
pagenumwd .initial:n = 1.55em,
+ fileopen .tl_set:N = \l__eb_fileopen_type_tl,
+ fileopen .initial:n = once,
unknown .code:n = \eb_msg_deprecated_option:n { toc }
}
@@ -1841,10 +1879,14 @@
}
\AddToHook{enddocument/afterlastpage}
{
- \IfHookEmptyTF{starttoc/after}{}
- {\iow_now:Nn \@mainaux { \RemoveFromHook{starttoc/after}[aux] }}
+ \tl_if_eq:NnTF \l__eb_fileopen_type_tl { once }
+ { \iow_now:Nn \@mainaux { \RemoveFromHook{starttoc/after}[*] } }
+ {
+ \IfHookEmptyTF{starttoc/after}{}
+ {\iow_now:Nn \@mainaux { \RemoveFromHook{starttoc/after}[aux] }}
+ }
}
-\cs_set_protected:Npn \AllotPartialExt #1#2
+\cs_set_protected:Npn \AssignPartialExt #1#2
{
\tl_if_exist:cTF { ttl@partial#1 }
{ \msg_warning:nnnn { easybase } { repeated-ptoc } {#1} {#2} }
@@ -1854,12 +1896,13 @@
{\ttl@topartial{#1}{##1}{##2}}
}
}
+\cs_set_eq:NN \AllotPartialExt \AssignPartialExt
\msg_new:nnn { easybase } { repeated-ptoc }
{
Local~directory~file~'#2'~of~directory~type~'#1'~is \\
repeatedly~allocated.
}
-\AllotPartialExt{lol}{pll}
+\AssignPartialExt{lol}{pll}
\cs_new_protected:Npn \RegisterTitleIfname #1
{
@@ -1925,12 +1968,12 @@
}
},
subsection =
- { tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 3.8em } { 1.4em } }
+ { tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 3.8em } { 1.5em } }
}
\ctex_at_end_package:nn { imakeidx }
{
- \RenewDocumentCommand{\printindex}{st+od()}
+ \RenewDocumentCommand{\printindex}{st++o}
{
\group_begin:
\tl_set_eq:NN \eb@toc@title \indexname
@@ -1988,19 +2031,19 @@
\ctex_define:nn { font }
{
- caption-table .tl_set:N = \l__eb_font_caption_table_tl,
- caption-figure .tl_set:N = \l__eb_font_caption_figure_tl,
- caption-listing .tl_set:N = \l__eb_font_caption_listing_tl,
- caption-every .meta:n =
+ caption-table .tl_set:N = \l__eb_font_caption_table_tl,
+ caption-figure .tl_set:N = \l__eb_font_caption_figure_tl,
+ caption-lstlisting .tl_set:N = \l__eb_font_caption_lstlisting_tl,
+ caption-every .meta:n =
{
- caption-table = {#1},caption-figure = {#1},
- caption-listing = {#1}
+ caption-table = {#1},caption-figure = {#1},
+ caption-lstlisting = {#1}
},
- caption-every .initial:n = \sffamily\small,
- footnote .tl_set:N = \eb@font@footnote,
- marginpar .tl_set:N = \marginfont,
- marginpar .initial:n = \footnotesize,
- unknown .code:n = \eb_msg_deprecated_option:n { font }
+ caption-every .initial:n = \sffamily\small,
+ footnote .tl_set:N = \eb@font@footnote,
+ marginpar .tl_set:N = \marginfont,
+ marginpar .initial:n = \footnotesize,
+ unknown .code:n = \eb_msg_deprecated_option:n { font }
}
\cs_new_protected:Npn \ebaddtofont #1#2
{
@@ -2010,13 +2053,13 @@
{ \tl_put_right:Nn \l__eb_font_caption_table_tl {#2} }
{ figure }
{ \tl_put_right:Nn \l__eb_font_caption_figure_tl {#2} }
- { listing }
- { \tl_put_right:Nn \l__eb_font_caption_listing_tl {#2} }
+ { lstlisting }
+ { \tl_put_right:Nn \l__eb_font_caption_lstlisting_tl {#2} }
{ every }
{
\tl_put_right:Nn \l__eb_font_caption_table_tl {#2}
\tl_put_right:Nn \l__eb_font_caption_figure_tl {#2}
- \tl_put_right:Nn \l__eb_font_caption_listing_tl {#2}
+ \tl_put_right:Nn \l__eb_font_caption_lstlisting_tl {#2}
}
{ footnote }
{ \tl_put_right:Nn \eb@font@footnote {#2} }
@@ -2045,7 +2088,7 @@
fntspread .initial:n = 1.2,
captab-spread .fp_set:N = \l__eb_spread_caption_table_fp,
capfig-spread .fp_set:N = \l__eb_spread_caption_figure_fp,
- caplst-spread .fp_set:N = \l__eb_spread_caption_listing_fp,
+ caplst-spread .fp_set:N = \l__eb_spread_caption_lstlisting_fp,
caption-spread .meta:n =
{
captab-spread = {#1},capfig-spread = {#1},
@@ -2085,8 +2128,30 @@
}
\AfterPreamble{\skip_set:Nn \abovedisplayshortskip { 0ex plus .1ex }}
+\cs_new_protected:Npn \eb@register@cap@options #1
+ {
+ \ctex_define:nn { cap }
+ {
+ #1/unknown .code:n =
+ {
+ \use:x
+ {
+ \exp_not:N \captionsetup[#1]
+ { \eb_unknown_kv_handle: }
+ }
+ },
+ #1/unknown .default:V = \c_novalue_tl,
+ #1 .meta:nn = { ctex/cap/#1 } {##1}
+ }
+ }
+\cs_new_protected:Npn \RegisterCapOptions #1
+ {
+ \clist_map_function:nN {#1}
+ \eb@register@cap@options
+ }
+\RegisterCapOptions{table,figure,lstlisting}
\clist_map_inline:nn
- { table,figure,listing }
+ { table,figure,lstlisting }
{
\DeclareCaptionFont{eb@#1@font}
{
@@ -2104,7 +2169,7 @@
}
\captionsetup[table]{font = eb@table@font}
\captionsetup[figure]{font = eb@figure@font}
-\captionsetup[lstlisting]{font = eb@listing@font}
+\captionsetup[lstlisting]{font = eb@lstlisting@font}
\ctex_at_end_package:nn { bicaption }
{
\captionsetup[figure][bi-second]{name = Figure}
@@ -2278,6 +2343,9 @@
\listnumberline{#2}
\thmtname\thmtifnote{~(\thmtnote)}{}
}
+ \cs_gset:cpn { thmt@contentsline@#2 }
+ { \thmt@contentslineIfNamed }
+ \exp_args:Nc \providecommand { p@#2 }[1]{##1}
}
\ctex_define:nn { thmt }
{
@@ -2298,7 +2366,7 @@
\theoremstyle{default}
\cs_undefine:N \proof
\DeclareFloatList{theorem}{loe}
- \AllotPartialExt{loe}{ple}
+ \AssignPartialExt{loe}{ple}
\eb_preto_cmd:nn { listoftheorems }
{
\group_begin:
@@ -2409,7 +2477,7 @@
{ \exp_args:NV \bibliographystyle \l__eb_bib_both_style_tl }
\tl_if_blank:VF \l__eb_bib_cite_style_tl
{ \exp_args:NV \setcitestyle \l__eb_bib_cite_style_tl }
- \NewDocumentCommand{\printbibliography}{st+o}
+ \NewDocumentCommand{\printbibliography}{st++o}
{
\group_begin:
\tl_set_eq:NN \eb@toc@title \bibname
@@ -2457,7 +2525,7 @@
\setcounter{biburllcpenalty}{1}
\setcounter{biburlnumpenalty}{1}
}
-\eb_at_end_preamble:n
+\ctex_before_end_preamble:n
{
\providecommand{\bibname}{\refname}
\clist_if_empty:NF \l__eb_bib_datafile_clist
@@ -2682,9 +2750,101 @@
lstlistingname = Code
}
}
+
+\cs_if_exist:NF \DeclareObjectType
+ { \RequirePackage{xtemplate} }
+\DeclareObjectType{easybook}{0}
+\DeclareTemplateInterface{easybook}{cover}{0}
+ {
+ content : tokenlist = \c_empty_tl,
+ beforecode : tokenlist = \c_empty_tl,
+ aftercode : tokenlist = \c_empty_tl,
+ align : choice {l,r,c,n} = c
+ }
+\DeclareTemplateCode{easybook}{cover}{0}
+ {
+ content = \l__eb_cover_content_tl,
+ beforecode = \l__eb_cover_before_code_tl,
+ aftercode = \l__eb_cover_after_code_tl,
+ align =
+ {
+ l = \cs_set_eq:NN \eb_cover_align: \raggedright,
+ r = \cs_set_eq:NN \eb_cover_align: \raggedleft,
+ c = \cs_set_eq:NN \eb_cover_align: \centering,
+ n = \cs_set:Npn \eb_cover_align: { }
+ }
+ }
+ {
+ \AssignTemplateKeys
+ \tl_use:N \l__eb_cover_before_code_tl
+ \group_begin:
+ \eb_cover_align:
+ \tl_use:N \l__eb_cover_content_tl
+ \tex_par:D
+ \group_end:
+ \tl_use:N \l__eb_cover_after_code_tl
+ }
+\DeclareInstance{easybook}{top}{cover}{}
+\DeclareInstance{easybook}{bottom}{cover}{}
+\DeclareInstance{easybook}{middle}{cover}
+ {
+ content =
+ {
+ \notbool{@titlepage}
+ {
+ \renewcommand{\theupfootnote}{\@fnsymbol\c@footnote}
+ \renewcommand{\thefootnote}{\@fnsymbol\c@footnote}
+ }
+ {}
+ \LARGE\@title\par\vskip 3em
+ \large
+ \begin{tabular}[t]{c}
+ \@author
+ \end{tabular}\par\vskip 1.5em
+ \@date
+ \notbool{@titlepage}{\par\vskip 1.5em}{}
+ \@thanks
+ },
+ beforecode =
+ {
+ \ifbool{@titlepage}
+ {
+ \begin{titlepage}
+ \let\footnotesize\small
+ \let\footnoterule\relax
+ \let\footnote\thanks
+ \null\vfil
+ }
+ {\null}
+ \vskip 60\p@
+ },
+ aftercode =
+ {
+ \ifbool{@titlepage}
+ {
+ \vfil\null
+ \end{titlepage}
+ }
+ {\thispagestyle{plain}}
+ \setcounter{footnote}{0}
+ }
+ }
+\keys_define:nn { eb/cover }
+ {
+ title .tl_set:N = \@title,
+ author .tl_set:N = \@author,
+ date .tl_set:N = \@date
+ }
+\RenewDocumentCommand{\maketitle}{+O{}}
+ {
+ \keys_set:nn { eb/cover } {#1}
+ \UseInstance{easybook}{top}
+ \UseInstance{easybook}{middle}
+ \UseInstance{easybook}{bottom}
+ }
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/07/15}{2024cs}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/08/08}{2024di}
{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..c20c966b8b1 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/23 v4.3.1
%<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,27 @@
% \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}
+% \item % Version 4.3.1, July 23, 2024
+% \begin{itemize}
+% \item Also reset \cs{everypar} to its original \TeX{} value
+% \cs{tex\_everypar:D} in \cs{f@nch@resetpar}, otherwise environments
+% based on \cs{trivlist} will not work properly in \Package{fancyhdr}
+% headers and footers.
+% \end{itemize}
% \end{itemize}
%
%
+%
% \StopEventually{%
% \PrintChanges
% \PrintIndex}
@@ -3648,26 +3677,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 +3777,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 +3802,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 +3838,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 +4011,14 @@
% \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.}
+% \changes{fancyhdr v4.3.1}{2024/07/23}{Also reset \cs{everypar} to its
+% original \TeX{} value \cs{tex\_everypar:D} in \cs{f@nch@resetpar},
+% otherwise environments based on \cs{trivlist}
+% will not work properly in \Package{fancyhdr} headers and footers.}
% 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 +4027,23 @@
\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 \everypar\tex_everypar:D
+ \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 +4079,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 +4098,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 +4248,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 +4344,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 +4383,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 +4695,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 +4724,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/fillwith/fillwith.dtx b/Master/texmf-dist/source/latex/fillwith/fillwith.dtx
new file mode 100644
index 00000000000..c066ac9dade
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fillwith/fillwith.dtx
@@ -0,0 +1,747 @@
+% \iffalse meta-comment
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% fillwith.dtx
+% Additions and changes Copyright (C) 2024 Clea F. Rees.
+% Code from skeleton.dtx Copyright (C) 2015-2024 Scott Pakin (see below).
+%
+% 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 2008-05-04 or later.
+%
+% This work has the LPPL maintenance status \muaintained'.
+%
+% The Current Maintainer of this work is Clea F. Rees.
+%
+% This work consists of all files listed in manifest.txt.
+%
+% The file fillwith.dtx is a derived work under the terms of the
+% LPPL. It is based on version 2.4 of skeleton.dtx which is part of
+% dtxtut by Scott Pakin. A copy of dtxtut, including the
+% unmodified version of skeleton.dtx is available from
+% https://www.ctan.org/pkg/dtxtut and released under the LPPL.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \fi
+%
+% \iffalse
+%<*driver>
+\RequirePackage{svn-prov}
+\ProvidesFileSVN{$Id: fillwith.dtx 10202 2024-08-08 15:33:47Z cfrees $}[v0.3 \revinfo][\filename: \filebase]
+\DefineFileInfoSVN[fillwith]
+\GetFileInfoSVN*
+% ref. ateb Max Chernoff: https://tex.stackexchange.com/a/723294/
+\def\MakePrivateLetters{\makeatletter\ExplSyntaxOn\endlinechar13}
+\documentclass[british,a4paper]{ltxdoc}
+\usepackage{babel}
+\usepackage[tt={monowidth,lining,tabular},sf={lining,proportional},rm={lining,proportional}]{cfr-lm}
+\usepackage{fillwith}
+\usepackage{parskip}
+\usepackage{verbatim}
+\usepackage{graphicx}
+\usepackage{xurl}
+% sicrhau hyperindex=false: llwytho CYN bookmark
+\usepackage{hypdoc}% ateb Ulrike Fischer: https://tex.stackexchange.com/a/695555/
+\usepackage{bookmark}
+\usepackage{cleveref}
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+%^^A \OnlyDescription
+%^^A \ExplSyntaxOn
+%^^A \makeatletter
+\DoNotIndex{\verb,\ProvidesPackageSVN,\NeedsTeXFormat,\ProcessKeyOptions,\ExplSyntaxOn,\ExplSyntaxOff,\RequirePackage,\NeedsTeXFormat,\DefineFileInfoSVN,\GetInfoSVN,\@ifundefined,\@ifl@t@r\ExplLoaderFileDate,\endinput,\PackageError,\PackageWarning,\PackageInfo,\keys_define:nn,\keys_set:nn,\ProcessKeysOptionns,\author,\title,\maketitle,\date,\revinfo,\ProcessKeysOptions,\MessageBreak,\fmtversion,\documentclass,\ExplLoaderFileDate,\filebase,\fileversion,\fileinfo,\filebase:,\filedate,\documentclass,\@ifl@t@r,\begin,\end,\item,\IfFormatAtLeastTF}
+%^^A \makeatother
+%^^A \ExplSyntaxOff
+\definecolor{strawberry}{rgb}{1.000,0.000,0.502}
+\definecolor{blueberry}{rgb}{0.000,0.000,1.000}
+\definecolor{moss}{rgb}{0.000,0.502,0.251}
+\hypersetup{%
+ colorlinks=true,
+ citecolor={moss},
+ extension=pdf,
+ linkcolor={strawberry},
+ linktocpage=true,
+ pdfcreator={TeX},
+ pdfproducer={pdfeTeX},
+ urlcolor={blueberry}%
+}
+\NewDocElement[%
+ idxtype=opt.,
+ idxgroup=options,
+ printtype=\textit{opt.},
+]{Opt}{option}
+\NewDocumentCommand \val { m }
+{%
+ {\ttfamily =\,\meta{#1}}%
+}
+\ExplSyntaxOn
+\NewDocumentCommand \vals { m }
+{
+ {
+ \ttfamily = \,
+ \clist_use:nn { #1 } { \textbar }
+ }
+}
+\ExplSyntaxOff
+\setcounter{IndexColumns}{2}
+\makeatletter
+\def\@xobeysp{\leavevmode\penalty100\ }
+\makeatother
+\begin{document}
+ \DocInput{\filename}
+\end{document}
+%</driver>
+% \fi
+% \title{\filebase{} \filerev}
+% \author{Clea F. Rees}
+% \date{\filedate}
+% \maketitle
+% \begin{abstract}
+% A small package originally based on \href{https://tex.stackexchange.com/a/241139/}{Harish Kumar's answer} to a question I asked on \TeX{} SE\footnote{%
+% See \href{https://tex.stackexchange.com/a/241139/}{tex.stackexchange.com/a/241139/}.%
+% }.
+% The intended purpose was the creation of worksheets for students where I would like \LaTeX{} to use the available vertical space to provide lined areas for answers.
+% Since then, the code has been (partially) rewritten in \pkg{expl3} and extended in response to both my own needs and others' questions on \TeX{} SE.
+% The package aims to do one thing: to fill a vertical space in the same way as, say, \verb|\vfill|, but with some kind of ‘filler’ rather than empty space.
+% Currently, the package supports solid rules or dotted lines.
+% The remainder of the current line may optionally be filled in the same way and the ‘filler’ may be coloured if desired.
+%
+% Lines may optionally be numbered, though the numbered versions should not be used to fill long stretches as they are extremely inefficient.
+% \textbf{Numbered fills are highly experimental and not recommended for use in ‘real’ documents.}
+% That is, it seems to work, but I recommend using an alternative package or solution if you need a reliable numbering mechanism.
+% \end{abstract}
+%
+% \section{Load}\label{sec:pkg}
+% To use the package simply load it in your preamble in the usual way.
+%
+% \iffalse
+%<*verb>
+% \fi
+\begin{verbatim}
+ \usepackage[<options>]{fillwith}
+\end{verbatim}
+% \iffalse
+%</verb>
+% \fi
+%
+% A small number of options may be specified when loading the package.
+% See \cref{sec:config}.
+%
+% We start with an example in \cref{sec:ee}.
+% \Cref{sec:use} describes the basic commands illustrated in this example.
+% \Cref{sec:config} explains the options used by these commands, together with other customisation features of \pkg{fillwith}.
+%
+% \section{Example}\label{sec:ee}
+%
+% The code below illustrates most package features.
+%
+% \Cref{fig:ee1} demonstrates filling with rules.
+% Note the effect of altering \texttt{fillwith ht} on line-spacing.
+% \begin{figure}
+% \centering
+% \fbox{\includegraphics{fillwith-example.pdf}}
+% \caption{Filling with rules.}\label{fig:ee1}
+% \end{figure}
+%
+% \Cref{fig:ee2} shows dotted fillings.
+% Note the use of \cmd{\fillwithset} to alter the colour.
+% \begin{figure}
+% \centering
+% \fbox{\includegraphics[page=2]{fillwith-example.pdf}}
+% \caption{Filling with dotted lines.}\label{fig:ee2}
+% \end{figure}
+%
+% \Cref{fig:ee3} shows numbered fillings.
+% Note the use of \texttt{goal ht} to divide the available vertical space more-or-less equally.
+% \begin{figure}
+% \centering
+% \fbox{\includegraphics[page=3]{fillwith-example.pdf}}
+% \caption{Filling with numbered lines.}\label{fig:ee3}
+% \end{figure}
+%
+% \verbatiminput{fillwith-example.tex}
+%
+% \section{Usage}\label{sec:use}
+%
+% \DescribeMacro{\fillwith}\oarg{options}
+% \DescribeMacro{\fillwith*}
+%
+% Fill vertically with current settings, optionally modified by \meta{options}.
+% See \cref{sec:config} for \meta{options}.
+% If used in the middle of a line, the starred form fills to the end of the line first, whereas the unstarred form does not.
+%
+% \DescribeMacro{\fillwithrules}\oarg{line-spacing}
+% \DescribeMacro{\fillwithrules*}
+%
+% Convenience wrappers which just set \texttt{style = rules} and set the line-spacing to \meta{line-spacing}.
+% These macros do nothing which cannot be done using \cmd{\fillwith} and \cmd{\fillwith*}.
+%
+% \DescribeMacro{\fillwithdottedlines}\oarg{line-spacing}
+% \DescribeMacro{\fillwithdottedlines*}
+%
+% Convenience wrappers which just set \texttt{style = dots} and set the line-spacing to \meta{line-spacing}.
+% These macros do nothing which cannot be done using \cmd{\fillwith} and \cmd{\fillwith*}.
+%
+% \DescribeMacro{\fillwithnolines}\oarg{options}
+% \DescribeMacro{\fillwithnolines*}
+%
+% Fill vertically with current settings, numbering each complete line, after optionally setting \meta{options}.
+% Numbering \textbf{requires} use of these commands, as opposed to the generic \cmd{\fillwith}/\cmd{\fillwith*}.
+%
+% \section{Customisation}\label{sec:config}
+%
+% Options can be set per use, locally or globally.
+% A small number of options are implemented as package options (\cref{sec:pkg}).
+%
+% \DescribeMacro{\fillwithset}\marg{options}
+% Set local or global defaults.
+%
+% \DescribeOpt{colour}\val{colour name}
+% \DescribeOpt{color}
+% \DescribeOpt{lliw}
+%
+% Colour to be used for (solid) rules.
+%
+% Initially \texttt{gray}.
+% Available as a package option.
+%
+% \DescribeOpt{dotted color}\val{colour name}
+% \DescribeOpt{dotted colour}
+%
+% Colour to be used for dotted lines.
+%
+% Initially \texttt{black}.
+% Available as a package option.
+%
+% \DescribeOpt{cont}\vals{true,false}
+%
+% Whether to fill the remainder of any current line.
+% Generally, users will probably prefer to use the starred command forms for local usage, but this option permits modification of the package default on a local or global basis.
+%
+% Initially \texttt{false}.
+% Default is \texttt{true}.
+%
+% \DescribeOpt{fillwith~ht}\val{real positive number expressed as decimal}
+%
+% Multiplication factor for line-spacing.
+% Typically, hand-written content requires greater spacing than typewritten content.
+% This option scales the standard line-spacing.
+%
+% Initially \texttt{2}, which is also the default value.
+% Decimal values such as \texttt{1.5} are permitted.
+%
+% \DescribeOpt{goal ~ ht}\val{dimension}
+%
+% Used only by \cmd{\fillwithnolines} and \cmd{\fillwithnolines*}.
+% Sets the target dimension to fill with numbered lines.
+% If unspecified, the code tries to fill the remaining vertical space on the current page.
+% If more than one use of a \pkg{fillwith} macro is used on a single page, this option \textbf{must} be used for numbered fills to prevent a single instance taking (almost) all available space.
+% In contrast, multiple unnumbered fills can coexist on the same page without issue --- the available space will simply be divided equally between them.
+%
+% Initially unset.
+% No default.
+%
+% \DescribeOpt{no ~ font}\val{font switches}
+%
+% Font switches to apply when typesetting numbers for numbered fills.
+%
+% Initially \cmd{\normalfont}\cmd{\normalsize}, which is also the default value.
+% Note the commands used here should be switches rather than text commands -- for example, use \cmd{\bfseries} rather than \cmd{\textbf} --- since the commands should not expect an argument.
+%
+% \DescribeOpt{style}\vals{rule,dots,line,lines,rules}
+%
+% Style of fill.
+% \texttt{rule}, \texttt{line}, \texttt{rules} and \texttt{lines} are synonyms which all denote solid rules or lines.
+% \texttt{dots} uses dotted lines rather than solid rules.
+% The dots are slightly more densely packed than the standard used for dotted fills by the standard classes, as these seem a bit too widely spaced to provide ideal guidelines.
+%
+% Initially \texttt{dots}, which is also the default value.
+%
+% If an unknown value is used, the code will attempt to use two macros derived from that value.
+% The first is constructed simply by preceding \meta{value} with a backslash and the second by also appending \texttt{part}.
+% For example, if \texttt{style}\val{mystyle} is used, the code will try to use \cs{mystyle} and \cs{mystylepart} for complete and partial lines.
+% In theory, this supports filling with somewhat arbitrary content, but the implementation is untested and \textbf{should not be used in real documents}.
+%
+%
+% \changes{v0.0}{???}{First public release.}
+% \changes{\fileversion}{\filedate}{}
+%
+%
+% \MaybeStop{%
+% \PrintChanges
+% \PrintIndex
+% }
+%
+% \section{Implementation}
+%
+% You do not need to read the remainder of this document in order to install or use the package.
+%
+% \iffalse
+%<@@=fillwith>
+%<*sty>
+% \fi
+% \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}[2021-11-15]
+\RequirePackage{svn-prov}
+\ProvidesPackageSVN[\filebase.sty]{$Id: fillwith.dtx 10202 2024-08-08 15:33:47Z cfrees $}[v0.0 \revinfo][\filebase: fill vertically with non-space]
+% this is needed only because l3doc overwrites \fileversion and \filedate
+% neither ltxdoc nor doc does this
+\DefineFileInfoSVN
+% \end{macrocode}
+% \iffalse
+% ^^A Paid â defnyddio \GetFileInfoSVN*/\GetFileInfoSVN{} yn y fan hon!!
+% \fi
+% \begin{macrocode}
+\RequirePackage{xcolor}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% copied verbatim, excepting format from Joseph Wright's' siunitx.sty under LPPL
+\@ifundefined{ExplLoaderFileDate}{%
+ \RequirePackage{expl3}%
+}{}
+% almost verbatim from siunitx.sty
+\@ifl@t@r\ExplLoaderFileDate{2022-02-24}{%
+}{%
+ \PackageError{fillwith}{Support package expl3 too old}
+ {%
+ You need to update your installation of the bundles 'l3kernel' and
+ 'l3packages'.\MessageBreak
+ Loading~fillwith~will~abort!%
+ }%
+ \endinput
+}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ExplSyntaxOn
+\prop_gput:Nnn \g_msg_module_name_prop { fillwith } { fillwith }
+
+% BEGIN Expl pkg option setup
+
+\keys_define:nn { fillwith }
+{
+ color .meta:n = {
+ colour = #1,
+ },
+ colour .code:n = {
+ \colorlet{fillwithcolour}{#1}
+ },
+ dotted ~ color .meta:n = {
+ dotted colour = #1,
+ },
+ dotted color .meta:n = {
+ dotted colour = #1,
+ },
+ dotted ~ colour .meta:n = {
+ dotted colour = #1,
+ },
+ dotted colour .code:n = {
+ \colorlet{fillwithdottedcolour}{#1}
+ },
+ lliw .meta:n = {
+ colour = #1,
+ },
+ colour .initial:n = gray,
+ dotted colour .initial:n = black,
+}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Joseph Wright: from siunitx.sty ; https://chat.stackexchange.com/transcript/message/64327823#64327823
+\providecommand \IfFormatAtLeastTF { \@ifl@t@r \fmtversion }
+\IfFormatAtLeastTF { 2022-06-01 }
+{
+ \ProcessKeyOptions [ fillwith ]
+}{
+ \RequirePackage { l3keys2e }
+ \ProcessKeysOptions { fillwith }
+}
+\IfFormatAtLeastTF { 2020-10-01 }{
+}{
+ \RequirePackage { xparse }
+ \providecommand \ExpandArgs [1]
+ { \cs_if_exist_use:c { exp_args:N #1 } }
+}
+% END Expl pkg option setup
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% BEGIN vars
+\box_new:N \l__fillwith_adj_rule_box
+\box_new:N \l__fillwith_part_rule_box
+\box_new:N \l__fillwith_tmpa_box
+\box_new:N \l__fillwith_tmpb_box
+% BEGIN coffins
+\coffin_new:N \l__fillwith_line_coffin
+\coffin_new:N \l__fillwith_lines_coffin
+\coffin_new:N \l__fillwith_part_coffin
+\coffin_new:N \l__fillwith_tmpa_coffin
+% END coffins
+% BEGIN dims
+\dim_new:N \l__fillwith_ht_dim
+\dim_new:N \l__fillwith_dp_dim
+\dim_new:N \l__fillwith_rem_dim
+\dim_new:N \l__fillwith_line_ht_dim
+\dim_new:N \l__fillwith_line_adj_hsize_dim
+\dim_set:Nn \l__fillwith_line_ht_dim { 0.4pt }
+\dim_new:N \l__fillwith_line_madj_dim
+\dim_new:N \l__fillwith_line_vadj_dim
+\dim_set_eq:NN \l__fillwith_line_vadj_dim \c_zero_dim
+\dim_new:N \l__fillwith_goal_dim
+\dim_new:N \l__fillwith_tmpa_dim
+% END dims
+\int_new:N \g__fillwith_cnt_int
+% END vars
+% BEGIN fns
+\cs_new_protected_nopar:Nn \__fillwith_style: {}
+\cs_new_protected_nopar:Nn \__fillwith_coffin_tht:N
+{
+ \dim_eval:n { \coffin_ht:N #1 + \coffin_dp:N #1 }
+}
+% BEGIN \__fillwith_hrulefill:
+\cs_new_protected_nopar:Npn \__fillwith_hrulefill_part:
+{
+ \vrule height \c_zero_dim depth \l__fillwith_line_ht_dim width 0.1pt
+}
+\cs_new_protected_nopar:Npn \__fillwith_hrulefill:
+{
+ \vrule height \c_zero_dim depth \l__fillwith_line_ht_dim width \l__fillwith_line_adj_hsize_dim
+}
+% END \__fillwith_hrulefill:
+% BEGIN \__fillwith_dottedfill:
+\cs_new_protected_nopar:Npn \__fillwith_dottedfill_part:
+{
+ \hbox to 0.33em {\hss .\hss}
+}
+\cs_new_protected_nopar:Npn \__fillwith_dottedfill:
+{
+ \leaders \hbox to 0.33em {\hss .\hss} \hfill \kern \c_zero_dim
+}
+% END \__fillwith_dottedfill:
+% END fns
+% \end{macrocode}
+% \begin{macro}{\fillwithset}
+% Wrapper command for configuration.
+% Most global or local customisation will use this as most keys are not valid package options.
+% \begin{macrocode}
+\NewDocumentCommand\fillwithset { +m }{
+ \keys_set:nn { fillwith } { #1 }
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macrocode}
+% BEGIN keys (+)
+\keys_define:nn { fillwith }
+{
+ cont .bool_set:N = \l__fillwith_cont_bool,
+ cont .default:n = true,
+ cont .initial:n = false,
+ fillwith~ht .tl_set:N = \l__fillwith_ht_tl,
+ fillwith~ht .initial:n = 2,
+ fillwith~ht .default:n = 2,
+ goal ~ ht .dim_set:N = \l__fillwith_goal_dim,
+ line nos .bool_set:N = \l__fillwith_nos_bool,
+ line ~ nos .bool_set:N = \l__fillwith_nos_bool,
+ line ~ nos .default:n = true,
+ line ~ nos .initial:n = false,
+ no ~ font .tl_set:N = \l__fillwith_no_font_tl,
+ no ~ font .initial:n = { \normalfont\normalsize },
+ no ~ font .default:n = { \normalfont\normalsize },
+ style .choices:nn =
+ {
+ rule, dots , line , lines , rules , unknown
+ }{
+ \if_case:w \l_keys_choice_int
+ \or: \cs_set_eq:NN \__fillwith_style: \__fillwith_hrulefill:
+ \or: \cs_set_eq:NN \__fillwith_style: \__fillwith_dottedfill:
+ \or: \cs_set_eq:NN \__fillwith_style: \__fillwith_hrulefill:
+ \or: \cs_set_eq:NN \__fillwith_style: \__fillwith_hrulefill:
+ \or: \cs_set_eq:NN \__fillwith_style: \__fillwith_hrulefill:
+ \else: \cs_set_protected_nopar:Nn \__fillwith_style: { \use:c { \l_keys_choice_tl } }
+ \fi:
+ \if_case:w \l_keys_choice_int
+ \or: \cs_set_eq:NN \__fillwith_style_part: \__fillwith_hrulefill_part:
+ \or: \cs_set_eq:NN \__fillwith_style_part: \__fillwith_dottedfill_part:
+ \or: \cs_set_eq:NN \__fillwith_style_part: \__fillwith_hrulefill_part:
+ \or: \cs_set_eq:NN \__fillwith_style_part: \__fillwith_hrulefill_part:
+ \or: \cs_set_eq:NN \__fillwith_style_part: \__fillwith_hrulefill_part:
+ \else: \cs_set_protected_nopar:Nn \__fillwith_style_part: { \use:c { \l_keys_choice_tl part } }
+ \fi:
+ },
+ style .default:n = dots,
+ style .initial:n = dots,
+}
+% END keys (+)
+%
+% BEGIN \__fillwith_fill:
+% ref: https://tex.stackexchange.com/a/241139/ Harish Kumar
+\cs_new_protected_nopar:Nn \__fillwith_fill:
+{
+ \__fillwith_measures:
+ \dim_set:Nn \l__fillwith_line_adj_hsize_dim { \hsize - \@totalleftmargin }
+ \vbox_set:Nn \l__fillwith_adj_rule_box
+ {
+ \parindent=0pt
+ \vrule height \l__fillwith_ht_dim depth \l__fillwith_dp_dim width \c_zero_dim
+ \skip_horizontal:n { \@totalleftmargin }
+ \__fillwith_style:
+ }
+ \if_mode_horizontal:
+ \bool_if:NT \l__fillwith_cont_bool
+ {
+ \leaders \box_use:N \l__fillwith_part_rule_box \hfill \kern \c_zero_dim
+ }{
+ \vrule height \l__fillwith_ht_dim depth \l__fillwith_dp_dim width \c_zero_dim
+ }
+ %^^A gweithio ond erbyn y rheolau
+ %^^A byddai'n achosi draferth, siwr o fod
+ % \tex_par:D
+ %^^A yn lle hynny, ceisio hyn - oes perygl hefyd?
+ \para_raw_end:
+ \else:
+ \unskip
+ \skip_vertical:n { \l__fillwith_dp_dim }
+ \fi:
+ \xleaders \box_use:N \l__fillwith_adj_rule_box \vfill
+ \para_end:
+ \normalcolor
+}
+% END \__fillwith_fill:
+% BEGIN \__fillwith_measures:
+\cs_new_protected_nopar:Nn \__fillwith_measures:
+{
+ \color{fillwithcolour}
+ \offinterlineskip
+ \hbox_set:Nn \l__fillwith_part_rule_box
+ {
+ \strut
+ \__fillwith_style_part:
+ \kern \c_zero_dim
+ }
+ \dim_set:Nn \l__fillwith_tmpa_dim { \box_ht:N \l__fillwith_part_rule_box }
+ \dim_set:Nn \l__fillwith_ht_dim { \l__fillwith_ht_tl \l__fillwith_tmpa_dim }
+ \box_set_ht:Nn \l__fillwith_part_rule_box { \l__fillwith_ht_dim }
+ \dim_set:Nn \l__fillwith_tmpa_dim { \box_dp:N \l__fillwith_part_rule_box }
+ % neu \fp_to_dim:n { \l__fillwith_ht_tl * \l__fillwith_tmpa_dim } ??
+ \dim_set:Nn \l__fillwith_dp_dim { \l__fillwith_ht_tl \l__fillwith_tmpa_dim }
+ \box_set_dp:Nn \l__fillwith_part_rule_box { \l__fillwith_dp_dim }
+}
+% END \__fillwith_measures:
+% BEGIN fillwith
+% \end{macrocode}
+% \begin{macro}{\fillwith}
+% The package is basically this macro.
+% \begin{macrocode}
+\NewDocumentCommand \fillwith { s o }
+{
+ \group_begin:
+ \IfValueT { #2 }
+ {
+ \keys_set:nn { fillwith } { #2 }
+ }
+ \IfBooleanTF { #1 }
+ {
+ \bool_set_true:N \l__fillwith_cont_bool
+ }{
+ \bool_set_false:N \l__fillwith_cont_bool
+ }
+ \__fillwith_fill:
+ \group_end:
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macrocode}
+% END fillwith
+% BEGIN fillwithrules
+% \end{macrocode}
+% \begin{macro}{\fillwithrules}
+% Simple convenience wrapper with simplified syntax for (solid) rules.
+% \begin{macrocode}
+\NewDocumentCommand \fillwithrules { s O { 2 } }
+{
+ \group_begin:
+ \IfBooleanTF { #1 }
+ {
+ \bool_set_true:N \l__fillwith_cont_bool
+ }{
+ \bool_set_false:N \l__fillwith_cont_bool
+ }
+ \keys_set:nn { fillwith } { style = rules, fillwith~ht=#2 }
+ \__fillwith_fill:
+ \group_end:
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macrocode}
+% END fillwithrules
+% BEGIN fillwithdottedlines
+% \end{macrocode}
+% \begin{macro}{\fillwithdottedlines}
+% Simple convenience wrapper with simplified syntax for dotted lines.
+% \begin{macrocode}
+\NewDocumentCommand \fillwithdottedlines { s O { 2 } }
+{
+ \group_begin:
+ \IfBooleanTF { #1 }
+ {
+ \bool_set_true:N \l__fillwith_cont_bool
+ }{
+ \bool_set_false:N \l__fillwith_cont_bool
+ }
+ \colorlet{fillwithcolour}{fillwithdottedcolour}
+ \keys_set:nn { fillwith } { style = dots, fillwith~ht=#2 }
+ \__fillwith_fill:
+ \group_end:
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macrocode}
+% END fillwithdottedlines
+% BEGIN fillwithnolines
+\cs_new_protected:Nn \__fillwith_nos: % rhybudd: ARAF ! SLOW!
+{
+ \parindent=0pt
+ \__fillwith_measures:
+ \dim_set_eq:NN \l__fillwith_line_adj_hsize_dim \linewidth
+ \vcoffin_set:Nnn \l__fillwith_line_coffin { \l__fillwith_line_adj_hsize_dim }
+ {
+ \parindent=0pt
+ \vrule height \l__fillwith_ht_dim depth \l__fillwith_dp_dim width \c_zero_dim
+ \skip_horizontal:n \c_zero_skip
+ \__fillwith_style:
+ }
+ \coffin_set_eq:NN \l__fillwith_lines_coffin \l__fillwith_line_coffin
+ \if_mode_horizontal:
+ \bool_if:NTF \l__fillwith_cont_bool
+ {
+ \leaders \box_use:N \l__fillwith_part_rule_box \hfill \kern \c_zero_dim
+ \int_gincr:N \g__fillwith_cnt_int
+ % \vcoffin_set:Nnn \l__fillwith_tmpa_coffin { 1.5em}
+ % {
+ % \l__fillwith_no_font_tl \int_to_arabic:n { \g__fillwith_cnt_int }
+ % }
+ % \coffin_mark_handle:Nnnn \l__fillwith_tmpa_coffin {B} {l} { red }
+ % \coffin_mark_handle:Nnnn \l__fillwith_tmpa_coffin {b} {l} { green }
+ % \coffin_attach:NnnNnnnn \l__fillwith_lines_coffin {B} {r} \l__fillwith_tmpa_coffin {B} {l} {2.5pt} { \l__fillwith_ht_dim + \l__fillwith_dp_dim }
+ % \coffin_mark_handle:Nnnn \l__fillwith_lines_coffin {T} {r} { blue }
+ % \coffin_mark_handle:Nnnn \l__fillwith_lines_coffin {t} {r} { magenta }
+ \dim_set:Nn \l__fillwith_line_vadj_dim { \l__fillwith_dp_dim }
+ }{
+ \vrule height \l__fillwith_ht_dim depth \l__fillwith_dp_dim width \c_zero_dim
+ }
+ \dim_set:Nn \l__fillwith_line_madj_dim { \@totalleftmargin }
+ \para_raw_end:
+ \else:
+ \dim_set_eq:NN \l__fillwith_line_madj_dim \c_zero_dim
+ \unskip
+ \skip_vertical:n { \l__fillwith_dp_dim }
+ \fi:
+ \int_gincr:N \g__fillwith_cnt_int
+ \vcoffin_set:Nnn \l__fillwith_tmpa_coffin { 1.5em}
+ {
+ \l__fillwith_no_font_tl \int_to_arabic:n { \g__fillwith_cnt_int }
+ }
+ \coffin_attach:NnnNnnnn \l__fillwith_lines_coffin {B} {r} \l__fillwith_tmpa_coffin {B} {l} {2.5pt} {\c_zero_dim}
+ \dim_set:Nn \l__fillwith_rem_dim
+ {
+ \l__fillwith_goal_dim -\footskip - \pagetotal
+ }
+ \dim_until_do:nNnn { \__fillwith_coffin_tht:N \l__fillwith_lines_coffin } > { \l__fillwith_rem_dim - \l__fillwith_ht_dim - \l__fillwith_dp_dim }
+ {
+ \coffin_join:NnnNnnnn \l__fillwith_lines_coffin { b } { l } \l__fillwith_line_coffin { t } { l } { \c_zero_dim } { \c_zero_dim }
+ \int_gincr:N \g__fillwith_cnt_int
+ \vcoffin_set:Nnn \l__fillwith_tmpa_coffin {1.5em}
+ {
+ \l__fillwith_no_font_tl \int_to_arabic:n { \g__fillwith_cnt_int }
+ }
+ \coffin_attach:NnnNnnnn \l__fillwith_lines_coffin {B} {r} \l__fillwith_tmpa_coffin {B} {l} {2.5pt} {\c_zero_dim}
+ }
+ \coffin_typeset:Nnnnn \l__fillwith_lines_coffin { B } { l } { \l__fillwith_line_madj_dim } { \l__fillwith_line_vadj_dim }
+ \para_end:
+ \normalcolor
+}
+% \end{macrocode}
+% \begin{macro}{\fillwithnolines}
+% Provisional experimental macro for numbered fill.
+% \begin{macrocode}
+\NewDocumentCommand \fillwithnolines { s O { } }
+{
+ \group_begin:
+ \IfBooleanTF { #1 }
+ {
+ \bool_set_true:N \l__fillwith_cont_bool
+ }{
+ \bool_set_false:N \l__fillwith_cont_bool
+ }
+ \keys_set:nn { fillwith } { goal ~ ht = \pagegoal, #2 }
+ \__fillwith_nos:
+ \group_end:
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macrocode}
+% END fillwithnolines
+\ExplSyntaxOff
+% \end{macrocode}
+% \iffalse
+%</sty>
+% \fi
+%
+% \subsection{Demonstration}
+%
+% Simple example to demonstrate usage.
+%
+% \iffalse
+%<*ee>
+% \fi
+% \begin{macrocode}
+\listfiles
+\documentclass[british,a6paper]{article}
+\usepackage{babel}
+\usepackage[scale=.85,marginparwidth=0pt,marginparsep=0pt]{geometry}
+\usepackage{fillwith}
+\usepackage{cfr-lm}
+\begin{document}
+\author{A. N. Author}
+\title{\texttt{fillwith} Demo}
+\maketitle
+\begin{enumerate}
+ \item What is the answer to the question?
+ \fillwithrules
+ \item How did you answer the previous question?
+ \fillwith*[style=line]
+ \item Why answer?
+
+ \fillwith*[style=rule,fillwith ht=1.25,colour=blue!40!cyan]
+ \clearpage
+ \item Evaluate your responses so far.
+ \fillwithdottedlines
+ \item Evaluate your responses so far.
+
+ {%
+ \fillwithset{dotted colour=magenta}%
+ \fillwithdottedlines[1.5]
+ }
+ \item Criticise your evaluation.
+ \fillwithdottedlines*
+ \clearpage
+ \item Assess your answers.
+ \fillwithnolines[goal ht = .33\textheight]
+ \item Assess your answers.
+
+ \fillwithnolines[style=rules,no font=\bfseries\tiny,colour=green!50!gray,goal ht = .67\textheight]
+ \item Summarise your analysis.
+ \fillwithnolines*
+\end{enumerate}
+
+\end{document}
+% \end{macrocode}
+% \iffalse
+%</ee>
+% \fi
+% \subsection{Other}
+% \iffalse
+%<*other>
+% \fi
+% \begin{macrocode}
+% \end{macrocode}
+% \iffalse
+%</other>
+% \fi
+%\Finale
diff --git a/Master/texmf-dist/source/latex/fillwith/fillwith.ins b/Master/texmf-dist/source/latex/fillwith/fillwith.ins
new file mode 100644
index 00000000000..2f7f4c576cd
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fillwith/fillwith.ins
@@ -0,0 +1,68 @@
+%% $Id: fillwith.ins 10202 2024-08-08 15:33:47Z cfrees $
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% fillwith.ins
+%% Additions and changes Copyright (C) 2024 Clea F. Rees.
+%% Code from skeleton.ins Copyright (C) 2015-2024 Scott Pakin (see below).
+%%
+%% 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 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This work consists of all files listed in manifest.txt.
+%%
+%% The file fillwith.ins is a derived work under the terms of the
+%% LPPL. It is based on version 2.4 of skeleton.ins which is part of
+%% dtxtut by Scott Pakin. A copy of dtxtut, including the
+%% unmodified version of skeleton.ins is available from
+%% https://www.ctan.org/pkg/dtxtut and released under the LPPL.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\input docstrip.tex
+\keepsilent
+
+%% ???
+\usedir{tex/latex/fillwith}
+
+\declarepreamble\safonol
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Copyright (C) 2024 Clea F. Rees.
+
+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 2008-05-04 or later.
+
+This work has the LPPL maintenance status `maintained'.
+
+The Current Maintainer of this work is Clea F. Rees.
+
+This file may only be distributed together with a copy of the package
+fillwith. You may however distribute the package fillwith without
+such generated files.
+
+This work consists of all files listed in manifest.txt.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\endpreamble
+
+% \askonceonly
+\askforoverwritefalse
+
+\usepreamble\safonol
+
+\generate{\file{fillwith.sty}{\from{fillwith.dtx}{sty}}
+ \file{fillwith-example.tex}{\from{fillwith.dtx}{ee}}
+}
+
+
+\endbatchfile
diff --git a/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx b/Master/texmf-dist/source/latex/hypcap/hypcap.dtx
index a9bb106fe3d..ef7538e91e2 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx
+++ b/Master/texmf-dist/source/latex/hypcap/hypcap.dtx
@@ -1,13 +1,13 @@
% \iffalse meta-comment
%
% File: hypcap.dtx
-% Version: 2016/05/16 v1.12
+% Version: 2024-07-26 v1.13
% Info: Adjusting the anchors of captions
%
% Copyright (C)
% 1999-2001, 2006-2008, 2011 Heiko Oberdiek
-% 2016-2019 Oberdiek Package Support Group
-% https://github.com/ho-tex/oberdiek/issues
+% 2016-2024 Oberdiek Package Support Group
+% https://github.com/ho-tex/hypcap/issues
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -23,15 +23,15 @@
%
% The Current Maintainers of this work are
% Heiko Oberdiek and the Oberdiek Package Support Group
-% https://github.com/ho-tex/oberdiek/issues
+% https://github.com/ho-tex/hypcap/issues
%
% This work consists of the main source file hypcap.dtx
% and the derived files
% hypcap.sty, hypcap.pdf, hypcap.ins, hypcap.drv.
%
% Distribution:
-% CTAN:macros/latex/contrib/oberdiek/hypcap.dtx
-% CTAN:macros/latex/contrib/oberdiek/hypcap.pdf
+% CTAN:macros/latex/contrib/hypcap/hypcap.dtx
+% CTAN:macros/latex/contrib/hypcap/hypcap.pdf
%
% Unpacking:
% (a) If hypcap.ins is present:
@@ -52,7 +52,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex hypcap.dtx
% makeindex -s gind.ist hypcap.idx
% pdflatex hypcap.dtx
@@ -60,9 +60,9 @@
% pdflatex hypcap.dtx
%
% Installation:
-% TDS:tex/latex/oberdiek/hypcap.sty
-% TDS:doc/latex/oberdiek/hypcap.pdf
-% TDS:source/latex/oberdiek/hypcap.dtx
+% TDS:tex/latex/hypcap/hypcap.sty
+% TDS:doc/latex/hypcap/hypcap.pdf
+% TDS:source/latex/hypcap/hypcap.dtx
%
%<*ignore>
\begingroup
@@ -79,7 +79,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: hypcap 2016/05/16 v1.12 Adjusting the anchors of captions (HO)}
+\Msg{* Package: hypcap 2024-07-26 v1.13 Adjusting the anchors of captions (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -91,11 +91,11 @@
This is a generated file.
Project: hypcap
-Version: 2016/05/16 v1.12
+Version: 2024-07-26 v1.13
Copyright (C)
1999-2001, 2006-2008, 2011 Heiko Oberdiek
- 2016-2019 Oberdiek Package Support Group
+ 2016-2024 Oberdiek Package Support Group
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -111,7 +111,7 @@ This work has the LPPL maintenance status "maintained".
The Current Maintainers of this work are
Heiko Oberdiek and the Oberdiek Package Support Group
-https://github.com/ho-tex/oberdiek/issues
+https://github.com/ho-tex/hypcap/issues
This work consists of the main source file hypcap.dtx
@@ -124,7 +124,7 @@ and the derived files
\generate{%
\file{hypcap.ins}{\from{hypcap.dtx}{install}}%
\file{hypcap.drv}{\from{hypcap.dtx}{driver}}%
- \usedir{tex/latex/oberdiek}%
+ \usedir{tex/latex/hypcap}%
\file{hypcap.sty}{\from{hypcap.dtx}{package}}%
}
@@ -152,7 +152,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{hypcap.drv}%
- [2016/05/16 v1.12 Adjusting the anchors of captions (HO)]%
+ [2024-07-26 v1.13 Adjusting the anchors of captions (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2011/11/22]
\begin{document}
@@ -166,9 +166,9 @@ and the derived files
% \GetFileInfo{hypcap.drv}
%
% \title{The \xpackage{hypcap} package}
-% \date{2016/05/16 v1.12}
+% \date{2024-07-26 v1.13}
% \author{Heiko Oberdiek\thanks
-% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
+% {Please report any issues at \url{https://github.com/ho-tex/hypcap/issues}}}
%
% \maketitle
%
@@ -301,7 +301,7 @@ and the derived files
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hypcap}%
- [2016/05/16 v1.12 Adjusting the anchors of captions (HO)]
+ [2024-07-26 v1.13 Adjusting the anchors of captions (HO)]
% \end{macrocode}
%
% For unique command names this package uses |hc@| as prefix
@@ -461,7 +461,7 @@ and the derived files
\capstart
}{%
\if@capstart
- \PackageError{hypcap}{You have forgotten to use \string\caption}%
+ \PackageWarning{hypcap}{You have forgotten to use \string\caption}%
\global\@capstartfalse
\else
\fi
@@ -497,31 +497,11 @@ and the derived files
% \paragraph{Package.} This package is available on
% CTAN\footnote{\CTANpkg{hypcap}}:
% \begin{description}
-% \item[\CTAN{macros/latex/contrib/oberdiek/hypcap.dtx}] The source file.
-% \item[\CTAN{macros/latex/contrib/oberdiek/hypcap.pdf}] Documentation.
+% \item[\CTAN{macros/latex/contrib/hypcap/hypcap.dtx}] The source file.
+% \item[\CTAN{macros/latex/contrib/hypcap/hypcap.pdf}] Documentation.
% \end{description}
%
%
-% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
-% are also available in a TDS compliant ZIP archive. There
-% the packages are already unpacked and the documentation files
-% are generated. The files and directories obey the TDS standard.
-% \begin{description}
-% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
-% \end{description}
-% \emph{TDS} refers to the standard ``A Directory Structure
-% for \TeX\ Files'' (\CTANpkg{tds}). Directories
-% with \xfile{texmf} in their name are usually organized this way.
-%
-% \subsection{Bundle installation}
-%
-% \paragraph{Unpacking.} Unpack the \xfile{oberdiek.tds.zip} in the
-% TDS tree (also known as \xfile{texmf} tree) of your choice.
-% Example (linux):
-% \begin{quote}
-% |unzip oberdiek.tds.zip -d ~/texmf|
-% \end{quote}
-%
% \subsection{Package installation}
%
% \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
@@ -537,9 +517,9 @@ and the derived files
% \begin{quote}
% \def\t{^^A
% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
-% hypcap.sty & tex/latex/oberdiek/hypcap.sty\\
-% hypcap.pdf & doc/latex/oberdiek/hypcap.pdf\\
-% hypcap.dtx & source/latex/oberdiek/hypcap.dtx\\
+% hypcap.sty & tex/latex/hypcap/hypcap.sty\\
+% hypcap.pdf & doc/latex/hypcap/hypcap.pdf\\
+% hypcap.dtx & source/latex/hypcap/hypcap.dtx\\
% \end{tabular}^^A
% }^^A
% \sbox0{\t}^^A
@@ -718,6 +698,9 @@ and the derived files
% \item
% Documentation updates.
% \end{Version}
+% \begin{Version}{2024-07-26 v1.13}
+% \item Change error into warning, issue \#1
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/iwonamath/Makefile b/Master/texmf-dist/source/latex/iwonamath/Makefile
index 5b8322bf33a..fcac414a151 100644
--- a/Master/texmf-dist/source/latex/iwonamath/Makefile
+++ b/Master/texmf-dist/source/latex/iwonamath/Makefile
@@ -48,6 +48,7 @@ all: ${PDF} $(PACKAGE).sty $(FD)
pdflatex $<
- bibtex $*
pdflatex $<
+ pdflatex $<
while ( grep -q '^LaTeX Warning: Label(s) may have changed' $*.log) \
do pdflatex $<; done
@@ -64,7 +65,8 @@ clean:
*.ilg *.ind *.out *.lof \
*.lot *.bbl *.blg *.gls \
*.dvi *.ps *.thm *.tgz *.zip *.rpi \
- *.hd sample-blx.bib
+ *.hd sample-blx.bib \
+ omsiwonamathcmsy.fd *.sty
distclean: clean
@@ -75,7 +77,7 @@ distclean: clean
#
archive: all clean
COPYFILE_DISABLE=1 \
- tar -C .. -czvf ../$(PACKAGE).tgz --exclude '*~' \
+ tar -C .. -czvf ../$(PACKAGE).tgz --exclude '*~' --exclude LICENSE \
--exclude '*.tgz' --exclude '*.zip' --exclude .git $(PACKAGE)
mv ../$(PACKAGE).tgz .
diff --git a/Master/texmf-dist/source/latex/iwonamath/iwonamath.dtx b/Master/texmf-dist/source/latex/iwonamath/iwonamath.dtx
index 020c8d6ad08..38aebd666a7 100644
--- a/Master/texmf-dist/source/latex/iwonamath/iwonamath.dtx
+++ b/Master/texmf-dist/source/latex/iwonamath/iwonamath.dtx
@@ -141,7 +141,7 @@
%<oms>{oms_FAMILY_.fd}
%<omx>{omx_FAMILY_.fd}
%<cmsy>{omsiwonamathcmsy.fd}
-%<package|fd>{2023-08-31} {1.0}
+%<package|fd>{2024-07-19} {1.1}
%<package|fd>{Scaled Iwona math fonts}
%<*package>
% \end{macrocode}
@@ -233,7 +233,8 @@
%
% We add delimiters from |cmsy|, as discussed in
% \citep[\S~12.5.5]{TLC3}). We predefine the symbols for the standard
-% versions just in case.
+% versions just in case. The last line is suggested by Enrico
+% Gregorio.
% \begin{macrocode}
\bool_if:NTF \l_@@_delimitershack_bool
{
@@ -241,6 +242,7 @@
\SetSymbolFont{symbols2} {bold}{OMS}{cmsy}{b}{n}
\DeclareMathDelimiter{\lVert}{\mathopen} {symbols2}{"6B}{largesymbols}{"0D}
\DeclareMathDelimiter{\rVert}{\mathclose}{symbols2}{"6B}{largesymbols}{"0D}
+ \DeclareMathDelimiter{\|}{\mathclose}{symbols2}{"6B}{largesymbols}{"0D}
}
{}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
index 4b4e61d3c8b..64c65d0ff76 100644
--- a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
@@ -24,7 +24,7 @@
%
%<*driver|generic|package|2ekernel>
%</driver|generic|package|2ekernel>
-\def\ExplFileDate{2024-05-27}%
+\def\ExplFileDate{2024-07-20}%
%<*driver>
\documentclass[full]{l3doc}
\usepackage{graphicx}
@@ -51,7 +51,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx b/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx
index 69e44415804..ad15d79653e 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3bitset.dtx b/Master/texmf-dist/source/latex/l3kernel/l3bitset.dtx
index 4559b56fd3a..2b62c68b4a0 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3bitset.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3bitset.dtx
@@ -42,7 +42,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx b/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx
index 861f0bb5a62..7f4eba752be 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3box.dtx b/Master/texmf-dist/source/latex/l3kernel/l3box.dtx
index 808d22da232..532ec6a7d8e 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3box.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3box.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -906,9 +906,9 @@
% \begin{syntax}
% \cs{box_set_trim:Nnnnn} \meta{box} \Arg{left} \Arg{bottom} \Arg{right} \Arg{top}
% \end{syntax}
-% Adjusts the bounding box of the \meta{box} \meta{left} is removed from
+% Adjusts the bounding box of the \meta{box}: \meta{left} is removed from
% the left-hand edge of the bounding box, \meta{right} from the right-hand
-% edge and so fourth. All adjustments are \meta{dim exprs}.
+% edge, and so forth. All adjustments are \meta{dim exprs}.
% Material outside of the bounding box is still displayed in the output
% unless \cs{box_set_clipped:N} is subsequently applied.
% The updated \meta{box} is an
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3cctab.dtx b/Master/texmf-dist/source/latex/l3kernel/l3cctab.dtx
index 4bf8db41a68..92f134aa934 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3cctab.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3cctab.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx b/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx
index 5adb01cffb6..f8d1eeaea8f 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -324,8 +324,10 @@
% {
% \clist_remove_all:Nn, \clist_remove_all:cn,
% \clist_remove_all:NV, \clist_remove_all:cV,
+% \clist_remove_all:Ne, \clist_remove_all:ce,
% \clist_gremove_all:Nn, \clist_gremove_all:cn,
% \clist_gremove_all:NV, \clist_gremove_all:cV
+% \clist_gremove_all:Ne, \clist_gremove_all:ce
% }
% \begin{syntax}
% \cs{clist_remove_all:Nn} \meta{clist~var} \Arg{item}
@@ -1429,13 +1431,15 @@
% \begin{macro}
% {
% \clist_remove_all:Nn, \clist_remove_all:cn,
-% \clist_remove_all:NV, \clist_remove_all:cV
+% \clist_remove_all:NV, \clist_remove_all:cV,
+% \clist_remove_all:Ne, \clist_remove_all:ce
% }
% \UnitTested
% \begin{macro}
% {
% \clist_gremove_all:Nn, \clist_gremove_all:cn,
-% \clist_gremove_all:NV, \clist_gremove_all:cV
+% \clist_gremove_all:NV, \clist_gremove_all:cV,
+% \clist_gremove_all:Ne, \clist_gremove_all:ce
% }
% \UnitTested
% \begin{macro}{\@@_remove_all:NNNn}
@@ -1509,8 +1513,8 @@
\cs_new:Npn \@@_remove_all:
{ \exp_after:wN \@@_remove_all:w \@@_tmp:w , }
\cs_new:Npn \@@_remove_all:w #1 , \s_@@_mark , #2 , { \exp_not:n {#1} }
-\cs_generate_variant:Nn \clist_remove_all:Nn { c , NV , cV }
-\cs_generate_variant:Nn \clist_gremove_all:Nn { c , NV , cV }
+\cs_generate_variant:Nn \clist_remove_all:Nn { c , NV , cV , Ne , ce }
+\cs_generate_variant:Nn \clist_gremove_all:Nn { c , NV , cV , Ne , ce }
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx b/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
index 62dc5f92ad3..afbd1bd3945 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3color.dtx b/Master/texmf-dist/source/latex/l3kernel/l3color.dtx
index b56fb9e0ac2..117a468d218 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3color.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3color.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -103,7 +103,7 @@
% \begin{itemize}
% \item \texttt{Gray} Grayscale color, with a single axis running from
% $0$ (fully black) to $15$ (fully white)
-% \item \texttt{hsb} Hue-saturation-brightness color, with three axes,all
+% \item \texttt{hsb} Hue-saturation-brightness color, with three axes, all
% real values in the range $[0,1]$ for hue saturation and brightness
% \item \texttt{Hsb} Hue-saturation-brightness color, with three axes, integer
% in the range $[0,360]$ for hue, real values in the range $[0,1]$ for
@@ -406,20 +406,20 @@
%
% \begin{function}{\color_export:nnN}
% \begin{syntax}
-% \cs{color_export:nnN} \Arg{color expression} \Arg{format} \Arg{tl}
+% \cs{color_export:nnN} \Arg{color expression} \Arg{format} \meta{tl var}
% \end{syntax}
% Parses the \meta{color expression} as described earlier,
% then converts to the \meta{format} specified and assigns the data to the
-% \meta{tl}.
+% \meta{tl var}.
% \end{function}
%
% \begin{function}{\color_export:nnnN}
% \begin{syntax}
-% \cs{color_export:nnnN} \Arg{model} \Arg{value(s)} \Arg{format} \Arg{tl}
+% \cs{color_export:nnnN} \Arg{model} \Arg{value(s)} \Arg{format} \meta{tl var}
% \end{syntax}
% Expresses the combination of \meta{model} and \meta{value(s)} in an
% internal representation, then converts to the \meta{format} specified and
-% assigns the data to the \meta{tl}.
+% assigns the data to the \meta{tl var}.
% \end{function}
%
% \section{Creating new color models}
@@ -495,7 +495,7 @@
%
% Color profiles are used to ensure color accuracy by linking to collaboration.
% Applying a profile can be used to standardise color which is otherwise
-% device-dependence.
+% device-dependent.
%
% \begin{function}[added = 2021-02-23]{\color_profile_apply:nn}
% \begin{syntax}
@@ -697,14 +697,14 @@
% \begin{macro}{\@@_convert:nnnN, \@@_convert:nVnN, \@@_convert:nnVN}
% \begin{macro}[EXP]
% {
-% \@@_convert_gray_gray:w
-% \@@_convert_gray_rgb:w
-% \@@_convert_gray_cmyk:w
-% \@@_convert_cmyk_gray:w
-% \@@_convert_cmyk_rgb:w
-% \@@_convert_cmyk_cmyk:w
-% \@@_convert_rgb_gray:w
-% \@@_convert_rgb_rgb:w
+% \@@_convert_gray_gray:w,
+% \@@_convert_gray_rgb:w,
+% \@@_convert_gray_cmyk:w,
+% \@@_convert_cmyk_gray:w,
+% \@@_convert_cmyk_rgb:w,
+% \@@_convert_cmyk_cmyk:w,
+% \@@_convert_rgb_gray:w,
+% \@@_convert_rgb_rgb:w,
% \@@_convert_rgb_cmyk:w
% }
% \begin{macro}[EXP]{\@@_convert_rgb_cmyk:nnn}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3debug.dtx b/Master/texmf-dist/source/latex/l3kernel/l3debug.dtx
index 21e6747a844..4e578ee9b6d 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3debug.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3debug.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -69,7 +69,7 @@
%
% Standard file identification.
% \begin{macrocode}
-\ProvidesExplFile{l3debug.def}{2024-05-27}{}{L3 Debugging support}
+\ProvidesExplFile{l3debug.def}{2024-07-20}{}{L3 Debugging support}
% \end{macrocode}
%
% \begin{variable}{\s_@@_stop}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx b/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx
index 5852205ddca..697f235311a 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -505,10 +505,10 @@
{ \text_uppercase:nn {#1} {#2} }
\__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \text_titlecase_first:n }
\cs_new:Npn \tl_mixed_case:n #1
- { \text_titlecase_first:n {#1} }
+ { \text_titlecase_first:n { \text_lowercase:n {#1} } }
\__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \text_titlecase_first:nn }
\cs_new:Npn \tl_mixed_case:nn #1#2
- { \text_titlecase_first:nn {#1} {#2} }
+ { \text_titlecase_first:nn {#1} { \text_lowercase:n {#2} } }
% \end{macrocode}
% \end{macro}
%
@@ -571,7 +571,7 @@
% \char_lower_case:N, \char_upper_case:N,
% \char_mixed_case:Nn, \char_fold_case:N,
% \char_str_lower_case:N, \char_str_upper_case:N,
-% \char_str_mixed_case:Nn, \char_str_fold_case:N,
+% \char_str_mixed_case:N, \char_str_fold_case:N,
% }
% \begin{macrocode}
\__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \text_lowercase:n }
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
index 43b719ce592..751d4f4e145 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
@@ -71,7 +71,7 @@ and all files in that bundle must be distributed together.
% This isn't included in the typeset documentation because it's a bit
% ugly:
%<*class>
-\ProvidesExplClass{l3doc}{2024-05-27}{}
+\ProvidesExplClass{l3doc}{2024-07-20}{}
{L3 Experimental documentation class}
%</class>
% \fi
@@ -84,7 +84,7 @@ and all files in that bundle must be distributed together.
% require you to do updates, if the class changes.}}
%
% \author{\Team}
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
% \maketitle
% \tableofcontents
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx b/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx
index fecb228324e..199801ff3b1 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx
@@ -63,7 +63,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx b/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx
index d13578bde1b..499c94587e4 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
index 546222711e1..039c4eecb8e 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx b/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx
index 88e726df354..690347426f7 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx
index e6fa97423e5..e1b3bc788b0 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx
@@ -42,7 +42,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
% \maketitle
%
% \begin{documentation}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx
index 1ad33e235e4..4c39e81f461 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx
index e2d93219b0f..a93ff90291b 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx
@@ -42,7 +42,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx
index 4983a3dd1fa..9b5b66f8151 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx
index 7577f640d40..e9dcdf66467 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx
@@ -42,7 +42,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx
index 596dc86ef2c..24f1e5c1279 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx
@@ -42,7 +42,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-functions.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-functions.dtx
index b9e269b988b..2c5eb9602ff 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-functions.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-functions.dtx
@@ -42,7 +42,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx
index 486a3bc579b..9d39f4f67e7 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx
@@ -42,7 +42,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx
index 7853c401327..191ab2755c6 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx
@@ -42,7 +42,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx
index ff999926aba..dd407047197 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx
@@ -42,7 +42,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx
index 0d39b8a26a1..ad209342152 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-symbolic.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-symbolic.dtx
index 88e214f49e1..8223419f66d 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-symbolic.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-symbolic.dtx
@@ -42,7 +42,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx
index fec48bc1634..7f22a2d137f 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx
@@ -42,7 +42,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
% \maketitle
%
% \begin{documentation}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx
index 7c40c6198fa..b7b67c94457 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx
@@ -42,7 +42,7 @@
% {latex-team@latex-project.org}^^A
% }^^A
% }
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-types.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-types.dtx
index e9269e1f038..d969f76bdc5 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp-types.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-types.dtx
@@ -42,7 +42,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx
index d273b057eab..8e37a55799e 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -773,7 +773,7 @@
% The result may contain other functions, which are
% then replaced by their results if they have any. For instance,
% \begin{quote}
-% \cs{fp_new_function:n} |{ foo }| \\
+% \cs{fp_new_function:n} |{ npow }| \\
% \cs{fp_set_function:nnn} |{ npow } { a,b } { a**b }| \\
% \cs{fp_show:n} |{ npow(16,0.25) } }|
% \end{quote}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx
index f48de27af38..9592671ae39 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3int.dtx b/Master/texmf-dist/source/latex/l3kernel/l3int.dtx
index 45050964ded..4b0d251cab5 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3int.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3int.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -100,21 +100,6 @@
% restricted-expandable functions can both be used, and \cs{exp_not:n}
% and its variants have no effect while \cs{exp_not:N} may incorrectly
% interrupt the expression.
-% \begin{texnote}
-% Exactly two expansions are needed to evaluate \cs{int_eval:n}.
-% The result is \emph{not} an \meta{internal integer}, and therefore
-% should be terminated by a space if used in \cs{int_value:w} or in
-% a \TeX{}-style integer assignment.
-%
-% As all \TeX{} integers, integer operands can also be:
-% \tn{value}\Arg{\LaTeXe{} counter}; dimension or skip variables,
-% converted to integers in~\texttt{sp}; the character code of some
-% character given as \texttt{`}\meta{char} or
-% \texttt{`\textbackslash}\meta{char}; octal numbers given as
-% \texttt{'} followed by digits from \texttt{0} to \texttt{7}; or
-% hexadecimal numbers given as |"| followed by digits and upper case
-% letters from \texttt{A} to~\texttt{F}.
-% \end{texnote}
%
% \begin{function}[EXP]{\int_eval:n}
% \begin{syntax}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx b/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx
index aa49275e78c..4be0ca6be64 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx b/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx
index c3bb838acfc..5d5758a6afd 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx b/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx
index 13772d17817..db580c525cb 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -649,15 +649,13 @@
% { key } % Name of choice key
% { choice-a , choice-b , choice-c } % Valid choices
% { \exp_not:n {#1} } % Invalid choice given
-% %
-% %
% }
% \end{verbatim}
%
% Multiple choices are created in a very similar manner to mutually-exclusive
% choices, using the properties \texttt{.multichoice:} and
% \texttt{.multichoices:nn}. As with mutually exclusive choices, multiple
-% choices are define as sub-keys. Thus both
+% choices are defined as sub-keys. Thus both
% \begin{verbatim}
% \keys_define:nn { mymodule }
% {
@@ -1926,19 +1924,21 @@
% \end{macro}
%
% \begin{macro}{\@@_define_code:n}
+% \begin{macro}[EXP]{\@@_define_code:nnn}
% \begin{macro}[EXP]{\@@_define_code:w}
% Two possible cases. If there is a value for the key, then just use
% the function. If not, then a check to make sure there is no need for
% a value with the property. If there should be one then complain,
-% otherwise execute it. There is no need to check for a |:| as if it
-% was missing the earlier tests would have failed.
+% otherwise execute it. For a \LaTeXe{} property like |.code| which
+% doesn't contain a |:|, treat it as having arity 1 and pass the
+% (empty) value to it.
% \begin{macrocode}
\cs_new_protected:Npn \@@_define_code:n #1
{
\bool_if:NTF \l_@@_no_value_bool
{
- \exp_after:wN \@@_define_code:w
- \l_@@_property_str \s_@@_stop
+ \@@_define_code:nnn
+ { \use:c { \c_@@_props_root_str \l_@@_property_str } {#1} }
{ \use:c { \c_@@_props_root_str \l_@@_property_str } }
{
\msg_error:nnee { keys } { property-requires-value }
@@ -1947,12 +1947,31 @@
}
{ \use:c { \c_@@_props_root_str \l_@@_property_str } {#1} }
}
-\exp_last_unbraced:NNNNo
- \cs_new:Npn \@@_define_code:w #1 \c_colon_str #2 \s_@@_stop
- { \tl_if_empty:nTF {#2} }
+\cs_new:Npe \@@_define_code:nnn
+ {
+ \exp_not:N \exp_after:wN \exp_not:N \@@_define_code:w
+ \exp_not:N \l_@@_property_str
+ \c_colon_str \c_colon_str
+ \exp_not:N \s_@@_stop
+ }
+\use:e
+ {
+ \cs_new:Npn \exp_not:N \@@_define_code:w
+ #1 \c_colon_str #2 \c_colon_str #3 \exp_not:N \s_@@_stop
+ }
+ {
+ \tl_if_empty:nTF {#3}
+ { \use_i:nnn }
+ {
+ \tl_if_empty:nTF {#2}
+ { \use_ii:nnn }
+ { \use_iii:nnn }
+ }
+ }
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \subsection{Turning properties into actions}
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx b/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx
index 4cfce5c5f1e..b5ef8968278 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx b/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx
index eb10d5aecce..aa7724a8ce8 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
index e901b07c063..66e7ac82828 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3names.dtx b/Master/texmf-dist/source/latex/l3kernel/l3names.dtx
index 5cdd1361e37..1cb0d132ae4 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3names.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3names.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3pdf.dtx b/Master/texmf-dist/source/latex/l3kernel/l3pdf.dtx
index 55f49476e3d..34118c371a4 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3pdf.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3pdf.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -70,8 +70,8 @@
% \cs{pdf_object_write:nnn} \Arg{object} \Arg{type} \Arg{content}
% \end{syntax}
% Writes the \meta{content} as content of the \meta{object}. Depending on the
-% \meta{type} declared for the object, the format required for the
-% \meta{data} will vary
+% \meta{type} declared for the object, the format required for
+% \meta{content} will vary:
% \begin{itemize}
% \item[\texttt{array}] A space-separated list of values
% \item[\texttt{dict}] Key--value pairs in the form
@@ -159,7 +159,7 @@
% \cs{pdf_object_unnamed_write:nn} \Arg{type} \Arg{content}
% \end{syntax}
% Writes the \meta{content} as content of an anonymous object. Depending on the
-% \meta{type}, the format required for the \meta{data} will vary
+% \meta{type}, the format required for \meta{content} will vary:
% \begin{itemize}
% \item[\texttt{array}] A space-separated list of values
% \item[\texttt{dict}] Key--value pairs in the form
@@ -251,9 +251,9 @@
%
% \section{Destinations}
%
-% Destinations are the places a link jumped too.
-% Unlike the name may suggest they don't described
-% an exact location in the PDF. Instead a destination contains a reference to
+% Destinations are the places a link jumped to.
+% Unlike the name may suggest, they don't describe
+% an exact location in the PDF. Instead, a destination contains a reference to
% a page along with an instruction how to display this page.
% The normally used \enquote{XYZ \textit{top left zoom}} for example instructs
% the viewer to show the page with the given \textit{zoom} and
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx
index bec4e3a7125..ac6131d6ff1 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx b/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx
index 21b8d03dd69..fd0d8e167df 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -181,11 +181,11 @@
% \prop_gset_from_keyval:Nn, \prop_gset_from_keyval:cn,
% }
% \begin{syntax}
-% \cs{prop_set_from_keyval:Nn} \meta{property list}
-% \{
-% \meta{key1} |=| \meta{value1} |,|
-% \meta{key2} |=| \meta{value2} |,| \ldots{}
-% \}
+% \cs{prop_set_from_keyval:Nn} \meta{property list} \\
+% ~~\{ \\
+% ~~~~\meta{key1} |=| \meta{value1} |,| \\
+% ~~~~\meta{key2} |=| \meta{value2} |,| \ldots{} \\
+% ~~\}
% \end{syntax}
% Sets \meta{property list} to contain key--value pairs given in the second
% argument. If duplicate keys appear only the last of the values is kept.
@@ -205,11 +205,11 @@
% \begin{function}[added = 2017-11-28, updated = 2021-11-07]
% {\prop_const_from_keyval:Nn, \prop_const_from_keyval:cn}
% \begin{syntax}
-% \cs{prop_const_from_keyval:Nn} \meta{property list}
-% \{
-% \meta{key1} |=| \meta{value1} |,|
-% \meta{key2} |=| \meta{value2} |,| \ldots{}
-% \}
+% \cs{prop_const_from_keyval:Nn} \meta{property list} \\
+% ~~\{ \\
+% ~~~~\meta{key1} |=| \meta{value1} |,| \\
+% ~~~~\meta{key2} |=| \meta{value2} |,| \ldots{} \\
+% ~~\}
% \end{syntax}
% Creates a new constant \enquote{flat} \meta{property list} or raises
% an error if the
@@ -224,11 +224,11 @@
% \begin{function}[added = 2024-02-12]
% {\prop_const_linked_from_keyval:Nn, \prop_const_linked_from_keyval:cn}
% \begin{syntax}
-% \cs{prop_const_linked_from_keyval:Nn} \meta{prop~var}
-% \{
-% \meta{key1} |=| \meta{value1} |,|
-% \meta{key2} |=| \meta{value2} |,| \ldots{}
-% \}
+% \cs{prop_const_linked_from_keyval:Nn} \meta{prop~var} \\
+% ~~\{ \\
+% ~~~~\meta{key1} |=| \meta{value1} |,| \\
+% ~~~~\meta{key2} |=| \meta{value2} |,| \ldots{} \\
+% ~~\}
% \end{syntax}
% Creates a new constant \enquote{linked} \meta{prop~var} or raises an
% error if the
@@ -347,11 +347,11 @@
% \prop_gput_from_keyval:Nn, \prop_gput_from_keyval:cn,
% }
% \begin{syntax}
-% \cs{prop_put_from_keyval:Nn} \meta{property list}
-% \{
-% \meta{key1} |=| \meta{value1} |,|
-% \meta{key2} |=| \meta{value2} |,| \ldots{}
-% \}
+% \cs{prop_put_from_keyval:Nn} \meta{property list} \\
+% ~~\{ \\
+% ~~~~\meta{key1} |=| \meta{value1} |,| \\
+% ~~~~\meta{key2} |=| \meta{value2} |,| \ldots{} \\
+% ~~\}
% \end{syntax}
% Updates the \meta{property list} by adding entries for each key--value
% pair given in the second argument. The addition is done through
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx b/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx
index 136596a3fe2..ad78a12bd29 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx b/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx
index 6ca9c8eeed9..c3d5de27cbd 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx b/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx
index 38fc9471a90..413e20f8caa 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx b/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
index 6e96b41326a..9bea4c7b145 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx b/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
index 47cebcad255..a86f916d241 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx b/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx
index baf705fe0c2..40618958969 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3str.dtx b/Master/texmf-dist/source/latex/l3kernel/l3str.dtx
index f4f7b94b884..2be2b105ce4 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3str.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3str.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -757,7 +757,7 @@
% \item Case changing text for typesetting: see the
% \cs[index=text_lowercase:n]{text_lowercase:n(n)},
% \cs[index=text_uppercase:n]{text_uppercase:n(n)} and
-% \cs[index=text_titlecase_all:n]{text_titlecase_(all|once):n(n)} functions which
+% \cs[index=text_titlecase_all:n]{text_titlecase_(all|first):n(n)} functions which
% correctly deal with context-dependence and other factors appropriate
% to text case changing.
% \end{itemize}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx b/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx
index b2228c7fd9e..1db09f95505 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3text-case.dtx b/Master/texmf-dist/source/latex/l3kernel/l3text-case.dtx
index 89cdb9e2b13..134e2508b73 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3text-case.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3text-case.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3text-map.dtx b/Master/texmf-dist/source/latex/l3kernel/l3text-map.dtx
index 35730022441..e3586164c5a 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3text-map.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3text-map.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3text-purify.dtx b/Master/texmf-dist/source/latex/l3kernel/l3text-purify.dtx
index 35390811aa7..d22ee1bc3e0 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3text-purify.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3text-purify.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3text.dtx b/Master/texmf-dist/source/latex/l3kernel/l3text.dtx
index bcfd15cb62b..9a4c4f244e8 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3text.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3text.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
@@ -65,11 +65,11 @@
% \end{syntax}
% Takes user input \meta{text} and expands the content.
% Protected commands (typically
-% formatting) are left in place, and no processing takes place of
+% formatting) are left in place, and no processing of
% math mode material (as delimited by pairs given in
% \cs{l_text_math_delims_tl} or as the argument to commands listed
-% in \cs{l_text_math_arg_tl}). Commands which are neither engine-
-% nor \LaTeX{} protected are expanded exhaustively.
+% in \cs{l_text_math_arg_tl}) takes place. Commands which are neither engine-
+% nor \LaTeX{}-protected are expanded exhaustively.
% Any commands listed in \cs{l_text_expand_exclude_tl} are excluded from
% expansion, as are those in \cs{l_text_case_exclude_arg_tl} and
% \cs{l_text_math_arg_tl}.
@@ -114,8 +114,8 @@
% \end{function}
%
% Upper- and lowercase have the obvious meanings. Titlecasing may be regarded
-% informally as converting the first character of the \meta{tokens} to
-% uppercase. However, the process is more complex
+% informally as converting the first \emph{non-space} character of the
+% \meta{tokens} to uppercase. However, the process is more complex
% than this as there are some situations where a single lowercase character
% maps to a special form, for example \texttt{ij} in Dutch which becomes
% \texttt{IJ}. There are two functions available for titlecasing: one which
@@ -214,8 +214,8 @@
% \text_declare_uppercase_mapping:nnn
% }
% \begin{syntax}
-% \cs{text_declare_lowercase_mapping:nn} \Arg{codeppoint} \Arg{replacement}
-% \cs{text_declare_lowercase_mapping:nnn} \Arg{BCP-47} \Arg{codeppoint} \Arg{replacement}
+% \cs{text_declare_lowercase_mapping:nn} \Arg{codepoint} \Arg{replacement}
+% \cs{text_declare_lowercase_mapping:nnn} \Arg{BCP-47} \Arg{codepoint} \Arg{replacement}
% \end{syntax}
% Declares that the \meta{replacement} tokens should be used when case mapping
% the \meta{codepoint}, rather than the standard mapping given in the
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx b/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx
index 4df9ee68a3d..600da3985db 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3tl-build.dtx b/Master/texmf-dist/source/latex/l3kernel/l3tl-build.dtx
index 6cd9822ad24..e484c5b1c59 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3tl-build.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3tl-build.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx b/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
index 71d68d532cf..84f2c367986 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
index 03bf46b1016..c028310326b 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx b/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx
index 179817d4900..532eb315d35 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2024-05-27}
+% \date{Released 2024-07-20}
%
% \maketitle
%
diff --git a/Master/texmf-dist/source/latex/lni/lni.dtx b/Master/texmf-dist/source/latex/lni/lni.dtx
index 257f0d4bb0d..b5699cbac66 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/07/01 v1.9 Official class for submissions to the ``Lecture Notes
+ [2024/07/23 v1.10 Official class for submissions to the ``Lecture Notes
in Informatics'']
%</class>
%<*driver>
@@ -287,6 +287,8 @@ This work consists of the file lni.dtx
% \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)}
+% \changes{v1.10}{2024/07/01}{Change font for URLs to text font and change footnote numbers to superscript}
+% \changes{v1.10}{2024/07/23}{Fix support multiple affiliations (#173)}
%
% \GetFileInfo{\jobname.dtx}
% \DoNotIndex{\newcommand,\newenvironment}
@@ -1046,7 +1048,7 @@ This work consists of the file lni.dtx
\RequirePackage[hang]{footmisc}
\setlength{\footnotemargin}{1em}
\long\def\@makefntext#1{%
- \def\@makefnmark{\rlap{\normalfont\@thefnmark}}%
+ \def\@makefnmark{\rlap{\normalfont\textsuperscript{\@thefnmark}}}%
\ifFN@hangfoot
\bgroup
\setbox\@tempboxa\hbox{%
@@ -1160,9 +1162,9 @@ This work consists of the file lni.dtx
\newcommand{\@multiaffil}[1]{%
\ifcsundef{@emailsandorcids#1}{\csgdef{@emailsandorcids#1}{}}{}%
\ifcsempty{@emailsandorcids#1}%
- {\csgappto{@emailsandorcids#1}{%
+ {\protected@csxappto{@emailsandorcids#1}{%
\if\relax\@currEmail\relax\else\email{\@currEmail}\fi\if\relax\@currOrcid\relax\else,\ \orcid{\@currOrcid}\fi}}%
- {\csgappto{@emailsandorcids#1}{%
+ {\protected@csxappto{@emailsandorcids#1}{%
\if\relax\@currEmail\relax\else;\ \email{\@currEmail}\fi\if\relax\@currOrcid\relax\else,\ \orcid{\@currOrcid}\fi}}%
}
@@ -1549,6 +1551,7 @@ This work consists of the file lni.dtx
% \end{macrocode}
% \begin{macrocode}
\RequirePackage{url}
+\urlstyle{same}
% \end{macrocode}
% improve wrapping of URLs - hint by http://tex.stackexchange.com/a/10419/9075
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/magicwatermark/magicwatermark.dtx b/Master/texmf-dist/source/latex/magicwatermark/magicwatermark.dtx
deleted file mode 100644
index 7c9575858bc..00000000000
--- a/Master/texmf-dist/source/latex/magicwatermark/magicwatermark.dtx
+++ /dev/null
@@ -1,597 +0,0 @@
-% \iffalse meta-comment
-% !TEX program = XeLaTeX
-%<*internal>
-\iffalse
-%</internal>
-%<*internal>
-\fi
-\begingroup
- \def\temp{LaTeX2e}
-\expandafter\endgroup\ifx\temp\fmtname\else
-\csname fi\endcsname
-%</internal>
-%<*install>
-
-\input ctxdocstrip %
-
-\let\MetaPrefix\relax
-
-\declarepostamble\emptypostamble
-\endpostamble
-
-\def\MetaPrefix{-- }
-
-
-\let\MetaPrefix\DoubleperCent
-
-\generate
- {
-%</install>
-%<*internal>
- \usedir{source/xelatex/magicwatermark}
- \file{magicwatermark.ins} {\from{\jobname.dtx}{install}}
-%</internal>
-%<*install>
- \usedir{xetex/xelatex/magicwatermark}
- \file{magicwatermark.sty} {\from{\jobname.dtx}{package}}
- \nopreamble\nopostamble
- \usedir{doc/xelatex/magicwatermark}
- }
-
-\endbatchfile
-%</install>
-%<*internal>
-\fi
-%</internal>
-%<package>\NeedsTeXFormat{LaTeX2e}[2020/10/01]
-%<package>\ProvidesPackage{magicwatermark}[2021/12/22 v1.0.1 watermark for ljguo ]
-%<*driver>
-\documentclass{ctxdoc}
-\usepackage{graphicx}
-\usepackage{enumitem}
-\usepackage{listings}
-\lstset{
-frame=tb,framerule=2pt,language={[LaTeX]TeX},basicstyle={\ttfamily},
-language={[LaTeX]TeX},
-keywordstyle=\color{red!70!black}\bfseries,
-keywordstyle={[2]\color{blue!70!black}\bfseries},
-morekeywords={PageSetup,Watermark,NewWatermark,MyPageSetup,MyWatermark,EvenPageSetup,OddPageSetup,EvenWatermark,OddWatermark,ClearWatermark}}
-\usepackage{fontspec}
-\IfFontExistsTF{calibri.ttf}
-{
- \setmainfont{calibri.ttf}[
- BoldFont = calibrib.ttf,
- ItalicFont = calibrii.ttf,
- BoldItalicFont = calibriz.ttf
- ]
-}
-{}
-\setCJKmainfont[AutoFakeBold,AutoFakeSlant]{simfang.ttf}
-\usepackage{magicwatermark}
-\renewcommand*\marg[1]{\{\meta{#1}\}}
-\renewcommand*\oarg[1]{[\meta{#1}]}
-\renewcommand*\parg[1]{(\meta{#1})}
-\begin{document}
-%<!--CODEDOC--> \DisableImplementation
- \EnableImplementation
- \DocInput{\jobname.dtx}
- \IndexLayout
- \PrintChanges
- \PrintIndex
-\end{document}
-%</driver>
-% \fi
-%
-
-% \GetFileId{magicwatermark.sty}
-%
-% \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
-% Lower-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
-% Digits \0\1\2\3\4\5\6\7\8\9
-% Exclamation \! Double quote \" Hash (number) \#
-% Dollar \$ Percent \% Ampersand \&
-% Acute accent \' Left paren \( Right paren \)
-% Asterisk \* Plus \+ Comma \,
-% Minus \- Point \. Solidus \/
-% Colon \: Semicolon \; Less than \<
-% Equals \= Greater than \> Question mark \?
-% Commercial at \@ Left bracket \[ Backslash \\
-% Right bracket \] Circumflex \^ Underscore \_
-% Grave accent \` Left brace \{ Vertical bar \|
-% Right brace \} Tilde \~}
-%
-%
-%\title{\pkg{magicwatermark}: 魔法水å°å®åŒ…}
-%\author{郭æŽå†› \\ liguo1020@gmail.com}
-%\def\version{v1.0.1}
-%\date{\today\quad\version}
-%\pagestyle{empty}
-%\PageSetup*
-%{
-% \begin{tikzpicture}[remember picture,overlay]
-% \node[cyan,scale = 2,shift={(-1,-1)}] at (current page.north east){--~\thepage~--};
-% \end{tikzpicture}
-%}
-%\Watermark
-%\maketitle
-%\thispagestyle{empty}
-%\tableofcontents
-%\begin{documentation}
-%\changes{v1.0.1}{2021/12/21}{实现了一些基本功能}
-%\begin{abstract}
-%\pkg{magicwatermark} 是一个基于 \pkg{everypage} å’Œ \pkg{tikz} å®åŒ…,并ç»è¿‡ \LaTeX3 \ 进行å°è£…çš„å®åŒ…,它å¯ä»¥å¾ˆçµæ´»çš„设置和清除水å°ï¼Œæ‰€æœ‰æ°´å°å†…容都放在 \verb|tikz| 的一个 \verb|node| 里é¢ï¼Œå¹¶å¤„于页é¢ä¸­å¿ƒã€‚
-%\end{abstract}
-%\section{介ç»}
-%ç›®å‰ \pkg{magicwatermark} å®åŒ…åªèƒ½å®žçŽ°å¦‚下功能
-%\begin{itemize}
-% \item 设置所有页é¢çš„æ°´å°
-% \item 设置奇数页的水å°
-% \item 设置å¶æ•°é¡µçš„æ°´å°
-% \item 新建水å°ï¼ŒåŒé¡µé¢è®¾ç½®å¤šä¸ªæ°´å°
-% \item 清除水å°
-%\end{itemize}
-%\section{用户接å£}
-%\subsection{æ供命令}
-% \begin{function}[added=2021-12-21,updated=2021-12-21]{\PageSetup}
-% \begin{syntax}
-% \tn{PageSetup} \oarg{æ°´å°å‚æ•°} \marg{æ°´å°å†…容}
-% \end{syntax}
-% 此命令用于设置所有页é¢çš„æ°´å°å†…容,接å—两个å‚数,第一个å‚数用于设置一些属性,以 \verb|key=value| çš„å½¢å¼ç»™å‡ºï¼Œ 第二个å‚数用于设置水å°å†…容,å¯ä»¥æ˜¯æ–‡å­—ã€å›¾ç‰‡ã€ç­‰.
-% \end{function}
-%\begin{function}[added=2021-12-21,updated=2021-12-21]{\Watermark}
-%\begin{syntax}
-% \tn{Watermark}
-%\end{syntax}
-% 该命令用于显示上é¢è®¾ç½®çš„æ°´å°
-%\end{function}
-%\begin{function}[added=2021-12-21,updated=2021-12-21]{\EvenPageSetup}
-%\begin{syntax}
-% \tn{EvenPageSetup}\oarg{æ°´å°å‚æ•°}\marg{æ°´å°å†…容}
-%\end{syntax}
-% 该命令用于设置å¶æ•°é¡µçš„æ°´å°å†…容
-%\end{function}
-%\begin{function}[added=2021-12-21,updated=2021-12-21]{\EvenWatermark}
-%\begin{syntax}
-% \tn{EvenWatermark}
-%\end{syntax}
-% 该命令用于显示上é¢è®¾ç½®çš„å¶æ•°é¡µæ°´å°
-%\end{function}
-%\begin{function}[added=2021-12-21,updated=2021-12-21]{\OddPageSetup}
-%\begin{syntax}
-% \tn{OddPageSetup}\oarg{æ°´å°å‚æ•°}\marg{æ°´å°å†…容}
-%\end{syntax}
-% 该命令用于设置奇数页的水å°å†…容
-%\end{function}
-%\begin{function}[added=2021-12-21,updated=2021-12-21]{\OddWatermark}
-%\begin{syntax}
-% \tn{OddWatermark}
-%\end{syntax}
-% 该命令用于显示上é¢è®¾ç½®çš„奇数页水å°
-%\end{function}
-%\subsection{扩展命令}
-%以下带星å·å‘½ä»¤ç”¨æ³•å’Œä¸Šé¢çš„类似,与其说是扩展,ä¸å¦‚说是å–消了é™åˆ¶ï¼Œä»¥ä¸Šçš„命令都将水å°å†…容写在一个\verb|node|中,对于对 TikZ ä¸å¤ªç†Ÿç»ƒçš„用户æ¥è¯´ï¼Œå‰è€…更加方
-%便快æ·ï¼Œè€ŒåŽè€…则更加çµæ´»
-%\begin{function}[added=2022-01-07,updated=2022-01-07]{\PageSetup*}
-%\begin{syntax}
-% \tn{PageSetup*}\marg{æ°´å°å†…容}
-%\end{syntax}
-%\end{function}
-%\begin{function}[added=2022-01-07,updated=2022-01-07]{\EvenPageSetup*}
-%\begin{syntax}
-% \tn{EvenPageSetup*}\marg{æ°´å°å†…容}
-%\end{syntax}
-%\end{function}
-%\begin{function}[added=2022-01-07,updated=2022-01-07]{\OddPageSetup*}
-%\begin{syntax}
-% \tn{OddPageSetup*}\marg{æ°´å°å†…容}
-%\end{syntax}
-%\end{function}
-%\begin{function}[added=2021-12-21,updated=2021-12-21]{\NewWatermark}
-%\begin{syntax}
-% \tn{NewWatermark}\marg{æ°´å°å称}
-%\end{syntax}
-%该命令用于新建一个水å°ï¼Œæ³¨æ„æ°´å°å称ä¸èƒ½æ˜¯ \verb|main|, \verb|even|, \verb|odd|.
-%\end{function}
-%\begin{function}[added=2021-12-21,updated=2021-12-21]{\MyPageSetup}
-%\begin{syntax}
-% \tn{MyPageSetup}\oarg{æ°´å°å‚æ•°}\marg{æ°´å°å称}\marg{æ°´å°å†…容}
-%\end{syntax}
-%用于设置新建的水å°å†…容
-%\end{function}
-%\begin{function}[added=2021-12-21,updated=2021-12-21]{\MyWatermark}
-%\begin{syntax}
-% \tn{MyWatermark}\marg{æ°´å°å称}
-%\end{syntax}
-% 该命令用于显示上é¢è®¾ç½®çš„æ°´å°
-%\end{function}
-%\begin{function}[added=2021-12-21,updated=2021-12-21]{\ClearWatermark}
-%\begin{syntax}
-% \tn{ClearWatermark}\marg{æ°´å°åˆ—表}
-%该命令用于清除设置的水å°ï¼ŒæŽ¥å—一个逗å·åˆ—表作为å‚数,例如:
-%\begin{itemize}
-% \item \verb|\ClearWatermark{main}| 清除由 \verb|\Watermark| 设置的水å°
-% \item \verb|\ClearWatermark{even,odd}| 清除奇数和å¶æ•°é¡µçš„æ°´å°
-% \item \verb|\ClearWatermark{all}| 清除所有的水å°
-% \item \verb|\ClearWatermark{name1,name2,name3,...}|
-%\end{itemize}
-%\end{syntax}
-%\end{function}
-%\subsection{å‚数列表}
-%以上设置命令中的\textbf{æ°´å°å‚æ•°}如下
-%\begin{itemize}
-% \item \verb|scale = <number>| 用于设置缩放比例
-% \item \verb|opacity = <number>| 用于设置ä¸é€æ˜Žåº¦
-% \item \verb|shift = {(x,y)}| 用于按å‘é‡ (x,y) 平移
-% \item \verb|color = <color expression>| 用于设置文本颜色
-% \item \verb|rotate = <angle>| 用于设置旋转角度
-% \item \verb+align = <center|left|right>+ 用于设置多行文本对é½æ–¹å¼ï¼Œé»˜è®¤ä¸º center
-% \item \verb+showframe = <true|false>+ 用于设置是å¦æ˜¾ç¤ºæ–‡æœ¬æ¡†ï¼Œé»˜è®¤ä¸º false
-%\end{itemize}
-%\subsection{一些说明}
-%所有的显示命令和清除命令都仅对该命令åŽé¢çš„文本生效。
-
-%\section{Examples}
-%\subsection{ä¸å¸¦æ˜Ÿå·}
-%\begin{lstlisting}
-\documentclass{ctexart}
-\usepackage{magicwatermark}
-\PageSetup[
- rotate = 30, % 设置旋转角度
- color = red!80, % 设置水å°å†…容颜色
- scale = 6 % 设置比例
-]{
- æ°´å°å†…容
-}
-\Watermark % 全文生效
-\begin{document}
-...
-\end{document}
-\end{lstlisting}
-%\subsection{奇å¶é¡µ}
-%\begin{lstlisting}
-\documentclass{ctexart}
-\usepackage{magicwatermark}
-\EvenPageSetup[color=cyan,showframe,scale=4]{å¶æ•°é¡µ} % 设置奇数页
-\OddPageSetup[color=purple,showframe,scale=4]{奇数页} % 设置å¶æ•°é¡µ
-\EvenWatermark % 显示水å°
-\OddWatermark
-\begin{document}
-...
-\end{document}
-\end{lstlisting}
-%\subsection{带星å·}
-%\begin{lstlisting}
-\documentclass{ctexart}
-\usepackage{magicwatermark}
-\PageSetup*{
- \begin{tikzpicture}[remember picture,overlay]
- \node[cyan,scale = 2,shift={(-1,-1)}] at
- (current page.north east){--~\thepage~--};
- \end{tikzpicture}
-}
-\begin{document}
-...
-\Watermark % 该命令之å‰ä¸ç”Ÿæ•ˆ
-\end{document}
-\end{lstlisting}
-%\subsection{新建水å°}
-%\begin{lstlisting}
-\documentclass{ctexart}
-\usepackage{magicwatermark}
-\NewWatermark{one} % 新建两个水å°
-\NewWatermark{two}
-\MyPageSetup[scale=5,color=blue]{one}{æ°´å°å†…容一} % 设置水å°
-\MyPageSetup[scale=5,color=red]{two}{æ°´å°å†…容二}
-\begin{document}
-\MyWatermark{one} % 使用第一个水å°
-...
-\newpage
-\ClearWatermark{one} % 清除第一个水å°
-\MyWatermark{two} % 使用第二个水å°
-...
-\end{document}
-\end{lstlisting}
-%\end{documentation}
-%
-% \StopEventually{}
-% \section{代ç å®žçŽ°}
-% \begin{macrocode}
-%<*package>
-% \end{macrocode}
-% 加载必è¦çš„å®åŒ…
-% \begin{macrocode}
-\RequirePackage{everypage-1x,tikz,xparse,expl3}
-% \end{macrocode}
-% 打开\LaTeX3 编程环境
-% \begin{macrocode}
-\ExplSyntaxOn
-% \end{macrocode}
-% 声明一些å˜é‡
-% \begin{macrocode}
-\tl_new:N \l_mainpage_tl
-\tl_new:N \l_evenpage_tl
-\tl_new:N \l_oddpage_tl
-\tl_new:N \g_case_tl
-\tl_new:N \g_clear_all_tl
-% \end{macrocode}
-% 定义警告
-% \begin{macrocode}
-\msg_new:nnn{clear}{not~have}{I~can~not~find~the~"\clear"~watermark~!}
-% \end{macrocode}
-% \begin{macro}{\PageSetup}
-% 对所有页é¢è®¾ç½®æ°´å°
-% \begin{macrocode}
-\NewDocumentCommand{\PageSetup}{sO{}+m}
-{
- \IfBooleanTF{#1}
- {
- \tl_set:Nn \l_mainpage_tl{#3}
- }
- {
- \tl_set:Nn \l_mainpage_tl
- {
- \group_begin:
- \keys_set:nn{watermark}{#2}
- \begin{tikzpicture}[remember~picture,overlay]
- \node
- [
- scale = \fp_use:N\l_scale_fp,
- opacity = \fp_use:N\l_opacity_fp,
- shift = \tl_use:N\l_shift_tl,
- color = \tl_use:N \l_color_tl,
- rotate = \fp_use:N \l_rotate_fp,
- align = \tl_use:N \l_align_tl,
- \bool_if:NTF \l_showframe_bool{draw}{},
- ]
- at(current~page.center){#3};
- \end{tikzpicture}
- \group_end:
- }
- }
-}
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\Watermark}
-% 用于显示由 \verb|\PageSetup| 命令设置的水å°
-% \begin{macrocode}
-\NewDocumentCommand{\Watermark}{}
-{
- \AddEverypageHook{\tl_use:N \l_mainpage_tl}
-}
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\EvenPageSetup}
-% 对å¶æ•°é¡µè®¾ç½®æ°´å°
-% \begin{macrocode}
-\NewDocumentCommand{\EvenPageSetup}{sO{}+m}
-{
- \IfBooleanTF{#1}
- {
- \tl_set:Nn \l_evenpage_tl{#3}
- }
- {
- \tl_set:Nn \l_evenpage_tl
- {
- \group_begin:
- \keys_set:nn{watermark}{#2}
- \begin{tikzpicture}[remember~picture,overlay]
- \node
- [
- scale = \fp_use:N\l_scale_fp,
- opacity = \fp_use:N\l_opacity_fp,
- shift = \tl_use:N\l_shift_tl,
- color = \tl_use:N \l_color_tl,
- rotate = \fp_use:N \l_rotate_fp,
- align = \tl_use:N \l_align_tl,
- \bool_if:NTF \l_showframe_bool{draw}{},
- ]
- at(current~page.center){#3};
- \end{tikzpicture}
- \group_end:
- }
- }
-}
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\EvenWatermark}
-% 用于显示由 \verb|\EvenPageSetup| 命令设置的水å°
-% \begin{macrocode}
-\NewDocumentCommand{\EvenWatermark}{}
-{
- \AddEverypageHook
- {
- \int_if_even:nT{\int_use:N \value{page}}
- {
- \tl_use:N \l_evenpage_tl
- }
- }
-}
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\OddPageSetup}
-% 对奇数页设置水å°
-% \begin{macrocode}
-\NewDocumentCommand{\OddPageSetup}{sO{}+m}
-{
- \IfBooleanTF{#1}
- {
- \tl_set:Nn \l_oddpage_tl{#3}
- }
- {
- \tl_set:Nn \l_oddpage_tl
- {
- \group_begin:
- \keys_set:nn{watermark}{#2}
- \begin{tikzpicture}[remember~picture,overlay]
- \node
- [
- scale = \fp_use:N\l_scale_fp,
- opacity = \fp_use:N\l_opacity_fp,
- shift = \tl_use:N\l_shift_tl,
- color = \tl_use:N \l_color_tl,
- rotate = \fp_use:N \l_rotate_fp,
- align = \tl_use:N \l_align_tl,
- \bool_if:NTF \l_showframe_bool{draw}{},
- ]
- at(current~page.center){#3};
- \end{tikzpicture}
- \group_end:
- }
- }
-}
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\OddWatermark}
-% 用于显示由 \verb|\OddPageSetup| 命令设置的水å°
-% \begin{macrocode}
-\NewDocumentCommand{\OddWatermark}{}
-{
- \AddEverypageHook
- {
- \int_if_odd:nT{\int_use:N \value{page}}
- {
- \tl_use:N \l_oddpage_tl
- }
- }
-}
-% \end{macrocode}
-% \end{macro}
-
-% \begin{macro}{\NewWatermark}
-% 用于新建一个水å°
-% \begin{macrocode}
-\NewDocumentCommand{\NewWatermark}{m}
-{
- \tl_new:c {l_#1_tl}
- \tl_put_right:Nn \g_case_tl {{#1}{\tl_clear:c {l_#1_tl}}}
- \tl_put_right:Nn \g_clear_all_tl {\tl_clear:c {l_#1_tl}}
-}
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\MyPageSetup}
-% 用于设置新建的水å°
-% \begin{macrocode}
-\NewDocumentCommand{\MyPageSetup}{O{} m +m}
-{
- \tl_set:cn {l_#2_tl}
- {
- \group_begin:
- \keys_set:nn{watermark}{#1}
- \begin{tikzpicture}[remember~picture,overlay]
- \node
- [
- scale = \fp_use:N\l_scale_fp,
- opacity = \fp_use:N\l_opacity_fp,
- shift = \tl_use:N\l_shift_tl,
- color = \tl_use:N \l_color_tl,
- rotate = \fp_use:N \l_rotate_fp,
- align = \tl_use:N \l_align_tl,
- \bool_if:NTF \l_showframe_bool{draw}{},
- ]
- at(current~page.center){#3};
- \end{tikzpicture}
- \group_end:
- }
-}
-% \end{macrocode}
-% \end{macro}
-
-
-
-% \begin{macro}{\MyWatermark}
-% 用于显示由 \verb|\MyPageSetup| 命令设置的水å°
-% \begin{macrocode}
-\NewDocumentCommand{\MyWatermark}{m}
-{
- \AddEverypageHook{\tl_use:c {l_#1_tl}}
-}
-% \end{macrocode}
-% \end{macro}
-% 定义一些å¯é€‰å‚æ•°, 用于对水å°è¿›è¡Œè®¾ç½®
-% \begin{macrocode}
-\keys_define:nn{watermark}
-{
- scale.fp_set:N = \l_scale_fp,
- scale.initial:n = 1.0,
- scale.default:n = 1.0,
- opacity.fp_set:N = \l_opacity_fp,
- opacity.initial:n = 0.8,
- opacity.default:n = 0.8,
- shift.tl_set:N = \l_shift_tl,
- shift.initial:n = {(0,0)},
- shift.default:n = {(0,0)},
- color.tl_set:N = \l_color_tl,
- color.initial:n = black,
- color.default:n =black,
- rotate.fp_set:N =\l_rotate_fp,
- rotate.initial:n = 0.0,
- rotate.default:n = 0.0,
- align.tl_set:N = \l_align_tl,
- align.initial:n = center,
- align.default:n = center,
- showframe.bool_set:N = \l_showframe_bool,
- showframe.initial:n = false,
- showframe.default:n = true,
-}
-% \end{macrocode}
-% \begin{macro}{\g_clear_all_tl}
-% 用于ä¿å­˜å¾…清空的所有水å°
-% \begin{macrocode}
-\tl_gset:Nn \g_clear_all_tl
-{
- \tl_clear:N \l_mainpage_tl
- \tl_clear:N \l_evenpage_tl
- \tl_clear:N \l_oddpage_tl
-}
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\g_case_tl}
-% 用于ä¿å­˜ä¸€äº›å¼€å…³
-% \begin{macrocode}
-\tl_gset:Nn \g_case_tl{
- {all}
- {
- \tl_use:N\g_clear_all_tl
- }
- {even}
- {
- \tl_clear:N \l_evenpage_tl
- }
- {odd}
- {
- \tl_clear:N \l_oddpage_tl
- }
- {main}
- {
- \tl_clear:N \l_mainpage_tl
- }
-}
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\ClearWatermark}
-% 用于清除设置的水å°
-% \begin{macrocode}
-\NewDocumentCommand{\ClearWatermark}{m}
-{
-\clist_gset:Nn \g_clear_clist{#1}
-\clist_map_variable:NNn \g_clear_clist \clear
-{
- \exp_args:NV \str_case:nVF \clear
- \g_case_tl
- {\msg_warning:nn{clear}{not~have}}
-}
-}
-% \end{macrocode}
-% \end{macro}
-% 关闭\LaTeX3 编程环境
-% \begin{macrocode}
-\ExplSyntaxOff
-% \end{macrocode}
-% \begin{macrocode}
-%</package>
-% \end{macrocode}
-% \Finale
-%
-\endinput
-\endlinechar
diff --git a/Master/texmf-dist/source/latex/mailing/mailing.dtx b/Master/texmf-dist/source/latex/mailing/mailing.dtx
index 01aabfcfd43..2a1747d4404 100644
--- a/Master/texmf-dist/source/latex/mailing/mailing.dtx
+++ b/Master/texmf-dist/source/latex/mailing/mailing.dtx
@@ -1,33 +1,34 @@
% \iffalse meta-comment
%
-% Copyright 1994-2004 Johannes Braams. All rights reserved.
-%
+% Copyright 1999-2024 Johannes L. Braams. All rights reserved.
+%
% This file is part of the mailing package.
% -----------------------------------------
-%
+%
% It 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
-% version 2003/12/01 or later.
-%
+% 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 Johannes Braams.
-%
-% The list of all files belonging to the mailing package is
-% given in the file `manifest.txt'.
-%
+%
+% The list of all files belonging to the supertabular package is
+% given in the file `MANIFEST.
+%
% The list of derived (unpacked) files belonging to the distribution
% and covered by LPPL is defined by the unpacking scripts (with
% extension .ins) which are part of the distribution.
% \fi
+%
% \CheckSum{157}
%
%\iffalse
-%% Copyright (C) 1999-2004 Johannes L. Braams texniek at braams.cistron.nl
+%% Copyright (C) 1999-2024 Johannes L. Braams texniek at texniek.nl
%%
%%
%<*dtx>
@@ -38,7 +39,7 @@
%<driver>\ProvidesFile{mailing.drv}
%\fi
%\ProvidesFile{mailing}
- [2004/02/20 v1.0b Send letters to multiple addresses]
+ [2024/07/20 v1.0c Send letters to multiple addresses]
%\iffalse
%<*driver>
\documentclass{ltxdoc}
@@ -48,11 +49,14 @@
\end{document}
%</driver>
%\fi
+% \changes{v1.0c}{2024/07/20}{Updated contact info}
%
% \GetFileInfo{mailing}
-% \title{Creating a mailing}
+% \title{Creating a mailing\thanks{This file
+% has version number \fileversion, last
+% revised \filedate.}}
% \author{Johannes Braams}
-% \date{september 7, 1994}
+% \date{\filedate}^^AA original date{september 7, 1994}
% \maketitle
%
% \markboth
@@ -304,4 +308,4 @@
% \end{macro}
%
% \Finale
-\endinput \ No newline at end of file
+\endinput
diff --git a/Master/texmf-dist/source/latex/mailing/mailing.ins b/Master/texmf-dist/source/latex/mailing/mailing.ins
index b9143a89b68..a9c133d718b 100644
--- a/Master/texmf-dist/source/latex/mailing/mailing.ins
+++ b/Master/texmf-dist/source/latex/mailing/mailing.ins
@@ -3,54 +3,43 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2004 Johannes L. Braams. All rights reserved.
%%
-%% This file is part of the mailing package.
-%% ------------------------------------------
+%% This file is distributed in the hope that it will be useful,
+%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
%%
-%% It 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.
+%% IMPORTANT NOTICE:
%%
-%% This work has the LPPL maintenance status "maintained".
+%% Copyright (C) 1994-2024 Johannes Braams, All rights reserved.
%%
-%% The Current Maintainer of this work is Johannes Braams.
-%%
-%% The list of all files belonging to the mailing package is
-%% given in the file `manifest.txt.
-%%
-%% The list of derived (unpacked) files belonging to the distribution
-%% and covered by LPPL is defined by the unpacking scripts (with
-%% extension .ins) which are part of the distribution.
+%% 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; either
+%% version 1.3c of the License, or any later version.
%%
%% --------------- start of docstrip commands ------------------
%%
% ignored commands
-\def\filedate{2004/02/20}
+\def\filedate{2024/07/20}
\def\batchfile{mailing.ins}
\input docstrip.tex
-
% package file
\preamble
-Copyright (C) 1999-2004 Johannes Braams. All rights reserved.
+Copyright (C) 1999-2024 Johannes Braams. All rights reserved.
This file was generated from file(s) of the mailing package.
------------------------------------------------------------
It 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
-version 2003/12/01 or later.
+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".
@@ -61,12 +50,13 @@ mailing package. You may however distribute the mailing package
without such generated files.
The list of all files belonging to the mailing package is
-given in the file `manifest.txt.
+given in the file `MANIFEST'.
The list of derived (unpacked) files belonging to the distribution
and covered by LPPL is defined by the unpacking scripts (with
extension .ins) which are part of the distribution.
\endpreamble
+\keepsilent
\generateFile{mailing.sty}{t}{\from{mailing.dtx}{package}}
diff --git a/Master/texmf-dist/source/latex/mathastext/mathastext.dtx b/Master/texmf-dist/source/latex/mathastext/mathastext.dtx
index d8c464a117b..7857f9b70a6 100644
--- a/Master/texmf-dist/source/latex/mathastext/mathastext.dtx
+++ b/Master/texmf-dist/source/latex/mathastext/mathastext.dtx
@@ -2,8 +2,8 @@
% N.B.: this dtx file does NOT use \DocInput, it only uses docstrip.
% The LaTeX source of the documentation is NOT prefixed with %'s.
%<*dtx>
-\def\dtxtimestamp {Time-stamp: <29-12-2023 at 10:54:52 CET>}
-\def\docdate{2023/12/29}
+\def\dtxtimestamp {Time-stamp: <26-07-2024 at 11:21:35 CEST>}
+\def\docdate{2024/07/27}
% To extract run etex on this file, then to build documentation run
% latexmk on mathastext.tex then dvipdfmx on the dvi.
% For more information see http://jf.burnol.free.fr/v13/INSTALL.txt
@@ -11,8 +11,8 @@
% due to usage of § (<A7>) as an active character.
%</dtx>
%<*drv>
-\def\MSTpkgdate {2023/12/29}
-\def\MSTpkgversion {1.3zb}
+\def\MSTpkgdate {2024/07/27}
+\def\MSTpkgversion {1.4b}
%</drv>
%<*dtx>
\iffalse % meta-comment
@@ -28,13 +28,13 @@
+-------------------------------------------+
This Work may be distributed and/or modified under the conditions
-of the [LPPL1.3c](http://www.latex-project.org/lppl/lppl-1-3c.txt)
+of the [LPPL 1.3c](https://www.latex-project.org/lppl/lppl-1-3c.txt)
The Author of this Work is Jean-Francois Burnol (`jfbu at free dot fr`)
-Copyright (C) 2011-2019, 2022, 2023 Jean-Francois Burnol
+Copyright (C) 2011-2019, 2022-2024 Jean-Francois Burnol
- Source: mathastext.dtx 1.3zb 2023/12/29
+ Source: mathastext.dtx 1.4b 2024/07/27
%</readme>
%<*dtx>
@@ -44,10 +44,10 @@ Copyright (C) 2011-2019, 2022, 2023 Jean-Francois Burnol
%%----------------------------------------------------------------
%% Package: mathastext
%% Info: Use the text font in math mode (JFB)
-%% Version: 1.3zb 2023/12/29
+%% Version: 1.4b 2024/07/27
%% License: LPPL 1.3c (http://www.latex-project.org/lppl/lppl-1-3c.txt)
-%% Copyright (C) 2011-2019, 2022, 2023 Jean-Francois Burnol
-%% <jfbu at free dot fr>
+%% Copyright (C) 2011-2019, 2022-2024 Jean-Francois Burnol
+%% <jfbu at free dot fr>
%% Examples of use of mathastext:
%% http://jf.burnol.free.fr/mathastext.html
%% http://jf.burnol.free.fr/showcase.html
@@ -95,19 +95,11 @@ Copyright (C) 2011-2019, 2022, 2023 Jean-Francois Burnol
\begingroup
\input docstrip.tex
\askforoverwritefalse
-\def\testfilepreamble{\string\def\string\testfileincipit{Test file
- to accompany \string\texttt{mathastext}^^J%
- version \string\texttt{\MSTpkgversion} of \string\texttt{\MSTpkgdate}}}
\generate{\nopreamble\nopostamble
\file{README.md}{\from{mathastext.dtx}{readme}}
\file{ChangeLog.md}{\from{mathastext.dtx}{changelog}}
\usepostamble\defaultpostamble
\file{mathastext.tex}{\from{mathastext.dtx}{drv}}
- \usepreamble\testfilepreamble
- \file{mathastexttestmathversions.tex}{\from{mathastext.dtx}{mathversions}}
- \file{mathastexttestunicodemacos.tex}{\from{mathastext.dtx}{macos}}
- \file{mathastexttestunicodelinux.tex}{\from{mathastext.dtx}{linux}}
- \file{mathastexttestalphabets.tex}{\from{mathastext.dtx}{alphabets}}
\usepreamble\defaultpreamble
\file{mathastext.sty}{\from{mathastext.dtx}{package}}%
}
@@ -120,7 +112,8 @@ Copyright (C) 2011-2019, 2022, 2023 Jean-Francois Burnol
% no file extractions if latex compilation was on mathastext.tex
\ifdefined\MessageDeFin\AtEndDocument{\MessageDeFin}\fi
\begingroup\catcode1 0 \catcode`\\ 12
-% this is to fool TeX's recognition of \if/\else/\fi like tokens in test files
+% This is to fool TeX's recognition of \if/\else/\fi like tokens in test files,
+% but on 2024/07/14 I removed from the dtx four previously included such filss.
^^Aiffalse
%</dtx>
%<*readme>
@@ -200,6 +193,98 @@ MATHASTEXT CHANGE LOG
%</changelog>
%<*readme|changelog>
+1.4b \[2024/07/27\]
+----
+
+* Fix a regression at `1.4` regarding option `nodigits`.
+
+* New option: `noletters`. I am in old age now so I can provide an option
+ completely antithetical to my life work.
+
+* Option `everymath` which is destined to be removed at next major
+ release warns user about it. As major releases tend to happen once
+ per decade I think the constant nagging will become insufferable
+ and you will adapt to the `1.4` changes rather than persisting into
+ using this option.
+
+1.4a \[2024/07/20\]
+----
+
+* There was a documentation glitch in 1.4 and also a problem with the
+ `\MTprimeskip` feature being lost under the emergency fall-back
+ `everymath` option.
+
+1.4 \[2024/07/20\]
+---
+
+* Since 1.2 of 2012/12/20, mathastext has used mathematically active
+ characters to propose certain advanced functionalities. For reasons half
+ lost in the mists of time but whose main one was surely to keep the
+ meaning of the active shape of characters unchanged outside of math mode,
+ this mathematical activation, and (in most cases) the definitions of what
+ active characters do, were done again at *each* entrance into math mode.
+ At this 1.4 release, mathastext does not inject *any* code whatsoever into
+ the `\everymath` and `\everydisplay` toks registers anymore (except for
+ one font-related hack needed under LuaLaTeX, see below). Your documents
+ will compile a tiny bit faster.
+
+* In (unsual) documents where users play with catcodes and mathcodes it is
+ impossible to keep exact backward compatibility, because documented user
+ commands which acted formerly a toggles with delayed action now will enact
+ changes immediately if in the document body. In practice consequences are
+ expected to be few, because catcode active characters are (as was already
+ the case with earlier releases) hacked only when they are Babel shorthands
+ and they are then modified in a way altering only their action in math
+ mode. The precise description of what mathastext does when mathematically
+ activating (or not) a character, depending on circumstances, is to be
+ found among small-print comments in the section "Extended scope of the
+ math alphabets commands". See also the documentation of the
+ `\MTmathactiveletters` command for some specifics regarding ascii letters.
+
+* New option: `everymath`. It instructs mathastext to revert (partially)
+ to its legacy code which uses `\everymath/\everydisplay`. This reversal
+ is partial, the handling of ascii letters not being included into it. The
+ `everymath` option is there only to try as a quick fix in case transition
+ to this release causes a major problem in a user document and time is
+ lacking to investigate. Please report to the author such issues. Option
+ `everymath` is destined to be removed at next major release.
+
+* New option: `activedigits`. Enjoy.
+
+* It is now easier to hook into the mathastext architecture for
+ mathematically activated ascii letters. See the new section "Hacking
+ letters (and even digits) for special tasks".
+
+* Bugfix: do not override special behavior of the math mode dot in
+ babel-spanish.
+
+* Bugfix: A desperate hack related to LuaLaTeX font matters and dating
+ back to 1.3o 2016/05/03 had been for some years in dire need of an update
+ regarding fonts using `Renderer=HarfBuzz`. This is done now. Thanks to
+ tex.sx `user691586` for report. This is currently the sole remaining
+ usage of `\everymath/\everydisplay`.
+
+* Bugfix: an optional feature related to `\{` and `\}` was broken since an
+ upstream LaTeX change at its 2020-02-02 release.
+
+* With option symbolmisc, those math symbol macros formerly defined via
+ `\DeclareRobustCommand` are now declared via `\protected\def`.
+
+* Removal of legacy branches previously kept to support LaTeX earlier than
+ 2020-02-02.
+
+* Removal of support for EU1 and EU2 font encodings.
+
+* Option `noasterisk` deprecated at 1.2d 2013/01/02 has (finally) been removed.
+
+* Four test files previously included and auto-extracted from the
+ distributed dtx have been dropped. One of them is still available
+ on the package homepage.
+
+* Some parts of the documentation have been massively re-ordered and even to some
+ extent improved. But there may be some occasions where obsolete statements will
+ be found having the legacy `\everymath/\everydisplay` situation as background.
+
1.3zb \[2023/12/29\]
-----
@@ -251,6 +336,8 @@ MATHASTEXT CHANGE LOG
* Fix long-standing hyperlink problems in the documentation:
blue color words should now all be functioning hyperlinks.
+%</readme|changelog>
+%<*changelog>
1.3z \[2023/09/01\]
----
@@ -311,8 +398,6 @@ been pushed to CTAN, hence the version increase to 1.3y)
letters and emitted during math version creation in the
preamble.
-%</readme|changelog>
-%<*changelog>
1.3w \[2019/11/16\]
----
@@ -358,7 +443,7 @@ been pushed to CTAN, hence the version increase to 1.3y)
to some other (robust) math alphabet macros, but were not
robust in the strict sense. This does cause some issues for
moving arguments in the context of multiple math versions,
- hence it was a bug. The special behaviour of the math
+ hence it was a bug. The special behavior of the math
alphabet commands (they redefine themselves and other macros
on first use) makes is somewhat problematic for mathastext
to keep them updated across math versions and at the same
@@ -620,16 +705,14 @@ been pushed to CTAN, hence the version increase to 1.3y)
redefined as math symbols and could not be used as delimiters.
-1.3d \[2015/02/26\]
+1.3d \[2014/05/23\]
----
-* the documentation mentions the improved compatibility of mathastext
+* A 2015/02/26 edit to the documentation mentions the
+ improved compatibility of mathastext
with the latest (3.34) beamer release: no more need for
`\usefonttheme{professionalfonts}`.
-1.3d \[2014/05/23\]
-----
-
* new commands `\MTstandardgreek` and `\MTcustomgreek`.
* The Greek letters, in case of use of one of the package related
@@ -760,6 +843,8 @@ use of mathematically active characters in versions 1.2 and 1.2b.
mechanism of letting non-letter symbols obey the math alphabet
commands.
+* the `noasterisk` option is deprecated and made a no-op.
+
* documentation extended and improved.
1.2c \[2012/12/31\]
@@ -904,6 +989,11 @@ use of mathematically active characters in versions 1.2 and 1.2b.
complete manner to adapt the math configuration to fonts
provided with no math support.
+1.13d
+----
+
+* new macros `\MTstandardgreek` and `\MTcustomgreek`
+
1.13b
----
@@ -972,502 +1062,6 @@ use of mathematically active characters in versions 1.2 and 1.2b.
%%% mode: latex
%%% End:
%</drv>
-%<*mathversions>
-%% This file `mathastexttestversions.tex' is for testing the enhanced
-%% concept of math versions provided by the package `mathastext'.
-%%
-%% See `mathastext.dtx' for the copyright and conditions of distribution or
-%% modification.
-%%
-\documentclass{article}
-\usepackage[T1]{fontenc}
-\usepackage{newcent}
-\usepackage[subdued]{mathastext}
-\Mathastext[newcent]
-\renewcommand\familydefault\ttdefault
-\Mathastext[courier]
-\renewcommand\familydefault\sfdefault
-\Mathastext[avantgarde]
-\renewcommand\familydefault\rmdefault
-\begin{document}
-\testfileincipit
-
-text in NewCentury and $math\ as\ in\ default$,%
-\MTversion{courier} text in Courier and $math\ in\ Courier$,%
-\MTversion{avantgarde} text in AvantGarde and $math\ in\ AvantGarde$,%
-\MTversion[newcent]{courier} text in NewCentury and $math\ in\
-Courier$,\MTversion{bold} text in bold NewCentury and $math\ as\ in\
-bold\ default$,\MTversion[courier]{avantgarde} text in Courier and
-$math\ in\ AvantGarde$.
-\end{document}
-%</mathversions>
-%<*macos>
-%% This file `mathastexttestunicodemacos.tex' is for testing the use
-%% of the package `mathastext' with the unicode engines XeTeX or LuaLaTeX.
-%%
-%% Mac OS X specific fonts are used (initially tested on 10.8.2).
-%%
-%% See `mathastext.dtx' for the copyright and conditions of distribution or
-%% modification.
-%%
-\documentclass{article}
-\usepackage[hscale=0.85]{geometry}
-\usepackage{multicol}
-\usepackage[no-math]{fontspec}
-\usepackage{lmodern}
-\usepackage{metalogo}
-\usepackage{iftex}
-\ifXeTeX
-\expandafter\def\expandafter\testfileincipit\expandafter
- {\testfileincipit\ (compiled with \XeLaTeX)}
-\else
-\ifLuaTeX
-\expandafter\def\expandafter\testfileincipit\expandafter
- {\testfileincipit\ (compiled with \LuaLaTeX)}
-\fi\fi
-\usepackage[subdued,italic,asterisk]{mathastext}
-\setmainfont[Color=FF0000]{Hoefler Text} \Mathastext[Hoefler]
-\setmainfont[Color=336633]{American Typewriter}\Mathastext[Typewriter]
-\setmainfont[Color=0000FF]{Herculanum} \Mathastext[Herculanum]
-\setmainfont[Color=FF00FF]{Didot} \Mathastext[Didot]
-\setmainfont[Color=999999]{Comic Sans MS} \Mathastext[Comic]
-\MTDeclareVersion{Times}{T1}{ptm}{m}{n}
-\begin{document}
-\MTversion{normal}
-\testfileincipit
-
-This test uses \verb|mathastext| with its \emph{italic}, \emph{asterisk}, and
-\emph{subdued} options. The base document fonts are the Latin Modern ones (in
-OpenType format). The other OpenType fonts were chosen from those available on
-a Mac OS machine. We also used the Times font in traditional \TeX\ font T1
-encoding, to demonstrate the removal since release \texttt{1.3u} of a former
-limitation that all math versions had to share the same font encoding, else
-some characters such as the dotless \texttt{i} ($\imath$), or the minus sign
-could well vanish from the output in the non-normal math versions.
-
-Furthermore we test (last line of each block, on the left) if the non-letter
-characters obey the math alphabet \verb|\mathbf|. In the normal and bold math
-versions, this feature is de-activated, as option \emph{subdued} was used; and
-if activated we should then use in these math versions the package
-\verb|\Mathbf| rather than \verb|\mathbf| which is there still the original
-one, which will use encoding \verb|OT1| in the normal and bold versions, as we
-loaded \verb|fontspec| with its option \emph{no-math}.
-
-Some among the fonts tested have no bold variant or no italic variant.
-
-Note (tested 2013/09/03): for some reason the \verb|Color| specifications in the
-\verb|\setmainfont| commands work only
-with \XeLaTeX{}, not with \LuaLaTeX{}; a few months back I had not noticed
-such a difference between the two engines.
-
-Update (tested 2016/01/15 with reasonably up-to-date TL2015): \verb|Color|
-spec in use of \verb|\setmainfont| command now functional again with
-\LuaLaTeX.
-
-Note (tested 2019/08/11, reasonably up-to-date TL2019): spacing with the Didot
-font differs widely between \XeLaTeX\ and \LuaLaTeX{} (perhaps related to
-italic corrections, see the package documentation), and also it seems
-\LuaLaTeX{} will not find (from our generic usage of the \verb|fontspec|
-interface, at least) bold variants of the Hoefler Text and American Typewriter
-fonts, contrarily to \XeLaTeX. Also, the \emph{italic} option remains
-seemingly without effect with \LuaLaTeX{} in the case of the Hoefler Text font
-(see the package source code comments on some problems with the two ``modes''
-for text fonts under \LuaLaTeX, which may be related with this specific issue
-here).
-
-Update (tested 2022/10/29, with 1.3x and up-to-date TL2022): it appears that
-most, perhaps even all, of the remarks in the preceding note are now obsolete
-as I do not see obvious differences between outputs from \XeLaTeX{} versus
-\LuaLaTeX{} but I did not seriously compare, only quickly done.
-
-\newcommand\TEST[1]{\MTversion{#1}\def\tmpa{#1}%
- \def\tmpb{normal}\def\tmpc{bold}%
- \ifx\tmpa\tmpb\else\ifx\tmpa\tmpc\else \MTnonlettersobeymathxx
- \MTexplicitbracesobeymathxx\fi\fi
-\begin{multicols}{2}
-\hbox to\columnwidth{\hbox to\columnwidth{\hfil
- $abcdefghijklmnopqrstuvwxyz$\hfil}\kern-2.5em{#1}}
- \centerline{ $ABCDEFGHIJKLMNOPQRSTUVWXYZ$ }
- \centerline{ $0123456789$ }
- \centerline{ $!\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\backslash$ }
- \centerline{ $\mathbf{!\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\backslash}$ }
-\columnbreak
- \centerline{ abcdefghijklmnopqrstuvwxyz }
- \centerline{ ABCDEFGHIJKLMNOPQRSTUVWXYZ }
- \centerline{ 0123456789 }
- \centerline{ !\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\char92 }
- \centerline{\bfseries !\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\char92 }
-\end{multicols}}
-\begin{multicols}{2}
- \centerline{\textbf{math mode}}
-\columnbreak
- \centerline{ \textbf{text} }
-\end{multicols}
-\TEST{Didot}\TEST{Comic}\TEST{normal}\TEST{Herculanum}
-\TEST{Hoefler}\TEST{Typewriter}\TEST{bold}\TEST{Times}
-\end{document}
-%</macos>
-%<*linux>
-%% This file `mathastexttestunicodelinux.tex' is for testing the use
-%% of the package `mathastext' with the unicode engines XeTeX or LuaLaTeX.
-%%
-%% Fonts which were available on a Linux machine are used. Beware that
-%% compilation with LuaLaTeX will abort with errors if specified fonts do not
-%% exist on your system.
-%%
-%% See `mathastext.dtx' for the copyright and conditions of distribution or
-%% modification.
-%%
-\documentclass{article}
-\usepackage[hscale=0.8]{geometry}
-\usepackage{multicol}
-\usepackage[no-math]{fontspec}
-\usepackage{lmodern}
-\usepackage{metalogo}
-\usepackage{iftex}
-\ifXeTeX
-\expandafter\def\expandafter\testfileincipit\expandafter
- {\testfileincipit\ (compiled with \XeLaTeX)}
-\else
-\ifLuaTeX
-\expandafter\def\expandafter\testfileincipit\expandafter
- {\testfileincipit\ (compiled with \LuaLaTeX)}
-\fi\fi
-\usepackage[subdued,italic,asterisk]{mathastext}
-\setmainfont[Color=999999]{Verdana} \Mathastext[Verdana]
-\setmainfont[Color=0000FF]{Arial} \Mathastext[Arial]
-\setmainfont[Color=00C000]{DejaVu Serif} \Mathastext[DejaVu]
-\setmainfont[Color=FF0000]{Andale Mono} \Mathastext[Andale]
-%% commented out as these fonts do not exist anymore on the Linux box
-%% I have access to (test last done 2016/01/15)
-%%\setmainfont[Color=C000C0]{URW Chancery L} \Mathastext[Chancery]
-%%\setmainfont[Color=800080]{URW Palladio L} \Mathastext[Palladio]
-\setmainfont[Color=808000]{Liberation Serif} \Mathastext[Liberation]
-\MTDeclareVersion{Times}{T1}{ptm}{m}{n}
-\begin{document}
-\MTversion{normal}
-\testfileincipit
-
-This test uses \verb|mathastext| with its \emph{italic}, \emph{asterisk}, and
-\emph{subdued} options. The base document fonts are the Latin Modern ones (in
-OpenType format). The other OpenType fonts were chosen from those available on
-a Linux machine. We also used the Times font in traditional \TeX\ font T1
-encoding, to demonstrate the removal since release \texttt{1.3u} of a former
-limitation that all math versions had to share the same font encoding, else
-some characters such as the dotless \texttt{i} ($\imath$), or the minus sign
-could well vanish from the output in the non-normal math versions.
-
-Furthermore we test (last line of each block, on the left) if the non-letter
-characters obey the math alphabet \verb|\mathbf|. In the normal and bold math
-versions, this feature is de-activated, as option \emph{subdued} was used; and
-if activated we should then use in these math versions the package
-\verb|\Mathbf| rather than \verb|\mathbf| which is there still the original
-one, which will use encoding \verb|OT1| in the normal and bold versions, as we
-loaded \verb|fontspec| with its option \emph{no-math}.
-
-Some among the fonts tested have no bold variant or no italic variant.
-
-Note: the two unicode engines \XeLaTeX\ and \LuaLaTeX\ give likely not fully
-identical results particularly for the math mode. At least this is what I
-observed regularly over the years with the variant of this file prepared for
-fonts available on Mac OS, which is my main system where I develop
-|\mathastext|. Lastly for example (TL2019, august 2019), \LuaLaTeX\ could not
-find the bold variant of some system font, but \XeLaTeX\ did. And the spacing
-for the letters of the Didot font was vastly different between the two
-engines.
-
-\newcommand\TEST[1]{\MTversion{#1}\def\tmpa{#1}%
- \def\tmpb{normal}\def\tmpc{bold}%
- \ifx\tmpa\tmpb\else\ifx\tmpa\tmpc\else \MTnonlettersobeymathxx
- \MTexplicitbracesobeymathxx\fi\fi
-\begin{multicols}{2}
-\hbox to\columnwidth{\hbox to\columnwidth{\hfil
- $abcdefghijklmnopqrstuvwxyz$\hfil}\kern-2.5em{#1}}
- \centerline{ $ABCDEFGHIJKLMNOPQRSTUVWXYZ$ }
- \centerline{ $0123456789$ }
- \centerline{ $!\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\backslash$ }
- \centerline{ $\mathbf{!\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\backslash}$ }
-\columnbreak
- \centerline{ abcdefghijklmnopqrstuvwxyz }
- \centerline{ ABCDEFGHIJKLMNOPQRSTUVWXYZ }
- \centerline{ 0123456789}
- \centerline{ !\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\char92 }
- \centerline{\bfseries !\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\char92 }
-\end{multicols}}
-\begin{multicols}{2}
- \centerline{\textbf{math mode}}
-\columnbreak
- \centerline{ \textbf{text} }
-\end{multicols}
-\TEST{DejaVu}
-\TEST{Verdana}
-\TEST{Andale}
-%%\TEST{Palladio}
-\TEST{Arial}
-%%\TEST{Chancery}
-\TEST{Liberation}
-\TEST{bold}\TEST{normal}\TEST{Times}
-\end{document}
-%</linux>
-%<*alphabets>
-%% This file `mathastexttestalphabets.tex' is for testing the extended
-%% scope of the math alphabet commands with package `mathastext', via
-%% the package command \MTnonlettersobeymathxx.
-%%
-%% Compile either with latex, pdflatex, lualatex (pdf output) or xelatex.
-%%
-%% See `mathastext.dtx' for the copyright and conditions of distribution or
-%% modification.
-%%
-\documentclass{article}
-\usepackage[hscale=0.66, vscale=0.72]{geometry}
-\usepackage{amsmath}
-\usepackage{mathtools}\mathtoolsset{centercolon}
-%% WARNING THIS IS INCOMPATIBLE WITH BABEL+FRENCHB
-%% BUT WITH MATHASTEXT LOADED THIS IS CORRECTED
-%% *IF* \MTnonlettersobeymathxx IS MADE USE OF.
-\usepackage{iftex}
-\ifXeTeX
-\expandafter\def\expandafter\testfileincipit\expandafter
- {\testfileincipit\ (compiled with \XeLaTeX)}
-\usepackage[no-math]{fontspec}
-\setmainfont[ExternalLocation,
- Mapping=tex-text,
- BoldFont=texgyretermes-bold,
- ItalicFont=texgyretermes-italic,
- BoldItalicFont=texgyretermes-bolditalic]{texgyretermes-regular}
-\setmonofont[ExternalLocation,
- Mapping=tex-text]{texgyrecursor-regular}
-\setsansfont[ExternalLocation,
- Mapping=tex-text]{texgyreheros-regular}
-\else
-\ifLuaTeX % for pdf output
-\expandafter\def\expandafter\testfileincipit\expandafter
- {\testfileincipit\ (compiled with \LuaLaTeX)}
-\usepackage[no-math]{fontspec}
-\setmainfont[Ligatures=TeX]{TeX Gyre Termes}
-\setmonofont[Ligatures=TeX]{TeX Gyre Cursor}
-\setsansfont[Ligatures=TeX]{TeX Gyre Heros}
-\else
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{tgtermes}
-\usepackage{tgcursor}
-\usepackage{tgheros}
-\fi\fi
-\usepackage{metalogo} % must be loaded /after/ [no-math]fontspec
-\usepackage[french]{babel}
-\usepackage[italic,asterisk]{mathastext}
-\MTlettershape{n}\Mathastext[upright]
-\MTnonlettersobeymathxx
-\MTexplicitbracesobeymathxx
-\delimitershortfall-1pt
-\usepackage{color}
-\begin{document}
-\testfileincipit
-
-\begin{center}
- \bfseries Two features of \texttt{mathastext}:\\
-extended scope of the math alphabets and added italic corrections\par
-\end{center}
-
-The package makes
-${!}\,{?}\,{,}\,{:}\,{;}\,{+}\,{-}\,{=}\,{(}\,{)}\,{[}\,{]}\,{<}\,{>}\,{\{}\,{\}}$,
-the asterisk $*$, and $.\,/\,\vert\,\backslash\,{\#}\,{\$}\,{\%}\,{\&}$ obey the
-math alphabet commands (this is the maximal list, some characters may have been
-excluded by the corresponding package options). For the characters listed first
-the mechanism involves a `mathematical activation'.
-
-As this process may create incompatibilities, it will be put into action
-for
-${!}\,{?}\,{,}\,{:}\,{;}\,{+}\,{-}\,{=}\,{(}\,{)}\,{[}\,{]}\,{<}\,{>}$
-only if the user makes use of the package command
-\verb|\MTnonlettersobeymathxx| (and the braces necessitate
-\verb|\MTexplicitbracesobeymathxx|).
-
-It could be that one such character has been made `active' in the entire
-document by some other package, typically a language definition file for the
-\verb|babel| system. Here for example we have used \verb|babel| with the
-\verb|french| option, which makes the high punctuation characters !?:; active
-throughout the document (extra spacing is put in front of the character when
-used in text; no change in math but perhaps for other languages and characters
-this could happen, it is up to the language definition file to decide).
-
-When \verb|mathastext| detects that a character it wants to `mathematically
-activate' is already `active', it does not go further except if it seems that
-the activation was done by Babel. If the activation was done by Babel, then
-\verb|mathastext| replaces the expansion of the active character in math mode by
-what is necessary to achieve its goal. It does not additionally mathematically
-activate the character; rather it makes sure that the character is \emph{not}
-mathematically active. In the present document the colon was made mathematically
-active by \verb|mathtools| but this was already canceled in the preamble by
-\verb|mathastext| as it was loaded later. And it is better so, because the
-combination \verb|babel| (with option \verb|frenchb|) +\verb|mathtools| (with
-\verb|centercolon|) makes \verb|$:$| create an infinite loop!
-
-But even if someone had mathematically activated the colon after the preamble,
-or after the loading of \verb|mathastext|, this would be canceled again
-automatically for each inline or displayed mathematical formula (if the user
-does \verb|\MTnonlettersobeymathxx|).
-
-The conclusion with \verb|\MTnonlettersobeymathxx| is: if some package has tried
-to make the character mathematically active, this will be overruled by
-\verb|mathastext|; if some package has made the character globally active, then
-the package wins except if it is Babel, as \verb|mathastext| may in the latter
-case safely modify the action in math mode (paying attention to the fact that
-the character should be usable in \verb|\label| and \verb|\ref| in and outside
-of math mode).
-
-The displayed equations next illustrate the extended scope of the math alphabets
-which now apply to $=$, $-$, $($, $)$, $[$, $]$ (but not to the large delimiters
-of course). Furthermore, for testing purposes the equations were labeled using
-such characters, for example the last one has label \verb|eq=7|, to check that
-the mathematical activation of $=$ does not cause problems with
-\verb|\label/\ref|.
-
-\def\testformula{\quad\Biggl\lbrace\biggl(\left(\left[[\sin(a) + \cos(b) - \log(c) =
-\sec(d)]\right]\right)\biggr)\Biggr\rbrace}
-\begin{equation}\testformula\label{eq:1}\end{equation}
-\begin{equation}\mathnormalbold{mathnormalbold:\testformula}\label{eq;2}\end{equation}
-\begin{equation}\mathrm{mathrm:\testformula}\label{eq?3}\end{equation}
-\begin{equation}\mathbf{mathbf:\testformula}\label{eq!4}\end{equation}
-\begin{equation}\mathit{mathit:\testformula}\label{eq(5}\end{equation}
-\begin{equation}\mathtt{mathtt:\testformula}\label{eq)6}\end{equation}
-\begin{equation}\mathsf{mathsf:\testformula}\label{eq=7}\end{equation}
-
-Equations above are numbered \ref{eq:1}, \ref{eq;2}, \ref{eq?3}, \ref{eq!4}, and
-$\ref{eq(5}$, $\ref{eq)6}$, and $\ref{eq=7}$.
-
-\def\testline#1{$#1$&$\mathnormalbold{#1}$&$\mathrm{#1}$&$\mathbf{#1}$&$\mathit{#1}$&$\mathtt{#1}$&$\mathsf{#1}$}
-
-\centerline{\begin{tabular}{ccccccc}
-\testline{a!b}\\
-\testline{a?b}\\
-\testline{a,b}\\
-\testline{a;b}\\
-\testline{a:b}\\
-\testline{a:=b}\\
-\testline{a\vcentcolon= b}\\
-\testline{a\colon b}\\
-\testline{a.b}\\
-\testline{a-b}\\
-\testline{a+b}\\
-\testline{a=b}\\
-\testline{a<b}\\
-\testline{a>b}\\
-\testline{<x,y>}\\
-\testline{\mathopen{<} x,y\mathclose{>}}\\
-\testline{\left< x,y\right>}\\
-\testline{a/b}\\
-\testline{a\backslash b}\\
-\testline{a\setminus b}\\
-\testline{a|b}\\
-\testline{a\mid b}\\
-\testline{(a,b)}\\
-\testline{[a,b]}\\
-\testline{\{a,b\}}
-\end{tabular}}
-
-The question mark has been made active by \verb|babel+frenchb|.
-\verb|mathastext| has imposed in math mode its ways (now \verb|$\mathbf{???}$|
-gives $\mathbf{???}$). As the extra spacing is added by \verb|frenchb| only in
-text, we had to use the math alphabet to check that indeed \verb|mathastext|
-overruled Babel.
-
-To double-check we will now make \string? mathematically active:
-\verb|\mathcode`?="8000|\mathcode`?="8000. This is a sure cause for disaster
-normally with Babel (don't do this at home without \verb|mathastext|!). But here
-with \verb|$?$| no bad surprise (infinite loop!) awaits us: just $?$.
-
-Let's take some other character, for example the opening parenthesis, and make
-it catcode active:
-\verb|\catcode`(=\active \def ({X}|.
-Let's try the input
-\verb|( and $($|.
-\begingroup
-\catcode`(=\active \gdef ({X}
-This gives ( and $($. We see that \verb|mathastext| does not attempt to modify
-the definition of the active character, as this activation was not done via the
-\verb|babel| services. \catcode`\(=12 \mathcode`(="8000 We now revert the
-parenthesis to catcode other (but maintain \verb|\def ({X}| as definition of its
-active version), and then make it mathematically active using the command
-\verb|\mathcode`(="8000|. If we try \verb|$((($| we see that the parenthesis is
-not converted into an $X$: $((($. The mathematically active character was
-overruled by \verb|mathastext|.
-
-Issuing \verb|\MTnonlettersdonotobeymathxx|\MTnonlettersdonotobeymathxx\ we do
-get the $X$'s from the input \verb|$((($|: $((($
-\endgroup
-This shows that \verb|mathastext| now does not modify in math mode the
-non-letter \verb|(|.
-
-\MTversion{upright}\MTnonlettersobeymathxx
-We defined in the preamble of the document a \verb|mathastext|-enhanced
-math version (named \verb|upright|) having the Latin letters upright in
-math mode. Let's switch to
-it: \newline
-\hbox to\linewidth{\hss\verb|\MTversion{upright}|\hss}
-
-With a font which is neither italic nor slanted, \verb|mathastext| automatically
-inserts italic corrections for better positioning of the subscript:
-\verb|$f_i^i$| gives
-$f_i^i$.
-After \verb|\MTnoicinmath| which turns off this feature\MTnoicinmath{}, the same
-input gives $f_i^i$, which is different.
-\footnote{last time I tried, this only worked with PDF\LaTeX{}, not with
- \LuaLaTeX{} or \XeTeX{}.}
-
-Again with italic corrections on (\verb|\MTicinmath|)\MTicinmath{}
-\verb|$f_{abc}^{def}$| gives $f_{abc}^{def}$, and here is another one:
-$f^{f_{abc}^{def}}_u$. Without italic corrections\MTnoicinmath: $f_{abc}^{def}$,
-and respectively $f^{f_{abc}^{def}}_u$.
-
-\MTicinmath
-
-\verb|mathastext| does not add these italic corrections inside arguments of
-math alphabets, as this would prevent the formation of ligatures:
-$\mathnormal{ff}$, $\mathrm{ff}$, $\mathit{ff}$, $\mathbf{ff}$, $\mathtt{ff}$
-(no ligature in teletype) and $\mathsf{ff}$.\footnote{\llap{\textcolor{magenta}{\bfseries Changed!\kern3em}}Prior to 1.3i,
- italic corrections were added to the \string\mathnormal\ arguments.}
-
-\centerline{\begin{tabular}{ccccccc}
-\testline{a!b}\\
-\testline{a?b}\\
-\testline{a,b}\\
-\testline{a;b}\\
-\testline{a:b}\\
-\testline{a:=b}\\
-\testline{a\vcentcolon= b}\\
-\testline{a\colon b}\\
-\testline{a.b}\\
-\testline{a-b}\\
-\testline{a+b}\\
-\testline{a=b}\\
-\testline{a<b}\\
-\testline{a>b}\\
-\testline{<x,y>}\\
-\testline{\mathopen{<} x,y\mathclose{>}}\\
-\testline{\left< x,y\right>}\\
-\testline{a/b}\\
-\testline{a\backslash b}\\
-\testline{a\setminus b}\\
-\testline{a|b}\\
-\testline{a\mid b}\\
-\testline{(a,b)}\\
-\testline{[a,b]}\\
-\testline{\{a,b\}}
-\end{tabular}}
-
-\end{document}
-%</alphabets>
%<*dtx>
^^Afi^^Aendgroup % end of big \iffalse block including generated files
% Removal of the *sfixed found in tex/latex/mlmodern/omxmlmex.fd
@@ -1523,7 +1117,7 @@ $\mathnormal{ff}$, $\mathrm{ff}$, $\mathit{ff}$, $\mathbf{ff}$, $\mathtt{ff}$
\def\cmd#1{\cs{\expandafter\cmd@to@cs\string#1}}
\def\cmd@to@cs#1#2{\char\number`#2\relax}
% Here I am loading doc=v2 but formerly I was using ltxdoc via scrdoc
-% which I dropped at release 1.4l (2022-05-29) and without much
+% which I dropped at (etoc) release 1.4l (2022-05-29) and without much
% thinking I had kept this.
\DeclareRobustCommand\cs[1]{\texttt{\bslash#1}}
% As I may have the * active, or macro names with _ or ^, I should
@@ -1552,12 +1146,19 @@ $\mathnormal{ff}$, $\mathrm{ff}$, $\mathit{ff}$, $\mathbf{ff}$, $\mathtt{ff}$
% is set by geometry package and a4paper option from xint.tex file. So it
% seems I only need the hologo loading:
\usepackage{hologo}
-\DeclareRobustCommand*{\eTeX}{\hologo{eTeX}}%
-\DeclareRobustCommand*{\pdfLaTeX}{\hologo{pdfLaTeX}}%
-\DeclareRobustCommand*{\LuaTeX}{\hologo{LuaTeX}}%
-\DeclareRobustCommand*{\LuaLaTeX}{\hologo{LuaLaTeX}}%
-\DeclareRobustCommand*{\XeTeX}{\hologo{XeTeX}}%
-\DeclareRobustCommand*{\XeLaTeX}{\hologo{XeLaTeX}}%
+% 1.4 fix to some extra line spacing obviously caused by usage of the
+% \hologo macro.
+% I opened https://github.com/ho-tex/hologo/issues/9
+% after testing, actually only XeTeX and XeLaTeX are problematic
+% update: as per @u-fischer the problem goes away if graphicx package
+% is loaded, but we don't use it in this document...
+\def\msthologo#1{\smash{\hologo{#1}}}
+\DeclareRobustCommand*{\eTeX}{\msthologo{eTeX}}%
+\DeclareRobustCommand*{\pdfLaTeX}{\msthologo{pdfLaTeX}}%
+\DeclareRobustCommand*{\LuaTeX}{\msthologo{LuaTeX}}%
+\DeclareRobustCommand*{\LuaLaTeX}{\msthologo{LuaLaTeX}}%
+\DeclareRobustCommand*{\XeTeX}{\msthologo{XeTeX}}%
+\DeclareRobustCommand*{\XeLaTeX}{\msthologo{XeLaTeX}}%
%
\makeatother
%%% end of ltxdoc+srcdoc emulation from June 2022 xint.dtx,
@@ -1669,7 +1270,8 @@ pdfpagemode=UseOutlines,%
asterisk,%
defaultmathsizes,%
symbolmisc,symbolre,%
- LGRgreek+]{mathastext}
+ LGRgreek+,
+ activedigits]{mathastext}
\let\symbolbullet\bullet
\let\bullet\originalbullet
% This version will use the mlmodern font which is current
@@ -1790,15 +1392,15 @@ pdfpagemode=UseOutlines,%
\def\tt {\normalfont\ttfamily}
% mais bon, en fait je ne les utilise pas.
-% 2023/12/27 pas encore
-% \newcommand\mstrelease[1]{\hyperlink{v#1}{\texttt{#1}}}
-
% 2023/12/27
\DeclareRobustCommand\ctanpkg[1]
{\texorpdfstring{\href{https://ctan.org/pkg/#1}{#1}}{#1}}
-% bataille avec le rendu de l'entrée 1.3zb du change log
-% \hyphenation{ncc-comma}
+% 2024/07/10
+% Attention que si la cible n'existe pas il n'y a AUCUN warning
+% dans le log...
+\newcommand\mstrelease[1]{\hyperlink{#1}{\texttt{#1}}}
+
\begin{document}
% \makeatletter\show\mv@normal\makeatother
% contient
@@ -1924,10 +1526,6 @@ the preamble:
\end{verbatim}
The package records which font is set up for text, at the time it is
loaded,
-%\footnote{alternatively it is possible to configure the text font after
- % loading \mst, and then the command \cs{Mathastext} will accomplish the
- % necessary changes to the font for letters, digits and a few extra ascii
- % symbols in math mode.}
and
then arranges things in order for this text font to be used in math mode as
well. So, with the preamble as above
@@ -1955,293 +1553,6 @@ The exact list of characters concerned by
As one can see, this is a very limited list! Some possibilities exist
regarding Greek letters and will be described later.
-\subsection{Miscellanea}
-
-Please note that most of this section was written many years ago (except for
-the item about math alphabets which was enriched with important background
-information and moved upfront at |1.3zb|). But it should still be valid!
-%
-\begin{description}
-
-\item[math alphabets:] Let us first recall fundamental facts of life, in the
- world of traditional PDF\TeX\ engine and \TeX\ fonts, as background for
- understanding what \mst does in this context, which will be explained next.
- People familiar with using Unicode engines and \ctanpkg{unicode-math}, please be
- aware that the semantics there of the \LaTeX\ math alphabet commands are
- \textbf{significantly} modified!
-\begin{snugshade}
-\begin{itemize}
-\item In the default \LaTeX\ set-up all five of §\mathrm§, §\mathbf§,
- §\mathit§, §\mathsf§ and §\mathtt§ tell \TeX\ to use for their arguments
- specific \texttt{OT1}-encoded fonts,
-\item if the document body uses, as will be the case probably with any
- language other than English or its variants, some other encoding such as
- \texttt{T1} for its fonts, there is no change whatsoever to the math
- configuration, indeed most font packages ignore it completely,
-\item it is thus a priori wrong to think of these commands as switching to
- some body text font, although letters within their scopes will act as in a
- text font, and in particular obey ligatures (this also applies to operator
- names defined by |amsmath|'s \cs{DeclareMathOperator} which are, with some
- extras not mentioned here, as using §\mathrm§),
-\item these commands are completely different in spirit from the \LaTeX\
- \cs{textrm}, \cs{textbf}, and others, which change only some font axis;
- indeed the math alphabet commands inherit from legacy Knuth's \cs{rm},
- \cs{bf}, and others which are complete font specifiers,
-\item in particular when nesting, it is the inner-most which wins,
-\item only mathematical characters (such as letters) which are declared to
- \TeX\ as being of ``variable family type'' react to being in the argument of
- a math alphabet command,
-\item lowercase Greek letters are by default in \LaTeX\ immune to math
- alphabets (so \verb|\mathrm{\pi}| induces no change in output), but the
- eleven uppercase Greek letters are of ``variable family type'' because they
- are picked in the \texttt{OT1}-encoded font also used for operator names
- (the one to which §\mathrm§ maps), \emph{and they occupy the exact same
- slots in the \emph{\texttt{OML}}-encoding to which} §\mathnormal§ maps! So
- in default \TeX, \verb|\mathnormal{\Gamma}| gives a slanted one. The slots
- occupied in \texttt{OML}-encoding by the lowercase Greek letters (to which
- encoding they are a priori assigned) give
- completely unrelated glyphs in the \texttt{OT1}-encoding, so it makes sense
- that the default \LaTeX\ declares them to not react to math alphabets.
- Notice though, that if \LaTeX\ had declared a \cs{mathnormalbold}, mapping
- to a bold \texttt{OML}-encoded font, it would have made sense to also have
- \cs{alpha}, \cs{beta}, etc... be of ``variable family type'',
-\item but of course then one should a priori never use |\mathbf{\pi}| for
- example, because the default §\mathbf§ selects an \texttt{OT1}-encoded
- font, where there is no pi glyph whatsoever and in particular not at the slot of
- pi in the \texttt{OML} encoding (slot number 25)!
-\end{itemize}
-\end{snugshade}
-Please keep all the above in mind when trying to understand what \mst does
-with math alphabets. The most significant point described next naturally is that
-\mst will sync §\mathnormal§, §\mathrm§, §\mathbf§, §\mathit§, §\mathsf§ and
-§\mathtt§ to map to the \mst-ified body text fonts.
- \begin{itemize}
- \item §\mathnormal§, §\mathrm§, §\mathbf§, §\mathit§,
- §\mathsf§ and §\mathtt§ are modified to use the \mst-ified
- text fonts; this can be disabled via §defaultalphabets§ and
- related individual options, but the package always provides
- §\Mathnormal§, §\Mathrm§, etc..., to match the \mst font
- configuration (\RLNote{changed:}{1.3za}prior to |1.3za|
- §defaultalphabets§ and related options also caused the \mst
- alphabet commands not to be defined). Recall that there may
- arise a ``too many math alphabets'' error if too many of these
- commands are \emph{used} in the document:
- \emph{declaring} them is not by itself the cause of the error. See the
- \LaTeX\ news entry of its \texttt{2021-11-15} release for
- the counter \texttt{localmathalphabets} (with default value 2)
- which can be now be used if one hits such a difficulty.
- \item We define a new math alphabet command
- §\mathnormalbold§ which gives direct access to
- the bold version of the §\mathnormal§ alphabet
- (rather than using either the \cs{bm} command from
- the \ctanpkg{bm} package or the \cs{boldsymbol} command
- from the \ctanpkg{amsbsy} package). As it does not
- exist in the default \LaTeX{} math font set-up, this
- alphabet is \emph{not} subjected to the {subdued option} action.
-
-\item version \RightNote{1.2}|1.2| of \mst has extended the scope of the math
- alphabets to apply to non-alphabetical characters and to
- operator names. This respects the automatic white spaces
- added by \TeX{} around math symbols.
-\item The\RightNote{1.3i}
- extra skips around letters (see \autoref{sec:mathskips} and
- \autoref{sec:ic}) are removed in the scope of the math alphabets.
-
- \item Depending on options, further math alphabet commands
- are defined by the package: §\MathEulerBold§,
- §\MathEuler§, §\MathPSymbol§, and since |1.3x| under
- the §LGRgreek§ family of options\RightNote{1.3x} also
- §\mathgreekup§ and §\mathgreekit§. See
- \autoref{sec:newgreek}.
- \item \RightNote{1.3za}Addition of §\mathgreekupbold§ and
- §\mathgreekitbold§ under the §LGRgreek§ family of options.
- \item With\RightNote{1.3za} the §LGRgreek+§ option
- which enhances Greek letters with a specific behavior when in the
- arguments of the §\mathrm§, §\mathbf§, etc..., math alphabet
- commands, this special behavior is not triggered by the §\Mathrm§,
- §\Mathbf§, et al., which are genuine unmodifed math alphabet commands. See
- \autoref{sec:newgreekplus}.
- \end{itemize}
-
-\item[the en-dash as minus sign:] very often the -
- character from the text font does not give a good
- minus sign. So by default, the package uses the
- en-dash sign \textendash{}. Use §noendash§ to
- deactivate it. Starting with version |1.12| of the
- package this `en-dash as minus' should work in all
- encodings, including Unicode (if \ctanpkg{fontspec} has been
- loaded); see also |unicodeminus| for OpenType fonts.
-
-\item[amsmath:] \strut the behaviour of the
- \cs{DeclareMathOperator}\RightNote{1.3n} command
- of |amsmath| is modified by \mst for it to use the correct font.
- Additionally, release |1.3n| of \mst at long last also handles an extra
- operation done by |amsmath| for |'.:/-*| to be used in operator names
- without the extra math spacing.%
-%
-\footnote{To the experts: there is a long story here that \cs{newmcodes@}
- hardcodes the font, that it was not compatible with Unicode engines, that
- during some time (2013-2016) \texttt{lualatex-math} fixed that and very
- recently |amsopn.sty 2016/03/08 v2.02| also, so now \texttt{lualatex-math
- 1.6} does nothing as it is already fixed ``upstream'' in |amsopn.sty|, but
- anyhow in both cases, this still hardcoded the font, so finally \mst does
- the right thing from its point of view. See the code comments for more,
- there is an issue here with \LuaLaTeX\ not applying the curly right quote
- contrarily to \XeLaTeX.}
-%
-This customization is suppressed in §subdued§ mode for the |normal| and |bold|
-math versions.
-
-\item[hbar:] the default \LaTeX\ definition of §\hbar§ would in our context
- make use of the |h| of the current math font (so for us, it is also the text
- font, perhaps in italic shape), but with a bar accross the |h| from the
- original default math font for letters (usually |cmmi|). We redefine
- \cs{hbar} to use the text font macron accent (|\=|) as a mock math accent
- (this takes into account the §italic§ option and is compatible with
- subscripts and superscripts).
-
- Since |1.12| \mst when dealing with a Unicode font sets the \cs{hbar}
- to be the character from the font having hexadecimal codepoint |U+0127|.
-
- Since |1.3u| the general 8bits font encoding is
- supported\RightNote{1.3u} (see discussion of the |mathaccents| option
- at end of this list for the shared limitations). Brief testing with
- various usual \TeX\ fonts shows that the vertical positioning of
- the bar isn't satisfying. It is planned to either add a parameter to
- adjust it or to modify altogether the mode of construction of the |\hbar|.
-
- Use §nohbar§ to tell \mst not do provide its own |\hbar|.
-
-
-\item[dotless i and j:] by default the package redefines \cs{imath} and
- \cs{jmath} to give (in math mode) the dotless i and j (if it exists at
- all) from the text font.%
-%
-\footnote{\RightNote{1.3t}Since \texttt{1.12} it also redefined \cs{i} and
- \cs{j} for usability both in text and math modes, but this has been
- dropped at \texttt{1.3t}. Breaking change!}
-
-\item[asterisk:] versions of \mst earlier than |1.2d [2013/01/02]|
- did not do anything
- with the \cs{ast} control sequence but did pick the asterisk
- $*$ in the document text font, and this often was a rather
- silly thing as the text asterisk is generally in a raised
- position. Furthermore, the $*$ lost its status of a binary
- operator and was treated as an `ordinary' symbol. An option
- |noasterisk| turned this feature off. Starting with |1.2d|,
- the |noasterisk| option is deprecated and the new default is
- to do nothing. But when option §asterisk§ is received by the
- package, then both \cs{ast} and $*$ are simultaneously
- modified to use (as binary operators) the text asterisk,
- slightly lowered. The amount of lowering\footnote{with the
- option \texttt{symbolmisc}, the asterisk is picked from
- the Symbol font, and the amount of lowering is
- non-customizable; however if a math alphabet command is
- used, the asterisk is then again from a text font and the
- lowering will be as specified by \cs{MTlowerast}.} is
- decided by the mandatory argument to the command
- \csb{MTlowerast}\marg{dimen}. The package initially does
- \cs{MTlowerast}|{.3\height}|. Doing \cs{MTlowerast}|{.5ex}| is
- not a good idea as it does not scale properly in the script
- and scriptscript styles. With an argument given as a
- multiple of |\height|, the asterisk will behave as expected
- in subscripts and subscripts of subscripts. But $*$ is now
- `mathematically active'\thinspace\footnote{in a hopefully
- safe way, for example {\ttfamily\$\string\label\{eq*1\}\$}
- is ok.} and |$R^*$| or |$R^\ast$| \emph{must} be input as
- |$R^{*}$| and |$R^{\ast}$|. Furthermore, they will obey the
- math alphabet commands.
-
-\item[\XeTeX{} and \LuaLaTeX{}:] regarding the en-dash and the
- dotless i and j, the package is now under the Unicode engines
- compatible not only with the ``Unicode'' \LaTeX\ font encodings
- EU1 (\XeTeX, old fontspec), EU2 (\LuaLaTeX, old fontspec), TU
- (\XeTeX\ and \LuaLaTeX, modern fontspec), but also with
- traditional 8bits-encodings declared as a |fontenc|
- option.\RightNote{1.3u}
-
-% obsolete
- % Formerly, with a Unicode engine,
- % only OT1, T1 and LY1 were supported by \mst as the 8bit encoding
- % of the document text font, regarding the minus as en-dash and
- % the dotless i and j.
-
- \item[fontspec:] one more note to users of
-\XeTeX{}/\LuaLaTeX{} with \ctanpkg{fontspec}:\newline
-\fbox{it has to be
-loaded {with the option} |no-math|},
-and \emph{before} \mst.
-
-\item[vec accent:] The default \cs{vec} accent is not
- appropriate for upright letters, so \mst
- provides a \cs{fouriervec} which takes its glyph in a
- Fourier font, and an Ersatz \cs{pmvec}
- which is reasonably good looking on upright letters
- and works with the \cs{rightarrow} glyph. Contrarily
- to version |1.0|, the default \cs{vec} is not
- overwritten with \cs{fouriervec}. And contrarily to
- version |1.1|, one now needs to pass the option
- §fouriervec§ to have the math accent \cs{fouriervec}
- defined by the package.%
-%
-\footnote{this costs a math family, as I never came back to this to try to
- do otherwise.}
-
-\item[math accents:] if option §mathaccents§ is used then \mst attempts to let
- the math accents |\acute|, |\grave|, etc... use the suitable glyphs from the
- text font. Prior to |1.3u| only |OT1|, |T1|, and |LY1| were supported (via
- hardcoded slots). It should now work with any 8bits font
- encoding\RightNote{1.3u} having been declared as an option to the
- \ctanpkg{fontenc} package (and of course providing the ten needed text accents which
- will mock math accents).%
- %
- \footnote{The code will raise low-level \TeX\ errors if the user attempts to
- use an 8bits font encoding whose \LaTeX\ definition file is lacking the
- suitable uses of \cs{DeclareTextAccent} or if the low level \LaTeX\ macro
- implementation of text accents changes significantly; in such cases please
- report the problem to the author, so that it can be documented in future
- releases!}
-
- The |\vec| math accent is not handled here, as it is not available in the
- usual 8bits font encodings. See the §fouriervec§ option or the §\pmvec§
- command.
-
- The math accents obey the §subdued§ option\RightNote{1.3u}
- and will change in sync with the \mst-ified text font used in
- each non subdued math version.
-
- (Very) brief testing during |1.3u| development with \XeTeX\ and \LuaTeX\ let
- the author conclude that usage with the \cs{Umathaccent} primitive of an
- OpenType accent glyph slot (which in the text font is for usage as a
- postpended combining character) gives definitely bad horizontal placements
- for both engines (each in its own way). Thus, the redefinitions of accents
- for a \mst declared math version with an OpenType font is by default
- canceled.%
-%
-\footnote{I.e., the \cs{grave} etc... control sequences will, in math versions
- with an OpenType \mst-ified font, expand to macros holding their initial
- meanings, unmodified by \mst, which was in force at the
- |\string\begin\string{document\string}|.}
-%
- Use §unimathaccents§ to force usage of the OpenType font text
- accents glyph slots with the \cs{Umathaccent} primitive. Expert users are
- invited to check out the code and to contribute suggestions if some extras
- can improve it.
-
-\item[varying font encodings:] the very first release of \mst dealt with only
- one font; very soon thereafter it acquired the capacity to define multiple
- math versions, each one using its own text font. But, as was documented at
- this location formerly, various encoding dependent decisions were done once
- and for all during package loading.
-
- This meant in particular that the minus sign (using the text endash), the
- dotless |i| and |j|, the |\hbar|, the math accents were all set up for only
- one unique font encoding. It was thus recommended that all math versions
- share the same font encoding.
-
- The |1.3u| release has lifted this restriction.\RightNote{1.3u}
-\end{description}
-
\subsection{Examples}
\label{sec:examples}
@@ -2473,7 +1784,7 @@ versions.%
% \href{http://mirrors.ctan.org/help/Catalogue/entries/cbgreek-complete.html}{cbfonts},
% \href{http://mirrors.ctan.org/help/Catalogue/entries/txfontsb.html}{txfontsb}.
-\emph{Since |1.3x| this documentation uses globally the |mlmodern|%
+\emph{Since \mstrelease{1.3y} this documentation uses globally the |mlmodern|%
%
\footnote{Daniel Benjamin \textsc{Miller}, \emph{A blacker Type 1 version of Computer Modern, with multilingual
support}, \url{https://ctan.org/pkg/mlmodern}. I have added to the preamble
@@ -2500,7 +1811,7 @@ reasons of PDF file size.}%
\subsubsection{The \blueit{italic} option}
-In the initial version |1.0|, the Latin letters in
+In the initial version \mstrelease{1.0}, the Latin letters in
mathematical mode assumed the exact same shape as in
text mode, and this meant, generally speaking, that
they would turn up upright. Doing this gives a very
@@ -2510,15 +1821,15 @@ one of the design goals of \mst.
Nevertheless, soon after I posted the initial version
of the package to CTAN, I was overwhelmed by
-numerous\footnote{this means ``more then one.''}
+numerous\footnote{this means ``more than one.''}
questions\footnote{I thank in particular
Tariq~\textsc{Perwez} and Kevin~\textsc{Klement} for
their kind remarks (chronological order).} on how to
have the letters be in italic shape.
-The default is still, as in version |1.0|, for everything to be in
+The default is still, as in version \mstrelease{1.0}, for everything to be in
upright shape, but it suffices to pass to the package the option
-§italic§\RightNote{1.1} to let the Latin letters in math mode be
+§italic§\RightNote{\mstrelease{1.1}} to let the Latin letters in math mode be
in italic shape.%
%
\footnote{more precisely stated, the value of \cs{itdefault}
@@ -2547,7 +1858,7 @@ the \ctanpkg{moresize} package. To cancel all of this use option
\subsubsection[The subdued option]{The \blueit{subdued} option}\label{sec:subdued}
-This option was introduced in |v1.15|.\RightNote{1.15} It provides a manner to
+This option was introduced in |v1.15|.\RightNote{\mstrelease{1.15}} It provides a manner to
switch on the \mst-\emph{ification} only for limited portions of
the document, with the help of the mechanism of math versions. Without the
§subdued§ option, the \emph{mathastextification} applies by default
@@ -2560,7 +1871,7 @@ Despite some limitations I will now partially describe, the §subdued§ option
has its utility, as I think is illustrated enough by the examples given at the
start of this document and it works reasonably well.
-\begin{framed}
+\begin{shaded*}
\mst was not written initially in order to allow its action to
be completely canceled. It does not store (all) mathcodes nor
does it set them (all) when changing math versions; only that would
@@ -2569,7 +1880,7 @@ start of this document and it works reasonably well.
official interface to math mode, as it is almost entirely
preamble only).
- Releases |1.3t| and |1.3u| do this kind of things to maintain
+ Releases \mstrelease{1.3t} and \mstrelease{1.3u} do this kind of things to maintain
usability across multiple \mst-ified math versions of characters
which are obviously font encoding dependent such as the minus
sign as en-dash (or unicode minus), the dotless i, the |\hbar|,
@@ -2581,7 +1892,7 @@ start of this document and it works reasonably well.
mode and to multiple math versions amounts to some kind of a
kludge, added to an initial design which handled a single unique
text font.
-\end{framed}
+\end{shaded*}
To get the displayed math
(almost) as if \mst had not been loaded, one must also
@@ -2590,7 +1901,7 @@ as, for example, the colon, the dot, and the minus sign belong
in the default \LaTeX{} math mode set-up to three distinct fonts
whereas \mst will pick (even subdued) the three of them in the same
font,%
-\footnote{\RightNote{1.3t}The minus sign is now perfectly subdued,
+\footnote{\RightNote{\mstrelease{1.3t}}The minus sign is now perfectly subdued,
because its original mathcode is stored and restored; this was only
way to handle the case with Unicode engines
where the math operator font is in a classic
@@ -2604,13 +1915,13 @@ mathcodes, so to
be on the safe side one needs the §basic§ option which limits the
mathastextification to letters and digits.%
%
-\footnote{\RightNote{1.3d}The §subdued§ mode does extinguish
+\footnote{\RightNote{\mstrelease{1.3d}}The §subdued§ mode does extinguish
in the normal and bold math versions the action of options §selfGreek§,
§eulergreek§, and §symbolgreek§ (previously only §LGRgreek§ was
subdue-able).}
-\footnote{\RightNote{1.3t}The \texttt{\string\imath} and
+\footnote{\RightNote{\mstrelease{1.3t}}The \texttt{\string\imath} and
\texttt{\string\jmath} now obey the subdued regime.}
-\footnote{\RightNote{1.3u}Also \texttt{\string\hbar}
+\footnote{\RightNote{\mstrelease{1.3u}}Also \texttt{\string\hbar}
and the math accents (see §mathaccents§ option) obey the subdued regime.}
%
Even then, in some circumstances, this may not suffice: for example the
@@ -2644,80 +1955,192 @@ customization of Greek letters. The command §\MTcustomgreek§ reenables the
customization done by \mst, if it was loaded with the §LGRgreek§ or one of the
other Greek related options.
-\begin{framed}
- Release |1.3x| has added important new aspects to the handling of Greek
+\begin{shaded*}
+ Release \mstrelease{1.3y} has added important new aspects to the handling of Greek
letters via the §LGRgreek§ option. Make sure to read the \autoref{sec:newgreek}.
-\end{framed}
+\end{shaded*}
+
+\subsection{Miscellanea}
+
+Please note that most material to be found in this section was written many
+years ago (except the two subsections on §frenchmath§ on one hand and
+intervals on the other hand). But it should still be valid!
-\subsection{More miscellanea}
+Ultimately most information here should be moved into the
+reference sections \autoref{sec:cmd} and \autoref{sec:opt}, and only some
+generalities should be kept here.
-This may repeat information already given.
+\subsubsection{Load \mst always last}
+
+The ``large'' math symbols are not modified in any way by \mst. Only loading
+some math font packages such as \ctanpkg{fourier}, \ctanpkg{kpfonts}, \ctanpkg{mathabx}, \ctanpkg{mathdesign},
+\ctanpkg{txfonts}, \ctanpkg{newtxmath}, \ctanpkg{libertinust1math}, others\dots{} will change them. Think of loading these
+packages before \mst, else they might undo what \mst did.
+
+More generally any package (such as \ctanpkg{amsmath}) dealing with math mode should be
+loaded \emph{before} \mst.
\subsubsection{Avoid \texorpdfstring{\texttt{OT1}}{OT1} encoding}
- We specified in our minimal working example a |T1| encoding (|LY1| would
- have been ok, too) because the default |OT1| does not have the
+ The default |OT1| does not have the
{\color{joli}\DeleteShortVerb{\|}
$\mathord{<}\,\mathord{>}\,\mathord{|}$\,\{\,\}} and
{\color{joli}$\backslash$\MakeShortVerb{\|}} glyphs. If
\mst detects |OT1| as the default encoding it will leave these characters to
- their defaults from the math fonts.\footnote{the §subdued§ option, described next,
+ their defaults from the math fonts.%
+%
+\footnote{The §subdued§ option, described next,
acts a bit otherwise, it forces, contrarily to its usual low-key character,
the replacement of |OT1| by |T1| for the fonts ultimately used with letters
and digits in math mode.}
-\begin{framed}
+%
+\begin{shaded*}
If \mst detects the obsolete |OT1| encoding it does not do anything with
\DeleteShortVerb{\|}<, >, |, \{, and \} which (except for monospace fonts)
are not available in that encoding.\MakeShortVerb{\|}
To fully benefit from \mst it is
recommended to use some other encoding having these glyphs such as |T1| or
|LY1|.
-\end{framed}
+\end{shaded*}
\subsubsection{Derivative, minus, asterisk}
The text characters {}'{} and {}-{} are not used, and the asterisk is
-done optionally:
+done only optionally:
\begin{itemize}
\item the derivative sign ${}'$ is left to its default as the text font
- glyph {}'{} is not, as a rule, a satisfying alternative.\footnote{|v1.2| adds
+ glyph {}'{} is not, as a rule, a satisfying alternative.%
+%
+\footnote{|v1.2| adds
a customizable tiny space before ${}'$ to separate it from the previous
letter, this is really needed when using upright letters in math mode with
the CM derivative glyph.{\MTversion{upright}\sffamily\MTprimeskip{.5mu}%
Compare $f'$ with \MTprimeskip{0mu}$f'$.} }
+
\item for the minus sign \mst uses the endash character
- \textendash, if available, and not the hyphen character -.%
-%
-\footnote{see the §unicodeminus§ option if using an OpenType font.}
-%
-\item the §asterisk§ option is mandatory for \mst to replace the binary math
- operator $*$ (and the equivalent control sequence \cs{ast}) with a version
- which uses the text asterisk * suitably lowered\footnote{the amount of
- lowering can be customized.} (and with the correct spaces around it as
- binary operator). The reason is that after this inputs such as |$R^*$|
- or |$R^\ast$| raise errors and \emph{must} be written |$R^{*}$| or |$R^{\ast}$|.
+ \textendash, if available, and not the hyphen character -. With
+an OpenType font, \mst uses per default the EN DASH U+2013 (see §unicodeminus§).
+
+\item the §asterisk§ option is required for \mst to use the text font for the
+ binary infix math operator $*$ and
+ the control sequence \cs{ast}. They will use then the text asterisk
+ * suitably lowered, and with the correct spaces around it as binary
+ operator.
+ \begin{snugshade}
+ Attention that with this option, inputs such as |$R^*$| or |$R^\ast$|
+ raise errors and \emph{must} be replaced by |$R^{*}$|, respectively
+ |$R^{\ast}$|.
+ \end{snugshade}
\end{itemize}
+\subsubsection{Large symbols and delimiters}
+
Nothing is changed to the ``large'' math symbols, except for
$\MToriginalprod$ and $\MToriginalsum$ in inline math which, like here:
$\prod\sum$, will be taken from the Symbol Font if option §symbolmisc§
was used.
The left and right delimiters are taken from
-the text font only for the base size: any |\big|, |\bigl|, |\bigr|,
-etc\dots reverts to the original math symbols.
+the text font only for the base size: any one of |\big|, |\bigl|, |\bigr|,
+etc\dots will trigger the use of the original math symbols.
+\subsubsection{amsmath}
+The behavior of the
+ \cs{DeclareMathOperator}\RightNote{\mstrelease{1.3n}} command
+ of |amsmath| is modified by \mst for it to use the correct font.
+ Additionally, release \mstrelease{1.3n} of \mst at long last also handles an extra
+ operation done by |amsmath| for |'.:/-*| to be used in operator names
+ without the extra math spacing.%
+%
+\footnote{To the experts: there is a long story here that \cs{newmcodes@}
+ hardcodes the font, that it was not compatible with Unicode engines, that
+ during some time (2013-2016) \texttt{lualatex-math} fixed that and very
+ recently |amsopn.sty 2016/03/08 v2.02| also, so now \texttt{lualatex-math
+ 1.6} does nothing as it is already fixed ``upstream'' in |amsopn.sty|, but
+ anyhow in both cases, this still hardcoded the font, so finally \mst does
+ the right thing from its point of view. See the code comments for more,
+ there is an issue here with \LuaLaTeX\ not applying the curly right quote
+ contrarily to \XeLaTeX.}
+%
+This customization is suppressed in §subdued§ mode for the |normal| and |bold|
+math versions.
-\subsubsection{Load \mst always last}
+\subsubsection{hbar}
+The default \LaTeX\ definition of §\hbar§ would in our context
+ make use of the |h| of the current math font (so for us, it is also the text
+ font, perhaps in italic shape), but with a bar accross the |h| from the
+ original default math font for letters (usually |cmmi|). We redefine
+ \cs{hbar} to use the text font macron accent (|\=|) as a mock math accent
+ (this takes into account the §italic§ option and is compatible with
+ subscripts and superscripts).
-The ``large'' math symbols are not modified in any way by \mst. Only loading
-some math font packages such as \ctanpkg{fourier}, \ctanpkg{kpfonts}, \ctanpkg{mathabx}, \ctanpkg{mathdesign},
-\ctanpkg{txfonts}, \ctanpkg{newtxmath}, etc\dots{} will change them. Think of loading these
-packages before \mst, else they might undo what \mst did.
+ Since \mstrelease{1.12} \mst when dealing with a Unicode font sets the \cs{hbar}
+ to be the character from the font having hexadecimal codepoint |U+0127|.
-More generally any package (such as \ctanpkg{amsmath}) dealing with math mode should be
-loaded \emph{before} \mst.
+ Since \mstrelease{1.3u} the general 8bits font encoding is
+ supported\RightNote{\mstrelease{1.3u}} (see discussion of the |mathaccents| option
+ at end of this list for the shared limitations). Brief testing with
+ various usual \TeX\ fonts shows that the vertical positioning of
+ the bar isn't satisfying. It is planned to either add a parameter to
+ adjust it or to modify altogether the mode of construction of the |\hbar|.
+
+ Use §nohbar§ to tell \mst not do provide its own |\hbar|.
+
+
+\subsubsection{Dotless i and j}
+By default the package redefines \cs{imath} and
+ \cs{jmath} to give (in math mode) the dotless i and j (if it exists at
+ all) from the text font.%
+
+ \subsubsection{fontspec}
+
+\fbox{\ctanpkg{fontspec}
+has to be
+loaded {with the option} |no-math|},
+\emph{and before} \mst.
+
+\subsubsection{vec accent}
+
+The default \cs{vec} accent is not appropriate for upright letters, so \mst
+provides under option §fouriervec§ a math accent control sequence
+\cs{fouriervec} which takes its glyph in a Fourier font. A poorman Ersatz
+\cs{pmvec} is always available ; it is reasonably good looking on upright
+letters and works with the \cs{rightarrow} glyph.
+
+\subsubsection{math accents}
+If option §mathaccents§ is used then \mst attempts to let
+ the math accents |\acute|, |\grave|, etc... use the suitable glyphs from the
+ text font.
+
+ The |\vec| math accent is not handled here, as it is not available in the
+ usual 8bits font encodings. See the §fouriervec§ option or the §\pmvec§
+ command.
+
+ The math accents obey the §subdued§ option\RightNote{\mstrelease{1.3u}}
+ and will change in sync with the \mst-ified text font used in
+ each non subdued math version.
+
+\begin{footnotesize}
+ (Very) brief testing during \mstrelease{1.3u} development with \XeTeX\ and \LuaTeX\ let
+ the author conclude that usage with the \cs{Umathaccent} primitive of an
+ OpenType accent glyph slot (which in the text font is for usage as a
+ postpended combining character) gives definitely bad horizontal placements
+ for both engines (each in its own way). Thus, the redefinitions of accents
+ for a \mst declared math version with an OpenType font is by default
+ canceled.%
+%
+\footnote{I.e., the \cs{grave} etc... control sequences will, in math versions
+ with an OpenType \mst-ified font, expand to macros holding their initial
+ meanings, unmodified by \mst, which was in force at the
+ |\string\begin\string{document\string}|.}
+%
+ Use §unimathaccents§ to force usage of the OpenType font text
+ accents glyph slots with the \cs{Umathaccent} primitive. Expert users are
+ invited to check out the code and to contribute suggestions if some extras
+ can improve it.\par
+\end{footnotesize}
+
\subsubsection{Sans serif in math}
@@ -2733,8 +2156,6 @@ text.
\subsubsection{\mst with \ctanpkg{beamer}}\label{ssec:beamer}
-%\noindent\llap{\textcolor{green}{\bfseries 2015/02/26}\hspace{1em}}
-
Starting
with release |3.34| of \ctanpkg{beamer}%
%
@@ -2791,24 +2212,9 @@ Antoine~\textsc{Missier}:
\item and load \mst afterwards (with possibly some font packages loaded in-between), passing it
the option §frenchmath*§.
\end{itemize}
-% \begin{footnotesize}
-% The\RightNote{1.3zb} release |2.7| dated |2023/12/23| of
-% \ctanpkg{frenchmath} required \mst to add a compatiblity patch and modify
-% the §frenchmath*§ option. The above instructions cause a build crash with
-% |2.7| \ctanpkg{frenchmath} and \mst |1.3za| and earlier. One must use \mst
-% |1.3zb| or later.\par
-% \end{footnotesize}
-% Also, \ctanpkg{frenchmath} must be at least at
-% version |2.7| of |2023/12/23|.%
Limited testing indicated that the combination of the two packages (using the
options as indicated above) works satisfactorily.
-% as expected but that some adjustments may be needed for some of
-% the macros defined by \ctanpkg{frenchmath}: we
-% observed in particular that the |\paral| command (which produces
-% $\mathrel{/\!\!/}$) may not work well if the $/$ is picked up from the text
-% font due to \mst (alternative could be for most text fonts
-% |\def\paral{\mathrel{//}}|),
There may be some minor adjustments to do, as the \mst-ified math font may
cause issues to some of
the \ctanpkg{frenchmath} macros: for exemple \cs{Oijk} may not work
@@ -2886,9 +2292,9 @@ respectively, which make
the comma (to some extent) `intelligent', i.e. decide on the spacing type
(ordinary or punctuation) depending on next token. Do not load directly the packages
but simply use the corresponding option and \mst will do the loading and take
-appropriate needed measures for compatibility. The\RightNote{1.3zb} §decimalcomma§ option is
+appropriate needed measures for compatibility. The\RightNote{\mstrelease{1.3zb}} §decimalcomma§ option is
included in the §frenchmath*§ option, and the §ncccomma§
-option is included in the §frenchmath+§ option.\RightNote{1.3zb}
+option is included in the §frenchmath+§ option.\RightNote{\mstrelease{1.3zb}}
Let's give another example of usage of \ctanpkg{mathtools} here to define a
macro for integer ranges:
@@ -2924,6 +2330,417 @@ multiple math versions. Read the fine print below for some limitations though.
\mst actions on square brackets (and parentheses).\par
\end{footnotesize}
+\subsubsection{Unicode engines}
+
+\mst is minimally Unicode aware since \mstrelease{1.12} and can be used with \XeTeX{} or
+\LuaTeX{}. Starting with release \mstrelease{1.3}, it needs |luatex| to be at least
+as recent as the one which was provided with the TL2013 distribution.
+
+However \mst applies only to (a subset of) the |32-127| ascii range, and
+optionally to Greek letters, but for the latter only if provided via ``\TeX\
+fonts'' such as Euler, Symbol or LGR-encoded fonts.
+It does not know how to use a given Unicode font simultaneously for Latin and
+Greek letters.
+
+Thus, first consider much better alternatives:
+\begin{itemize}
+\item Since 2018, the package \ctanpkg{mathfont}%
+%
+\footnote{Conrad \textsc{Kosowsky}, \emph{Use TrueType and OpenType fonts in math mode}
+\url{https://ctan.org/pkg/mathfont}.}
+%
+adapts Unicode text fonts to usage in math mode. It works with both \XeTeX\
+and \LuaTeX.
+\item For \XeTeX\ only, \ctanpkg{mathspec}%
+%
+\footnote{Andrew Gilbert \textsc{Moschou}, \emph{Specify arbitrary fonts for mathematics in \XeTeX}
+\url{https://ctan.org/pkg/mathspec}.}
+%
+also allows usage of arbitrary text fonts in mathematics.
+\item and of course
+\ctanpkg{unicode-math}%
+%
+\footnote{Will \textsc{Robertson}, et al., \emph{Unicode mathematics with
+ support for XeTeX and LuaTeX} \url{https://ctan.org/pkg/unicode-math}.}
+%
+is the standard package for using OpenType fonts which are equipped with the needed extra
+support being used in \TeX\ math mode.
+\end{itemize}
+
+If using any one of the above you probably don't need, don't want, and should
+not use \mst.
+
+Let me insist that \mst has not been tested in any systematic
+manner under the Unicode engines; and that it is expected to be most definitely
+incompatible with \ctanpkg{unicode-math}, although your mileage may vary and some
+features may appear to work.
+
+When using \mst with either \XeTeX{} or \LuaTeX{} it is recommended to use the
+\ctanpkg{fontspec} package (see remark below on \cs{encodingdefault}). Furthermore,
+if using \ctanpkg{fontspec} it is \emph{necessary} to load it with its
+|no-math| option, and this \emph{must} happen before loading \mst.
+\begin{shaded*}
+\begin{itemize}[label=$\bullet$, leftmargin=1em]
+\item
+ Use \ctanpkg{fontspec} with its
+ \emph{no-math} option, and load it \emph{prior} to \mst. As some packages
+ load \ctanpkg{fontspec} themselves (for example |polyglossia|), a
+ \centeredline{|\PassOptionsToPackage{no-math}{fontspec}|} early in the
+ preamble might be needed.
+
+\item
+ The \ctanpkg{amsmath} package, if used, \emph{must} be loaded \emph{prior} to \mst.
+
+\item
+ Under |lualatex| engine, it is recommended to also load the package
+ \ctanpkg{lualatex-math}.% Please check its documentation as possibly it has now
+ % been incorporated upstream (I am not following up on the situation).
+\end{itemize}
+\end{shaded*}
+
+I already mentioned in the \autoref{sec:ic} the fact that
+the italic corrections were not available for OpenType fonts
+under the \XeTeX{} engine and only partially available for the
+\LuaTeX{} engine, with the result that the spacings in math
+mode when using for the letters an upright text font will be
+less satisfying than with the standard PDF\TeX{} engine (the
+OpenType fonts not being usable with the latter engine, this is
+not a criterion of choice anyhow).
+
+To define math versions when using unicode fonts, use \ctanpkg{fontspec}'s
+\cs{setmainfont} before the \cs{Mathastext}\oarg{version} command, or simply
+before loading \mst for the default math versions.
+
+It is possible to mix usage of Unicode fonts and classical \TeX{}
+fonts. All used 8bits font encoding must have been passed as
+options to the \ctanpkg{fontenc} package.
+
+\subsubsection{The unicodeminus option}
+
+For legacy reason, \mst uses by default the |EN DASH U+2013| for the minus
+sign in math mode, if the font is determined to be a ``Unicode'' font.
+
+There is now the §unicodeminus§\RightNote{\mstrelease{1.3q}} to use rather
+% BORDEL DE BORDEL DE FAIT CHIER \verb ET Text for \verb command ended by end
+% of line. je l'ai patché dans etoc et xint mais pas ici encore.
+|MINUS SIGN U+2212|.%
+\footnote{Thanks to Tobias~\textsc{Brink} who asked for this feature.}
+%
+Check \hyperref[nicodeminus]{\ttfamily\hyphenchar\font=189 its documentation}
+on page \pageref{nicodeminus}.
+
+\subsubsection{Two examples with OpenType fonts}
+
+\begingroup\def\MacroFont{\normalfont\footnotesize\ttfamily}
+I include
+here two examples which compiled successfully (a long time ago!) with \XeTeX{} and
+\LuaLaTeX{}, the first one on a Linux machine, the second one on a Mac
+OS X machine.
+\begin{verbatim}
+\documentclass{article}
+\usepackage[hscale=0.8]{geometry}
+\usepackage{multicol}
+\usepackage[no-math]{fontspec}
+\usepackage{lmodern}
+\usepackage[subdued,italic]{mathastext}
+\setmainfont[Color=999999]{Verdana} \Mathastext[Verdana]
+\setmainfont[Color=0000FF]{Arial} \Mathastext[Arial]
+\setmainfont[Color=00FF00]{DejaVu Serif} \Mathastext[DejaVu]
+\MTDeclareVersion{times}{T1}{ptm}{m}{n}
+\setmainfont[Color=FF0000]{Andale Mono} \Mathastext[Andale]
+\begin{document}
+\newcommand\TEST[1]{\MTversion{#1}%
+\begin{multicols}{2}
+\hbox to\columnwidth{\hbox to\columnwidth{\hfil
+ $abcdefghijklmnopqrstuvwxyz$\hfil}\kern-2.5em{#1}}
+ \centerline{ $ABCDEFGHIJKLMNOPQRSTUVWXYZ$ }
+ \centerline{ $0123456789$ }
+ \centerline{ $!\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
+ \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\backslash$ }
+\columnbreak
+ \centerline{ abcdefghijklmnopqrstuvwxyz }
+ \centerline{ ABCDEFGHIJKLMNOPQRSTUVWXYZ }
+ \centerline{ 0123456789}
+ \centerline{ !\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
+ \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\char92 }
+\end{multicols}}
+\begin{multicols}{2}
+ \centerline{\textbf{math mode}}
+\columnbreak
+ \centerline{ \textbf{text} }
+\end{multicols}
+\TEST{DejaVu}\TEST{Verdana}\TEST{times}\TEST{Andale}
+\TEST{Arial}\TEST{bold}\TEST{normal}
+\end{document}
+\end{verbatim}
+And now the same thing with fonts available on Mac OS X:
+\begin{verbatim}
+\documentclass{article}
+\usepackage[hscale=0.8]{geometry}
+\usepackage{multicol}
+\usepackage[no-math]{fontspec}
+\usepackage{lmodern}
+\usepackage[subdued,italic]{mathastext}
+\setmainfont[Color=FF0000]{Hoefler Text} \Mathastext[Hoefler]
+\setmainfont[Color=336633]{American Typewriter}\Mathastext[Typewriter]
+\setmainfont[Color=0000FF]{Herculanum} \Mathastext[Herculanum]
+\setmainfont[Color=FF00FF]{Didot} \Mathastext[Didot]
+\setmainfont[Color=999999]{Comic Sans MS} \Mathastext[Comic]
+\begin{document}
+ --- copy here the code from the previous example ---
+\TEST{Didot}\TEST{Comic}\TEST{normal}\TEST{Herculanum}
+\TEST{Hoefler}\TEST{Typewriter}\TEST{bold}
+\end{document}
+\end{verbatim}
+\endgroup
+
+
+\subsubsection{Compatibility with other packages}\label{sec:compat}
+
+Regarding the namespace of the package: all internal macros use
+\cs{mst@} (or \cs{ifmst@} for \TeX{} conditionals) as prefix. Almost all user
+commands have \cs{MT} prefix, the oldest ones
+may use \cs{Mathastext} or variants.%
+%
+\footnote{It is only years after initial release that I became aware that
+package \ctanpkg{mathtools} used \cs{MT\string_} prefix (with an underscore as
+shown) for most internal constructs, and sometimes \cs{MT@}, and those can not
+clash with our \cs{MT[a-z\string|A-Z]} for public commands and \cs{mst@} for
+internal macros. They do have however user commands \cs{MTFlushSpaceAbove} and
+\cs{MTFlushSpaceBelow}, but nothing else hence some retroactive relief.}
+
+Compatibility issues are often questions of who decides last. They are
+naturally to be expected with packages dealing with the math setting. The fix
+is simply to load \mst last. In particular one should \emph{always} load \mst
+\emph{after} \ctanpkg{amsmath} (this is especially needed with Unicode engines
+but applies in general as well).
+
+Any definition made in a package loaded before \mst of the font to be
+used for letters or for the common characters in the |ascii| basic range
+will be overruled by the loading of \mst.
+Conversely most of the set-up done by \mst may well be overruled by
+packages loaded later which do math related things.
+
+Starting with version \mstrelease{1.2}, \mst makes some characters
+`mathematically active' to achieve certain effects: automatic insertion of the
+italic corrections when using an upright text font in math (\autoref{sec:ic}),
+extended scope of the math alphabet commands which now apply to non-letter
+symbols (\autoref{sec:mathxx}; and also to math operator names, but this is
+much easier to achieve). And the (already mathematically active) right quote
+is modified to have some extra space added before the derivative glyph ${}'$
+(see §\MTprimeskip§).
+
+This mathematical activation is compatible with the \cs{label} and \cs{ref}
+commands in and outside of math mode.
+
+But a difficulty arises when some other package has
+made the character `catcode active' everywhere in the document. If it is
+detected for such a character that \mst wishes to make `mathematically active'
+that it is already `catcode active', \mst then checks if it is handling a Babel
+shorthand. If yes, it then hacks into \ctanpkg{babel} support macros for that
+character to let it do what it desires it to do in math mode. And it does not
+make the character mathematically active, to the contrary it makes sure
+that the character is \emph{not} mathematically active.
+
+\begin{footnotesize}
+ This last paragraph applies to the characters
+ {{;}\,{,}\,{:}\,{!}\,{?}\,{+}\,{\textendash}\,{=}\,{<}\,{>}\,{(}\,{)}\,{[}\,{]}*}
+ mentioned in \autoref{sec:mathxx} as `hard non-letters'. The right tick
+ (which is already mathematically active per default) is also handled via a
+ similar process, and in particular is tested for being a Babel shorthand
+ (which happens in particular with the Spanish language |activeacute| option).
+
+ The reason for avoiding in general for a catcode active character to be at
+ same time mathematically active is illustrated in next shaded box.
+
+ In the case of the Spanish active |'|, the advantage of \mst intervention to
+ reset its mathcode is that in case of a faulty input as a curly right tick
+ |U+8217| ', which \LaTeX{} will map to \cs{textquoteright} which itself
+ gives the catcode 12 |'|, it will show as curly quote in output not as prime
+ glyph, as \mst removes its mathematical activation. This complements the
+ \LaTeX{} warnings about \cs{textquoteright} being invalid in math mode.
+
+ The ascii letters can not have been made active by Babel interface (see code
+ comments of \cs{mst@do@activecase}) so if an ascii letter is catcode active
+ when \mst examines it, nothing will change to its meaning.
+
+ \CHANGED{\mstrelease{1.4}}At \mstrelease{1.4} these actions are done for
+ ascii letters at loading of the package or via \csb{MTmathactiveletters},
+ which is itself done by \csb{MTversion} when entering non-subdued math
+ version. Check documentation of \csb{MTmathactiveletters} for some relevant
+ details.\par
+\end{footnotesize}
+
+\begin{shaded*}
+\footnotesize
+On matters of \emph{mathematical} versus \emph{catcode} active character
+tokens, here is some code, not involving \mst, that you should \textbf{not}
+try at home:
+\begin{verbatim}
+ \documentclass{article}
+ \usepackage[french]{babel}
+ \usepackage{mathtools}\mathtoolsset{centercolon}
+ \begin{document}
+ $:$
+ \end{document}
+\end{verbatim}
+\fbox{DO NOT DO THIS AT HOME}\thinspace: it creates (with |pdflatex|) an infinite
+loop.
+% %
+% \footnote{This seems to still be the case with Babel |3.9f| and
+% frenchb.ldf |2.6e|, as tested on Sep. 2, 2013. Again tested with up-to-date
+% TL2015 Jan. 15, 2016 with same result. Again tested July 11, 2024 with
+% up-to-date TL2024 with the
+% same result.}
+% %
+This is due
+to the fact that the colon is simultaneously active (this is made by
+\ctanpkg{babel-french} at begin document) and mathematically active (done by
+\ctanpkg{mathtools} in the preamble). The interaction gives an infinite loop.
+%
+% Such a
+% situation will be cured by \mst, even loaded before \ctanpkg{mathtools},
+% \emph{if} use is made of §\MTnonlettersobeymathxx§.
+%
+% At each math formula
+% \mst will detect that Babel has activated the colon, and will cancel the
+% mathematical activation (the precise definition done by \ctanpkg{mathtools} was
+% already lost at begin document due to overwriting by \ctanpkg{babel} but the fact that
+% the character was mathematically active remained true).
+\par
+\end{shaded*}
+
+
+ Regarding mathematical activation, an incompatibility of
+ another type arose with \ctanpkg{amsmath}. To fix it, \mst now replaces
+ an inner macro of \ctanpkg{amsmath}
+ (\cs{resetMathstrut@}) with its own version.\\
+ \null\hspace{1cm}\fbox{Always load \ctanpkg{amsmath} before \mst.}
+
+\begin{footnotesize}
+ Actually this last commandment was already made necessary by the use of the
+ text endash to represent the minus sign in math mode, and, especially for
+ Unicode engines, some aspects of the \cs{DeclareMathOperator} macro from
+ \ctanpkg{amsmath}.\par
+\end{footnotesize}
+
+
+
+ \begin{shaded*}
+ \textcolor{magenta}{\bfseries New with 1.3i:} \mst patches |\url| of
+ packages \ctanpkg{url} and \ctanpkg{hyperref}, and also |\nolinkurl|, to force them
+ to do automatically §\MTeverymathoff§. Indeed they use math mode, and it
+ is better to turn \mst off for their dealings.
+
+ See the §\MTeverymathoff§ documentation.
+ \end{shaded*}
+
+
+
+\subsection{Math alphabets}
+
+Let us first recall fundamental facts of life, in the
+ world of traditional PDF\TeX\ engine and \TeX\ fonts, as background for
+ understanding what \mst does in this context.
+ People familiar with using Unicode engines and \ctanpkg{unicode-math}, please be
+ aware that the semantics there of the \LaTeX\ math alphabet commands are
+ \textbf{significantly} modified!
+\begin{shaded*}
+\begin{itemize}
+\item In the default \LaTeX\ set-up all five of §\mathrm§, §\mathbf§,
+ §\mathit§, §\mathsf§ and §\mathtt§ tell \TeX\ to use for their arguments
+ specific \texttt{OT1}-encoded fonts.
+\item If the document body uses, as will be the case probably with any
+ language other than English or its variants, some other encoding such as
+ \texttt{T1} for its fonts, there is no change whatsoever to the math
+ configuration, indeed most font packages ignore it completely.
+\item It is thus a priori wrong to think of these commands as switching to
+ some body text font, although letters within their scopes will act as in a
+ text font, and in particular obey ligatures (this also applies to operator
+ names defined by |amsmath|'s \cs{DeclareMathOperator} which are, with some
+ extras not mentioned here, as using §\mathrm§).
+\item These commands are completely different in spirit from the \LaTeX\
+ \cs{textrm}, \cs{textbf}, and others, which change only some font axis;
+ indeed the math alphabet commands inherit from legacy Knuth's \cs{rm},
+ \cs{bf}, and others which are complete font specifiers.
+\item In particular when nesting, it is the inner-most which wins.
+\item Only mathematical characters (such as letters) which are declared to
+ \TeX\ as being of ``variable family type'' react to being in the argument of
+ a math alphabet command.
+\item Lowercase Greek letters are by default in \LaTeX\ immune to math
+ alphabets (so \verb|\mathrm{\pi}| induces no change in output), but the
+ eleven uppercase Greek letters are of ``variable family type'' because they
+ are picked in the \texttt{OT1}-encoded font also used for operator names
+ (the one to which §\mathrm§ maps), \emph{and they occupy the exact same
+ slots in the \emph{\texttt{OML}}-encoding to which} §\mathnormal§ maps! So
+ in default \TeX, \verb|\mathnormal{\Gamma}| gives a slanted glyph. The slots
+ occupied in \texttt{OML}-encoding by the lowercase Greek letters (to which
+ encoding they are a priori assigned) give
+ completely unrelated glyphs in the \texttt{OT1}-encoding, so it makes sense
+ that the default \LaTeX\ declares lowercase Greek to not react to math alphabets.
+ Notice though, that if \LaTeX\ had declared a \cs{mathnormalbold}, mapping
+ to a bold \texttt{OML}-encoded font, it would have made sense to also have
+ \cs{alpha}, \cs{beta}, etc... be of ``variable family type''.
+\item But of course even if |\pi| is of such ``variable family type'' then
+ |\mathbf{\pi}| will give garbage because the default §\mathbf§ selects an
+ \texttt{OT1}-encoded font, where there is no pi glyph whatsoever and in
+ particular not at the slot (which is 25) of $\pi$ in the \texttt{OML} encoding!
+\end{itemize}
+\end{shaded*}
+
+Please keep all the above in mind when trying to understand what \mst does
+with math alphabets. The most significant point described next naturally is that
+\mst will sync §\mathnormal§, §\mathrm§, §\mathbf§, §\mathit§, §\mathsf§ and
+§\mathtt§ to map to the \mst-ified body text fonts.
+ \begin{itemize}
+ \item §\mathnormal§, §\mathrm§, §\mathbf§, §\mathit§,
+ §\mathsf§ and §\mathtt§ are modified to use the \mst-ified
+ text fonts; this can be disabled via §defaultalphabets§ and
+ related individual options, but the package always provides
+ §\Mathnormal§, §\Mathrm§, etc..., to match the \mst font
+ configuration (\RLNote{changed:}{\mstrelease{1.3za}}prior to \mstrelease{1.3za}
+ §defaultalphabets§ and related options also caused the \mst
+ alphabet commands not to be defined). Recall that there may
+ arise a ``too many math alphabets'' error if too many of these
+ commands are \emph{used} in the document:
+ \emph{declaring} them is not by itself the cause of the error. See the
+ \LaTeX\ news entry of its \texttt{2021-11-15} release for
+ the counter \texttt{localmathalphabets} (with default value 2)
+ which can be now be used if one hits such a difficulty.
+ \item We define a new math alphabet command
+ §\mathnormalbold§ which gives direct access to
+ the bold version of the §\mathnormal§ alphabet
+ (rather than using either the \cs{bm} command from
+ the \ctanpkg{bm} package or the \cs{boldsymbol} command
+ from the \ctanpkg{amsbsy} package). As it does not
+ exist in the default \LaTeX{} math font set-up, this
+ alphabet is \emph{not} subjected to the {subdued option} action.
+
+\item Version \RightNote{\mstrelease{1.2}}\mstrelease{1.2} of \mst has extended the scope of the math
+ alphabets to apply to non-alphabetical characters and to
+ operator names. This respects the automatic white spaces
+ added by \TeX{} around math symbols. See the devoted \autoref{sec:mathxx}.
+\item The optional\RightNote{\mstrelease{1.3i}}
+ extra skips around letters (see \autoref{sec:mathskips} and
+ \autoref{sec:ic}) are removed in the scope of the math alphabets.
+
+ \item Depending on options, further math alphabet commands
+ are defined by the package: §\MathEulerBold§,
+ §\MathEuler§, §\MathPSymbol§, and since \mstrelease{1.3y} under
+ the §LGRgreek§ family of options\RightNote{\mstrelease{1.3y}} also
+ §\mathgreekup§ and §\mathgreekit§. See
+ \autoref{sec:newgreek}. And also §\mathgreekupbold§ and
+ §\mathgreekitbold§ under the §LGRgreek§ family of
+ options.\RightNote{\mstrelease{1.3za}}
+
+ \item With\RightNote{\mstrelease{1.3za}} the §LGRgreek+§ option
+ which enhances Greek letters with a specific behavior when in the
+ arguments of the §\mathrm§, §\mathbf§, etc..., math alphabet
+ commands, this special behavior is not triggered by the §\Mathrm§,
+ §\Mathbf§, et al., which are genuine unmodifed math alphabet commands. See
+ \autoref{sec:newgreekplus}.
+ \end{itemize}
+
\subsection{Math versions}\label{sec:mathversions}
@@ -2972,13 +2789,13 @@ It is still possible to switch on via §\MTversion§ in the document body
\footnote{When not using math versions at all (so not using \texttt{subdued}
mode either) another way to achieve distinct fonts in text and math is
naturally to modify the document text font \emph{after} having loaded \mst (or
-after last usage of \cs{Mathastext} without optional argument).
-Another way is to use \cs{MTfamily}, \cs{MTencoding}, \cs{MTseries},
-\cs{MTshape}, \cs{MTlettershape} in the preamble before a call to
-\cs{Mathastext} which will configure math fonts without having modified the
+after last usage of \csb{Mathastext} without optional argument).
+Another way is to use \csb{MTfamily}, \csb{MTencoding}, \csb{MTseries},
+\csb{MTshape}, \csb{MTlettershape} in the preamble before a call to
+\csb{Mathastext} which will configure math fonts without having modified the
document text fonts. However if one does \texttt{\string\MTversion\{normal\}}
in the document then the text font will be reset to what was recorded as math
-font by the \cs{Mathastext} call in the preamble (as said above, when not
+font by the \csb{Mathastext} call in the preamble (as said above, when not
using \texttt{subdued} option).}
The native \LaTeX{} command \cs{mathversion}\marg{version\_name} would change
@@ -3000,19 +2817,19 @@ For all math versions if not using the §subdued§ option, or only
for the non-\emph{normal} and non-\emph{bold} math versions if
using the §subdued§ option, \cs{MTversion} does further additional tasks:
\begin{itemize}
-\item it resets\RightNote{1.3u} the §\hbar§, \cs{imath}
+\item it resets\RightNote{\mstrelease{1.3u}} the §\hbar§, \cs{imath}
(see §\inodot§), \cs{jmath}, math accents (see option
§mathaccents§) and minus sign as en dash according to the used
font encoding for the \mst-ified text font,
-\item (see sections \ref{sec:mathskips} and \ref{sec:ic}) it re-issues the
+\item (see \autoref{sec:mathskips} and \autoref{sec:ic}) it re-issues the
command §\MTmathactiveletters§ to let a to z, A to Z, be mathematically
active in order to automatically insert the skips as defined by the user
with §\MTsetmathskips§, and the italic corrections (if the font is not
italic or slanted),
-\item (see section \ref{sec:extraskips}) it resets the extra spaces after the
+\item (see \autoref{sec:extraskips}) it resets the extra spaces after the
symbols $\exists$, $\forall$ and before the derivative ${}'$ to the values as
decided by the user in the preamble on a \emph{per version} basis,
-\item (see section \ref{sec:mathxx}) it re-issues the commands
+\item (see \autoref{sec:mathxx}) it re-issues the commands
§\MTmathoperatorsobeymathxx§ and §\MTeasynonlettersobeymathxx§ to let
the math operator names and (`easy') non letter characters obey the math
alphabets,
@@ -3058,8 +2875,9 @@ provided by \mst:
package, Greek letters are the default Computer
Modern ones or have been set-up by other packages;
for example by the \ctanpkg{fourier} package with option
- `upright', which gives upright Greek letters.
-\item[§LGRgreek§:] (this was substantially updated at |1.3x|, make sure to
+ `upright', which gives upright Greek letters
+ or by the author \ctanpkg{lgrmath} package.
+\item[§LGRgreek§:] (this was substantially updated at \mstrelease{1.3y}, make sure to
read the new documentation at \autoref{sec:newgreek})
this option is for fonts which additionally to Latin
letters also provide Greek letters in |LGR| encoding. Here is
@@ -3088,7 +2906,7 @@ provided by \mst:
If you use the §italic§ option note that the italic Greek
letters from the |cbfonts| are not the same glyphs as
the default Greek letters from the |OML| encoded font |cmmi|.
-\item[§LGRgreek+§:] \RightNote{1.3za}extends §LGRgreek§ to allow abusive
+\item[§LGRgreek+§:] \RightNote{\mstrelease{1.3za}}extends §LGRgreek§ to allow abusive
usage of \cs{mathrm} and alike commands with Greek letters.
This is very much not in the spirit (especially with traditional
``8bit'' \TeX\ fonts) of the \LaTeX\ kernel concept of math alphabet
@@ -3146,17 +2964,17 @@ from the lowest to the highest priority:
the digits and operator names (most of the time this means ``upright
shape'', but it can be otherwise),
\item[§itgreek§]: says that Greek letters (both lowercase and uppercase) will
- be in `|it|' shape. \RLNote{changed:}{1.3x}More precisely the expansion of
+ be in `|it|' shape. \RLNote{changed:}{\mstrelease{1.3y}}More precisely the expansion of
§\MTgreekitdefault§ is used.
- This was changed at |1.3x|, formerly the value of \cs{itdefault} which was in
+ This was changed at \mstrelease{1.3y}, formerly the value of \cs{itdefault} which was in
force at the time of using §\Mathastext§ (or at time of loading the package
if no use is made of §\Mathastext§) was used.
\item[§upgreek§]: says that Greek letters (both lowercase and uppercase) will
- be in `|n|' shape. \RLNote{changed:}{1.3x}More precisely the expansion of
+ be in `|n|' shape. \RLNote{changed:}{\mstrelease{1.3y}}More precisely the expansion of
§\MTgreekupdefault§ is used.
- This was changed at |1.3x|, formerly the value of \cs{updefault} which was in
+ This was changed at \mstrelease{1.3y}, formerly the value of \cs{updefault} which was in
force at the time of using §\Mathastext§ (or at time of loading the package
if no use is made of §\Mathastext§) was used. But since \LaTeX{}
|2020-02-02| this caused many Font Warnings in the log because
@@ -3187,7 +3005,7 @@ font family available in |LGR| encoding: for example |lmr|,
|DejaVuSerif-TLF| (needs \ctanpkg{dejavu} package on your system),
etc\dots
-\begin{framed}
+\begin{shaded*}
§\MTitgreek§, §\MTupgreek§, §\MTitGreek§, §\MTupGreek§
have some effect only if one of the §LGRgreek§, §LGRgreeks§,
§selfGreek§ or §selfGreeks§ options was passed to the package.
@@ -3198,14 +3016,14 @@ etc\dots
§\MTgreekfont§ has an effect only for §LGRgreek§ and §selfGreek§. It is
without any effect with §LGRgreeks§ and §selfGreeks§.
-\end{framed}
+\end{shaded*}
\subsubsection{Control sequences to access directly upright or italic
shape for Greek under \texttt{LGRgreek} option}
\label{sec:newgreek}
-Some changes were made at |1.3x| to enhance the §LGRgreek§ (and §LGRgreeks§)
+Some changes were made at \mstrelease{1.3y} to enhance the §LGRgreek§ (and §LGRgreeks§)
options with new features. Everything which will be explained here applies
only to these two options.
@@ -3224,7 +3042,7 @@ command in the preamble (possibly with \oarg{version\_name} optional
argument). Their default definitions are to expand to `|n|' and `|it|'
respectively. They can also be defined prior to loading \mst.
-See\RightNote{1.3x} the \autoref{table:greekup} and \autoref{table:greekit}
+See\RightNote{\mstrelease{1.3y}} the \autoref{table:greekup} and \autoref{table:greekit}
for illustrations (using here the Libertinus Serif font).
\begin{table}[htbp]
\MTversion{libertinus}
@@ -3364,7 +3182,7 @@ etc\dots\ options or §\MTitgreek§ et al.\@ commands. This is on a per \mst-enri
math version basis, depending only on how the options or commands were used
in the preamble.
-Furthermore\RightNote{1.3x} two math alphabets are provided
+Furthermore\RightNote{\mstrelease{1.3y}} two math alphabets are provided
\centeredline{§\mathgreekup§}
\centeredline{§\mathgreekit§}
which can be used to map a letter to the corresponding Greek fonts:
@@ -3379,14 +3197,14 @@ which can be used to map a letter to the corresponding Greek fonts:
\centeredline{$\mathgreekit{W}=\mathgreekit{\Omega}=\mathgreekit{\Omegaup}=\Omegait$}
}
-Some\RightNote{1.3x} refactoring%
+Some\RightNote{\mstrelease{1.3y}} refactoring%
%
\footnote{Technically, formerly two symbol fonts were declared, one for the
lowercase Greek letters and one for the uppercase Greek letters; now those
are dropped and replaced by two symbol fonts, one for `italic' Greek letters,
the other for `upright' Greek letters.}
%
-was required to achieve this at |1.3x|
+was required to achieve this at \mstrelease{1.3y}
and it is not 100\% backwards compatible: if none of the §itgreek§ etc\dots\
things was used, the Greek letters formerly would follow the shape of Latin
letters (for lowercase Greek) and of operator names (for uppercase Greek).
@@ -3414,10 +3232,10 @@ compatibility.
\subsubsection{\cs{mathgreekupbold} and \cs{mathgreekitbold}}
\label{sec:newgreekbold}
-Again this applies only to §LGRgreek§ and §LGRgreeks§ options (and the |1.3za|
+Again this applies only to §LGRgreek§ and §LGRgreeks§ options (and the \mstrelease{1.3za}
added §LGRgreek+§ and §LGRgreeks+§).
-See\RightNote{1.3za} the \autoref{table:greekupbold} and \autoref{table:greekitbold}
+See\RightNote{\mstrelease{1.3za}} the \autoref{table:greekupbold} and \autoref{table:greekitbold}
for illustration of usage (in math mode only) of code such as
\begin{verbatim}
\mathgreekupbold{\alpha}
@@ -3594,7 +3412,7 @@ commands on Latin letters also:
the \texttt{LGRgreek+} option}
\label{sec:newgreekplus}
-With option\RightNote{1.3za} §LGRgreek+§ or §LGRgreeks+§, \mst makes Greek
+With option\RightNote{\mstrelease{1.3za}} §LGRgreek+§ or §LGRgreeks+§, \mst makes Greek
letters control sequences \cs{alpha}, \cs{beta}, ... (but not \cs{alphaup} or
\cs{betait} and the others) react in a special manner within the scope of
§\mathnormal§, §\mathrm§, §\mathit§, §\mathbf§, and §\mathnormalbold§, but not
@@ -3671,15 +3489,24 @@ fonts having only 128 or 256 glyphs, and from the fact that §\mathrm§ and
§\mathbf§ originate in Plain \TeX\ \cs{rm} and \cs{bf} and are still quite
akin to it, they are font switching commands nothing more or less.
+\subsection{Advanced capacities}
+
+Some such capacities are on per default (but if with §subdued§ option will be
+turned off in the \emph{normal} and \emph{bold} math versions), others require
+an action from the user for activation.
-\subsection{Extra spaces around letters}
+\subsubsection{Extra spaces around letters}
\label{sec:mathskips}
-This is a new feature added with release |1.3|: the command §\MTsetmathskips§
-allows the user to set up some spaces (more precisely, `mu glue'; but stretch
-and shrink are discarded) to be
-automatically inserted around the letters in math mode. Some (very) unrealistic
-uses:
+This is a new feature%
+%
+\footnote{It was new in 2013 indeed. Not so much new now, but it is never too
+late to try it out.}
+%
+added with release \mstrelease{1.3}: the command §\MTsetmathskips§ allows the
+user to set up some spaces (more precisely, `mu glue'; but stretch and shrink
+are discarded) to be automatically inserted around the letters in math
+mode. Some (very) unrealistic uses:
\begin{verbatim}
% this may be anywhere in the document (also within a math group):
\MTsetmathskips{x}{20.33mu}{15.66mu}% 20.33mu before all x's and 15.66mu after.
@@ -3699,28 +3526,25 @@ limits as usual the scope of this command. Furthermore the command
§\MTunsetmathskips§ cancels previous use of \cs{MTsetmathskips} for a given
letter.
-The implementation relies on the `mathematical activation' of letters, which is
-done by default by the package since release |1.2b|. Should this cause
-compatibility problems, the command §\MTmathstandardletters§ cancels it
+The implementation relies on the `mathematical activation' of letters, which
+is done by default by the package since release \mstrelease{1.2b}. Should this
+cause compatibility problems, the command §\MTmathstandardletters§ cancels it
entirely. To reactivate it, there is §\MTmathactiveletters§. Note that
-\cs{MTmathactiveletters} is done automatically by \mst when loaded, and also
-each time the package enhanced math-version-switch command §\MTversion§ is used,
-except for the normal and bold math versions under the §subdued§ option.
-
-% Earlier this `mathematical activation' of letters had been used by the package
-% only to add automatically italic corrections, as described in the next
-% section.
+§\MTmathactiveletters§ is done automatically (as part of §\MTicinmath§) by
+\mst when loaded (if not with §subdued§ option), and also each time the
+package enhanced math-version-switch command §\MTversion§ is used, except for
+the normal and bold math versions under the §subdued§ option.
-\begin{framed}
+\begin{shaded*}
The extra skips are set at natural width; they do not contribute to the
overall stretchability or shrinkability of the math formula and do not
create break points.
- \textcolor{magenta}{\bfseries Changed with |1.3i|}: they are \emph{not}
+ \textcolor{magenta}{\bfseries Changed with \mstrelease{1.3i}}: they are \emph{not}
applied within the scope of math alphabet commands.
-\end{framed}
+\end{shaded*}
-\subsection{Italic corrections}
+\subsubsection{Background on italic corrections in math mode}
\label{sec:ic}
{\small Note: this is somewhat technical discussion which may well be skipped in
@@ -3824,9 +3648,14 @@ $\xdef\mstrestorefontdimen{\fontdimen2\textfont\symmtletterfont=
We learn in Appendix G of the \TeX book that the italic correction is used for
the horizontal shift of the superscript with respect to the position of
-the subscript: $\mathit{f_i^j}$, or,
+% CETTE LIGNE PROVOQUE L'AJOUT D'UN LINESKIP
+% the subscript: $\mathit{f_i^j}$, or,
+% En fait déjà en Plain TeX, configuration de base la hauteur totale de
+% $f_i^j$ est > 12pt = baselineskip !
+% Work-around ad hoc
+the subscript: \smash{$\mathit{f_i^j}$}, or,
going back now to the standard math italics $f_i^j$. In the next paragraphs
-we use $f_i^i$ for more accurate comparison of the positioning of the sub- and superscript.
+we use \smash{$f_i^i$} for more accurate comparison of the positioning of the sub- and superscript.
If we try something like this: |${f\/}_i^i$| we obtain ${f\/}_i^i$. Our
overlapping game with |\rlap{$f_i^i$}${f\/}_i^i$| gives
@@ -3889,15 +3718,10 @@ to preserve this behavior).
italic corrections are canceled inside the arguments to the math alphabet
commands, to allow the formation of ligatures as
is expected in the standard default \TeX{} font set-up in math.%
-% \footnotemark
-% \global\let\saved@Href@B\Hy@footnote@currentHref
\end{framed}\vskip-.75\baselineskip
\end{framed}
-%\addtocounter{footnote}{-1}%
-%\let\Hy@footnote@currentHref\saved@Href@A
-%
\footnotetext{the situation is rather ironical! by the way, the warnings in
- section \ref{sec:mathxx} with \texttt{\$x\^{}?\$} or similar are less of an
+ \autoref{sec:mathxx} with \texttt{\$x\^{}?\$} or similar are less of an
issue here, because the letter is only \emph{followed} by \texttt{\char92/}
and anyhow the whole is put by \mst within group braces, so no surprises
with \texttt{\$x\^{}y\$} or \texttt{\$\char92mathbin x\$}. Nevertheless it
@@ -3905,16 +3729,10 @@ to preserve this behavior).
composite objects, something which could surprise other packages. The
command \csb{MTmathstandardletters} cancels this mechanism.}
-%\addtocounter{footnote}{1}%
-% \let\Hy@footnote@currentHref\saved@Href@B
-%
-% \footnotetext{\RightNote{1.3i}Formerly, italic corrections were added to the
-% \cs{mathnormal} arguments.}
-
\makeatother
The feature-implementing commands §\MTicinmath§, §\MTnoicinmath§,
-§\MTicalsoinmathxx§ are described in section \ref{sec:cmds}.
+§\MTicalsoinmathxx§ are described in \autoref{sec:cmds}.
\endgroup
\textbf{\hbox{Note:}} \emph{from brief testing on 2012/12/28, \XeTeX{} seems not
@@ -3944,11 +3762,7 @@ at least on current TL2016.
\noindent\kern-0.5em\relax2022/10/29: no change with current TL2022.}
-% For more see
-% \url{http://tex.stackexchange.com/a/337076} which explores also the differences
-% between the two Unicode engines regarding italic corrections in pure text mode.
-
-\subsection{Extra glue after \texorpdfstring{\cs{exists}}{\textbackslash
+\subsubsection{Extra glue after \texorpdfstring{\cs{exists}}{\textbackslash
exists}, \texorpdfstring{\cs{forall}}{\textbackslash forall}, and before the prime glyph}
\label{sec:extraskips}
@@ -3998,21 +3812,16 @@ Under the §subdued§ option, the \emph{normal} math version (at the start of
the document body, or after |\MTversion{normal}|) and the \emph{bold} math
version (either at the start of the document body after \cs{boldmath}, or after
|\MTversion{bold}|) do not have any extra skip inserted (even one of zero
-width) after $\oldforall$, $ \oldexists$, or before the ${}'$.%
-%
-%\footnote{\RightNote{1.3j}Formerly, skips of zero widths were inserted.}
+width) after $\oldforall$, $ \oldexists$, or before the ${}'$.
\endgroup
-
-\subsection{Extended scope of the math alphabets commands}
+\subsubsection{Extended scope of the math alphabets commands}
\label{sec:mathxx}
\begingroup
\MTversion{italic}\renewcommand\familydefault\sfdefault
-% il faudra peut-être que j'annule cette façon qu'à mathastext de tripatouiller
-% \familydefault...
-\makeatletter\let\mst@doasterisk\relax\makeatother
+\MTnormalasterisk
Ever since the initial version of the package, some characters usually
unaffected by the math alphabet commands \cs{mathbf}, \cs{mathtt},
@@ -4027,21 +3836,31 @@ $<$, or $]$ could not be declared of `variable family' (in addition to being
picked up in the text font) as this would, for reasons of the inner workings of
\TeX{}, not be compatible with the automatically inserted spaces around them.
-A revolutionary\RightNote{1.2} ;-) novelty is introduced with version |1.2| of the package:
+A revolutionary\RightNote{\mstrelease{1.2}} ;-) novelty is introduced with
+version \mstrelease{1.2} of the package:
\begin{enumerate}
\item the pre-declared or user-declared (using the |amsmath|
\cs{DeclareMathOperator} or equivalent) operator names obey the math
alphabet commands,\footnote{contrarily to the next feature, this one is not
likely to create incompatibilities with other packages, so it is
activated by default.}
-\item and, \emph{optionally}, all non alphabetical
- characters\footnote{of course some of them are input preceded by a
- backslash, and the backslash itself is input as \cs{backslash}.} treated by
- \mst, \emph{i.e.}, if not disabled by options,
- ${!}\,{?}\,{,}\,{:}\,{;}\,{+}\,{-}\,{=}\,{(}\,{)}\,{[}\,{]}\,{<}\,{>}\,{\{}\,{\}}$,
- the asterisk $*$, and
- $.\,/\,\vert\,\backslash\,{\#}\,{\$}\,{\%}\,{\&}$%
-%
+\item as well as all non alphabetical characters treated by \mst.
+\end{enumerate}
+
+The non-letters handled by \mst (if not disabled by options) fall into two
+groups:
+\begin{itemize}[nosep]
+\item Those to which \TeX{} associates some specific spacings:
+ \centeredline{${!}\,{?}\,{,}\,{:}\,{;}\,{+}\,{-}\,{=}\,%
+ {(}\,{)}\,{[}\,{]}\,{<}\,{>}\,{\{}\,{\}}\,*$}
+ We call them the ``hard'' ones.
+\item Those for which \TeX{} uses so-called ordinary spacings:
+ \centeredline{$.\,/\,\vert\,\backslash\,{\#}\,{\$}\,{\%}\,{\&}$}
+ We call them the ``easy'' ones.
+\end{itemize}
+The ``easy'' non-letters are handled \emph{easily} by \mst, simply
+by declaring them to be of ``variable family type''. This will
+be done automatically.%
\footnote{%
${\#}\,{\$}\,{\%}\,{\&}$ obey the math alphabets since the initial version
of \mst; the dot $.$, the slash $/$, the vertical bar $\vert$ and the
@@ -4049,431 +3868,326 @@ A revolutionary\RightNote{1.2} ;-) novelty is introduced with version |1.2| of t
around them, and the procedure is then activated by default since
\texttt{1.2} for these characters as they are `easy non-letters'. But for
\cs{mid} and \cs{setminus} which are $\vert$ and $\backslash$ with special
- spacing (of type \cs{mathrel} and \cs{mathbin} resp.) the procedure has
- some constraints explained in the framed box on next page and the
- activation requires \cs{MTnonlettersobeymathxx}.}
+ spacing (of type \cs{mathrel} and \cs{mathbin} resp.) the
+ activation requires \csb{MTnonlettersobeymathxx}.}
%
-will also obey
- the math alphabet commands (when not used as delimiters). The
- important thing is that the spaces added by \TeX{} before and after
- are not modified.
-\end{enumerate}
+The ``hard'' non-letters require a more complex approach using a concept
+called ``mathematical activation''. For reasons explained next, this is not
+done automatically and requires the user to employ the command
+§\MTnonlettersobeymathxx§ (or, for the specific case of the asterisk the option
+§asterisk§).
+
+\begin{shaded*}
+ It is a fundamental feature that the spacing added by \TeX{} before and
+ after each such \mst-ified non-letter is in no way modified.
+\end{shaded*}
+
+
Let us compare, for example, the new behavior of \cs{mathtt} and \cs{mathbf}
-\MTmathoperatorsobeymathxx\MTnonlettersobeymathxx\MTeasynonlettersobeymathxx
-\[ \mathtt{(\sin(n!)<\cos(m-p)?)}\qquad \mathbf{[\sin(x+y)=\cos(z-t)]}\]
-with the traditional default behavior:
-\MTmathoperatorsdonotobeymathxx\MTnonlettersdonotobeymathxx
+when §\MTnonlettersobeymathxx§ has been used
+\MTmathoperatorsobeymathxx
+\MTnonlettersobeymathxx
+\MTeasynonlettersobeymathxx
+\[ new:\quad \mathtt{(\sin(n!)<\cos(m-p)?)}\qquad \mathbf{[\sin(x+y)=\cos(z-t)]}\]
+with the traditional default behavior one observes without \mst or in
+§subdued§ normal or bold math version:
+\MTmathoperatorsdonotobeymathxx
+\MTnonlettersdonotobeymathxx
\MTeasynonlettersdonotobeymathxx
-\[ \mathtt{(\sin(n!)<\cos(m-p)?)}\qquad \mathbf{[\sin(x+y)=\cos(z-t)]}\]
-
-The first feature is activated by default, except of course for the normal and
-bold math versions when the package was given the \emph{subdued} option. The
-second feature is \emph{off} by default for the characters listed first. It is
-\emph{on} for the `easy' cases
-${\#}\,{\$}\,{\%}\,{\&}\,.\,/\,\vert\,\backslash$ (activating the feature for
-them puts no constraint on the user input and should not be too upsetting to
-other packages), and also for $*$ but only if this was required explicitly by
-the option §asterisk§, as the user then is supposed to know that |$R^*$| is no
-valid input anymore and should be replaced by |$R^{*}$|. The remaining `difficult'
-cases create similar
-constraints, which will be commented more upon next. The commands%
-\footnote{these commands are to be used outside of math mode.
- Their scope is limited to the current \LaTeX{} environment or group. They use
- the \cs{everymath} and \cs{everydisplay} mechanism so if the document needs to
- modify these token lists it has to do so in a responsible manner, extending
- not annihilating their previous contents.}
-%
-for deactivation are:\\
+\[ standard:\quad \mathtt{(\sin(n!)<\cos(m-p)?)}\qquad \mathbf{[\sin(x+y)=\cos(z-t)]}\]
+
+The commands for
+\emph{deactivation} are:\\
\mbox{}\hspace{1cm}\csb{MTmathoperatorsdonotobeymathxx},\\
\mbox{}\hspace{1cm}\csb{MTeasynonlettersdonotobeymathxx},\\
\mbox{}\hspace{1cm}\csb{MTnonlettersdonotobeymathxx},\\
-and those for activation:\\
-\mbox{}\hspace{1cm}\csb{MTmathoperatorsobeymathxx} regards operator names and is executed by default,\\
-\mbox{}\hspace{1cm}\csb{MTeasynonlettersobeymathxx} is done by default and applies to \centeredline{${\#}\,{\$}\,{\%}\,{\&}\,.\,/\,\vert\,\backslash$} and also to $*$ under package option §asterisk§,\\
-\mbox{}\hspace{1cm}\csb{MTnonlettersobeymathxx} is \emph{not} done by default (see explanations why in the framed box next) and regards \centeredline{${!}\,{?}\,{,}\,{:}\,{;}\,{+}\,{-}\,{=}\,{(}\,{)}\,{[}\,{]}\,{<}\,{>}$} and also \cs{mid} and \cs{setminus} but applies to
-the braces ${\{}\,{\}}$ only if \csb{MTexplicitbracesobeymathxx} is also used.\par
-%
-%% suppression de cette note de bas de page à 1.3u car elle est obsolète
-%% (pas sûr si à 100%, mais en tout cas l'exemple avec \mathbf{-} n'a plus
-%% de problème.
-% \footnote{when in subdued mode, the
-% math alphabets are the default ones, not the ones modified by \mst to use the
-% document text fonts. As a result, matters of font encodings may then give
-% unexpected results, for example for $-$. On the present document page we
-% switched to a math version to escape from the |subdued| mode and avoid the
-% problem with \cs{mathbf\{-\}} giving in the normal (subdued) math version
-% {\MTversion{normal}\MTnonlettersobeymathxx$\mathbf-$\sffamily, when
-% `non-letters' are declared to obey math alphabets.}}
+and those for \emph{activation}:\\
+\mbox{}\hspace{1cm}\csb{MTmathoperatorsobeymathxx} (done by default),\\
+\mbox{}\hspace{1cm}\csb{MTeasynonlettersobeymathxx} (done by default),\\
+\mbox{}\hspace{1cm}\csb{MTnonlettersobeymathxx} is \emph{not} done by default
+(see explanations why in the shaded box next) and applies to the ``hard''
+non-letters mentioned above and also to \cs{mid} and \cs{setminus}.
+Furthermore, it applies to
+the braces ${\{}\,{\}}$ only if \csb{MTexplicitbracesobeymathxx} is also used.
+
+
+\begin{shaded*}
+ \textbf{Important:} the package does not execute on its own
+ \csb{MTnonlettersobeymathxx}. The reason is that the
+ mechanism in effet replaces the original ``hard'' characters such as
+ |?|, |[|, |<| by (in math mode only) a more complex structure, which
+ ceases looking to \TeX{} as only one token, and as a consequence |$x^?$|, |$R^+$|
+ or |$\mathopen<A\mathclose>$| raise an error, the workaround being to
+ employ additional braces: |$x^{?}$|, |$R^{+}$| and |$\mathopen{<}A\mathclose{>}$|.
+
+ Similarly |$R^*$| does not work anymore under option §asterisk§, the user is
+ supposed to know that with this option |$R^{*}$| is the mark-up to use.
+
+ Thus, if one adds
+ \centeredline{|\usepackage{mathastext}|§\MTnonlettersobeymathxx§} to a
+ pre-existing document, it is needed to check if the mark-up satisfies
+ to the above guidelines. For this reason the mechanism is by default
+ not activated and the user has to execute:
+ \centeredline{§\MTnonlettersobeymathxx§}
+ This can be done in the preamble and will trigger actual modifications
+ only at time of |\begin{document}|.
+\end{shaded*}
-\begin{framed}
- \textbf{Important:} the package does \csb{MTnonlettersdonotobeymathxx} by
- default. The reason is that activating the mechanism adds some constraints to
- the way things must be input, adding
-\centeredline{|\usepackage{mathastext}|\csb{MTnonlettersobeymathxx}}
- to a pre-existing
- document might well create errors:
- all these characters treated by \mst, such
- as |?|, |[|, |<| now represent (in math mode only!) \emph{two} `tokens' and
- this will utterly confuse \TeX{} if some precautions are not taken: |$x^?$|,
- |$R^+$| or |$\mathopen<A\mathclose>$| \emph{must} now be coded as |$x^{?}$|,
- |$R^{+}$| and |$\mathopen{<}A\mathclose{>}$| (the rule is to do as if |?|,
- |+|, |<| or |>| were each really \emph{two} characters).
-
- Even if this rule is respected in the document source, it is still a
- possibility that incompatibilities with other packages will arise because
- \mst does a \emph{mathematical activation} of the characters which could be
- unexpected and unchecked for by other packages. This is precisely the case
- with the \ctanpkg{amsmath} package, and the problem goes away by just making sure
- that |amsmath| is loaded before \mst{} (generally speaking, \mst should be
- loaded last after all packages dealing with math things).
-\end{framed}
+
+\begin{footnotesize}
+Some \TeX nical notes:%
+%
+\footnote{The complete truth is only to be found in source code. Here are
+ some extra details:
+
+ The
+ dollar sign and the curly braces are not tested for mathematical or catcode
+ activation.
+
+ The $*$\RLNote{changed:}{\mstrelease{1.4}} is tested as
+ are the ``hard'' non-letters, except under option §everymath§. On the
+ other hand \cs{ast} will be modified independently of what is decided for
+ $*$. Comprenne qui pourra.}
+
+\begin{itemize}[nosep]
+\item
+The asterisk $*$ is associated with its own option §asterisk§, because
+independently of the matter of its behavior in the scope of math alphabets
+commands, its handling by \mst (via the §\MTlowerast§ associated
+configuration) always requires it to be made mathematically active and to
+expand to a more complex structure. So once this option is received by the
+package, it goes full steam and also adds by default the responsiveness to
+math alphabet commands (in non-§subdued§ math versions).
+
+\item The legacy situation which is a bit late to change is that the
+ responsiveness of the asterisk to math alphabets being on by default under
+ option §asterisk§, it was decided that this responsiveness would be turned
+ off by §\MTeasynonlettersdonotobeymathxx§ and back on by
+ §\MTeasynonlettersobeymathxx§, although the $*$ is part of the ``hard''
+ non-letters. One can use §\MTnormalasterisk§ to stop the $*$ to obey math
+ alphabet commands, but it also cancels the §\MTlowerast§ mechanism.
+
+\item At\RLNote{changed:}{\mstrelease{1.4}} \mstrelease{1.4} ``easy''
+ non-letters found out to be (at |\begin{document}| or with §\MTversion§
+ except for §subdued§ \emph{normal} or \emph{bold}) mathematically active
+ characters will not get overridden by \mst.
+ This applies for example with
+ the dot ``.'' under \ctanpkg{babel} with Spanish language. Its special
+ behavior to transform into a comma ``,'' if before a digit is now
+ kept. As an amusing side note, if §\MTnonlettersobeymathxx§ is used, this
+ comma does obey math alphabet commands.
+
+\item An ``easy'' non-letter which (at |\begin{document}| or with §\MTversion§
+ except for §subdued§ \emph{normal} or \emph{bold}) is catcode active will
+ still be set by \mst to be of ``variable family type'', if it is not
+ mathematically active. The catcode status is not checked nor modified, only
+ the mathcode as per previous item. Now whether the \mst-ification has any
+ effect depends on how the user has configured the catcode active character
+ to behave if in math mode.
+
+\item When \mst wants to employ mathematical activation for a non-letter
+ character among the ``hard'' cases (inclusive of the asterisk), which is done
+ at |\begin{document}| if not §subdued§ or with every §\MTversion§ except for
+ §subdued§ \emph{normal} or \emph{bold}, it first checks if this character
+ is currently catcode active. If this is the case, it then checks if the
+ character is a \ctanpkg{babel} shorthand. If yes, it then hooks into
+ \ctanpkg{babel} internals to modify the way this shorthand acts in math
+ mode, so that now the character will respond to math alphabet commands.
+ If however the catcode active character does not appear to be a
+ \ctanpkg{babel} shorthand, then \mst does not do anything at all (beyond
+ its general business at package loading time to set-up the
+ font used for the non-active token).
+%
+ In relation to this context \mst should always be loaded \emph{after} \ctanpkg{babel}.
+ And also \emph{after} the \ctanpkg{amsmath} package.
+
+\item
The braces |\{| and |\}| remain unresponsive to the alphabet changing commands
-even after \csb{MTnonlettersobeymathxx}. One must issue also
-\csb{MTexplicitbracesobeymathxx}, but it has the disadvantage that |\{| and
+even after \csb{MTnonlettersobeymathxx}. The user must employ for this
+\centeredline{\csb{MTexplicitbracesobeymathxx}}
+This has the disadvantage that |\{| and
|\}| become then unusable as variable-size delimiters: |\big\{| or |\big\}|
create errors and one must make use of |\big\lbrace| and |\big\rbrace|. But
-\MTmathoperatorsobeymathxx\MTnonlettersobeymathxx\MTexplicitbracesobeymathxx
+%
+\MTmathoperatorsobeymathxx
+\MTnonlettersobeymathxx
+\MTexplicitbracesobeymathxx
+%
one can now enjoy $\mathtt{\{a, a>b\}}$, $\mathbf{\{a, a>b\}}$,
-$\mathsf{\{a, a>b\}}$, or even $\mathnormalbold{\{a, a>b\}}$.\footnote{this
- last example uses the \cs{mathnormalbold} additional alphabet defined by
- \mst.}\footnote{Let me recall that braces will anyhow not be handled at all
+$\mathsf{\{a, a>b\}}$, or even $\mathnormalbold{\{a, a>b\}}$.%
+%
+\footnote{This
+ last example uses the \csb{mathnormalbold} additional alphabet defined by
+ \mst.}%
+%
+\footnote{Let me recall that braces will anyhow not be handled at all
by \mst if the document
font encoding is |OT1|, except under option |alldelims|.}
-Even with \csb{MTnonlettersobeymathxx}, the parenthese-like symbols $($, $)$,
+\item
+Even with \csb{MTnonlettersobeymathxx}, the parentheses-like symbols $($, $)$,
$[$, $]$, $<$ and $>$ and the slashes $/$, $\backslash$, \emph{if used as
- left/right delimiters} (i.e.\@ with |\left/\right|) do not react to math
+ left/right delimiters} (i.e.\@ with |\left/\right|) will not respond to math
alphabet commands. This is mainly explained by the fact that the text font
-will not contain suitable glyphs, hence no attempt was made to make the
+will not contain suitable glyphs, hence no attempt was made by \mst to make the
delimiters pick up their glyphs there.
But \mst does try to pick up most of the `small variants' of the delimiters
-from the text font: |$\left<x\right>$| gives $\left<x\right>$ (but
-|$\left<b\right>$| gives $\left<b\right>$.) Notice that this differs from
+from the text font: |$\left<x\right>$| gives $\left<x\right>$ but
+|$\left<b\right>$| gives $\left<b\right>$. Notice that this differs from
standard \LaTeX{} for which |$\left< x\right>$| gives $\langle x\rangle$. As
-it is perhaps a bit strange to have $\left< x\right>$ next to
-$\left< X\right>$ there is option §nosmalldelims§: with this option the
-small-sized variants of the delimiters are not modified by \mst (option
-§nosmalldelims§ has the side effect that, for the non-delimiter uses of
-|\{, \}|
-to be \mst-ified it is necessary to issue \csb{MTnonlettersobeymathxx} and
-\csb{MTexplicitbracesobeymathxx}.)
-
-At any rate, as said above, whether `small' or not, delimiters are
-unresponsive to math alphabet commands, due to technical aspects of \TeX, and
-the way \mst handles these things. Examples: |\mathbf{<a,b>}| gives
-$\mathbf{<a,b>}$
-%{\setbox0\hbox{$\mathbf{<a,b>}$}\typeout{ICI}\showboxdepth\maxdimen
-% \showboxbreadth\maxdimen \showbox0}
-(no use of |\left/\right|, hence brackets do obey the math alphabets --- as we
-issued §\MTnonlettersobeymathxx§ a bit earlier), |\mathbf{\left<a,b\right>}|
-gives $\mathbf{\left<a,b\right>}$ (brackets used with |\left/\right| do not
-obey the math alphabets), |\mathbf{\mathopen{<}a,b \mathclose{>}}| gives
-$\mathbf{\mathopen{<} a,b \mathclose{>}}$ (no |\left/\right|, brackets
-do obey the math alphabets).
-
-\endgroup
-For comparison, the \LaTeX{} standard behavior for
-\centeredline{|\mathbf{\mathopen{<}a,b\mathclose{>}}|}
-is $\mathbf{\mathopen{<} a,b
- \mathclose{>}}$ (neither brackets nor the comma do respond).
-
-
-\subsection{Unicode engines}
-
-\mst is minimally Unicode aware since |1.12| and can be used with \XeTeX{} or
-\LuaTeX{}. Starting with release |1.3|, it needs |luatex| to be at least
-as recent as the one which was provided with the TL2013 distribution.
-
-However \mst applies only to (a subset of) the |32-127| ascii range, and
-optionally to Greek letters, but for the latter only if provided via ``\TeX\
-fonts'' such as Euler, Symbol or LGR-encoded fonts.
-It does not know how to use a given Unicode font simultaneously for Latin and
-Greek letters.
-
-Thus, first consider much better alternatives:
-\begin{itemize}
-\item Since 2018, the package \ctanpkg{mathfont}%
-%
-\footnote{Conrad \textsc{Kosowsky}, \emph{Use TrueType and OpenType fonts in math mode}
-\url{https://ctan.org/pkg/mathfont}.}
-%
-adapts Unicode text fonts to usage in math mode. It works with both \XeTeX\
-and \LuaTeX.
-\item For \XeTeX\ only, \ctanpkg{mathspec}%
-%
-\footnote{Andrew Gilbert \textsc{Moschou}, \emph{Specify arbitrary fonts for mathematics in \XeTeX}
-\url{https://ctan.org/pkg/mathspec}.}
-%
-also allows usage of arbitrary text fonts in mathematics.
-\item and of course
-\ctanpkg{unicode-math}%
-%
-\footnote{Will \textsc{Robertson}, et al., \emph{Unicode mathematics with
- support for XeTeX and LuaTeX} \url{https://ctan.org/pkg/unicode-math}.}
-%
-is the standard package for using OpenType fonts which are equipped with the needed extra
-support being used in \TeX\ math mode.
-\end{itemize}
-
-If using any one of the above you probably don't need, don't want, and should
-not use \mst.
-
-Let me insist that \mst has not been tested in any systematic
-manner under the Unicode engines; and that it is expected to be most definitely
-incompatible with \ctanpkg{unicode-math}, although your mileage may vary and some
-features may appear to work.
+it is perhaps a bit strange to have $\left< x\right>$ and $\left< y\right>$
+not use the same bracketing glyphs, there is an option §nosmalldelims§: with
+this option the small-sized variants of the delimiters are not modified by
+\mst (option §nosmalldelims§ has the side effect that, for the non-delimiter
+uses of |\{, \}| to be \mst-ified it is necessary to issue
+\csb{MTnonlettersobeymathxx} and \csb{MTexplicitbracesobeymathxx}.)\par
-When using \mst with either \XeTeX{} or \LuaTeX{} it is recommended to use the
-\ctanpkg{fontspec} package (see remark below on \cs{encodingdefault}). Furthermore,
-if using \ctanpkg{fontspec} it is \emph{necessary} to load it with its
-|no-math| option, and this \emph{must} happen before loading \mst.
-\begin{framed}
-\begin{itemize}[label=$\bullet$, leftmargin=1em]
\item
- Use \ctanpkg{fontspec} with its
- \emph{no-math} option, and load it \emph{prior} to \mst. As some packages
- load \ctanpkg{fontspec} themselves (for example |polyglossia|), a
- \centeredline{|\PassOptionsToPackage{no-math}{fontspec}|} early in the
- preamble might be needed.
-
-\item
- The \ctanpkg{amsmath} package, if used, \emph{must} be loaded \emph{prior} to \mst.
-
-\item
- Under |lualatex| engine, it is recommended to also load the package
- \ctanpkg{lualatex-math}.% Please check its documentation as possibly it has now
- % been incorporated upstream (I am not following up on the situation).
+At any rate, as said above, whether `small' or not, delimiters will remain
+unresponsive to math alphabet commands, due to technical aspects of \TeX, and
+the way \mst handles these things. Examples:
+\begin{itemize}[nosep]
+\item |\mathbf{<a,b>}| gives $\mathbf{<a,b>}$: no use of |\left/\right|, hence
+ brackets do obey the math alphabets --- as we issued
+ §\MTnonlettersobeymathxx§ a bit earlier,
+\item |\mathbf{\left<a,b\right>}| gives
+ $\mathbf{\left<a,b\right>}$: delimiters used with |\left/\right| will not obey
+ the math alphabets,
+\item |\mathbf{\mathopen{<}a,b \mathclose{>}}| gives
+ $\mathbf{\mathopen{<} a,b \mathclose{>}}$: no |\left/\right|, so the
+ brackets do obey the math alphabets due to §\MTnonlettersobeymathxx§.
+\item
+\MTnonlettersdonotobeymathxx
+to compare, the \LaTeX{} standard for
+|\mathbf{\mathopen{<}a,b\mathclose{>}}| is to produce
+$\mathbf{\mathopen{<} a,b \mathclose{>}}$: neither brackets nor the comma are
+responding to \cs{mathbf}.
\end{itemize}
-\end{framed}
-
-% obsolete with release 1.3:
-% A little piece of the functionality of \mst is less fully
-% realized under the \LuaLaTeX{} engine than it is with
-% \XeTeX{}. This is a temporary situation as the needed feature
-% of \LuaLaTeX{} has been implemented in its latest development
-% release. I will update \mst when these binaries will have
-% reached the distribution stage.
-
-I already mentioned in the section \ref{sec:ic} the fact that
-the italic corrections were not available for OpenType fonts
-under the \XeTeX{} engine and only partially available for the
-\LuaTeX{} engine, with the result that the spacings in math
-mode when using for the letters an upright text font will be
-less satisfying than with the standard PDF\TeX{} engine (the
-OpenType fonts not being usable with the latter engine, this is
-not a criterion of choice anyhow).
-
-To define math versions when using unicode fonts, use \ctanpkg{fontspec}'s
-\cs{setmainfont} before the \cs{Mathastext}\oarg{version} command, or simply
-before loading \mst for the default math versions.
-
-It is possible to mix usage of Unicode fonts and classical \TeX{}
-fonts. All used 8bits font encoding must have been passed as
-options to the \ctanpkg{fontenc} package.
-
-\subsubsection{The unicodeminus option}
-
-For legacy reason, \mst uses by default the |EN DASH U+2013| for the minus
-sign in math mode, if the font is determined to be a ``Unicode'' font.
-
-There is now the §unicodeminus§\RightNote{1.3q} to use rather
-% BORDEL DE BORDEL DE FAIT CHIER \verb ET Text for \verb command ended by end
-% of line. je l'ai patché dans etoc et xint mais pas ici encore.
-|MINUS SIGN U+2212|.%
-\footnote{Thanks to Tobias~\textsc{Brink} who asked for this feature.}
-%
-Check \hyperref[nicodeminus]{\ttfamily\hyphenchar\font=189 its documentation}
-on page \pageref{nicodeminus}.
+\end{itemize}
+\end{footnotesize}
-\subsubsection{Two examples}
+\endgroup
-I include
-here two examples which compiled successfully with \XeTeX{} and
-\LuaLaTeX{}, the first one on a Linux machine, the second one on a Mac
-OS X machine.\footnote{A |tex mathastext.dtx| (in a temporary repertory) on a
- copy of |kpsewhich mathastext.dtx| will extract extended versions of
- these examples as test files.}
+\subsubsection{Hacking letters (and even digits) for special tasks}
+\label{ssec:hackingletters}
+
+For some ascii characters, i.e.\@ the ``hard'' non-letters considered in the
+previous section, and even more spectacularly for all ascii letters, \mst
+achieves the capabilities describes in earlier sections via a \TeX nique known
+as ``mathematically active characters''. For letters this is turned on by
+default, but for the non-letter characters it is the command
+\cs{MTnonlettersobeymathxx} which triggers this mathematical activation.
+
+It is possible for daring \LaTeX{} users to hook into this architecture.
+Release \mstrelease{1.4} has made this especially easy regarding ascii letters
+(and even for digits if using the package option §activedigits§).
+
+Except if told otherwise, \mst will make all Latin ascii letters mathematically
+active, and when \TeX{} encounters e.g.\@ `e' in math mode it replaces it with
+the macro having name \cs{MTcommandlettere} (mind the ending |e|). Its
+default definition inserts \hyperref[sec:mathskips]{optional extra skips}
+and/or an \hyperref[sec:ic]{italic correction}.
+
+You can redefine this \cs{MTcommandlettere}, or any
+\cs{MTcommandletter}\meta{ascii-letter}, to achieve (globally or locally)
+custom goals.%
+%
+\footnote{\CHANGED{\mstrelease{1.4}}%
+Prior to \mstrelease{1.4}, there was no equivalent to
+\cs{MTcommandletter}\meta{letter}. An internal macro \cs{mst@}\meta{letter}
+stood for what is denoted now \cs{MTmathcharletter}\meta{letter}, but required
+a \cs{protected} if redefined as it was submitted to an \cs{edef} during
+processing.}
+%
+Attention, this redefinition should not use `e' itself as a ``naked''
+character to typeset in math mode, else an infinite loop will arise at time of
+use. To access a symbol equivalent to the ``naked'' `e', use
+\cs{MTmathcharlettere} (again mind the ending |e|). For example:
\begin{verbatim}
-\documentclass{article}
-\usepackage[hscale=0.8]{geometry}
-\usepackage{multicol}
-\usepackage[no-math]{fontspec}
-\usepackage{lmodern}
-\usepackage[subdued,italic]{mathastext}
-\setmainfont[Color=999999]{Verdana} \Mathastext[Verdana]
-\setmainfont[Color=0000FF]{Arial} \Mathastext[Arial]
-\setmainfont[Color=00FF00]{DejaVu Serif} \Mathastext[DejaVu]
-\MTDeclareVersion{times}{T1}{ptm}{m}{n}
-\setmainfont[Color=FF0000]{Andale Mono} \Mathastext[Andale]
-\begin{document}
-\newcommand\TEST[1]{\MTversion{#1}%
-\begin{multicols}{2}
-\hbox to\columnwidth{\hbox to\columnwidth{\hfil
- $abcdefghijklmnopqrstuvwxyz$\hfil}\kern-2.5em{#1}}
- \centerline{ $ABCDEFGHIJKLMNOPQRSTUVWXYZ$ }
- \centerline{ $0123456789$ }
- \centerline{ $!\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\backslash$ }
-\columnbreak
- \centerline{ abcdefghijklmnopqrstuvwxyz }
- \centerline{ ABCDEFGHIJKLMNOPQRSTUVWXYZ }
- \centerline{ 0123456789}
- \centerline{ !\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,%
- \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\char92 }
-\end{multicols}}
-\begin{multicols}{2}
- \centerline{\textbf{math mode}}
-\columnbreak
- \centerline{ \textbf{text} }
-\end{multicols}
-\TEST{DejaVu}\TEST{Verdana}\TEST{times}\TEST{Andale}
-\TEST{Arial}\TEST{bold}\TEST{normal}
-\end{document}
+\renewcommand\MTcommandlettere{\mathsf{\MTmathcharlettere}}% not \mathsf{e}!
\end{verbatim}
-And now the same thing with fonts available on Mac OS X:
+In this case we could do the simpler approach with \cs{textsf}, which works
+as it will then typeset the |e| in text mode, not math mode.
\begin{verbatim}
-\documentclass{article}
-\usepackage[hscale=0.8]{geometry}
-\usepackage{multicol}
-\usepackage[no-math]{fontspec}
-\usepackage{lmodern}
-\usepackage[subdued,italic]{mathastext}
-\setmainfont[Color=FF0000]{Hoefler Text} \Mathastext[Hoefler]
-\setmainfont[Color=336633]{American Typewriter}\Mathastext[Typewriter]
-\setmainfont[Color=0000FF]{Herculanum} \Mathastext[Herculanum]
-\setmainfont[Color=FF00FF]{Didot} \Mathastext[Didot]
-\setmainfont[Color=999999]{Comic Sans MS} \Mathastext[Comic]
-\begin{document}
- --- copy here the code from the previous example ---
-\TEST{Didot}\TEST{Comic}\TEST{normal}\TEST{Herculanum}
-\TEST{Hoefler}\TEST{Typewriter}\TEST{bold}
-\end{document}
+\renewcommand\MTcommandlettere{\textsf{e}}% not \mathsf{e}!
\end{verbatim}
-% The test files which will be produced by running |latex| on
-% |mathastext.dtx| are more extent.
+This gives a priori the same result in our \mst context, which
+picks the font for \cs{mathsf} from the one used by \cs{textsf}, assuming here
+default configuration in the preamble following the loading of \mst.%
+%
+\footnote{This example simply reassigns \texttt{e} to another font, and one
+could use also the \LaTeX{} command \cs{DeclareMathSymbol} for this. But few
+\LaTeX{} users are familiar with its interface, and such an approach could
+cost adding an extra math symbol font, depending on what one wants to do.
+Besides \cs{DeclareMathSymbol} is a preamble-only command, which limits
+considerably its usability, forcing basically the change to apply to the whole
+document. Using the \mst interface via mathematically active characters opens
+up the possibility of arbitrary replacements, of local scope in the document
+body.}
-\subsection{Compatibility issues}\label{sec:compat}
-
-Compatibility issues (or just questions of who decides last) are naturally to
-be expected with packages dealing with the math setting; the fix is simply to
-load \mst last. And one should always load |amsmath| before \mst (this is
-especially true when using Unicode engines but applies in general as well).
-
-Any definition made in a package loaded before \mst of the font to be
-used for letters or for the common characters in the |ascii| basic range
-will be overruled by the loading of \mst (this includes the case
-when the earlier package had made the character `mathematically active').
-Conversely most of the set-up done by \mst may well be overruled by
-packages loaded later which do math related things.
-
-Starting with version |1.2|, \mst makes some characters `mathematically
-active' to achieve certain effects: automatic insertion of the italic
-corrections when using an upright text font in math, extended scope of
-the math alphabet commands which now apply to non-letter symbols (and
-also to math operator names, but this is much easier to achieve). And
-the (already mathematically active) right quote is modified to have some
-extra space added before the derivative glyph ${}'$.
-
-This is compatible with using \cs{label} and \cs{ref} in and outside of
-math mode. But a difficulty arises when some other package has made the
-character `globally active' everywhere in the document. The action of
-\mst is made anew at each mathematical inline or displayed formula. If
-it is detected that a character has been activated then nothing further
-will be done (so the \mst feature\footnote{italic correction insertion
- for the latin letters, receptivity to the math alphabet action for the
- other characters.} for that character is lost) \emph{except} if it
-appears that this activation was done by the Babel system. In that case
-\mst does not make the character mathematically active but it modifies
-in the appropriate manner the action of Babel for that character in math
-mode. Furthermore \mst makes the character mathematically
-\emph{inactive}.\footnote{only the characters
- {{;}\,{,}\,{:}\,{!}\,{?}\,{+}\,{\textendash}\,{=}\,{<}\,{>}\,{(}\,{)}\,{[}\,{]}\,*}
- mentioned in section \ref{sec:mathxx} as `difficult non letters' (and
- the right quote {'}) and
- the latin letters are concerned here; it seems highly unprobable that
- a latin letter ${\in}\{a\mbox{--}z,A\mbox{--}Z\}$ will have been made
- globally active (only letters never being used in command names are
- possible candidates), but \mst has been
- designed to cope with it, should it happen ...}
-
-Here is indeed some code that you should \textbf{not} try at
-home:
+
+It is recommended in general to add an extra pair of braces
+to avoid problems when used with |_| and |^|. Let's give an other example and
+demonstrate its output:
\begin{verbatim}
- \documentclass{article}
- \usepackage[french]{babel}
- \usepackage{mathtools}\mathtoolsset{centercolon}
- \begin{document}
- $:$
- \end{document}
+\[
+\renewcommand\MTcommandlettere{{\mathcolor{blue}{\mathsf{\MTmathcharlettere}}}}%
+abcde^efgh
+\]
\end{verbatim}
-\fbox{DO NOT DO THIS AT HOME}\thinspace: it creates an infinite
-loop.\footnote{This seems to still be the case with Babel |3.9f| and
- frenchb.ldf |2.6e|, as tested on Sep. 2, 2013. Again tested with up-to-date
- TL2015 Jan. 15, 2016 with same result.} This is due
-to the fact that the colon is simultaneously active (this is made by
-\ctanpkg{babel-french} at begin document) and mathematically active (done by
-\ctanpkg{mathtools} in the preamble). The interaction gives an infinite loop. Such a
-situation will be cured by \mst, even loaded before \ctanpkg{mathtools},
-\emph{if} use is made of \cs{MTnonlettersobeymathxx}. At each math formula
-\mst will detect that Babel has activated the colon, and will cancel the
-mathematical activation (the precise definition done by \ctanpkg{mathtools} was
-already lost at begin document due to overwriting by \ctanpkg{babel} but the fact that
-the character was mathematically active remained true).
+\MTversion{times}
+\[
+\renewcommand\MTcommandlettere{{\mathcolor{blue}{\mathsf{\MTmathcharlettere}}}}%
+abcde^efgh
+\]%
+\MTversion{normal}%
+As this document is in §subdued§ mode, we had, to show the effect, to
+switch temporarily to some math version activating \mst, and we used here a
+|times| math version with Times and Helvetica clones.
+
+If you redefine \cs{MTcommandlettere} as described in this section the optional extra
+math skips added before or after via §\MTsetmathskips§ will be lost, as well
+as the automatic italic correction |\/| added by \mst for an upright font, and it
+is up to the redefinition of \cs{MTcommandlettere} to do the job.
+
+The explanations above apply to any (ascii) Latin letters \meta{ascii-letter}
+with associed macros \cs{MTcommandletter}\meta{ascii-letter} and ``naked''
+symbol command \cs{MTmathcharletter}\meta{ascii-letter}.
+
+With option §activedigits§ you can even extend the game to digits. The
+``raw'' digit symbol is kept as a math symbol control sequence
+\cs{MTmathchardigit}\meta{y} where \meta{y} stands for the Roman version of
+the digit: empty
+for $0$, then |i|, |ii|, etc... until |ix|. The macro to redefine for special
+effect is \cs{MTcommanddigit}\meta{y}. Example:
+\begin{verbatim}
+\[
+\renewcommand\MTcommanddigit{{\MTmathchardigit^{\mathcolor{blue}{1}}
+ _{\mathcolor{red}{2}}}}%
+\renewcommand\MTcommanddigiti{{\boxed{\mathbf{\MTmathchardigiti}}}}
+0^0_0
+\]
+\end{verbatim}
+\MTversion{times}
+\[
+\renewcommand\MTcommanddigit{{\MTmathchardigit^{\mathcolor{blue}{1}}
+ _{\mathcolor{red}{2}}}}%
+\renewcommand\MTcommanddigiti{{\boxed{\mathbf{\MTmathchardigiti}}}}
+0^0_0
+\]%
+\MTversion{normal}%
+(\cs{boxed} is from \ctanpkg{amsmath}) Let's hope you find better
+usage... recall that you can't use digit $0$ in its redefinition but must use
+\cs{MTcommanddigit}. But you can of course use other digits... except if
+their definitions use the digit $0$ rather than the non-active symbol control
+sequence \cs{MTmathchardigit}.
+See also §\MTmathactiveletters§ and §\MTmathactivedigits§.
- So far I have briefly described the problem of document active
- characters (see the test file |mathastexttestalphabets.tex| for more
- explanations and illustrations, and the commented source code of the
- package). Pure mathematical activation revealed an incompatibility of
- another type with \ctanpkg{amsmath}. To fix it, \mst now replaces
- an inner macro of \ctanpkg{amsmath}
- (\cs{resetMathstrut@}) with its own version.\\
- \null\hspace{1cm}\fbox{Always load \ctanpkg{amsmath} before \mst.}\\
- Actually this last commandment was already made necessary by the use of the
- text endash to represent the minus sign in math mode, and, especially for
- Unicode engines, some aspects of the \cs{DeclareMathOperator} macro from
- \ctanpkg{amsmath}.
-
- \begin{framed}\kern-.75\baselineskip
- \begin{framed}
- \textbf{Important!} As is mentioned in the section \ref{sec:mathxx},
- after command §\MTnonlettersobeymathxx§, characters such as
- |?|, or |[|, now represent \emph{two} `tokens' and this will utterly
- confuse \TeX{} if some precautions are not taken. Examples: |$0^+$| or
- |$x\mathrel?y$| or |$R^*$| \emph{must} be input now as |$0^{+}$|
- and, respectively,
- |$x\mathrel{?}y$| or |$R^{*}$|. This is why the package does
- §\MTnonlettersdonotobeymathxx§ by default.
- \end{framed}\vskip-.75\baselineskip
- \end{framed}
- One thing to take note of is that this mechanism uses the \cs{everymath}
- and \cs{everydisplay}, so if it is needed to add to these \TeX{} `token
- lists' some additional things this should be done in a way preserving the
- former contents.
-
- If one issues (after |\begin{document}|) |\everymath={}| and
- |\everydisplay={}| this annihilates not only all the \mst (evil ?) doings
- with math active characters but also everything else some other package
- might have put in these token registers, so it is better, if the need
- arises to cancel the math activation of characters done by \mst to use the
- command §\MTeverymathoff§, which does all of
- §\MTmathoperatorsdonotobeymathxx§, §\MTnonlettersdonotobeymathxx§ (already
- default), §\MTmathstandardletters§, §\MTnormalprime§, and
- §\MTnormalasterisk§. This is supposed to be used in a group or
- environment (as there is no |\MTactivemathon|). It must be used prior to
- entering math mode.
-
- \begin{framed}
- \textcolor{magenta}{\bfseries New with 1.3i:} \mst patches |\url| of
- packages \ctanpkg{url} and \ctanpkg{hyperref}, and also |\nolinkurl|, to force them
- to do automatically §\MTeverymathoff§. Indeed they use math mode, and it
- is better to turn \mst off for their dealings.
- \end{framed}
-
% 2 septembre 2013; finalisé 22:58
% Mardi 19 décembre 2023: l'utilisation de bleu alors que ce n'est
@@ -4503,7 +4217,7 @@ option).
\item \mstcmd{Mathastext} (or \mstcmd{mathastext}) reinitializes \mst: it sets the
fonts used in math mode (in versions |normal| and |bold|) for letters,
digits and a few ascii symbols to the \emph{current} defaults of encoding,
- family, series and shape.\footnote{\texttt{\char92Mathastext} updates also
+ family, series and shape.\footnote{\csb{Mathastext} updates also
the font and shapes for the Greek letters (|LGRgreek| option), and the
skips to be inserted after the symbols $\oldforall$ and $\oldexists$,
see \emph{infra.}} Both the normal and bold math version are modified by
@@ -4517,7 +4231,7 @@ option).
the \LaTeX{} \cs{DeclareMathVersion} macro. \emph{Do not use}
|\string\Mathastext[foo]| \emph{with
|foo| equal to ``normal'' or ``bold'';} this is already taken care of by the
- initial loading of the package or a later command \cs{Mathastext}
+ initial loading of the package or a later command \csb{Mathastext}
without any optional argument. And it will be rejected.}
\item %\textbf{inheritance:}
\csb{Mathastext}\oarg{version\_name}\oarg{parent\_name}
@@ -4553,7 +4267,7 @@ option).
\mstcmd{MTlettershape}\marg{sh}.%
%
\footnote{These commands exist also with
- long names: \texttt{\char92Mathastextencoding},
+ long names: \csb{Mathastextencoding},
etc\dots{} The same applies to the other commands
mentioned in this section.}
%
@@ -4597,7 +4311,7 @@ optional argument) will these commands have any real effect.
of the time of loading the package.} else letters will
have the same shape as used for digits and operator-names.
- Another optional argument may be used as last argument.\RightNote{1.3c}
+ Another optional argument may be used as last argument.\RightNote{\mstrelease{1.3c}}
Similarly as its
use with §\Mathastext§ this makes the declared math version inherit, for
things not modified by \mst like large symbols, the font set up of the math
@@ -4645,7 +4359,7 @@ optional argument) will these commands have any real effect.
redefined). In the absence of the optional argument, the mandatory one is
used. The versions \emph{must} be either |normal|, or |bold|, or previously
declared ones via §\Mathastext§ or §\MTDeclareVersion§.
- \item the starred variant\RightNote{1.3c} does the math set-up, but changes \emph{nothing} to
+ \item the starred variant\RightNote{\mstrelease{1.3c}} does the math set-up, but changes \emph{nothing} to
the text fonts (see \autoref{sec:mathversions} for a description of the math
set-up, which summarizes
what is done additionally to only using \LaTeX{}'s |\mathversion|).
@@ -4659,7 +4373,7 @@ optional argument) will these commands have any real effect.
option the package checks separately the letter shape for lowercase and
uppercase.
- \RightNote{1.3j}§\MTversion§ also does §\MTexistsdoesskip§,
+ \RightNote{\mstrelease{1.3j}}§\MTversion§ also does §\MTexistsdoesskip§,
§\MTforalldoesskip§, and also §\MTprimedoesskip§,
\csb{MTmathoperatorsobeymathxx}, except under the |subdued| option for
\emph{normal} and \emph{bold}, in which case it does the opposite actions.
@@ -4668,17 +4382,13 @@ optional argument) will these commands have any real effect.
the |italic| option) combining the |h| letter and the \={ } accent from the
\mst font. Note that \cs{mathrm}|{\hbar}| and \cs{mathbf}|{\hbar}| will
work and that \cs{hbar} does scale in subscripts and exponents. Since
- |1.3u|, this is a priori compatible with all 8bits text font
- encodings\RightNote{1.3u} supporting the |\=| text accent in
+ \mstrelease{1.3u}, this is a priori compatible with all 8bits text font
+ encodings\RightNote{\mstrelease{1.3u}} supporting the |\=| text accent in
the LaTeX way.%
%
-\footnote{\RightNote{1.3u}The horizontal skips for letter |h| from
- \cs{MTsetmathskips} are ignored for \cs{hbar}.% Formerly, a positive
- % ``before'' skip was not properly taken into account for the horizontal
- % positioning of the accent and thus gave a bad result. The user can extend
- % the package \cs{hbar} definition to add skips.
-}
-\footnote{\RightNote{1.3u}The \cs{hbar} redefinition is canceled in normal and
+\footnote{\RightNote{\mstrelease{1.3u}}The horizontal skips for letter |h| from
+ \csb{MTsetmathskips} are ignored for \cs{hbar}.}
+\footnote{\RightNote{\mstrelease{1.3u}}The \cs{hbar} redefinition is canceled in normal and
bold math versions under the |subdued| option.}
\item \mstcmd{fouriervec}: this is a |\vec| accent taken from the Fourier font;
@@ -4687,7 +4397,7 @@ if option §fouriervec§.
\item \mstcmd{pmvec}: this provides a poor man \cs{vec} accent command, for
upright letters. It uses the right arrow. Does not change
size in subscripts and exponents.
-\item \RLNote{new description:}{1.3za}\mstcmd{Mathnormal}, \mstcmd{Mathrm},
+\item \RLNote{new description:}{\mstrelease{1.3za}}\mstcmd{Mathnormal}, \mstcmd{Mathrm},
\mstcmd{Mathbf}, \mstcmd{Mathit}, \mstcmd{Mathsf}, \mstcmd{Mathtt}: they use the
\mst-ified fonts. By default, \mstcmd{mathnormal}, \mstcmd{mathrm},
\mstcmd{mathbf}, \mstcmd{mathit}, \mstcmd{mathsf}, \mstcmd{mathtt} are redefined
@@ -4707,7 +4417,7 @@ size in subscripts and exponents.
This command is also made available under §subdued§ option in
the ``normal'' and ``bold'' math versions, as \LaTeX\ does not define it a
priori, contrarily to §\mathbf§ and other math alphabet commands.
- \item \RightNote{1.3x}\mstcmd{mathgreekup}: math alphabet, only available
+ \item \RightNote{\mstrelease{1.3y}}\mstcmd{mathgreekup}: math alphabet, only available
under §LGRgreek§ (or §LGRgreeks§) option, which gives access to `upright'
Greek letters (picked up from a font available in |LGR|-encoding). Note
that the package also defines \cs{alphaup}, \dots, \cs{piup}, \dots\
@@ -4725,7 +4435,7 @@ size in subscripts and exponents.
support as long as suitable usage of §\MTgreekfont§ later on configures a
suitable font).
- \RightNote{1.3za}Also \mstcmd{mathgreekupbold}.
+ \RightNote{\mstrelease{1.3za}}Also \mstcmd{mathgreekupbold}.
\begin{footnotesize}
These math alphabets are also available under §subdued§ option in the
@@ -4764,14 +4474,14 @@ size in subscripts and exponents.
the §subdued§ option anyhow.\par
\end{footnotesize}
-\item \RightNote{1.3x}\mstcmd{mathgreekit}: math alphabet, only available
+\item \RightNote{\mstrelease{1.3y}}\mstcmd{mathgreekit}: math alphabet, only available
under §LGRgreek§ (or §LGRgreeks§) option, which gives access to `italic'
Greek letters (picked up from a font available in |LGR|-encoding). The
actual shape is configurable via re-defining §\MTgreekitdefault§ and then
redeclaring the math version via §\Mathastext§ (with optional argument if
for a math version other than the ``normal'' one), or §\MTDeclareVersion§.
- \RightNote{1.3za}Also \mstcmd{mathgreekitbold}.
+ \RightNote{\mstrelease{1.3za}}Also \mstcmd{mathgreekitbold}.
\begin{footnotesize}
See the discussion of §\mathgreekup§ for some \TeX\ hacker level
@@ -4782,13 +4492,6 @@ size in subscripts and exponents.
font for use in math mode. By default, |\imath| and |\jmath| are redefined to use
them. Since \texttt{1.3t}, these macros obey the \texttt{subdued}
regime.
-%
-% \footnote{\RightNote{1.3t}Formerly (i.e.\@ since \texttt{1.12}) \mst
-% redefined the \texttt{\string\i} and \texttt{\string\j} as robust
-% commands usable both in text and math mode and using the above macros
-% in the latter. I have decided it wasn't such a good idea and there is
-% from now on \texttt{1.3t} no such redefinition of \texttt{\string\i}
-% and \texttt{\string\j}!}
\item \mstcmd{MathEuler}, \mstcmd{MathEulerBold}: math alphabets to access
all the glyphs of the Euler font, if option |eulergreek| (or
|eulerdigits| was passed to the package.
@@ -4811,14 +4514,14 @@ all the glyphs of the Euler font, if option |eulergreek| (or
\cs{let}\cs{varepsilon}$=$\cs{epsilon}, etc\dots,
in case only the `variant' form of the letter was used
in the documents.
-\item \hypertarget{symbolmisc}{Miscelleneous mathematical symbols} from the
+\item \hypertarget{symbolmisc}{Miscellaneous mathematical symbols} from the
postscript Symbol font are made available (or replaced) by option
§symbolmisc§.\footnote{option \blueit{asterisk} is also required to treat the
$*$.
Recall from \autoref{sec:mathxx} that the asterisk in math mode (also
when using the control sequence \cs{ast}) appears then to \TeX{} to be
a composite object.}
- \makeatletter\let\mst@doasterisk\mst@@doasterisk\makeatother They are
+ \MTactiveasterisk They are
\cs{prod}~$\prod$ \cs{sum}~$\sum$ \cs{implies}~$\implies$
\cs{impliedby}~$\impliedby$ \cs{iff}~$\iff$ \cs{shortiff}~$\shortiff$
\cs{to}~$\to$ \cs{longto}~$\longto$ \cs{mapsto}~$\mapsto$
@@ -4864,64 +4567,106 @@ comments).
The timing for actions of \mst falls into three cases:
\begin{enumerate}
-\item things done during the loading of the package, or delayed to
- |\AtBeginDocument|,
+\item things done by \mst itself during its loading (some are delayed to
+ |\begin{document}|),
\item things done as the result of user commands, either in the preamble or in
- the body of the document,
+ the body of the document, (but note that some commands if used in preamble
+ have a real effect only at the time of |\begin{document}|),
\item things done everytime math mode is entered.
\end{enumerate}
-The second category overlaps with the others, as the (preamble) use of some
-commands can have either immediate effect or only trigger some actions in
-|\AtBeginDocument| or perhaps only influence the things done later by \mst
-each time math mode is entered.
-
-The third category deserves some brief additional comments: it mainly (but not
-exclusively) regards the ``math activation'' of characters, and conversely all
-``math activations'' fall into this category. The package re-checks each time
-math mode is entered if some characters have been made in-between catcode
-active, or math active, and takes appropriate decisions: one important aspect
-of this issue is that |babel|'s mechanism for activating character was not, last
-time I checked, very robust against math active characters. I now checked
-again (on January 15, 2016) that
-\begin{verbatim}
- \documentclass{article}
- \usepackage[french]{babel}
- \usepackage{mathtools}\mathtoolsset{centercolon}
- \begin{document}
- $:$
- \end{document}
-\end{verbatim}
-creates an infinite loop (see section \ref{sec:compat} where this was
-mentioned already, some years ago). Thus \mst has (since |1.2e 2013/01/10|) a
-somewhat elaborate mechanism related to these issues (see the code comments),
-installed into the list of things done by \TeX\ systematically each time
-it enters math mode. For some legacy reason the package also puts into
-this list a few other things which could arguably be done elsewhere once and
-for all. The command \csb{MTeverymathoff} cancels all actions done by
-\mst.
+At \mstrelease{1.4}\RLNote{changed:}{\mstrelease{1.4}} a very significant
+change took place: the last category, the one of things done everytime math mode
+is entered, has become \emph{empty}.%
+%
+\footnote{There ia always an exception to a good
+rule, and here it is: only with \LuaLaTeX{} engine, a certain
+command is executed as part of \cs{everymath}. For details see
+\csb{MTfixfonts}.}
+
+The §everymath§ option added at \mstrelease{1.4} re-establishes the legacy
+behavior. Except for ascii letters: they will not even then be made
+mathematically active at each entrance in to math mode, but only once at time
+of package loading (if not §subdued§) and also when using §\MTversion§ (for
+non-§subdued§ math versions).
+
+\begin{shaded*}
+Under §everymath§ option some commands described here as being usable
+everywhere have in fact an effect only if used externally of math mode.
+The documentation is only accurate for the default \mstrelease{1.4}
+configuration, not for the legacy one as re-enacted by §everymath§.
+\end{shaded*}
+
+\subsubsection{Expert commands which are preamble-only}
+
+\begin{enumerate}[label=$\bullet$, leftmargin=1em]
+\item \mstcmd{MTgreekupdefault}:\RightNote{\mstrelease{1.3y}} a command with
+ no argument whose expansion specifies, under §LGRgreek§ regime, the
+ shape for the `|up|' Greek control sequences (and for the no-postfix
+ Greek control sequences under §upgreek§ option) in all \mst math
+ versions declared \emph{afterwards} via \cs{Mathastext} or
+ \cs{MTDeclareVersion}. The a priori default for this shape is `|n|'
+ (without the quotes). See
+ \autoref{sec:newgreek}.
+
+ This command can also be defined \emph{prior} to loading the package,
+ as the package itself only does:
+ \centeredline{|\providecommand*\MTgreekupdefault{n}|}
+
+\item \mstcmd{MTgreekitdefault}:\RightNote{\mstrelease{1.3y}} a command with
+ no argument whose expansion specifies, under §LGRgreek§ regime, the
+ shape for the `|it|' Greek control sequences (and for the no-postfix
+ Greek control sequences under §itgreek§ option) in all \mst math
+ versions declared \emph{afterwards} via \cs{Mathastext} or
+ \cs{MTDeclareVersion}. The a priori default for this shape is `|it|'
+ (without the quotes).
+ See \autoref{sec:newgreek}.
+
+ This command can also be defined \emph{prior} to loading the package,
+ as the package itself only does:
+ \centeredline{|\providecommand*\MTgreekitdefault{it}|}
+\end{enumerate}
+
\subsubsection{Expert commands usable everywhere}\label{sec:cmds}
\begin{enumerate}[label=$\bullet$, leftmargin=1em]
+ \item \mstcmd{MTcustomgreek}:\RightNote{\mstrelease{1.3d}} in case \mst has been loaded with one of its
+ Greek related options, this activates the corresponding
+ customization of Greek letters in math mode. It is issued
+ automatically by the package in the preamble (except if loaded with
+ |subdued| option) and at each switch of math version via
+ |\MTversion| or |\MTversion*| (except for the normal and bold math
+ versions in subdued mode). Also available as
+ |\Mathastextcustomgreek|. May be used even inside of math mode.
+
+ \item \mstcmd{MTstandardgreek}:\RightNote{\mstrelease{1.3d}} in case \mst was loaded with one of the Greek
+ related options this command reverts the customization, it resets the Greek
+ letters to their definitions in force at package loading time. Can be used
+ in the preamble, but is mainly for the document body (may even be used
+ inside math mode ...). Done automatically
+ under the |subdued| option when switching to the normal or bold math
+ version. Also available as |\Mathastextstandardgreek|.
+
+
\DeleteShortVerb{\|}%
\item \mstcmd{MTsetmathskips}\marg{a-z|A-Z}\marg{muglue\_before}\marg{muglue\_after}:
%
\MakeShortVerb{\|}%
%
- is\RightNote{1.3a} used to specify extra skips (or rather mu glue) to be
+ is\RightNote{\mstrelease{1.3a}} used to specify extra skips (or rather mu glue) to be
inserted in math mode, before and after a letter. The rationale is that
standard text fonts used in math mode may sometimes cause glyph (near-)
collisions with math symbols, as \TeX{} has some implicit expectations on the
design of fonts for math letters.
- \begin{framed}
+ \begin{snugshade}
These extra skips around letters are set at their natural width and do not
add any stretchability or shrinkability to the math formula as a whole,
nor do they result in extra potential break points.
- \end{framed}
+ \end{snugshade}
Random (silly) examples:
\centeredline{|\MTsetmathskips{x}{\medmuskip}{\thickmuskip}|} \centeredline
@@ -4941,19 +4686,19 @@ for all. The command \csb{MTeverymathoff} cancels all actions done by
\makeatother
\end{verbatim}
- \begin{framed}
+ \begin{snugshade}
\emph{\color{magenta}\bfseries Starting with |v1.3i|:} the extra skips are
\emph{not} applied to the letters within the scope of math alphabet
commands, or the letters from operator names (pre-defined or user
declared).
- \end{framed}
+ \end{snugshade}
{\footnotesize
Note that contrarily to the \csb{MTexistsskip}, \csb{MTforallskip}, and
\csb{MTprimeskip} commands described next, these extra skips (which may be
specified in the preamble) are not recorded in the definition of the math
- version (as defined via §\Mathastext§ with its optional argument or via
- §\MTDeclareVersion§). The declared skips hold thoughout the document
+ version (as defined via \csb{Mathastext} with its optional argument or via
+ \csb{MTDeclareVersion}). The declared skips hold thoughout the document
until modified or canceled, independently of math versions (of
course, \mst cancels the skips in the normal and bold math versions if
package option \blueit{subdued} was used).\par}
@@ -4967,18 +4712,15 @@ for all. The command \csb{MTeverymathoff} cancels all actions done by
cancels the skips
for that letter (they are not set to |0mu| but completely removed).
-
- % setting the skips to |0mu| which prevents formation of ligatures
- % when the letter is used inside a \cs{mathbf} for example). Example (using a
- % version with upright Latin Modern): \centeredline
- % {|\MTsetmathskips{f}{8mu}{0mu}$gffg\MTunsetmathskips{f}ff\mathbf{ff}$|}
- % gives: \begingroup\MTversion{upright}%
- % \MTsetmathskips{f}{8mu}{0mu}$gffg\MTunsetmathskips{f}ff\mathbf{ff}$\endgroup.
- % The ligature was correctly formed.
-
The argument may be a macro (or any expandable code) expanding to a letter.
+\item \RightNote{\mstrelease{1.3j}}\mstcmd{MTnormalexists}, \mstcmd{MTexistsdoesskip}: the
+ latter (done by default if not |subdued|, and also on each use of
+ |\MTversion| in the body of the document) makes it so that $\oldexists$
+ takes into account the math glue as specified by §\MTexistsskip§. The
+ former is its opposite.
+
\item \mstcmd{MTexistsskip}\marg{math glue}: specifies the amount of skip or more
generally glue to put after each $\oldexists$ math symbol. Indeed, upright
letters (or digits for that matter) often appear to be positioned a bit too
@@ -4991,17 +4733,13 @@ for all. The command \csb{MTeverymathoff} cancels all actions done by
version (and subsequent ones). One may also use the command at any time in
the document. In the case of the option |subdued|, the skip is canceled in
the \emph{normal} and \emph{bold} math versions.
-%
-% \footnote{\RightNote{1.3j}%
-% Formerly, it was set to |0mu|.}
-%
In the case of the option |italic|, the
default skip is set to zero.
-\item \RightNote{1.3j}\mstcmd{MTnormalexists}, \mstcmd{MTexistsdoesskip}: the
+\item \RightNote{\mstrelease{1.3j}}\mstcmd{MTnormalforall}, \mstcmd{MTforalldoesskip}: the
latter (done by default if not |subdued|, and also on each use of
- |\MTversion| in the body of the document) makes it so that $\oldexists$
- takes into account the math glue as specified by \csb{MTexistsskip}. The
+ |\MTversion| in the body of the document) makes it so that $\oldforall$
+ takes into account the math glue as specified by §\MTforallskip§. The
former is its opposite.
\item \mstcmd{MTforallskip}\marg{math glue}: the default is to add a |.6667mu| math
@@ -5012,138 +4750,191 @@ for all. The command \csb{MTeverymathoff} cancels all actions done by
be declared} math versions. In the case of the option |subdued|, the skip
is canceled in the \emph{normal} and \emph{bold} math
versions.
-%
-%\footnote{\RightNote{1.3j}Formerly, it was set to |0mu|.}
In the
case of the option |italic|, the default skip is zero for all math versions.
One may use the command at any location in the document.
-\item \RightNote{1.3j}\mstcmd{MTnormalforall}, \mstcmd{MTforalldoesskip}: the
- latter (done by default if not |subdued|, and also on each use of
- |\MTversion| in the body of the document) makes it so that $\oldforall$
- takes into account the math glue as specified by \csb{MTforallskip}. The
- former is its opposite.
+\item \RightNote{\mstrelease{1.3j}}\mstcmd{MTnormalprime},
+ \mstcmd{MTprimedoesskip}: the latter (done by default if not |subdued|,
+ and also on each use of \csb{MTversion} in the body of the document except
+ for the §subdued§ \emph{normal} and \emph{bold} math version) makes it so
+ that $'$ takes into account the math glue as specified by
+ §\MTprimeskip§. The former is its opposite. In all cases the right quote
+ |'| is a mathematically active character throughout the document producing
+ ${}'$ as is the default in \TeX, it is only its meaning which changes to
+ include or not an extra skip.
+
+ \begin{footnotesize}
+ Even though §\MTprimedoesskip§ is not done in the §subdued§ case, it is
+ \emph{not} a no-op even then in the preamble or in the \emph{normal} and
+ \emph{bold} math versions.\par
+ \end{footnotesize}
-\item \mstcmd{MTprimeskip}\marg{math glue}: the default is to add a |0.5mu| skip
- before the derivative glyph, except for the |italic| option. In the case of
- the option |subdued|, the skip is canceled in the \emph{normal} and
+\item \mstcmd{MTprimeskip}\marg{math glue}: specifies the amount of math
+ skip to add before the derivative glyph. The default iniitial value is
+ |0.5mu|, except with the |italic| option where it is |0mu|. In the case
+ of the option |subdued|, the skip is canceled in the \emph{normal} and
\emph{bold} math versions.
-%
-%\footnote{\RightNote{1.3j}Formerly, it was set to
-% |0mu|.}
-% obsolete et même faux avec 1.3j
-% \footnote{if \cs{begin\{document\}} is not followed
-% with \cs{MTversion\{normal\}}, the latest values set in the preamble by
-% these commands are used at the beginning of the document,
-% even under option \texttt{subdued}.}
+\item \mstcmd{MTnormalasterisk}, \mstcmd{MTactiveasterisk}: the latter will
+ use for |*| and |\ast| the text font asterisk, suitably lowered; the former
+ if used in the preamble tells \mst to not modify the non-\mst situation, or
+ if used in the body to revert to it. Both are no-op's in absence of option
+ §asterisk§.
+
+\begin{footnotesize}
+ A legacy feature is that §\MTactiveasterisk§ is \emph{not} a no-op in
+ §subdued§ \emph{normal} or \emph{bold} math versions, and does let the
+ asterisk obey the §\MTlowerast§ configuration, if used explicitly by user
+ (even in the preamble).
+
+ At \mstrelease{1.4}\RLNote{changed:}{\mstrelease{1.4}} \mst checks at
+ |\begin{document}| (or each time §\MTaciveasterisk§ is made use of) if
+ * is a Babel shorthand (which I far as I know is the case of no
+ language) or is already mathematically active. In the latter case the
+ * is not modified in math mode; and it is not modified either if
+ found to be catcode active but not a \ctanpkg{babel} shorthand. In
+ contrast, the \cs{ast} will always be set to obey §\MTlowerast§
+ configuration after §\MTactiveasterisk§.
+
+\end{footnotesize}
-\item \mstcmd{MTlowerast}\marg{dimen}: a \cs{raisebox} command is
+\item \mstcmd{MTlowerast}\marg{dimen}: under option §asterisk§
+ a \cs{raisebox} command is
used to lower the text asterisk to produce a reasonable math
asterisk. The package uses this command initially with
argument |0.3\height|, this will have to be fine-tuned for
each given text font but worked out ok with the fonts we
- tried. Note that the dimension argument will be used also in
+ tried. The dimension argument will be used also in
sub-scripts and sub-sub-scripts, so it is best not to use an
- absolute dimension.
+ absolute dimension. The dimension specification is for text
+ it can not be with |mu| unit.
\item \mstcmd{MTmathoperatorsobeymathxx}, \mstcmd{MTmathoperatorsdonotobeymathxx}: the
former is done by default, it makes operator names obey math alphabets. See
- also section \ref{sec:mathxx}. This functionality \emph{does
+ also \autoref{sec:mathxx}. This functionality \emph{does
{\normalfont\bfseries not} rely}
on ``math active characters''. Automatically issued by each \cs{MTversion},
except under option |subdued| when switching to \emph{normal} or \emph{bold}.
- \item \mstcmd{MTcustomgreek}:\RightNote{1.3d} in case \mst has been loaded with one of its
- Greek related options, this activates the corresponding
- customization of Greek letters in math mode. It is issued
- automatically by the package in the preamble (except if loaded with
- |subdued| option) and at each switch of math version via
- |\MTversion| or |\MTversion*| (except for the normal and bold math
- versions in subdued mode). Also available as
- |\Mathastextcustomgreek|. May be used even inside of math mode.
+\item \mstcmd{MTmathactiveletters}:\RightNote{\mstrelease{1.3}}
+ `math activation' of all ascii Latin
+ letters. This is done by the package automatically except under the
+ §subdued§ option.
- \item \mstcmd{MTstandardgreek}:\RightNote{1.3d} in case \mst was loaded with one of the Greek
- related options this command reverts the customization, it resets the Greek
- letters to their definitions in force at package loading time. Can be used
- in the preamble, but is mainly for the document body (may even be used
- inside math mode ...). Done automatically
- under the |subdued| option when switching to the normal or bold math
- version. Also available as |\Mathastextstandardgreek|.
-\end{enumerate}
-
-\subsubsection{Expert commands which are preamble-only}
-
-\begin{enumerate}[label=$\bullet$, leftmargin=1em]
-\item \mstcmd{MTgreekupdefault}:\RightNote{1.3x} a command with
- no argument whose expansion specifies, under §LGRgreek§ regime, the
- shape for the `|up|' Greek control sequences (and for the no-postfix
- Greek control sequences under §upgreek§ option) in all \mst math
- versions declared \emph{afterwards} via \cs{Mathastext} or
- \cs{MTDeclareVersion}. The a priori default for this shape is `|n|'
- (without the quotes). See
- \autoref{sec:newgreek}.
-
- This command can also be defined \emph{prior} to loading the package,
- as the package itself only does:
- \centeredline{|\providecommand*\MTgreekupdefault{n}|}
-
-\item \mstcmd{MTgreekitdefault}:\RightNote{1.3x} a command with
- no argument whose expansion specifies, under §LGRgreek§ regime, the
- shape for the `|it|' Greek control sequences (and for the no-postfix
- Greek control sequences under §itgreek§ option) in all \mst math
- versions declared \emph{afterwards} via \cs{Mathastext} or
- \cs{MTDeclareVersion}. The a priori default for this shape is `|it|'
- (without the quotes).
- See \autoref{sec:newgreek}.
-
- This command can also be defined \emph{prior} to loading the package,
- as the package itself only does:
- \centeredline{|\providecommand*\MTgreekitdefault{it}|}
-\end{enumerate}
-
-\subsubsection{Expert commands usable only outside of math mode}\label{sec:cmdsoutmath}
+ At \mstrelease{1.4}\RLNote{changed:}{\mstrelease{1.4}} its behavior was
+ modified significantly: instead of setting some toggle obeyed only at
+ entrance of math mode, it acts on the spot immediately.
+\begin{snugshade}
+ Formerly, this command was only a configuration toggle with no immediate
+ impact (and was not usable from inside math mode). Indeed, the \mst work of
+ mathematical activation was done (or not done) \emph{each time} math mode
+ was entered (if not in §subdued§), and the ascii letters kept standard
+ mathcodes outside of math mode.
+
+ The command now does the mathematical activation on the spot and the meaning
+ of the active shape of the ascii letters --- a priori undefined because
+ typesetting a document with an active ascii letter is near impossible, as no
+ \LaTeX{} command name used in the document can contain it --- is modified
+ here and then; but of course the catcodes are not modified only the
+ mathcodes are. Except if \mst is loaded with the §subdued§ option, this
+ mathematical activation is executed already at package loading time.
+
+ If with the §subdued§ option, the command is inactive in the preamble, as
+ well as in the \emph{normal} and \emph{bold} math versions. In all cases it
+ gets (re-)executed automatically when §\MTversion§ is used for activating a
+ non-subdued math version.
-They are usable only from outside math mode because they act via turning on
-or off the execution, each time math mode is entered, of certain macros added
-by \mst to the \cs{everymath} and \cs{everydisplay} token list variables.
+ \begin{footnotesize}
+ The new situation may be dangerous if the document author makes a letter,
+ say |A|, catcode active at some point, with a definition of the active
+ state using |\string A|. As \mst has (earlier, in the preamble) set |A|
+ to be mathematically active as well, and as the \cs{string} changes
+ nothing to that, an infinite loop will be triggered by such an |A| in math
+ mode.
+
+ But, having an active ascii letter can only be in very localized portions
+ of a document, and only be authored by experts. The experts should
+ carefully make sure the mathcode of the letter is not active if they set
+ the catcode to active and let the active meaning use \cs{string} on the
+ letter itself, thus we can trust that the mathematical activation done
+ earlier by \mst is undone and there will be no problems.\par
+ \end{footnotesize}
-\begin{enumerate}[label=$\bullet$, leftmargin=1em]
+ This \mstrelease{1.4} change may thus need to be followed by some
+ adjustments in some quite special circumstances caused by some expert
+ interventions.
-\item \mstcmd{MTmathactiveletters}: activates the `math activation' of Latin
- letters. This is done by the package during loading, except under the
- |subdued| option.
-%
-% \footnote{\RightNote{1.3j}Formerly, it was also executed
-% from each \cs{Mathastext} in the preamble.}
- It is again executed in the
- body at each \cs{MTversion}, except under the |subdued| option when
- switching to the \emph{normal} or \emph{bold} math versions.
+ See \autoref{sec:mathskips} and \autoref{sec:ic} for the rationale of this
+ mathematical activation, and \autoref{ssec:hackingletters} for ways to
+ use it for other goals.
+\end{snugshade}
+ \begin{footnotesize}
+ If you do want mathematically active letters also in subdued \emph{normal}
+ or \emph{bold} math versions (to apply tricks such as those of
+ \autoref{ssec:hackingletters}) there is \cs{mst@mathactivateletters} which
+ does not check the §subdued§ status.\par
+ \end{footnotesize}
+
+\item \mstcmd{MTmathstandardletters}:\RightNote{\mstrelease{1.3}}
+ turns off the mathematical active
+ ascii letters, i.e.\@ reverts their mathcodes to package font configuration.
+ Here ``standard'' only means
+ that the letters will not be mathematically active, but they are still under the
+ influence of \mst regarding the typeface they use, so they are only
+ ``standard'' from \mst point of view.
+
+ At \mstrelease{1.4}\RLNote{changed:}{\mstrelease{1.4}} its behavior was
+ modified: instead of setting some toggle obeyed only at entrance of math
+ mode, it acts on the spot immediately.
+ \begin{snugshade}
+ §\MTmathstandardletters§ will not try to restore the meaning associated to
+ the catcode active variant of the letter token which may have been in place
+ at the time of §\MTmathactiveletters§. This meaning is not saved for
+ later reset.
+
+ \emph{Except} if the \emph{letter} was an active Babel-shorthand at the time
+ of §\MTmathactiveletters§, which is in fact almost impossible to achieve
+ via the \ctanpkg{babel} interface.
+
+ And if the letter was catcode-active due to user action,
+ §\MTmathactiveletters§ will not have made it mathematically active, nor
+ will it have modified its active meaning. So the active meaning may get
+ overwritten only for a letter having a normal catcode at time of
+ §\MTmathactiveletters§ but which for some reason has some meaning
+ associated to its catcode active variant.
+ \end{snugshade}
+
+\item \mstcmd{MTmathactivedigits}:\RLNote{new:}{\mstrelease{1.4}}
+ is a no-op except under option
+ §activedigits§. It then makes all digits mathematically active and is
+ executed during package loading, except if §subdued§. It is again executed
+ when entering any non-§subdued§ math version in the document body. See
+ \autoref{ssec:hackingletters} for an example of use.
- The letters are made mathematically active\footnote{the |mathcode|'s are
- only modified at the time of execution of \cs{everymath},
- \cs{everydisplay}.} to insert the extra skips as specified by
- \csb{MTsetmathskips} (see section \ref{sec:mathskips}), and also possibly
- the italic corrections when using upright fonts (see section \ref{sec:ic}).
+ \begin{footnotesize}
+ If you do want mathematically active digits also in subdued \emph{normal}
+ or \emph{bold} math versions (to apply tricks such as those of
+ \autoref{ssec:hackingletters}) there is \cs{mst@mathactivatedigits} which
+ does not check the §subdued§ status.\par
+ \end{footnotesize}
-\item \mstcmd{MTmathstandardletters}: cancels the `math activation' of the letters.
- Must be re-issued after each \csb{MTversion}, but see
- \csb{MTeverymathdefault}.
+\item \mstcmd{MTmathstandarddigits}:\RLNote{new:}{\mstrelease{1.4}}
+ a no-op except under option
+ §activedigits§. Under this option it resets the digits to their normal
+ mathcodes as configured by the package.
\item \mstcmd{MTicinmath}: this command is executed by default by \mst except in
case of option |subdued| or if the user chosen letter shape is oblique (|it|
or |sl|). It tells \mst to add italic corrections after all letters in math
mode, except within the scope of math alphabets.
-%
-% \footnote{\RightNote{1.3i}%
-% Formerly, italic corrections were added to the (non-oblique) letters of
-% \cs{mathnormal} arguments.}
- This command and the next ones in this item can be used in the preamble as
- well as in the body of the document (in case of |subdued| option, using the
- commands from within the preamble will remain without effect, as the
- document body will start in the subdued normal math version anyhow.) But
- each \cs{MTversion} in the body will re-emit \cs{MTicinmath} (in case of
+ This\RLNote{changed:}{\mstrelease{1.4}}
+ command and the next ones in this item can be used anywhere in the
+ document and even from inside math mode. In case of §subdued§ option, using the
+ command from within the preamble remains without effect, as the
+ document body will start in the subdued normal math version anyhow.
+ Each \cs{MTversion} in the body reemits \cs{MTicinmath} (in case of
non-oblique letter shape), except if the
|subdued| option was used and the chosen math version is \emph{normal} or
\emph{bold}.
@@ -5153,54 +4944,38 @@ by \mst to the \cs{everymath} and \cs{everydisplay} token list variables.
{\footnotesize
- It may theoretically be used from inside math mode, but the included
- §\MTmathactiveletters§ will have an effect only if issued prior to
- entering math mode.
+ The description above about the command not being executed if the letter
+ shape is italic or slanted is not quite right, as it refers only to the
+ act of inserting or not italic correction. The
+ §\MTmathactiveletters§ component is always executed, however it will be a
+ no-op in |subdued| \emph{normal} and \emph{bold}.
\mstcmd{MTnoicinmath}: this command deactivates the package added
italic corrections. It can be used inside as well as outside
- of math mode (or in the preamble of the document).
-
- \mstcmd{MTICinmath}, \mstcmd{MTnoICinmath}: these commands activate the italic
- corrections only for the uppercase letters (but recall that \cs{MTicinmath}
- is done by default, thus this will typically have to follow
- \cs{MTnoicinmath}.)
-
-% obsolète 1.3i
- % Following some decision of the package author whose rationale has been
- % forgotten, afer \cs{MTICinmath} italic corrections for uppercase letters in
- % arguments to all math alphabets (\emph{i.e.} also \cs{mathnormal}) are
- % suppressed (with \cs{MTicinmath} the italic corrections are suppressed
- % inside the scope of math alphabets \emph{except} \cs{mathnormal}.)
- % No italic corrections are explicitly added inside arguments of math
- % alphabets.
+ of math mode (or in the preamble of the document). Note that it does not
+ deactivate the mathematical activation of the ascii letters. Use
+ §\MTmathstandardletters§ for that.
+
+ \mstcmd{MTICinmath}, \mstcmd{MTnoICinmath}: only acts on the uppercase
+ letters. But recall that \cs{MTicinmath} is done by default, thus
+ using italic corrections only for uppercase needs to go via
+ \cs{MTnoicinmath} then \cs{MTICinmath}.
\mstcmd{MTicalsoinmathxx}: this command de-activates the de-activation of
the italic corrections inside the arguments to the math alphabet
- commands.
-% apart from \cs{mathnormal}.
+ commands.
It can be issued inside as well as outside of math mode. Will be effective
only if §\MTicinmath§ or §\MTICinmath§ is in force.
-% obsolète 1.3i
- % \footnote{it is provided
- % for the \mst defined math alphabet \cs{mathnormalbold} which
- % contrarily to \cs{mathnormal} is not treated apart from the other
- % math alphabets.}
To cancel its effect either enclose it in a group or
environment or re-issue §\MTicinmath§ after it.
}
-\item \mstcmd{MTnormalasterisk}, \mstcmd{MTactiveasterisk}: the latter will use for |*|
- and |\ast| the text font asterisk, suitably lowered; the former tells \mst
- to not modify the \LaTeX\ default. Both are no-op without option
- §asterisk§.
-
\item \mstcmd{MTeasynonlettersobeymathxx}, \mstcmd{MTeasynonlettersdonotobeymathxx}: the
former is done by default, it makes characters \verb+.+, \verb+/+, \verb+|+,
\verb+\+, \verb+#+, \verb+$+, \verb+%+, and \verb+&+
(if not excluded by package options) obey math alphabet commands. See also
- section \ref{sec:mathxx}. This functionality does \emph{not} make the
+ \autoref{sec:mathxx}. This functionality does \emph{not} make the
characters ``math active'' (but it does modify |\mathcode|'s, naturally).
\item \mstcmd{MTnonlettersobeymathxx}, \mstcmd{MTnonlettersdonotobeymathxx}: the former
@@ -5213,105 +4988,110 @@ by \mst to the \cs{everymath} and \cs{everydisplay} token list variables.
it will have to be coded |$a^{!}$|. Hence, by default, the package does
§\MTnonlettersdonotobeymathxx§.
- \begin{framed}
- Under |subdued| option, \cs{MTnonlettersobeymathxx} effect is of course
- canceled in the \emph{normal} and \emph{bold} math versions; but please
- note that when switching back to a non-subdued math version it will be
- mandatory to issue again \cs{MTnonlettersobeymathxx} explicitly if its
- effect is to be re-activated.
-
- In particular, executing \cs{MTnonlettersobeymathxx} in the preamble or at
- the start of the document body serves nothing, because the document is in
- the subdued \emph{normal} math version regime then. It must thus be
- executed after the first usage of \cs{MTversion} switching to a
- non-subdued math version, and again on each successive exit from the
- \emph{normal} or \emph{bold} math versions.
- \end{framed}
-
\item \mstcmd{MTexplicitbracesobeymathxx}: extends an earlier §\MTnonlettersobeymathxx§
to also treat \verb|\{| and \verb|\}|. But then |\left\{|, |\right\}| must
be coded |\left\lbrace|, |\right\rbrace| rather. There is also
\mstcmd{MTexplicitbracesdonotobeymathxx}.
-\item \RightNote{1.3j}\mstcmd{MTnormalprime}, \mstcmd{MTprimedoesskip}: the latter (done by default if not
- |subdued|, and also on each use of \csb{MTversion} in the body of the document
- except for the |subdued| \emph{normal} and \emph{bold} math version)
- makes it so that $'$ takes into account the math glue as specified by
- \csb{MTprimeskip}. The former is its opposite. In all cases the right quote
- |'| is a mathematically active character producing ${}'$ as is the default
- in \TeX, it is only its meaning which changes to include or not an extra
- skip. For some (legacy) reason, this change of meaning is done anew
- by \mst each time math mode is entered. The commands of this item are thus
- no-op from inside math mode.
-
-
-\item \RightNote{1.3j}\mstcmd{MTeverymathdefault}: this hook is executed by
- \csb{MTversion}\marg{version\_name}, except under option |subdued|
- when switching to the \emph{normal} or \emph{bold} math versions. Its
+\item \RightNote{\mstrelease{1.3j}}\mstcmd{MTeverymathdefault}: this hook is executed by
+ \csb{MTversion}\marg{version\_name} (but if under option |subdued|
+ and switching to the \emph{normal} or \emph{bold} math version its default
+ effect is overruled by an §\MTeverymathoff§ executed after it). Its
default meaning is:
\begin{verbatim}
\MTactiveasterisk % this has no effect without option asterisk
\MTprimedoesskip % this makes prime glyph obey extra space
\MTeasynonlettersobeymathxx
- \MTicinmath % this does \MTmathactiveletters, hence also skips from
- % \MTsetmathskips are obeyed.
+ \MTicinmath % this does \MTmathactiveletters, hence the extra
+ % skips from \MTsetmathskips are obeyed.
+ \MTmathactivedigits % this is a no-op in absence of option activedigits
\MTfixfonts % only operant under LuaLaTeX.
\end{verbatim}
- {\footnotesize Notice that under |subdued| option, switching to the
+ {\footnotesize Under |subdued| option, switching to the
\emph{normal} or \emph{bold} version does \csb{MTeverymathoff} which
- includes \cs{MTnonlettersdonotobeymathxx}.
+ includes §\MTnonlettersdonotobeymathxx§.
The default
§\MTeverymathdefault§ which is issued when going back to a
non-\emph{normal} or \emph{bold} math version doesn't do
- \cs{MTnonlettersobeymathxx}: thus it is up to the user to correct this if
- needed (no issue without |subdued| option).
+ §\MTnonlettersobeymathxx§: thus it is up to the user to correct this if
+ desired.
Notice also that \csb{MTversion}\marg{version\_name}, except for \emph{normal}
or \emph{bold} if |subdued| does \csb{MTforalldoesskip} and
\csb{MTexistsdoesskip}, which are not included in \cs{MTeverymathdefault}
-actions as they are not related to \cs{everymath} and \cs{everydisplay}.\par}
+actions as they are not related to \cs{everymath} and \cs{everydisplay}.\par
-\item \RightNote{1.3j}\mstcmd{MTeverymathoff}: does §\MTnormalasterisk§,
+At \mstrelease{1.4}, the name of this command diverges somewhat from its
+action as mathematical activation of ascii letters (or, optionally, of digits)
+will happen on the spot and not during \cs{everymath} or \cs{everydisplay}
+execution.\par
+}
+
+\item \RightNote{\mstrelease{1.3j}}\mstcmd{MTeverymathoff}: does §\MTnormalasterisk§,
§\MTnormalprime§, §\MTnonlettersdonotobeymathxx§,
- §\MTeasynonlettersdonotobeymathxx§, §\MTmathstandardletters§ and
+ §\MTeasynonlettersdonotobeymathxx§, §\MTmathstandardletters§,
+ §\MTmathstandarddigits§\RightNote{\mstrelease{1.4}} and
§\MTdonotfixfonts§.
- {\footnotesize \RightNote{1.3i}The commands
- |\url/\nolinkurl| of package |hyperref| and |url| from |url.sty| (which
+ Automatically done by \csb{MTversion}|{normal}| (or |{bold}|) under option |subdued|
+ (and
+ also \csb{MTnormalexists} and
+ \csb{MTnormalforall} are executed then).
+
+
+ {\footnotesize \RightNote{\mstrelease{1.3i}}The commands
+ |\url/\nolinkurl| of package |hyperref| and |\url| from |url.sty| (which
use math mode under the hood) are patched by \mst to do §\MTeverymathoff§
automatically: this is needed because \mst modifies anew some mathcodes
\emph{each time math mode is entered,} hence may overwrite to some extent
- the specific preparation done by |{url,hyperref}.sty|.
- % {\parfillskip0pt\hfill
- % \rlap{\kern10pt\textcolor{magenta}{\bfseries New! (1.3i)}}\par}
+ the specific preparations done by |{url,hyperref}.sty|.
+
+ \RightNote{\mstrelease{1.4}}However, in some cases it may be interesting to
+ be able to apply hacks as described in \autoref{ssec:hackingletters}.
+ You can use now §\MTeverymathoff§ as a hook inside
+ |\url| and |\nolinkurl| commands. Perhaps redefine it (locally) to do
+ all of the above except §\MTmathstandardletters§ and/or
+ §\MTmathstandarddigits§, and use the \autoref{ssec:hackingletters}
+ instructions to achieve special effects for some letters or digits in
+ the URLs rendered via |\url| and |\nolinkurl|.
+ \par
+ }
+
+\end{enumerate}
- Automatically done by \csb{MTversion} under option |subdued|
- if switching to the \emph{normal} or \emph{bold} math versions; and
- \csb{MTversion} then does also \csb{MTnormalexists} and
- \csb{MTnormalforall}.
-\par}
+\subsubsection{Expert commands usable only outside of math mode}\label{sec:cmdsoutmath}
+
+There is only one pair of commands here: §\MTfixfonts§ and §\MTdonotfixfonts§.
+They are operant only under \LuaLaTeX{}. As §\MTeverymathdefault§ and
+§\MTeverymathoff§ use them, they arguably could have been listed here, but
+only for engine \LuaLaTeX{}.
\small
-\item \RightNote{1.3o}\mstcmd{MTfixfonts}: this is operant only under
+\begin{enumerate}[label=$\bullet$, leftmargin=1em]
+
+\item \RightNote{\mstrelease{1.3o}}\mstcmd{MTfixfonts}: this is operant only under
\LuaLaTeX{}. It has the effect that each time math mode is entered macro
\csb{MTfixmathfonts} will be executed. The latter forces so-called |base|
mode for the used text font in math mode, in an effort to (only partially,
see code comments) fix the fact that OpenType features such as Lining
Figures were in some cases not being applied in math mode when one uses text
fonts there (text fonts are declared by \LuaTeX+|luaotfload| to use |node|
- mode, which is non-functional in math.) It is invoked automatically by the
+ or |harf| mode, which are non-functional in math.) It is invoked automatically by the
package (except for |normal| and |bold| math versions under |subdued|
option), and in normal situations, there is no reason to use it directly.
+ \RLNote{changed:}{\mstrelease{1.4}}The hack was updated at \mstrelease{1.4}
+ in order to also handle fonts using |Renderer=HarfBuzz|.
+
% pas envie de perdre mon temps là-dessus. D'ailleurs peut-être déjà pour
% commencer bm ne fonctionne pas avec fontes OpenType.
% Notice (not tested) that package |bm| is presumably not compatible.
-\item \RightNote{1.3o}\mstcmd{MTdonotfixfonts}: cancels the job of
+\item \RightNote{\mstrelease{1.3o}}\mstcmd{MTdonotfixfonts}: cancels the job of
|\MTfixfonts|. Done automatically in §subdued§ mode when in the |normal| or
|bold| math version; in normal contexts, there is no reason to use this
command. Only operant under \LuaLaTeX.
@@ -5321,17 +5101,19 @@ actions as they are not related to \cs{everymath} and \cs{everydisplay}.\par}
\subsubsection{Expert commands usable only in math mode}
\begin{enumerate}[label=$\bullet$, leftmargin=1em]
-{\small
-\item\RightNote{1.3p}%
+
+\item\RightNote{\mstrelease{1.3p}}%
\mstcmd{MTfixmathfonts}: this used to be an internal package macro
- but it is given a public name at |1.3p| because I discovered that
+ but it is given a public name at \mstrelease{1.3p} because I discovered that
|$..\hbox{\mathversion{foo}$..$}..$| causes an
issue and one needs to invoke again \cs{MTfixmathfonts} \emph{after} the
\verb|\hbox|, for some reason. To be used \emph{only} under \LuaLaTeX{} and only for
such rare cases where it may be needed.\par
-}
+
\end{enumerate}
+\normalsize
+
\section{Package options}
\subsection{Summary of main options}
@@ -5388,7 +5170,8 @@ actions as they are not related to \cs{everymath} and \cs{everydisplay}.\par}
roughly by themes. So, objectively, the best for the diligent reader is to
read thoroughly all descriptions.
\begin{enumerate}[label=$\bullet$, leftmargin=1em]
- \item \mstopt{basic}: only mathastextify letters and digits.
+ \item \mstopt{basic}: only mathastextify (ascii) letters and digits. Can
+ be combined with either §nodigits§ or §noletters§.
\item \mstopt{subdued}: acts in a subdued way, which means that the \LaTeX\
``normal'' (default) and ``bold'' (triggered by \cs{boldmath} or
\cs{mathversion}|{bold}|, undone by \cs{unboldmath} or on exit from a
@@ -5410,10 +5193,10 @@ actions as they are not related to \cs{everymath} and \cs{everydisplay}.\par}
handles Greek letters, also lowercase (but not uppercase) Greek
letters will use this a priori italic shape except if some other
option such as \blueit{upgreek} was used.%
- \footnote{Since \texttt{1.3x}, in presence of the \blueit{LGRgreek}
- option in addition to \blueit{italic}, the \cs{MTgreekitdefault}
+ \footnote{Since \texttt{1.3y}, in presence of the \blueit{LGRgreek}
+ option in addition to \blueit{italic}, the \csb{MTgreekitdefault}
shape is then used for lowercase Greek letters and
- \cs{MTgreekupdefault} for uppercase.}
+ \csb{MTgreekupdefault} for uppercase.}
\item \mstopt{frenchmath}: configures the lowercase Latin letters to use
italic shape (\cs{itdefault}), and uppercase Latin letters to be in
same shape as for digits and operator names (i.e.\@ a priori
@@ -5424,8 +5207,8 @@ actions as they are not related to \cs{everymath} and \cs{everydisplay}.\par}
and uppercase Greek letters will use the same shape as
operator names, except if some other option such as \blueit{itgreek}
was used.%
- \footnote{Under \blueit{LGRgreek} and since |1.3x|, the
- \cs{MTgreekupdefault} is used for Greek letters if no other option
+ \footnote{Under \blueit{LGRgreek} and since \mstrelease{1.3y}, the
+ \csb{MTgreekupdefault} is used for Greek letters if no other option
such as \blueit{itgreek} was employed.}
\begin{snugshade}
@@ -5434,9 +5217,7 @@ actions as they are not related to \cs{everymath} and \cs{everydisplay}.\par}
be in the same shape as the one for digits and operator
names) is \textbf{not} undone in the §subdued§ ``normal''
and ``bold'' math versions. It holds throughout the
- document, but math versions declared by \mst may use
- §\MTshape§ and §\MTlettershape§ to, in effect, obtain
- whatever configuration is desired.
+ document.
As a bonus, note that doing
\centeredline{|\usepackage[basic,subdued,frenchmath]{mathastext}|}
@@ -5490,7 +5271,7 @@ actions as they are not related to \cs{everymath} and \cs{everydisplay}.\par}
%\end{footnotesize}
-\item \mstopt{defaultalphabets}: \RLNote{new behavior}{1.3za}\mst
+\item \mstopt{defaultalphabets}: \RLNote{new behavior}{\mstrelease{1.3za}}\mst
always defines \cs{Mathnormal}, \cs{Mathrm}, \cs{Mathbf} etc... to
refer to the \mst-ified text fonts, and redefines the math
alphabets \cs{mathrm}, \cs{mathit}, \cs{mathtt} etc\dots{} (but
@@ -5501,22 +5282,22 @@ actions as they are not related to \cs{everymath} and \cs{everydisplay}.\par}
be available whether or not this option is made use of.
\begin{footnotesize}
- Prior to |1.3za| (and since |1.15f|), this option also prevented the
+ Prior to \mstrelease{1.3za} (and since \mstrelease{1.15f}), this option also prevented the
package to declare the \cs{Mathnormal} et al.\@ and \cs{mathnormalbold}
commands. In this context, recall that the dreaded ``too many math
alphabets'' error can only occur on \emph{use} in the document of too many
of such commands, and not at the time of their declarations. The author's
- notes from time of |1.15f| release (|2012/10/25|) only say that it may not
+ notes from time of \mstrelease{1.15f} release (|2012/10/25|) only say that it may not
be ``useful'' to package user to have both (for example) |\mathrm| and
|\Mathrm|, which sounds weird if they are to acquire distinct meanings.
- So since |1.3za| both will exist. In the default package configuration
+ So since \mstrelease{1.3za} both will exist. In the default package configuration
|\mathrm| is configured to expand to |\Mathrm| (with some extra behavior
under §LGRgreek+§), and with this option or the §defaultrm§ option
|\mathrm| is kept with its original meaning (and the §LGRgreek+§ extras do
not work).\par
\end{footnotesize}
-\item \RLNote{changed:}{1.3za}\mstopt{defaultnormal}, \mstopt{defaultrm},
+\item \RLNote{changed:}{\mstrelease{1.3za}}\mstopt{defaultnormal}, \mstopt{defaultrm},
\mstopt{defaultbf}, \mstopt{defaultit}, \mstopt{defaultsf},
\mstopt{defaulttt}: tell \mst to not set up, respectively, the
\cs{mathnormal}, \cs{mathrm}, \cs{mathbf}, \cs{mathit}, \cs{mathsf}, and
@@ -5524,11 +5305,11 @@ actions as they are not related to \cs{everymath} and \cs{everydisplay}.\par}
always via \cs{Mathnormal}, \cs{Mathrm}, \cs{Mathbf}, \cs{Mathit}, etc...
\begin{footnotesize}
- Prior to |1.3za| these options also prevented the creation of the
+ Prior to \mstrelease{1.3za} these options also prevented the creation of the
corresponding \mst command with an uppercased initial.\par
\end{footnotesize}
-\item \mstopt{ncccomma}:\RightNote{1.3x} it triggers the loading of the
+\item \mstopt{ncccomma}:\RightNote{\mstrelease{1.3y}} it triggers the loading of the
\ctanpkg{ncccomma} package%
%
\footnote{Alexander I. \textsc{Rozhenko}, \emph{Use comma as decimal
@@ -5553,8 +5334,8 @@ those parts of the document using another language than French.%
reenact it. For background on this issue see
\url{https://github.com/latex3/babel/issues/190}.
- This does not apply to \ctanpkg{decimalcomma} |1.3| or later.}
-\item \mstopt{decimalcomma}:\RightNote{1.3zb} it triggers the loading of the
+ This does not apply to \ctanpkg{decimalcomma} \mstrelease{1.3} or later.}
+\item \mstopt{decimalcomma}:\RightNote{\mstrelease{1.3zb}} it triggers the loading of the
\ctanpkg{decimalcomma} package%
%
\footnote{Antoine \textsc{Missier}, \emph{Comma for decimal numbers},
@@ -5565,7 +5346,7 @@ The same remarks apply as for the §ncccomma§ option. In particular \emph{note
\emph{\texttt{decimalcomma}}, the correct way is to use the eponymous
option.}
-\item \mstopt{binarysemicolon}:\RightNote{1.3x} sets (except if
+\item \mstopt{binarysemicolon}:\RightNote{\mstrelease{1.3y}} sets (except if
\blueit{nopunctuation} is used) the semi-colon to let \TeX\ use
spacing of binary type, not punctuation type, around the semi-colon
(it is often used in French mathematical typesetting as separator in
@@ -5575,12 +5356,12 @@ The same remarks apply as for the §ncccomma§ option. In particular \emph{note
The effect applies to all math versions, even the \emph{normal} and
\emph{bold} math versions with \mst having been loaded with the
\blueit{subdued} option.
-\item \mstopt{frenchmath*}:\RLNote{CHANGED!}{1.3zb} does all three of \blueit{frenchmath},
+\item \mstopt{frenchmath*}:\RLNote{CHANGED!}{\mstrelease{1.3zb}} does all three of \blueit{frenchmath},
\blueit{decimalcomma} and \blueit{binarysemicolon}.
\begin{footnotesize}
- Prior to |1.3zb|, this option did what is now available via §frenchmath+§.
- The |1.3zb|
+ Prior to \mstrelease{1.3zb}, this option did what is now available via §frenchmath+§.
+ The \mstrelease{1.3zb}
change was made as a follow-up consecutive to the |2.7| release \ctanpkg{frenchmath}.
Indeed this option as explained in \autoref{ssec:frenchmath} is provided as
a compatiblity layer with \ctanpkg{frenchmath}, and it was mandatory to
@@ -5588,20 +5369,75 @@ The same remarks apply as for the §ncccomma§ option. In particular \emph{note
consecutive to the internal change of \ctanpkg{frenchmath} at its |2.7|
release to use \ctanpkg{decimalcomma}.\par
\end{footnotesize}
-\item \mstopt{frenchmath+}:\RightNote{1.3zb} does all three of \blueit{frenchmath},
+\item \mstopt{frenchmath+}:\RightNote{\mstrelease{1.3zb}} does all three of \blueit{frenchmath},
\blueit{ncccomma} and \blueit{binarysemicolon}. This is what used to be
- called §frenchmath*§ prior to |1.3zb|.
+ called §frenchmath*§ prior to \mstrelease{1.3zb}.
\item \mstopt{endash}, \mstopt{emdash}: use the text font en-dash (\textendash) or even
the em-dash (\textemdash, but this seems crazy) for the minus sign
rather than {}-{}. §endash§ option is default for the package.
-\item \mstopt{unicodeminus}:\RightNote{1.3q} use the |MINUS SIGN U+2212| (requires
+\item \mstopt{unicodeminus}:\RightNote{\mstrelease{1.3q}} use the |MINUS SIGN U+2212| (requires
\ctanpkg{fontspec}.) Or, in the form |unicodeminus=HHHH| with four \emph{uppercased}
hexadecimal digits: use the |U+HHHH| code point. As §noendash§ really means
``use the hyphen from the text font'', §unicodeminus§ remains without effect
under it, or, naturally, under §nominus§. Without this option,
\mst uses the |EN DASH U+2013| by default for OpenType fonts.
-\item \mstopt{asterisk}: use the text font (or the Symbol font) asterisk in math mode.
-\item \mstopt{nohbar}: prevents \mst from defining its own
+\item \mstopt{asterisk}: this tells \mst to replace the binary math operator $*$
+ and the control sequence \cs{ast} with versions which uses the text asterisk
+ * suitably lowered, and with the correct spaces around it as binary
+ operator. The amount of lowering%
+%
+\footnote{With the option
+ \texttt{symbolmisc}, the asterisk is picked from the Symbol font, and the
+ amount of lowering is non-customizable; however if a math alphabet command
+ is used, the asterisk is then again from a text font and the lowering will
+ be as specified by \cs{MTlowerast}.}
+%
+ is decided by the mandatory argument to the command
+ \csb{MTlowerast}\marg{dimen}. The package does
+ \cs{MTlowerast}|{.3\height}|. Using the |ex| unit as in
+ \cs{MTlowerast}|{.5ex}| is not a good idea as it does not scale properly in
+ the script and scriptscript styles.
+
+ Attention that if using this option, inputs such as |$R^*$| or |$R^\ast$|
+ raise errors and \emph{must} be replaced by |$R^{*}$|, respectively
+ |$R^{\ast}$|. The $*$ is now `mathematically active'\thinspace%
+%
+\footnote{In
+ a hopefully safe way, for example {\ttfamily\$\string\label\{eq*1\}\$} is
+ ok.}
+%
+ and |*| and |\ast| will obey the math alphabet
+ commands (see \autoref{sec:mathxx}).
+
+\item \mstopt{activedigits}:\RLNote{new:}{\mstrelease{1.4}}
+ it makes all digits mathematically active! This is
+ reserved to expert \LaTeX{} users. See \autoref{ssec:hackingletters} for an
+ example. Do not use this option if you don't intend to make use of such
+ techniques to achieve special effects at some location of your document at
+ least. (I know this goes without saying, but passing this option and not
+ using it is only adding overhead to all your equations with digits).
+
+\item \mstopt{nodigits}: no \mst-ification of digits.
+\item \mstopt{noletters}:\RLNote{new:}{\mstrelease{1.4b}}
+ This is quite antithetical to the package core aim, but here you go.
+
+ \begin{footnotesize}
+ This option implies §nohbar§ and §defaultimath§.
+
+ Note though that \mst will still declare to \LaTeX{} two extra symbol
+ fonts and define alphabet commands such as §\Mathrm§, §\Mathnormal§ and
+ §\mathnormalbold§ which map to them. But ascii letters will if not in
+ arguments of these commands not use the \mst-font and all business of
+ active letters (see \autoref{ssec:hackingletters}) is now irrevocably
+ inaccessible.
+
+ If you simply want to avoid the overhead of math active
+ letters, use rather §\MTmathstandardletters§ in the preamble after having
+ loaded the package (although this does not undo the fact that \mst will
+ have redefined what a letter does if it is catcode active but that remark
+ should have been made in an even smaller typeface).\par
+ \end{footnotesize}
+ \item \mstopt{nohbar}: prevents \mst from defining its own
\cs{hbar}.
\item \mstopt{noendash}: the minus sign will be the - from the
text font, not the en-dash \textendash.
@@ -5616,7 +5452,7 @@ The same remarks apply as for the §ncccomma§ option. In particular \emph{note
\ \mstopt{nopunctuation} ,\,.\,:\,;\ \mstopt{noplus},
\mstopt{nominus}, \mstopt{noplusnominus}\ +\,\textendash{} \mstopt{noequal} =\
\mstopt{noparenthesis} (\,)\,[\,]\,/\ \mstopt{nospecials}
-\#\,\$\,\%\,\&\ and \mstopt{nodigits}.
+\#\,\$\,\%\,\&\ (and §nodigits§ and §noletters§ mentioned earlier).
\item \mstopt{alldelims}: true by default, means that the
characters excluded by §nolessnomore§ are
treated. Use this option in case of a mono-width
@@ -5690,7 +5526,7 @@ Euler font.
declared |\alphaup|, |\alphait|, ...., and the
associated §\mathgreekup§
and §\mathgreekit§ commands to access the underlying fonts, and also since
- |1.3za| §\mathgreekupbold§ and §\mathgreekitbold§.
+ \mstrelease{1.3za} §\mathgreekupbold§ and §\mathgreekitbold§.
The font used by these math
alphabet commands in the subdued ``normal'' and ``bold'' is either
@@ -5699,7 +5535,7 @@ Euler font.
§\MTgreekfont§ when the command §\Mathastext§ (without
optional argument) was used in the preamble.
- |1.3za| fixes here a bug which froze the target font to be
+ \mstrelease{1.3za} fixes here a bug which froze the target font to be
the one at time of loading the package: this bug applied
(only) to the subdued ``normal'' and ``bold'' math versions
and was not readily visible as there is a priori no reason to
@@ -5716,7 +5552,7 @@ Euler font.
§LGRgreek§ and then §\MTgreekfont§ manually appropriately.
\item \mstopt{LGRgreek+} and
- \mstopt{LGRgreeks+}:\RightNote{1.3za} they extend
+ \mstopt{LGRgreeks+}:\RightNote{\mstrelease{1.3za}} they extend
respectively §LGRgreek§ or §LGRgreeks§ to let Greek letters
control sequences when in the scope of §\mathrm§, §\mathit§,
and §\mathbf§ behave as would be expected by LaTeX users who
@@ -5747,7 +5583,7 @@ Euler font.
accents. As in vanilla \LaTeX{}, they are taken from the font
for the digits and \cs{log}-like names. Obey the alphabet
changing commands.
- \item \mstopt{unimathaccents}:\RightNote{1.3u} extends |mathaccents| to
+ \item \mstopt{unimathaccents}:\RightNote{\mstrelease{1.3u}} extends |mathaccents| to
OpenType fonts. Gave bad results in my brief testing.
\item \mstopt{defaultimath}: do not overwrite \cs{imath} and
\cs{jmath} to use \cs{inodot} and \cs{jnodot}.
@@ -5756,7 +5592,29 @@ OpenType fonts. Gave bad results in my brief testing.
\item \mstopt{fouriervec}: provides a \cs{fouriervec} command. The user can then
add in the preamble \cs{let}\cs{vec}$=$\cs{fouriervec}. There is also
always available a ``poor man'' vec accent \cs{pmvec} for upright letters.
- \end{enumerate}
+\item \mstopt{everymath}:\RLNote{new:}{\mstrelease{1.4}} this option tells
+ \mst to employ as in the \mstrelease{1.3} releases the
+ \cs{everymath}/\cs{everydisplay} registers to store certain actions to be
+ executed at each entrance into math mode. The main change with
+ \mstrelease{1.4} is that mathcode changes done by user (or possibly via
+ language changes in a multilingual \ctanpkg{babel} context) in the document
+ body, and which apply to those characters which \mst used to handle as part of
+ \cs{everymath}/\cs{everydisplay}, will now have an effect, whereas with
+ earlier releases or this one
+ with the §everymath§ option, they may get overruled by \mst. Use
+ §everymath§ for backward compatibility if needed (and \emph{only} if needed).
+ Notice though that regarding ascii letters, there is no return to the
+ pre-\mstrelease{1.4}: they will not acquire their mathcode active status only
+ at each entrance into math mode, even with this option,
+ but once and for all at package loading time, if not §subdued§, or when using
+ §\MTversion§ to enter a non-§subdued§ math version.
+
+ Please report breakages due to the \mstrelease{1.4} release, which made it
+ necessary for you to use this option §everymath§ as workaround.
+
+ The option is destined to be removed at next major release and it will warn
+ the user about this.
+\end{enumerate}
Thanks to Kevin~\textsc{Klement}, Tariq~\textsc{Perwez}
and Ricard~\textsc{Torres} for sending bug reports and feature requests when
@@ -5780,6 +5638,7 @@ Numerous examples will be found there:\\
\label{sec:changelog}
\begingroup
+\hyphenation{Lua-La-TeX}
\def\MacroFont{\footnotesize\normalfont}
% utilisé par verbatim en classe scrdoc (ou plutôt shortvrb)
@@ -5817,16 +5676,27 @@ Numerous examples will be found there:\\
\lccode`\~`1
\lowercase{\endgroup\def~}{\ifvmode\medskip\expandafter\@DTXLOGhelper\fi 1}
+% 2024/07/10 hypertargets pour \mstrelease (importé de etoc, et j'ai déjà ici
+% toute une infrastructure rendant le truc trivial avec un fol 1 actif). Par
+% contre j'ai fait une modification s/#1\[/#1 \[/ car le #1 avant se terminait
+% par un espace.\]\]
+% Et attention au detokenize...
+% Il y a juste un problème avec le cas "1.15f and 1.15g".
\begingroup
\catcode`\| 0
\catcode`\\ 12
-|long|gdef|@DTXLOGhelper #1 ----#2|par{|@@DTXLOGhelper #1\[\]|par}
-|long|gdef|@@DTXLOGhelper #1\[#2\]#3|par%
- {|textbf{#1}% le #1 ici contient un espace
+% Je réduis à --- ici.
+|long|gdef|@DTXLOGhelper #1 ---#2|par{|@@DTXLOGhelper #1 \[\]|par}
+|long|gdef|@@DTXLOGhelper #1 \[#2\]#3|par%
+ {|hypertarget{|detokenize|expandafter{|fixonexv#1 and|relax}}{|textbf{#1}} %
|ifx|relax #2|relax|else [#2]|fi
|par|nopagebreak}
|endgroup
+% uniquement pour s'occuper de "1.15f and 1.15g" et en profitant du fait qu'il
+% n'y a de référence à 1.15g nulle part.
+\def\fixonexv#1 and#2\relax{#1}
+
\catcode`-=\active
\def-{%
\catcode`M\active
@@ -5869,7 +5739,7 @@ Numerous examples will be found there:\\
\StopEventually{\end{document}\endinput}
\cleardoublepage
-\newgeometry{hmarginratio=3:2}
+\newgeometry{hmarginratio=2:1}
\small
\section{Implementation}
@@ -5884,27 +5754,44 @@ Numerous examples will be found there:\\
%
%</dtx>
%<*package>
-% The usual catcode regime for letters and digits is assumed and some characters
-% such as |*|, |`|, |"|, |=| are supposed to be of catcode other at the time of loading
-% of \mst. The source of \mst takes precautions for some other characters such
-% as the right quote |'|, which may thus be active with no harm at the time of
-% loading. By the way, I think \LaTeX2e should have provided to authors a
+% The comments are a kind of palimpsest. Indeed they are not destined to the
+% reader but to the author: when coming back to the source code perhaps years
+% after having last looked at it, all bits of past information even if
+% obsolete are useful. Not only comments but perhaps also some ancient parts
+% of the code itself are a bit strange (the author hardly new any \LaTeX{} at
+% that time).
+%
+% For about the same reason, there may be some long macro names which do not
+% fit in the margins and that one sees only partially. The author sometimes
+% has used a workaround to hyphenate, but not systematically. Life is
+% time-limited. At \mstrelease{1.4} large chunks of code have been re-ordered
+% but the global architecture is still somewhat of a mess and doing some such
+% large diffs makes it sometimes difficult to follow small bits of code across
+% commit history, so this is done reluctantly.
+%
+% The usual catcode regime for letters and digits is assumed and some
+% characters such as |*|, |`|, |"|, |=| are supposed to be of catcode other at
+% the time of loading of \mst. The source of \mst takes precautions for some
+% other characters such as the right quote |'|, which may thus be active with
+% no harm at the time of loading (note added |2024/07/16|: very hard to
+% understand why I was so paranoid, but I have kept this annoying constraint).
+%
+% By the way, I think \LaTeX2e should have provided to authors a
% standard macro to be used at the beginning of a style file to make sure the
% catcodes are standard. Shorthands created by Babel should be mostly no problem
% as Babel does the activation only at the |\begin{document}|.
%
-% The comments have been accumulating through successive versions with only
-% partial efforts to achieve some sort of coherence; as a result some are a
-% bit strange or obsolete to various degrees. And the similar remark
-% applies to some ancient parts of the code itself!
-%
-% Should I require |2005/12/01| \LaTeX? (not sure about the month).
+% \mstrelease{1.4} removes a few code branches still there for support to
+% old \LaTeX{} and requires \LaTeX{} |2020-02-02| (which made |\{| and |\}|
+% \cs{protected}; earlier release |2019-10-01| had math macros such as the
+% math accents and \cs{hbar} robust and so far we kept supporting both new and
+% old contexts).
% \begin{macrocode}
-\NeedsTeXFormat{LaTeX2e}
+\NeedsTeXFormat{LaTeX2e}[2020/02/02]
\ProvidesPackage {mathastext}
- [2023/12/29 v1.3zb Use the text font in math mode (JFB)]
+ [2024/07/27 v1.4b Use the text font in math mode (JFB)]
% \end{macrocode}
-% |1.3zb| avoids writing \mst info messages also to console output, only log file.
+% \mstrelease{1.3zb} avoids writing \mst info messages also to console output, only log file.
% Make prefix occupy 20 not 25 characters for alignment with \texttt{LaTeX Font Info},
% as the latter often issues info messages. For similar reason the usages of
% \cs{PackageInfo} will be done with empty lines above and below for better visual
@@ -5915,16 +5802,9 @@ Numerous examples will be found there:\\
\immediate\write\m@ne{}
\PackageInfo{mathastext}{Starting the math mode configuration\@gobble}
% \end{macrocode}
-% \LaTeX{} |2019-10-01| release has made robust math macros such as the math
-% accents and \cs{hbar}.
-% \begin{macrocode}
-\newif\ifmst@robust@obsessed@LaTeX@era
-\@ifl@t@r\fmtversion{2019/10/01}{\mst@robust@obsessed@LaTeX@eratrue}{}
-\edef\mst@robustifyingspace{\ifmst@robust@obsessed@LaTeX@era\space\fi}
-% \end{macrocode}
% Testing for \XeTeX\ and \LuaLaTeX.
%
-% |1.3g 2015/10/15|: update for the naming of primitives, the situation has
+% \mstrelease{1.3g} |2015/10/15|: update for the naming of primitives, the situation has
% evolved both on \XeTeX\ side and on the \LuaLaTeX\ side (LaTeX base
% |2015/10/01|): I was told "U" named math primitives were always available
% for \LuaLaTeX. For \XeTeX, the XeTeX prefix got replaced by U prefix with
@@ -5967,10 +5847,37 @@ Numerous examples will be found there:\\
\ifmst@LuaTeX\mst@XeOrLuatrue\fi
\ifmst@XeTeX \mst@XeOrLuatrue\fi
% \end{macrocode}
-% |1.2|: all inner macros of \mst now starts with |\mst@| for a cleaner
+% \mstrelease{1.4}. I only checked this is correct with TL2024.
+% The macro will be used with |#1| a catcode 11 or 12 token or a one character
+% control sequence such as |\#|.
+% \begin{macrocode}
+\ifmst@XeTeX
+ \def\mst@OnlyIfNotMathActive#1{%
+ \ifnum\mst@Umathcodenum`#1="1FFFFF
+ \expandafter\@gobble
+ \else\expandafter\@firstofone
+ \fi
+ }
+\else\ifmst@LuaTeX
+ \def\mst@OnlyIfNotMathActive#1{%
+ \ifnum\mst@Umathcodenum`#1="1000000
+ \expandafter\@gobble
+ \else\expandafter\@firstofone
+ \fi
+ }
+\else
+ \def\mst@OnlyIfNotMathActive#1{%
+ \ifnum\mathcode`#1="8000
+ \expandafter\@gobble
+ \else\expandafter\@firstofone
+ \fi
+ }
+\fi\fi
+% \end{macrocode}
+% \mstrelease{1.2}: all inner macros of \mst now starts with |\mst@| for a cleaner
% name-space.
%
-% |1.3l 2016/01/29|: hmmm... at this late stage where nobody would expect me
+% \mstrelease{1.3l} |2016/01/29|: hmmm... at this late stage where nobody would expect me
% to still look at the code, I have found at least two macros which still
% didn't: \cs{do@the@endashstuff} and \cs{do@the@emdashstuff}.
%
@@ -5980,16 +5887,16 @@ Numerous examples will be found there:\\
% engines for a while, hence it is not hard to adapt to the replacement of
% |EU1/EU2| by |TU|, maintaining compatibility with legacy installations.
%
+% At \mstrelease{1.4} the support for obsolete |EU1| and |EU2| font encodings
+% has been removed.
+%
% \begin{macro}{\mst@OneifUniEnc}
% The \cs{mst@OneifUniEnc} is expandable but must be used after
% having set \cs{mst@tmp@enc}...
% \begin{macrocode}
\def\mst@oti{OT1}
-\def\mst@eui{EU1}\def\mst@euii{EU2}\def\mst@tu{TU}
-\def\mst@OneifUniEnc {%
- \ifx \mst@tmp@enc\mst@tu 1\else
- \ifx \mst@tmp@enc\mst@eui 1\else
- \ifx \mst@tmp@enc\mst@euii 1\else 0\fi\fi\fi }
+\def\mst@tu{TU}
+\def\mst@OneifUniEnc{\ifx\mst@tmp@enc\mst@tu1\else0\fi}
\newif\ifmst@goahead
\newif\ifmst@abort
% \end{macrocode}
@@ -6006,9 +5913,13 @@ Numerous examples will be found there:\\
\def\mst@enc{\encodingdefault}
\def\mst@fam{\familydefault}
\def\mst@ser{\seriesdefault}
- \def\mst@opsh{\shapedefault} %% will be default shape for operator names
+% \end{macrocode}
+% \noindent\cs{mst@opsh} will hold default shape for operator names.\newline
+% \cs{mst@ltsh} will hold default shape for letters.
+% \begin{macrocode}
+ \def\mst@opsh{\shapedefault}
\def\mst@bold{\bfdefault}
- \def\mst@ltsh{\shapedefault} %% will be default shape for letters
+ \def\mst@ltsh{\shapedefault}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -6017,7 +5928,7 @@ Numerous examples will be found there:\\
% \end{macro}
% \end{macro}
% \begin{macro}{\mst@greekfont}
-% |1.15c|: for use by the LGRgreek and selfGreek options. Defined as
+% \mstrelease{1.15c}: for use by the LGRgreek and selfGreek options. Defined as
% an \cs{edef} in order to be able to set-up once and for all the
% Greek at the time of \cs{usepackage}. Modifiable in the preamble
% via \cs{MTgreekfont}\marg{font\_name}\cs{Mathastext}.
@@ -6026,20 +5937,24 @@ Numerous examples will be found there:\\
% \end{macrocode}
% \end{macro}
% \begin{macro}{Package options}
-% |2011/03/09|: |1.13| introduces the option LGRgreek and systematic use
+% |2011/03/09|: \mstrelease{1.13} introduces the option LGRgreek and systematic use
% of \cs{if...} conditionals, for better readability (by myself) of
% the code.
%
-% |1.3x| of |2022/11/03| adds |ncccomma|, |binarysemicolon| and
+% \mstrelease{1.3y} of |2022/11/03| adds |ncccomma|, |binarysemicolon| and
% |frenchmath*| options.
%
-% |1.3za| adds |LGRgreek+| and |LGRgreeks+|.
+% \mstrelease{1.3za} adds |LGRgreek+| and |LGRgreeks+|.
%
-% |1.3zb| adds |decimalcomma| and modifies |frenchmath*| to use it. And
-% provides |frenchmath+| as an alias to former |frenchmath*|. Consecutive
-% to the change at |2.7| of \ctanpkg{frenchmath} which replaced
+% \mstrelease{1.3zb} adds |decimalcomma| and modifies |frenchmath*| to use
+% it. And provides |frenchmath+| as an alias to former |frenchmath*|.
+% Consecutive to the change at |v2.7| of \ctanpkg{frenchmath} which replaced
% \ctanpkg{ncccomma} by \ctanpkg{decimalcomma} and broke the compatibility
% recipe explained in \autoref{ssec:frenchmath}.
+%
+% \mstrelease{1.4} adds options |everymath| and |activedigits|.
+%
+% \mstrelease{1.4b} adds |noletters|.
% \begin{macrocode}
\newif\ifmst@italic
\newif\ifmst@frenchmath
@@ -6082,25 +5997,32 @@ Numerous examples will be found there:\\
\newif\ifmst@noexclam
\DeclareOption{noexclam}{\mst@noexclamtrue}
\newif\ifmst@asterisk
- \DeclareOption{noasterisk}{\PackageWarningNoLine{mathastext}
- {option `noasterisk\string' is deprecated.^^J\space\space\space
- Check the documentation}}
\DeclareOption{asterisk}{\mst@asterisktrue}
\newif\ifmst@nospecials
\DeclareOption{nospecials}{\mst@nospecialstrue}
-\newif\ifmst@basic % 1.3 to avoid unnecessary patch of amsmath \newmcodes@
+\newif\ifmst@basic
\DeclareOption{basic}{\mst@basictrue
\ExecuteOptions{noparenthesis,nopunctuation,%
noplusnominus,noequal,noexclam,nospecials,nolessnomore}}
\newif\ifmst@nohbar
\DeclareOption{nohbar}{\mst@nohbartrue}
+% \end{macrocode}
+% \mstrelease{1.4} adds option |activedigits|.
+% \begin{macrocode}
+\newif\ifmst@activedigits
+ \DeclareOption{activedigits}{\mst@activedigitstrue}
\newif\ifmst@nodigits
\DeclareOption{nodigits}{\mst@nodigitstrue}
\newif\ifmst@defaultimath
\DeclareOption{defaultimath}{\mst@defaultimathtrue}
+% \end{macrocode}
+% \mstrelease{1.4b} adds option |noletters|.
+% \begin{macrocode}
+\newif\ifmst@noletters
+ \DeclareOption{noletters}{\mst@noletterstrue\ExecuteOptions{nohbar,defaultimath}}
\newif\ifmst@mathaccents
\DeclareOption{mathaccents}{\mst@mathaccentstrue}
-\newif\ifmst@unimathaccents % 1.3u
+\newif\ifmst@unimathaccents
\DeclareOption{unimathaccents}{\mst@mathaccentstrue\mst@unimathaccentstrue}
\newif\ifmst@needsymbol
\newif\ifmst@symboldelimiters
@@ -6108,7 +6030,7 @@ Numerous examples will be found there:\\
\newif\ifmst@symboldigits
\DeclareOption{symboldigits}{\mst@needsymboltrue\mst@symboldigitstrue}
\newif\ifmst@symbolgreek
-\newif\ifmst@customgreek %% new with 1.3d
+\newif\ifmst@customgreek
\DeclareOption{symbolgreek}{\mst@needsymboltrue\mst@symbolgreektrue
\mst@customgreektrue }
\newif\ifmst@symbolre
@@ -6144,13 +6066,13 @@ Numerous examples will be found there:\\
\DeclareOption{itGreek}{\def\mst@greek@select{1}}
\DeclareOption{upGreek}{\def\mst@greek@select{2}}
% \end{macrocode}
-% Starting with |1.15f| the meaning of the `defaultxx' options has changed. They
+% Starting with \mstrelease{1.15f} the meaning of the `defaultxx' options has changed. They
% now prevent |mathastext| from defining additional alphabets rather than
% prevent it from identifying the `mathxx' with the new `Mathxx'. The
% `Mathnormal' and `Mathrm' alphabet commands are always created as they are
% SymbolFontAlphabets.
%
-% This was again changed at |1.3za|. The additional alphabets are
+% This was again changed at \mstrelease{1.3za}. The additional alphabets are
% always declared, the options only prevent mapping the existing
% `mathxx' to the new `Mathxx'. This may be breaking change if
% people used these options because they had a need for the
@@ -6169,7 +6091,7 @@ Numerous examples will be found there:\\
\newif\ifmst@defaulttt
\DeclareOption{defaulttt}{\mst@defaulttttrue}
% \end{macrocode}
-% Here and elsewhere |1.3za| has removed an
+% Here and elsewhere \mstrelease{1.3za} has removed an
% \cs{ifmst@nonormalbold} conditional.
% \begin{macrocode}
\DeclareOption{defaultalphabets}{\ExecuteOptions{defaultnormal,defaultrm,%
@@ -6185,14 +6107,25 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\newif\ifmst@fouriervec
\DeclareOption{fouriervec}{\mst@fouriervectrue}
% \end{macrocode}
-% |1.15|: the subdued option.
+% \mstrelease{1.15}: the |subdued| option.
% \begin{macrocode}
\newif\ifmst@subdued
\DeclareOption{subdued}{\mst@subduedtrue}
% \end{macrocode}
-% |1.3q|: the unicode option. Thanks to Tobias~\textsc{Brink} for suggesting its
-% incorporation. The parsing of |\CurrentOption| does not seek any robustness,
-% it just does its job if the option is used correctly.
+% \mstrelease{1.4}: the |everymath| option.
+% \begin{macrocode}
+\newif\ifmst@everymath
+ \DeclareOption{everymath}{\mst@everymathtrue
+\PackageWarningNoLine{mathastext}{%
+ `everymath\string' will be removed at next major release.\MessageBreak
+ Please report to the author the circumstances\MessageBreak
+ which mandated its use in the present document}%
+}
+% \end{macrocode}
+% \mstrelease{1.3q}: the |unicode| option. Thanks to Tobias~\textsc{Brink}
+% for suggesting its incorporation. The parsing of \cs{CurrentOption} does
+% not seek any robustness, it just does its job if the option is used
+% correctly.
% \begin{macrocode}
\def\mst@unicodeminus {2013}
\def\mst@checkoption #1unicodeminus#2\mst@#3\mst@@
@@ -6216,7 +6149,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
%
% This broke usage of \cs{Mathastext} macro in preamble.
%
-% |1.3w| works around this via \cs{mst@DeclareMathAccent}. And other
+% \mstrelease{1.3w} works around this via \cs{mst@DeclareMathAccent}. And other
% changes were made in \mst code to cope with these complications around
% robustness.
% \begin{macrocode}
@@ -6226,13 +6159,36 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\DeclareMathAccent{#1}}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\mst@normalversionname}
+% \begin{macro}{\mst@boldversionname}
% Helper macros to test math version names. User is not allowed to redefine
% via \cs{Mathastext} with optional argument or via \cs{MTDeclareVersion} the
-% |normal| and |bold| math versions! Added at |1.3w|, about 7 years late.
+% |normal| and |bold| math versions. Added at \mstrelease{1.3w}, about 7 years late.
% \begin{macrocode}
\def\mst@normalversionname{normal}%
\def\mst@boldversionname{bold}%
% \end{macrocode}
+% \end{macro}\end{macro}
+% \begin{macro}{\mst@OnlyIfNotSubdued}
+% \mstrelease{1.3u} adds this check that we are not in a subdued normal or
+% bold math version. We do not push the |#1| out of the TeX conditionals,
+% and anyhow there was no real need for expandable coding.
+% \begin{macrocode}
+\def\mst@OnlyIfNotSubdued#1{%
+ \ifmst@subdued
+ \ifx\math@version\mst@normalversionname
+ \else
+ \ifx\math@version\mst@boldversionname
+ \else
+ #1%
+ \fi
+ \fi
+ \else
+ #1%
+ \fi
+}%
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\exists} \begin{macro}{\mst@exists@skip}
% \begin{macro}{\forall} \begin{macro}{\mst@forall@skip}
% \begin{macro}{\MTnormalexists}
@@ -6240,7 +6196,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \begin{macro}{\MTnormalforall}
% \begin{macro}{\MTforalldoesskip }
%
-% |1.15e| |2012/10/21|: math skip/glue \emph{after} \cs{exists} and
+% \mstrelease{1.15e} |2012/10/21|: math skip/glue \emph{after} \cs{exists} and
% \cs{forall}, this is useful with upright letters in math mode.
% Each math version has its own user defined values for the skips,
% stored as macros. The redefinitions of $\exists$ and $\forall$ are
@@ -6249,32 +6205,32 @@ defaultbf,defaultit,defaultsf,defaulttt}}
%
% The subdued option (later and only for the normal and bold math
% version) and the italic option (here) set to zero the package
-% default skips. With |1.2| the skips can be modified on the fly in
+% default skips. With \mstrelease{1.2} the skips can be modified on the fly in
% the document, they are not necessarily set in the preamble once
% and for all for each math version.
%
-% |1.3j| adds \cs{MTnormalexists}, \cs{MTexistsdoesskip},
+% \mstrelease{1.3j} adds \cs{MTnormalexists}, \cs{MTexistsdoesskip},
% \cs{MTnormalforall}, \cs{MTforalldoesskip}.
%
-% Earlier to |1.3j|, |\let\mst@exists@original\exists| was done at End of
+% Earlier to \mstrelease{1.3j}, |\let\mst@exists@original\exists| was done at End of
% Package, now it is done at Begin Document, and same for |\forall|. We
% pay attention that use of \cs{MTnormalexists} etc... inside the
% preamble does not create self-let's.
%
% Also |subdued| mode will do \cs{MTnormalexists}, \cs{MTnormalforall}
-% (earlier than |1.3j|, it only set the muskips to |0mu|.) Same when
+% (earlier than \mstrelease{1.3j}, it only set the muskips to |0mu|.) Same when
% using |\MTversion{normal}|, if |subdued|.
%
% For some (random, legacy) reason, the handling of $\exists$ and
% $\forall$ is part of the things
% not included inside |\everymath/\everydisplay|.
%
-% |1.3v| The \mst-defined \cs{exists} and \cs{forall} are created
+% \mstrelease{1.3v} The \mst-defined \cs{exists} and \cs{forall} are created
% \cs{protected}. We feel this matches better with their default
% definition as \cs{mathchardef} tokens than dealing with \LaTeX2e robust
% macros. Besides, the coding is simpler.
% \begin{macrocode}
-\newmuskip\mst@exists@muskip %% v 1.15e
+\newmuskip\mst@exists@muskip
\newmuskip\mst@forall@muskip
\def\mst@exists@skip{1mu}
\def\mst@forall@skip{.6667mu}
@@ -6318,13 +6274,13 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \begin{macro}{\MTnormalprime}
% \begin{macro}{\MTprimedoesskip}
%
-% |1.2| |2012/12/17|: math skip/glue \emph{before} the \cs{prime}
+% \mstrelease{1.2} |2012/12/17|: math skip/glue \emph{before} the \cs{prime}
% glyph. This is useful with the default CM glyph and upright letters
% (in contrast the prime from |txfonts| works fine with upright
% letters). For this we replace the \LaTeX{} kernel \cs{active@math@prime}
% with our own skip-enhanced version \cs{mst@active@math@prime}.
%
-% |1.2b| |2012/12/31|: doing\\
+% \mstrelease{1.2b} |2012/12/31|: doing\\
% \null\hspace{1cm}|{\catcode`\'=\active \global\let'\mst@active@math@prime}|\\
% is awfully wrong when the right quote is made active at begin document by
% some other package (as happens with |babel| for some languages). So \mst
@@ -6340,47 +6296,102 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% does its job only as part of the \cs{everymath} and
% \cs{everydisplay} token lists.
%
-% |1.2e| being paranoid, we take precautions against a possibly
+% \mstrelease{1.2e} being paranoid, we take precautions against a possibly
% catcode active right quote at
% the time of loading mathastext.
%
-% |1.3i| adds \cs{MTactiveprime}.
+% \mstrelease{1.3i} adds \cs{MTactiveprime}.
%
-% |1.3j| renames it to \cs{MTprimedoesskip}. Besides, it makes use in the
-% preamble of \cs{MTnormalprime} or \cs{MTprimedoesskip}.
+% \mstrelease{1.3j} renames it to \cs{MTprimedoesskip}. Besides, it makes use in the
+% preamble of \cs{MTnormalprime} or \cs{MTprimedoesskip}.
+%
+% \mstrelease{1.4} adds the support for the new ``non-everymath''
+% implementation, which has to satisfy to very different constraints.
+%
+% The \cs{MTprimedoesskip} is not a |no-op| in |subdued| math version.
+% This is legacy situation, not changed at \mstrelease{1.4}.
+%
% \begin{macrocode}
-\newmuskip\mst@prime@muskip %% v 1.2
+\newmuskip\mst@prime@muskip
\def\mst@prime@skip{.5mu}
\ifmst@italic\ifmst@frenchmath\else\def\mst@prime@skip{0mu}\fi\fi
+% \end{macrocode}
+% Shouldn't I have rather hacked \cs{prim@s}? (answer: perhaps related to
+% Babel see a comment above).\par
+% \noindent
+% TODO: clarify why I used \cs{sp} not |^| in
+% \cs{mst@active@math@prime} in 2012/2013.\newline
+% TODO: clarify why I am paranoid regarding the |'| catcode here.
+%
+% The |everymath| branch was initially superficially refactored at
+% \mstrelease{1.4}, but unfortunately as \cs{mst@mathactivate} had been
+% modified to not handle mathematically active characters, this meant that the
+% \mst feature of extra math skip was lost under the |everymath| option, due to
+% an oversight by the author. For this among other reasons having mainly to
+% do with code comments we did \mstrelease{1.4a}.
+%
+% At \mstrelease{1.4} we can not go via \cs{mst@mathactivate} (defined further
+% down in the code) which filters out the already mathematically active
+% characters.
+%
+% Why am I paranoid here about |'| catcode at package loading time? (this
+% looks ridiculous...).
+% \begin{macrocode}
+\def\mst@tmp#1{%
+\def\mst@mathactivateprime{%
+ \ifnum\catcode`#1=\active
+ \@ifundefined{active@char#1}
+ {}
+ {\mst@do@activecase #1{}{\mst@active@math@prime}}%
+ \else
+ \mst@@mathactivate #1{}{\mst@active@math@prime}%
+ \fi
+}%
+% \end{macrocode}
+% The ``undo'' is needed at \mstrelease{1.4} (but not if |everymath|).
+% \begin{macrocode}
+\def\mst@undo@mathactivateprime{\mst@mathdeactivate#1{"8000}}%
+}\expandafter\mst@tmp\string'
\def\mst@active@math@prime{\sp\bgroup\mskip\mst@prime@muskip\prim@s}
-{\catcode`\'=12
-\gdef\mst@@modifyprime{\mst@mathactivate'{}\mst@active@math@prime}}
-\newcommand*\MTnormalprime {\let\mst@modifyprime\@empty }
-\newcommand*\MTprimedoesskip {\let\mst@modifyprime\mst@@modifyprime}
-\ifmst@subdued
- \MTnormalprime
+\ifmst@everymath
+ \newcommand*\MTnormalprime {\let\mst@modifyprime\@empty}
+ \newcommand*\MTprimedoesskip{\let\mst@modifyprime\mst@mathactivateprime}%
+ \AtBeginDocument{%
+ \everymath\expandafter
+ {\the\everymath \mst@modifyprime \MTnormalprime}%
+ \everydisplay\expandafter
+ {\the\everydisplay \mst@modifyprime \MTnormalprime}%
+% \end{macrocode}
+% MEMO: |subdued| case will do its own \cs{MTnormalprime} at
+% |\begin{document}| later as part of \cs{MTeverymathoff}.
+% \begin{macrocode}
+ \MTprimedoesskip
+ }
\else
- \MTprimedoesskip
+% \end{macrocode}
+% \mstrelease{1.4} must do things a bit differently.
+% \begin{macrocode}
+ \newcommand*\MTnormalprime {\mst@undo@mathactivateprime}
+ \newcommand*\MTprimedoesskip{\mst@mathactivateprime}
+% \end{macrocode}
+% MEMO: |subdued| case will do its own \cs{MTnormalprime} at
+% |\begin{document}| later as part of \cs{MTeverymathoff}.
+% \begin{macrocode}
+ \AtBeginDocument{\MTprimedoesskip}
\fi
-\AtBeginDocument{%
- \everymath\expandafter
- {\the\everymath \mst@modifyprime \MTnormalprime}%
- \everydisplay\expandafter
- {\the\everydisplay \mst@modifyprime \MTnormalprime}%
-}
% \end{macrocode}
% \end{macro}\end{macro}\end{macro}\end{macro}\end{macro}
% \begin{macro}{\MTexistsskip}
% \begin{macro}{\MTforallskip}
% \begin{macro}{\MTprimeskip}
-% |1.15e|: These user macros set up the amount of muglue after
+% \mstrelease{1.15e}: These user macros set up the amount of muglue after
% \cs{exists} or \cs{forall}. The normal and
% bold math versions inherit the same skips; these skips are set to
% zero in case of the subdued, or the italic option. Each command
% \cs{Mathastext}\oarg{version\_name} stores the current values in
% the definition of the math version.
%
-% |1.2|: \cs{MTprimeskip} added, the silly \cs{@onlypreamble} are removed
+% \mstrelease{1.2}: \cs{MTprimeskip} added, the silly \cs{@onlypreamble} are removed
% and the macros are modified to have immediate effect in the document,
% independently of their possible use in the preamble for the math
% versions to store values.
@@ -6433,35 +6444,49 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% mathastext font (both in the current math version). If option
% |noparenthesis| was used, we leave everything untouched.
%
-% In |1.3a|, |2013/09/04|, the modification is done only at the time of
+% In \mstrelease{1.3a}, |2013/09/04|, the modification is done only at the time of
% \cs{MTnonlettersobeymathxx}. It is canceled by
% \cs{MTnonlettersdonotobeymathxx}. So the code has been moved to these
% macros and here we just store at the begin document the then meaning of
% \cs{resetMathstrut@}, and check also if \cs{MTnonlettersobeymathxx} has
% been invoked in the preamble.
%
-% |1.3f| |2015/09/12| issues only an Info message not a Warning, as I am
+% \mstrelease{1.3f} |2015/09/12| issues only an Info message not a Warning, as I am
% becoming aware from another context (etoc) that Warnings are stressful to
% users, in some integrated environments for editing and compiling \LaTeX{}
% source files.
+%
+% \mstrelease{1.4} adds here an \cs{AtEndOfPackage}. As this must be
+% executed (if not in the legacy |everymath| context) after the
+% redefinition of \cs{MTnonlettersobeymathxx} which happens at begin
+% document.
% \begin{macrocode}
\ifmst@noparen\else
-\AtBeginDocument{%
- \@ifundefined{resetMathstrut@}{% nothing to do, no amsmath
- }{% amsmath loaded, and possibly patched by things such as lualatex-math
- \let\mst@savedresetMathstrut@\resetMathstrut@
-% \PackageInfo{mathastext}{current `at begin document\string' meaning of
-% amsmath\MessageBreak
-% \string\resetMathstrut@\space preserved for
-% future use\@gobble}%
- \ifx\mst@the\the % means that \MTnonlettersobeymathxx was used in preamble
- \let\mst@the\@gobble\MTnonlettersobeymathxx
- \fi}}
+\AtEndOfPackage{%
+ \AtBeginDocument{%
+ \@ifundefined{resetMathstrut@}
+ {}%
+ {%
+ \let\mst@savedresetMathstrut@\resetMathstrut@
+% \end{macrocode}
+% The |\ifx\mst@the\the| is true iff \cs{MTnonlettersobeymathxx} was used in preamble
+% (last compared to \cs{MTnonlettersdonotobeymathxx}).
+% Setting \cs{mst@the} to \cs{@gobble} here wiil cause \cs{MTnonlettersobeymathxx}
+% to indeed modify \cs{resetMathstrut@} (and it resets \cs{mst@the} to \cs{the} for
+% its behavior in \cs{everymath}).
+% \begin{macrocode}
+ \ifx\mst@the\the
+ \let\mst@the\@gobble
+ \MTnonlettersobeymathxx
+ \fi
+ }%
+ }%
+}%
\fi
% \end{macrocode}
% \end{macro}
%
-% |1.2| |2012/12/20| does some rather daring \emph{math} activation of
+% \mstrelease{1.2} |2012/12/20| does some rather daring \emph{math} activation of
% \verb$; , : ! ? + - = < > ( ) [ ]$ in
% math mode to achieve something I wanted to do since a long time: overcome
% the mutually excluding relation between the variable-family concept and
@@ -6476,7 +6501,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% the entrance of the math mode are discussed later),\\
% \null\hspace{1cm}\fbox{but the concerned characters will now expand in math
% mode to \emph{two} tokens.}\\
-% |1.2c| |2012/12/31|: hence, this current
+% \mstrelease{1.2c} |2012/12/31|: hence, this current
% implementation puts constraints on the input: |$x^?$| or |$x\mathrel?y$|
% now create errors. They must be input
% |$x^{?}$|, respectively |$x\mathrel{?}y$|.\\
@@ -6488,8 +6513,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% should be used instead) but it can be activated for them too.
%
%
-% \begin{macro}{\mst@mathactivate}
-% |1.2b| |2012/12/30|: there were bad oversights in the |1.2| code
+% \mstrelease{1.2b} |2012/12/30|: there were bad oversights in the \mstrelease{1.2} code
% for \cs{mst@mathactivate} related to the possibility for some
% characters to have been made active (in the sense of the catcode)
% elsewhere (something which often is done by language definition
@@ -6503,7 +6527,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% |:| (assuming for the latter that things would have worked ok before
% the twiddling by \mst).
%
-% |1.2e| |2013/01/09|: alas |$\ref{eq:1}$| still was a problem.
+% \mstrelease{1.2e} |2013/01/09|: alas |$\ref{eq:1}$| still was a problem.
% Indeed in that case the \mst prefix had no means to know it was
% inside a \cs{ref} so it made the character expand to its \mst
% redefinition, which is not acceptable inside a
@@ -6566,13 +6590,13 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% the mathcode to 32768!!}, rather it makes \emph{sure} the character
% is not mathematically active.
%
-% As |1.2e| is a bit paranoid it takes precautions against
+% As \mstrelease{1.2e} is a bit paranoid it takes precautions against
% the possibility of characters it treats being active at
% the time of its loading. Excepted from the scope of the
% paranoia are the latin letters (that would be crazy!) and
% also |*|, |"| and the left quote |`|.
%
-% |1.2f| |2013/01/21| with earlier versions (*) it was important not
+% \mstrelease{1.2f} |2013/01/21| with earlier versions (*) it was important not
% to do twice the business of \cs{mst@mathactivate} (think
% |$\hbox{$?$}$|), so I used (this was a bit wasteful) some sort of
% boolean macro for each character. But now that there are the
@@ -6590,57 +6614,274 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% |\label| or |\ref|. So testing for active characters should be done
% always... many things should be done always... I leave as is.
%
-% |1.3i| |2016/01/06| removes a spurious end of line space in
+% \mstrelease{1.3i} |2016/01/06| removes a spurious end of line space in
% \cs{mst@mathactivate} (did not show as anyhow done in math mode).
%
-% \begin{macro}{\mst@do@az}
-% \begin{macro}{\mst@do@AZ}
-% \begin{macro}{\mst@addtodo@az}
-% \begin{macro}{\mst@addtodo@AZ}
-% \begin{macro}{\mst@the}
-% |1.2b| |2012/12/28| now that we understand the great advantages of |"8000|
-% we do it also for all letters a-z and A-Z to insert automatically the
-% italic corrections. See the \hyperref[sec:ic]{discussion} in the user
-% manual. Ironically I wrote the code initially for the |italic| option only
-% to realize later it was more suitable to using an \emph{upright} text font
-% in math mode! So this mathematical activation of the letters is not done if
-% the font shape is detected to be |it| or |sl|; to bypass this the command
-% \cs{MTicinmath} is provided.
-%
-% |1.2e| |2013/01/10| corrects a bad oversight of |1.2b| in
-% \cs{mst@mathactivate} which made the reproduction of the user manual
-% illustrations with |$f_i^i$| impossible. As \cs{mst@mathactivate} was
-% originally used also to get the non-letters obey math alphabet while
-% maintaining the \TeX{} spacings, it added no extra braces. The braces
-% should however be added for expansion of math active letters, in order of
-% things like |x^y| to work as expected. (the group braces do not prevent
-% ligatures when the letters are arguments to the math alphabet commands,
-% the added macros \cs{mst@itcorr} and \cs{mst@before<letter>} expanding to
-% nothing).
+% \mstrelease{1.4} has significantly refactored the coding, there were
+% simplication from a changed way to use \cs{mst@mathactivate} for letters
+% and added branches to accomodate the renouncement to \cs{everymath}.
+% \begin{macro}{\mst@do@activecase}
+% Called by \cs{mst@mathactivate} if |#1| is catcode active.
+%
+% Check if token activation originates apparently into \ctanpkg{babel}:
+% \begin{itemize}[nosep]
+% \item if NO, nothing is done. The active meaning of |#1| is not modified.
+% \item if YES, we hook into \ctanpkg{babel} associated macros so
+% that in math mode the catcode active token does what \mst expects it to
+% do. Its \cs{mathcode} is set to the
+% one of the associated \cs{mathalpha} symbol as declared by \mst, except
+% for asterisk and right tick which simply use their ascii number as mathcode.
+% \end{itemize}
+%
+% In the case of \ctanpkg{babel}-spanish which has a catcode active right
+% tick, resetting its mathcode has the advantage to reveal in output the case
+% of a faulty input using the curly right tick U+8217 which one can get easily
+% from copy paste, for example from the |babel-spanish.pdf| file.
+%
+% And in general it is dangerous to have a character both catcode active and
+% mathcode active.
+%
+% Some auxiliaries.
+% \begin{macrocode}
+\def\mst@magic@v #1#2#3#4#5{#1#3#4}
+\def\mst@magic@vi #1#2#3#4#5#6{#1#2#4#5}
+\def\mst@fork{\ifmmode\mst@magic@v\fi\@thirdofthree}
+\def\mst@safefork{\ifmmode\if@safe@actives\else\mst@magic@vi\fi\fi\@thirdofthree}
+% \end{macrocode}
+% Some refactoring (and streamlining) at \mstrelease{1.4} here.
+% \begin{footnotesize}
+% There was at some point in the case of a Babel-active token a special
+% hanlding for |#1| to use \cs{MTmathcharletter}|#1| (and event for
+% digits!). But this is almost impossible to arise in practice:
+% \begin{itemize}[nosep]
+% \item Babel commands to set up a shorthand are preamble only (they use
+% \cs{AtBeginDocument}),
+% \item A shorthand is made active at begin document, and we don't want that
+% for a letter!
+% \item Activation is recorded as an instruction in the |.aux| file which
+% breaks it almost surely (except perhaps for letter |Z| or such not
+% likely to appear in macro names in the |.aux| file).
+% \item Even if we somehow hack against that (which I did to test) a more
+% subtle problem arises that Babel updates \cs{nfss@catcodes}, so that the
+% latter will want to make (e.g.) |a| of catcode 12! This causes breakage
+% very easily at the time of \cs{process@table} almost as easily as with
+% the |a| set to be an active character...
+% \end{itemize}
+%
+%^^A In revisiting and
+%^^A improving the coding here (following up on a simplification of
+%^^A \cs{mst@mathactivate} itself, I discovered a bug of earlier releases: in
+%^^A this fictitious "letter made active by Babel" branch the insertion of mu
+%^^A glue around the letter was lost, only the italic correction was kept in the
+%^^A modified meaning of Babel active letter in math mode. This bug was
+%^^A dissolved by the new way \cs{mst@mathactivate} is used by
+%^^A \cs{mst@DeclareMathLetter} and the ensuing simplifcation here. But in fact
+%^^A as summarized above this is purely fictitious code, which will never get
+%^^A executed in real life!
+%^^A As I am not of the repenting type, I also add at \mstrelease{1.4} a similar
+%^^A fictituous layer for catcode active digits...\par
+% \end{footnotesize}
+% |#1| here is a character token of catcode 11 or 12.
+% We do something only if the catcode activation appears to have been triggered
+% by \ctanpkg{babel}. The test has been moved earlier at \mstrelease{1.4}.
+% \begin{macrocode}
+\def\mst@do@activecase#1#2#3{%
+% \end{macrocode}
+% As letters and digits are impossible here, |#2| is either empty (which
+% happens only now for asterisk and right tick) or a single token (\cs{mathclose},
+% \cs{mathopen},... ). When |#2| is not empty, |#3| is always a mathchar
+% token. For safety we make sure then the mathcode is not active.
+%
+% The rationale is
+% to avoid context where people have both catcode and math active and use
+% |\string|. In the case of \ctanpkg{babel}-spanish with
+% |activeacute| option it allows to reveal more easily input errors using
+% curly right tick U+8217.
+%
+% Arguably I probably mainly wanted to do this if the character was found
+% catcode active but not a Babel shorthand. But it ended into the Babel
+% branch and the non-Babel branch for active catcode is to do nothing.
+%
+% |#2| is empty exactly for the case of the right tick and the asterisk.
+% In all other cases, then |#3| is a mathchar token.
+% \begin{macrocode}
+ \ifx\relax #2\relax\mathcode`#1=`#1\relax\else\mathcode`#1=#3\relax\fi
+% \end{macrocode}
+% Less \cs{expandafter}'s at \mstrelease{1.4}. Also, it is now required
+% to make sure:
+% \begin{itemize}[nosep]
+% \item not do it twice in succession (else infinite loop),
+% \item and undo it when deactivating.
+% \end{itemize}
+% This was easily done under legacy code (now only used under |everymath|
+% option, and only for non-letters) as it activated only when entering into
+% math mode.
+%
+% This is more annoying when activation happens in an uncontrolled
+% scope, and we handle this via a \cs{mst@hackedshorthand@<char>} flag.
+%
+% MEMO: the undoing is done in \cs{mst@mathdeactivate} which is invoked
+% only for those non-letters submitted to \cs{mst@mathactivate}.
+% \begin{macrocode}
+ \ifmst@everymath\else\@ifundefined{mst@hackedshorthand@#1}{\fi
+ \expandafter\let\csname mst@orig@user@active#1\expandafter\endcsname
+ \csname user@active#1\endcsname
+ \expandafter\let\csname mst@orig@normal@char#1\expandafter\endcsname
+ \csname normal@char#1\endcsname
+ \ifmst@everymath\else}{}\fi
+% \end{macrocode}
+% No more \cs{edef}'s at \mstrelease{1.4}. At this release, in letter case
+% |#3| is empty and |#2| is a single token which needs no extra brace
+% pair as this brace pair will come from its expansion.
+% We can use |{#2}{#3}| in all cases rather than either |{{#2#3}}{}| versus
+% |{#2}#3| depending on whether |#1| is letter or not as was done in the past.
+% Attention that |#2| and |#3| may each be empty.
+% \begin{macrocode}
+ \def\mst@tmp##1##2{\def##1{\mst@fork{#2}{#3}##2}}%
+ \expandafter\mst@tmp\csname user@active#1\expandafter\endcsname
+ \csname mst@orig@user@active#1\endcsname
+ \def\mst@tmp##1##2{\def##1{\mst@safefork{#2}{#3}##2}}%
+ \expandafter\mst@tmp\csname normal@char#1\expandafter\endcsname
+ \csname mst@orig@normal@char#1\endcsname
+ \ifmst@everymath
+ \else
+ \expandafter\let\csname mst@hackedshorthand@#1\endcsname\@empty
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\mst@@mathactivate}
+% \begin{macrocode}
+\begingroup
+ \catcode`\~=\active
+ \def\x{%
+\endgroup
+% \end{macrocode}
+% |##1| is always a token of catcode 11 or 12.
+% \begin{macrocode}
+\ifmst@everymath
+ \def\mst@@mathactivate##1##2##3{%
+ \begingroup
+ \lccode`~=`##1
+ \lccode`##1=`##1
+% \end{macrocode}
+% Careful here as |##2| is empty in the asterisk and prime case. And |##3|
+% also is at \mstrelease{1.4} empty for letters.
+% \begin{macrocode}
+ \lowercase{\endgroup
+% \end{macrocode}
+% Refactoring at \mstrelease{1.4} merged the catcode 11 and catcode 12
+% branches here and in particular avoided in former case an \cs{edef}. This
+% helped into providing the \cs{MTcommandletter}\meta{letter} as a
+% customizable macro. There was no equivalent to this macro, which here is
+% |##2|, prior to \mstrelease{1.4}.
+% \begin{macrocode}
+ \mathcode`##1="8000
+ \def~{##2##3}%
+ }%
+ }%
+\else
+ \def\mst@@mathactivate##1##2##3{%
+ \begingroup
+ \lccode`~=`##1
+ \lccode`##1=`##1
+ \lowercase{\endgroup
+ \mathcode`##1="8000
+% \end{macrocode}
+% Also, \mstrelease{1.4} possibly execute \cs{mst@mathactivate} everywhere
+% in document body (at version changes for example) or at begin document.
+% Hence this modifies globally the active meaning. So we add some safeguard
+% here using an \cs{ifmmode}. And we store the original meaning of the
+% active variant of the token to reset it when ``undoing''.
+%
+% Careful not to do it twice in a row... (but this means \cs{mst@deactivate}
+% might not revert to a user custom redefinition done in-between but to a
+% prior one; although if the character is made active the second
+% \cs{mst@mathactivate} would not have been done).
+% \begin{macrocode}
+ \@ifundefined{mst@prioractivemeaning@##1}
+ {\expandafter\let
+ \csname mst@prioractivemeaning@##1\endcsname ~}
+ {}%
+ \def~{\ifmmode##2##3\else##1\fi}%
+ }%
+ }%
+\fi
+}\x
+% \end{macrocode}
+% At \mstrelease{1.4} the macro was split into two, to test first whether the
+% character which is encountered is currently with active catcode.
%
-% Added note |2016/01/06|: it should be explicitly said that the extra
-% |{..}| in |\mst@mathactivate| for letters end up creating |\hbox|'es
-% around each letter with its extra skips and explicit italic correction,
-% when present. These skips are thus set at natural width and do not add
-% any break point.
+% At \mstrelease{1.4} the non-catcode active branch is entered only if the
+% character isn't mathematically active at time of use..
%
-% \begin{macro}{\MTmath-}\begin{macro}{activeletters}
-% \begin{macro}{\MTmath-}\begin{macro}{standardletters}
-% |1.3| |2013/09/02| extends the use of mathematically active letters to
-% allow the user to specify muglue before and after the letter itself (see
-% \cs{MTsetmathskips}, below).
-% Mathematically active letters were previously used only to add the italic
-% correction; the math activation has now been separated and put in
-% \cs{MTmathactiveletters}. There is also \cs{MTmathactiveLetters} to allow
-% math activation only for the uppercase letters. To cancel the (now default,
-% even with option |italic|) math
-% activation of letters, there is \cs{MTmathstandardletters}. Version |1.3a|
-% removes some silly |\string|'s from the code, which prevented to pass
-% macros as first argument to the command.
-% \begin{macro}{\MTnonletters-}\begin{macro}{obeymathxx}
-% \begin{macro}{\MTnonletters-}\begin{macro}{donotobeymathxx}
-% \begin{macro}{\resetMathstrut@}
-% These macros are modified in version |1.3a| |2013/09/04| in order to
+% Careful that |#2| and |#3| may each be empty. The test for being a Babel
+% shorthand is done here and not as prior to \mst@release{1.4} inside
+% \cs{mst@do@activecase}.
+% \begin{macrocode}
+\def\mst@mathactivate#1#2#3{%
+ \ifnum\catcode`#1=\active
+ \@ifundefined{active@char#1}{}{\mst@do@activecase #1{#2}{#3}}%
+ \else
+ \mst@OnlyIfNotMathActive{#1}{\mst@@mathactivate #1{#2}{#3}}%
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\mst@mathdeactivate}
+% This is needed at \mstrelease{1.4} for non-letters which are mathematically
+% activated. See comments above in \cs{mst@do@activecase}. Works in
+% sync with \cs{mst@addtodo@nonletters}.
+%
+% The \cs{mst@mathdeactivate} is active (sic) only in the non |everymath|
+% situation. It will restore a previously existing active meaning if it has
+% been changed.
+% \begin{macrocode}
+\ifmst@everymath
+\else
+\def\mst@mathdeactivate#1#2{%
+ \mathcode`#1=#2\relax
+ \@ifundefined{active@char#1}
+ {\@ifundefined{mst@prioractivemeaning@#1}
+ {}%
+ {\mst@restoreactivemeaning#1%
+ \expandafter\let\csname mst@prioractivemeaning@#1\endcsname\relax}%
+ }
+ {\@ifundefined{mst@hackedshorthand@#1}
+ {}
+ {\expandafter\let\csname user@active#1\expandafter\endcsname
+ \csname mst@orig@user@active#1\endcsname
+ \expandafter\let\csname normal@char#1\expandafter\endcsname
+ \csname mst@orig@normal@char#1\endcsname
+ \expandafter\let\csname mst@hackedshorthand@#1\endcsname\relax
+ }%
+ }%
+}%
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\mst@restoreactivemeaning}
+% At \mstrelease{1.4} when we undo the mathematical activation we now also
+% restore the prior existing active meaning, if any. Only in the ``no
+% |everymath|'' branch (because in the |everymath| \TeX{} itself takes care
+% of that on exiting the scope of the math mode).
+% \begin{macrocode}
+\def\mst@restoreactivemeaning#1{%
+ \begingroup
+ \lccode`~=`#1
+ \lccode`#1=`#1
+ \lowercase{\endgroup
+ \expandafter\let\expandafter~\csname mst@prioractivemeaning@#1\endcsname
+ }%
+}
+\fi
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\mst@do@nonletters}
+% \begin{macro}{\mst@addtodo@nonletters}
+% \begin{macro}{\mst@the}
+% \begin{macro}{\MTnonlettersobeymathxx}
+% \begin{macro}{\MTnonlettersdonotobeymathxx}
+% These macros are modified in version \mstrelease{1.3a} |2013/09/04| in order to
% cleverly adjust, or not, the |amsmath| \cs{resetMathstrut@}. When used in
% the preamble, they just modify \cs{mst@the}. And there is code at begin
% document to check the status there of \cs{mst@the} and if its meaning is
@@ -6658,7 +6899,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% |2016/03/03 v2.15a| of |amsmath.sty| is still not compatible with a math
% active opening parenthesis. Hence my patch here is still needed.
%
-% At |1.3u| \cs{MTnonlettersobeymathxx} and \cs{MTeasynonlettersobeymathxx}
+% At \mstrelease{1.3u} \cs{MTnonlettersobeymathxx} and \cs{MTeasynonlettersobeymathxx}
% are made no-ops under subdued mode. This fixes some bug if for example
% the former was used in preamble or immediately after |\begin{document}|
% making the minus sign math active although the \mst action was
@@ -6667,42 +6908,42 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% versions.
% \begin{macrocode}
\newtoks\mst@do@nonletters
-\newtoks\mst@do@easynonletters
-\newtoks\mst@do@az
-\newtoks\mst@do@AZ
+\ifmst@everymath
+\else
+ \newtoks\mst@undo@nonletters
+\fi
+% \end{macrocode}
+% |#1| is a category 12 character, |#2| is a \cs{mathopen}, or \cs{mathclose},
+% etc..., |#3| is a \cs{mathchar} (of variable family type).
+%
+% At \mstrelease{1.4}, \cs{mst@mathactivate} will not do anything if |#1|
+% is mathcode active (but not catcode active) at time of use.
+% \begin{macrocode}
+\ifmst@everymath
+ \def\mst@addtodo@nonletters#1#2#3{\mst@do@nonletters\expandafter
+ {\the\mst@do@nonletters\mst@mathactivate#1#2#3}%
+ }%
+\else
+% \end{macrocode}
+% We need to automatize some safeguards related to \cs{mst@do@activecase} when
+% deactivating.
+% \begin{macrocode}
+ \def\mst@addtodo@nonletters#1#2#3{\mst@do@nonletters\expandafter
+ {\the\mst@do@nonletters\mst@mathactivate#1#2#3}%
+ \edef\mst@tmp{\noexpand\mst@mathdeactivate#1{\the\mathcode`#1}}%
+ \mst@undo@nonletters\expandafter\expandafter\expandafter
+ {\expandafter\mst@tmp\the\mst@undo@nonletters}%
+ }%
+\fi
\let\mst@the\@gobble
-\newcommand*\MTnonlettersdonotobeymathxx{%
- \ifx\mst@the\@gobble
- \else
- \@ifundefined{mst@savedresetMathstrut@}{}{%
- \PackageInfo{mathastext}{restoring for this group or environment
- the original\MessageBreak
- amsmath \protect\resetMathstrut@}%
- \let\resetMathstrut@\mst@savedresetMathstrut@}%
- \fi
- \let\mst@the\@gobble
-}%
% \end{macrocode}
-% |1.3u| adds this check that we are not in a subdued normal or bold math
-% version. No need for expandable coding.
+% As \cs{mst@savedresetMathstrut@} will only be defined at begin document,
+% the next two macros are no-op in the preamble.
% \begin{macrocode}
-\def\mst@OnlyIfNotSubdued#1{%
- \ifmst@subdued
- \ifx\math@version\mst@normalversionname
- \else
- \ifx\math@version\mst@boldversionname
- \else
- #1%
- \fi
- \fi
- \else
- #1%
- \fi
-}%
-\def\mst@nonlettersobeymathxx{%
- \ifx\mst@the\the
- \else
- \@ifundefined{mst@savedresetMathstrut@}{}{%
+\def\mst@redefine@resetMathstrut@{%
+ \@ifundefined{mst@savedresetMathstrut@}
+ {}
+ {%
\ifmst@symboldelimiters
\def\resetMathstrut@{%
\setbox\z@\hbox{\the\textfont\symmtpsymbol\char40
@@ -6715,234 +6956,186 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\the\textfont\symoperators\char40}%
\ht\Mathstrutbox@\ht\z@ \dp\Mathstrutbox@\dp\z@}%
\fi
- \PackageInfo{mathastext}{\string\resetMathstrut@\space
- from amsmath replaced for this\MessageBreak group or environment}}%
- \fi
- \let\mst@the\the
+ \PackageInfo{mathastext}{\string\resetMathstrut@\space
+ from amsmath replaced for this\MessageBreak group or environment}%
+ }%
}%
-\newcommand*\MTnonlettersobeymathxx
- {\mst@OnlyIfNotSubdued\mst@nonlettersobeymathxx}%
-\newcommand*\MTeasynonlettersdonotobeymathxx{\let\mst@theeasy\@gobble}%
-\def\mst@easynonlettersobeymathxx{\let\mst@theeasy\the}%
-\newcommand*\MTeasynonlettersobeymathxx
- {\mst@OnlyIfNotSubdued\mst@easynonlettersobeymathxx}%
-\MTeasynonlettersobeymathxx % no-op here if subdued mode
-\def\mst@mathactiveletters{\let\mst@thef\the \let\mst@theF\the}%
-\newcommand*\MTmathactiveletters
- {\mst@OnlyIfNotSubdued\mst@mathactiveletters}%
-\MTmathactiveletters % no-op here if subdued mode
-\def\mst@mathactiveLetters{\let\mst@theF\the}%
-\newcommand*\MTmathactiveLetters
- {\mst@OnlyIfNotSubdued\mst@mathactiveLetters}%
-\newcommand*\MTmathstandardletters{\let\mst@thef\@gobble \let\mst@theF\@gobble}%
+\def\mst@restore@resetMathstrut@{%
+ \@ifundefined{mst@savedresetMathstrut@}{}{%
+ \PackageInfo{mathastext}{restoring for this group or environment
+ the original\MessageBreak
+ amsmath \protect\resetMathstrut@}%
+ \let\resetMathstrut@\mst@savedresetMathstrut@}%
+}%
+\ifmst@everymath
+ \newcommand*\MTnonlettersobeymathxx{%
+ \mst@OnlyIfNotSubdued{%
+ \ifx\mst@the\the
+ \else
+ \mst@redefine@resetMathstrut@
+ \fi
+ \let\mst@the\the
+ }%
+ }%
+ \newcommand*\MTnonlettersdonotobeymathxx{%
+ \ifx\mst@the\@gobble
+ \else
+ \mst@restore@resetMathstrut@
+ \fi
+ \let\mst@the\@gobble
+ }%
+\else
+ \newcommand*\MTnonlettersobeymathxx{%
+ \mst@OnlyIfNotSubdued{%
+ \AtBeginDocument{\MTnonlettersobeymathxx}%
+ }%
+ }%
+ \newcommand*\MTnonlettersdonotobeymathxx{%
+ \AtBeginDocument{\MTnonlettersdonotobeymathxx}%
+ }%
+ \AtBeginDocument{%
+ \renewcommand*\MTnonlettersobeymathxx{%
+ \mst@OnlyIfNotSubdued{%
+ \the\mst@do@nonletters
+ \ifx\mst@the\the
+ \else
+ \mst@redefine@resetMathstrut@
+ \fi
+ \let\mst@the\the
+ }%
+ }%
+ \renewcommand*\MTnonlettersdonotobeymathxx{%
+ \the\mst@undo@nonletters
+ \ifx\mst@the\@gobble
+ \else
+ \mst@restore@resetMathstrut@
+ \fi
+ \let\mst@the\@gobble
+ }%
+ }%
+\fi
% \end{macrocode}
-% \begin{macro}{\MTicinmath}
-% \begin{macro}{\MTICinmath}
-% \begin{macro}{\MTnoicinmath}
-% \begin{macro}{\MTicalsoinmathxx}
-% \cs{MTnoicinmath} can also be used from inside math mode.
-%
-% \cs{MTicalsoinmathxx} is destined to be used inside
-% \cs{mathnormalbold} as I didn't want to add the complication of
-% extracting the family number used inside \cs{mathnormalbold} (will
-% perhaps come back if I have time to spend on
-% |source2e|). Added note |2016/01/06|: this number is a priori simply
-% |symmtletterfont+1|.
-%
-% \cs{MTicinmath} can also be used inside math mode, to revert an
-% earlier \cs{MTnoicinmath} from inside the same math group: the math mode
-% had to be entered with the math activation of letters allowed.
-%
-% |1.3i| |2016/01/06|: For some reason which I have now forgotten I did
-% until now:
-% \begin{verbatim}
-% \def\mst@itcorr{\ifnum\fam=\m@ne\/\else\ifnum\fam=\symmtletterfont\/\fi\fi}%
-% \end{verbatim}
-% hence italic corrections were also applied inside \cs{mathnormal} (for
-% upright fonts; \cs{mathnormalbold} math alphabet was not treated like
-% \cs{mathnormal}). I now drop this to be more in sync with the handling
-% of the extra skips around letters. Everything gets suppressed inside
-% all math alphabets, allowing ligatures, even for \cs{mathnormal}.
-%
+% \end{macro}\end{macro}\end{macro}\end{macro}\end{macro}
+% \begin{macro}{\MTeasynonlettersobeymathxx}
+% \begin{macro}{\MTeasynonlettersdonotobeymathxx}
% \begin{macrocode}
-\newcommand*\MTicinmath{%
- \MTmathactiveletters
- \def\mst@itcorr{\ifnum\fam=\m@ne\/\fi}%
- \let\mst@ITcorr\mst@itcorr}
-\newcommand*\MTICinmath{%
- \MTmathactiveLetters
- \def\mst@ITcorr{\ifnum\fam=\m@ne\/\fi}}
-\newcommand*\MTnoicinmath{\let\mst@itcorr\@empty\let\mst@ITcorr\@empty}
-\newcommand*\MTnoICinmath{\let\mst@ITcorr\@empty}
-\newcommand*\MTicalsoinmathxx{%
- \ifx\mst@itcorr\@empty\else\def\mst@itcorr{\/}\fi
- \ifx\mst@ITcorr\@empty\else\def\mst@ITcorr{\/}\fi}
+\newtoks\mst@do@easynonletters
+\ifmst@everymath
+ \newcommand*\MTeasynonlettersdonotobeymathxx{\let\mst@theeasy\@gobble}%
+ \newcommand*\MTeasynonlettersobeymathxx{%
+ \mst@OnlyIfNotSubdued{\let\mst@theeasy\the}%
+ }%
+ \MTeasynonlettersobeymathxx
+\else
+ \newtoks\mst@undo@easynonletters
+ \newcommand*\MTeasynonlettersdonotobeymathxx{\the\mst@undo@easynonletters}
+ \newcommand*\MTeasynonlettersobeymathxx{%
+ \mst@OnlyIfNotSubdued{\the\mst@do@easynonletters}%
+ }%
+ \AtEndOfPackage{\MTeasynonlettersobeymathxx}%
+\fi
% \end{macrocode}
-% \end{macro}\end{macro}\end{macro}\end{macro}\end{macro}\end{macro}\end{macro}
-% \end{macro}\end{macro}\end{macro}\end{macro}\end{macro}\end{macro}\end{macro}
-% \end{macro}\end{macro}\end{macro}\end{macro}\end{macro}
-% \begin{macro}{\MTsetmathskips}
-% \begin{macro}{\MTunsetmathskips}
-% |1.3| |2013/09/02|: user level command to specify extra spaces in math mode
-% around the letters (only the 7bit a,b,..,z and A,B,..,Z). First parameter is
-% the letter, second is the math skip to be inserted before, and third the
-% skip to be inserted after; for example \cs{thickmuskip} or explicitly
-% |0.1mu|.
-%
-% For this, letters are made mathematically active. This is now the package
-% default (version |1.2| did this only in the absence of option |italic|, or
-% more precisely when the font used was not of shape |it| or |sl|). But if
-% \cs{MTsetmathskips} has not been used for that letter, the only effect of
-% the math activation is, as in |1.2|, to add the italic correction
-% automatically, except when the font shape is detected to be |it| or |sl|; in
-% these latter cases, although mathematically active, the letter acts in the
-% standard way.
-%
-% The command \cs{MTmathstandardletters} turns off math activation and its
-% effects for all letters.
-%
-% Ligatures within the argument of a math alphabet command are impeached by
-% skips; so \cs{MTunsetmathskips} is provided to cancel the skips for one
-% specific letter (|f| for example).
+% \end{macro}\end{macro}
+% \begin{macro}{\mst@addtodo@easynonletters}
+% |#1| is a one character control sequence (|\.|, |\/|, |\#|, |\%| or |\&|)
+% and |#2| is a mathchar.
%
-% |1.3a| |2013/09/04|: I strangely had |\string#1| inside \cs{MTsetmathskips}.
-% Phobic of catcode active letters... but with |\string| one needs some
-% |\expandafter| to use \cs{MTsetmathskips} in an |\@for| loop for example. It
-% is better to allow the first argument to be a macro or anything expanding to
-% a letter, and to not be paranoid about improbable catcode active letters
-% (the user just has to tame them at the time of the \cs{MTsetmathskip}) so I
-% take out these |\string|'s.
+% Perhaps I should use the Unicode engine \cs{Umathcode} et alia. I do this
+% at other places. However
+% I realized in 2013 and it is still true in 2024 that \LaTeX{} interface
+% \cs{DeclareSymbolFont} does not allow to declare more than 16 font
+% families even with \LuaLaTeX{} despite the latter allowing 256 such.
%
-% |1.3i| |2016/01/06|: the extra skips are suppressed for the arguments of
-% math alphabet commands. This applies in particular for amsmath's
-% \cs{DeclareMathOperator}.
+% So why bother?
%
+% \mstrelease{1.4} adds to this legacy branch a test to not override
+% a mathematically active ``easy'' non-letter. Main case is the dot
+% with Babel Spanish.
% \begin{macrocode}
-\newcommand*\MTsetmathskips[3]{%
- \@namedef{mst@before#1}{\ifnum\fam=\m@ne\mskip#2\relax\fi }%
- \@namedef{mst@after#1}{\ifnum\fam=\m@ne\mskip#3\relax\fi }%
-}
-\newcommand*\MTunsetmathskips[1]{%
- \@namedef{mst@before#1}{}%
- \@namedef{mst@after#1}{}%
-}
+\ifmst@everymath
+ \def\mst@addtodo@easynonletters#1#2{%
+ \mst@do@easynonletters\expandafter{%
+ \the\mst@do@easynonletters
+ \mst@OnlyIfNotMathActive{#1}{\mathcode`#1=#2}%
+ }%
+ }%
+ \def\mst@addtodo@easynonletters@U#1#2{%
+ \mst@do@easynonletters\expandafter{%
+ \the\mst@do@easynonletters
+ \mst@OnlyIfNotMathActive{#1}{\mst@Umathcodenum`#1=#2}%
+ }%
+ }%
+\else
% \end{macrocode}
-% \end{macro}\end{macro}
-% \begin{macro}{\mst@mathactivate}
-% \begin{macro}{\mst@addtodo@nonletters}
-% \begin{macro}{\mst@addtodo@easynonletters}
-% \begin{macro}{\mst@addtodo@az}
-% \begin{macro}{\mst@addtodo@AZ}
-% Added note |2016/01/06|:
-% Notice that the initially |\relax| tokens \verb+\mst@[before|after]@<letter>+
-% formed with |\csname...\endcsname| do not modify TeX's math layout:
-% |{\relax f\relax}| is like |f| (also for ligatures inside |\mathrm| for
-% example).
+% The character may have been made mathcode active
+% exterior to \mst. We can not test this for sure at begin document as it
+% may happen later. If such an ``easy'' character is mathcode active,
+% this can not originate in \mst. So we should not overwrite when
+% we issue \cs{MTeasynonlettersdonotobeymathxx}. Example I know is
+% with \ctanpkg{babel} Spanish which makes the dot math active. With PDF\LaTeX{}
+% it is also catcode active
+%
+% This macro may be used with Unicoe engines, and \LuaTeX{} and \XeTeX{}
+% differ regarding math active characters. I have only tested this (anew)
+% for \mstrelease{1.4} for which this branch is needed, so in 2024.
% \begin{macrocode}
-\def\mst@magic@v #1#2#3#4#5{#1#3#4}
-\def\mst@magic@vi #1#2#3#4#5#6{#1#2#4#5}
-\def\mst@fork{\ifmmode\mst@magic@v\fi\@thirdofthree}
-\def\mst@safefork{\ifmmode\if@safe@actives\else\mst@magic@vi\fi\fi\@thirdofthree}
-\def\mst@do@activecase#1#2#3{% #1 is a category 11 or 12 character token
- \@ifundefined{active@char#1}{}{%
- \ifcat #1a\mathcode`#1=#2\else
- \ifx\relax #2\relax\mathcode`#1=`#1 \else\mathcode`#1=#3\fi\fi
- \expandafter\expandafter\expandafter\let\expandafter\expandafter
- \csname mst@orig@user@active#1\endcsname
- \csname user@active#1\endcsname
- \expandafter\expandafter\expandafter\let\expandafter\expandafter
- \csname mst@orig@normal@char#1\endcsname
- \csname normal@char#1\endcsname
- \ifcat #1a%
- \expandafter\edef\csname user@active#1\endcsname
- {\noexpand\mst@fork {{#2\noexpand#3}}{}\expandafter
- \noexpand\csname mst@orig@user@active#1\endcsname
- }%
- \expandafter\edef\csname normal@char#1\endcsname
- {\noexpand\mst@safefork {{#2\noexpand#3}}{}\expandafter
- \noexpand\csname mst@orig@normal@char#1\endcsname
- }%
- \else
- \expandafter\edef\csname user@active#1\endcsname
- {\noexpand\mst@fork {#2}\noexpand#3\expandafter
- \noexpand\csname mst@orig@user@active#1\endcsname
- }%
- \expandafter\edef\csname normal@char#1\endcsname
- {\noexpand\mst@safefork {#2}\noexpand#3\expandafter
- \noexpand\csname mst@orig@normal@char#1\endcsname
- }%
- \fi}}
-\begingroup
- \catcode`\~=\active
- \def\x{\endgroup
- \def\mst@mathactivate##1##2##3{% ##1 guaranteed of cat 11 or 12
- \begingroup
- \lccode`~=`##1
- \lccode`##1=`##1
- \lowercase{\endgroup
- \ifnum\catcode`##1=\active
- \mst@do@activecase ##1{##2}##3%
- % careful as ##2 is empty in the asterisk and
- % prime case!
- \else
- \mathcode`##1="8000
- % version 1.3 adds the possibility of extra skips around letters,
- % (only if non catcode active at the time of use).
- \ifcat##1a\edef~{% extra braces for a^b for example
- {\expandafter\noexpand\csname mst@before##1\endcsname
- ##2\noexpand##3%
- \expandafter\noexpand\csname mst@after##1\endcsname}}%
- \else\def~{##2##3}\fi
- \fi}}}
-\x
-\def\mst@addtodo@nonletters#1#2#3{%
- % #1 will be of cat 11 or 12.
- % #2 is empty for asterisk and right quote
- \mst@do@nonletters\expandafter
- {\the\mst@do@nonletters \mst@mathactivate#1{#2}#3}%
-}
-\def\mst@addtodo@easynonletters#1#2{% #1 is a one char control sequence
- \mst@do@easynonletters\expandafter{\the\mst@do@easynonletters\mathcode`#1=#2}%
-}
-\def\mst@addtodo@az#1#2{%
- \mst@do@az\expandafter{\the\mst@do@az\mst@mathactivate#1#2\mst@itcorr}
-}
-\def\mst@addtodo@AZ#1#2{%
- \mst@do@AZ\expandafter{\the\mst@do@AZ\mst@mathactivate#1#2\mst@ITcorr}%
-}
+ \def\mst@addtodo@easynonletters#1#2{%
+ \mst@do@easynonletters\expandafter
+ {\the\mst@do@easynonletters
+ \mst@OnlyIfNotMathActive{#1}{\mathcode`#1=#2}}%
+ \def\mst@tmp##1\relax{%
+ \def\mst@tmp{\mst@OnlyIfNotMathActive{#1}{\mathcode`#1=##1\relax}}%
+ }%
+ \expandafter\mst@tmp\the\mathcode`#1\relax
+ \mst@undo@easynonletters\expandafter\expandafter\expandafter
+ {\expandafter\mst@tmp\the\mst@undo@easynonletters}%
+ }%
+ \def\mst@addtodo@easynonletters@U#1#2{%
+ \mst@do@easynonletters\expandafter{%
+ \the\mst@do@easynonletters
+ \mst@OnlyIfNotMathActive{#1}{\mst@Umathcodenum`#1=#2}%
+ }%
+ \def\mst@tmp##1\relax{%
+ \def\mst@tmp{\mst@OnlyIfNotMathActive{#1}{\mst@Umathcodenum`#1=##1\relax}}%
+ }%
+ \expandafter\mst@tmp\the\mst@Umathcodenum`#1\relax
+ \mst@undo@easynonletters\expandafter\expandafter\expandafter
+ {\expandafter\mst@tmp\the\mst@undo@easynonletters}%
+ }%
+\fi
% \end{macrocode}
-% \end{macro}\end{macro}\end{macro}\end{macro}\end{macro}
+% \end{macro}
% \begin{macro}{\newmcodes@}
% \begin{macro}{\mst@newmcodes@}
% \begin{macro}{\MTresetnewmcodes}
% \begin{macro}{\MTcustomizenewmcodes}
-% |1.15d|: the \cs{newmcodes@} amsmath macro causes an error in Unicode engines as soon
-% someone assigns a Unicode mathcode to the minus sign, and then makes a
-% \cs{DeclareMathOperator} declaration. Furthermore it hard-codes the font
-% family 0 as being the one to be used. Moreover just putting the concerned
-% signs |-|, |:|, |.|, |\| ,|'|, |*| inside braces emulates enough the
-% behavior (although the tick will give a prime).
+% \mstrelease{1.15d}: the \cs{newmcodes@} amsmath macro causes an error in
+% Unicode engines as soon someone assigns a Unicode mathcode to the minus
+% sign, and then makes a \cs{DeclareMathOperator} declaration. Furthermore
+% it hard-codes the font family 0 as being the one to be used. Moreover just
+% putting the concerned signs |-|, |:|, |.|, |\| ,|'|, |*| inside braces
+% emulates enough the behavior (although the tick will give a prime).
%
-% |1.3|: now tests if `basic' option was used.
+% \mstrelease{1.3}: now tests if `basic' option was used.
%
-% |1.3d|: I should re-examine the situation with |\newmcodes@|. In the
+% \mstrelease{1.3d}: I should re-examine the situation with |\newmcodes@|. In the
% meantime its relaxification will not be done if lualatex-math is
% loaded. And the whole thing is put at begin document.
%
-% |1.3m|: |lualatex-math 1.5| n'a pas modifié son traitement de |\newmcodes@|
+% \mstrelease{1.3m}: |lualatex-math 1.5| n'a pas modifié son traitement de |\newmcodes@|
% mais par contre a supprimé le patch de \cs{resetMathstrut@}. Mais la date
-% de release est restée à |2015/09/22| (date de |1.4a|) au lieu de quelque
+% de release est restée à |2015/09/22| (date de \mstrelease{1.4a}) au lieu de quelque
% chose comme |2016/03/13| (date pour l'annonce sur CTAN). Il faudra suivre
% l'évolution future de |amsmath.sty| maintenant assurée par D.C.
%
-% |1.3n 2016/04/22|: there is no more a patch of |\newmcodes@| by
+% \mstrelease{1.3n} |2016/04/22|: there is no more a patch of |\newmcodes@| by
% |lualatex-math 1.6| |(2016/04/16)|, as |amsmath 2016/03/10 v2.15b| has now
% a version compatible with \LuaLaTeX.
%
% My very radical |\let\newmcodes@\relax| was only a temporary measure I
% adopted for lack of time on October 13, 2012, and apart from avoiding to
% do that in case |lualatex-math| was detected, I never came back... finally
-% I handle it myself for |1.3n|. The remaining problem of this macro (now
+% I handle it myself for \mstrelease{1.3n}. The remaining problem of this macro (now
% that it does not anymore crash |lualatex| or vice versa) is that (also
% with |amsmath| version |2016/03/10 v2.15b|) it hardcodes the font used.
% The aim of the macro is to modify the type of spacing affected to symbols
@@ -6954,7 +7147,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \item \mst makes (or not, depending on commands issued by the user) these
% characters math active (the right tick already is), which complicates
% recovery of former mathcode. We have mathchar type \emph{macros}, but
-% then the complication is in diverging behaviours of the engines:
+% then the complication is in diverging behaviors of the engines:
% |\numexpr\mst@varfam@minus\relax| works with \LuaTeX, not with \XeTeX.
% \item the |*| must presumably really be the non-lowered text glyph.
% \item for the |-| I hesitated but do use the hyphen in the end.
@@ -6979,7 +7172,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \item I noticed that \LuaLaTeX\ does not apply the ``TeX Ligature'' (bad
% name) regarding the right tick APOSTROPHE being transformed into RIGHT
% SINGLE QUOTATION MARK in math mode, but \XeLaTeX\ does. From the point
-% of view of \mst, the behaviour of \XeLaTeX\ is the coherent one. It
+% of view of \mst, the behavior of \XeLaTeX\ is the coherent one. It
% appears that \LuaLaTeX\ use in math mode of a text font does not obey
% the set features.^^A like this
%^^A \url{http://tex.stackexchange.com/questions/208688/oldstylefigure-issue-with-lualatex-and-mathastext}
@@ -6997,7 +7190,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% in 2012! I spent some hours on this small thing, with consequent testing and
% for example this TeX Ligature issue with Unicode engines.
%
-% Since |1.3v| we require e-\TeX{} extensions, so a test for
+% Since \mstrelease{1.3v} we require e-\TeX{} extensions, so a test for
% \cs{numexpr} has been dropped here.
% \begin{macrocode}
\ifmst@basic
@@ -7027,7 +7220,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
}%
\let\mst@originalnewmcodes@\newmcodes@
\fi
- }% end of AtBeginDocument
+ }%
\else
\AtBeginDocument {%
\ifx\newmcodes@\@undefined\else
@@ -7047,9 +7240,9 @@ defaultbf,defaultit,defaultsf,defaulttt}}
}%
\let\mst@originalnewmcodes@\newmcodes@
\fi
- }% end of second AtBeginDocument
- \fi % mst@XeOrLua
-\fi % mst@basic
+ }%
+ \fi
+\fi
\newcommand*\MTresetnewmcodes{\ifx\mst@originalnewmcodes@\undefined\else
\let\newmcodes@\mst@originalnewmcodes@\fi}
\newcommand*\MTcustomizenewmcodes{\ifx\mst@originalnewmcodes@\undefined\else
@@ -7080,7 +7273,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% we'll see.
% \begin{macro}{\MTmathoperators-}\begin{macro}{obeymathxx}
% \begin{macro}{\MTmathoperators-}\begin{macro}{donot-}\begin{macro}{obeymathxx}
-% |1.2|: rather than just replacing \cs{symoperators} by
+% \mstrelease{1.2}: rather than just replacing \cs{symoperators} by
% \cs{symmtoperatorfont} I add a modification which makes the
% declared operator names sensitive to the math alphabets... ouh le
% vilain!
@@ -7093,7 +7286,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \end{macrocode}
% \end{macro}\end{macro}\end{macro}\end{macro}\end{macro}\end{macro}
% \begin{macro}{mtletterfont}
-% At version |1.1|, we add the possibility to mimick the standard
+% At version \mstrelease{1.1}, we add the possibility to mimick the standard
% behavior, that is to have italic letters and upright
% digits. Thanks to Tariq~\textsc{Perwez} and
% Kevin~\textsc{Klement} who asked for such a feature.
@@ -7134,39 +7327,59 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% simultaneously when specified with |mode=base|. It does work with
% |mode=node| but this mode ``does not work in math mode.''
%
-% Done for |1.3o| of |2016/05/03|.
+% Done for \mstrelease{1.3o} of |2016/05/03|.
+%
+% \mstrelease{1.3p} renames the macro to \cs{MTfixmathfonts} for public access.
+%
+% \mstrelease{1.4} intercepts also |mode=harf|. Cf
+% \url{https://tex.stackexchange.com/questions/722084/change-number-style-with-mathastext}
+% (thanks to |user691586| for bug report). The new code unconditionally
+% replaces |mode=foo| by |mode=base|. The complications due to the output of
+% |\fontname| using only category 12 characters are handled in a different way
+% than the |2016| code.
%
-% |1.3p| renames the macro to \cs{MTfixmathfonts} for public access.
+% The \url{https://github.com/latex3/fontspec/issues/525} problem causes
+% additional complications.
+%
+% Perhaps I should simply zap spaces always rather than check for quotes?
+% Anyway this appears to work.
% \begin{macrocode}
-\begingroup
-\catcode`N 12
-\catcode`O 12
-\catcode`D 12
-\catcode`E 12
-\lowercase{\gdef\mst@fixmathfonts@ #1=NODE;#2#3\relax #4\@empty #5}%
- {\ifx#2\empty\else\font\mst@mathfont=#1=base;#2#3\relax#5=\mst@mathfont\fi}
-\lowercase{\gdef\MTfixmathfonts
-{\expandafter\mst@fixmathfonts@
- \fontname\textfont\symmtoperatorfont\relax\relax=NODE;\empty\relax\@empty
- {\textfont\symmtoperatorfont}%
- \expandafter\mst@fixmathfonts@
- \fontname\scriptfont\symmtoperatorfont\relax\relax=NODE;\empty\relax\@empty
- {\scriptfont\symmtoperatorfont}%
- \expandafter\mst@fixmathfonts@
- \fontname\scriptscriptfont\symmtoperatorfont\relax\relax=NODE;\empty\relax\@empty
- {\scriptscriptfont\symmtoperatorfont}%
- \expandafter\mst@fixmathfonts@
- \fontname\textfont\symmtletterfont\relax\relax=NODE;\empty\relax\@empty
- {\textfont\symmtletterfont}%
- \expandafter\mst@fixmathfonts@
- \fontname\scriptfont\symmtletterfont\relax\relax=NODE;\empty\relax\@empty
- {\scriptfont\symmtletterfont}%
- \expandafter\mst@fixmathfonts@
- \fontname\scriptscriptfont\symmtletterfont\relax\relax=NODE;\empty\relax\@empty
- {\scriptscriptfont\symmtletterfont}%
- }%
+\def\mst@fixmathfonts@#1.#2.#3.{%
+\def\mst@fixmathfonts@##1##2#1=##3;##4##5\relax##6\@empty##7{%
+ \ifx##3\empty\else
+ \if"##1%
+ \font\mst@mathfont=##1##2#1=base;##4##5\relax
+ \else
+ \mst@arrrrgh@fixmathfonts##1##2#1=base;##4##5#2\empty#3\relax
+ \fi
+ ##7=\mst@mathfont
+ \fi
}%
-\endgroup
+\def\mst@arrrrgh@fixmathfonts##1#2##2##3#3##4\relax{%
+ \ifx##2\empty
+ \font\mst@mathfont="##1"\relax
+ \else
+ \font\mst@mathfont="##1"#2##2##3#3\relax
+ \fi
+}%
+}%
+\expandafter\mst@fixmathfonts@\detokenize{mode. at.pt.}%
+\def\MTfixmathfonts#1{%
+\def\MTfixmathfonts{%
+ \expandafter\mst@fixmathfonts@\fontname\textfont\symmtoperatorfont
+ \relax\relax #1=;\empty\relax\@empty{\textfont\symmtoperatorfont}%
+ \expandafter\mst@fixmathfonts@\fontname\scriptfont\symmtoperatorfont
+ \relax\relax #1=;\empty\relax\@empty{\scriptfont\symmtoperatorfont}%
+ \expandafter\mst@fixmathfonts@\fontname\scriptscriptfont\symmtoperatorfont
+ \relax\relax #1=;\empty\relax\@empty{\scriptscriptfont\symmtoperatorfont}%
+ \expandafter\mst@fixmathfonts@\fontname\textfont\symmtletterfont
+ \relax\relax #1=;\empty\relax\@empty{\textfont\symmtletterfont}%
+ \expandafter\mst@fixmathfonts@\fontname\scriptfont\symmtletterfont
+ \relax\relax #1=;\empty\relax\@empty{\scriptfont\symmtletterfont}%
+ \expandafter\mst@fixmathfonts@\fontname\scriptscriptfont\symmtletterfont
+ \relax\relax #1=;\empty\relax\@empty{\scriptscriptfont\symmtletterfont}%
+}}%
+\expandafter\MTfixmathfonts\expandafter{\detokenize{mode}}%
\ifmst@LuaTeX
\everymath\expandafter{\the\everymath\mst@fixmathfonts}%
\everydisplay\expandafter{\the\everydisplay\mst@fixmathfonts}%
@@ -7198,7 +7411,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \cs{mathrm} and not \cs{mathnormal}.
%
% Actually math alphabet macros are created robust since \LaTeX{} from 2005,
-% so at |1.3v 2019/09/19| I decided to modify the old \mst approach a bit.
+% so at \mstrelease{1.3v} |2019/09/19| I decided to modify the old \mst approach a bit.
% Indeed with the old approach a \cs{mathtt} in a moving argument translates
% ultimately into \cs{Mathtt} but if for example the new context where it
% gets expanded is a subdued normal math version, this does not give the same
@@ -7220,10 +7433,10 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% robustness (except of course in the subdued math versions as there the math
% alphabets acquire back their original robust meanings.)
%
-% Potential breaking change at |1.3za|, the |defaultbf| etc... options do
+% Potential breaking change at \mstrelease{1.3za}, the |defaultbf| etc... options do
% not prevent the package declaring |\Mathbf| etc... commands.
%
-% |1.3za| defines a \cs{Mathnormalbold} and then defines \cs{mathnormalbold}
+% \mstrelease{1.3za} defines a \cs{Mathnormalbold} and then defines \cs{mathnormalbold}
% in terms of it in place of defining directly \cs{mathnormalbold} as a math
% alphabet. This is in relation to implementation of the |LGRgreek+|
% option. There was some hesitation though to restrict this change to that
@@ -7249,7 +7462,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\let\mst@original@it\mathit
\let\mst@original@sf\mathsf
\let\mst@original@tt\mathtt
-\def\mst@restorealphabets{% for subdued
+\def\mst@restorealphabets{%
\let\mathnormal\mst@original@normal
\let\mathrm\mst@original@rm
\let\mathbf\mst@original@bf
@@ -7264,7 +7477,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% there to be a robust and easy way to know when one is in the argument of
% \cs{mathrm} or \cs{mathbf}, and the code is spread on various chapters of
% \texttt{source2e.pdf}, and the comments are often not up-to-date. So I did
-% not try a too complex hack and decided for |1.3za| to add a numeric
+% not try a too complex hack and decided for \mstrelease{1.3za} to add a numeric
% indicator to let Greek letters react to it. It incorporates a space to be
% self-delimiting in an \cs{ifcase} to maintain expandability in numeric
% context of the to-be-defined Greek control sequences.
@@ -7316,7 +7529,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \begin{macro}{\MTgreekupdefault}
% \begin{macro}{\MTgreekitdefault}
% \begin{macro}{selfGreek}
-% |1.14b|: We can not move the \cs{DeclareSymbolFont} to the
+% \mstrelease{1.14b}: We can not move the \cs{DeclareSymbolFont} to the
% \cs{Mathastext} macro because it resets the font family in *all*
% math versions, and some could have been defined by the user with
% previous calls to \cs{Mathastext}. So we have to have them here.
@@ -7336,7 +7549,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
%
% First we establish the cumulative effect of the greek related options.
%
-% |1.15c| introduces some possibilities to change the shapes of Greek letters
+% \mstrelease{1.15c} introduces some possibilities to change the shapes of Greek letters
% in each math versions, and even the Greek font (in LGR encoding). The
% commands \cs{MTitgreek} etc... will be used in-between calls to
% \cs{Mathastext} and re-adjust the shapes. And the command \cs{MTgreekfont}
@@ -7355,7 +7568,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \LaTeX\ (since 2020-02-02 now that I check this out). As a result this
% triggered Font Warnings in the log about the replacement of |up| by |n|.
%
-% |1.3x| refactors completely the handling of Greek letter shapes under the
+% \mstrelease{1.3y} refactors completely the handling of Greek letter shapes under the
% |LGRgreek(s)| options (and only under them). Under these options we don't
% use one font for lowercase Greek and anotherone for uppercase Greek (some
% above code comments have not been updated) but one math font |mtgreekit| for italic Greek
@@ -7372,7 +7585,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
%
% In order to maintain perfect identical code for non-|LGRgreek|, the
% |LGRgreek| related code is simply added to previously shared
-% constructions. The |LGRgreek| behaviour will remain identical in most
+% constructions. The |LGRgreek| behavior will remain identical in most
% documents, but for example those who used some adventurous `|sc|' for the
% main shape (the one used per default for operator names) need to adjust
% \cs{MTgreekupdefault} to be `|sc|', for the math version being defined, or
@@ -7386,9 +7599,9 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% package; to be examined next time --- which may be a long time in
% future!).
%
-% Unfortunately the |1.3x/1.3y| did some internal renamings here (using
+% Unfortunately the \mstrelease{1.3y} did some internal renamings here (using
% |@lgr@| in macro names in place of |@greek@|) which were not everywhere
-% followed up, and this broke the |selfGreek| option. Fixed at |1.3z|.
+% followed up, and this broke the |selfGreek| option. Fixed at \mstrelease{1.3z}.
%
% \begin{macrocode}
\providecommand*\MTgreekupdefault{n}
@@ -7442,14 +7655,14 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \begin{macro}{\mathgreekit}
% \begin{macro}{\mathgreekupbold}
% \begin{macro}{\mathgreekitbold}
-% The |1.3x| refactoring was done in order to be able to define \cs{alphaup},
+% The \mstrelease{1.3y} refactoring was done in order to be able to define \cs{alphaup},
% etc \dots\ control sequences (\cs{mathchar}'s), as well as the italic ones.
% Formerly two math fonts were created but to be used respectively with
% lowercase or uppercase Greek. Now we have two fonts indexed by their shape,
% and we take advantage to create two math alphabets mapping to the two
% defined symbol fonts |mtgreekup| and |mtgreekit|.
%
-% |1.3za| adds \cs{mathgreekupbold} and \cs{mathgreekitbold}.
+% \mstrelease{1.3za} adds \cs{mathgreekupbold} and \cs{mathgreekitbold}.
% \begin{macrocode}
\ifmst@LGRgreek
\DeclareFontEncoding{LGR}{}{}
@@ -7484,10 +7697,11 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% In case we need the Euler font, we declare it here. It will use
% |uzeur.fd| from the \ctanpkg{eulervm} package of Walter~\textsc{Schmidt}
% \begin{macrocode}
-\ifmst@needeuler\mst@infoline{will use Euler font; command \string\MTEulerScale}
-\DeclareSymbolFont{mteulervm}{U}{zeur}{m}{n}
-\DeclareSymbolFontAlphabet{\MathEuler}{mteulervm}
-\DeclareMathAlphabet{\MathEulerBold}{U}{zeur}{\mst@bold}{n}
+\ifmst@needeuler
+\mst@infoline{will use Euler font; command \string\MTEulerScale}
+ \DeclareSymbolFont{mteulervm}{U}{zeur}{m}{n}
+ \DeclareSymbolFontAlphabet{\MathEuler}{mteulervm}
+ \DeclareMathAlphabet{\MathEulerBold}{U}{zeur}{\mst@bold}{n}
\fi
\newcommand*\MTEulerScale[1]{\edef\zeu@Scale{#1}}
\let\MathastextEulerScale\MTEulerScale
@@ -7534,14 +7748,15 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \cs{psy@scale} will be used to scale the font (see at the
% very end of this file).
% \begin{macrocode}
-\ifmst@needsymbol\mst@infoline{will use Symbol font; command \string\MTSymbolScale}
- \def\psy@scale{1}
- \DeclareSymbolFont{mtpsymbol}{U}{psy}{m}{n}
- \DeclareSymbolFontAlphabet{\MathPSymbol}{mtpsymbol}
-\AtBeginDocument{%
- \DeclareFontFamily{U}{psy}{}%
- \DeclareFontShape{U}{psy}{m}{n}{<->s*[\psy@scale] psyr}{}%
-}
+\ifmst@needsymbol
+ \mst@infoline{will use Symbol font; command \string\MTSymbolScale}
+ \def\psy@scale{1}
+ \DeclareSymbolFont{mtpsymbol}{U}{psy}{m}{n}
+ \DeclareSymbolFontAlphabet{\MathPSymbol}{mtpsymbol}
+ \AtBeginDocument{%
+ \DeclareFontFamily{U}{psy}{}%
+ \DeclareFontShape{U}{psy}{m}{n}{<->s*[\psy@scale] psyr}{}%
+ }
\fi
\newcommand*\MTSymbolScale[1]{\edef\psy@scale{#1}}
\let\MathastextSymbolScale\MTSymbolScale
@@ -7553,10 +7768,14 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \end{macro}
% \end{macro}
% \begin{macro}{\pmvec}
-% Definition of a poor man version of the \cs{vec} accent
+% Definition of a poor man version of the \cs{vec} accent.
+% Done using \cs{protected}\cs{def} at \mstrelease{1.4}.
% \begin{macrocode}
-\DeclareRobustCommand*\pmvec[1]{\mathord{\stackrel{\raisebox{-.5ex}%
-{\tiny\boldmath$\mathord{\rightarrow}$}}{{}#1}}}
+\protected\def\pmvec#1{%
+ \mathord{\stackrel{\raisebox{-.5ex}{\tiny\boldmath$\mathord{\rightarrow}$}}%
+ {{}#1}%
+ }%
+}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\fouriervec}
@@ -7584,7 +7803,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% Some public macros to modify our private internals, and
% we will use them also ourself.
%
-% In version |1.1| we add the possibility to have two
+% In version \mstrelease{1.1} we add the possibility to have two
% distinct font shapes for letters and digits. So in fact
% we could as well have two really unrelated fonts but
% this is really not the spirit of the package.
@@ -7594,7 +7813,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% same time not modifying the \cs{familydefault} or \cs{romandefault}
% etc\dots
%
-% At time of |1.3za| I considered letting |LGRgreeks| and |selfGreeks|
+% At time of \mstrelease{1.3za} I considered letting |LGRgreeks| and |selfGreeks|
% support \cs{MTgreekfont} and this needed a chaneg to \cs{MTfamily}
% here but I dropped the idea. Too wary of documentation changes.
% \begin{macrocode}
@@ -7622,14 +7841,14 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \begin{macro}{\MTitGreek}
% \begin{macro}{\MTupGreek}
% \begin{macro}{\MTgreekfont}
-% |1.15c|: These new macros can be used in-between calls to \cs{Mathastext}.
+% \mstrelease{1.15c}: These new macros can be used in-between calls to \cs{Mathastext}.
% They reset the shapes for Greek letters (applies to LGRgreek(s) and
% selfGreek(s) options). The \cs{MTgreekfont} presupposes either LGRgreek or
% selfGreek (it is inoperant under |LGRgreeks| or |selfGreeks|).
% |\MTgreekfont{\familydefault}| is somewhat like using LGRgreeks or
% selfGreeks.
%
-% At time of |1.3za| I let \cs{MTgreekfont} also have an effect under option
+% At time of \mstrelease{1.3za} I let \cs{MTgreekfont} also have an effect under option
% |LGRgreeks| or |selfGreeks|, via a refactoring which also modified \cs{MTfamily}.
% \begin{macrocode}
\newcommand*\MTitgreek{\mst@itgreektrue\mst@upgreekfalse\def\mst@greek@select{0}}
@@ -7648,55 +7867,359 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \end{macro}
% \end{macro}
% \end{macro}
+%
% At (long...) last we now change the font for the letters of the
-% latin alphabet. In version |1.1|, Latin letters have their own font
+% latin alphabet. In version \mstrelease{1.1}, Latin letters have their own font
% (shape).
%
-% |1.2b| initiated the use of mathematically active letters to insert the italic
-% corrections. With version |1.3| the use of math active letters is also for
-% extra muglue added before and after the letters. Use of |\@for| to shorten the
-% code initiated with release |1.3|.
+% \mstrelease{1.2b} |2012/12/28| now that we understand the great advantages of |"8000|
+% we do it also for all letters a-z and A-Z to insert automatically the
+% italic corrections. See the \hyperref[sec:ic]{discussion} in the user
+% manual. Ironically I wrote the code initially for the |italic| option only
+% to realize later it was more suitable to using an \emph{upright} text font
+% in math mode! So this mathematical activation of the letters is not done if
+% the font shape is detected to be |it| or |sl|; to bypass this the command
+% \cs{MTicinmath} is provided.
+%
+% \mstrelease{1.2e} |2013/01/10| corrects a bad oversight of \mstrelease{1.2b} in
+% \cs{mst@mathactivate} which made the reproduction of the user manual
+% illustrations with |$f_i^i$| impossible. As \cs{mst@mathactivate} was
+% originally used also to get the non-letters obey math alphabet while
+% maintaining the \TeX{} spacings, it added no extra braces. The braces
+% should however be added for expansion of math active letters, in order of
+% things like |x^y| to work as expected. (the group braces do not prevent
+% ligatures when the letters are arguments to the math alphabet commands,
+% the added macros \cs{mst@itcorr} and \cs{mst@before@<letter>} expanding to
+% nothing).
+%
+% Added note |2016/01/06|: it should be explicitly said that the extra
+% |{..}| in |\mst@mathactivate| for letters end up creating |\hbox|'es
+% around each letter with its extra skips and explicit italic correction,
+% when present. These skips are thus set at natural width and do not add
+% any break point.
+%
+% Added note at \mstrelease{1.4}: the extra pair of braces is inserted here
+% at \cs{mst@DeclareMathLetter}, not at \cs{mst@mathactivate}.
+%
+% \mstrelease{1.3} |2013/09/02| extends the use of mathematically active letters to
+% allow the user to specify muglue before and after the letter itself (see
+% \cs{MTsetmathskips}, below).
+% Mathematically active letters were previously used only to add the italic
+% correction; the math activation has now been separated and put in
+% \cs{MTmathactiveletters}. There is also \cs{MTmathactiveLetters} to allow
+% math activation only for the uppercase letters. To cancel the (now default,
+% even with option |italic|) math
+% activation of letters, there is \cs{MTmathstandardletters}. Version \mstrelease{1.3a}
+% removes some silly |\string|'s from the code, which prevented to pass
+% macros as first argument to the command.
+%
+% Added note |2016/01/06|:
+% Notice that the initially |\relax| tokens \verb+\mst@[before|after]@<letter>+
+% formed with |\csname...\endcsname| do not modify TeX's math layout:
+% |{\relax f\relax}| is like |f| (also for ligatures inside |\mathrm| for
+% example).
+%
+% The code here was refactored at \mstrelease{1.4} and this simplified
+% \cs{mst@mathactivate} definition.
+%
+% The \cs{mst@before}\meta{letter} were renamed at \mstrelease{1.4} into
+% \cs{mst@before@}\meta{letter} and are incorporated at the
+% \cs{mst@DeclareMathLetter} location. Formerly \cs{mst@}\meta{letter} was
+% only the math symbol, now \cs{MTmathcharletter}\meta{letter} is used for that and
+% \cs{MTcommandletter}\meta{letter} is the whole thing to which the active letter
+% expands (the definition of the active letter done by \cs{mst@mathactivate}
+% is done with a \cs{def}, not a \cs{let}).
+% \begin{macro}{\mst@DeclareMathLetter}
+%
+% \mstrelease{1.4b} adds |noletters| option.
% \begin{macrocode}
-\def\mst@DeclareMathLetter #1{%
+\ifmst@noletters
+ \let\MTmathactiveletters\@empty
+ \let\MTmathactiveLetters\@empty
+ \let\MTmathstandardletters\@empty
+\else
+\def\mst@DeclareMathLetter#1#2#3#4#5{%
\DeclareMathSymbol {#1}{\mathalpha}{mtletterfont}{`#1}%
- \expandafter
- \DeclareMathSymbol \csname mst@#1\endcsname{\mathalpha}{mtletterfont}{`#1}%
- \expandafter\mst@addtodo@az\expandafter #1\csname mst@#1\endcsname
+ \DeclareMathSymbol {#4}{\mathalpha}{mtletterfont}{`#1}%
+ \def#2{{#3#4#5\mst@itcorr}}%
+}%
+\@tfor\mst@tmp:=abcdefghijklmnopqrstuvwxyz\do{%
+ \expandafter\expandafter\expandafter\mst@DeclareMathLetter
+ \expandafter\mst@tmp
+ \csname MTcommandletter\mst@tmp\expandafter\endcsname
+ \csname mst@before@\mst@tmp\expandafter\endcsname
+ \csname MTmathcharletter\mst@tmp\expandafter\endcsname
+ \csname mst@after@\mst@tmp\endcsname
}%
-\@tfor\mst@tmp:=abcdefghijklmnopqrstuvwxyz\do
- {\expandafter\mst@DeclareMathLetter\mst@tmp}%
\ifmst@frenchmath \def\mst@font@tbu{mtoperatorfont}%
\else \def\mst@font@tbu{mtletterfont}%
\fi
-\def\mst@DeclareMathLetter #1{%
+\def\mst@DeclareMathLetter #1#2#3#4#5{%
\DeclareMathSymbol {#1}{\mathalpha}{\mst@font@tbu}{`#1}%
- \expandafter
- \DeclareMathSymbol \csname mst@#1\endcsname{\mathalpha}{\mst@font@tbu}{`#1}%
- \expandafter\mst@addtodo@AZ\expandafter #1\csname mst@#1\endcsname
+ \DeclareMathSymbol {#4}{\mathalpha}{\mst@font@tbu}{`#1}%
+ \def#2{{#3#4#5\mst@ITcorr}}%
}%
-\@tfor\mst@tmp:=ABCDEFGHIJKLMNOPQRSTUVWXYZ\do
- {\expandafter\mst@DeclareMathLetter\mst@tmp}%
-\let\mst@DeclareMathLetter\relax
+\@tfor\mst@tmp:=ABCDEFGHIJKLMNOPQRSTUVWXYZ\do{%
+ \expandafter\expandafter\expandafter\mst@DeclareMathLetter
+ \expandafter\mst@tmp
+ \csname MTcommandletter\mst@tmp\expandafter\endcsname
+ \csname mst@before@\mst@tmp\expandafter\endcsname
+ \csname MTmathcharletter\mst@tmp\expandafter\endcsname
+ \csname mst@after@\mst@tmp\endcsname
+}%
+\def\mst@mathactivate@lowercase{%
+ \@tfor\mst@tmp:=abcdefghijklmnopqrstuvwxyz\do{%
+ \expandafter\expandafter\expandafter
+ \mst@mathactivate\expandafter\mst@tmp\csname MTcommandletter\mst@tmp\endcsname{}%
+ }%
+}%
+\def\mst@mathactivate@uppercase{%
+ \@tfor\mst@tmp:=ABCDEFGHIJKLMNOPQRSTUVWXYZ\do{%
+ \expandafter\expandafter\expandafter
+ \mst@mathactivate\expandafter\mst@tmp\csname MTcommandletter\mst@tmp\endcsname{}%
+ }%
+}%
+\def\mst@mathdeactivate@lowercase{%
+ \@tfor\mst@tmp:=abcdefghijklmnopqrstuvwxyz\do{%
+ \expandafter\mathcode\expandafter`\mst@tmp=\csname MTmathcharletter\mst@tmp\endcsname
+ }%
+}%
+\def\mst@mathdeactivate@uppercase{%
+ \@tfor\mst@tmp:=ABCDEFGHIJKLMNOPQRSTUVWXYZ\do{%
+ \expandafter\mathcode\expandafter`\mst@tmp=\csname MTmathcharletter\mst@tmp\endcsname
+ }%
+}%
+% \end{macrocode}
+% We redo the definitions with some added layer (silly because will never
+% happen in pratice that a letter is Babel-active) related to
+% \cs{mst@do@activecase} in \ctanpkg{babel} context.
+% \begin{macrocode}
+\ifmst@everymath
+\else
+ \def\mst@mathdeactivate@lowercase{%
+ \@tfor\mst@tmp:=abcdefghijklmnopqrstuvwxyz\do{%
+ \expandafter\mathcode\expandafter`\mst@tmp=
+ \csname MTmathcharletter\mst@tmp\endcsname
+ }%
+ }%
+ \def\mst@mathdeactivate@uppercase{%
+ \@tfor\mst@tmp:=ABCDEFGHIJKLMNOPQRSTUVWXYZ\do{%
+ \expandafter\mathcode\expandafter`\mst@tmp=
+ \csname MTmathcharletter\mst@tmp\endcsname
+ }%
+ }%
+\fi
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\MTmathactiveletters}
+% \begin{macro}{\MTmathstandardletters}
+%
+% Important changes at \mstrelease{1.4}.
+%
+% Ascii letters are math-activated at package loading time, rather than again and
+% again each time math mode is entered. But not under |subdued| mode, then
+% the activation is done as part of switching to some math version.
+%
+% The ordering in this code source is a bit of a mess, and it may be too early
+% here to execute \cs{MTmathactiveletters} (I think it is fine now after some
+% major moving around of code chunks but will not waste time checking
+% it) so this will be postponed to end of package loading. Prior to
+% \mstrelease{1.4} \cs{MTmathactiveletters} could be executed here as it only
+% set some toggle to be obeyed at every math mode entrance.
+% \begin{macrocode}
+\def\mst@mathactivateletters{%
+ \mst@mathactivate@lowercase
+ \mst@mathactivate@uppercase
+}%
+\newcommand*\MTmathactiveletters{%
+ \mst@OnlyIfNotSubdued
+ \mst@mathactivateletters
+}%
+\AtEndOfPackage{\MTmathactiveletters}%
+% \end{macrocode}
+% Duplication due to some legacy reasons, do not rely on these internal
+% macro names, beware they change at future release.
+% \begin{macrocode}
+\def\mst@mathactivateLetters{\mst@activate@uppercase}%
+\newcommand*\MTmathactiveLetters{%
+ \mst@OnlyIfNotSubdued
+ \mst@mathactivateLetters
+}%
+\newcommand*\MTmathstandardletters{%
+ \mst@mathdeactivate@lowercase
+ \mst@mathdeactivate@uppercase
+}%
+\fi
+% \end{macrocode}
+% \end{macro}\end{macro}
+% \begin{macro}{\MTicinmath}
+% \begin{macro}{\MTICinmath}
+% \begin{macro}{\MTnoicinmath}
+% \begin{macro}{\MTicalsoinmathxx}
+% \cs{MTnoicinmath} can also be used from inside math mode.
+%
+% \cs{MTicalsoinmathxx} is destined to be used inside
+% \cs{mathnormalbold} as I didn't want to add the complication of
+% extracting the family number used inside \cs{mathnormalbold} (will
+% perhaps come back if I have time to spend on
+% |source2e|). Added note |2016/01/06|: this number is a priori simply
+% |symmtletterfont+1|.
+%
+% \cs{MTicinmath} can also be used inside math mode, to revert an
+% earlier \cs{MTnoicinmath} from inside the same math group.
+%
+% \mstrelease{1.3i} |2016/01/06|: For some reason which I have now forgotten I did
+% until then:
+% \begin{verbatim}
+% \def\mst@itcorr{\ifnum\fam=\m@ne\/\else\ifnum\fam=\symmtletterfont\/\fi\fi}%
+% \end{verbatim}
+% hence italic corrections were also applied inside \cs{mathnormal} (for
+% upright fonts; \cs{mathnormalbold} math alphabet was not treated like
+% \cs{mathnormal}). I now drop this to be more in sync with the handling
+% of the extra skips around letters. Everything gets suppressed inside
+% all math alphabets, allowing ligatures, even for \cs{mathnormal}.
+%
+% \begin{macrocode}
+\newcommand*\MTicinmath{%
+ \MTmathactiveletters
+ \def\mst@itcorr{\ifnum\fam=\m@ne\/\fi}%
+ \let\mst@ITcorr\mst@itcorr
+}
+\newcommand*\MTICinmath{%
+ \MTmathactiveLetters
+ \def\mst@ITcorr{\ifnum\fam=\m@ne\/\fi}%
+}
+\newcommand*\MTnoicinmath{\let\mst@itcorr\@empty\let\mst@ITcorr\@empty}
+\newcommand*\MTnoICinmath{\let\mst@ITcorr\@empty}
+\newcommand*\MTicalsoinmathxx{%
+ \ifx\mst@itcorr\@empty\else\def\mst@itcorr{\/}\fi
+ \ifx\mst@ITcorr\@empty\else\def\mst@ITcorr{\/}\fi
+}
+% \end{macrocode}
+% \end{macro}\end{macro}\end{macro}\end{macro}
+% \begin{macro}{\MTsetmathskips}
+% \begin{macro}{\MTunsetmathskips}
+% \mstrelease{1.3} |2013/09/02|: user level command to specify extra spaces in math mode
+% around the letters (only the 7bit a,b,..,z and A,B,..,Z). First parameter is
+% the letter, second is the math skip to be inserted before, and third the
+% skip to be inserted after; for example \cs{thickmuskip} or explicitly
+% |0.1mu|.
+%
+% For this, letters are made mathematically active. This is now the package
+% default (version \mstrelease{1.2} did this only in the absence of option |italic|, or
+% more precisely when the font used was not of shape |it| or |sl|). But if
+% \cs{MTsetmathskips} has not been used for that letter, the only effect of
+% the math activation is, as in \mstrelease{1.2}, to add the italic correction
+% automatically, except when the font shape is detected to be |it| or |sl|; in
+% these latter cases, although mathematically active, the letter acts in the
+% standard way.
+%
+% The command \cs{MTmathstandardletters} turns off math activation and its
+% effects for all letters.
+%
+% Ligatures within the argument of a math alphabet command are impeached by
+% skips; so \cs{MTunsetmathskips} is provided to cancel the skips for one
+% specific letter (|f| for example).
+%
+% \mstrelease{1.3a} |2013/09/04|: I strangely had |\string#1| inside \cs{MTsetmathskips}.
+% Phobic of catcode active letters... but with |\string| one needs some
+% |\expandafter| to use \cs{MTsetmathskips} in an |\@for| loop for example. It
+% is better to allow the first argument to be a macro or anything expanding to
+% a letter, and to not be paranoid about improbable catcode active letters
+% (the user just has to tame them at the time of the \cs{MTsetmathskip}) so I
+% take out these |\string|'s.
+%
+% \mstrelease{1.3i} |2016/01/06|: the extra skips are suppressed for the arguments of
+% math alphabet commands. This applies in particular for amsmath's
+% \cs{DeclareMathOperator}.
+%
+% \begin{macrocode}
+\newcommand*\MTsetmathskips[3]{%
+ \@namedef{mst@before@#1}{\ifnum\fam=\m@ne\mskip#2\relax\fi}%
+ \@namedef{mst@after@#1}{\ifnum\fam=\m@ne\mskip#3\relax\fi}%
+}
+\newcommand*\MTunsetmathskips[1]{%
+ \@namedef{mst@before@#1}{}%
+ \@namedef{mst@after@#1}{}%
+}
+% \end{macrocode}
+% \end{macro}\end{macro}
+% \begin{macro}{\mst@DeclareMathDigit}
+% \begin{macro}{\MTmathactivedigits}
+% \begin{macro}{\MTmathstandarddigits}
+% In version \mstrelease{1.1}, we have now separated digits from letters, so paradoxically
+% it is less problematic to give them the |mathalpha| type.
+%
+% \mstrelease{1.4} had defined some no-op \cs{MTmathstandarddigits} and
+% \cs{MTmathactivedigits} but if not under option |nodigits|. As they are
+% used in \cs{MTeverymathoff} and \cs{MTeverymathdefault} though this broke
+% the option |nodigits| (either with |subdued| or when using \cs{MTversion}).
+%
+% Defining them as \cs{empty} so that \LaTeX{} defensive mechanism with
+% \cs{newcommand} works but this is sooooooo hypothetical context!
+% \begin{macrocode}
+\let\MTmathactivedigits\empty
+\let\MTmathstandarddigits\empty
\ifmst@nodigits\else
-\def\mst@font@tbu{mtoperatorfont}%
+ \def\mst@font@tbu{mtoperatorfont}%
+ \ifmst@symboldigits \def\mst@font@tbu{mtpsymbol}\fi
+ \ifmst@eulerdigits \def\mst@font@tbu{mteulervm}\fi
+ \DeclareMathSymbol{0}{\mathalpha}{\mst@font@tbu}{`0}%
+ \DeclareMathSymbol{1}{\mathalpha}{\mst@font@tbu}{`1}%
+ \DeclareMathSymbol{2}{\mathalpha}{\mst@font@tbu}{`2}%
+ \DeclareMathSymbol{3}{\mathalpha}{\mst@font@tbu}{`3}%
+ \DeclareMathSymbol{4}{\mathalpha}{\mst@font@tbu}{`4}%
+ \DeclareMathSymbol{5}{\mathalpha}{\mst@font@tbu}{`5}%
+ \DeclareMathSymbol{6}{\mathalpha}{\mst@font@tbu}{`6}%
+ \DeclareMathSymbol{7}{\mathalpha}{\mst@font@tbu}{`7}%
+ \DeclareMathSymbol{8}{\mathalpha}{\mst@font@tbu}{`8}%
+ \DeclareMathSymbol{9}{\mathalpha}{\mst@font@tbu}{`9}%
% \end{macrocode}
-% In version |1.1|, we have now separated digits from letters, so paradoxically
-% it is less problematic to give them the |mathalpha| type.
-% \begin{macrocode}
-\ifmst@symboldigits \def\mst@font@tbu{mtpsymbol} \fi
-\ifmst@eulerdigits \def\mst@font@tbu{mteulervm} \fi
-\DeclareMathSymbol{0}{\mathalpha}{\mst@font@tbu}{`0}%
-\DeclareMathSymbol{1}{\mathalpha}{\mst@font@tbu}{`1}%
-\DeclareMathSymbol{2}{\mathalpha}{\mst@font@tbu}{`2}%
-\DeclareMathSymbol{3}{\mathalpha}{\mst@font@tbu}{`3}%
-\DeclareMathSymbol{4}{\mathalpha}{\mst@font@tbu}{`4}%
-\DeclareMathSymbol{5}{\mathalpha}{\mst@font@tbu}{`5}%
-\DeclareMathSymbol{6}{\mathalpha}{\mst@font@tbu}{`6}%
-\DeclareMathSymbol{7}{\mathalpha}{\mst@font@tbu}{`7}%
-\DeclareMathSymbol{8}{\mathalpha}{\mst@font@tbu}{`8}%
-\DeclareMathSymbol{9}{\mathalpha}{\mst@font@tbu}{`9}%
+% \mstrelease{1.4} adds possibility of mathematically active digits.
+% \begin{macrocode}
+ \ifmst@activedigits
+ \def\mst@DeclareMathDigit #1#2#3{%
+ \DeclareMathSymbol{#3}{\mathalpha}{\mst@font@tbu}{`#1}%
+ \def#2{#3}%
+ }%
+ \@tfor\mst@tmp:=0123456789\do{%
+ \expandafter\expandafter\expandafter\mst@DeclareMathDigit
+ \expandafter\mst@tmp
+ \csname MTcommanddigit\romannumeral\mst@tmp\expandafter\endcsname
+ \csname MTmathchardigit\romannumeral\mst@tmp\endcsname
+ }%
+ \def\mst@mathactivatedigits{%
+ \@tfor\mst@tmp:=0123456789\do{%
+ \expandafter\expandafter\expandafter\mst@mathactivate
+ \expandafter\mst@tmp\csname MTcommanddigit\romannumeral\mst@tmp\endcsname{}%
+ }%
+ }%
+ \def\MTmathactivedigits{\mst@OnlyIfNotSubdued\mst@mathactivatedigits}%
+ \MTmathactivedigits
+ \ifmst@everymath
+ \def\MTmathstandarddigits{%
+ \@tfor\mst@tmp:=0123456789\do{%
+ \expandafter\mathcode\expandafter`\mst@tmp
+ =\csname MTmathchardigit\romannumeral\mst@tmp\endcsname
+ }%
+ }%
+ \else
+% \end{macrocode}
+% We inject some extra layer (silly because will never happen in pratice
+% that a digit token is Babel-active) related to \cs{mst@do@activecase} in
+% \ctanpkg{babel} context.
+% \begin{macrocode}
+ \def\MTmathstandarddigits{%
+ \@tfor\mst@tmp:=0123456789\do{%
+ \expandafter\mathcode\expandafter`\mst@tmp
+ =\csname MTmathchardigit\romannumeral\mst@tmp\endcsname
+ }%
+ }%
+ \fi
+ \fi
\fi
% \end{macrocode}
+% \end{macro}\end{macro}\end{macro}
% When |symboldelimiters| is passed as an option, we use the
% Symbol font for the printable characters other than
% letters and digits.
@@ -7709,7 +8232,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\def\mst@font@tbu{mtoperatorfont}%
\fi
% \end{macrocode}
-% |1.2| adds the tricks to let non letters/digits obey math alphabets. We have
+% \mstrelease{1.2} adds the tricks to let non letters/digits obey math alphabets. We have
% to double the definitions for easy switch on-off of the mechanism, via a token
% list which is put into \cs{everymath} and \cs{everydisplay}.
% \begin{macrocode}
@@ -7727,7 +8250,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \begin{macro}{\mst@@doasterisk}
% \begin{macro}{\MTnormalasterisk}
% \begin{macro}{\MTactiveasterisk}
-% |1.12d| The \cs{ast} or |*| is defined in |fontmath.ltx| as a binary
+% \mstrelease{1.12d} The \cs{ast} or |*| is defined in |fontmath.ltx| as a binary
% operator from the |symbols| font. Usually the asterisk from the text
% font is in a raised position. Previous versions of \mst did nothing
% with \cs{ast} but strangely defined |*| to be the one from the text
@@ -7740,61 +8263,100 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% The user macro \cs{MTlowerast} sets the amount
% of lowering to be applied to the text asterisk.
%
-% |1.12e| Somehow there was a big omission in |1.12d|, the
+% \mstrelease{1.12e} Somehow there was a big omission in \mstrelease{1.12d}, the
% command \cs{MTlowerast} as described in the manual was missing!
%
-% nota bene: it is assumed that |*| is of type |other| when \mst
-% is loaded... it should neither be active, nor of type |letter|!
+% \mstrelease{1.3i} adds \cs{MTnormalasterisk} and \cs{MTactiveasterisk}.
+% They do nothing if package is loaded without option |asterisk|.
+%
+% \mstrelease{1.4} uses \cs{protected} rather than robust commands.
+% And implements the support for the new default of not using \cs{everymath}.
%
-% |1.3i| adds \cs{MTnormalasterisk} and \cs{MTactiveasterisk}. They do nothing
-% without option |asterisk|.
+% The first two \cs{newcommand*} are because the commands were previously
+% defined unconditionally anyhow, in a way making them no-op's without
+% option |asterisk|. Finally using \cs{let} here with \cs{empty} with
+% the idea of less impact on \TeX{} internals, but losing \LaTeX{} check.
% \begin{macrocode}
-\def\mst@@doasterisk{\let\ast\mst@ast\mst@mathactivate*{}\mst@ast}%
-\newcommand*\MTnormalasterisk {\let\mst@doasterisk\relax}
-\newcommand*\MTactiveasterisk {\let\mst@doasterisk\mst@@doasterisk}
+\let\MTnormalasterisk\empty
+\let\MTactiveasterisk\empty
\ifmst@asterisk\mst@infoline{asterisk: \string\ast\space and *}
- \AtBeginDocument{%
- \everymath\expandafter
- {\the\everymath \mst@doasterisk \MTnormalasterisk }%
- \everydisplay\expandafter
- {\the\everydisplay\mst@doasterisk \MTnormalasterisk }}
\ifmst@symbolmisc
- \def\mst@bin@ast{%
- \mathbin{\mathchoice{\raisebox{-.1\height}%
- {\the\textfont\symmtpsymbol\char42}}%
- {\raisebox{-.1\height}%
- {\the\textfont\symmtpsymbol\char42}}%
- {\raisebox{-.1\height}%
- {\the\scriptfont\symmtpsymbol\char42}}%
- {\raisebox{-.1\height}%
- {\the\scriptscriptfont\symmtpsymbol\char42}}}}%
+ \protected\def\mst@bin@ast{\mathbin{\mathchoice
+ {\raisebox{-.1\height}{\the\textfont\symmtpsymbol\char42}}%
+ {\raisebox{-.1\height}{\the\textfont\symmtpsymbol\char42}}%
+ {\raisebox{-.1\height}{\the\scriptfont\symmtpsymbol\char42}}%
+ {\raisebox{-.1\height}{\the\scriptscriptfont\symmtpsymbol\char42}}}%
+ }%
\else
- \def\mst@bin@ast{%
- \mathbin{\mathchoice{\raisebox{-\mst@lowerast}%
- {\the\textfont\symmtoperatorfont\char42}}%
- {\raisebox{-\mst@lowerast}%
- {\the\textfont\symmtoperatorfont\char42}}%
- {\raisebox{-\mst@lowerast}%
- {\the\scriptfont\symmtoperatorfont\char42}}%
- {\raisebox{-\mst@lowerast}%
- {\the\scriptscriptfont\symmtoperatorfont\char42}}}}%
+ \protected\def\mst@bin@ast{\mathbin{\mathchoice
+ {\raisebox{-\mst@lowerast}{\the\textfont\symmtoperatorfont\char42}}%
+ {\raisebox{-\mst@lowerast}{\the\textfont\symmtoperatorfont\char42}}%
+ {\raisebox{-\mst@lowerast}{\the\scriptfont\symmtoperatorfont\char42}}%
+ {\raisebox{-\mst@lowerast}{\the\scriptscriptfont\symmtoperatorfont\char42}}}%
+ }%
\fi
- \def\mst@varfam@ast{\ifnum\fam=\m@ne\mst@bin@ast\else
- \mathbin{\mathchoice{\raisebox{-\mst@lowerast}%
- {\the\textfont\fam\char42}}%
- {\raisebox{-\mst@lowerast}%
- {\the\textfont\fam\char42}}%
- {\raisebox{-\mst@lowerast}%
- {\the\scriptfont\fam\char42}}%
- {\raisebox{-\mst@lowerast}%
- {\the\scriptscriptfont\fam\char42}}}\fi}%
- \MTactiveasterisk
- \DeclareRobustCommand*{\mst@ast}{\mst@bin@ast}
+ \protected\def\mst@varfam@ast{\ifnum\fam=\m@ne
+ \mst@bin@ast
+ \else
+ \mathbin{\mathchoice
+ {\raisebox{-\mst@lowerast}{\the\textfont\fam\char42}}%
+ {\raisebox{-\mst@lowerast}{\the\textfont\fam\char42}}%
+ {\raisebox{-\mst@lowerast}{\the\scriptfont\fam\char42}}%
+ {\raisebox{-\mst@lowerast}{\the\scriptscriptfont\fam\char42}}}%
+ \fi}%
+ \let\mst@ast\mst@bin@ast
\newcommand*\MTlowerast[1]{\def\mst@lowerast{#1}}
\MTlowerast{.3\height}
- \mst@do@easynonletters\expandafter\expandafter\expandafter
- {\expandafter\the\expandafter\mst@do@easynonletters
- \expandafter\def\csname mst@ast \endcsname{\mst@varfam@ast}}
+% \end{macrocode}
+% Arguably \mst should have used the ``hard'' non-letters affiliation here.
+% Probably too late to change this in 2024... and costly in documentation
+% time.
+% \begin{macrocode}
+ \mst@do@easynonletters\expandafter{%
+ \the\mst@do@easynonletters\let\mst@ast\mst@varfam@ast
+ }%
+ \ifmst@everymath
+ \def\mst@@doasterisk {\let\ast\mst@ast\mst@mathactivate*{}\mst@ast}%
+ \def\MTnormalasterisk {\let\mst@doasterisk\relax}
+ \def\MTactiveasterisk {\let\mst@doasterisk\mst@@doasterisk}
+ \MTactiveasterisk
+ \AtBeginDocument{%
+ \everymath\expandafter
+ {\the\everymath \mst@doasterisk \MTnormalasterisk }%
+ \everydisplay\expandafter
+ {\the\everydisplay\mst@doasterisk \MTnormalasterisk }%
+ }%
+ \else
+ \def\MTnormalasterisk{\AtBeginDocument{\MTnormalasterisk}}
+ \def\MTactiveasterisk{\AtBeginDocument{\MTactiveasterisk}}
+% \end{macrocode}
+% For legacy reasons the responsiveness to math alphabets is made part of the
+% handling of ``easy'' non letters (probably because it is on per default),
+% and this causes me problems of internal logic and even more annoyingly of
+% documentation. I am leaving this standing because it would be too much of a
+% pain at this stage to document a change and it was already quite annoying to
+% better document actual situation.
+% \begin{macrocode}
+ \mst@undo@easynonletters\expandafter{%
+ \the\mst@do@easynonletters\let\mst@ast\mst@bin@ast
+ }%
+% \end{macrocode}
+% For legacy reasons the action of \cs{MTactiveasterisk} is not testing if
+% in |subdued| mode.
+%
+% MEMO: if |subdued| there is \cs{MTeverymathoff} added to |\begin{document}|
+% near end of package and it will do \cs{MTnormalasterisk}.
+% \begin{macrocode}
+ \AtBeginDocument{%
+ \let\mst@orig@abd@ast\ast
+ \edef\MTnormalasterisk{\noexpand\mst@mathdeactivate*{\the\mathcode`\*}%
+ \let\noexpand\ast\noexpand\mst@orig@abd@ast}%
+ \def\MTactiveasterisk{\def\ast{\mst@ast}%
+ \mst@mathactivate*{}\mst@ast
+ }%
+ \MTactiveasterisk
+ }
+ \fi
\fi
% \end{macrocode}
% \end{macro}\end{macro}\end{macro}\end{macro}\end{macro}
@@ -7807,17 +8369,19 @@ defaultbf,defaultit,defaultsf,defaulttt}}
%
% [(Dec. 2012) should I reexamine these definitive sounding remarks?]
%
-% |1.3x| of |2022/11/03| adds support for |ncccomma| option.
+% \begin{macro}{ncccomma}
+% \begin{macro}{decimalcomma}
+% \mstrelease{1.3y} of |2022/11/03| adds support for |ncccomma| option.
%
% Some non-obvious hack is needed for compatibility with our home-made
% mechanism of non-letters obeying math alphabet commands. Alternative would
-% have been to not load at all \ctanpkg{ncccomma} (or since |1.3zb|
+% have been to not load at all \ctanpkg{ncccomma} (or since \mstrelease{1.3zb}
% \ctanpkg{decimalcomma}) and provide the functionality purely by our own
% means; because here in order to support \cs{MTnonlettersobeymathxx} we are
% almost contrived to override quasi entirely the contents of these tiny
% packages.
%
-% |1.3zb| adds support for the |decimalcomma| option. This was mandatory to
+% \mstrelease{1.3zb} adds support for the |decimalcomma| option. This was mandatory to
% keep a compatibility layer with \ctanpkg{frenchmath} after its |2.7| release
% of |2023/12/23|.
%
@@ -7838,7 +8402,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\RequirePackage{decimalcomma}[2023/12/28]% 1.3 or later
% \end{macrocode}
% Attention
-% that the breaking behavior of \cs{AtBeginDocument} at October 2020
+% that the \textbf{BREAKING CHANGE} to \cs{AtBeginDocument} at October 2020
% \LaTeX{} release means that, \emph{taking into account that \emph{\mst} already has
% employed some \emph{\cs{AtBeginDocument}} prior to loading} \ctanpkg{decimalcomma}, any
% code here will be executed \textbf{BEFORE} the \cs{AtBeginDocument} material
@@ -7855,7 +8419,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% latter for which \ctanpkg{babel-french} has a dectection mechanism, which as
% a result avoids the bad interactions with \ctanpkg{numprint} plus its
% |autolanguage| option, which are mentioned below in the \ctanpkg{ncccomma}
-% branch. So we don't need here the workaround done below is in the
+% branch. So we don't need here the workaround done below in the
% |ncccomma| branch. Notice though that in both cases, the `intelligent'
% comma feature will be applied to the whole document, even inside those
% portions where the user has switched to another language such as English.
@@ -7884,19 +8448,26 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\let\mathcomma\mst@varfam@comma
\let\sm@rtcomma\mst@sm@rtcomma
}
- \else % end of decimalcomma branch
- \ifmst@ncccomma
- \mst@infoline{loading package ncccomma for `smart comma\string'}
- \RequirePackage{ncccomma}%
+ \ifmst@everymath
+ \else
+ \edef\mst@tmp{\mathchardef\mathcomma=\the\mathcode`\,\relax}%
+ \mst@undo@nonletters\expandafter\expandafter\expandafter
+ {\expandafter\mst@tmp\the\mst@undo@nonletters}%
+ \fi
+ \else
% \end{macrocode}
% Work around some bad interaction of \ctanpkg{ncccomma}, \ctanpkg{numprint}
% with |autolanguage| and \ctanpkg{babel-french}. See
% \centeredline{\url{https://github.com/latex3/babel/issues/190}} for
-% background. Some hesitation whether I should use the \cs{noextrasfrench}
-% to work around \ctanpkg{babel-french} code influencing non-French sections
-% in the document. Update: I think the last sentence means I was hesitating
-% at time of |1.3x| whether to insert some extra code inside the \cs{noextrasfrench}.
+% background. Some hesitation whether I should use the \cs{noextrasfrench} to
+% work around \ctanpkg{babel-french} code influencing non-French sections in
+% the document. Update: I think the last sentence means I was hesitating at
+% time of \mstrelease{1.3y} whether to insert some extra code inside the
+% \cs{noextrasfrench}.
% \begin{macrocode}
+ \ifmst@ncccomma
+ \mst@infoline{loading package ncccomma for `smart comma\string'}
+ \RequirePackage{ncccomma}%
\AtBeginDocument{%
\mathcode`\,="8000\relax
\@ifpackageloaded{babel}{%
@@ -7918,34 +8489,77 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\let\mathcomma\mst@varfam@comma
\let\NCC@comma\mst@NCC@comma
}
- \else % neither ncccomma nor decimalcomma
+ \ifmst@everymath
+ \else
+% \end{macrocode}
+% Attention that \ctanpkg{ncccomma} (contrarily to \ctanpkg{icomma} loaded by
+% \ctanpkg{decimalcomma} has made the comma math active already when we loaded it.
+% So we don't use |\the\mathcode`\,\relax| here.
+% \begin{macrocode}
+ \edef\mst@tmp{\mathchardef\mathcomma=\the\mathcomma\relax}%
+ \mst@undo@nonletters\expandafter\expandafter\expandafter
+ {\expandafter\mst@tmp\the\mst@undo@nonletters}%
+ \fi
+ \else
+% \end{macrocode}
+% Neither option |ncccomma| nor |decimalcomma|. The \mstrelease{1.4} non-use
+% of \cs{everymath} and consequences is accounted for automatically by
+% \cs{mst@addtodo@nonletters}.
+% \begin{macrocode}
\expandafter\mst@addtodo@nonletters\string,\mathpunct\mst@varfam@comma
\fi\fi
+% \end{macrocode}
+% math dot.
+% \begin{macrocode}
\DeclareMathSymbol{.}{\mathord}{\mst@font@tbu}{"2E}
\DeclareMathSymbol{\mst@varfam@dot}{\mathalpha}{\mst@font@tbu}{"2E}
\mst@addtodo@easynonletters\.\mst@varfam@dot
- \DeclareMathSymbol{:}{\mathrel}{\mst@font@tbu}{"3A} % relation spacing
+% \end{macrocode}
+% math colon.
+% \begin{macrocode}
+ \DeclareMathSymbol{:}{\mathrel}{\mst@font@tbu}{"3A}
\DeclareMathSymbol{\mst@varfam@colon}{\mathalpha}{\mst@font@tbu}{"3A}
\expandafter\mst@addtodo@nonletters\string:\mathrel\mst@varfam@colon
\@ifpackageloaded{amsmath}
- {} % \colon defined in amsmath.sty in terms of : with some enlarged explicit
- % spacing. No need to intervene.
- {% no amsmath, use standard punctuation spacing
+% \end{macrocode}
+% \cs{colon} gets defined in \ctanpkg{amsmath} in terms of |:| with some enlarged explicit
+% spacing. No need to intervene.
+% \begin{macrocode}
+ {}
+% \end{macrocode}
+% No \ctanpkg{amsmath}, use standard punctuation spacing.
+%
+% The reason for |\et\colon\undefined| is if some package has redefined
+% \cs{colon} which then can not be used in \cs{DeclareMathSymbol} anymore (we
+% shamelessly overwrite...)
+% \begin{macrocode}
+ {%
\let\colon\undefined
- % the reason is if some package has redefined \colon which then
- % can not be used in \cs{DeclareMathSymbol} anymore (we
- % shamelessly overwrite...)
\DeclareMathSymbol{\colon}{\mathpunct}{\mst@font@tbu}{"3A}
- \mst@do@nonletters\expandafter{\the\mst@do@nonletters
+ \let\mst@colon\colon
+% \end{macrocode}
+% \mstrelease{1.3v} uses \cs{protected} for the (optional) \cs{colon} redefinition.
+% \begin{macrocode}
+ \mst@do@nonletters\expandafter{%
+ \the\mst@do@nonletters
+ \protected\def\colon{\mathpunct{\mst@varfam@colon}}%
+ }%
% \end{macrocode}
-% |1.3v| uses \cs{protected} for the (optional) \cs{colon} redefinition.
+% \mstrelease{1.4} needs extras.
% \begin{macrocode}
- \protected\def\colon{\mathpunct{\mst@varfam@colon}}}%
+ \ifmst@everymath
+ \else
+ \mst@undo@nonletters\expandafter{%
+ \the\mst@undo@nonletters
+ \let\colon\mst@colon
+ }%
+ \fi
}
- \DeclareMathSymbol{\mst@varfam@pointvirgule}{\mathalpha}{\mst@font@tbu}{"3B}
% \end{macrocode}
-% |1.3x| adds |binarysemicolon| option.
+% Semi-colon.
+% \mstrelease{1.3y} adds |binarysemicolon| option.
% \begin{macrocode}
+ \DeclareMathSymbol{\mst@varfam@pointvirgule}{\mathalpha}{\mst@font@tbu}{"3B}
\ifmst@binarysemicolon
\mst@infoline{semi-colon set to be of type \string\mathbin}
\DeclareMathSymbol{;}{\mathbin}{\mst@font@tbu}{"3B}
@@ -7953,21 +8567,22 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\else
\DeclareMathSymbol{;}{\mathpunct}{\mst@font@tbu}{"3B}
\expandafter\mst@addtodo@nonletters\string;\mathpunct\mst@varfam@pointvirgule
- \fi % binarysemicolno
-\fi % end \ifmst@nopunct else branch
+ \fi
+\fi
% \end{macrocode}
+% \end{macro}\end{macro}
% \begin{macro}{\relbar}
% Due to the way = and - are used by \LaTeX{} in arrows, we will
% have to redefine \cs{Relbar} and \cs{relbar} in order for
% them to preserve their original meanings.
%
-% |1.15d|: Oct 13, 2012. Belated amendment of the code to be compatible
+% \mstrelease{1.15d}: Oct 13, 2012. Belated amendment of the code to be compatible
% with Unicode engines in case someone changed the mathcode of -.
% However, for the time being I can do it in an easy way only for
% \XeTeX, not for \LuaLaTeX. Also I do my modifications to \cs{relbar}
% in a manner testing for the presence of amsmath.
%
-% |1.3v 2019/09/19|: \LaTeX{} of |2019-10-01| defines \cs{leftarrowfill}
+% \mstrelease{1.3v} |2019/09/19|: \LaTeX{} of |2019-10-01| defines \cs{leftarrowfill}
% and \cs{rightarrowfill} as robust macros, so we do the same.
%
% I need to put amsmath under surveillance to check if it decides to
@@ -7981,49 +8596,48 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\else
\ifmst@XeOrLua
\mst@Umathcharnumdef\mst@minus@sign=\mst@Umathcodenum`\-\relax
-%^^A I used this prior to the new \luatexUmathcodenum, as available since TL2013:
-%^^A \mathchardef\mst@minus@sign=8704\relax % "2200
+% \end{macrocode}
+% I used this prior to the new \cs{luatexUmathcodenum}, as available since TL2013:
+% \centeredline{|\mathchardef\mst@minus@sign=8704\relax % "2200|}
+%^^A L'alignement est bizarre dans l'output.
+% \begin{macrocode}
\else
\mathchardef\mst@minus@sign=\mathcode`\-\relax
\fi
\@ifpackageloaded{amsmath}
{\def\relbar{\mathrel{\mathpalette\mathsm@sh\mst@minus@sign}}}
{\DeclareRobustCommand\relbar{\mathrel{\smash\mst@minus@sign}}}
- \ifmst@robust@obsessed@LaTeX@era\expandafter\DeclareRobustCommand
- \else\expandafter\def\fi
- \rightarrowfill{$\m@th\mathord{\relbar}\mkern-7mu%
+ \DeclareRobustCommand\rightarrowfill{$\m@th\mathord{\relbar}\mkern-7mu%
\cleaders\hbox{$\mkern-2mu\relbar\mkern-2mu$}\hfill
\mkern-7mu\mathord\rightarrow$}
- \ifmst@robust@obsessed@LaTeX@era\expandafter\DeclareRobustCommand
- \else\expandafter\def\fi
- \leftarrowfill{$\m@th\mathord\leftarrow\mkern-7mu%
+ \DeclareRobustCommand\leftarrowfill{$\m@th\mathord\leftarrow\mkern-7mu%
\cleaders\hbox{$\mkern-2mu\relbar\mkern-2mu$}\hfill
\mkern-7mu\mathord{\relbar}$}
\fi
% \end{macrocode}
% \end{macro}
% \begin{macro}{endash}
-% |1.1| |2011/01/29|: Producing this next piece of code was not a piece
+% \mstrelease{1.1} |2011/01/29|: Producing this next piece of code was not a piece
% of cake for a novice like myself!\newline
-% |1.11| |2011/02/05|: Compatibility with Unicode (via use of fontspec
+% \mstrelease{1.11} |2011/02/05|: Compatibility with Unicode (via use of fontspec
% encodings EU1 and EU2)\newline
-% |1.12| |2011/02/07|: Improved dealing of Unicode possibility.\newline
-% |1.14b| |2011/04/02|: Corrected some very irresponsible bug in the
+% \mstrelease{1.12} |2011/02/07|: Improved dealing of Unicode possibility.\newline
+% \mstrelease{1.14b} |2011/04/02|: Corrected some very irresponsible bug in the
% Unicode part which caused a problem when 10 or more math families have
% been allocated.\newline
-% |1.15| |2012/09/24|: Added AtBeginDocument to circumvent some amsmath
+% \mstrelease{1.15} |2012/09/24|: Added AtBeginDocument to circumvent some amsmath
% problem with unicode engines.
%
-% |1.3l| |2016/01/29|: anticipating TL2016 fontspec's switch to |TU|.
+% \mstrelease{1.3l} |2016/01/29|: anticipating TL2016 fontspec's switch to |TU|.
%
-% |1.3t| |2018/08/22|: fix to very ancient (|2012/12/20|) bug with
+% \mstrelease{1.3t} |2018/08/22|: fix to very ancient (|2012/12/20|) bug with
% |\DeclareMathSymbol| lacking last argument if encoding not T1, OT1 or
% LY1 when setting up math mode to use the en-dash character as minus
% sign (PDF\TeX\ engine).
%
% \begin{macro}{\mst@subduedminus}
% \begin{macro}{\mst@nonsubduedminus}
-% |1.3t| Further, new macros |\mst@subduedminus| and |\mst@nonsubduedminus|,
+% \mstrelease{1.3t} Further, new macros |\mst@subduedminus| and |\mst@nonsubduedminus|,
% for the good functioning of the subdued option also in case of
% presence of fontspec. This is the only character for which subdued
% option works (now) by setting the mathcode on each math version
@@ -8034,7 +8648,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% change. This means also that |\MTversion| and not |\mathversion|
% must be used for good functioning.
%
-% |1.3u| improves the handling of the minus sign by letting it be compatible
+% \mstrelease{1.3u} improves the handling of the minus sign by letting it be compatible
% with math versions (and not only with the with subdued mechanism but all
% math versions) having varying font encodings, even possibly classic 8bit
% font encoding mixed with TU encoding for Unicode engines. For this it is
@@ -8047,9 +8661,9 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% This is counter-intuitive and breaks expectations.
% \end{quotation}
%
-% But the |1.3u| mechanism with \cs{mst@UmathchardefWorkAround@i} introduced a
+% But the \mstrelease{1.3u} mechanism with \cs{mst@UmathchardefWorkAround@i} introduced a
% bug which showed under option |noendash| (hence also |symboldelimiters|) with
-% Unicode engines. Fixed at |1.3w|.
+% Unicode engines. Fixed at \mstrelease{1.3w}.
% \begin{macrocode}
\let\mst@subduedminus\empty
\let\mst@nonsubduedminus\empty
@@ -8063,7 +8677,8 @@ defaultbf,defaultit,defaultsf,defaulttt}}
{\csname\mst@tmp@enc\string\textendash\endcsname}
\DeclareMathSymbol{#2}{\mathalpha}{mtoperatorfont}
{\csname\mst@tmp@enc\string\textendash\endcsname}
- \fi}% mst@dothe@endashstuff
+ \fi
+}%
\def\mst@dothe@emdashstuff#1#2#3{%
\edef\mst@tmp@enc{#3}%
\if1\mst@OneifUniEnc
@@ -8074,7 +8689,8 @@ defaultbf,defaultit,defaultsf,defaulttt}}
{\csname\mst@tmp@enc\string\textemdash\endcsname}
\DeclareMathSymbol{#2}{\mathalpha}{mtoperatorfont}
{\csname\mst@tmp@enc\string\textemdash\endcsname}
- \fi}% mst@dothe@emdashstuff
+ \fi
+}%
\def\mst@dothe@hyphenstuff#1#2{%
\DeclareMathSymbol{#1}{\mathbin}{\mst@font@tbu}{"2D}%
\DeclareMathSymbol{#2}{\mathalpha}{\mst@font@tbu}{"2D}%
@@ -8090,9 +8706,9 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\csname mst@minus@mv\math@version\endcsname
\relax
\else
- \mathcode`\-=\@nameuse{mst@minus@mv\math@version}% self-delimiting
+ \mathcode`\-=\@nameuse{mst@minus@mv\math@version}%
\fi
- }% \mst@nonsubduedminus
+ }%
% \end{macrocode}
% The above works only if the \cs{mst@minus@mv<name>} was really
% defined via \cs{Umathchardef}. If it was defined via \cs{DeclareMathSymbol}
@@ -8101,8 +8717,8 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \begin{macrocode}
\ifmst@endash\else\ifmst@emdash\else
\def\mst@nonsubduedminus{%
- \mathcode`\-=\@nameuse{mst@minus@mv\math@version}% self-delimiting
- }% non Umathchardef \mst@minus@mv<mathversion> macros
+ \mathcode`\-=\@nameuse{mst@minus@mv\math@version}%
+ }%
\fi\fi
\fi
\def\mst@UmathchardefWorkAround@i
@@ -8112,7 +8728,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \end{macro}\end{macro}\end{macro}
% \begin{macro}{\mst@hbar@mvnormal}
% \begin{macro}{\mst@ltbar@mvnormal}
-% |2011/01/31|, |1.1| I decide to settle the question of the |\hbar|. The
+% |2011/01/31|, \mstrelease{1.1} I decide to settle the question of the |\hbar|. The
% \LaTeX{} definition is |\def\hbar{{\mathchar'26\mkern-9muh}}|
% and its advantage is that |h| is in the correct font. But of course not
% the macron character (|\=|, |\bar|). And anyway |amsfonts| uses a
@@ -8125,26 +8741,26 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% (as an aside, I am only now (April 2, 2011) aware that the package
% |mathtools| provides the |mathrlap| etc... )
%
-% |1.3l 2016/01/29|: anticipating TL2016 fontspec's switch to |TU|.
+% \mstrelease{1.3l} |2016/01/29|: anticipating TL2016 fontspec's switch to |TU|.
%
-% |1.3u 2019/08/20|: encoding (8bits) agnostic construct for hbar, using same
+% \mstrelease{1.3u} |2019/08/20|: encoding (8bits) agnostic construct for hbar, using same
% method as for |mathaccents| option. I should add some way to adjust the
% vertical positioning.
%
% On this occasion I replace |h| by |\mst@h| because the mechanism for
% before and after skips does not interact well with the rlap construct.
%
-% |1.3v 2019/09/19| adapts to maintain the robustness of \cs{hbar} which now
+% \mstrelease{1.3v} |2019/09/19| adapts to maintain the robustness of \cs{hbar} which now
% applies with \LaTeX{} |2019-10-01|.
%
-% |1.3w| works around \url{https://github.com/latex3/latex2e/issues/216} via
+% \mstrelease{1.3w} works around \url{https://github.com/latex3/latex2e/issues/216} via
% \cs{mst@DeclareMathAccent}. The upstream bug affected the definition of
% \cs{mst@ltbar@mvnormal} and broke usage of \cs{Mathastext} in preamble.
%
-% |1.3w| also fixes oversight that \cs{hbar} may have been redefined via
+% \mstrelease{1.3w} also fixes oversight that \cs{hbar} may have been redefined via
% \cs{DeclareMathSymbol} by some package (e.g. |amsfonts|) and with \LaTeX{}
% |2019-10-01| this means \cs{hbar<space>} is now undefined. Modifying it
-% changed nothing to \cs{hbar} behaviour in such circumstances. Finally we
+% changed nothing to \cs{hbar} behavior in such circumstances. Finally we
% opt for a \cs{protected} \cs{hbar} and choose to ignore completely if
% there is a \cs{hbar<space>} or not. To avoid extra steps we do not
% undefine it if it exists, because we would need to restore it in
@@ -8161,7 +8777,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\def\mst@mathrlapinternal#1#2{\rlap{$\mathsurround=0pt#1{#2}$}}
\def\mst@dothe@hbarstuff#1#2#3{%
\edef\mst@tmp@enc{#3}%
- \if1\mst@OneifUniEnc % Unicode engine and font
+ \if1\mst@OneifUniEnc
\mst@Umathchardef#1="7 \symmtletterfont "0127 \relax %% or 210F?
\else
\begingroup
@@ -8170,13 +8786,13 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\mst@DeclareMathAccent{#2}{\mathalpha}{mtletterfont}%
{\csname\mst@tmp@enc\string\=\endcsname{}}%
\endgroup
- \protected\def#1{\mst@mathrlap{#2{\ }}\mst@h}%
+ \protected\def#1{\mst@mathrlap{#2{\ }}\MTmathcharletterh}%
\fi
-}% end of \mst@dothe@hbarstuff
+}%
% \end{macrocode}
% \end{macro}
% \end{macro}
-% |1.15d|: Oct 13, 2012. The \cs{mathcode} thing with = is (belatedly,
+% \mstrelease{1.15d}: Oct 13, 2012. The \cs{mathcode} thing with = is (belatedly,
% sorry!) made Unicode compatible.
% \begin{macro}{+,=,\Relbar}
% \begin{macrocode}
@@ -8246,7 +8862,8 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% sequences can not be simultaneously math symbols and math delimiters,
% thus, this complicates things for the mathastextification.
% \begin{macrocode}
-\ifmst@noparen\else\mst@infoline{parentheses \string( \string) \string[ \string] and slash \string/}
+\ifmst@noparen\else
+\mst@infoline{parentheses \string( \string) \string[ \string] and slash \string/}
\ifmst@nosmalldelims
\DeclareMathSymbol{(}{\mathopen}{\mst@font@tbu}{"28}
\DeclareMathSymbol{)}{\mathclose}{\mst@font@tbu}{"29}
@@ -8287,17 +8904,22 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% other math symbol fonts they do respect the encoding of the CM symbols and
% largesymbols, so this is 90\% safe. But in truth I should extract from the
% meaning of \cs{backslash} the |delcode|.
+%
+% At \mstrelease{1.4} I am a bit perplexed at the \cs{mathalpha} here.
+% Adding a a \cs{mst@mathord@backslash} for matters of option |noeverymath|.
% \begin{macrocode}
\DeclareMathDelimiter{\mst@varfam@backslash}
{\mathalpha}{symbols}{"6E}{largesymbols}{"0F}
+ \let\mst@mathord@backslash\backslash
\else
\DeclareMathDelimiter{<}{\mathopen}{\mst@font@tbu}{"3C}{largesymbols}{"0A}
\DeclareMathDelimiter{>}{\mathclose}{\mst@font@tbu}{"3E}{largesymbols}{"0B}
% \end{macrocode}
% There is no backslash in the Symbol font hence |mtoperatorfont| here.
% \begin{macrocode}
- \DeclareMathDelimiter{\backslash}
+ \DeclareMathDelimiter{\mst@mathord@backslash}
{\mathord}{mtoperatorfont}{"5C}{largesymbols}{"0F}
+ \let\backslash\mst@mathord@backslash
\DeclareMathDelimiter{\mst@varfam@backslash}
{\mathalpha}{mtoperatorfont}{"5C}{largesymbols}{"0F}
\fi
@@ -8309,17 +8931,38 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\expandafter\mst@addtodo@nonletters\string>\mathrel\mst@varfam@more
\mst@do@easynonletters\expandafter{\the\mst@do@easynonletters
\let\backslash\mst@varfam@backslash}
+% \end{macrocode}
+% Extras for \mstrelease{1.4} are needed:
+% \begin{macrocode}
+\ifmst@everymath
+\else
+ \mst@undo@easynonletters\expandafter{\the\mst@undo@easynonletters
+ \let\backslash\mst@mathord@backslash}
+\fi
\DeclareMathSymbol{\setminus}{\mathbin}{mtoperatorfont}{"5C}
+\let\mst@setminus\setminus
\DeclareMathSymbol{\mst@varfam@setminus}{\mathalpha}{mtoperatorfont}{"5C}
% \end{macrocode}
-% |1.3v| adds a \cs{protected} here for \cs{setminus}.
+% \mstrelease{1.3v} adds a \cs{protected} here for \cs{setminus}.
% \begin{macrocode}
-\mst@do@nonletters\expandafter{\the\mst@do@nonletters
- \protected\def\setminus{\mathbin{\mst@varfam@setminus}}}
+\mst@do@nonletters\expandafter{%
+ \the\mst@do@nonletters
+ \protected\def\setminus{\mathbin{\mst@varfam@setminus}}%
+}
+% \end{macrocode}
+% Extras for \mstrelease{1.4} are needed:
+% \begin{macrocode}
+\ifmst@everymath
+\else
+ \mst@undo@nonletters\expandafter{%
+ \the\mst@undo@nonletters
+ \let\setminus\mst@setminus
+ }
+\fi
% \end{macrocode}
% \end{macro}\end{macro}\end{macro}
% \begin{macro}{\models}
-% |1.15d|: 13 oct 2012. Before modifying \string| we must preserve \cs{models}.
+% \mstrelease{1.15d}: 13 oct 2012. Before modifying \string| we must preserve \cs{models}.
% \begin{macrocode}
\ifmst@XeOrLua
\mst@Umathcharnumdef\mst@vert@bar=\mst@Umathcodenum`\|\relax
@@ -8335,7 +8978,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% it used to be anyhow, so it is too late. Or not (2019)? maybe I
% \emph{should} do something here...
%
-% |1.3v 2019/09/19|: I discover this rather radical legacy
+% \mstrelease{1.3v} |2019/09/19|: I discover this rather radical legacy
% \verb+\def\vert{|}+, which is done here once in the preamble, but I leave
% it unmodified apart from prefixing it with \cs{protected}. I also add a
% \cs{protected} for the definition of \cs{mid} (which applies only under
@@ -8349,34 +8992,53 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\protected\def\vert{|}
\DeclareMathSymbol{\mst@varfam@vbar}{\mathalpha}{\mst@font@tbu}{124}
\mst@addtodo@easynonletters\|\mst@varfam@vbar
-\let\mid\undefined % 1.3: to avoid problems with some packages
+\let\mid\undefined
\DeclareMathSymbol{\mid}{\mathrel}{\mst@font@tbu}{124}
-\mst@do@nonletters\expandafter{\the\mst@do@nonletters
- \protected\def\mid{\mathrel\mst@varfam@vbar}}
+\let\mst@mid\mid
+\mst@do@nonletters\expandafter{%
+ \the\mst@do@nonletters
+ \protected\def\mid{\mathrel\mst@varfam@vbar}%
+}
+% \end{macrocode}
+% Extras for \mstrelease{1.4} are needed:
+% \begin{macrocode}
+\ifmst@everymath
+\else
+ \mst@undo@nonletters\expandafter{%
+ \the\mst@undo@nonletters
+ \let\mid\mst@mid
+ }
+\fi
% \end{macrocode}
% \begin{macro}{\MTexplicitbraces-}\begin{macro}{obeymathxx}
% \begin{macro}{\MTexplicitbraces-}\begin{macro}{donotobeymathxx}
-% Braces. With version |1.2|, |\{| and |\}| will not be acceptable as
+% Braces. With version \mstrelease{1.2}, |\{| and |\}| will not be acceptable as
% delimiters anymore if the redefinitions below in \cs{mst@dobraces} are
-% enacted. But they will obey math alphabets. Improvements in |1.2a|, to
+% enacted. But they will obey math alphabets. Improvements in \mstrelease{1.2a}, to
% preserve robustness.
%
-% For |1.3| I make |\lbrace| and |\rbrace| undefined first, else problems
+% For \mstrelease{1.3} I make |\lbrace| and |\rbrace| undefined first, else problems
% may arise with some packages.
%
-% |1.3e| suppresses under option
+% \mstrelease{1.3e} suppresses under option
% |nosmalldelims| the definitions of |\lbrace| and |\rbrace| as math
% symbols as this made |\left\lbrace| cause an error, it was a bug.
%
-% LaTeX2e defines |\{| and |\}| as robust commands for a long time
+% (obsolete) LaTeX2e defines |\{| and |\}| as robust commands since a long time
% (I don't know since when). The \mst redefinition is done only if user
% has executed \cs{MTexplicitbracesobeymathxx}, and it is done only when
% entering math mode, but there could be some |\hbox| inside math, hence
% it has to be careful to be valid in text too.
%
-% |1.3v| maintains strict \LaTeX2e robustness for |\{| and |\}|.
+% \mstrelease{1.3v} maintains strict \LaTeX2e robustness for |\{| and |\}|.
% This assumes no one fiddled with |\{| and |\}| proper (without space
% in the name).
+%
+% \LaTeX{} made |\{| and |\}| \cs{protected}, not robust, at its
+% |2020-02-02| release, so the code used by \mst under
+% \cs{MTexplicitbracesobeymathxx} toggle remained without effect since
+% as it configured a change to |\{<space>| and |\}<space>|. Fixed at
+% \mstrelease{1.4}.
% \begin{macrocode}
\ifmst@nosmalldelims
\else
@@ -8388,28 +9050,46 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\fi
\DeclareMathSymbol{\mst@varfam@lbrace}{\mathalpha}{\mst@font@tbu}{123}
\DeclareMathSymbol{\mst@varfam@rbrace}{\mathalpha}{\mst@font@tbu}{125}
-\DeclareRobustCommand*{\mst@lbrace}
- {\ifmmode\mathopen\mst@varfam@lbrace\else\textbraceleft\fi}
-\DeclareRobustCommand*{\mst@rbrace}
- {\ifmmode\mathclose\mst@varfam@rbrace\else\textbraceright\fi}
-\mst@do@nonletters\expandafter{\the\mst@do@nonletters
- \mst@dobraces{\expandafter\let\csname\string{ \expandafter\endcsname
- \csname mst@lbrace \endcsname
- \expandafter\let\csname\string} \expandafter\endcsname
- \csname mst@rbrace \endcsname}}
-\fi % end of \ifmst@alldelims
+% \end{macrocode}
+% \begin{macrocode}
+\protected\def\mst@lbrace{\ifmmode\mathopen\mst@varfam@lbrace\else\textbraceleft\fi}
+\protected\def\mst@rbrace{\ifmmode\mathclose\mst@varfam@rbrace\else\textbraceright\fi}
+\mst@do@nonletters\expandafter{%
+ \the\mst@do@nonletters
+ \mst@dobraces{\let\{\mst@lbrace\let\}\mst@rbrace}%
+}
+\fi
\newcommand*{\MTexplicitbracesobeymathxx}{\let\mst@dobraces\@firstofone}
\newcommand*{\MTexplicitbracesdonotobeymathxx}{\let\mst@dobraces\@gobble}
+% \end{macrocode}
+% Extras for \mstrelease{1.4} are needed:
+% \begin{macrocode}
+\ifmst@everymath
+\else
+ \renewcommand*\MTexplicitbracesobeymathxx{%
+ \let\mst@dobraces\@firstofone
+ \MTnonlettersobeymathxx
+ }%
+ \renewcommand*\MTexplicitbracesdonotobeymathxx{%
+ \let\mst@dobraces\@gobble
+ \protected\def\{{\ifmmode \lbrace \else \textbraceleft \fi}%
+ \protected\def\}{\ifmmode \rbrace \else \textbraceright \fi}%
+ }%
+ \mst@undo@nonletters\expandafter{\the\mst@undo@nonletters
+ \protected\def\{{\ifmmode \lbrace \else \textbraceleft \fi}%
+ \protected\def\}{\ifmmode \rbrace \else \textbraceright \fi}%
+ }%
+\fi
\MTexplicitbracesdonotobeymathxx
% \end{macrocode}
% \end{macro}\end{macro}\end{macro}\end{macro}
% \end{macro}\end{macro}
% \begin{macro}{specials}
-% \leavevmode\kern\parindent |1.14b| |2011/04/02|: the redefinitions of
+% \leavevmode\kern\parindent \mstrelease{1.14b} |2011/04/02|: the redefinitions of
% \#, \$, \% and \& were buggy (this showed up when 10 or more math
% families had been created).
%
-% |1.15f| |2012/10/23|: the code, although working, was perhaps a bit insane
+% \mstrelease{1.15f} |2012/10/23|: the code, although working, was perhaps a bit insane
% and
% had definitions which could surprise other packages. For example, it did:\\
% \null\hspace{1cm}|\renewcommand{\%}{\ifmmode\mt@mmode@percent\else\char37\relax\fi}|\\
@@ -8426,60 +9106,80 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% mathcode. So here it is \emph{not} a redefinition of the control sequences,
% purely an adjustment of mathcodes.
%
-% |1.2d| |2013/01/01|: previous versions imposed the variable family type. I
+% \mstrelease{1.2d} |2013/01/01|: previous versions imposed the variable family type. I
% hereby make it possible to de-activate this feature with the macro
% \cs{MTeasynonlettersdonotobeymathxx}. Besides, I have absolutely no idea
% why I had different looking code depending on the engine \XeTeX, \LuaTeX\ or
% default. Removed.
%
-% |1.3c| |2013/12/14|: I have absolutely no idea why I removed the \XeTeX\
-% and \LuaTeX\ code at the time of |1.2d|! the code for tex/pdftex engine
+% \mstrelease{1.3c} |2013/12/14|: I have absolutely no idea why I removed the \XeTeX\
+% and \LuaTeX\ code at the time of \mstrelease{1.2d}! the code for tex/pdftex engine
% could not accomodate more than 16 math families. Code for \XeTeX\ and
% \LuaTeX\ again added. (and since TL2013 no more problems with
% |\luatexUmathcode|.)
+%
+% \mstrelease{1.4} has done slight refactoring here to share more code related
+% to math activation across the two branches.
% \begin{macrocode}
\ifmst@nospecials
\else
- \mst@infoline{\string\#\space\string\mathdollar\space
- \string\%\space\string\&\space}
+ \mst@infoline{\string\#\space\string\mathdollar\space
+ \string\%\space\string\&\space}
\ifmst@XeOrLua
- \mst@Umathcode`\#=0 \symmtoperatorfont "23 \relax
- \mst@Umathchardef\mathdollar=0 \symmtoperatorfont "24 \relax
- \mst@Umathcode`\%=0 \symmtoperatorfont "25 \relax
- \mst@Umathcode`\&=0 \symmtoperatorfont "26 \relax
- \mst@do@easynonletters\expandafter{%
- \the\mst@do@easynonletters
- \mst@Umathcode`\#=7 \symmtoperatorfont "23 \relax
- \mst@Umathchardef\mathdollar=7 \symmtoperatorfont "24 \relax
- \mst@Umathcode`\%=7 \symmtoperatorfont "25 \relax
- \mst@Umathcode`\&=7 \symmtoperatorfont "26 \relax
- }
+ \mst@Umathcode`\#=0 \symmtoperatorfont "23 \relax
+ \mst@Umathchardef\mathdollar=0 \symmtoperatorfont "24 \relax
+ \mst@Umathcode`\%=0 \symmtoperatorfont "25 \relax
+ \mst@Umathcode`\&=0 \symmtoperatorfont "26 \relax
+ \mst@Umathchardef\mst@varfam@mathhash = 7 \symmtoperatorfont "23 \relax
+ \mst@Umathchardef\mst@varfam@mathdollar = 7 \symmtoperatorfont "24 \relax
+ \mst@Umathchardef\mst@varfam@mathpercent = 7 \symmtoperatorfont "25 \relax
+ \mst@Umathchardef\mst@varfam@mathampersand = 7 \symmtoperatorfont "26 \relax
+ \mst@addtodo@easynonletters@U\#\mst@varfam@mathhash
+ \mst@addtodo@easynonletters@U\%\mst@varfam@mathpercent
+ \mst@addtodo@easynonletters@U\&\mst@varfam@mathampersand
\else
- \count@=\symmtoperatorfont
- \multiply\count@ by \@cclvi
- \advance\count@ by 35
- \mathcode`\#\count@
- \advance\count@ by \@ne
- \mathchardef\mathdollar\count@
- \advance\count@ by \@ne
- \mathcode`\%\count@
- \advance\count@ by \@ne
- \mathcode`\&\count@
- \count@=\symmtoperatorfont
- \multiply\count@ by \@cclvi
- \advance\count@ by 28707 % = "7023
- \mathchardef\mst@varfam@mathhash\count@
- \advance\count@ by \@ne
- \mathchardef\mst@varfam@mathdollar\count@
- \advance\count@ by \@ne
- \mathchardef\mst@varfam@mathpercent\count@
- \advance\count@ by \@ne
- \mathchardef\mst@varfam@mathampersand\count@
+ \count@=\symmtoperatorfont
+ \multiply\count@ by \@cclvi
+ \advance\count@ by 35
+ \mathcode`\#\count@
+ \advance\count@ by \@ne
+ \mathchardef\mathdollar\count@
+ \advance\count@ by \@ne
+ \mathcode`\%\count@
+ \advance\count@ by \@ne
+ \mathcode`\&\count@
+ \count@=\symmtoperatorfont
+ \multiply\count@ by \@cclvi
+ \advance\count@ by 28707 % = "7023
+ \mathchardef\mst@varfam@mathhash\count@
+ \advance\count@ by \@ne
+ \mathchardef\mst@varfam@mathdollar\count@
+ \advance\count@ by \@ne
+ \mathchardef\mst@varfam@mathpercent\count@
+ \advance\count@ by \@ne
+ \mathchardef\mst@varfam@mathampersand\count@
+ \mst@addtodo@easynonletters\#\mst@varfam@mathhash
+ \mst@addtodo@easynonletters\%\mst@varfam@mathpercent
+ \mst@addtodo@easynonletters\&\mst@varfam@mathampersand
+ \fi
+% \end{macrocode}
+% It is possible to mathematically activate the dollar sign, and to use
+% it in math mode as |\string$|... well, how many documents will have
+% done that? But we do not modify the mathcode of the |$| character
+% anyhow, so why should I add here a \cs{mst@OnlyIfNotMathActive}?
+% There is no good reason for that.
+% \begin{macrocode}
\mst@do@easynonletters\expandafter{\the\mst@do@easynonletters
- \mathcode`\#=\mst@varfam@mathhash
- \let\mathdollar\mst@varfam@mathdollar
- \mathcode`\%=\mst@varfam@mathpercent
- \mathcode`\&=\mst@varfam@mathampersand}
+ \let\mathdollar\mst@varfam@mathdollar}%
+% \end{macrocode}
+% Extras for \mstrelease{1.4} are needed. Here too we do not worry
+% about math active dollar character.
+% \begin{macrocode}
+ \ifmst@everymath\else
+ \edef\mst@tmp{\ifmst@XeOrLua\mst@Umathcharnumdef\else\mathchardef\fi
+ \mathdollar=\the\mathdollar\relax}%
+ \mst@undo@easynonletters\expandafter\expandafter\expandafter
+ {\expandafter\mst@tmp\the\mst@undo@easynonletters}%
\fi
\fi
% \end{macrocode}
@@ -8495,7 +9195,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% manipulations, but well, life is finite.
% \begin{macro}{\prod}
% \begin{macro}{\sum}
-% |1.13b|: I correct the brutal re-definitions of \cs{prod} and \cs{sum} from
+% \mstrelease{1.13b}: I correct the brutal re-definitions of \cs{prod} and \cs{sum} from
% the earlier versions of the package; most of the time the Symbol glyphs do
% appear to be too small in display mode. The new redefinitions do have some
% defects: |$\displaystyle\prod_1^2$| changes the position of limits but not
@@ -8506,40 +9206,50 @@ defaultbf,defaultit,defaultsf,defaulttt}}
%
% October 2012: maybe I should re-examine what I did?
%
-% |1.3c| (|2013/12/14|) renames |\defaultprod| to |\MToriginalprod| and
+% \mstrelease{1.3c} (|2013/12/14|) renames |\defaultprod| to |\MToriginalprod| and
% |\defaultsum| to
% |\MToriginalsum|.
%
-% |1.3v| hesitates about making robust here \cs{prod} and \cs{sum}. Finally I
+% \mstrelease{1.3v} hesitates about making robust here \cs{prod} and \cs{sum}. Finally I
% use \cs{protected} for them.
+%
+% \mstrelease{1.4} finally replaces all control sequences defines earlier via
+% \cs{DeclareRobustCommand} to be defined using \cs{protected}\cs{def}. It
+% also removes \cs{mst@prod} and \cs{mst@sum} which were aliases of
+% \cs{MToriginalprod} and \cs{MToriginalsum}, and having both must have
+% been some left-over of earlier versions in 2012 or 2013 (unchecked).
% \begin{macrocode}
-\ifmst@symbolmisc\mst@infoline{symbolmisc: miscellaneous math symbols from Symbol font}
-\let\mst@prod\prod
+\ifmst@symbolmisc
+\mst@infoline{symbolmisc: miscellaneous math symbols from Symbol font}
\let\MToriginalprod\prod
\DeclareMathSymbol{\prodpsy}{\mathop}{mtpsymbol}{213}
-\protected\def\prod{\ifinner\prodpsy\else\mst@prod\fi}
-\let\mst@sum\sum
+\protected\def\prod{\ifinner\prodpsy\else\MToriginalprod\fi}
\let\MToriginalsum\sum
\DeclareMathSymbol{\sumpsy}{\mathop}{mtpsymbol}{229}
-\protected\def\sum{\ifinner\sumpsy\else\mst@sum\fi}
+\protected\def\sum{\ifinner\sumpsy\else\MToriginalsum\fi}
% \end{macrocode}
% \end{macro}
% \end{macro}
% \begin{macrocode}
\DeclareMathSymbol{\mst@implies}{\mathrel}{mtpsymbol}{222}
-\DeclareRobustCommand*{\implies}{\;\mst@implies\;}
+\protected\def\implies{\;\mst@implies\;}
\DeclareMathSymbol{\mst@impliedby}{\mathrel}{mtpsymbol}{220}
-\DeclareRobustCommand*{\impliedby}{\;\mst@impliedby\;}
-\DeclareRobustCommand*{\iff}{\;\mst@impliedby\mathrel{\mkern-3mu}\mst@implies\;}
+\protected\def\impliedby{\;\mst@impliedby\;}
+\protected\def\iff{\;\mst@impliedby\mathrel{\mkern-3mu}\mst@implies\;}
\DeclareMathSymbol{\mst@iff}{\mathrel}{mtpsymbol}{219}
-\DeclareRobustCommand*{\shortiff}{\;\mst@iff\;}
-\DeclareMathSymbol{\mst@to}{\mathrel}{mtpsymbol}{174}
+\protected\def\shortiff{\;\mst@iff\;}
+% \end{macrocode}
+% \mstrelease{1.4} drops defining a \cs{mst@to} and employs \cs{to}
+% in subsequent definitions
+% \begin{macrocode}
+\let\to\relax
+\DeclareMathSymbol{\to}{\mathrel}{mtpsymbol}{174}
\DeclareMathSymbol{\mst@trait}{\mathrel}{mtpsymbol}{190}
-\DeclareRobustCommand*\to{\mst@to}
-\DeclareRobustCommand*\longto{\mkern2mu\mst@trait\mathrel{\mkern-10mu}\mst@to}
-\DeclareRobustCommand*\mapsto{\mapstochar\mathrel{\mkern0.2mu}\mst@to}
-\DeclareRobustCommand*\longmapsto{%
-\mapstochar\mathrel{\mkern2mu}\mst@trait\mathrel{\mkern-10mu}\mst@to}
+\protected\def\longto{\mkern2mu\mst@trait\mathrel{\mkern-10mu}\to}
+\protected\def\mapsto{\mapstochar\mathrel{\mkern0.2mu}\to}
+\protected\def\longmapsto{%
+ \mapstochar\mathrel{\mkern2mu}\mst@trait\mathrel{\mkern-10mu}\to
+}
\DeclareMathSymbol{\aleph}{\mathord}{mtpsymbol}{192}
\DeclareMathSymbol{\inftypsy}{\mathord}{mtpsymbol}{165}
\DeclareMathSymbol{\emptyset}{\mathord}{mtpsymbol}{198}
@@ -8593,7 +9303,8 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \begin{macro}{symbolre}
% I like the \cs{Re} and \cs{Im} from Symbol, so I overwrite the CM ones.
% \begin{macrocode}
-\ifmst@symbolre\mst@infoline{symbolre: \string\Re\space and \string\Im\space from Symbol font}
+\ifmst@symbolre
+\mst@infoline{symbolre: \string\Re\space and \string\Im\space from Symbol font}
\DeclareMathSymbol{\Re}{\mathord}{mtpsymbol}{"C2}
\DeclareMathSymbol{\Im}{\mathord}{mtpsymbol}{"C1}
\DeclareMathSymbol{\DotTriangle}{\mathord}{mtpsymbol}{92}
@@ -8603,12 +9314,12 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \begin{macro}{Greek letters}
% LGRgreek $>$ selfGreek $>$ eulergreek $>$ symbolgreek
%
-% |1.11| I correct some bugs on how eulergreek and
+% \mstrelease{1.11} I correct some bugs on how eulergreek and
% symbolgreek interacted.
%
-% |1.12b| more bug fixes.
+% \mstrelease{1.12b} more bug fixes.
%
-% |1.13|
+% \mstrelease{1.13}
%
% * Option LGRgreek.
%
@@ -8616,10 +9327,10 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% the default shape is now the one for letters, not for operator-names
% and digits. This complies to the ISO standard.
%
-% * bugfix: version |1.12b| did not define the \cs{omicron} in the
+% * bugfix: version \mstrelease{1.12b} did not define the \cs{omicron} in the
% case when no Greek-related option was passed to the package.
%
-% |1.13d| has new macros |\MTstandardgreek| and |\MTcustomgreek|.
+% \mstrelease{1.13d} has new macros |\MTstandardgreek| and |\MTcustomgreek|.
% And in the subdued case |\MTstandardgreek| is done when switching to
% the normal or bold math versions (previously something like this
% was only done in case of |LGRgreek| option. )
@@ -8672,13 +9383,13 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \begin{macrocode}
\ifx\mst@mathord\mathord
% \end{macrocode}
-% symbolgreek but neither eulergreek nor selfGreek
-% \begin{macrocode}
-%% attention le P de Symbol est un \Pi pas un \Rho
+% \noindent symbolgreek but neither eulergreek nor selfGreek\newline
+% Attention le P de Symbol est un \cs{Pi} pas un \cs{Rho}.\newline
+% Attention le X de Symbol est un \cs{Xi} pas un \cs{Chi}.\newline
+% Attention le F de Symbol est un \cs{Phi}. Il n'y a pas de \cs{Digamma}.
+% \begin {macrocode}
\DeclareMathSymbol{\mst@Rho}{\mathord}{mtpsymbol}{"52}
-%% attention le X de Symbol est un \Xi pas un \Chi
\DeclareMathSymbol{\mst@Chi}{\mathord}{mtpsymbol}{"43}
-%% attention le F de Symbol est un \Phi. Il n'y a pas de \Digamma
\DeclareMathSymbol{\mst@Gamma}{\mathord}{mtpsymbol}{"47}
\DeclareMathSymbol{\mst@Delta}{\mathord}{mtpsymbol}{"44}
\DeclareMathSymbol{\mst@Theta}{\mathord}{mtpsymbol}{"51}
@@ -8690,7 +9401,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\DeclareMathSymbol{\mst@Phi}{\mathord}{mtpsymbol}{"46}
\DeclareMathSymbol{\mst@Psi}{\mathord}{mtpsymbol}{"59}
\DeclareMathSymbol{\mst@Omega}{\mathord}{mtpsymbol}{"57}
- \else % de \mst@mathord=\mathord
+ \else
% \end{macrocode}
% not symbolgreek but eulergreek or selfGreek. Note |2015/10/31| : apparemment à
% un moment dans le passé je considérais eulergreek et selfGreek comme pouvant
@@ -8709,8 +9420,8 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\DeclareMathSymbol\mst@Phi {\mathalpha}{\mst@font@tbu}{"08}
\DeclareMathSymbol\mst@Psi {\mathalpha}{\mst@font@tbu}{"09}
\DeclareMathSymbol\mst@Omega {\mathalpha}{\mst@font@tbu}{"0A}
- \fi % de \mst@mathord=\mathord
-\fi % fin de goahead
+ \fi
+\fi
% \end{macrocode}
% There are differences regarding Euler and Symbol with respect to the
% available var-letters. We include one or two things like the |wp| and the
@@ -8796,10 +9507,10 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\fi
% \end{macrocode}
% \begin{macro}{\alphaup etc...}
-% Completely refactored at |1.3x| to define |\Alphaup|, |\Alphait|,
+% Completely refactored at \mstrelease{1.3y} to define |\Alphaup|, |\Alphait|,
% |\alphaup|, |\alphait|, etc\dots{} and prepare templates |\Alpha|, \dots{},
% |\alpha|, \dots{}, which when activating a math version will be submitted to
-% an |\expanded|, whose behaviour will depend on version-specific conditionals.
+% an |\expanded|, whose behavior will depend on version-specific conditionals.
% \begin{macrocode}
\ifmst@LGRgreek
% cf http://milde.users.sourceforge.net/LGR/lgrxenc.def.html
@@ -8832,7 +9543,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\DeclareMathSymbol{\Tauit}{\mathalpha}{mtgreekit}{84}
\DeclareMathSymbol{\Chiit}{\mathalpha}{mtgreekit}{81}
% \end{macrocode}
-% |1.3w| and earlier had a bug regarding Digamma which was set up
+% \mstrelease{1.3w} and earlier had a bug regarding Digamma which was set up
% to use same font shape as for lowercase digamma.
% \begin{macrocode}
\DeclareMathSymbol{\Digammaup}{\mathalpha}{mtgreekup}{195}
@@ -8916,7 +9627,9 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\DeclareMathSymbol{\omegaup}{\mathalpha}{mtgreekup}{119}
%
\DeclareMathSymbol{\digammaup}{\mathalpha}{mtgreekup}{147}
-% only varsigma defined (I should check this again)
+% \end{macrocode}
+% Only varsigma defined (I should check this again).
+% \begin{macrocode}
\DeclareMathSymbol{\varsigmaup}{\mathalpha}{mtgreekup}{99}
%
\DeclareMathSymbol{\alphait}{\mathalpha}{mtgreekit}{97}
@@ -8981,12 +9694,12 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \begin{macro}{\MTstandardgreek}
% \begin{macro}{\MTcustomgreek}
% \begin{macro}{\MTrecordstandardgreek}
-% |1.3d 2014/05/23| defines the commands |\MTstandardgreek| and
+% \mstrelease{1.3d} |2014/05/23| defines the commands |\MTstandardgreek| and
% |\MTcustomgreek| for package and user. I leave |\MTrecordstandardgreek|
% undocumented as I don't want to encourage people to load math packages
% after \mst.
%
-% |1.3h 2015/10/31|: corrected |\MTcustomgreek| as it caused |\ell| to
+% \mstrelease{1.3h} |2015/10/31|: corrected |\MTcustomgreek| as it caused |\ell| to
% become undefined under option |symbolgreek| and, much more catastrophic,
% caused |\alpha|, etc.. to become undefined under option |selfGreek| !
% \begin{macrocode}
@@ -9055,7 +9768,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
%
\let\mst@origpartial\partial
\let\mst@origwp\wp
- \let\mst@origell\ell }% \MTrecordstandardgreek
+ \let\mst@origell\ell }%
\MTrecordstandardgreek
\renewcommand*{\MTstandardgreek}{%
\let\Alpha\mst@origAlpha
@@ -9119,10 +9832,10 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\let\partial\mst@origpartial
\let\wp\mst@origwp
\let\ell\mst@origell
-}% \MTstandardgreek
+}%
\ifmst@greekplus
% \end{macrocode}
-% |1.3za| implementation of |LGRgreek+| option. It is not exactly
+% \mstrelease{1.3za} implementation of |LGRgreek+| option. It is not exactly
% clear what we should do for \cs{mathnormal} and \cs{mathnormalbold}.
%
% This definition allows usage of \cs{alpha} for example in numerical
@@ -9210,7 +9923,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\mst@define@lowergreekletter\omega\mst@omega
\mst@define@lowergreekletter\varsigma\mst@varsigma
\mst@define@lowergreekletter\digamma\mst@digamma
-}% end of True branch of \ifmst@greekplus
+}%
\else
% \end{macrocode}
% Under |selfGreek| or other Greek option but not |LGRgreek|, these Greek
@@ -9243,8 +9956,10 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\let\noexpand\Rho\mst@Rho
\let\noexpand\Tau\mst@Tau
\let\noexpand\Chi\mst@Chi
- }% end of first big \expanded
-% 1.3h: \mst@Digamma not defined if symbolgreek option
+ }%
+% \end{macrocode}
+% \mstrelease{1.3h}: \cs{mst@Digamma} not defined if |symbolgreek| option.
+% \begin{macrocode}
\ifmst@symbolgreek\else
\expanded{\let\noexpand\Digamma\mst@Digamma}%
\fi
@@ -9260,10 +9975,10 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\let\noexpand\Phi\mst@Phi
\let\noexpand\Psi\mst@Psi
\let\noexpand\Omega\mst@Omega
- }% end of second big \expanded
+ }%
% \end{macrocode}
-% |1.3h 2015/10/31| adds this conditional to correct the bad bug in
-% |1.3d 2014/05/23| which caused |\alpha| etc... to become undefined
+% \mstrelease{1.3h} |2015/10/31| adds this conditional to correct the bad bug in
+% \mstrelease{1.3d} |2014/05/23| which caused |\alpha| etc... to become undefined
% under option |selfGreek|.
% \begin{macrocode}
\ifmst@selfGreek\else
@@ -9293,28 +10008,34 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\let\noexpand\psi\mst@psi
\let\noexpand\omega\mst@omega
\let\noexpand\varsigma\mst@varsigma
- }% end of third big \expanded
-% 1.3h: digamma only defined with option LGRgreek:
+ }%
+% \end{macrocode}
+% \mstrelease{1.3h}: digamma only defined with option |LGRgreek|.
+% \begin{macrocode}
\ifmst@LGRgreek
\expanded{\let\noexpand\digamma\mst@digamma}%
\fi
-% conditional added 1.3h 2015/10/31
+% \end{macrocode}
+% Conditional added \mstrelease{1.3h} |2015/10/31|.
+% \begin{macrocode}
\ifmst@LGRgreek\else
\let\varepsilon\mst@varepsilon
\let\vartheta\mst@vartheta
\let\varpi\mst@varpi
\let\varrho\mst@varrho
\let\varphi\mst@varphi
-%
\let\partial\mst@partial
\let\wp\mst@wp
-% 1.3h: no \mst@ell if symbolgreek (bugfix 1.3h 2015/10/31)
+% \end{macrocode}
+% \mstrelease{1.3h}: no \cs{mst@ell} if |symbolgreek| (bugfix
+% \mstrelease{1.3h} |2015/10/31|).
+% \begin{macrocode}
\ifmst@symbolgreek\else\let\ell\mst@ell\fi
\fi
\fi
-}% \MTcustomgreek
-\fi% end of else branch of \ifmst@greekplus
-\fi% end of \ifmst@customgreek
+}%
+\fi
+\fi
\let\Mathastextstandardgreek\MTstandardgreek
\let\Mathastextcustomgreek\MTcustomgreek
\ifmst@subdued\else\MTcustomgreek\fi
@@ -9322,22 +10043,22 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \end{macro}\end{macro}\end{macro}
% \begin{macro}{\inodot}
% \begin{macro}{\jnodot}
-% In |1.0|, I had them of type |mathord|, here I choose |mathalpha|. If I
+% In \mstrelease{1.0}, I had them of type |mathord|, here I choose |mathalpha|. If I
% used \cs{i} and \cs{j} from the text font the problem would be with the
% fontsize, if in scriptstyle. The amsmath \cs{text} would do the trick.
%
-% |1.14b| |2011/04/02|: again this bug in the EU1/EU2 encoding part, as in the
+% \mstrelease{1.14b} |2011/04/02|: again this bug in the EU1/EU2 encoding part, as in the
% code redefining \$ etc in math mode (see above). Fixed.
%
-% |1.3l| |2016/01/29|: anticipating TL2016 fontspec's switch to |TU|.
+% \mstrelease{1.3l} |2016/01/29|: anticipating TL2016 fontspec's switch to |TU|.
%
-% |1.3t| |2018/08/22| removes the definitions done of |\i| and |\j|
-% since |1.12| (as robust commands usable both in text and math mode).
+% \mstrelease{1.3t} |2018/08/22| removes the definitions done of |\i| and |\j|
+% since \mstrelease{1.12} (as robust commands usable both in text and math mode).
%
-% |1.3u| lets the \cs{imath} and \cs{jmath} react to the font encoding at each
+% \mstrelease{1.3u} lets the \cs{imath} and \cs{jmath} react to the font encoding at each
% math version.
%
-% |1.3v| lets the redefined \cs{imath} and \cs{jmath} be \cs{protected}.
+% \mstrelease{1.3v} lets the redefined \cs{imath} and \cs{jmath} be \cs{protected}.
% \begin{macrocode}
\def\mst@subduedinodot{%
\let\inodot\mst@original@imath
@@ -9352,7 +10073,6 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\def\mst@dothe@inodotstuff#1#2#3{%
\edef\mst@tmp@enc{#3}%
\if1\mst@OneifUniEnc
- % Unicode engine and font
\mst@Umathchardef#1="7 \symmtletterfont "0131 \relax
\mst@Umathchardef#2="7 \symmtletterfont "0237 \relax
\else
@@ -9360,7 +10080,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
{\csname\mst@tmp@enc\string\i\endcsname}
\DeclareMathSymbol{#2}{\mathalpha}{mtletterfont}
{\csname\mst@tmp@enc\string\j\endcsname}
- \fi}% \mst@dothe@inodotstuff
+ \fi}%
\ifmst@defaultimath\else\mst@infoline{\string\imath\space and \string\jmath\space}
\AtEndOfPackage{\AtBeginDocument{%
\protected\def\imath{\inodot}%
@@ -9382,10 +10102,10 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% define math versions with different encodings. Here I
% take T1 if it was the default at the time of loading the
% package, else OT1.
-% |1.12b|: I add LY1 which is quasi like OT1.
+% \mstrelease{1.12b}: I add LY1 which is quasi like OT1.
% \end{quote}
%
-% At |1.3u 2019/08/20| I decide to remove the hard-coded slot positions
+% At \mstrelease{1.3u} |2019/08/20| I decide to remove the hard-coded slot positions
% for OT1, T1 and LY1, and replace them with some hack which assumes
% LaTeX2e way of handling text accents got executed by the encoding
% definition file. If not, some breakage on package loading could occur, but
@@ -9395,21 +10115,22 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% The |\vec| accent is not considered here because it has no suitable
% available glyph in a standard 8bits text font encodings.
%
-% Also at |1.3u| the math accents adapt to the font encoding at each math
+% Also at \mstrelease{1.3u} the math accents adapt to the font encoding at each math
% version.
%
-% |1.3v| adapts to \LaTeX{} |2019-10-01| which now comes with robust math
-% accent macros. The «original»-named macros are without the robustifying
-% space (NOT true anymore, see |1.3w| next), as they only serve as meaning
+% (obsolete at \mstrelease{1.4}) \mstrelease{1.3v} adapts to \LaTeX{}
+% |2019-10-01| which now comes with robust math accent macros. The
+% «original»-named macros are without the robustifying space (NOT true
+% anymore, see \mstrelease{1.3w} next), as they only serve as meaning
% holders.
%
-% On the other hand the macros
-% indexed by math version names are (in the pdflatex branch) always defined
-% via \cs{DeclareMathAccent} hence they will be robust with |2019-10-01| or
+% (obsolete at \mstrelease{1.4}) On the other hand the macros indexed by
+% math version names are (in the pdflatex branch) always defined via
+% \cs{DeclareMathAccent} hence they will be robust with |2019-10-01| or
% later and we must use the \cs{mst@robustifyingspace} with them to access
% their real meaning (this thus differs from the situation with \cs{hbar}).
%
-% |1.3w| The above was a bit optimistic as |amsmath| for example modifies
+% \mstrelease{1.3w} The above was a bit optimistic as |amsmath| for example modifies
% \LaTeX{} internals and handles math accents differently.
%
% We thus needed to double our
@@ -9456,73 +10177,63 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\let\add@unicode@accent\@firstoftwo
\if1\mst@OneifUniEnc
\ifmst@unimathaccents
- % \` -> \grave
\expandafter\xdef\csname mst@grave@mv#1\mst@robustifyingspace\endcsname
{\mst@Umathaccent
7
\number\symmtoperatorfont\space
\csname#2\string\`\endcsname{}\relax}%
- % \' -> \acute
\expandafter\xdef\csname mst@acute@mv#1\mst@robustifyingspace\endcsname
{\mst@Umathaccent
7
\number\symmtoperatorfont\space
\csname#2\string\'\endcsname{}\relax}%
- % \v -> \check
\expandafter\xdef\csname mst@check@mv#1\mst@robustifyingspace\endcsname
{\mst@Umathaccent
7
\number\symmtoperatorfont\space
\csname#2\string\v\endcsname{}\relax}%
- % \u -> \breve
\expandafter\xdef\csname mst@breve@mv#1\mst@robustifyingspace\endcsname
{\mst@Umathaccent
7
\number\symmtoperatorfont\space
\csname#2\string\u\endcsname{}\relax}%
- % \= -> \bar
\expandafter\xdef\csname mst@bar@mv#1\mst@robustifyingspace\endcsname
{\mst@Umathaccent
7
\number\symmtoperatorfont\space
\csname#2\string\=\endcsname{}\relax}%
- % \. -> \dot
\expandafter\xdef\csname mst@dot@mv#1\mst@robustifyingspace\endcsname
{\mst@Umathaccent
7
\number\symmtoperatorfont\space
\csname#2\string\.\endcsname{}\relax}%
- % \" -> \ddot
\expandafter\xdef\csname mst@ddot@mv#1\mst@robustifyingspace\endcsname
{\mst@Umathaccent
7
\number\symmtoperatorfont\space
\csname#2\string\"\endcsname{}\relax}%
- % \r -> \mathring
\expandafter\xdef\csname mst@mathring@mv#1\mst@robustifyingspace\endcsname
{\mst@Umathaccent
7
\number\symmtoperatorfont\space
\csname#2\string\r\endcsname{}\relax}%
- % \^ -> \hat
\expandafter\xdef\csname mst@hat@mv#1\mst@robustifyingspace\endcsname
{\mst@Umathaccent
7
\number\symmtoperatorfont\space
\csname#2\string\^\endcsname{}\relax}%
- % \~ -> \tilde
\expandafter\xdef\csname mst@tilde@mv#1\mst@robustifyingspace\endcsname
{\mst@Umathaccent
7
\number\symmtoperatorfont\space
\csname#2\string\~\endcsname{}\relax}%
- \else % false branch of ifmst@unimathaccents
+ \else
% \end{macrocode}
-% |1.3u| used some \cs{def} but this made the accent macro meanings look
+% \mstrelease{1.3u} used some \cs{def} but this made the accent macro meanings look
% slightly different depending on whether the math version being set-up was
% with an 8bit encoding or TU encoding.
%
-% For the sake of uniform treatment we modify this at |1.3v|, but this is a
+% For the sake of uniform treatment we modify this at \mstrelease{1.3v}, but this is a
% bit complicated regarding timing: we need, in absence of |unimathaccents|
% option, in math versions with an OpenType font, to let the \cs{acute} etc...
% acquire back some prior non-\mst meanings. To allow maximal flexibility,
@@ -9535,8 +10246,8 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% definition of the «original»-named macros but prior to the (last one, if
% multiple) \cs{mst@nonsubduedmathaccents}.
%
-% Hence |1.3v| delayed a bit the initial execution of this macro (see further
-% down in the code) compared to what happened in |1.3u|.
+% Hence \mstrelease{1.3v} delayed a bit the initial execution of this macro (see further
+% down in the code) compared to what happened in \mstrelease{1.3u}.
%
% We are in a group but \cs{AtEndOfPackage} does the right thing.
% \begin{macrocode}
@@ -9561,7 +10272,6 @@ defaultbf,defaultit,defaultsf,defaulttt}}
%
% But wouldn't it be simpler to manage \cs{protected} macros?
% \begin{macrocode}
- \ifmst@robust@obsessed@LaTeX@era
\@tfor\@tempa:={grave}{acute}{check}{breve}{bar}%
{dot}{ddot}{mathring}{hat}{tilde}%
\do
@@ -9569,58 +10279,47 @@ defaultbf,defaultit,defaultsf,defaulttt}}
{\noexpand\protect
\expandafter\noexpand\csname mst@\@tempa @mv#1 \endcsname}%
}%
- \fi
- \else % false branch of ifUniEnc
+ \else
% \end{macrocode}
% \cs{DeclareMathAccent} works \cs{global}ly. And with \LaTeX{} |2019-10-01|
% or later it creates robust macros.
%
% \cs{mst@DeclareMathAccent} to work around \url{https://github.com/latex3/latex2e/issues/216}
% \begin{macrocode}
- % \` -> \grave
\expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@grave@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\`\endcsname{}}
- % \' -> \acute
\expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@acute@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\'\endcsname{}}
- % \v -> \check
\expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@check@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\v\endcsname{}}
- % \u -> \breve
\expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@breve@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\u\endcsname{}}
- % \= -> \bar
\expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@bar@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\=\endcsname{}}
- % \. -> \dot
\expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@dot@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\.\endcsname{}}
- % \" -> \ddot
\expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@ddot@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\"\endcsname{}}
- % \r -> \mathring
\expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@mathring@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\r\endcsname{}}
- % \^ -> \hat
\expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@hat@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\^\endcsname{}}
- % \~ -> \tilde
\expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@tilde@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\~\endcsname{}}
\fi
\endgroup
}%
-\fi % \ifmst@mathaccents
+\fi
% \end{macrocode}
% \end{macro}
% \begin{macro}{\MTDeclareVersion}
@@ -9634,14 +10333,14 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \cs{SetSymbolFont}|{mteulervm}||{versionname}||{U}{zeur}{bx}{n}| if
% one wants to have a math version with bold Euler characters.
%
-% For version |1.1| we add an optional parameter specifying the shape
+% For version \mstrelease{1.1} we add an optional parameter specifying the shape
% to be used for letters.
%
% Note: (|2012/10/24|) I really should check whether the user attempts to
% redefine the `normal' and `bold' versions and issue a warning in
-% that case! Finally done at |1.3w| |2019/11/16|! Better late than never...
+% that case! Finally done at \mstrelease{1.3w} |2019/11/16|! Better late than never...
%
-% |1.3c| (|2013/12/14|) adds an extra optional parameter after all
+% \mstrelease{1.3c} (|2013/12/14|) adds an extra optional parameter after all
% previous ones, to inherit the settings from another version. Typically
% to be used with [bold]. I take this opportunity to sanitize a bit some
% line endings to avoid generating (in the preamble, document macros were
@@ -9650,11 +10349,11 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% purpose) the strange way I used |\@onlypreamble| in earlier
% version.
%
-% |1.3u| adds storage of macros holding the needed meanings for
+% \mstrelease{1.3u} adds storage of macros holding the needed meanings for
% \cs{imath}, \cs{hbar}, math accents, and the minus symbol,
% version wise.
%
-% |1.3w| adds the check to forbid |normal| and |bold| as version names.
+% \mstrelease{1.3w} adds the check to forbid |normal| and |bold| as version names.
% \begin{macrocode}
\newcommand*\MTDeclareVersion[6][]{%
\edef\mst@declareversionargs{{#1}{#2}{#3}{#4}{#5}{#6}}%
@@ -9666,14 +10365,14 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\MTDoNotDeclareVersion@\expandafter\@gobblefour
\fi
\relax\DeclareMathVersion{\mst@version}\MTDeclareVersion@
-}% \MTDeclareVersion
+}%
\newcommand*\MTDoNotDeclareVersion@[1][]{%
\PackageWarningNoLine{mathastext}{You asked to declare a version with name
`\mst@version'.^^J%
\@spaces Sorry but you are not allowed to do that.^^J%
\@spaces \ifmst@subdued Anyway the `subdued' option is in force\else
Use rather \string\Mathastext\space macro (with no optional argument)\fi
-}}%\MTDoNotDeclareVersion@
+}}%
\newcommand*\MTDeclareVersion@[1][]{%
\edef\mst@tmp{#1}%
\ifx\mst@tmp\empty\else
@@ -9685,7 +10384,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
inherits from `#1\string'\@gobble}%
\fi
\expandafter\MTDeclareVersion@@\mst@declareversionargs
-}% \MTDeclareVersion@
+}%
\newcommand*\MTDeclareVersion@@[6]{%
\expandafter\edef\csname mst@encoding@\mst@version\endcsname{#3}%
\expandafter\edef\csname mst@family@\mst@version\endcsname{#4}%
@@ -9706,46 +10405,69 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\ifx\mst@tmp\empty
\ifmst@italic
\SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{\mst@ltsh}%
-\immediate\write\m@ne{}%
-\PackageInfo{mathastext}{Latin letters in math version `#2\string'\MessageBreak
+ \immediate\write\m@ne{}%
+ \PackageInfo{mathastext}%
+ {\ifmst@noletters
+ \else
+ Latin letters in math version `#2\string'\MessageBreak
declared\on@line\MessageBreak
will use the font #3/#4/#5/\mst@ltsh
\ifmst@frenchmath\space(uppercase: #6)\fi\MessageBreak
+ \fi
Other characters (digits, ...) and \protect\log-like names\MessageBreak
- will be in `#6\string' shape\@gobble}%
-\immediate\write\m@ne{}%
+ \ifmst@noletters
+ will use the font #3/#4/#5/#6%
+ \else
+ will be in `#6\string' shape%
+ \fi\@gobble}%
+ \immediate\write\m@ne{}%
\expandafter\edef\csname mst@ltshape@\mst@version\endcsname{\mst@ltsh}%
\else
\SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{#6}%
-\immediate\write\m@ne{}%
-\PackageInfo{mathastext}{Latin letters in math version `#2\string'\MessageBreak
+ \ifmst@noletters
+ \else
+ \immediate\write\m@ne{}%
+ \PackageInfo{mathastext}%
+ {Latin letters in math version `#2\string'\MessageBreak
declared\on@line\MessageBreak
will use the fonts #3/#4/#5(\mst@bold)/#6\@gobble}%
-\immediate\write\m@ne{}%
+ \fi
+ \immediate\write\m@ne{}%
\expandafter\edef\csname mst@ltshape@\mst@version\endcsname{#6}%
\fi
- \else % #1 not empty
+ \else
+% \end{macrocode}
+% |#1| not empty.
+% \begin{macrocode}
\SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{#1}%
-\immediate\write\m@ne{}%
-\PackageInfo{mathastext}{Latin letters in math version `#2\string'\MessageBreak
+ \immediate\write\m@ne{}%
+ \PackageInfo{mathastext}%
+ {\ifmst@noletters
+ \else
+ Latin letters in math version `#2\string'\MessageBreak
declared\on@line\MessageBreak
will use the font #3/#4/#5/#1%
\ifmst@frenchmath\space(uppercase: #6)\fi\MessageBreak
+ \fi
Other characters (digits, ...) and
\protect\log-like names\MessageBreak
- will be in `#6\string' shape\@gobble}%
-\immediate\write\m@ne{}%
- \expandafter\edef\csname mst@ltshape@\mst@version\endcsname{#1}%
+ \ifmst@noletters
+ will use the font #3/#4/#5/#6%
+ \else
+ will be in `#6\string' shape%
+ \fi\@gobble}%
+ \immediate\write\m@ne{}%
+ \expandafter\edef\csname mst@ltshape@\mst@version\endcsname{#1}%
\fi
% \end{macrocode}
-% Here and elsewhere |1.3za| has removed an
+% Here and elsewhere \mstrelease{1.3za} has removed an
% \cs{ifmst@nonormalbold} conditional.
% \begin{macrocode}
\SetMathAlphabet{\Mathnormalbold}{#2}{#3}{#4}{\mst@bold}%
{\csname mst@ltshape@\mst@version\endcsname}%
\SetSymbolFont{mtoperatorfont}{#2}{#3}{#4}{#5}{#6}%
% \end{macrocode}
-% Since |1.3za| (and prior to |1.15f|) these math alphabet
+% Since \mstrelease{1.3za} (and prior to \mstrelease{1.15f}) these math alphabet
% commands are always defined.
% \begin{macrocode}
\SetMathAlphabet{\Mathbf}{#2}{#3}{#4}{\mst@bold}{#6}
@@ -9765,12 +10487,12 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% options as well as on the (local to this version) shapes for letters
% and digits.
%
-% |1.3x| replaces \cs{updefault} by \cs{MTgreekupdefault} and
+% \mstrelease{1.3y} replaces \cs{updefault} by \cs{MTgreekupdefault} and
% \cs{itdefault} by \cs{MTgreekitdefault}. It also prepares to store
% two Boolean settings saying whether lowercase respectively uppercase
% Greek letters will use `upright' or `italic' (|LGRgreek(s)| only).
%
-% The |1.3x| refactoring of |LGRgreek| is done via a decoupling,
+% The \mstrelease{1.3y} refactoring of |LGRgreek| is done via a decoupling,
% thus things are done here under |selfGreek| or other Greek options
% which ultimately serve nothing and conversely things are done here
% for |LGRgreek| which are superfluous.
@@ -9813,7 +10535,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\mst@greek@upper@uptrue
\fi
% \end{macrocode}
-% |1.3za| refactoring to reduce code duplication; I briefly considered
+% \mstrelease{1.3za} refactoring to reduce code duplication; I briefly considered
% trying to enhance \cs{MTgreekfont} to work also with |LGRgreeks| and
% |selfGreeks| but I have dropped the idea for now.
% \begin{macrocode}
@@ -9875,7 +10597,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\expandafter\mst@dothe@hyphenstuff\mst@tmp
\fi
\fi
-}% \MTDeclareVersion@@
+}%
\let\MathastextDeclareVersion\MTDeclareVersion
% \end{macrocode}
% \end{macro}
@@ -9890,45 +10612,48 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% additionally to the math fonts. Present already in the initial
% version of the package (January 2011.)
%
-% |1.15|: some modifications for the subdued option vs LGRgreek and
+% \mstrelease{1.15}: some modifications for the subdued option vs LGRgreek and
% for the math muskips after \cs{exists} and \cs{forall}.
%
-% |1.2|: with the subdued option sets the math alphabets in the
+% \mstrelease{1.2}: with the subdued option sets the math alphabets in the
% normal and bold math versions do not apply to operator
% names and non-alphabetical symbols. The switch for braces
% is left as it is.
%
-% |1.2b|: with the subdued option, the italic corrections are not added.
+% \mstrelease{1.2b}: with the subdued option, the italic corrections are not added.
% Else, we check the shape of letters in this version. Also, there was a bug
-% since |1.15|: the values of the math skips were taken not from the
+% since \mstrelease{1.15}: the values of the math skips were taken not from the
% settings for the math version (\#2) but from those of the optional argument
% (\#1), if present...
%
-% |1.3|: activation of italic corrections is now separated from actual math
+% \mstrelease{1.3}: activation of italic corrections is now separated from actual math
% activation of letters.
%
-% |1.3c|: a starred variant is added which does not modify the text fonts,
+% \mstrelease{1.3c}: a starred variant is added which does not modify the text fonts,
% only the math set-tup.
%
-% |1.3d|: replaced in |\MTversion@| things like |\edef\mst@encoding{...}| and
-% |\renewcommand{\encodingdefault}{\mst@@encoding}| by
+% \mstrelease{1.3d}: replaced in |\MTversion@| things like |\edef\mst@encoding{...}| and
+% \centeredline{|\renewcommand{\encodingdefault}{\mst@@encoding}|} by
% |\edef\encodingdefault{...}| etc\dots All those |\mst@@...| things were
% useless. I also redefine |\seriesdefault| rather than |\mddefault|.
%
-% |1.3d|: mechanism of restoration of Greek in subdued normal and bold
+% \mstrelease{1.3d}: mechanism of restoration of Greek in subdued normal and bold
% versions has been to all cases, and not only for the
% |LGRgreek| option.
%
-% |1.3u|: version savvy (i.e.\@ font-encoding savvy) minus sign,
+% \mstrelease{1.3u}: version savvy (i.e.\@ font-encoding savvy) minus sign,
% \cs{hbar}, \cs{imath}, math accents.
%
-% |1.3x|: Booleans recovered from stored data in the math version will
+% \mstrelease{1.3y}: Booleans recovered from stored data in the math version will
% configure the things \cs{MTcustomgreek} do, under |LGRgreek| option.
% \begin{macrocode}
-\newcommand*\MTversion {\@ifstar\MTversion@s\MTversion@ }
-\newcommand*\MTversion@s [1]{\mathversion{#1}\MTversion@@ }
+\newcommand*\MTversion {\@ifstar\MTversion@s\MTversion@}
+\newcommand*\MTversion@s [1]{\mathversion{#1}\MTversion@@}
\newcommand*\MTversion@ [2][]{%
- \mathversion{#2}% defines \math@version as expanded #2
+% \end{macrocode}
+% This defines \cs{math@version} as expanded |#2|.
+% \begin{macrocode}
+ \mathversion{#2}%
\edef\mst@tmpa{#1}%
\ifx\mst@tmpa\empty
\let\mst@tmp\math@version
@@ -9946,14 +10671,14 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\edef\ttdefault {\csname mst@ttdefault@\mst@tmp\endcsname}%
\usefont{\encodingdefault}{\familydefault}{\seriesdefault}{\shapedefault}%
\MTversion@@
-}% \MTversion@
+}%
% \end{macrocode}
-% |1.3j| has a stronger subdued which does \cs{MTnormalprime},
+% \mstrelease{1.3j} has a stronger subdued which does \cs{MTnormalprime},
% \cs{MTnormalexists}, \cs{MTnormalforall} rather than setting the skips to
% |0mu|. Hence \cs{MTversion} by default should do \cs{MTprimedoesskip},
% \cs{MTexistsdoesskip}, \cs{MTforalldoesskip}.
%
-% |1.3u| drops the argument, as the info is in \cs{math@version} from
+% \mstrelease{1.3u} drops the argument, as the info is in \cs{math@version} from
% \LaTeX2e code.
% \begin{macrocode}
\newcommand*\MTversion@@ {%
@@ -9979,18 +10704,18 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\edef\mst@tmpa{\csname mst@ltshape@\math@version\endcsname}%
\edef\mst@tmpb{\csname mst@shape@\math@version\endcsname}%
% \end{macrocode}
-% |v1.15c|: extending subdued to LGRgreek.
+% \mstrelease{1.15c}: extending subdued to LGRgreek.
%
-% |v1.15f|: subdueing math alphabets in a simpler way than in |1.15e|.
+% \mstrelease{1.15f}: subdueing math alphabets in a simpler way than in \mstrelease{1.15e}.
%
-% |v1.2b|: subdueing the activation of characters in math mode.
+% \mstrelease{1.2b}: subdueing the activation of characters in math mode.
%
-% |v1.2d|: special treatment of the asterisk.
+% \mstrelease{1.2d}: special treatment of the asterisk.
%
-% |v1.3d|: extended LGRgreek mechanism of activation/restoration of Greek to all
+% \mstrelease{1.3d}: extended LGRgreek mechanism of activation/restoration of Greek to all
% cases.
%
-% |v1.3j|: use of \cs{MTeverymathdefault}, which includes \cs{MTicinmath}, but
+% \mstrelease{1.3j}: use of \cs{MTeverymathdefault}, which includes \cs{MTicinmath}, but
% must be corrected then according to shape of letters and presence or absence
% of option |frenchmath|. We do only |\def\mst@ITcorr{\ifnum\fam=\m@ne\/\fi}|
% and not \cs{MTICinmath} to not overwrite some user-defined
@@ -9999,6 +10724,12 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% user customizing possibilities, but if I moved it later, I would possibly
% have to put inside the \cs{MTicinmath} the check for |it| ot |sl|. Similary
% the \cs{MTcustomgreek} always executed (if not |subdued|).
+%
+% MEMO: \cs{MTeverymathdefault} is executed \emph{also} if in |subdued| mode
+% but there is a \cs{MTeverymathoff} done next in the \emph{normal} and
+% \emph{bold} version. It does \cs{MTicinmath} and \cs{MTmathactivedigits}
+% which however are no-ops (only partly for the former, and for the latter
+% always anyhow if no option |activedigits|) in subdude mode.
% \begin{macrocode}
\MTmathoperatorsobeymathxx
\MTeverymathdefault
@@ -10009,7 +10740,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\@for\mst@tmpc:=it,sl\do{\ifx\mst@tmpc\mst@tmpb\MTnoICinmath\fi}%
\fi
% \end{macrocode}
-% |1.3j| has a stronger subdued which does \cs{MTnormalprime},
+% \mstrelease{1.3j} has a stronger subdued which does \cs{MTnormalprime},
% \cs{MTnormalexists}, \cs{MTnormalforall} rather than simply setting the
% skips to |0mu|. Note: \cs{MTnormalprime} is done as part of
% \cs{MTeverymathoff}.
@@ -10027,13 +10758,18 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\MTmathoperatorsdonotobeymathxx
\MTnormalexists
\MTnormalforall
+% \end{macrocode}
+% \mstrelease{1.4} has kept \cs{MTmathstandardletters} inside
+% \cs{MTeverymathoff} but its action is now quite different from earlier
+% situation as it resets mathcodes from active to normal status on the spot.
+% \begin{macrocode}
\MTeverymathoff
\MTresetnewmcodes
% \end{macrocode}
-% |1.3t| adds better compatibility with |subdued| mode for
+% \mstrelease{1.3t} adds better compatibility with |subdued| mode for
% |\imath/\jmath| and perfect compatibility for the minus sign.
%
-% |1.3u| extends this further to allow per-math-version meanings
+% \mstrelease{1.3u} extends this further to allow per-math-version meanings
% for them.
% \begin{macrocode}
\mst@subduedhbar
@@ -10056,7 +10792,14 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\else
\mst@setalphabets
% \end{macrocode}
-% |1.3x| addition for \cs{MTcustomgreek} under |LGRgreeks| option.
+% \mstrelease{1.3y} addition for \cs{MTcustomgreek} under |LGRgreeks| option.
+%
+% MEMO: the needed mathematical re-activation of letters when switching from
+% \emph{normal} or \emph{bold} to a non-|subdued| math version has already
+% been done above from the \cs{MTicinmath} which is part of
+% \cs{MTeverymathdefault}.
+%
+% MEMO: idem for digits under option |activedigits|.
% \begin{macrocode}
\expandafter\let\csname ifmst@greek@upper@up\expandafter\endcsname
\csname ifmst@greek@\math@version @upper@up\endcsname
@@ -10071,19 +10814,22 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\fi
\else
% \end{macrocode}
-% |1.3x| addition for \cs{MTcustomgreek} under |LGRgreek| option.
+% \mstrelease{1.3y} addition for \cs{MTcustomgreek} under |LGRgreek| option.
+%
+% MEMO: the mathematical activation of letters happened above from
+% \cs{MTeverymathdefault}. Idem if |activedigits| for digits.
% \begin{macrocode}
\expandafter\let\csname ifmst@greek@upper@up\expandafter\endcsname
\csname ifmst@greek@\math@version @upper@up\endcsname
\expandafter\let\csname ifmst@greek@lower@up\expandafter\endcsname
\csname ifmst@greek@\math@version @lower@up\endcsname
- \MTcustomgreek % new with 1.3d
+ \MTcustomgreek
\mst@nonsubduedhbar
\mst@nonsubduedinodot
\mst@nonsubduedmathaccents
\mst@nonsubduedminus
\fi
-}% \MTversion@@
+}%
\let\MathastextVersion\MTversion
\let\Mathastextversion\MTversion
\let\MTVersion\MTversion
@@ -10100,7 +10846,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\MTfamily{#3}
\MTseries{#4}
\MTshape{#5}
- \ifmst@italic\MTlettershape{\itdefault}\fi % was missing in v 1.14 and prior
+ \ifmst@italic\MTlettershape{\itdefault}\fi
\edef\mst@tmp{#1}
\ifx\mst@tmp\empty\else\MTlettershape{#1}\fi
\Mathastext}
@@ -10113,23 +10859,23 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% preamble and any number of time, the last one is the
% one that counts.
%
-% In version |1.1| we have two fonts: they only differ in
+% In version \mstrelease{1.1} we have two fonts: they only differ in
% shape. The |mtletterfont| is for letters, and the
% |mtoperatorfont| for digits and log-like operator
% names. The default is that both are upright.
%
-% Starting with version |1.12|, an optional argument makes
+% Starting with version \mstrelease{1.12}, an optional argument makes
% \cs{Mathastext} act as the declaration of a math
% version, to be later used in the document.
%
-% Versions |1.15x| brought some adaptations related to the subdued
+% Versions \mstrelease{1.15x} brought some adaptations related to the subdued
% option.
%
-% |1.3c| adds a second optional parameter to inherit previous settings
+% \mstrelease{1.3c} adds a second optional parameter to inherit previous settings
% from another version; mostly done to inherit the bold version fonts for
% symbols and large symbols. This is done in |\MTDeclareVersion|.
%
-% |1.3j| moves the code related to \cs{MTicinmath} from \cs{Mathastext@} to
+% \mstrelease{1.3j} moves the code related to \cs{MTicinmath} from \cs{Mathastext@} to
% \cs{AtBeginDocument} (code depending on whether |subdued| option in use).
% But we omit for this from \cs{MTicinmath} the \cs{MTmathactiveletters}
% and issue the latter during loading of package, hence allowing
@@ -10139,15 +10885,15 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% command without optional parameter does not any |\SetSymbolFont| etc...
% but it has a few other tasks to complete nevertheless.
%
-% |1.3u| fixes some long-standing bug that \cs{Mathastext} did not repeat some
+% \mstrelease{1.3u} fixes some long-standing bug that \cs{Mathastext} did not repeat some
% font-encoding dependent things: they got done only once during package
% loading (things regarding the \cs{hbar}, \cs{imath}, the math accents and
% the minus sign). They are now part of the contents of \cs{Mathastext} macro
% itself (which is executed during package loading).
%
-% |1.3x| has refactored the |LGRgreek| associated math fonts.
+% \mstrelease{1.3y} has refactored the |LGRgreek| associated math fonts.
% \begin{macrocode}
-\def\Mathastext {\@ifnextchar [\Mathastext@declare\Mathastext@ }
+\def\Mathastext {\@ifnextchar[\Mathastext@declare\Mathastext@}% ]
\def\Mathastext@declare [#1]{%
\edef\mst@tmp{#1}%
\ifx\mst@tmp\empty
@@ -10156,7 +10902,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\fi
\Mathastext@
{\MTDeclareVersion[\mst@ltsh]{#1}{\mst@enc}{\mst@fam}{\mst@ser}{\mst@opsh}}%
-}% \Mathastext@declare
+}%
\def\Mathastext@ {%
\mst@update@greeksh
\edef\mst@encoding@normal{\mst@enc}%
@@ -10187,7 +10933,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\edef\mst@prime@skip@bold{\mst@prime@skip}%
\ifmst@subdued
% \end{macrocode}
-% Since |1.3j| this branch is actually almost superfluous, as entering
+% Since \mstrelease{1.3j} this branch is actually almost superfluous, as entering
% |normal| or |bold| with \cs{MTversion} does \cs{MTnormalexists},
% \cs{MTnormalforall}, and \cs{MTnormalprime}. But some default values are
% needed if the user insists on issuing \cs{MTexistsdoesskip}, etc...
@@ -10199,7 +10945,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\def\mst@exists@skip@bold{0mu}%
\def\mst@forall@skip@bold{0mu}%
\def\mst@prime@skip@bold{0mu}%
- \else % not subdued
+ \else
\ifmst@italic
\ifmst@frenchmath
\mst@exists@muskip\mst@exists@skip\relax
@@ -10220,8 +10966,8 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\fi
\fi
% \end{macrocode}
-% Here and elsewhere |1.3za| has removed usage of an
-% \cs{ifmst@nonormalbold} conditional which was added at |1.15f|.
+% Here and elsewhere \mstrelease{1.3za} has removed usage of an
+% \cs{ifmst@nonormalbold} conditional which was added at \mstrelease{1.15f}.
% \begin{macrocode}
\SetMathAlphabet{\Mathnormalbold}{normal}{\mst@encoding@normal}%
{\mst@family@normal}%
@@ -10249,7 +10995,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
{\mst@series@bold}%
{\mst@shape@bold}%
% \end{macrocode}
-% |1.3za| removes the |1.15f| added conditional checks.
+% \mstrelease{1.3za} removes the \mstrelease{1.15f} added conditional checks.
% \begin{macrocode}
\SetMathAlphabet{\Mathbf}{normal}{\mst@encoding@normal}%
{\mst@family@normal}%
@@ -10283,10 +11029,10 @@ defaultbf,defaultit,defaultsf,defaulttt}}
{\mst@ttdefault@bold}%
{\mst@series@bold}%
{\mst@shape@bold}%
- \fi % de \ifmst@subdued
+ \fi
% \end{macrocode}
% \begin{macro}{\MathEulerBold}
-% |1.14c|: We reset |mteulervm| and \cs{MathEulerBold} here as the
+% \mstrelease{1.14c}: We reset |mteulervm| and \cs{MathEulerBold} here as the
% variant for bold may have been changed by the user via
% \cs{Mathastextboldvariant}|{m}|; and we should keep this local to
% math versions.
@@ -10309,9 +11055,9 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \begin{macro}{selfGreek*}
% LGRgreek, LGRgreeks, selfGreek, and selfGreeks options.
%
-% |1.3x| has refactored the |LGRgreek| associated math fonts.
+% \mstrelease{1.3y} has refactored the |LGRgreek| associated math fonts.
%
-% |1.3za| adds the math alphabets \cs{mathgreekitbold} and
+% \mstrelease{1.3za} adds the math alphabets \cs{mathgreekitbold} and
% \cs{mathgreekupbold}.
% And it executes this code also in |subdued| mode, because
% anyhow the symbolfonts |mtgreekup| and |mtgreekit| and
@@ -10352,7 +11098,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \end{macrocode}
% \end{macro}
% \end{macro}
-% |1.3za| adds the log message in case of |selfGreek| option.
+% \mstrelease{1.3za} adds the log message in case of |selfGreek| option.
% \begin{macrocode}
\ifmst@subdued
\else
@@ -10380,7 +11126,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\mst@infoline{Other characters (digits, ...) and \string\log-like names will be}%
\mst@infoline{typeset with the \mst@shape@normal\space shape.}%
\fi
- \fi % end of else branch \ifmst@subdued
+ \fi
\ifmst@nohbar\else
\mst@infoline{\string\hbar}%
\mst@dothe@hbarstuff
@@ -10415,9 +11161,9 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\let\mst@varfam@minus@mvbold\mst@varfam@minus@mvnormal
\fi
\fi
- \fi % minus
+ \fi
% \end{macrocode}
-% |1.3zb| moves this info line last and also explicitly mentions |italic| or
+% \mstrelease{1.3zb} moves this info line last and also explicitly mentions |italic| or
% |frenchmath| (here and at some other locations above).
% \begin{macrocode}
\ifmst@subdued
@@ -10427,7 +11173,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\mst@infoline{The \ifmst@frenchmath frenchmath \else
italic \fi option is in effect.}%
\fi
-}% \Mathastext@
+}%
\let\mathastext\Mathastext
\Mathastext
% \end{macrocode}
@@ -10488,14 +11234,23 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\MTeverymathoff}
-% |1.3i 2016/01/06| Compatibility patch with |\url| from |url.sty| and
+% \mstrelease{1.3i} |2016/01/06| Compatibility patch with |\url| from |url.sty| and
% |\url/\nolinkurl| from |hyperref.sty|.
%
-% |1.3j 2016/01/15| renamed the macro from |\MTactivemathoff| to
+% \mstrelease{1.3j} |2016/01/15| renamed the macro from |\MTactivemathoff| to
% |\MTeverymathoff|, as it is not exclusively a matter of math active
% characters due to |\MTeasynonlettersdonotobeymathxx|.
%
-% |1.3o 2016/05/03| adds \cs{MTdonotfixfonts}. Operant with \LuaLaTeX\ only.
+% \mstrelease{1.3o} |2016/05/03| adds \cs{MTdonotfixfonts}. Operant with
+% \LuaLaTeX\ only.
+%
+% \mstrelease{1.4} |2024/07/20| keeps the \cs{MTmathstandardletters} as a
+% component of \cs{MTeverymathoff}. It was checked that \ctanpkg{url} and
+% \ctanpkg{hyperref} do not change mathcodes of ascii letters prior to
+% location where \cs{MTeverymathoff} gets executed, so nothing is
+% overwritten, despite the new mode of action of \cs{MTmathstandardletters}.
+%
+% \mstrelease{1.4} has \cs{MTmathstandarddigits} and inserts it into \cs{MTeverymathoff}.
% \begin{macrocode}
\newcommand*\MTeverymathoff {%
\MTnormalasterisk
@@ -10503,6 +11258,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\MTnonlettersdonotobeymathxx
\MTeasynonlettersdonotobeymathxx
\MTmathstandardletters
+ \MTmathstandarddigits
\MTdonotfixfonts
}%
\AtBeginDocument {%
@@ -10513,7 +11269,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\MTeverymathdefault}
-% |1.3j 2016/01/15| Customizable command which gets executed by
+% \mstrelease{1.3j} |2016/01/15| Customizable command which gets executed by
% \cs{MTversion} except when switching to |normal/bold| if option |subdued|.
% The included \cs{MTicinmath} does \cs{MTmathactiveletters} which will also
% activate the math skips around letters.
@@ -10537,13 +11293,18 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% it will not be overruled (as it is delayed at begin document to after \mst
% dealings).
%
-% |1.3o 2016/05/03| adds \cs{MTfixfonts}. Operant with \LuaLaTeX\ only.
+% \mstrelease{1.3o} |2016/05/03| adds \cs{MTfixfonts}. Operant with
+% \LuaLaTeX\ only.
+%
+% \cs{MTmathactivedigits} of \mstrelease{1.4} is a no-op except under option
+% |activedigits|.
% \begin{macrocode}
\newcommand*\MTeverymathdefault {%
\MTactiveasterisk
\MTprimedoesskip
\MTeasynonlettersobeymathxx
\MTicinmath
+ \MTmathactivedigits
\MTfixfonts
}%
% \end{macrocode}
@@ -10552,48 +11313,54 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% \def~{\rlap}
% \begin{macro}{Things to do last ~{``at begin document''}}
% \let~\temp
+%
+% \mstrelease{1.4} has a significant change here that mathematical
+% activation of ascii letters is now not incorporated into the \cs{everymath}
+% and \cs{everydisplay}.
% \begin{macrocode}
-\AtBeginDocument{%
- \everymath\expandafter{\the\everymath
- \mst@the\mst@do@nonletters \let\mst@the\@gobble
- \mst@theeasy\mst@do@easynonletters \let\mst@theeasy\@gobble
- \mst@thef\mst@do@az \let\mst@thef\@gobble
- \mst@theF\mst@do@AZ \let\mst@theF\@gobble}%
- \everydisplay\expandafter{\the\everydisplay
- \mst@the\mst@do@nonletters \let\mst@the\@gobble
- \mst@theeasy\mst@do@easynonletters \let\mst@theeasy\@gobble
- \mst@thef\mst@do@az \let\mst@thef\@gobble
- \mst@theF\mst@do@AZ \let\mst@theF\@gobble}%
-% \end{macrocode}
-% |1.3j|: moved here to be executed at begin document (and not from inside
+\ifmst@everymath
+ \AtBeginDocument{%
+ \everymath\expandafter{\the\everymath
+ \mst@the\mst@do@nonletters \let\mst@the\@gobble
+ \mst@theeasy\mst@do@easynonletters \let\mst@theeasy\@gobble
+ }%
+ \everydisplay\expandafter{\the\everydisplay
+ \mst@the\mst@do@nonletters \let\mst@the\@gobble
+ \mst@theeasy\mst@do@easynonletters \let\mst@theeasy\@gobble
+ }%
+ }
+\fi
+% \end{macrocode}
+% \mstrelease{1.3j}: moved here to be executed at begin document (and not from inside
% \cs{Mathastext@}.) The \cs{MTeverymathoff} does: \cs{MTnormalasterisk},
% \cs{MTnormalprime}, \cs{MTnonlettersdonotobeymathxx},
% \cs{MTeasynonlettersdonotobeymathxx}, \cs{MTmathstandardletters}.
%
-% |1.3m|: doing \cs{MTmathactiveletters} in subdued mode immediately after
+% \mstrelease{1.3m}: doing \cs{MTmathactiveletters} in subdued mode immediately after
% |\begin{document}| resulted in errors because \cs{mst@itcorr} had been left
% undefined. We thus add \cs{MTnoicinmath} to the subdued initialization.
%
-% Since |1.3n| there is \cs{MTresetnewmcodes} which needs
+% Since \mstrelease{1.3n} there is \cs{MTresetnewmcodes} which needs
% \cs{mst@originalnewmcodes@}, itself defined at begin document. Thus we have
-% wrapped the whole thing in \cs{AtEndOfPackage} (at |1.3u| whole code
+% wrapped the whole thing in \cs{AtEndOfPackage} (at \mstrelease{1.3u} whole code
% directly moved at end of package).
%
-% And |1.3p| adds here \cs{MTcustomizenewmcodes} which had been regrettably
-% forgotten by |1.3n|.
+% And \mstrelease{1.3p} adds here \cs{MTcustomizenewmcodes} which had been regrettably
+% forgotten by \mstrelease{1.3n}.
%
-% |1.3t| adds some extras to handle correctly the minus sign and
+% \mstrelease{1.3t} adds some extras to handle correctly the minus sign and
% dotless i and j in subdued mode, even in case of usage with fontspec.
%
-% |1.3u| similarly lets math accents be correctly subdued.
+% \mstrelease{1.3u} similarly lets math accents be correctly subdued.
%
-% |1.3v| adapts to \cs{hbar} and math accents now being robust with \LaTeX{}
+% \mstrelease{1.3v} adapts to \cs{hbar} and math accents now being robust with \LaTeX{}
% |2019-10-01| or later.
%
-% |1.3w| pays attention to the fact that \cs{hbar} may well be
+% \mstrelease{1.3w} pays attention to the fact that \cs{hbar} may well be
% a |\mathchar| and not a robust macro! And no need to worry about
% \cs{hbar<space>} finally in revised code.
% \begin{macrocode}
+\AtBeginDocument{%
\MTcustomizenewmcodes
\let\mst@original@hbar\hbar
\let\mst@original@imath\imath
@@ -10617,21 +11384,18 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\MTresetnewmcodes
\MTnoicinmath
\MTmathoperatorsdonotobeymathxx
- %\mst@subduedhbar
\let\inodot\imath
\let\jnodot\jmath
- %\mst@subduedmathaccents
\mst@subduedminus
\else
\mst@nonsubduedhbar
% \end{macrocode}
-% |1.3v| needs this \cs{mst@nonsubduedmathaccents} to get executed later (see
+% \mstrelease{1.3v} needs \cs{mst@nonsubduedmathaccents} to get executed later (see
% code comments for \cs{mst@dothe@mathaccentsstuff}).
% \begin{macrocode}
- % \mst@nonsubduedmathaccents % will get executed later
\mst@nonsubduedminus
% \end{macrocode}
-% |1.3j|: an earlier version of this code was earlier part of \cs{Mathastext@}.
+% \mstrelease{1.3j}: an earlier version of this code was earlier part of \cs{Mathastext@}.
% As we are now in \cs{AtBeginDocument} we try to be careful not to overwrite
% \cs{MTicinmath}, \cs{MTnoicinmath}, \cs{MTicalsoinmathxx}, ... if issued by
% the user in the preamble, though. And we do not execute
@@ -10652,12 +11416,12 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\fi
\fi
\fi
-}% \AtBeginDocument
+}%
\AtEndOfPackage{\AtBeginDocument{\ifmst@subdued\else\mst@nonsubduedmathaccents\fi}}%
% \end{macrocode}
% \end{macro}
% \begin{macro}{subdued}
-% |1.15|: The subdued code was initiated in May 2011. I returned to
+% \mstrelease{1.15}: The subdued code was initiated in May 2011. I returned to
% |mathastext| on Sep 24, 2012, and decided to complete what I had started
% then, but in the mean time I had forgotten almost all of the little I knew
% about \LaTeX{} macro programming.
@@ -10671,7 +11435,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% $^1$but the \emph{euler} package for example
% assigns the digits to the \emph{letters} symbol font...
%
-% |1.15d|: Oct 13, 2012. The \cs{mathcode} thing has to be used with care
+% \mstrelease{1.15d}: Oct 13, 2012. The \cs{mathcode} thing has to be used with care
% under Unicode engines. Unfortunately the \cs{luatexUmathcode} macro is
% helpless as it is not possible to know if it will return a legacy mathcode
% or a Unicode mathcode. On the other hand the much saner
@@ -10683,14 +11447,14 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% treats identically under both unicode engines the equal and minus signs (and
% the vertical bar).}
%
-% |1.15e|: Oct 22, 2012. I add the necessary things to also subdue the
+% \mstrelease{1.15e}: Oct 22, 2012. I add the necessary things to also subdue the
% \cs{mathbf}, \cs{mathit}, \cs{mathsf} and \cs{mathtt} macros (previous
% version only took care of the symbol alphabets \cs{mathnormal} and
-% \cs{mathrm}.) [update: |1.15f| does that in a completely different and much
+% \cs{mathrm}.) [update: \mstrelease{1.15f} does that in a completely different and much
% simpler way] Notice that the package defines a \cs{mathnormalbold} macro,
% but it will not be subdued in the normal and bold math versions.
%
-% |1.15f|: Oct 23, 2012. The previous version of the code queried the math
+% \mstrelease{1.15f}: Oct 23, 2012. The previous version of the code queried the math
% family of a, respectively 1, to guess and then extract the fonts to be
% reassigned to mtletterfont and mtoperatorfont (which is done at the end of
% this .sty file). The present code simply directly uses letters and operators
@@ -10705,23 +11469,24 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% to revert these changes (and one would have to do even more hacking for
% |\mathversion{normal}| and not only |\MTversion{normal}| to work).
%
-% |1.15f|: and also I take this opportunity to do the subdued math
+% \mstrelease{1.15f}: and also I take this opportunity to do the subdued math
% alphabets things in a much much easier way, see below.
%
-% |1.3s 2018/08/21|: I have half-forgotten the reasons for modifiying the
+% \mstrelease{1.3s} |2018/08/21|: I have half-forgotten the reasons for modifiying the
% font encoding to current |\encodingdefault|, but at any rate this should
% not be done in a \ctanpkg{fontspec} context, encoding default being (now) |TU| it
% is very unlikely modifying from |TU| or to |TU| from something else will
-% do any good.^^A See
+% do any good.
+%^^A See
%^^A \centeredline{\url{https://tex.stackexchange.com/questions/444565/mathastext-wrong-digits-in-math-mode/}}
%^^A for original report.
% I add workaround here for case of \ctanpkg{fontspec} being
% detected via the |\encodingdefault| setting.
%
-% |1.3t 2018/08/22|: the |1.3s| fix erroneously removed the
+% \mstrelease{1.3t} |2018/08/22|: the \mstrelease{1.3s} fix erroneously removed the
% |OT1->T1| replacement in |TU| context.
%
-% |1.3u|: the whole thing will only get executed At Begin
+% \mstrelease{1.3u}: the whole thing will only get executed At Begin
% Document.
%
% I realize extremely late (|2023/12/28|) I never said explicitly anywhere
@@ -10734,7 +11499,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
% behavior of the package.
% \begin{macrocode}
\ifmst@subdued
-\AtBeginDocument{%
+ \AtBeginDocument{%
\def\mst@reserved#1\getanddefine@fonts\symletters#2#3\@nil{%
\def\mst@normalmv@letter{#2}}%
\expandafter\mst@reserved\mv@normal\@nil
@@ -10773,15 +11538,19 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\else
\mst@tmp@enc
\fi/\mst@reste\endcsname}%
- \expandafter\SetSymbolFont@ \expandafter\mv@normal\mst@normalmv@letter\symmtletterfont
- \expandafter\SetSymbolFont@ \expandafter\mv@bold\mst@boldmv@letter\symmtletterfont
- \expandafter\SetSymbolFont@ \expandafter\mv@normal\mst@normalmv@operator\symmtoperatorfont
- \expandafter\SetSymbolFont@ \expandafter\mv@bold\mst@boldmv@operator\symmtoperatorfont
-\immediate\write\m@ne{}%
+ \expandafter\SetSymbolFont@
+ \expandafter\mv@normal\mst@normalmv@letter\symmtletterfont
+ \expandafter\SetSymbolFont@
+ \expandafter\mv@bold\mst@boldmv@letter\symmtletterfont
+ \expandafter\SetSymbolFont@
+ \expandafter\mv@normal\mst@normalmv@operator\symmtoperatorfont
+ \expandafter\SetSymbolFont@
+ \expandafter\mv@bold\mst@boldmv@operator\symmtoperatorfont
+ \immediate\write\m@ne{}%
\PackageInfo{mathastext}{...entering subdued mode...\MessageBreak ...done}%
-\immediate\write\m@ne{}%
-}% \AtBeginDocument
-\fi % \ifmst@subdued
+ \immediate\write\m@ne{}%
+ }%
+\fi
% \end{macrocode}
%^^A In the short-lived |1.15e| I was doing the following for alphabets:\\
%^^A |\def\mst@reservedc#1#2#3#4{\def\mst@normalmv@mathbf{#4#3}}|\\
diff --git a/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx b/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx
index 47bfec1ee27..7010eb64e13 100644
--- a/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx
@@ -52,7 +52,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex aliascnt.dtx
% makeindex -s gind.ist aliascnt.idx
% pdflatex aliascnt.dtx
@@ -308,7 +308,7 @@ and the derived files
% Therefore we must ensure that manipulations to the clear list
% are done with the clear list macro of a real counter.
% \begin{macro}{\AC@findrootcnt}
-% \cs{AC@findrootcnt} walks throught the aliasing relations
+% \cs{AC@findrootcnt} walks through the aliasing relations
% to find the base counter.
% \begin{macrocode}
\newcommand*{\AC@findrootcnt}[1]{%
diff --git a/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx b/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx
index 0eec647c99c..bdcf6004d06 100644
--- a/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx
@@ -54,7 +54,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex bmpsize.dtx
% makeindex -s gind.ist bmpsize.idx
% pdflatex bmpsize.dtx
@@ -339,7 +339,7 @@ and the derived files
%
% A parser sets the switch \cs{ifbmpsize@ok} to true, if it
% could successfully parse the image file.
-% The width and height are returnd in \cs{bmpsize@width} and
+% The width and height are returned in \cs{bmpsize@width} and
% \cs{bmpsize@height}. If information about density is available,
% it is used to calculate width and height of the image, otherwise
% the values given by option \xoption{defaultresolution} is used.
diff --git a/Master/texmf-dist/source/latex/oberdiek/centernot.dtx b/Master/texmf-dist/source/latex/oberdiek/centernot.dtx
index dd990a33197..aa2cff5f0d8 100644
--- a/Master/texmf-dist/source/latex/oberdiek/centernot.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/centernot.dtx
@@ -52,7 +52,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex centernot.dtx
% makeindex -s gind.ist centernot.idx
% pdflatex centernot.dtx
diff --git a/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx b/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx
index 78e1a3cbebb..24989ed9db3 100644
--- a/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx
@@ -53,7 +53,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex chemarr.dtx
% makeindex -s gind.ist chemarr.idx
% pdflatex chemarr.dtx
diff --git a/Master/texmf-dist/source/latex/oberdiek/classlist.dtx b/Master/texmf-dist/source/latex/oberdiek/classlist.dtx
index 8b454645215..370fc269d01 100644
--- a/Master/texmf-dist/source/latex/oberdiek/classlist.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/classlist.dtx
@@ -52,7 +52,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex classlist.dtx
% makeindex -s gind.ist classlist.idx
% pdflatex classlist.dtx
@@ -233,7 +233,7 @@ and the derived files
% configured by
% \item[\cs{PrintClassListTitle}] for the title and
% \item[\cs{PrintClassListEntry}] for formatting the entries.
-% See the implemenation how to use these.
+% See the implementation for how to use these.
% \end{description}
%
% \StopEventually{
diff --git a/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx b/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx
index aeae542c39f..007a42cbe5f 100644
--- a/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx
@@ -52,7 +52,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex colonequals.dtx
% makeindex -s gind.ist colonequals.idx
% pdflatex colonequals.dtx
diff --git a/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx b/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx
index 0141ae2a947..335196bf918 100644
--- a/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx
@@ -52,7 +52,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex dvipscol.dtx
% makeindex -s gind.ist dvipscol.idx
% pdflatex dvipscol.dtx
diff --git a/Master/texmf-dist/source/latex/oberdiek/engord.dtx b/Master/texmf-dist/source/latex/oberdiek/engord.dtx
index 6c759532002..a0ba888a1a0 100644
--- a/Master/texmf-dist/source/latex/oberdiek/engord.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/engord.dtx
@@ -55,7 +55,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex engord.dtx
% makeindex -s gind.ist engord.idx
% pdflatex engord.dtx
diff --git a/Master/texmf-dist/source/latex/oberdiek/enparen.dtx b/Master/texmf-dist/source/latex/oberdiek/enparen.dtx
index 773ebc861c9..af503d79dc4 100644
--- a/Master/texmf-dist/source/latex/oberdiek/enparen.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/enparen.dtx
@@ -52,7 +52,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex enparen.dtx
% makeindex -s gind.ist enparen.idx
% pdflatex enparen.dtx
@@ -335,12 +335,12 @@ and the derived files
% \subsection{Notes}
%
% \begin{description}
-% \item[Implicite kerning:]
-% Unexpandable stuff might affect the implicite kerning.
+% \item[Implicit kerning:]
+% Unexpandable stuff might affect the implicit kerning.
% The package cannot avoid this, because it need to define
-% and redefine macros at the occurence of each symbol.
+% and redefine macros at the occurrence of each symbol.
% This is done before the opening and after the closing
-% symbol, thus that the implicite kerning inside
+% symbol, thus that the implicit kerning inside
% is not affected.
% \end{description}
%
diff --git a/Master/texmf-dist/source/latex/oberdiek/eolgrab.dtx b/Master/texmf-dist/source/latex/oberdiek/eolgrab.dtx
index d27e99d34ec..87f0aceaa45 100644
--- a/Master/texmf-dist/source/latex/oberdiek/eolgrab.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/eolgrab.dtx
@@ -58,7 +58,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex eolgrab.dtx
% makeindex -s gind.ist eolgrab.idx
% pdflatex eolgrab.dtx
diff --git a/Master/texmf-dist/source/latex/oberdiek/fibnum.dtx b/Master/texmf-dist/source/latex/oberdiek/fibnum.dtx
index 9c3f8f79868..de66a377109 100644
--- a/Master/texmf-dist/source/latex/oberdiek/fibnum.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/fibnum.dtx
@@ -56,7 +56,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex fibnum.dtx
% bibtex fibnum.aux
% makeindex -s gind.ist fibnum.idx
diff --git a/Master/texmf-dist/source/latex/oberdiek/flags.dtx b/Master/texmf-dist/source/latex/oberdiek/flags.dtx
index 6a2d05c7b44..8834113617e 100644
--- a/Master/texmf-dist/source/latex/oberdiek/flags.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/flags.dtx
@@ -52,7 +52,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex flags.dtx
% makeindex -s gind.ist flags.idx
% pdflatex flags.dtx
diff --git a/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx b/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx
index 9ac40aa5ae9..b9ba295cfa6 100644
--- a/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx
@@ -52,7 +52,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex holtxdoc.dtx
% makeindex -s gind.ist holtxdoc.idx
% pdflatex holtxdoc.dtx
diff --git a/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx b/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx
index dd26b08d2b5..2b5781775c5 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx
@@ -52,7 +52,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex hypbmsec.dtx
% makeindex -s gind.ist hypbmsec.idx
% pdflatex hypbmsec.dtx
@@ -260,7 +260,7 @@ and the derived files
% \begin{itemize}
% \item An additional second optional argument in square brackets.
% \item An additional optional argument in parentheses (in
-% assoziation with a pdf string that is internally surrounded
+% association with a pdf string that is internally surrounded
% by parentheses, too).
% \end{itemize}
% Because \Package{\filename} stores the original meaning of the
@@ -375,7 +375,7 @@ and the derived files
[2016/05/16 v2.5 Bookmarks in sectioning commands (HO)]
% \end{macrocode}
%
-% Because of redifining the sectioning commands, it is dangerous
+% Because of redefining the sectioning commands, it is dangerous
% to reload the package several times.
% \begin{macrocode}
\@ifundefined{hbs@do}{}{%
@@ -554,7 +554,7 @@ and the derived files
% \end{macrocode}
%
% Other packages are allowed to redefine the sectioning commands,
-% if they does not change the syntax. Therefore the redefinitons
+% if they does not change the syntax. Therefore the redefinitions
% of this package should be done after the other packages.
% \begin{macrocode}
\let\hbs@part \part
diff --git a/Master/texmf-dist/source/latex/oberdiek/hypgotoe.dtx b/Master/texmf-dist/source/latex/oberdiek/hypgotoe.dtx
index 3f6af63a3ee..7a4c55e4511 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hypgotoe.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hypgotoe.dtx
@@ -53,7 +53,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex hypgotoe.dtx
% makeindex -s gind.ist hypgotoe.idx
% pdflatex hypgotoe.dtx
@@ -195,7 +195,7 @@ and the derived files
% \item
% Currently only embedded files and named destinations are supported.
% \item
-% Missing are support for destination arrays and attachted files.
+% Missing are support for destination arrays and attached files.
% \item
% Special characters aren't supported either.
% \end{itemize}
diff --git a/Master/texmf-dist/source/latex/oberdiek/hyphsubst.dtx b/Master/texmf-dist/source/latex/oberdiek/hyphsubst.dtx
index e0fd44bf126..996257b0d43 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hyphsubst.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hyphsubst.dtx
@@ -56,7 +56,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex hyphsubst.dtx
% makeindex -s gind.ist hyphsubst.idx
% pdflatex hyphsubst.dtx
diff --git a/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx b/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx
index 0b4918a6d07..7b695054496 100644
--- a/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx
@@ -52,7 +52,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex ifdraft.dtx
% makeindex -s gind.ist ifdraft.idx
% pdflatex ifdraft.dtx
diff --git a/Master/texmf-dist/source/latex/oberdiek/iflang.dtx b/Master/texmf-dist/source/latex/oberdiek/iflang.dtx
index fa784b7d453..9eebbd0a8cc 100644
--- a/Master/texmf-dist/source/latex/oberdiek/iflang.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/iflang.dtx
@@ -57,7 +57,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex iflang.dtx
% makeindex -s gind.ist iflang.idx
% pdflatex iflang.dtx
@@ -200,7 +200,7 @@ and the derived files
% Package \xpackage{babel} defines \cs{iflanguagename}. As first
% argument it takes a language name and executes the second or
% third argument depending on the current language. This
-% language test is based on hypenation patterns. However, it
+% language test is based on hyphenation patterns. However, it
% is possible that different languages or dialects share the
% same patterns. In such cases \cs{iflanguagename} fails.
%
@@ -211,7 +211,7 @@ and the derived files
%
% \begin{declcs}{IfLanguageName} \M{lang} \M{then} \M{else}
% \end{declcs}
-% Makro \cs{IfLanguageName} compares language \meta{lang} with
+% Macro \cs{IfLanguageName} compares language \meta{lang} with
% the current setting of macro \cs{languagename}. If both
% contains the same name then the \meta{then} part is called,
% otherwise the \meta{else} part.
@@ -562,7 +562,7 @@ and the derived files
% at the conference Bacho\TeX~2005:
% \url{http://www.gust.org.pl/projects/pearls/2005p/david-kastrup/bachotex2005-david-kastrup-pearl1.pdf}
%
-% The orignal code allows macros inside the second string.
+% The original code allows macros inside the second string.
% Because also \cs{languagename} might consists of further
% macros, we need a variant that allows macros in the first
% string, too.
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
index dc59a6e0247..099d1f538d0 100644
--- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
+++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
@@ -3,7 +3,7 @@
%
% Copyright (C)
% 1999, 2001, 2006 Heiko Oberdiek
-% 2016-2020 Oberdiek Package Support Group
+% 2016-2024 Oberdiek Package Support Group
% https://github.com/ho-tex/oberdiek/issues
%
% This work may be distributed and/or modified under the
@@ -40,7 +40,6 @@
\batchinput{flags.dtx}
\batchinput{holtxdoc.dtx}
\batchinput{hypbmsec.dtx}
-\batchinput{hypcap.dtx}
\batchinput{hypgotoe.dtx}
\batchinput{hyphsubst.dtx}
\batchinput{ifdraft.dtx}
@@ -58,7 +57,6 @@
\batchinput{stampinclude.dtx}
\batchinput{tabularht.dtx}
\batchinput{tabularkv.dtx}
-\batchinput{telprint.dtx}
\batchinput{thepdfnumber.dtx}
\batchinput{twoopt.dtx}
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex
index 3849551d71c..0759250c248 100644
--- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex
+++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex
@@ -11,11 +11,11 @@
\newcommand*{\Author}{Heiko Oberdiek}
\newcommand*{\Email}{ho-tex at tug.org}
-\newcommand*{\Date}{2023/01/10}
+\newcommand*{\Date}{2024/07/26}
% Copyright (C) 2006-2016 by
% Heiko Oberdiek
-% Copyright (C) 2016-2023 by
+% Copyright (C) 2016-2024 by
% Oberdiek Package Support Group
%
% This work may be distributed and/or modified under the
@@ -203,8 +203,6 @@
[\entrysep]
\entry{hypbmsec}{Bookmarks in sectioning commands}%
[\entrysep]
-\entry{hypcap}{Adjusting the anchors of captions}%
-[\entrysep]
\entry{hypgotoe}{Links to embedded files}%
[\entrysep]
\entry{hyphsubst}{Substitute hyphenation patterns}%
@@ -239,8 +237,6 @@
[\entrysep]
\entry{tabularkv}{Tabular with key value interface}%
[\entrysep]
-\entry{telprint}{Format German phone numbers}%
-[\entrysep]
\entry{thepdfnumber}{Print PDF numbers with minimal digits}%
[\entrysep]
\entry{twoopt}{Definitions with two optional arguments}%
@@ -391,20 +387,6 @@ a replacement for the bookmarks can be given.
\tocinclude{hypbmsec}
\newpage
-\subsection{\pkgsectformat{hypcap}}
-\label{hypcap}
-\begin{abstract}
-This package tries a solution of the problem with
-hyperref, that links to floats points below the
-caption and not at the beginning of the float.
-Therefore this package divides the task into two
-part, the link setting with \cs{capstart} or
-automatically at the beginning of a float and
-the rest in the \cs{caption} command.
-\end{abstract}
-\tocinclude{hypcap}
-
-\newpage
\subsection{\pkgsectformat{hypgotoe}}
\label{hypgotoe}
\begin{abstract}
@@ -520,7 +502,7 @@ is supported. Index preambles can be given either by means of package
\label{setouterhbox}
\begin{abstract}
If math stuff is set in an \cs{hbox}, then TeX
-performs some optimization and omits the implicite
+performs some optimization and omits the implicit
penalties \cs{binoppenalty} and \cs{relpenalty}.
This packages tries to put stuff into an \cs{hbox}
without getting lost of those penalties.
@@ -578,15 +560,6 @@ especially if package \xpackage{tabularht} is used.
\tocinclude{tabularkv}
\newpage
-\subsection{\pkgsectformat{telprint}}
-\label{telprint}
-\begin{abstract}
-Package \xpackage{telprint} provides \cs{telprint} for formatting
-German phone numbers.
-\end{abstract}
-\tocinclude{telprint}
-
-\newpage
\subsection{\pkgsectformat{thepdfnumber}}
\label{thepdfnumber}
\begin{abstract}
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx
index 17893f98a98..02df672d4eb 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx
@@ -53,7 +53,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex pdfcolparallel.dtx
% makeindex -s gind.ist pdfcolparallel.idx
% pdflatex pdfcolparallel.dtx
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx
index 77d8aab0716..a382037b426 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx
@@ -53,7 +53,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex pdfcolparcolumns.dtx
% makeindex -s gind.ist pdfcolparcolumns.idx
% pdflatex pdfcolparcolumns.dtx
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx
index e4681efa8c2..3c5070829c4 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx
@@ -55,7 +55,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex pdfcrypt.dtx
% makeindex -s gind.ist pdfcrypt.idx
% pdflatex pdfcrypt.dtx
diff --git a/Master/texmf-dist/source/latex/oberdiek/protecteddef.dtx b/Master/texmf-dist/source/latex/oberdiek/protecteddef.dtx
index cff42cccf7d..21aab0c9fcd 100644
--- a/Master/texmf-dist/source/latex/oberdiek/protecteddef.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/protecteddef.dtx
@@ -56,7 +56,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex protecteddef.dtx
% makeindex -s gind.ist protecteddef.idx
% pdflatex protecteddef.dtx
@@ -246,7 +246,7 @@ and the derived files
% is not supported. Macro \meta{cmd} is to be defined as
% \cs{long} macro without star with \meta{num} arguments.
%
-% The number of arguments \meta{num} must be given as explicite digit
+% The number of arguments \meta{num} must be given as explicit digit
% |0| upto |9|. Otherwise the part between the argument \meta{cmd} and
% the \meta{definition text} is taken as parameter text in the syntax
% of vanilla \hologo{TeX}. Examples (with \cs{protected}):
diff --git a/Master/texmf-dist/source/latex/oberdiek/resizegather.dtx b/Master/texmf-dist/source/latex/oberdiek/resizegather.dtx
index 4a078649172..8ec4cc8a13c 100644
--- a/Master/texmf-dist/source/latex/oberdiek/resizegather.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/resizegather.dtx
@@ -53,7 +53,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex resizegather.dtx
% makeindex -s gind.ist resizegather.idx
% pdflatex resizegather.dtx
diff --git a/Master/texmf-dist/source/latex/oberdiek/rotchiffre.dtx b/Master/texmf-dist/source/latex/oberdiek/rotchiffre.dtx
index 3023347fe16..aa807540118 100644
--- a/Master/texmf-dist/source/latex/oberdiek/rotchiffre.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/rotchiffre.dtx
@@ -56,7 +56,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex rotchiffre.dtx
% makeindex -s gind.ist rotchiffre.idx
% pdflatex rotchiffre.dtx
@@ -214,7 +214,7 @@ and the derived files
% \begin{declcs}{EdefRot} \M{type} \M{cmd} \M{text}
% \end{declcs}
% The \meta{text} is expanded and sanitized. All tokens
-% are letters with catcode 12 (other) with the exeption of
+% are letters with catcode 12 (other) with the exception of
% the space token that has character code 32 (0x20) and
% catcode 10 (space). This follows \hologo{TeX}'s convention of
% \cs{string} and \cs{meaning}.
diff --git a/Master/texmf-dist/source/latex/oberdiek/scrindex.dtx b/Master/texmf-dist/source/latex/oberdiek/scrindex.dtx
index fea57fd1a9d..63deeaab2fc 100644
--- a/Master/texmf-dist/source/latex/oberdiek/scrindex.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/scrindex.dtx
@@ -53,7 +53,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex scrindex.dtx
% makeindex -s gind.ist scrindex.idx
% pdflatex scrindex.dtx
@@ -195,7 +195,7 @@ and the derived files
% the standard classes |article|, |report|, and |book|. It
% redefines environment `theindex' for its needs.
% However, it does not know other classes such as KOMA-Script.
-% This package closes the compatibiliy gap between KOMA-Script's
+% This package closes the compatibility gap between KOMA-Script's
% classes and package \xpackage{index}.
%
% Environment |theindex| is redefined to support both package
diff --git a/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx b/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx
index 001cd278d3d..cc937c16a46 100644
--- a/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx
@@ -57,7 +57,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex setouterhbox.dtx
% makeindex -s gind.ist setouterhbox.idx
% pdflatex setouterhbox.dtx
@@ -190,7 +190,7 @@ and the derived files
%
% \begin{abstract}
% If math stuff is set in an \cs{hbox}, then TeX
-% performs some optimization and omits the implicite
+% performs some optimization and omits the implicit
% penalties \cs{binoppenalty} and \cs{relpenalty}.
% This packages tries to put stuff into an \cs{hbox}
% without getting lost of those penalties.
@@ -234,7 +234,7 @@ and the derived files
% method we discuss here. Nowadays we have \eTeX\ that extends
% the tool set of a \TeX\ macro programmer. Especially useful
% \eTeX\ was in this package for detecting and dealing with
-% errorneous situations.
+% erroneous situations.
%
% However also nowadays a perfect solution for the problem
% is still missing at macro level. Probably someone has
diff --git a/Master/texmf-dist/source/latex/oberdiek/settobox.dtx b/Master/texmf-dist/source/latex/oberdiek/settobox.dtx
index c38d502a534..c1d7af6ae9a 100644
--- a/Master/texmf-dist/source/latex/oberdiek/settobox.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/settobox.dtx
@@ -53,7 +53,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex settobox.dtx
% makeindex -s gind.ist settobox.idx
% pdflatex settobox.dtx
@@ -282,7 +282,7 @@ and the derived files
% c) Print #1 commands.
% d) Print box with frame
%
-% The implemenation looks more weird:
+% The implementation looks more weird:
\makeatletter
\newcommand*{\test}[1]{%
\par
diff --git a/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx b/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx
index 6b3444c33c6..09110de9476 100644
--- a/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx
@@ -52,7 +52,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex stackrel.dtx
% makeindex -s gind.ist stackrel.idx
% pdflatex stackrel.dtx
diff --git a/Master/texmf-dist/source/latex/oberdiek/stampinclude.dtx b/Master/texmf-dist/source/latex/oberdiek/stampinclude.dtx
index 9acd8a61f84..ba468e85916 100644
--- a/Master/texmf-dist/source/latex/oberdiek/stampinclude.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/stampinclude.dtx
@@ -52,7 +52,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex stampinclude.dtx
% makeindex -s gind.ist stampinclude.idx
% pdflatex stampinclude.dtx
@@ -225,7 +225,7 @@ and the derived files
% This package \xpackage{stampinclude} goes another way.
% \LaTeX\ reads and writes a separate \xext{aux} file for each
% file that is included by \cs{include}. There \LaTeX\ remembers
-% counter valuses. Changed \xext{tex}
+% counter values. Changed \xext{tex}
% files can therefore be detected by comparing the file date stamp of
% the \xext{tex} file with the date stamp of its \xext{aux} file.
% Since version 1.30.0 \pdfTeX\ provides \cs{pdffilemoddate}
@@ -254,7 +254,7 @@ and the derived files
%
% \subsubsection{Other file dependencies}
%
-% A file that is included by \cs{include} may input ore reference
+% A file that is included by \cs{include} may input or reference
% other files:
% \begin{itemize}
% \item other \TeX\ files using \cs{input},
diff --git a/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx b/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx
index 20688068b07..e6c26f1040f 100644
--- a/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx
@@ -53,7 +53,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex tabularht.dtx
% makeindex -s gind.ist tabularht.idx
% pdflatex tabularht.dtx
@@ -250,7 +250,7 @@ and the derived files
% and add the vertical lines. The lines in a tabular
% with \xpackage{tabularht} support (environments of this package)
% are numbered from left to right. The gap that is
-% controlled by \cs{interrowspace} or inbetween \cs{interrowstart}
+% controlled by \cs{interrowspace} or in between \cs{interrowstart}
% and \cs{interrowstop} is then filled with the detected
% vertical lines.
%
@@ -472,7 +472,7 @@ and the derived files
\def\tabH@spread{spread}
% \end{macrocode}
% First argument is the height of the table,
-% then the orignal arguments for tabular follow.
+% then the original arguments for tabular follow.
% \begin{macrocode}
\newenvironment{tabularht}[1]{%
\tabH@setheight{#1}%
diff --git a/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx b/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx
index 57ef5e87457..b324e6e8abc 100644
--- a/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx
@@ -53,7 +53,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex tabularkv.dtx
% makeindex -s gind.ist tabularkv.idx
% pdflatex tabularkv.dtx
diff --git a/Master/texmf-dist/source/latex/oberdiek/thepdfnumber.dtx b/Master/texmf-dist/source/latex/oberdiek/thepdfnumber.dtx
index 61eb42684c3..c1aa4bf9fac 100644
--- a/Master/texmf-dist/source/latex/oberdiek/thepdfnumber.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/thepdfnumber.dtx
@@ -57,7 +57,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex thepdfnumber.dtx
% makeindex -s gind.ist thepdfnumber.idx
% pdflatex thepdfnumber.dtx
@@ -256,7 +256,7 @@ and the derived files
% \item The decimal part is omitted, if the number is an integer (5, 7).
% \item Trailing zeros from the decimal part are stripped (5, 6, 7, 9).
% \end{itemize}
-% The resulting number representation can be catched with one of the
+% The resulting number representation can be caught with one of the
% following Perl regular expressions:
% \begin{itemize}
% \item |^0$| (zero)
@@ -295,11 +295,11 @@ and the derived files
% \subsection{Input number}
%
% The user macros expect a number as argument. The number can either
-% be given explicitely or as macro that expands in one step
-% to an explicite number, because the first token of the argument
+% be given explicitly or as macro that expands in one step
+% to an explicit number, because the first token of the argument
% is expanded once.
%
-% The explicite number consists of
+% The explicit number consists of
% \begin{itemize}
% \item optional signs `\texttt{+}' and `\texttt{-}',
% \item digits `\texttt{0}' upto `\texttt{9}' and
@@ -320,7 +320,7 @@ and the derived files
% The package is not intended for validating numbers or to
% decide if an argument is a number. Therefore it is an usage
% error to use the user macros with arguments that are not
-% explicite numbers as specified in the previous sections.
+% explicit numbers as specified in the previous sections.
% Nevertheless some error conditions are sometimes recognized.
% Errors are given in form of an undefined command sequence.
% It is the only way to notify \hologo{TeX} in expandable context.
diff --git a/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx b/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx
index 10334f0d3a9..806799fd410 100644
--- a/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx
@@ -52,7 +52,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex twoopt.dtx
% makeindex -s gind.ist twoopt.idx
% pdflatex twoopt.dtx
diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
index 2109ca38b5d..8b43d5b6bef 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
@@ -786,7 +786,7 @@
% Briefe}, series {\sc I, III, VII,} being edited by Dr.\ H.\
% Breger\index{Breger, Herbert}, Dr.~N. G\"adeke\index{G\"adeke, Nora} and
% others at the Leibniz-Archiv, Nieders\"achsische Landesbibliothek, Hannover.
-% (see \url{http://www.nlb-hannover.de/Leibniz})}
+% (see \url{https://www.gwlb.de/leibniz/digitale-ressourcen/repositorium-des-leibniz-archivs})}
% Theodosius's\index{Theodosius} {\em Spherics}, the German {\em
% Algorismus} of Sacrobosco,\index{Sacrobosco} the Sanskrit text of the
% {\em K\={a}\'{s}ik\={a}\-v\d{r}tti\/} of V\={a}mana\index{Vamana} and
@@ -3962,7 +3962,7 @@
% & It makes the peas taste funny \\
% & And get my tummy gummy.\edindex{gummy} &
% & But it keeps them on the knife.
-% \end{edtabularr}
+% \end{edtabularl}
% \pend
% \endnumbering
% \end{verbatim}
diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
index aff1d03da13..1d09e9c4eff 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
@@ -354,6 +354,7 @@
% \changes{v2.25.4}{2023/07/04}{Fix bug with \protect\cs{linenumOnlyPagesForColumnsR} and multiple numbered sections}
% \changes{v2.25.5}{2023/07/20}{Fix bug with hyperlink when using \protect\cs{footnoteXnomk}}
% \changes{v2.25.6}{2024/02/26}{Make \protect\cs{doinsidethislinehook} working on right side}
+% \changes{v2.25.7}{2024/07/23}{Fix compatibility with \protect\package{polyglossia} 2.2}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -1410,7 +1411,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2024/05/11 v2.25.6a reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2024/07/23 v2.25.7 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -5543,17 +5544,6 @@
% To counter this, we have to make sure that the correct language is
% used at the proper times.
%
-% \begin{macro}{\ifl@dusedbabel}
-% \begin{macro}{\l@dusedbabelfalse}
-% \begin{macro}{\l@dusedbabeltrue}
-% A flag for checking if \verb?babel? has been used as a package.
-% \begin{macrocode}
-\newif\ifl@dusedbabel
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
% \changes{v1.8.0}{2014/08/05}{Suppress \protect\cs{ifl@dsamelang} which did not work and was not logical, because both columns could have the same language but not the main language of the document.}
%
% \begin{macro}{\l@dchecklang}
@@ -5598,20 +5588,18 @@
% Now do the \protect\package{babel} or \protect\package{polyglossia} fix or, if necessary.
% \begin{macrocode}
\AtBeginDocument{%
- \@ifundefined{xpg@main@language}{%
+ \@ifpackageloaded{babel}{%
\@ifundefined{bbl@main@language}{%
% \end{macrocode}
% Either \protect\package{babel} has not been used or it has been used with no
% specified language.
% \begin{macrocode}
- \l@dusedbabelfalse
}{%
% \end{macrocode}
% Here we deal with the case where babel has been used. \protect\cs{selectlanguage}
% has to be redefined to use our version of \protect\cs{bbl@set@language} and to
% store the left or right language.
% \begin{macrocode}
- \l@dusedbabeltrue
\let\l@doldselectlanguage\selectlanguage
\let\l@doldbbl@set@language\bbl@set@language
\renewcommand{\selectlanguage}[1]{%
@@ -5635,7 +5623,7 @@
\gdef\theledlanguageL{\bbl@main@language}%
\gdef\theledlanguageR{\bbl@main@language}%
}%
- }
+ }{}%
% \end{macrocode}
% If use \protect\package{polyglossia}
% \changes{v1.8.0}{2014/08/05}{Correct left/right language setting with polyglossia.}
@@ -5643,25 +5631,28 @@
% \changes{v2.22.4}{2019/11/04}{Provide compatibility with the latest version of polyglossia (v1.45).}
% \changes{v2.23.0}{2020/03/08}{Restore compatibility with versions of polyglossia prior to v1.45.}
% \begin{macrocode}
- {%
- \@ifpackagelater{polyglossia}{2022/04/10}{}{\led@err@polyglossiaTooOld}%
- \let\old@otherlanguage\otherlanguage%
- \renewcommand{\otherlanguage}[2][]{%
- \selectlanguage[#1]{#2}%
- \xpg@set@language@only@aux[#1]{#2}%
- \ifledRcol \gdef\theledlanguageR{#2}%
- \else \gdef\theledlanguageL{#2}%
- \fi}%
+ \@ifpackageloaded{polyglossia}{%
+ \@ifpackagelater{polyglossia}{2024/07/15}{}{\led@err@polyglossiaTooOld}%
\renewcommand{\l@duselanguage}[1]{%
\csuse{no\languagename @numbers}%
- \expandafter\@select@language\expandafter{#1}%
+ \selectlanguage*{#1}%
+ }%
+ \AddToHook{env/Leftside/begin}{%
+ \AddToHookNext{cmd/polyglossia@language@switched/after}{%
+ \xdef\theledlanguageL{\languagename}%
+ }%
}%
- \xdef\theledlanguageL{\xpg@main@language}%
- \xdef\theledlanguageR{\xpg@main@language}%
+ \AddToHook{env/Rightside/begin}{%
+ \AddToHookNext{cmd/polyglossia@language@switched/after}{%
+ \xdef\theledlanguageR{\languagename}%
+ }%
+ }%
+ \xdef\theledlanguageL{\mainlanguagename}%
+ \xdef\theledlanguageR{\mainlanguagename}%
% \end{macrocode}
% That is it.
% \begin{macrocode}
- }%
+ }{}%
}%
% \end{macrocode}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/reptheorem/reptheorem.dtx b/Master/texmf-dist/source/latex/reptheorem/reptheorem.dtx
index d96f740fecb..b0f537af972 100644
--- a/Master/texmf-dist/source/latex/reptheorem/reptheorem.dtx
+++ b/Master/texmf-dist/source/latex/reptheorem/reptheorem.dtx
@@ -12,7 +12,7 @@
%
% This work has the LPPL maintenance status `maintained'.
%
-% The Current Maintainer of this work is Jesse Sraat.
+% The Current Maintainer of this work is Jesse Straat.
%
% This work consists of the main file reptheorem.dtx
% and the derived files
@@ -89,7 +89,7 @@ License: [LPPL1.3c](https://www.latex-project.org/lppl.txt)
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: reptheorem 2024-03-27 v1.0}
+\Msg{* Package: reptheorem 2024-08-12 v1.1}
\Msg{************************************************************************}
\keepsilent
@@ -109,7 +109,7 @@ version 2008 or later.
This work has the LPPL maintenance status `maintained'.
-The Current Maintainer of this work is Jesse Sraat.
+The Current Maintainer of this work is Jesse Straat.
This work consists of the main file reptheorem.dtx
and the derived files
@@ -246,9 +246,9 @@ colorlinks,
% environment \DescribeEnv{makethm} |makethm| is
% used for.
% \begin{verbatim}
-% \begin{makethm}{theorem}{thm:Yoneda}[Yoneda Lemma]{
+% \begin{makethm}{theorem}{thm:Yoneda}[Yoneda Lemma]
% For \(F\colon \mathcal{C}\to \mathbf{Set}\) a functor,
-% \([\mathcal{C}^\mathrm{op},\mathbf{Set}](YA, F) \cong F(A)\)%
+% \([\mathcal{C}^\mathrm{op},\mathbf{Set}](YA, F) \cong F(A)\)
% for all objects \(A\) in \(\mathcal{C}\).
% \end{makethm}
% \end{verbatim}
@@ -271,33 +271,33 @@ colorlinks,
% the theorem is proven at a later point, or we want to
% ``tease'' the reader with a powerful theorem that will be
% proven later in the chapter. To do this, we use the
-% \DescribeMacro{repthm} command, as follows.
+% \DescribeMacro{\repthm} command, as follows.
% \begin{verbatim}
-% \repthm{theorem}{thm:Yoneda}
+% \repthm{thm:Yoneda}
% \end{verbatim}
% This outputs the theorem again.
-% \repthm{theorem}{thm:Yoneda}
+% \repthm{thm:Yoneda}
% The label of this theorem is a |\ref|, and automatically
% links to the original theorem statement.\par
% If the original theorem statement exists in a different
% file, or has not been created yet, we can add a placeholder
% alt text to the |\repthm| as an optional argument, which
% only displays if the theorem is undefined. For example,
-% |\repthm{theorem}{thm:foo}[bar]| returns
-% \repthm{theorem}{thm:foo}[bar]
+% |\repthm{thm:foo}[bar]| returns
+% \repthm{thm:foo}[bar]
% If we do the same without providing an alt text, we get
-% \repthm{theorem}{thm:foo}
+% \repthm{thm:foo}
% together with a warning.\par
% Since we're using the |.aux| file, it is possible
% to replicate a theorem before it is stated. For example,
% \begin{verbatim}
-% \repthm{theorem}{thm:later}
+% \repthm{thm:later}
% \begin{makethm}{theorem}{thm:later}[Later]
% Alligator!
% \end{makethm}
% \end{verbatim}
% returns
-% \repthm{theorem}{thm:later}
+% \repthm{thm:later}
% \begin{makethm}{theorem}{thm:later}[Later]
% Alligator
% \end{makethm}
@@ -352,7 +352,7 @@ colorlinks,
% \section{Source code}
% \begin{macrocode}
%<*package>
-\ProvidesPackage{reptheorem}[2024-03-27 v1.0 Reptheorem package]
+\ProvidesPackage{reptheorem}[2024-08-12 v1.1 Reptheorem package]
% \end{macrocode}
%
% \begin{macro}{\theoremfile}
@@ -387,6 +387,7 @@ colorlinks,
% \end{macro}
%
% \begin{environment}{makethm}
+% \changes{v1.1}{2024/05/03}{Now saves theorem environment type, breaking backwards compatibility}
% On to defining the actual theorems to be saved.
% \begin{macrocode}
\NewDocumentEnvironment{makethm}{ m m o +b }
@@ -403,15 +404,19 @@ colorlinks,
}
#4
\end{#1}
+ \expandafter\gdef\csname thmtype@#2\endcsname{#1}
\expandafter\long\expandafter\gdef\csname thm@#2\endcsname{#4}%
\expandafter\gdef\csname thmdesc@#2\endcsname{#3}%
% Saving parameters to aux file
\long\gdef\@thmoutput{%
+ \string\expandafter\string\gdef\noexpand%
+ \csname thmtype@#2\string\endcsname{#1}%
+ ^^J%
\string\expandafter\string\long\string\expandafter%
\string\gdef\noexpand\csname thm@#2\string\endcsname{#4}%
^^J%
- \string\expandafter\string\expandafter%
- \string\gdef\noexpand\csname thmdesc@#2\string\endcsname{#3}%
+ \string\expandafter\string\gdef\noexpand%
+ \csname thmdesc@#2\string\endcsname{#3}%
}
\write\@auxout{\@thmoutput}
\if\reptheorem@theoremfile\relax
@@ -426,53 +431,60 @@ colorlinks,
% \end{environment}
%
% \begin{macro}{\repthm}
+% \changes{v1.1}{2024/05/03}{Now saves theorem environment type, breaking backwards compatibility}
% To repeat a theorem, use the |\repthm| command.
% The type of theorem is not saved, so it is necessary to
% respecify it each time a theorem is repeated.
% \begin{macrocode}
\newcounter{old@counter}
-\NewDocumentCommand{\repthm}{ m m +o }{
- % m: the type of theorem environment
+\NewDocumentCommand{\repthm}{ m +o }{
% m: the name of the theorem
% o: alt text
\begingroup
- \setcounter{old@counter}{\value{#1}}
+ % Check if thmtype is given
+ \ifcsname thmtype@#1\endcsname%
+ \expandafter\let\expandafter\@@thmtype\csname thmtype@#1\endcsname%
+ \else%
+ \def\@@thmtype{theorem}%
+ \fi%
+ %
% Save theorem counter so we don't increase it
- \def\thetheorem{\ref{#2}}
+ \setcounter{old@counter}{\value{\@@thmtype}}
+ \def\thetheorem{\ref{#1}}
\let\@@theoremnotdefined\relax
%
- \ifcsname thm@#2\endcsname% Check if theorem is even defined
+ \ifcsname thm@#1\endcsname% Check if theorem is even defined
% Theorem is defined
- \expandafter\edef\expandafter\@@thmdesc{\csname thmdesc@#2\endcsname}%
- \expandafter\let\expandafter\@@thm\csname thm@#2\endcsname
+ \expandafter\edef\expandafter\@@thmdesc{\csname thmdesc@#1\endcsname}%
+ \expandafter\let\expandafter\@@thm\csname thm@#1\endcsname
% Output theorem
\IfValueTF{\@@thmdesc}{% Check if theorem has name
- \begin{#1}[\@@thmdesc]
+ \begin{\@@thmtype}[\@@thmdesc]
\@@thm
- \end{#1}
+ \end{\@@thmtype}
}{% No optionals
- \begin{#1}
+ \begin{\@@thmtype}
\@@thm
- \end{#1}
+ \end{\@@thmtype}
}
\else
% Theorem undefined
- \IfValueTF{#3}{
- \begin{#1}
- #3
- \end{#1}
+ \IfValueTF{#2}{
+ \begin{\@@thmtype}
+ #2
+ \end{\@@thmtype}
}{% No theorem or alt text provided: throw warning
- \begin{#1}
- \end{#1}
+ \begin{\@@thmtype}
+ \end{\@@thmtype}
\PackageWarning{reptheorem}{%
- Theorem #2 not defined; rebuild your project.
+ Theorem #1 not defined; rebuild your project.
If the issue persists, create the theorem using
\begin{makethm} or consider adding alt text to \repthm
using the optional parameter%
}
}
\fi
- \setcounter{#1}{\value{old@counter}}
+ \setcounter{\@@thmtype}{\value{old@counter}}
% Reset theorem counter back to original
\endgroup
}
@@ -483,4 +495,4 @@ colorlinks,
% \begin{macrocode}
%</package>
% \end{macrocode}
-%\Finale
+%\Finale \ No newline at end of file
diff --git a/Master/texmf-dist/source/latex/reptheorem/reptheorem.ins b/Master/texmf-dist/source/latex/reptheorem/reptheorem.ins
index c85a0d2ff38..be179b4d9a1 100644
--- a/Master/texmf-dist/source/latex/reptheorem/reptheorem.ins
+++ b/Master/texmf-dist/source/latex/reptheorem/reptheorem.ins
@@ -27,7 +27,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: reptheorem 2024-03-27 v1.0}
+\Msg{* Package: reptheorem 2024-08-12 v1.1}
\Msg{************************************************************************}
\keepsilent
diff --git a/Master/texmf-dist/source/latex/se2thesis/se2colors.dtx b/Master/texmf-dist/source/latex/se2thesis/se2colors.dtx
index 09e6523a9eb..7b0b5d81f71 100644
--- a/Master/texmf-dist/source/latex/se2thesis/se2colors.dtx
+++ b/Master/texmf-dist/source/latex/se2thesis/se2colors.dtx
@@ -231,7 +231,7 @@
%
% Identify the package and give the overall version information.
% \begin{macrocode}
-\ProvidesExplPackage {se2colors} {2024-06-25} {4.2.0}
+\ProvidesExplPackage {se2colors} {2024-08-12} {4.3.2}
{A colour support package for the se2thesis bundle}
% \end{macrocode}
%
diff --git a/Master/texmf-dist/source/latex/se2thesis/se2fonts.dtx b/Master/texmf-dist/source/latex/se2thesis/se2fonts.dtx
index bfc3210cc01..5ede585b755 100644
--- a/Master/texmf-dist/source/latex/se2thesis/se2fonts.dtx
+++ b/Master/texmf-dist/source/latex/se2thesis/se2fonts.dtx
@@ -151,7 +151,7 @@
%
% Identify the package and give the overall version information.
% \begin{macrocode}
-\ProvidesExplPackage {se2fonts} {2024-06-25} {4.2.0}
+\ProvidesExplPackage {se2fonts} {2024-08-12} {4.3.2}
{A font-selection support package for the se2thesis bundle}
% \end{macrocode}
%
diff --git a/Master/texmf-dist/source/latex/se2thesis/se2packages.dtx b/Master/texmf-dist/source/latex/se2thesis/se2packages.dtx
index 4c915c3eb54..3ad8d99b0af 100644
--- a/Master/texmf-dist/source/latex/se2thesis/se2packages.dtx
+++ b/Master/texmf-dist/source/latex/se2thesis/se2packages.dtx
@@ -446,6 +446,8 @@
% \bibitem{DBLP:journals/sttt/BeyerLW19} Dirk Beyer, Stefan Löwe, and Philipp
% Wendler: \emph{Reliable benchmarking: requirements and solutions}. STTT
% 21(1): 1--29 (2019)
+% \bibitem{Knu86} Donald E. Knuth: \emph{The \TeX{}book}. Addison-Wesley
+% (1986)
% \end{thebibliography}
%
%
@@ -470,7 +472,7 @@
%
% Identify the package and give the overall version information.
% \begin{macrocode}
-\ProvidesExplPackage {se2packages} {2024-06-25} {4.2.0}
+\ProvidesExplPackage {se2packages} {2024-08-12} {4.3.2}
{Supporting packages for the se2thesis bundle}
% \end{macrocode}
%
diff --git a/Master/texmf-dist/source/latex/se2thesis/se2thesis.dtx b/Master/texmf-dist/source/latex/se2thesis/se2thesis.dtx
index 0a6705aaa5b..6d29f974822 100644
--- a/Master/texmf-dist/source/latex/se2thesis/se2thesis.dtx
+++ b/Master/texmf-dist/source/latex/se2thesis/se2thesis.dtx
@@ -62,7 +62,7 @@
% internet, causing each thesis looking differently.
%
% The author of this package provided a template,
-% which he initially created for his bachelor and master thesis,
+% which he initially created for his bachelor's and master's thesis,
% that was recommended and used by many students.
% The implementation of that template, however, was very hacky and required
% some changes over time.
@@ -74,7 +74,7 @@
% The bundle itself consists of several \LaTeX{} classes and packages
% that also allow reuse of various parts of it.
% Its main class is the \pkg{se2thesis} document class,
-% an extension of the \KOMAScript{} |scrreprt| document class.
+% an extension of the \KOMAScript{} |scrbook| document class.
% The packages \pkg{se2colors} and \pkg{se2fonts} provide necessary
% colour and font settings for the \pkg{se2thesis} class;
% the \pkg{se2packages} allows to load several recommended packages~(see
@@ -186,9 +186,9 @@
% \pkg{expl3}, \pkg{l3keys2e} in case one uses a \LaTeX{} kernel from before
% 2022--06--01, \pkg{graphicx}, \pkg{translations}, \KOMAScript, \pkg{xcolor},
% \pkg{ifthen}, as well as \pkg{fontspec}, \pkg{unicode-math},
-% and \pkg{libertinus-otf} if one uses \LuaTeX{};
+% \pkg{inconsolata-nerd-font} and \pkg{libertinus-otf} if one uses \LuaTeX{};
% for \pdfLaTeX{} we load \pkg{fontenc}, \pkg{libertinus-type1}, and
-% \pkg{AnonymousPro} instead of the latter three.
+% \pkg{inconsolata} instead of the latter three.
% Furthermore, we load \pkg{microtype};
% when using \LuaTeX{}, we also load \pkg{lua-widow-control} and \pkg{selnolig}.
%
@@ -220,6 +220,11 @@
% \emph{Note:} you cannot use \cls{scrartcl} because it does not provide
% the required |chapter| sectioning.
% Default is |scrbook|.
+%
+% Please note that if you want to have the bibliography numbered or use an
+% appendix with alpha-numbering (A, B, \dots), you want to explicitly use
+% |scrreprt| as the base class; for some (currently unknown) reason this does
+% not work with the default |scrbook|.
% \end{function}
% \begin{function}{paper}
% \begin{syntax}
@@ -243,9 +248,9 @@
% \end{syntax}
% Defines the type of the thesis.
% Possible values are:
-% |bachelor| for a bachelor thesis, |bachelorproposal| for a proposal to
-% a bachelor thesis, |master| for a master thesis, |masterproposal| for
-% a proposal to a master thesis, |phdproposal| for a proposal to a PhD thesis,
+% |bachelor| for a bachelor's thesis, |bachelorproposal| for a proposal to
+% a bachelor's thesis, |master| for a master's thesis, |masterproposal| for
+% a proposal to a master's thesis, |phdproposal| for a proposal to a PhD thesis,
% |phd| for a PhD thesis in the natural sciences, |phdeng| for a PhD thesis
% in engineering, and |phdphil| for a PhD thesis in natural philosophy.
% \end{function}
@@ -307,7 +312,7 @@
% \cmd{\matrnumber} \marg{matriculation-number}
% \end{syntax}
% Specify the matriculation number of the student writing the thesis.
-% This is required for Bachelor and Master theses.
+% This is required for bachelor's and master's theses.
% \end{function}
%
% \begin{function}{\supervisor, \cosupervisor}
@@ -437,7 +442,7 @@
% We provide the \env{acknowledgements} environment to typeset acknowledgements
% for your thesis.
% Using this environment is optional.
-% Usually, bachelor and master thesis do not contain such an acknowledgements
+% Usually, bachelor's and master's thesis do not contain such an acknowledgements
% section, however, there is no general rule to this.
% \begin{verbatim}
% \begin{acknowledgements}[language]
@@ -540,6 +545,48 @@
% question;
% however, this can also be arbitrary text.
%
+% \subsection{Language Support and Hyphenation}\label{sec:doct-se2thesis-lang}
+%
+% The study regulations of the University of Passau require students to write
+% their thesis in either German or English. For both cases it is recommended
+% to load a package for the correct hyphenation patters. Usually, one can
+% either choose between the \pkg{babel} and \pkg{polyglossia} package. For a
+% detailed discussion in the differences and which to choose, please use the
+% search engine of your choice.
+%
+% For this documentation we stick with the \pkg{babel} package, which is often
+% considered to be the standard package.
+%
+% If you write your thesis in German, load \pkg{babel} in your preamble like
+% follows
+% \begin{verbatim}
+% \usepackage[ngerman]{babel}
+% \end{verbatim}
+% For a thesis in English, you have to also load the German variant plus the
+% English one as the default (see \cref{sec:doc-se2thesis-authorship} for an
+% explanation)
+% \begin{verbatim}
+% \usepackage[ngerman,main=UKenglish]{babel}
+% \end{verbatim}
+%
+% Note that by default, \LaTeX{} does not provide hyphenation for compound
+% words, which is explained in the \TeX{} Book~\cite[p.~454]{Knu86} and a
+% StackExchange post\footnote{\href{https://tex.stackexchange.com/a/63234/14622}{https://tex.stackexchange.com/a/63234/14622}}. The \pkg{babel} package
+% provides a way (called shorthands) for German, which allows to reenable
+% hyphenation for compound words (as they are common on German). These
+% shorthands are by default not available for English, but they can easily be
+% added by adding
+% \begin{verbatim}
+% \useshorthands{"}
+% \addto\extrasUKenglish{\languageshorthands{ngerman}}
+% \end{verbatim}
+% after loading \pkg{babel} with the aforementioned \cmd{\usepackage}
+% macro\footnote{see https://tex.stackexchange.com/a/298844/14622}.
+%
+% \emph{Please note:} loading the \pkg{hyphenat} package is strongly discouraged
+% by the \pkg{se2thesis} maintainer because it conflicts with the \env{hyp}
+% environment provided by \pkg{se2thesis} (see \cref{sec:doc-se2thesis-summaries}).
+%
% \end{documentation}
%
% \clearpage
@@ -607,7 +654,7 @@
%
% Identify the class and give the overall version number.
% \begin{macrocode}
-\ProvidesExplClass {se2thesis} {2024-06-25} {4.2.0}
+\ProvidesExplClass {se2thesis} {2024-08-12} {4.3.2}
{A thesis class for the Chair of Software Engineering II}
% \end{macrocode}
%
@@ -1246,7 +1293,7 @@
% \end{macrocode}
% The next block generates the text that describes the thesis.
% In case of a PhD thesis, this text is predefined to match the requirements.
-% In case of a bachelor or master thesis, or a proposal thereof, we generate
+% In case of a bachelor's or master's thesis, or a proposal thereof, we generate
% a text based on the values of the |thesistype| load-time option and the
% values of the \cmd{\degreeprogramme}, \cmd{\department}, and
% \cmd{\institute} variables.
@@ -1362,12 +1409,18 @@
% \end{macrocode}
%
% \begin{macro}{\@lowertitleback}
-% Afterwards, override the definition of \cs{@lowertitleback}.
+% Afterwards, override the definition of \cs{@lowertitleback}. To prevent
+% line breaks in the title (that might be necessary to layout it properly on
+% the front title page), we place a group around \cs{@title} and temporarily
+% redefine \cmd{\\} to do nothing.
% \begin{macrocode}
\renewcommand*{\@lowertitleback}{%
\group_begin:
\noindent\textbf{\@author}:\\
- \emph{\@title}\\
+ \group_begin:
+ \let\\\relax
+ \emph{\@title}
+ \group_end:\\
\tl_if_eq:NnT \l_@@_thesis_type_tl { bachelor }
{ \GetTranslation{Bachelor-thesis},~ }
\tl_if_eq:NnT \l_@@_thesis_type_tl { master }
@@ -1678,7 +1731,7 @@
% We provide the following English translations.
%
% \begin{macrocode}
-\ProvideDictionaryFor{English}{se2translations}[2024/06/25]
+\ProvideDictionaryFor{English}{se2translations}[2024/08/12]
\ProvideDictTranslation{abstract}{abstract}
\ProvideDictTranslation{Abstract}{Abstract}
\ProvideDictTranslation{acknowledgement}{acknowledgement}
@@ -1703,10 +1756,10 @@
\ProvideDictTranslation{External}{External Examiner}
\ProvideDictTranslation{degreeprogramme}{programme}
\ProvideDictTranslation{Degreeprogramme}{Programme}
-\ProvideDictTranslation{Bachelor-thesis}{Bachelor Thesis}
-\ProvideDictTranslation{Bachelor-thesis-proposal}{Bachelor Thesis Proposal}
-\ProvideDictTranslation{Master-thesis}{Master Thesis}
-\ProvideDictTranslation{Master-thesis-proposal}{Master Thesis Proposal}
+\ProvideDictTranslation{Bachelor-thesis}{Bachelor's Thesis}
+\ProvideDictTranslation{Bachelor-thesis-proposal}{Bachelor's Thesis Proposal}
+\ProvideDictTranslation{Master-thesis}{Master's Thesis}
+\ProvideDictTranslation{Master-thesis-proposal}{Master's Thesis Proposal}
\ProvideDictTranslation{PhD-thesis}{PhD Thesis}
\ProvideDictTranslation{PhD-thesis-proposal}{PhD Thesis Proposal}
\ProvideDictTranslation{date}{date}
@@ -1729,7 +1782,7 @@
% We provide the following German translations.
%
% \begin{macrocode}
-\ProvideDictionaryFor{German}{se2translations}[2024/06/25]
+\ProvideDictionaryFor{German}{se2translations}[2024/08/12]
\ProvideDictTranslation{abstract}{Zusammenfassung}
\ProvideDictTranslation{Abstract}{Zusammenfassung}
\ProvideDictTranslation{acknowledgement}{Danksagung}
diff --git a/Master/texmf-dist/source/latex/sillypage/sillypage.dtx b/Master/texmf-dist/source/latex/sillypage/sillypage.dtx
index 86982db30db..922d8b6a669 100644
--- a/Master/texmf-dist/source/latex/sillypage/sillypage.dtx
+++ b/Master/texmf-dist/source/latex/sillypage/sillypage.dtx
@@ -19,8 +19,8 @@
% by Phelype Oleinik, Paulo Cereda, samcarter and Ulrike Fischer.
%
%<*package>
-\def\sillypageDate{2023-03-04}
-\def\sillypageVersion{1.6}
+\def\sillypageDate{2024-07-23}
+\def\sillypageVersion{1.7}
%</package>
%<*driver>
\documentclass[a4paper,full]{l3doc}
@@ -261,9 +261,13 @@
\newcommand*\@silly { \@@_step:n }
\cs_new:Npn \@@_step:n #1
{
+ \UseTaggingSocket{@@/begin}{#1}
+ \SuspendTagging{@@}
\@@_step_aux:eN
{ \int_eval:n { \int_mod:nn { #1-1 } { \silly@steps } +1 } }
\c_false_bool
+ \ResumeTagging{@@}
+ \UseTaggingSocket{@@/end}
}
% \end{macrocode}
% \end{macro}
@@ -280,8 +284,12 @@
\newcommand*\@sillynumeral { \@@_numeral:n }
\cs_new:Npn \@@_numeral:n #1
{
+ \UseTaggingSocket{@@/begin}{#1}
+ \SuspendTagging{@@}
\exp_args:Ne \str_map_function:nN
{ \int_to_base:nn {#1} { 12 } } \@@_numeral_aux:n
+ \ResumeTagging{@@}
+ \UseTaggingSocket{@@/end}
}
\cs_new:Npn \@@_numeral_aux:n #1
{ \@@_step_aux:eN { "\char_uppercase:N #1+1 } \c_true_bool }
@@ -289,6 +297,28 @@
% \end{macro}
% \end{macro}
% \end{macro}
+%
+% \subsection{Tagging Support}
+
+% \begin{macrocode}
+\NewSocket{tagsupport/@@/begin}{1}
+\NewSocket{tagsupport/@@/end}{0}
+\NewSocketPlug{tagsupport/@@/begin}{tagged}
+ {
+ \mode_leave_vertical:
+ \tag_mc_end_push:
+ \tag_struct_begin:n {tag=Span}
+ \tag_mc_begin:n {actualtext=#1}
+ }
+\NewSocketPlug{tagsupport/@@/end}{tagged}
+ {
+ \tag_mc_end:
+ \tag_struct_end:
+ \tag_mc_begin_pop:n{}
+ }
+\AssignSocketPlug{tagsupport/@@/begin}{tagged}
+\AssignSocketPlug{tagsupport/@@/end}{tagged}
+% \end{macrocode}
%
% \subsection{Internals}
%
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx
index 2b875143759..4a7e2eb7057 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx-number.dtx
@@ -2980,7 +2980,13 @@
\str_case:nnF {#1}
{
{ down } { \use_i:nn }
- { up } { \use_ii:nn }
+ { up }
+ {
+ \str_if_eq:eeTF
+ {#2} { \prg_replicate:nn { \tl_count:n {#2} } { 0 } }
+ { \use_i:nn }
+ { \use_ii:nn }
+ }
}
{
\bool_lazy_or:nnTF
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
index bd97dc57500..054d525a88b 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.dtx
@@ -59,6 +59,9 @@
%
% \begin{documentation}
%
+% ^^A API documentation is given on a per-module basis:
+% ^^A see the siunitx-<module>.dtx files
+%
% \end{documentation}
%
% \begin{implementation}
@@ -121,7 +124,7 @@
%
% Identify the package and give the over all version information.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2024-06-24} {3.3.19}
+\ProvidesExplPackage {siunitx} {2024-08-01} {3.3.20}
{A comprehensive (SI) units package}
% \end{macrocode}
%
diff --git a/Master/texmf-dist/source/latex/siunitx/siunitx.tex b/Master/texmf-dist/source/latex/siunitx/siunitx.tex
index 7c6e147f007..3c0231e5b4f 100644
--- a/Master/texmf-dist/source/latex/siunitx/siunitx.tex
+++ b/Master/texmf-dist/source/latex/siunitx/siunitx.tex
@@ -414,7 +414,7 @@ mode.
\end{LaTeXdemo}
The second operation mode for the \cs{unit} macro is an \enquote{interpreted}
-system, Here, each unit, \acro{SI} multiple prefix and power is given a macro
+system. Here each unit, \acro{SI} multiple prefix and power is given a macro
name. These are entered in a method very similar to the reading of the unit
name in English.
\begin{LaTeXdemo}
@@ -1252,7 +1252,7 @@ font variant which does not feature them.
\DescribeOption{text-subscript-command}
\DescribeOption{text-superscript-command}
In most cases, the commands \cs{textsubscript} and \cs{textsuperscript} are
-appropriagte for creating sub- and superscript material in text mode. However,
+appropriate for creating sub- and superscript material in text mode. However,
when the \pkg{realscripts} package is loaded, it is possible that the output is
not as desired. These two commands are therefore available to allow tuning of
the results. They can also be used for non-standard effects, for example as
diff --git a/Master/texmf-dist/source/latex/subeqn/subeqn.dtx b/Master/texmf-dist/source/latex/subeqn/subeqn.dtx
index cc49b5f0b5a..b9ce8706822 100644
--- a/Master/texmf-dist/source/latex/subeqn/subeqn.dtx
+++ b/Master/texmf-dist/source/latex/subeqn/subeqn.dtx
@@ -1,48 +1,49 @@
% \iffalse meta-comment
%
-% Copyright 1994-2004 Johannes Braams. All rights reserved.
-%
+% Copyright 1999-2024 Johannes L. Braams. All rights reserved.
+%
% This file is part of the subeqn package.
% ----------------------------------------
-%
+%
% It 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
-% version 2003/12/01 or later.
-%
+% 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 Johannes Braams.
-%
-% The list of all files belonging to the subeqn package is
-% given in the file `manifest.txt'.
-%
+%
+% The list of all files belonging to the supertabular package is
+% given in the file `MANIFEST.
+%
% The list of derived (unpacked) files belonging to the distribution
% and covered by LPPL is defined by the unpacking scripts (with
% extension .ins) which are part of the distribution.
% \fi
-% \CheckSum{76}
+%
+% \CheckSum{84}
% \iffalse
-%% File: `subeqn.dtx'
-%% Copyright (C) 1999-2004
-%% Donald Arsenau (asnd at reg.triumf.ca),
-%% Johannes Braams (TeXniek at braams.cistron.nl)
-%%
+% Copyright (C) 1999-2024
+% Donald Arsenau at reg.triumf.ca,
+% Johannes Braams texniek at texniek.nl
+%
%<*dtx>
\ProvidesFile{subeqn.dtx}
%</dtx>
%<package>\NeedsTeXFormat{LaTeX2e}[1998/06/01]
%<package>\ProvidesPackage{subeqn}
-%<sample>\ProvidesFile{subeqn.tex}
+%<sample>\ProvidesFile{subeqn-sample.tex}
%<driver>\ProvidesFile{subeqn.drv}
%\ProvidesFile{subeqn.dtx}
- [2004/04/15 v2.0b subnumbering of equations]
+ [2024/07/21 v2.0c subnumbering of equations]
%<*driver>
\documentclass{ltxdoc}
\begin{document}
+\pagestyle{myheadings}
\providecommand{\Lenv}[1]{\textsf{#1}}
\providecommand{\Lopt}[1]{\textsf{#1}}
\providecommand{\pkg}[1]{\texttt{#1}}
@@ -60,6 +61,10 @@
% \date{\filedate}
% \maketitle
%
+% \markboth
+% {subeqn package version \fileversion\space as of \filedate}
+% {subeqn package version \fileversion\space as of \filedate}
+%
% \section{Introduction}
%
% Sometimes it is necessary to be able to refer to subexpressions
@@ -165,7 +170,7 @@
\global\c@equation\z@
}{%
% \end{macrocode}
-% When the environment is finished we restore the value ot the
+% When the environment is finished we restore the value of the
% \texttt{equation} counter.
% \begin{macrocode}
\global\c@equation\c@mainequation
@@ -220,7 +225,14 @@
\usepackage{subeqn}
\begin{document}
-This is an example ot the use of the \texttt{subeqations} package.
+\title{Sample sub-equations}
+\author{Johannes L. Braams}
+\date{\today}
+\maketitle
+
+\noindent
+This is an example of the use of the \texttt{subeqations}
+package. First we have a normal \textsf{equation} environment.
\begin{equation}
\label{a}
a^2 + b^2 = c^2
@@ -247,6 +259,7 @@ Now we start sub-numbering.
and~\ref{c2}.
\end{subequations}
+\noindent
Now lets start a \textsf{subeqnarray} environment.
\begin{subeqnarray}
\label{d}
diff --git a/Master/texmf-dist/source/latex/subeqn/subeqn.ins b/Master/texmf-dist/source/latex/subeqn/subeqn.ins
index e9e8689856d..b3e295f28c4 100644
--- a/Master/texmf-dist/source/latex/subeqn/subeqn.ins
+++ b/Master/texmf-dist/source/latex/subeqn/subeqn.ins
@@ -3,50 +3,41 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2004 Johannes L. Braams. All rights reserved.
-%%
-%% This file is part of the subeqn package.
-%% ----------------------------------------
-%%
-%% It 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".
-%%
-%% The Current Maintainer of this work is Johannes Braams.
-%%
-%% The list of all files belonging to the subeqn package is
-%% given in the file `manifest.txt.
+%%
+%% This file is distributed in the hope that it will be useful,
+%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
%%
-%% The list of derived (unpacked) files belonging to the distribution
-%% and covered by LPPL is defined by the unpacking scripts (with
-%% extension .ins) which are part of the distribution.
+%% IMPORTANT NOTICE:
+%%
+%% Copyright (C) 1999-2024 Johannes L. Braams. All rights reserved.
+%%
+%% 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; either
+%% version 1.3c of the License, or any later version.
%%
%% --------------- start of docstrip commands ------------------
%%
-\def\filedate{2004/04/15}
\def\batchfile{subeqn.ins}
\input docstrip.tex
+\keepsilent
\preamble
+This is a generated file.
-Copyright (C) 1999-2004 Johannes Braams. All rights reserved.
+Copyright (C) 1999-2024 Johannes Braams. All rights reserved.
This file was generated from file(s) of the subeqn package.
-----------------------------------------------------------
It 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.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.
+and version 1.3Ñ or later is part of all distributions of LaTeX
+version 2008 or later.
This work has the LPPL maintenance status "maintained".
@@ -57,7 +48,7 @@ subeqn package. You may however distribute the subeqn package
without such generated files.
The list of all files belonging to the subeqn package is
-given in the file `manifest.txt.
+given in the file `MANIFEST'.
The list of derived (unpacked) files belonging to the distribution
and covered by LPPL is defined by the unpacking scripts (with
@@ -70,7 +61,7 @@ extension .ins) which are part of the distribution.
% The sample file
-\generateFile{subeqn.tex}{t}{\from{subeqn.dtx}{sample}}
+\generateFile{subeqn-sample.tex}{t}{\from{subeqn.dtx}{sample}}
\Msg{***********************************************************}
\Msg{*}
diff --git a/Master/texmf-dist/source/latex/subeqnarray/subeqnarray.dtx b/Master/texmf-dist/source/latex/subeqnarray/subeqnarray.dtx
index 5b3555c3120..d460ccfca32 100644
--- a/Master/texmf-dist/source/latex/subeqnarray/subeqnarray.dtx
+++ b/Master/texmf-dist/source/latex/subeqnarray/subeqnarray.dtx
@@ -1,43 +1,40 @@
% \iffalse meta-comment
%
-% Copyright 1994-2004 Johannes Braams. All rights reserved.
-%
+% Copyright 1998-2024 Johannes L. Braams. All rights reserved.
+%
% This file is part of the subeqnarray package.
% ---------------------------------------------
-%
+%
% It 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
-% version 2003/12/01 or later.
-%
+% 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 Johannes Braams.
-%
-% The list of all files belonging to the subeqnarray package is
-% given in the file `manifest.txt'.
-%
+%
+% The list of all files belonging to the supertabular package is
+% given in the file `MANIFEST'.
+%
% The list of derived (unpacked) files belonging to the distribution
% and covered by LPPL is defined by the unpacking scripts (with
% extension .ins) which are part of the distribution.
% \fi
-% \CheckSum{259}
-%\iffalse
+%
+% \CheckSum{264}
+%
+% \iffalse
%
% Subeqnarray package to use with LaTeX2e
%
-%% Copyright (C) 1988--2004 by Johannes Braams,
-%% all rights resserved
%%
%% Error reports please to: J. Braams
%% TeXniek
-%% Kooienswater 62
-%% 2715 AJ Zoetermeer
-%% The Netherlands
-%% Email: texniek at braams.cistron.nl
+%% Email: texniek at texniek.nl
%
% \section{Producing the documentation}
%
@@ -48,10 +45,10 @@
%</dtx>
%<package>\NeedsTeXFormat{LaTeX2e}[1998/06/01]
%<package>\ProvidesPackage{subeqnarray}
-%<sample>\ProvidesFile{subeqnarray.tex}
+%<sample>\ProvidesFile{subeqnarray-sample.tex}
%<driver>\ProvidesFile{subeqnarray.drv}
%\ProvidesFile{subeqnarray.dtx}
- [2004/04/15 v2.1c subeqnarray package]
+ [2024/07/20 v2.1e subeqnarray package]
%<*driver>
\documentclass{ltxdoc}
@@ -82,10 +79,8 @@
%
% \author{Johannes Braams\\
% \TeX niek\\
-% Kersengaarde 33\\
-% 2723 BP Zoetermeer\\
% The Netherlands\\
-% Internet: \texttt{TeXniek at braams.cistron.nl}}
+% Internet: \texttt{texniek at texniek.nl}}
%
% \date{\filedate}
%
@@ -114,8 +109,8 @@
% \changes{2.0}{1993/11/02}{Added support for the leqno option}
% \changes{2.0}{1993/11/02}{Added support for the fleqn option}
% \changes{2.1}{1994/02/09}{Upgrade for LaTeX2e}
-% \changes{2.1b}{1999/03/03}{Changed licensing remarks to use LPPL}
-% \changes{2.1c}{2004/04/15}{Updated address information}
+% \changes{v2.1b}{1999/03/03}{Changed licensing remarks to use LPPL}
+% \changes{v2.1e}{2024/07/20}{Updated contact info}
%
% \section{Initial Code}
%
@@ -129,8 +124,8 @@
% \end{macro}
%
% \begin{macro}{\thesubequation}
-% The representation o the counter \texttt{subequation} includes
-% the \texttt{equation} counter
+% The representation of the counter \texttt{subequation} includes
+% the \texttt{equation} counter.
% \begin{macrocode}
\def\thesubequation{\theequation\alph{subequation}}
% \end{macrocode}
@@ -197,7 +192,7 @@
\ExecuteOptions{reqno,deqn}
% \end{macrocode}
%
-% Now see if the use specified any options.
+% Now see if the user specified any options.
% \begin{macrocode}
\ProcessOptions
% \end{macrocode}
@@ -206,9 +201,9 @@
%
% \begin{macro}{\slabel}
% A new label command to refer to subequations. It works
-% like the |\label| command and was taken from \texttt{latex.tex}.
+% like the |\label| command and was taken from \texttt{latex.ltx}.
%
-% |\slabel{FOO}| writes the following on file |\@auxout|
+% |\slabel{FOO}| writes the following on file |\@auxout|:
%
% |\newlabel{FOO}{{eval(\@currentlabel)}{eval(\thepage)}}|
%
@@ -285,7 +280,7 @@
% \end{macro}
%
% \begin{macro}{\@@subeqncr}
-% Ceck the number of columns, and insert extra |&| if needed. If
+% Check the number of columns, and insert extra |&| if needed. If
% there appear to be more than 3 columns an error is signalled.
% \begin{macrocode}
\def\@@subeqncr{\let\@tempa\relax
@@ -314,7 +309,6 @@
% \begin{macrocode}
\let\@ssubeqncr\@subeqncr
%</package>
-%<*sample>
% \end{macrocode}
% \end{macro}
%
@@ -328,6 +322,11 @@
\documentclass[fleqn]{article}
\usepackage{subeqnarray}
\begin{document}
+\title{Sample subeqnarray}
+\author{Johannes L. Braams}
+\date{\today}
+\maketitle
+
This document shows an example of the use of the \emph{subeqnarray}
environment. Here is one:
\begin{subeqnarray}
@@ -360,20 +359,4 @@ These are equations~\ref{eq10},~\ref{eq11} and~\ref{eq12}.
%
% \Finale
\endinput
-%
-%% \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
-%% Lower-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
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
+% \ No newline at end of file
diff --git a/Master/texmf-dist/source/latex/subeqnarray/subeqnarray.ins b/Master/texmf-dist/source/latex/subeqnarray/subeqnarray.ins
index efa2d4da606..f28eb4717a2 100644
--- a/Master/texmf-dist/source/latex/subeqnarray/subeqnarray.ins
+++ b/Master/texmf-dist/source/latex/subeqnarray/subeqnarray.ins
@@ -1,53 +1,49 @@
-%%
+%
%% This file will generate fast loadable files and documentation
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1989-2004 Johannes L. Braams. All rights reserved.
-%%
-%% This file is part of the subeqnarray package.
-%% ---------------------------------------------
-%%
+%% Copyright (C) 1999-2024 Johannes L. Braams. All rights reserved.
+%%
+%% This file is part of the eqnarray distribution.
+%% -----------------------------------------------
+%%
%% It 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
-%% version 2003/12/01 or later.
-%%
-%% This work has the LPPL maintenance status "maintained".
-%%
-%% The Current Maintainer of this work is Johannes Braams.
-%%
-%% The list of all files belonging to the subeqnarray package is
-%% given in the file `manifest.txt.
-%%
-%% The list of derived (unpacked) files belonging to the distribution
-%% and covered by LPPL is defined by the unpacking scripts (with
-%% extension .ins) which are part of the distribution.
+%% 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 file has the LPPL maintenance status "maintained".
+%%
+%% As this file contains legal notices, it is NOT PERMITTED to modify
+%% this file in any way that the legal information placed into
+%% generated files is changed (i.e., the files generated when the
+%% original file is executed). This restriction does not apply if
+%% (parts of) the content is reused in a different WORK producing its
+%% own generated files.
%%
%% --------------- start of docstrip commands ------------------
%%
-% ignored commands
-\def\filedate{2004/04/15}
-\def\batchfile{subeqnarray.ins}
+
\input docstrip.tex
\preamble
-Copyright (C) 1999-2004 Johannes Braams. All rights reserved.
+Copyright (C) 1999-2024 Johannes Braams. All rights reserved.
This file was generated from file(s) of the subeqnarray package.
----------------------------------------------------------------
It 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
-version 2003/12/01 or later.
+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".
@@ -71,7 +67,7 @@ extension .ins) which are part of the distribution.
% The sample file
-\generateFile{subeqnarray.tex}{t}{\from{subeqnarray.dtx}{sample}}
+\generateFile{subeqnarray-sample.tex}{t}{\from{subeqnarray.dtx}{sample}}
\Msg{***********************************************************}
\Msg{*}
@@ -89,4 +85,4 @@ extension .ins) which are part of the distribution.
\Msg{* Happy TeXing}
\Msg{***********************************************************}
-\endinput
+\endbatchfile
diff --git a/Master/texmf-dist/source/latex/supertabular/supertabular.dtx b/Master/texmf-dist/source/latex/supertabular/supertabular.dtx
index be31a2d113d..6bde17bbfa6 100644
--- a/Master/texmf-dist/source/latex/supertabular/supertabular.dtx
+++ b/Master/texmf-dist/source/latex/supertabular/supertabular.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1989-2020 Johannes L. Braams. All rights reserved.
+% Copyright 1989-2021 Johannes L. Braams. All rights reserved.
%
% This file is part of the supertabular package.
% ---------------------------------------------
@@ -25,14 +25,13 @@
% extension .ins) which are part of the distribution.
% \fi
%
-% \CheckSum{1132}
+% \CheckSum{1188}
% \iffalse
%% Sourcefile `supertabular.dtx'.
%%
%% Copyright (C) 1988 by Theo Jurriens
-%% Copyright (C) 1990-2020 by Johannes Braams texniek at braams.xs4all.nl
-%% Kersengaarde 33
-%% 2723 BP Zoetermeer NL
+%% Copyright (C) 1990-2024 by Johannes Braams texniek at texniek.nl
+%% The Netherlands
%% all rights reserved.
%%
%%
@@ -43,11 +42,11 @@
%<package>\ProvidesPackage{supertabular}
%<driver>\ProvidesFile{supertabular.drv}
%\ProvidesFile{supertabular.dtx}
- [2020/02/02 v4.1g the supertabular environment]
+ [2024/07/20 v4.2c the supertabular environment]
%
%<*driver>
\documentclass{ltxdoc}
-\usepackage[debugshow]{supertabular}
+\usepackage[debugshow,calculate]{supertabular}
\newcommand{\tbsp}{\rule{0pt}{18pt}}
\begin{document}
\providecommand{\Lenv}[1]{\textsf{#1}}
@@ -59,17 +58,19 @@
%</driver>
% \fi
%
-% \changes{v4.0a}{1996/11/28}{Cleanup of the code, now a \file{.dtx}
-% source file}
-% \changes{v4.0c}{1997/02/20}{Replace \cs{tableformat} by
-% \cs{ST@tableformat} to prevent a clash with the \pkg{KOMA}
-% pacakage}
-% \changes{v4.0f}{1997/04/10}{Repaired a few typos in the
-% documentation}
-% \changes{v4.1a}{1997/09/18}{Repaired a number of typos and added
-% contributed mpsupertabular environemnts}
-% \changes{v4.1b}{1997/10/08}{Renamed \cs{@@tabularcr} to
-% \cs{org@tabularcr}}
+% \changes{v4.0a}{1996/11/28}{Cleanup of the code, now a \file{.dtx}
+% source file}
+% \changes{v4.0c}{1997/02/20}{Replace \cs{tableformat} by
+% \cs{ST@tableformat} to prevent a clash with the \pkg{KOMA}
+% pacakage}
+% \changes{v4.0f}{1997/04/10}{Repaired a few typos in the
+% documentation}
+% \changes{v4.1a}{1997/09/18}{Repaired a number of typos and added
+% contributed mpsupertabular environemnts}
+% \changes{v4.1b}{1997/10/08}{Renamed \cs{@@tabularcr} to
+% \cs{org@tabularcr}}
+% \changes{v4.2a}{2020-06-27}{renamed \cs{ST@lineht} to \cs{ST@rowht}}
+% \changes{v4.2c}{2024/07/20}{A few documentation changes}
%
% \GetFileInfo{supertabular.dtx}
% \title{The \texttt{supertabular} environment\thanks{This file
@@ -110,7 +111,13 @@
% and why \pkg{supertabular} decides to break the tabular
% environment in order to produce a new page.
% \item The option \textsf{debugshow} also adds information about
-% each line that is added to the tabular.
+% each row that is added to the tabular.
+% \item The option \textsf{estimate} (the default) has the package
+% use the old estimation-based algortihm to establish the height
+% of individual rows.
+% \item The option \textsf{calculate} has the package use the new
+% calculation-based algortihm to establish the height
+% of individual rows.
% \end{enumerate}
%
% Below is a description of the new commands and environments that
@@ -172,15 +179,15 @@
%
% \begin{itemize}
% \item When the material of a normal entry (not a p-arg) becomes
-% larger than the estimated |\ST@lineht|, overfull |\vbox|es
-% will be produced at all.
+% larger than the estimated |\ST@rowht|, overfull |\vbox|es
+% will be produced.
% \item When the last p-arg on a page gets more than 4 lines
% (probably even more than 3 lines) it will result in an overfull
% |\vbox|. Also some combinations of |\baselinestretch|
-% |\arraystretch| and a large font may lead to one line too much.
-% \item if accidentally the last line of the tabular produces a
+% |\arraystretch| and a large font may lead to one row too much.
+% \item if accidentally the last row of the tabular produces a
% newpage, on the next page the tabletail will be written
-% immediately after the tablehead. Depending on the contents this
+% immediately after the tablehead. Depending on the contents, this
% may result in an error message regarding misplaced |\noalign|.
%
% A quick but not very elegant solution: shrink the allowed height
@@ -431,6 +438,36 @@
\DeclareOption{errorshow}{\c@tracingst\z@}
\DeclareOption{pageshow}{\c@tracingst\thr@@}
\DeclareOption{debugshow}{\c@tracingst5\relax}
+% \end{macrocode}
+% In version 4.1g a new way of determining the height of the
+% average row was introduced. Instead of using an estimation, based
+% on the value of |\baselineskip| a computation was introduced,
+% based on the size of the |\strutbox|. The effect of this new
+% method was that the parial tabulars fill the page better, so less
+% \texttt{underfull vbox} message would appear. Unfortunately this
+% had a negative effect on existing documents (that don;t come out
+% like they used to) and especially when a very small font
+% (|\tiny| or |\scriptsize| was chosen for the tabular and the
+% cells contain subscripts or superscripts. It turned out that the
+% heigth and depth of a formula like $5^5_5$ exceeds the size of
+% |\strutbox|. The result is that the rows have more height (and/or
+% depth) thatn what the algorithm computed. Hence, when more rows
+% are added to the partial tabular than fit on the page. Especially
+% on the first part thisis a probem as the partial tabular becomes
+% too high and doesn't fit in the avialbale space. \TeX\ then
+% decides to move it to the next page, resulting in two
+% consecutive pages that have a lot of white space on them.
+% \changes{v4.2a}{2020-06-27}{Two new options to choose the
+% computation algorithhm}
+% \begin{macrocode}
+\DeclareOption{calculate}{\def\ST@calculate@rowht{\ST@compute@rowht}}
+\DeclareOption{estimate}{\def\ST@calculate@rowht{\ST@estimate@rowht}}
+%\def\ST@calculate@rowht{\ST@estimate@rowht}
+% \end{macrocode}
+% The default for the options is to only show errors and use the
+% old estmation algorithm (so as not to break old documents).
+% \begin{macrocode}
+\ExecuteOptions{errorshow,estimate}
\ProcessOptions
% \end{macrocode}
%
@@ -510,7 +547,7 @@
% yet be visible in the amount of space occupoed on the page
% sofar. Therefore we include the possibility to reduce the height
% of the first part of the supertabular. In order to this we need a
-% macro that indicates a aption has been put in front of the
+% macro that indicates a caption has been put in front of the
% table. We do this to reduce the risk that the first part of the
% table is too high after all and is pushed onto the next page due
% to an overfull |\vbox| condition.
@@ -523,7 +560,7 @@
% \begin{macro}{\ST@caption}
% This is a redefinition of LaTeX's |\@caption|, |\@makecaption| is
% called within a group so as not to return to |\normalsize|
-% globally. also a fix is made for the `feature' of the
+% globally. Also a fix is made for the `feature' of the
% |\@makecaption| of the document class \cls{article} and friends
% that a caption \textbf{always} gets a |\vskip 10pt| at the top
% and \textbf{none} at the bottom. If a user wants to precede his
@@ -554,14 +591,19 @@
% to \cs{@tabularcr}}
% \changes{v4.1b}{1997/10/08}{Not \cs{@tabularcr} but
% \cs{org@tabularcr}}
+% \changes{v4.2b}{2021-02-14}{When the argument is empty the internal
+% macro \cs{@tablehead} needs to be empty as well.}
% \begin{macrocode}
\newcommand\tablehead[1]{%
- \gdef\@tablehead{%
- \noalign{%
- \global\let\@savcr=\\
- \global\let\\=\org@tabularcr}%
- #1%
- \noalign{\global\let\\=\@savcr}}}
+ \def\@ST@arg{#1}%
+ \ifx\@ST@arg\@empty\gdef\@tablehead{}\else
+ \gdef\@tablehead{%
+ \noalign{%
+ \global\let\@savcr=\\
+ \global\let\\=\org@tabularcr}%
+ #1%
+ \noalign{\global\let\\=\@savcr}}%
+ \fi}
\tablehead{}
% \end{macrocode}
% It's possible to specify a different tablehead for the first
@@ -571,17 +613,22 @@
% document.
% \changes{v4.1f}{2019/01/12}{\cs{\@table@first@head} needs the same
% definition as \cs{\@tablehead} (found by FMi)}
+% \changes{v4.2b}{2021-02-14}{When the argument is empty the internal
+% macro \cs{@table@first@head} needs to be empty as well.}
% \begin{macrocode}
\newcommand\tablefirsthead[1]{%
- \gdef\@table@first@head{%
- \noalign{%
- \global\let\@savcr=\\
- \global\let\\=\org@tabularcr}%
- #1%
- \noalign{%
- \global\let\\=\@savcr
- \global\let\@table@first@head\undefined
- }}}
+ \def\@ST@arg{#1}%
+ \ifx\@ST@arg\@empty\gdef\@table@first@head{}\else
+ \gdef\@table@first@head{%
+ \noalign{%
+ \global\let\@savcr=\\
+ \global\let\\=\org@tabularcr}%
+ #1%
+ \noalign{%
+ \global\let\\=\@savcr
+ \global\let\@table@first@head\undefined
+ }}%
+ \fi}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -598,14 +645,19 @@
% to \cs{@tabularcr}}
% \changes{v4.1b}{1997/10/08}{Not \cs{@tabularcr} but
% \cs{org@tabularcr}}
+% \changes{v4.2b}{2021-02-14}{When the argument is empty the internal
+% macro \cs{@tabletail} needs to be empty as well.}
% \begin{macrocode}
\newcommand\tabletail[1]{%
- \gdef\@tabletail{%
- \noalign{%
- \global\let\@savcr=\\
- \global\let\\=\org@tabularcr}%
- #1%
- \noalign{\global\let\\=\@savcr}}}
+ \def\@ST@arg{#1}%
+ \ifx\@ST@arg\@empty\gdef\@tabletail{}\else
+ \gdef\@tabletail{%
+ \noalign{%
+ \global\let\@savcr=\\
+ \global\let\\=\org@tabularcr}%
+ #1%
+ \noalign{\global\let\\=\@savcr}}%
+ \fi}
\tabletail{}
% \end{macrocode}
% It's possible to specify a different tabletail for the last
@@ -615,17 +667,22 @@
% document.
% \changes{v4.1f}{2019/01/12}{\cs{\@table@last@tail} needs the same
% definition as \cs{\@tabletail}}
+% \changes{v4.2b}{2021-02-14}{When the argument is empty the internal
+% macro \cs{@tabletail} needs to be empty as well.}
% \begin{macrocode}
\newcommand\tablelasttail[1]{%
- \gdef\@table@last@tail{%
- \noalign{%
- \global\let\@savcr=\\
- \global\let\\=\org@tabularcr}%
- #1%
- \noalign{%
- \global\let\\=\@savcr
- \global\let\@table@last@tail\undefined
- }}}
+ \def\@ST@arg{#1}%
+ \ifx\@ST@arg\@empty\gdef\@table@last@tail{}\else
+ \gdef\@table@last@tail{%
+ \noalign{%
+ \global\let\@savcr=\\
+ \global\let\\=\org@tabularcr}%
+ #1%
+ \noalign{%
+ \global\let\\=\@savcr
+ \global\let\@table@last@tail\undefined
+ }}%
+ \fi}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -660,7 +717,7 @@
%
% \begin{macro}{\ST@trace@cr}
% A variant of |\ST@trace| that can be called from within |\\| as
-% that command is looking for an optional argument will end up
+% that command is looking for an optional argument and will end up
% scanning the next line.
% \begin{macro}{\ST@save@lineno}
% \changes{v4.1f}{2019/01/18}{Added a macro to save the current input
@@ -752,25 +809,22 @@
% \changes{v4.0b}{1997/02/04}{Removed the use of \cs{ST@pboxcorr},
% correction seems to be no longer necessary}
%
-% \begin{macro}{\ST@lineht}
+% \begin{macro}{\ST@rowht}
% \begin{macro}{\ST@stretchht}
% \changes{v4.0g}{1997/04/12}{Dimension register added}
% \begin{macro}{\ST@prevht}
% \changes{v4.0g}{1997/04/12}{Dimension register added}
-% The estimated height of a normal line is stored in
-% |\ST@lineht|. The dimension register |\ST@stretchht| is used to
-% store the difference between the `normal' line height and the
-% line height when |\arraystretch| has a non-standard value. This
-% is used in the case where p-box entries are added to the
-% tabular. The dimension register |\ST@prevht| is use to store the
-% height of the previous line to use it as an estimate for the
-% height of the next line. This is needed for a better estimate of
+% The estimated height of a normal row is stored in
+% |\ST@rowht|. The dimension register |\ST@stretchht| was used to
+% store the difference between the `normal' row height and the
+% row height when |\arraystretch| has a non-standard value. This
+% was used in the case where p-box entries are added to the
+% tabular. The dimension register |\ST@prevht| is used to store the
+% height of the previous row, to use it as an estimate for the
+% height of the next row. This is needed for a better estimate of
% when to break the tabular.
-% \changes{v4.1g}{2020/02/02}{\cs{ST@stretchht} is no longer needed,
-% will be removed in a future release}
% \begin{macrocode}
-\newdimen\ST@lineht
-%\newdimen\ST@stretchht
+\newdimen\ST@rowht
\newdimen\ST@prevht
% \end{macrocode}
% \end{macro}
@@ -907,10 +961,12 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\ST@compute@lineht}
-% \changes{v4.1g}{2020/02/02}{New macro \cs{ST@compute@lineht} to
-% replacte \cs{estimate@lineht}}
-% The height of a line in an array environemnt can be computed as:
+% \begin{macro}{\ST@compute@rowht}
+% \changes{v4.1g}{2020/02/02}{New macro \cs{ST@compute@rowht} to
+% replace \cs{ST@estimate@rowht}}
+% \changes{v4.2a}{2020-06-27}{Make sure that \cs{ST@rowht} is large
+% enough to take subscripts and superscripts into account}
+% The height of a row in an array environemnt can be computed as:
% \begin{itemize}
% \item the height of the strutbox |\ht\strutbox| (plus
% |\extrarowheight| when the \pkg{array} package is loaded),
@@ -919,34 +975,60 @@
% by |\arraystretch|.
% \end{itemize}
% \begin{macrocode}
-\def\ST@compute@lineht{%
- \ST@lineht=\ht\strutbox
+\def\ST@compute@rowht{%
+% \end{macrocode}
+% Temporarily store a formula with superscript and subscript in a
+% box in order to be able to measure its height and depth.
+% \begin{macrocode}
+ \setbox\@tempboxa=\vbox{\@arrayparboxrestore $5^5_5$}
+% \end{macrocode}
+% Use the largest height of either |\@tempboxa| or |\strutbox|.
+% \begin{macrocode}
+ \ifnum\ht\@tempboxa>\ht\strutbox
+ \ST@rowht=\ht\@tempboxa
+ \else
+ \ST@rowht=\ht\strutbox
+ \fi
+% \end{macrocode}
+% If the \textsf{array} pacakge is used we need to add the
+% value of |\extrarowheight|.
+% \begin{macrocode}
\ifx\extrarowheight\undefined\else
- \advance \ST@lineht by \extrarowheight
+ \advance \ST@rowht by \extrarowheight
+ \fi
+% \end{macrocode}
+% Also use the largest depth of either |\@tempboxa| or |\strutbox|.
+% \begin{macrocode}
+ \ifnum\dp\@tempboxa>\dp\strutbox
+ \advance\ST@rowht \dp\@tempboxa
+ \else
+ \advance\ST@rowht \dp\strutbox
\fi
- \ST@lineht = \arraystretch\ST@lineht
- \advance\ST@lineht \arraystretch\dp\strutbox
- \ST@trace\tw@{Normal Line height: \the\ST@lineht}%
+% \end{macrocode}
+% And finally multiply by |\arraystretch|.
+% \begin{macrocode}
+ \ST@rowht = \arraystretch\ST@rowht
+% \end{macrocode}
+% \begin{macrocode}
+ \ST@trace\tw@{Normal Row height: \the\ST@rowht}%
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\estimate@lineht}
+% \begin{macro}{\ST@estimate@rowht}
% Estimates the height of normal line taking |\arraystretch| into
% account. Also computes the difference between a normal line and a
% `stretched' one.
% \changes{v4.0b}{1997/02/04}{Removed use of \cs{ST@pboxcorr}}
% \changes{v4.0g}{1997/04/12}{Added the computation of
% \cs{ST@stretchht}}
-% This macro will be removed in a future release.
+% \changes{v4.2a}{2020-06-27}{removed the computation of
+% \cs{ST@stretchht} as it is no longer used}
% \begin{macrocode}
-\def\estimate@lineht{%
- \ST@lineht=\arraystretch \baslineskp
- \global\advance\ST@lineht by 1\p@
- \ST@stretchht\ST@lineht\advance\ST@stretchht-\baslineskp
- \ifdim\ST@stretchht<\z@\ST@stretchht\z@\fi
- \ST@trace\tw@{Average line height: \the\ST@lineht}%
- \ST@trace\tw@{Stretched line height: \the\ST@stretchht}%
+\def\ST@estimate@rowht{%
+ \ST@rowht=\arraystretch \baslineskp
+ \global\advance\ST@rowht by 1\p@
+ \ST@trace\tw@{Average Row height: \the\ST@rowht}%
}
% \end{macrocode}
% \end{macro}
@@ -1071,23 +1153,23 @@
\ST@tailht=\ht\@tempboxa\advance\ST@tailht\dp\@tempboxa
\fi
% \end{macrocode}
-% We add the average height of a line to this because when we
+% We add the average height of a row to this because when we
% decide to continue the tabular we need to have enough space left
-% for one line and the tail.
+% for one row \emph{and} the tail.
% \begin{macrocode}
- \advance\ST@tailht by \ST@lineht
+ \advance\ST@tailht by \ST@rowht
\ST@trace\tw@{Height of tail: \the\ST@tailht}%
\ST@trace\tw@{Maximum height of tabular: \the\ST@pageleft}%
\@tempdima\ST@headht
% \end{macrocode}
% \changes{v4.0b}{1997/02/04}{Base the decision whether to start on a
-% new page on the total of headheight, tailht and lineht}
+% new page on the total of headheight, tailht and rowht}
% Now we decide whether we can continue on the current page or
% whether we need to start on a new page. We assume that the
% minimum height of a tabular is the height of the head, the tail
-% and one line of data. If that doesn't fit a new page is started.
+% and one row of data. If that doesn't fit a new page is started.
% \begin{macrocode}
- \advance\@tempdima\ST@lineht
+ \advance\@tempdima\ST@rowht
\advance\@tempdima\ST@tailht
\ST@trace\tw@{Minimum height of tabular: \the\@tempdima}%
\ifnum\@tempdima>\ST@pageleft
@@ -1164,7 +1246,7 @@
\global\let\@oldcr=\\
% \end{macrocode}
% Save the current value of |\baselineskip|, as we need it in the
-% calculation of the average height of a line.
+% calculation of the average height of a row.
% \begin{macrocode}
\def\baslineskp{\baselineskip}%
% \end{macrocode}
@@ -1174,9 +1256,9 @@
\ifx\undefined\@classix
% \end{macrocode}
% Save old |\@tabularcr| and insert the definition of
+% |\ST@tabularcr|.
% \changes{v4.1c}{1997/11/07}{For standard \LaTeX\ we need to change
% \cs{@@startpbox}, \emph{not} \cs{@startpbox}}
-% |\ST@tabularcr|.
% \begin{macrocode}
\let\org@tabularcr\@tabularcr
\let\@tabularcr\ST@tabularcr
@@ -1210,20 +1292,20 @@
\fi
% \end{macrocode}
% The first part of a supertabular may be moved on to the next page
-% if it doesn't fit on the current page afterall. Subsequent parts
+% if it doesn't fit on the current page after all. Subsequent parts
% can not be moved; therefor we will have to switch the definition
-% of |\ST@skippart| around.
+% of |\ST@skippage| around.
% \changes{v4.0e}{1997/04/09}{Make sure that only the first part of a
% supertabular can be moved to the next page.}
% \begin{macrocode}
\let\ST@skippage\ST@skipfirstpart
% \end{macrocode}
-% Now we can estimate the average line height and the height of the
+% Now we can estimate the average row height and the height of the
% first page of the \Lenv{supertabular}.
% \changes{v4.0i}{1997/09/18}{Added \cs{noindent}}
-% \changes{v4.1g}{2020/02/02}{Now call \cs{ST@compute@lineht}}
+% \changes{v4.1g}{2020/02/02}{Now call \cs{ST@calculate@rowht}}
% \begin{macrocode}
- \ST@compute@lineht
+ \ST@calculate@rowht
\@calfirstpageht
\noindent
}
@@ -1544,20 +1626,20 @@
% \begin{macrocode}
\def\ST@cr{%
\noalign{%
- \ifnum\ST@pboxht<\ST@lineht
+ \ifnum\ST@pboxht<\ST@rowht
% \end{macrocode}
-% If there is a non-empty line, but an empty parbox, then
-% |\ST@pboxht| might be non-zero, but too small thereby breaking
-% the algorithm. Therefor we estimate the height of the line to be
-% |\ST@lineht| in this case.
+% If there is a non-empty row, but an empty parbox, then
+% |\ST@pboxht| might be non-zero, but too small, thereby breaking
+% the algorithm. Therefor we estimate the height of the row to be
+% |\ST@rowht| in this case.
% \begin{macrocode}
- \global\advance\ST@pageleft -\ST@lineht
+ \global\advance\ST@pageleft -\ST@rowht
% \end{macrocode}
% And we store that fact in |\ST@prevht|.
-% \changes{v4.0g}{1997/04/12}{store the height of the previous line in
+% \changes{v4.0g}{1997/04/12}{store the height of the previous row in
% \cs{ST@prevht}}
% \begin{macrocode}
- \global\ST@prevht\ST@lineht
+ \global\ST@prevht\ST@rowht
\else
% \end{macrocode}
% When the parbox was not empty we take into account its height
@@ -1605,11 +1687,11 @@
\else
% \end{macrocode}
% When there is not enough space left on the current page, we start
-% a new page. To compute the amount of space need we use the
-% height of the previous line (|\ST@prevht|) as an estimation of
-% the height of the next line. If we are processing a
+% a new page. To compute the amount of space needed we use the
+% height of the previous row (|\ST@prevht|) as an estimation of
+% the height of the next row. If we are processing a
% \Lenv{mpsupertabular} we need to take the height of the footnotes
-% into account.
+% into account as well.
% \changes{v4.0g}{1997/04/12}{Leave room for both \cs{ST@tailht}
% \emph{and} \cs{ST@prevht}}
% \changes{v4.1a}{1997/09/19}{Take care of space needed for
@@ -1659,10 +1741,19 @@
% \begin{macrocode}
\global\advance\ST@pageleft\pagetotal
% \end{macrocode}
-% Then we can set |\ST@pagesofar| to $0$ and start the new page.
+% Then we can set |\ST@pagesofar| to $0$...
% \begin{macrocode}
\global\ST@pagesofar\z@
- \newpage
+% \end{macrocode}
+% ... and start the new page, but in this special case we need to
+% trigger the output routine directly by issuing a |\penalty|
+% rather than calling |\newpage| as that macro effectively issues a
+% |\vskip-\maxdepth| which makes the first two rows of the tabular
+% overlap.
+% \changes{v4.2b}{2021-02-14}{Issue a \cs{penalty} instead of
+% \cs{newpage} to trigger the output routine.}
+% \begin{macrocode}
+ \penalty -\@M
% \end{macrocode}
%
% Finally we make sure that this macro can only be executed once
diff --git a/Master/texmf-dist/source/latex/tablvar/tablvar.dtx b/Master/texmf-dist/source/latex/tablvar/tablvar.dtx
index afc47fc9539..e39c2382f0c 100644
--- a/Master/texmf-dist/source/latex/tablvar/tablvar.dtx
+++ b/Master/texmf-dist/source/latex/tablvar/tablvar.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2018-2023 by Antoine Missier <antoine.missier@ac-toulouse.fr>
+% Copyright (C) 2018-2024 by Antoine Missier <antoine.missier@ac-toulouse.fr>
%
% This file may be distributed and/or modified under the conditions of
% the LaTeX Project Public License, either version 1.3 of this license
@@ -22,11 +22,11 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{tablvar}
- [2023/12/23 v2.0 .dtx tablvar file]
+ [2024/08/09 v2.1 Tables of signs and variations]
%</package>
%<*driver>
\documentclass{ltxdoc}
-\usepackage[utf8]{inputenc}
+%\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
\usepackage[french]{babel}
\usepackage{lmodern}
@@ -38,10 +38,12 @@
\def\bbObrecht{\vrule\kern1pt\vrule} \let\bb\relax
\let\variations\relax
\usepackage{tkz-tab}
+\usepackage{pstricks}
+\usepackage{tableau}
\usepackage[pstricks]{tablvar}
\usepackage[style=french,font=fcm]{lgrmath} % pour un joli pi droit
-\usepackage{hyperref}
+\usepackage[hyperindex=false]{hyperref}
\usepackage{sectsty}
\usepackage{makecell}
\usepackage{spacingtricks}
@@ -58,6 +60,8 @@
\definecolor{darkbrown}{rgb}{0.5,0.1,0.1}
\allsectionsfont{\color{darkbrown}}
\hypersetup{%
+ bookmarksopen=true,
+ bookmarksopenlevel=2,
colorlinks,
linkcolor=blue,
citecolor=red,
@@ -76,7 +80,7 @@
%</driver>
% \fi
%
-% \CheckSum{752}
+% \CheckSum{828}
%
% \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
@@ -119,27 +123,21 @@
% \changes{v2.0}{16/12/2023}{Nouveau paramètre limsep}
% \changes{v2.0}{20/12/2023}{Macro bas et mil valables pour un nb quelconque de lignes}
% \changes{v2.0}{22/12/2023}{Macros @pos -> tv@pos, @@pos -> tv@@pos}
+% \changes{v2.1}{23/07/2024}{
+% - Calcul de hauteur automatique de la colonne de légende :
+% * nouveaux paramètres rowtopsep et rowbottomsep
+% * tv@saveheight -> tv@setheight
+% - option pstricks possible avec LuaLaTeX + luapstricks,
+% - amélioration du calcul de position de la macro mil,
+% - nouvelles macros limg*, limd* et bblim*
+% - exemple plus sophistiqué pour bblim}
%
% \GetFileInfo{tablvar.sty}
-%
-% \DoNotIndex{\@@ZI,\tv@@pos,\tv@pos,\@ZI,\@arstrutbox,\@ifstar,\\}
-% \DoNotIndex{\addtocounter,\advance,\arraybackslash}
-% \DoNotIndex{\begin,\boolean,\centering,\color,\DeclareOption,\def}
-% \DoNotIndex{\define@boolkey,\defin@key,\dp,\draw,\else,\empty,\end}
-% \DoNotIndex{\fi,\fill,\global,\hspace,\ht}
-% \DoNotIndex{\I,\if,\ifdim,\ifnum,\ifthenelse,\Ix,\Iy,\kern}
-% \DoNotIndex{\makebox,\MessageBreak,\multido,\ncline,\newboolean,}
-% \DoNotIndex{\newcommand,\newcounter,\newenvironment,\newlength,\newsavebox}
-% \DoNotIndex{\node,\PackageWarningNoLine,\ProcessOptions,\psframe}
-% \DoNotIndex{\raisebox,\relax,\renewcommand,\RequirePackage,\rnode}
-% \DoNotIndex{\sbox,\setboolean,\setcounter,\setlength,\stepcounter}
-% \DoNotIndex{\TikZ,\tvanchor,\usetikzlibrary,\value,\wd}
-% \DoNotIndex{\ZIheight,\ZIheighti,\ZIheightii,\ZIheightiii,\ZIheightiv,\ZIdepth,\ZIwidth}
%
% \title{L'extension \textsf{tablvar}\thanks{Ce document
-% correspond à \textsf{tablvar}~\fileversion, dernière modification le 23/12/2023.}}
+% correspond à \textsf{tablvar}~\fileversion, dernière modification le 09/08/2024.}}
% \author{Antoine Missier \\ \texttt{antoine.missier@ac-toulouse.fr}}
-% \date{23 décembre 2023}
+% \date{9 août 2024}
% \maketitle
% \tableofcontents
%
@@ -175,8 +173,8 @@
% |pstricks| ou |tikz|, que l'on invoque dans le préambule à l'appel de l'extension :
% |\usepackage[tikz]{tablvar}|.
% Lorsque l'option n'est pas précisée, l'extension choisira \texttt{tikz}
-% pour un compilateur PDF (comme pdf\LaTeX\ ou \LuaLaTeX), \texttt{pstricks} sinon
-% (typiquement \LaTeX\ + dvips + ps2pdf ou \XeLaTeX).
+% pour un mode de sortie PDF direct (avec pdf\LaTeX\ ou \LuaLaTeX),
+% \texttt{pstricks} sinon (avec \LaTeX\ > dvips > ps2pdf ou \XeLaTeX).
% Pour l'option |tikz|, il faut compiler \emph{deux fois},
% la première fois les flèches ne sont pas correctement dessinées
% (un message de compilation le rappelle).
@@ -189,9 +187,9 @@
%
% \subsection{Tableaux de variations simples}
%
-% % \DescribeEnv{tablvar}
+% \DescribeEnv{tablvar}
% Un tableau de variations (ou de signes) se définit par un environnement |tablvar|
-% qui \emph{doit être en mode mathématiques} (comme |array|).
+% qui \emph{doit être en mode mathématique} (comme |array|).
%
% \medskip
% Voici un premier tableau tout simple avec les commandes
@@ -235,8 +233,8 @@
% Cette unité à l'avantage de s'ajuster lorsqu'on change de fonte
% sans avoir besoin de modifier le code. L'unité de même type utilisée pour les hauteurs
% est le \texttt{ex}, hauteur du \og x \fg.}.
-% Les flèches ne sont pas contraintes à rester à l'intérieur des colonnes intervalles
-% mais s'ajustent par rapport à la taille effective des valeurs qu'elles relient.
+% La longueur des flèches s'ajuste en fonction de la taille des valeurs
+% qu'elles relient et ne sont pas contraintes à rester à l'intérieur des colonnes intervalles.
% Lorsqu'une valeur est trop large, elle déborde automatiquement
% dans les colonnes intervalles sans altérer
% les largeurs de colonne.
@@ -314,7 +312,7 @@
% (voir section \ref{options} pour la liste détaillée des options).
%
% \DescribeMacro{\variations\oarg{nblignes}}
-% C'est la commande |\variations| qui, se charge de la construction des flèches
+% C'est la commande |\variations| qui se charge de la construction des flèches
% en fonction du positionnement des valeurs.
% Un paramètre optionnel permet de définir
% un nombre arbitraire de lignes pour les variations (3 par défaut).
@@ -418,7 +416,8 @@
% \mbox{Signe de }f'(x) & & - & \barre[0] & + & \barre[0] & - & \\
% \hline
% \variations{ \mil{\makecell{\mbox{Variations} \\ \mbox{de }f}} &
-% \haut{+\infty} && \bas{-14} && \haut{\frac{69}{4}} && \bas{-\infty} }
+% \haut{+\infty} && \bas{-14} && \haut{\frac{69}{4}} &&
+% \bas{-\infty} }
% \hline
%\end{tablvar}\]
% \end{verbatim}
@@ -435,50 +434,57 @@
%
% \medskip
% Une première solution est d'interrompre la double barre pour placer
-% les limites qui resteront alors centrées au milieu de la colonne (mais il faut aimer).
+% les limites qui resteront alors centrées au milieu de la colonne
+% (mais il faut aimer).
%\[\begin{tablvar}{2}
% \hline
-% x & -\infty && 0 && +\infty \\
+% x & -\infty && 2 && +\infty \\
% \hline
-% \variations{\mil{\e^{\frac{1}{x}}} & \haut{1} &&
-% \bas{0} \pos*{2}{\bb} \discont \haut{+\infty} && \bas{1} }
+% \variations{\mil{\dfrac{1}{x-2}} & \pos{2}{0} && \bas{-\infty}
+% \pos*{2}{\bb} \discont \haut{+\infty} && \pos{2}{0} }
% \hline
%\end{tablvar}\]
-% La macro |\e| compose le nombre d'Euler $\e$ en romain (forme droite),
-% comme c'est la règle pour les constantes mathématiques
-% (cf. \textsf{mismath}~\cite{MIS} ou \textsf{frenchmath}~\cite{FR}).
% \begin{verbatim}
%\[\begin{tablvar}{2}
% \hline
-% x & -\infty && 0 && +\infty \\
+% x & -\infty && 2 && +\infty \\
% \hline
-% \variations{\mil{\e^{\frac{1}{x}}} & \haut{1} &&
-% \bas{0} \pos*{2}{\bb} \discont \haut{+\infty} && \bas{1} }
+% \variations{\mil{\dfrac{1}{x-2}} & \pos{2}{0} && \bas{-\infty}
+% \pos*{2}{\bb} \discont \haut{+\infty} && \pos{2}{0} }
% \hline
%\end{tablvar}\]
% \end{verbatim}
%
% \hypertarget{firstcolsep}{}
% \DescribeMacro{\limg} \DescribeMacro{\limd}
-% Les macros |\limg|\oarg{pos}\marg{ligne}\marg{valeur}
-% et |\limd|\oarg{pos}\marg{ligne}\marg{valeur}
+% Les macros |\limg|\oarg{pos}\marg{ligne}\marg{valeur} et
+% |\limd|\oarg{pos}\marg{lgn}\marg{val}
% offrent une solution plus élégante pour placer des limites à gauche ou à droite.
% L'option de positionnement \meta{pos} correspond à celle de la macro |\pos|
% (\texttt{c}, \texttt{t} ou \texttt{b}).
+%
+% \DescribeMacro{\limg*}\DescribeMacro{\limd*}
+% Les variantes étoilées |\limg*| et |\limd*| sont des alias :
+% |\limg*{+}| signifie |\limg{1}{+\infty}|,
+% |\limg*{-}| correspond à |\limg{|$n$|}{-\infty}|
+% (pour une partie variations sur $n$ lignes),
+% de même pour |\limd*|.
+% Tout autre argument que \texttt{+} ou \texttt{-} génère un message d'erreur.
+%
+% \DescribeMacro{firstcolsep}
+% La colonne de légende peut être élargie en ajoutant de l'espace à ses extrémités
+% avec l'option \texttt{firstcolsep} (dont la valeur par défaut est \texttt{5pt}).
%\[\begin{tablvar}[firstcolsep=10pt,intervalwidth=4em]{2}
% \hline
% x & -\infty && 0 && +\infty \\
% \hline
% -\frac{1}{x} & & + & \bb & - & \\
% \hline
-% \variations{ \mil{\dfrac{1}{x^2}} & \bas{0} && \limg{1}{+\infty} \bb
-% \discont \limd{1}{+\infty} && \bas{0} }
+% \variations{ \mil{\e^{\frac{1}{x}}} & \haut{1} && \limg{3}{0} \bb
+% \discont \limd*{+} && \bas{1} }
% \hline
%\end{tablvar}\]
%
-% \DescribeMacro{firstcolsep}
-% Ci-dessus la colonne de légende a été élargie en ajoutant de l'espace à ses extrémités
-% avec l'option \texttt{firstcolsep} (dont la valeur par défaut est \texttt{5pt}).
% \begin{verbatim}
%\[\begin{tablvar}[firstcolsep=10pt,intervalwidth=4em]{2}
% \hline
@@ -486,13 +492,18 @@
% \hline
% -\frac{1}{x} & & + & \bb & - & \\
% \hline
-% \variations{ \mil{\dfrac{1}{x^2}} & \bas{0} && \limg{1}{+\infty} \bb
-% \discont \limd{1}{+\infty} && \bas{0} }
+% \variations{ \mil{\e^{\frac{1}{x}}} & \haut{1} && \limg{3}{0} \bb
+% \discont \limd*{+} && \bas{1} }
% \hline
%\end{tablvar}\]
% \end{verbatim}
+% \vspace{-2ex}
+% La macro |\e| compose le nombre d'Euler $\e$ en romain,
+% comme c'est la règle pour les constantes mathématiques
+% (cf. \textsf{mismath}~\cite{MIS} ou \textsf{frenchmath}~\cite{FR}).
%
-% \DescribeMacro{\bblim}
+% \bigskip
+% \DescribeMacro{\bblim}\DescribeMacro{\bblim*}
% Sauf sur les bords du tableau ou lorsqu'il y a une zone interdite,
% les doubles barres sont en général accompagnées à la fois d'une limite à gauche
% et d'une limite à droite. La commande |\bblim| permet alors d'alléger la syntaxe.
@@ -502,24 +513,28 @@
% C'est un alias de
% |\limg|\marg{ligne}\marg{valeur}|\bb\discont\limd|\marg{ligne}\marg{valeur}.
% La seule différence est que |\bblim| ne possède pas d'option de positionnement
-% des nœuds comme |\limg| et |\limd|.
-%\[\begin{tablvar}{4}
+% des nœuds comme |\limg| et |\limd|. La forme étoilée offre une syntaxe
+% encore plus légère lorsque les deux limites sont infinies :
+% |\bblim*{-}{+}| correspond à |\bblim{3}{-\infty}{1}{+\infty}|
+% (lorsqu'il y a 3 lignes de variations).
+%
+%\[\begin{tablvar}{5}
% \hline
-% x & -\infty && -1 && 0 && 1 && +\infty \\
+% x & -\infty && -2 && 0 && 1 && 2 && +\infty \\
% \hline
-% \variations{\mil{\dfrac{1}{1-x^2}} & \haut{0} &&
-% \bblim{3}{-\infty}{1}{+\infty} && \bas{1} &&
-% \bblim{1}{+\infty}{3}{-\infty} && \haut{0} }
+% \variations{ \mil{\dfrac{\e^{\frac{1}{x}}}{x-2}} & \haut{0} &&
+% \bas{-\frac{1}{4}\e^{-\frac{1}{2}}} && \bblim{1}{0}{3}{-\infty} &&
+% \haut{-\e} && \bblim*{-}{+} && \bas{0} }
% \hline
%\end{tablvar}\]
% \begin{verbatim}
-%\[\begin{tablvar}{4}
+%\[\begin{tablvar}{5}
% \hline
% x & -\infty && -1 && 0 && 1 && +\infty \\
% \hline
-% \variations{\mil{\dfrac{1}{1-x^2}} & \haut{0} &&
-% \bblim{3}{-\infty}{1}{+\infty} && \bas{1} &&
-% \bblim{1}{+\infty}{3}{-\infty} && \haut{0} }
+% \variations{ \mil{\dfrac{\e^{\frac{1}{x}}}{x-2}} & \haut{0} &&
+% \bas{-\frac{1}{4}\e^{-\frac{1}{2}}} && \bblim{1}{0}{3}{-\infty} &&
+% \haut{-\e} && \bblim*{-}{+} && \bas{0} }
% \hline
%\end{tablvar}\]
% \end{verbatim}
@@ -533,7 +548,7 @@
% sauf si on préfère plus de blanc.
% On peut y compris leur donner des valeurs négatives si l'on veut s'approcher
% davantage des filets verticaux, par exemple \texttt{limsep=-1.5pt}
-% amène au contact de la double barre).
+% amènerait au contact de la double barre).
%\[\begin{tablvar}[bordercolsep=4pt,limsep=3pt]{3}
% \hline
% x & -\infty && 0 && 1 && +\infty \\
@@ -568,7 +583,7 @@
% \hline
% x & 0 && 1 && +\infty \\
% \hline
-% \variations{ \mil{\ln x -x} & \bb\limd{3}{-\infty} && \haut{-1} &&
+% \variations{ \mil{\ln x -x} & \bb\limd*{-} && \haut{-1} &&
% \bas{-\infty} }
% \hline
%\end{tablvar*}
@@ -589,7 +604,7 @@
% \hline
% x & 0 && 1 && +\infty \\
% \hline
-% \variations{ \mil{\ln x -x} & \bb\limd{3}{-\infty} && \haut{-1} &&
+% \variations{ \mil{\ln x -x} & \bb\limd*{-} && \haut{-1} &&
% \bas{-\infty} }
% \hline
%\end{tablvar*}
@@ -603,8 +618,8 @@
% \hline
%\end{tablvar*}\]
% \end{verbatim}
-% \hypertarget{ext}{}
%
+% \hypertarget{ext}{}
% \DescribeMacro{extleft}\DescribeMacro{extright}
% Dans \texttt{tablvar*}, si, à une extrémité sans double barre,
% les valeurs ont des largeurs vraiment différentes
@@ -622,25 +637,25 @@
% pour éviter que le 1 ne soit collé au bord droit
% et qu'il garde un bon centrage par rapport à $+\infty$.
%
-% \noindent\begin{minipage}[t]{7.7cm}
+% \noindent\begin{minipage}[t]{7.4cm}
% \begin{verbatim}
-%\[\begin{tablvar}[extleft,intervalwidth=4em]{1}
+%\[\begin{tablvar}[extleft]{1}
% \hline
% x & 0 && +\infty \\
% \hline
-% \variations{ \mil{1-\dfrac{1}{x}} & \bb
-% \limd{3}{-\infty} && \haut{1} }
+% \variations[2]{ \mil{1-\dfrac{1}{x}}
+% & \bb \limd*{-} && \haut{1} }
% \hline
%\end{tablvar}\]
% \end{verbatim}
% \end{minipage}
% \begin{minipage}[t]{5cm}
-%\[\begin{tablvar}[extleft,intervalwidth=4em]{1}
+%\[\begin{tablvar}[extleft]{1}
% \hline
% x & 0 && +\infty \\
% \hline
-% \variations{ \mil{1-\dfrac{1}{x}} & \bb
-% \limd{3}{-\infty} && \haut{1} }
+% \variations[2]{ \mil{1-\dfrac{1}{x}}
+% & \bb \limd*{-} && \haut{1} }
% \hline
%\end{tablvar}\]
% \end{minipage}
@@ -661,14 +676,14 @@
%
% Voici un exemple où la valeur remarquable
% est placée dans la colonne intervalle.\\
-% \begin{minipage}[t]{7.7cm}
+% \begin{minipage}[t]{7.4cm}
% \begin{verbatim}
%\[\begin{tablvar*}[6em]{1}
% \hline
% x & 0 & \vr{1} & +\infty \\
% \hline
% \variations{ \mil{\ln x} &
-% \bb \limd{3}{-\infty} & \vr{0} &
+% \bb \limd*{-} & \vr{0} &
% \pos[t]{1}{+\infty} }
% \hline
%\end{tablvar*}\]
@@ -680,7 +695,7 @@
% x & 0 & \vr{1} & +\infty \\
% \hline
% \variations{ \mil{\ln x} &
-% \bb \limd{3}{-\infty} & \vr{0} &
+% \bb \limd*{-} & \vr{0} &
% \pos[t]{1}{+\infty} }
% \hline
%\end{tablvar*}\]
@@ -702,8 +717,8 @@
% \hline
% x & -\infty && \vr{0} && \vr{1} && +\infty \\
% \hline
-% \variations[4]{ \mil{\exp x} & \haut{0} &&
-% \vr[3]{1} && \vr{\e} && \bas{+\infty} }
+% \variations[4]{ \mil{\exp x} & \bas{0} &&
+% \vr[3]{1} && \vr{\e} && \haut{+\infty} }
% \hline
%\end{tablvar}\]
% \end{verbatim}
@@ -738,7 +753,7 @@
% \medskip
% On peut préférer que les flèches de variations ne passent pas à travers
% les valeurs remarquables (qui doivent alors être aussi des nœuds pour les flèches).
-% L'exemple suivant présente un tableau utilisant simultanément
+% L'exemple qui suit présente un tableau utilisant simultanément
% les deux manières de traiter les valeurs remarquables.
% La taille des flèches s'ajuste automatiquement.
% Le second zéro correspond à la fois à un nœud pour les flèches
@@ -767,6 +782,10 @@
% L'option |[t]| pour le max en ligne 1
% est ici combinée avec l'option |[b]| en ligne 3 et permet de conserver
% un positionnement correct du 0 sur la flèche.
+%
+% Pour placer la dernière valeur, on aurait pu utiliser |\limg[b]{3}{-\infty}|,
+% mais ici |\pos[b]{3}{-\infty}| convient aussi à cause de l'option \texttt{extright}
+% qui produit un alignement au fer à droite de la dernière colonne.
% \begin{verbatim}
%\[\begin{tablvar}[extright,intervalwidth=2em]{4}
% \hline
@@ -782,7 +801,6 @@
%\end{tablvar}\]
% \end{verbatim}
%
-% \vspace{-\baselineskip}
% \DescribeMacro{\vrconnect}
% C'est la macro graphique |\vrconnect| qui gère le tracé de ces traits pointillés.
% Elle peut être redéfinie pour changer leur aspect
@@ -802,7 +820,7 @@
% 0 &\mbox{si } x= 0
%\end{array}
%\right. .\]
-% \begin{minipage}[t]{6.5cm}
+% \begin{minipage}[t]{6.7cm}
% \begin{verbatim}
%\[\begin{tablvar}{2}
% \hline
@@ -900,7 +918,7 @@
% \vspace{-\baselineskip}
% Le |\hspace{-0.5em}| devant \texttt{+} a pour effet de décaler le $+$ affiché
% vers la gauche afin de le recentrer.
-% En effet, les macros |\limg| et |limd| placent les valeurs dans des boîtes de largeur
+% En effet, les macros |\limg| et |\limd| placent les valeurs dans des boîtes de largeur
% nulle (grâce à la commande |\zbox|, voir section \ref{cmd-pos}).
% De ce fait, le contenu d'une colonne valeur (qui a une largeur fixe)
% peut déborder en largeur
@@ -926,8 +944,8 @@
% -\frac{x}{\strut\sqrt{x^2-1}^3} && + & \bb & \ZI & \bb & - & \\
% \hline
% \variations{\pos*{2}{\dfrac{1}{\sqrt{x^2-1}}} & \bas{0} &&
-% \limg{1}{+\infty} \bb & \ZI &
-% \bb \limd{1}{+\infty} && \bas{0} }
+% \limg*{+} \bb & \ZI &
+% \bb \limd*{+} && \bas{0} }
% \hline
%\end{tablvar}\]
%
@@ -943,8 +961,8 @@
% -\frac{x}{\strut\sqrt{x^2-1}^3} && + & \bb & \ZI & \bb & - & \\
% \hline
% \variations{\pos*{2}{\dfrac{1}{\sqrt{x^2-1}}} & \bas{0} &&
-% \limg{1}{+\infty} \bb & \ZI &
-% \bb \limd{1}{+\infty} && \bas{0} }
+% \limg*{+} \bb & \ZI &
+% \bb \limd*{+} && \bas{0} }
% \hline
%\end{tablvar}\]
% \end{verbatim}
@@ -961,7 +979,8 @@
% Il arrive que la compilation \LaTeX\ + dvips + ps2pdf
% n'affiche pas cette transparence,
% ce qui semble être dû à un bug dans certaines versions de Ghostscript.
-% Dans ce cas la solution est de compiler avec \XeLaTeX.
+% Dans ce cas une solution peut être de compiler avec \XeLaTeX\ ou \LuaLaTeX\
+% (si \textsf{luapstricks} est installé sur votre distribution).
% La compilation pdf\LaTeX\ avec l'option \texttt{tikz} ne pose pas ce problème.}
%
%\[\begin{tablvar}[ZItype=c,ZIcolor=green,ZIaddwidth=1pt]{3}
@@ -1000,17 +1019,18 @@
%\end{tablvar}\]
% \end{verbatim}
%
-% Si des extrema de grande taille sont placés dans la partie variations,
+% lorsque des extrema de grande taille sont placés dans la partie \emph{variations},
% il est nécessaire de modifier la hauteur des lignes,
% pour éviter de toucher le filet horizontal (au-dessus ou en-dessous)
-% \footnote{L'extension \textsf{tabularray}~\cite{TABUL} de Jianrui Lyu permettra
-% éventuellement une gestion automatisée des hauteurs de ligne dans une version future.}.
+% \footnote{L'extension \textsf{tabularray}~\cite{TABUL} de Jianrui Lyu permettrait
+% éventuellement une gestion automatisée des hauteurs de ligne
+% dans une possible version future.}.
% Cette modification peut se faire
-% avec \texttt{stretch} ou avec |\vstrut|\oarg{depth}\marg{height}
-% \emph{qu'il faut placer dans la toute 1\iere colonne} pour
+% avec l'option \texttt{stretch} ou avec |\vstrut|\oarg{depth}\marg{height}
+% qu'il faut placer \emph{dans la colonne de légendes} pour
% que |\ZI| prenne en compte sa hauteur.
-% Dans l'exemple suivant, \texttt{stretch=2.2} aurait donné le même résultat pour
-% les variations mais une ligne des $x$ plus haute.
+% Dans l'exemple suivant, \texttt{stretch=2.2} aurait donné le même résultat
+% mais une ligne des $x$ plus haute.
%
%\[\begin{tablvar}[4em]{4}
% \hline
@@ -1080,7 +1100,7 @@
% \DescribeMacro{\hachure}
% Lorsque l'on dessine des zones interdites hachurées
% sur plusieurs colonnes contiguës,
-% les hachures seront en général discontinues.
+% les hachures ne seront en général pas jointives.
% Pour pallier cela, on peut
% utiliser la primitive graphique |\hachure|
% qui permet de définir manuellement le rectangle à hachurer.
@@ -1090,16 +1110,16 @@
%\[ \begin{tablvar}[intervalwidth=1.8em,ZIaddwidth=1pt]{8}
% \hline
% x & -\infty && -2 && -\sqrt{\frac{5}{2}} && -1
-% && 0 && 1 && \sqrt{\frac{5}{2}} && 2 && +\infty \\
+% && 0 && 1 && \sqrt{\frac{5}{2}} && 2 && +\infty \\
% \hline
% 2x & &-& \barre &-& \barre &-& \barre &-& \barre[0] &+&
-% \barre &+& \barre &+& \barre &+& \\
+% \barre &+& \barre &+& \barre &+& \\
% \hline
% 2x^2-5 & &+& \barre &+& \barre[0] &-& \barre &-& \barre &-&
-% \barre &-& \barre[0] &+& \barre &+& \\
+% \barre &-& \barre[0] &+& \barre &+& \\
% \hline
% f'(x) & &-& \bb & \ZI & \barre & \ZI & \bb &+&
-% \barre[0] &-& \bb & & & & \bb & + & \\
+% \barre[0] &-& \bb & & & & \bb & + & \\
% \hline
% \variations{\mil{f(x)} & \haut{+\infty} && \bas{0}\barre & \ZI &
% \barre & \ZI & \bas{0}\barre && \haut{2} && \bas{0}\barre \discont
@@ -1108,7 +1128,7 @@
% \hline
%\end{tablvar} \] }
%
-% Pour hachurer une zone donnée, la commande |\hachure| peut être placée où l'on veut
+% La commande |\hachure| peut être placée où l'on veut
% dans le tableau, il suffit de donner les coordonnées du rectangle visé à
% partir de la position courante (réglage manuel).
% Dans la partie variations, il faut mettre la commande |\hachure| dans un |\pos*|,
@@ -1119,16 +1139,16 @@
%\[ \begin{tablvar}[intervalwidth=1.8em,ZIaddwidth=1pt]{8}
% \hline
% x & -\infty && -2 && -\sqrt{\frac{5}{2}} && -1
-% && 0 && 1 && \sqrt{\frac{5}{2}} && 2 && +\infty \\
+% && 0 && 1 && \sqrt{\frac{5}{2}} && 2 && +\infty \\
% \hline
% 2x & &-& \barre &-& \barre &-& \barre &-& \barre[0] &+&
-% \barre &+& \barre &+& \barre &+& \\
+% \barre &+& \barre &+& \barre &+& \\
% \hline
% 2x^2-5 & &+& \barre &+& \barre[0] &-& \barre &-& \barre &-&
-% \barre &-& \barre[0] &+& \barre &+& \\
+% \barre &-& \barre[0] &+& \barre &+& \\
% \hline
% f'(x) & &-& \bb & \ZI & \barre & \ZI & \bb &+&
-% \barre[0] &-& \bb & & & & \bb & + & \\
+% \barre[0] &-& \bb & & & & \bb & + & \\
% \hline
% \variations{\mil{f(x)} & \haut{+\infty} && \bas{0}\barre & \ZI &
% \barre & \ZI & \bas{0}\barre && \haut{2} && \bas{0}\barre \discont
@@ -1219,11 +1239,11 @@
% \medskip
% \DescribeMacro{\tablvarset\marg{keyval}}
% Mais les environnements \texttt{tablvar} et \texttt{tablvar*} possèdent également
-% un jeu de paramètres qui peuvent être définis de manière globale
-% (ou locale dans un environnement ou un groupe |{...}|),
-% avec des variables spécifiques
-% ou (depuis la version 2.0) avec la commande |\tablvarset|\marg{keyval},
-% utilisant le mécanisme \emph{clé=valeur}.
+% un jeu de paramètres qui peuvent être définis de manière globale,
+% ou locale dans un environnement (ou un groupe |{...}|),
+% soit en utilisant des variables spécifiques,
+% soit (depuis la version 2.0) avec la commande |\tablvarset|\marg{keyval},
+% basée sur le mécanisme \emph{clé=valeur}.
%
% \DescribeEnv{tablvar\oarg{keyval}}\DescribeEnv{tablvar*\oarg{keyval}}
% Ces paramètres peuvent aussi être réglés localement,
@@ -1280,12 +1300,12 @@
% \begin{description}
% \item[stretch] qui est un facteur d'élasticité verticale agissant sur toutes
% les lignes du tableau
-% \footnote{Pour ajuster la hauteur d'une ligne particulière, on dispose de la
-% macro \texttt{\textbackslash vstrut}\oarg{depth}\marg{height}
+% \footnote{Pour augmenter la hauteur d'une ligne particulière, on pourra utiliser la
+% commande \texttt{\textbackslash vstrut}\oarg{depth}\marg{height}
% (du package \textsf{spacingtricks}~\cite{SPA}),
% où \meta{depth} désigne la \emph{profondeur} et \meta{height} la \emph{hauteur}
% minimales à atteindre par rapport à la ligne de \emph{base},
-% ou encore de \texttt{\bslash cstrut}\marg{height} qui garantit une hauteur minimale
+% ou encore \texttt{\bslash cstrut}\marg{height} qui garantit une hauteur minimale
% en-dessous et au-dessus de la ligne de centrage mathématique.} ;
% une valeur de 1 correspond à la valeur standard
% d'un environnement \texttt{array}.
@@ -1322,7 +1342,7 @@
%
% \medskip
% Le rendu des commandes graphiques peut également être modifié,
-% en redéfinissant ces commandes, en particulier |\fleche|, |vrconnect| et |\hachure|
+% en redéfinissant ces commandes, en particulier |\fleche|, |\vrconnect| et |\hachure|
% grâce aux nombreuses options offertes par PSTricks ou \TikZ.
% C'est le cas aussi de l'aspect des filets et barres du tableau qui sont définis
% par les commandes |\tvrulewidth| (\texttt{0.4pt} par défaut),
@@ -1349,8 +1369,8 @@
% \hline
% -\frac{x+2}{x^4} && - & \barre[0] & + & \bb & - & \\
% \hline
-% \variations{\mil{\e^{\frac{x+1}{x^2}}} & \haut{1} && \bas{\e^{-\frac{1}{4}}}
-% && \bblim{1}{+\infty}{1}{+\infty} && \bas{1} }
+% \variations{\mil{\e^{\frac{x+1}{\vstrut{1.2ex} x^2}}} & \haut{1} &&
+% \bas{\e^{-\frac{1}{4}}} && \bblim*{+}{+} && \bas{1} }
% \hline
%\end{tablvar} \]
% \begin{verbatim}
@@ -1366,24 +1386,27 @@
% \hline
% -\frac{x+2}{x^4} && - & \barre[0] & + & \bb & - & \\
% \hline
-% \variations{\mil{\e^{\frac{x+1}{x^2}}} & \haut{1} &&
-% \bas{\e^{-\frac{1}{4}}} && \bblim{1}{+\infty}{1}{+\infty} &&
-% \bas{1} }
+% \variations{\mil{\e^{\frac{x+1}{\vstrut{1.2ex} x^2}}} & \haut{1} &&
+% \bas{\e^{-\frac{1}{4}}} && \bblim*{+}{+} && \bas{1} }
% \hline
%\end{tablvar} \]
% \end{verbatim}
+%
+% Enfin deux autres paramètres de type longueur |\rowtopsep| et |\rowbottomsep|
+% garantissent un espace minimum (de \texttt{2pt} par défaut)
+% entre les filets horizontaux et le contenu des cellules, pour la colonne des légendes.
%
-% \subsection{Nouveautés de la version 2.0}
+% \subsection{Nouveautés depuis la version 2.0}
%
-% Cette version présente de nombreuses nouveautés :
+% La version 2.0 présente de nombreuses nouveautés :
% \begin{itemize}
% \item \emph{Il n'y a plus d'option par défaut} à l'appel de l'extension.
% C'était \texttt{pstricks} dans les versions précédentes.
% Dorénavant, si aucune option n'est précisée, l'extension choisira elle-même
-% en fonction du compilateur utilisé, donc \texttt{tikz} pour le moteur pdf\LaTeX\
+% en fonction du compilateur utilisé, donc \texttt{tikz} pour pdf\LaTeX\
% qui ne supporte pas le code PSTricks.
%
-% \item \emph{Les colonnes de valeurs ont des largeurs fixes (\texttt{2em} par défaut)}
+% \item \emph{Les colonnes de valeurs ont des largeurs fixes} (\texttt{2em} \emph{par défaut)}
% et non plus variables en fonction du contenu, comme c'était le cas jusqu'à la version
% 1.2. L'avantage est d'améliorer le centrage pour les signes,
% lorsque les colonnes de valeurs ont des largeurs très différentes,
@@ -1395,7 +1418,7 @@
% et a été fixé à \texttt{0pt} car, en l'absence de filets verticaux,
% il ne sert plus à rien avec les colonnes à largeur fixe.
% Mais, en contrepartie, \emph{la valeur par défaut de} |\intervalwidth|
-% \emph{a été augmentée de \texttt{2.5em} à \texttt{3em}}.
+% \emph{a été augmentée de} \texttt{2.5em} \emph{à} \texttt{3em}.
%
% \item Les réglages peuvent désormais être effectués,
% avec la syntaxe \emph{clé = valeur} et la commande |\tablvarset|,
@@ -1446,12 +1469,26 @@
% De nouveaux types de colonnes ont été définis pour les valeurs et légendes,
% mais sont également internes à l'environnement \texttt{tablvar}.
%
-% \item Les macros |\haut|, |\bas| et |\mil| peuvent à présent être utilisées
+% \item Les macros |\bas| et |\mil| peuvent à présent être utilisées
% même lorsque le nombre de lignes de variations est différent de 3.
% Dans ce cas, commande |\mil| calcule automatiquement le décalage vertical ;
% l'utilisateur n'a plus besoin d'un appel explicite à |\vdecal|.
% \end{itemize}
%
+% Dans la version 2.1 :
+% \begin{itemize}
+% \item Ont été ajoutés deux nouveaux paramètres |\rowtopsep| et |\rowbottomsep|
+% pour garantir un espace minimum (de \texttt{2pt} par défaut)
+% entre les filets horizontaux et le contenu pour la colonne des légendes.
+% \item
+% Il est désormais possible d'utiliser l'option \texttt{pstricks} avec \LuaLaTeX,
+% si \textsf{luapstricks} est installé sur votre distribution.
+% \item Le calcul du décalage vertical de la commande |\mil| a été amélioré,
+% dans le cas d'un nombre pair de lignes de variations.
+% \item Les nouvelles commandes étoilées |\limg*|, |\limd*| et |\bblim*|
+% permettent une écriture simplifiée de |\limg|, |\limd| et |\bblim|,
+% pour des limites $\infty$.
+% \end{itemize}
% \medskip
% Des problèmes de composition peuvent apparaître avec des tableaux
% réalisés antérieurement à la version 2.0, en particulier
@@ -1469,16 +1506,81 @@
% dans la rubrique \og Maths tabvar \fg.
% Nous les décrivons ici brièvement.
% \begin{description}
-% \item[tableaux] de Nicolas Kisselhoff~\cite{TABL}.
+% \item[tableaux] de Nicolas Kisselhoff~\cite{TABL}.
% Propose un pseudo-code PSTricks,
% certainement plus commode que d'écrire toutes les commandes PSTricks.
-
+% Attention l'extension doit être appelée avec |\usepackage{tableau}|, sans \texttt{x}.
+% Voici un exemple repris de la doc de \textsf{tableaux} avec le code en suivant.
+%\newpsstyle{hachured}{fillstyle=hlines,hatchwidth=0.2pt,hatchsep=2pt}
+%\setlength{\TabTitreL}{1cm}
+%
+%\begin{MonTableau}{1}{9}{1.5}
+%\psframe[style=hachured,linestyle=none](.3,1)(.45,0)
+%
+%\TabNewCol{0}
+%\rTabPut{Br}{-.15}{.25}{$x$}
+%\rTabPut{Br}{-.15}{.40}{$f(x)$}
+%
+%\TabNewCol{0}
+%\rTabPut{Bl}{.15}{.25}{$0$}
+%\rTabPut{Bl}{.15}{.60}{$\frac{3}{2}$}
+%
+%\TabNewCol{.30}
+%\rTabPut{B}{0}{.25}{$1$}
+%\rTabPut{Br}{-.15}{.80}{$+\infty$}
+%\psline[style=TabDblBarre](.3,0)(.3,1)
+%
+%\TabNewCol{.45}
+%\rTabPut{B}{0}{.25}{$\frac{3}{2}$}
+%\rTabPut[2]{B}{0}{.10}{\TabZ}
+%
+%\TabNewCol{1}
+%\rTabPut{Br}{-.15}{.25}{$+\infty$}
+%\rTabPut{Br}{-.15}{.40}{$1$}
+%
+%\TabFleche{B1}{C1}
+%\TabFleche{D1}{E1}
+%\end{MonTableau}
+%
+% \begin{verbatim}
+%\newpsstyle{hachured}{fillstyle=hlines,hatchwidth=0.2pt,hatchsep=2pt}
+%\setlength{\TabTitreL}{1cm}
+%
+%\begin{MonTableau}{1}{9}{1.5}
+%\psframe[style=hachured,linestyle=none](.3,1)(.45,0)
+%
+%\TabNewCol{0}
+%\rTabPut{Br}{-.15}{.25}{$x$}
+%\rTabPut{Br}{-.15}{.40}{$f(x)$}
+%
+%\TabNewCol{0}
+%\rTabPut{Bl}{.15}{.25}{$0$}
+%\rTabPut{Bl}{.15}{.60}{$\frac{3}{2}$}
+%
+%\TabNewCol{.30}
+%\rTabPut{B}{0}{.25}{$1$}
+%\rTabPut{Br}{-.15}{.80}{$+\infty$}
+%\psline[style=TabDblBarre](.3,0)(.3,1)
+%
+%\TabNewCol{.45}
+%\rTabPut{B}{0}{.25}{$\frac{3}{2}$}
+%\rTabPut[2]{B}{0}{.10}{\TabZ}
+%
+%\TabNewCol{1}
+%\rTabPut{Br}{-.15}{.25}{$+\infty$}
+%\rTabPut{Br}{-.15}{.40}{$1$}
+%
+%\TabFleche{B1}{C1}
+%\TabFleche{D1}{E1}
+%\end{MonTableau}
+% \end{verbatim}
+%
% \item[tabvar] de Daniel Flipo~\cite{TABV},
% l'auteur, entre-autres de \textsf{babel-french},
% extension bien connue de tous les utilisateurs francophones de \LaTeX.
% Permet de réaliser des tableaux plutôt symboliques.
% Voici un tableau simple et son code \textsf{tabvar}. \\
-% \begin{minipage}[t]{7cm}
+% \begin{minipage}[t]{7.5cm}
% \begin{verbatim}
%\[\begin{tabvar}{|C|CCCCR|}
% \hline
@@ -1492,7 +1594,7 @@
%\end{tabvar}\]
% \end{verbatim}
% \end{minipage}
-% \begin{minipage}[t]{5cm}
+% \begin{minipage}[t]{4.2cm}
%\[\begin{tabvar}{|C|CCCCR|}
% \hline
% x & 0 & & \frac{1}{2} & & 1 \\
@@ -1551,19 +1653,19 @@
% Une très belle extension qui fait a peu près tout ce que fait \textsf{tablvar}
% et même un peu plus : par exemple tangentes horizontales sur les extrema,
% cellules en couleur.
-% Un de ses principaux avantages par rapport à \textsf{tablvar} est de ne pas nécessiter
+% Un de ses principaux bénéfices par rapport à \textsf{tablvar} est de ne pas nécessiter
% de double compilation
% \footnote{La double compilation avec \textsf{tablvar} n'est cependant nécessaire
% qu'avec l'option \texttt{tikz}.}.
-% Signalons quelques différences avec \textsf{tablvar} :
+% Signalons quand même quelques avantages de \textsf{tablvar} :
% \begin{itemize}
-% \item un tableau n'est pas globalement en mode mathématique, il faut donc mettre les
-% \$ du mode math autour de chaque valeur,
-% \item les hauteurs de ligne doivent être précisées de manière explicite et
-% ne peuvent être données qu'en cm (unité fixe qui ne s'ajuste pas à la fonte),
-% \item \textsf{tablvar} offre la possibilité de mettre des 0 par dessus les flèches,
-% \item les double barres aux extrémités du tableau sont assez éloignées des filets,
-% ce qui peut donc laisser un certain blanc sur les bords.
+% \item avec \textsf{tkz-tab}, un tableau n'est pas globalement en mode mathématique,
+% il faut donc mettre les |$| du mode math autour de chaque valeur,
+% \item et les hauteurs de ligne doivent être précisées de manière explicite et
+% uniquement cm (unité fixe qui ne s'ajuste pas à la fonte),
+% \item \textsf{tablvar} offre la possibilité de mettre des valeurs par dessus les flèches,
+% \item dans \textsf{tkz-tab}, les double barres aux extrémités du tableau
+% sont assez éloignées des filets, ce qui laisse un blanc important sur les bords.
% \end{itemize}
% Voici un exemple illustrant ce dernier point, avec son code.
% Pour comparer, le tableau obtenu avec \textsf{tablvar}
@@ -1615,7 +1717,7 @@
\RequirePackage{ifthen}
\RequirePackage{multido}
\RequirePackage{xkeyval}
-\RequirePackage{ifpdf}
+\RequirePackage{iftex}
\newif\iftv@tikz % false par défaut
\DeclareOption{tikz}{\tv@tikztrue}
@@ -1625,23 +1727,31 @@
\iftv@pstricks
\ifpdf
- \PackageError{tablvar}{Don't use the pstricks option with PDF engines}{}
+ \ifluatex
+ \PackageInfo{tablvar}{Option 'pstricks' works
+ with luapstricks}
+ \else
+ \PackageError{tablvar}{Don't use the 'pstricks' option with
+ PDF output mode}{Use 'tikz' option or change the engine}
+ \fi
\else
- \PackageInfo{tablvar}{PSTricks option is used}
+ \PackageInfo{tablvar}{Option 'pstricks' is used}
\fi
\else\iftv@tikz
- \PackageInfo{tablvar}{tikz option is used.
+ \AtEndDocument{\PackageWarningNoLine{tablvar}{Option 'tikz' is used.
\MessageBreak
- Run twice to draw the arrows correctly}
+ Maybe rerun to draw the arrows correctly}
+ }
\else\ifpdf
- \PackageWarningNoLine{tablvar}{PDF engine is used,
- I'm using the tikz option.
+ \AtEndDocument{\PackageWarningNoLine{tablvar}{Output is in PDF mode,
+ I'm using the 'tikz' option.
\MessageBreak
- Run twice to draw the arrows correctly}
+ Maybe rerun to draw the arrows correctly}
+ }
\tv@tikztrue
\else
- \PackageWarningNoLine{tablvar}{PDF engines not used,
- I'm using the pstricks option}
+ \PackageWarningNoLine{tablvar}{Output is in DVI mode,
+ I'm using the 'pstricks' option}
\tv@pstrickstrue
\fi\fi\fi
@@ -1832,6 +1942,28 @@
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\rowtopsep}
+% Cette longueur définit l'espace minimal entre le filet vertical supérieur et le contenu,
+% pour les cellules de la colonne des légendes.
+% Elle ne s'applique pas pour les lignes de variations
+% puisque, dans la colonne des légendes, seule la ligne
+% \og milieu \fg est censée posséder un contenu.
+% \begin{macrocode}
+\newlength{\rowtopsep}
+\setlength{\rowtopsep}{2pt}
+% \end{macrocode}
+% \end{macro}
+
+% \begin{macro}{\rowbottomsep}
+% Cette longueur définit l'espace minimal entre le filet vertical inférieur et le contenu,
+% pour les cellules de la colonne des légendes.
+% Elle ne s'applique pas pour les lignes de variations.
+% \begin{macrocode}
+\newlength{\rowbottomsep}
+\setlength{\rowbottomsep}{2pt}
+% \end{macrocode}
+% \end{macro}
+
% \subsection{Les commandes graphiques PSTricks/\TikZ} \label{graph}
%
% Nous présentons ici les commandes graphiques permettant le dessin
@@ -1962,12 +2094,13 @@
}
% \end{macrocode}
-% La commande |\mil| positionne son contenu sur la colonne 2,
-% mais réalise un décalage vertical si le nombre de lignes de variations diffère de 3.
+% La commande |\mil| positionne son contenu sur la colonne |mil@row|,
+% et réalise un décalage vertical de |\mil@shift|
+% si le nombre de lignes de variations est pair.
% Pour cela nous avons besoin d'une variable de dimension et d'un compteur.
% \begin{macrocode}
-\newlength\mil@heightshift
-\newcounter{mil@rowshift}
+\newlength\mil@shift
+\newcounter{mil@row}
% \end{macrocode}
% Pour gérer correctement les zones interdites, avec la commande |\ZI|,
@@ -2046,7 +2179,7 @@
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\tv@saveheight}
+% \begin{macro}{\tv@setheight}
% Cette macro sert à calculer la hauteur et la profondeur d'une cellule,
% qui seront enregistrées dans des variables globales afin que la commande |\ZI|
% puisse les récupérer.
@@ -2071,21 +2204,22 @@
% et le contenu de la cellule agrandie va toucher le filet horizontal.
% La solution est alors de placer un |\vstrut| ou |\cstrut| dans la colonne
% de légendes pour augmenter sa hauteur qui, de ce fait, sera bien enregistrée
-% par |\tv@saveheight|.
+% par |\tv@setheight|.
% \begin{macrocode}
-\newcommand\tv@saveheight{%
- \tv@cellheight=0pt
- \tv@celldepth=0pt
- \ifdim \ht\tv@cellbox > \ht\@arstrutbox
- \global\advance\tv@cellheight by \ht\tv@cellbox
- \else
- \global\advance\tv@cellheight by \ht\@arstrutbox
+\newcommand\tv@setheight{%
+ \global\tv@cellheight=\ht\tv@cellbox
+ \ifthenelse{\value{var@ligne}=0}{
+ \global\advance\tv@cellheight by \rowtopsep}{}
+ \ifdim \tv@cellheight < \ht\@arstrutbox
+ \global\tv@cellheight = \ht\@arstrutbox
\fi
- \ifdim \dp\tv@cellbox > \dp\@arstrutbox
- \global\advance\tv@celldepth by \dp\tv@cellbox
- \else
- \global\advance\tv@celldepth by \dp\@arstrutbox
+ \global\tv@celldepth=\dp\tv@cellbox
+ \ifthenelse{\value{var@ligne}=0}{
+ \global\advance \tv@celldepth by \rowbottomsep}{}
+ \ifdim \tv@celldepth < \dp\@arstrutbox
+ \global\tv@celldepth = \dp\@arstrutbox
\fi
+ \vrule height \tv@cellheight depth \tv@celldepth width 0pt
}
% \end{macrocode}
% \end{macro}
@@ -2115,7 +2249,7 @@
>{\setcounter{tv@icol}{0}\stepcounter{tv@row}\begin{lrbox}%
\tv@cellbox $}%
c%
- <{$\end{lrbox}\usebox{\tv@cellbox}\tv@saveheight}}
+ <{$\end{lrbox}\usebox{\tv@cellbox}\tv@setheight}}
% type de colonne i pour les intervalles
\newcolumntype{i}{>{\stepcounter{tv@icol}
\centering\arraybackslash$}p{\intervalwidth}<{$}}
@@ -2142,7 +2276,7 @@
% On commence par prendre en compte les options grâce à |\setkeys*| fourni par l'extension
% \textsf{xkeyval}. La version étoilée de |\setkeys|
% a l'avantage de ne pas produire d'erreur lorsqu'une clé n'est pas reconnue
-% (celle-ci est passée à |XKV@rm|). On l'interprète
+% (celle-ci est passée à |\XKV@rm|). On l'interprète
% \footnote{Un message d'erreur de dimension erronée
% peut donc signifier que l'on s'est trompé dans l'orthographe d'une clé.}
% alors comme une dimension pour le paramètre |\intervalwidth|.
@@ -2156,8 +2290,8 @@
\setkeys*{tablvar}{#1} % fourni par xkeyval
\if\XKV@rm\empty \else \setlength{\intervalwidth}{#1} \fi
\tvcoltypes
- \ifextleft \newcolumntype{B}{v{l}} \else \newcolumntype{B}{v{c}} \fi
- \ifextright \newcolumntype{E}{v{r}} \else \newcolumntype{E}{v{c}} \fi
+ \ifextleft\newcolumntype{B}{v{l}}\else\newcolumntype{B}{v{c}}\fi
+ \ifextright\newcolumntype{E}{v{r}}\else\newcolumntype{E}{v{c}}\fi
\tablvarinit{#2}
\ZIinit
\begin{array}{%
@@ -2228,11 +2362,12 @@
% Les flèches et pointillés sont dessinés à la fin, quand tous les nœuds sont créés,
% mais il faut les tracer avant le |\\| final, sinon la compilation plante !
% Le compteur |var@ligne| doit être remis à 0 au cas où il y a plusieurs parties variations.
+% Cette remise à zéro s'effectue à la fin au cas où on mettrait des lignes de signes
+% après une ligne variations.
% \begin{macrocode}
\newcommand*{\variations}[2][3]{% #1=nblignes (3 par défaut)
% (ré)initialisation des compteurs
\setcounter{nbvarlignes}{#1}
- \setcounter{var@ligne}{0}
\setcounter{numdiscont}{0}
\multido{\I=1+1}{\themaxdiscont}{\setcounter{discont\I}{0}}
% boucle : on exécute le code #2 un nb de fois égal à (#1)-1
@@ -2259,6 +2394,7 @@
}
% tracé des pointillés pour les valeurs remarquables
\multido{\Ix=1+1}{\thenumvr}{\vrconnect{X\Ix}{Y\Ix}}
+ \setcounter{var@ligne}{0}
\\ % dernier retour ligne du tableau
}
% \end{macrocode}
@@ -2291,6 +2427,7 @@
% Place son contenu dans une boite de largeur nulle : affiche le contenu
% mais considère que l'espace occupé est nul pour ne pas altérer le calcul de la
% largeur de colonne.
+% Cette macro est similaire à |\mathclap| de l'extension \textsf{mathtools}~\cite{TOOLS}.
% Sa syntaxe est :
% |\zbox|\oarg{pos}\marg{contenu} où \meta{opt} = |c| (par défaut), |l| (left) ou |r| (right).
% \begin{macrocode}
@@ -2367,24 +2504,31 @@
% \end{macro}
% \begin{macro}{\mil}
-% La commande |\mil|\marg{valeur} positionne \meta{valeur} sur la ligne 2
-% de la partie variations. Lorsqu'il y a 3 lignes de variations cela correspond bien
-% au milieu, mais sinon on réalise un décalage vertical grâce à |\vdecal|.
-% La formule de ce décalage est
-% $(3- \mbox{nblignes}) \times (\mbox{hauteur de ligne})/2$.
-% Le résultat de ce calcul est stocké dans la variable de dimension |\mil@heightshift|.
-% Au cas où |\mil| ne donnerait pas un résultat parfait, on pourrait alors régler
+% Pour un nombre $n$ impair de lignes de variations,
+% la commande |\mil|\marg{valeur} positionne \meta{valeur} sur la ligne $\frac{n+1}{2}$
+% de la partie variations. Cela correspond bien à la ligne du milieu :
+% ligne 2 lorsqu'il y a 3 lignes.
+% Par contre si $n$ est pair, on place \meta{valeur} sur la ligne $\frac{n}{2}$ mais avec
+% un décalage vertical négatif (vers le bas) grâce à |\vdecal|.
+% Ce décalage correspond à une profondeur de cellule augmenté de \texttt{0.5ex}
+% (écart entre la ligne de base du texte et la ligne de centrage mathématique).
+% Le résultat de ce calcul est stocké dans la variable de dimension |\mil@shift|.
+% Au cas où l'on ne serait pas satisfait du résultat de |\mil|, on pourrait alors régler
% le décalage manuellement avec
%|\pos*|\marg{ligne}|{\vdecal|\marg{decal}\marg{contenu}|}|.
% \begin{macrocode}
\newcommand*{\mil}[1]{%
- \mil@heightshift = \ht\@arstrutbox
- \advance\mil@heightshift by \dp\@arstrutbox
- \divide\mil@heightshift by 2
- \setcounter{mil@rowshift}{3}
- \addtocounter{mil@rowshift}{-\value{nbvarlignes}}
- \multiply\mil@heightshift by \value{mil@rowshift}
- \pos*{2}{\vdecal{\mil@heightshift}{#1}}
+ \setcounter{mil@row}{\value{nbvarlignes}}
+ \ifthenelse{\isodd{\value{nbvarlignes}}}{
+ \addtocounter{mil@row}{1}
+ \divide\value{mil@row} by 2
+ \pos*{\themil@row}{\smash{#1}}
+ }{
+ \divide\value{mil@row} by 2
+ \mil@shift = \dp\@arstrutbox
+ \advance\mil@shift by 0.5ex
+ \pos*{\themil@row}{\vdecal{-\mil@shift}{#1}}
+ }
}
% \end{macrocode}
% \end{macro}
@@ -2409,7 +2553,7 @@
% \begin{macro}{\bb}
% La macro |\bb|, qui produit une double barre,
-% reprend celle de l'extension \textsf{variations} de Christian Obrecht
+% reprend celle de l'extension \mbox{\textsf{variations}} de Christian Obrecht :
% |\def\bb{\vrule\kern1pt\vrule}|.
% Nous avons ajouté \texttt{1.5pt} d'espace avant et après, afin d'aligner au mieux
% la double barre avec un 0 sur la ligne des $x$, lorsque la double barre
@@ -2423,14 +2567,38 @@
% \end{macro}
% \DescribeMacro{\limg}\DescribeMacro{\limd}
-% Les macros |\limg| et |limd| servent à positionner des limites à gauche \emph{ou} à droite,
+% Les macros |\limg| et |\limd| servent à positionner des limites à gauche ou à droite,
% en particulier aux bords des double barres.
% Le premier paramètre, optionnel, précise l'option de positionnement (\texttt{c},
% \texttt{l} ou \texttt{r}) et le second \emph{obligatoire} et le numéro de ligne,
% enfin le troisième est la valeur à placer.
+%
+% \DescribeMacro{\limg*}\DescribeMacro{\limd*}
+% Les versions étoilées n'acceptent comme argument que \texttt{+} ou \texttt{-},
+% |\limg*{+}| correspond à |\limg{1}{+\infty}|,
+% |\limg*{-}| correspond à |\limg{|$n$|}{-\infty}| (pour une partie variations
+% sur $n$ lignes et de même pour |\limd*|.
% \begin{macrocode}
-\newcommand*{\limg}[3][c]{\zbox[r]{\valpos[#1]{#2}{#3\hspace{\limsep}}}}
-\newcommand*{\limd}[3][c]{\zbox[l]{\valpos[#1]{#2}{\hspace{\limsep}#3}}}
+\newcommand*{\@limg}[3][c]{%
+ \zbox[r]{\valpos[#1]{#2}{#3\hspace{\limsep}}}}
+\newcommand*{\@limd}[3][c]{%
+ \zbox[l]{\valpos[#1]{#2}{\hspace{\limsep}#3}}}
+\newcommand*{\@@limg}[1]{%
+ \ifthenelse{\equal{#1}{+}}{\@limg{1}{+\infty}}{
+ \ifthenelse{\equal{#1}{-}}{\@limg{\value{nbvarlignes}}{-\infty}}{
+ \PackageError{tablvar}{Invalid argument for \string\limg*}
+ {Only + or - are valid arguments for \string\limg*}
+ }}
+}
+\newcommand*{\@@limd}[1]{%
+ \ifthenelse{\equal{#1}{+}}{\@limd{1}{+\infty}}{
+ \ifthenelse{\equal{#1}{-}}{\@limd{\value{nbvarlignes}}{-\infty}}{
+ \PackageError{tablvar}{Invalid argument for \string\limd*}
+ {Only + or - are valid arguments for \string\limd*}
+ }}
+}
+\newcommand{\limg}{\@ifstar{\@@limg}{\@limg}}
+\newcommand{\limd}{\@ifstar{\@@limd}{\@limd}}
% \end{macrocode}
% \begin{macro}{\discont}
@@ -2458,16 +2626,19 @@
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\bblim}
-% Sert à positionner des limites à gauche \emph{et} à droite
+% \DescribeMacro{\bblim}\DescribeMacro{\bblim*}
+% Ces macros servent à positionner des limites à gauche \emph{et} à droite
% d'une double barre.
-% Cette macro trace la double barre, place les limites et appelle |\discont|.
-% Sa syntaxe est :
-% |\bblim|\marg{ligne gauche}\marg{limite gauche}\marg{ligne droite}\marg{limite droite}.
+% Elles tracent la double barre, placent les limites et appellent |\discont|.\\
+% La syntaxe de |\bblim| est : \\
+% |\bblim|\marg{ligne gauche}\marg{limite gauche}\marg{ligne droite}\marg{limite droite}.\\
+% La syntaxe de|\bblim*| reprend celle de |\limg*| et |\limd*| :
+% |\bblim*|\marg{+$\vert$-}\marg{+$\vert$-}.
% \begin{macrocode}
-\newcommand*{\bblim}[4]{\limg{#1}{#2}\bb\discont\limd{#3}{#4}}
+\newcommand*{\@bblim}[4]{\limg{#1}{#2}\bb\discont\limd{#3}{#4}}
+\newcommand*{\@@bblim}[2]{\limg*{#1}\bb\discont\limd*{#2}}
+\newcommand*{\bblim}{\@ifstar{\@@bblim}{\@bblim}}
% \end{macrocode}
-% \end{macro}
% \begin{macro}{\vr}
% La commande |\vr| fabrique un nœud pour chaque valeur remarquable.
@@ -2595,7 +2766,7 @@
% courante dans une des 4 variables de dimension |\ZIheighti|, \ldots, |\ZIheightiv|
% correspondant à la zone interdite appelante.
% On récupère hauteur et profondeur qui ont été enregistrés dans
-% les variables globales |\tv@cellheight| et |\tv@cellheight|,
+% les variables globales |\tv@cellheight| et |\tv@celldepth|,
% par la colonne de légendes de la même ligne.
% Le numéro de la ZI (son indice) est passé en argument.
% \begin{macrocode}
@@ -2711,18 +2882,18 @@
% \end{macrocode}
%
% \bigskip
-% \begin{thebibliography}{14}
+% \begin{thebibliography}{15}
% \begin{raggedright}
-% \bibitem{TABL} \emph{Tableaux}. Nicolas Kisselhoff, CTAN.
-% \bibitem{TABV} \emph{Tableaux de variations : \textsf{‘tabvar’}}. Daniel Flipo,
+% \bibitem{TABL} \emph{Tableaux}, Nicolas Kisselhoff, CTAN.
+% \bibitem{TABV} \emph{Tableaux de variations : \textsf{‘tabvar’}}, Daniel Flipo,
% CTAN, v1.8 16/07/2022.
-% \bibitem{VARI} \emph{L'extension \textsf{variations}}. Christian Obrecht,
+% \bibitem{VARI} \emph{L'extension \textsf{variations}}, Christian Obrecht,
% CTAN, v0.3 13/09/2006.
% \bibitem{TABLOR} \emph{\textsf{tablor.sty} La machine à créer des tableaux
-% de signes et de variations}. Guillaume Connan, CTAN, v4.07 09/05/2010.
+% de signes et de variations}, Guillaume Connan, CTAN, v4.07 09/05/2010.
% \bibitem{VARMP} \emph{\textsf{tableauVariations} -- Variation tables in
-% \textlogo{METAPOST}}. Frédéric Mazoit, CTAN, 2005.
-% \bibitem{TKZ} \emph{\textsf{Tkz-Tab}}. Alain Matthes, CTAN,
+% \textlogo{METAPOST}}, Frédéric Mazoit, CTAN, 2005.
+% \bibitem{TKZ} \emph{\textsf{Tkz-Tab}}, Alain Matthes, CTAN,
% v2.12c 29/04/2020.
% \bibitem{ARRAY} \emph{A new implementation of LATEX’s \textsf{tabular} and \textsf{array}
% environment}, Frank Mittelbach, David Carlisle, CTAN, v2.5g revised 16/10/2023.
@@ -2734,12 +2905,14 @@
% v1.9.0 04/01/2022.
% \bibitem{SPA} \emph{The \textsf{spacingtricks} package}, Antoine Missier,
% CTAN, v1.7 28/07/2023.
-% \bibitem{XKEY} \emph{The \textsf{xkeyval} package}. Hendri Adriaens,
-% CTAN, v2.9, 16/06/2022.
-% \bibitem{MIS} \emph{\textsf{mismath} -- Miscellaneous mathematical macros},
-% Antoine Missier, CTAN, v2.9 19/12/2023.
-% \bibitem{FR} \emph{L'extension \textsf{frenchmath}}. Antoine Missier,
-% CTAN, v2.7, 23/12/2023.
+% \bibitem{XKEY} \emph{The \textsf{xkeyval} package}, Hendri Adriaens,
+% CTAN, v2.9 16/06/2022.
+% \bibitem{TOOLS} \emph{The \textsf{mathtools} package}, Morten Høgholm, Lars Madsen,
+% CTAN, v1.23 17/01/2020.
+% \bibitem{MIS} Miscellaneous mathematical macros -- The \emph{\textsf{mismath} package},
+% Antoine Missier, CTAN, v3.1 16/06/2024.
+% \bibitem{FR} \emph{L'extension \textsf{frenchmath}}, Antoine Missier,
+% CTAN, v3.1 07/05/2024.
% \end{raggedright}
% \end{thebibliography}
% \Finale
diff --git a/Master/texmf-dist/source/latex/tablvar/tablvar.ins b/Master/texmf-dist/source/latex/tablvar/tablvar.ins
index 0280b617734..192a1eb6e83 100644
--- a/Master/texmf-dist/source/latex/tablvar/tablvar.ins
+++ b/Master/texmf-dist/source/latex/tablvar/tablvar.ins
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2018-2023 by Antoine Missier <antoine.missier@ac-toulouse.fr>
+%% Copyright (C) 2018-2024 by Antoine Missier <antoine.missier@ac-toulouse.fr>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3 of this license
@@ -21,7 +21,7 @@
This is a generated file.
-Copyright (C) 2018-2023 by Antoine Missier <antoine.missier@ac-toulouse.fr>
+Copyright (C) 2018-2024 by Antoine Missier <antoine.missier@ac-toulouse.fr>
This file may be distributed and/or modified under the conditions of
the LaTeX Project Public License, either version 1.3 of this license
@@ -46,7 +46,7 @@ and version 1.3 or later is part of all distributions of LaTeX version
\Msg{* tablvar.sty *}
\Msg{* *}
\Msg{* To produce the documentation run the file tablvar.dtx *}
-\Msg{* through XeLaTeX or LaTeX + dvips + ps2pdf. *}
+\Msg{* through LaTeX + dvips + ps2pdf. *}
\Msg{* *}
\Msg{* Happy TeXing! *}
\Msg{* *}
diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-backend.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-backend.dtx
index 7e19e1e90f7..0ed233e2e0b 100644
--- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-backend.dtx
+++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-backend.dtx
@@ -47,13 +47,13 @@
% }^^A
% }
%
-% \date{Version 0.99c, released 2024-06-20}
+% \date{Version 0.99d, released 2024-08-02}
% \maketitle
% \begin{implementation}
% \begin{macrocode}
%<@@=tag>
%<*luatex>
-\ProvidesExplFile {tagpdf-luatex.def} {2024-06-20} {0.99c}
+\ProvidesExplFile {tagpdf-luatex.def} {2024-08-02} {0.99d}
{tagpdf~driver~for~luatex}
% \end{macrocode}
% \section{Loading the lua}
@@ -164,8 +164,8 @@
local ProvidesLuaModule = {
name = "tagpdf",
- version = "0.99c", --TAGVERSION
- date = "2024-06-20", --TAGDATE
+ version = "0.99d", --TAGVERSION
+ date = "2024-08-02", --TAGDATE
description = "tagpdf lua code",
license = "The LATEX Project Public License 1.3c"
}
@@ -252,6 +252,12 @@ local iwfontattributeid = luatexbase.new_attribute ("g_@@_interwordfont_attr")
local tagunmarkedbool= token.create("g_@@_tagunmarked_bool")
local truebool = token.create("c_true_bool")
% \end{macrocode}
+% with this token we can query the state of the softhyphen boolean
+% and so detect if hyphens from hyphenation should be replaced by soft-hyphens.
+% \begin{macrocode}
+local softhyphenbool = token.create("g_@@_softhyphen_bool")
+% \end{macrocode}
+
% Now a number of local versions from global tables.
% Not all is perhaps needed, most node variants were copied from lua-debug.
% \begin{macrocode}
@@ -286,6 +292,9 @@ local KERN = node.id("kern")
local PENALTY = node.id("penalty")
local LOCAL_PAR = node.id("local_par")
local MATH = node.id("math")
+
+local explicit_disc = 1
+local regular_disc = 3
% \end{macrocode}
% Now we setup the main table structure. ltx is used by other latex code too!
% \begin{macrocode}
@@ -1267,6 +1276,80 @@ function ltx.@@.func.output_parenttree (abspage)
end
% \end{macrocode}
% \end{macro}
+%
+% \begin{macro}
+% {
+% process_softhyphen_pre
+% process_softhyphen_post
+% }
+% First some local definitions. Since these are only needed locally everything gets wrapped into a block.
+% \begin{macrocode}
+do
+ local properties = node.get_properties_table()
+ local is_soft_hyphen_prop = 'tagpdf.rewrite-softhyphen.is_soft_hyphen'
+ local hyphen_char = 0x2D
+ local soft_hyphen_char = 0xAD
+% \end{macrocode}
+%
+% A lookup table to test if the font supports the soft hyphen glyph.
+% \begin{macrocode}
+ local softhyphen_fonts = setmetatable({}, {__index = function(t, fid)
+ local fdir = identifiers[fid]
+ local format = fdir and fdir.format
+ local result = (format == 'opentype' or format == 'truetype')
+ local characters = fdir and fdir.characters
+ result = result and (characters and characters[soft_hyphen_char]) ~= nil
+ t[fid] = result
+ return result
+ end})
+% \end{macrocode}
+%
+% A pre shaping callback to mark hyphens as being hyphenation hyphens.
+% This runs before shaping to avoid affecting hyphens moved into
+% discretionaries during shaping.
+% \begin{macrocode}
+ local function process_softhyphen_pre(head, _context, _dir)
+ if softhyphenbool.mode ~= truebool.mode then return true end
+ for disc, sub in node.traverse_id(DISC, head) do
+ if sub == explicit_disc or sub == regular_disc then
+ for n, _ch, _f in node.traverse_char(disc.pre) do
+ local props = properties[n]
+ if not props then
+ props = {}
+ properties[n] = props
+ end
+ props[is_soft_hyphen_prop] = true
+ end
+ end
+ end
+ return true
+ end
+
+% \end{macrocode}
+%
+% Finally do the actual replacement after shaping. No checking for double processing here
+% since the operation is idempotent.
+% \begin{macrocode}
+ local function process_softhyphen_post(head, _context, _dir)
+ if softhyphenbool.mode ~= truebool.mode then return true end
+ for disc, sub in node.traverse_id(DISC, head) do
+ for n, ch, fid in node.traverse_glyph(disc.pre) do
+ local props = properties[n]
+ if softhyphen_fonts[fid] and ch == hyphen_char and props and props[is_soft_hyphen_prop] then
+ n.char = soft_hyphen_char
+ props.glyph_info = nil
+ end
+ end
+ end
+ return true
+ end
+
+ luatexbase.add_to_callback('pre_shaping_filter', process_softhyphen_pre, 'tagpdf.rewrite-softhyphen')
+ luatexbase.add_to_callback('post_shaping_filter', process_softhyphen_post, 'tagpdf.rewrite-softhyphen')
+end
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macrocode}
%</lua>
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-checks.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-checks.dtx
index 345b2e35bad..3cbe3b141bb 100644
--- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-checks.dtx
+++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-checks.dtx
@@ -48,7 +48,7 @@
% }^^A
% }
%
-% \date{Version 0.99c, released 2024-06-20}
+% \date{Version 0.99d, released 2024-08-02}
% \maketitle
% \begin{documentation}
% \section{Commands}
@@ -331,7 +331,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-checks-code} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf-checks-code} {2024-08-02} {0.99d}
{part of tagpdf - code related to checks, conditionals, debugging and messages}
%</header>
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-data.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-data.dtx
index f07e5db3edc..6417b44c404 100644
--- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-data.dtx
+++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-data.dtx
@@ -47,7 +47,7 @@
% }^^A
% }
%
-% \date{Version 0.99c, released 2024-06-20}
+% \date{Version 0.99d, released 2024-08-02}
% \maketitle
% \begin{documentation}
% This files contains a various data files which are read in
@@ -61,7 +61,7 @@
% latex-lab has also a namespace module, which takes precedence!
% \begin{macrocode}
%<*ns-latex>
-%% \ProvidesExplFile {tagpdf-ns-latex.def} {2024-06-20} {0.99c}
+%% \ProvidesExplFile {tagpdf-ns-latex.def} {2024-08-02} {0.99d}
%% {latex} {https://www.latex-project.org/ns/dflt/2022}{}
title, Title, pdf2,
part, Title, pdf2,
@@ -93,7 +93,7 @@ text, P, pdf2,
% It is bound to change
% \begin{macrocode}
%<*ns-latex-book>
-%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2024-06-20} {0.99c}
+%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2024-08-02} {0.99d}
%% {latex-book} {https://www.latex-project.org/ns/book/2022}{}
chapter, H1,pdf2,
section, H2,pdf2,
@@ -107,7 +107,7 @@ subparagraph, H6,pdf2,
% \section{The pdf namespace data}
% \begin{macrocode}
%<*ns-pdf>
-%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2024-06-20} {0.99c}
+%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2024-08-02} {0.99d}
%% {pdf} {http://iso.org/pdf/ssn}{}
StructTreeRoot,StructTreeRoot,pdf,D,
Document,Document,pdf,D,
@@ -175,7 +175,7 @@ Strong,Span,pdf,I,
% \section{The pdf 2.0 namespace data}
% \begin{macrocode}
%<*ns-pdf2>
-%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2024-06-20} {0.99c}
+%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2024-08-02} {0.99d}
%% {pdf2} {http://iso.org/pdf2/ssn}{}
StructTreeRoot,StructTreeRoot,pdf2,D,
Document,Document,pdf2,D,
@@ -232,7 +232,7 @@ Strong,Strong,pdf2,I,
% \section{The mathml namespace data}
% \begin{macrocode}
%<*ns-mathml>
-%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2024-06-20} {0.99c}
+%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2024-08-02} {0.99d}
% {mathml}{http://www.w3.org/1998/Math/MathML}{}
abs,abs,mathml,
and,and,mathml,
@@ -467,7 +467,7 @@ xor,xor,mathml,
% This will perhaps change in future.
% \begin{macrocode}
%<*parent-child>
-%% \ProvidesExplFile {tagpdf-parent-child.csv} {2024-06-20} {0.99c}
+%% \ProvidesExplFile {tagpdf-parent-child.csv} {2024-08-02} {0.99d}
,,,StructTreeRoot,Document,Art,Part,Div,Sect,BlockQuote,NonStruct,TOC,TOCI,Index,Private,Quote,Note,Reference,BibEntry,P,Hn,H,Lbl,Code,Span,Link,Annot,Form,Ruby,RB,RT,RP,Warichu,WT,WP,L,LI,LBody,Table,TR,TH,TD,THead,TBody,TFoot,Caption,Figure,Formula,MC
Document,both,document level,1,0..n,∅,‡,‡,∅,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅
Art,1.7,grouping,∅,0..n,∅,‡,‡,0..n,0..n,‡,∅,∅,∅,0..n,∅,0..n,∅,∅,∅,0..1,0..1,∅,∅,∅,0..n,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,0..n,∅,∅,0..n,0..n,∅,∅,∅,0..n,0..n,∅,∅
@@ -522,7 +522,7 @@ MC,both,---,∅,∅,∅,∅,∅,∅,0..n,‡,∅,∅,∅,0..n,0..n,0..n,0..n,0..
% This will perhaps change in future.
% \begin{macrocode}
%<*parent-child-2>
-%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2024-06-20} {0.99c}
+%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2024-08-02} {0.99d}
,,,StructTreeRoot,Document,DocumentFragment,Art,Part,Div,Sect,Aside,BlockQuote,NonStruct,TOC,TOCI,Index,Private,Title,Sub,Quote,Note,Reference,BibEntry,P,Hn,H,Lbl,Code,Em,Strong,Span,Link,Annot,Form,Ruby,RB,RT,RP,Warichu,WT,WP,FENote,L,LI,LBody,Table,TR,TH,TD,THead,TBody,TFoot,Caption,Figure,Formula,math,mathml,Artifact,MC
Document,both,document level,1,0..n,0..n,∅,‡,‡,∅,0..n,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,0..n,∅
DocumentFragment,2.0,document level,∅,0..n,0..n,0..n,‡,‡,0..n,0..n,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅*,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅*,∅*,∅,∅,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅,0..n,∅
diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-generic.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-generic.dtx
index 0cef27fd3b8..ff036b5523f 100644
--- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-generic.dtx
+++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-generic.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.99c, released 2024-06-20}
+% \date{Version 0.99d, released 2024-08-02}
% \maketitle
% \begin{documentation}
% \end{documentation}
@@ -55,11 +55,11 @@
% \begin{macrocode}
%<@@=tag>
%<*generic>
-\ProvidesExplPackage {tagpdf-mc-code-generic} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf-mc-code-generic} {2024-08-02} {0.99d}
{part of tagpdf - code related to marking chunks - generic mode}
%</generic>
%<*debug>
-\ProvidesExplPackage {tagpdf-debug-generic} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf-debug-generic} {2024-08-02} {0.99d}
{part of tagpdf - debugging code related to marking chunks - generic mode}
%</debug>
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-luacode.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-luacode.dtx
index 7dd309c5f53..3c2e91605e1 100644
--- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-luacode.dtx
+++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-luacode.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.99c, released 2024-06-20}
+% \date{Version 0.99d, released 2024-08-02}
% \maketitle
% \begin{implementation}
% The code is split into three parts: code shared by all engines,
@@ -86,11 +86,11 @@
% \begin{macrocode}
%<@@=tag>
%<*luamode>
-\ProvidesExplPackage {tagpdf-mc-code-lua} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf-mc-code-lua} {2024-08-02} {0.99d}
{tagpdf - mc code only for the luamode }
%</luamode>
%<*debug>
-\ProvidesExplPackage {tagpdf-debug-lua} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf-debug-lua} {2024-08-02} {0.99d}
{part of tagpdf - debugging code related to marking chunks - lua mode}
%</debug>
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-shared.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-shared.dtx
index c96fd8c4c81..5bfe0658d10 100644
--- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-shared.dtx
+++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-shared.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.99c, released 2024-06-20}
+% \date{Version 0.99d, released 2024-08-02}
% \maketitle
% \begin{documentation}
% \section{Public Commands}
@@ -181,7 +181,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-mc-code-shared} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf-mc-code-shared} {2024-08-02} {0.99d}
{part of tagpdf - code related to marking chunks -
code shared by generic and luamode }
%</header>
diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-roles.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-roles.dtx
index 80f9da0f6bd..fb5f1b77c99 100644
--- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-roles.dtx
+++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-roles.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.99c, released 2024-06-20}
+% \date{Version 0.99d, released 2024-08-02}
% \maketitle
% \begin{documentation}
% \begin{function}
@@ -98,7 +98,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-roles-code} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf-roles-code} {2024-08-02} {0.99d}
{part of tagpdf - code related to roles and structure names}
%</header>
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-space.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-space.dtx
index a29c8f0fb3d..5c8e0070848 100644
--- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-space.dtx
+++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-space.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.99c, released 2024-06-20}
+% \date{Version 0.99d, released 2024-08-02}
% \maketitle
% \begin{documentation}
% \begin{function}{activate/space (setup-key),interwordspace (deprecated)}
@@ -66,7 +66,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-space-code} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf-space-code} {2024-08-02} {0.99d}
{part of tagpdf - code related to real space chars}
%</header>
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-struct.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-struct.dtx
index 963852b1fca..6da5e48b187 100644
--- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-struct.dtx
+++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-struct.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.99c, released 2024-06-20}
+% \date{Version 0.99d, released 2024-08-02}
% \maketitle
% \begin{documentation}
% \section{Public Commands}
@@ -285,7 +285,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-struct-code} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf-struct-code} {2024-08-02} {0.99d}
{part of tagpdf - code related to storing structure}
%</header>
% \end{macrocode}
@@ -1937,7 +1937,7 @@
% \section{Attributes and attribute classes}
% \begin{macrocode}
%<*header>
-\ProvidesExplPackage {tagpdf-attr-code} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf-attr-code} {2024-08-02} {0.99d}
{part of tagpdf - code related to attributes and attribute classes}
%</header>
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-tree.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-tree.dtx
index 04b9309597f..f7ae6de9966 100644
--- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-tree.dtx
+++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-tree.dtx
@@ -47,13 +47,13 @@
% }^^A
% }
%
-% \date{Version 0.99c, released 2024-06-20}
+% \date{Version 0.99d, released 2024-08-02}
% \maketitle
% \begin{implementation}
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-tree-code} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf-tree-code} {2024-08-02} {0.99d}
{part of tagpdf - code related to writing trees and dictionaries to the pdf}
%</header>
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-user.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-user.dtx
index 916ff041d01..a4014b62e39 100644
--- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-user.dtx
+++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-user.dtx
@@ -46,7 +46,7 @@
% }^^A
% }
%
-% \date{Version 0.99c, released 2024-06-20}
+% \date{Version 0.99d, released 2024-08-02}
% \maketitle
% \begin{documentation}
% \section{Setup commands}
@@ -309,7 +309,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-user} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf-user} {2024-08-02} {0.99d}
{tagpdf - user commands}
%</header>
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf.dtx
index e58570340e5..b1d008a6e6c 100644
--- a/Master/texmf-dist/source/latex/tagpdf/tagpdf.dtx
+++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf.dtx
@@ -72,6 +72,12 @@
% marked up as artifact. The initial value is true.
% \end{function}
%
+% \begin{function}{activate/softhyphen (setup-key)}
+% This key allows to activates automatic handling of hyphens inserted
+% by hyphenation. It only is used in luamode and replaces hyphens
+% by U+00AD if the font supports this.
+% \end{function}
+%
% \begin{function}{page/tabsorder (setup-key), tabsorder (deprecated)}
% This sets the tabsorder on a page. The values are |row|, |column|, |structure| (default)
% or |none|. Currently this is set more or less globally. More finer control can be
@@ -87,7 +93,7 @@
% \begin{macrocode}
%<@@=tag>
%<*package>
-\ProvidesExplPackage {tagpdf} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf} {2024-08-02} {0.99d}
{ A package to experiment with pdf tagging }
\bool_if:nF
@@ -113,7 +119,7 @@
% \end{macrocode}
%<*debug>
% \begin{macrocode}
-\ProvidesExplPackage {tagpdf-debug} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf-debug} {2024-08-02} {0.99d}
{ debug code for tagpdf }
\@ifpackageloaded{tagpdf}{}{\PackageWarning{tagpdf-debug}{tagpdf~not~loaded,~quitting}\endinput}
% \end{macrocode}
@@ -136,7 +142,7 @@
% we define a base package with dummy functions
% \begin{macrocode}
%<*base>
-\ProvidesExplPackage {tagpdf-base} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf-base} {2024-08-02} {0.99d}
{part of tagpdf - provide base, no-op versions of the user commands }
%</base>
% \end{macrocode}
@@ -354,6 +360,13 @@
% \end{macrocode}
% \end{variable}
%
+% \begin{variable}{\g_@@_softhyphen_bool}
+% This boolean controls if the code should try to automatically
+% handle hyphens from hyphenation. It is currently only used in luamode.
+% \begin{macrocode}
+\bool_new:N \g_@@_softhyphen_bool
+% \end{macrocode}
+% \end{variable}
% \section{Variants of l3 commands}
% \begin{macrocode}
\prg_generate_conditional_variant:Nnn \pdf_object_if_exist:n {e}{T,F,TF}
@@ -648,6 +661,13 @@
tagunmarked .bool_gset:N = \g_@@_tagunmarked_bool,
% \end{macrocode}
% \end{macro}
+% \begin{macro}{activate/softhyphen (setup-key)}
+% This key activates (in luamode) the handling of soft hyphens.
+% \begin{macrocode}
+ activate/softhyphen .bool_gset:N = \g_@@_softhyphen_bool,
+ activate/softhyphen .initial:n = true,
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{page/tabsorder (setup-key),tabsorder (deprecated)}
% This sets the tabsorder on a page. The values are |row|, |column|, |structure| (default)
% or |none|. Currently this is set more or less globally. More finer control can be
diff --git a/Master/texmf-dist/source/latex/oberdiek/telprint.dtx b/Master/texmf-dist/source/latex/telprint/telprint.dtx
index 57152c66517..74bb22ea8af 100644
--- a/Master/texmf-dist/source/latex/oberdiek/telprint.dtx
+++ b/Master/texmf-dist/source/latex/telprint/telprint.dtx
@@ -1,13 +1,13 @@
% \iffalse meta-comment
%
% File: telprint.dtx
-% Version: 2016/05/16 v1.11
+% Version: 2024-07-26 v1.12
% Info: Format German phone numbers
%
% Copyright (C)
% 1996, 1997, 2004-2008 Heiko Oberdiek
-% 2016-2019 Oberdiek Package Support Group
-% https://github.com/ho-tex/oberdiek/issues
+% 2016-2024 Oberdiek Package Support Group
+% https://github.com/ho-tex/telprint/issues
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -23,7 +23,7 @@
%
% The Current Maintainers of this work are
% Heiko Oberdiek and the Oberdiek Package Support Group
-% https://github.com/ho-tex/oberdiek/issues
+% https://github.com/ho-tex/telprint/issues
%
% The Base Interpreter refers to any `TeX-Format',
% because some files are installed in TDS:tex/generic//.
@@ -34,8 +34,8 @@
% telprint-test1.tex.
%
% Distribution:
-% CTAN:macros/latex/contrib/oberdiek/telprint.dtx
-% CTAN:macros/latex/contrib/oberdiek/telprint.pdf
+% CTAN:macros/latex/contrib/telprint/telprint.dtx
+% CTAN:macros/latex/contrib/telprint/telprint.pdf
%
% Unpacking:
% (a) If telprint.ins is present:
@@ -56,7 +56,7 @@
% use A4 as paper format:
% \PassOptionsToClass{a4paper}{article}
%
-% Programm calls to get the documentation (example):
+% Program calls to get the documentation (example):
% pdflatex telprint.dtx
% makeindex -s gind.ist telprint.idx
% pdflatex telprint.dtx
@@ -64,9 +64,9 @@
% pdflatex telprint.dtx
%
% Installation:
-% TDS:tex/generic/oberdiek/telprint.sty
-% TDS:doc/latex/oberdiek/telprint.pdf
-% TDS:source/latex/oberdiek/telprint.dtx
+% TDS:tex/generic/telprint/telprint.sty
+% TDS:doc/latex/telprint/telprint.pdf
+% TDS:source/latex/telprint/telprint.dtx
%
%<*ignore>
\begingroup
@@ -83,7 +83,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: telprint 2016/05/16 v1.11 Format German phone numbers (HO)}
+\Msg{* Package: telprint 2024-07-26 v1.12 Format German phone numbers (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -95,11 +95,11 @@
This is a generated file.
Project: telprint
-Version: 2016/05/16 v1.11
+Version: 2024-07-26 v1.12
Copyright (C)
1996, 1997, 2004-2008 Heiko Oberdiek
- 2016-2019 Oberdiek Package Support Group
+ 2016-2024 Oberdiek Package Support Group
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -115,7 +115,7 @@ This work has the LPPL maintenance status "maintained".
The Current Maintainers of this work are
Heiko Oberdiek and the Oberdiek Package Support Group
-https://github.com/ho-tex/oberdiek/issues
+https://github.com/ho-tex/telprint/issues
The Base Interpreter refers to any `TeX-Format',
@@ -132,9 +132,9 @@ and the derived files
\generate{%
\file{telprint.ins}{\from{telprint.dtx}{install}}%
\file{telprint.drv}{\from{telprint.dtx}{driver}}%
- \usedir{tex/generic/oberdiek}%
+ \usedir{tex/generic/telprint}%
\file{telprint.sty}{\from{telprint.dtx}{package}}%
-% \usedir{doc/latex/oberdiek/test}%
+% \usedir{doc/latex/telprint/test}%
% \file{telprint-test1.tex}{\from{telprint.dtx}{test1}}%
}
@@ -162,7 +162,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{telprint.drv}%
- [2016/05/16 v1.11 Format German phone numbers (HO)]%
+ [2024-07-26 v1.12 Format German phone numbers (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2011/11/22]
\usepackage[ngerman,english]{babel}
@@ -177,9 +177,9 @@ and the derived files
% \GetFileInfo{telprint.drv}
%
% \title{The \xpackage{telprint} package}
-% \date{2016/05/16 v1.11}
+% \date{2024-07-26 v1.12}
% \author{Heiko Oberdiek\thanks
-% {Please report any issues at \url{https://github.com/ho-tex/oberdiek/issues}}}
+% {Please report any issues at \url{https://github.com/ho-tex/telprint/issues}}}
%
% \maketitle
%
@@ -397,7 +397,7 @@ and the derived files
\fi
\expandafter\x\csname ver@telprint.sty\endcsname
\ProvidesPackage{telprint}%
- [2016/05/16 v1.11 Format German phone numbers (HO)]%
+ [2024-07-26 v1.12 Format German phone numbers (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -467,7 +467,11 @@ and the derived files
% \begin{macro}{\telspace}
% \begin{macrocode}
\DeclareRobustCommand*{\telspace}[1]{\def\TELspace{#1}}
-\telspace{{}$\,${}}
+\ifcsname LaTeXReleaseInfo\endcsname
+ \telspace{\,}
+\else
+ \telspace{{}$\,${}}
+\fi
% \end{macrocode}
% \end{macro}
% \begin{macro}{\telhyphen}
@@ -615,30 +619,10 @@ and the derived files
% \paragraph{Package.} This package is available on
% CTAN\footnote{\CTANpkg{telprint}}:
% \begin{description}
-% \item[\CTAN{macros/latex/contrib/oberdiek/telprint.dtx}] The source file.
-% \item[\CTAN{macros/latex/contrib/oberdiek/telprint.pdf}] Documentation.
-% \end{description}
-%
-%
-% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
-% are also available in a TDS compliant ZIP archive. There
-% the packages are already unpacked and the documentation files
-% are generated. The files and directories obey the TDS standard.
-% \begin{description}
-% \item[\CTANinstall{install/macros/latex/contrib/oberdiek.tds.zip}]
+% \item[\CTAN{macros/latex/contrib/telprint/telprint.dtx}] The source file.
+% \item[\CTAN{macros/latex/contrib/telprint/telprint.pdf}] Documentation.
% \end{description}
-% \emph{TDS} refers to the standard ``A Directory Structure
-% for \TeX\ Files'' (\CTANpkg{tds}). Directories
-% with \xfile{texmf} in their name are usually organized this way.
%
-% \subsection{Bundle installation}
-%
-% \paragraph{Unpacking.} Unpack the \xfile{oberdiek.tds.zip} in the
-% TDS tree (also known as \xfile{texmf} tree) of your choice.
-% Example (linux):
-% \begin{quote}
-% |unzip oberdiek.tds.zip -d ~/texmf|
-% \end{quote}
%
% \subsection{Package installation}
%
@@ -655,9 +639,9 @@ and the derived files
% \begin{quote}
% \def\t{^^A
% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
-% telprint.sty & tex/generic/oberdiek/telprint.sty\\
-% telprint.pdf & doc/latex/oberdiek/telprint.pdf\\
-% telprint.dtx & source/latex/oberdiek/telprint.dtx\\
+% telprint.sty & tex/generic/telprint/telprint.sty\\
+% telprint.pdf & doc/latex/telprint/telprint.pdf\\
+% telprint.dtx & source/latex/telprint/telprint.dtx\\
% \end{tabular}^^A
% }^^A
% \sbox0{\t}^^A
@@ -836,6 +820,9 @@ and the derived files
% \item
% Documentation updates.
% \end{Version}
+% \begin{Version}{2024-07-26 v1.12}
+% \item Avoid math in \cs{telspace} for better tagging support.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/ut-thesis/ut-thesis.dtx b/Master/texmf-dist/source/latex/ut-thesis/ut-thesis.dtx
index 873f0bd2c59..9d6a7041485 100644
--- a/Master/texmf-dist/source/latex/ut-thesis/ut-thesis.dtx
+++ b/Master/texmf-dist/source/latex/ut-thesis/ut-thesis.dtx
@@ -5,7 +5,7 @@
%<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<class>\ProvidesClass{ut-thesis}
%<*class>
-[2023/02/08 v3.1.7 University of Toronto thesis class]
+[2024/07/26 v3.1.8 University of Toronto thesis class]
%</class>
%
%<*driver>
@@ -33,15 +33,15 @@
% \GetFileInfo{ut-thesis.dtx}
%
% \title{The \textit{ut-thesis} class
-% \thanks{\fileversion~[\filedate] CTAN repository:
-% \href{https://ctan.org/pkg/ut-thesis}
-% {\texttt{https://ctan.org/pkg/ut-thesis}}}}
+% \thanks{\fileversion~[\filedate]\hfill
+% \href{https://ctan.org/pkg/ut-thesis}{\texttt{https://ctan.org/pkg/ut-thesis}}\hfill
+% \href{https://github.com/jessexknight/ut-thesis}{\texttt{github.com/jessexknight/ut-thesis}}}}
% \author{
% Francois Pitt,
% Jesse Knight
% \thanks{maintainer, contact:
-% \href{mailto:jesse.knight@mail.utoronto.ca}
-% {\texttt{jesse.knight@mail.utoronto.ca}}}
+% \href{mailto:jesse.x.knight@protonmail.com}
+% {\texttt{jesse.x.knight@protonmail.com}}}
% }
%
% \maketitle
@@ -79,7 +79,7 @@
%
% The default options produce a final copy, ready for submission to
% the University of Toronto School of Graduate Studies (SGS).
-% Some examples are available on
+% There is some example code on
% \href{https://github.com/jessexknight/ut-thesis/tree/master/test}{GitHub}.
%
% \subsection{Options}\label{use:opt}
@@ -616,4 +616,4 @@
\setlength\belowcaptionskip{1ex}
% \end{macrocode}
%
-\endinput \ No newline at end of file
+\endinput
diff --git a/Master/texmf-dist/source/latex/ut-thesis/ut-thesis.ins b/Master/texmf-dist/source/latex/ut-thesis/ut-thesis.ins
index db350551150..80df67d81ee 100644
--- a/Master/texmf-dist/source/latex/ut-thesis/ut-thesis.ins
+++ b/Master/texmf-dist/source/latex/ut-thesis/ut-thesis.ins
@@ -11,8 +11,8 @@ as of Fall 2020:
[https://www.sgs.utoronto.ca/academic-progress/program-completion/formatting]
Copyright (c) 1998-2013 Francois Pitt <fpitt@cs.utoronto.ca>,
- 2020-2021 Jesse Knight <jesse.knight@mail.utoronto.ca>
-last updated at 23:30 (EST) on Tue 20 July 2021
+ 2020-2024 Jesse Knight <jesse.x.knight@protonmail.com>
+last updated at 09:00 (BST) on Fri 26 July 2024
This work may be distributed and/or modified under the conditions of
the LaTeX Project Public Licence, either version 1.3c of this licence
@@ -28,7 +28,7 @@ and is not covered by the licence.
This work has the LPPL maintenance status "maintained".
The Current Maintainer of this work is
-Jesse Knight <jesse.knight@mail.utoronto.ca>.
+Jesse Knight <jesse.x.knight@protonmail.com>.
This work consists of the files:
- README
@@ -37,12 +37,13 @@ This work consists of the files:
- ut-thesis.pdf (derived user manual)
- ut-thesis.cls (derived class file)
-To generate ut-thesis.cls (class file), run: pdflatex ut-thesis.ins
-To generate ut-thesis.pdf (documentation), run: pdflatex ut-thesis.dtx
-To use the class, make ut-thesis.cls visible to your LaTeX distribution,
-by placing ut-thesis.cls either in your working directory,
-or in your texmf tree, perhaps: $texmf/tex/latex/ut-thesis/ut-thesis.cls
-and the documentation: $texmf/doc/latex/ut-thesis/ut-thesis.pdf
+Install ut-thesis from your favourite LaTeX distribution.
+Alternatively, or to use the latest version:
+- generate ut-thesis.cls (class file) using: pdflatex ut-thesis.ins
+ and copy to: $texmf/tex/latex/ut-thesis/ut-thesis.cls
+- generate ut-thesis.pdf (documentation) using: pdflatex ut-thesis.dtx
+ and copy to: $texmf/doc/latex/ut-thesis/ut-thesis.pdf
+or simply copy ut-thesis.cls to your working directory.
See version history on GitHub:
[https://github.com/jessexknight/ut-thesis]
@@ -51,4 +52,4 @@ See version history on GitHub:
\generate{\file{ut-thesis.cls}{\from{ut-thesis.dtx}{class}}}
-\endbatchfile \ No newline at end of file
+\endbatchfile
diff --git a/Master/texmf-dist/source/lualatex/piton/piton.dtx b/Master/texmf-dist/source/lualatex/piton/piton.dtx
index ec18e80eaa6..38ef21b9b81 100644
--- a/Master/texmf-dist/source/lualatex/piton/piton.dtx
+++ b/Master/texmf-dist/source/lualatex/piton/piton.dtx
@@ -44,7 +44,7 @@
end-escape = ! ,
begin-escape-math = \( ,
end-escape-math = \) ,
- detected-commands = highLight
+ detected-commands = { highLight, footnote }
}
\parindent 0pt
@@ -79,12 +79,12 @@
% \iffalse
%<*STY>
% \fi
-\def\PitonFileVersion{3.0b}
-\def\PitonFileDate{2024/05/23}
+\def\PitonFileVersion{3.1a}
+\def\PitonFileDate{2024/08/12}
% \iffalse
%</STY>
%<*LUA>
-piton_version = "3.0b" -- 2024/05/23
+piton_version = "3.1a" -- 2024/08/12
%</LUA>
%\fi
%
@@ -361,8 +361,12 @@ piton_version = "3.0b" -- 2024/05/23
%
% \begin{itemize}
% \item The key \Definition{language} specifies which computer language is
-% considered (that key is case-insensitive). Five values are allowed :
-% |Python|, |OCaml|, |C|, |SQL| and |minimal|. The initial value is |Python|.
+% considered (that key is case-insensitive). It's possible to use the name of
+% the five built-in languages (|Python|, |OCaml|, |C|, |SQL| and |minimal|) or
+% the name of the language defined by the user with |\NewPitonLanguage|
+% (cf.~part~\ref{NewPitonLanguage}, p.~\pageref{NewPitonLanguage}.
+%
+% The initial value is |Python|.
%
% \item \index{path} The key \Definition{path} specifies a path where the files
% included by |\PitonInputFile| will be searched.
@@ -431,6 +435,13 @@ piton_version = "3.0b" -- 2024/05/23
% \item The key \Definition{line-numbers/sep} is the horizontal distance between
% the numbers of lines (inserted by |line-numbers|) and the beginning of the
% lines of code. The initial value is 0.7~em.
+% \item \colorbox{yellow!50}{\bfseries New 3.1}\enskip The key
+% \Definition{line-numbers/format} is a list of tokens which are inserted before
+% the number of line in order to format it. It's possible to put, \emph{at the
+% end} of the list, a LaTeX command with one argument, such as, for example,
+% |\fbox|.
+%
+% The initial value is |\footnotesize\color{gray}|.
% \end{itemize}
%
% For convenience, a mechanism of factorisation of the prefix |line-numbers| is
@@ -442,7 +453,8 @@ piton_version = "3.0b" -- 2024/05/23
% {
% skip-empty-lines = false ,
% label-empty-lines = false ,
-% sep = 1 em
+% sep = 1 em ,
+% line-format = \footnotesize \color{blue}
% }
% }
% \end{Verbatim}
@@ -473,6 +485,12 @@ piton_version = "3.0b" -- 2024/05/23
% The key |background-color| accepts a color defined «on the fly». For example,
% it's possible to write |background-color = [cmyk]{0.1,0.05,0,0}|.
%
+% \smallskip
+% When the key |split-on-empty-lines| is in force (see the part ``Page breaks'',
+% p.~\pageref{page breaks}), the empty lines generated by that key don't have
+% any background color (at least with the initial value of the parameter
+% |split-separation|).
+%
% \item \index{prompt-background-color} With the key
% \Definition{prompt-background-color}, \pkg{piton} adds a
% color background to the lines beginning with the prompt ``|>>>|'' (and its
@@ -976,6 +994,7 @@ piton_version = "3.0b" -- 2024/05/23
% \label{breakable}
%
% \subsubsection{Page breaks}
+% \label{page breaks}
% \index{splittable}
%
% By default, the listings produced by the environment |{Piton}| and the command
@@ -994,10 +1013,17 @@ piton_version = "3.0b" -- 2024/05/23
% In fact, when the key |split-on-empty-lines| is in force, the work goes a
% little further than merely allowing page breaks: several successive empty lines
% are deleted and replaced by the content of the parameter corresponding to the
-% key \Definition{split-separation}. The initial value of this parameter is
-% |\vspace{\baselineskip}\vspace{-1.25pt}| which corresponds eventually to an
+% key \Definition{split-separation}.
+% \begin{itemize}
+% \item That parameter must contain elements allowed to be inserted in
+% \emph{vertical mode} of TeX. For example, it's possible to put |\hrule|.
+%
+% \item The initial value of this parameter is
+% |\vspace{\baselineskip}\vspace{-1.25pt}| which corresponds eventually to an
% empty line in the final PDF (this vertical space is deleted if it occurs on a
-% page break).
+% page break). If the key |background-color| is in force, no background color is
+% added to that empty line.
+% \end{itemize}
%
% \item Of course, the key |split-on-empty-lines| may not be sufficient and
% that's why \pkg{piton} provides the key \Definition{splittable}.
@@ -1012,6 +1038,9 @@ piton_version = "3.0b" -- 2024/05/23
% When used without value, the key |splittable| is equivalent to
% |splittable = 1| and the listings may be broken anywhere (it's probably
% not recommandable).
+%
+% The initial value of the key |splittable| is equal to 100 (by default, the
+% listings are not breakable at all).
% \end{itemize}
%
%
@@ -1654,6 +1683,8 @@ piton_version = "3.0b" -- 2024/05/23
%
% \subsubsection{Commands of Beamer allowed in \{Piton\} and \textbackslash PitonInputFile}
%
+% \index{detected-beamer-commands}
+%
% When \pkg{piton} is used in the class \cls{beamer} , the following commands of
% \cls{beamer} (classified upon their number of arguments) are automatically
% detected in the environments |{Piton}| (and in the listings processed by
@@ -1663,17 +1694,23 @@ piton_version = "3.0b" -- 2024/05/23
% also possible to use the command \texttt{\textbackslash pause} in a ``LaTeX
% comment'', that is to say by writing \texttt{\#> \textbackslash pause}. By
% this way, if the Python code is copied, it's still executable by Python}. ;
-% \item one mandatory argument : |\action|, |\alert|, |\invisible|, |\only|, |\uncover| and |\visible| ;
+% \item one mandatory argument : |\action|, |\alert|, |\invisible|, |\only|,
+% |\uncover| and |\visible| ; \newline
+% \colorbox{yellow!50}{\bfseries New 3.1}\newline
+% It's possible to add new commands to that list with the key
+% \Definition{detected-beamer-commands} (the names of the commands must
+% \emph{not} be preceded by a backslash).
% \item two mandatory arguments : |\alt| ;
% \item three mandatory arguments : |\temporal|.
% \end{itemize}
-% \medskip
-% In the mandatory arguments of these commands, the braces must be balanced.
-% However, the braces included in short strings\footnote{The short strings of
-% Python are the strings delimited by characters \texttt{'} or the characters
-% \texttt{"} and not \texttt{'''} nor \texttt{"""}. In Python, the short strings
-% can't extend on several lines.} of Python are not considered.
+% \medskip
+% These commands must be used preceded and following by a space. In the
+% mandatory arguments of these commands, the braces must be balanced. However,
+% the braces included in short strings\footnote{The short strings of Python are
+% the strings delimited by characters \texttt{'} or the characters \texttt{"}
+% and not \texttt{'''} nor \texttt{"""}. In Python, the short strings can't
+% extend on several lines.} of Python are not considered.
%
% \medskip
% Regarding the functions |\alt| and |\temporal| there should be no carriage
@@ -1713,8 +1750,18 @@ piton_version = "3.0b" -- 2024/05/23
% listings processed by |\PitonInputFile|): |{actionenv}|, |{alertenv}|,
% |{invisibleenv}|, |{onlyenv}|, |{uncoverenv}| and |{visibleenv}|.
%
+% \smallskip
+% \index{detected-beamer-environments}
+% \colorbox{yellow!50}{\bfseries New 3.1}
+%
+% It's possible to add new environments to that list with the key
+% \Definition{detected-beamer-environments}.
+%
+% \smallskip
+%
% However, there is a restriction: these environments must contain only \emph{whole
-% lines of Python code} in their body.
+% lines of Python code} in their body. The instructions |\begin{...}| and
+% |\end{...}| must be alone on their lines.
%
%\medskip
% Here is an example:
@@ -1810,10 +1857,98 @@ piton_version = "3.0b" -- 2024/05/23
% in particular: it must be loaded after the package \pkg{xcolor} and it is not
% perfectly compatible with \pkg{hyperref}.
%
+%
+% \medskip
+% \textbf{Important remark} : If you use Beamer, you should know taht Beamer has
+% its own system to extract the footnotes. Therefore, \pkg{piton} must be loaded
+% in that class without the option |footnote| nor the option |footnotehyper|.
+%
+%
+% \bigskip
+% By default, in an environment |{Piton}|, a command |\footnote| may appear only
+% within a ``LaTeX comment''. But it's also possible to add the command
+% |\footnote| to the list of the ``\emph{detected-commands}''
+% (cf.~part~\ref{detected-commands}, p.~\pageref{detected-commands}).
+
% \medskip
% In this document, the package \pkg{piton} has been loaded with the
-% option |footnotehyper|. For examples of notes, cf. \ref{notes-examples},
-% p.~\pageref{notes-examples}.
+% option |footnotehyper| dans we added the command |\footnote| to the list of
+% the ``\emph{detected-commands}'' with the following instruction in the
+% preamble of the LaTeX document.
+%
+% \qquad \verb|\PitonOptions{detected-commands = footnote}|
+%
+%
+% \begingroup
+% \fvset{commandchars=\~\&\@,formatcom=\small\color{gray}}
+% \begin{Verbatim}
+% \PitonOptions{background-color=gray!10}
+% \begin{Piton}
+% def arctan(x,n=10):
+% if x < 0:
+% return -arctan(-x)~emphase&\footnote{First recursive call.}]@
+% elif x > 1:
+% return pi/2 - arctan(1/x)~emphase&\footnote{Second recursive call.}@
+% else:
+% return sum( (-1)**k/(2*k+1)*x**(2*k+1) for k in range(n) )
+% \end{Piton}
+% \end{Verbatim}
+% \endgroup
+%
+% \begingroup
+% \PitonOptions{background-color=gray!10}
+% \begin{Piton}
+% def arctan(x,n=10):
+% if x < 0:
+% return -arctan(-x)\footnote{First recursive call.}
+% elif x > 1:
+% return pi/2 - arctan(1/x)\footnote{Second recursive call.}
+% else:
+% return sum( (-1)**k/(2*k+1)*x**(2*k+1) for k in range(n) )
+% \end{Piton}
+% \endgroup
+%
+%
+% \vspace{1cm}
+%
+% If an environment |{Piton}| is used in an environment |{minipage}| of LaTeX,
+% the notes are composed, of course, at the foot of the environment
+% |{minipage}|. Recall that such |{minipage}| can't be broken by a page break.
+%
+%
+% \begingroup
+% \fvset{commandchars=\~\&\@,formatcom=\small\color{gray}}
+% \begin{Verbatim}
+% \PitonOptions{background-color=gray!10}
+% \emphase\begin{minipage}{\linewidth}
+% \begin{Piton}
+% def arctan(x,n=10):
+% if x < 0:
+% return -arctan(-x)~emphase&\footnote{First recursive call.}@
+% elif x > 1:
+% return pi/2 - arctan(1/x)~emphase&\footnote{Second recursive call.}@
+% else:
+% return sum( (-1)**k/(2*k+1)*x**(2*k+1) for k in range(n) )
+% \end{Piton}
+% \end{minipage}
+% \end{Verbatim}
+% \endgroup
+%
+% \begingroup
+% \PitonOptions{background-color=gray!10}
+% \begin{minipage}{\linewidth}
+% \begin{Piton}
+% def arctan(x,n=10):
+% if x < 0:
+% return -arctan(-x)\footnote{First recursive call.}
+% elif x > 1:
+% return pi/2 - arctan(1/x)\footnote{Second recursive call.}
+% else:
+% return sum( (-1)**k/(2*k+1)*x**(2*k+1) for k in range(n) )
+% \end{Piton}
+% \end{minipage}
+% \endgroup
+%
%
% \subsection{Tabulations}
%
@@ -1835,6 +1970,8 @@ piton_version = "3.0b" -- 2024/05/23
% course). Hence, that key is similar to the key |auto-gobble| but acts on
% U+0009 instead of U+0020 (spaces).
%
+% The key |env-gobble| is not compatible with the tabulations.
+%
%
% \bigskip
% \section{API for the developpers}
@@ -1882,7 +2019,7 @@ piton_version = "3.0b" -- 2024/05/23
% \index{numbers of the lines de code|emph}
%
% We remind that it's possible to have an automatic numbering of the lines in
-% the Python listings by using the key |line-numbers|.
+% the Python listings by using the key |line-numbers| (used without value).
%
% By default, the numbers of the lines are composed by \pkg{piton} in an
% overlapping position on the left (by using internally the command |\llap| of LaTeX).
@@ -2015,94 +2152,7 @@ piton_version = "3.0b" -- 2024/05/23
% \endgroup
%
%
-% \bigskip
-% \subsection{Notes in the listings}
-%
-% \label{notes-examples}
-% \index{notes in the listings}
%
-% In order to be able to extract the notes (which are typeset with the command
-% |\footnote|), the extension \pkg{piton} must be loaded with the key |footnote|
-% or the key |footenotehyper| as explained in the section \ref{footnote}
-% p.~\pageref{footnote}. In this document, the extension \pkg{piton} has been
-% loaded with the key |footnotehyper|.
-%
-% Of course, in an environment |{Piton}|, a command |\footnote| may appear only
-% within a LaTeX comment (which begins with |#>|). It's possible to have comments
-% which contain only that command |\footnote|. That's the case in the following example.
-%
-%
-%
-% \begingroup
-% \fvset{commandchars=\~\&\@,formatcom=\small\color{gray}}
-% \begin{Verbatim}
-% \PitonOptions{background-color=gray!10}
-% \begin{Piton}
-% def arctan(x,n=10):
-% if x < 0:
-% return -arctan(-x)~emphase&#>\footnote{First recursive call.}]@
-% elif x > 1:
-% return pi/2 - arctan(1/x)~emphase&#>\footnote{Second recursive call.}@
-% else:
-% return sum( (-1)**k/(2*k+1)*x**(2*k+1) for k in range(n) )
-% \end{Piton}
-% \end{Verbatim}
-% \endgroup
-%
-% \begingroup
-% \PitonOptions{background-color=gray!10}
-% \begin{Piton}
-% def arctan(x,n=10):
-% if x < 0:
-% return -arctan(-x)#>\footnote{First recursive call.}
-% elif x > 1:
-% return pi/2 - arctan(1/x)#>\footnote{Second recursive call.}
-% else:
-% return sum( (-1)**k/(2*k+1)*x**(2*k+1) for k in range(n) )
-% \end{Piton}
-% \endgroup
-%
-%
-% \vspace{1cm}
-%
-% If an environment |{Piton}| is used in an environment |{minipage}| of LaTeX,
-% the notes are composed, of course, at the foot of the environment
-% |{minipage}|. Recall that such |{minipage}| can't be broken by a page break.
-%
-%
-% \begingroup
-% \fvset{commandchars=\~\&\@,formatcom=\small\color{gray}}
-% \begin{Verbatim}
-% \PitonOptions{background-color=gray!10}
-% \emphase\begin{minipage}{\linewidth}
-% \begin{Piton}
-% def arctan(x,n=10):
-% if x < 0:
-% return -arctan(-x)~emphase&#>\footnote{First recursive call.}@
-% elif x > 1:
-% return pi/2 - arctan(1/x)~emphase&#>\footnote{Second recursive call.}@
-% else:
-% return sum( (-1)**k/(2*k+1)*x**(2*k+1) for k in range(n) )
-% \end{Piton}
-% \end{minipage}
-% \end{Verbatim}
-% \endgroup
-%
-% \begingroup
-% \PitonOptions{background-color=gray!10}
-% \begin{minipage}{\linewidth}
-% \begin{Piton}
-% def arctan(x,n=10):
-% if x < 0:
-% return -arctan(-x)#>\footnote{First recursive call.}
-% elif x > 1:
-% return pi/2 - arctan(1/x)#>\footnote{Second recursive call.}
-% else:
-% return sum( (-1)**k/(2*k+1)*x**(2*k+1) for k in range(n) )
-% \end{Piton}
-% \end{minipage}
-% \endgroup
-%
%
%
% \bigskip
@@ -2297,7 +2347,7 @@ piton_version = "3.0b" -- 2024/05/23
% Keyword & the following keywords:
% \ttfamily assert, break, case, continue, del,
% elif, else, except, exec, finally, for, from,
-% global, if, import, lambda, non local,
+% global, if, import, in, lambda, non local,
% pass, raise, return, try, while,
% with, yield et yield from.\\
% \bottomrule
@@ -2705,6 +2755,14 @@ piton_version = "3.0b" -- 2024/05/23
% \end{macrocode}
%
% \bigskip
+% The command |\text| provided by the package \pkg{amstext} will be used to
+% allow the use of the command |\pion{...}| (with the standard syntax) in
+% mathematical mode.
+% \begin{macrocode}
+\RequirePackage { amstext }
+% \end{macrocode}
+%
+% \bigskip
% \begin{macrocode}
\cs_new_protected:Npn \@@_error:n { \msg_error:nn { piton } }
\cs_new_protected:Npn \@@_warning:n { \msg_warning:nn { piton } }
@@ -2835,25 +2893,12 @@ piton_version = "3.0b" -- 2024/05/23
beamer .bool_gset:N = \g_@@_beamer_bool ,
beamer .default:n = true ,
-
- math-comments .code:n = \@@_error:n { moved~to~preamble } ,
- comment-latex .code:n = \@@_error:n { moved~to~preamble } ,
unknown .code:n = \@@_error:n { Unknown~key~for~package }
}
% \end{macrocode}
%
%
-% \bigskip
-% \begin{macrocode}
-\@@_msg_new:nn { moved~to~preamble }
- {
- The~key~'\l_keys_key_str'~*must*~now~be~used~with~
- \token_to_str:N \PitonOptions`in~the~preamble~of~your~
- document.\\
- That~key~will~be~ignored.
- }
-% \end{macrocode}
%
% \begin{macrocode}
\@@_msg_new:nn { Unknown~key~for~package }
@@ -2957,7 +3002,11 @@ piton_version = "3.0b" -- 2024/05/23
% \begin{macrocode}
\lua_now:n
{
- piton.ListCommands = lpeg.P ( false )
+ piton.BeamerCommands = lpeg.P ( "\\uncover" )
+ + "\\only" + "\\visible" + "\\invisible" + "\\alert" + "\\action"
+ piton.beamer_environments = { "uncoverenv" , "onlyenv" , "visibleenv" ,
+ "invisibleenv" , "alertenv" , "actionenv" }
+ piton.DetectedCommands = lpeg.P ( false )
piton.last_code = ''
piton.last_language = ''
}
@@ -3006,27 +3055,31 @@ piton_version = "3.0b" -- 2024/05/23
%
%
% \medskip
-% We will compute (with Lua) the numbers of lines of the Python code and store
+% We will compute (with Lua) the numbers of lines of the listings (or
+% \emph{chunks} of listings when |split-on-empty-lines| is in force) and store
% it in the following counter.
% \begin{macrocode}
\int_new:N \l_@@_nb_lines_int
% \end{macrocode}
%
-% The same for the number of non-empty lines of the Python codes.
+% The same for the number of non-empty lines of the listings.
% \begin{macrocode}
\int_new:N \l_@@_nb_non_empty_lines_int
% \end{macrocode}
%
% The following counter will be used to count the lines during the composition.
-% It will count all the lines, empty or not empty. It won't be used to print the
-% numbers of the lines.
+% It will take into account all the lines, empty or not empty. It won't be used
+% to print the numbers of the lines but will be used to allow or disallow line
+% breaks (when |splittable| is in force) and for the color of the background
+% (when |background-color| is used with a \emph{list} of colors).
% \begin{macrocode}
\int_new:N \g_@@_line_int
% \end{macrocode}
%
% \medskip
% The following token list will contain the (potential) information to write
-% on the |aux| (to be used in the next compilation).
+% on the |aux| (to be used in the next compilation). The technic of the
+% auxiliary file will be used when the key |width| is used with the value~|min|.
% \begin{macrocode}
\tl_new:N \g_@@_aux_tl
% \end{macrocode}
@@ -3034,26 +3087,31 @@ piton_version = "3.0b" -- 2024/05/23
% \medskip
% The following counter corresponds to the key |splittable| of |\PitonOptions|.
% If the value of |\l_@@_splittable_int| is equal to $n$, then no line break can
-% occur within the first $n$~lines or the last $n$~lines of the listings.
+% occur within the first $n$~lines or the last $n$~lines of a listing (or a
+% \emph{chunk} of listings when the key |split-on-empty-lines| is in force).
% \begin{macrocode}
\int_new:N \l_@@_splittable_int
% \end{macrocode}
%
% \medskip
+% An initial value of |splittable| equal to 100 is equivalent to say that the
+% environments |{Piton}| are unbreakable.
+% \begin{macrocode}
+\int_set:Nn \l_@@_splittable_int { 100 }
+% \end{macrocode}
+%
+% \medskip
% When the key |split-on-empty-lines| will be in force, then the following token
% list will be inserted between the chunks of code (the informatic code provided
-% by the final user is split in chunks on the empty lines in the code).
+% by the final user is split in chunks on the empty lines in the code).
% \begin{macrocode}
\tl_new:N \l_@@_split_separation_tl
-\tl_set:Nn \l_@@_split_separation_tl { \vspace{\baselineskip} \vspace{-1.25pt} }
+\tl_set:Nn \l_@@_split_separation_tl
+ { \vspace { \baselineskip } \vspace { -1.25pt } }
% \end{macrocode}
+% That parameter must contain elements to be inserted in \emph{vertical} mode by
+% TeX.
%
-% \medskip
-% An initial value of |splittable| equal to 100 is equivalent to say that the
-% environments |{Piton}| are unbreakable.
-% \begin{macrocode}
-\int_set:Nn \l_@@_splittable_int { 100 }
-% \end{macrocode}
%
%
% \medskip
@@ -3213,11 +3271,6 @@ piton_version = "3.0b" -- 2024/05/23
\dim_set:Nn \l_@@_numbers_sep_dim { 0.7 em }
% \end{macrocode}
%
-% \medskip
-% The tabulators will be replaced by the content of the following token list.
-% \begin{macrocode}
-\tl_new:N \l_@@_tab_tl
-% \end{macrocode}
%
% \medskip
% Be careful. The following sequence |\g_@@_languages_seq| is not the list of
@@ -3233,30 +3286,26 @@ piton_version = "3.0b" -- 2024/05/23
%
% \medskip
% \begin{macrocode}
-\cs_new_protected:Npn \@@_set_tab_tl:n #1
- {
- \tl_clear:N \l_@@_tab_tl
- \prg_replicate:nn { #1 }
- { \tl_put_right:Nn \l_@@_tab_tl { ~ } }
- }
-\@@_set_tab_tl:n { 4 }
+\int_new:N \l_@@_tab_size_int
+\int_set:Nn \l_@@_tab_size_int { 4 }
% \end{macrocode}
%
-% \medskip
-% When the key |show-spaces| is in force, |\l_@@_tab_tl| will be replaced by an
-% arrow by using the following command.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_convert_tab_tl:
- {
- \hbox_set:Nn \l_tmpa_box { \l_@@_tab_tl }
- \dim_set:Nn \l_tmpa_dim { \box_wd:N \l_tmpa_box }
- \tl_set:Nn \l_@@_tab_tl
+\cs_new_protected:Npn \@@_tab:
+ {
+ \bool_if:NTF \l_@@_show_spaces_bool
{
+ \hbox_set:Nn \l_tmpa_box
+ { \prg_replicate:nn \l_@@_tab_size_int { ~ } }
+ \dim_set:Nn \l_tmpa_dim { \box_wd:N \l_tmpa_box }
\( \mathcolor { gray }
- { \hbox_to_wd:nn \l_tmpa_dim { \rightarrowfill } \) }
+ { \hbox_to_wd:nn \l_tmpa_dim { \rightarrowfill } } \)
}
+ { \hbox:n { \prg_replicate:nn \l_@@_tab_size_int { ~ } } }
+ \int_gadd:Nn \g_@@_indentation_int \l_@@_tab_size_int
}
% \end{macrocode}
+%
%
% \medskip
% The following integer corresponds to the key |gobble|.
@@ -3373,7 +3422,8 @@ piton_version = "3.0b" -- 2024/05/23
% \bigskip
% \subsubsection{Treatment of a line of code}
%
-% The following command is only used once.
+% The following command is only used once. We have written an autonomous function
+% only for legibility.
% \begin{macrocode}
\cs_new_protected:Npn \@@_replace_spaces:n #1
{
@@ -3444,14 +3494,14 @@ piton_version = "3.0b" -- 2024/05/23
{
\bool_if:nF
{
- \str_if_eq_p:nn { #1 } { \PitonStyle {Prompt}{} }
+ \str_if_eq_p:nn { #1 } { \PitonStyle { Prompt } { } }
&&
\l_@@_skip_empty_lines_bool
}
{ \int_gincr:N \g_@@_visual_line_int }
\bool_if:nT
{
- ! \str_if_eq_p:nn { #1 } { \PitonStyle {Prompt}{} }
+ ! \str_if_eq_p:nn { #1 } { \PitonStyle { Prompt } { } }
||
( ! \l_@@_skip_empty_lines_bool && \l_@@_label_empty_lines_bool )
}
@@ -3579,24 +3629,63 @@ piton_version = "3.0b" -- 2024/05/23
% \end{macrocode}
%
% \bigskip
+% The command |\@@_newline:| will be inserted by Lua between two lines of the
+% informatic listing.
+% \begin{itemize}
+% \item In fact, it will be inserted between two commands
+% |\@@_begin_line:|...|\@@_end_of_line:|.
+% \item When the key |break-lines-in-Piton| is in force, a line of the
+% informatic code (the \emph{input}) may result in several lines in the PDF (the
+% \emph{output}).
+% \item |\@@_newline:| has a rather complex behaviour because it may close and
+% open |\vtop|s and finish and start paragraphs.
+% \end{itemize}
% \begin{macrocode}
\cs_new_protected:Npn \@@_newline:
{
+% \end{macrocode}
+% We recall that |\g_@@_line_int| is \emph{not} used for the number of line
+% printed in the PDF (when |line-numbers| is in force)...
+% \begin{macrocode}
\int_gincr:N \g_@@_line_int
+% \end{macrocode}
+% ... it will be used to allow or disallow page breaks (the final user controls
+% that behaviour with the key |splittable|).
+% \begin{macrocode}
\int_compare:nNnT \g_@@_line_int > { \l_@@_splittable_int - 1 }
{
\int_compare:nNnT
- { \l_@@_nb_lines_int - \g_@@_line_int } > \l_@@_splittable_int
+ { \l_@@_nb_lines_int - \g_@@_line_int + 1 } > \l_@@_splittable_int
+% \end{macrocode}
+% Now, we allow a page break after the current line of code.
+% \begin{macrocode}
{
\egroup
\bool_if:NT \g_@@_footnote_bool \endsavenotes
- \par \mode_leave_vertical:
+ \par
+% \end{macrocode}
+% Each non-splittable block of lines is composed in a |\vtop| of
+% TeX inserted in a paragraph of TeX.
+% \begin{itemize}
+% \item In the previous lines, we have closed a |\vtop| (with |\egroup|) and a
+% paragraph (with |\par|).
+% \item Now, we start a new paragraph (with |\mode_leave_vertical:|) and open a
+% |\vtop| (with |\vtop \bgroup|).
+% \end{itemize}
+% \begin{macrocode}
+ \mode_leave_vertical:
\bool_if:NT \g_@@_footnote_bool \savenotes
\vtop \bgroup
+% \end{macrocode}
+% And, in that |\vtop|, of course, we will put a box for each line of the
+% informatic listing (but a line of the informatic listing may be formatted as a
+% box of several lines when |break-lines-in-Piton| is in force).
+% \begin{macrocode}
}
}
}
% \end{macrocode}
+% After the command |\@@_newline:|, we will have a command |\@@_begin_line:|.
%
% \bigskip
% \begin{macrocode}
@@ -3637,6 +3726,8 @@ piton_version = "3.0b" -- 2024/05/23
\bool_new:N \l_@@_skip_empty_lines_bool
\bool_set_true:N \l_@@_skip_empty_lines_bool
\bool_new:N \l_@@_line_numbers_absolute_bool
+\tl_new:N \l_@@_line_numbers_format_bool
+\tl_set:Nn \l_@@_line_numbers_format_tl { \footnotesize \color { gray } }
\bool_new:N \l_@@_label_empty_lines_bool
\bool_set_true:N \l_@@_label_empty_lines_bool
\int_new:N \l_@@_number_lines_start_int
@@ -3667,12 +3758,8 @@ piton_version = "3.0b" -- 2024/05/23
false .code:n = \bool_set_false:N \l_@@_line_numbers_bool ,
start .code:n =
- \bool_if:NTF \l_@@_in_PitonOptions_bool
- { Invalid~key }
- {
- \bool_set_true:N \l_@@_line_numbers_bool
- \int_set:Nn \l_@@_number_lines_start_int { #1 }
- } ,
+ \bool_set_true:N \l_@@_line_numbers_bool
+ \int_set:Nn \l_@@_number_lines_start_int { #1 } ,
start .value_required:n = true ,
skip-empty-lines .code:n =
@@ -3699,11 +3786,7 @@ piton_version = "3.0b" -- 2024/05/23
{
\bool_set_true:N \l_@@_line_numbers_absolute_bool
\bool_set_false:N \l_@@_skip_empty_lines_bool
- }
- \bool_lazy_or:nnF
- \l_@@_in_PitonInputFile_bool
- \l_@@_in_PitonOptions_bool
- { \@@_error:n { Invalid~key } } ,
+ } ,
absolute .value_forbidden:n = true ,
resume .code:n =
@@ -3715,6 +3798,9 @@ piton_version = "3.0b" -- 2024/05/23
sep .dim_set:N = \l_@@_numbers_sep_dim ,
sep .value_required:n = true ,
+ format .tl_set:N = \l_@@_line_numbers_format_tl ,
+ format .value_required:n = true ,
+
unknown .code:n = \@@_error:n { Unknown~key~for~line-numbers }
}
% \end{macrocode}
@@ -3730,9 +3816,17 @@ piton_version = "3.0b" -- 2024/05/23
% First, we put keys that should be available only in the preamble.
% \begin{macrocode}
detected-commands .code:n =
- \lua_now:n { piton.addListCommands('#1') } ,
+ \lua_now:n { piton.addDetectedCommands('#1') } ,
detected-commands .value_required:n = true ,
detected-commands .usage:n = preamble ,
+ detected-beamer-commands .code:n =
+ \lua_now:n { piton.addBeamerCommands('#1') } ,
+ detected-beamer-commands .value_required:n = true ,
+ detected-beamer-commands .usage:n = preamble ,
+ detected-beamer-environments .code:n =
+ \lua_now:n { piton.addBeamerEnvironments('#1') } ,
+ detected-beamer-environments .value_required:n = true ,
+ detected-beamer-environments .usage:n = preamble ,
% \end{macrocode}
%
% Remark that the command |\lua_escape:n| is fully expandable. That's why we use
@@ -3849,11 +3943,9 @@ piton_version = "3.0b" -- 2024/05/23
} ,
left-margin .value_required:n = true ,
- tab-size .code:n = \@@_set_tab_tl:n { #1 } ,
+ tab-size .int_set:N = \l_@@_tab_size_int ,
tab-size .value_required:n = true ,
- show-spaces .code:n =
- \bool_set_true:N \l_@@_show_spaces_bool
- \@@_convert_tab_tl: ,
+ show-spaces .bool_set:N = \l_@@_show_spaces_bool ,
show-spaces .value_forbidden:n = true ,
show-spaces-in-strings .code:n = \tl_set:Nn \l_@@_space_tl { ⣠} , % U+2423
show-spaces-in-strings .value_forbidden:n = true ,
@@ -3939,7 +4031,7 @@ piton_version = "3.0b" -- 2024/05/23
% When using |\NewPitonEnvironment| a user may use |\PitonOptions| inside.
% However, the set of keys available should be different that in standard
% |\PitonOptions|. That's why we define a version of |\PitonOptions| with no
-% restrection on the set of available keys and we will link that version to
+% restriction on the set of available keys and we will link that version to
% |\PitonOptions| in such environment.
% \begin{macrocode}
\NewDocumentCommand \@@_fake_PitonOptions { }
@@ -3954,7 +4046,9 @@ piton_version = "3.0b" -- 2024/05/23
%
% \medskip
% The following counter will be used to count the lines in the code when the
-% user requires the numbers of the lines to be printed (with |line-numbers|).
+% user requires the numbers of the lines to be printed (with |line-numbers|)
+% whereas the counter |\g_@@_line_int| previously defined is \emph{not} used for
+% that functionality.
%
% \begin{macrocode}
\int_new:N \g_@@_visual_line_int
@@ -3974,9 +4068,12 @@ piton_version = "3.0b" -- 2024/05/23
\hbox_overlap_left:n
{
{
- \color { gray }
- \footnotesize
- \int_to_arabic:n \g_@@_visual_line_int
+ \l_@@_line_numbers_format_tl
+% \end{macrocode}
+% We put braces. Thus, the user may use the key |line-numbers/format| with a
+% value such as |\fbox|.
+% \begin{macrocode}
+ { \int_to_arabic:n \g_@@_visual_line_int }
}
\skip_horizontal:N \l_@@_numbers_sep_dim
}
@@ -4164,18 +4261,29 @@ piton_version = "3.0b" -- 2024/05/23
\NewDocumentCommand { \@@_piton_standard } { m }
{
\group_begin:
- \ttfamily
% \end{macrocode}
% The following tuning of LuaTeX in order to avoid all break of lines on the
% hyphens.
% \begin{macrocode}
\automatichyphenmode = 1
+% \end{macrocode}
+% Remark that the argument of |\piton| (with the normal syntax) is expanded in
+% the TeX sens, (see the |\tl_set:Nx| below) and that's why we can provide the
+% following escapes to the final user:
+% \begin{macrocode}
\cs_set_eq:NN \\ \c_backslash_str
\cs_set_eq:NN \% \c_percent_str
\cs_set_eq:NN \{ \c_left_brace_str
\cs_set_eq:NN \} \c_right_brace_str
\cs_set_eq:NN \$ \c_dollar_str
+% \end{macrocode}
+% The standard command |\â£| is \emph{not} expandable and we need here expandable
+% commands. With the following code, we define an expandable command.
+% \begin{macrocode}
\cs_set_eq:cN { ~ } \space
+% \end{macrocode}
+%
+% \begin{macrocode}
\cs_set_protected:Npn \@@_begin_line: { }
\cs_set_protected:Npn \@@_end_line: { }
\tl_set:Nx \l_tmpa_tl
@@ -4196,7 +4304,14 @@ piton_version = "3.0b" -- 2024/05/23
\bool_if:NT \l_@@_break_lines_in_piton_bool
{ \regex_replace_all:nnN { \x20 } { \x20 } \l_tmpa_tl }
}
- \l_tmpa_tl
+% \end{macrocode}
+% The command |\text| is provided by the package \pkg{amstext} (loaded by \pkg{piton}).
+% \begin{macrocode}
+ \if_mode_math:
+ \text { \ttfamily \l_tmpa_tl }
+ \else:
+ \ttfamily \l_tmpa_tl
+ \fi:
\group_end:
}
% \end{macrocode}
@@ -4273,34 +4388,9 @@ piton_version = "3.0b" -- 2024/05/23
\cs_new_protected:Npn \@@_piton_no_cr:n #1
{
\group_begin:
- \cs_set_protected:Npn \@@_begin_line: { }
- \cs_set_protected:Npn \@@_end_line: { }
- \cs_set:cpn { pitonStyle _ \l_piton_language_str _ Prompt } { }
- \cs_set:cpn { pitonStyle _ Prompt } { }
\cs_set_protected:Npn \@@_newline:
{ \msg_fatal:nn { piton } { cr~not~allowed } }
- \bool_lazy_or:nnTF
- \l_@@_break_lines_in_piton_bool
- \l_@@_break_lines_in_Piton_bool
- {
- \tl_set:Nx \l_tmpa_tl
- {
- \lua_now:e
- { piton.ParseTer('\l_piton_language_str',token.scan_string()) }
- { #1 }
- }
- }
- {
- \tl_set:Nx \l_tmpa_tl
- {
- \lua_now:e
- { piton.Parse('\l_piton_language_str',token.scan_string()) }
- { #1 }
- }
- }
- \bool_if:NT \l_@@_show_spaces_bool
- { \regex_replace_all:nnN { \x20 } { ⣠} \l_tmpa_tl } % U+2423
- \l_tmpa_tl
+ \@@_piton:n { #1 }
\group_end:
}
% \end{macrocode}
@@ -4347,7 +4437,7 @@ piton_version = "3.0b" -- 2024/05/23
{
\hbox_set:Nn \l_tmpa_box
{
- \footnotesize
+ \l_@@_line_numbers_format_tl
\bool_if:NTF \l_@@_skip_empty_lines_bool
{
\lua_now:n
@@ -4448,14 +4538,7 @@ piton_version = "3.0b" -- 2024/05/23
}
{
\group_end:
- \mode_if_vertical:TF \mode_leave_vertical: \newline
-% \end{macrocode}
-% We count with Lua the number of lines of the argument. The result will be
-% stored by Lua in |\l_@@_nb_lines_int|. That information will be used to allow
-% or disallow page breaks. The use of |token.scan_argument| avoids problems with
-% the delimiters of the Lua string.
-% \begin{macrocode}
- \lua_now:n { piton.CountLines(token.scan_argument()) } { ##1 }
+ \mode_if_vertical:TF { \noindent \mode_leave_vertical: } \newline
% \end{macrocode}
% The first argument of the following function is the name of the Lua function
% that will be applied to the second argument in order to count the number of lines.
@@ -4463,7 +4546,8 @@ piton_version = "3.0b" -- 2024/05/23
\@@_compute_left_margin:nn { CountNonEmptyLines } { ##1 }
\@@_compute_width:
\ttfamily
- \dim_zero:N \parskip
+ \dim_zero:N \parskip
+ \noindent % added 2024/08/07
% \end{macrocode}
%
% Now, the key |write|.
@@ -4545,7 +4629,7 @@ piton_version = "3.0b" -- 2024/05/23
% \bigskip
% The following function will be used when the key |split-on-empty-lines| is not
% in force. It will gobble the spaces at the beginning of the lines and parse
-% the code. The argument is provided by curryfication.
+% the code. The argument is provided by curryfication.
% \begin{macrocode}
\cs_new_protected:Npn \@@_gobble_parse:n
{
@@ -4726,7 +4810,6 @@ piton_version = "3.0b" -- 2024/05/23
\@@_compute_left_margin:no { CountNonEmptyLinesFile } \l_@@_file_name_str
\@@_compute_width:
\ttfamily
- % \leavevmode
\lua_now:e
{
piton.ParseFile(
@@ -4881,8 +4964,6 @@ piton_version = "3.0b" -- 2024/05/23
{
String .meta:n = { String.Long = #1 , String.Short = #1 } ,
Comment.Math .tl_set:c = pitonStyle _ Comment.Math ,
- ParseAgain .tl_set:c = pitonStyle _ ParseAgain ,
- ParseAgain .value_required:n = true ,
ParseAgain.noCR .tl_set:c = pitonStyle _ ParseAgain.noCR ,
ParseAgain.noCR .value_required:n = true ,
unknown .code:n =
@@ -4950,13 +5031,12 @@ piton_version = "3.0b" -- 2024/05/23
UserFunction = ,
Prompt = ,
ParseAgain.noCR = \@@_piton_no_cr:n ,
- ParseAgain = \@@_piton:n ,
Discard = \use_none:n
}
% \end{macrocode}
-% The last styles |ParseAgain.noCR| and |ParseAgain| should be considered as
+% The styles |ParseAgain.noCR| should be considered as
% ``internal style'' (not available for the final user). However, maybe we will
-% change that and document these styles for the final user (why not?).
+% change that and document that style for the final user.
%
% \medskip
% If the key |math-comments| has been used at load-time, we change the style
@@ -5215,8 +5295,11 @@ piton_version = "3.0b" -- 2024/05/23
}
% \end{macrocode}
%
+% We don't give the name |syntax error| for the following error because you
+% should not give a name with a space because such space could be replaced by
+% U+2423 when the key |show-spaces| is in force in the command |\piton|.
% \begin{macrocode}
-\@@_msg_new:nn { syntax~error }
+\@@_msg_new:nn { SyntaxError }
{
Your~code~of~the~language~"\l_piton_language_str"~is~not~
syntactically~correct.\\
@@ -5274,6 +5357,8 @@ piton_version = "3.0b" -- 2024/05/23
break-lines-in-Piton,~
continuation-symbol,~
continuation-symbol-on-indentation,~
+ detected-beamer-commands,~
+ detected-beamer-environments,~
detected-commands,~
end-of-broken-line,~
end-range,~
@@ -5386,8 +5471,28 @@ piton_version = "3.0b" -- 2024/05/23
% \begin{macrocode}
F = space ^ 0 * ( ( alpha ^ 1 ) / "\\%0" ) * space ^ 0
}
- function piton.addListCommands( key_value )
- piton.ListCommands = piton.ListCommands + my_lpeg : match ( key_value )
+ function piton.addDetectedCommands( key_value )
+ piton.DetectedCommands = piton.DetectedCommands + my_lpeg : match ( key_value )
+ end
+ function piton.addBeamerCommands( key_value )
+ piton.BeamerCommands
+ = piton.BeamerCommands + my_lpeg : match ( key_value )
+ end
+% \end{macrocode}
+%
+% \begin{macrocode}
+ local function insert(...)
+ local s = piton.beamer_environments
+ for _ , x in ipairs({...}) do table.insert(s,x) end
+ return s
+ end
+ local my_lpeg_bis =
+ P { "E" ,
+ E = ( V "F" * ( "," * V "F" ) ^ 0 ) / insert ,
+ F = space ^ 0 * ( alpha ^ 1 ) * space ^ 0
+ }
+ function piton.addBeamerEnvironments( key_value )
+ piton.beamer_environments = my_lpeg_bis : match ( key_value )
end
\end{luacode*}
%</STY>
@@ -5411,23 +5516,11 @@ piton.comment_latex = "#" .. piton.comment_latex
% \end{macrocode}
%
%
-% \bigskip
-% The following functions are an easy way to safely insert braces (|{| and |}|)
-% in the TeX flow.
-% \begin{macrocode}
-function piton.open_brace ()
- tex.sprint("{")
-end
-function piton.close_brace ()
- tex.sprint("}")
-end
-% \end{macrocode}
-%
% \begin{macrocode}
local function sprintL3 ( s )
tex.sprint ( luatexbase.catcodetables.expl , s )
end
-% \end{uncoverenv}
+% \end{macrocode}
%
% \bigskip
% \subsubsection{Special functions dealing with LPEG}
@@ -5648,7 +5741,7 @@ local SkipSpace = Q " " ^ 0
local Punct = Q ( S ".,:;!" )
-local Tab = "\t" * Lc "\\l_@@_tab_tl"
+local Tab = "\t" * Lc "\\@@_tab:"
% \end{macrocode}
%
% \bigskip
@@ -5687,7 +5780,8 @@ local LPEG_cleaner = { }
% present in strings of the language. However, the syntax for the strings is
% language-dependent. That's why we write a Lua function |Compute_braces| which
% will compute the pattern by taking in as argument a pattern for the strings of
-% the language (at least the shorts strings).
+% the language (at least the shorts strings). The argument of |Compute_braces|
+% must be a pattern \emph{which does no catching}.
% \begin{macrocode}
local function Compute_braces ( lpeg_string ) return
P { "E" ,
@@ -5703,16 +5797,19 @@ local function Compute_braces ( lpeg_string ) return
end
% \end{macrocode}
%
+%
+%
% \bigskip
% The following Lua function will compute the \text{lpeg} |DetectedCommands|
% which is a \textsc{lpeg} with captures).
% \begin{macrocode}
local function Compute_DetectedCommands ( lang , braces ) return
Ct ( Cc "Open"
- * C ( piton.ListCommands * P "{" )
+ * C ( piton.DetectedCommands * P "{" )
* Cc "}"
)
- * ( braces / (function ( s ) return LPEG1[lang] : match ( s ) end ) )
+ * ( braces
+ / ( function ( s ) if s ~= '' then return LPEG1[lang] : match ( s ) end end ) )
* P "}"
* Ct ( Cc "Close" )
end
@@ -5721,9 +5818,10 @@ end
% \bigskip
% \begin{macrocode}
local function Compute_LPEG_cleaner ( lang , braces ) return
- Ct ( ( piton.ListCommands * "{"
- * ( braces
- / ( function ( s ) return LPEG_cleaner[lang] : match ( s ) end ) )
+ Ct ( ( piton.DetectedCommands * "{"
+ * ( braces
+ / ( function ( s )
+ if s ~= '' then return LPEG_cleaner[lang] : match ( s ) end end ) )
* "}"
+ EscapeClean
+ C ( P ( 1 ) )
@@ -5744,28 +5842,20 @@ local BeamerBeginEnvironments = P ( true )
local BeamerEndEnvironments = P ( true )
% \end{macrocode}
%
-% \bigskip
-% \begin{macrocode}
-local list_beamer_env =
- { "uncoverenv" , "onlyenv" , "visibleenv" ,
- "invisibleenv" , "alertenv" , "actionenv" }
-% \end{macrocode}
-%
-% \bigskip
% \begin{macrocode}
-local BeamerNamesEnvironments = P ( false )
-for _ , x in ipairs ( list_beamer_env ) do
- BeamerNamesEnvironments = BeamerNamesEnvironments + x
+piton.BeamerEnvironments = P ( false )
+for _ , x in ipairs ( piton.beamer_environments ) do
+ piton.BeamerEnvironments = piton.BeamerEnvironments + x
end
% \end{macrocode}
-%
+%
% \bigskip
% \begin{macrocode}
BeamerBeginEnvironments =
( space ^ 0 *
L
(
- P "\\begin{" * BeamerNamesEnvironments * "}"
+ P "\\begin{" * piton.BeamerEnvironments * "}"
* ( "<" * ( 1 - P ">" ) ^ 0 * ">" ) ^ -1
)
* "\r"
@@ -5776,11 +5866,12 @@ BeamerBeginEnvironments =
% \begin{macrocode}
BeamerEndEnvironments =
( space ^ 0 *
- L ( P "\\end{" * BeamerNamesEnvironments * "}" )
+ L ( P "\\end{" * piton.BeamerEnvironments * "}" )
* "\r"
) ^ 0
% \end{macrocode}
%
+%
%
% \bigskip
% The following Lua function will be used to compute the \textsc{lpeg} |Beamer|
@@ -5795,14 +5886,14 @@ local function Compute_Beamer ( lang , braces )
local lpeg = L ( P "\\pause" * ( "[" * ( 1 - P "]" ) ^ 0 * "]" ) ^ -1 )
lpeg = lpeg +
Ct ( Cc "Open"
- * C ( ( P "\\uncover" + "\\only" + "\\alert" + "\\visible"
- + "\\invisible" + "\\action" )
+ * C ( piton.BeamerCommands
* ( "<" * ( 1 - P ">" ) ^ 0 * ">" ) ^ -1
* P "{"
)
* Cc "}"
)
- * ( braces / ( function ( s ) return LPEG1[lang] : match ( s ) end ) )
+ * ( braces /
+ ( function ( s ) if s ~= '' then return LPEG1[lang] : match ( s ) end end ) )
* "}"
* Ct ( Cc "Close" )
% \end{macrocode}
@@ -5814,29 +5905,38 @@ local function Compute_Beamer ( lang , braces )
% \begin{macrocode}
lpeg = lpeg +
L ( P "\\alt" * "<" * ( 1 - P ">" ) ^ 0 * ">" * "{" )
- * K ( 'ParseAgain.noCR' , braces )
+ * ( braces /
+ ( function ( s ) if s ~= '' then return LPEG1[lang] : match ( s ) end end ) )
* L ( P "}{" )
- * K ( 'ParseAgain.noCR' , braces )
+ * ( braces /
+ ( function ( s ) if s ~= '' then return LPEG1[lang] : match ( s ) end end ) )
* L ( P "}" )
% \end{macrocode}
%
% \bigskip
-% For |\\temporal|, the specification of the overlays (between angular brackets) is mandatory.
+% For |\\temporal|, the specification of the overlays (between angular brackets)
+% is mandatory.
% \begin{macrocode}
lpeg = lpeg +
L ( ( P "\\temporal" ) * "<" * ( 1 - P ">" ) ^ 0 * ">" * "{" )
- * K ( 'ParseAgain.noCR' , braces )
+ * ( braces
+ / ( function ( s )
+ if s ~= '' then return LPEG1[lang] : match ( s ) end end ) )
* L ( P "}{" )
- * K ( 'ParseAgain.noCR' , braces )
+ * ( braces
+ / ( function ( s )
+ if s ~= '' then return LPEG1[lang] : match ( s ) end end ) )
* L ( P "}{" )
- * K ( 'ParseAgain.noCR' , braces )
+ * ( braces
+ / ( function ( s )
+ if s ~= '' then return LPEG1[lang] : match ( s ) end end ) )
* L ( P "}" )
% \end{macrocode}
%
% \bigskip
% Now, the environments of Beamer.
% \begin{macrocode}
- for _ , x in ipairs ( list_beamer_env ) do
+ for _ , x in ipairs ( piton.beamer_environments ) do
lpeg = lpeg +
Ct ( Cc "Open"
* C (
@@ -5847,7 +5947,11 @@ local function Compute_Beamer ( lang , braces )
)
* (
( ( 1 - P ( "\\end{" .. x .. "}" ) ) ^ 0 )
- / ( function ( s ) return LPEG1[lang] : match ( s ) end )
+ / ( function ( s )
+ if s ~= ''
+ then return LPEG1[lang] : match ( s )
+ end
+ end )
)
* P ( "\\end{" .. x .. "}" )
* Ct ( Cc "Close" )
@@ -5959,6 +6063,17 @@ local Operator =
local OperatorWord =
K ( 'Operator.Word' , P "in" + "is" + "and" + "or" + "not" )
+% \end{macrocode}
+%
+% \smallskip
+% The keyword |in| in a construction such as ``|for i in range(n)|'' must be
+% formatted as a keyword and not as an |Operator.Word|.
+% \begin{macrocode}
+local For = K ( 'Keyword' , P "for" )
+ * Space
+ * Identifier
+ * Space
+ * K ( 'Keyword' , P "in" )
local Keyword =
K ( 'Keyword' ,
@@ -6195,15 +6310,18 @@ local ShortString = SingleShortString + DoubleShortString
% \bigskip
% \paragraph{Beamer}
%
+% The argument of |Compute_braces| must be a pattern \emph{which does no
+% catching} corresponding to the strings of the language.
+%
% \begin{macrocode}
local braces =
Compute_braces
(
- Q ( P "\"" + "r\"" + "R\"" + "f\"" + "F\"" )
- * ( "\"" * ( P "\\\"" + 1 - S "\"" ) ^ 0 * "\"" )
+ ( P "\"" + "r\"" + "R\"" + "f\"" + "F\"" )
+ * ( P "\\\"" + 1 - S "\"" ) ^ 0 * "\""
+
- Q ( P '\'' + 'r\'' + 'R\'' + 'f\'' + 'F\'' )
- * ( '\'' * ( P '\\\'' + 1 - S '\'' ) ^ 0 * '\'' )
+ ( P '\'' + 'r\'' + 'R\'' + 'f\'' + 'F\'' )
+ * ( P '\\\'' + 1 - S '\'' ) ^ 0 * '\''
)
if piton.beamer then Beamer = Compute_Beamer ( 'python' , braces ) end
% \end{macrocode}
@@ -6379,8 +6497,8 @@ local DefFunction =
* SkipSpace
* ( Q "->" * SkipSpace * K ( 'Name.Type' , identifier ) ) ^ -1
% \end{macrocode}
-% Here, we need a \pkg{piton} style |ParseAgain| which will be linked to
-% |\@@_piton:n| (that means that the capture will be parsed once again by
+% Here, we need a \pkg{piton} style |ParseAgain.noCR| which will be linked to
+% |\@@_piton_no_cr:n| (that means that the capture will be parsed once again by
% \pkg{piton}). We could avoid that kind of trick by using a non-terminal of a
% grammar but we have probably here a better legibility.
% \begin{macrocode}
@@ -6413,12 +6531,16 @@ local ExceptionInConsole = Exception * Q ( ( 1 - P "\r" ) ^ 0 ) * EOL
% \bigskip
% \paragraph{The main LPEG for the language Python}
%
+% \begin{macrocode}
+local EndKeyword = Space + Punct + Delim + EOL + Beamer + DetectedCommands + -1
+% \end{macrocode}
+%
% First, the main loop :
% \begin{macrocode}
local Main =
- space ^ 1 * -1
- + space ^ 0 * EOL
- + Space
+ -- space ^ 1 * -1
+ -- + space ^ 0 * EOL
+ Space
+ Tab
+ Escape + EscapeMath
+ CommentLaTeX
@@ -6429,16 +6551,17 @@ local Main =
+ ExceptionInConsole
+ Delim
+ Operator
- + OperatorWord * ( Space + Punct + Delim + EOL + -1 )
+ + OperatorWord * EndKeyword
+ ShortString
+ Punct
+ FromImport
+ RaiseException
+ DefFunction
+ DefClass
- + Keyword * ( Space + Punct + Delim + EOL + -1 )
+ + For
+ + Keyword * EndKeyword
+ Decorator
- + Builtin * ( Space + Punct + Delim + EOL + -1 )
+ + Builtin * EndKeyword
+ Identifier
+ Number
+ Word
@@ -6464,7 +6587,7 @@ LPEG2['python'] =
* Lc '\\@@_begin_line:'
* Prompt
* SpaceIndentation ^ 0
- * LPEG1['python']
+ * ( space ^ 1 * -1 + space ^ 0 * EOL + Main ) ^ 0
* -1
* Lc '\\@@_end_line:'
)
@@ -6555,7 +6678,7 @@ local DotNotation =
(
K ( 'Name.Module' , cap_identifier )
* Q "."
- * ( Identifier + Constructor + Q "(" + Q "[" + Q "{" )
+ * ( Identifier + Constructor + Q "(" + Q "[" + Q "{" ) ^ ( -1 )
+
Identifier
* Q "."
@@ -6613,10 +6736,13 @@ local Char =
% \paragraph{Beamer}
%
% \bigskip
+% The argument of |Compute_braces| must be a pattern \emph{which does no
+% catching} corresponding to the strings of the language.
+%
% \begin{macrocode}
-braces = Compute_braces ( "\"" * ( 1 - S "\"" ) ^ 0 * "\"" )
+local braces = Compute_braces ( "\"" * ( 1 - S "\"" ) ^ 0 * "\"" )
if piton.beamer then
- Beamer = Compute_Beamer ( 'ocaml' , "\"" * ( 1 - S "\"" ) ^ 0 * "\"" )
+ Beamer = Compute_Beamer ( 'ocaml' , braces ) -- modified 2024/07/24
end
% \end{macrocode}
%
@@ -6826,12 +6952,14 @@ local TypeParameter = K ( 'TypeParameter' , "'" * alpha * # ( 1 - P "'" ) )
% \bigskip
% \paragraph{The main LPEG for the language OCaml}
%
+% \begin{macrocode}
+local EndKeyword = Space + Punct + Delim + EOL + Beamer + DetectedCommands + -1
+% \end{macrocode}
+%
% First, the main loop :
% \begin{macrocode}
local Main =
- space ^ 1 * -1
- + space ^ 0 * EOL
- + Space
+ Space
+ Tab
+ Escape + EscapeMath
+ Beamer
@@ -6847,9 +6975,9 @@ local Main =
+ DefFunction
+ DefModule
+ Record
- + Keyword * ( Space + Punct + Delim + EOL + -1 )
- + OperatorWord * ( Space + Punct + Delim + EOL + -1 )
- + Builtin * ( Space + Punct + Delim + EOL + -1 )
+ + Keyword * EndKeyword
+ + OperatorWord * EndKeyword
+ + Builtin * EndKeyword
+ DotNotation
+ Constructor
+ Identifier
@@ -6872,7 +7000,7 @@ LPEG2['ocaml'] =
* BeamerBeginEnvironments
* Lc '\\@@_begin_line:'
* SpaceIndentation ^ 0
- * LPEG1['ocaml']
+ * ( space ^ 1 * -1 + space ^ 0 * EOL + Main ) ^ 0
* -1
* Lc '\\@@_end_line:'
)
@@ -6970,8 +7098,10 @@ String =
% \paragraph{Beamer}
%
% \bigskip
+% The argument of |Compute_braces| must be a pattern \emph{which does no
+% catching} corresponding to the strings of the language.
% \begin{macrocode}
-braces = Compute_braces ( "\"" * ( 1 - S "\"" ) ^ 0 * "\"" )
+local braces = Compute_braces ( "\"" * ( 1 - S "\"" ) ^ 0 * "\"" )
if piton.beamer then Beamer = Compute_Beamer ( 'c' , braces ) end
% \end{macrocode}
%
@@ -7015,12 +7145,14 @@ local LongComment =
% \bigskip
% \paragraph{The main LPEG for the language C}
%
+% \begin{macrocode}
+local EndKeyword = Space + Punct + Delim + EOL + Beamer + DetectedCommands + -1
+% \end{macrocode}
+%
% First, the main loop :
% \begin{macrocode}
local Main =
- space ^ 1 * -1
- + space ^ 0 * EOL
- + Space
+ Space
+ Tab
+ Escape + EscapeMath
+ CommentLaTeX
@@ -7034,9 +7166,9 @@ local Main =
+ Punct
+ DefFunction
+ DefClass
- + Type * ( Q "*" ^ -1 + Space + Punct + Delim + EOL + -1 )
- + Keyword * ( Space + Punct + Delim + EOL + -1 )
- + Builtin * ( Space + Punct + Delim + EOL + -1 )
+ + Type * ( Q "*" ^ -1 + EndKeyword )
+ + Keyword * EndKeyword
+ + Builtin * EndKeyword
+ Identifier
+ Number
+ Word
@@ -7060,7 +7192,7 @@ LPEG2['c'] =
* BeamerBeginEnvironments
* Lc '\\@@_begin_line:'
* SpaceIndentation ^ 0
- * LPEG1['c']
+ * ( space ^ 1 * -1 + space ^ 0 * EOL + Main ) ^ 0
* -1
* Lc '\\@@_end_line:'
)
@@ -7164,8 +7296,11 @@ local String = K ( 'String.Long' , "'" * ( 1 - P "'" ) ^ 1 * "'" )
% \paragraph{Beamer}
%
% \bigskip
+% The argument of |Compute_braces| must be a pattern \emph{which does no
+% catching} corresponding to the strings of the language.
+%
% \begin{macrocode}
-braces = Compute_braces ( String )
+local braces = Compute_braces ( "'" * ( 1 - P "'" ) ^ 1 * "'" )
if piton.beamer then Beamer = Compute_Beamer ( 'sql' , braces ) end
% \end{macrocode}
%
@@ -7203,6 +7338,9 @@ local LongComment =
% \bigskip
% \paragraph{The main LPEG for the language SQL}
%
+% \begin{macrocode}
+local EndKeyword = Space + Punct + Delim + EOL + Beamer + DetectedCommands + -1
+% \end{macrocode}
%
% \begin{macrocode}
local TableField =
@@ -7245,13 +7383,15 @@ local WeCatchTableNames =
* ( Space + EOL ) * OneTable
% \end{macrocode}
%
+% \begin{macrocode}
+local EndKeyword = Space + Punct + Delim + EOL + Beamer + DetectedCommands + -1
+% \end{macrocode}
+%
%
% First, the main loop :
% \begin{macrocode}
local Main =
- space ^ 1 * -1
- + space ^ 0 * EOL
- + Space
+ Space
+ Tab
+ Escape + EscapeMath
+ CommentLaTeX
@@ -7286,7 +7426,7 @@ LPEG2['sql'] =
* BeamerBeginEnvironments
* Lc [[ \@@_begin_line: ]]
* SpaceIndentation ^ 0
- * LPEG1['sql']
+ * ( space ^ 1 * -1 + space ^ 0 * EOL + Main ) ^ 0
* -1
* Lc [[ \@@_end_line: ]]
)
@@ -7314,7 +7454,12 @@ local String =
* Q "\""
)
-braces = Compute_braces ( String )
+% \end{macrocode}
+% The argument of |Compute_braces| must be a pattern \emph{which does no
+% catching} corresponding to the strings of the language.
+% \begin{macrocode}
+local braces = Compute_braces ( P "\"" * ( P "\\\"" + 1 - P "\"" ) ^ 1 * "\"" )
+
if piton.beamer then Beamer = Compute_Beamer ( 'minimal' , braces ) end
DetectedCommands = Compute_DetectedCommands ( 'minimal' , braces )
@@ -7328,9 +7473,7 @@ local Identifier = K ( 'Identifier' , identifier )
local Delim = Q ( S "{[()]}" )
local Main =
- space ^ 1 * -1
- + space ^ 0 * EOL
- + Space
+ Space
+ Tab
+ Escape + EscapeMath
+ CommentLaTeX
@@ -7352,7 +7495,7 @@ LPEG2['minimal'] =
* BeamerBeginEnvironments
* Lc [[ \@@_begin_line: ]]
* SpaceIndentation ^ 0
- * LPEG1['minimal']
+ * ( space ^ 1 * -1 + space ^ 0 * EOL + Main ) ^ 0
* -1
* Lc [[ \@@_end_line: ]]
)
@@ -7373,7 +7516,7 @@ function piton.Parse ( language , code )
local t = LPEG2[language] : match ( code )
if t == nil
then
- sprintL3 [[ \@@_error_or_warning:n { syntax~error } ]]
+ sprintL3 [[ \@@_error_or_warning:n { SyntaxError } ]]
return -- to exit in force the function
end
local left_stack = {}
@@ -7394,14 +7537,14 @@ function piton.Parse ( language , code )
%
% Here is an example of an item beginning with |"Open"|.
%
-% |{ "Open" , "\begin{uncover}<2>" , "\end{cover}" }|
+% |{ "Open" , "\begin{uncover}<2>" , "\end{uncover}" }|
%
% In order to deal with the ends of lines, we have to close the environment
-% (|{cover}| in this example) at the end of each line and reopen it at the
+% (|{uncover}| in this example) at the end of each line and reopen it at the
% beginning of the new line. That's why we use two Lua stacks, called
% |left_stack| and |right_stack|. |left_stack| will be for the elements like
% |\begin{uncover}<2>| and |right_stack| will be for the elements like
-% |\end{cover}|.
+% |\end{uncover}|.
% \begin{macrocode}
if one_item[1] == "Open" then
tex.sprint( one_item[2] )
@@ -7606,11 +7749,30 @@ function piton.GobbleParse ( lang , n , code )
piton.last_code = gobble ( n , code )
piton.last_language = lang
% \end{macrocode}
+% We count the number of lines of the informatic code. The result will be stored
+% by Lua in |\l_@@_nb_lines_int|. That information will be used to allow or
+% disallow page breaks (when |splittable| is in force).
+% \begin{macrocode}
+ piton.CountLines ( piton.last_code )
+ sprintL3 [[ \bool_if:NT \g_@@_footnote_bool \savenotes ]]
+% \end{macrocode}
+% We begin a |\vtop| for an non-splittable block of lines.
% \begin{macrocode}
- sprintL3 [[ \bool_if:NT \g_@@_footnote_bool \savenotes \vtop \bgroup ]]
+ sprintL3 [[ \vtop \bgroup ]]
piton.Parse ( lang , piton.last_code )
- sprintL3
- [[\vspace{2.5pt}\egroup\bool_if:NT\g_@@_footnote_bool\endsavenotes\par]]
+% \end{macrocode}
+% We close the latest opened |\vtop| with the following |\egroup|. Be careful:
+% that |\vtop| is \emph{not} necessarily the |\vtop| opened two lines above
+% because the commands |\@@_newline:| inserted by Lua may open and close
+% |\vtop|s and start and finish paragraphs (when |splittable| is in force).
+% \begin{macrocode}
+ sprintL3 [[ \vspace{2.5pt} \egroup ]]
+ sprintL3 [[ \bool_if:NT \g_@@_footnote_bool \endsavenotes ]]
+% \end{macrocode}
+% We finish the paragraph (each block of non-splittable lines of code is
+% composed in a |\vtop| inserted in a paragraph).
+% \begin{macrocode}
+ sprintL3 [[ \par ]]
% \end{macrocode}
%
% Now, if the final user has used the key |write| to write the code of the
@@ -7628,7 +7790,9 @@ end
% The following function will be used when the key |split-on-empty-lines| is in
% force. With that key, the informatic code is split in chunks at the empty
% lines (usually between the informatic functions defined in the informatic
-% code). LaTeX will be able to change the page between the chunks.
+% code). LaTeX will be able to change the page between the chunks. The second
+% argument |n| corresponds to the value of the key |gobble| (number of spaces to
+% gobble).
% \begin{macrocode}
function piton.GobbleSplitParse ( lang , n , code )
P { "E" ,
@@ -7637,7 +7801,7 @@ function piton.GobbleSplitParse ( lang , n , code )
/ ( function ( x ) sprintL3 [[ \@@_incr_visual_line: ]] end )
) ^ 1
/ ( function ( x )
- sprintL3 [[ \l_@@_split_separation_tl \int_gzero:N \g_@@_line_int ]]
+ sprintL3 ( piton.string_between_chunks )
end )
) ^ 0 * V "F" ,
% \end{macrocode}
@@ -7645,7 +7809,7 @@ function piton.GobbleSplitParse ( lang , n , code )
% \begin{macrocode}
F = C ( V "G" ^ 0 )
% \end{macrocode}
-% The second argument of |.pitonGobbleParse| is the argument |gobble|: we put
+% The second argument of |piton.GobbleSplitParse| is the argument |gobble|: we put
% that argument to~$0$ because we will have gobbled previously the whole argument
% |code| (see below).
% \begin{macrocode}
@@ -7654,10 +7818,24 @@ function piton.GobbleSplitParse ( lang , n , code )
% The non-terminal |G| corresponds to a non-empty line of code.
% \begin{macrocode}
G = ( 1 - P "\r" ) ^ 0 * "\r" - ( P " " ^ 0 * "\r" )
+ + ( ( 1 - P "\r" ) ^ 1 * -1 - ( P " " ^ 0 * -1 ) )
} : match ( gobble ( n , code ) )
end
% \end{macrocode}
%
+% \bigskip
+% The following Lua string will be inserted between the chunks of code created
+% when the key |split-on-empty-lines| is in force. It's used only once: you have
+% given a name to that Lua string only for legibily. The token list
+% |\l_@@_split_separation_tl| corresponds to the key |split-separation|. That
+% token list must contain elements inserted in \emph{vertical mode} of TeX.
+% \begin{macrocode}
+piton.string_between_chunks =
+ [[ \par \l_@@_split_separation_tl \mode_leave_vertical: ]]
+ .. [[ \int_gzero:N \g_@@_line_int ]]
+% \end{macrocode}
+% The counter |\g_@@_line_int| will be used to control the points where the code
+% may be broken by a change of page (see the key |splittable|).
%
% \bigskip
% The following public Lua function is provided to the developer.
@@ -7672,14 +7850,23 @@ end
% \subsubsection{To count the number of lines}
%
% \medskip
+% The following function is only used once (in |piton.GobbleParse|). We have
+% written an autonomous function only for legibility. The number of lines of the
+% code will be stored in |\l_@@_nb_lines_int| and will be used to allow or
+% disallow line breaks (when |splittable| is in force).
% \begin{macrocode}
function piton.CountLines ( code )
local count = 0
for i in code : gmatch ( "\r" ) do count = count + 1 end
- sprintL3 ( [[ \int_set:Nn \l_@@_nb_lines_int { ]] .. count .. '}' )
+ sprintL3 ( string.format ( [[ \int_set:Nn \l_@@_nb_lines_int { % i } ]] , count ) )
end
% \end{macrocode}
%
+% \bigskip
+% The following function is only used once (in |piton.GobbleParse|). We have
+% written an autonomous function only for legibility. The number of lines of the
+% code will be stored in |\l_@@_nb_non_empty_lines_int|. It will be used to
+% compute the largest number of lines to write (when |line-numbers| is in force).
% \begin{macrocode}
function piton.CountNonEmptyLines ( code )
local count = 0
@@ -7690,7 +7877,8 @@ function piton.CountNonEmptyLines ( code )
* -1
) / table.getn
) : match ( code )
- sprintL3 ( [[ \int_set:Nn \l_@@_nb_non_empty_lines_int { ]] .. count .. '}' )
+ sprintL3
+ ( string.format ( [[ \int_set:Nn \l_@@_nb_non_empty_lines_int { % i } ]] , count ) )
end
% \end{macrocode}
%
@@ -7699,7 +7887,8 @@ end
function piton.CountLinesFile ( name )
local count = 0
for line in io.lines ( name ) do count = count + 1 end
- sprintL3 ( [[ \int_set:Nn \l_@@_nb_lines_int { ]] .. count .. '}' )
+ sprintL3
+ ( string.format ( [[ \int_set:Nn \l_@@_nb_lines_int { %i } ]], count))
end
% \end{macrocode}
%
@@ -7713,7 +7902,8 @@ function piton.CountNonEmptyLinesFile ( name )
count = count + 1
end
end
- sprintL3 ( [[ \int_set:Nn \l_@@_nb_non_empty_lines_int { ]] .. count .. '}' )
+ sprintL3
+ ( string.format ( [[ \int_set:Nn \l_@@_nb_non_empty_lines_int { % i } ]] , count ) )
end
% \end{macrocode}
%
@@ -7813,7 +8003,7 @@ function piton.new_language ( lang , definition )
% |tag| (mainly for the language \textsc{html}) for the character |/| in the
% closing tags |</....>|).
% \begin{macrocode}
- other = other + P "c"
+ other = other + P ( c )
end
end
% \end{macrocode}
@@ -8046,6 +8236,7 @@ function piton.new_language ( lang , definition )
% the strings.
% \begin{macrocode}
local long_string = P ( false )
+ local Long_string = P ( false )
local LongString = P (false )
local central_pattern = P ( false )
for _ , x in ipairs ( def_table ) do
@@ -8072,7 +8263,15 @@ function piton.new_language ( lang , definition )
else prefix = P ( true )
end
% \end{macrocode}
-% We can write the pattern which matches the string.
+% First, a pattern \emph{without captures} (needed to compute |braces|).
+% \begin{macrocode}
+ long_string = long_string +
+ prefix
+ * arg3
+ * ( space + central_pattern ) ^ 0
+ * arg4
+% \end{macrocode}
+% Now a pattern \emph{with captures}.
% \begin{macrocode}
local pattern =
prefix
@@ -8080,18 +8279,20 @@ function piton.new_language ( lang , definition )
* ( VisualSpace + Q ( central_pattern ^ 1 ) + EOL ) ^ 0
* Q ( arg4 )
% \end{macrocode}
-% First, we create |long_string| because we need that \textsc{lpeg} in the
-% nested comments.
+% We will need |Long_string| in the nested comments.
% \begin{macrocode}
- long_string = long_string + pattern
+ Long_string = Long_string + pattern
LongString = LongString +
Ct ( Cc "Open" * Cc ( "{" .. arg2 .. "{" ) * Cc "}}" )
* pattern
* Ct ( Cc "Close" )
end
end
-
- local braces = Compute_braces ( String )
+% \end{macrocode}
+% The argument of |Compute_braces| must be a pattern \emph{which does no
+% catching} corresponding to the strings of the language.
+% \begin{macrocode}
+ local braces = Compute_braces ( long_string )
if piton.beamer then Beamer = Compute_Beamer ( lang , braces ) end
DetectedCommands = Compute_DetectedCommands ( lang , braces )
@@ -8208,12 +8409,7 @@ function piton.new_language ( lang , definition )
%
% \begin{macrocode}
local Main =
- space ^ 1 * -1
-% \end{macrocode}
-% The spaces at the end of the lines are discarded.
-% \begin{macrocode}
- + space ^ 0 * EOL
- + Space
+ Space
+ Tab
+ Escape + EscapeMath
+ CommentLaTeX
@@ -8249,7 +8445,7 @@ function piton.new_language ( lang , definition )
* BeamerBeginEnvironments
* Lc [[\@@_begin_line:]]
* SpaceIndentation ^ 0
- * LPEG1[lang]
+ * ( space ^ 1 * -1 + space ^ 0 * EOL + Main ) ^ 0
* -1
* Lc [[\@@_end_line:]]
)
@@ -8327,6 +8523,12 @@ end
%
% \verb|https://github.com/fpantigny/piton|
%
+% \subsection*{Changes between versions 3.0 and 3.1}
+%
+% Keys |line-numbers/format|, |detected-beamer-commands| and
+% |detected-beamer-environments|.
+%
+%
% \subsection*{Changes between versions 2.8 and 3.0}
%
% New command |\NewPitonLanguage|. Thanks to that command, it's now possible to
@@ -8396,61 +8598,6 @@ end
% The key |escape-inside| is deprecated: use |begin-escape| and |end-escape|.
%
%
-% \subsection*{Changes between versions 1.6 and 2.0}
-%
-% The extension \pkg{piton} now supports the computer languages OCaml and C
-% (and, of course, Python).
-%
-% \subsection*{Changes between versions 1.5 and 1.6}
-%
-% New key |width| (for the total width of the listing).
-%
-% New style |UserFunction| to format the names of the Python functions
-% previously defined by the user. Command |\PitonClearUserFunctions| to clear
-% the list of such functions names.
-%
-% \subsection*{Changes between versions 1.4 and 1.5}
-%
-% New key |numbers-sep|.
-%
-%
-% \subsection*{Changes between versions 1.3 and 1.4}
-%
-% New key |identifiers| in |\PitonOptions|.
-%
-% New command |\PitonStyle|.
-%
-% |background-color| now accepts as value a \emph{list} of colors.
-%
-% \subsection*{Changes between versions 1.2 and 1.3}
-%
-% When the class Beamer is used, the environment |{Piton}| and the command
-% |\PitonInputFile| are ``overlay-aware'' (that is to say, they accept a
-% specification of overlays between angular brackets).
-%
-% New key |prompt-background-color|
-%
-% It's now possible to use the command |\label| to reference a line of code in
-% an environment |{Piton}|.
-%
-% A new command |\|⣠is available in the argument of the command |\piton{...}| to
-% insert a space (otherwise, several spaces are replaced by a single space).
-%
-% \subsection*{Changes between versions 1.1 and 1.2}
-%
-% New keys |break-lines-in-piton| and |break-lines-in-Piton|.
-%
-% New key |show-spaces-in-string| and modification of the key |show-spaces|.
-%
-% When the class \cls{beamer} is used, the environments |{uncoverenv}|,
-% |{onlyenv}|, |{visibleenv}| and |{invisibleenv}|
-%
-%
-% \subsection*{Changes between versions 1.0 and 1.1}
-%
-% The extension \pkg{piton} detects the class \cls{beamer} and activates the
-% commands |\action|, |\alert|, |\invisible|, |\only|, |\uncover| and |\visible|
-% in the environments |{Piton}| when the class \cls{beamer} is used.
%
% \tableofcontents
%
diff --git a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
index a7e44a487e7..625a35848c0 100644
--- a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
+++ b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
@@ -85,9 +85,9 @@ See source file '\inFileName' for licencing and contact information.
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{luamplib.drv}%
- [2024/07/14 v2.33.1 Interface for using the mplib library]%
+ [2024/08/03 v2.34.5 Interface for using the mplib library]%
\documentclass{ltxdoc}
-\usepackage{metalogo,multicol,mdwlist,fancyvrb,xspace}
+\usepackage{metalogo,multicol,xspace}
\usepackage[x11names]{xcolor}
%
\def\primarycolor{DodgerBlue4} %%-> rgb 16 78 139 | #104e8b
@@ -123,7 +123,9 @@ See source file '\inFileName' for licencing and contact information.
\newcommand*\email [1] {<\href{mailto:#1}{#1}>}
\newcommand \file {\nolinkurl}
-\newcommand \pk {\textsf}
+
+\newcommand*\metapost {\textsc{metapost}\xspace}
+\newcommand*\mplib {\pkg{mplib}\xspace}
\begin{document}
\DocInput{luamplib.dtx}%
@@ -149,32 +151,32 @@ See source file '\inFileName' for licencing and contact information.
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
%
-% \title{The \textsf{luamplib} package}
+% \title{The \pkg{luamplib} package}
% \author{Hans Hagen, Taco Hoekwater, Elie Roux, Philipp Gesang and Kim Dohyun\\
% Current Maintainer: Kim Dohyun\\
% Support: \url{https://github.com/lualatex/luamplib}}
-% \date{2024/07/14 v2.33.1}
+% \date{2024/08/03 v2.34.5}
%
% \maketitle
%
% \begin{abstract}
-% Package to have metapost code typeset directly in a document with \LuaTeX.
+% Package to have \metapost code typeset directly in a document with \LuaTeX.
% \end{abstract}
%
% \section{Documentation}
%
-% This package aims at providing a simple way to typeset directly metapost
+% 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.
+% \mplib library, that runs \metapost code. This package is basically a
+% wrapper for the Lua \mplib functions and some \TeX\
+% functions to have the output of the \mplib functions in the pdf.
%
-% Using this package is easy: in Plain, type your metapost code between the
+% 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.
+% |mplibcode| environment.
%
-% The resulting metapost figures are put in a \TeX\ \texttt{hbox} with dimensions
-% adjusted to the metapost code.
+% The resulting \metapost figures are put in a \TeX\ |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
@@ -183,18 +185,18 @@ See source file '\inFileName' for licencing and contact information.
%
% \begin{itemize}
% \item possibility to use |btex ... etex| to typeset \TeX\ code.
-% |textext()| is a more versatile macro equivalent to |TEX()| from \textsf{TEX.mp}.
+% |textext()| is a more versatile macro equivalent to |TEX()| from \pkg{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.
+% \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}.
+% be the same as the stand-alone \pkg{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}.
+% The treatment of |verbatimtex| command has changed a lot since v2.20:
+% see \hyperlink{mpliblegacybehavior}{below \S\,1.1}.
%
% \item in the past,
% the package required PDF mode in order to have some output.
@@ -203,96 +205,110 @@ See source file '\inFileName' for licencing and contact information.
% \end{itemize}
%
% It seems to be convenient to divide the explanations of some more changes and cautions
-% into three parts: \TeX, MetaPost, and Lua interfaces.
+% into three parts: \TeX, \textsc{MetaPost}, and Lua interfaces.
%
% \subsection{\TeX}
%
% \paragraph{\cs{mplibforcehmode}}
-% When this macro is declared, every metapost 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
+% will have effects. \cs{mplibnoforcehmode}, being default, reverts this
+% setting. (Actually these commands redefine \cs{prependtomplibbox}; you
% can redefine this command with anything suitable before a box.)
%
% \paragraph{\cs{everymplib\{...\}}, \cs{everyendmplib\{...\}}}
% \cs{everymplib} and \cs{everyendmplib} redefine
-% the lua table containing metapost code
+% the lua table containing \metapost code
% which will
-% be automatically inserted at the beginning and ending of each metapost code chunk.
-% \begin{verbatim}
+% 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}
+%\end{verbatim}
%
-% \paragraph{\cs{mplibsetformat\{plain\char"7C metafun\}}}
-% There are (basically) two formats for metapost: \emph{plain} and
+% \paragraph{\cs{mplibsetformat\{plain\textbar 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>}|}|.
+% \cs{mplibsetformat\{<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) and shading (gradient colors) effects
+% 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).
+% and outlinetext is supported by our own alternative |mpliboutlinetext|
+% (see \hyperlink{mpliboutlinetext}{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>}|"|, where
-% $0 \le \hbox{\emph{<number>}} \le 1$, to the sentence.
+% just by appending |withprescript| |"tr_transparency=<number>"| to the sentence.
+% ($0 \le \hbox{\emph{<number>}} \le 1$)
+%
+% \hypertarget{metafunformat}{}\relax
+% 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.
+% Transparency group is available with \emph{plain} format as well, with extended functionality.
+% See \hyperlink{transparencygroup}{below \S\,1.2}.
%
% 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.
+% interpreted as a \pkg{color}, \pkg{xcolor} or \pkg{l3color}'s expression.
%
-% \paragraph{\cs{mplibnumbersystem\{scaled\char"7C double\char"7C decimal\}}}
+% \paragraph{\cs{mplibnumbersystem\{scaled\textbar double\textbar 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\}}}
+% \paragraph{\cs{mplibshowlog\{enable\textbar disable\}}}
% Default: |disable|.
-% When |\mplibshowlog{enable}|\footnote{As for user's setting,
+% When \cs{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.
+% 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}|
+% \paragraph{\cs{mpliblegacybehavior\{enable\textbar disable\}}}
+% \hypertarget{mpliblegacybehavior}{}\relax
+% By default, \cs{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,
+% 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}
+%\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|.
%
% On the other hand, \TeX\ code in |verbatimtex ... etex|
% between |beginfig()| and |endfig| will be inserted
-% after flushing out the metapost figure.
+% after flushing out the \metapost figure.
% As shown in the example below, |VerbatimTeX()| is a synonym of |verbatimtex| |...| |etex|.
-% \begin{verbatim}
+%\begin{verbatim}
% \mplibcode
% D := sqrt(2)**7;
% beginfig(0);
@@ -301,15 +317,15 @@ See source file '\inFileName' for licencing and contact information.
% endfig;
% \endmplibcode
% diameter: \Dia bp.
-% \end{verbatim}
+%\end{verbatim}
%
% By contrast,
-% when |\mpliblegacybehavior{disabled}| is declared, any
+% when \cs{mpliblegacybehavior\{disable\}} 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
% following |btex| |...| |etex| codes.
-% \begin{verbatim}
+%\begin{verbatim}
% \begin{mplibcode}
% beginfig(0);
% draw btex ABC etex;
@@ -318,11 +334,11 @@ 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{mplibtextextlabel\{enable\char"7C disable\}}}
+% \paragraph{\cs{mplibtextextlabel\{enable\textbar disable\}}}
% Default: |disable|.
-% |\mplibtextextlabel{enable}| enables
+% \cs{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)|.
@@ -334,24 +350,24 @@ See source file '\inFileName' for licencing and contact information.
% Also take care of |char| operator in the left side argument,
% as this might bring unpermitted characters into \TeX.
%
-% \paragraph{\cs{mplibcodeinherit\{enable\char"7C disable\}}}
+% \paragraph{\cs{mplibcodeinherit\{enable\textbar 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
+% \cs{mplibcodeinherit\{enable\}} enables the inheritance
+% of variables, constants, and macros defined by previous \metapost code chunks.
+% On the contrary, \cs{mplibcodeinherit\{disable\}} will make
% each code chunk being treated as an independent instance, never
% affected by previous code chunks.
%
-% \paragraph{Separate MetaPost instances}
-% luamplib 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.
% Plain \TeX\ users also can use this functionality.
% The syntax for \LaTeX\ is:
-% \begin{verbatim}
+%\begin{verbatim}
% \begin{mplibcode}[instanceName]
% % some mp code
% \end{mplibcode}
-% \end{verbatim}
+%\end{verbatim}
% The behavior is as follows.
% \begin{itemize}
% \item All the variables and functions are shared
@@ -371,19 +387,19 @@ See source file '\inFileName' for licencing and contact information.
% Unnamed \cs{everymplib} affects not only those instances with no name,
% but also those with name but with no corresponding \cs{everymplib}.
% The syntax is:
-% \begin{verbatim}
+%\begin{verbatim}
% \everymplib[instanceName]{...}
% \everyendmplib[instanceName]{...}
-% \end{verbatim}
+%\end{verbatim}
%
-% \paragraph{\cs{mplibglobaltextext\{enable\char"7C disable\}}}
+% \paragraph{\cs{mplibglobaltextext\{enable\textbar disable\}}}
% Default: |disable|.
-% Formerly, to inherit |btex| |...| |etex| boxes as well as other metapost macros, variables and constants,
+% 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 enabled.
-% This optinal command still remains mostly for backward compatibility.
-% \begin{verbatim}
+% This optional command still remains mostly for backward compatibility.
+%\begin{verbatim}
% \mplibcodeinherit{enable}
% %\mplibglobaltextext{enable}
% \everymplib{ beginfig(0);} \everyendmplib{ endfig;}
@@ -395,47 +411,49 @@ See source file '\inFileName' for licencing and contact information.
% \mplibcode
% currentpicture := pic scaled 2;
% \endmplibcode
-% \end{verbatim}
+%\end{verbatim}
%
-% \paragraph{\cs{mplibverbatim\{enable\char"7C disable\}}}
+% \paragraph{\cs{mplibverbatim\{enable\textbar disable\}}}
% Default: |disable|.
-% Users can issue |\mplibverbatim{enable}|, after which
+% Users can issue \cs{mplibverbatim\{enable\}}, after which
% the contents of mplibcode environment will be read verbatim. As a result,
-% except for |\mpdim| and |\mpcolor| (see below), all other \TeX\ commands outside of the
+% except for \cs{mpdim} and \cs{mpcolor} (see \hyperlink{mpdim}{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.
+% literally to the \mplib library.
%
% \paragraph{\cs{mpdim\{...\}}}
+% \hypertarget{mpdim}{}\relax
% 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}
+% in the mplibcode environment. This feature is inpired by \pkg{gmp} package authored by
+% Enrico Gregorio. Please refer to the manual of \pkg{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}
+%\end{verbatim}
%
% \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
+% \pkg{color}, \pkg{xcolor} and \pkg{l3color} module/packages can be used in the mplibcode
+% environment (after |withcolor| operator).
+% See the example \hyperlink{mpdim}{above}.
+% The optional |[...]| denotes the option of \pkg{xcolor}'s \cs{color} command.
+% For spot colors, \pkg{l3color} (in PDF/DVI mode),
+% \pkg{colorspace}, \pkg{spotcolor}
+% (in PDF mode) and \pkg{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.
+% we also provide unexpandable \TeX\ macros \cs{mpfig} |...| \cs{endmpfig} and its starred version
+% \cs{mpfig*} |...| \cs{endmpfig} to save typing toil.
% The former is roughly the same as follows:
-% \begin{verbatim}
+%\begin{verbatim}
% \begin{mplibcode}[@mpfig]
% beginfig(0)
% token list declared by \everymplib[@mpfig]
@@ -443,40 +461,40 @@ See source file '\inFileName' for licencing and contact information.
% token list declared by \everyendmplib[@mpfig]
% endfig;
% \end{mplibcode}
-% \end{verbatim}
+%\end{verbatim}
% and the starred version is roughly the same as follows:
-% \begin{verbatim}
+%\begin{verbatim}
% \begin{mplibcode}[@mpfig]
% ...
% \end{mplibcode}
-% \end{verbatim}
-% In these macros |\mpliblegacybehavior{disable}|
+%\end{verbatim}
+% In these macros \cs{mpliblegacybehavior\{disable\}}
% is forcibly declared.
-% Again, as both share the same instance name, metapost codes are inherited among them.
+% Again, as both share the same instance name, \metapost codes are inherited among them.
% A simple example:
-% \begin{verbatim}
+%\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}
+%\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.
+% \cs{mpfiginstancename}, after which a new \mplib instance will start and
+% code inheritance too will begin anew. \cs{let}\cs{mpfiginstancename}\cs{empty} will
+% prevent code inheritance if \cs{mplibcodeinherit\{true\}} is not declared.
%
% \paragraph{About cache 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.
+% if nececcsary, before returning their paths to \LuaTeX's \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>,...]}|
+% \item \cs{mplibmakenocache\{<filename>[,<filename>,...]\}}
+% \item \cs{mplibcancelnocache\{<filename>[,<filename>,...]\}}
% \end{itemize}
% where |<filename>| is a filename excluding |.mp| extension.
% Note that |.mp| files under |$TEXMFMAIN/metapost/base| and
@@ -491,9 +509,9 @@ See source file '\inFileName' for licencing and contact information.
% command-line option.
%
% Users can change this behavior by the command
-% |\mplibcachedir{<directory path>}|, where tilde (|~|) is interpreted
+% \cs{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
+% As backslashes (\cs{}) should be escaped by users, it would be easier to use
% slashes (|/|) instead.
%
% \paragraph{About figure box metric}
@@ -509,44 +527,46 @@ See source file '\inFileName' for licencing and contact information.
% Frequently used settings such as \cs{everymplib}, \cs{mplibforcehmode}
% or \cs{mplibcodeinherit} are suitable for going into this file.
%
-% \subsection{MetaPost}
+% \subsection{\textsc{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,
+% These are \metapost interfaces for the \TeX\ commands
+% \cs{mpdim} and \cs{mpcolor} (see \hyperlink{mpdim}{above}). For example,
+% |mplibdimen("\linewidth")| is basically the same as \cs{mpdim\{\cs{linewidth}\}}, and
+% |mplibcolor("red!50")| is basically the same as \cs{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
+% |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}
+%\begin{verbatim}
% color col;
% col := mplibtexcolor "olive!50";
-% \end{verbatim}
+%\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:
+% Therefore the example shown above would raise a \metapost error:
% |cmykcolor col;| should have been declared.
% By contrast, |mplibrgbtexcolor| \emph{<string>} always returns rgb model expressions.
%
% \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).
+% |mplibgraphictext| is a \metapost operator, the effect of which is similar to that of
+% \ConTeXt's |graphictext| or our own |mpliboutlinetext|
+% (see \hyperlink{mpliboutlinetext}{below}).
% However the syntax is somewhat different.
-% \begin{verbatim}
+%\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 the color expressions are given in string type, they are regarded as
-% \textsf{xcolor}'s or \textsf{l3color}'s expressions.
+% \pkg{color}, \pkg{xcolor} or \pkg{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
@@ -560,20 +580,20 @@ See source file '\inFileName' for licencing and contact information.
% 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,
+% in DVI mode, \pkg{unicode-math} package is needed for math formula,
% as we cannot embolden type1 fonts in DVI mode.
%
% \paragraph{\texttt{mplibglyph ... of ...}}
-% From v2.30, we provide a new metapost operator |mplibglyph|, which returns a metapost picture
+% 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}
+% When a type1 font is specified, \metapost primitive |glyph| will be called.
+%\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.
@@ -585,67 +605,83 @@ See source file '\inFileName' for licencing and contact information.
%
% \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.
+% 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.
%
% \leavevmode\llap{\textcolor{red}{☞}\kern1.2\parindent}\relax
-% To apply the nonzero winding number rule to a picture containg paths,
+% To apply the nonzero winding number rule to a picture containing 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,
+% If you want the even-odd rule instead, you can, with \emph{plain} format as well,
% 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
+% \hypertarget{mpliboutlinetext}{}\relax
+% From v2.31, a new \metapost operator |mpliboutlinetext| is available, which mimicks
+% \emph{metafun}'s |outlinetext|. So the syntax is the same: see the \emph{metafun}
% manual \S\,8.7 (|texdoc metafun|). A simple example:
-% \begin{verbatim}
+%\begin{verbatim}
% draw mpliboutlinetext.b ("$\sqrt{2+\alpha}$")
% (withcolor \mpcolor{red!50})
% (withpen pencircle scaled .2 withcolor red)
% scaled 2 ;
-% \end{verbatim}
+%\end{verbatim}
% After the process, |mpliboutlinepic[]|
% and |mpliboutlinenum| will be preserved as global variables;
-% |mpliboutlinepic[1]| \ldots{} |mpliboutlinepic[mpliboutlinenum]|
+% |mpliboutlinepic[1]| |...| |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\{...\}} \texttt{...} \cs{endmppattern}, \texttt{... withpattern ...}}
+% \paragraph{\cs{mppattern\{...\} ...} \cs{endmppattern}, \texttt{... withpattern ...}}
+% \hypertarget{mppattern}{}\relax
% \TeX\ macros
-% |\mppattern{<name>}| \ldots\ |\endmppattern| define a tiling pattern
+% \cs{mppattern\{<name>\}} |...| \cs{endmppattern} define a tiling pattern
% associated with the |<name>|.
-% MetaPost operator |withpattern|, the syntax being
-% \emph{<path>} |withpattern| \emph{<string>}, will return a metapost picture which fills
-% the given path with a tiling pattern of the |<name>|
+% \metapost operator |withpattern|, the syntax being
+% \emph{<path>}\,\textbar\,\emph{<textual picture>} |withpattern| \emph{<string>},
+% will return a \metapost picture which fills
+% the given path or text with a tiling pattern of the |<name>|
% by replicating it horizontally and vertically.
+% The \emph{textual picture} here means any text typeset by \TeX, mostly the result
+% of the |btex| command (though technically this is not a true textual picture)
+% or the |infont| operator.
+%
% An example:
-% \begin{verbatim}
-% \mppattern{mypatt} % or \begin{mppattern}{mypatt}
-% [ % options: see below
-% xstep = 10, ystep = 12,
-% matrix = {0,1,-1,0}, % or "0 1 -1 0"
-% ]
-% \mpfig % or any other TeX code,
-% picture q;
-% q := btex Q etex;
-% fill bbox q withcolor .8[red,white];
-% draw q withcolor .8red;
-% \endmpfig
-% \endmppattern % or \end{mppattern}
+%\begin{verbatim}
+% \mppattern{mypatt} % or \begin{mppattern}{mypatt}
+% [ % options: see below
+% xstep = 10,
+% ystep = 12,
+% matrix = {0, 1, -1, 0}, % or "0 1 -1 0"
+% ]
+% \mpfig % or any other TeX code,
+% draw (origin--(1,1))
+% scaled 10
+% withcolor 1/3[blue,white]
+% ;
+% draw (up--right)
+% scaled 10
+% withcolor 1/3[red,white]
+% ;
+% \endmpfig
+% \endmppattern % or \end{mppattern}
%
-% \mpfig
-% fill fullcircle scaled 100
-% withpostscript "collect" ;
-% draw unitsquare shifted - center unitsquare scaled 45
-% withpattern "mypatt"
-% withpostscript "evenodd" ;
-% \endmpfig
-% \end{verbatim}
+% \mpfig
+% draw fullcircle scaled 90
+% withpostscript "collect"
+% ;
+% draw fullcircle scaled 200
+% withpattern "mypatt"
+% withpen pencircle scaled 1
+% withcolor \mpcolor{red!50!blue!50}
+% withpostscript "evenodd"
+% ;
+% \endmpfig
+%\end{verbatim}
%
% The available options are listed in Table~\ref{tab:mppatternoptions}.
% \begin{table}
@@ -657,8 +693,8 @@ See source file '\inFileName' for licencing and contact information.
% |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*\\
+% |matrix| &\emph{table} or \emph{string} & |xx|, |yx|, |xy|, |yy| values\kern1pt* or MP transform code\\
% |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\\
@@ -668,7 +704,7 @@ See source file '\inFileName' for licencing and contact information.
% 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
+% As for |matrix| option, \metapost code such as `|rotated 30 slanted .2|' is allowed as well
% as string or table of four numbers. You can also set |xshift| and |yshift|
% values by using `|shifted|' operator. But when |xshift| or |yshift| option is explicitly
% given, they have precedence over the effect of `|shifted|' operator.
@@ -679,10 +715,10 @@ See source file '\inFileName' for licencing and contact information.
% is not needed in most cases.
%
% 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.
+% Uncolored pattern will be painted later by the color of a \metapost object.
% An example:
-% \begin{verbatim}
-% \begin{mppattern}{pattuncolored}
+%\begin{verbatim}
+% \begin{mppattern}{pattnocolor}
% [
% colored = false,
% matrix = "slanted .3 rotated 30",
@@ -702,7 +738,7 @@ See source file '\inFileName' for licencing and contact information.
% if j < length mpliboutlinepic[i]:
% withpostscript "collect"
% else:
-% withpattern "pattuncolored"
+% withpattern "pattnocolor"
% withpen pencircle scaled 1/2
% withcolor (i/4)[red,blue] % paints the pattern
% fi;
@@ -710,13 +746,29 @@ See source file '\inFileName' for licencing and contact information.
% endfor
% endfig;
% \end{mplibcode}
-% \end{verbatim}
+%\end{verbatim}
+% A much simpler and efficient way to obtain a similar result
+% (without colorful characters in this example)
+% is to give a \emph{textual picture} as the operand of |withpattern|:
+%\begin{verbatim}
+% \begin{mplibcode}
+% beginfig(2)
+% picture pic;
+% pic = mplibgraphictext "\bfseries\TeX"
+% fakebold 1/2
+% fillcolor 1/3[red,blue] % paints the pattern
+% drawcolor 2/3[red,blue]
+% scaled 10 ;
+% draw pic withpattern "pattnocolor" ;
+% endfig;
+% \end{mplibcode}
+%\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>},
+% \paragraph{\texttt{... withfademethod ...}}
+% This is a \metapost operator which makes the color of an object gradiently transparent.
+% The syntax is \emph{<path>}\texttt{\textbar}\emph{<picture>} |withfademethod| \emph{<string>},
% the latter being either |"linear"| or |"circular"|.
-% Though it is similar to the |withshademethod| provided by metafun,
+% Though it is similar to the |withshademethod| from \emph{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.
%
@@ -741,9 +793,11 @@ See source file '\inFileName' for licencing and contact information.
% 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.
+% Particularly, see the description \hyperlink{withgroupbbox}{below}
+% on the analogous macro |withgroupbbox|.
% \end{description}
% An example:
-% \begin{verbatim}
+%\begin{verbatim}
% \mpfig
% picture mill;
% mill = btex \includegraphics[width=100bp]{mill} etex;
@@ -754,31 +808,164 @@ See source file '\inFileName' for licencing and contact information.
% withfadeopacity (1, 0)
% ;
% \endmpfig
-% \end{verbatim}
+%\end{verbatim}
+%
+% \paragraph{\texttt{... asgroup ...}}
+% \hypertarget{transparencygroup}{}\relax
+% As said \hyperlink{metafunformat}{before},
+% transparency group is available with \emph{plain} as well as \emph{metafun} format.
+% The syntax is exactly the same:
+% \emph{<picture>} \textbar\ \emph{<path>} |asgroup|
+% |""| \textbar\ |"isolated"| \textbar\ |"knockout"| \textbar\ |"isolated,knockout"|,
+% which will return a \metapost picture.
+% It is called \emph{Transparency Group} because the objects contained in the group are composited
+% to produce a single object, so that outer transparency effect, if any,
+% will be applied to the group as a whole, not to the individual objects cumulatively.
+%
+% The additional feature provided by luamplib is that
+% you can reuse the group as many times as you want
+% in the \TeX{} code or in other \metapost code chunks,
+% with infinitesimal increase in the size of PDF file.
+% For this functionality we provide \TeX{} and \metapost macros as follows:
+% \begin{description}
+% \let\bfseries\relax
+% \item[|withgroupname| \emph{<string>}] associates a transparency group with the given name.
+% When this is not appended to the sentense with |asgroup| operator,
+% the default group name `|lastmplibgroup|' will be used.
+%
+% \item[\cs{usemplibgroup\{...\}}]
+% \hypertarget{usemplibgroup}{}\relax
+% is a \TeX\ command to reuse a transparency group of the name
+% once used.
+% Note that the position of the group will be origin-based:
+% in other words, lower-left corner of the group will be shifted to the origin.
+%
+% \item[|usemplibgroup| \emph{<string>}] is a \metapost command which will add
+% a transparency group of the name to the |currentpicture|.
+% Contrary to the \TeX\ command just mentioned,
+% the position of the group is the same as the original transparency group.
+%
+% \item[|withgroupbbox (|\emph{pair}|,|\emph{pair}|)|]
+% \hypertarget{withgroupbbox}{}\relax
+% sets the bounding box of the transparency group,
+% default value being |(llcorner p, urcorner p)|.
+% This option might be needed especially when you draw with a thick pen
+% a path that touches the boundary;
+% you would probably want to append to the sentense
+% `|withgroupbbox| |(bot| |lft| |llcorner| |p,| |top| |rt| |urcorner| |p)|',
+% supposing that the pen was selected by the |pickup| command.
+%
+% \end{description}
+% An example showing the difference between the \TeX\ and \metapost commands:
+%\begin{verbatim}
+% \mpfig
+% draw image(
+% fill fullcircle scaled 100 shifted 25right withcolor .5[blue,white];
+% fill fullcircle scaled 100 withcolor .5[red,white] ;
+% ) asgroup ""
+% withgroupname "mygroup";
+% draw (left--right) scaled 10;
+% draw (up--down) scaled 10;
+% \endmpfig
+%
+% \noindent
+% \clap{\vrule width 20pt height .25pt depth .25pt}%
+% \clap{\vrule width .5pt height 10pt depth 10pt}%
+% \usemplibgroup{mygroup}
+%
+% \mpfig
+% usemplibgroup "mygroup" rotated 15;
+% draw (left--right) scaled 10;
+% draw (up--down) scaled 10;
+% \endmpfig
+%\end{verbatim}
+%
+% Also note that normally the reused transparency groups are not affected by outer color commands.
+% However, if you have made the original transparency group using |withoutcolor| command,
+% colors will have effects on the uncolored objects in the group.
+%
+% \paragraph{\cs{mplibgroup\{...\} ...} \cs{endmplibgroup}}
+% These \TeX\ macros are described here in this subsection, as they are
+% deeply related to the |asgroup| operator.
+% Users can define a transparency group or a normal \emph{form XObject}
+% with these macros from \TeX\ side.
+% The syntax is similar to the \cs{mppattern} command (see \hyperlink{mppattern}{above}).
+% An example:
+%\begin{verbatim}
+% \mplibgroup{mygrx} % or \begin{mplibgroup}{mygrx}
+% [ % options: see below
+% asgroup="",
+% ]
+% \mpfig % or any other TeX code
+% pickup pencircle scaled 10;
+% draw (left--right) scaled 30 rotated 45 ;
+% draw (left--right) scaled 30 rotated -45 ;
+% \endmpfig
+% \endmplibgroup % or \end{mplibgroup}
+%
+% \usemplibgroup{mygrx}
+%
+% \mpfig
+% usemplibgroup "mygrx"
+% scaled 1.5
+% withprescript "tr_transparency=0.5" ;
+% \endmpfig
+%\end{verbatim}
+%
+% Availabe options, much fewer than those for \cs{mppattern},
+% are listed in Table~\ref{tab:mplibgroupoptions}.
+% Again, the width/height/depth values of the mplibgroup will be written down into the log file.
+% \begin{table}
+% \centering
+% \caption{options for \cs{mplibgroup}}\label{tab:mplibgroupoptions}
+% \begin{tabular}{lll}
+% \hline
+% Key & Value Type & Explanation\\
+% \hline
+% |asgroup| &\emph{string} & |""|, |"isolated"|, |"knockout"|, or |"isolated,knockout"|\\
+% |bbox| &\emph{table} or \emph{string} & |llx|, |lly|, |urx|, |ury| values\kern1pt*\\
+% |matrix| &\emph{table} or \emph{string} & |xx|, |yx|, |xy|, |yy| values\kern1pt*
+% or MP transform code\\
+% |resources| &\emph{string} & PDF resources if needed\\
+% \hline
+% & & \small *\,in string type, numbers are separated by spaces\\
+% \end{tabular}
+% \end{table}
+%
+% When |asgroup| option, including empty string, is not given,
+% a normal form XObject will be generated rather than a transparency group.
+% Thus the individual objects, not the XObject as a whole, will be affected
+% by outer transparency command.
+%
+% As shown in the example, you can reuse the mplibgroup once defined
+% using the \TeX\ command \cs{usemplibgroup} or
+% the \metapost command |usemplibgroup|.
+% The behavior of these commands is the same as that described \hyperlink{usemplibgroup}{above}.
+%
%
% \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,
+% 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 \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
+% 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)|
+% 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 from Lua side,
+% Users can access the Lua table containing \mplib instances, |luamplib.instances|,
+% 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 knots and the cyclicity of the path |unitsquare|, consecutively.
-% \begin{verbatim}
+%\begin{verbatim}
% \begin{mplibcode}[instance1]
% boolean b; b = 1 > 2;
% numeric n; n = 3;
@@ -796,13 +983,13 @@ See source file '\inFileName' for licencing and contact information.
% print(k, type(v)=='table' and table.concat(v,' ') or v)
% end
% }
-% \end{verbatim}
+%\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}
+% 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}
+%\end{verbatim}
% The second argument cannot be absent, but can be an empty string (|""|) which
% means that it has no instance name.
%
@@ -841,14 +1028,14 @@ See source file '\inFileName' for licencing and contact information.
luatexbase.provides_module {
name = "luamplib",
- version = "2.33.1",
- date = "2024/07/14",
+ version = "2.34.5",
+ date = "2024/08/03",
description = "Lua package to typeset Metapost with LuaTeX's MPLib.",
}
% \end{macrocode}
%
-% Use the |luamplib| namespace, since |mplib| is for the metapost library
+% Use the |luamplib| namespace, since |mplib| is for the \metapost library
% itself. \ConTeXt{} uses |metapost|.
% \begin{macrocode}
luamplib = luamplib or { }
@@ -884,7 +1071,6 @@ local function termorlog (target, text, kind)
if kind == "Error" then error() end
end
end
-
local function warn (...) -- beware '%' symbol
termorlog("term and log", select("#",...) > 1 and format(...) or ...)
end
@@ -900,7 +1086,7 @@ luamplib.showlog = luamplib.showlog or false
% \end{macrocode}
%
% This module is a stripped down version of libraries that are used by
-% \ConTeXt. Provide a few ``shortcuts'' expected by the imported code.
+% \ConTeXt. Provide a few ``shortcuts'' expected by the code.
% \begin{macrocode}
local tableconcat = table.concat
local tableinsert = table.insert
@@ -909,18 +1095,14 @@ local texsprint = tex.sprint
local texgettoks = tex.gettoks
local texgetbox = tex.getbox
local texruntoks = tex.runtoks
-
if not texruntoks then
err("Your LuaTeX version is too old. Please upgrade it to the latest")
end
-
local is_defined = token.is_defined
local get_macro = token.get_macro
-
local mplib = require ('mplib')
local kpse = require ('kpse')
local lfs = require ('lfs')
-
local lfsattributes = lfs.attributes
local lfsisdir = lfs.isdir
local lfsmkdir = lfs.mkdir
@@ -936,7 +1118,6 @@ local file = file or { }
local replacesuffix = file.replacesuffix or function(filename, suffix)
return (filename:gsub("%.[%a%d]+$","")) .. "." .. suffix
end
-
local is_writable = file.is_writable or function(name)
if lfsisdir(name) then
name = name .. "/_luam_plib_temp_file_"
@@ -958,14 +1139,11 @@ end
% \end{macrocode}
%
% |btex ... etex| in input |.mp| files will be replaced in finder.
-% Because of the limitation of MPLib regarding |make_text|,
+% Because of the limitation of \mplib regarding |make_text|,
% we might have to make cache files modified from input files.
% \begin{macrocode}
-local luamplibtime = kpse.find_file("luamplib.lua")
-luamplibtime = luamplibtime and lfsattributes(luamplibtime,"modification")
-
+local luamplibtime = lfsattributes(kpse.find_file"luamplib.lua", "modification")
local currenttime = os.time()
-
local outputdir, cachedir
if lfstouch then
for i,v in ipairs{'TEXMFVAR','TEXMF_OUTPUT_DIRECTORY','.','TEXMFOUTPUT'} do
@@ -1002,10 +1180,9 @@ function luamplib.getcachedir(dir)
end
end
end
-
% \end{macrocode}
%
-% Some basic MetaPost files not necessary to make cache files.
+% Some basic \metapost files not necessary to make cache files.
% \begin{macrocode}
local noneedtoreplace = {
["boxes.mp"] = true, -- ["format.mp"] = true,
@@ -1024,7 +1201,6 @@ local noneedtoreplace = {
["mp-tool.mpiv"] = true, ["mp-cont.mpiv"] = true,
}
luamplib.noneedtoreplace = noneedtoreplace
-
% \end{macrocode}
%
% |format.mp| is much complicated, so specially treated.
@@ -1046,7 +1222,6 @@ local function replaceformatmp(file,newfile,ofmodify)
lfstouch(newfile,currenttime,ofmodify)
return newfile
end
-
% \end{macrocode}
%
% Replace |btex ... etex| and |verbatimtex ... etex| in input files,
@@ -1056,7 +1231,6 @@ local name_b = "%f[%a_]"
local name_e = "%f[^%a_]"
local btex_etex = name_b.."btex"..name_e.."%s*(.-)%s*"..name_b.."etex"..name_e
local verbatimtex_etex = name_b.."verbatimtex"..name_e.."%s*(.-)%s*"..name_b.."etex"..name_e
-
local function replaceinputmpfile (name,file)
local ofmodify = lfsattributes(file,"modification")
if not ofmodify then return file end
@@ -1069,23 +1243,19 @@ local function replaceinputmpfile (name,file)
return nf.size == 0 and file or newfile
end
end
-
if name == "format.mp" then return replaceformatmp(file,newfile,ofmodify) end
-
local fh = ioopen(file,"r")
if not fh then return file end
local data = fh:read("*all"); fh:close()
-
% \end{macrocode}
% ``|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.
+% \LuaTeX\ manual, which is not the case of standalone \metapost though.
% \begin{macrocode}
local count,cnt = 0,0
data, cnt = data:gsub(btex_etex, "btex %1 etex ") -- space
count = count + cnt
data, cnt = data:gsub(verbatimtex_etex, "verbatimtex %1 etex;") -- semicolon
count = count + cnt
-
if count == 0 then
noneedtoreplace[name] = true
fh = ioopen(newfile,"w");
@@ -1095,7 +1265,6 @@ local function replaceinputmpfile (name,file)
end
return file
end
-
fh = ioopen(newfile,"w")
if not fh then return file end
fh:write(data); fh:close()
@@ -1105,8 +1274,8 @@ end
% \end{macrocode}
%
-% As the finder function for MPLib, use the |kpse| library and
-% make it behave like as if MetaPost was used. And replace it with
+% As the finder function for \mplib, use the |kpse| library and
+% make it behave like as if \metapost was used. And replace |.mp| files with
% cache files if needed.
% See also \#74, \#97.
% \begin{macrocode}
@@ -1118,12 +1287,10 @@ do
end
mpkpse = kpse.new(arg[exe], "mpost")
end
-
local special_ftype = {
pfb = "type1 fonts",
enc = "enc files",
}
-
function luamplib.finder (name, mode, ftype)
if mode == "w" then
if name and name ~= "mpout.log" then
@@ -1149,9 +1316,9 @@ end
% \end{macrocode}
%
-% Create and load MPLib instances.
-% We do not support ancient version of MPLib any more.
-% (Don't know which version of MPLib started to support
+% Create and load \mplib instances.
+% We do not support ancient version of \mplib any more.
+% (Don't know which version of \mplib started to support
% |make_text| and |run_script|; let the users find it.)
% \begin{macrocode}
local preamble = [[
@@ -1160,17 +1327,15 @@ local preamble = [[
let normalfontsize = fontsize;
input %s ;
]]
-
% \end{macrocode}
%
-% |plain| or |metafun|,
-% though we cannot support |metafun| format fully.
+% \emph{plain} or \emph{metafun},
+% though we cannot support \emph{metafun} format fully.
% \begin{macrocode}
local currentformat = "plain"
function luamplib.setformat (name)
currentformat = name
end
-
% \end{macrocode}
%
% v2.9 has introduced the concept of ``code inherit''
@@ -1179,7 +1344,6 @@ luamplib.codeinherit = false
local mplibinstances = {}
luamplib.instances = mplibinstances
local has_instancename = false
-
local function reporterror (result, prevlog)
if not result then
err("no result object returned")
@@ -1220,7 +1384,6 @@ local function reporterror (result, prevlog)
return log
end
end
-
% \end{macrocode}
%
% |lualibs-os.lua| installs a randomseed. When this file is not loaded,
@@ -1233,10 +1396,8 @@ local function luamplibload (name)
find_file = luamplib.finder,
% \end{macrocode}
% Make use of |make_text| and |run_script|, which will co-operate
-% with \LuaTeX's |tex.runtoks|. And we
-% provide |numbersystem| option since v2.4. Default value ``|scaled|''
-% can be changed by declaring |\mplibnumbersystem{double}|
-% or |\mplibnumbersystem{decimal}|.
+% with \LuaTeX's |tex.runtoks| or other Lua functions. And we
+% provide |numbersystem| option since v2.4.
% See \url{https://github.com/lualatex/luamplib/issues/21}.
% \begin{macrocode}
make_text = luamplib.maketext,
@@ -1247,7 +1408,7 @@ local function luamplibload (name)
extensions = 1,
}
% \end{macrocode}
-% Append our own MetaPost preamble to the preamble above.
+% Append our own \metapost preamble to the preamble above.
% \begin{macrocode}
local preamble = tableconcat{
format(preamble, replacesuffix(name,"mp")),
@@ -1264,7 +1425,6 @@ local function luamplibload (name)
log = reporterror(result)
return mpx, result, log
end
-
% \end{macrocode}
%
% Here, excute each |mplibcode| data,
@@ -1314,13 +1474,13 @@ end
% |dvipdfmx| is supported, though nobody seems to use it.
% \begin{macrocode}
local pdfmode = tex.outputmode > 0
+
% \end{macrocode}
%
% |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")
-
% \end{macrocode}
%
% |tex.scantoks| sometimes fail to read catcode properly, especially
@@ -1330,7 +1490,6 @@ local catat11 = luatexbase.registernumber("catcodetable@atletter")
local function run_tex_code (str, cat)
texruntoks(function() texsprint(cat or catlatex, str) end)
end
-
% \end{macrocode}
%
% Prepare textext box number containers, locals and globals.
@@ -1346,11 +1505,9 @@ local texboxes = { globalid = 0, localid = 4096 }
% For conversion of |sp| to |bp|.
% \begin{macrocode}
local factor = 65536*(7227/7200)
-
local textext_fmt = 'image(addto currentpicture doublepath unitsquare \z
-xscaled %f yscaled %f shifted (0,-%f) \z
-withprescript "mplibtexboxid=%i:%f:%f")'
-
+ xscaled %f yscaled %f shifted (0,-%f) \z
+ withprescript "mplibtexboxid=%i:%f:%f")'
local function process_tex_text (str)
if str then
local global = (has_instancename or luamplib.globaltextext or luamplib.codeinherit)
@@ -1395,7 +1552,6 @@ local mplibcolorfmt = {
[[\color_select:n%s\endgroup]],
},
}
-
local colfmt = is_defined'color_select:n' and "l3color" or "xcolor"
if colfmt == "l3color" then
run_tex_code{
@@ -1409,7 +1565,6 @@ if colfmt == "l3color" then
}
end
local ccexplat = luatexbase.registernumber"luamplibcctabexplat"
-
local function process_color (str)
if str then
if not str:find("%b{}") then
@@ -1470,20 +1625,18 @@ end
%
% For legacy verbatimtex process.
% |verbatimtex ... etex| before |beginfig()| is not ignored,
-% but the \TeX\ code is inserted just before the mplib box. And
-% \TeX\ code inside |beginfig() ... endfig| is inserted after the mplib box.
+% but the \TeX\ code is inserted just before the \mplib box. And
+% \TeX\ code inside |beginfig() ... endfig| is inserted after the \mplib box.
% \begin{macrocode}
local tex_code_pre_mplib = {}
luamplib.figid = 1
luamplib.in_the_fig = false
-
local function process_verbatimtex_prefig (str)
if str then
tex_code_pre_mplib[luamplib.figid] = str
end
return ""
end
-
local function process_verbatimtex_infig (str)
if str then
return format('special "postmplibverbtex=%s";', str)
@@ -1502,17 +1655,16 @@ local runscript_funcs = {
% \end{macrocode}
%
-% For |metafun| format. see issue \#79.
+% For \emph{metafun} format. see issue \#79.
% \begin{macrocode}
mp = mp or {}
local mp = mp
mp.mf_path_reset = mp.mf_path_reset or function() end
mp.mf_finish_saving_data = mp.mf_finish_saving_data or function() end
mp.report = mp.report or info
-
% \end{macrocode}
%
-% metafun 2021-03-09 changes crashes luamplib.
+% \emph{metafun} 2021-03-09 changes crashes luamplib.
% \begin{macrocode}
catcodes = catcodes or {}
local catcodes = catcodes
@@ -1546,7 +1698,6 @@ local function mpprint(buffer,...)
end
end
end
-
function luamplib.runscript (code)
local id, str = code:match("(.-){(.*)}")
if id and str then
@@ -1585,9 +1736,7 @@ local function protecttexcontents (str)
:gsub("%zPerCent%z", "\\%%")
:gsub("%s+", " ")
end
-
luamplib.legacyverbatimtex = true
-
function luamplib.maketext (str, what)
if str and str ~= "" then
str = protecttexcontents(str)
@@ -1615,13 +1764,13 @@ end
% \end{macrocode}
%
-% luamplib's metapost color operators
+% luamplib's \metapost color operators
% \begin{macrocode}
local function colorsplit (res)
- local t, tt = { }, res:gsub("[%[%]]",""):explode()
+ local t, tt = { }, res:gsub("[%[%]]","",2):explode()
local be = tt[1]:find"^%d" and 1 or 2
for i=be, #tt do
- if tt[i]:find"^%a" then break end
+ if not tonumber(tt[i]) then break end
t[#t+1] = tt[i]
end
return t
@@ -1655,7 +1804,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}
@@ -1701,9 +1850,9 @@ luamplib.shadecolor = function (str)
% endfig;
% \end{mplibcode}
% \end{document}
-% \end{verbatim}
+%\end{verbatim}
% another one: user-defined DeviceN colorspace
-% \begin{verbatim}
+%\begin{verbatim}
% \DocumentMetadata{ }
% \documentclass{article}
% \usepackage{luamplib}
@@ -1731,7 +1880,7 @@ luamplib.shadecolor = function (str)
% ;
% \endmpfig
% \end{document}
-% \end{verbatim}
+%\end{verbatim}
% \begin{macrocode}
run_tex_code({
[[\color_export:nnN{]], str, [[}{backend}\mplib_@tempa]],
@@ -1750,9 +1899,15 @@ end
% \end{macrocode}
%
+% Remove trailing zeros for smaller PDF
+% \begin{macrocode}
+local decimals = "%.%d+"
+local function rmzeros(str) return str:gsub("%.?0+$","") end
+
+% \end{macrocode}
+%
% luamplib's mplibgraphictext operator
% \begin{macrocode}
-local running = -1073741824
local emboldenfonts = { }
local function getemboldenwidth (curr, fakebold)
local width = emboldenfonts.width
@@ -1785,13 +1940,14 @@ local function getrulewhatsit (line, wd, ht, dp)
fmt = "pdf:content "..fmt
pl = node.new("whatsit","special")
end
- pl.data = fmt:format(line, 0, -dp, wd, ht+dp, "B")
+ pl.data = fmt:format(line, 0, -dp, wd, ht+dp, "B") :gsub(decimals,rmzeros)
local ss = node.new"glue"
node.setglue(ss, 0, 65536, 65536, 2, 2)
pl.next = ss
return pl
end
local function getrulemetric (box, curr, bp)
+ local running = -1073741824
local wd,ht,dp = curr.width, curr.height, curr.depth
wd = wd == running and box.width or wd
ht = ht == running and box.height or ht
@@ -1843,7 +1999,8 @@ local function embolden (box, curr, fakebold)
head, curr = node.remove(head, curr)
elseif curr.id == node.id"glyph" and curr.font > 0 then
local f = curr.font
- local i = emboldenfonts[f]
+ local key = format("%s:%s",f,fakebold)
+ local i = emboldenfonts[key]
if not i then
local ft = font.getfont(f) or font.getcopy(f)
if pdfmode then
@@ -1859,7 +2016,7 @@ local function embolden (box, curr, fakebold)
name = format('%s;embolden=%s;',name,fakebold)
_, i = fonts.constructors.readanddefine(name,ft.size)
end
- emboldenfonts[f] = i
+ emboldenfonts[key] = i
end
curr.font = i
end
@@ -1871,6 +2028,9 @@ end
local function graphictextcolor (col, filldraw)
if col:find"^[%d%.:]+$" then
col = col:explode":"
+ for i=1,#col do
+ col[i] = format("%.3f", col[i])
+ end
if pdfmode then
local op = #col == 4 and "k" or #col == 3 and "rg" or "g"
col[#col+1] = filldraw == "fill" and op or op:upper()
@@ -2068,7 +2228,7 @@ end
% mpliboutlinetext : based on mkiv's font-mps.lua
% \begin{macrocode}
local rulefmt = "mpliboutlinepic[%i]:=image(addto currentpicture contour \z
-unitsquare shifted - center unitsquare;) xscaled %f yscaled %f shifted (%f,%f);"
+ unitsquare shifted - center unitsquare;) xscaled %f yscaled %f shifted (%f,%f);"
local outline_horz, outline_vert
function outline_vert (res, box, curr, xshift, yshift)
local b2u = box.dir == "LTL"
@@ -2309,7 +2469,7 @@ end
% \end{macrocode}
%
-% Our MetaPost preambles
+% Our \metapost preambles
% \begin{macrocode}
luamplib.preambles = {
mplibcode = [[
@@ -2494,7 +2654,13 @@ vardef mpliboutlinetext@# (expr t) text rest =
) mplib_do_outline_options_r; )
enddef ;
primarydef t withpattern p =
- image( fill t withprescript "mplibpattern=" & if numeric p: decimal fi p; )
+ image(
+ if cycle t:
+ fill
+ else:
+ draw
+ fi
+ t withprescript "mplibpattern=" & if numeric p: decimal fi p; )
enddef;
vardef mplibtransformmatrix (text e) =
save t; transform t;
@@ -2509,12 +2675,20 @@ vardef mplibtransformmatrix (text e) =
& "}");
enddef;
primarydef p withfademethod s =
- p withprescript "mplibfadetype=" & 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
+ decimal (xpart llcorner p -1/4) & ":" &
+ decimal (ypart llcorner p -1/4) & ":" &
+ decimal (xpart urcorner p +1/4) & ":" &
+ decimal (ypart urcorner p +1/4)
enddef;
def withfadeopacity (expr a,b) =
withprescript "mplibfadeopacity=" &
@@ -2541,6 +2715,34 @@ def withfadebbox (expr a,b) =
decimal xpart b & ":" &
decimal ypart b
enddef;
+primarydef p asgroup s =
+ image(
+ draw center p
+ withprescript "mplibgroupbbox=" &
+ decimal (xpart llcorner p -1/4) & ":" &
+ decimal (ypart llcorner p -1/4) & ":" &
+ decimal (xpart urcorner p +1/4) & ":" &
+ decimal (ypart urcorner p +1/4)
+ withprescript "gr_state=start"
+ withprescript "gr_type=" & s;
+ draw p;
+ draw center p withprescript "gr_state=stop";
+ )
+enddef;
+def withgroupbbox (expr a,b) =
+ withprescript "mplibgroupbbox=" &
+ decimal xpart a & ":" &
+ decimal ypart a & ":" &
+ decimal xpart b & ":" &
+ decimal ypart b
+enddef;
+def withgroupname expr s =
+ withprescript "mplibgroupname=" & s
+enddef;
+def usemplibgroup primary s =
+ draw maketext("\usemplibgroup{" & s & "}")
+ shifted runscript("return luamplib.trgroupshifts['" & s & "']")
+enddef;
]],
legacyverbatimtex = [[
def specialVerbatimTeX (text t) = runscript("luamplibprefig{"&t&"}") enddef;
@@ -2570,7 +2772,6 @@ enddef;
% When \cs{mplibverbatim} is enabled, do not expand |mplibcode| data.
% \begin{macrocode}
luamplib.verbatiminput = false
-
% \end{macrocode}
%
% Do not expand |btex ... etex|, |verbatimtex ... etex|, and
@@ -2586,7 +2787,6 @@ local function protect_expansion (str)
return format("\\unexpanded{%s}",str)
end
end
-
local function unprotect_expansion (str)
if str then
return str:gsub("!!!Control!!!", "\\")
@@ -2596,25 +2796,20 @@ local function unprotect_expansion (str)
:gsub("!!!RBrace!!!", "}")
end
end
-
luamplib.everymplib = setmetatable({ [""] = "" },{ __index = function(t) return t[""] end })
luamplib.everyendmplib = setmetatable({ [""] = "" },{ __index = function(t) return t[""] end })
-
function luamplib.process_mplibcode (data, instancename)
texboxes.localid = 4096
-
% \end{macrocode}
% This is needed for legacy behavior
% \begin{macrocode}
if luamplib.legacyverbatimtex then
luamplib.figid, tex_code_pre_mplib = 1, {}
end
-
local everymplib = luamplib.everymplib[instancename]
local everyendmplib = luamplib.everyendmplib[instancename]
data = format("\n%s\n%s\n%s\n",everymplib, data, everyendmplib)
:gsub("\r","\n")
-
% \end{macrocode}
% These five lines are needed for |mplibverbatim| mode.
% \begin{macrocode}
@@ -2654,7 +2849,6 @@ function luamplib.process_mplibcode (data, instancename)
return format("verbatimtex %s etex", unprotect_expansion(str))
end)
end
-
process(data, instancename)
end
@@ -2662,21 +2856,12 @@ end
%
% For parsing |prescript| materials.
% \begin{macrocode}
-local further_split_keys = {
- mplibtexboxid = true,
- sh_color_a = true,
- sh_color_b = true,
-}
local function script2table(s)
local t = {}
for _,i in ipairs(s:explode("\13+")) do
local k,v = i:match("(.-)=(.*)") -- v may contain = or empty.
if k and v and k ~= "" and not t[k] then
- if further_split_keys[k] or further_split_keys[k:sub(1,10)] then
- t[k] = v:explode(":")
- else
- t[k] = v
- end
+ t[k] = v
end
end
return t
@@ -2692,38 +2877,26 @@ local figcontents = { post = { } }
local function put2output(a,...)
figcontents[#figcontents+1] = type(a) == "string" and format(a,...) or a
end
-
local function pdf_startfigure(n,llx,lly,urx,ury)
put2output("\\mplibstarttoPDF{%f}{%f}{%f}{%f}",llx,lly,urx,ury)
end
-
local function pdf_stopfigure()
put2output("\\mplibstoptoPDF")
end
-
% \end{macrocode}
%
% |tex.sprint| with catcode regime -2, as sometimes |#| gets doubled
% in the argument of pdfliteral.
% \begin{macrocode}
-local function pdf_literalcode (fmt,...)
- put2output{-2, format(fmt,...)}
-end
-
-local function start_pdf_code()
- if pdfmode then
- pdf_literalcode("q")
- else
- put2output"\\special{pdf:bcontent}"
- end
-end
-local function stop_pdf_code()
- if pdfmode then
- pdf_literalcode("Q")
- else
- put2output"\\special{pdf:econtent}"
- end
+local function pdf_literalcode (...)
+ put2output{ -2, format(...) :gsub(decimals,rmzeros) }
end
+local start_pdf_code = pdfmode
+ and function() pdf_literalcode"q" end
+ or function() put2output"\\special{pdf:bcontent}" end
+local stop_pdf_code = pdfmode
+ and function() pdf_literalcode"Q" end
+ or function() put2output"\\special{pdf:econtent}" end
% \end{macrocode}
%
@@ -2731,7 +2904,7 @@ end
% |textext(...)| or |TEX(...)|, all being the same internally.
% \begin{macrocode}
local function put_tex_boxes (object,prescript)
- local box = prescript.mplibtexboxid
+ local box = prescript.mplibtexboxid:explode":"
local n,tw,th = box[1],tonumber(box[2]),tonumber(box[3])
if n and tw and th then
local op = object.path
@@ -2795,7 +2968,6 @@ local pdfobjs, pdfetcs = {}, {}
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, stream)
local key = os
if stream then key = key..stream end
@@ -2822,7 +2994,6 @@ local function update_pdfobjs (os, stream)
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
local getpageres = pdfetcs.getpageres
@@ -2858,11 +3029,20 @@ if pdfmode then
end
else
texsprint {
+ "\\luamplibatfirstshipout{",
"\\special{pdf:obj @MPlibTr<<>>}",
"\\special{pdf:obj @MPlibSh<<>>}",
"\\special{pdf:obj @MPlibCS<<>>}",
- "\\special{pdf:obj @MPlibPt<<>>}",
+ "\\special{pdf:obj @MPlibPt<<>>}}",
}
+ pdfetcs.resadded = { }
+ pdfetcs.fallback_update_resources = function (name,res,obj)
+ texsprint{"\\special{pdf:put ", obj, " <<", res, ">>}"}
+ if not pdfetcs.resadded[name] then
+ texsprint{"\\luamplibateveryshipout{\\special{pdf:put @resources <</", name, " ", obj, ">>}}"}
+ pdfetcs.resadded[name] = obj
+ end
+ end
end
% \end{macrocode}
@@ -2888,81 +3068,88 @@ local function add_extgs_resources (on, new)
local tr = format("/%s %s", key, val)
if is_defined(pdfetcs.pgfextgs) then
texsprint { "\\csname ", pdfetcs.pgfextgs, "\\endcsname{", tr, "}" }
- elseif pdfmode then
- if is_defined"TRP@list" then
- texsprint(catat11,{
- [[\if@filesw\immediate\write\@auxout{]],
- [[\string\g@addto@macro\string\TRP@list{]],
- tr,
- [[}}\fi]],
- })
- if not get_macro"TRP@list":find(tr) then
- texsprint(catat11,[[\global\TRP@reruntrue]])
- end
- else
- pdfetcs.fallback_update_resources("ExtGState", tr)
+ elseif is_defined"TRP@list" then
+ texsprint(catat11,{
+ [[\if@filesw\immediate\write\@auxout{]],
+ [[\string\g@addto@macro\string\TRP@list{]],
+ tr,
+ [[}}\fi]],
+ })
+ if not get_macro"TRP@list":find(tr) then
+ texsprint(catat11,[[\global\TRP@reruntrue]])
end
else
- texsprint { "\\special{pdf:put @MPlibTr<<", tr, ">>}" }
+ pdfetcs.fallback_update_resources("ExtGState",tr,"@MPlibTr")
end
end
end
- if not pdfmode and not pdfmanagement and not is_defined(pdfetcs.pgfextgs) then
- texsprint"\\special{pdf:put @resources <</ExtGState @MPlibTr>>}"
- end
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 on
if opaq then
+ local key, on, os, new
local mode = prescript.tr_alternative or 1
- mode = transparancy_modes[tonumber(mode)]
- local os, new = format("<</BM /%s/ca %.3f/CA %.3f/AIS false>>",mode,opaq,opaq)
- on, new = update_pdfobjs(os)
- local key = add_extgs_resources(on,new)
- start_pdf_code()
- pdf_literalcode("/%s gs",key)
+ mode = transparancy_modes[tonumber(mode)] or mode
+ opaq = format("%.3f", opaq) :gsub(decimals,rmzeros)
+ for i,v in ipairs{ {mode,opaq},{"Normal",1} } do
+ os = format("<</BM/%s/ca %s/CA %s/AIS false>>",v[1],v[2],v[2])
+ 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 on
end
% \end{macrocode}
%
-% Shading with |metafun| format.
+% Shading with \emph{metafun} format.
% \begin{macrocode}
local function sh_pdfpageresources(shtype,domain,colorspace,ca,cb,coordinates,steps,fractions)
- local fun2fmt,os = "<</FunctionType 2/Domain [%s]/C0 [%s]/C1 [%s]/N 1>>"
+ for _,v in ipairs{ca,cb} do
+ for i,vv in ipairs(v) do
+ for ii,vvv in ipairs(vv) do
+ v[i][ii] = tonumber(vvv) and format("%.3f",vvv) or vvv
+ end
+ end
+ end
+ local fun2fmt,os = "<</FunctionType 2/Domain[%s]/C0[%s]/C1[%s]/N 1>>"
if steps > 1 then
local list,bounds,encode = { },{ },{ }
for i=1,steps do
if i < steps then
- bounds[i] = fractions[i] or 1
+ bounds[i] = format("%.3f", fractions[i] or 1)
end
encode[2*i-1] = 0
encode[2*i] = 1
os = fun2fmt:format(domain,tableconcat(ca[i],' '),tableconcat(cb[i],' '))
+ :gsub(decimals,rmzeros)
list[i] = format(pdfetcs.resfmt, update_pdfobjs(os))
end
os = tableconcat {
"<</FunctionType 3",
- format("/Bounds [%s]", tableconcat(bounds,' ')),
- format("/Encode [%s]", tableconcat(encode,' ')),
- format("/Functions [%s]", tableconcat(list, ' ')),
- format("/Domain [%s]>>", domain),
- }
+ format("/Bounds[%s]", tableconcat(bounds,' ')),
+ format("/Encode[%s]", tableconcat(encode,' ')),
+ format("/Functions[%s]", tableconcat(list, ' ')),
+ format("/Domain[%s]>>", domain),
+ } :gsub(decimals,rmzeros)
else
os = fun2fmt:format(domain,tableconcat(ca[1],' '),tableconcat(cb[1],' '))
+ :gsub(decimals,rmzeros)
end
local objref = format(pdfetcs.resfmt, update_pdfobjs(os))
os = tableconcat {
format("<</ShadingType %i", shtype),
format("/ColorSpace %s", colorspace),
format("/Function %s", objref),
- format("/Coords [%s]", coordinates),
- "/Extend [true true]/AntiAlias true>>",
- }
+ format("/Coords[%s]", coordinates),
+ "/Extend[true true]/AntiAlias true>>",
+ } :gsub(decimals,rmzeros)
local on, new = update_pdfobjs(os)
if new then
local key, val = format("MPlibSh%s", on), format(pdfetcs.resfmt, on)
@@ -2972,19 +3159,11 @@ local function sh_pdfpageresources(shtype,domain,colorspace,ca,cb,coordinates,st
}
else
local res = format("/%s %s", key, val)
- if pdfmode then
- pdfetcs.fallback_update_resources("Shading", res)
- else
- texsprint { "\\special{pdf:put @MPlibSh<<", res, ">>}" }
- end
+ pdfetcs.fallback_update_resources("Shading",res,"@MPlibSh")
end
end
- if not pdfmode and not pdfmanagement then
- texsprint"\\special{pdf:put @resources <</Shading @MPlibSh>>}"
- end
return on
end
-
local function color_normalize(ca,cb)
if #cb == 1 then
if #ca == 4 then
@@ -2996,7 +3175,6 @@ local function color_normalize(ca,cb)
cb[1], cb[2], cb[3], cb[4] = 1-cb[1], 1-cb[2], 1-cb[3], 0
end
end
-
pdfetcs.clrspcs = setmetatable({ }, { __index = function(t,names)
run_tex_code({
[[\color_model_new:nnn]],
@@ -3008,7 +3186,6 @@ pdfetcs.clrspcs = setmetatable({ }, { __index = function(t,names)
t[names] = colorspace
return colorspace
end })
-
local function do_preobj_SH(object,prescript)
local shade_no
local sh_type = prescript and prescript.sh_type
@@ -3016,14 +3193,14 @@ local function do_preobj_SH(object,prescript)
return
else
local domain = prescript.sh_domain or "0 1"
- local centera = prescript.sh_center_a or "0 0"; centera = centera:explode()
- local centerb = prescript.sh_center_b or "0 0"; centerb = centerb:explode()
+ local centera = (prescript.sh_center_a or "0 0"):explode()
+ local centerb = (prescript.sh_center_b or "0 0"):explode()
local transform = prescript.sh_transform == "yes"
local sx,sy,sr,dx,dy = 1,1,1,0,0
if transform then
- local first = prescript.sh_first or "0 0"; first = first:explode()
- local setx = prescript.sh_set_x or "0 0"; setx = setx:explode()
- local sety = prescript.sh_set_y or "0 0"; sety = sety:explode()
+ local first = (prescript.sh_first or "0 0"):explode()
+ local setx = (prescript.sh_set_x or "0 0"):explode()
+ local sety = (prescript.sh_set_y or "0 0"):explode()
local x,y = tonumber(setx[1]) or 0, tonumber(sety[1]) or 0
if x ~= 0 and y ~= 0 then
local path = object.path
@@ -3045,15 +3222,15 @@ local function do_preobj_SH(object,prescript)
end
end
local ca, cb, colorspace, steps, fractions
- ca = { prescript.sh_color_a_1 or prescript.sh_color_a or {0} }
- cb = { prescript.sh_color_b_1 or prescript.sh_color_b or {1} }
+ ca = { (prescript.sh_color_a_1 or prescript.sh_color_a or "0"):explode":" }
+ cb = { (prescript.sh_color_b_1 or prescript.sh_color_b or "1"):explode":" }
steps = tonumber(prescript.sh_step) or 1
if steps > 1 then
fractions = { prescript.sh_fraction_1 or 0 }
for i=2,steps do
fractions[i] = prescript[format("sh_fraction_%i",i)] or (i/steps)
- ca[i] = prescript[format("sh_color_a_%i",i)] or {0}
- cb[i] = prescript[format("sh_color_b_%i",i)] or {1}
+ ca[i] = (prescript[format("sh_color_a_%i",i)] or "0"):explode":"
+ cb[i] = (prescript[format("sh_color_b_%i",i)] or "1"):explode":"
end
end
if prescript.mplib_spotcolor then
@@ -3120,7 +3297,6 @@ local function do_preobj_SH(object,prescript)
else
err"unknown shading type"
end
- pdf_literalcode("q /Pattern cs")
end
return shade_no
end
@@ -3130,43 +3306,15 @@ end
% Patterns
% \begin{macrocode}
pdfetcs.patterns = { }
-local patterns = pdfetcs.patterns
-function luamplib.registerpattern ( boxid, name, opts )
- local box = texgetbox(boxid)
- local wd = format("%.3f",box.width/factor)
- local hd = format("%.3f",(box.height+box.depth)/factor)
- info("w/h/d of '%s': %s %s 0.0", name, wd, hd)
- if opts.xstep == 0 then opts.xstep = nil end
- if opts.ystep == 0 then opts.ystep = nil end
- if opts.colored == nil then
- opts.colored = opts.coloured
- if opts.colored == nil then
- opts.colored = true
- end
+local function gather_resources (optres)
+ local t, do_pattern = { }, not optres
+ local names = {"ExtGState","ColorSpace","Shading"}
+ if do_pattern then
+ names[#names+1] = "Pattern"
end
- if type(opts.matrix) == "table" then opts.matrix = tableconcat(opts.matrix," ") end
- if type(opts.bbox) == "table" then opts.bbox = tableconcat(opts.bbox," ") end
- if opts.matrix and opts.matrix:find"%a" then
- local data = format("mplibtransformmatrix(%s);",opts.matrix)
- process(data,"@mplibtransformmatrix")
- local t = luamplib.transformmatrix
- opts.matrix = format("%s %s %s %s", t[1], t[2], t[3], t[4])
- opts.xshift = opts.xshift or t[5]
- opts.yshift = opts.yshift or t[6]
- end
- local attr = {
- "/Type/Pattern",
- "/PatternType 1",
- format("/PaintType %i", opts.colored and 1 or 2),
- "/TilingType 2",
- format("/XStep %s", opts.xstep or wd),
- 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),
- }
if pdfmode then
- local optres, t = opts.resources or "", { }
if pdfmanagement then
- for _,v in ipairs{"ExtGState","ColorSpace","Shading"} do
+ 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))
@@ -3175,26 +3323,19 @@ function luamplib.registerpattern ( boxid, name, opts )
else
local res = pdfetcs.getpageres() or ""
run_tex_code[[\mplibtmptoks\expandafter{\the\pdfvariable pageresources}]]
- res = (res .. texgettoks'mplibtmptoks'):explode()
- res = tableconcat(res," "):explode"/+"
+ res = res .. texgettoks'mplibtmptoks'
+ if do_pattern then return res end
+ res = res:explode"/+"
for _,v in ipairs(res) do
+ v = v:match"^%s*(.-)%s*$"
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
- local index = tex.saveboxresource(boxid, tableconcat(attr), optres, true, opts.bbox and 4 or 1)
- patterns[name] = { id = index, colored = opts.colored }
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
+ 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 {
@@ -3210,24 +3351,81 @@ function luamplib.registerpattern ( boxid, name, opts )
"\\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'
+ else
+ 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
- optres = optres .. tableconcat(t)
+ end
+ return tableconcat(t)
+end
+function luamplib.registerpattern ( boxid, name, opts )
+ local box = texgetbox(boxid)
+ local wd = format("%.3f",box.width/factor)
+ local hd = format("%.3f",(box.height+box.depth)/factor)
+ info("w/h/d of pattern '%s': %s 0", name, format("%s %s",wd, hd):gsub(decimals,rmzeros))
+ if opts.xstep == 0 then opts.xstep = nil end
+ if opts.ystep == 0 then opts.ystep = nil end
+ if opts.colored == nil then
+ opts.colored = opts.coloured
+ if opts.colored == nil then
+ opts.colored = true
+ end
+ end
+ if type(opts.matrix) == "table" then opts.matrix = tableconcat(opts.matrix," ") end
+ if type(opts.bbox) == "table" then opts.bbox = tableconcat(opts.bbox," ") end
+ if opts.matrix and opts.matrix:find"%a" then
+ local data = format("mplibtransformmatrix(%s);",opts.matrix)
+ process(data,"@mplibtransformmatrix")
+ local t = luamplib.transformmatrix
+ opts.matrix = format("%f %f %f %f", t[1], t[2], t[3], t[4])
+ opts.xshift = opts.xshift or format("%f",t[5])
+ opts.yshift = opts.yshift or format("%f",t[6])
+ end
+ local attr = {
+ "/Type/Pattern",
+ "/PatternType 1",
+ format("/PaintType %i", opts.colored and 1 or 2),
+ "/TilingType 2",
+ format("/XStep %s", opts.xstep or wd),
+ 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 ""
+ optres = optres .. gather_resources(optres)
+ local patterns = pdfetcs.patterns
+ if pdfmode then
+ if opts.bbox then
+ attr[#attr+1] = format("/BBox[%s]", opts.bbox)
+ end
+ attr = tableconcat(attr) :gsub(decimals,rmzeros)
+ local index = tex.saveboxresource(boxid, attr, optres, true, opts.bbox and 4 or 1)
+ patterns[name] = { id = index, colored = opts.colored }
+ else
+ local cnt = #patterns + 1
+ local objname = "@mplibpattern" .. cnt
+ local metric = format("bbox %s", opts.bbox or format("0 0 %s %s",wd,hd))
texsprint {
- [[\ifvmode\nointerlineskip\fi]],
- format([[\hbox to0pt{\vbox to0pt{\hsize=\wd %i\vss\noindent]], boxid), -- force horiz mode?
- [[\special{pdf:bcontent}]],
- [[\special{pdf:bxobj ]], objname, format(" %s}", metric),
- format([[\raise\dp %i\box %i]], boxid, boxid),
- format([[\special{pdf:put @resources <<%s>>}]], optres),
- [[\special{pdf:exobj <<]], tableconcat(attr), ">>}",
- [[\special{pdf:econtent}]],
- [[\par}\hss}]],
+ "\\expandafter\\newbox\\csname luamplib.patternbox.", cnt, "\\endcsname",
+ "\\global\\setbox\\csname luamplib.patternbox.", cnt, "\\endcsname",
+ "\\hbox{\\unhbox ", boxid, "}\\luamplibatnextshipout{",
+ "\\special{pdf:bcontent}",
+ "\\special{pdf:bxobj ", objname, " ", metric, "}",
+ "\\raise\\dp\\csname luamplib.patternbox.", cnt, "\\endcsname",
+ "\\box\\csname luamplib.patternbox.", cnt, "\\endcsname",
+ "\\special{pdf:put @resources <<", optres, ">>}",
+ "\\special{pdf:exobj <<", tableconcat(attr), ">>}",
+ "\\special{pdf:econtent}}",
}
- patterns[#patterns+1] = objname
- patterns[name] = { id = #patterns, colored = opts.colored }
+ patterns[cnt] = objname
+ patterns[name] = { id = cnt, colored = opts.colored }
end
end
local function pattern_colorspace (cs)
@@ -3242,21 +3440,17 @@ local function pattern_colorspace (cs)
local res = format("/%s %s", key, val)
if is_defined(pdfetcs.pgfcolorspace) then
texsprint { "\\csname ", pdfetcs.pgfcolorspace, "\\endcsname{", res, "}" }
- elseif pdfmode then
- pdfetcs.fallback_update_resources("ColorSpace", res)
else
- texsprint { "\\special{pdf:put @MPlibCS<<", res, ">>}" }
+ pdfetcs.fallback_update_resources("ColorSpace",res,"@MPlibCS")
end
end
end
- if not pdfmode and not pdfmanagement and not is_defined(pdfetcs.pgfcolorspace) then
- texsprint"\\special{pdf:put @resources <</ColorSpace @MPlibCS>>}"
- end
return on
end
local function do_preobj_PAT(object, prescript)
local name = prescript and prescript.mplibpattern
if not name then return end
+ local patterns = pdfetcs.patterns
local patt = patterns[name]
local index = patt and patt.id or err("cannot get pattern object '%s'", name)
local key = format("MPlibPt%s",index)
@@ -3296,16 +3490,11 @@ local function do_preobj_PAT(object, prescript)
local res = format("/%s %s", key, val)
if is_defined(pdfetcs.pgfpattern) then
texsprint { "\\csname ", pdfetcs.pgfpattern, "\\endcsname{", res, "}" }
- elseif pdfmode then
- pdfetcs.fallback_update_resources("Pattern", res)
else
- texsprint { "\\special{pdf:put @MPlibPt<<", res, ">>}" }
+ pdfetcs.fallback_update_resources("Pattern",res,"@MPlibPt")
end
end
end
- if not pdfmode and not pdfmanagement and not is_defined(pdfetcs.pgfpattern) then
- texsprint"\\special{pdf:put @resources <</Pattern @MPlibPt>>}"
- end
patt.done = true
end
@@ -3313,22 +3502,29 @@ end
%
% Fading
% \begin{macrocode}
+pdfetcs.fading = { }
local function do_preobj_FADE (object, prescript)
- if object.postscript == "collect" then return end
local fd_type = prescript and prescript.mplibfadetype
- if not fd_type then return end
+ 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 width, height = bbox[3]-bbox[1], bbox[4]-bbox[2]
- local vec = prescript.mplibfadevector
- vec = vec and vec:explode":"
- or fd_type == "linear" and {bbox[1], bbox[2], bbox[3], bbox[2]} -- left to right
- or {width/2, height/2, width/2, height/2} -- center for both circles
local dx, dy = -bbox[1], -bbox[2]
- bbox = format("0 0 %f %f", bbox[3]+dx, bbox[4]+dy)
+ 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])
@@ -3342,25 +3538,159 @@ local function do_preobj_FADE (object, prescript)
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)
+ bbox = format("0 0 %f %f", bbox[3]+dx, bbox[4]+dy)
local streamtext = format("q /Pattern cs/MPlibFd%s scn %s re f Q", on, bbox)
+ :gsub(decimals,rmzeros)
os = format("<</Pattern<</MPlibFd%s %s>>>>", on, format(pdfetcs.resfmt, on))
on = update_pdfobjs(os)
- local resources = "/Resources " .. format(pdfetcs.resfmt, on)
+ local 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,
+ "/BBox[", bbox, "]",
+ "/Matrix[1 0 0 1 ", format("%f %f", -dx,-dy), "]",
+ "/Resources ", resources,
"/Group ", format(pdfetcs.resfmt, on),
- }
+ } :gsub(decimals,rmzeros)
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)
- return on
+ if fd_stop then return "standalone" end
+ return "start"
+end
+
+% \end{macrocode}
+%
+% Transparency Group
+% \begin{macrocode}
+pdfetcs.tr_group = { shifts = { } }
+luamplib.trgroupshifts = pdfetcs.tr_group.shifts
+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.name = prescript.mplibgroupname or "lastmplibgroup"
+ trgroup.isolated, trgroup.knockout = false, false
+ for _,v in ipairs(prescript.gr_type:explode",+") do
+ trgroup[v] = true
+ end
+ trgroup.bbox = prescript.mplibgroupbbox:explode":"
+ put2output[[\begingroup\setbox\mplibscratchbox\hbox\bgroup]]
+ elseif grstate == "stop" then
+ local llx,lly,urx,ury = tableunpack(trgroup.bbox)
+ put2output(tableconcat{
+ "\\egroup",
+ format("\\wd\\mplibscratchbox %fbp", urx-llx),
+ format("\\ht\\mplibscratchbox %fbp", ury-lly),
+ "\\dp\\mplibscratchbox 0pt",
+ })
+ local grattr = format("/Group<</S/Transparency/I %s/K %s>>",trgroup.isolated,trgroup.knockout)
+ local res = gather_resources()
+ local bbox = format("%f %f %f %f", llx,lly,urx,ury) :gsub(decimals,rmzeros)
+ if pdfmode then
+ put2output(tableconcat{
+ "\\saveboxresource type 2 attr{/Type/XObject/Subtype/Form/FormType 1",
+ "/BBox[", bbox, "]", grattr, "} resources{", res, "}\\mplibscratchbox",
+ [[\setbox\mplibscratchbox\hbox{\useboxresource\lastsavedboxresourceindex}]],
+ [[\wd\mplibscratchbox 0pt\ht\mplibscratchbox 0pt\dp\mplibscratchbox 0pt]],
+ [[\box\mplibscratchbox\endgroup]],
+ "\\expandafter\\xdef\\csname luamplib.group.", trgroup.name, "\\endcsname{",
+ "\\noexpand\\mplibstarttoPDF{",llx,"}{",lly,"}{",urx,"}{",ury,"}",
+ "\\useboxresource \\the\\lastsavedboxresourceindex\\noexpand\\mplibstoptoPDF}",
+ })
+ else
+ trgroup.cnt = (trgroup.cnt or 0) + 1
+ local objname = format("@mplibtrgr%s", trgroup.cnt)
+ put2output(tableconcat{
+ "\\special{pdf:bxobj ", objname, " bbox ", bbox, "}",
+ "\\unhbox\\mplibscratchbox",
+ "\\special{pdf:put @resources <<", res, ">>}",
+ "\\special{pdf:exobj <<", grattr, ">>}",
+ "\\special{pdf:uxobj ", objname, "}\\endgroup",
+ })
+ token.set_macro("luamplib.group."..trgroup.name, tableconcat{
+ "\\mplibstarttoPDF{",llx,"}{",lly,"}{",urx,"}{",ury,"}",
+ "\\special{pdf:uxobj ", objname, "}\\mplibstoptoPDF",
+ }, "global")
+ end
+ trgroup.shifts[trgroup.name] = { llx, lly }
+ end
+ return grstate
+end
+function luamplib.registergroup (boxid, name, opts)
+ local box = texgetbox(boxid)
+ local wd, ht, dp = node.getwhd(box)
+ local res = (opts.resources or "") .. gather_resources()
+ local attr = { "/Type/XObject/Subtype/Form/FormType 1" }
+ if type(opts.matrix) == "table" then opts.matrix = tableconcat(opts.matrix," ") end
+ if type(opts.bbox) == "table" then opts.bbox = tableconcat(opts.bbox," ") end
+ if opts.matrix and opts.matrix:find"%a" then
+ local data = format("mplibtransformmatrix(%s);",opts.matrix)
+ process(data,"@mplibtransformmatrix")
+ opts.matrix = format("%f %f %f %f %f %f",tableunpack(luamplib.transformmatrix))
+ end
+ local grtype = 3
+ if opts.bbox then
+ attr[#attr+1] = format("/BBox[%s]", opts.bbox)
+ grtype = 2
+ end
+ if opts.matrix then
+ attr[#attr+1] = format("/Matrix[%s]", opts.matrix)
+ grtype = opts.bbox and 4 or 1
+ end
+ if opts.asgroup then
+ local t = { isolated = false, knockout = false }
+ for _,v in ipairs(opts.asgroup:explode",+") do t[v] = true end
+ attr[#attr+1] = format("/Group<</S/Transparency/I %s/K %s>>", t.isolated, t.knockout)
+ end
+ local trgroup = pdfetcs.tr_group
+ trgroup.shifts[name] = { get_macro'MPllx', get_macro'MPlly' }
+ local whd
+ if pdfmode then
+ attr = tableconcat(attr) :gsub(decimals,rmzeros)
+ local index = tex.saveboxresource(boxid, attr, res, true, grtype)
+ token.set_macro("luamplib.group."..name, "\\useboxresource "..index, "global")
+ whd = format("%.3f %.3f 0", wd/factor, (ht+dp)/factor) :gsub(decimals,rmzeros)
+ else
+ trgroup.cnt = (trgroup.cnt or 0) + 1
+ local objname = format("@mplibtrgr%s", trgroup.cnt)
+ texsprint {
+ "\\expandafter\\newbox\\csname luamplib.groupbox.", trgroup.cnt, "\\endcsname",
+ "\\global\\setbox\\csname luamplib.groupbox.", trgroup.cnt, "\\endcsname",
+ "\\hbox{\\unhbox ", boxid, "}\\luamplibatnextshipout{",
+ "\\special{pdf:bcontent}",
+ "\\special{pdf:bxobj ", objname, " width ", wd, "sp height ", ht, "sp depth ", dp, "sp}",
+ "\\unhbox\\csname luamplib.groupbox.", trgroup.cnt, "\\endcsname",
+ "\\special{pdf:put @resources <<", res, ">>}",
+ "\\special{pdf:exobj <<", tableconcat(attr), ">>}",
+ "\\special{pdf:econtent}}",
+ }
+ token.set_macro("luamplib.group."..name, tableconcat{
+ "\\begingroup\\setbox\\mplibscratchbox\\hbox{\\special{pdf:uxobj ", objname, "}}",
+ "\\wd\\mplibscratchbox ", wd, "sp",
+ "\\ht\\mplibscratchbox ", ht, "sp",
+ "\\dp\\mplibscratchbox ", dp, "sp",
+ "\\box\\mplibscratchbox\\endgroup",
+ }, "global")
+ whd = format("%.3f %.3f %.3f", wd/factor, ht/factor, dp/factor) :gsub(decimals,rmzeros)
+ end
+ info("w/h/d of group '%s': %s", name, whd)
+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}
@@ -3488,11 +3818,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}
@@ -3510,7 +3840,7 @@ function luamplib.flush (result,flusher)
local object = objects[o]
local objecttype = object.type
% \end{macrocode}
-% The following 7 lines are part of |btex...etex| patch.
+% The following 9 lines are part of |btex...etex| patch.
% Again, colors are processed at this stage.
% \begin{macrocode}
local prescript = object.prescript
@@ -3518,6 +3848,8 @@ function luamplib.flush (result,flusher)
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
+ local pattern_ = do_preobj_PAT(object,prescript) -- pattern
if prescript and prescript.mplibtexboxid then
put_tex_boxes(object,prescript)
elseif objecttype == "start_bounds" or objecttype == "stop_bounds" then --skip
@@ -3543,7 +3875,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
@@ -3569,10 +3901,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
@@ -3614,6 +3943,14 @@ function luamplib.flush (result,flusher)
objecttype = 'fill'
end
end
+% \end{macrocode}
+% Added : shading
+% \begin{macrocode}
+ local shade_no = do_preobj_SH(object,prescript) -- shading
+ if shade_no then
+ pdf_literalcode"q /Pattern cs"
+ objecttype = false
+ end
if transformed then
start_pdf_code()
end
@@ -3634,27 +3971,25 @@ function luamplib.flush (result,flusher)
else
flushnormalpath(path,open)
end
-% \end{macrocode}
-% Shading seems to conflict with these ops
-% \begin{macrocode}
- if not shade_no then -- conflict with shading
- if objecttype == "fill" then
- pdf_literalcode(evenodd and "h f*" or "h f")
- elseif objecttype == "outline" then
- if both then
- pdf_literalcode(evenodd and "h B*" or "h B")
- else
- pdf_literalcode(open and "S" or "h S")
- end
- elseif objecttype == "both" then
+ if objecttype == "fill" then
+ pdf_literalcode(evenodd and "h f*" or "h f")
+ elseif objecttype == "outline" then
+ if both then
pdf_literalcode(evenodd and "h B*" or "h B")
+ else
+ pdf_literalcode(open and "S" or "h S")
end
+ elseif objecttype == "both" then
+ pdf_literalcode(evenodd and "h B*" or "h B")
end
end
if transformed then
stop_pdf_code()
end
local path = object.htap
+% \end{macrocode}
+% How can we generate an |htap| object? Please let us know if you have succeeded.
+% \begin{macrocode}
if path then
if transformed then
start_pdf_code()
@@ -3688,21 +4023,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)
+ pdf_literalcode("W%s n /MPlibSh%s sh Q",evenodd and "*" or "",shade_no)
end
end
end
- if fading_ then -- fading
- stop_pdf_code()
- 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
@@ -3755,15 +4098,34 @@ end
% First we need to load some packages.
%
% \begin{macrocode}
-\bgroup\expandafter\expandafter\expandafter\egroup
-\expandafter\ifx\csname selectfont\endcsname\relax
- \input ltluatex
-\else
+\ifcsname ProvidesPackage\endcsname
+% \end{macrocode}
+% We need \LaTeX\ 2024-06-01 as we use |ltx.pdf.object_id| when pdfmanagement is loaded.
+% But as \pkg{fp} package does not accept an option, we do not append the date option.
+% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luamplib}
- [2024/07/14 v2.33.1 mplib package for LuaTeX]
- \ifx\newluafunction\@undefined
+ [2024/08/03 v2.34.5 mplib package for LuaTeX]
+\fi
+\ifdefined\newluafunction\else
\input ltluatex
+\fi
+% \end{macrocode}
+%
+% In DVI mode, a new XObject (mppattern, mplibgroup) must be encapsulated in an \cs{hbox}.
+% But this should not affect typesetting. So we use Hook mechanism provided by \LaTeX\ kernel.
+% In Plain, \pkg{atbegshi.sty} is loaded.
+% \begin{macrocode}
+\ifnum\outputmode=0
+ \ifdefined\AddToHookNext
+ \def\luamplibatnextshipout{\AddToHookNext{shipout/background}}
+ \def\luamplibatfirstshipout{\AddToHook{shipout/firstpage}}
+ \def\luamplibateveryshipout{\AddToHook{shipout/background}}
+ \else
+ \input atbegshi.sty
+ \def\luamplibatnextshipout#1{\AtBeginShipoutNext{\AtBeginShipoutAddToBox{#1}}}
+ \let\luamplibatfirstshipout\AtBeginShipoutFirst
+ \def\luamplibateveryshipout#1{\AtBeginShipout{\AtBeginShipoutAddToBox{#1}}}
\fi
\fi
% \end{macrocode}
@@ -3783,7 +4145,7 @@ end
\fi
% \end{macrocode}
%
-% Set the format for metapost.
+% Set the format for \metapost.
% \begin{macrocode}
\def\mplibsetformat#1{\directlua{luamplib.setformat("#1")}}
% \end{macrocode}
@@ -3825,6 +4187,39 @@ end
\def\mplibputtextbox#1{\vbox to 0pt{\vss\hbox to 0pt{\raise\dp#1\copy#1\hss}}}
% \end{macrocode}
%
+% use Transparency Group
+% \begin{macrocode}
+\protected\def\usemplibgroup#1{\csname luamplib.group.#1\endcsname}
+\protected\def\mplibgroup#1{%
+ \begingroup
+ \def\MPllx{0}\def\MPlly{0}%
+ \def\mplibgroupname{#1}%
+ \mplibgroupgetnexttok
+}
+\def\mplibgroupgetnexttok{\futurelet\nexttok\mplibgroupbranch}
+\def\mplibgroupskipspace{\afterassignment\mplibgroupgetnexttok\let\nexttok= }
+\def\mplibgroupbranch{%
+ \ifx [\nexttok
+ \expandafter\mplibgroupopts
+ \else
+ \ifx\mplibsptoken\nexttok
+ \expandafter\expandafter\expandafter\mplibgroupskipspace
+ \else
+ \let\mplibgroupoptions\empty
+ \expandafter\expandafter\expandafter\mplibgroupmain
+ \fi
+ \fi
+}
+\def\mplibgroupopts[#1]{\def\mplibgroupoptions{#1}\mplibgroupmain}
+\def\mplibgroupmain{\setbox\mplibscratchbox\hbox\bgroup\ignorespaces}
+\protected\def\endmplibgroup{\egroup
+ \directlua{ luamplib.registergroup(
+ \the\mplibscratchbox, '\mplibgroupname', {\mplibgroupoptions}
+ )}%
+ \endgroup
+}
+% \end{macrocode}
+%
% Patterns
% \begin{macrocode}
{\def\:{\global\let\mplibsptoken= } \: }
@@ -3863,7 +4258,7 @@ end
}
% \end{macrocode}
%
-% simple way to use mplib:
+% simple way to use \mplib:
% |\mpfig draw fullcircle scaled 10; \endmpfig|
% \begin{macrocode}
\def\mpfiginstancename{@mpfig}
@@ -4075,7 +4470,7 @@ end
\def\domplibcolor#1#2{ runscript("luamplibcolor{#1{#2}}") }
% \end{macrocode}
%
-% MPLib's number system. Now |binary| has gone away.
+% \mplib's number system. Now |binary| has gone away.
% \begin{macrocode}
\def\mplibnumbersystem#1{\directlua{
local t = "#1"
diff --git a/Master/texmf-dist/tex/context/third/chat/t-chat.mkiv b/Master/texmf-dist/tex/context/third/chat/t-chat.mkiv
new file mode 100644
index 00000000000..b3e1933549e
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/chat/t-chat.mkiv
@@ -0,0 +1,231 @@
+%D \module
+%D [ file=t-chat,
+%D version=2024.08.10,
+%D title=\CONTEXT\ User Module,
+%D subtitle=Chat,
+%D author=Henning Hraban Ramm,
+%D date=\currentdate,
+%D copyright={fiëé visuëlle, H. Ramm},
+%D license={GPL 3.0+}]
+
+\unprotect
+
+%D First we define a few colors.
+%D Don’t rely on these names, use the “Chat†palet instead.
+\definecolor[ChatColorI][c=0,m=.03,y=.15,k=0]
+\definecolor[ChatColorII][c=.1,m=0,y=0,k=0]
+\definecolor[ChatNameColor][c=0,m=0,y=0,k=.1]
+\definecolor[ChatColor][ChatColorI]
+\definecolor[ChatFrameColor][ChatNameColor]
+
+%D The palet contains all used colors.
+%D ATM there are only 2 different colors for recipient and sender,
+%D there should be more colors to distinguish senders.
+\definepalet[Chat][
+ frame=ChatFrameColor,
+ name=ChatNameColor,
+ 1=ChatColorI,
+ 2=ChatColorII,
+]
+
+\installcorenamespace {chat}
+
+\installsimplecommandhandler \??chat {Chat} \??chat
+
+\setupChat[
+ recipient=,
+ person=,
+ \c!distance=.25em,
+ \c!style={\ss},
+ \c!width=.8\textwidth,
+ senderstyle={\ss\bf},
+]
+
+% \Chatparameter
+
+\startuniqueMPgraphic{ChatBubble}
+% side: 0=right, 1=left
+% pos: 0 solo, 1 top, 2 middle, 3 bottom
+
+ numeric side, pos ;
+ string bgcol ;
+
+ if "\getvariable{Chat}{Person}" = "\Chatparameter{recipient}" :
+ side := 0;
+ bgcol := "Chat:1";
+ ; else :
+ side := 1;
+ bgcol := "Chat:2";
+ ; fi ;
+
+ if "\getvariable{Chat}{Person}" = "\getvariable{Chat}{PrevPerson}" :
+ % same as previous person: omit tail
+ pos := 3;
+ ; else :
+ % since we can’t know what’s next, go with "solo"
+ pos := 0;
+ ; fi ;
+
+ cradius := .125cm;
+ tailoffset := .125cm;
+ tailsize := .25cm;
+ h := OverlayHeight;
+ w := OverlayWidth;
+
+ if h < (2*cradius + 2*tailsize):
+ % if the box is too small, reduce radius and tail size
+ cradius := h/3;
+ tailsize := h/3;
+ tailoffset := 0;
+ fi;
+
+ pair ll[],lr[],tl[],tr[],s[];
+
+ % corners
+ ll1 := (0,cradius);
+ ll2 := (cradius,0);
+ lr1 := (w,cradius);
+ lr2 := (w-cradius,0);
+ % tail points
+ tl1 := (0,h-cradius);
+ tl2 := (cradius,h);
+ tr1 := (w,h-cradius);
+ tr2 := (w-cradius,h);
+
+ s1 := (w,h-cradius-tailoffset);
+ s2 := (w+tailsize,h-cradius-tailoffset);
+ s3 := (w,h-cradius-tailoffset-tailsize);
+
+ if pos > 1: % disable tail on middle/bottom
+ %s1 := (w,h-cradius-tailoffset);
+ s2 := (w,h-cradius-tailoffset);
+ %s3 := (w,h-cradius-tailoffset-tailsize);
+ fi;
+ if (pos = 1) or (pos = 2): % top/middle
+ lr1 := (w,cradius/3);
+ lr2 := (w-cradius/3,0);
+ fi;
+ if (pos = 2) or (pos = 3): % middle/bottom
+ tr1 := (w,h-cradius/3);
+ tr2 := (w-cradius/3,h);
+ fi;
+
+ path p ;
+ p := (ll1 ... ll2 --- lr2 ... lr1 -- s3 -- s2 -- s1 -- tr1 ... tr2 --- tl2 ... tl1 --- cycle);
+
+ % mirror the bubble for left side
+ if side = 1:
+ p := p reflectedabout ((w/2,0),(w/2,h));
+ fi;
+
+ fill p withcolor bgcol ;
+ draw p withpen pencircle scaled 0.75 withcolor "Chat:frame";
+
+ setbounds currentpicture to OverlayBox ;
+\stopuniqueMPgraphic
+
+\defineframedtext[ChatBubbleFrame][
+ style=\Chatparameter\s!style,
+ align=flushleft,
+ frame=off,
+ width=\Chatparameter\s!width,
+ autowidth=force,
+ offset=0pt,
+ loffset=2pt,
+ roffset=3pt,
+ before={\vskip\dimexpr-1em+\Chatparameter\c!distance\relax},
+ after={\vskip\dimexpr-\Chatparameter\c!distance\relax},
+]
+
+%D Receive text (left-facing).
+\defineoverlay[ChatGetOverlay][\uniqueMPgraphic{ChatBubble}]
+\defineframedtext[ChatGetFrame][ChatBubbleFrame][
+ background=ChatGetOverlay,
+ location=left,
+]
+
+%D Send text (right-facing).
+\defineoverlay[ChatSendOverlay][\uniqueMPgraphic{ChatBubble}]
+\defineframedtext[ChatSendFrame][ChatBubbleFrame][
+ background=ChatSendOverlay,
+ location=right,
+]
+
+%D This should become an avatar
+%D or simply initials in a circle
+\defineframed[ChatSenderFramed][
+ width=1em,
+ offset=overlay,
+ frame=off,
+ style=\Chatparameter{senderstyle},
+ %offset=0pt,
+ %loffset=0.25em,
+ %roffset=0.25em,
+ %corner=rounded,
+ %frameradius=.5em,
+ %background=color,
+ %backgroundcolor=Chat:frame,
+]
+
+%D Only show names (avatars) if person is different from last one
+% Sender name: #1 x-offset
+\define[1]\ChatSender{\offset[x=#1]{%
+ \doifnot{\getvariable{Chat}{Person}}{\getvariable{Chat}{PrevPerson}}{
+ % TODO: style \ss\tfx if more than 2 chars
+ \ChatSenderFramed{\style[style=\Chatparameter{senderstyle}]{\getvariable{Chat}{Person}}}}%
+ }%
+}
+
+\define[1]\startChat{%
+ \setevariable{Chat}{PrevPerson}{\getvariable{Chat}{Person}}
+ \setevariable{Chat}{Person}{#1}
+ \testpage[1]
+ \doifelse{\getvariable{Chat}{Person}}{\Chatparameter{recipient}}{
+ % recipient
+ \ChatSender{\dimexpr\textwidth-1.25em\relax}
+ \startnarrow[left=.5em]\startChatSendFrame
+ }{
+ % other sender
+ \ChatSender{-0.25em}
+ \startnarrow[right=.5em]\startChatGetFrame
+ }
+}
+
+\def\resetChat{%
+ \setevariable{Chat}{Recipient}{}%
+ \setevariable{Chat}{Person}{}%
+ \setevariable{Chat}{PrevPerson}{0}%
+}
+
+\def\stopChat{
+\doifelse{\getvariable{Chat}{Person}}{\Chatparameter{recipient}}{
+ % recipient
+ \stopChatSendFrame%
+}{
+ % other sender
+ \stopChatGetFrame%
+}
+\stopnarrow%
+}
+
+\resetChat
+
+\protect
+
+\continueifinputfile{t-chat.mkiv}
+
+\starttext
+
+\setupChat[
+ recipient=A,
+]
+
+\starttext
+\startChat{A} Do you wanna chat?\stopChat
+\startChat{B} Maybe. What about?\stopChat
+\startChat{A} How about cats?\stopChat
+\startChat{A} or squirrels?\stopChat
+\stoptext
+
+
+\stoptext
diff --git a/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex b/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex
index 4e4861071f9..f85b8ab58b3 100644
--- a/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex
+++ b/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex
@@ -16,8 +16,8 @@
\startmodule[circuitikz]
\usemodule[tikz]
-\def\pgfcircversion{1.6.9}
-\def\pgfcircversiondate{2024/05/25}
+\def\pgfcircversion{1.7.0}
+\def\pgfcircversiondate{2024/08/03}
\writestatus{loading}{\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion}
diff --git a/Master/texmf-dist/tex/fonts/bonum-otf/bonum-otf.sty b/Master/texmf-dist/tex/fonts/bonum-otf/bonum-otf.sty
new file mode 100644
index 00000000000..616801a1a1b
--- /dev/null
+++ b/Master/texmf-dist/tex/fonts/bonum-otf/bonum-otf.sty
@@ -0,0 +1,301 @@
+%% $Id: bonum-otf.sty 925 2024-07-23 17:47:45Z herbert $
+%%
+%% This file is 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.
+%%
+%
+\ProvidesPackage{bonum-otf}[%
+ 2024/07/23 v. 0.01 (Herbert Voss) Supports TeX Gyre bonum fonts for lualatex and xelatex.]
+
+\RequirePackage{iftex,xkeyval,textcomp}
+
+\newif\ifbonum@lining \bonum@liningtrue
+\newif\ifbonum@tabular \bonum@tabulartrue
+\newif\ifbonum@usefilenames \bonum@usefilenamestrue
+\newif\ifbonum@nomath \bonum@nomathfalse
+\newif\ifbonum@libertinus \bonum@libertinusfalse
+
+\DeclareOptionX{lining}[true]{\@nameuse{bonum@lining#1}}
+\DeclareOptionX{nf}[true]{\@nameuse{bonum@lining#1}}
+\DeclareOptionX{lf}[true]{\@nameuse{bonum@lining#1}}
+\DeclareOptionX{oldstyle}[true]{\@nameuse{if#1}\bonum@liningfalse\else\bonum@liningtrue\fi}
+\DeclareOptionX{osf}[true]{\@nameuse{if#1}\bonum@liningfalse\else\bonum@liningtrue\fi}
+\DeclareOptionX{libertinus}[true]{\@nameuse{bonum@libertinus#1}}
+
+\newcommand*\bonumMM@feature{}
+\DeclareOptionX{math}[]{\renewcommand*\bonumMM@feature{#1}}
+\DeclareOptionX{nomath}[true]{\@nameuse{bonum@nomath#1}}
+
+\DeclareOptionX{usefilenames}[true]{\@nameuse{bonum@usefilenames#1}}
+
+\DeclareOptionX{tabular}[true]{\@nameuse{bonum@tabular#1}}
+\DeclareOptionX{t}[true]{\@nameuse{bonum@tabular#1}}
+\DeclareOptionX{proportional}[true]{\@nameuse{if#1}\bonum@tabularfalse\else\bonum@tabulartrue\fi}
+\DeclareOptionX{p}[true]{\@nameuse{if#1}\bonum@tabularfalse\else\bonum@tabulartrue\fi}
+
+\newcommand*\bonumRM@scale{1}
+\DeclareOptionX{ScaleRM}{\renewcommand*{\bonumRM@scale}{#1}}
+
+\def\bonum@defaultfeatures{}
+\DeclareOptionX{defaultfeatures}{\def\bonum@defaultfeatures{#1}}
+
+\ProcessOptionsX\relax
+
+\RequirePackage{unicode-math}
+
+\ifbonum@lining
+ \def\bonum@figurestyle{+lnum}
+\else
+ \def\bonum@figurestyle{+onum}
+\fi
+
+\ifbonum@tabular
+ \def\bonum@figurealign{+tnum}
+\else
+ \def\bonum@figurealign{+pnum}
+\fi
+
+\ifxetex\XeTeXtracingfonts=1\fi
+\defaultfontfeatures[\rmfamily,\sffamily]{
+ Ligatures = TeX ,
+ SmallCapsFeatures={Letters=SmallCaps},% \ifluatex,Renderer=Basic\fi},
+ \bonum@defaultfeatures
+}
+
+\ifbonum@usefilenames
+%------------------------ filenames start -------------------------
+
+%texgyrebonum-bold.otf texgyrebonum-italic.otf
+%texgyrebonum-bolditalic.otf texgyrebonum-regular.otf
+
+
+\setmainfont{texgyrebonum}[
+ RawFeature = {\bonum@figurealign;\bonum@figurestyle},
+ Scale = \bonumRM@scale ,
+ UprightFont = *-regular,
+ ItalicFont = *-italic,
+ ItalicFeatures = { SmallCapsFont = *-italic },
+ SlantedFont = *-regular,
+ SlantedFeatures= {FakeSlant=0.2},
+ BoldFont = *-bold,
+ BoldFeatures = { SmallCapsFont = *-bold },
+ BoldItalicFont = *-bolditalic,
+ BoldItalicFeatures = { SmallCapsFont = *-bolditalic },
+ BoldSlantedFont= *-bold,
+ BoldSlantedFeatures= {FakeSlant=0.2, SmallCapsFont = *-bold },
+ SmallCapsFont = *-regular,
+% SmallCapsFeatures={RawFeature=+smcp},
+ SmallCapsFeatures={Letters=SmallCaps},
+ Extension = .otf
+]
+
+\newfontfamily\bonum{texgyrebonum}[
+ RawFeature = {\bonum@figurealign;\bonum@figurestyle},
+ Scale = \bonumRM@scale ,
+ UprightFont = *-regular,
+ ItalicFont = *-italic,
+ ItalicFeatures = { SmallCapsFont = *-italic },
+ SlantedFont = *-regular,
+ SlantedFeatures= {FakeSlant=0.2},
+ BoldFont = *-bold,
+ BoldFeatures = { SmallCapsFont = *-bold },
+ BoldItalicFont = *-bolditalic,
+ BoldItalicFeatures = { SmallCapsFont = *-bolditalic },
+ BoldSlantedFont= *-bold,
+ BoldSlantedFeatures= {FakeSlant=0.2, SmallCapsFont = *-bold },
+ SmallCapsFont = *-regular,
+% SmallCapsFeatures={RawFeature=+smcp},
+ SmallCapsFeatures={Letters=SmallCaps},
+ Extension = .otf
+]
+
+\newfontfamily\bonumOsF{texgyrebonum}[
+ RawFeature = {+onum},
+ Scale = \bonumRM@scale ,
+ UprightFont = *-regular,
+ ItalicFont = *-italic,
+ ItalicFeatures = { SmallCapsFont = *-italic },
+ SlantedFont = *-regular,
+ SlantedFeatures= {FakeSlant=0.2},
+ BoldFont = *-bold,
+ BoldFeatures = { SmallCapsFont = *-bold },
+ BoldItalicFont = *-bolditalic,
+ BoldItalicFeatures = { SmallCapsFont = *-bolditalic },
+ BoldSlantedFont= *-bold,
+ BoldSlantedFeatures= {FakeSlant=0.2, SmallCapsFont = *-bold },
+ SmallCapsFont = *-regular,
+% SmallCapsFeatures={RawFeature=+smcp},
+ SmallCapsFeatures={Letters=SmallCaps},
+ Extension = .otf
+]
+
+\newfontfamily\bonumTLF{texgyrebonum}[
+ RawFeature = {+tnum;-onum},
+ Scale = \bonumRM@scale ,
+ UprightFont = *-regular,
+ ItalicFont = *-italic,
+ ItalicFeatures = { SmallCapsFont = *-italic },
+ SlantedFont = *-regular,
+ SlantedFeatures= {FakeSlant=0.2},
+ BoldFont = *-bold,
+ BoldFeatures = { SmallCapsFont = *-bold },
+ BoldItalicFont = *-bolditalic,
+ BoldItalicFeatures = { SmallCapsFont = *-bolditalic },
+ BoldSlantedFont= *-bold,
+ BoldSlantedFeatures= {FakeSlant=0.2, SmallCapsFont = *-bold },
+ SmallCapsFont = *-regular,
+% SmallCapsFeatures={RawFeature=+smcp},
+ SmallCapsFeatures={Letters=SmallCaps},
+ Extension = .otf
+]
+%------------------------ filenames stop -------------------------
+\else
+%------------------------ symbolic names start -------------------------
+\setmainfont{TeX Gyre bonum}[
+ RawFeature = {\bonum@figurealign,\bonum@figurestyle},
+ Scale = \bonumRM@scale ,
+ UprightFont = * Regular,
+ SlantedFont = * Regular,
+ SlantedFeatures = {FakeSlant=0.2},
+ ItalicFont = * Italic,
+ ItalicFeatures = { SmallCapsFont = * Italic },
+ BoldFont = * Bold,
+ BoldFeatures = { SmallCapsFont = * Bold },
+ BoldItalicFont = * Bold Italic,
+ BoldItalicFeatures= { SmallCapsFont = * Bold Italic },
+ SmallCapsFont = * Regular,
+ SmallCapsFeatures = {RawFeature=+smcp},
+ BoldSlantedFont = * Bold,
+ BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = * Bold },
+ SmallCapsFeatures = {Letters=SmallCaps},
+]
+\newfontfamily\bonum{TeX Gyre bonum}[
+ RawFeature = {\bonum@figurealign,\bonum@figurestyle},
+ Scale = \bonumRM@scale ,
+ UprightFont = * Regular,
+ SlantedFont = * Regular,
+ SlantedFeatures = {FakeSlant=0.2},
+ ItalicFont = * Italic,
+ ItalicFeatures = { SmallCapsFont = * Italic },
+ BoldFont = * Bold,
+ BoldFeatures = { SmallCapsFont = * Bold },
+ BoldItalicFont = * Bold Italic,
+ BoldItalicFeatures= { SmallCapsFont = * Bold Italic },
+ SmallCapsFont = * Regular,
+ SmallCapsFeatures = {RawFeature=+smcp},
+ BoldSlantedFont = * Bold,
+ BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = * Bold },
+ SmallCapsFeatures = {Letters=SmallCaps},
+]
+\newfontfamily\bonumOsF{TeX Gyre bonum}[
+ RawFeature = {OldStyle,Proportional},
+ Scale = \bonumRM@scale ,
+ UprightFont = * Regular,
+ SlantedFont = * Regular,
+ SlantedFeatures = {FakeSlant=0.2},
+ ItalicFont = * Italic,
+ ItalicFeatures = { SmallCapsFont = * Italic },
+ BoldFont = * Bold,
+ BoldFeatures = { SmallCapsFont = * Bold },
+ BoldItalicFont = * Bold Italic,
+ BoldItalicFeatures= { SmallCapsFont = * Bold Italic },
+ SmallCapsFont = * Regular,
+ SmallCapsFeatures = {RawFeature=+smcp},
+ BoldSlantedFont = * Bold,
+ BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = * Bold },
+ SmallCapsFeatures = {Letters=SmallCaps},
+]
+
+\newfontfamily\bonumTLF{TeX Gyre bonum}[
+ RawFeature = {Lining,Monospaced},
+ Scale = \bonumRM@scale ,
+ UprightFont = * Regular,
+ SlantedFont = * Regular,
+ SlantedFeatures = {FakeSlant=0.2},
+ ItalicFont = * Italic,
+ ItalicFeatures = { SmallCapsFont = * Italic },
+ BoldFont = * Bold,
+ BoldFeatures = { SmallCapsFont = * Bold },
+ BoldItalicFont = * Bold Italic,
+ BoldItalicFeatures= { SmallCapsFont = * Bold Italic },
+ SmallCapsFont = * Regular,
+ SmallCapsFeatures = {RawFeature=+smcp},
+ BoldSlantedFont = * Bold,
+ BoldSlantedFeatures = {FakeSlant=0.2, SmallCapsFont = * Bold },
+ SmallCapsFeatures = {Letters=SmallCaps},
+]
+
+\fi
+%------------------------ symbolic names stop -------------------------
+
+\ifbonum@nomath\else
+ \typeout{*************************************^^J%
+ * Using bonum math *^^J%
+ *************************************}%
+ \setmathfont{texgyrebonum-math.otf}[AutoFakeBold,RawFeature=\bonumMM@feature]
+ \ifbonum@libertinus
+ \setmathfont{LibertinusMath-Regular.otf}[AutoFakeBold,RawFeature=\bonumMM@feature,
+ range={\int,\iint,\iiint,\iiiint,\oint,\oiint,\oiiint}]
+ \fi
+\fi
+
+\def\sufigures{\addfontfeatures{VerticalPosition=Superior}}
+\DeclareTextFontCommand{\textsup}{\sufigures}
+\DeclareTextFontCommand{\textinit}{\bonumInitials}% Initials
+
+\def\Lsup#1{{\addfontfeature{RawFeature=+sups}#1}}
+\def\Lsinf#1{{\addfontfeature{RawFeature=+sinf}#1}}
+\def\Land{{\addfontfeature{RawFeature=+ss06}\&}}
+
+\def\Lcase#1{{\addfontfeature{RawFeature=case}#1}}
+\def\LCASE{\@ifnextchar-\L@CASE\L@@CASE}
+\def\L@CASE-{\addfontfeature{RawFeature=-case}}
+\def\L@@CASE#1{\addfontfeature{RawFeature=+case}\ifx#1+\else#1\fi}
+
+\def\Lfrac#1{{\addfontfeature{RawFeature=+frac}#1}}
+\def\LFRAC{\@ifnextchar-\L@FRAC\L@@FRAC}
+\def\L@FRAC-{\addfontfeature{RawFeature=-frac}}
+\def\L@@FRAC#1{\addfontfeature{RawFeature=+frac}\ifx#1+\else#1\fi}
+
+\def\Lcpsp#1{{\addfontfeature{RawFeature=+cpsp}#1}}
+\def\LCPSP{\@ifnextchar-\L@CPSP\L@@CPSP}
+\def\L@CPSP-{\addfontfeature{RawFeature=-cpsp}}
+\def\L@@CPSP#1{\addfontfeature{RawFeature=+cpsp}\ifx#1+\else#1\fi}
+
+\def\Lss#1#2#3{{\addfontfeature{RawFeature=+ss#1#2}#3}}
+\def\LSS#1#2{\addfontfeature{RawFeature=+ss#1#2}}
+
+\def\Lctosc#1{{\addfontfeature{RawFeature=+c2sc}#1}}
+\def\LCtoSC{\@ifnextchar-\L@CtoSC\L@@CtoSC}
+\def\L@CtoSC-{\addfontfeature{RawFeature=-c2sc}}
+\def\L@@CtoSC#1{\addfontfeature{RawFeature=+c2sc}\ifx#1+\else#1\fi}
+
+\def\Lctosmcp#1{{\addfontfeature{RawFeature={+c2sc,+smcp}}#1}}
+\def\LCtoSMCP{\@ifnextchar-\L@CtoSMCP\L@@CtoSMCP}
+\def\L@CtoSMCP-{\addfontfeature{RawFeature={-c2sc,-smcp}}}
+\def\L@@CtoSMCP#1{\addfontfeature{RawFeature={+c2sc,+smcp}}\ifx#1+\else#1\fi}
+
+\def\Lsalt#1{{\addfontfeature{RawFeature=+salt}#1}}
+\def\LSALT{\@ifnextchar-\L@SALT\L@@SALT}
+\def\L@SALT-{\addfontfeature{RawFeature=-salt}}
+\def\L@@SALT#1{\addfontfeature{RawFeature=+salt}\ifx#1+\else#1\fi}
+
+\def\Lliga#1{{\addfontfeature{RawFeature=+liga}#1}}
+\def\LLIGA{\@ifnextchar-\L@LIGA\L@@LIGA}
+\def\L@LIGA-{\addfontfeature{RawFeature=-liga}}
+\def\L@@LIGA#1{\addfontfeature{RawFeature=+liga}\ifx#1+\else#1\fi}
+
+
+\def\Lhlig#1{{\addfontfeature{RawFeature=+hlig}#1}}
+\def\LHLIG{\@ifnextchar-\L@HLIG\L@@HLIG}
+\def\L@HLIG-{\addfontfeature{RawFeature=-hlig}}
+\def\L@@HLIG#1{\addfontfeature{RawFeature=+hlig}\ifx#1+\else#1\fi}
+
+\def\Ldlig#1{{\addfontfeature{RawFeature=+dlig}#1}}
+\def\LDLIG{\@ifnextchar-\L@DLIG\L@@DLIG}
+\def\L@DLIG-{\addfontfeature{RawFeature=-dlig}}
+\def\L@@DLIG#1{\addfontfeature{RawFeature=+dlig}\ifx#1+\else#1\fi}
+
+\endinput
+
diff --git a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
index dc2968cd4a0..c74b119c023 100644
--- a/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/acadian.ldf
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{acadian}
- [2024-06-26 v3.6b French support from the babel system]
+ [2024-07-25 v3.6c French support from the babel system]
\PackageInfo{acadian.ldf}%
{`acadian' dialect is currently\MessageBreak
*absolutely identical* to the\MessageBreak
diff --git a/Master/texmf-dist/tex/generic/babel-french/canadien.ldf b/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
index 449c05b0f0e..5f4ce1fbd56 100644
--- a/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/canadien.ldf
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{canadien}
- [2024-06-26 v3.6b French support from the babel system]
+ [2024-07-25 v3.6c French support from the babel system]
\PackageWarning{canadien.ldf}%
{Option `canadien' for Babel is *deprecated*,\MessageBreak
it might be removed sooner or later. Please\MessageBreak
diff --git a/Master/texmf-dist/tex/generic/babel-french/francais.ldf b/Master/texmf-dist/tex/generic/babel-french/francais.ldf
index 03a40729000..f1dab47db9f 100644
--- a/Master/texmf-dist/tex/generic/babel-french/francais.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/francais.ldf
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{francais}
- [2024-06-26 v3.6b French support from the babel system]
+ [2024-07-25 v3.6c French support from the babel system]
\PackageWarning{francais.ldf}%
{Option `francais' for Babel is *deprecated*,\MessageBreak
it might be removed sooner or later. Please\MessageBreak
diff --git a/Master/texmf-dist/tex/generic/babel-french/french.ldf b/Master/texmf-dist/tex/generic/babel-french/french.ldf
index 7542b22f6e8..61bb613bc09 100644
--- a/Master/texmf-dist/tex/generic/babel-french/french.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/french.ldf
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{french}
- [2024-06-26 v3.6b French support from the babel system]
+ [2024-07-25 v3.6c French support from the babel system]
%%
%% Babel package for LaTeX version 2e
%% Copyright © 1996-2024
@@ -1271,14 +1271,14 @@
Reported}%
\fi
}
-\newcommand*{\FB@ListOldLayout@setup}[1]%
+\newcommand*{\FBListOldLayout@setup}[1]%
{\csname FBListOldLayout#1\endcsname
\ifFBListOldLayout
\FBStandardEnumerateEnvtrue
\renewcommand*{\FrenchLabelItem}{\textendash}%
\fi
}
-\newcommand*{\FB@CompactItemize@setup}[1]%
+\newcommand*{\FBCompactItemize@setup}[1]%
{\csname FBCompactItemize#1\endcsname
\ifFBCompactItemize
\FBStandardItemizeEnvfalse
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
index 9ca381c455e..043aa84c723 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.ldf
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{frenchb}
- [2024-06-26 v3.6b French support from the babel system]
+ [2024-07-25 v3.6c French support from the babel system]
\def\bbl@tempa{frenchb}
\ifx\CurrentOption\bbl@tempa
\chardef\l@frenchb\l@french
diff --git a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
index 2a824fb924c..34f19225fca 100644
--- a/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
+++ b/Master/texmf-dist/tex/generic/babel-french/frenchb.lua
@@ -1,6 +1,6 @@
--[[
File `frenchb.lua’ generated from frenchb.dtx
- [2024-06-26 v3.6b French support from the babel system]
+ [2024-07-25 v3.6c French support from the babel system]
Copyright © 2014-2024 Daniel Flipo
<daniel (dot) flipo (at) free (dot) fr>
License LPPL: see french.ldf.
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcirc.defines.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcirc.defines.tex
index 943745bf7a0..cca735bf1e0 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcirc.defines.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcirc.defines.tex
@@ -266,6 +266,58 @@
%
%>>>
+%% check loaded TikZ/pgf version %<<<`
+%
+% parse the release date, thanks to Skillmon
+% https://github.com/pgf-tikz/pgf/issues/1348#issuecomment-2231681032
+% date can be yyyy-mm-dd or (older TikZ) yyyy/mm/dd
+\begingroup
+ \pgfutil@protected\def\parsedate#1%
+ {%
+ \afterassignment\parsedate@month
+ \pgf@circ@count@a=#1\relax
+ }
+ \pgfutil@protected\def\parsedate@month#1%
+ {%
+ \afterassignment\parsedate@day
+ \pgf@circ@count@b=%
+ }
+ \pgfutil@protected\def\parsedate@day#1%
+ {%
+ \afterassignment\parsedate@cleanup
+ \pgf@circ@count@c=%
+ }
+ \def\parsedate@cleanup#1\relax{}%
+ \parsedate{\pgfrevisiondate}%
+ \xdef\ctikz@@pgfyear{\the\pgf@circ@count@a}%
+ \xdef\ctikz@@pgfmonth{\the\pgf@circ@count@b}%
+ \xdef\ctikz@@pgfday{\the\pgf@circ@count@c}%
+\endgroup
+% The following code thanks to Skillmon:
+% https://tex.stackexchange.com/a/722570/38080
+% modified by romano to check the date
+\def\ctikz@@ifpgfafter@auxi#1#2%
+ {%
+ \ifnum#1
+ \ctikz@@ifpgfafter@auxii{#2}%
+ \fi
+ }
+\def\ctikz@@ifpgfafter@auxii#1\fi#2\ctikz@@ifpgfafter#3{\fi#1}
+\def\ctikz@@ifpgfafter#1-#2-#3#%
+ {%
+ \ctikz@@ifpgfafter@auxi{\ctikz@@pgfyear>#1}\pgfutil@firstoftwo
+ \ctikz@@ifpgfafter@auxi{\ctikz@@pgfyear<#1}\pgfutil@secondoftwo
+ \ctikz@@ifpgfafter@auxi{\ctikz@@pgfmonth>#2}\pgfutil@firstoftwo
+ \ctikz@@ifpgfafter@auxi{\ctikz@@pgfmonth<#2}\pgfutil@secondoftwo
+ \ctikz@@ifpgfafter@auxi{\ctikz@@pgfday<#3}\pgfutil@secondoftwo
+ \pgfutil@gobble\ctikz@@ifpgfafter\pgfutil@firstoftwo
+ }
+%
+% usage \ctikz@@ifpgfafter 2023-01-16{true}{false}
+% ^^^ no spaces here, braces needed.
+%
+%>>>
+
%% arrow tips macros and utilities %<<<1
% the default arrow is latexslim, which has been ported over old arrows library (deprecated)
@@ -298,9 +350,70 @@
\pgfpathclose
\pgfusepathqfill
}
-
\pgfarrowsdeclarereversed{latexslim reversed}{latexslim reversed}{latexslim}{latexslim}
-
+%% Jack Tap, see
+%% https://github.com/circuitikz/circuitikz/issues/806
+\pgfdeclarearrow{name=Jack Tap,
+ parameters = {%
+ \the\pgfarrowlength,%
+ \the\pgfarrowwidth,%
+ \ifpgfarrowswap s\fi%
+ \ifpgfarrowopen o\fi%
+ \ifpgfarrowroundjoin j\fi
+ \ifpgfarrowroundcap c\fi%
+ },
+ setup code = {
+ \pgfarrowssettipend{.5\pgfarrowlength}
+ \pgfarrowssetlineend{-.6\pgfarrowlength}
+ \pgfarrowssetvisualbackend{-.6\pgfarrowlength}
+ \pgfarrowssetbackend{-.6\pgfarrowlength}
+ % hull
+ \pgfarrowshullpoint{.5\pgfarrowlength}{0pt}
+ \pgfarrowshullpoint{0pt}{\pgfarrowwidth}
+ \pgfarrowshullpoint{-.6\pgfarrowlength}{0pt}
+ % Saves: Only the length:
+ \pgfarrowssavethe\pgfarrowlength
+ \pgfarrowssavethe\pgfarrowwidth
+ },
+ drawing code = {
+ \pgfsetdash{}{+0pt}
+ \pgfarrowlinewidth=\pgflinewidth
+ \ifpgfarrowroundjoin\pgfsetroundjoin\else\pgfsetmiterjoin\fi
+ \ifpgfarrowroundcap\pgfsetroundcap\else\pgfsetbuttcap\fi
+ \pgfpathmoveto{\pgfqpoint{-.6\pgfarrowlength}{0pt}}
+ \pgfpathlineto{\pgfqpoint{-.5\pgfarrowlength}{0pt}}
+ \pgfpathlineto{\pgfqpoint{0pt}{\pgfarrowwidth}}
+ \pgfpathlineto{\pgfqpoint{.5\pgfarrowlength}{0pt}}
+ \ifpgfarrowopen
+ \pgfusepathqstroke
+ \else
+ \pgfpathclose
+ \ifdim\pgfarrowlinewidth>0pt\pgfusepathqfillstroke\else\pgfusepathqfill\fi
+ \fi
+ },
+ defaults = {length = 0.3cm, width=0.15cm, open},
+ % cache=false, % breaks everything
+}
+% the new "fill without arg" will be in TikZ 3.1.11. Apply it here if we have an
+% older version
+\ctikz@@ifpgfafter 2023-01-16{\relax}{%
+ % thanks @muzimuzhi https://github.com/pgf-tikz/pgf/issues/1348#issuecomment-2229075269
+ % undo the fill/.value required key
+ \expandafter\let\csname pgfk@/pgf/arrow keys/fill/.@def\endcsname\@undefined
+ \pgfkeys{/pgf/arrow keys/fill/.code={%
+ \def\pgf@temp{#1}%
+ \ifx\pgf@temp\pgf@nonetext%
+ \pgfarrowsaddtooptions{\pgfarrowopentrue}%
+ \else\ifx\pgf@temp\pgfkeysnovalue@text%
+ \pgfarrowsaddtooptions{\pgfarrowopenfalse}%
+ \else
+ \pgfarrowsaddtooptions{\pgfarrowopenfalse\def\pgf@arrows@fill@color{#1}}%
+ \fi\fi
+ }}%
+}
+\tikzset{v/.tip={Jack Tap[swap]}, ^/.tip={Jack Tap},
+ vf/.tip={Jack Tap[swap,fill]}, ^f/.tip={Jack Tap[fill]}}
+%
% select the arrows using available defaults.
\def\pgfcirc@arrow@default{default}
% choose the arrows to use. Use #2 and #3 if the key is equal to "default"
@@ -466,7 +579,30 @@
\fi
\fi
}
-
+% similar o the above, use the fill parameter to set fill or draw
+% for a subset of the shape
+\def\pgf@circ@subset@fill@or@draw#1{%
+ % You *must* be sure that this is called inside a \pgfscope!
+ \edef\@@none{none}\edef\@@default{default}
+ \edef\@@tmp{\ctikzvalof{#1/fill}}
+ \ifx\@@tmp\@@none
+ \pgfusepath{draw}
+ \else
+ \ifx\@@tmp\@@default\else
+ \pgfsetfillcolor{\@@tmp}
+ \fi
+ \pgfusepath{draw, fill}
+ \fi
+}
+% ...and for the thickness
+\def\pgf@circ@subset@thickness#1{%
+ % You *must* be sure that this is called inside a \pgfscope!
+ \edef\@@default{default}
+ \edef\@@tmp{\ctikzvalof{#1/thickness}}
+ \ifx\@@tmp\@@default\else
+ \pgfsetlinewidth{\@@tmp\pgflinewidth}%
+ \fi
+}
% set the text color (via \color) if the color is not default or none
% needed in some strange case (like bodydiode' dots)
\def\pgf@circ@maybe@color#1{%
@@ -557,6 +693,7 @@
% #7 - macros drawing the bipole
%
\long\def\pgfcircdeclarebipolescaled#1#2#3#4#5#6#7{
+ % \typeout{Declaring bipole:\space #4,}
\pgfdeclareshape{#4shape}{
\savedmacro{\ctikzclass}{\edef\ctikzclass{#1}}
\saveddimen{\scaledRlen}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}}
@@ -602,97 +739,33 @@
\pgf@y=.5\pgf@y
}
\anchor{center}{\pgfpointorigin}
- \anchor{n}{
- \northeast
- \pgf@x=0cm
- }
- \anchor{north east}{
- \northeast
- }
- \anchor{north west}{
- \northeast
- \pgf@x=-\pgf@x
- }
- \anchor{ne}{
- \northeast
- }
- \anchor{nw}{
- \northeast
- \pgf@x=-\pgf@x
- }
- \anchor{e}{
- \northeast
- \pgf@y=0cm
- }
- \anchor{s}{
- \southwest
- \pgf@x=0cm
- }
- \anchor{south east}{
- \southwest
- \pgf@x=-\pgf@x
- }
- \anchor{south west}{
- \southwest
- }
- \anchor{se}{
- \southwest
- \pgf@x=-\pgf@x
- }
- \anchor{sw}{
- \southwest
- }
- \anchor{w}{
- \southwest
- \pgf@y=0cm
- }
- \anchor{north}{
- \northeast
- \pgf@x=0cm
- }
- \anchor{east}{
- \northeast
- \pgf@y=0cm
- }
- \anchor{south}{
- \southwest
- \pgf@x=0cm
- }
- \anchor{west}{
- \southwest
- \pgf@y=0cm
- }
- \anchor{right}{
- \northeast
- \pgf@y=0cm
- }
- \anchor{above}{
- \northeast
- \pgf@x=0cm
- }
- \anchor{left}{
- \southwest
- \pgf@y=0cm
- }
- \anchor{below}{
- \southwest
- \pgf@x=0cm
- }
- \anchor{a}{
- \northeast
- \pgf@y=0cm
- }
- \anchor{b}{
- \southwest
- \pgf@y=0cm
- }
+ \anchor{n}{\northeast\pgf@x=0cm }
+ \anchor{north east}{\northeast}
+ \anchor{north west}{\northeast\pgf@x=-\pgf@x}
+ \anchor{ne}{\northeast}
+ \anchor{nw}{\northeast\pgf@x=-\pgf@x}
+ \anchor{e}{\northeast\pgf@y=0cm }
+ \anchor{s}{\southwest\pgf@x=0cm }
+ \anchor{south east}{\southwest\pgf@x=-\pgf@x}
+ \anchor{south west}{\southwest}
+ \anchor{se}{\southwest\pgf@x=-\pgf@x}
+ \anchor{sw}{\southwest}
+ \anchor{w}{\southwest\pgf@y=0cm }
+ \anchor{north}{\northeast\pgf@x=0cm }
+ \anchor{east}{\northeast\pgf@y=0cm }
+ \anchor{south}{\southwest\pgf@x=0cm }
+ \anchor{west}{\southwest\pgf@y=0cm }
+ \anchor{right}{\northeast\pgf@y=0cm }
+ \anchor{above}{\northeast\pgf@x=0cm }
+ \anchor{left}{\southwest\pgf@y=0cm }
+ \anchor{below}{\southwest\pgf@x=0cm }
+ \anchor{a}{\northeast\pgf@y=0cm }
+ \anchor{b}{\southwest\pgf@y=0cm }
\savedanchor{\textanchor}{%
\pgf@y=\ht\pgfnodeparttextbox
\pgf@x=-.5\wd\pgfnodeparttextbox
}
- \anchor{text}{
- \textanchor
- }
+ \anchor{text}{ \textanchor }
\anchorborder{%
\ifpgf@circuit@bipole@inverted
\pgf@circ@res@left=-\pgf@x
@@ -711,7 +784,6 @@
#2%
\pgf@circ@draw@component{
\pgf@circ@setcolor
-
\northeast
\pgf@circ@res@up = \pgf@y
\pgf@circ@res@zero = 0cm
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex
index 626ed28812b..b30e741458d 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex
@@ -632,13 +632,21 @@
\pgfusepath{draw}
\endpgfscope
}%
-
%% Zig-zag resistors
+% see https://github.com/circuitikz/circuitikz/discussions/814
+\ctikzset{resistors/zigzag stub/.initial=0}
+\ctikzset{resistors/zigzag hook/.code={}}
\def\pgf@circ@zigzag#1{%
+ \pgf@circ@res@temp=\ctikzvalof{resistors/zigzag stub}\pgf@circ@res@step
+ \advance \pgf@circ@res@step by -2\pgf@circ@res@temp
\divide \pgf@circ@res@step by \numexpr4*\zigs\relax
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{\pgf@circ@res@zero}}
+ \ifdim\pgf@circ@res@temp>0pt
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@left+\pgf@circ@res@temp -\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{\pgf@circ@res@zero}}
+ \fi
\pgf@circ@res@other = \pgf@circ@res@left
+ \advance\pgf@circ@res@other by \pgf@circ@res@temp
\pgf@circ@count@a=\zigs\relax
% first half zig
\advance\pgf@circ@res@other by \pgf@circ@res@step
@@ -655,11 +663,14 @@
\advance\pgf@circ@res@other by 2\pgf@circ@res@step
\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{#1\pgf@circ@res@down}}
\advance\pgf@circ@res@other by \pgf@circ@res@step
- \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@zero}}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@other+\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{\pgf@circ@res@zero}}
+ \ifdim\pgf@circ@res@temp>0pt
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@other+\pgf@circ@res@temp+\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{\pgf@circ@res@zero}}
+ \fi
\pgfsetbeveljoin
+ \pgfkeys{/tikz/circuitikz/resistors/zigzag hook}
\pgfusepath{draw}
}
-
%% Resistor
\pgfcircdeclarebipolescaled{resistors}
{
@@ -672,7 +683,7 @@
{
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
\pgftransformationadjustments
- \pgfmathsetlength{\pgf@circ@res@step}{\ctikzvalof{bipoles/resistor/width}*\scaledRlen+\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}
+ \pgfmathsetlength{\pgf@circ@res@step}{\ctikzvalof{bipoles/resistor/width}*\scaledRlen}
\pgf@circ@zigzag{1}
}
@@ -692,7 +703,7 @@
{
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
\pgftransformationadjustments
- \pgfmathsetlength{\pgf@circ@res@step}{\ctikzvalof{bipoles/vresistor/width}*\scaledRlen+\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}
+ \pgfmathsetlength{\pgf@circ@res@step}{\ctikzvalof{bipoles/vresistor/width}*\scaledRlen}
\pgf@circ@zigzag{.5}
\pgfscope
@@ -731,7 +742,7 @@
{
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
\pgftransformationadjustments
- \pgfmathsetlength{\pgf@circ@res@step}{\ctikzvalof{bipoles/potentiometer/width}*\scaledRlen+\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}
+ \pgfmathsetlength{\pgf@circ@res@step}{\ctikzvalof{bipoles/potentiometer/width}*\scaledRlen}
\pgf@circ@zigzag{1}
\pgfscope
@@ -761,7 +772,7 @@
{%
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
\pgftransformationadjustments
- \pgfmathsetlength{\pgf@circ@res@step}{\ctikzvalof{bipoles/resistivesens/width}*\scaledRlen+\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}
+ \pgfmathsetlength{\pgf@circ@res@step}{\ctikzvalof{bipoles/resistivesens/width}*\scaledRlen}
\pgf@circ@zigzag{.5}
\pgfscope
@@ -810,7 +821,7 @@
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right/\@@intscale+\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{+0pt}}
\pgfpathlineto{\pgfpoint{\pgf@circ@res@right+\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{+0pt}}
\pgftransformationadjustments
- \pgfmathsetlength{\pgf@circ@res@step}{\ctikzvalof{bipoles/ldresistor/width}*\scaledRlen+\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}
+ \pgfmathsetlength{\pgf@circ@res@step}{\ctikzvalof{bipoles/ldresistor/width}*\scaledRlen}
\pgf@circ@zigzag{\@@hscale}
}%
@@ -6031,6 +6042,13 @@
\ctikzset{bipoles/qpprobe/voltage/additional shift/.initial=.5}
\ctikzset{bipoles/iloop/width/.initial=.40}
\ctikzset{bipoles/iloop/height/.initial=.60}
+% currtap see https://github.com/circuitikz/circuitikz/issues/807
+\ctikzset{bipoles/currtap/height/.initial=0.4}
+\ctikzset{bipoles/currtap/dot size/.initial=0.5}
+\ctikzset{bipoles/currtap/fill/.initial=default}
+\ctikzset{bipoles/currtap/dash/.initial=none}
+\ctikzset{bipoles/currtap/color/.initial=default}
+\ctikzset{bipoles/currtap/thickness/.initial=default}
\ctikzset{bipoles/oscope/height/.initial=.60}
\ctikzset{bipoles/oscope/width/.initial=.60}
@@ -6607,6 +6625,28 @@
\pgfusepath{draw}
\endpgfscope
}
+%% currtap
+\pgfcircdeclarebipolescaled{instruments}
+{
+ \savedmacro{\@@dotsize}{\def\@@dotsize{\ctikzvalof{bipoles/currtap/dot size}}}
+ \anchor{tap}{\northeast\pgf@x=0pt\pgf@y=\@@dotsize\pgf@y\pgf@y=-\pgf@y}
+}
+{\ctikzvalof{bipoles/currtap/height}}
+{currtap}
+{\ctikzvalof{bipoles/currtap/height}}
+{\ctikzvalof{bipoles/currtap/height}}
+{
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+ \pgfpathlineto{\pgfpoint{0.95\pgf@circ@res@left}{0pt}}
+ \pgfpatharc{180}{0}{0.95\pgf@circ@res@right}
+ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+ \pgfusepath{draw}
+ \pgf@circ@subset@color@dash{bipoles/currtap}
+ \pgf@circ@subset@thickness{bipoles/currtap}
+ \pgfusepath{draw}
+ \pgfpathcircle{\pgfpoint{0pt}{0pt}}{\@@dotsize*\pgf@circ@res@up}
+ \pgf@circ@subset@fill@or@draw{bipoles/currtap}
+}
% %>>>
% Path definitions for Instruments%<<<
@@ -6619,8 +6659,8 @@
\pgfcirc@activate@bipole@simple{l}{rmeterwa}
\pgfcirc@activate@bipole@simple{l}{smeter}
\pgfcirc@activate@bipole@simple{l}{iloop}
-% \pgfcirc@activate@bipole@simple{l}{iloop2} that was wrong
\pgfcirc@activate@bipole{l}{ilooptwo}{iloop2}{iloop2}
+\pgfcirc@activate@bipole@simple{l}{currtap}
\pgfcirc@activate@bipole@simple{l}{qvprobe}
\pgfcirc@activate@bipole@simple{l}{qiprobe}
\pgfcirc@activate@bipole@simple{l}{qpprobe}
@@ -6774,16 +6814,22 @@
% spring into the damper
\pgfscope
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+ \pgfscope
+ \pgftransformationadjustments
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{\pgf@circ@res@zero}}
+ \pgfpathlineto{\pgfpoint{.95\pgf@circ@res@left}{\pgf@circ@res@zero}}
\pgfsetcornersarced{\pgfpoint{.25\pgf@circ@res@up}{.25\pgf@circ@res@up}}
\pgfpathlineto{\pgfpoint{.75\pgf@circ@res@left}{.75\pgf@circ@res@up}}
\pgfpathlineto{\pgfpoint{.5\pgf@circ@res@left}{-.75\pgf@circ@res@up}}
\pgfpathlineto{\pgfpoint{.25\pgf@circ@res@left}{.75\pgf@circ@res@up}}
\pgfpathlineto{\pgfpoint{0pt}{-.75\pgf@circ@res@up}}
\pgfpathlineto{\pgfpoint{\ctikzvalof{bipoles/damper/length}\pgf@circ@res@right}{.75\pgf@circ@res@up}}
+ \pgfsetbuttcap
+ \pgfsetbeveljoin
\pgfusepath{stroke}
\endpgfscope
+ \endpgfscope
% damper box
\pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
@@ -7171,18 +7217,18 @@
{\ctikzvalof{bipoles/thermocouple/height}}
{\ctikzvalof{bipoles/thermocouple/width}}
{
+ \pgfsetrectcap
\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0}}
\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{.5\pgf@circ@res@down}}
- \pgfusepath{draw}
- \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{.5\pgf@circ@res@down}}
- \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
\pgfpathlineto{\pgfpoint{0}{\pgf@circ@res@down}}
- \pgfusepath{draw}
- \pgfsetlinewidth{\pgfstartlinewidth}
- \pgfpathmoveto{\pgfpoint{0}{\pgf@circ@res@down}}
\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{.5\pgf@circ@res@down}}
\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0}}
\pgfusepath{draw}
+ \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+ \pgfsetroundcap
+ \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{.5\pgf@circ@res@down}}
+ \pgfpathlineto{\pgfpoint{0}{\pgf@circ@res@down}}
+ \pgfusepath{draw}
}
%% fuse
\pgfcircdeclarebipolescaled{misc}
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex
index e3665b88625..cb95f54ef3e 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex
@@ -231,13 +231,15 @@
\compattikzset{#2/.style={\comnpatname #1, #3={##1}}}%
}
% create a bipole
-\def\pgfcirc@activate@bipole#1#2#3#4{% path name, base node name, style name
+\def\pgfcirc@activate@bipole#1#2#3#4{% type of label, path name, base node name, style name
+ % \typeout{Activate bipole:\space #4,}
\expandafter\def\csname pgf@circ@#2@path\endcsname##1{\pgf@circ@bipole@path{#3}{##1}}%
\pgfcirc@path@to@style{#1}{#2}{#4}{}% no options here, let's see
}
\def\pgfcirc@activate@bipole@simple#1#2{\pgfcirc@activate@bipole{#1}{#2}{#2}{#2}}
% create a bipole with options
-\def\pgfcirc@activate@bipole@opt#1#2#3#4#5{% path name, base node name, style name
+\def\pgfcirc@activate@bipole@opt#1#2#3#4#5{% type of label, path name, base node name, style name, options
+ % \typeout{Activate bipole:\space #4,}
\expandafter\def\csname pgf@circ@#2@path\endcsname##1{\pgf@circ@bipole@path{#3}{##1}}%
\pgfcirc@path@to@style{#1}{#2}{#4}{#5}% no options here, let's see
}
diff --git a/Master/texmf-dist/tex/generic/pst-coil/pst-coil.tex b/Master/texmf-dist/tex/generic/pst-coil/pst-coil.tex
index cd15fa05373..0aff59732c5 100644
--- a/Master/texmf-dist/tex/generic/pst-coil/pst-coil.tex
+++ b/Master/texmf-dist/tex/generic/pst-coil/pst-coil.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-coil.tex 578 2011-09-18 17:18:46Z herbert $
+%% $Id: pst-coil.tex 930 2024-08-13 18:19:44Z herbert $
%% BEGIN pst-coil.tex
%%
%% Coils and zigzags with PSTricks
@@ -7,7 +7,7 @@
%%
%%
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
-%% 2006-2015 Herbert Voss, hvoss@tug.org
+%% 2006-2024 Herbert Voss, hvoss@tug.org
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN
@@ -21,8 +21,8 @@
\ifx\PSTnodeLoaded\endinput \else\input pst-node.tex\fi
\ifx\PSTXKeyLoaded\endinput \else\input pst-xkey \fi
%
-\def\fileversion{1.07}
-\def\filedate{2015/05/13}
+\def\fileversion{1.08}
+\def\filedate{2024/08/13}
%
\edef\TheAtCode{\the\catcode`\@}
\catcode`\@=11
@@ -48,7 +48,15 @@
\let\psk@coilarmB\psk@coilarmA}
\define@key[psset]{pst-coil}{coilaspect}[45]{\pst@getangle{#1}\psk@coilaspect}
\define@key[psset]{pst-coil}{coilinc}[10]{\pst@getangle{#1}\psk@coilinc}
-%
+%%%%%% alternative macro
+\define@key[psset]{pst-coil}{N}[10]{\def\psk@NoOfSpirals{#1 }}
+\define@key[psset]{pst-coil}{R}[1]{\def\psk@InitialWidth{#1 }}% in cm
+\define@key[psset]{pst-coil}{l0}[10]{\def\psk@InitialLength{#1 }}
+\define@key[psset]{pst-coil}{alpha}[15]{\def\psk@coil@Alpha{#1 }}
+\define@key[psset]{pst-coil}{arm}[0]{\def\psk@coil@arm{#1 }}
+\define@key[psset]{pst-coil}{nS}[25]{\def\psk@coil@NoOfPointsPerCoil{#1 }}
+\psset[pst-coil]{N=10,R=0.5,alpha=15,arm=0,l0=5,nS=25}
+
\psset[pst-coil]{coilaspect=45,coilarm=.5cm,coilheight=1,coilwidth=1cm,coilinc=10}
%
\def\pscoil{\def\pst@par{}\pst@object{pscoil}}
@@ -198,7 +206,7 @@
{ \psk@function }
\tx@Sin
}%
- \showpointsfalse%
+ \showpointsfalse
\end@OpenObj}
%
\def\ncsin{\pst@object{ncsin}}
@@ -220,6 +228,49 @@
\def\pcsin{\def\pst@par{}\pst@object{pcsin}}
\def\pcsin@i{\pc@object\ncsin@ii}
%
+\def\psAltCoil{\def\pst@par{}\pst@object{psAltCoil}}
+\def\psAltCoil@i{\pst@getarrows\psAltCoil@ii}
+\def\psAltCoil@ii(#1){\@ifnextchar({\psAltCoil@iii{1}(#1)}{\psAltCoil@iii{\z@}(0,0)(#1)}}
+\def\psAltCoil@iii#1(#2)(#3){%
+ \begin@OpenObj
+ \pst@getcoor{#2}\pst@tempa
+ \pst@getcoor{#3}\pst@tempb
+ \addto@pscode{%
+ \pst@tempa \pst@tempb
+ /y1 ED /x1 ED /y0 ED /x0 ED
+ x0 y0 translate
+ y1 y0 sub x1 x0 sub 2 copy Pyth
+ /Longueur ED
+ Atan rotate
+ /NoOfSpirals \psk@NoOfSpirals def % nombre de spires
+ /Alpha \psk@coil@Alpha def
+ /R_0 \psk@InitialWidth \pst@number\psunit mul def
+ /arm \psk@coil@arm \pst@number\psunit mul def
+ /l_0 \psk@InitialLength \pst@number\psunit mul def
+ /nS \psk@coil@NoOfPointsPerCoil def
+ /Pas_0 l_0 NoOfSpirals div def
+ /Pas Longueur 2 arm mul sub NoOfSpirals div def
+ % longueur de l'hélice sur un tour
+ % = sqrt(4*pi^2*R^2+p^2)
+ /Longueur_Helice_pas 39.47842 R_0 dup mul mul Pas_0 dup mul add sqrt def
+ % R=1/(2*pi)*sqrt(L^2-p^2)
+ /Radius 0.1591549 Longueur_Helice_pas dup mul Pas dup mul sub sqrt mul def
+ /xH {Radius 360 t mul cos mul Radius sub} def
+ /yH {Radius 360 t mul sin mul} def
+ /zH {Pas t mul arm add} def
+ /Inc 1 NoOfSpirals nS mul div def % nS(50) points par spires
+ 1 setlinejoin
+ 1 0 0 0 ArrowA arm 0 lineto
+ 0 Inc NoOfSpirals {
+ /t ED
+ zH xH Alpha tan mul sub
+ yH
+ lineto
+ } for
+ Longueur 0
+ ArrowB lineto
+ }%
+ \end@OpenObj}
%
\catcode`\@=\TheAtCode\relax
\endinput
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 f8af2076aa2..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.06}
-\def\filedate{2024/07/10}
+\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}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/amsfonts.4ht b/Master/texmf-dist/tex/generic/tex4ht/amsfonts.4ht
index 71602474401..6cac5658c2c 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/amsfonts.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/amsfonts.4ht
@@ -1,37 +1,29 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% amsfonts.4ht 2009-05-21-09:32 %
-% Copyright (C) 2001--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 %
-% 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".%
-% %
-% This Current Maintainer of this work %
-% is Eitan M. Gurari. %
-% %
-% If you modify this program your changing its signature %
-% with a directive of the following form will be %
-% appreciated. %
-% \message{signature} %
-% %
-% gurari@cse.ohio-state.edu %
-% http://www.cse.ohio-state.edu/~gurari %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2009-05-21-09:32}
-
+% amsfonts.4ht 2024-08-13-13:15 %
+% Copyright (C) 2001-2009 Eitan M. Gurari %
+% Copyright 2009-2024 TeX Users Group
+%
+% 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 the TeX4ht Project <https://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
\NewConfigure{mathbb}{2}
-\def\:temp#1{{\a:mathbb \o:@mathbb:{#1}\b:mathbb}}
-\HLet\@mathbb\:temp
+\def\:temp#1{{\a:mathbb \o:mathbb:{#1}\b:mathbb}}
+\HLet\mathbb\:temp
\NewConfigure{mathfrak}{2}
-\def\:temp#1{{\a:mathfrak \o:@mathfrak:{#1}\b:mathfrak}}
-\HLet\@mathfrak\:temp
+\def\:temp#1{{\a:mathfrak \o:mathfrak:{#1}\b:mathfrak}}
+\HLet\mathfrak\:temp
\Hinput{amsfonts}
\endinput
diff --git a/Master/texmf-dist/tex/generic/tex4ht/esvect.4ht b/Master/texmf-dist/tex/generic/tex4ht/esvect.4ht
new file mode 100644
index 00000000000..8fc583da580
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/tex4ht/esvect.4ht
@@ -0,0 +1,25 @@
+% esvect.4ht (2024-08-02-14:24), generated from tex4ht-4ht.tex
+% Copyright 2024 TeX Users Group
+%
+% 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
+% 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>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
+\immediate\write-1{version 2024-08-02-14:24}
+
+
+
+\Hinput{esvect}
+\endinput
+
diff --git a/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht b/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht
index dfe3f02138f..c33bacaa3ff 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht
@@ -1,23 +1,23 @@
-% html-mml.4ht (2022-10-31-13:02), generated from tex4ht-mathml.tex
-% Copyright 2009-2022 TeX Users Group
+% html-mml.4ht (2024-08-11-08:31), generated from tex4ht-mathml.tex
+% Copyright 2009-2024 TeX Users Group
% Copyright 1999-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.
-\immediate\write-1{version 2022-10-31-13:02}
+\immediate\write-1{version 2024-08-11-08:31}
\exit:ifnot{amsmath,%
array,%
@@ -291,6 +291,139 @@ tex4ht}
\Configure{MathjaxSource}{https://cdn.jsdelivr.net/npm/mathjax@3/es5/mml-chtml.js}
\Configure{@HEAD}{\HCode{ <script type="text/javascript" id="MathJax-script" async="async" src="\a:MathjaxSource"></script> \Hnewline}}
\fi
+\:CheckOption{texsource}\if:Option
+
+\newtoks\mmleqtoks
+\ExplSyntaxOn
+\cs_new_protected:Npn \mmlalteqtoks #1
+{
+ % save tokens, but preserve spaces
+ % https://tex.stackexchange.com/a/44444/2891
+ \tl_set:Nn \l_tmpa_tl {#1}
+ \regex_replace_all:nnN { . } { \c{string} \0 } \l_tmpa_tl
+ \tl_set:Nx \l_tmpa_tl { \l_tmpa_tl }
+ % % replace < > and & with xml entities
+ \regex_replace_all:nnN { \x{26} } { &amp; } \l_tmpa_tl
+ \regex_replace_all:nnN { \x{3C} } { &lt; } \l_tmpa_tl
+ \regex_replace_all:nnN { \x{3E} } { &gt; } \l_tmpa_tl
+ % \regex_replace_all:nnN { \n } {\HCode{ \Hnewline }} \l_tmpa_tl
+ % replace \par command with blank lines
+ \regex_replace_all:nnN { \x{5C}par\b } {\x{A}\x{A}} \l_tmpa_tl
+ \tl_set:Nx \mmleqtoks{ \l_tmpa_tl }
+
+ %\HCode{\l_tmpb_tl}
+}
+\ExplSyntaxOff
+
+
+\def\AltMath#1${\mmlalteqtoks{#1}%
+ #1\HCode{</\a:mathml mrow><\a:mathml annotation encoding="application/x-tex">\mmleqtoks</\a:mathml annotation>}$}
+\Configure{$}{\Configure{@math}{display="inline"}\DviMath\HCode{<\a:mathml semantics><\a:mathml mrow>}}{\HCode{</\a:mathml semantics>}\EndDviMath}{\expandafter\AltMath}
+
+\def\AltMathParen#1\){\mmlalteqtoks{#1}%
+ #1\HCode{</\a:mathml mrow><a\a:mathml nnotation encoding="application/x-tex">\mmleqtoks</\a:mathml annotation>}$}
+
+\def\AltMathParen#1\){\mmlalteqtoks{#1}#1\HCode{</\a:mathml mrow><\a:mathml annotation encoding="application/x-tex">\mmleqtoks</\a:mathml annotation>}\)}
+%\Configure{()}{\Configure{@math}{display="inline"}\DviMath\HCode{<\a:mathml semantics><\a:mathml mrow>}\AltMathParen$}{\EndDviMath\HCode{</\a:mathml semantics>}}
+\Configure{()}
+ {\Configure{@math}{%\a:mathml
+ display="inline"
+}\csname a:mathml()\endcsname
+\DviMath\HCode{<\a:mathml semantics><\a:mathml mrow>}$\expandafter\AltMathParen}
+{$\HCode{</\a:mathml semantics>}\EndDviMath\csname b:mathml()\endcsname}
+
+
+\long\def\AltDisplay#1\]{\mmlalteqtoks{#1}#1\HCode{</\a:mathml mrow><\a:mathml annotation encoding="application/x-tex">\mmleqtoks</\a:mathml annotation></\a:mathml semantics>}\]}
+\Configure{[]}{\Configure{@math}{display="block"}\DviMath$$\DisplayMathtrue\HCode{<\a:mathml semantics><\a:mathml mrow>}\AltDisplay}{$$\EndDviMath}
+
+
+% \long\def\MMLAltlDisplayDollars#1$${\mmlalteqtoks{\[#1\]}#1\HCode{</\a:mathml mrow><\a:mathml annotation encoding="application/x-tex">\mmleqtoks</\a:mathml annotation>}$$}
+
+% configuarartion of display math doesn't work yet. need to investigate it.
+% \Configure{$$}
+% {\Configure{@math}{%\a:mathml
+% display="block"
+% }\IgnorePar
+% \ifvmode\else \HCode{<!--tex4ht:inline-->}\fi
+% \EndP\DviMath\HCode{<\a:mathml semantics><\a:mathml mrow>}}
+% {\HCode{</\a:mathml semantics>}\EndDviMath\ShowPar\par{\csname HCondtrue\endcsname\noindent}}
+% {\DisplayMathtrue\expandafter\MMLAltlDisplayDollars}
+
+
+% \renewcommand\eqannotate[1]{\mmlalteqtoks{#1}\HCode{<\a:mathml semantics><\a:mathml mrow>}#1\HCode{</\a:mathml mrow><\a:mathml annotation encoding="application/x-tex">\mmleqtoks</\a:mathml annotation></\a:mathml semantics>}}
+
+
+% environment support
+\newcommand\MMLVerbMathToks[2]{%
+ \mmlalteqtoks{\begin{#2}
+ #1
+ \end{#2}}%
+ \begingroup%
+ \ifvmode\IgnorePar\fi\EndP\Configure{@math}{display="block"}\DviMath\DisplayMathtrue\HCode{<\a:mathml semantics><\a:mathml mrow>}
+ \Configure{$$}{}{}{}
+ \begin{old#2}
+ #1
+ \end{old#2}
+ \HCode{</\a:mathml mrow><\a:mathml annotation encoding="application/x-tex">}
+ \HCode{\mmleqtoks}
+ \HCode{</\a:mathml annotation></\a:mathml semantics>}
+ \EndDviMath
+ \endgroup
+}
+
+% we must handle equations separatelly.
+% it is a bit messy
+\newcommand\MMLVerbMathToksEquation[2]{%
+ \mmlalteqtoks{\begin{#2}
+ #1
+ \end{#2}}%
+ \begingroup%
+ \def\@tempa{#2}%
+ \def\@equationname{equation}%
+ \def\mlabeledtr{mtr}
+ \ifx\@equationname\@tempa%
+ \def\mlabeledtr{mlabeledtr} % this element can be used to print the equation number, but it is supported only by MathJax
+ \fi
+ \ifvmode\IgnorePar\fi\EndP\Configure{@math}{display="block"}\DviMath\DisplayMathtrue\HCode{<\a:mathml semantics><\a:mathml mrow><\a:mathml mtable><\a:mathml \mlabeledtr><\a:mathml mtd>}%
+ \ifx\@equationname\@tempa%
+ \incr@eqnum%
+ \print@eqnum%
+ \HCode{</\a:mathml mtd><\a:mathml mtd>}%
+ \fi
+ #1%
+ \HCode{</\a:mathml mtd></\a:mathml \mlabeledtr></\a:mathml mtable></\a:mathml mrow><\a:mathml annotation encoding="application/x-tex">}%
+ \HCode{\mmleqtoks}%
+ \HCode{</\a:mathml annotation></\a:mathml semantics>}%
+ \EndDviMath%
+ \endgroup%
+}
+
+\ExplSyntaxOn
+\newcommand\MMLVerbMath[1]{%
+ \cs_if_exist:cTF{#1}{
+ \expandafter\let\csname old#1\expandafter\endcsname\csname #1\endcsname
+ \expandafter\let\csname endold#1\expandafter\endcsname\csname end#1\endcsname
+ \RenewDocumentEnvironment{#1}{+!b}{%
+ \NoFonts\expandafter\MMLVerbMathToks\expandafter{##1}{#1}\EndNoFonts%
+ }{}
+ }{}%
+}
+
+\newcommand\MMLVerbEquation[1]{%
+ \cs_if_exist:cTF{#1}{
+ \expandafter\let\csname old#1\expandafter\endcsname\csname #1\endcsname
+ \expandafter\let\csname endold#1\expandafter\endcsname\csname end#1\endcsname
+ \RenewDocumentEnvironment{#1}{+!b}{%
+ \NoFonts\expandafter\MMLVerbMathToksEquation\expandafter{##1}{#1}\EndNoFonts%
+ }{}
+ }{}%
+}
+\ExplSyntaxOff
+
+% \MMLVerbEquation{equation}
+% \MMLVerbEquation{equation*}
+
+\fi
\Configure{multicolumn}
{\let\sv:VBorder\VBorder
\let\VBorder\empty
@@ -482,9 +615,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
-
-
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amsmath}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -661,6 +791,43 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\ShowPar\IgnoreIndent\par}
\fi
+\:CheckOption{texsource}\if:Option
+\MMLVerbMath{subarray}
+\MMLVerbMath{smallmatrix}
+\MMLVerbMath{matrix}
+\MMLVerbMath{pmatrix}
+\MMLVerbMath{bmatrix}
+\MMLVerbMath{Bmatrix}
+\MMLVerbMath{vmatrix}
+\MMLVerbMath{Vmatrix}
+\MMLVerbMath{cases}
+\MMLVerbMath{subequations}
+\MMLVerbMath{aligned}
+\MMLVerbMath{alignedat}
+\MMLVerbMath{gathered}
+\MMLVerbMath{gather}
+\MMLVerbMath{gather*}
+\MMLVerbMath{alignat}
+\MMLVerbMath{alignat*}
+\MMLVerbMath{xalignat}
+\MMLVerbMath{xalignat*}
+\MMLVerbMath{xxalignat}
+\MMLVerbMath{align}
+\MMLVerbMath{align*}
+\MMLVerbMath{flalign}
+\MMLVerbMath{flalign*}
+\MMLVerbMath{split}
+\MMLVerbMath{multline}
+\MMLVerbMath{multline*}
+% equations fails with errors, even though it worked in a .cfg
+% I will need to investigate it more
+% \MMLVerbEquation{equation}
+% \MMLVerbEquation{equation*}
+\MMLVerbMath{math}
+\MMLVerbMath{displaymath}
+\MMLVerbMath{eqnarray}
+\MMLVerbMath{eqnarray*}
+\fi
\Configure{@begin}
{split}
{\let\tagform@=\:gobble }
@@ -680,6 +847,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{plain}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -831,6 +1000,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{color}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -913,6 +1084,14 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
+
+
+
+
+
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{rlbabel}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -960,6 +1139,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{frenchb}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1299,5 +1479,40 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\endinput
diff --git a/Master/texmf-dist/tex/generic/tex4ht/jats.4ht b/Master/texmf-dist/tex/generic/tex4ht/jats.4ht
index 4e946779867..c6add3efca5 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/jats.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/jats.4ht
@@ -1,22 +1,22 @@
-% jats.4ht (2024-02-23-14:41), generated from tex4ht-jats.tex
+% jats.4ht (2024-08-13-13:15), generated from tex4ht-jats.tex
% Copyright 2022-2024 TeX Users Group
%
% 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.
-\immediate\write-1{version 2024-02-23-14:41}
+\immediate\write-1{version 2024-08-13-13:15}
\exit:ifnot{amsart,%
amsbook,%
@@ -490,6 +490,18 @@ url}
{\EndNoFonts\HCode{</term><def>}\HtmlParOn\par\ShowPar
}
+\ConfigureList{thebibliography}%
+ {\ifvmode\IgnorePar\fi \EndP \HCode{<ref-list>}\let\en:bib=\empty}
+ {\en:bib \ifvmode\IgnorePar\fi \EndP \HCode{</ref-list>}}
+ {\en:bib\def\en:bib{\HCode{</mixed-citation></ref>}}%
+ \HCode{<ref><label>}%
+ \Configure{HtmlPar}%
+ {\EndP}%
+ {\EndP}%
+ {} {}%
+ }
+ {\HCode{</label><mixed-citation>}}
+
\Configure{chapter}
@@ -713,6 +725,18 @@ url}
{\EndNoFonts\HCode{</term><def>}\HtmlParOn\par\ShowPar
}
+\ConfigureList{thebibliography}%
+ {\ifvmode\IgnorePar\fi \EndP \HCode{<ref-list>}\let\en:bib=\empty}
+ {\en:bib \ifvmode\IgnorePar\fi \EndP \HCode{</ref-list>}}
+ {\en:bib\def\en:bib{\HCode{</mixed-citation></ref>}}%
+ \HCode{<ref><label>}%
+ \Configure{HtmlPar}%
+ {\EndP}%
+ {\EndP}%
+ {} {}%
+ }
+ {\HCode{</label><mixed-citation>}}
+
\ConfigureEnv{abstract}
@@ -945,6 +969,18 @@ url}
{\EndNoFonts\HCode{</term><def>}\HtmlParOn\par\ShowPar
}
+\ConfigureList{thebibliography}%
+ {\ifvmode\IgnorePar\fi \EndP \HCode{<ref-list>}\let\en:bib=\empty}
+ {\en:bib \ifvmode\IgnorePar\fi \EndP \HCode{</ref-list>}}
+ {\en:bib\def\en:bib{\HCode{</mixed-citation></ref>}}%
+ \HCode{<ref><label>}%
+ \Configure{HtmlPar}%
+ {\EndP}%
+ {\EndP}%
+ {} {}%
+ }
+ {\HCode{</label><mixed-citation>}}
+
\ConfigureEnv{abstract}
@@ -976,8 +1012,6 @@ url}
-
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amsart}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1565,6 +1599,7 @@ url}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{biblatex}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1634,7 +1669,6 @@ url}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{url}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1649,6 +1683,7 @@ url}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{hyperref}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1739,7 +1774,6 @@ url}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{memoir}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1926,6 +1960,18 @@ url}
{\EndNoFonts\HCode{</term><def>}\HtmlParOn\par\ShowPar
}
+\ConfigureList{thebibliography}%
+ {\ifvmode\IgnorePar\fi \EndP \HCode{<ref-list>}\let\en:bib=\empty}
+ {\en:bib \ifvmode\IgnorePar\fi \EndP \HCode{</ref-list>}}
+ {\en:bib\def\en:bib{\HCode{</mixed-citation></ref>}}%
+ \HCode{<ref><label>}%
+ \Configure{HtmlPar}%
+ {\EndP}%
+ {\EndP}%
+ {} {}%
+ }
+ {\HCode{</label><mixed-citation>}}
+
\ConfigureEnv{abstract}
{\ifvmode\IgnorePar\fi\EndP\HCode{<abstract>\Hnewline}}
@@ -2047,6 +2093,11 @@ url}
+
+
+
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{scrbook}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2233,6 +2284,18 @@ url}
{\EndNoFonts\HCode{</term><def>}\HtmlParOn\par\ShowPar
}
+\ConfigureList{thebibliography}%
+ {\ifvmode\IgnorePar\fi \EndP \HCode{<ref-list>}\let\en:bib=\empty}
+ {\en:bib \ifvmode\IgnorePar\fi \EndP \HCode{</ref-list>}}
+ {\en:bib\def\en:bib{\HCode{</mixed-citation></ref>}}%
+ \HCode{<ref><label>}%
+ \Configure{HtmlPar}%
+ {\EndP}%
+ {\EndP}%
+ {} {}%
+ }
+ {\HCode{</label><mixed-citation>}}
+
\Configure{chapter}
@@ -2270,6 +2333,7 @@ url}
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{scrartcl}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2456,6 +2520,18 @@ url}
{\EndNoFonts\HCode{</term><def>}\HtmlParOn\par\ShowPar
}
+\ConfigureList{thebibliography}%
+ {\ifvmode\IgnorePar\fi \EndP \HCode{<ref-list>}\let\en:bib=\empty}
+ {\en:bib \ifvmode\IgnorePar\fi \EndP \HCode{</ref-list>}}
+ {\en:bib\def\en:bib{\HCode{</mixed-citation></ref>}}%
+ \HCode{<ref><label>}%
+ \Configure{HtmlPar}%
+ {\EndP}%
+ {\EndP}%
+ {} {}%
+ }
+ {\HCode{</label><mixed-citation>}}
+
\ConfigureEnv{abstract}
@@ -2473,7 +2549,6 @@ url}
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{scrreprt}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2660,6 +2735,18 @@ url}
{\EndNoFonts\HCode{</term><def>}\HtmlParOn\par\ShowPar
}
+\ConfigureList{thebibliography}%
+ {\ifvmode\IgnorePar\fi \EndP \HCode{<ref-list>}\let\en:bib=\empty}
+ {\en:bib \ifvmode\IgnorePar\fi \EndP \HCode{</ref-list>}}
+ {\en:bib\def\en:bib{\HCode{</mixed-citation></ref>}}%
+ \HCode{<ref><label>}%
+ \Configure{HtmlPar}%
+ {\EndP}%
+ {\EndP}%
+ {} {}%
+ }
+ {\HCode{</label><mixed-citation>}}
+
\ConfigureEnv{abstract}
@@ -2983,5 +3070,15 @@ url}
+
+
+
+
+
+
+
+
+
+
\endinput
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht
index cfc53895a23..5c3534e8c8a 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht
@@ -1,28 +1,32 @@
-% mathjax-latex-4ht.4ht (2024-02-25-08:28), generated from tex4ht-mathjax.tex
+% mathjax-latex-4ht.4ht (2024-07-28-13:12), generated from tex4ht-mathjax.tex
% Copyright 2018-2024 TeX Users Group
%
% 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.
-\immediate\write-1{version 2024-02-25-08:28}
+\immediate\write-1{version 2024-07-28-13:12}
\ExplSyntaxOn
\cs_new_protected:Npn \alteqtoks #1
{
- \tl_set:Ne \l_tmpa_tl {\detokenize{#1}}
+ % save tokens, but preserve spaces
+ % https://tex.stackexchange.com/a/44444/2891
+ \tl_set:Nn \l_tmpa_tl {#1}
+ \regex_replace_all:nnN { . } { \c{string} \0 } \l_tmpa_tl
+ \tl_set:Nx \l_tmpa_tl { \l_tmpa_tl }
% % replace < > and & with xml entities
\regex_replace_all:nnN { \x{26} } { &amp; } \l_tmpa_tl
\regex_replace_all:nnN { \x{3C} } { &lt; } \l_tmpa_tl
@@ -677,5 +681,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
\endinput
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
index 3de1fdb2fe2..6cb1a3bec25 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
@@ -1,4 +1,4 @@
-% mathml.4ht (2024-03-21-13:48), generated from tex4ht-mathml.tex
+% mathml.4ht (2024-08-02-14:24), generated from tex4ht-mathml.tex
% Copyright 2009-2024 TeX Users Group
% Copyright 1999-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-03-21-13:48}
+\immediate\write-1{version 2024-08-02-14:24}
\exit:ifnot{Preamble,%
accents,%
@@ -34,6 +34,7 @@ array,%
bm,%
cancel,%
dcolumn,%
+esvect,%
etex4ht,%
fontmath,%
gauss,%
@@ -1807,7 +1808,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amsmath}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2190,7 +2190,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amstext}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2201,6 +2200,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amstex1}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2431,6 +2431,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{plain}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3335,6 +3336,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{array}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3415,6 +3417,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amscd}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3517,6 +3521,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amssymb}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3745,6 +3750,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{gauss}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3804,7 +3810,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{rlbabel}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3848,7 +3853,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{dcolumn}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3928,6 +3932,10 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
+
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{mathtools}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -4101,6 +4109,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{subeqnarray}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -4150,7 +4159,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{siunitx}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -4166,6 +4174,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{sistyle}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -4179,7 +4188,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{ushort}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -4217,6 +4225,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{bm}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -4265,7 +4274,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{ulem}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -4575,6 +4583,24 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ \ConfigureHinput{esvect}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ \def\:tempa#1{%
+ \bgroup\HCode{<\a:mathml mover><\a:mathml mrow>}#1\HCode{</\a:mathml mrow><\a:mathml mo>&rarr;</\a:mathml mo></\a:mathml mover>}\egroup
+}
+
+\HLet\ESV@vecteur\:tempa
+\def\:tempa#1#2{%
+ \ESV@vecteur{{#1}\sb{#2}}
+}
+\HLet\vvstar\:tempa
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput\empty\empty\empty\empty\empty\empty
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\endinput
diff --git a/Master/texmf-dist/tex/generic/tex4ht/tagpdf-base-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/tagpdf-base-hooks.4ht
index 4793862b311..dcf308775ee 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/tagpdf-base-hooks.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/tagpdf-base-hooks.4ht
@@ -1,4 +1,4 @@
-% tagpd-base-hooks.4ht (2024-05-06-13:37), generated from tex4ht-4ht.tex
+% tagpd-base-hooks.4ht (2024-07-26-15:08), generated from tex4ht-4ht.tex
% Copyright 2024 TeX Users Group
%
% This work may be distributed and/or modified under the
@@ -16,10 +16,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2024-05-06-13:37}
+\immediate\write-1{version 2024-07-26-15:08}
-% ignore tagpdf's specials
-% we use csname, because \ExplSyntaxOn .. Off caused catcode issues
-\expandafter\def\csname __tag_whatsits:\endcsname{}
\endinput
diff --git a/Master/texmf-dist/tex/generic/tex4ht/tagpdf-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/tagpdf-hooks.4ht
index c012b7967b8..02db5485f63 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/tagpdf-hooks.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/tagpdf-hooks.4ht
@@ -1,4 +1,4 @@
-% tagpdf-hooks.4ht (2024-05-03-14:34), generated from tex4ht-4ht.tex
+% tagpdf-hooks.4ht (2024-07-26-15:08), generated from tex4ht-4ht.tex
% Copyright 2022-2024 TeX Users Group
%
% This work may be distributed and/or modified under the
@@ -16,11 +16,9 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2024-05-03-14:34}
+\immediate\write-1{version 2024-07-26-15:08}
\ExplSyntaxOn
-% ignore tagpdf's specials
-\cs_set_protected:Npn \__tag_whatsits: {}
\ExplSyntaxOff
\:AtEndOfPackage{%
\RenewDocumentCommand \tagpdfsetup { m }{}
diff --git a/Master/texmf-dist/tex/latex-dev/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex-dev/l3kernel/expl3-code.tex
index b90d7551a9c..54aa898cc98 100644
--- a/Master/texmf-dist/tex/latex-dev/l3kernel/expl3-code.tex
+++ b/Master/texmf-dist/tex/latex-dev/l3kernel/expl3-code.tex
@@ -75,7 +75,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2024-06-19}%
+\def\ExplFileDate{2024-07-20}%
\begingroup
\def\next{\endgroup}%
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -13859,7 +13859,8 @@ Type H <return> for immediate help}\def~{\errmessage{%
{
\bool_if:NTF \l__keys_no_value_bool
{
- \__keys_define_code:TF
+ \__keys_define_code:nnn
+ { \use:c { \c__keys_props_root_str \l__keys_property_str } {#1} }
{ \use:c { \c__keys_props_root_str \l__keys_property_str } }
{
\msg_error:nnee { keys } { property-requires-value }
@@ -13868,7 +13869,7 @@ Type H <return> for immediate help}\def~{\errmessage{%
}
{ \use:c { \c__keys_props_root_str \l__keys_property_str } {#1} }
}
-\cs_new:Npe \__keys_define_code:TF
+\cs_new:Npe \__keys_define_code:nnn
{
\exp_not:N \exp_after:wN \exp_not:N \__keys_define_code:w
\exp_not:N \l__keys_property_str
@@ -13880,7 +13881,15 @@ Type H <return> for immediate help}\def~{\errmessage{%
\cs_new:Npn \exp_not:N \__keys_define_code:w
#1 \c_colon_str #2 \c_colon_str #3 \exp_not:N \s__keys_stop
}
- { \tl_if_empty:nTF {#2} }
+ {
+ \tl_if_empty:nTF {#3}
+ { \use_i:nnn }
+ {
+ \tl_if_empty:nTF {#2}
+ { \use_ii:nnn }
+ { \use_iii:nnn }
+ }
+ }
\cs_new_protected:Npn \__keys_bool_set:Nn #1#2
{ \__keys_bool_set:Nnnn #1 {#2} { true } { false } }
\cs_generate_variant:Nn \__keys_bool_set:Nn { c }
@@ -37386,10 +37395,10 @@ Type H <return> for immediate help}\def~{\errmessage{%
{ \text_uppercase:nn {#1} {#2} }
\__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \text_titlecase_first:n }
\cs_new:Npn \tl_mixed_case:n #1
- { \text_titlecase_first:n {#1} }
+ { \text_titlecase_first:n { \text_lowercase:n {#1} } }
\__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \text_titlecase_first:nn }
\cs_new:Npn \tl_mixed_case:nn #1#2
- { \text_titlecase_first:nn {#1} {#2} }
+ { \text_titlecase_first:nn {#1} { \text_lowercase:n {#2} } }
\__kernel_patch_deprecation:nnNNpn { 2022-05-23 } { \token_case_meaning:Nn }
\cs_new:Npn \tl_case:Nn { \token_case_meaning:Nn }
\__kernel_patch_deprecation:nnNNpn { 2022-05-23 } { \token_case_meaning:NnT }
diff --git a/Master/texmf-dist/tex/latex-dev/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex-dev/l3kernel/expl3-generic.tex
index 115116eb8c4..6f417c325c5 100644
--- a/Master/texmf-dist/tex/latex-dev/l3kernel/expl3-generic.tex
+++ b/Master/texmf-dist/tex/latex-dev/l3kernel/expl3-generic.tex
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2024-06-19}%
+\def\ExplFileDate{2024-07-20}%
\let\ExplLoaderFileDate\ExplFileDate
\begingroup
\catcode`\_=11
diff --git a/Master/texmf-dist/tex/latex-dev/l3kernel/expl3.ltx b/Master/texmf-dist/tex/latex-dev/l3kernel/expl3.ltx
index d69c3f785e0..512497e7a09 100644
--- a/Master/texmf-dist/tex/latex-dev/l3kernel/expl3.ltx
+++ b/Master/texmf-dist/tex/latex-dev/l3kernel/expl3.ltx
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2024-06-19}%
+\def\ExplFileDate{2024-07-20}%
\let\ExplLoaderFileDate\ExplFileDate
\begingroup
\catcode`\_=11
diff --git a/Master/texmf-dist/tex/latex-dev/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex-dev/l3kernel/expl3.sty
index cf7a71387b0..10c4ecbc700 100644
--- a/Master/texmf-dist/tex/latex-dev/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex-dev/l3kernel/expl3.sty
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2024-06-19}%
+\def\ExplFileDate{2024-07-20}%
\let\ExplLoaderFileDate\ExplFileDate
\ProvidesPackage{expl3}
[%
diff --git a/Master/texmf-dist/tex/latex-dev/l3kernel/l3debug.def b/Master/texmf-dist/tex/latex-dev/l3kernel/l3debug.def
index 85e8367975f..000b6dcb41c 100644
--- a/Master/texmf-dist/tex/latex-dev/l3kernel/l3debug.def
+++ b/Master/texmf-dist/tex/latex-dev/l3kernel/l3debug.def
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: l3debug.dtx
-\ProvidesExplFile{l3debug.def}{2024-06-19}{}{L3 Debugging support}
+\ProvidesExplFile{l3debug.def}{2024-07-20}{}{L3 Debugging support}
\scan_new:N \s__debug_stop
\cs_new:Npn \__debug_use_i_delimit_by_s_stop:nw #1 #2 \s__debug_stop {#1}
\quark_new:N \q__debug_recursion_tail
diff --git a/Master/texmf-dist/tex/latex-dev/l3kernel/l3doc.cls b/Master/texmf-dist/tex/latex-dev/l3kernel/l3doc.cls
index f0c283a3865..4d4876f5607 100644
--- a/Master/texmf-dist/tex/latex-dev/l3kernel/l3doc.cls
+++ b/Master/texmf-dist/tex/latex-dev/l3kernel/l3doc.cls
@@ -20,7 +20,7 @@
%%
%% File: l3doc.dtx
\RequirePackage{calc}
-\ProvidesExplClass{l3doc}{2024-06-19}{}
+\ProvidesExplClass{l3doc}{2024-07-20}{}
{L3 Experimental documentation class}
\clist_new:N \g_docinput_clist
\seq_new:N \g_doc_functions_seq
diff --git a/Master/texmf-dist/tex/latex/abraces/abraces.sty b/Master/texmf-dist/tex/latex/abraces/abraces.sty
index af146826ce5..3b096e7ab77 100644
--- a/Master/texmf-dist/tex/latex/abraces/abraces.sty
+++ b/Master/texmf-dist/tex/latex/abraces/abraces.sty
@@ -1,5 +1,5 @@
%% abraces.sty
-%% Copyright 2021 Werner Grundlingh
+%% Copyright 2024 Werner Grundlingh
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -16,9 +16,12 @@
% This work consists of the file abraces.sty.
\ProvidesPackage{abraces}% http://ctan.org/pkg/abraces
- [2022/11/06 v2.1 Arbitrary and asymmetric braces]
+ [2024/08/02 v2.2 Arbitrary and asymmetric braces]
+% xparse definitions now form part of the LaTeX core. However, keeping this in for those using older versions.
\RequirePackage{xparse}
+% Since abraces defines \bracecolor, add xcolor as dependency
+\RequirePackage{xcolor}
\newif\if@overload
\DeclareOption{overload}{\@overloadtrue}
diff --git a/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls b/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls
index 186e5d49415..82ccbc2614e 100644
--- a/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls
+++ b/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls
@@ -5,8 +5,8 @@
%% ASME conference requirements as represented on ASME's conference web pages in 2024.
%%
%% This file's version and date:
- \def\versionno{1.37}
- \def\versiondate{2024/02/06\space}
+ \def\versionno{1.38}
+ \def\versiondate{2024/08/01\space}
%%
%% Author: John H. Lienhard, V
%% Department of Mechanical Engineering
@@ -23,7 +23,7 @@
%% 6. Provide line numbers for editing and review
%% 7. Support balancing length of columns on last page
%% 8. Provide copyright footer for federal employees and contractors
-%% 9. Support the archival PDF/A standards 1b, 2b, 2u, 3b, and 3u
+%% 9. Support archival PDF/A standards
%% 10. Enable various math and text features from the newtxmath and newtxtext packages
%% 11. Support inclusion of passages in languages other than English
%%
@@ -66,74 +66,76 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{asmeconf}[\versiondate ASME Conference Paper LaTeX Template (JHL)]
-\LoadClass[twoside,twocolumn,10pt]{article}
+\LoadClass[twoside,10pt]{article}% twocolumn is initiated in \MakeTitle
% Even/odd page layout is not used in ASME's specs, although the papers are printed in two-sided format.
\RequirePackage{iftex}% provides \ifpdftex (many) & \ifluatex (once)
\RequirePackage{ifthen}% ifthenelse (many) & \whiledo (once)
-\RequirePackage{etoolbox}% using patchcmd in 4 places
+\RequirePackage{etoolbox}% using patchcmd in 4 or 5 places
+\ExplSyntaxOn
+ \str_const:Nn \ClassName {asmeconf}
+\ExplSyntaxOff
+
+%%%%%%%%%%%%% Compatibility codes for older distributions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%% Test compatibility of older distributions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\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\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
-\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
+\IfFormatAtLeastTF{2020/10/01}{\relax}{%
+ \ClassError{\ClassName}{Your LaTeX format is dated \fmtversion. Formats dated 2020/10/01 or later are recommended for the asmejour class. Older formats and packages may generate errors or fail entirely!}{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 (else fall back to hyperxmp and bookmark packages after loading hyperref)
+\newif\ifasme@pdfmanagement
+\IfPDFManagementActiveTF{
+ \asme@pdfmanagementtrue
+}{
+ \asme@pdfmanagementfalse
+ \ClassWarningNoLine{\ClassName}{pdfmanagement is not active. Will load hyperxmp and bookmark packages instead}
+}
-\IfFormatAtLeastTF{2020/10/01}{%
- \ClassInfo{asmeconf}{Your LaTeX format is dated \fmtversion. LaTeX distributions 2020/10/01 or later are strongly recommended for best results}
- }{%
- \ClassError{asmeconf}{Your LaTeX format is dated \fmtversion. Formats dated 2020/10/01 or later are recommended for the asmejour class. Older formats and packages may generate errors or fail entirely!}{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.}%
+% Allow pre 2021/11/15 formats to see the graphicx alt key without causing an error
+\IfFormatAtLeastTF{2021/11/15}{
+ \relax
+}{
+ \AtBeginDocument{
+ \IfPackageLoadedTF{graphicx}{\define@key{Gin}{alt}{}}{\relax}
+ }
}
+% Enable pre-2020/10 formats to access essential macros later moved into LaTeX kernel
\ifdefined\NewDocumentCommand\else
\RequirePackage{xparse}% enable older installations to access features in LaTeX kernel since 2020/10/01; but need at least 2018/04...
\fi
-\DeclareDocumentCommand\LogNote{m}{%
- \IfFormatAtLeastTF{2021/11/15}{%
- \ClassNoteNoLine{asmeconf}{#1}% Added to LaTeX in Nov. 2021
- }{%
- \ClassWarningNoLine{asmeconf}{#1}%
- }
+% Provide pre-2020/10 installations with basic unicode character mappings
+\IfFormatAtLeastTF{2020/10/01}{\relax}{%
+\ifpdftex
+ \pdfgentounicode=1 %% enable CMaps; was moved into the latex kernel Oct 2020
+ \input glyphtounicode.tex %% lists of mappings; was moved into the latex kernel Oct 2020
+\fi
}
\IfPackageAtLeastTF{iftex}{2019/11/07}{\relax}{%
- \ClassError{asemconf}{Package iftex is too old. Go to \string https://ctan.org and download an up-to-date version.}%
+ \ClassError{\ClassName}{Package iftex is too old. Go to \string https://ctan.org and download an up-to-date version.}{%
+ Your latex installation does not have an up-to-date version of the package iftex. You can get it at CTAN: \string https://ctan.org.}
}
-%% Test whether \DocumentMetadata has been loaded (Thank you Ulrike Fischer)
-\newif\if@asme@pdfmanagement
-% \IfPDFManagementActiveTF{\@asme@pdfmanagementtrue}{\@asme@pdfmanagementfalse}% New 2021/07/23, don't implement yet
-\ExplSyntaxOn
- \IfFormatAtLeastTF{2020/02/02}{%
- \bool_if:nTF
- {
- \bool_lazy_and_p:nn
- {\cs_if_exist_p:N \pdfmanagement_if_active_p:}
- { \pdfmanagement_if_active_p: }
- }
- {
- \@asme@pdfmanagementtrue
- }
- {
- \@asme@pdfmanagementfalse
- }
- }{\@asme@pdfmanagementfalse}
-\ExplSyntaxOff
-
-
%%%%%%%%%%%%%% Options for the class %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{kvoptions}
\SetupKeyvalOptions{
- family=asmeconf,
+ family=\ClassName,
prefix=asmeconf@,
setkeys=\kvsetkeys,
}
%%% set key [colorlinks] to have colored hyperlinks, rather than black links (use a key with new pdfmanagement, 2021/12/01)
-\define@key{asmeconf}{colorlinks}[colorlinks]{%
+\define@key{\ClassName}{colorlinks}[colorlinks]{%
\PassOptionsToPackage{#1}{hyperref}%
}
@@ -182,12 +184,11 @@
\ifthenelse{\equal{#1}{\ac@main}}{\ac@cyrillictrue\def\ac@TtwoA{T2A}}{\relax}% comparing strings
}
-\define@key{asmeconf}{main}[english]{%
+\define@key{\ClassName}{main}{% remove default 2024/07/26, to avoid conflict with subsequent logic
\PassOptionsToPackage{main=#1,#1}{babel}% added #1 resolves conflict of russianb.ldf & ukrainianb.ldf under "main=".
\ac@mainsettrue
\ifthenelse{\equal{#1}{english}}{%
- \PassOptionsToPackage{pdflang=en}{hyperref}}{%
- \LogNote{Selecting #1 as the primary language}%
+ \ClassNoteNoLine{\ClassName}{Selecting #1 as the primary language}%
\ifthenelse{\equal{#1}{greek}}{%
\ac@greektrue
\def\ac@LGR{LGR}%
@@ -201,7 +202,7 @@
\@FindCyr{russian;belarusian;bulgarian;macedonian;serbianc;ukrainian}
}%
}
-\define@key{asmeconf}{vietnamese}[]{%
+\define@key{\ClassName}{vietnamese}[]{%
\RequirePackage[vietnamese=nohyphenation]{hyphsubst}% using key, not option, to allow loading package w/o babel warning.
\PassOptionsToPackage{vietnamese.noencoding}{babel}% modified.noencoding suppresses unnecessary warning about inputenc
\ac@vietnamesetrue
@@ -209,21 +210,20 @@
}
\DeclareDefaultOption{}% suppress warnings about unused options
-\ProcessKeyvalOptions{asmeconf}
+\ProcessKeyvalOptions{\ClassName}
-%% if main language was not chosen explicitly, default to English
+%% if main language was not chosen explicitly, ensure default to English
\ifac@mainset\relax\else
\PassOptionsToPackage{main=english}{babel}%
- \PassOptionsToPackage{pdflang=en}{hyperref}
- \ClassInfo{asmeconf}{Selecting English as the primary language, since main= not set}%
+ \ClassInfo{\ClassName}{Selecting English as the primary language, since main= not set}%
\fi
%% Turn off these keys now that we're done with them
-\def\@KeyFamily{asmeconf}
+\def\@KeyFamily{\ClassName}
\NewDocumentCommand\ac@DisableOption{m}{%
\DisableKeyvalOption[%
action=ignore,%
- class=asmeconf%
+ class=\ClassName%
]{#1}{\@KeyFamily}%
}
\NewDocumentCommand\@DisableKeys{>{\SplitList{;}}m}{\ProcessList{#1}{\ac@DisableOption}}
@@ -249,7 +249,7 @@
\ifpdftex
\PassOptionsToPackage{largesc=true}{newtxtext}% largesc is a boolean key in newtxtext
\else
- \ClassWarningNoLine{asmeconf}{largesc option is not available under luaLateX. It will be ignored}%
+ \ClassWarningNoLine{\ClassName}{largesc option is not available under luaLateX. It will be ignored}%
\fi
}
@@ -261,21 +261,23 @@
%% option to hyphenate the inconsolata typewriter font [hyphenate] and to issue a warning when that's done.
\DeclareOption{hyphenate}{%
\ifac@fontspec
- \ClassWarningNoLine{asmeconf}{hyphenate option is not supported by fontspec, will be ignored}%
+ \ClassWarningNoLine{\ClassName}{hyphenate option is not supported by fontspec. It will be ignored}%
\else
\PassOptionsToPackage{hyphenate}{inconsolata}% hyphenate is a key via xkeyval in inconsolata
- \LogNote{Allowing hyphenation of typewriter font}%
+ \ClassNoteNoLine{\ClassName}{Allowing hyphenation of typewriter font}%
\fi
}
%% option for monospacing in inconsolata typewriter font [mono].
+\def\MonoNotMono{WordSpace={1,1,1}}% rescaled tt font to match pdf, 2024/07/28
\DeclareOption{mono}{%
\ifac@fontspec
- \def\MonoNotMono{}%
+ \def\MonoNotMono{WordSpace={1,0,0},PunctuationSpace={3}}% NB: these are the default WordSpace values. 20204/07/30
\else
\PassOptionsToPackage{mono}{inconsolata}% mono is a key via xkeyval in inconsolata
\fi
}
%% option for unslashed zero in inconsolata typewriter font [var0].
+\def\ssztwo{}% for Inconsolatazi4; default uses slashed zero, +ss02 uses regular zero
\DeclareOption{var0}{%
\ifac@fontspec
\def\ssztwo{+ss02}% stylistic alternate for regular zero
@@ -296,7 +298,7 @@
\newif\ifac@setpdfa\ac@setpdfafalse
\newif\ifac@pdfaone\ac@pdfaonefalse
-\if@asme@pdfmanagement\else
+\ifasme@pdfmanagement\else
\SetupKeyvalOptions{
family=pdfaopt,
@@ -308,7 +310,7 @@
%%% set key [pdfa] to activate pdf/a compliance (default is pdf/A-3u)
\define@key{pdfaopt}{pdf-a}[true]{%
\IfFormatAtLeastTF{2018/12/01}{\relax}{%
- \ClassError{asmeconf}{Your LaTeX format is dated \fmtversion. Formats dated 2018/12/01 or later are necessary for the [pdf-a] option. 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/. Meanwhile, you can remove the [pdf-a] option and try again}%
+ \ClassError{\ClassName}{Your LaTeX format is dated \fmtversion. Formats dated 2018/12/01 or later are necessary for the [pdf-a] option. 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/. Meanwhile, you can remove the [pdf-a] option and try again}%
}
\ac@setpdfatrue
\PassOptionsToPackage{pdfa}{hyperref}
@@ -344,7 +346,7 @@
%%%%%%%%%%%% PDF/A compliance related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\if@asme@pdfmanagement\else
+\ifasme@pdfmanagement\else
\ifpdftex
\ifac@pdfaone
\pdfminorversion=4 % for pdf/a-1 need version 4, not 7
@@ -353,7 +355,7 @@
\fi
\else
\ifluatex
- \ifac@setpdfa\ClassWarningNoLine{asmeconf}{pdf-a option requires pdfLaTeX engine. Under LuaLaTeX, use %
+ \ifac@setpdfa\ClassWarningNoLine{\ClassName}{pdf-a option requires pdfLaTeX engine. Under LuaLaTeX, use %
\protect\DocumentMetadata{pdfstandard=A-3b} before \protect\documentclass[..]{asmeconf}}%
\fi
\directlua{
@@ -367,7 +369,7 @@
end
}
\else
- \ClassError{asmeconf}{Please use either pdfLaTeX or LuaLaTeX}{This class has NOT been configured to support other engines, and the results will be unpredictable. Exit and rerun using either pdfLaTeX or LuaLaTeX.}%
+ \ClassError{\ClassName}{Please use either pdfLaTeX or LuaLaTeX}{This class has NOT been configured to support other engines, and the results will be unpredictable. Exit and rerun using either pdfLaTeX or LuaLaTeX.}%
\fi
\fi
\fi
@@ -381,19 +383,17 @@
\ifpdftex
\ifasmeconf@nofontspec
- \ClassWarningNoLine{asmeconf}{The [nofontspec] option requires LuaLaTeX. It will be ignored under pdfLaTeX}%
+ \ClassWarningNoLine{\ClassName}{The [nofontspec] option requires LuaLaTeX. It will be ignored under pdfLaTeX}%
\fi
\else
\ifasmeconf@nofontspec
- \ClassWarningNoLine{asmeconf}{The [nofontspec] option has been issued. LuaLaTeX will run without font support}%
+ \ClassWarningNoLine{\ClassName}{The [nofontspec] option has been issued. LuaLaTeX will run without font support}%
\else
\IfFormatAtLeastTF{2020/10/01}{%
\ac@fontspectrue
\fontspecloadedtrue
- \def\ssztwo{}% for Inconsolatazi4; default uses slashed zero, +ss02 uses regular zero
- \def\MonoNotMono{WordSpace={1,1.33,1.67}}% for Inconsolatazi4; default allows word spacing (is not mono)
}{%
- \ClassError{asmeconf}{Your LaTeX format is dated \fmtversion. LaTeX installations dated 2020/10/01 or later are needed to run LuaLaTeX with the fontspec package. Fontspec will NOT be loaded. Language support will be minimal}{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 may alternatively choose the [nofontspec] option.}%
+ \ClassError{\ClassName}{Your LaTeX format is dated \fmtversion. LaTeX installations dated 2020/10/01 or later are needed to run LuaLaTeX with the fontspec package. Fontspec will NOT be loaded. Language support will be minimal}{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 may alternatively choose the [nofontspec] option.}%
}
\fi
\fi
@@ -403,7 +403,7 @@
\PassOptionsToPackage{japanese}{babel}%
\ac@japanesetrue
\else
- \ClassWarningNoLine{asmeconf}{[japanese] option is supported only under LuaLaTeX with fontspec. It will be ignored}%
+ \ClassWarningNoLine{\ClassName}{[japanese] option is supported only under LuaLaTeX with fontspec. It will be ignored}%
\fi
}
@@ -426,23 +426,23 @@
% Several languages do not have .ldf files to load. Babel will call these on demand.
%
-\DeclareOption{arabic}{\ClassError{asmeconf}{Do not specify "arabic" as a class option}{Instead, give the option [bidi=basic] and specify "arabic" when you call the language within your document.}}
+\DeclareOption{arabic}{\ClassError{\ClassName}{Do not specify "arabic" as a class option}{Instead, give the option [bidi=basic] and specify "arabic" when you call the language within your document.}}
%
-\DeclareOption{bengali}{\ClassError{asmeconf}{Do not specify "bengali" as a class option}{Babel does not have an ldf file for Bengali. Instead, specify "bengali" when you call the language within your document. No class option is needed.}}
+\DeclareOption{bengali}{\ClassError{\ClassName}{Do not specify "bengali" as a class option}{Babel does not have an ldf file for Bengali. Instead, specify "bengali" when you call the language within your document. No class option is needed.}}
%
-\DeclareOption{chinese-simplified}{\ClassError{asmeconf}{Do not specify "chinese-simplified" as class option}{Babel does not have an ldf file for simplified Chinese. Instead, specify "chinese-simplified" when you call the language within your document. No class option is needed.}}
+\DeclareOption{chinese-simplified}{\ClassError{\ClassName}{Do not specify "chinese-simplified" as class option}{Babel does not have an ldf file for simplified Chinese. Instead, specify "chinese-simplified" when you call the language within your document. No class option is needed.}}
%
-\DeclareOption{chinese-traditional}{\ClassError{asmeconf}{Do not specify "chinese-traditional" as class option}{Babel does not have an ldf file for traditional Chinese. Instead, specify "chinese-traditional" when you call the language within your document. No class option is needed.}}
+\DeclareOption{chinese-traditional}{\ClassError{\ClassName}{Do not specify "chinese-traditional" as class option}{Babel does not have an ldf file for traditional Chinese. Instead, specify "chinese-traditional" when you call the language within your document. No class option is needed.}}
%
-\DeclareOption{chinese}{\ClassError{asmeconf}{Do not specify "chinese" as a class option}{Instead, specify either "chinese-simplified" or "chinese-traditional" when you call the language within your document. No class option is needed.}}
+\DeclareOption{chinese}{\ClassError{\ClassName}{Do not specify "chinese" as a class option}{Instead, specify either "chinese-simplified" or "chinese-traditional" when you call the language within your document. No class option is needed.}}
%
-\DeclareOption{hindi}{\ClassError{asmeconf}{Do not specify "hindi" as a class option}{Babel does not have an ldf file for Hindi. Instead, specify "hindi" when you call the language within your document. No class option is needed.}}
+\DeclareOption{hindi}{\ClassError{\ClassName}{Do not specify "hindi" as a class option}{Babel does not have an ldf file for Hindi. Instead, specify "hindi" when you call the language within your document. No class option is needed.}}
%
-\DeclareOption{marathi}{\ClassError{asmeconf}{Do not specify "marathi" as a class option}{Babel does not have an ldf file for Marathi. Instead, specify "marathi" when you call the language within your document. No class option is needed.}}
+\DeclareOption{marathi}{\ClassError{\ClassName}{Do not specify "marathi" as a class option}{Babel does not have an ldf file for Marathi. Instead, specify "marathi" when you call the language within your document. No class option is needed.}}
%
-\DeclareOption{korean}{\ClassError{asmeconf}{Do not specify "korean" as class option}{Babel does not have an ldf file for Korean. Instead, specify "korean"when you call the language within your document. No class option is needed.}}
+\DeclareOption{korean}{\ClassError{\ClassName}{Do not specify "korean" as class option}{Babel does not have an ldf file for Korean. Instead, specify "korean"when you call the language within your document. No class option is needed.}}
%
-\DeclareOption{tamil}{\ClassError{asmeconf}{Do not specify "tamil" as a class option}{Babel does not have an ldf file for Tamil. Instead, specify "tamil" when you call the language within your document. No class option is needed.}}
+\DeclareOption{tamil}{\ClassError{\ClassName}{Do not specify "tamil" as a class option}{Babel does not have an ldf file for Tamil. Instead, specify "tamil" when you call the language within your document. No class option is needed.}}
%% Suppress warnings about unused global options
\DeclareOption*{}
@@ -462,23 +462,18 @@
\RequirePackage{graphicx} % removed obsolete options, 2023/11/19
\RequirePackage[dvipsnames,svgnames,x11names]{xcolor}
-% Allow pre 2021/11/15 formats to see the graphicx alt key without causing an error, in preparation for tagged pdf
-\IfFormatAtLeastTF{2021/11/15}{
- \relax
-}{
- \AtBeginDocument{
- \IfPackageLoadedTF{graphicx}{\define@key{Gin}{alt}{}}{\relax}
- }
-}
%%%%%%%%%%%% Table related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{booktabs}
\RequirePackage{array}
-\RequirePackage{dcolumn}% alignment on decimal places
-\newcolumntype{d}[1]{D{.}{.}{#1}}% NB: This conflicts with babel's Spanish language option which makes "." an active character.
- % To use "," separator, put this command in your preamble: \newcolumntype{d}[1]{D{,}{,}{#1}}
+\RequirePackage{dcolumn}% alignment on decimal places
+% use d{x.y} to center on "." as in "12.234"
+\newcolumntype{d}[1]{D{.}{.}{#1}}
+% NB: The above conflicts with babel's Spanish language option which makes "." an active character.
+% Instead, to use "," as the decimal separator, choose columntype "," (as in "12,234")
+\newcolumntype{,}[1]{D{,}{,}{#1}}
%%%%%%%%% Caption related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -507,7 +502,7 @@
\captionsetup[table]{labelformat=uppercase,labelfont={sf,bf,small},textfont={sf,bf,small},textformat=boldmath,labelsep=colon,skip=0.5\baselineskip} %name=TABLE,
\fi
-%% This construction avoids a failure of hyperref in relation to uppercase caption
+%% This construction avoids a failure of hyperref in relation to uppercase captions
%% Discussion: https://tex.stackexchange.com/questions/375695/maketextuppercase-inside-table-captions
\AtBeginDocument{
\let\scaption\caption
@@ -542,8 +537,17 @@
\RequirePackage[no-math]{fontspec}
\defaultfontfeatures{Ligatures=TeX,}
%
- \setmainfont{TeXGyreTermesX}[% Presumes these are system fonts! Available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre
- WordSpace = {1,1.4,1},%% This stretch matches newtxtext a little better. 1.4
+ \def\FontWarning{For luaLaTeX, you MUST have these OpenType fonts installed as system fonts on your computer: TeX Gyre Termes and TeX Gyre Heros (from \string http://www.gust.org.pl/projects/e-foundry/tex-gyre) and Inconsolatazi4 (\string https://ctan.org/tex-archive/fonts/inconsolata/opentype). If you DON'T have these fonts, you will see ERROR messages!}
+%
+ \IfFontExistsTF{TeX Gyre Termes}{}{\ClassWarningNoLine{\ClassName}{\FontWarning} }
+ \IfFontExistsTF{texgyreheros}{}{ \ClassWarningNoLine{\ClassName}{\FontWarning} }
+ \IfFontExistsTF{Inconsolatazi4}{}{ \ClassWarningNoLine{\ClassName}{\FontWarning} }
+%
+ % The newtx package includes a modified version of TeXGyreTermes called TexGyreTermesX, which is loaded here.
+ % Can fall back to TeXGyreTermes if desired, available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre
+ \setmainfont{TeXGyreTermesX}[
+ WordSpace = {1,1.6,1.2},%% This stretch matches newtxtext a little better; rescaled 2024/07/28
+ PunctuationSpace = 1.332,%% match fontdimen7 to newtxtext, 2024/07/28
Extension = .otf,
UprightFont = *-Regular,
ItalicFont = *-Italic,
@@ -552,7 +556,7 @@
Numbers = Lining,
]
\setsansfont{texgyreheros}[% Presumes these are system fonts! Available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre
- WordSpace = {1,1.4,1},
+ WordSpace = {1,1,1},% These spacings match newtxtext; rescaled to unity 2024/07/28
Extension = .otf,
UprightFont = *-regular,
ItalicFont = *-italic,
@@ -562,7 +566,6 @@
Scale=0.91,% same as for newtx; former value 0.9 too small 2022/01/15
]
\setmonofont{Inconsolatazi4}[% This otf font ships with the LaTeX Inconsolata package (it's in TeX Live)
- \MonoNotMono,% match newtxtext if we enable wordspacing
Scale=1.05,% rescaled from 1, 22/03/10
Extension = .otf,
UprightFont = *-Regular,
@@ -570,20 +573,22 @@
BoldFont = *-Bold,
BoldItalicFont = *-Bold,% has no italic face
RawFeature = {+ss01,\ssztwo,+ss03},
- ]
+ \MonoNotMono,% match newtxtext if we enable wordspacing; note wordspace def'd in option above.
+ ]
%
% For many languages, using babel commands helps font loading.
+ % Switched Harbbuzz to OpenType throughout, 2024/07/28
% Noto fonts are available at https://github.com/googlefonts
\def\Noto@scale{0.92}
\def\Ara@scale{0.91}% For the serif font only
\def\NotoBan@scale{0.92}% 1.} should probably stay consistent within the Noto family.
\def\NotoDev@scale{0.92}% 1.} should probably stay consistent within the Noto family.
\def\NotoTam@scale{0.92}
- \def\Noto@color{black}
+ \def\Noto@color{Color=black}% 2024/07/28. Changed this diagnostic command to by-pass a bug in luatexja-fontspec.
%
\babelprovide[import, language=Default]{arabic}
\babelfont [arabic]{rm}[Scale=\Ara@scale,
- Renderer=HarfBuzz,
+ %Renderer=OpenType,
Extension = .ttf,
UprightFont = *-Regular,
ItalicFont = *-Regular,% don't use italic face, I am told
@@ -591,7 +596,7 @@
BoldItalicFont = *-Bold,% don't use italic face, I am told
]{Amiri}% NotoNaskhArabic}% Some readers prefer Amiri font
\babelfont [arabic]{sf}[Scale=\Noto@scale,
- Renderer=HarfBuzz,
+ %Renderer=OpenType,
Extension =.ttf,
UprightFont = *-Regular,
ItalicFont = *-Regular,% font has no italic face
@@ -599,7 +604,7 @@
BoldItalicFont = *-SemiBold,% font has no italic face
]{NotoSansArabic}%DejaVuSans}%NotoKufiArabic}% .otf,%
\babelfont [arabic]{tt}[%
- Renderer=HarfBuzz,
+ %Renderer=OpenType,
Extension =.ttf,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -610,9 +615,9 @@
%
\babelprovide[import,language=Default,script=Bangla]{bengali}
\babelfont [bengali]{rm}[%
- Renderer=HarfBuzz,
+ %Renderer=OpenType,
Scale=\NotoBan@scale,% same as Devanagari
- Color=\Noto@color,
+ \Noto@color,
Extension = .ttf,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -620,9 +625,9 @@
BoldItalicFont = *-Bold,% has no italic face
]{NotoSerifBengali}
\babelfont [bengali]{sf}[%
- Renderer=HarfBuzz,
+ %Renderer=OpenType,
Scale=\NotoBan@scale,
- Color=\Noto@color,
+ \Noto@color,
Extension = .ttf,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -630,9 +635,9 @@
BoldItalicFont = *-Bold,% has no italic face
]{NotoSansBengali}
\babelfont [bengali]{tt}[
- Renderer=HarfBuzz,
+ %Renderer=OpenType,
Scale=\NotoBan@scale,
- Color=\Noto@color,
+ \Noto@color,
Extension = .ttf,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -646,7 +651,7 @@
\babelprovide[import,language=Default,script=Cyrillic]{#1}
\babelfont [#1]{rm}[%
Scale=\Noto@scale,
- Color=\Noto@color,
+ \Noto@color,
Extension = .ttf,
UprightFont = *-Regular,
ItalicFont = *-Italic,
@@ -655,7 +660,7 @@
]{NotoSerif}
\babelfont [#1]{sf}[%
Scale=\Noto@scale,
- Color=\Noto@color,
+ \Noto@color,
Extension = .ttf,
UprightFont = *-Regular,
ItalicFont = *-Italic,
@@ -664,7 +669,7 @@
]{NotoSans}
\babelfont [#1]{tt}[%
Scale=\Noto@scale,
- Color=\Noto@color,
+ \Noto@color,
Extension = .ttf,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -676,14 +681,14 @@
\setlocalecaption{serbian-cyrillic}{abstract}{Сажетак}% NB: utf-8
%
% Devanagari languages
- \newfontscript{Devanagari}{deva}% HarfBuzz has some problems in Hindi, see babel manual Sect. 1.13 (main issue is ra)
+ \newfontscript{Devanagari}{deva}% OpenType has some problems in Hindi, see babel manual Sect. 1.13 (main issue is ra)
\NewDocumentCommand\@LoadBabelDev{>{\SplitList{;}}m}{\ProcessList{#1}{\@DevBabel}}
\NewDocumentCommand\@DevBabel{m}{%
\babelprovide[import,language=Default]{#1}
\babelfont [#1]{rm}[%
-% Renderer=HarfBuzz,% works for Marathi, throws errors in Hindi...
+% %Renderer=OpenType,% Marathi and Hindi may respond differently...
Scale=\NotoDev@scale,
- Color=\Noto@color,
+ \Noto@color,
Extension = .ttf,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -691,9 +696,9 @@
BoldItalicFont = *-Bold,% has no italic face
]{NotoSerifDevanagari}
\babelfont [#1]{sf}[%
-% Renderer=HarfBuzz,% works for Marathi, throws errors in Hindi...
+% %Renderer=OpenType,% % Marathi and Hindi may respond differently...
Scale=\NotoDev@scale,
- Color=\Noto@color,
+ \Noto@color,
Extension = .ttf,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -701,9 +706,9 @@
BoldItalicFont = *-Bold,% has no italic face
]{NotoSansDevanagari}
\babelfont [#1]{tt}[
-% Renderer=HarfBuzz,% works for Marathi, throws errors in Hindi...
+% %Renderer=OpenType,% % Marathi and Hindi may respond differently...
Scale=\NotoDev@scale,
- Color=\Noto@color,
+ \Noto@color,
Extension = .ttf,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -719,7 +724,7 @@
\babelfont [greek]{rm}[%
Scale=\Noto@scale,
WordSpace={1.1},% increase word spacing slightly
- Color=\Noto@color,
+ \Noto@color,
Extension = .ttf,
UprightFont = *-Regular,
ItalicFont = *-Italic,
@@ -729,7 +734,7 @@
\babelfont [greek]{sf}[%
Scale=\Noto@scale,
WordSpace={1.1},% increase word spacing slightly
- Color=\Noto@color,
+ \Noto@color,
Extension = .ttf,
UprightFont = *-Regular,
ItalicFont = *-Italic,
@@ -738,7 +743,7 @@
]{NotoSans}
\babelfont [greek]{tt}[%
Scale=\Noto@scale,
- Color=\Noto@color,
+ \Noto@color,
Extension = .ttf,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -747,11 +752,14 @@
]{NotoSansMono}
%
% Japanese
+ % luatexja-fontspec seems to want lc "color" now, rather than normal "Color", as before. Commenting out.
+ % NB: luatexja-fontspec color breakage appears to be global.
\ifac@japanese
- \RequirePackage[match]{luatexja-fontspec}% japanese typesets *much* better with this loaded
+ \def\Noto@color{}% by-pass bug in luatexja-fontspec, 2024/07/28.
+ \RequirePackage[no-math]{luatexja-fontspec}% japanese typesets *much* better with this loaded
\setmainjfont{NotoSerifCJKjp}[%
Scale=\Noto@scale,
- Color=\Noto@color,
+ \Noto@color,
% Extension = .otf,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -760,7 +768,7 @@
]
\setsansjfont{NotoSansCJKjp}[%
Scale=\Noto@scale,
- Color=\Noto@color,
+ \Noto@color,
% Extension = .ttc,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -769,7 +777,7 @@
]
\setmonojfont{NotoSansMonoCJKjp}[%
Scale=\Noto@scale,
- Color=\Noto@color,
+ \Noto@color,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
BoldFont = *-Bold,
@@ -780,7 +788,7 @@
% Need at least one of the following to load the Japanese dictionary.
\babelfont [japanese]{rm}[%
Scale=\Noto@scale,
- Color=\Noto@color,
+ \Noto@color,
Extension = .otf,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -789,7 +797,7 @@
]{NotoSerifCJKjp}% Scale estimated
\babelfont [japanese]{sf}[%
Scale=\Noto@scale,
- Color=\Noto@color,
+ \Noto@color,
% Extension = .ttc,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -798,7 +806,7 @@
]{NotoSansCJKjp}
\babelfont [japanese]{tt}[%
Scale=\Noto@scale,
- Color=\Noto@color,
+ \Noto@color,
% Extension = .ttc,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -812,7 +820,7 @@
\babelprovide[import,language=Default]{korean}
\babelfont [korean]{rm}[%
Scale=\Noto@scale,
- Color=\Noto@color,
+ \Noto@color,
Extension = .otf,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -821,7 +829,7 @@
]{NotoSerifCJKkr}
\babelfont [korean]{sf}[%
Scale=\Noto@scale,
- Color=\Noto@color,
+ \Noto@color,
Extension = .ttc,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -830,7 +838,7 @@
]{NotoSansCJK}
\babelfont [korean]{tt}[%
Scale=\Noto@scale,
- Color=\Noto@color,
+ \Noto@color,
% Extension = .ttc,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -843,7 +851,7 @@
\babelprovide[import,language=Default]{chinese-simplified}
\babelfont [chinese-simplified]{rm}[%
Scale=\Noto@scale,
- Color=\Noto@color,
+ \Noto@color,
Extension = .otf,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -852,7 +860,7 @@
]{NotoSerifCJKsc}
\babelfont [chinese-simplified]{sf}[%
Scale=\Noto@scale,
- Color=\Noto@color,
+ \Noto@color,
Extension = .ttc,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -861,7 +869,7 @@
]{NotoSansCJK}
\babelfont [chinese-simplified]{tt}[%
Scale=\Noto@scale,
- Color=\Noto@color,
+ \Noto@color,
% Extension = .ttc,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -871,9 +879,9 @@
%
% Traditional Chinese (includes characters for Cantonese also)
\babelprovide[import,language=Default]{chinese-traditional}
- \babelfont [chinese-tradiational]{rm}[%
+ \babelfont [chinese-traditional]{rm}[% fixed 2024/07/28
Scale=\Noto@scale,
- Color=\Noto@color,
+ \Noto@color,
Extension = .otf,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -882,20 +890,20 @@
]{NotoSerifCJKtc}
\babelfont [chinese-traditional]{sf}[%
Scale=\Noto@scale,
- Color=\Noto@color,
+ \Noto@color,
Extension = .ttc,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
BoldFont = *-Bold,
BoldItalicFont = *-Bold,% has no italic face
]{NotoSansCJK}
- \babelfont [chinese-traditional]{tt}[Scale=\Noto@scale,Color=\Noto@color]{NotoSansMonoCJKtc}
+ \babelfont [chinese-traditional]{tt}[Scale=\Noto@scale,\Noto@color]{NotoSansMonoCJKtc}
%
\babelprovide[import,language=Default]{tamil}
\babelfont [tamil]{rm}[%
- Renderer=HarfBuzz,
+ %Renderer=OpenType,
Scale=\NotoTam@scale,
- Color=\Noto@color,
+ \Noto@color,
Extension = .ttf,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -903,9 +911,9 @@
BoldItalicFont = *-Bold,% has no italic face
]{NotoSerifTamil}
\babelfont [tamil]{sf}[%
- Renderer=HarfBuzz,
+ %Renderer=OpenType,
Scale=\NotoTam@scale,
- Color=\Noto@color,
+ \Noto@color,
Extension = .ttf,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -913,9 +921,9 @@
BoldItalicFont = *-Bold,% has no italic face
]{NotoSansTamil}
\babelfont [tamil]{tt}[
- Renderer=HarfBuzz,
+ %Renderer=OpenType,
Scale=\NotoTam@scale,
- Color=\Noto@color,
+ \Noto@color,
Extension = .ttf,
UprightFont = *-Regular,
ItalicFont = *-Regular,% has no italic face
@@ -949,8 +957,13 @@
\RequirePackage{bm}% load after all math to give further access to bold math
-%% Ensure that the current font is used for equation tags, not \normalfont as set by amsmath
-\def\maketag@@@#1{\hbox{\m@th#1}}
+% To free \eqref from the normal font (e.g., for use in section headings or captions). Revised 2024/07/28
+\renewcommand{\eqref}[1]{\textup{\hbox{\m@th{(\ignorespaces\ref{#1}\unskip\@@italiccorr)}}}}
+%
+% amsmath def: \newcommand{\eqref}[1]{\textup{\tagform@{\ref{#1}}}}
+% \def\tagform@#1{\maketag@@@{(\ignorespaces#1\unskip\@@italiccorr)}}
+% \def\maketag@@@#1{\hbox{\m@th\normalfont#1}}
+
% The article class calls \sloppy in two-column mode (\tolerance 9999, \emergencystretch 3em)
% The following adjustments affect line breaking; the values below are intended to produce
@@ -1000,11 +1013,11 @@
\SetMathAlphabet{\mathsf}{sans}{\encodingdefault}{\sfdefault}{m}{n}% \mathsf is upright.
-% Nice solution from DPC to prevent aux file errors (due to active characters from babel) when switching from pdflatex to lualatex.
-\ifx\directlua\undefined
- \AtBeginDocument{\immediate\write\@auxout{\detokenize{%
- \ifx\directlua\undefined\else\endinput\fi}}}
-\fi
+%% Nice solution from DPC to prevent aux file errors (due to active characters from babel) when switching from pdflatex to lualatex. Disabled, 2024/07/28
+%\ifx\directlua\undefined
+% \AtBeginDocument{\immediate\write\@auxout{\detokenize{%
+% \ifx\directlua\undefined\else\endinput\fi}}}
+%\fi
%%%%%%%% Footers and Footnotes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1034,7 +1047,6 @@
\fancyfoot[CE,CO]{\@SetFont\thepage\\[1ex]\footnotesize The United States Government retains, and by accepting the article for publication, the publisher acknowledges that the United States Government retains, a non-exclusive, paid-up, irrevocable, worldwide license to publish or reproduce the published form of this work, or allow others to do so, for United States Government purposes.}
\fi
-% was missing from earlier versions...?
\ifasmeconf@govtsome
\newgeometry{left=0.5in, right=0.5in, top=0.5in, bottom = 1.in, footskip = 0.3in, columnsep = 0.38in}
\fancyfoot[RO,RE]{}
@@ -1088,39 +1100,36 @@
\titlespacing\subsubsection{\parindent}{6pt plus 3pt minus 2pt}{0pt plus 2pt minus 1pt} % from 12 4 3, 2019/7/7
%% Special handling of the appendices
-%% Assumes that appendices are the last content in paper
-\RenewDocumentCommand{\appendix}{}{%
- \setcounter{section}{0}
- \pdfbookmark[0]{\appendicesname}{appendices}
- \renewcommand\thesection{\Alph{section}}
- \titleformat{\section}{\mathversion{sansbold}\bfseries\sffamily\raggedright}{\MakeTextUppercase{\appendixname}\ \thesection.}{0.5em}{\MakeTextUppercase}
-}
-
-%% This patches titlesec's unprotected re-definition of \footnote.
-%% See discussion here: https://github.com/jbezos/titlesec/issues/48
+%% Assumes that appendices are the last content in paper
+%% Code revised to better support tagged pdf, 2024/07/26.
+\patchcmd{\appendix}{%
+ \setcounter{subsection}{0}%
+}{%
+ \setcounter{subsection}{0}\pdfbookmark[1]{\appendicesname}{appendices}%
+}{}{}
+\apptocmd{\appendix}{\titleformat{\section}[block]{\mathversion{sansbold}\bfseries\sffamily\raggedright}{\MakeTextUppercase{\appendixname}\ \thesection.}{0.5em}{\MakeTextUppercase}}{}{}
+% Changed to block layout (rather than default hanging) whilst retaining \raggedright, since "Appendix X." is a very wide hanging indent. 2024/07/26
+
+%% This patches titlesec's unprotected re-definition of \footnote. See discussion here: https://github.com/jbezos/titlesec/issues/48
%% Without this patch, recent versions of LaTeX will require \protect\footnote in section headings.
-%% This issue may be corrected in titlesec, but keeping the patch anyway.
+%% This issue may be corrected in titlesec, but keeping the patch for backward compatibility.
\patchcmd{\ttl@select}{\def\footnote}{\protected\def\footnote}{\typeout{Asmeconf.sty patched titlesec to have protected def of footnote}}{}
%%%%%%%%%% Hyperref, bookmarks, and PDF/A %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% new pdf management in LaTeX, with \DocumentMetaData{..}, is preferred to this *legacy* approach.
\ifpdftex
- %%% to assist with unicode glyph mapping, following M. Sharpe's recommendation in the newtx documentation.
- \IfFormatAtLeastTF{2020/10/01}{\relax}{%
- \pdfgentounicode=1 %% enable CMaps; has moved into the latex kernel Oct 2020
- \input glyphtounicode.tex %% lists of mappings; has moved into the latex kernel Oct 2020
- }
+ %%% to assist with unicode glyph mapping, following M. Sharpe's recommendation in the newtx documentation.
+ %%% as of 2024/07/28, these are still necessary with \DocumentMetadata{pdfstandard=A-3u}. Note: glyphtounicode-cmex.tex is now in latex-lab.
\InputIfFileExists{glyphtounicode-cmr.tex}{}{} %% additional mappings
\InputIfFileExists{glyphtounicode-ntx.tex}{}{} %% additional mappings
\ifac@setpdfa
- %%%% pdfmanagement options, from Ulrike Fischer 2021/06/12
- \if@asme@pdfmanagement
- \ClassInfo{asmeconf}{pdfmanagement is defined. Class file will not load a color profile}
+ %% new pdf management in LaTeX, with \DocumentMetaData{..}, is preferred to this *legacy* approach.
+ \ifasme@pdfmanagement
+ \ClassInfo{\ClassName}{pdfmanagement is defined. Class file will not load a color profile}
\else
- \ClassInfo{asmeconf}{NOTE: pdfmanagement not defined. Class file will load a color profile}%
+ \ClassInfo{\ClassName}{NOTE: pdfmanagement not defined. Class file will load a color profile}%
%%% a fairly generic RGB color profile, aimed at on-screen rendering (not print production)
\immediate\pdfobj stream attr{/N 3} file{sRGB.icc}
\pdfcatalog{%
@@ -1158,20 +1167,20 @@
\urlstyle{same} % don't switch to typewriter font for urls
\RequirePackage{doi} % supports the nasty characters in some doi's
\renewcommand{\doitext}{DOI } % change to this from default value, {doi:}, per ASME specification
-\RequirePackage{bookmark} % improves handling of pdf bookmarks
\providecommand*{\toclevel@subfigure}{1}% <== to address unknown bookmark level of subfigure. 2021/12/24
\providecommand\hrefurl[2]{\href{#1}{#2}}% to address certain issues around URL recognition with new pdf management code, 2021/12/02
-\if@asme@pdfmanagement
- \ClassInfo{asmejour}{pdfmanagement is defined. Class file will not load hyperxmp}
+\ifasme@pdfmanagement
+ \ClassInfo{asmejour}{pdfmanagement is defined. Class file will not load hyperxmp and bookmark packages}
\else
+ \RequirePackage{bookmark}% improves handling of pdf bookmarks
\RequirePackage{hyperxmp}% improve transfer of metadata to pdf
% Patch bug in hyperxmp, unless a more recent version is used.
\ifdefined\hyxmp@no@bad@parts% \hyxmp@no@bad@parts is not def'd in TeX Live 2019 or older
- \@ifpackagelater{hyperxmp}{2022/10/15}{% v5.11 or later
+ \IfPackageAtLeastTF{hyperxmp}{2022/10/15}{% v5.11 or later
\relax
}{%
\newcount\hypxmp@tempcnt
@@ -1180,13 +1189,11 @@
\hyxmp@pdfstringdef\@pdfapart{\the\hypxmp@tempcnt}%
}
}
- \else
- \relax
\fi
\fi
-%%% ==> recent and evolving development of \pdfstring removes all robust commands from bookmarks, so
-%%% by early 2024, errors are not present; however, these commands serve to still suppress warnings.
+%%% ==> recent development of \pdfstring removes all robust commands from bookmarks, so that
+%%% by early 2024, errors are not present; these commands serve to still suppress warnings, however.
%% 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}
@@ -1212,7 +1219,7 @@
%% Ensure that tag color does not follow \eqref into bookmarks, 2020/02/28
\pdfstringdefDisableCommands{%
- \def\eqref#1{(\ref{#1})}%
+ \def\eqref#1{(\ref*{#1})}% \ref* is from hyperref
}
% Let's make sure footnotes in section headings don't break pdf bookmarks.
@@ -1222,7 +1229,6 @@
}
-
%% Let's also add \footnote to the \TextUppercase exception list, so that footnote text won't be capitalized
%% if given in section headings. Ditto for \eqref
%
@@ -1244,13 +1250,12 @@
\renewcommand{\linenumberfont}{\normalfont\footnotesize\color{red}}
\AtBeginDocument{\linenumbers}
\ifasmeconf@balance
- \ClassWarningNoLine{asmeconf}{Package lineno loaded, so final column balancing will be disabled}%
+ \ClassWarningNoLine{\ClassName}{Package lineno loaded, so final column balancing will be disabled}%
\fi
%%% Patch to allow line numbering in AMS math environments.
%%% This patch is for lineno versions earlier than v5.2 [2023/05/19]. As of mid-2023, the lineno package
- %%% has been corrected to account for the AMS math environments. Retaining temporarily for backward compatibility.
+ %%% has been corrected to account for the AMS math environments. Retaining for backward compatibility.
%%% postdisplaypenalty adjusted to avoid extra line number at end, see: https://tex.stackexchange.com/a/461192/
- %%% multline has some additional problem that puts an extra line number above it.
\IfPackageAtLeastTF{lineno}{2023/05/19}{\relax}{
\NewDocumentCommand{\ac@losepostpenalty}{}{\patchcmd{\linenomathWithnumbers}{\advance\postdisplaypenalty\linenopenalty}{}{}{}}
%
@@ -1270,7 +1275,7 @@
\ifasmeconf@balance
\RequirePackage{flushend}% flushend package is NOT compatible with lineno
\AtEndDocument{\flushcolsend}%
- \LogNote{Calling flushend package to balance column height on last page}%
+ \ClassNoteNoLine{\ClassName}{Calling flushend package to balance column height on last page}%
\fi%
\fi
\providecommand{\@LN@col}[1]{\relax}% Enable dropping lineno option without trashing .aux file
@@ -1364,7 +1369,10 @@
\NewDocumentCommand\PaperNo{m}{\gdef\@PaperNo{#1}}
\providecommand\@PaperNo{\protect\phantom{NO.}}
-\NewDocumentCommand\PaperTitle{m}{\gdef\@PaperTitle{#1}}
+\NewDocumentCommand\PaperTitle{m}{%
+ \gdef\@PaperTitle{#1}%
+ \gdef\@title{#1}% added 2024/07/28
+}
\providecommand\@PaperTitle{\hbox{ }}
\NewDocumentCommand\@HeaderTitle{}{%
@@ -1419,7 +1427,7 @@
%%%% option to use the traditional grid layout of authors or the inline style
\ifasmeconf@grid
- \LogNote{Selected option for a grid of author blocks}%
+ \ClassNoteNoLine{\ClassName}{Selected option for a grid of author blocks}%
%%%%%%%%%%%%%%%%%%%% Gridded author layout %%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1463,7 +1471,7 @@
\ifblank{#1}{%
\expandafter\xdef\csname aut@\theauthorcnt\endcsname{}%
\expandafter\xdef\csname autaffil@\theauthorcnt\endcsname{-1}
- \ClassWarning{asmeconf}{Missing author name, check for extra comma}%
+ \ClassWarning{\ClassName}{Missing author name, check for extra comma}%
}{\expandafter\xdef\csname aut@\theauthorcnt\endcsname{#1}%
}%
}% defines \aut@authorcnt as Name #1
@@ -1547,12 +1555,18 @@
\fi
\fi
\ifnum\value{authorno}>15
- \ClassWarningNoLine{asmeconf}{The class is programmed for up to 15 author blocks. If some of your authors are at the same institution, %
+ \ClassWarningNoLine{\ClassName}{The class is programmed for up to 15 author blocks. If some of your authors are at the same institution, %
you may put more than one name above a single address. If you need more than 15 author blocks, try using the in-line author style %
instead of the [grid] option}
\fi
}% end whiledo
}
+ \ExplSyntaxOn
+ % next three are for backward compatibility
+ \cs_if_exist:NF \cs_gset:Npe { \cs_generate_variant:Nn \cs_gset:Npn {Npe} }
+ \cs_if_exist:NF \tl_set:Ne { \cs_generate_variant:Nn \tl_set:Nn {Ne} }
+ \cs_if_exist:NF \tl_put_right:Ne { \cs_generate_variant:Nn \tl_put_right:Nn {Ne} }
+
\NewDocumentCommand\@ConstructAuthorBlock{}{%
\ifnum\value{authorno}>3
\JoinCoffins\firstrowauthorblock[hc,b]\secondrowauthorblock[hc,t](0pt, -1.5\baselineskip)
@@ -1566,8 +1580,34 @@
\ifnum\value{authorno}>12
\JoinCoffins\firstrowauthorblock[hc,b]\fifthrowauthorblock[hc,t](0pt, -1.5\baselineskip)
\fi
- \centerline{\TypesetCoffin\firstrowauthorblock}%% in this instance, \centerline is better than \centering
+ \centerline{\TypesetCoffin\firstrowauthorblock}% in this instance, \centerline is better than \centering
+ \__asmeconf_concataut:
+ \cs_gset:Npe \@author { \tl_use:N \g_asmeconf_authors_tl }
+ %\iow_term:e { \tl_use:N \g_asmeconf_authors_tl }% diagnostic only
}
+ % build comma-separated list of author names
+ \cs_new_protected:Nn \__asmeconf_concataut: {
+ \tl_new:N \g_asmeconf_authors_tl
+ \int_set:Nn \l_tmpa_int {1}
+ \int_new:N \l__asmeconf_noauts
+ \int_set:Nn \l__asmeconf_noauts { \value{authorcnt} }
+ \int_do_until:nNnn { \l_tmpa_int } > { \l__asmeconf_noauts }
+ {
+ \tl_set:Ne \l_tmpa_tl {\use:c { aut@ \int_use:N \l_tmpa_int } }
+ \tl_replace_all:Nnn \l_tmpa_tl {\unhbox \voidb@x \protect \penalty \@M \ } {~}
+ % If tex unbreakable space character "~" has expanded, replace by a simple space, which is "~" in Expl3 syntax
+ \tl_remove_all:Nn \l_tmpa_tl { \JointFirstAuthor }
+ \tl_replace_all:Nnn \l_tmpa_tl { \CorrespondingAuthor } { \use_none:n }
+ \tl_replace_all:Nnn \l_tmpa_tl { \affil } { \use_none:n }
+ \tl_replace_all:Nnn \l_tmpa_tl { \xdef } { \use_none:nn }
+ \tl_put_right:Ne \g_asmeconf_authors_tl \l_tmpa_tl
+ \int_compare:nNnT { \l_tmpa_int } < { \l__asmeconf_noauts} {
+ \tl_put_right:Ne \g_asmeconf_authors_tl { ,~ }
+ }
+ \int_incr:N \l_tmpa_int
+ }
+ }
+ \ExplSyntaxOff
%%% otherwise use the new compact layout of authors
\else
@@ -1576,13 +1616,35 @@
\NewCoffin{\AffiliationBlock}
\NewCoffin{\AffiliationsBlock}
\AtBeginDocument{\SetHorizontalCoffin\AffiliationsBlock{}}% corrected 2021/12/01
-
+
+ \ExplSyntaxOn
+ \cs_if_exist:NF \cs_gset:Npe { \cs_generate_variant:Nn \cs_gset:Npn {Npe} }
+ \cs_if_exist:NF \tl_gset:Ne { \cs_generate_variant:Nn \tl_gset:Nn {Ne} }
+
%% NB: \parbox width to \textwidth (full page) not \linewidth (single column)
\NewDocumentCommand\SetAuthors{m}{%
- \SetHorizontalCoffin\AuthorBlock{%
+ \SetHorizontalCoffin\AuthorBlock{% ignoring the bug in testphase tagging
\parbox{\textwidth}{\centering\sffamily\bfseries\ignorespaces#1\ignorespaces}%
+ % NB: in vertical mode \parbox needs \noindent ahead of it, _inside_ vertical coffin
+ % \SetVerticalCoffin\AuthorBlock{\textwidth}{% 2024/07/30, test a vertical coffin alternative
+ % \centering\sffamily\bfseries\ignorespaces#1\ignorespaces%
+ \__asmeconf_striptokens:n {#1}
+ \cs_gset:Npe \@author { \tl_use:N \g_asmeconf_authors_tl }% set \@author = list of authors, 2024/07/31
}
}
+ % strip \affil{..}, \JointFirstAuthor, \CorrespondingAuthor{...} from argument
+ \cs_new_protected:Nn \__asmeconf_striptokens:n {
+ \tl_set:Nn \l_tmpa_tl {#1}
+ \regex_replace_all:nnN { \cA\~ } {\ } \l_tmpa_tl % replace ~ by space in author list
+ %\tl_replace_all:Nnn \l__asmeconf_authors_tl {\ } {~}% change "\ " to space (but why? for text we would want this)
+ \tl_remove_all:Nn \l_tmpa_tl { \JointFirstAuthor }
+ \tl_replace_all:Nnn \l_tmpa_tl { \affil } { \use_none:n }
+ \tl_replace_all:Nnn \l_tmpa_tl { \CorrespondingAuthor } { \use_none:n }
+ \tl_new:N \g_asmeconf_authors_tl
+ \tl_gset:Ne \g_asmeconf_authors_tl \l_tmpa_tl
+ \iow_term:e { \tl_use:N \g_asmeconf_authors_tl }% diagnostic only
+ }
+ \ExplSyntaxOff
\def\@makefnmark{\hbox{\@textsuperscript{\sffamily\@thefnmark}}}%
@@ -1598,14 +1660,14 @@
%%% Affiliation mark
\NewDocumentCommand{\affil}{m}{%
\ifblank{#1}{%
- \ClassWarning{asmeconf}{Empty affiliation tag}%
+ \ClassWarning{\ClassName}{Empty affiliation tag}%
\@gobble% 9 Dec 2021, addresses modification for commas
}{\bfseries\footnotemark[#1]}%
}
%%% to deal with sequential notes as, e.g., "1,*", or "1,2,*" %%%%%%%%%%
\ExplSyntaxOn
- \cs_new:Npn \__asmecome_OtherNoteComma:n {
+ \cs_new:Npn \__asmeconf_OtherNoteComma:n {
\peek_meaning:NTF \affil
{ \textsuperscript{\mdseries,} }
{ \peek_meaning:NTF \CorrespondingAuthor
@@ -1614,11 +1676,11 @@
}
}
\cs_new_eq:NN \__saveAF \affil
- \cs_gset_protected:Npn \affil #1 { \__saveAF{#1} \__asmecome_OtherNoteComma:n }
+ \cs_gset_protected:Npn \affil #1 { \__saveAF{#1} \__asmeconf_OtherNoteComma:n }
\cs_new_eq:NN \__saveCA \CorrespondingAuthor
- \cs_gset_protected:Npn \CorrespondingAuthor #1 { \__saveCA{#1} \__asmecome_OtherNoteComma:n }
+ \cs_gset_protected:Npn \CorrespondingAuthor #1 { \__saveCA{#1} \__asmeconf_OtherNoteComma:n }
\cs_new_eq:NN \__saveJA \JointFirstAuthor
- \cs_gset_protected:Npn \JointFirstAuthor { \__saveJA \__asmecome_OtherNoteComma:n }
+ \cs_gset_protected:Npn \JointFirstAuthor { \__saveJA \__asmeconf_OtherNoteComma:n }
\ExplSyntaxOff
%%%
@@ -1633,7 +1695,6 @@
%%%% Make the title and author section
\NewDocumentCommand\MakeTitlePage{}{%
\twocolumn[
- \begin{@twocolumnfalse}
\@HeaderTitle
\vspace*{2\baselineskip}
\ifasmeconf@grid
@@ -1642,7 +1703,6 @@
\@SetAuthorBlock
\fi
\vspace*{3\baselineskip}
- \end{@twocolumnfalse}
]
\let\@makefnmark\savemakefnmark% restore footnote mark font
\renewcommand*{\thefootnote}{\fnsymbol{footnote}}
@@ -1767,12 +1827,12 @@
%%%%%%%%%%%%%%%%%% Times-like fonts for specific languages %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifpdftex % Under lualatex, babel has problems with the following approach, which assumes that fontspec has not been loaded.
- % Recommend not to choose the [nofontspec] option.
+ % Recommend not to choose the [nofontspec] option.
% Several modifications made in response to newtx v1.71, 2022/03/14
\ifac@vietnamese
%
\IfFormatAtLeastTF{2020/02/02}{\relax}{%
- \ClassError{asmeconf}{Your LaTeX format is dated \fmtversion. LaTeX distributions 2020 are necessary to use the fonts of the [vietnamese] option with pdflatex}{Please UPDATE your LaTeX distribution: TeX Live is available for download at no charge: \string https://www.tug.org/texlive/. Alternatively, delete the class option [vietnamese].}%
+ \ClassError{\ClassName}{Your LaTeX format is dated \fmtversion. LaTeX distributions 2020 are necessary to use the fonts of the [vietnamese] option with pdflatex}{Please UPDATE your LaTeX distribution: TeX Live is available for download at no charge: \string https://www.tug.org/texlive/. Alternatively, delete the class option [vietnamese].}%
}
%
\AtBeginDocument{%
@@ -1831,7 +1891,7 @@
\ifac@greek
%
\IfFormatAtLeastTF{2020/02/02}{\relax}{%
- \ClassError{asmeconf}{Your LaTeX format is dated \fmtversion. LaTeX distributions 2020 are necessary to use the fonts of the [greek] option with pdflatex}{Please UPDATE your LaTeX distribution: TeX Live is available for download at no charge: \string https://www.tug.org/texlive/. Alternatively, delete the class option [greek].}%
+ \ClassError{\ClassName}{Your LaTeX format is dated \fmtversion. LaTeX distributions 2020 are necessary to use the fonts of the [greek] option with pdflatex}{Please UPDATE your LaTeX distribution: TeX Live is available for download at no charge: \string https://www.tug.org/texlive/. Alternatively, delete the class option [greek].}%
}
%
\AtBeginDocument{%
@@ -1906,7 +1966,7 @@
\ifac@cyrillic
%
\IfFormatAtLeastTF{2020/02/02}{\relax}{%
- \ClassError{asmeconf}{Your LaTeX format is dated \fmtversion. LaTeX distributions 2020 are necessary to use the fonts of the cyrillic language option with pdflatex, e.g., [russian]}{Please UPDATE your LaTeX distribution: TeX Live is available for download at no charge: \string https://www.tug.org/texlive/. Alternatively, delete the class option calling a cyrillic-alphabet language.}%
+ \ClassError{\ClassName}{Your LaTeX format is dated \fmtversion. LaTeX distributions 2020 are necessary to use the fonts of the cyrillic language option with pdflatex, e.g., [russian]}{Please UPDATE your LaTeX distribution: TeX Live is available for download at no charge: \string https://www.tug.org/texlive/. Alternatively, delete the class option calling a cyrillic-alphabet language.}%
}
%
\AtBeginDocument{%
diff --git a/Master/texmf-dist/tex/latex/asmejour/asmejour.cls b/Master/texmf-dist/tex/latex/asmejour/asmejour.cls
index 095964ffc7b..a8cd43eae27 100644
--- a/Master/texmf-dist/tex/latex/asmejour/asmejour.cls
+++ b/Master/texmf-dist/tex/latex/asmejour/asmejour.cls
@@ -4,10 +4,9 @@
%%
%% The asmejour.cls file should be used with the files asmejour.bst (for citations) and asmejour-template.tex.
%%
-%%
%% This file's version and date are:
- \def\versionno{1.22}
- \def\versiondate{2024/01/30\space}
+ \def\versionno{1.23}
+ \def\versiondate{2024/07/24\space}
%%
%% Author: John H. Lienhard V
%% Department of Mechanical Engineering
@@ -22,14 +21,14 @@
%% 4. Support citations, footnotes, and bold face math in section headings
%% 5. Provide optional line numbers for editing and review
%% 6. Support balancing height of columns on the last page
-%% 7. Support the archival PDF/A standards 1b, 2b, 2u, 3b, and 3u
+%% 7. Support archival PDF/A standards
%% 8. Provide copyright notices for government employees and government contractors
%% 9. Enable various math and text features from the newtxmath, mathalfa, and newtxtext packages
%% 10. Support inclusion of passages in languages other than English
%%
%% This class is compatible with both pdfLaTeX and LuaLaTeX. All packages required by the class
-%% are in standard distributions, such as TeXLive, and are also available at CTAN (https://ctan.org/).
-%% The use of an up-to-date (Feb. 2020 or later) and complete LaTeX distribution is strongly recommended.
+%% are in standard distributions, such as TeX Live, and are also available at CTAN (https://ctan.org/).
+%% The use of an up-to-date (Nov. 2022 or later) and complete LaTeX distribution is strongly recommended.
%%
%% The title block is set by specific commands that are described in the asmejour-template.tex file.
%%
@@ -57,72 +56,79 @@
%% 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.
%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{asmejour}[\versiondate asmejour paper format]
-\LoadClass[twoside,9pt,twocolumn]{extarticle}
-
-\ifdefined\NewDocumentCommand\else
- \RequirePackage{xparse}[2020/02/25]
-\fi
+\LoadClass[twoside,9pt]{extarticle}% twocolumn format initiated in \MakeTitle command 2024/07/20
\RequirePackage{iftex}% provides \ifpdftex, etc.
\RequirePackage{ifthen}
-%%%%%%%%%%%%% Test compatibility of older distributions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ExplSyntaxOn
+ \str_const:Nn \ClassName {asmejour}
+\ExplSyntaxOff
-\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
+%%%%%%%%%%%%% Some compatibility for older distributions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\IfFormatAtLeastTF{2020/02/25}{%
- \ClassInfo{asmeconf}{Your LaTeX format is dated \fmtversion. LaTeX distributions 2020/10/01 or later are strongly recommended, for best results}
- }{%
- \ClassError{asmeconf}{Your LaTeX format is dated \fmtversion. Formats dated 2020/10/01 or later are recommended for the asmejour class. Older formats may generate errors or fail entirely!}{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, but your abstract will probably not compile properly if you lack the xparse package [2020/02/25], and the code will crash entirely if you lack the iftex package [2019/11/07].}%
+\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\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}{\relax}{%
+ \ClassError{\ClassName}{Your LaTeX format is dated \fmtversion. Formats dated 2020/10/01 or later are recommended for the asmejour class. Older formats may generate errors or fail entirely!}{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 any errors for now, but your abstract will not compile properly if you lack the xparse package [2020/02/25], and the code will crash entirely if you lack the iftex package [2019/11/07].}%
}
-
-\DeclareDocumentCommand\LogNote{m}{%
- \IfFormatAtLeastTF{2021/11/15}{%
- \ClassNoteNoLine{asmejour}{#1}% Added to LaTeX in Nov. 2021
- }{%
- \ClassWarningNoLine{asmejour}{#1}%
+
+% check whether pdfmanagement (\DocumentMetadata) has been loaded (else fall back to hyperxmp and bookmark packages after loading hyperref)
+\newif\ifasme@pdfmanagement
+\IfPDFManagementActiveTF{
+ \asme@pdfmanagementtrue
+}{
+ \asme@pdfmanagementfalse
+ \ClassWarningNoLine{\ClassName}{pdfmanagement is not active. Will load hyperxmp and bookmark packages instead}
+}
+
+% Allow pre 2021/11/15 formats to see the graphicx alt key without causing an error
+\IfFormatAtLeastTF{2021/11/15}{
+ \relax
+}{
+ \AtBeginDocument{
+ \IfPackageLoadedTF{graphicx}{\define@key{Gin}{alt}{}}{\relax}
}
}
-%% Test whether \DocumentMetadata has been loaded (Thank you Ulrike Fischer)
-\newif\if@asme@pdfmanagement
-\ExplSyntaxOn
-\bool_if:nTF
- {
- \bool_lazy_and_p:nn
- {\cs_if_exist_p:N \pdfmanagement_if_active_p:}
- { \pdfmanagement_if_active_p: }
- }
- {
- \@asme@pdfmanagementtrue
- }
- {
- \@asme@pdfmanagementfalse
- }
-\ExplSyntaxOff
+% Enable pre-2020/10 formats to access essential macros later moved into LaTeX kernel
+\ifdefined\NewDocumentCommand\else
+ \RequirePackage{xparse}[2020/02/25]
+\fi
+
+% Provide pre-2020/10 installations with basic unicode character mappings
+\IfFormatAtLeastTF{2020/10/01}{\relax}{%
+ \pdfgentounicode=1 %% enable CMaps; was moved into the latex kernel Oct 2020
+ \input glyphtounicode.tex %% lists of mappings; was moved into the latex kernel Oct 2020
+}
-%%%%%%%%%%%%%% Options for the class %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%% Options for the class %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{kvoptions}% this package calls kvsetkeys
\SetupKeyvalOptions{
- family=asmejour,
+ family=\ClassName,
prefix=asmejour@,
setkeys=\kvsetkeys,
}
%% for mathalfa, so we may pass options in this format: mathalfa=cal=euler, mathalfa=frak=boondox
-\define@key{asmejour}{mathalfa}{%
+\define@key{\ClassName}{mathalfa}{%
\PassOptionsToPackage{#1}{mathalfa}%
}
+%% Option to obtain line numbers [singlecolumn], 2024/07/20
+\DeclareBoolOption{singlecolumn}
+
%% Option to obtain line numbers [lineno]
\DeclareBoolOption{lineno}
@@ -132,6 +138,12 @@
%% Option to omit lists of figures and tables
\DeclareBoolOption{nolists}
+%% Option to omit ASME copyright notice [nocopyright]
+\DeclareBoolOption{nocopyright}
+
+%% Option to omit ASME footers [nofoot]
+\DeclareBoolOption{nofoot}
+
%% Option for copyright notice if all authors are government employees [govt]
\DeclareBoolOption{govt}
@@ -141,57 +153,54 @@
%% Option for government contractor copyright notice [contractor]
\DeclareBoolOption{contractor}
-%% set [barcolor=] to a color name defined by xcolor package
+%% set key [barcolor=] to pass a color name defined by xcolor package
\DeclareStringOption[black]{barcolor}
-%% the key main= passes the choice of main language to babel
+%% the key [main= ] to pass the choice of main language to babel
\newif\ifaj@mainset\aj@mainsetfalse
-\define@key{asmejour}{main}[english]{%
+\define@key{\ClassName}{main}{%
\PassOptionsToPackage{main=#1,#1}{babel}% added #1 resolves conflicts between certain .ldf files under "main=".
\aj@mainsettrue
- \ifthenelse{\equal{#1}{english}}{%
- \PassOptionsToPackage{pdflang=en}{hyperref}}{%
- \LogNote{Selecting #1 as the primary language}
- }%
+ \ClassNoteNoLine{\ClassName}{Selecting #1 as the primary language}
}
-%% if main language was not chosen explicitly, default to English
-\ifaj@mainset\relax\else
- \PassOptionsToPackage{main=english}{babel}%
- \PassOptionsToPackage{pdflang=en}{hyperref}
- \ClassInfo{Selecting English as the primary language, since main= not set}%
-\fi
-
%% Suppress warnings about unused global options, 2021/12/01
-\DeclareDefaultOption{}% suppress warning about unused mathalfa option
+\DeclareDefaultOption{}
-\ProcessKeyvalOptions{asmejour}
+\ProcessKeyvalOptions{\ClassName}
%% Turn off these keys now that we're done with them
\NewDocumentCommand\aj@DisableOption{m}{%
\DisableKeyvalOption[%
action=ignore,%
- class=asmejour%
+ class=\ClassName%
]{#1}{\@KeyFamily}%
}
\NewDocumentCommand\@DisableKeys{>{\SplitList{;}}m}{\ProcessList{#1}{\aj@DisableOption}}
-\def\@KeyFamily{asmejour}
-\@DisableKeys{mathalfa;barcolor;lineno;balance;nolists;govt;govtsome;contractor;main}
+\def\@KeyFamily{\ClassName}
+\@DisableKeys{mathalfa;singlecolumn;lineno;balance;nolists;nocopyright;nofoot;govt;govtsome;contractor;barcolor;main}
+
+
+%% if main language was not was chosen explicitly, default to English
+\ifaj@mainset\relax\else
+ \PassOptionsToPackage{main=english}{babel}%
+ \ClassNoteNoLine{\ClassName}{Selecting English as the primary language, since main= not set}%
+\fi
-%%%%%%% PDF/A Compliance Keys %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%% PDF/A Compliance Keys %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% new pdf management in LaTeX, with \DocumentMetaData{..}, is preferred to this approach.
\newif\ifaj@setpdfa\aj@setpdfafalse
\newif\ifaj@pdfaone\aj@pdfaonefalse
-\if@asme@pdfmanagement\else
+\ifasme@pdfmanagement\else
\SetupKeyvalOptions{
family=pdfaopt,
- prefix=pdafopt@,
+ prefix=pdfaopt@,
setkeys=\kvsetkeys,
}
@@ -201,7 +210,7 @@
\define@key{pdfaopt}{pdf-a}[true]{%
\aj@setpdfatrue
\PassOptionsToPackage{pdfa}{hyperref}
- \AtBeginDocument{\hypersetup{pdfapart=3,pdfaconformance=u}}% note: hyperref takes these options if hyperxmp is loaded
+ \AtBeginDocument{\hypersetup{pdfapart=3,pdfaconformance=u}}% hyperref takes these options if hyperxmp is loaded
}
%%% to select part 1, 2 or 3
\define@key{pdfaopt}{pdfapart}[3]{%
@@ -209,7 +218,7 @@
\AtBeginDocument{\hypersetup{pdfapart=\asmejour@tempa}}
\ifthenelse{\equal{#1}{1}}{\aj@pdfaonetrue}{\relax}%
}
- %% to select conformance b or u. NB: a is not possible with pdfLaTeX, and u is not possible with 1.
+ %% to select conformance b or u. NB: a is not currently possible with pdfLaTeX; u not possible with 1.
\ExplSyntaxOn
\define@key{pdfaopt}{pdfaconformance}[u]{%
\str_set:Ne \l_tmp_str { \str_uppercase:n {#1} }
@@ -236,9 +245,10 @@
\pdfminorversion=7 % this selection is not required
\fi
\else
- \ifaj@setpdfa\ClassWarningNoLine{asmejour}{pdf-a option requires pdfLaTeX engine. Under LuaLaTeX, use %
- \protect\DocumentMetadata{pdfstandard=A-3b} before \protect\documentclass[..]{asmeconf}}\fi%
- \ifx\directlua\undefined\else
+ \ifaj@setpdfa\ClassWarningNoLine{\ClassName}{pdf-a option requires pdfLaTeX. Under LuaLaTeX, use %
+ \protect\DocumentMetadata{pdfstandard=A-3b} before \protect\documentclass[..]{\ClassName}}%
+ \fi
+ \ifx\directlua\undefined\else % default under lualatex is 1.4
\directlua{
if pdf.getminorversion() \string~= 7 then
if (status.pdf_gone and status.pdf_gone > 0)
@@ -248,58 +258,28 @@
pdf.setminorversion(7)
end
end
+ }
\fi
- }% will lose some accented characters this way... better to use fontspec, if the system fonts exist.
\fi
\fi
-%%%%%%%%%% Further class options %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% Option to omit ASME footer
-\DeclareOption{nofoot}{%
- \AtBeginDocument{\pagestyle{plain}%
- \fancypagestyle{title}{%
- \fancyhf{}
- \fancyfoot[CE,CO]{\thepage}
- }
- }
-}
-
-%% Option to omit ASME copyright
-\DeclareOption{nocopyright}{%
- \AtBeginDocument{\fancypagestyle{title}{%
- \fancyhf{}
- \fancyfoot[RO]{\large\sffamily \@PreprintStringR\space\space\bfseries/\space\space\@PaperNumber\thepage}
- \fancyfoot[LO]{\large\bfseries\sffamily Journal of \@JourName}
- \fancyfoot[CO]{}
- }
- }
-}
+%%%%%%%%% Various font-related options %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Option for slightly larger small capitals font [largesc], corrected 2021/01/29
\DeclareOption{largesc}{\PassOptionsToPackage{largesc=true}{newtxtext}}% largesc is a boolean key in newtxtext
-%% ASME word separation is greater than newtxtext defaults so change these parameters.
-\PassOptionsToPackage{spacing=0.3em, stretch=0.18em, shrink=0.10em}{newtxtext}% increased shrink from 0.08, 2021/01/30
-
%% Disable newtxtext osf option, which is not appropriate for documents in this class
\DeclareOption{osf}{%
\PassOptionsToPackage{lining}{newtxtext}%
}
-%% Option to hyphenate the typewriter font [hyphenate]
-\DeclareOption{hyphenate}{%
- \PassOptionsToPackage{hyphenate}{inconsolata}%
- \LogNote{Allowing hyphenation of typewriter font}%
-}
-
\DeclareOption{hyphenate}{%
\ifpdftex
\PassOptionsToPackage{hyphenate}{inconsolata}% hyphenate is a key via xkeyval in inconsolata
- \LogNote{Allowing hyphenation of typewriter font}%
+ \ClassNoteNoLine{\ClassName}{Allowing hyphenation of typewriter font}%
\else
- \ClassWarningNoLine{asmejour}{The [hyphenate] option is only supported with pdftex. It will be ignored}%
+ \ClassWarningNoLine{\ClassName}{The [hyphenate] option is only supported with pdftex. It will be ignored}%
\fi
}
@@ -329,7 +309,7 @@
\ProcessOptions \relax
-%%%%%%%%%%%% Page size, bibliography, graphics, color, etc. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%% Page size, bibliography, graphics, color %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage[paperheight=285.7mm, paperwidth=215.900mm, left=21.100mm, right=21.100mm, top=15.9mm, bottom = 24mm, footskip=8mm]{geometry}
\setlength\columnsep{4.5mm}
@@ -342,22 +322,8 @@
\renewcommand*{\bibfont}{\footnotesize}
\RequirePackage{graphicx}
-\RequirePackage[dvipsnames,svgnames,x11names]{xcolor}% remove obsolete options, 2023/10/23
+\RequirePackage[dvipsnames,svgnames,x11names]{xcolor}% removed obsolete options, 2023/10/23
-% Allow pre 2021/11/15 formats to see the graphicx alt key without causing an error, in preparation for tagged pdf
-\IfFormatAtLeastTF{2021/11/15}{
- \relax
-}{
- \AtBeginDocument{
- \IfPackageLoadedTF{graphicx}{\define@key{Gin}{alt}{}}{\relax}
- }
-}
-
-% Nice solution from DPC to prevent aux file errors when switching from pdflatex to lualatex
-\ifx\directlua\undefined
- \AtBeginDocument{\immediate\write\@auxout{\detokenize{%
- \ifx\directlua\undefined\else\endinput\fi}}}
-\fi
%%%%%%%%%%%%% Table related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -383,7 +349,9 @@
\ifpdftex
\RequirePackage[T1]{fontenc}
\RequirePackage[utf8]{inputenc}% for backward compatibility with pre-2018 LaTeX distributions
- \RequirePackage[helvratio=0.91]{newtxtext}% add this scaling 2022/06/26
+ %% ASME word separation is greater than newtxtext defaults so change these parameters.
+ %% increased shrink from 0.08, 2021/01/30; add this helvetica scaling 2022/06/26
+ \RequirePackage[helvratio=0.91, spacing=0.3em, stretch=0.18em, shrink=0.10em]{newtxtext}% default {0.25em,0.2em,0.1em}
\RequirePackage[varl,varqu]{inconsolata}% sans typewriter font; restored varl, varqu 2020/08/10
\RequirePackage[]{newtxmath}
\else % use lualatex with newtxmath and fontspec for text primary fonts. Revised 2023/10/21.
@@ -396,20 +364,20 @@
%
\RequirePackage[varqu,varl]{inconsolata} % typewriter font for math
\renewcommand\rmdefault{ntxtlf} % roman font for math
- \DeclareFontFamily{T1}{\sfdefault}{} % sf for math
+ \DeclareFontFamily{T1}{\sfdefault}{} % sf for math
\DeclareFontShape{T1}{\sfdefault}{m}{n}{<-> s*[0.94] ec-qhvr}{} %% see t1qhv.fd; 0.9-->0.94 2022/01/15
\RequirePackage[]{newtxmath} % newtxmath still handles mathematics
\RequirePackage[no-math]{fontspec}
\defaultfontfeatures{Ligatures=TeX,}
%
- \def\FontWarning{For luaLaTeX, you MUST have these OpenType fonts installed as system fonts on your computer: TeX Gyre Termes and TeX Gyre Heros (from \string http://www.gust.org.pl/projects/e-foundry/tex-gyre) and Inconsolatazi4 (\string https://ctan.org/tex-archive/fonts/inconsolata/opentype). If DON'T have these fonts, you will see ERROR messages!}
+ \def\FontWarning{For luaLaTeX, you MUST have these OpenType fonts installed as system fonts on your computer: TeX Gyre Termes and TeX Gyre Heros (from \string http://www.gust.org.pl/projects/e-foundry/tex-gyre) and Inconsolatazi4 (\string https://ctan.org/tex-archive/fonts/inconsolata/opentype). If you DON'T have these fonts, you will see ERROR messages!}
%
- \IfFontExistsTF{TeXGyreTermesX}{}{\ClassWarning{asmeconf}{\FontWarning} }
- \IfFontExistsTF{texgyreheros}{}{ \ClassWarning{asmeconf}{\FontWarning} }
- \IfFontExistsTF{Inconsolatazi4}{}{\ClassWarning{asmeconf}{\FontWarning} }
+ \IfFontExistsTF{TeX Gyre Termes}{}{\ClassWarningNoLine{\ClassName}{\FontWarning} }
+ \IfFontExistsTF{texgyreheros}{}{ \ClassWarningNoLine{\ClassName}{\FontWarning} }
+ \IfFontExistsTF{Inconsolatazi4}{}{\ClassWarningNoLine{\ClassName}{\FontWarning} }
%
- \setmainfont{TeXGyreTermesX}[% Presumes these are system fonts! Available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre
- WordSpace = {1,1.4,1},%% This stretch matches newtxtext a little better. 1.4
+ \setmainfont{TeXGyreTermes}[% Presumes these are system fonts! Available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre
+ WordSpace = {1.20,1.43,1.2},%% This stretch matches newtxtext a little better (reset 2024/07/23)
Extension = .otf,
UprightFont = *-Regular,
ItalicFont = *-Italic,
@@ -418,7 +386,8 @@
Numbers = Lining,
]
\setsansfont{texgyreheros}[% Presumes these are system fonts! Available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre
- WordSpace = {1,1.4,1},
+ WordSpace = {1.20,1.43,1.2},%% This stretch matches newtxtext a little better (reset 2024/07/23)
+% WordSpace = {1,1.4,1},
Extension = .otf,
UprightFont = *-regular,
ItalicFont = *-italic,
@@ -443,7 +412,7 @@
\RequirePackage{bm}% load after all math for expanded access to bold math
-%% In addition to the word spacing options declared in line 235...
+%% In addition to the word spacing options declared in line 371...
%% Relative to size9.clo: leading reduced to 10 pt; displayskips made greater
\renewcommand\normalsize{%
\@setfontsize\normalsize\@ixpt{10\p@}% % <== was \@xipt
@@ -464,13 +433,12 @@
\newcommand*{\CondSans}{\fontencoding{T1}\fontfamily{qhvc}\selectfont}% remove extra \selectfont, 2023/10/21
\renewcommand\huge{\@setfontsize\huge{14}{14}} %... for author names only
\newcommand*{\CondSansBold}{\renewcommand\bfdefault{b}\fontencoding{T1}\fontfamily{qhvc}\selectfont\bfseries}
-\renewcommand\Huge{\@setfontsize\Huge{26.5}{26.5}} %... for title font only
+\renewcommand\Huge{\@setfontsize\Huge{26.5}{26.5}} %... for title only
\RequirePackage{metalogo,hologo}% Access to various LaTeX logos (for use in the documentation)
-%% This provides sans serif italic and sans serif bold italic math.
-%% It's intended for use in the figure and table captions.
-%% Fonts are from newtxsf package.
+%% This provides sans serif italic and sans serif bold italic math, against with fonts from newtxsf.
+%% For use in the figure and table captions.
\DeclareMathVersion{sansbold}
\SetSymbolFont{letters}{sansbold}{OML}{ntxsfmi}{b}{it}
\SetSymbolFont{lettersA}{sansbold}{U}{ntxsfmia}{b}{it}
@@ -480,8 +448,8 @@
\SetSymbolFont{operators}{sansbold}{\encodingdefault}{\sfdefault}{\bfdefault}{n}
\SetMathAlphabet{\mathsf}{sansbold}{\encodingdefault}{\sfdefault}{b}{n}% \mathsf is upright
-%% These lines are to provide math accents for the sans and sansbold math versions.
-%% The accents from ntxsfmi work normally with regular times fonts. Added 2021/01/27
+%% Provide math accents for the sans and sansbold math versions. Accents from ntxsfmi work normally
+%% with regular times fonts. 2021/01/27
\DeclareSymbolFont{lettersAB}{U}{ntxsfmia}{m}{it}
\SetSymbolFont{lettersAB}{normal}{U}{ntxsfmia}{m}{it}
\SetSymbolFont{lettersAB}{bold}{U}{ntxsfmia}{b}{it}
@@ -556,8 +524,7 @@
\DeclareMathSymbol{\sfhslash}{\mathalpha}{lettersAB}{52}% this is not upright
\DeclareMathSymbol{\sfhbar}{\mathalpha}{lettersAB}{53}% this is not upright
-%%% sans math version, potential value with PGFPlots, and provisionally called in subfigure captions.
-%%% this is experimental, still needs stress testing. 2021/01/30
+%%% sans math version, potential value with PGFPlots, called in subfigure captions. 2021/01/30
\DeclareMathVersion{sans}
\SetSymbolFont{letters}{sans}{OML}{ntxsfmi}{m}{it}
\SetSymbolFont{lettersA}{sans}{U}{ntxsfmia}{m}{it}
@@ -569,7 +536,7 @@
\SetMathAlphabet{\mathsf}{sans}{\encodingdefault}{\sfdefault}{m}{n}
-%%%%%%%%%%%%%%%%% Some adjustments to math layout %%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%% Some adjustments to math layout %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\setlength{\jot}{10pt}% <== default is 3pt
@@ -580,7 +547,7 @@
\allowdisplaybreaks % ASME allows these breaks
-%%%%%%%%%%%%%%%%% Equation and Line Numbering %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%% Equation and Line Numbering %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{etoolbox}% patching amsmath
@@ -598,37 +565,36 @@
\ifasmejour@lineno
\RequirePackage[switch,mathlines]{lineno}%
- \renewcommand{\linenumberfont}{\normalfont\footnotesize\color{red}}%
+ \renewcommand{\linenumberfont}{\normalfont\scriptsize\color{red}}%
\AtBeginDocument{\linenumbers}%
\ifasmejour@balance
- \ClassWarningNoLine{asmejour}{Package lineno loaded, so final column balancing will be disabled}%
+ \ClassWarningNoLine{\ClassName}{Package lineno loaded, so final column balancing will be disabled}%
\fi
%%% Patch to allow line numbering in AMS math environments.
%%% This patch is for lineno versions earlier than v5.2 [2023/05/19]. As of mid-2023, the lineno package
%%% has been corrected to account for the AMS math environments. Retaining temporarily for backward compatibility.
%%% postdisplaypenalty adjusted to avoid extra line number at end, see: https://tex.stackexchange.com/a/461192/
- %%% multline has some additional problem that puts an extra line number above it.
\IfPackageAtLeastTF{lineno}{2023/05/19}{\relax}{
- \NewDocumentCommand{\ac@losepostpenalty}{}{\patchcmd{\linenomathWithnumbers}{\advance\postdisplaypenalty\linenopenalty}{}{}{}}
+ \NewDocumentCommand{\aj@losepostpenalty}{}{\patchcmd{\linenomathWithnumbers}{\advance\postdisplaypenalty\linenopenalty}{}{}{}}
%
- \NewDocumentCommand{\ac@FixAMSMath}{m}{%
- \AtBeginEnvironment{#1}{\ac@losepostpenalty\linenomath}%
+ \NewDocumentCommand{\aj@FixAMSMath}{m}{%
+ \AtBeginEnvironment{#1}{\aj@losepostpenalty\linenomath}%
\AtEndEnvironment{#1}{\endlinenomath}%
- \AtBeginEnvironment{#1*}{\ac@losepostpenalty\linenomath}%
+ \AtBeginEnvironment{#1*}{\aj@losepostpenalty\linenomath}%
\AtEndEnvironment{#1*}{\endlinenomath}%
}
%
- \NewDocumentCommand{\ac@FixAll}{>{\SplitList{;}}m}{\ProcessList{#1}{\ac@FixAMSMath}}
+ \NewDocumentCommand{\aj@FixAll}{>{\SplitList{;}}m}{\ProcessList{#1}{\aj@FixAMSMath}}
%
- \ac@FixAll{align;alignat;gather;flalign;multline}
+ \aj@FixAll{align;alignat;gather;flalign;multline}
}
%
\else
\ProvideDocumentEnvironment{linenomath}{}{}{}%
- \ifasmejour@balance % balancing through flushend can produce weird errors
- \RequirePackage{flushend}% flushend package is NOT compatible with lineno
+ \ifasmejour@balance % balancing through flushend can produce weird errors.
+ \RequirePackage{flushend}% flushend package is NOT compatible with lineno.
\AtEndDocument{\flushcolsend}%
- \LogNote{Calling flushend package to balance column height on last page}%
+ \ClassNoteNoLine{\ClassName}{Calling flushend package to balance column height on last page}%
\fi%
\fi
@@ -638,9 +604,9 @@
%% ASME page proofs seem to align the number at top of the line, rather than bottom as done here.
-%%%%%%%%%%%%%%%%% Footer Set Up %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%% Footer Set Up %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%% footer text names %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%% footer text names %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newcommand{\JourName}[1]{\gdef\@JourName{#1}}
\providecommand\@JourName{\hbox{ }}
@@ -650,8 +616,8 @@
}
\providecommand\@PaperYear{\the\year}
-\def\@PreprintStringL{PREPRINT FOR REVIEW}
-\def\@PreprintStringR{PREPRINT FOR REVIEW}
+\def\@PreprintStringL{PREPRINT}% updated 2024/07/24
+\def\@PreprintStringR{PREPRINT}
\NewDocumentCommand{\PreprintString}{m o}{%
\IfNoValueTF{#2}{%
@@ -668,32 +634,53 @@
%%%%%% Fancyhdr %%%%%%%%%%%%%%%%%%%%%%%%%
-\RequirePackage{fancyhdr}
+\RequirePackage{fancyhdr}% options revised 2024/07/23
\pagestyle{fancy}
\fancyhf{}% clear all header and footer fields
\renewcommand{\headrulewidth}{0pt}
\renewcommand{\footrulewidth}{0pt}
-\fancyfoot[RE]{\large\bfseries\sffamily Transactions of the ASME}
-\fancyfoot[LO]{\large\bfseries\sffamily Journal of \@JourName}
-\fancyfoot[RO]{\large\sffamily \@PreprintStringR\space\space\bfseries/\space\space\@PaperNumber\thepage}
-\fancyfoot[LE]{\large\sffamily {\bfseries \@PaperNumber\thepage\space\space/}\space\space\@PreprintStringL\ }
+\ifasmejour@nofoot
+ \fancyfoot[CE,CO]{\thepage}
+\else
+ \fancyfoot[RE]{\large\bfseries\sffamily Transactions of the ASME}
+ \fancyfoot[LO]{\large\bfseries\sffamily Journal of \@JourName}
+ \fancyfoot[RO]{\large\sffamily \@PreprintStringR\space\space\bfseries/\space\space\@PaperNumber\thepage}
+ \fancyfoot[LE]{\large\sffamily {\bfseries \@PaperNumber\thepage\space\space/}\space\space\@PreprintStringL\ }
+\fi
-\fancypagestyle{title}{%
+\fancypagestyle{title}{% is an odd page
\fancyhf{}% clear all header and footer fields
\renewcommand{\headrulewidth}{0pt}
\renewcommand{\footrulewidth}{0pt}
- \fancyfoot[RO]{\large\sffamily \@PreprintStringR\space\space\bfseries/\space\space\@PaperNumber\thepage}
- \fancyfoot[LO]{\large\bfseries\sffamily Journal of \@JourName}
- \fancyfoot[CO]{\large\bfseries\sffamily Copyright \textcopyright\ \@PaperYear\ by ASME}
+ \ifasmejour@nofoot
+ \fancyfoot[CO]{\thepage}
+ \else
+ \fancyfoot[RO]{\large\sffamily \@PreprintStringR\space\space\bfseries/\space\space\@PaperNumber\thepage}
+ \fancyfoot[LO]{\large\bfseries\sffamily Journal of \@JourName}
+ \ifasmejour@nocopyright
+ \fancyfoot[CO]{}
+ \else
+ \fancyfoot[CO]{\large\bfseries\sffamily Copyright \textcopyright\ \@PaperYear\ by ASME}
+ \fi
+ \fi
}
+
%%%%%% Footnotes %%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{fnpos}
\makeFNbottom
\makeFNbelow
+\RequirePackage{footmisc}%
+\IfPackageAtLeastTF{footmisc}{2022/02/05}{
+ \PassOptionsToPackage{belowfloats}{footmisc}%
+ }{ \RequirePackage{fnpos}
+ \makeFNbottom
+ \makeFNbelow
+ }%
+\setlength\footnotemargin{4mm}% reduce indentation of footnotes, from footmisc
\setlength{\skip\footins}{12pt plus 2pt minus 1pt}
\renewcommand{\footnoterule}{%
@@ -702,10 +689,6 @@
\kern 2pt
}
-%% reduce indentation of footnotes
-\renewcommand\@makefntext[1]{%
- \noindent\makebox[4mm][r]{\@makefnmark}\hyphenpenalty=300\exhyphenpenalty=300 #1}% <== suppress hyphenation
-
%% Produces an unmarked footnote about the revision date.
%% This command is invoked by \date as part of \MakeTitlePage below.
%% Text can be anything given as the argument to \date{..}.
@@ -717,13 +700,13 @@
%% include a comma for sequential footnotes
\ExplSyntaxOn
- \cs_new:Npn \__asmejour_NoteComma:n { \peek_meaning:NT \footnote { \textsu{\mdseries,} } }
+ \cs_new:Npn \__asmejour_NoteComma:n { \peek_meaning:NT \footnote { \textsuperscript{\mdseries,} } }
\cs_new_eq:NN \__savefootnote \footnote
\cs_gset_protected:Npn \footnote #1 { \__savefootnote{#1}\__asmejour_NoteComma:n }
\ExplSyntaxOff
-%%%%%%%%% Caption Related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%% Caption Related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\addto{\captionsenglish}{%
\renewcommand{\figurename}{Fig.}
@@ -739,7 +722,7 @@
\captionsetup[figure]{labelfont={sf,bf},textfont={sf,bf},textformat=boldmath,labelsep=quad}
\captionsetup[table]{labelfont={sf,bf},textfont={sf,bf},textformat=boldmath,labelsep=quad,skip=0.5\baselineskip}
-%% 30 January 2021. ASME only labels subfigures with a sans serif, italic (a), (b),... no caption text, no bold face.
+%% 2021/01/30: ASME only labels subfigures with a sans serif, italic (a), (b),... no caption text, no bold face.
\captionsetup[subfigure]{labelfont={sf},textfont={sf},textformat=sansmath,labelformat=simple}% default: =parens
\renewcommand\thesubfigure{(\textit{\alph{subfigure}})}
@@ -747,7 +730,7 @@
\renewcommand\thesubtable{(\textit{\alph{subtable}})}
-%%%%%%%%%%%% Section Headings %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%% Section Headings %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage[raggedright,indentafter]{titlesec}
@@ -760,28 +743,28 @@
\titlespacing{\subsubsection}{\parindent}{12pt plus 3pt minus 2pt}{0.5em}
%% ASME style does not seem to go lower than third level heading, so ...
-%% ....putting \paragraph into \subsubsection settings.
+%% ...put \paragraph into \subsubsection settings.
\titleformat{\paragraph}[runin]{\itshape}{\thesubsubsection}{0.5em}{}[.]
\titlespacing{\paragraph}{\parindent}{14pt plus 3pt minus 2pt}{0.5em}
%% Special handling of the appendices
%% Assumes that appendices are the last technical content in paper
-\providecommand{\appendicesname}{Appendices}
-
-\RenewDocumentCommand{\appendix}{}{%
- \pdfbookmark[1]{\appendicesname}{appendices}
- \setcounter{section}{0}
- \renewcommand\thesection{\Alph{section}}
- \setcounter{equation}{0}
- \renewcommand\theequation{\Alph{section}\arabic{equation}}
- \titleformat{\section}[block]{\mathversion{bold}\bfseries\large\raggedright}{\appendixname\ \thesection:}{0.5em}{}[\setcounter{equation}{0}]
-}
+\providecommand*{\appendicesname}{Appendices}
+\newcounter{appeqn}%% Code revised to better support tagged pdf, 2024/07/24
+\patchcmd{\appendix}{%
+ \setcounter{subsection}{0}}{%
+ \setcounter{subsection}{0}%
+ \pdfbookmark[1]{\appendicesname}{appendices}%
+ \@addtoreset{equation}{appeqn}\stepcounter{appeqn}%
+ \gdef\theequation{\@Alph\c@section\@arabic\c@equation}%
+}{}{}
+\apptocmd{\appendix}{\titleformat{\section}[block]{\mathversion{bold}\bfseries\large\raggedright}{\appendixname\ \thesection:}{0.5em}{}}
%% natbib's \bibsection controls section heading for References.
-%%%%%%%%%%%%%%%%% List environments %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%% List environments %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{enumitem}
@@ -789,24 +772,20 @@
%% I have no examples of sublists...
-%%%%%%%%%%%%%%%%% Hyperref %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%% Hyperref %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% new pdf management in LaTeX, with \DocumentMetaData{..}, is preferred to this approach.
\ifpdftex
- %%% to assist with unicode glyph mapping, following M. Sharpe's recommendation in the newtx documentation.
- \IfFormatAtLeastTF{2020/10/01}{\relax}{%
- \pdfgentounicode=1 %% enable CMaps; has moved into the latex kernel Oct 2020
- \input glyphtounicode.tex %% lists of mappings; has moved into the latex kernel Oct 2020
- }
+ %%% to assist with unicode glyph mapping in pdf/a, per M. Sharpe's recommendation in newtx documentation
\InputIfFileExists{glyphtounicode-cmr.tex}{}{} %% additional mappings
\InputIfFileExists{glyphtounicode-ntx.tex}{}{} %% additional mappings
+ %% new pdf management in LaTeX, with \DocumentMetaData{..}, is preferred to this approach.
\ifaj@setpdfa
- %%%% the pdfmanagement options are experimental, from Ulrike Fischer 2021/06/12
- \if@asme@pdfmanagement
- \ClassInfo{asmejour}{pdfmanagement is defined. Class file will not load a color profile}
+ %%%% the pdfmanagement options from Ulrike Fischer 2021/06/12
+ \ifasme@pdfmanagement
+ \ClassInfo{\ClassName}{pdfmanagement is defined. Class file will not load a color profile}
\else
- \ClassInfo{asmejour}{pdfmanagement not defined. Class file will load a color profile}%
+ \ClassInfo{\ClassName}{pdfmanagement not defined. Class file will load a color profile}%
%%% a fairly generic RGB color profile, aimed at on-screen rendering (not print production)
\immediate\pdfobj stream attr{/N 3} file{sRGB.icc}
\pdfcatalog{%
@@ -826,41 +805,41 @@
%%%
-\RequirePackage[psdextra]{hyperref} % recent kernel transition suggests providing most hyperref options via \hypersetup,
- % but setting psdextra here (for additional math support in bookmarks) 2021/12/23
+\RequirePackage[psdextra]{hyperref} % provide most hyperref options via \hypersetup, but per documentation
+ % set [psdextra] here (for additional math support in bookmarks) 2021/12/23
\hypersetup{%
- pdfborder={0 0 0},%
- bookmarksnumbered=true,%
- bookmarksopen=true,%
- bookmarksopenlevel=1,%
- colorlinks=true,%
- linkcolor=blue, %
- citecolor=blue, %
- urlcolor=blue, %
- filecolor=red, % added 2021/12/23, to make certain broken links more apparent
- pdfnewwindow=true,%
- pdfpagelayout=SinglePage, %TwoPageRight,% changed 2020/08/12
- pdfdisplaydoctitle=true%
+ pdfborder={0 0 0},
+ bookmarksnumbered=true,
+ bookmarksopen=true,
+ bookmarksopenlevel=1,
+ colorlinks=true,
+ linkcolor=blue,
+ citecolor=blue,
+ urlcolor=blue,
+ filecolor=red, % added 2021/12/23, to make certain broken links more apparent
+ pdfnewwindow=true,
+ pdfpagelayout=SinglePage, % was TwoPageRight, changed 2020/08/12
+ pdfdisplaydoctitle=true,
}
\urlstyle{same} % don't switch to typewriter font
\RequirePackage{doi} % supports nasty characters in some doi's
\renewcommand{\doitext}{doi:~} % change the default, {doi:}, to this for ASME specification
-\RequirePackage{bookmark} % improves handling of pdf bookmarks
\providecommand*{\toclevel@subfigure}{1}% <== to address unknown bookmark level of subfigure. 2021/12/24
\providecommand\hrefurl[2]{\href{#1}{#2}}% to address certain issues around URL recognition with new pdf management code, 2021/12/22
%% This alias is also incorporated into asmejour.bst
-\if@asme@pdfmanagement
- \ClassInfo{asmejour}{pdfmanagement is defined. Class file will not load hyperxmp}
+\ifasme@pdfmanagement
+ \ClassInfo{\ClassName}{pdfmanagement is defined. Class file will not load hyperxmp}
\else
+ \RequirePackage{bookmark} %% improves handling of pdf bookmarks
\RequirePackage{hyperxmp} %% to fix transfer of metadata to Acrobat pdf
% Patch bug in hyperxmp, unless a more recent version is used.
\@ifpackagelater{hyperxmp}{2022/10/15}{% v5.11 or later
\relax
- % \ClassInfo{asmeconf}{hyperxmp v5.11 or later is in use}
+ % \ClassInfo{\ClassName}{hyperxmp v5.11 or later is in use}
}{%
\ifx\undefined\hyxmp@no@bad@parts\relax\else
\newcount\hypxmp@tempcnt
@@ -872,10 +851,11 @@
}
\fi
-%%%%%% Adjustments to accommodate hyperref bookmarks %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%% Adjustments to accommodate hyperref bookmarks %%%%%%%%%%%%%%%%%%%%%%
-%%% ==> recent and evolving development of \pdfstring removes all robust commands from bookmarks, so
-%%% the following interventions may become unnecessary over time (2021/12/23).
+%%% Recent development of \pdfstring has removed all robust commands from bookmarks (2021/12/23).
+%%% By mid-2024, no errors are thrown except for \bm; however, these commands serve to still suppress warnings.
+%%% Math shift by $..$ still creates a warning, but I am leaving that in place. To avoid, use \( .. \) instead.
%% 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}
@@ -896,7 +876,7 @@
%% Ensure that tag color does not follow \eqref into bookmarks, 2020/02/28
\pdfstringdefDisableCommands{%
- \def\eqref#1{(\ref{#1})}%
+ \def\eqref#1{(\ref*{#1})}%
}
%% Let's make sure footnotes in section headings don't break pdf bookmarks.
@@ -906,13 +886,13 @@
}
-%%%%%%%%%%%%% Define some section and other names for special environments %%%%%%%
+%%%%%%%%%%%%% Define some section and other names for special environments %%%%%%%%%%%%%%%%%%%%%%%%
\providecommand{\nomname}{Nomenclature}
\providecommand{\keywordname}{Keywords}
\providecommand{\CAwords}{Corresponding Author.}
-%%%%%%%%%%%%% Nomenclature Environment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%% Nomenclature Environment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Nomenclature environment in ASME Journal Style.
%% Run twice to get proper label width.
@@ -926,7 +906,7 @@
\NewDocumentCommand{\entry}{m m}{%
\ifblank{#2}{%
- \ClassError{asmejour}{The command \protect\entry should have two arguments. For subheadings, use \protect\EntryHeading}{It appears that you gave only one argument for \protect\entry. You need to include a second argument.}
+ \ClassError{\ClassName}{The command \protect\entry should have two arguments. For subheadings, use \protect\EntryHeading}{It appears that you gave only one argument for \protect\entry. You need to include a second argument.}
}{%
\item[\hfill#1${} = {}$]#2%
\@itempenalty=-\@lowpenalty%
@@ -938,7 +918,7 @@
%% A separate command command for nomenclature subheadings
\NewDocumentCommand\EntryHeading{m}{%
- \itemsep12\p@ plus 4\p@ minus 4\p@% \bigskip
+ \itemsep12\p@ plus 4\p@ minus 4\p@
\goodbreak\item[\bfseries#1\hfill]\mbox{}\itemsep3\p@ plus 1\p@ minus 1\p@\@itempenalty=1000% add \mbox for tagged pdf, 2023/10/20
}
@@ -966,28 +946,25 @@
}%
}{%
\setcounter{savedlength}{\widest}%
- \end{list}%
+ \end{list}\ignorespacesafterend
}
-%%%%%%%%%%%%%%%% List of figures and list of tables %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%% List of figures and list of tables %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% ASME requires these lists for production.
\ifasmejour@nolists
- \LogNote{Omitting lists of figures and tables}%
+ \ClassNoteNoLine{\ClassName}{Omitting lists of figures and tables}%
\else
\AtEndDocument{%
- \clearpage
\twocolumn[%
- \begin{@twocolumnfalse}
\listoffigures
\listoftables
- \end{@twocolumnfalse}
]%
}%
\fi
-%%%%%%%%%%%%%%%% Author/Title/Abstract block %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%% Author/Title/Abstract block %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{xcoffins}
@@ -1028,12 +1005,12 @@
\fi
}
-
\NewDocumentCommand\SetTitle{m}{%
\SetVerticalCoffin{\Title}{114mm}{%
\vspace*{0.5mm}% <== ASME doesn't align bar and text
\noindent\Huge\CondSansBold\raggedright%
#1%
+ %\gdef\@title{#1}% for tagging, etc. 2024/07/24. pdf metadata will probably override.
\par
}
}
@@ -1086,7 +1063,7 @@
\addtocounter{footnote}{-1}% in case of more than one CA
}
-%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newlength{\@AbstractSep}%% <== separation of author/abstract coffin from main two-column text.
\setlength{\@AbstractSep}{12.5mm}
@@ -1094,12 +1071,15 @@
\NewDocumentCommand{\MakeTitlePage}{}{%
\thispagestyle{title}%
- \twocolumn[
- \begin{@twocolumnfalse}
+ \ifasmejour@singlecolumn % 2024/07/20
\@ConstructAuthorBlock
\vspace*{\@AbstractSep}
- \end{@twocolumnfalse}
- ]
+ \else
+ \twocolumn[
+ \@ConstructAuthorBlock
+ \vspace*{\@AbstractSep}
+ ]
+ \fi
\ifaj@CA
\addtocounter{footnote}{1}
\footnotetext{\CAwords}
@@ -1113,7 +1093,7 @@
\fi
}
-%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Provide compatibility with titling commands from standard LaTeX article class
@@ -1143,7 +1123,7 @@
\RenewDocumentCommand{\thanks}{m}{\relax}%% disabling this standard command, as it is inconsistent with this format
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/bib2qr/bib2qr.sty b/Master/texmf-dist/tex/latex/bib2qr/bib2qr.sty
new file mode 100644
index 00000000000..093c38dba6d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/bib2qr/bib2qr.sty
@@ -0,0 +1,107 @@
+%%
+%% This is file `bib2qr.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% bib2qr.dtx (with options: `package')
+%%
+%% Copyright (C) 2024 Christian Schreinemachers
+%%
+%% 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
+%%
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The current maintainer of this work is
+%% Christian Schreinemachers.
+%%
+%% This work consists of the files
+%% bib2qr.dtx
+%% bib2qr.ins
+%% and the derived files
+%% bib2qr.sty
+%% bib2qr.pdf
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{bib2qr}
+ [2024-07-31 v0.2 Cite BibTeX entries with QR codes]
+\RequirePackage{biblatex}
+\RequirePackage{ifthen}
+\RequirePackage{qrcode}
+\RequirePackage{xstring}
+\DeclareKeys[@bibiiqr]{
+ doiurlbase.store = \@bibiiqr@doiurlbase,
+ doiurlbase.usage = load,
+ qrdelimiter.store = \@bibiiqr@qrdelimiter,
+ qrdelimiter.usage = load,
+ qrversion.store = \@bibiiqr@qrversion,
+ qrversion.usage = load,
+ qrwidth.store = \@bibiiqr@qrwidth,
+ qrwidth.usage = load,
+}%
+\SetKeys[@bibiiqr]{
+ doiurlbase=https://doi.org/,
+ qrdelimiter=\space,
+ qrversion=0,
+ qrwidth=2cm,
+}%
+\ProcessKeyOptions[@bibiiqr]\relax
+\newcommand\@bibiiqr@showqr[1]{%
+ \qrcode[height=\@bibiiqr@qrwidth,version=\@bibiiqr@qrversion]{#1}%
+}%
+\DeclareFieldFormat{@bibiiqr@fldFmtDoi}{%
+ \IfBeginWith{#1}{\@bibiiqr@doiurlbase}%
+ {\@bibiiqr@showqr{#1}}%
+ {\@bibiiqr@showqr{\@bibiiqr@doiurlbase#1}}%
+}%
+\DeclareFieldFormat{@bibiiqr@fldFmtUrl}{\@bibiiqr@showqr{#1}}
+\DeclareBibliographyDriver{@bibiiqr@bibDrvQR}{%
+ \usebibmacro{begentry}%
+ \ifboolexpr{test{\iffieldundef{doi}}}
+ {%
+ \ifboolexpr{test{\iffieldundef{url}}}%
+ {%
+ \PackageWarning{bib2qr}%
+ {BibTeX entry without DOI or URL: \thefield{entrykey}}{}%
+ }%
+ {\printfield[@bibiiqr@fldFmtUrl]{url}}%
+ }%
+ {\printfield[@bibiiqr@fldFmtDoi]{doi}}%
+ \usebibmacro{finentry}%
+}
+\DeclareCiteCommand{\qrcite}
+ {\usebibmacro{prenote}}%
+ {\usedriver{}{@bibiiqr@bibDrvQR}}%
+ {\@bibiiqr@qrdelimiter}%
+ {\usebibmacro{postnote}}%
+\NewDocumentCommand{\qrfullcite}{O{}m}{%
+ \par%
+ \ifthenelse{\equal{#1}{noindent}}{%
+ \noindent%
+ \edef\@bibiiqr@mpiiwidth{\dimexpr\linewidth-\@bibiiqr@qrwidth-0.5em}%
+ }{%
+ \edef\@bibiiqr@mpiiwidth{%
+ \dimexpr\linewidth-\parindent-\@bibiiqr@qrwidth-0.5em}%
+ }%
+ \begin{minipage}[t]{\@bibiiqr@qrwidth}
+ \qrcite{#2}%
+ \end{minipage}
+ \hspace{0.5em}%
+ \begin{minipage}{\@bibiiqr@mpiiwidth}
+ \fullcite{#2}%
+ \end{minipage}
+ \par%
+}%
+
+\endinput
+%%
+%% End of file `bib2qr.sty'.
diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.bbx
index ff82f97f559..8f4e1bea05c 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.bbx
@@ -2,13 +2,13 @@
%% biblatex-ieee --- A biblatex implementation of the IEEE
%% bibliography style
%% Maintained by Joseph Wright
-%% E-mail: joseph.wright@morningstar2.co.uk
+%% E-mail: joseph@texdev.net
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesFile{ieee-alphabetic.bbx}[2021/12/06 v1.3f biblatex bibliography style]
+\ProvidesFile{ieee-alphabetic.bbx}[2024/08/14 v1.3g biblatex bibliography style]
\RequireBibliographyStyle{ieee}
@@ -53,8 +53,8 @@
{\item}
%%
-%% Copyright (C) 2011-2013,2015-2021 by
-%% Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% Copyright (C) 2011-2013,2015-2021,2024 by
+%% Joseph Wright <joseph@texdev.net>
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx
index 302517b02e1..d28449741b3 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx
@@ -2,13 +2,13 @@
%% biblatex-ieee --- A biblatex implementation of the IEEE
%% bibliography style
%% Maintained by Joseph Wright
-%% E-mail: joseph.wright@morningstar2.co.uk
+%% E-mail: joseph@texdev.net
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesFile{ieee-alphabetic.cbx}[2021/12/06 v1.3f biblatex citation style]
+\ProvidesFile{ieee-alphabetic.cbx}[2024/08/14 v1.3g biblatex citation style]
\RequireCitationStyle{alphabetic}
@@ -45,8 +45,8 @@
}
%%
-%% Copyright (C) 2011-2013,2015-2021 by
-%% Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% Copyright (C) 2011-2013,2015-2021,2024 by
+%% Joseph Wright <joseph@texdev.net>
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx
index 77a8b6794de..088064d1f35 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx
@@ -2,13 +2,13 @@
%% biblatex-ieee --- A biblatex implementation of the IEEE
%% bibliography style
%% Maintained by Joseph Wright
-%% E-mail: joseph.wright@morningstar2.co.uk
+%% E-mail: joseph@texdev.net
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesFile{ieee.bbx}[2021/12/06 v1.3f biblatex bibliography style]
+\ProvidesFile{ieee.bbx}[2024/08/14 v1.3g biblatex bibliography style]
% Load the standard style to avoid copy-pasting unnecessary material
\RequireBibliographyStyle{numeric-comp}
@@ -30,6 +30,7 @@
maxbibnames = 6,
sorting = none,
dashed = false,
+ urldate = long,
}
\uspunctuation
@@ -50,6 +51,7 @@
{\bibstring{jourser}\addnbspace#1}
\DeclareFieldFormat[online,report]{title}{\mkbibquote{#1\isdot}}
\DeclareFieldFormat{url}{\bibstring{url}\addcolon\space\url{#1}}
+\DeclareFieldFormat{urldate}{\bibstring{urlseen}\space#1}
\DeclareFieldFormat*{volume}
{\bibstring{volume}\addnbspace#1}
\DeclareFieldFormat[article,periodical]{volume}
@@ -76,6 +78,7 @@
presentedat = presented at the\addspace ,
techreport = Tech\adddot\addspace Rep\adddot ,
url = [Online]\adddot\addspace Available ,
+ urlseen = Accessed\addcolon
}
\DefineBibliographyStrings{english}{
@@ -210,6 +213,7 @@
{%
\printtext[journaltitle]{%
\printfield[titlecase]{journaltitle}%
+ \setunit{\subtitlepunct}%
\printfield[titlecase]{journalsubtitle}%
}%
}%
@@ -331,6 +335,17 @@
\printfield{titleaddon}%
}
+\renewbibmacro*{url+urldate}{%
+ \usebibmacro{urldate}%
+ \setunit{\adddot\space}%
+ \usebibmacro{url}%
+}
+
+\renewbibmacro*{urldate}{%
+ \printurldate
+ \newunit
+ }
+
\renewbibmacro*{volume+number+eid}{%
\printfield{volume}%
\newunit
@@ -713,7 +728,6 @@
{\usebibmacro{eprint}}
{}%
\setunit{\adddot\addspace}%
- \printtext[parens]{\usebibmacro{date}}%
\newunit\newblock
\usebibmacro{url+urldate}%
\setunit{\adddot\addspace}%
@@ -802,8 +816,8 @@
\usebibmacro{finentry}}
%%
-%% Copyright (C) 2011-2013,2015-2021 by
-%% Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% Copyright (C) 2011-2013,2015-2021,2024 by
+%% Joseph Wright <joseph@texdev.net>
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx
index 877d645053f..4b1886683fd 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx
@@ -2,19 +2,19 @@
%% biblatex-ieee --- A biblatex implementation of the IEEE
%% bibliography style
%% Maintained by Joseph Wright
-%% E-mail: joseph.wright@morningstar2.co.uk
+%% E-mail: joseph@texdev.net
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesFile{ieee.cbx}[2021/12/06 v1.3f biblatex citation style]
+\ProvidesFile{ieee.cbx}[2024/08/14 v1.3g biblatex citation style]
\RequireCitationStyle{numeric-comp}
\ExecuteBibliographyOptions{
- maxcitenames = 3,
- minnames = 3,
+ maxcitenames = 2,
+ minnames = 1,
sorting = none
}
@@ -122,8 +122,8 @@
{}}}
%%
-%% Copyright (C) 2011-2013,2015-2021 by
-%% Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% Copyright (C) 2011-2013,2015-2021,2024 by
+%% Joseph Wright <joseph@texdev.net>
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/magyar-ieee.lbx b/Master/texmf-dist/tex/latex/biblatex-ieee/magyar-ieee.lbx
index 79ffd21ce92..33e88122fda 100644
--- a/Master/texmf-dist/tex/latex/biblatex-ieee/magyar-ieee.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-ieee/magyar-ieee.lbx
@@ -2,7 +2,7 @@
%% biblatex-ieee --- A biblatex implementation of the IEEE
%% bibliography style
%% Maintained by Joseph Wright
-%% E-mail: joseph.wright at morningstar2.co.uk
+%% E-mail: jsoeph@texdev.net
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
@@ -34,8 +34,8 @@
}
%%
-%% Copyright (C) 2011-2013,2015-2020 by
-%% Joseph Wright <joseph.wright at morningstar2.co.uk>
+%% Copyright (C) 2011-2013,2015-2020,2024 by
+%% Joseph Wright <joseph@texdev.net>
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/biblatex-phys/phys.bbx b/Master/texmf-dist/tex/latex/biblatex-phys/phys.bbx
index 442f4feae5c..336f90e5474 100644
--- a/Master/texmf-dist/tex/latex/biblatex-phys/phys.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-phys/phys.bbx
@@ -2,13 +2,13 @@
%% biblatex-phys --- A biblatex implementation of the AIP and APS
%% bibliography style
%% Maintained by Joseph Wright
-%% E-mail: joseph.wright@morningstar2.co.uk
+%% E-mail: joseph@texdev.net
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesFile{phys.bbx}[2019/12/03 v1.1b biblatex bibliography style]
+\ProvidesFile{phys.bbx}[2024/07/26 v1.1c biblatex bibliography style]
% Load the standard style to avoid copy-pasting unnecessary material
\RequireBibliographyStyle{numeric-comp}
@@ -464,14 +464,15 @@
\printfield{pages}%
\iffieldundef{pages}
{%
- \printfield{doi}%
- \clearfield{doi}%
- }%
- {%
- \iftoggle{bbx:doi}
- {}
- {\clearfield{doi}}%
- }%
+ \iffieldundef{eid}
+ {%
+ \iftoggle{bbx:doi}
+ {}
+ {\printfield{doi}}%
+ }
+ {}%
+ }
+ {}%
}
\newbibmacro*{related:translatedas}[1]{%
@@ -495,8 +496,8 @@
%%
-%% Copyright (C) 2012-2014,2016,2018,2019 by
-%% Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% Copyright (C) 2012-2014,2016,2018-2020,2023,2024 by
+%% Joseph Wright <joseph@texdev.net>
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/biblatex-phys/phys.cbx b/Master/texmf-dist/tex/latex/biblatex-phys/phys.cbx
index 7758bc0a2b5..4452bd71133 100644
--- a/Master/texmf-dist/tex/latex/biblatex-phys/phys.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-phys/phys.cbx
@@ -2,13 +2,13 @@
%% biblatex-phys --- A biblatex implementation of the AIP and APS
%% bibliography style
%% Maintained by Joseph Wright
-%% E-mail: joseph.wright@morningstar2.co.uk
+%% E-mail: joseph@texdev.net
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesFile{phys.cbx}[2019/12/03 v1.1b biblatex citation style]
+\ProvidesFile{phys.cbx}[2024/07/26 v1.1c biblatex citation style]
\RequireCitationStyle{numeric-comp}
@@ -20,8 +20,8 @@
}
%%
-%% Copyright (C) 2012-2014,2016,2018,2019 by
-%% Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% Copyright (C) 2012-2014,2016,2018,2019,2024 by
+%% Joseph Wright <joseph@texdev.net>
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/biblatex-phys/phys.dbx b/Master/texmf-dist/tex/latex/biblatex-phys/phys.dbx
index c47ca1e2d93..388e7ee4355 100644
--- a/Master/texmf-dist/tex/latex/biblatex-phys/phys.dbx
+++ b/Master/texmf-dist/tex/latex/biblatex-phys/phys.dbx
@@ -2,19 +2,19 @@
%% biblatex-phys --- A biblatex implementation of the AIP and APS
%% bibliography style
%% Maintained by Joseph Wright
-%% E-mail: joseph.wright@morningstar2.co.uk
+%% E-mail: joseph@texdev.net
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\ProvidesFile{phys.dbx}[2019/12/03 v1.1b biblatex database model extension]
+\ProvidesFile{phys.dbx}[2024/07/26 v1.1c biblatex database model extension]
\DeclareDatamodelFields[type=field, datatype=literal]{collaboration}
%%
-%% Copyright (C) 2012-2014,2016,2018,2019 by
-%% Joseph Wright <joseph.wright@morningstar2.co.uk>
+%% Copyright (C) 2012-2014,2016,2018,2019,2024 by
+%% Joseph Wright <joseph@texdev.net>
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
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 d3d4381a9ab..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.11}
-\def\bpl@rdate{2024/07/02}
+\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,6 +552,7 @@
{}{\PackageWarning{biblatex-publist}{Patching refsection failed!}}
}{}
+% Section count. We use l3 here to split the argument and do calculations
\ExplSyntaxOn
\int_new:N \l_bpl_sec_cnt_int
@@ -560,7 +561,7 @@
{
\IfNoValueTF{#1}{%
\csnumdef{bpltmprefsection}{\c@refsection}
- \csuse{bpl@secitems:\bpltmprefsection}%
+ \ifcsdef{bpl@secitems:\bpltmprefsection}{\csuse{bpl@secitems:\bpltmprefsection}}{}%
}{
\int_zero:N \l_bpl_sec_cnt_int
\ProcessList{#1}{\__bpl_add_section_count}
@@ -570,7 +571,8 @@
\cs_new:Npn \__bpl_add_section_count #1
{
- \int_add:Nn \l_bpl_sec_cnt_int { \use:c{bpl@secitems:#1} }
+ \cs_if_exist:cT {bpl@secitems:#1}
+ { \int_add:Nn \l_bpl_sec_cnt_int { \use:c{bpl@secitems:#1} } }
}
\ExplSyntaxOff
@@ -1789,6 +1791,10 @@
%
% l7n
%
+
+\DeclareLanguageMappingSuffix{-publist}
+
+% publist-specific bibstrings
\NewBibliographyString{with}
\NewBibliographyString{parttranslationof}
\NewBibliographyString{impactfactor}
@@ -1803,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 b5972d94978..8176810996a 100644
--- a/Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx
@@ -26,8 +26,8 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\bpl@version{2.11}
-\def\bpl@rdate{2024/07/02}
+\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)]
@@ -91,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 71e9e692767..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.11 (2024/07/02).
+% 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/bxjatoucs/bxjatoucs.sty b/Master/texmf-dist/tex/latex/bxjatoucs/bxjatoucs.sty
index b387872640d..04fb01765a4 100644
--- a/Master/texmf-dist/tex/latex/bxjatoucs/bxjatoucs.sty
+++ b/Master/texmf-dist/tex/latex/bxjatoucs/bxjatoucs.sty
@@ -1,7 +1,7 @@
%%
%% This is file 'bxjatoucs.sty'.
%%
-%% Copyright (c) 2019 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2019-2024 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -53,7 +53,7 @@
%% package declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bxjatoucs}[2019/10/20 v0.2]
+\ProvidesPackage{bxjatoucs}[2024/07/22 v0.3a]
\def\bxju@pkgname{bxjatoucs}
%--------------------------------------- "check-avail"
@@ -167,6 +167,22 @@
\bxju@ifdefinable\bxjaFastJscToUcsHex{%
\def\bxjaFastJscToUcsHex{%
\bxju@burst-`>\bxju@in@hex\bxju@fast@jsc@to@ucs}}
+%%<*> \bxjaUcsToJis{<ucs>}
+\bxju@ifdefinable\bxjaUcsToJis{%
+ \def\bxjaUcsToJis{%
+ \bxju@burst-`>\bxju@ucs@to@jis}}
+%%<*> \bxjaUcsToEuc{<ucs>}
+\bxju@ifdefinable\bxjaUcsToEuc{%
+ \def\bxjaUcsToEuc{%
+ \bxju@burst-`>\bxju@ucs@to@euc}}
+%%<*> \bxjaUcsToSjis{<ucs>}
+\bxju@ifdefinable\bxjaUcsToSjis{%
+ \def\bxjaUcsToSjis{%
+ \bxju@burst-`>\bxju@ucs@to@sjis}}
+%%<*> \bxjaFastUcsToJsc{<ucs>}
+\bxju@ifdefinable\bxjaFastUcsToJsc{%
+ \def\bxjaFastUcsToJsc{%
+ \bxju@burst-`>\bxju@fast@ucs@to@jsc}}
%--------------------------------------- auxiliary
@@ -195,6 +211,16 @@
\expandafter\bxju@decomp@b\the\numexpr#2-#1*256:#1:}
\def\bxju@decomp@b#1:#2:#3{#3{#2}{#1}}
+%% \bxju@decomp@int{<number>}\CScont
+% Divides the <number> by 94 and returns the quotient and
+% the remainder as \CScont{<high>}{<low>}.
+\def\bxju@decomp@int#1{%
+ \expandafter\bxju@decomp@int@a
+ \number\numexpr\ifnum#1>\ltx@zero(#1-47)/94\else0\fi:#1:}
+\def\bxju@decomp@int@a#1:#2:{%
+ \expandafter\bxju@decomp@int@b\the\numexpr#2-#1*94:#1:}
+\def\bxju@decomp@int@b#1:#2:#3{#3{#2}{#1}}
+
%% \bxju@in@hex\CSconv{<arg>}
\def\bxju@in@hex#1#2{%
\expandafter\bxju@in@hex@a\bxju@burst-`>#1{#2}:>}
@@ -231,6 +257,7 @@
%% umbralist fontdefs
\font\bxju@ul@cid=bxjatoucs-cid
\font\bxju@ul@jis=bxjatoucs-jis
+\font\bxju@ul@tojis=bxjatoucs-tojis
%% \bxju@cid@to@ucs{<cid>}
\def\bxju@cid@to@ucs#1{%
@@ -284,6 +311,55 @@
\def\bxju@fast@jsc@to@ucs#1{%
\number\fontdimen\numexpr(#1)+8\bxju@ul@jis}
+%% \bxju@conv@ucs@to@jsc{<ucs>}\CScont
+% Converts a UCS value <ucs> to JSC and returns the result.
+% If no corresponding JSC codepoint exists, returns 9999.
+\def\bxju@conv@ucs@to@jsc#1{%
+ \expandafter\bxju@conv@ucs@to@jsc@a\number\numexpr#1\bxju@mk}
+\def\bxju@conv@ucs@to@jsc@a#1\bxju@mk{%
+ \bxju@cond\ifnum#1<"10000 \fi{%
+ \expandafter\bxju@conv@ucs@to@jsc@b
+ \number\fontdimen\numexpr(#1+480)/64\bxju@ul@tojis:#1\bxju@mk
+ }{\bxju@conv@ucs@to@jsc@a0\bxju@mk}}
+\def\bxju@conv@ucs@to@jsc@b#1:#2\bxju@mk{%
+ \expandafter\bxju@conv@ucs@to@jsc@c
+ \number\fontdimen\numexpr#2+1088-#1\bxju@ul@tojis\bxju@mk}
+\def\bxju@conv@ucs@to@jsc@c#1\bxju@mk#2{#2{#1}}
+
+%% \bxju@ucs@to@jis{<ucs>}
+\def\bxju@ucs@to@jis#1{%
+ \bxju@check@number{#1}\bxju@ucs@to@jiseuc{8481}}
+\def\bxju@ucs@to@jiseuc#1{%
+ \bxju@conv@ucs@to@jsc{#1}\bxju@ucs@to@jiseuc@a}
+\def\bxju@ucs@to@jiseuc@a#1{%
+ \bxju@cond\ifnum#1=9999 \fi{\ltx@firstoftwo{0}}{%else
+ \bxju@decomp@int{#1}\bxju@ucs@to@jiseuc@b}}
+\def\bxju@ucs@to@jiseuc@b#1#2#3{%
+ \number\numexpr#1*256+#2+#3\relax}
+
+%% \bxju@ucs@to@euc{<ucs>}
+\def\bxju@ucs@to@euc#1{%
+ \bxju@check@number{#1}\bxju@ucs@to@jiseuc{41377}}
+
+%% \bxju@ucs@to@sjis{<ucs>}
+\def\bxju@ucs@to@sjis#1{%
+ \bxju@check@number{#1}\bxju@ucs@to@sjis@a}
+\def\bxju@ucs@to@sjis@a#1{%
+ \bxju@conv@ucs@to@jsc{#1}\bxju@ucs@to@sjis@b}
+\def\bxju@ucs@to@sjis@b#1{%
+ \bxju@cond\ifnum#1=9999 \fi{0}{%else
+ \bxju@decomp@int{#1}\bxju@ucs@to@sjis@c}}
+\def\bxju@ucs@to@sjis@c#1#2{%
+ \number\numexpr#1*128+#2 %
+ \ifodd#1 -33 \else\ifnum#2>62 +1 \fi\fi
+ \ifnum#1<62 +33088 \else +49472 \fi\relax}
+
+%% \bxju@fast@ucs@to@jsc{<ucs>}
+\def\bxju@fast@ucs@to@jsc#1{%
+ \bxju@conv@ucs@to@jsc{#1}\bxju@fast@ucs@to@jsc@a}
+\def\bxju@fast@ucs@to@jsc@a#1{%
+ \bxju@cond\ifnum#1=9999 \fi{-1}{#1}}
+
%--------------------------------------- all done
\let\bxju@next\@undefined
\let\bxju@ifdefinable\@undefined
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
index 0595b52b4ec..fb1b96a2ebd 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsarticle}
- [2024/01/22 v2.9b BXJS document classes]
+ [2024/07/19 v2.9c BXJS document classes]
%% ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ—¥æœ¬èªžæ–‡å­—ã‚’å«ã¿ã¾ã™.
\def\bxjs@clsname{bxjsarticle}
\newif\ifjsc@needsp@tch
@@ -1431,6 +1431,12 @@
\let\sectionmark\@gobble
\let\subsectionmark\@gobble
}
+\let\bxjs@phantomsection\relax
+\g@addto@macro\bxjs@begin@document@hook{%
+ \@ifpackageloaded{hyperref}{%
+ \let\bxjs@phantomsection\phantomsection
+ }{}%
+}
\newcommand*{\jsSubtitle}[1]{\gdef\bxjs@subtitle{#1}}
\renewcommand*{\title}[1]{\bxjs@decl@subtitle\gdef\@title{#1}}
\g@addto@macro\bxjs@begin@document@hook{\bxjs@decl@subtitle}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
index ed06d493e4e..a107f3a6f74 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsbook}
- [2024/01/22 v2.9b BXJS document classes]
+ [2024/07/19 v2.9c BXJS document classes]
%% ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ—¥æœ¬èªžæ–‡å­—ã‚’å«ã¿ã¾ã™.
\def\bxjs@clsname{bxjsbook}
\newif\ifjsc@needsp@tch
@@ -1467,6 +1467,12 @@
\let\chaptermark\@gobble
\let\sectionmark\@gobble
}
+\let\bxjs@phantomsection\relax
+\g@addto@macro\bxjs@begin@document@hook{%
+ \@ifpackageloaded{hyperref}{%
+ \let\bxjs@phantomsection\phantomsection
+ }{}%
+}
\newcommand*{\jsSubtitle}[1]{\gdef\bxjs@subtitle{#1}}
\renewcommand*{\title}[1]{\bxjs@decl@subtitle\gdef\@title{#1}}
\g@addto@macro\bxjs@begin@document@hook{\bxjs@decl@subtitle}
@@ -2302,8 +2308,9 @@
\fi
\columnseprule.4pt \columnsep 2\jsZw
\ifx\multicols\@undefined
- \twocolumn[\@makeschapterhead{\indexname}%
- \addcontentsline{toc}{chapter}{\indexname}]%
+ \twocolumn[\bxjs@phantomsection
+ \addcontentsline{toc}{chapter}{\indexname}%
+ \@makeschapterhead{\indexname}]%
\else
\ifdim\textwidth<\fullwidth
\setlength{\evensidemargin}{\oddsidemargin}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
index ba235ec3ba8..d5c4e72f6ae 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bxjscjkcat}
- [2024/01/22 v2.9b BXJS document classes]
+ [2024/07/19 v2.9c BXJS document classes]
\def\bxjx@pkgname{bxjscjkcat}
\newcount\bxjx@cnta
\@onlypreamble\bxjx@tmpdo
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
index a621868b9d0..b6ca0c76d8b 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bxjscompat}
- [2024/01/22 v2.9b BXJS document classes]
+ [2024/07/19 v2.9c BXJS document classes]
\def\bxac@pkgname{bxjscompat}
\let\bxac@engine=n
\def\bxac@do#1#2{%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def
index 44e1b044b0c..7ff3ed48a3f 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-minimal.def}
- [2024/01/22 v2.9b BXJS document classes]
+ [2024/07/19 v2.9c BXJS document classes]
%% ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ—¥æœ¬èªžæ–‡å­—ã‚’å«ã¿ã¾ã™
\let\bxjs@tmpa\relax
\ifx J\jsEngine \def\bxjs@tmpa{NTT-jTeX}\fi
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
index 799fd1e7cdf..adf5d66c4b2 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-modern.def}
- [2024/01/22 v2.9b BXJS document classes]
+ [2024/07/19 v2.9c BXJS document classes]
\input{bxjsja-standard.def}
\ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi=\z@
\def\encodingdefault{T1}%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
index c4f3bf7a64f..bd595cff6e1 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-pandoc.def}
- [2024/01/22 v2.9b BXJS document classes]
+ [2024/07/19 v2.9c BXJS document classes]
\if x\jsEngine
\PassOptionsToPackage{nospace}{xeCJK}
\fi
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
index b8862a44301..bc05f69e940 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-standard.def}
- [2024/01/22 v2.9b BXJS document classes]
+ [2024/07/19 v2.9c BXJS document classes]
%% ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ—¥æœ¬èªžæ–‡å­—ã‚’å«ã¿ã¾ã™
\input{bxjsja-minimal.def}
\bxjs@simplejasetupfalse
@@ -240,6 +240,14 @@
\DeclareHookRule{shipout/firstpage}{pxjahyper/enc}{<}{hyperref}%
\global\let\bxjs@urgent@special@a\relax}
\fi
+\@onlypreamble\bxjs@patch@RDMA@for@bm
+\def\bxjs@patch@RDMA@for@bm{%
+ \let\bxjs@org@DualLang@mathalph@bet\DualLang@mathalph@bet
+ \def\DualLang@mathalph@bet{%
+ \ifx\bm\@firstofone \expandafter\@firstoftwo
+ \else \expandafter\bxjs@org@DualLang@mathalph@bet
+ \fi}%
+}
\if j\jsEngine
\newcommand*{\setkanjiskip}{\jsSetKanjiSkip}
\newcommand*{\getkanjiskip}{\jsGetKanjiSkip}
@@ -386,11 +394,10 @@
\DeclareMathAlphabet{\mathgt}{\jsc@JYn}{gt}{m}{n}
\g@addto@macro\bxjs@begin@document@hook{%
\ifx\reDeclareMathAlphabet\@undefined\else
- \@ifpackageloaded{bm}{}{%else
+ \@ifpackageloaded{bm}{\bxjs@patch@RDMA@for@bm}{}%
\reDeclareMathAlphabet{\mathrm}{\@mathrm}{\@mathmc}%
\reDeclareMathAlphabet{\mathbf}{\@mathbf}{\@mathgt}%
\reDeclareMathAlphabet{\mathsf}{\@mathsf}{\@mathgt}%
- }%
\fi}
\fi
\else\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T
@@ -606,6 +613,7 @@
\@ltj@match@familytrue
\fi
\g@addto@macro\bxjs@begin@document@hook{%
+ \@ifpackageloaded{bm}{\bxjs@patch@RDMA@for@bm}{}%
\reDeclareMathAlphabet{\mathrm}{\mathrm}{\mathmc}%
\reDeclareMathAlphabet{\mathbf}{\mathbf}{\mathgt}%
\reDeclareMathAlphabet{\mathsf}{\mathsf}{\mathgt}}%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
index 04a51b3ed3d..09990c0acaa 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bxjspandoc}
- [2024/01/22 v2.9b BXJS document classes]
+ [2024/07/19 v2.9c BXJS document classes]
%% ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ—¥æœ¬èªžæ–‡å­—ã‚’å«ã¿ã¾ã™.
\def\bxjsp@pkgname{bxjspandoc}
\let\bxjsp@engine=n
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
index b3c7753c1d3..51568cfaa5c 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsreport}
- [2024/01/22 v2.9b BXJS document classes]
+ [2024/07/19 v2.9c BXJS document classes]
%% ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ—¥æœ¬èªžæ–‡å­—ã‚’å«ã¿ã¾ã™.
\def\bxjs@clsname{bxjsreport}
\newif\ifjsc@needsp@tch
@@ -1441,6 +1441,12 @@
\let\chaptermark\@gobble
\let\sectionmark\@gobble
}
+\let\bxjs@phantomsection\relax
+\g@addto@macro\bxjs@begin@document@hook{%
+ \@ifpackageloaded{hyperref}{%
+ \let\bxjs@phantomsection\phantomsection
+ }{}%
+}
\newcommand*{\jsSubtitle}[1]{\gdef\bxjs@subtitle{#1}}
\renewcommand*{\title}[1]{\bxjs@decl@subtitle\gdef\@title{#1}}
\g@addto@macro\bxjs@begin@document@hook{\bxjs@decl@subtitle}
@@ -2324,8 +2330,9 @@
\fi
\columnseprule.4pt \columnsep 2\jsZw
\ifx\multicols\@undefined
- \twocolumn[\@makeschapterhead{\indexname}%
- \addcontentsline{toc}{chapter}{\indexname}]%
+ \twocolumn[\bxjs@phantomsection
+ \addcontentsline{toc}{chapter}{\indexname}%
+ \@makeschapterhead{\indexname}]%
\else
\ifdim\textwidth<\fullwidth
\setlength{\evensidemargin}{\oddsidemargin}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
index d4b76d37c83..95ff31ff333 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsslide}
- [2024/01/22 v2.9b BXJS document classes]
+ [2024/07/19 v2.9c BXJS document classes]
%% ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯æ—¥æœ¬èªžæ–‡å­—ã‚’å«ã¿ã¾ã™.
\def\bxjs@clsname{bxjsslide}
\newif\ifjsc@needsp@tch
@@ -1429,6 +1429,12 @@
\let\sectionmark\@gobble
\let\subsectionmark\@gobble
}
+\let\bxjs@phantomsection\relax
+\g@addto@macro\bxjs@begin@document@hook{%
+ \@ifpackageloaded{hyperref}{%
+ \let\bxjs@phantomsection\phantomsection
+ }{}%
+}
\newcommand*{\jsSubtitle}[1]{\gdef\bxjs@subtitle{#1}}
\renewcommand*{\title}[1]{\bxjs@decl@subtitle\gdef\@title{#1}}
\g@addto@macro\bxjs@begin@document@hook{\bxjs@decl@subtitle}
diff --git a/Master/texmf-dist/tex/latex/bxpdfver/bxpdfver.sty b/Master/texmf-dist/tex/latex/bxpdfver/bxpdfver.sty
index ccc9825f6fb..296774068c6 100644
--- a/Master/texmf-dist/tex/latex/bxpdfver/bxpdfver.sty
+++ b/Master/texmf-dist/tex/latex/bxpdfver/bxpdfver.sty
@@ -1,7 +1,7 @@
%%
%% This is file 'bxpdfver.sty'.
%%
-%% Copyright (c) 2014-2022 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2014-2024 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,12 +10,8 @@
%% package declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bxpdfver}[2022/04/28 v0.6]
+\ProvidesPackage{bxpdfver}[2024/08/03 v0.8]
\def\bxpv@pkgname{bxpdfver}
-
-%% preparations
-\RequirePackage{ifthen}[]% for \newboolean
-\newif\ifbxpv@ok
\providecommand\bxDebug[1]{}
%--------------------------------------- package options
@@ -124,13 +120,23 @@
\fi
\fi
-%--------------------------------------- helpers
+%--------------------------------------- general
+
+%% packages
+\RequirePackage{ifthen}[]% for \newboolean
+
+%% variables
+\newif\ifbxpv@ok
%% unique tokens
\def\bxpv@end{\bxpv@end@}
\def\bxpv@mt{\bxpv@mt@}
\let\bxpv@mk\noindent
+%% \ifbxpv@read@file@ok
+% Whether or not the last \bxpv@read@file succeeded.
+\newif\ifbxpv@read@file@ok
+
%% \bxpv@csletcs
\def\bxpv@csletcs#1#2{%
\expandafter\let\csname#1\expandafter\endcsname\csname#2\endcsname
@@ -144,6 +150,13 @@
\def#3{#2}%
}
+%% \bxpv@info{<message>}
+% Issues an info message.
+\@onlypreamble\bxpv@info
+\def\bxpv@info#1{%
+ \PackageInfo\bxpv@pkgname{#1\@gobble}%
+}
+
%% \bxpv@warn{<message>}
% Issues a warning.
\@onlypreamble\bxpv@warn
@@ -175,17 +188,61 @@
}
%% \ifbxpv@defined
-\let\ifbxpv@defined\ifdefined
-\ifx\ifbxpv@defined\@undefined \expandafter\@firstofone
-\else \expandafter\@gobble
-\fi{\let\ifbxpv@defined\iffalse}
+% Identical to \ifdefined, and is used only in e-TeX-aware code.
+% On non-e-TeX engines it is made \iffalse to keep \if-balancedness.
+\bxpv@csletcs{ifbxpv@defined}{%
+ if\ifx\ifdefined\@undefined false\else defined\fi}
+
+%% \bxpv@begin@document@hook
+% The begin-document hook.
+\@onlypreamble\bxpv@begin@document@hook
+\let\bxpv@begin@document@hook\@empty
+\AtBeginDocument{\bxpv@begin@document@hook}
+
+%--------------------------------------- environment check
%% \ifbxpv@old@hook@system
\newif\ifbxpv@old@hook@system
\@ifl@t@r\fmtversion{2020/10/01}{}{\bxpv@old@hook@systemtrue}
+%% \ifbxpv@pdfmanagement@ok
+% Whether this package is supporting the LaTeX PDF management
+% of the current kernel.
+% (If the PDF management is active but this switch is off,
+% then this package will switch to no-op mode.)
+\newif\ifbxpv@pdfmanagement@ok
+
+%% check for new PDF management
+\if t\bxpv@ignore@pdfmanagement\else
+ \ifx\IfPDFManagementActiveTF\@undefined\else
+ \IfPDFManagementActiveTF{%
+ \let\bxpv@drv@type=m%
+ \def\bxpv@drv@name{latex-pdf}%
+ \@ifl@t@r\fmtversion{2022/06/01}{%
+ \bxpv@pdfmanagement@oktrue
+ }{}
+ }{}
+ \fi
+\fi
+\ifx m\bxpv@drv@type
+ \ifbxpv@pdfmanagement@ok
+ \bxpv@warn
+ {New PDF management is active.\MessageBreak
+ The driver is set to '\bxpv@drv@name'}%
+ % Here \ExplSyntaxOn should be available.
+ \else
+ \bxpv@warn
+ {New PDF management is active, but\MessageBreak
+ the kernel is too old (before 2022/06/01).\MessageBreak
+ Thus this package will not work}%
+ \fi
+\fi
+
%--------------------------------------- internal dispatchers
+% Initially all dispatchers are "unavailable".
+% They are later redefined according to the driver type.
+
%% \bxpv@suppress@compress
\@onlypreamble\bxpv@suppress@compress
\def\bxpv@suppress@compress{%
@@ -224,25 +281,11 @@
\@onlypreamble\bxpv@cancel@obj@compress
\let\bxpv@cancel@obj@compress\relax
-%% \bxpv@begin@document@hook
-% The begin-document hook.
-\@onlypreamble\bxpv@begin@document@hook
-\let\bxpv@begin@document@hook\@empty
-\AtBeginDocument{\bxpv@begin@document@hook}
\g@addto@macro\bxpv@begin@document@hook{%
\bxpv@check@hyperref % must come first
}
-%% check for new PDF management
-\if t\bxpv@ignore@pdfmanagement\else
- \ifx\IfPDFManagementActiveTF\@undefined\else
- \IfPDFManagementActiveTF{%
- \global\let\bxpv@drv@type=m%
- }{}
- \fi
-\fi
-
-%% adjust internal dispatchers
+%% Redefine internal dispatchers.
\ifx 0\bxpv@drv@type\else %--------
\begingroup
@@ -264,9 +307,31 @@
%% switch
\if m\bxpv@drv@type
- %% when in new PDF management
- \bxpv@warn
- {New PDF management is active}%
+ \ifbxpv@pdfmanagement@ok
+ % Here all l3pdf function is assumed to be available.
+ \gdef\bxpv@check@version{\bxpv@oktrue}
+ \ExplSyntaxOn %!!!!!!
+ \tl_new:N \g__bxpv_org_version
+ \exp_args:NNe \tl_gset:Nn \g__bxpv_org_version { \pdf_version: }
+ \cs_gset:Npn \bxpv@set@version
+ {
+ \token_if_eq_meaning:NNTF \bxpdfverMinorVersion \relax
+ { \pdf_version_gset:n { \g__bxpv_org_version } }
+ {
+ \pdf_version_gset:n
+ {
+ \int_use:N \bxpdfverMajorVersion
+ . \int_use:N \bxpdfverMinorVersion
+ }
+ }
+ }
+ % \pdf_uncompress: does both.
+ \cs_gset:Npn \bxpv@suppress@compress
+ { \pdf_uncompress: }
+ \cs_gset:Npn \bxpv@suppress@obj@compress
+ { \pdf_uncompress: }
+ \ExplSyntaxOff %!!!!!!
+ \fi
\else\ifnum\bxpv@pdfoutput>\z@
%% when in PDF mode
\global\let\bxpv@drv@type=p
@@ -386,12 +451,14 @@
\bxpv@warn
{Unsupported engine}%
\else\if d\bxpv@drv@type % 'dvipdfmx'
+ % All the real settings are done in the begin-document hook,
+ % so the dispatchers themselves will do nothing (if available).
\global\let\bxpv@suppress@compress\relax
\global\let\bxpv@suppress@obj@compress\relax
\global\let\bxpv@check@version\relax
\global\let\bxpv@set@version\relax
\global\let\bxpv@set@decimaldigits\relax
- %\global\let\bxpv@set@pkresolution\relax
+ \global\let\bxpv@set@pkresolution\relax
\global\let\bxpv@preserve@destinations\relax
\g@addto@macro\bxpv@begin@document@hook{%
\bxpv@begin@document@dvipdfmx
@@ -671,6 +738,7 @@
\fi
%% variables
+\let\bxpv@dvipdfmx@known@min\relax % minimum known dviodfmx version
\let\bxpv@C@value\relax
%% \bxpv@C@bits
@@ -689,6 +757,7 @@
%% \bxpv@begin@document@dvipdfmx
\@onlypreamble\bxpv@begin@document@dvipdfmx
\def\bxpv@begin@document@dvipdfmx{%
+ \bxpv@get@dvipdfmx@known@min
% PDF version
\ifx\bxpdfverMajorVersion\tw@
\bxpv@check@dvipdfmx@version{20180217}%
@@ -701,8 +770,8 @@
\bxpv@put@special{pdf:minorversion \the\bxpdfverMinorVersion}%
\fi
\ifx\bxpdfverMinorVersion\relax\else
- \bxpv@cache@fetch{dvipdfmxver}%
- \ifnum\bxpv@cache@@dvipdfmxver<20180217 \else
+ \bxpv@at@least@dvipdfmx@version{20180217}%
+ \ifbxpv@ok
\bxpv@put@special{pdf:majorversion \the\bxpdfverMajorVersion}%
\fi
\fi
@@ -734,7 +803,9 @@
\fi
% PK resolution
\ifx\bxpdfverPkResolution\relax\else
- \iffalse % This will never work....
+ \bxpv@check@dvipdfmx@version{20211016}%
+ {Cannot set PK resolution}%
+ \ifbxpv@ok
\bxpv@put@special{dvipdfmx:config r \the\bxpdfverPkResolution}%
\fi
\fi
@@ -748,10 +819,9 @@
\fi
% C option value
\ifx\bxpv@C@bits\@empty\else
- \bxpv@cache@fetch{dvipdfmxcfg}%
- \def\bxpv@next##1##2\bxpv@mk{\def\bxpv@C@value{##1}}%
- \expandafter\bxpv@next\bxpv@cache@@dvipdfmxcfg{0}\bxpv@mk
- \bxpv@rc@bitset{\bxpv@C@value}{64}%
+ % When C option is used, its value is automatically OR'ed with
+ % the current value, so we need not read the config for that.
+ \def\bxpv@C@value{0}%
\def\do##1{%
\bxpv@rc@bitset{\bxpv@C@value}{##1}%
\let\bxpv@C@value\bxpv@rc@num}%
@@ -776,25 +846,67 @@
\fi
}
+%% \bxpv@get@dvipdfmx@known@min
+% Gathers the information and sets \bxpv@dvipdfmx@known@min,
+% without actually spawning extractbb.
+% (Called in the begin-document hook.)
+\@onlypreamble\bxpv@get@dvipdfmx@known@min
+\def\bxpv@get@dvipdfmx@known@min{%
+ % initially no information
+ \def\bxpv@dvipdfmx@known@min{0}%
+ % l3backend-dvipdfmx of revision 2022-04-10 or later requires
+ % dvipdfmx of version 20201111 or later.
+ \def\bxpv@tmpa{def}%
+ \let\bxpv@tmpb\@gobbletwo
+ \@ifl@aded\bxpv@tmpa{l3backend-dvipdfmx}{%
+ \def\bxpv@tmpb{\@ifl@ter\bxpv@tmpa{l3backend-dvipdfmx}}%
+ }{}%
+ % Just in case....
+ \@ifl@aded\bxpv@tmpa{l3backend-dvips}{%
+ \def\bxpv@tmpb{\@ifl@ter\bxpv@tmpa{l3backend-dvips}}%
+ }{}%
+ \bxpv@tmpb{2022/04/10}{%
+ % Now the version is known to be 20201111 or later.
+ % This information can save much need for spawning extractbb.
+ \def\bxpv@dvipdfmx@known@min{20201111}%
+ }{}%
+ \bxDebug{dvipdfmx-known-min:\bxpv@dvipdfmx@known@min}%
+}
+
+%% \bxpv@at@least@dvipdfmx@version{<version>}
+% Checks if dvipdfmx >= <version> and sets bxpv@ok.
+\@onlypreamble\bxpv@at@least@dvipdfmx@version
+\def\bxpv@at@least@dvipdfmx@version#1{%
+ % first check using known-min
+ \ifnum\bxpv@dvipdfmx@known@min<#1
+ % get real version
+ \bxpv@cache@fetch{dvipdfmxver}%
+ \bxpv@info
+ {dvipdfmx version is \bxpv@cache@@dvipdfmxver}%
+ \bxpv@oktrue
+ \ifnum\bxpv@cache@@dvipdfmxver<#1
+ \bxpv@okfalse
+ \fi
+ \else % new enough
+ \bxpv@oktrue
+ \fi
+}
+
%% \bxpv@check@dvipdfmx@version
\@onlypreamble\bxpv@check@dvipdfmx@version
\def\bxpv@check@dvipdfmx@version#1#2{%
- \bxpv@cache@fetch{dvipdfmxver}%
- \bxpv@okfalse
- \ifnum\bxpv@cache@@dvipdfmxver=\z@
+ \bxpv@at@least@dvipdfmx@version{#1}%
+ \ifbxpv@ok % no-op
+ \else\ifnum\bxpv@cache@@dvipdfmxver=\z@
\bxpv@fail
{#2, because the\MessageBreak
version of dvipdfmx in use is unknown
\MessageBreak (v.#1 or later is required)}%
- \else\ifnum\bxpv@cache@@dvipdfmxver<#1
+ \else
\bxpv@fail
{#2, because the\MessageBreak
version of dvipdfmx in use (v.\bxpv@cache@@dvipdfmxver) is too old
\MessageBreak (v.#1 or later is required)}%
- \else
- \PackageInfo\bxpv@pkgname
- {dvipdfmx version is \bxpv@cache@@dvipdfmxver\@gobble}%
- \bxpv@oktrue
\fi\fi
}
@@ -950,10 +1062,6 @@
\let\bxpv@rf@line\relax % line content
\let\bxpv@rf@cont\relax % continue to read?
-%% \ifbxpv@read@file@ok
-% Whether or not the last \bxpv@read@file succeeded.
-\newboolean{bxpv@read@file@ok}
-
%% \bxpv@read@file{<file-name>}{<line-parser-code>}
% Reads from a text file. The line parser takes as #1 the
% content of each line.
diff --git a/Master/texmf-dist/tex/latex/changebar/changebar.sty b/Master/texmf-dist/tex/latex/changebar/changebar.sty
index 2de6b8218f0..c3da9e8eca8 100644
--- a/Master/texmf-dist/tex/latex/changebar/changebar.sty
+++ b/Master/texmf-dist/tex/latex/changebar/changebar.sty
@@ -37,7 +37,7 @@
%% Copyright 1994-2024 (C) Johannes Braams. All rights reserved.
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{changebar}
- [2024/01/09 v3.7d Indicate changes with marginal bars]
+ [2024/07/17 v3.7e Indicate changes with marginal bars]
\def\cb@maxpoint{80}
\def\cb@minpoint{1}
\def\cb@nil{0}
@@ -111,7 +111,7 @@
\immediate\openout\cb@writexy=\jobname.cb2\relax
\fi
\gdef\cb@pdfxy##1##2##3##4##5{%
- \immediate\write\cb@writexy{##1.##2p##3;##4;##5}%
+ \immediate\write\cb@writexy{##1.##2p##3/##4/##5}%
\expandafter\gdef\csname cb@##1.##2\endcsname{##3,##4,##5}}
\else\cb@pdftexerror\fi\fi\fi}
\def\cb@pdftexerror{\PackageError
@@ -131,7 +131,7 @@
\immediate\openout\cb@writexy=\jobname.cb2\relax
\fi
\gdef\cb@pdfxy##1##2##3##4##5{%
- \immediate\write\cb@writexy{##1.##2p##3;##4;##5}%
+ \immediate\write\cb@writexy{##1.##2p##3/##4/##5}%
\expandafter\gdef\csname cb@##1.##2\endcsname{##3,##4,##5}}
\gdef\sec@nd@ftw@##1 ##2{##2}
\fi}
@@ -151,7 +151,7 @@
\immediate\openout\cb@writexy=\jobname.cb2\relax
\fi
\gdef\cb@pdfxy##1##2##3##4##5{%
- \immediate\write\cb@writexy{##1.##2p##3;##4;##5}%
+ \immediate\write\cb@writexy{##1.##2p##3/##4/##5}%
\expandafter\gdef\csname cb@##1.##2\endcsname{##3,##4,##5}}
\fi}
\def\cb@luatexerror{\PackageError
@@ -384,9 +384,9 @@
\fi
\fi
}
- \def\cb@pdffind##1##2##3.##4p##5;##6;##7pt##8\relax##9{%
+ \def\cb@pdffind##1##2##3.##4p##5/##6/##7pt##8\relax##9{%
\def\cb@next{%
- \cb@pdffind{##1}{##2}##8\relax{##9##3.##4p##5;##6;##7pt}}%
+ \cb@pdffind{##1}{##2}##8\relax{##9##3.##4p##5/##6/##7pt}}%
\ifnum ##1=##3
\ifnum ##2=##4
\def\cb@pdfx{##5sp}%
@@ -422,7 +422,7 @@
\fi
\cb@next
}%
- \def\cb@pdfparsexy##1.##2p##3;##4;##5pt{%
+ \def\cb@pdfparsexy##1.##2p##3/##4/##5pt{%
\def\cb@pdfpg{##2}}%
\def\cb@defpoint##1##2{%
\if@filesw
@@ -443,7 +443,7 @@
\ifnum##1>99 1\else
\ifnum##1<10 0.0\the##1\else
0.\the##1\fi\fi\fi}
-\def\cb@pdf@scale{0.996264009963}
+ \def\cb@pdf@scale{0.996264009963}
\def\cb@connect##1##2##3{%
\cb@findpdfpoint{##1}\cb@pagecount
\ifx\cb@pdfx\relax\cb@rerun
@@ -524,9 +524,9 @@
\fi
\fi
}
- \def\cb@pdffind##1##2##3.##4p##5;##6;##7pt##8\relax##9{%
+ \def\cb@pdffind##1##2##3.##4p##5/##6/##7pt##8\relax##9{%
\def\cb@next{%
- \cb@pdffind{##1}{##2}##8\relax{##9##3.##4p##5;##6;##7pt}}%
+ \cb@pdffind{##1}{##2}##8\relax{##9##3.##4p##5/##6/##7pt}}%
\ifnum ##1=##3
\ifnum ##2=##4
\def\cb@pdfx{##5sp}%
@@ -562,7 +562,7 @@
\fi
\cb@next
}%
- \def\cb@pdfparsexy##1.##2p##3;##4;##5pt{%
+ \def\cb@pdfparsexy##1.##2p##3/##4/##5pt{%
\def\cb@pdfpg{##2}}%
\def\cb@defpoint##1##2{%
\if@filesw
@@ -583,7 +583,7 @@
\ifnum##1>99 1\else
\ifnum##1<10 0.0\the##1\else
0.\the##1\fi\fi\fi}
-\def\cb@pdf@scale{0.996264009963}
+ \def\cb@pdf@scale{0.996264009963}
\def\cb@connect##1##2##3{%
\cb@findpdfpoint{##1}\cb@pagecount
\ifx\cb@pdfx\relax\cb@rerun
@@ -665,9 +665,9 @@
\fi
\fi
}
- \def\cb@pdffind##1##2##3.##4p##5;##6;##7pt##8\relax##9{%
+ \def\cb@pdffind##1##2##3.##4p##5/##6/##7pt##8\relax##9{%
\def\cb@next{%
- \cb@pdffind{##1}{##2}##8\relax{##9##3.##4p##5;##6;##7pt}}%
+ \cb@pdffind{##1}{##2}##8\relax{##9##3.##4p##5/##6/##7pt}}%
\ifnum ##1=##3
\ifnum ##2=##4
\def\cb@pdfx{##5sp}%
@@ -703,7 +703,7 @@
\fi
\cb@next
}%
- \def\cb@pdfparsexy##1.##2p##3;##4;##5pt{%
+ \def\cb@pdfparsexy##1.##2p##3/##4/##5pt{%
\def\cb@pdfpg{##2}}%
\def\cb@defpoint##1##2{%
\if@filesw
@@ -724,7 +724,7 @@
\ifnum##1>99 1\else
\ifnum##1<10 0.0\the##1\else
0.\the##1\fi\fi\fi}
-\def\cb@pdf@scale{0.996264009963}
+ \def\cb@pdf@scale{0.996264009963}
\def\cb@connect##1##2##3{%
\cb@findpdfpoint{##1}\cb@pagecount
\ifx\cb@pdfx\relax\cb@rerun
@@ -802,7 +802,7 @@
\newcommand*{\nochangebars}{%
\def\cb@start[##1]{\ignorespaces}%
\def\cb@delete[##1]{}%
- \def\cb@end{\ignorespacesafterend}
+ \def\cb@end{\ignorespacesafterend}%
}
\newlength{\changebarwidth}
\setlength{\changebarwidth}{2pt}
diff --git a/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty b/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty
index afa91d4b2b1..4f5ce00a0fc 100644
--- a/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty
+++ b/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty
@@ -16,8 +16,8 @@
\providecommand\DeclareRelease[3]{}
\providecommand\DeclareCurrentRelease[2]{}
-\def\pgfcircversion{1.6.9}
-\def\pgfcircversiondate{2024/05/25}
+\def\pgfcircversion{1.7.0}
+\def\pgfcircversiondate{2024/08/03}
\DeclareRelease{0.4}{2012/12/20}{circuitikz-0.4-body.tex}
\DeclareRelease{v0.4}{2012/12/20}{circuitikz-0.4-body.tex}
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-bib.sty b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-bib.sty
index 19619e1f5b1..2a2af3a7d2b 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-bib.sty
+++ b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-bib.sty
@@ -34,7 +34,7 @@
\__csl_collect_bibliography:n
{
\lua_now:e
- { csl.bibliography("\l__csl_bib_filter_tl") }
+ { csl_citation_manager:bibliography("\l__csl_bib_filter_tl") }
}
}
}
@@ -53,11 +53,11 @@
}
\tl_use:N \l__csl_bibliography_tl
}
- { \msg_warning:nn { citation-style-language } { bibliography / empty } }
+ { \msg_warning:nn { citation-style-language } { empty-bibliography } }
\group_end:
}
-\msg_new:nnn { citation-style-language } { bibliography / empty }
+\msg_new:nnn { citation-style-language } { empty-bibliography }
{ The~ bibliography~ is~ empty. }
\DeclareDocumentCommand \bibliography { m }
@@ -108,11 +108,16 @@
\cs_new:Npn \__csl_write_aux_bibliography:n #1
{
\if@filesw
- \iow_now:Nn \@auxout { \csl@aux@bibliography {#1} }
+ \iow_now:Nx \@auxout
+ {
+ \token_to_str:N \csl@aux@bibliography
+ { \int_use:N \g__csl_ref_section_index_int }
+ {#1}
+ }
\fi
}
-\cs_new:Npn \csl@aux@bibliography #1 { }
+\cs_new:Npn \csl@aux@bibliography #1#2 { }
\tl_new:N \l__csl_bib_index_tl
@@ -182,7 +187,7 @@
}
{
\tl_set:Nn \@noitemerr
- { \msg_warning:nn { citation-style-language } { bibliography / empty } }
+ { \msg_warning:nn { citation-style-language } { empty-bibliography } }
\endlist
\group_end:
\exp_args:NV \__csl_print_bib_note:n \l__csl_bib_post_note_tl
@@ -355,6 +360,96 @@
}
+% ### Bibliography sections and segments
+
+
+\int_new:N \g__csl_ref_section_index_int
+\int_new:N \g__csl_max_ref_section_index_int
+\int_gset:Nn \g__csl_ref_section_index_int { 0 }
+\int_gset:Nn \g__csl_max_ref_section_index_int { 0 }
+
+\keys_define:nn { csl / ref-section }
+ {
+ style .code:n =
+ {
+ \tl_set:Nn \l__csl_style_tl {#1}
+ \renewcommand \csl@style {#1}
+ } ,
+ bib-resource .clist_set:N = \l__csl_bib_resources_clist ,
+ locale .tl_set:N = \l__csl_locale_tl ,
+ }
+
+\NewDocumentCommand \refsection { O { } }
+ {
+ \int_gincr:N \g__csl_max_ref_section_index_int
+ \int_gset_eq:NN \g__csl_ref_section_index_int \g__csl_max_ref_section_index_int
+
+ \tl_clear:N \l__csl_style_tl
+ \clist_clear:N \l__csl_bib_resources_clist
+ \tl_clear:N \l__csl_locale_tl
+ \keys_set:nn { csl / ref-section } { #1 }
+ \tl_if_empty:NTF \l__csl_style_tl
+ {
+ \tl_set_eq:NN \l__csl_style_tl \g__csl_global_style_tl
+ \tl_set_eq:NN \csl@style \l__csl_style_tl
+ }
+ {
+ \tl_set_eq:NN \csl@style \l__csl_style_tl
+ \exp_args:NV \__csl_write_aux_bibstyle:n \l__csl_style_tl
+ }
+ \clist_if_empty:NF \l__csl_bib_resources_clist
+ % { \clist_set_eq:NN \l__csl_bib_resources_clist \g__csl_global_bib_resources_clist }
+ {
+ \exp_args:Nx \__csl_write_aux_bibdata:n
+ { \clist_use:Nn \l__csl_bib_resources_clist { , } }
+ }
+ \tl_if_empty:NTF \l__csl_locale_tl
+ { \tl_set_eq:NN \l__csl_locale_tl \g__csl_global_locale_tl }
+ {
+ \exp_args:Nx \__csl_write_aux_options:n
+ { locale = \l__csl_locale_tl }
+ }
+ \sys_if_engine_luatex:TF
+ {
+ \lua_now:e
+ {
+ csl_citation_manager:begin_ref_section(
+ "\l__csl_style_tl",
+ "\clist_use:Nn \l__csl_bib_resources_clist { , }",
+ "\l__csl_locale_tl"
+ )
+ }
+ \str_if_eq:eeTF
+ {
+ \lua_now:n
+ {
+ tex.print(tostring(
+ csl_citation_manager.ref_section.initialized
+ ))
+ }
+ }
+ { true }
+ { \bool_set_true:N \l__csl_engine_initialized_bool }
+ { \bool_set_false:N \l__csl_engine_initialized_bool }
+ \__csl_get_style_class_luatex:
+ }
+ {
+ \__csl_get_style_class:
+ }
+ }
+
+\cs_set_eq:NN \newrefsection \refsection
+
+\cs_new:Npn \endrefsection {
+ \int_compare:nNnT { \g__csl_ref_section_index_int } > { 0 }
+ {
+ \int_gzero:N \g__csl_ref_section_index_int
+ \sys_if_engine_luatex:T
+ { \lua_now:n { csl_citation_manager:end_ref_section() } }
+ }
+}
+
+
% ### Bibliography Headings and Environments
\prop_new:N \l__csl_bib_env_begin_prop
@@ -381,7 +476,7 @@
{
\cs_if_exist:cF { __csl_head_ #1 :n }
{
- \msg_error:nnn { citation-style-language } { bib-heading-undefined }
+ \msg_error:nnn { citation-style-language } { undefined-bib-heading }
{#1}
}
\tl_if_blank:nTF {#2}
@@ -393,7 +488,7 @@
{ \exp_args:NV \label \l__csl_bib_head_label_tl }
}
-\msg_new:nnn { citation-style-language } { bib-heading-undefined }
+\msg_new:nnn { citation-style-language } { undefined-bib-heading }
{ Bibliography~ heading~ '#1'~ undefined. }
\keys_define:nn { csl / bib-heading }
@@ -426,6 +521,10 @@
\expandafter \newcommand \csname __csl_head_ #1 :n \endcsname [1] [ {#2} ]
}
+
+\cs_if_exist:NF \refname
+ { \cs_set:Npn \refname { References } }
+
\cs_if_exist:NTF \chapter
{
% `book` or `report`
@@ -437,19 +536,19 @@
\defbibheading { biblist } [ \biblistname ]
{
\chapter* {#1}
- \@mkboth { \MakeMarkcase {#1} } { \MakeMarkcase {#1} }
+ \@mkboth { \MakeUppercase {#1} } { \MakeUppercase {#1} }
}
\defbibheading { bibintoc } [ \bibname ]
{
\chapter* {#1}
\addcontentsline { toc } { chapter } {#1}
- \@mkboth { \MakeMarkcase {#1} } { \MakeMarkcase {#1} }
+ \@mkboth { \MakeUppercase {#1} } { \MakeUppercase {#1} }
}
\defbibheading { biblistintoc } [ \biblistname ]
{
\chapter* {#1}
\addcontentsline { toc } { chapter } {#1}
- \@mkboth { \MakeMarkcase {#1} } { \MakeMarkcase {#1} }
+ \@mkboth { \MakeUppercase {#1} } { \MakeUppercase {#1} }
}
\defbibheading { bibnumbered } [ \bibname ]
{ \chapter {#1} }
@@ -459,7 +558,7 @@
{
\section* {#1}
\if@twoside
- \markright { \MakeMarkcase {#1} }
+ \markright { \MakeUppercase {#1} }
\fi
}
\defbibheading { subbibintoc } [ \refname ]
@@ -467,7 +566,7 @@
\section* {#1}
\addcontentsline { toc } { section } {#1}
\if@twoside
- \markright { \MakeMarkcase {#1} }
+ \markright { \MakeUppercase {#1} }
\fi
}
\defbibheading { subbibnumbered } [ \refname ]
@@ -483,19 +582,19 @@
\defbibheading { biblist } [ \biblistname ]
{
\section* {#1}
- \@mkboth { \MakeMarkcase {#1} } { \MakeMarkcase {#1} }
+ \@mkboth { \MakeUppercase {#1} } { \MakeUppercase {#1} }
}
\defbibheading { bibintoc } [ \refname ]
{
\section* {#1}
\addcontentsline { toc } { section } {#1}
- \@mkboth { \MakeMarkcase {#1} } { \MakeMarkcase {#1} }
+ \@mkboth { \MakeUppercase {#1} } { \MakeUppercase {#1} }
}
\defbibheading { biblistintoc } [ \biblistname ]
{
\section* {#1}
\addcontentsline { toc } { section } {#1}
- \@mkboth { \MakeMarkcase {#1} } { \MakeMarkcase {#1} }
+ \@mkboth { \MakeUppercase {#1} } { \MakeUppercase {#1} }
}
\defbibheading { bibnumbered } [ \refname ]
{ \section {#1} }
@@ -531,7 +630,7 @@
{
\prop_get:NnNF \l__csl_bib_notes_prop {#1} \l_tmpa_tl
{
- \msg_error:nnn { citation-style-language } { bib-note-undefined }
+ \msg_error:nnn { citation-style-language } { undefined-bib-note }
{#1}
}
\tl_if_empty:NF \l_tmp_tl
@@ -547,7 +646,7 @@
}
}
-\msg_new:nnn { citation-style-language } { bib-note-undefined }
+\msg_new:nnn { citation-style-language } { undefined-bib-note }
{ Bibliography~ note~ '#1'~ undefined. }
@@ -593,7 +692,7 @@
\tl_put_right:Nn \l_tmpa_tl { ##1 = {##2} }
}
\sys_if_engine_luatex:T
- { \lua_now:e { csl.set_categories("\l_tmpa_tl") } }
+ { \lua_now:e { csl_citation_manager:set_categories("\l_tmpa_tl") } }
{
\tl_put_left:Nx \l_tmpa_tl { categories = \c_left_brace_str }
\tl_put_right:NV \l_tmpa_tl \c_right_brace_str
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-cite.sty b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-cite.sty
index e7683b5a900..709ef6191e4 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-cite.sty
+++ b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-cite.sty
@@ -246,10 +246,17 @@
\cs_new:Npn \__csl_set_locator:nn #1#2
{
- \prop_put:Nnn \l__csl_cite_item_prop { label } {#1}
- \prop_put:Nnn \l__csl_cite_item_prop { locator } {#2}
+ \tl_if_empty:nTF {#2}
+ { \msg_warning:nnn { citation-style-language } { empty-locator } {#1} }
+ {
+ \prop_put:Nnn \l__csl_cite_item_prop { label } {#1}
+ \prop_put:Nnn \l__csl_cite_item_prop { locator } {#2}
+ }
}
+\msg_new:nnn { citation-style-language } { empty-locator }
+ { Empty~ '#1'~ locator. }
+
\keys_define:nn { csl / cite-item }
{
prefix .prop_put:N = \l__csl_cite_item_prop,
@@ -376,7 +383,7 @@
\__csl_serialize_prop:NN \l__csl_citation_info_prop \l__csl_citation_info_tl
% Write to .aux file
% \tl_show:N \l__csl_citation_info_tl
- \exp_args:NV \__csl_write_aux_citation:n \l__csl_citation_info_tl
+ \exp_args:NVV \__csl_write_aux_citation:nn \g__csl_ref_section_index_int \l__csl_citation_info_tl
\bool_if:NT \l__csl_regression_test_bool
{ \tl_show:N \l__csl_citation_info_tl }
% Print the citation string
@@ -404,7 +411,7 @@
}
\cs_new:Npn \__csl_cite_aux:n #1
- { \lua_now:e { csl.cite("\lua_escape:n {#1}") } }
+ { \lua_now:e { csl_citation_manager:cite("\lua_escape:n {#1}") } }
% #1: seq
% #2: tl
@@ -488,11 +495,12 @@
}
-\cs_new:Npn \__csl_write_aux_citation:n #1
- % #1: citation info "{<citationID>}{{id=ITEM-1},{id=ITEM-2}}{<noteIndex>}"
+\cs_new:Npn \__csl_write_aux_citation:nn #1#2
+ % #1: refsection index (already converted to tl)
+ % #2: citation info "{<citationID>}{{id=ITEM-1},{id=ITEM-2}}{<noteIndex>}"
{
\if@filesw
- \iow_now:Nn \@auxout { \csl@aux@cite {#1} }
+ \iow_now:Nn \@auxout { \csl@aux@cite {#1} {#2} }
\fi
}
@@ -550,8 +558,8 @@
\tl_set:Nn \l__csl_citation_tl { [ \textbf {#1} ] }
}
-% \msg_new:nnn { citation-style-language } { citation / undefined }
-% { Citation~ `#1'~ on~ page~ \thepage \space undefined~ \msg_line_context: . }
+% \msg_new:nnn { citation-style-language } { undefined-citation }
+% { Citation~ '#1'~ on~ page~ \thepage \space undefined~ \msg_line_context: . }
\cs_new:Npn \__csl_warn_citation_undefined:n #1
{
@@ -580,23 +588,23 @@
}
\bool_if:NT \l__csl_regression_test_bool
{ \tl_show:N \l__csl_citation_info_tl }
- \exp_args:NV \__csl_no_cite_write_aux:n \l__csl_citation_info_tl
+ \exp_args:NVV \__csl_no_cite_write_aux:nn \g__csl_ref_section_index_int \l__csl_citation_info_tl
\sys_if_engine_luatex:T
- { \lua_now:n { csl.nocite("#1") } }
+ { \lua_now:n { csl_citation_manager:nocite("#1") } }
\tl_clear:N \l__csl_citation_tl
\bool_if:NT \l__csl_regression_test_bool
{ \tl_show:N \l__csl_citation_tl }
}
-\cs_new:Npn \__csl_no_cite_write_aux:n #1
+\cs_new:Npn \__csl_no_cite_write_aux:nn #1#2
{
\__csl_if_preamble:TF
{
\hook_gput_code:nnn { begindocument } { . }
- { \exp_args:Nx \__csl_write_aux_citation:n { #1 } }
+ { \__csl_write_aux_citation:nn {#1} {#2} }
}
- { \exp_args:Nx \__csl_write_aux_citation:n { #1 } }
+ { \__csl_write_aux_citation:nn {#1} {#2} }
}
@@ -612,10 +620,10 @@
% Used in aux files to register cite items.
% #1: a citation object
-\cs_set:Npn \csl@aux@cite #1
+\cs_set:Npn \csl@aux@cite #1#2
{
\sys_if_engine_luatex:T
- { \lua_now:e { csl.register_citation_info("\lua_escape:n {#1}") } }
+ { \lua_now:e { csl_citation_manager:register_citation_info(#1, "\lua_escape:n {#2}") } }
}
@@ -627,3 +635,10 @@
% #1: cite id
% #2: cite contents
\cs_new:Npn \cslcite #1#2 {#2}
+
+% This command is for use with hyperref.
+% #1: cite id
+\cs_new:Npn \cslundefinedcite #1 {
+ \textbf {#1}
+ \__csl_warn_citation_undefined:n {#1}
+}
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty
index ca44d0e4579..5289be43ee4 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty
+++ b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty
@@ -98,25 +98,33 @@
% ### `hyperref`
\cs_set:Npn \__csl_hyperref_cite_item:nn #1#2
- { \hyper@@link [ cite ] { } { cite. #1 \@extra@b@citeb } { #2 } }
+ {
+ \hyper@@link [ cite ] { }
+ { cite \int_use:N \g__csl_ref_section_index_int . #1 \@extra@b@citeb } { #2 }
+ }
\cs_new:Npn \__csl_hyperref_lbibitem:nn [#1]#2
{
\clist_gput_right:Nn \g__csl_bib_items_clist {#2}
\@skiphyperreftrue
- \H@item[%
- \ifx\Hy@raisedlink\@empty
- \hyper@anchorstart{cite.#2\@extra@b@citeb}%
- \@BIBLABEL{#1}%
- \hyper@anchorend
- \else
- \Hy@raisedlink{%
- \hyper@anchorstart{cite.#2\@extra@b@citeb}\hyper@anchorend
- }%
- \@BIBLABEL{#1}%
- \fi
- \hfill
- ]%
+ \H@item
+ [
+ \ifx \Hy@raisedlink \@empty
+ \hyper@anchorstart
+ { cite \int_use:N \g__csl_ref_section_index_int . #2 \@extra@b@citeb }
+ \@BIBLABEL {#1}
+ \hyper@anchorend
+ \else
+ \Hy@raisedlink
+ {
+ \hyper@anchorstart
+ { cite \int_use:N \g__csl_ref_section_index_int . #2 \@extra@b@citeb }
+ \hyper@anchorend
+ }
+ \@BIBLABEL {#1}
+ \fi
+ \hfill
+ ]
\@skiphyperreffalse
\ignorespaces
}
@@ -128,7 +136,8 @@
\Hy@raisedlink
{
\hyper@anchorstart
- { cite. #1 \@extra@b@citeb } \relax
+ { cite \int_use:N \g__csl_ref_section_index_int . #1 \@extra@b@citeb }
+ \relax
\hyper@anchorend
}
\ignorespaces
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-init.sty b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-init.sty
index db83bced06c..65bc15d1162 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-init.sty
+++ b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-init.sty
@@ -16,8 +16,9 @@
{ \__csl_initialize_lua_module: }
{
\__csl_load_bbl:
- \__csl_read_style_class:
+ \__csl_get_style_class:
}
+ \__csl_set_ref_section_level:
}
@@ -25,19 +26,20 @@
\cs_new:Npn \__csl_write_aux_info:
{
+ \tl_if_empty:NF \l__csl_style_tl
+ { \exp_args:NV \__csl_write_aux_bibstyle:n \l__csl_style_tl }
+ \tl_if_empty:NT \l__csl_style_tl
+ { \tl_set_eq:NN \l__csl_style_tl \g__csl_aux_bibstyle_tl }
\tl_if_empty:NT \l__csl_style_tl
- {
- \tl_set_eq:NN \l__csl_style_tl \g__csl_aux_bibstyle_tl
- \edef \csl@style { \g__csl_aux_bibstyle_tl }
- }
- \tl_if_empty:VTF \l__csl_style_tl
{
\msg_warning:nn { citation-style-language } { missing-style-name }
\tl_set:Nn \l__csl_style_tl { apa }
}
- { \exp_args:NV \__csl_write_aux_bibstyle:n \l__csl_style_tl }
- \clist_if_empty:NTF \l__csl_bib_resources_clist
+ \tl_set_eq:NN \csl@style \l__csl_style_tl
+ \clist_if_empty:NT \l__csl_bib_resources_clist
{ \clist_set_eq:NN \l__csl_bib_resources_clist \g__csl_aux_bib_files_clist }
+ \clist_if_empty:NTF \l__csl_bib_resources_clist
+ { \msg_warning:nn { citation-style-language } { empty-bib-resources } }
{
\exp_args:Nx \__csl_write_aux_bibdata:n
{ \clist_use:Nn \l__csl_bib_resources_clist { , } }
@@ -48,7 +50,11 @@
\cs_new:Npn \__csl_write_aux_bibstyle:n #1
{
\if@filesw
- \iow_now:Nx \@auxout { \token_to_str:N \csl@aux@style {#1} }
+ \iow_now:Nx \@auxout
+ {
+ \token_to_str:N \csl@aux@style
+ { \int_use:N \g__csl_ref_section_index_int } {#1}
+ }
\fi
}
@@ -56,42 +62,56 @@
{
\if@filesw
% Full expansion for files like \jobname.bib
- \iow_now:Nx \@auxout { \token_to_str:N \csl@aux@data {#1} }
+ \iow_now:Nx \@auxout
+ {
+ \token_to_str:N \csl@aux@data
+ { \int_use:N \g__csl_ref_section_index_int } {#1}
+ }
\fi
}
% In earlier time, \bibdata{xxx.json} was used but this causes latexmk unable
% to find xxx.json.bib and it refuses to run the $bibtex procedure.
% John Collins suggests using a different command than \bibdata.
-\cs_new:Npn \csl@aux@data #1
- { \clist_gput_right:Nn \g__csl_aux_bib_files_clist {#1} }
+\cs_new:Npn \csl@aux@data #1#2
+ {
+ \str_if_eq:nnT {#1} { 0 }
+ { \clist_gput_right:Nn \g__csl_aux_bib_files_clist {#2} }
+ }
\cs_new:Npn \__csl_initialize_lua_module:
{
- \clist_if_empty:NT \l__csl_bib_resources_clist
- { \msg_warning:nn { citation-style-language } { empty-bib-resources } }
+ \tl_set:Nx \l_tmpa_tl { \clist_use:Nn \l__csl_bib_resources_clist { , } }
\lua_now:e
{
- csl.init(
+ csl_citation_manager:init(
"\l__csl_style_tl",
- "\l__csl_bib_resources_clist",
+ "\l_tmpa_tl",
"\l__csl_locale_tl"
)
}
-
-
- \str_if_eq:eeT { \lua_now:n { tex.print(csl.initialized) } } { true }
+ \str_if_eq:eeTF
+ {
+ \lua_now:n
+ {
+ tex.print(tostring(
+ csl_citation_manager.ref_section.initialized
+ ))
+ }
+ }
+ { true }
{ \bool_set_true:N \l__csl_engine_initialized_bool }
- \__csl_get_style_class:
+ { \bool_set_false:N \l__csl_engine_initialized_bool }
+ \__csl_get_style_class_luatex:
\@ifpackageloaded { hyperref }
- { \lua_now:n { csl.enable_linking() } }
+ { \lua_now:n { csl_citation_manager:enable_linking() } }
{ }
}
\msg_new:nnn { citation-style-language } { missing-style-name }
- { Missing~ style~ name.\\Will~ use~ default~ APA~ style. }
+ { Missing~ style~ name.~ Will~ use~ default~ APA~ style. }
\msg_new:nnn { citation-style-language } { empty-bib-resources }
{ Empty~ bibliographic~ resources.~ Use~ \token_to_str:N \addbibresource. }
@@ -101,13 +121,16 @@
% In-text (including numeric or author-date) or note style
% \bool_new:N \l__csl_note_style_bool
-\cs_new:Npn \__csl_get_style_class: {
+\cs_new:Npn \__csl_get_style_class_luatex: {
+ \bool_set_false:N \l__csl_note_bool
\bool_if:NT \l__csl_engine_initialized_bool
{
- \tl_set:Nx \l__csl_class_tl { \lua_now:n { csl.get_style_class() } }
+ \tl_set:Nx \l__csl_class_tl { \lua_now:n { tex.print(csl_citation_manager:get_style_class()) } }
\tl_if_eq:NnT \l__csl_class_tl { note }
{ \bool_set_true:N \l__csl_note_bool }
}
+ \int_compare:nNnT { \g__csl_ref_section_index_int } = { 0 }
+ { \bool_gset_eq:NN \g__csl_global_note_class_bool \l__csl_note_bool }
}
@@ -266,14 +289,16 @@
\cs_new:Npn \__csl_write_aux_options:n #1
{
\if@filesw
- \iow_now:Nn \@auxout { \csl@aux@options {#1} }
+ \iow_now:Nx \@auxout
+ {
+ \token_to_str:N \csl@aux@options
+ { \int_use:N \g__csl_ref_section_index_int } {#1}
+ }
\fi
}
-\cs_new:Npn \csl@aux@options #1 { }
-
+\cs_new:Npn \csl@aux@options #1#2 { }
-\tl_new:N \g__csl_bibliography_setup_tl
% Load .bbl at the beginning of document to save one pass of latex.
% In this procedure, the \cslcitation command is processed and the contents
@@ -283,10 +308,6 @@
% The \@input@ prints "No file ....bbl" in the .log file from which
% the latexmk decides to run $bibtex or not.
\__csl_collect_bibliography:n { \@input@ { \jobname .bbl } }
- % Execute the \cslsetup part to set the style class.
- % \tl_show:N \g__csl_bibliography_setup_tl
- \tl_use:N \g__csl_bibliography_setup_tl
- % \bool_show:N \l__csl_note_bool
}
@@ -302,8 +323,6 @@
% URLs may contain "%" and "#" characters.
\char_set_catcode_other:N \%
\char_set_catcode_other:N \#
- \RenewDocumentCommand \cslsetup { m }
- { \tl_gset:Nn \g__csl_bibliography_setup_tl { \cslsetup { ##1 } } }
\RenewDocumentEnvironment { thebibliography } { m +b }
{
\tl_set:Nn \l__csl_bib_index_tl { 1 }
@@ -321,29 +340,121 @@
\group_end:
}
+% At the moment, the `\csloptions` only reads the style class from `.bbl`
+% generated by `citeproc-lua`.
+% #1: refsection index
+% #2: refsection options
+\NewDocumentCommand \csloptions { m m }
+ { \keys_set:nn { csl / options } { #2 } }
+
+% The class option is in the `<style>=<class>` form
+% (e.g. `\csloptions{class={apa=in-text}}`).
+\keys_define:nn { csl / options }
+ {
+ class .code:n = { \prop_gput_from_keyval:Nn \g__csl_style_class_prop {#1} },
+ }
+
+\prop_new:N \g__csl_style_class_prop
% The `\textcite` bahaves differently with note styles.
% Thus we read the style class from the `.csl` file with non-LuaTeX engines.
\ior_new:N \l__csl_style_ior
-\cs_new:Npn \__csl_read_style_class:
+\cs_new:Npn \__csl_get_style_class:
{
+ \tl_clear:N \l__csl_class_tl
\bool_set_false:N \l__csl_note_bool
+ \prop_get:NVNF \g__csl_style_class_prop \l__csl_style_tl \l__csl_class_tl
+ { \__csl_read_style_class: }
+ \tl_if_empty:NF \l__csl_class_tl
+ {
+ \str_case:VnTF \l__csl_class_tl
+ {
+ { note } { \bool_set_true:N \l__csl_note_bool }
+ { in-text } { \bool_set_false:N \l__csl_note_bool }
+ }
+ {
+ \int_compare:nNnT { \g__csl_ref_section_index_int } = { 0 }
+ {
+ \bool_gset_eq:NN \g__csl_global_note_class_bool \l__csl_note_bool
+ }
+ }
+ {
+ \msg_error:nnV { citation-style-language } { invalid-style-class }
+ \l__csl_class_tl
+ }
+ }
+ }
+
+\cs_new:Npn \__csl_read_style_class:
+ {
\tl_if_blank:VF \l__csl_style_tl
{
\exp_args:NNx \ior_open:Nn \l__csl_style_ior { \l__csl_style_tl .csl }
\ior_map_inline:Nn \l__csl_style_ior
{
% \tl_show:n {##1}
- \tl_if_in:nnT {##1} { class="note" }
+ \tl_if_in:nnTF {##1} { class="note" }
{
\tl_set:Nn \l__csl_class_tl { note }
\bool_set_true:N \l__csl_note_bool
+ \prop_gput:NVn \g__csl_style_class_prop \l__csl_style_tl { note }
\ior_map_break:
}
+ {
+ \tl_if_in:nnT {##1} { class="in-text" }
+ {
+ \tl_set:Nn \l__csl_class_tl { in-text }
+ \bool_set_false:N \l__csl_note_bool
+ \prop_gput:NVn \g__csl_style_class_prop \l__csl_style_tl { in-text }
+ \ior_map_break:
+ }
+ }
}
\ior_close:N \l__csl_style_ior
}
}
-% \msg_new:nnn { citation-style-language } { file / non-exist }
+\msg_new:nnn { citation-style-language } { invalid-style-class }
+ { Invalid~ style~ class~ '#1'. }
+
+% \msg_new:nnn { citation-style-language } { file-non-exist }
% { No~ file~ #1. }
+
+\cs_new:Npn \__csl_set_ref_section_level:
+ {
+ \str_case:Vn \l__csl_bib_ref_section_str
+ {
+ { none } { }
+ { part }
+ { \__csl_patch_ref_section:n { part } }
+ { chapter }
+ { \__csl_patch_ref_section:n { chapter } }
+ { chapter+ }
+ {
+ \__csl_patch_ref_section:n { part }
+ \__csl_patch_ref_section:n { chapter }
+ }
+ { section }
+ { \__csl_patch_ref_section:n { section } }
+ { section+ }
+ {
+ \__csl_patch_ref_section:n { part }
+ \__csl_patch_ref_section:n { chapter }
+ \__csl_patch_ref_section:n { section }
+ }
+ { subsection }
+ { \__csl_patch_ref_section:n { subsection } }
+ { subsection+ }
+ {
+ \__csl_patch_ref_section:n { part }
+ \__csl_patch_ref_section:n { chapter }
+ \__csl_patch_ref_section:n { section }
+ \__csl_patch_ref_section:n { subsection }
+ }
+ }
+ }
+
+\cs_new:Npn \__csl_patch_ref_section:n #1
+ {
+ \hook_gput_code:nnn { cmd / #1 / before } { . } { \newrefsection }
+ }
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty
index ebd497bcb71..03f20df1389 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty
+++ b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty
@@ -9,16 +9,23 @@
\RequirePackage{expl3}
\RequirePackage{xparse}
-\ProvidesExplPackage {citation-style-language} {2024-06-09} {0.5.0}
+\ProvidesExplPackage {citation-style-language} {2024-07-31} {0.6.0}
{Citation Style Language for LaTeX}
\RequirePackage { l3keys2e }
\RequirePackage { url }
+\prop_gput:Nnn \g_msg_module_name_prop { citation-style-language } { CSL }
+\prop_gput:Nnn \g_msg_module_type_prop { citeproc } { Module }
+
+\msg_new:nnn { citeproc } { citeproc-error } {#1}
+\msg_new:nnn { citeproc } { citeproc-warning } {#1}
+
+
% Check incompatible packages
\msg_new:nnn { citation-style-language } { incompatible-package }
- { The~ `#1'~ package~ is~ incompatible~ with~ `citation-style-language'. }
+ { Package~ '#1'~ is~ incompatible~ with~ 'citation-style-language'. }
\clist_map_inline:nn
{
@@ -34,7 +41,13 @@
% Load Lua module in LuaTeX
\sys_if_engine_luatex:T
- { \lua_now:n { csl = require("citeproc-latex") } }
+ {
+ \lua_now:n
+ {
+ citeproc_manager = require("citeproc-manager")
+ csl_citation_manager = citeproc_manager.CslCitationManager:new()
+ }
+ }
% Global options
@@ -44,11 +57,15 @@
\bool_new:N \l__csl_regression_test_bool
+\tl_new:N \g__csl_global_style_tl
\tl_new:N \l__csl_style_tl
\newcommand \csl@style {} % For latex2e interface
\tl_new:N \l__csl_class_tl % TODO: This should be removed
+\bool_new:N \g__csl_global_note_class_bool
\bool_new:N \l__csl_note_bool
+\clist_new:N \g__csl_global_bib_resources_clist
\clist_new:N \l__csl_bib_resources_clist
+\tl_new:N \g__csl_global_locale_tl
\tl_new:N \l__csl_locale_tl
\bool_new:N \l__csl_back_ref_bool
\str_new:N \l__csl_back_ref_type_str
@@ -62,6 +79,7 @@
\tl_new:N \l__csl_bib_item_sep_tl
\tl_new:N \l__csl_bib_par_indent_tl
\tl_new:N \l__csl_bib_hang_tl
+\str_new:N \l__csl_bib_ref_section_str
\keys_define:nn { csl }
@@ -71,14 +89,19 @@
{
\tl_set:Nn \l__csl_style_tl {#1}
\renewcommand \csl@style {#1}
+ \tl_gset:Nn \g__csl_global_style_tl {#1}
} ,
- class .code:n =
+ class .code:n = {} , % Deprecated, should be removed in the next release.
+ bib-resource .code:n =
{
- \tl_set:Nn \l__csl_class_tl {#1}
- \tl_if_eq:NnT \l__csl_class_tl { note }
- { \bool_set_true:N \l__csl_note_bool }
+ \clist_set:Nn \l__csl_bib_resources_clist {#1}
+ \clist_gset_eq:NN \g__csl_global_bib_resources_clist \l__csl_bib_resources_clist
+ } ,
+ locale .code:n =
+ {
+ \tl_set:Nn \l__csl_locale_tl {#1}
+ \tl_gset:Nn \g__csl_global_locale {#1}
} ,
- locale .tl_set:N = \l__csl_locale_tl ,
backref .choices:nn =
{ true, page, section, false }
{ \exp_args:NV \__csl_set_back_ref:n \l_keys_choice_tl } ,
@@ -92,13 +115,10 @@
bib-item-sep .tl_set:N = \l__csl_bib_item_sep_tl ,
bib-par-indent .tl_set:N = \l__csl_bib_par_indent_tl ,
bib-hang .tl_set:N = \l__csl_bib_hang_tl ,
- % The following keys are for easier interaction between LaTeX and
- % citeproc-lua engine and they are not designed for end-users.
- undefined-cites .code:n =
- {
- \clist_map_inline:nn {#1}
- { \__csl_warn_citation_undefined:n {##1} }
- } ,
+ % ref section
+ ref-section .choices:nn =
+ { none, part, chapter, chapter+, section, section+, subsection, subsection+ }
+ { \str_set:NV \l__csl_bib_ref_section_str \l_keys_choice_tl } ,
}
\cs_new:Npn \__csl_set_back_ref:n #1
@@ -124,6 +144,7 @@
bib-entry-page-break = true ,
bib-par-indent = { \parindent } ,
bib-hang = { 1 em } ,
+ ref-section = none ,
}
@@ -138,8 +159,11 @@
}
\tl_new:N \g__csl_aux_bibstyle_tl
-\cs_set:Npn \csl@aux@style #1
- { \tl_gset:Nn \g__csl_aux_bibstyle_tl {#1} }
+\cs_set:Npn \csl@aux@style #1#2
+ {
+ \str_if_eq:nnT {#1} { 0 }
+ { \tl_gset:Nn \g__csl_aux_bibstyle_tl {#2} }
+ }
% Write to an empty `.ccf` file for use with latexmk
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/styles/apa.csl b/Master/texmf-dist/tex/latex/citation-style-language/styles/apa.csl
index 79208912e77..ec2a5260175 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/styles/apa.csl
+++ b/Master/texmf-dist/tex/latex/citation-style-language/styles/apa.csl
@@ -14,7 +14,7 @@
<category citation-format="author-date"/>
<category field="psychology"/>
<category field="generic-base"/>
- <updated>2024-06-06T05:59:25+00:00</updated>
+ <updated>2024-07-19T10:52:31-04:00</updated>
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
</info>
<locale xml:lang="en">
@@ -23,6 +23,10 @@
<single>ed. &amp; trans.</single>
<multiple>eds. &amp; trans.</multiple>
</term>
+ <term name="editor-translator" form="short">
+ <single>ed. &amp; trans.</single>
+ <multiple>eds. &amp; trans.</multiple>
+ </term>
<term name="translator" form="short">trans.</term>
<term name="interviewer" form="short">
<single>interviewer</single>
@@ -32,6 +36,7 @@
<single>ed.</single>
<multiple>eds.</multiple>
</term>
+ <term name="performer" form="verb">recorded by</term>
<term name="circa" form="short">ca.</term>
<term name="bc"> B.C.E.</term>
<term name="ad"> C.E.</term>
@@ -41,7 +46,12 @@
</term>
<term name="software">computer software</term>
<term name="at" form="long">before the</term>
+ <term name="collection">archival collection</term>
+ <term name="post">online post</term>
+ <term name="at" form="long">before the</term>
<term name="hearing" form="verb">testimony of</term>
+ <term name="review-of" form="long">review of the</term>
+ <term name="review-of" form="short">review of</term>
</terms>
</locale>
<locale xml:lang="da">
@@ -82,101 +92,158 @@
<term name="et-al">et al.</term>
</terms>
</locale>
- <!-- TODO: New types: classic collection document event hearing performance periodical regulation -software- standard -->
- <!-- TODO: New creator roles: chair compiler contributor curator executive-producer guest host narrator organizer performer producer script-writer series-creator -->
- <!-- TODO: New variables:
- available-date submitted
- part-number printing-number supplement-number
- part-title volume-title
- archive_collection
- division jurisdiction
- event-title
- language
- license
- reviewed-genre
+ <!-- For Indigeneous Knowledge, assume the item is stored as `document` or `speech`
+ and that Nation/Community, treaty, where the Elder lives,
+ and topic are all stored in `title`
+ cf. https://libguides.norquest.ca/c.php?g=314831&p=5188823.
+ If the item is stored as `interview`, assume that Nation/Community, treat, and topic
+ are stored in `title`, 'Oral teaching' or similar is stored in `archive`, and where
+ the Elder lives is stored in `archive-place`.
-->
- <!-- TODO: New terms:
- advance-online-publication
- album on audio-recording
- original-work-published
- personal-communication
- preprint
- review-of
- item types
+ <!-- Reviews are detected if an item has type `review` or `review-book` or if it has any of the variables
+ `reviewed-title`, `reviewed-author`, or `reviewed-genre`. For the latter case, reviews are commonly
+ stored as types `article-journal`, `article-magazine`, `article-newspaper`, `post-weblog`, or `webpage`
-->
- <!-- TODO: Check Indigeneous Knowledge format -->
<!-- General categories of item types:
- Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
+ Periodical: article-journal article-magazine article-newspaper periodical post-weblog review review-book
Periodical or Booklike: paper-conference
Booklike: article book broadcast chapter classic collection dataset document
entry entry-dictionary entry-encyclopedia event figure
- graphic interview manuscript map motion_picture musical_score pamphlet patent
- performance periodical personal_communication post report
+ graphic interview manuscript map motion_picture musical_score
+ pamphlet patent performance personal_communication post report
software song speech standard thesis webpage
Legal: bill hearing legal_case legislation regulation treaty
-->
+ <!-- Equivalencies:
+ classic == book
+ document == report, but give full date
+ standard == report
+ performance == speech
+ event == speech
+ collection == book, but give full date
+ -->
+ <!-- Role equivalencies:
+ compiler == editor
+ organizer, curator == chair
+ script-writer == director
+ producer == director (but don't print both)
+ guest, host == director
+ series-creator, executive-producer == editor
+ -->
<!-- APA references contain four parts: author, date, title, source -->
<macro name="author-bib">
- <!-- TODO: New creator roles (media, contributor) -->
- <!-- TODO: Add new item types -->
- <names variable="composer" delimiter=", ">
- <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
- <substitute>
- <names variable="author"/>
- <names variable="illustrator"/>
- <names variable="director">
- <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
- <label form="long" prefix=" (" suffix=")" text-case="title"/>
- </names>
- <choose>
- <if variable="container-title">
- <choose>
- <if type="book entry entry-dictionary entry-encyclopedia" match="any">
- <choose>
- <if variable="title">
- <group delimiter=" ">
- <text macro="title"/>
- <text macro="parenthetical"/>
- </group>
- </if>
- <else>
- <text macro="title-and-descriptions"/>
- </else>
- </choose>
- </if>
- </choose>
- </if>
- </choose>
- <!-- TODO: Test for editortranslator and put that first as that becomes available -->
- <names variable="editor" delimiter=", ">
- <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
- <label form="short" prefix=" (" suffix=")" text-case="title"/>
- </names>
- <names variable="editorial-director">
- <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
- <label form="short" prefix=" (" suffix=")" text-case="title"/>
- </names>
- <names variable="collection-editor">
- <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
- <label form="short" prefix=" (" suffix=")" text-case="title"/>
- </names>
- <choose>
- <if variable="title">
- <group delimiter=" ">
- <text macro="title"/>
- <text macro="parenthetical"/>
- </group>
- </if>
- <else>
- <text macro="title-and-descriptions"/>
- </else>
- </choose>
- </substitute>
- </names>
+ <group delimiter=" ">
+ <names variable="composer" delimiter=", ">
+ <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+ <substitute>
+ <names variable="author"/>
+ <!-- Note: `narrator` only cited in secondary-contributors -->
+ <names variable="illustrator"/>
+ <names variable="script-writer director">
+ <!-- Note: Actors/performers and producers [not executive] not cited in APA style. -->
+ <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+ <label form="long" prefix=" (" suffix=")" text-case="title"/>
+ </names>
+ <names variable="guest host">
+ <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+ <label form="long" prefix=" (" suffix=")" text-case="title"/>
+ </names>
+ <names variable="producer">
+ <!-- Note: Producers not cited if there is a writer/director, but use if they are the principle creator. -->
+ <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+ <label form="long" prefix=" (" suffix=")" text-case="title"/>
+ </names>
+ <choose>
+ <if variable="container-title">
+ <choose>
+ <if type="book classic collection entry entry-dictionary entry-encyclopedia" match="any">
+ <!-- Items with book-like container-title substitute with their title and parenthetical,
+ but leave bracketed after container-title. This mimics the `container-booklike` formatting. -->
+ <choose>
+ <if variable="title">
+ <group delimiter=" ">
+ <text macro="title"/>
+ <text macro="parenthetical"/>
+ </group>
+ </if>
+ <else>
+ <text macro="title-and-descriptions"/>
+ </else>
+ </choose>
+ </if>
+ </choose>
+ </if>
+ </choose>
+ <names variable="series-creator executive-producer">
+ <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+ <label form="long" prefix=" (" suffix=")" text-case="title"/>
+ </names>
+ <names variable="editor-translator" delimiter=", ">
+ <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+ <label form="short" prefix=" (" suffix=")" text-case="title"/>
+ </names>
+ <!-- TODO: Split editor and translator into separate lines once processors begin to automatically create
+ the editor-translator variable. -->
+ <names variable="editor translator" delimiter=", ">
+ <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+ <label form="short" prefix=" (" suffix=")" text-case="title"/>
+ </names>
+ <names variable="editorial-director">
+ <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+ <label form="short" prefix=" (" suffix=")" text-case="title"/>
+ </names>
+ <names variable="compiler">
+ <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+ <label form="long" prefix=" (" suffix=")" text-case="title"/>
+ </names>
+ <choose>
+ <if type="event performance speech" match="any">
+ <names variable="chair">
+ <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+ <label form="long" prefix=" (" suffix=")" text-case="title"/>
+ </names>
+ <names variable="organizer">
+ <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+ <label form="long" prefix=" (" suffix=")" text-case="title"/>
+ </names>
+ </if>
+ </choose>
+ <names variable="curator">
+ <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+ <label form="long" prefix=" (" suffix=")" text-case="title"/>
+ </names>
+ <names variable="collection-editor">
+ <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+ <label form="short" prefix=" (" suffix=")" text-case="title"/>
+ </names>
+ <choose>
+ <if variable="title">
+ <!-- If an item has a title, substitute missing author with title and parenthetical, but leave bracketed
+ after the date (in the 'title' position). -->
+ <group delimiter=" ">
+ <text macro="title"/>
+ <text macro="parenthetical"/>
+ </group>
+ </if>
+ <else>
+ <!-- If an item has no title, substitute with bracketed followed by parenthetical. -->
+ <text macro="title-and-descriptions"/>
+ </else>
+ </choose>
+ </substitute>
+ </names>
+ <choose>
+ <!-- Print "with" contributor for books, but not for other types that commonly have them (eg, thesis, software) -->
+ <if type="book classic collection" match="any">
+ <names variable="contributor" prefix="(" suffix=")">
+ <label form="verb" suffix=" "/>
+ <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+ </names>
+ </if>
+ </choose>
+ </group>
</macro>
<macro name="author-intext">
- <!-- TODO: New creator roles -->
- <!-- TODO: Add new item types -->
<choose>
<if type="bill hearing legal_case legislation regulation treaty" match="any">
<text macro="title-intext"/>
@@ -212,18 +279,29 @@
<substitute>
<names variable="author"/>
<names variable="illustrator"/>
- <names variable="director"/>
+ <names variable="script-writer director"/>
+ <names variable="guest host"/>
+ <names variable="producer"/>
<choose>
<if variable="container-title">
<choose>
- <if type="book entry entry-dictionary entry-encyclopedia" match="any">
+ <if type="book classic collection entry entry-dictionary entry-encyclopedia" match="any">
<text macro="title-intext"/>
</if>
</choose>
</if>
</choose>
+ <names variable="series-creator executive-producer"/>
<names variable="editor"/>
<names variable="editorial-director"/>
+ <names variable="compiler"/>
+ <choose>
+ <if type="event performance speech" match="any">
+ <names variable="chair"/>
+ <names variable="organizer"/>
+ </if>
+ </choose>
+ <names variable="curator"/>
<text macro="title-intext"/>
</substitute>
</names>
@@ -241,7 +319,6 @@
</choose>
</macro>
<macro name="date-bib">
- <!-- TODO: Add new item types -->
<group delimiter=" " prefix="(" suffix=")">
<choose>
<if is-uncertain-date="issued">
@@ -257,7 +334,7 @@
<text variable="year-suffix"/>
</group>
<choose>
- <if type="article-magazine article-newspaper broadcast interview motion_picture pamphlet personal_communication post post-weblog song speech webpage" match="any">
+ <if type="article-magazine article-newspaper broadcast collection document event interview motion_picture pamphlet performance personal_communication post post-weblog song speech webpage" match="any">
<!-- Many video and audio examples in manual give full dates. Err on the side of too much information. -->
<date variable="issued">
<date-part name="month"/>
@@ -267,7 +344,7 @@
<else-if type="paper-conference">
<!-- Capture 'speech' stored as 'paper-conference' -->
<choose>
- <if variable="collection-editor editor editorial-director issue page volume" match="none">
+ <if variable="collection-editor compiler editor editorial-director issue page volume" match="none">
<date variable="issued">
<date-part name="month"/>
<date-part name="day" prefix=" "/>
@@ -275,14 +352,14 @@
</if>
</choose>
</else-if>
- <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic
- manuscript map musical_score paper-conference[published] patent report review review-book thesis -->
+ <!-- Only year: article article-journal book chapter classic entry entry-dictionary entry-encyclopedia dataset figure graphic
+ manuscript map musical_score paper-conference[published] patent periodical report review review-book software standard thesis -->
</choose>
</group>
</if>
<else-if variable="status">
<group>
- <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
+ <!-- We print the status variable directly rather than using in-press, etc. terms. -->
<text variable="status" text-case="lowercase"/>
<text variable="year-suffix" prefix="-"/>
</group>
@@ -296,6 +373,7 @@
</group>
</macro>
<macro name="date-sort">
+ <!-- This is necessary to ensure that citeproc sorts all item types chonologically in the same list. -->
<choose>
<if type="article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic manuscript map musical_score patent report review review-book thesis" match="any">
<date variable="issued" date-parts="year" form="numeric"/>
@@ -303,7 +381,7 @@
<else-if type="paper-conference">
<!-- Capture 'speech' stored as 'paper-conference' -->
<choose>
- <if variable="collection-editor editor editorial-director issue page volume" match="any">
+ <if variable="collection-editor compiler editor editorial-director issue page volume" match="any">
<date variable="issued" date-parts="year" form="numeric"/>
</if>
<else>
@@ -339,7 +417,6 @@
</choose>
</macro>
<macro name="date-intext">
- <!-- TODO: Add new item types -->
<choose>
<if variable="issued">
<group delimiter="/">
@@ -387,7 +464,7 @@
</group>
</if>
<else-if variable="status">
- <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
+ <!-- We print the status variable directly rather than using in-press, etc. terms. -->
<text variable="status" text-case="lowercase"/>
<text variable="year-suffix" prefix="-"/>
</else-if>
@@ -398,7 +475,7 @@
</choose>
</macro>
<!-- APA has two description elements following the title:
- title (parenthetical) [bracketed] -->
+ title (parenthetical) [bracketed] -->
<macro name="title-and-descriptions">
<choose>
<if variable="title">
@@ -412,7 +489,7 @@
<choose>
<if type="bill report" match="any">
<!-- Bills, resolutions, and congressional reports are not italicized and substitute bill number if no title. -->
- <!-- Can't distinguish congressional reports from other reports,
+ <!-- Can't distinguish congressional reports from other reports,
but giving the genre and number seems fine for other reports too. -->
<text macro="number"/>
<text macro="bracketed"/>
@@ -429,68 +506,125 @@
</choose>
</macro>
<macro name="title">
- <!-- TODO: Add new item types -->
<choose>
<if type="post webpage" match="any">
<!-- Webpages are always italicized -->
- <text variable="title" font-style="italic"/>
+ <text macro="title-plus-part-title" font-style="italic"/>
</if>
- <else-if variable="container-title" match="any">
- <!-- Other types are italicized based on presence of container-title.
+ <!-- Other types are italicized based on presence of container-title.
Assume that review and review-book are published in periodicals/blogs,
not just on a web page (ex. 69) -->
- <text variable="title"/>
+ <else-if type="article-journal article-magazine article-newspaper periodical post-weblog review review-book" match="any">
+ <text macro="periodical-title"/>
</else-if>
- <else>
+ <else-if type="paper-conference">
+ <!-- Treat paper-conference as book-like if it has an editor, otherwise as periodical-like -->
<choose>
- <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
- <text variable="title" font-style="italic"/>
+ <if variable="collection-editor compiler editor editorial-director" match="any">
+ <text macro="booklike-title"/>
</if>
- <else-if type="paper-conference">
- <choose>
- <if variable="collection-editor editor editorial-director" match="any">
- <group delimiter=": " font-style="italic">
- <text variable="title"/>
- <!-- TODO: Replace with volume-title -->
- <choose>
- <if is-numeric="volume" match="none">
- <group delimiter=" ">
- <label variable="volume" form="short" text-case="capitalize-first"/>
- <text variable="volume"/>
- </group>
- </if>
- </choose>
- </group>
- </if>
- <else>
- <text variable="title" font-style="italic"/>
- </else>
- </choose>
- </else-if>
<else>
- <group delimiter=": " font-style="italic">
+ <text macro="periodical-title"/>
+ </else>
+ </choose>
+ </else-if>
+ <else>
+ <text macro="booklike-title"/>
+ </else>
+ </choose>
+ </macro>
+ <macro name="periodical-title">
+ <!-- For periodicals, assume that part-number and part-title refer to the article and append to title -->
+ <choose>
+ <if variable="container-title" match="any">
+ <text macro="title-plus-part-title"/>
+ </if>
+ <else>
+ <!-- for periodical items without container titles, don't append volume-title to title -->
+ <text macro="title-plus-part-title" font-style="italic"/>
+ </else>
+ </choose>
+ </macro>
+ <macro name="booklike-title">
+ <!-- For book-like items, assume part-number and part-title refer to the book/volume. -->
+ <choose>
+ <if variable="container-title" match="any">
+ <text variable="title"/>
+ </if>
+ <else>
+ <!-- For book-like items without container titles and with volume-title, append volume-title to title (ex. 30) -->
+ <text macro="title-plus-volume-title" font-style="italic"/>
+ </else>
+ </choose>
+ </macro>
+ <macro name="title-plus-part-title">
+ <choose>
+ <if variable="reviewed-author reviewed-genre reviewed-title" type="review review-book" match="any">
+ <!-- If a review has no `reviewed-title`, assume that `title` contains the title of the reviewed work
+ and omit it here; it is printed in the `reviewed-item` macro. -->
+ <choose>
+ <if variable="reviewed-title" match="none"/>
+ <else>
+ <group delimiter=": ">
<text variable="title"/>
- <!-- TODO: Replace with volume-title -->
- <choose>
- <if is-numeric="volume" match="none">
- <group delimiter=" ">
- <label variable="volume" form="short" text-case="capitalize-first"/>
- <text variable="volume"/>
- </group>
- </if>
- </choose>
+ <text macro="part-title"/>
</group>
</else>
</choose>
+ </if>
+ <else>
+ <group delimiter=": ">
+ <text variable="title"/>
+ <text macro="part-title"/>
+ </group>
</else>
</choose>
</macro>
+ <macro name="part-title">
+ <group delimiter=". ">
+ <group delimiter=" ">
+ <label variable="part-number" form="short" text-case="capitalize-first"/>
+ <text variable="part-number"/>
+ </group>
+ <text variable="part-title" text-case="capitalize-first"/>
+ </group>
+ </macro>
+ <macro name="title-plus-volume-title">
+ <group delimiter=": ">
+ <text variable="title"/>
+ <text macro="volume-title"/>
+ </group>
+ </macro>
+ <macro name="volume-title">
+ <group delimiter=": ">
+ <choose>
+ <if variable="volume-title">
+ <group delimiter=" ">
+ <group delimiter=". ">
+ <group delimiter=" ">
+ <label variable="volume" form="short" text-case="capitalize-first"/>
+ <text variable="volume"/>
+ </group>
+ <text variable="volume-title"/>
+ </group>
+ </group>
+ </if>
+ <else-if is-numeric="volume" match="none">
+ <group delimiter=" ">
+ <label variable="volume" form="short" text-case="capitalize-first"/>
+ <text variable="volume"/>
+ </group>
+ </else-if>
+ </choose>
+ <!-- For book-like items, assume part-number and part-title refer to the book/volume. -->
+ <text macro="part-title"/>
+ </group>
+ </macro>
<macro name="title-intext">
- <!-- TODO: Add new item types -->
<choose>
<if type="bill report">
<!-- Bills, resolutions, and congressional reports are not italicized and substitute bill number if no title. -->
- <!-- Can't distinguish congressional reports from other reports,
+ <!-- Can't distinguish congressional reports from other reports,
but giving the genre and number seems fine for other reports too. -->
<choose>
<if variable="title">
@@ -544,7 +678,6 @@
</choose>
</macro>
<macro name="parenthetical">
- <!-- TODO: Add new item types -->
<!-- (Secondary contributors; Database location; Genre no. 123; Report Series 123, Version, Edition, Volume, Page) -->
<group prefix="(" suffix=")">
<choose>
@@ -604,7 +737,7 @@
<text macro="secondary-contributors"/>
<choose>
<if type="broadcast graphic map motion_picture song" match="any">
- <!-- For audiovisual media, number information comes after title, not container-title -->
+ <!-- For audiovisual media, number information comes after title, not container-title (ex. 94) -->
<text macro="number"/>
</if>
</choose>
@@ -622,7 +755,6 @@
</group>
</macro>
<macro name="parenthetical-container">
- <!-- TODO: Add new item types -->
<choose>
<if variable="container-title" match="any">
<group prefix="(" suffix=")">
@@ -630,7 +762,7 @@
<text macro="database-location"/>
<choose>
<if type="broadcast graphic map motion_picture song" match="none">
- <!-- For audiovisual media, number information comes after title, not container-title -->
+ <!-- For audiovisual media, number information comes after title, not container-title (ex. 94) -->
<text macro="number"/>
</if>
</choose>
@@ -641,65 +773,12 @@
</choose>
</macro>
<macro name="bracketed">
- <!-- TODO: Add new item types -->
<!-- [Descriptive information] -->
<!-- If there is a number, genre is already printed in macro="number" -->
<group prefix="[" suffix="]">
<choose>
- <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
- <!-- Reviewed item -->
- <group delimiter="; ">
- <group delimiter=", ">
- <group delimiter=" ">
- <!-- Assume that genre is entered as 'Review of the book' or similar -->
- <choose>
- <if variable="number" match="none">
- <choose>
- <if variable="genre">
- <text variable="genre" text-case="capitalize-first"/>
- </if>
- <else-if variable="medium">
- <text variable="medium" text-case="capitalize-first"/>
- </else-if>
- <else>
- <!-- TODO: Replace with term="review" -->
- <!-- TODO: Handle review vs review-of depending on presence of reviewed-title -->
- <!-- TODO: Add reviewed-genre -->
- <text value="Review of"/>
- </else>
- </choose>
- </if>
- <else>
- <choose>
- <if variable="medium">
- <text variable="medium" text-case="capitalize-first"/>
- </if>
- <else>
- <!-- TODO: Replace with term="review" -->
- <!-- TODO: Handle review vs review-of depending on presence of reviewed-title -->
- <!-- TODO: Add reviewed-genre -->
- <text value="Review of"/>
- </else>
- </choose>
- </else>
- </choose>
- <text macro="reviewed-title"/>
- </group>
- <names variable="reviewed-author">
- <label form="verb-short" suffix=" "/>
- <name and="symbol" initialize-with=". " delimiter=", "/>
- </names>
- </group>
- <choose>
- <if variable="genre" match="any">
- <choose>
- <if variable="number" match="none">
- <text variable="medium" text-case="capitalize-first"/>
- </if>
- </choose>
- </if>
- </choose>
- </group>
+ <if variable="reviewed-author reviewed-genre reviewed-title" type="review review-book" match="any">
+ <text macro="reviewed-item"/>
</if>
<else-if type="thesis">
<!-- Thesis type and institution -->
@@ -814,22 +893,35 @@
<choose>
<if variable="genre">
<text variable="genre" text-case="capitalize-first"/>
- <!-- TODO: Replace prefix with performer label -->
- <names variable="author" prefix="recorded by ">
- <name and="symbol" initialize-with=". " delimiter=", "/>
- </names>
+ <group delimiter=" ">
+ <text term="performer" form="verb"/>
+ <names variable="author">
+ <name and="symbol" initialize-with=". " delimiter=", "/>
+ <substitute>
+ <names variable="performer"/>
+ </substitute>
+ </names>
+ </group>
</if>
<else-if variable="medium">
<text variable="medium" text-case="capitalize-first"/>
- <!-- TODO: Replace prefix with performer label -->
- <names variable="author" prefix="recorded by ">
- <name and="symbol" initialize-with=". " delimiter=", "/>
- </names>
+ <group delimiter=" ">
+ <text term="performer" form="verb"/>
+ <names variable="author">
+ <name and="symbol" initialize-with=". " delimiter=", "/>
+ <substitute>
+ <names variable="performer"/>
+ </substitute>
+ </names>
+ </group>
</else-if>
<else>
- <!-- TODO: Replace prefix with performer label -->
- <names variable="author" prefix="Recorded by ">
+ <text term="performer" form="verb" text-case="capitalize-first"/>
+ <names variable="author">
<name and="symbol" initialize-with=". " delimiter=", "/>
+ <substitute>
+ <names variable="performer"/>
+ </substitute>
</names>
</else>
</choose>
@@ -840,15 +932,23 @@
<choose>
<if variable="medium">
<text variable="medium" text-case="capitalize-first"/>
- <!-- TODO: Replace prefix with performer label -->
- <names variable="author" prefix="recorded by ">
- <name and="symbol" initialize-with=". " delimiter=", "/>
- </names>
+ <group delimiter=" ">
+ <text term="performer" form="verb"/>
+ <names variable="author">
+ <name and="symbol" initialize-with=". " delimiter=", "/>
+ <substitute>
+ <names variable="performer"/>
+ </substitute>
+ </names>
+ </group>
</if>
<else>
- <!-- TODO: Replace prefix with performer label -->
- <names variable="author" prefix="Recorded by ">
+ <text term="performer" form="verb" text-case="capitalize-first"/>
+ <names variable="author">
<name and="symbol" initialize-with=". " delimiter=", "/>
+ <substitute>
+ <names variable="performer"/>
+ </substitute>
</names>
</else>
</choose>
@@ -871,16 +971,17 @@
<text macro="format"/>
</else-if>
<else>
- <!-- For conference presentations, chapters in reports, software, place bracketed after the container title -->
+ <!-- For conference presentations/performances/events, chapters in reports/standards/generic documents, software,
+ place bracketed after the container title -->
<choose>
- <if type="paper-conference speech" match="any">
+ <if type="event paper-conference performance speech" match="any">
<choose>
- <if variable="collection-editor editor editorial-director issue page volume" match="any">
+ <if variable="collection-editor compiler editor editorial-director issue page volume" match="any">
<text macro="format"/>
</if>
</choose>
</if>
- <else-if type="report software" match="none">
+ <else-if type="document report software standard" match="none">
<text macro="format"/>
</else-if>
</choose>
@@ -889,10 +990,9 @@
</group>
</macro>
<macro name="bracketed-intext">
- <!-- TODO: Add new item types -->
<group prefix="[" suffix="]">
<choose>
- <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+ <if variable="reviewed-title" match="any">
<group delimiter=" ">
<text term="review-of" text-case="capitalize-first"/>
<text macro="reviewed-title-intext"/>
@@ -937,14 +1037,80 @@
</choose>
</group>
</macro>
+ <macro name="reviewed-item">
+ <!-- Reviewed item -->
+ <group delimiter="; ">
+ <group delimiter=", ">
+ <group delimiter=" ">
+ <choose>
+ <if variable="reviewed-genre">
+ <group delimiter=" ">
+ <text term="review-of" form="long" text-case="capitalize-first"/>
+ <text variable="reviewed-genre" text-case="lowercase"/>
+ </group>
+ </if>
+ <!-- If no `reviewed-genre`, assume that `genre` or `medium` is entered as 'Review of the book' or similar -->
+ <else-if variable="number" match="none">
+ <choose>
+ <if variable="genre">
+ <text variable="genre" text-case="capitalize-first"/>
+ </if>
+ <else-if variable="medium">
+ <text variable="medium" text-case="capitalize-first"/>
+ </else-if>
+ <else-if type="review-book">
+ <group delimiter=" ">
+ <text term="review-of" form="long" text-case="capitalize-first"/>
+ <text term="book" form="long" text-case="lowercase"/>
+ </group>
+ </else-if>
+ <else>
+ <text term="review-of" form="short" text-case="capitalize-first"/>
+ </else>
+ </choose>
+ </else-if>
+ <else>
+ <choose>
+ <if variable="medium">
+ <text variable="medium" text-case="capitalize-first"/>
+ </if>
+ <else-if type="review-book">
+ <group delimiter=" ">
+ <text term="review-of" form="long" text-case="capitalize-first"/>
+ <text term="book" form="long" text-case="lowercase"/>
+ </group>
+ </else-if>
+ <else>
+ <text term="review-of" form="short" text-case="capitalize-first"/>
+ </else>
+ </choose>
+ </else>
+ </choose>
+ <text macro="reviewed-title"/>
+ </group>
+ <names variable="reviewed-author">
+ <label form="verb-short" suffix=" "/>
+ <name and="symbol" initialize-with=". " delimiter=", "/>
+ </names>
+ </group>
+ <choose>
+ <if variable="genre" match="any">
+ <choose>
+ <if variable="number" match="none">
+ <text variable="medium" text-case="capitalize-first"/>
+ </if>
+ </choose>
+ </if>
+ </choose>
+ </group>
+ </macro>
<macro name="bracketed-container">
- <!-- TODO: Add new item types -->
<group prefix="[" suffix="]">
<choose>
- <if type="paper-conference speech" match="any">
+ <if type="event paper-conference performance speech" match="any">
<!-- Conference presentations should describe the session [container] in bracketed unless published in a proceedings -->
<choose>
- <if variable="collection-editor editor editorial-director issue page volume" match="none">
+ <if variable="collection-editor compiler editor editorial-director issue page volume" match="none">
<text macro="format"/>
</if>
</choose>
@@ -953,23 +1119,21 @@
<!-- For entries in mobile app reference works, place bracketed after the container-title -->
<text macro="format"/>
</else-if>
- <else-if type="report">
- <!-- For chapters in reports, place bracketed after the container title -->
+ <else-if type="document report standard">
+ <!-- For chapters in report, standards, and generic documents, place bracketed after the container title -->
<text macro="format"/>
</else-if>
</choose>
</group>
</macro>
<macro name="secondary-contributors">
- <!-- TODO: Add new item types -->
- <!-- TODO: Add new creator roles -->
<choose>
- <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+ <if type="article-journal article-magazine article-newspaper periodical post-weblog review review-book" match="any">
<text macro="secondary-contributors-periodical"/>
</if>
<else-if type="paper-conference">
<choose>
- <if variable="collection-editor editor editorial-director" match="any">
+ <if variable="collection-editor compiler editor editorial-director" match="any">
<text macro="secondary-contributors-booklike"/>
</if>
<else>
@@ -992,14 +1156,13 @@
</names>
</if>
</choose>
- <names variable="translator" delimiter="; ">
+ <names variable="translator narrator" delimiter="; ">
<name and="symbol" initialize-with=". " delimiter=", "/>
<label form="short" prefix=", " text-case="title"/>
</names>
</group>
</macro>
<macro name="secondary-contributors-booklike">
- <!-- TODO: Add new item types -->
<group delimiter="; ">
<choose>
<if variable="title">
@@ -1009,7 +1172,8 @@
</names>
</if>
</choose>
- <!-- TODO: When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
+ <!-- TODO: When editor-translator becomes available in processors, add a test:
+ variable="editor-translator" match="none"; then print translator -->
<choose>
<if type="post webpage" match="none">
<!-- Webpages treat container-title like publisher -->
@@ -1024,6 +1188,14 @@
<name and="symbol" initialize-with=". " delimiter=", "/>
<label form="short" prefix=", " text-case="title"/>
</names>
+ <names variable="illustrator narrator" delimiter="; ">
+ <name and="symbol" initialize-with=". " delimiter=", "/>
+ <label form="short" prefix=", " text-case="title"/>
+ </names>
+ <names variable="compiler chair organizer curator series-creator executive-producer" delimiter="; ">
+ <name and="symbol" initialize-with=". " delimiter=", "/>
+ <label form="long" prefix=", " text-case="title"/>
+ </names>
</group>
</if>
</choose>
@@ -1038,6 +1210,14 @@
<name and="symbol" initialize-with=". " delimiter=", "/>
<label form="short" prefix=", " text-case="title"/>
</names>
+ <names variable="illustrator narrator" delimiter="; ">
+ <name and="symbol" initialize-with=". " delimiter=", "/>
+ <label form="short" prefix=", " text-case="title"/>
+ </names>
+ <names variable="compiler chair organizer curator series-creator executive-producer" delimiter="; ">
+ <name and="symbol" initialize-with=". " delimiter=", "/>
+ <label form="long" prefix=", " text-case="title"/>
+ </names>
</group>
</else>
</choose>
@@ -1047,13 +1227,11 @@
<choose>
<if variable="archive-place" match="none">
<!-- With `archive-place`: physical archives. Without: online archives. -->
- <!-- TODO: Add archive_collection -->
<text variable="archive_location"/>
</if>
</choose>
</macro>
<macro name="number">
- <!-- TODO: Add new item types -->
<choose>
<if variable="number">
<group delimiter=", ">
@@ -1079,12 +1257,11 @@
</choose>
</macro>
<macro name="locators-booklike">
- <!-- TODO: Add new item types -->
<choose>
- <if type="article-journal article-magazine article-newspaper broadcast interview patent post post-weblog review review-book speech webpage" match="any"/>
+ <if type="article-journal article-magazine article-newspaper broadcast event interview patent performance periodical post post-weblog review review-book speech webpage" match="any"/>
<else-if type="paper-conference">
<choose>
- <if variable="collection-editor editor editorial-director" match="any">
+ <if variable="collection-editor compiler editor editorial-director" match="any">
<group delimiter=", ">
<text macro="version"/>
<text macro="edition"/>
@@ -1129,23 +1306,26 @@
</choose>
</macro>
<macro name="volume-booklike">
- <!-- TODO: Add new item types -->
<group delimiter=", ">
<!-- Report series [ex. 52] -->
<choose>
- <if type="report">
+ <if type="document report standard">
<group delimiter=" ">
<text variable="collection-title" text-case="title"/>
<text variable="collection-number"/>
</group>
</if>
</choose>
+ <group delimiter=" ">
+ <label variable="supplement-number" text-case="capitalize-first"/>
+ <text variable="supplement-number"/>
+ </group>
<choose>
<if variable="volume" match="any">
- <!-- TODO: Update using volume-title -->
<choose>
<!-- Non-numeric volumes are already printed as part of the book title -->
- <if is-numeric="volume" match="none"/>
+ <if variable="volume-title"/>
+ <else-if is-numeric="volume" match="none"/>
<else>
<group delimiter=" ">
<label variable="volume" form="short" text-case="capitalize-first"/>
@@ -1176,7 +1356,8 @@
<choose>
<if variable="reviewed-title">
<!-- Not possible to distinguish TV series episode from other reviewed
- works [Ex. 69] -->
+ works without reviewed-container-title [Ex. 69] -->
+ <!-- Adapt for reviewed-container-title if that becomes available -->
<text variable="reviewed-title" font-style="italic"/>
</if>
<else>
@@ -1188,7 +1369,9 @@
<macro name="reviewed-title-intext">
<choose>
<if variable="reviewed-title">
- <!-- Not possible to distinguish TV series episode from other reviewed works [Ex. 69] -->
+ <!-- Not possible to distinguish TV series episode from other reviewed
+ works without reviewed-container-title [Ex. 69] -->
+ <!-- Adapt for reviewed-container-title if that becomes available -->
<text variable="reviewed-title" form="short" font-style="italic" text-case="title"/>
</if>
<else>
@@ -1198,7 +1381,6 @@
</choose>
</macro>
<macro name="format">
- <!-- TODO: Add new item types -->
<choose>
<if variable="genre medium" match="any">
<group delimiter="; ">
@@ -1210,31 +1392,12 @@
<text variable="medium" text-case="capitalize-first"/>
</group>
</if>
- <!-- Generic labels for specific types -->
- <!-- TODO: Add terms for other types? -->
- <else-if type="dataset">
- <text term="dataset"/>
- </else-if>
- <else-if type="software">
- <text term="software" text-case="capitalize-first"/>
- </else-if>
- <else-if type="interview personal_communication" match="any">
- <choose>
- <if variable="archive container-title DOI publisher URL" match="none">
- <text term="personal-communication" text-case="capitalize-first"/>
- </if>
- <else-if type="interview">
- <text term="interview" text-case="capitalize-first"/>
- </else-if>
- </choose>
- </else-if>
- <else-if type="map">
- <text term="map" text-case="capitalize-first"/>
- </else-if>
+ <else>
+ <text macro="generic-type-label"/>
+ </else>
</choose>
</macro>
<macro name="format-intext">
- <!-- TODO: Add new item types -->
<choose>
<if variable="genre" match="any">
<text variable="genre" text-case="capitalize-first"/>
@@ -1242,11 +1405,17 @@
<else-if variable="medium">
<text variable="medium" text-case="capitalize-first"/>
</else-if>
- <!-- Generic labels for specific types -->
- <!-- TODO: Add terms for other types? -->
- <else-if type="dataset">
- <text term="dataset"/>
- </else-if>
+ <else>
+ <text macro="generic-type-label"/>
+ </else>
+ </choose>
+ </macro>
+ <macro name="generic-type-label">
+ <!-- Generic labels for specific types -->
+ <choose>
+ <if type="dataset">
+ <text term="dataset" text-case="capitalize-first"/>
+ </if>
<else-if type="software">
<text term="software" text-case="capitalize-first"/>
</else-if>
@@ -1261,21 +1430,47 @@
</choose>
</else-if>
<else-if type="map">
- <text term="map"/>
+ <text term="map" text-case="capitalize-first"/>
+ </else-if>
+ <else-if type="collection">
+ <text term="collection" text-case="capitalize-first"/>
+ </else-if>
+ <else-if type="song">
+ <text term="song" text-case="capitalize-first"/>
+ </else-if>
+ <else-if type="motion_picture">
+ <text term="motion_picture" text-case="capitalize-first"/>
+ </else-if>
+ <else-if type="post">
+ <text term="post" text-case="capitalize-first"/>
+ </else-if>
+ <else-if type="review">
+ <text term="review" text-case="capitalize-first"/>
+ </else-if>
+ <else-if type="review-book">
+ <text term="review-book" text-case="capitalize-first"/>
+ </else-if>
+ <else-if type="broadcast">
+ <text term="broadcast" text-case="capitalize-first"/>
+ </else-if>
+ <else-if type="figure">
+ <text term="figure" text-case="capitalize-first"/>
+ </else-if>
+ <else-if type="graphic">
+ <text term="graphic" text-case="capitalize-first"/>
</else-if>
</choose>
</macro>
<!-- APA 'source' element contains four parts:
container, event, publisher, access -->
<macro name="container">
- <!-- TODO: Add new item types -->
<choose>
- <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+ <if type="article-journal article-magazine article-newspaper periodical post-weblog review review-book" match="any">
<!-- Periodical items -->
<text macro="container-periodical"/>
</if>
<else-if type="paper-conference">
- <!-- Determine if paper-conference is a periodical or booklike -->
+ <!-- Determine if paper-conference is a periodical- or book-like -->
<choose>
<if variable="editor editorial-director collection-editor container-author" match="any">
<text macro="container-booklike"/>
@@ -1309,7 +1504,6 @@
<choose>
<if variable="number">
<!-- Ex. 6: Journal article with article number or eLocator -->
- <!-- This should be localized -->
<group delimiter=" ">
<text term="article-locator" text-case="capitalize-first"/>
<text variable="number"/>
@@ -1323,8 +1517,8 @@
<choose>
<if variable="issued">
<choose>
- <if variable="issue page volume" match="none">
- <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
+ <if variable="issue number page volume" match="none">
+ <!-- We print the status variable directly rather than using in-press, etc. terms. -->
<text variable="status" text-case="capitalize-first"/>
</if>
</choose>
@@ -1333,33 +1527,54 @@
</group>
</macro>
<macro name="container-booklike">
- <!-- TODO: Add new item types -->
<choose>
<if variable="container-title" match="any">
<group delimiter=" ">
- <text term="in" text-case="capitalize-first"/>
+ <choose>
+ <if type="song">
+ <text term="on" text-case="capitalize-first"/>
+ </if>
+ <else>
+ <text term="in" text-case="capitalize-first"/>
+ </else>
+ </choose>
<group delimiter=", ">
- <names variable="editor translator" delimiter=", &amp; ">
- <!-- TODO: Change to editortranslator and move editor to substitute -->
+ <names variable="series-creator executive-producer" delimiter=", &amp; ">
<name and="symbol" initialize-with=". " delimiter=", "/>
- <label form="short" text-case="title" prefix=" (" suffix=")"/>
+ <label form="long" text-case="title" prefix=" (" suffix=")"/>
<substitute>
- <names variable="editorial-director"/>
- <names variable="collection-editor"/>
+ <names variable="editor-translator">
+ <name and="symbol" initialize-with=". " delimiter=", "/>
+ <label form="short" text-case="title" prefix=" (" suffix=")"/>
+ </names>
+ <!-- TODO: Split editor and translator lines once processors start to automatically
+ create editor-translator variable. -->
+ <names variable="editor translator">
+ <name and="symbol" initialize-with=". " delimiter=", "/>
+ <label form="short" text-case="title" prefix=" (" suffix=")"/>
+ </names>
+ <names variable="editorial-director">
+ <name and="symbol" initialize-with=". " delimiter=", "/>
+ <label form="short" text-case="title" prefix=" (" suffix=")"/>
+ </names>
+ <names variable="compiler"/>
+ <choose>
+ <if type="event performance speech" match="any">
+ <names variable="chair"/>
+ <names variable="organizer"/>
+ </if>
+ </choose>
+ <names variable="curator"/>
+ <names variable="collection-editor">
+ <name and="symbol" initialize-with=". " delimiter=", "/>
+ <label form="short" text-case="title" prefix=" (" suffix=")"/>
+ </names>
<names variable="container-author"/>
</substitute>
</names>
<group delimiter=": " font-style="italic">
<text variable="container-title"/>
- <!-- TODO: Replace with volume-title -->
- <choose>
- <if is-numeric="volume" match="none">
- <group delimiter=" ">
- <label variable="volume" form="short" text-case="capitalize-first"/>
- <text variable="volume"/>
- </group>
- </if>
- </choose>
+ <text macro="volume-title"/>
</group>
</group>
<text macro="parenthetical-container"/>
@@ -1369,7 +1584,6 @@
</choose>
</macro>
<macro name="publisher">
- <!-- TODO: Add new item types -->
<group delimiter="; ">
<choose>
<if type="thesis">
@@ -1377,6 +1591,9 @@
<if variable="archive DOI URL" match="none">
<text variable="publisher"/>
</if>
+ <else>
+ <text variable="archive"/>
+ </else>
</choose>
</if>
<else-if type="post webpage" match="any">
@@ -1389,12 +1606,12 @@
<else-if type="paper-conference">
<!-- For paper-conference, don't print publisher if in a journal-like proceedings -->
<choose>
- <if variable="collection-editor editor editorial-director" match="any">
+ <if variable="collection-editor compiler editor editorial-director" match="any">
<text variable="publisher"/>
</if>
</choose>
</else-if>
- <else-if type="article-journal article-magazine article-newspaper post-weblog" match="none">
+ <else-if type="article-journal article-magazine article-newspaper periodical post-weblog review review-book" match="none">
<text variable="publisher"/>
</else-if>
</choose>
@@ -1404,15 +1621,27 @@
<!-- With `archive-place`: physical archives. Without: online archives. -->
<!-- For physical archives, print the location before the archive name.
For electronic archives, these are printed in macro="description". -->
- <!-- TODO: Split "archive_location" into "archive_collection" and "archive_location" -->
<!-- Must test for archive_collection:
With collection: archive_collection (archive_location), archive, archive-place
No collection: archive (archive_location), archive-place
-->
- <text variable="archive_location"/>
+ <choose>
+ <if variable="archive_collection">
+ <group delimiter=" ">
+ <text variable="archive_collection"/>
+ <text variable="archive_location" prefix="(" suffix=")"/>
+ </group>
+ <text variable="archive"/>
+ </if>
+ <else>
+ <group delimiter=" ">
+ <text variable="archive"/>
+ <text variable="archive_location" prefix="(" suffix=")"/>
+ </group>
+ </else>
+ </choose>
</if>
</choose>
- <text variable="archive"/>
<text variable="archive-place"/>
</group>
</group>
@@ -1439,19 +1668,30 @@
</choose>
</macro>
<macro name="event">
- <!-- TODO: Add new item types (e.g., event, collection, performance) -->
<choose>
<if variable="event event-title" match="any">
<!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
both publisher-place and event-place. Remove this 'choose' when that is changed. -->
<choose>
- <if variable="collection-editor editor editorial-director issue page volume" match="none">
- <!-- Don't print event info if published in a proceedings -->
+ <if type="paper-conference">
+ <choose>
+ <if variable="collection-editor compiler editor editorial-director issue page volume" match="none">
+ <!-- Don't print event info for conference papers published in a proceedings -->
+ <group delimiter=", ">
+ <text macro="event-title"/>
+ <text variable="event-place"/>
+ </group>
+ </if>
+ </choose>
+ </if>
+ <else>
+ <!-- For other item types, print event info even if published (e.g., for collection catalogs, performance programs.
+ These items aren't given explicit examples in the APA manual, so err on the side of providing too much information. -->
<group delimiter=", ">
<text macro="event-title"/>
<text variable="event-place"/>
</group>
- </if>
+ </else>
</choose>
</if>
</choose>
@@ -1472,19 +1712,30 @@
</macro>
<!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
<macro name="publication-history">
- <!-- TODO: Add new item types -->
<choose>
- <if type="patent" match="none">
- <group prefix="(" suffix=")">
+ <if type="patent">
+ <text variable="references" prefix="(" suffix=")"/>
+ </if>
+ <else>
+ <group delimiter="; " prefix="(" suffix=")">
+ <!-- Print `status` here for things like "retracted" if it's not printed elsewhere already. -->
+ <choose>
+ <if variable="issued">
+ <choose>
+ <if variable="issue number page volume" match="any">
+ <text variable="status" text-case="capitalize-first"/>
+ </if>
+ </choose>
+ </if>
+ </choose>
<choose>
<if variable="references">
<!-- This provides the option for more elaborate description
- of publication history, such as full "reprinted" references
- (examples 11, 43, 44) or retracted references -->
+ of publication history, such as full "reprinted" references
+ (examples 11, 43, 44) -->
<text variable="references"/>
</if>
<else>
- <!-- TODO: Replace these with terms -->
<group delimiter=" ">
<text term="original-work-published" text-case="capitalize-first"/>
<choose>
@@ -1499,9 +1750,6 @@
</else>
</choose>
</group>
- </if>
- <else>
- <text variable="references" prefix="(" suffix=")"/>
</else>
</choose>
</macro>
@@ -1510,24 +1758,24 @@
<!-- `treaty`: for treaties -->
<!-- `legal_case`: for all legal and court cases -->
<!-- `bill`: for bills, resolutions, federal reports -->
- <!-- `hearing`: TODO for hearings and testimony -->
+ <!-- `hearing`: for hearings and testimony -->
<!-- `legislation`: for statutes, constitutional items, and charters -->
- <!-- `regulation`: TODO codified regulations, uncodified regulations, executive orders -->
+ <!-- `regulation`: codified regulations, uncodified regulations, executive orders -->
<group delimiter=" ">
<choose>
<if type="treaty">
<group delimiter=", " suffix=".">
<!-- APA generally defers to Bluebook for legal citations, but diverges without
- explanation for treaty items. We follow the Bluebook format that was used
+ explanation for treaty items. We follow the Bluebook format that was used
in APA 6th ed. -->
- <!-- APA manual omits treaty parties/authors, but per Bluebook
+ <!-- APA manual omits treaty parties/authors, but per Bluebook
they should be included at least for bilateral treaties. -->
<names variable="author">
<name initialize-with="." form="short" delimiter="-"/>
</names>
<text macro="date-legal"/>
- <!-- APA manual omits treaty source/report called for by Bluebook in favor of just URL.
- Both are included here, following the APA style used for all other item types
+ <!-- APA manual omits treaty source/report called for by Bluebook in favor of just URL.
+ Both are included here, following the APA style used for all other item types
to end the reference with a period, then give the URL afterward. -->
<text macro="container-legal"/>
</group>
@@ -1553,7 +1801,7 @@
<text variable="title" text-case="title"/>
</if>
<else-if type="hearing">
- <!-- APA uses a comma delimiter and omits "hearing before the" for hearings with testimony,
+ <!-- APA uses a comma delimiter and omits "hearing before the" for hearings with testimony,
but follows Bluebook rules (colon delimiter, prefix before the committee name) for
references to the whole hearing. We simply follow the Bluebook rules for both, but
use APA style capitalization (not capitalizing "Before" or the title of the hearing). -->
@@ -1609,14 +1857,14 @@
</group>
<choose>
<if variable="issued">
- <!-- APA manual includes "rev." before the revision year,
+ <!-- APA manual includes "rev." before the revision year,
but this isn't part of the Bluebook rules. -->
<date variable="issued">
<date-part name="year"/>
</date>
</if>
<else>
- <!-- Show proposal date for uncodified regualtions.
+ <!-- Show proposal date for uncodified regualtions.
Assume date is entered literally ala "proposed May 23, 2016".
TODO: Add 'proposed' term here if that becomes available -->
<date variable="submitted" form="text"/>
@@ -1682,10 +1930,10 @@
<text variable="genre"/>
<group delimiter=" ">
<choose>
- <!-- TODO: What was the logic for this? Do we still need this? -->
- <!-- If there is no session number or code/record title, print number.
- Is that trying to capture congressional reports/documents? -->
+ <!-- If there is no session number or code/record title, assume
+ assume the item is a congressional report and include 'No.' term. -->
<if variable="chapter-number container-title" match="none">
+ <!-- The item is a congressional report, rather than a bill or resultion. -->
<label variable="number" form="short" text-case="capitalize-first"/>
</if>
</choose>
@@ -1789,14 +2037,14 @@
</choose>
</macro>
<macro name="citation-locator">
- <!-- TODO: Add new locator types? -->
+ <!-- Abbreviate page and paragraph, leave other locator labels in long form, cf. Rule 8.13 -->
<group delimiter=" ">
<choose>
- <if locator="chapter">
- <label variable="locator" text-case="capitalize-first"/>
+ <if locator="page paragraph" match="any">
+ <label variable="locator" form="short"/>
</if>
<else>
- <label variable="locator" form="short"/>
+ <label variable="locator" text-case="capitalize-first"/>
</else>
</choose>
<text variable="locator"/>
@@ -1827,17 +2075,9 @@
</sort>
<layout>
<choose>
- <!-- TODO: Add new item types -->
<if type="bill hearing legal_case legislation regulation treaty" match="any">
<!-- Legal items have different orders and delimiters -->
- <choose>
- <if variable="DOI URL" match="any">
- <text macro="legal-cites"/>
- </if>
- <else>
- <text macro="legal-cites" suffix="."/>
- </else>
- </choose>
+ <text macro="legal-cites"/>
</if>
<else>
<group delimiter=" ">
diff --git a/Master/texmf-dist/tex/latex/citation-style-language/styles/ieee.csl b/Master/texmf-dist/tex/latex/citation-style-language/styles/ieee.csl
index 9ac71c63eaf..98b666b83e9 100644
--- a/Master/texmf-dist/tex/latex/citation-style-language/styles/ieee.csl
+++ b/Master/texmf-dist/tex/latex/citation-style-language/styles/ieee.csl
@@ -44,8 +44,8 @@
<category citation-format="numeric"/>
<category field="engineering"/>
<category field="generic-base"/>
- <summary>IEEE style as per the 2021 guidelines, V 01.29.2021.</summary>
- <updated>2024-01-11T14:39:58-05:00</updated>
+ <summary>IEEE style as per the 2023 guidelines, V 11.29.2023.</summary>
+ <updated>2024-07-15T10:30:07-04:00</updated>
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
</info>
<locale xml:lang="en">
@@ -56,6 +56,7 @@
</date>
<terms>
<term name="chapter" form="short">ch.</term>
+ <term name="chapter-number" form="short">ch.</term>
<term name="presented at">presented at the</term>
<term name="available at">available</term>
</terms>
@@ -120,6 +121,7 @@
<substitute>
<names variable="editor"/>
<names variable="translator"/>
+ <text macro="director"/>
</substitute>
</names>
</macro>
@@ -129,6 +131,12 @@
<label form="short" prefix=", " text-case="capitalize-first"/>
</names>
</macro>
+ <macro name="director">
+ <names variable="director">
+ <name and="text" et-al-min="7" et-al-use-first="1" initialize-with=". "/>
+ <et-al font-style="italic"/>
+ </names>
+ </macro>
<macro name="locators">
<group delimiter=", ">
<text macro="edition"/>
@@ -148,7 +156,7 @@
</macro>
<macro name="title">
<choose>
- <if type="bill book graphic legal_case legislation motion_picture song" match="any">
+ <if type="bill book graphic legal_case legislation motion_picture song standard software" match="any">
<text variable="title" font-style="italic"/>
</if>
<else>
@@ -374,6 +382,10 @@
<text macro="collection"/>
<text macro="publisher"/>
<text macro="issued"/>
+ <group delimiter=" ">
+ <label variable="chapter-number" form="short"/>
+ <text variable="chapter-number"/>
+ </group>
<text macro="page"/>
</group>
<text macro="access"/>
@@ -399,6 +411,26 @@
</group>
<text macro="access"/>
</else-if>
+ <else-if type="software">
+ <group delimiter=". " suffix=".">
+ <text macro="title"/>
+ <text macro="issued" prefix="(" suffix=")"/>
+ <text variable="genre"/>
+ <text macro="publisher"/>
+ </group>
+ <text macro="access"/>
+ </else-if>
+ <else-if type="article">
+ <group delimiter=", " suffix=".">
+ <text macro="title"/>
+ <text macro="issued"/>
+ <group delimiter=": ">
+ <text macro="publisher" font-style="italic"/>
+ <text variable="number"/>
+ </group>
+ </group>
+ <text macro="access"/>
+ </else-if>
<else-if type="webpage post-weblog post" match="any">
<group delimiter=", " suffix=".">
<text macro="title"/>
@@ -423,6 +455,18 @@
</group>
<text macro="access"/>
</else-if>
+ <else-if type="standard">
+ <group delimiter=", " suffix=".">
+ <text macro="title"/>
+ <group delimiter=" ">
+ <text variable="genre"/>
+ <text variable="number"/>
+ </group>
+ <text macro="geographic-location"/>
+ <text macro="issued"/>
+ </group>
+ <text macro="access"/>
+ </else-if>
<!-- Generic/Fallback Formats -->
<else-if type="bill book graphic legal_case legislation report song" match="any">
<group delimiter=", " suffix=". ">
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 ec78eb3ab06..1d4c0f01c12 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
@@ -32,7 +32,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2021/06/01]
\ProvidesClass{cjs-rcs-article}%
-[2024/07/14 v1.1 Article class for The Canadian Journal of
+[2024/07/30 v1.1a 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?
@@ -176,12 +176,12 @@
\def\CJS@journalname@en{The Canadian Journal of Statistics}
\def\CJS@journalname@fr{La revue canadienne de statistique}
\def\CJS@journalname{\CJS@journalname@en~{\textbar}~\CJS@journalname@fr}
-\setbox\z@=\vbox{\sffamily\hbox{\CJS@journalname}\hbox{\bfseries V,}}
\newsavebox\CJS@journalornament
\setbox\CJS@journalornament=\vbox{%
+ \setbox\z@=\vbox{\sffamily\hbox{\CJS@journalname}\hbox{\bfseries V,}}
\setbox\tw@\hbox{\vrule \@width4pt\@height\ht\z@\@depth\dp\z@}
- \hbox{\textcolor{CJSpink}{\copy\tw@}\kern2pt%
- \textcolor{CJSred}{\copy\tw@}\kern2pt%
+ \hbox{\textcolor{CJSpink}{\copy\tw@}\kern2pt
+ \textcolor{CJSred}{\copy\tw@}\kern2pt
\textcolor{CJSyellow}{\copy\tw@}\kern6pt}}
\newcommand*\makejournalinfo{%
\mbox{%
@@ -576,41 +576,42 @@
\setbox\CJS@licencebox=\vbox{%
\CJS@setlicencefont
\ifCJS@specialack\CJS@specialackstatement\fi
- \ifdefempty{\CJS@licence}{\CJS@licencesample}{\CJS@licence}}
+ \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}
+\def\CJS@fakern{\kern0.1em}
\def\ccby@{\mbox{%
- \faCreativeCommons\kern0.1em%
- \faCreativeCommonsBy\kern0.1em}}
+ \faCreativeCommons\CJS@fakern
+ \faCreativeCommonsBy\CJS@fakern}}
\newcommand*\ccbysa{\ccbysa@\@ifstar{~\faCopyright[regular]}\relax}
\def\ccbysa@{\mbox{%
- \faCreativeCommons\kern0.1em%
- \faCreativeCommonsBy\kern0.1em%
+ \faCreativeCommons\CJS@fakern
+ \faCreativeCommonsBy\CJS@fakern
\faCreativeCommonsSa}}
\newcommand*\ccbync{\ccbync@\@ifstar{~\faCopyright[regular]}\relax}
\def\ccbync@{\mbox{%
- \faCreativeCommons\kern0.1em%
- \faCreativeCommonsBy\kern0.1em%
+ \faCreativeCommons\CJS@fakern
+ \faCreativeCommonsBy\CJS@fakern
\faCreativeCommonsNc}}
\newcommand*\ccbyncsa{\ccbyncsa@\@ifstar{~\faCopyright[regular]}\relax}
\def\ccbyncsa@{\mbox{%
- \faCreativeCommons\kern0.1em%
- \faCreativeCommonsBy\kern0.1em%
- \faCreativeCommonsNc\kern0.1em%
+ \faCreativeCommons\CJS@fakern
+ \faCreativeCommonsBy\CJS@fakern
+ \faCreativeCommonsNc\CJS@fakern
\faCreativeCommonsSa}}
\newcommand*\ccbynd{\ccbynd@\@ifstar{~\faCopyright[regular]}\relax}
\def\ccbynd@{\mbox{%
- \faCreativeCommons\kern0.1em%
- \faCreativeCommonsBy\kern0.1em%
+ \faCreativeCommons\CJS@fakern
+ \faCreativeCommonsBy\CJS@fakern
\faCreativeCommonsNd}}
\newcommand*\ccbyncnd{\ccbyncnd@\@ifstar{~\faCopyright[regular]}\relax}
\def\ccbyncnd@{\mbox{%
- \faCreativeCommons\kern0.1em%
- \faCreativeCommonsBy\kern0.1em%
- \faCreativeCommonsNc\kern0.1em%
+ \faCreativeCommons\CJS@fakern
+ \faCreativeCommonsBy\CJS@fakern
+ \faCreativeCommonsNc\CJS@fakern
\faCreativeCommonsNd}}
\let\Pr\relax
\DeclareMathOperator{\Pr}{P}
@@ -672,7 +673,7 @@
\theoremstyle{remark}
\newtheorem{remark}{\iflanguage{french}{\CJS@remarkname@fr}{\CJS@remarkname@en}}
\renewcommand*\eqref[1]{\hyperref[{#1}]{\textup{(\ref*{#1})}}}
-\newcommand*\proglang[1]{{\hyphenchar\font=-1 #1}}
+\newrobustcmd*\proglang[1]{\mbox{#1}}
\newcommand*\Rlang{\proglang{R}}
\newcommand*\SASlang{\proglang{SAS}}
\newcommand*\SPSSlang{\proglang{SPSS}}
@@ -770,13 +771,13 @@
\item[\iflanguage{french}{\CJS@acceptedname@fr}{\CJS@acceptedname@en}]
\DTMusedate{accepted}}{\relax}%
\end{CJS@historylist}\par}
-\setbox\@ne=\vbox{\hbox{\firaoldstyle\small l4}}
\newsavebox\CJS@historyornament
\setbox\CJS@historyornament=\vbox{%
- \setbox\thr@@\hbox{\vrule \@width1.5pt\@height\ht\@ne\@depth\dp\@ne}
- \hbox{\textcolor{CJSpink}{\copy\thr@@}\kern.75pt%
- \textcolor{CJSred}{\copy\thr@@}\kern.75pt%
- \textcolor{CJSyellow}{\copy\thr@@}\kern3pt}}
+ \setbox\z@=\vbox{\hbox{\firaoldstyle\small l4}}
+ \setbox\tw@\hbox{\vrule \@width1.5pt\@height\ht\z@\@depth\dp\z@}
+ \hbox{\textcolor{CJSpink}{\copy\tw@}\kern.75pt
+ \textcolor{CJSred}{\copy\tw@}\kern.75pt
+ \textcolor{CJSyellow}{\copy\tw@}\kern3pt}}
\def\CJS@historybox{
\par\addvspace{2\baselineskip}\noindent%
\smash{\box\CJS@historyornament \CJS@history}\par%
diff --git a/Master/texmf-dist/tex/latex/dashrulex/dashrulex.sty b/Master/texmf-dist/tex/latex/dashrulex/dashrulex.sty
index 915d61a0d1e..090cfe2931f 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/18}{1.01a}
{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/doibanner/doibanner.sty b/Master/texmf-dist/tex/latex/doibanner/doibanner.sty
new file mode 100644
index 00000000000..986b52ad11e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/doibanner/doibanner.sty
@@ -0,0 +1,98 @@
+%%
+%% This is file `doibanner.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% doibanner.dtx (with options: `package')
+%%
+%% Copyright (C) 2024 Christian Schreinemachers
+%%
+%% 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
+%%
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The current maintainer of this work is
+%% Christian Schreinemachers.
+%%
+%% This work consists of the files
+%% doibanner.dtx
+%% doibanner.ins
+%% and the derived files
+%% doibanner.sty
+%% doibanner.pdf
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{doibanner}
+ [2024-07-28 v0.3 Generate DOI banners and links]
+\RequirePackage{adjustbox}
+\RequirePackage{hyperref}
+\RequirePackage{tikz}
+\definecolor{leftcolor}{RGB}{82,82,82}
+\definecolor{rightcolor}{RGB}{6,119,183}
+\definecolor{toptextcolor}{RGB}{235,235,235}
+\definecolor{bottomtextcolor}{RGB}{59,59,59}
+\tikzstyle{toptextstyle} = [
+ font=\fontfamily{\sfdefault}\selectfont\bfseries\Large,toptextcolor]
+\tikzstyle{bottomtextstyle} = [
+ font=\fontfamily{\sfdefault}\selectfont\bfseries\Large,bottomtextcolor]
+\DeclareKeys[@doibanner]{
+ label.store = \@doibanner@label,
+ label.usage = load,
+ urlbase.store = \@doibanner@urlbase,
+ urlbase.usage = load,
+ width.store = \@doibanner@width,
+ width.usage = load,
+}
+\SetKeys[@doibanner]{
+ label=DOI,
+ urlbase=https://doi.org/,
+ width=3.6cm,
+}
+\ProcessKeyOptions[@doibanner]\relax
+\NewDocumentCommand\doiurl{s m}{%
+ \IfBooleanTF#1
+ {\@doibanner@urlbase#2}%
+ {\href{\@doibanner@urlbase#2}{#2}}%
+}
+\NewDocumentCommand\@doibanner@draw{o m}{%
+ \adjustbox{#1}{%
+ \begin{tikzpicture}
+ \fill [leftcolor,draw]
+ (1.5,0) --
+ ++(0,.8) {[rounded corners=5] --
+ ++(-1.5,0) --
+ ++(0,-.8)} --
+ cycle
+ {};
+ \node[bottomtextstyle] at (.75,.35) {\@doibanner@label};
+ \node[toptextstyle] at (.75,.4) {\@doibanner@label};
+ \fill [rightcolor,draw]
+ (1.5,0) {[rounded corners=5] --
+ ++(6.5,0) --
+ ++(0,.8)} --
+ ++(-6.5,0) --
+ cycle
+ {};
+ \node[bottomtextstyle] at (4.75,.35) {#2};
+ \node[toptextstyle] at (4.75,.4) {#2};
+ \end{tikzpicture}%
+ }%
+}
+\NewDocumentCommand\doibanner{s O{width=\@doibanner@width} m}{%
+ \IfBooleanTF#1
+ {\@doibanner@draw[#2]{#3}}%
+ {\href{\@doibanner@urlbase#3}{\@doibanner@draw[#2]{#3}}}%
+}
+\endinput
+%%
+%% End of file `doibanner.sty'.
diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty
index d8cb268a644..2fdd6f8693b 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/07/15}{2024cs}
+\ProvidesExplPackage{easybase}{2024/08/08}{2024di}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -32,7 +32,7 @@
\cs_generate_variant:Nn \seq_set_from_clist:Nn { No }
\cs_generate_variant:Nn \ctex_define:nn { nx }
\cs_generate_variant:Nn \eb_set_hyperref:n { x }
-\cs_generate_variant:Nn \eb_at_begin_environment:nn { on }
+\cs_generate_variant:Nn \eb_at_begin_environment:nn { o }
\cs_generate_variant:Nn \tl_if_novalue:nF { V }
\cs_set_protected:Npn \ctex_define:nn #1
@@ -51,7 +51,7 @@
\clist_map_inline:nn {#1}
{ \AtBeginEnvironment{##1}{#2} }
}
-\cs_new_protected:Npn \eb_at_end_preamble:n
+\cs_set_protected:Npn \ctex_before_end_preamble:n
{ \BeforeBeginEnvironment{document} }
\cs_new_protected:Npn \eb_if_package_loaded:nnF #1#2#3
{
@@ -171,9 +171,9 @@
\seq_set_from_clist:Nn \l__eb_module_paths_seq
{
- tools,font,space,
- bib,thmt,toc,
- hdr,float,ref,geo
+ tools,font,space,bib,
+ thmt,toc,hdr,float,
+ ref,geo,cap
}
\seq_map_inline:Nn \l__eb_module_paths_seq
{
@@ -228,7 +228,6 @@
\ebloadpackage
{
[text]{spbmark},
- [normalem]{ulem},
[{shortlabels,inline}]{enumitem},
chemformula,siunitx,pifont,
geometry,marginnote,
@@ -597,7 +596,7 @@
\str_case:nnF {#1}
{
{ bottom }
- { \bool_set_true:N \l__eb_fnpara_bottom_bool }
+ { \PushFntBottom }
{ flush }
{
\tl_set:Nn \l__eb_footnote_value_tl { plain }
@@ -630,7 +629,6 @@
}
}
-\bool_new:N \l__eb_fnpara_bottom_bool
\tl_new:N \l__eb_fnmarktext_format_tl
\tl_new:N \l__eb_fncustom_format_tl
\clist_new:N \l__eb_footnote_value_clist
@@ -678,7 +676,7 @@
unknown .code:n = \eb_msg_deprecated_option:n { hdr }
}
-\eb_at_end_preamble:n
+\ctex_before_end_preamble:n
{
\bool_if:NT \l__eb_chap_counter_withpart_bool
{ \counterwithin*{chapter}{part} }
@@ -688,58 +686,91 @@
{ page } { \counterwithin*{footnote}{page} }
}
{ \counterwithout*{footnote}{chapter} }
- \eb_fnpara_if_pos_bottom:
}
-\cs_new_protected:Npn \setspread #1 { \linespread{#1}\selectfont }
-\cs_new:Npn \eb@ifvoid #1#2#3 { \ifvoid #1#2\else #3\fi }
-\cs_new_protected:Npn \eb_fnpara_if_pos_bottom:
+
+\def\@if@footnotes@TF #1#2 {\ifvoid\footins #2\else #1\fi}
+\def\@outputbox@removebskip
{
- \bool_if:NT \l__eb_fnpara_bottom_bool
+ \ifx\@textbottom\relax\else
+ \@outputbox@append
+ {
+ \@tempskipa\lastskip
+ \ifnum\gluestretchorder\@tempskipa>\z@
+ \vskip -\@tempskipa
+ \xdef\@outputbox@reinsertbskip
+ {\noexpand\@outputbox@append{\vskip\the\@tempskipa}}
+ \else
+ \global\let\@outputbox@reinsertbskip\relax
+ \fi
+ }
+ \fi
+ }
+\let\@outputbox@reinsertbskip\relax
+\def\@outputbox@append #1
+ {
+ \setbox\@outputbox\vbox
{
- \IfPackageLoadedTF{footmisc}
- {\msg_warning:nn { easybase } { bottom-not-compatible }}
+ \boxmaxdepth\@maxdepth
+ \dimen@\dp\@outputbox
+ \unvbox\@outputbox
+ #1
+ }
+ }
+\def\@outputbox@attachfloats{\@combinefloats}
+\NewHook{makecol/footins/before}
+\NewHook{makecol/footins/begin}
+\def\@outputbox@appendfootnotes
+ {
+ \@if@footnotes@TF
+ {
+ \UseHook{makecol/footins/before}
+ \@outputbox@append
{
- \cs_set:Npn \@makecol
- {
- \setbox\@outputbox\box\@cclv
- \let\@elt\relax
- \xdef\@freelist{\@freelist\@midlist}
- \global\let\@midlist\@empty
- \@combinefloats
- \eb@ifvoid\footins{}
- {
- \setbox\@outputbox\vbox
- {
- \boxmaxdepth\@maxdepth
- \unvbox\@outputbox
- \vfill\relax
- \vskip\skip\footins
- \color@begingroup
- \normalcolor\footnoterule
- \unvbox\footins
- \color@endgroup
- }
- }
- \eb@ifvoid\@kludgeins
- {\@makespecialcolbox}
- {
- \setbox\@outputbox\vbox to\@colht
- {
- \@texttop\dimen@\dp\@outputbox
- \unvbox\@outputbox
- \vskip -\dimen@\@textbottom
- }
- }
- \global\maxdepth\@maxdepth
- }
+ \vskip\skip\footins
+ \UseHook{makecol/footins/begin}
+ \color@begingroup
+ \normalcolor
+ \footnoterule
+ \@nameuse{pdfcolfoot@current}
+ \unvbox\footins
+ \color@endgroup
}
+ }{}
+ }
+\def\@makenormalcolbox
+ {
+ \setbox\@outputbox\vbox to\@colht
+ {
+ \@texttop
+ \dimen@\dp\@outputbox
+ \unvbox\@outputbox
+ \vskip -\dimen@
+ \@textbottom
}
}
-\msg_new:nnn { easybase } { bottom-not-compatible }
+\cs_new_protected:Npn \PushFntBottom
{
- Not~compatible~with~the~'footmisc'~package. \\
- Please~use~the~'bottom'~option~of~'footmisc'~package.
+ \cs_set:Npn \@makecol
+ {
+ \setbox\@outputbox\box\@cclv
+ \@outputbox@removebskip
+ \let\@elt\relax
+ \xdef\@freelist{\@freelist\@midlist}
+ \global\let\@midlist\@empty
+ \@outputbox@attachfloats
+ \@if@footnotes@TF
+ {\@outputbox@append{\vfill}}
+ {\@outputbox@reinsertbskip}
+ \@outputbox@appendfootnotes
+ \ifvbox\@kludgeins
+ \@makespecialcolbox
+ \else
+ \@makenormalcolbox
+ \fi
+ \global\maxdepth\@maxdepth
+ }
}
+\@onlypreamble\PushFntBottom
\cs_new_protected:Npn \eb_footnote_direct_hang:
{
@@ -795,6 +826,7 @@
\l__eb_fnpara_format_tl{#1}
\tl_if_eq:NnT \l__eb_footnote_value_tl { hang } { \par }
}
+\cs_new_protected:Npn \setspread #1 { \linespread{#1}\selectfont }
\clist_map_inline:nn { \@footnotetext,\@mpfootnotetext }
{
\eb_patch_cmd:Nnn #1
@@ -810,12 +842,12 @@
\ctex_at_end_package:nn { footmisc }
{
\eb_package_date_check:nn { footmisc } { 2022/02/10 }
- \boolfalse{FN@setspace}
- \ifbool{FN@para}{}
+ \ifboolexpr{not (bool {FN@para} or bool {FN@sidefn})}
{
+ \boolfalse{FN@setspace}
\cs_set_eq:NN \@makefntext \eb@@makefntext
\cs_set_eq:NN \@footnotetext \eb@@footnotetext
- }
+ }{}
\ifboolexpr
{
bool {FN@hangfoot} or
@@ -1129,29 +1161,32 @@
\ctex_define:nn { tools }
{
- hyphen-figure .tl_set:N = \l__eb_hyphen_figure_tl,
- hyphen-table .tl_set:N = \l__eb_hyphen_table_tl,
- hyphen-listing .tl_set:N = \l__eb_hyphen_listing_tl,
- hyphen-equation .tl_set:N = \l__eb_hyphen_equation_tl,
- hyphen-every .meta:n =
+ hyphen-figure .tl_set:N = \l__eb_hyphen_figure_tl,
+ hyphen-table .tl_set:N = \l__eb_hyphen_table_tl,
+ hyphen-lstlisting .tl_set:N = \l__eb_hyphen_lstlisting_tl,
+ hyphen-equation .tl_set:N = \l__eb_hyphen_equation_tl,
+ hyphen-every .meta:n =
{
- hyphen-figure = {#1},hyphen-table = {#1},
- hyphen-listing = {#1},hyphen-equation = {#1}
+ hyphen-figure = {#1},hyphen-table = {#1},
+ hyphen-lstlisting = {#1},hyphen-equation = {#1}
},
- hyphen-every .initial:n = .,
- unknown .code:n = \eb_msg_deprecated_option:n { tools }
+ hyphen-every .initial:n = .,
+ unknown .code:n = \eb_msg_deprecated_option:n { tools }
}
-\clist_map_inline:nn
- { figure,table,listing,equation }
+\AtBeginDocument
{
- \cs_set:cpn { the#1 }
+ \clist_map_inline:nn
+ { figure,table,lstlisting,equation }
{
- \int_compare:nNnT { \c@chapter } > { 0 }
+ \cs_set:cpn { the#1 }
{
- \thechapter
- \tl_use:c { l__eb_hyphen_#1_tl }
+ \int_compare:nNnT { \c@chapter } > { 0 }
+ {
+ \thechapter
+ \tl_use:c { l__eb_hyphen_#1_tl }
+ }
+ \int_to_arabic:v { c@#1 }
}
- \int_to_arabic:v { c@#1 }
}
}
@@ -1190,7 +1225,7 @@
\tl_set:Nn \eb@toc@title@level {#1}
\eb_toc_extract_level:
},
- level .initial:e =
+ level .initial:x =
{
\bool_if:NTF \l__eb_class_mode_book_bool
{ \exp_not:N \bichapter* }
@@ -1333,8 +1368,9 @@
{ \protect\numberline{#3}{#4} }
}
}
-\cs_new_protected:Npn \AllotCaptionExt #1#2
+\cs_new_protected:Npn \AssignCaptionExt #1#2
{ \tl_set:cn { ext@#1 } {#2} }
+\cs_set_eq:NN \AllotCaptionExt \AssignCaptionExt
\ctex_define:n
{
bicontentsname .tl_set:N = \bicontentsname,
@@ -1532,6 +1568,8 @@
hang .initial:n = true,
pagenumwd .code:n = \contentsmargin{#1},
pagenumwd .initial:n = 1.55em,
+ fileopen .tl_set:N = \l__eb_fileopen_type_tl,
+ fileopen .initial:n = once,
unknown .code:n = \eb_msg_deprecated_option:n { toc }
}
@@ -1560,10 +1598,14 @@
}
\AddToHook{enddocument/afterlastpage}
{
- \IfHookEmptyTF{starttoc/after}{}
- {\iow_now:Nn \@mainaux { \RemoveFromHook{starttoc/after}[aux] }}
+ \tl_if_eq:NnTF \l__eb_fileopen_type_tl { once }
+ { \iow_now:Nn \@mainaux { \RemoveFromHook{starttoc/after}[*] } }
+ {
+ \IfHookEmptyTF{starttoc/after}{}
+ {\iow_now:Nn \@mainaux { \RemoveFromHook{starttoc/after}[aux] }}
+ }
}
-\cs_set_protected:Npn \AllotPartialExt #1#2
+\cs_set_protected:Npn \AssignPartialExt #1#2
{
\tl_if_exist:cTF { ttl@partial#1 }
{ \msg_warning:nnnn { easybase } { repeated-ptoc } {#1} {#2} }
@@ -1573,12 +1615,13 @@
{\ttl@topartial{#1}{##1}{##2}}
}
}
+\cs_set_eq:NN \AllotPartialExt \AssignPartialExt
\msg_new:nnn { easybase } { repeated-ptoc }
{
Local~directory~file~'#2'~of~directory~type~'#1'~is \\
repeatedly~allocated.
}
-\AllotPartialExt{lol}{pll}
+\AssignPartialExt{lol}{pll}
\cs_new_protected:Npn \RegisterTitleIfname #1
{
@@ -1644,12 +1687,12 @@
}
},
subsection =
- { tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 3.8em } { 1.4em } }
+ { tocindent = \bool_if:NTF \l__eb_class_mode_book_bool { 3.8em } { 1.5em } }
}
\ctex_at_end_package:nn { imakeidx }
{
- \RenewDocumentCommand{\printindex}{st+od()}
+ \RenewDocumentCommand{\printindex}{st++o}
{
\group_begin:
\tl_set_eq:NN \eb@toc@title \indexname
@@ -1707,19 +1750,19 @@
\ctex_define:nn { font }
{
- caption-table .tl_set:N = \l__eb_font_caption_table_tl,
- caption-figure .tl_set:N = \l__eb_font_caption_figure_tl,
- caption-listing .tl_set:N = \l__eb_font_caption_listing_tl,
- caption-every .meta:n =
+ caption-table .tl_set:N = \l__eb_font_caption_table_tl,
+ caption-figure .tl_set:N = \l__eb_font_caption_figure_tl,
+ caption-lstlisting .tl_set:N = \l__eb_font_caption_lstlisting_tl,
+ caption-every .meta:n =
{
- caption-table = {#1},caption-figure = {#1},
- caption-listing = {#1}
+ caption-table = {#1},caption-figure = {#1},
+ caption-lstlisting = {#1}
},
- caption-every .initial:n = \sffamily\small,
- footnote .tl_set:N = \eb@font@footnote,
- marginpar .tl_set:N = \marginfont,
- marginpar .initial:n = \footnotesize,
- unknown .code:n = \eb_msg_deprecated_option:n { font }
+ caption-every .initial:n = \sffamily\small,
+ footnote .tl_set:N = \eb@font@footnote,
+ marginpar .tl_set:N = \marginfont,
+ marginpar .initial:n = \footnotesize,
+ unknown .code:n = \eb_msg_deprecated_option:n { font }
}
\cs_new_protected:Npn \ebaddtofont #1#2
{
@@ -1729,13 +1772,13 @@
{ \tl_put_right:Nn \l__eb_font_caption_table_tl {#2} }
{ figure }
{ \tl_put_right:Nn \l__eb_font_caption_figure_tl {#2} }
- { listing }
- { \tl_put_right:Nn \l__eb_font_caption_listing_tl {#2} }
+ { lstlisting }
+ { \tl_put_right:Nn \l__eb_font_caption_lstlisting_tl {#2} }
{ every }
{
\tl_put_right:Nn \l__eb_font_caption_table_tl {#2}
\tl_put_right:Nn \l__eb_font_caption_figure_tl {#2}
- \tl_put_right:Nn \l__eb_font_caption_listing_tl {#2}
+ \tl_put_right:Nn \l__eb_font_caption_lstlisting_tl {#2}
}
{ footnote }
{ \tl_put_right:Nn \eb@font@footnote {#2} }
@@ -1764,7 +1807,7 @@
fntspread .initial:n = 1.2,
captab-spread .fp_set:N = \l__eb_spread_caption_table_fp,
capfig-spread .fp_set:N = \l__eb_spread_caption_figure_fp,
- caplst-spread .fp_set:N = \l__eb_spread_caption_listing_fp,
+ caplst-spread .fp_set:N = \l__eb_spread_caption_lstlisting_fp,
caption-spread .meta:n =
{
captab-spread = {#1},capfig-spread = {#1},
@@ -1804,8 +1847,30 @@
}
\AfterPreamble{\skip_set:Nn \abovedisplayshortskip { 0ex plus .1ex }}
+\cs_new_protected:Npn \eb@register@cap@options #1
+ {
+ \ctex_define:nn { cap }
+ {
+ #1/unknown .code:n =
+ {
+ \use:x
+ {
+ \exp_not:N \captionsetup[#1]
+ { \eb_unknown_kv_handle: }
+ }
+ },
+ #1/unknown .default:V = \c_novalue_tl,
+ #1 .meta:nn = { ctex/cap/#1 } {##1}
+ }
+ }
+\cs_new_protected:Npn \RegisterCapOptions #1
+ {
+ \clist_map_function:nN {#1}
+ \eb@register@cap@options
+ }
+\RegisterCapOptions{table,figure,lstlisting}
\clist_map_inline:nn
- { table,figure,listing }
+ { table,figure,lstlisting }
{
\DeclareCaptionFont{eb@#1@font}
{
@@ -1823,7 +1888,7 @@
}
\captionsetup[table]{font = eb@table@font}
\captionsetup[figure]{font = eb@figure@font}
-\captionsetup[lstlisting]{font = eb@listing@font}
+\captionsetup[lstlisting]{font = eb@lstlisting@font}
\ctex_at_end_package:nn { bicaption }
{
\captionsetup[figure][bi-second]{name = Figure}
@@ -1997,6 +2062,9 @@
\listnumberline{#2}
\thmtname\thmtifnote{~(\thmtnote)}{}
}
+ \cs_gset:cpn { thmt@contentsline@#2 }
+ { \thmt@contentslineIfNamed }
+ \exp_args:Nc \providecommand { p@#2 }[1]{##1}
}
\ctex_define:nn { thmt }
{
@@ -2017,7 +2085,7 @@
\theoremstyle{default}
\cs_undefine:N \proof
\DeclareFloatList{theorem}{loe}
- \AllotPartialExt{loe}{ple}
+ \AssignPartialExt{loe}{ple}
\eb_preto_cmd:nn { listoftheorems }
{
\group_begin:
@@ -2128,7 +2196,7 @@
{ \exp_args:NV \bibliographystyle \l__eb_bib_both_style_tl }
\tl_if_blank:VF \l__eb_bib_cite_style_tl
{ \exp_args:NV \setcitestyle \l__eb_bib_cite_style_tl }
- \NewDocumentCommand{\printbibliography}{st+o}
+ \NewDocumentCommand{\printbibliography}{st++o}
{
\group_begin:
\tl_set_eq:NN \eb@toc@title \bibname
@@ -2176,7 +2244,7 @@
\setcounter{biburllcpenalty}{1}
\setcounter{biburlnumpenalty}{1}
}
-\eb_at_end_preamble:n
+\ctex_before_end_preamble:n
{
\providecommand{\bibname}{\refname}
\clist_if_empty:NF \l__eb_bib_datafile_clist
@@ -2401,6 +2469,98 @@
lstlistingname = Code
}
}
+
+\cs_if_exist:NF \DeclareObjectType
+ { \RequirePackage{xtemplate} }
+\DeclareObjectType{easybook}{0}
+\DeclareTemplateInterface{easybook}{cover}{0}
+ {
+ content : tokenlist = \c_empty_tl,
+ beforecode : tokenlist = \c_empty_tl,
+ aftercode : tokenlist = \c_empty_tl,
+ align : choice {l,r,c,n} = c
+ }
+\DeclareTemplateCode{easybook}{cover}{0}
+ {
+ content = \l__eb_cover_content_tl,
+ beforecode = \l__eb_cover_before_code_tl,
+ aftercode = \l__eb_cover_after_code_tl,
+ align =
+ {
+ l = \cs_set_eq:NN \eb_cover_align: \raggedright,
+ r = \cs_set_eq:NN \eb_cover_align: \raggedleft,
+ c = \cs_set_eq:NN \eb_cover_align: \centering,
+ n = \cs_set:Npn \eb_cover_align: { }
+ }
+ }
+ {
+ \AssignTemplateKeys
+ \tl_use:N \l__eb_cover_before_code_tl
+ \group_begin:
+ \eb_cover_align:
+ \tl_use:N \l__eb_cover_content_tl
+ \tex_par:D
+ \group_end:
+ \tl_use:N \l__eb_cover_after_code_tl
+ }
+\DeclareInstance{easybook}{top}{cover}{}
+\DeclareInstance{easybook}{bottom}{cover}{}
+\DeclareInstance{easybook}{middle}{cover}
+ {
+ content =
+ {
+ \notbool{@titlepage}
+ {
+ \renewcommand{\theupfootnote}{\@fnsymbol\c@footnote}
+ \renewcommand{\thefootnote}{\@fnsymbol\c@footnote}
+ }
+ {}
+ \LARGE\@title\par\vskip 3em
+ \large
+ \begin{tabular}[t]{c}
+ \@author
+ \end{tabular}\par\vskip 1.5em
+ \@date
+ \notbool{@titlepage}{\par\vskip 1.5em}{}
+ \@thanks
+ },
+ beforecode =
+ {
+ \ifbool{@titlepage}
+ {
+ \begin{titlepage}
+ \let\footnotesize\small
+ \let\footnoterule\relax
+ \let\footnote\thanks
+ \null\vfil
+ }
+ {\null}
+ \vskip 60\p@
+ },
+ aftercode =
+ {
+ \ifbool{@titlepage}
+ {
+ \vfil\null
+ \end{titlepage}
+ }
+ {\thispagestyle{plain}}
+ \setcounter{footnote}{0}
+ }
+ }
+\keys_define:nn { eb/cover }
+ {
+ title .tl_set:N = \@title,
+ author .tl_set:N = \@author,
+ date .tl_set:N = \@date
+ }
+\RenewDocumentCommand{\maketitle}{+O{}}
+ {
+ \keys_set:nn { eb/cover } {#1}
+ \UseInstance{easybook}{top}
+ \UseInstance{easybook}{middle}
+ \UseInstance{easybook}{bottom}
+ }
\endinput
%%
%% End of file `easybase.sty'.
diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls
index 0e714ce9680..ebd8aed8ddc 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/07/15}{2024cs}
+\ProvidesExplClass{easybook}{2024/08/08}{2024di}
{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 09f5d81cc2d..177743fc487 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/07/15}{2024cs}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/08/08}{2024di}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
diff --git a/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty b/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty
index f42afc04fbd..ab4ea7b0745 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/23 v4.3.1
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..9030da7b18c 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/23 v4.3.1
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,25 @@
\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 \everypar\tex_everypar:D
+ \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 +261,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 +312,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 +486,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 +495,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/fillwith/fillwith.sty b/Master/texmf-dist/tex/latex/fillwith/fillwith.sty
new file mode 100644
index 00000000000..9e15d13bf81
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fillwith/fillwith.sty
@@ -0,0 +1,349 @@
+%%
+%% This is file `fillwith.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fillwith.dtx (with options: `sty')
+%% Copyright (C) 2024 Clea F. Rees.
+%%
+%% 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 2008-05-04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Clea F. Rees.
+%%
+%% This file may only be distributed together with a copy of the package
+%% fillwith. You may however distribute the package fillwith without
+%% such generated files.
+%%
+%% This work consists of all files listed in manifest.txt.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\NeedsTeXFormat{LaTeX2e}[2021-11-15]
+\RequirePackage{svn-prov}
+\ProvidesPackageSVN[\filebase.sty]{$Id: fillwith.dtx 10202 2024-08-08 15:33:47Z cfrees $}[v0.0 \revinfo][\filebase: fill vertically with non-space]
+\DefineFileInfoSVN
+\RequirePackage{xcolor}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\@ifundefined{ExplLoaderFileDate}{%
+ \RequirePackage{expl3}%
+}{}
+\@ifl@t@r\ExplLoaderFileDate{2022-02-24}{%
+}{%
+ \PackageError{fillwith}{Support package expl3 too old}
+ {%
+ You need to update your installation of the bundles 'l3kernel' and
+ 'l3packages'.\MessageBreak
+ Loading~fillwith~will~abort!%
+ }%
+ \endinput
+}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ExplSyntaxOn
+\prop_gput:Nnn \g_msg_module_name_prop { fillwith } { fillwith }
+
+
+\keys_define:nn { fillwith }
+{
+ color .meta:n = {
+ colour = #1,
+ },
+ colour .code:n = {
+ \colorlet{fillwithcolour}{#1}
+ },
+ dotted ~ color .meta:n = {
+ dotted colour = #1,
+ },
+ dotted color .meta:n = {
+ dotted colour = #1,
+ },
+ dotted ~ colour .meta:n = {
+ dotted colour = #1,
+ },
+ dotted colour .code:n = {
+ \colorlet{fillwithdottedcolour}{#1}
+ },
+ lliw .meta:n = {
+ colour = #1,
+ },
+ colour .initial:n = gray,
+ dotted colour .initial:n = black,
+}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\providecommand \IfFormatAtLeastTF { \@ifl@t@r \fmtversion }
+\IfFormatAtLeastTF { 2022-06-01 }
+{
+ \ProcessKeyOptions [ fillwith ]
+}{
+ \RequirePackage { l3keys2e }
+ \ProcessKeysOptions { fillwith }
+}
+\IfFormatAtLeastTF { 2020-10-01 }{
+}{
+ \RequirePackage { xparse }
+ \providecommand \ExpandArgs [1]
+ { \cs_if_exist_use:c { exp_args:N #1 } }
+}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\box_new:N \l__fillwith_adj_rule_box
+\box_new:N \l__fillwith_part_rule_box
+\box_new:N \l__fillwith_tmpa_box
+\box_new:N \l__fillwith_tmpb_box
+\coffin_new:N \l__fillwith_line_coffin
+\coffin_new:N \l__fillwith_lines_coffin
+\coffin_new:N \l__fillwith_part_coffin
+\coffin_new:N \l__fillwith_tmpa_coffin
+\dim_new:N \l__fillwith_ht_dim
+\dim_new:N \l__fillwith_dp_dim
+\dim_new:N \l__fillwith_rem_dim
+\dim_new:N \l__fillwith_line_ht_dim
+\dim_new:N \l__fillwith_line_adj_hsize_dim
+\dim_set:Nn \l__fillwith_line_ht_dim { 0.4pt }
+\dim_new:N \l__fillwith_line_madj_dim
+\dim_new:N \l__fillwith_line_vadj_dim
+\dim_set_eq:NN \l__fillwith_line_vadj_dim \c_zero_dim
+\dim_new:N \l__fillwith_goal_dim
+\dim_new:N \l__fillwith_tmpa_dim
+\int_new:N \g__fillwith_cnt_int
+\cs_new_protected_nopar:Nn \__fillwith_style: {}
+\cs_new_protected_nopar:Nn \__fillwith_coffin_tht:N
+{
+ \dim_eval:n { \coffin_ht:N #1 + \coffin_dp:N #1 }
+}
+\cs_new_protected_nopar:Npn \__fillwith_hrulefill_part:
+{
+ \vrule height \c_zero_dim depth \l__fillwith_line_ht_dim width 0.1pt
+}
+\cs_new_protected_nopar:Npn \__fillwith_hrulefill:
+{
+ \vrule height \c_zero_dim depth \l__fillwith_line_ht_dim width \l__fillwith_line_adj_hsize_dim
+}
+\cs_new_protected_nopar:Npn \__fillwith_dottedfill_part:
+{
+ \hbox to 0.33em {\hss .\hss}
+}
+\cs_new_protected_nopar:Npn \__fillwith_dottedfill:
+{
+ \leaders \hbox to 0.33em {\hss .\hss} \hfill \kern \c_zero_dim
+}
+\NewDocumentCommand\fillwithset { +m }{
+ \keys_set:nn { fillwith } { #1 }
+}
+\keys_define:nn { fillwith }
+{
+ cont .bool_set:N = \l__fillwith_cont_bool,
+ cont .default:n = true,
+ cont .initial:n = false,
+ fillwith~ht .tl_set:N = \l__fillwith_ht_tl,
+ fillwith~ht .initial:n = 2,
+ fillwith~ht .default:n = 2,
+ goal ~ ht .dim_set:N = \l__fillwith_goal_dim,
+ line nos .bool_set:N = \l__fillwith_nos_bool,
+ line ~ nos .bool_set:N = \l__fillwith_nos_bool,
+ line ~ nos .default:n = true,
+ line ~ nos .initial:n = false,
+ no ~ font .tl_set:N = \l__fillwith_no_font_tl,
+ no ~ font .initial:n = { \normalfont\normalsize },
+ no ~ font .default:n = { \normalfont\normalsize },
+ style .choices:nn =
+ {
+ rule, dots , line , lines , rules , unknown
+ }{
+ \if_case:w \l_keys_choice_int
+ \or: \cs_set_eq:NN \__fillwith_style: \__fillwith_hrulefill:
+ \or: \cs_set_eq:NN \__fillwith_style: \__fillwith_dottedfill:
+ \or: \cs_set_eq:NN \__fillwith_style: \__fillwith_hrulefill:
+ \or: \cs_set_eq:NN \__fillwith_style: \__fillwith_hrulefill:
+ \or: \cs_set_eq:NN \__fillwith_style: \__fillwith_hrulefill:
+ \else: \cs_set_protected_nopar:Nn \__fillwith_style: { \use:c { \l_keys_choice_tl } }
+ \fi:
+ \if_case:w \l_keys_choice_int
+ \or: \cs_set_eq:NN \__fillwith_style_part: \__fillwith_hrulefill_part:
+ \or: \cs_set_eq:NN \__fillwith_style_part: \__fillwith_dottedfill_part:
+ \or: \cs_set_eq:NN \__fillwith_style_part: \__fillwith_hrulefill_part:
+ \or: \cs_set_eq:NN \__fillwith_style_part: \__fillwith_hrulefill_part:
+ \or: \cs_set_eq:NN \__fillwith_style_part: \__fillwith_hrulefill_part:
+ \else: \cs_set_protected_nopar:Nn \__fillwith_style_part: { \use:c { \l_keys_choice_tl part } }
+ \fi:
+ },
+ style .default:n = dots,
+ style .initial:n = dots,
+}
+\cs_new_protected_nopar:Nn \__fillwith_fill:
+{
+ \__fillwith_measures:
+ \dim_set:Nn \l__fillwith_line_adj_hsize_dim { \hsize - \@totalleftmargin }
+ \vbox_set:Nn \l__fillwith_adj_rule_box
+ {
+ \parindent=0pt
+ \vrule height \l__fillwith_ht_dim depth \l__fillwith_dp_dim width \c_zero_dim
+ \skip_horizontal:n { \@totalleftmargin }
+ \__fillwith_style:
+ }
+ \if_mode_horizontal:
+ \bool_if:NT \l__fillwith_cont_bool
+ {
+ \leaders \box_use:N \l__fillwith_part_rule_box \hfill \kern \c_zero_dim
+ }{
+ \vrule height \l__fillwith_ht_dim depth \l__fillwith_dp_dim width \c_zero_dim
+ }
+ %^^A gweithio ond erbyn y rheolau
+ %^^A byddai'n achosi draferth, siwr o fod
+ % \tex_par:D
+ %^^A yn lle hynny, ceisio hyn - oes perygl hefyd?
+ \para_raw_end:
+ \else:
+ \unskip
+ \skip_vertical:n { \l__fillwith_dp_dim }
+ \fi:
+ \xleaders \box_use:N \l__fillwith_adj_rule_box \vfill
+ \para_end:
+ \normalcolor
+}
+\cs_new_protected_nopar:Nn \__fillwith_measures:
+{
+ \color{fillwithcolour}
+ \offinterlineskip
+ \hbox_set:Nn \l__fillwith_part_rule_box
+ {
+ \strut
+ \__fillwith_style_part:
+ \kern \c_zero_dim
+ }
+ \dim_set:Nn \l__fillwith_tmpa_dim { \box_ht:N \l__fillwith_part_rule_box }
+ \dim_set:Nn \l__fillwith_ht_dim { \l__fillwith_ht_tl \l__fillwith_tmpa_dim }
+ \box_set_ht:Nn \l__fillwith_part_rule_box { \l__fillwith_ht_dim }
+ \dim_set:Nn \l__fillwith_tmpa_dim { \box_dp:N \l__fillwith_part_rule_box }
+ % neu \fp_to_dim:n { \l__fillwith_ht_tl * \l__fillwith_tmpa_dim } ??
+ \dim_set:Nn \l__fillwith_dp_dim { \l__fillwith_ht_tl \l__fillwith_tmpa_dim }
+ \box_set_dp:Nn \l__fillwith_part_rule_box { \l__fillwith_dp_dim }
+}
+\NewDocumentCommand \fillwith { s o }
+{
+ \group_begin:
+ \IfValueT { #2 }
+ {
+ \keys_set:nn { fillwith } { #2 }
+ }
+ \IfBooleanTF { #1 }
+ {
+ \bool_set_true:N \l__fillwith_cont_bool
+ }{
+ \bool_set_false:N \l__fillwith_cont_bool
+ }
+ \__fillwith_fill:
+ \group_end:
+}
+\NewDocumentCommand \fillwithrules { s O { 2 } }
+{
+ \group_begin:
+ \IfBooleanTF { #1 }
+ {
+ \bool_set_true:N \l__fillwith_cont_bool
+ }{
+ \bool_set_false:N \l__fillwith_cont_bool
+ }
+ \keys_set:nn { fillwith } { style = rules, fillwith~ht=#2 }
+ \__fillwith_fill:
+ \group_end:
+}
+\NewDocumentCommand \fillwithdottedlines { s O { 2 } }
+{
+ \group_begin:
+ \IfBooleanTF { #1 }
+ {
+ \bool_set_true:N \l__fillwith_cont_bool
+ }{
+ \bool_set_false:N \l__fillwith_cont_bool
+ }
+ \colorlet{fillwithcolour}{fillwithdottedcolour}
+ \keys_set:nn { fillwith } { style = dots, fillwith~ht=#2 }
+ \__fillwith_fill:
+ \group_end:
+}
+\cs_new_protected:Nn \__fillwith_nos: % rhybudd: ARAF ! SLOW!
+{
+ \parindent=0pt
+ \__fillwith_measures:
+ \dim_set_eq:NN \l__fillwith_line_adj_hsize_dim \linewidth
+ \vcoffin_set:Nnn \l__fillwith_line_coffin { \l__fillwith_line_adj_hsize_dim }
+ {
+ \parindent=0pt
+ \vrule height \l__fillwith_ht_dim depth \l__fillwith_dp_dim width \c_zero_dim
+ \skip_horizontal:n \c_zero_skip
+ \__fillwith_style:
+ }
+ \coffin_set_eq:NN \l__fillwith_lines_coffin \l__fillwith_line_coffin
+ \if_mode_horizontal:
+ \bool_if:NTF \l__fillwith_cont_bool
+ {
+ \leaders \box_use:N \l__fillwith_part_rule_box \hfill \kern \c_zero_dim
+ \int_gincr:N \g__fillwith_cnt_int
+ % \vcoffin_set:Nnn \l__fillwith_tmpa_coffin { 1.5em}
+ % {
+ % \l__fillwith_no_font_tl \int_to_arabic:n { \g__fillwith_cnt_int }
+ % }
+ % \coffin_mark_handle:Nnnn \l__fillwith_tmpa_coffin {B} {l} { red }
+ % \coffin_mark_handle:Nnnn \l__fillwith_tmpa_coffin {b} {l} { green }
+ % \coffin_attach:NnnNnnnn \l__fillwith_lines_coffin {B} {r} \l__fillwith_tmpa_coffin {B} {l} {2.5pt} { \l__fillwith_ht_dim + \l__fillwith_dp_dim }
+ % \coffin_mark_handle:Nnnn \l__fillwith_lines_coffin {T} {r} { blue }
+ % \coffin_mark_handle:Nnnn \l__fillwith_lines_coffin {t} {r} { magenta }
+ \dim_set:Nn \l__fillwith_line_vadj_dim { \l__fillwith_dp_dim }
+ }{
+ \vrule height \l__fillwith_ht_dim depth \l__fillwith_dp_dim width \c_zero_dim
+ }
+ \dim_set:Nn \l__fillwith_line_madj_dim { \@totalleftmargin }
+ \para_raw_end:
+ \else:
+ \dim_set_eq:NN \l__fillwith_line_madj_dim \c_zero_dim
+ \unskip
+ \skip_vertical:n { \l__fillwith_dp_dim }
+ \fi:
+ \int_gincr:N \g__fillwith_cnt_int
+ \vcoffin_set:Nnn \l__fillwith_tmpa_coffin { 1.5em}
+ {
+ \l__fillwith_no_font_tl \int_to_arabic:n { \g__fillwith_cnt_int }
+ }
+ \coffin_attach:NnnNnnnn \l__fillwith_lines_coffin {B} {r} \l__fillwith_tmpa_coffin {B} {l} {2.5pt} {\c_zero_dim}
+ \dim_set:Nn \l__fillwith_rem_dim
+ {
+ \l__fillwith_goal_dim -\footskip - \pagetotal
+ }
+ \dim_until_do:nNnn { \__fillwith_coffin_tht:N \l__fillwith_lines_coffin } > { \l__fillwith_rem_dim - \l__fillwith_ht_dim - \l__fillwith_dp_dim }
+ {
+ \coffin_join:NnnNnnnn \l__fillwith_lines_coffin { b } { l } \l__fillwith_line_coffin { t } { l } { \c_zero_dim } { \c_zero_dim }
+ \int_gincr:N \g__fillwith_cnt_int
+ \vcoffin_set:Nnn \l__fillwith_tmpa_coffin {1.5em}
+ {
+ \l__fillwith_no_font_tl \int_to_arabic:n { \g__fillwith_cnt_int }
+ }
+ \coffin_attach:NnnNnnnn \l__fillwith_lines_coffin {B} {r} \l__fillwith_tmpa_coffin {B} {l} {2.5pt} {\c_zero_dim}
+ }
+ \coffin_typeset:Nnnnn \l__fillwith_lines_coffin { B } { l } { \l__fillwith_line_madj_dim } { \l__fillwith_line_vadj_dim }
+ \para_end:
+ \normalcolor
+}
+\NewDocumentCommand \fillwithnolines { s O { } }
+{
+ \group_begin:
+ \IfBooleanTF { #1 }
+ {
+ \bool_set_true:N \l__fillwith_cont_bool
+ }{
+ \bool_set_false:N \l__fillwith_cont_bool
+ }
+ \keys_set:nn { fillwith } { goal ~ ht = \pagegoal, #2 }
+ \__fillwith_nos:
+ \group_end:
+}
+\ExplSyntaxOff
+\endinput
+%%
+%% End of file `fillwith.sty'.
diff --git a/Master/texmf-dist/tex/latex/fontscale/fontscale.sty b/Master/texmf-dist/tex/latex/fontscale/fontscale.sty
index d032e49860a..70bfae6026c 100644
--- a/Master/texmf-dist/tex/latex/fontscale/fontscale.sty
+++ b/Master/texmf-dist/tex/latex/fontscale/fontscale.sty
@@ -1,33 +1,32 @@
-% Package : fontscale -- A user interface for setting document font sizes
+% Package : fontscale -- A flexible interface for setting font sizes
% Copyright : 2024 (c) Oliver Beery <beeryoliver@gmail.com>
% CTAN : https://ctan.org/pkg/fontscale
% Repository: https://github.com/beeryoliver/fontscale
% License : The LaTeX Project Public License 1.3c
-% The 2022-06-01 LaTeX kernel update added \ProcessKeyOptions.
-\NeedsTeXFormat{LaTeX2e}[2022-06-01]
+% LaTeX2e version 2023-11-01 added \IfExplAtLeastTF.
+\NeedsTeXFormat{LaTeX2e}[2023-11-01]
\ProvidesExplPackage
{fontscale}
- {2024-05-17}
- {1.3.0}
- {A user interface for setting document font sizes}
+ {2024-08-12}
+ {2.1.0}
+ {A flexible interface for setting font sizes}
-% The 2023-10-10 l3kernel update added many 'e'-variants.
-\IfExplAtLeastTF { 2023-10-10 }
- { }
+% l3kernel version 2023-10-10 added many 'e'-variants.
+\IfExplAtLeastTF { 2023-10-10 } { }
{
\msg_new:nnn { fontscale } { expl3-out-of-date }
{
- The~ package~ could~ not~ load.~
- The~ fontscale~ package~ requires~
- L3~ programming~ layer~ version~ 2023-10-10~ or~ later.
+ The~ fontscale~ package~ could~ not~ load.~
+ This~ package~ requires~
+ L3~ programming~ layer~ version~ 2023-10-10~ or~ newer.
}
\msg_critical:nn { fontscale } { expl3-out-of-date }
}
% This package does not require any other packages!
-% DECLARE FONT PARAMETER VARIABLES
+% DECLARE FONT SIZE PARAMETER VARIABLES
\fp_const:Nn \c_fontscale_tiny_step_fp { -4 }
\fp_const:Nn \c_fontscale_scriptsize_step_fp { -3 }
@@ -74,31 +73,7 @@
\skip_new:N \l_fontscale_huge_baselineskip_skip
\skip_new:N \l_fontscale_Huge_baselineskip_skip
-\prop_new:N \l_fontscale_tiny_prop
-\prop_new:N \l_fontscale_scriptsize_prop
-\prop_new:N \l_fontscale_footnotesize_prop
-\prop_new:N \l_fontscale_small_prop
-\prop_new:N \l_fontscale_normalsize_prop
-\prop_new:N \l_fontscale_large_prop
-\prop_new:N \l_fontscale_Large_prop
-\prop_new:N \l_fontscale_LARGE_prop
-\prop_new:N \l_fontscale_huge_prop
-\prop_new:N \l_fontscale_Huge_prop
-
-\prop_put:Nnn \l_fontscale_tiny_prop { step } { -4 }
-\prop_put:Nnn \l_fontscale_scriptsize_prop { step } { -3 }
-\prop_put:Nnn \l_fontscale_footnotesize_prop { step } { -2 }
-\prop_put:Nnn \l_fontscale_small_prop { step } { -1 }
-\prop_put:Nnn \l_fontscale_normalsize_prop { step } { 0 }
-\prop_put:Nnn \l_fontscale_large_prop { step } { 1 }
-\prop_put:Nnn \l_fontscale_Large_prop { step } { 2 }
-\prop_put:Nnn \l_fontscale_LARGE_prop { step } { 3 }
-\prop_put:Nnn \l_fontscale_huge_prop { step } { 4 }
-\prop_put:Nnn \l_fontscale_Huge_prop { step } { 5 }
-
-\prop_put:Nnn \l_fontscale_normalsize_prop { scale } { 1 }
-
-% INITIALIZE FONT PARAMETER VARIABLES
+% INITIALIZE FONT SIZE PARAMETER VARIABLES
\fp_set:Nn \l_fontscale_tiny_scale_fp { 0.6 }
\fp_set:Nn \l_fontscale_scriptsize_scale_fp { 0.7 }
@@ -132,177 +107,221 @@
\skip_set:Nn \l_fontscale_huge_baselineskip_skip { 19.2pt }
\skip_set:Nn \l_fontscale_Huge_baselineskip_skip { 21.6pt }
-\prop_put:Nnn \l_fontscale_tiny_prop { scale } { 0.6 }
-\prop_put:Nnn \l_fontscale_scriptsize_prop { scale } { 0.7 }
-\prop_put:Nnn \l_fontscale_footnotesize_prop { scale } { 0.8 }
-\prop_put:Nnn \l_fontscale_small_prop { scale } { 0.9 }
-\prop_put:Nnn \l_fontscale_large_prop { scale } { 1.1 }
-\prop_put:Nnn \l_fontscale_Large_prop { scale } { 1.2 }
-\prop_put:Nnn \l_fontscale_LARGE_prop { scale } { 1.4 }
-\prop_put:Nnn \l_fontscale_huge_prop { scale } { 1.6 }
-\prop_put:Nnn \l_fontscale_Huge_prop { scale } { 1.8 }
-
-\prop_put:Nnn \l_fontscale_tiny_prop { size } { 6pt }
-\prop_put:Nnn \l_fontscale_scriptsize_prop { size } { 7pt }
-\prop_put:Nnn \l_fontscale_footnotesize_prop { size } { 8pt }
-\prop_put:Nnn \l_fontscale_small_prop { size } { 9pt }
-\prop_put:Nnn \l_fontscale_normalsize_prop { size } { 10pt }
-\prop_put:Nnn \l_fontscale_large_prop { size } { 11pt }
-\prop_put:Nnn \l_fontscale_Large_prop { size } { 12pt }
-\prop_put:Nnn \l_fontscale_LARGE_prop { size } { 14pt }
-\prop_put:Nnn \l_fontscale_huge_prop { size } { 16pt }
-\prop_put:Nnn \l_fontscale_Huge_prop { size } { 18pt }
-
-\prop_put:Nnn \l_fontscale_tiny_prop { baselineskip } { 7.2pt }
-\prop_put:Nnn \l_fontscale_scriptsize_prop { baselineskip } { 8.4pt }
-\prop_put:Nnn \l_fontscale_footnotesize_prop { baselineskip } { 9.6pt }
-\prop_put:Nnn \l_fontscale_small_prop { baselineskip } { 10.8pt }
-\prop_put:Nnn \l_fontscale_normalsize_prop { baselineskip } { 12 pt }
-\prop_put:Nnn \l_fontscale_large_prop { baselineskip } { 13.2pt }
-\prop_put:Nnn \l_fontscale_Large_prop { baselineskip } { 14.4pt }
-\prop_put:Nnn \l_fontscale_LARGE_prop { baselineskip } { 16.8pt }
-\prop_put:Nnn \l_fontscale_huge_prop { baselineskip } { 19.2pt }
-\prop_put:Nnn \l_fontscale_Huge_prop { baselineskip } { 21.6pt }
-
% SOME VARIABLES
-% Used for mapping.
-\tl_const:Nn \c__fontscale_names_tl
- {
- {tiny} {scriptsize} {footnotesize} {small} {normalsize}
- {large} {Large} {LARGE} {huge} {Huge}
- }
-\tl_const:Nn \c__fontscale_names_other_tl
- {
- {tiny} {scriptsize} {footnotesize} {small}
- {large} {Large} {LARGE} {huge} {Huge}
- }
-
% Used to speed up floating point calculations.
\fp_new:N \l__fontscale_normalsize_size_fp
\fp_set:Nn \l__fontscale_normalsize_size_fp { 10 }
+\fp_new:N \l__fontscale_musical_base_fp
\fp_new:N \l__fontscale_musical_notes_fp
-% Temporary variables
-\tl_new:N \l__fontscale_step_tl
-\tl_new:N \l__fontscale_scale_tl
-\dim_new:N \l__fontscale_size_dim
+% Scratch variables
+\tl_new:N \l__fontscale_tmp_tl
+\str_new:N \l__fontscale_tmp_str
+\dim_new:N \l__fontscale_tmp_dim
+\fp_new:N \l__fontscale_tmp_fp
% SOME HELPER FUNCTIONS
-% Sets a dimen/skip variable from a dimen/skip expression, supplying a default
+% Sets a dimen/skip variable from a dimen/skip expression, appending a default
% unit of pt.
-\cs_new_protected:Npn \__fontscale_dim_set_with_default_pt:Nn #1#2
+\cs_new_protected:Npn \__fontscale_dim_set_default_pt:Nn #1#2
{ \@defaultunits #1 = \dimexpr #2 pt \relax \relax \@nnil }
-\cs_generate_variant:Nn \__fontscale_dim_set_with_default_pt:Nn { c }
-\cs_new_protected:Npn \__fontscale_skip_set_with_default_pt:Nn #1#2
+\cs_generate_variant:Nn \__fontscale_dim_set_default_pt:Nn { c }
+\cs_new_protected:Npn \__fontscale_skip_set_default_pt:Nn #1#2
{ \@defaultunits #1 = \glueexpr #2 pt \relax \@nnil }
-\cs_generate_variant:Nn \__fontscale_skip_set_with_default_pt:Nn { c }
-% Used to define \tiny to \Huge. Need \dim_use:N for compatibility with the
-% microtype package. Otherwise the following would do:
-% \cs_new_protected:Npn \__fontscale_fontsize:NNN { \@setfontsize }
-\cs_new_protected:Npn \__fontscale_fontsize:NNN #1#2
- { \@setfontsize #1 { \dim_use:N #2 } }
-% Similar to \fontsize + \selectfont, except that it takes dimen and skip
-% expressions as arguments and avoids the issue where \f@size is set to the new
-% font size before the second argument is expanded.
+\cs_generate_variant:Nn \__fontscale_skip_set_default_pt:Nn { c }
+% Similar to \@setfontsize. Used to define \tiny to \Huge. Need \dim_use:N for
+% compatibility with the microtype package.
+\cs_new_protected:Npn \__fontscale_fontsize:NNN #1#2#3
+ {
+ \mode_if_math:TF
+ {
+ \msg_warning:nne { fontscale } { math-mode-warning }
+ { \token_to_str:N #1 }
+ }
+ {
+ \cs_set_eq:NN \@currsize #1
+ \fontsize { \dim_use:N #2 } #3 \selectfont
+ }
+ }
+% Similar to \fontsize + \selectfont, except that it:
+% (1) Takes dimen and skip expressions as arguments.
+% (2) Avoids the issue where \f@size is set to the new font size before the
+% second argument is expanded.
+% (3) Provides error checking for the font size and font baselineskip.
+\dim_new:N \l__fontscale_fontsize_dim
\skip_new:N \l__fontscale_fontsize_skip
\cs_new_protected:Npn \__fontscale_fontsize:nn #1#2
{
- \__fontscale_skip_set_with_default_pt:Nn \l__fontscale_fontsize_skip {#2}
- \fontsize { = \dimexpr #1 pt \relax \relax } \l__fontscale_fontsize_skip
- \selectfont
+ \__fontscale_dim_set_default_pt:Nn \l__fontscale_fontsize_dim {#1}
+ \__fontscale_skip_set_default_pt:Nn \l__fontscale_fontsize_skip {#2}
+ \dim_compare:nNnTF \l__fontscale_fontsize_dim > \c_zero_dim
+ {
+ \dim_compare:nNnTF \l__fontscale_fontsize_skip <
+ \l__fontscale_fontsize_dim
+ { \msg_error:nn { fontscale } { font-baselineskip-out-of-bounds } }
+ {
+ \fontsize \l__fontscale_fontsize_dim \l__fontscale_fontsize_skip
+ \selectfont
+ }
+ }
+ { \msg_error:nn { fontscale } { font-size-out-of-bounds } }
}
% Similar to the above function, except that it sets the font baselineskip
% equal to the new font size times the baselineskip-size-ratio.
\cs_new_protected:Npn \__fontscale_fontsize:n #1
{
- \fontsize { = \dimexpr #1 pt \relax \relax }
- { \fp_to_dim:n { \f@size * \l__fontscale_baselineskip_size_ratio_fp } }
- \selectfont
+ \__fontscale_dim_set_default_pt:Nn \l__fontscale_fontsize_dim {#1}
+ \dim_compare:nNnTF \l__fontscale_fontsize_dim > \c_zero_dim
+ {
+ \fontsize \l__fontscale_fontsize_dim
+ {
+ \fp_to_dim:n
+ {
+ \l__fontscale_fontsize_dim
+ * \l__fontscale_baselineskip_size_ratio_fp
+ }
+ }
+ \selectfont
+ }
+ { \msg_error:nn { fontscale } { font-size-out-of-bounds } }
}
% MESSAGES
-\msg_new:nnn { fontscale } { modular-ratio-out-of-bounds }
+\msg_new:nnn { fontscale } { key-baselineskip-size-ratio-out-of-bounds }
{
- The~ value~ for~ the~ key~ 'modular / ratio'~
+ The~ value~ of~ the~ key~ 'baselineskip-size-ratio'~
\msg_line_context: \c_space_tl
- must~ be~ greater~ than~ 1.
+ must~ be~ at~ least~ 1.
}
-\msg_new:nnn { fontscale } { musical-ratio-out-of-bounds }
+\msg_new:nnn { fontscale } { key-musical-base-out-of-bounds }
{
- The~ value~ for~ the~ key~ 'musical / ratio'~
+ The~ value~ of~ the~ key~ 'musical / base'~
+ \msg_line_context: \c_space_tl
+ must~ be~ a~ positive~ length.
+ }
+\msg_new:nnn { fontscale } { key-musical-ratio-out-of-bounds }
+ {
+ The~ value~ of~ the~ key~ 'musical / ratio'~
\msg_line_context: \c_space_tl
must~ be~ greater~ than~ 1.
}
-\msg_new:nnn { fontscale } { musical-notes-out-of-bounds }
+\msg_new:nnn { fontscale } { key-musical-notes-out-of-bounds }
{
- The~ value~ for~ the~ key~ 'musical / notes'~
+ The~ value~ of~ the~ key~ 'musical / notes'~
\msg_line_context: \c_space_tl
must~ be~ a~ positive~ integer.
}
-\msg_new:nnn { fontscale } { key-font-scale-ignored }
+\msg_new:nnn { fontscale } { key-font-scale-out-of-bounds }
{
- Key~ '#1 / scale'~
+ The~ value~ of~ the~ key~ '#1 / scale'~
\msg_line_context: \c_space_tl
- ignored.~
- Setting~ the~ scale~ and~ size~ keys~ for~ the~ same~
- font~ size~ command~ ignores~ the~ scale~ key.
+ must~ be~ positive.
+ }
+\msg_new:nnn { fontscale } { key-font-size-out-of-bounds }
+ {
+ The~ value~ of~ the~ key~ '#1 / size'~
+ \msg_line_context: \c_space_tl
+ must~ be~ a~ positive~ length.
+ }
+\msg_new:nnn { fontscale } { key-font-scale-overwritten }
+ {
+ The~ font~ size~ set~ by~ the~ key~ '#1 / scale'~
+ has~ been~ overwritten~ by~ the~ key~ '#1 / size'~
+ \msg_line_context:.
+ }
+\msg_new:nnn { fontscale } { key-font-baselineskip-out-of-bounds }
+ {
+ The~ value~ of~ the~ key~ '#1 / baselineskip'~
+ \msg_line_context: \c_space_tl
+ must~ be~ greater~ than~ or~ equal~ to~
+ the~ font~ size~ of~ '\iow_char:N \\#1'.
}
\msg_new:nnn { fontscale } { font-sizes-out-of-order }
{
The~ font~ sizes~
\msg_line_context: \c_space_tl
are~ not~ in~ the~ correct~ order.~
- The~ magnitude~ of~ the~ font~ sizes~ should~ be~ ordered~ from~
- '\iow_char:N \\tiny'~ to~ '\iow_char:N \\normalsize'~ to~
- '\iow_char:N \\Huge'.
+ The~ lengths~ of~ the~ font~ sizes~ should~ be~ ordered~ from~
+ '\iow_char:N \\tiny'~ to~ '\iow_char:N \\Huge'.
}
\msg_new:nnn { fontscale } { font-baselineskips-out-of-order }
{
The~ font~ baselineskips~
\msg_line_context: \c_space_tl
are~ not~ in~ the~ correct~ order.~
- The~ magnitude~ of~ the~ font~ baselineskips~ should~ be~ ordered~ from~
- '\iow_char:N \\tiny'~ to~ '\iow_char:N \\normalsize'~ to~
- '\iow_char:N \\Huge'.
+ The~ lengths~ of~ the~ font~ baselineskips~ should~ be~ ordered~ from~
+ '\iow_char:N \\tiny'~ to~ '\iow_char:N \\Huge'.
+ }
+
+\msg_new:nnn { fontscale } { math-mode-warning }
+ {
+ '#1'~
+ \msg_line_context: \c_space_tl
+ does~ nothing~ if~ used~ in~ math~ mode.
+ }
+\msg_new:nnn { fontscale } { math-mode-error }
+ {
+ '#1'~
+ \msg_line_context: \c_space_tl
+ cannot~ be~ used~ in~ math~ mode.
+ }
+\msg_new:nnn { fontscale } { font-size-out-of-bounds }
+ {
+ The~ font~ size~
+ \msg_line_context: \c_space_tl
+ must~ be~ a~ positive~ length.
+ }
+\msg_new:nnn { fontscale } { font-baselineskip-out-of-bounds }
+ {
+ The~ font~ baselineskip~
+ \msg_line_context: \c_space_tl
+ must~ be~ greater~ than~ or~ equal~ to~ the~ font~ size.
}
\msg_new:nnn { fontscale } { font-step-out-of-bounds }
{
The~ font~ step~
\msg_line_context: \c_space_tl
- must~ be~ an~ integer~ from~ -4~ to~ 5,~
- unless~ the~ value~ for~ the~ choice~ key~ 'typographic-scale'~
- is~ 'modular'~ or~ 'musical'.
+ must~ equal~ an~ integer~ from~ -4~ to~ 5,~
+ unless~ the~ value~ of~ the~ key~ 'typographic-scale'~ is~ 'musical'.~
+ \msg_see_documentation_text:n { fontscale }
}
\msg_new:nnn { fontscale } { current-font-step-out-of-bounds }
{
'\iow_char:N \\SetFontStep*'~
\msg_line_context: \c_space_tl
could~ not~ calculate~ the~ new~ font~ step~ because~
- the~ current~ font~ step~ is~ undefined.
+ the~ current~ font~ step~ is~ undefined.~
+ \msg_see_documentation_text:n { fontscale }
}
% DEFINE KEYS
\str_new:N \l__fontscale_typographic_scale_str
+\dim_new:N \l__fontscale_musical_base_dim
-\keys_define:nn { fontscale }
+\cs_new_protected:Npn \__fontscale_keys_name:n #1
{
- reset .choices:nn = { initial , preamble }
- { \use:c { __fontscale_keys_precompile_#1: } }
- , reset .default:n = initial
-
- , ignore-order .bool_set:N = \l__fontscale_ignore_order_bool
- , ignore-order .default:n = true
+ \tl_if_in:nnTF {#1} { / }
+ { \__fontscale_keys_name_split:ww #1 \q_stop }
+ { \tl_set:cn { l__fontscale_ \l_keys_key_str _size_tl } {#1} }
+ }
+\cs_new_protected:Npn \__fontscale_keys_name_split:ww #1 / #2 \q_stop
+ {
+ \tl_set:cn { l__fontscale_ \l_keys_key_str _size_tl } {#1}
+ \tl_set:cn { l__fontscale_ \l_keys_key_str _baselineskip_tl } {#2}
+ }
- , baselineskip-size-ratio .fp_set:N =
+\keys_define:nn { fontscale }
+ {
+ baselineskip-size-ratio .fp_set:N =
\l__fontscale_baselineskip_size_ratio_fp
, baselineskip-size-ratio .value_required:n = true
, typographic-scale .choices:nn =
- { classic-10pt , classic-11pt , classic-12pt , modular , musical }
+ { classic-10pt , classic-11pt , classic-12pt , musical }
{ \str_set:Nn \l__fontscale_typographic_scale_str {#1} }
, typographic-scale .value_required:n = true
@@ -315,18 +334,16 @@
, classic-12pt .meta:n = { typographic-scale = classic-12pt }
, classic-12pt .value_forbidden:n = true
- , modular .meta:n = { typographic-scale = modular }
- , modular .value_forbidden:n = true
-
, musical .meta:n = { typographic-scale = musical }
, musical .value_forbidden:n = true
-
- , modular / ratio .fp_set:N = \l__fontscale_modular_ratio_fp
- , modular / ratio .value_required:n = true
}
\keys_define:nn { fontscale / musical }
{
- ratio .fp_set:N = \l__fontscale_musical_ratio_fp
+ base .code:n =
+ \__fontscale_dim_set_default_pt:Nn \l__fontscale_musical_base_dim {#1}
+ , base .value_required:n = true
+
+ , ratio .fp_set:N = \l__fontscale_musical_ratio_fp
, ratio .value_required:n = true
, notes .int_set:N = \l__fontscale_musical_notes_int
@@ -441,58 +458,46 @@
}
\keys_define:nn { fontscale }
{
- tiny .code:n = \__fontscale_keys_name_code:n {#1}
+ tiny .code:n = \__fontscale_keys_name:n {#1}
, tiny .value_required:n = true
- , scriptsize .code:n = \__fontscale_keys_name_code:n {#1}
+ , scriptsize .code:n = \__fontscale_keys_name:n {#1}
, scriptsize .value_required:n = true
- , footnotesize .code:n = \__fontscale_keys_name_code:n {#1}
+ , footnotesize .code:n = \__fontscale_keys_name:n {#1}
, footnotesize .value_required:n = true
- , small .code:n = \__fontscale_keys_name_code:n {#1}
+ , small .code:n = \__fontscale_keys_name:n {#1}
, small .value_required:n = true
- , normalsize .code:n = \__fontscale_keys_name_code:n {#1}
+ , normalsize .code:n = \__fontscale_keys_name:n {#1}
, normalsize .value_required:n = true
- , large .code:n = \__fontscale_keys_name_code:n {#1}
+ , large .code:n = \__fontscale_keys_name:n {#1}
, large .value_required:n = true
- , Large .code:n = \__fontscale_keys_name_code:n {#1}
+ , Large .code:n = \__fontscale_keys_name:n {#1}
, Large .value_required:n = true
- , LARGE .code:n = \__fontscale_keys_name_code:n {#1}
+ , LARGE .code:n = \__fontscale_keys_name:n {#1}
, LARGE .value_required:n = true
- , huge .code:n = \__fontscale_keys_name_code:n {#1}
+ , huge .code:n = \__fontscale_keys_name:n {#1}
, huge .value_required:n = true
- , Huge .code:n = \__fontscale_keys_name_code:n {#1}
+ , Huge .code:n = \__fontscale_keys_name:n {#1}
, Huge .value_required:n = true
}
-\cs_new_protected:Npn \__fontscale_keys_name_code:n #1
- {
- \str_if_in:nnTF {#1} { / }
- { \__fontscale_keys_name_code_split:ww #1 \q_stop }
- { \tl_set:cn { l__fontscale_ \l_keys_key_str _size_tl } {#1} }
- }
-\cs_new_protected:Npn \__fontscale_keys_name_code_split:ww #1 / #2 \q_stop
- {
- \tl_set:cn { l__fontscale_ \l_keys_key_str _size_tl } {#1}
- \tl_set:cn { l__fontscale_ \l_keys_key_str _baselineskip_tl } {#2}
- }
-% PRE-COMPILE KEYS
+% INITIALIZE AND PRE-COMPILE KEYS
% Pre-compiles the keys with their initial values and then sets the keys to
% their initial values. This is done by hand for speed.
-\cs_new_protected:Npn \__fontscale_keys_precompile_initial:
+\cs_new_protected:Npn \__fontscale_keys_set_initial:
{
- \bool_set_false:N \l__fontscale_ignore_order_bool
\fp_set:Nn \l__fontscale_baselineskip_size_ratio_fp { 1.2 }
\str_set:Nn \l__fontscale_typographic_scale_str { classic-10pt }
- \fp_set:Nn \l__fontscale_modular_ratio_fp { 1.125 }
+ \dim_set:Nn \l__fontscale_musical_base_dim { 10pt }
\fp_set:Nn \l__fontscale_musical_ratio_fp { 2 }
\int_set:Nn \l__fontscale_musical_notes_int { 5 }
@@ -528,98 +533,23 @@
\tl_set:Nn \l__fontscale_huge_baselineskip_tl { \q_no_value }
\tl_set:Nn \l__fontscale_Huge_baselineskip_tl { \q_no_value }
}
-\__fontscale_keys_precompile_initial:
+\__fontscale_keys_set_initial:
-% Pre-compiles the keys with their values at the end of the preamble. The keys
-% are pre-compiled by hand for speed.
-\cs_new_eq:NN \__fontscale_keys_precompile_preamble: \prg_do_nothing:
-% \AddToHook is passed only a single token for speed.
-\AddToHook { begindocument / before }
- { \__fontscale_keys_precompile_preamble_set: }
-\cs_new_protected:Npn \__fontscale_keys_precompile_preamble_set:
+% SET AND PROCESS KEYS
+
+\NewDocumentCommand \fontscalesetup { s m }
{
- \cs_set_protected:Npe \__fontscale_keys_precompile_preamble:
+ \mode_if_math:TF
{
- \bool_if:NTF \l__fontscale_ignore_order_bool
- { \bool_set_true:N } { \bool_set_false:N }
- \exp_not:N \l__fontscale_ignore_order_bool
- \fp_set:Nn \exp_not:N \l__fontscale_baselineskip_size_ratio_fp
- { \exp_not:V \l__fontscale_baselineskip_size_ratio_fp }
- \str_set:Nn \exp_not:N \l__fontscale_typographic_scale_str
- { \l__fontscale_typographic_scale_str }
- \fp_set:Nn \exp_not:N \l__fontscale_modular_ratio_fp
- { \exp_not:V \l__fontscale_modular_ratio_fp }
- \fp_set:Nn \exp_not:N \l__fontscale_musical_ratio_fp
- { \exp_not:V \l__fontscale_musical_ratio_fp }
- \int_set:Nn \exp_not:N \l__fontscale_musical_notes_int
- { \int_use:N \l__fontscale_musical_notes_int }
-
- \tl_set:Nn \exp_not:N \l__fontscale_tiny_scale_tl
- { \exp_not:V \l__fontscale_tiny_scale_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_scriptsize_scale_tl
- { \exp_not:V \l__fontscale_scriptsize_scale_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_footnotesize_scale_tl
- { \exp_not:V \l__fontscale_footnotesize_scale_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_small_scale_tl
- { \exp_not:V \l__fontscale_small_scale_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_large_scale_tl
- { \exp_not:V \l__fontscale_large_scale_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_Large_scale_tl
- { \exp_not:V \l__fontscale_Large_scale_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_LARGE_scale_tl
- { \exp_not:V \l__fontscale_LARGE_scale_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_huge_scale_tl
- { \exp_not:V \l__fontscale_huge_scale_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_Huge_scale_tl
- { \exp_not:V \l__fontscale_Huge_scale_tl }
-
- \tl_set:Nn \exp_not:N \l__fontscale_tiny_size_tl
- { \exp_not:V \l__fontscale_tiny_size_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_scriptsize_size_tl
- { \exp_not:V \l__fontscale_scriptsize_size_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_footnotesize_size_tl
- { \exp_not:V \l__fontscale_footnotesize_size_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_small_size_tl
- { \exp_not:V \l__fontscale_small_size_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_normalsize_size_tl
- { \exp_not:V \l__fontscale_normalsize_size_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_large_size_tl
- { \exp_not:V \l__fontscale_large_size_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_Large_size_tl
- { \exp_not:V \l__fontscale_Large_size_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_LARGE_size_tl
- { \exp_not:V \l__fontscale_LARGE_size_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_huge_size_tl
- { \exp_not:V \l__fontscale_huge_size_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_Huge_size_tl
- { \exp_not:V \l__fontscale_Huge_size_tl }
-
- \tl_set:Nn \exp_not:N \l__fontscale_tiny_baselineskip_tl
- { \exp_not:V \l__fontscale_tiny_baselineskip_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_scriptsize_baselineskip_tl
- { \exp_not:V \l__fontscale_scriptsize_baselineskip_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_footnotesize_baselineskip_tl
- { \exp_not:V \l__fontscale_footnotesize_baselineskip_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_small_baselineskip_tl
- { \exp_not:V \l__fontscale_small_baselineskip_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_normalsize_baselineskip_tl
- { \exp_not:V \l__fontscale_normalsize_baselineskip_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_large_baselineskip_tl
- { \exp_not:V \l__fontscale_large_baselineskip_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_Large_baselineskip_tl
- { \exp_not:V \l__fontscale_Large_baselineskip_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_LARGE_baselineskip_tl
- { \exp_not:V \l__fontscale_LARGE_baselineskip_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_huge_baselineskip_tl
- { \exp_not:V \l__fontscale_huge_baselineskip_tl }
- \tl_set:Nn \exp_not:N \l__fontscale_Huge_baselineskip_tl
- { \exp_not:V \l__fontscale_Huge_baselineskip_tl }
+ \msg_warning:nne { fontscale } { math-mode-warning }
+ { \token_to_str:N \fontscalesetup }
+ }
+ {
+ \IfBooleanTF #1
+ { \__fontscale_keys_reset:n {#2} }
+ { \__fontscale_keys_set:n {#2} }
}
}
-
-% PROCESS KEYS
-
-\NewDocumentCommand \fontscalesetup { m } { \__fontscale_keys_set:n {#1} }
\cs_new_protected:Npn \__fontscale_keys_set:n #1
{
\keys_set:nn { fontscale } {#1}
@@ -628,55 +558,65 @@
\prg_break:
\prg_break_point:
}
+\cs_new_protected:Npn \__fontscale_keys_reset:n
+ { \__fontscale_keys_set_initial: \__fontscale_keys_set:n }
\cs_new_protected:Npn \__fontscale_keys_process:
{
- \__fontscale_keys_process_check_modular_musical:
+ \__fontscale_keys_process_start:
\__fontscale_keys_process_normalsize:
\__fontscale_keys_process_other:
\__fontscale_keys_process_check_order:
}
-% Issues an error if the key 'modular/ratio', 'musical/ratio', or
-% 'musical/notes' is set to an impossible value.
-\cs_new_protected:Npn \__fontscale_keys_process_check_modular_musical:
+\cs_new_protected:Npn \__fontscale_keys_process_start:
{
- \fp_compare:nNnF \l__fontscale_modular_ratio_fp > \c_one_fp
+ \fp_compare:nNnT \l__fontscale_baselineskip_size_ratio_fp < \c_one_fp
{
- \msg_error:nn { fontscale } { modular-ratio-out-of-bounds }
+ \msg_error:nn { fontscale }
+ { key-baselineskip-size-ratio-out-of-bounds }
+ \prg_break:
+ }
+ \dim_compare:nNnF \l__fontscale_musical_base_dim > \c_zero_dim
+ {
+ \msg_error:nn { fontscale } { key-musical-base-out-of-bounds }
\prg_break:
}
\fp_compare:nNnF \l__fontscale_musical_ratio_fp > \c_one_fp
{
- \msg_error:nn { fontscale } { musical-ratio-out-of-bounds }
+ \msg_error:nn { fontscale } { key-musical-ratio-out-of-bounds }
\prg_break:
}
\int_compare:nNnF \l__fontscale_musical_notes_int > 0
{
- \msg_error:nn { fontscale } { musical-notes-out-of-bounds }
+ \msg_error:nn { fontscale } { key-musical-notes-out-of-bounds }
\prg_break:
}
}
-% Sets the size and baselineskip of \normalsize and updates their property list
-% entries.
+% Sets the font size and font baselineskip of \normalsize.
\cs_new_protected:Npn \__fontscale_keys_process_normalsize:
{
\quark_if_no_value:NTF \l__fontscale_normalsize_size_tl
{
\dim_set:Nn \l_fontscale_normalsize_size_dim
{
- \str_case:VnF \l__fontscale_typographic_scale_str
+ \str_case:Vn \l__fontscale_typographic_scale_str
{
+ { classic-10pt } { 10pt }
{ classic-11pt } { 11pt }
{ classic-12pt } { 12pt }
+ { musical } { \l__fontscale_musical_base_dim }
}
- { 10pt }
}
}
{
- \__fontscale_dim_set_with_default_pt:Nn
- \l_fontscale_normalsize_size_dim { \l__fontscale_normalsize_size_tl }
+ \__fontscale_dim_set_default_pt:Nn \l_fontscale_normalsize_size_dim
+ { \l__fontscale_normalsize_size_tl }
+ \dim_compare:nNnF \l_fontscale_normalsize_size_dim > \c_zero_dim
+ {
+ \msg_error:nnn { fontscale } { key-font-size-out-of-bounds }
+ { normalsize }
+ \prg_break:
+ }
}
- \prop_put:NnV \l_fontscale_normalsize_prop { size }
- \l_fontscale_normalsize_size_dim
\fp_set:Nn \l__fontscale_normalsize_size_fp
{ \l_fontscale_normalsize_size_dim }
\quark_if_no_value:NTF \l__fontscale_normalsize_baselineskip_tl
@@ -691,12 +631,17 @@
}
}
{
- \__fontscale_skip_set_with_default_pt:Nn
+ \__fontscale_skip_set_default_pt:Nn
\l_fontscale_normalsize_baselineskip_skip
{ \l__fontscale_normalsize_baselineskip_tl }
+ \dim_compare:nNnT \l_fontscale_normalsize_baselineskip_skip <
+ \l_fontscale_normalsize_size_dim
+ {
+ \msg_error:nnn { fontscale }
+ { key-font-baselineskip-out-of-bounds } { normalsize }
+ \prg_break:
+ }
}
- \prop_put:NnV \l_fontscale_normalsize_prop { baselineskip }
- \l_fontscale_normalsize_baselineskip_skip
}
% Auxiliary functions that expand to the font size depending on the name of the
% font size command.
@@ -745,57 +690,55 @@
{ Huge } { 24pt }
}
}
-\cs_new:Npn \__fontscale_keys_process_other_modular:n #1
- {
- \fp_to_dim:n
- {
- \l__fontscale_normalsize_size_fp * \l__fontscale_modular_ratio_fp
- ^ \use:c { c_fontscale_#1_step_fp }
- }
- }
\cs_new:Npn \__fontscale_keys_process_other_musical:n #1
{
\fp_to_dim:n
{
- \l__fontscale_normalsize_size_fp * \l__fontscale_musical_ratio_fp
+ \l__fontscale_musical_base_fp * \l__fontscale_musical_ratio_fp
^ ( \use:c { c_fontscale_#1_step_fp }
/ \l__fontscale_musical_notes_fp )
}
}
-% Sets the size, scale, and baselineskip of the other font size commands and
-% updates their property list entries. Issues a warning if the user sets both
-% the scale and size keys for the same font size command.
+% Sets the font size, font scale, and font baselineskip of the other font size
+% commands.
\cs_new_protected:Npn \__fontscale_keys_process_other:
{
- \cs_set_eq:Nc \__fontscale_keys_process_other_typographic_scale:n
+ \str_case:Vn \l__fontscale_typographic_scale_str
{
- \str_case:Vn \l__fontscale_typographic_scale_str
- {
- { classic-10pt } { __fontscale_keys_process_other_classic_xpt:n }
- { classic-11pt } { __fontscale_keys_process_other_classic_xipt:n }
- { classic-12pt } { __fontscale_keys_process_other_classic_xiipt:n }
- { modular } { __fontscale_keys_process_other_modular:n }
- { musical } { __fontscale_keys_process_other_musical:n }
- }
+ { classic-10pt }
+ {
+ \cs_set_eq:NN \__fontscale_keys_process_other_fn_aux:n
+ \__fontscale_keys_process_other_classic_xpt:n
+ }
+ { classic-11pt }
+ {
+ \cs_set_eq:NN \__fontscale_keys_process_other_fn_aux:n
+ \__fontscale_keys_process_other_classic_xipt:n
+ }
+ { classic-12pt }
+ {
+ \cs_set_eq:NN \__fontscale_keys_process_other_fn_aux:n
+ \__fontscale_keys_process_other_classic_xiipt:n
+ }
+ { musical }
+ {
+ \cs_set_eq:NN \__fontscale_keys_process_other_fn_aux:n
+ \__fontscale_keys_process_other_musical:n
+ \fp_set:Nn \l__fontscale_musical_base_fp
+ { \l__fontscale_musical_base_dim }
+ \fp_set:Nn \l__fontscale_musical_notes_fp
+ { \l__fontscale_musical_notes_int }
+ }
}
- \str_if_eq:VnT \l__fontscale_typographic_scale_str { musical }
+ \tl_map_function:nN
{
- \fp_set:Nn \l__fontscale_musical_notes_fp
- { \l__fontscale_musical_notes_int }
+ {tiny} {scriptsize} {footnotesize} {small}
+ {large} {Large} {LARGE} {huge} {Huge}
}
- \tl_map_function:NN \c__fontscale_names_other_tl
- \__fontscale_keys_process_other_aux:n
+ \__fontscale_keys_process_other_fn:n
}
-\cs_new_protected:Npn \__fontscale_keys_process_other_aux:n #1
+\cs_new_protected:Npn \__fontscale_keys_process_other_fn:n #1
{
- \quark_if_no_value:cF { l__fontscale_#1_size_tl }
- {
- \__fontscale_dim_set_with_default_pt:cn { l_fontscale_#1_size_dim }
- { \use:c { l__fontscale_#1_size_tl } }
- \quark_if_no_value:cF { l__fontscale_#1_scale_tl }
- { \msg_warning:nnn { fontscale } { key-font-scale-ignored } {#1} }
- \prg_break:
- }
\quark_if_no_value:cF { l__fontscale_#1_scale_tl }
{
\dim_set:cn { l_fontscale_#1_size_dim }
@@ -806,17 +749,42 @@
* ( \use:c { l__fontscale_#1_scale_tl } )
}
}
+ \dim_compare:nNnF { \use:c { l_fontscale_#1_size_dim } } > \c_zero_dim
+ {
+ \tl_map_break:n
+ {
+ \msg_error:nnn { fontscale } { key-font-scale-out-of-bounds }
+ {#1}
+ \prg_break:
+ }
+ }
+ \quark_if_no_value:cT { l__fontscale_#1_size_tl } { \prg_break: }
+ }
+ \quark_if_no_value:cF { l__fontscale_#1_size_tl }
+ {
+ \__fontscale_dim_set_default_pt:cn { l_fontscale_#1_size_dim }
+ { \use:c { l__fontscale_#1_size_tl } }
+ \dim_compare:nNnF { \use:c { l_fontscale_#1_size_dim } } > \c_zero_dim
+ {
+ \tl_map_break:n
+ {
+ \msg_error:nnn { fontscale } { key-font-size-out-of-bounds }
+ {#1}
+ \prg_break:
+ }
+ }
+ \quark_if_no_value:cF { l__fontscale_#1_scale_tl }
+ {
+ \msg_warning:nnn { fontscale } { key-font-scale-overwritten } {#1}
+ }
\prg_break:
}
\dim_set:cn { l_fontscale_#1_size_dim }
- { \__fontscale_keys_process_other_typographic_scale:n {#1} }
+ { \__fontscale_keys_process_other_fn_aux:n {#1} }
\prg_break:
\prg_break_point:
\fp_set:cn { l_fontscale_#1_scale_fp }
{ \use:c { l_fontscale_#1_size_dim } / \l__fontscale_normalsize_size_fp }
- \prop_put:cne { l_fontscale_#1_prop } { scale }
- { \fp_use:c { l_fontscale_#1_scale_fp } }
- \prop_put:cnv { l_fontscale_#1_prop } { size } { l_fontscale_#1_size_dim }
\quark_if_no_value:cTF { l__fontscale_#1_baselineskip_tl }
{
\skip_set:cn { l_fontscale_#1_baselineskip_skip }
@@ -829,122 +797,113 @@
}
}
{
- \__fontscale_skip_set_with_default_pt:cn
+ \__fontscale_skip_set_default_pt:cn
{ l_fontscale_#1_baselineskip_skip }
{ \use:c { l__fontscale_#1_baselineskip_tl } }
+ \dim_compare:nNnT { \use:c { l_fontscale_#1_baselineskip_skip } } <
+ { \use:c { l_fontscale_#1_size_dim } }
+ {
+ \tl_map_break:n
+ {
+ \msg_error:nnn { fontscale }
+ { key-font-baselineskip-out-of-bounds } {#1}
+ \prg_break:
+ }
+ }
}
- \prop_put:cnv { l_fontscale_#1_prop } { baselineskip }
- { l_fontscale_#1_baselineskip_skip }
}
% Issues a warning if the font sizes or font baselineskips (ignoring the
-% stretch and shrink components) are not in the correct order unless the value
-% for the key 'ignore-order' is 'true'.
+% stretch and shrink components) are not in the correct order.
\cs_new_protected:Npn \__fontscale_keys_process_check_order:
{
- \bool_if:NF \l__fontscale_ignore_order_bool
+ \dim_compare:nF
{
- \dim_compare:nF
- {
- \l_fontscale_tiny_size_dim
- < \l_fontscale_scriptsize_size_dim
- < \l_fontscale_footnotesize_size_dim
- < \l_fontscale_small_size_dim
- < \l_fontscale_normalsize_size_dim
- < \l_fontscale_large_size_dim
- < \l_fontscale_Large_size_dim
- < \l_fontscale_LARGE_size_dim
- < \l_fontscale_huge_size_dim
- < \l_fontscale_Huge_size_dim
- }
- { \msg_warning:nn { fontscale } { font-sizes-out-of-order } }
- \dim_compare:nF
- {
- \l_fontscale_tiny_baselineskip_skip
- < \l_fontscale_scriptsize_baselineskip_skip
- < \l_fontscale_footnotesize_baselineskip_skip
- < \l_fontscale_small_baselineskip_skip
- < \l_fontscale_normalsize_baselineskip_skip
- < \l_fontscale_large_baselineskip_skip
- < \l_fontscale_Large_baselineskip_skip
- < \l_fontscale_LARGE_baselineskip_skip
- < \l_fontscale_huge_baselineskip_skip
- < \l_fontscale_Huge_baselineskip_skip
- }
- { \msg_warning:nn { fontscale } { font-baselineskips-out-of-order } }
+ \l_fontscale_tiny_size_dim
+ < \l_fontscale_scriptsize_size_dim
+ < \l_fontscale_footnotesize_size_dim
+ < \l_fontscale_small_size_dim
+ < \l_fontscale_normalsize_size_dim
+ < \l_fontscale_large_size_dim
+ < \l_fontscale_Large_size_dim
+ < \l_fontscale_LARGE_size_dim
+ < \l_fontscale_huge_size_dim
+ < \l_fontscale_Huge_size_dim
}
+ { \msg_warning:nn { fontscale } { font-sizes-out-of-order } }
+ \dim_compare:nF
+ {
+ \l_fontscale_tiny_baselineskip_skip
+ < \l_fontscale_scriptsize_baselineskip_skip
+ < \l_fontscale_footnotesize_baselineskip_skip
+ < \l_fontscale_small_baselineskip_skip
+ < \l_fontscale_normalsize_baselineskip_skip
+ < \l_fontscale_large_baselineskip_skip
+ < \l_fontscale_Large_baselineskip_skip
+ < \l_fontscale_LARGE_baselineskip_skip
+ < \l_fontscale_huge_baselineskip_skip
+ < \l_fontscale_Huge_baselineskip_skip
+ }
+ { \msg_warning:nn { fontscale } { font-baselineskips-out-of-order } }
}
% DOCUMENT COMMANDS
-% The internal functions of each font size command are not used elsewhere in
-% the code for compatibility with user-defined hooks
-% (e.g. \AddToHook{cmd/normalsize/after}{<user-defined-function>}).
-\DeclareDocumentCommand \tiny { } { \__fontscale_tiny: }
-\cs_new_protected:Npn \__fontscale_tiny:
+% Defines the standard LaTeX font size commands from \tiny to \Huge and
+% initializes to \normalsize.
+\DeclareDocumentCommand \tiny { }
{
\__fontscale_fontsize:NNN \tiny \l_fontscale_tiny_size_dim
\l_fontscale_tiny_baselineskip_skip
}
-\DeclareDocumentCommand \scriptsize { } { \__fontscale_scriptsize: }
-\cs_new_protected:Npn \__fontscale_scriptsize:
+\DeclareDocumentCommand \scriptsize { }
{
\__fontscale_fontsize:NNN \scriptsize \l_fontscale_scriptsize_size_dim
\l_fontscale_scriptsize_baselineskip_skip
}
-\DeclareDocumentCommand \footnotesize { } { \__fontscale_footnotesize: }
-\cs_new_protected:Npn \__fontscale_footnotesize:
+\DeclareDocumentCommand \footnotesize { }
{
\__fontscale_fontsize:NNN \footnotesize \l_fontscale_footnotesize_size_dim
\l_fontscale_footnotesize_baselineskip_skip
}
-\DeclareDocumentCommand \small { } { \__fontscale_small: }
-\cs_new_protected:Npn \__fontscale_small:
+\DeclareDocumentCommand \small { }
{
\__fontscale_fontsize:NNN \small \l_fontscale_small_size_dim
\l_fontscale_small_baselineskip_skip
}
-\DeclareDocumentCommand \normalsize { } { \__fontscale_normalsize: }
-\cs_new_protected:Npn \__fontscale_normalsize:
+\DeclareDocumentCommand \normalsize { }
{
\__fontscale_fontsize:NNN \normalsize \l_fontscale_normalsize_size_dim
\l_fontscale_normalsize_baselineskip_skip
}
-\DeclareDocumentCommand \large { } { \__fontscale_large: }
-\cs_new_protected:Npn \__fontscale_large:
+\DeclareDocumentCommand \large { }
{
\__fontscale_fontsize:NNN \large \l_fontscale_large_size_dim
\l_fontscale_large_baselineskip_skip
}
-\DeclareDocumentCommand \Large { } { \__fontscale_Large: }
-\cs_new_protected:Npn \__fontscale_Large:
+\DeclareDocumentCommand \Large { }
{
\__fontscale_fontsize:NNN \Large \l_fontscale_Large_size_dim
\l_fontscale_Large_baselineskip_skip
}
-\DeclareDocumentCommand \LARGE { } { \__fontscale_LARGE: }
-\cs_new_protected:Npn \__fontscale_LARGE:
+\DeclareDocumentCommand \LARGE { }
{
\__fontscale_fontsize:NNN \LARGE \l_fontscale_LARGE_size_dim
\l_fontscale_LARGE_baselineskip_skip
}
-\DeclareDocumentCommand \huge { } { \__fontscale_huge: }
-\cs_new_protected:Npn \__fontscale_huge:
+\DeclareDocumentCommand \huge { }
{
\__fontscale_fontsize:NNN \huge \l_fontscale_huge_size_dim
\l_fontscale_huge_baselineskip_skip
}
-\DeclareDocumentCommand \Huge { } { \__fontscale_Huge: }
-\cs_new_protected:Npn \__fontscale_Huge:
+\DeclareDocumentCommand \Huge { }
{
\__fontscale_fontsize:NNN \Huge \l_fontscale_Huge_size_dim
\l_fontscale_Huge_baselineskip_skip
}
-% Initializes to \normalsize.
\normalsize
-\NewExpandableDocumentCommand \CurrentFontStep { }
- { \__fontscale_current_font_step: }
-\cs_new:Npn \__fontscale_current_font_step:
+\NewExpandableDocumentCommand \CurrentFontStep { } { \__fontscale_step: }
+\cs_new:Npn \__fontscale_step:
{
\dim_case:nnF { \f@size pt }
{
@@ -960,47 +919,100 @@
{ \l_fontscale_Huge_size_dim } { 5 }
}
{
- \str_case:Vn \l__fontscale_typographic_scale_str
+ \str_if_eq:VnT \l__fontscale_typographic_scale_str { musical }
{
- { modular }
- {
- \fp_eval:n
- {
- ln ( \f@size / \l__fontscale_normalsize_size_fp )
- / ln ( \l__fontscale_modular_ratio_fp )
- }
- }
- { musical }
- {
- \fp_eval:n
- {
- \l__fontscale_musical_notes_fp
- * ln ( \f@size / \l__fontscale_normalsize_size_fp )
- / ln ( \l__fontscale_musical_ratio_fp )
- }
- }
+ \fp_eval:n
+ {
+ \l__fontscale_musical_notes_fp
+ * ln ( \f@size / \l__fontscale_musical_base_fp )
+ / ln ( \l__fontscale_musical_ratio_fp )
+ }
}
}
}
-\NewExpandableDocumentCommand \CurrentFontScale { }
- { \__fontscale_current_font_scale: }
-\cs_new:Npn \__fontscale_current_font_scale:
+\NewExpandableDocumentCommand \CurrentFontScale { } { \__fontscale_scale: }
+\cs_new:Npn \__fontscale_scale:
{ \fp_eval:n { \f@size / \l__fontscale_normalsize_size_fp } }
-\NewExpandableDocumentCommand \CurrentFontSize { }
- { \__fontscale_current_font_size: }
-\cs_new:Npn \__fontscale_current_font_size: { \f@size pt }
+\NewExpandableDocumentCommand \CurrentFontSize { } { \__fontscale_size: }
+\cs_new:Npn \__fontscale_size: { \f@size pt }
\NewExpandableDocumentCommand \CurrentFontBaselineskip { }
- { \__fontscale_current_font_baselineskip: }
-\cs_new:Npn \__fontscale_current_font_baselineskip: { \f@baselineskip }
+ { \__fontscale_baselineskip: }
+\cs_new:Npn \__fontscale_baselineskip: { \f@baselineskip }
+
+\NewExpandableDocumentCommand \CurrentFontSizeCommand { }
+ { \__fontscale_name: }
+\cs_new:Npn \__fontscale_name:
+ {
+ \dim_case:nn { \f@size pt }
+ {
+ { \l_fontscale_tiny_size_dim }
+ {
+ \skip_if_eq:nnT { \l_fontscale_tiny_baselineskip_skip }
+ { \f@baselineskip } { tiny }
+ }
+ { \l_fontscale_scriptsize_size_dim }
+ {
+ \skip_if_eq:nnT { \l_fontscale_scriptsize_baselineskip_skip }
+ { \f@baselineskip } { scriptsize }
+ }
+ { \l_fontscale_footnotesize_size_dim }
+ {
+ \skip_if_eq:nnT { \l_fontscale_footnotesize_baselineskip_skip }
+ { \f@baselineskip } { footnotesize }
+ }
+ { \l_fontscale_small_size_dim }
+ {
+ \skip_if_eq:nnT { \l_fontscale_small_baselineskip_skip }
+ { \f@baselineskip } { small }
+ }
+ { \l_fontscale_normalsize_size_dim }
+ {
+ \skip_if_eq:nnT { \l_fontscale_normalsize_baselineskip_skip }
+ { \f@baselineskip } { normalsize }
+ }
+ { \l_fontscale_large_size_dim }
+ {
+ \skip_if_eq:nnT { \l_fontscale_large_baselineskip_skip }
+ { \f@baselineskip } { large }
+ }
+ { \l_fontscale_Large_size_dim }
+ {
+ \skip_if_eq:nnT { \l_fontscale_Large_baselineskip_skip }
+ { \f@baselineskip } { Large }
+ }
+ { \l_fontscale_LARGE_size_dim }
+ {
+ \skip_if_eq:nnT { \l_fontscale_LARGE_baselineskip_skip }
+ { \f@baselineskip } { LARGE }
+ }
+ { \l_fontscale_huge_size_dim }
+ {
+ \skip_if_eq:nnT { \l_fontscale_huge_baselineskip_skip }
+ { \f@baselineskip } { huge }
+ }
+ { \l_fontscale_Huge_size_dim }
+ {
+ \skip_if_eq:nnT { \l_fontscale_Huge_baselineskip_skip }
+ { \f@baselineskip } { Huge }
+ }
+ }
+ }
\NewDocumentCommand \SetFontStep { s m }
{
- \IfBooleanTF #1
- { \__fontscale_add_font_step:n {#2} }
- { \__fontscale_set_font_step:n {#2} }
+ \mode_if_math:TF
+ {
+ \msg_warning:nne { fontscale } { math-mode-warning }
+ { \token_to_str:N \SetFontStep }
+ }
+ {
+ \IfBooleanTF #1
+ { \__fontscale_add_font_step:n {#2} }
+ { \__fontscale_set_font_step:n {#2} }
+ }
}
% Using \str_case: here is significantly faster (and easier to write) than
% repeatedly testing \fp_compare:.
@@ -1020,49 +1032,42 @@
{ 5 } { \Huge }
}
{
- \str_case:VnF \l__fontscale_typographic_scale_str
+ \str_if_eq:VnTF \l__fontscale_typographic_scale_str { musical }
{
- { modular }
- {
- \__fontscale_fontsize:n
- {
- \fp_to_dim:n
- {
- \l__fontscale_normalsize_size_fp
- * \l__fontscale_modular_ratio_fp ^ (#1)
- }
- }
- }
- { musical }
- {
- \__fontscale_fontsize:n
- {
- \fp_to_dim:n
- {
- \l__fontscale_normalsize_size_fp
- * \l__fontscale_musical_ratio_fp
- ^ ( (#1) / \l__fontscale_musical_notes_fp )
- }
- }
- }
+ \__fontscale_fontsize:n
+ {
+ \fp_to_dim:n
+ {
+ \l__fontscale_musical_base_fp
+ * \l__fontscale_musical_ratio_fp
+ ^ ( (#1) / \l__fontscale_musical_notes_fp )
+ }
+ }
}
{ \msg_error:nn { fontscale } { font-step-out-of-bounds } }
}
}
\cs_new_protected:Npn \__fontscale_add_font_step:n #1
{
- \tl_set:Ne \l__fontscale_step_tl { \__fontscale_current_font_step: }
- \tl_if_empty:NTF \l__fontscale_step_tl
+ \tl_set:Ne \l__fontscale_tmp_tl { \__fontscale_step: }
+ \tl_if_empty:NTF \l__fontscale_tmp_tl
{ \msg_error:nn { fontscale } { current-font-step-out-of-bounds } }
- { \__fontscale_add_font_step_aux:n { (#1) + \l__fontscale_step_tl } }
+ { \__fontscale_add_font_step_aux:n { (#1) + \l__fontscale_tmp_tl } }
}
\cs_new_eq:NN \__fontscale_add_font_step_aux:n \__fontscale_set_font_step:n
\NewDocumentCommand \SetFontScale { s m }
{
- \IfBooleanTF #1
- { \__fontscale_add_font_scale:n {#2} }
- { \__fontscale_set_font_scale:n {#2} }
+ \mode_if_math:TF
+ {
+ \msg_warning:nne { fontscale } { math-mode-warning }
+ { \token_to_str:N \SetFontScale }
+ }
+ {
+ \IfBooleanTF #1
+ { \__fontscale_add_font_scale:n {#2} }
+ { \__fontscale_set_font_scale:n {#2} }
+ }
}
\cs_new_protected:Npn \__fontscale_set_font_scale:n #1
{
@@ -1077,70 +1082,150 @@
\NewDocumentCommand \SetFontSize { s m }
{
- \IfBooleanTF #1
- { \__fontscale_add_font_size:n {#2} }
- { \__fontscale_set_font_size:n {#2} }
+ \mode_if_math:TF
+ {
+ \msg_warning:nne { fontscale } { math-mode-warning }
+ { \token_to_str:N \SetFontSize }
+ }
+ {
+ \IfBooleanTF #1
+ { \__fontscale_add_font_size:n {#2} }
+ { \__fontscale_set_font_size:n {#2} }
+ }
}
\cs_new_eq:NN \__fontscale_set_font_size:n \__fontscale_fontsize:n
\cs_new_protected:Npn \__fontscale_add_font_size:n #1
{
- \__fontscale_dim_set_with_default_pt:Nn \l__fontscale_size_dim {#1}
- \dim_add:Nn \l__fontscale_size_dim { \f@size pt }
- \__fontscale_fontsize:n { \l__fontscale_size_dim }
+ \__fontscale_dim_set_default_pt:Nn \l__fontscale_tmp_dim {#1}
+ \__fontscale_fontsize:n { \l__fontscale_tmp_dim + \f@size pt }
}
\NewDocumentCommand \ScaleFont { m }
- { \__fontscale_scale_font_size_baselineskip:n {#1} }
-\cs_new_protected:Npn \__fontscale_scale_font_size_baselineskip:n #1
{
+ \mode_if_math:TF
+ {
+ \msg_warning:nne { fontscale } { math-mode-warning }
+ { \token_to_str:N \ScaleFont }
+ }
+ { \__fontscale_scale_font:n {#1} }
+ }
+\cs_new_protected:Npn \__fontscale_scale_font:n #1
+ {
+ \fp_set:Nn \l__fontscale_tmp_fp {#1}
\__fontscale_fontsize:nn
- { \fp_to_dim:n { \f@size * (#1) } }
- { \fp_to_dim:n { \dim_to_fp:n { \f@baselineskip } * (#1) } }
+ { \fp_to_dim:n { \f@size * \l__fontscale_tmp_fp } }
+ {
+ \fp_to_dim:n
+ { \dim_to_fp:n { \f@baselineskip } * \l__fontscale_tmp_fp }
+ }
}
\NewDocumentCommand \SetFontSizeBaselineskip { m m }
- { \__fontscale_set_font_size_baselineskip:nn {#1} {#2} }
+ {
+ \mode_if_math:TF
+ {
+ \msg_warning:nne { fontscale } { math-mode-warning }
+ { \token_to_str:N \SetFontSizeBaselineskip }
+ }
+ { \__fontscale_set_font_size_baselineskip:nn {#1} {#2} }
+ }
\cs_new_eq:NN \__fontscale_set_font_size_baselineskip:nn
\__fontscale_fontsize:nn
-\NewDocumentCommand \PrintFontParameters { }
- { \__fontscale_print_font_parameters: }
-\cs_new_protected:Npn \__fontscale_print_font_parameters:
+\NewDocumentCommand \PrintFontSizeParameters { }
+ { \__fontscale_print_font_size_parameters: }
+\cs_new_protected:Npn \__fontscale_print_font_size_parameters:
{
- step ~=~ \__fontscale_current_font_step: ,~
- scale ~=~ \__fontscale_current_font_scale: ,~
- size ~=~ \__fontscale_current_font_size: ,~
- baselineskip ~=~ \__fontscale_current_font_baselineskip:
+ step ~=~ \__fontscale_step: ,~
+ scale ~=~ \__fontscale_scale: ,~
+ size ~=~ \__fontscale_size: ,~
+ baselineskip ~=~ \__fontscale_baselineskip:
}
-\NewDocumentCommand \PrintAllFontParameters { }
- { \__fontscale_print_all_font_parameters: }
-\cs_new_protected:Npn \__fontscale_print_all_font_parameters:
+\NewDocumentCommand \PrintAllFontSizeParameters { }
{
- \tl_map_inline:Nn \c__fontscale_names_tl
+ \mode_if_math:TF
{
- \prop_get:cnN { l_fontscale_##1_prop } { step } \l__fontscale_step_tl
- \prop_get:cnN { l_fontscale_##1_prop } { scale } \l__fontscale_scale_tl
- \token_to_str:c {##1} \@ \c_colon_str \c_space_tl
- step ~=~ \l__fontscale_step_tl ,~
- scale ~=~ \l__fontscale_scale_tl ,~
- size ~=~ \dim_use:c { l_fontscale_##1_size_dim } ,~
- baselineskip ~=~ \skip_use:c { l_fontscale_##1_baselineskip_skip }
- \str_if_eq:nnF {##1} { Huge } { \newline }
+ \msg_error:nne { fontscale } { math-mode-error }
+ { \token_to_str:N \PrintAllFontSizeParameters }
+ }
+ { \__fontscale_print_all_font_size_parameters: }
+ }
+\cs_new_protected:Npn \__fontscale_print_all_font_size_parameters:
+ {
+ \token_to_str:N \tiny \c_colon_str \c_space_tl
+ step ~=~ -4 ,~
+ scale ~=~ \fp_use:N \l_fontscale_tiny_scale_fp ,~
+ size ~=~ \dim_use:N \l_fontscale_tiny_size_dim ,~
+ baselineskip ~=~ \skip_use:N \l_fontscale_tiny_baselineskip_skip
+ \newline
+ \token_to_str:N \scriptsize \c_colon_str \c_space_tl
+ step ~=~ -3 ,~
+ scale ~=~ \fp_use:N \l_fontscale_scriptsize_scale_fp ,~
+ size ~=~ \dim_use:N \l_fontscale_scriptsize_size_dim ,~
+ baselineskip ~=~ \skip_use:N \l_fontscale_scriptsize_baselineskip_skip
+ \newline
+ \token_to_str:N \footnotesize \c_colon_str \c_space_tl
+ step ~=~ -2 ,~
+ scale ~=~ \fp_use:N \l_fontscale_footnotesize_scale_fp ,~
+ size ~=~ \dim_use:N \l_fontscale_footnotesize_size_dim ,~
+ baselineskip ~=~ \skip_use:N \l_fontscale_footnotesize_baselineskip_skip
+ \newline
+ \token_to_str:N \small \c_colon_str \c_space_tl
+ step ~=~ -1 ,~
+ scale ~=~ \fp_use:N \l_fontscale_small_scale_fp ,~
+ size ~=~ \dim_use:N \l_fontscale_small_size_dim ,~
+ baselineskip ~=~ \skip_use:N \l_fontscale_small_baselineskip_skip
+ \newline
+ \token_to_str:N \normalsize \c_colon_str \c_space_tl
+ step ~=~ 0 ,~
+ scale ~=~ 1 ,~
+ size ~=~ \dim_use:N \l_fontscale_normalsize_size_dim ,~
+ baselineskip ~=~ \skip_use:N \l_fontscale_normalsize_baselineskip_skip
+ \newline
+ \token_to_str:N \large \c_colon_str \c_space_tl
+ step ~=~ 1 ,~
+ scale ~=~ \fp_use:N \l_fontscale_large_scale_fp ,~
+ size ~=~ \dim_use:N \l_fontscale_large_size_dim ,~
+ baselineskip ~=~ \skip_use:N \l_fontscale_large_baselineskip_skip
+ \newline
+ \token_to_str:N \Large \c_colon_str \c_space_tl
+ step ~=~ 2 ,~
+ scale ~=~ \fp_use:N \l_fontscale_Large_scale_fp ,~
+ size ~=~ \dim_use:N \l_fontscale_Large_size_dim ,~
+ baselineskip ~=~ \skip_use:N \l_fontscale_Large_baselineskip_skip
+ \newline
+ \token_to_str:N \LARGE \@ \c_colon_str \c_space_tl
+ step ~=~ 3 ,~
+ scale ~=~ \fp_use:N \l_fontscale_LARGE_scale_fp ,~
+ size ~=~ \dim_use:N \l_fontscale_LARGE_size_dim ,~
+ baselineskip ~=~ \skip_use:N \l_fontscale_LARGE_baselineskip_skip
+ \newline
+ \token_to_str:N \huge \c_colon_str \c_space_tl
+ step ~=~ 4 ,~
+ scale ~=~ \fp_use:N \l_fontscale_huge_scale_fp ,~
+ size ~=~ \dim_use:N \l_fontscale_huge_size_dim ,~
+ baselineskip ~=~ \skip_use:N \l_fontscale_huge_baselineskip_skip
+ \newline
+ \token_to_str:N \Huge \c_colon_str \c_space_tl
+ step ~=~ 5 ,~
+ scale ~=~ \fp_use:N \l_fontscale_Huge_scale_fp ,~
+ size ~=~ \dim_use:N \l_fontscale_Huge_size_dim ,~
+ baselineskip ~=~ \skip_use:N \l_fontscale_Huge_baselineskip_skip
+ }
+
+\NewDocumentCommand \PrintSampleText { s +m }
+ {
+ \mode_if_math:TF
+ {
+ \msg_error:nne { fontscale } { math-mode-error }
+ { \token_to_str:N \PrintSampleText }
+ }
+ {
+ \IfBooleanTF #1
+ { \__fontscale_print_sample_text_descending_order:n {#2} }
+ { \__fontscale_print_sample_text_ascending_order:n {#2} }
}
- }
-
-\NewDocumentCommand \PrintSampleText
- { s O
- {
- The~ \texttt { fontscale }~ package \c_colon_str \c_space_tl
- A~ user~ interface~ for~ setting~ document~ font~ sizes
- }
- }
- {
- \IfBooleanTF #1
- { \__fontscale_print_sample_text_descending_order:n {#2} }
- { \__fontscale_print_sample_text_ascending_order:n {#2} }
}
\cs_new_protected:Npn \__fontscale_print_sample_text_ascending_order:n #1
{
@@ -1169,80 +1254,26 @@
{ \tiny #1 \par }
}
-\NewDocumentCommand \PrintFontSizeCommand { } { \__fontscale_print_name: }
-\cs_new_protected:Npn \__fontscale_print_name:
+\NewDocumentCommand \PrintFontSizeCommand { }
{
- \dim_case:nn { \f@size pt }
+ \mode_if_math:TF
{
- { \l_fontscale_tiny_size_dim }
- {
- \skip_if_eq:nnT { \f@baselineskip }
- { \l_fontscale_tiny_baselineskip_skip }
- { \token_to_str:N \tiny \prg_break: }
- }
- { \l_fontscale_scriptsize_size_dim }
- {
- \skip_if_eq:nnT { \f@baselineskip }
- { \l_fontscale_scriptsize_baselineskip_skip }
- { \token_to_str:N \scriptsize \prg_break: }
- }
- { \l_fontscale_footnotesize_size_dim }
- {
- \skip_if_eq:nnT { \f@baselineskip }
- { \l_fontscale_footnotesize_baselineskip_skip }
- { \token_to_str:N \footnotesize \prg_break: }
- }
- { \l_fontscale_small_size_dim }
- {
- \skip_if_eq:nnT { \f@baselineskip }
- { \l_fontscale_small_baselineskip_skip }
- { \token_to_str:N \small \prg_break: }
- }
- { \l_fontscale_normalsize_size_dim }
- {
- \skip_if_eq:nnT { \f@baselineskip }
- { \l_fontscale_normalsize_baselineskip_skip }
- { \token_to_str:N \normalsize \prg_break: }
- }
- { \l_fontscale_large_size_dim }
- {
- \skip_if_eq:nnT { \f@baselineskip }
- { \l_fontscale_large_baselineskip_skip }
- { \token_to_str:N \large \prg_break: }
- }
- { \l_fontscale_Large_size_dim }
- {
- \skip_if_eq:nnT { \f@baselineskip }
- { \l_fontscale_Large_baselineskip_skip }
- { \token_to_str:N \Large \prg_break: }
- }
- { \l_fontscale_LARGE_size_dim }
- {
- \skip_if_eq:nnT { \f@baselineskip }
- { \l_fontscale_LARGE_baselineskip_skip }
- { \token_to_str:N \LARGE \@ \prg_break: }
- }
- { \l_fontscale_huge_size_dim }
- {
- \skip_if_eq:nnT { \f@baselineskip }
- { \l_fontscale_huge_baselineskip_skip }
- { \token_to_str:N \huge \prg_break: }
- }
- { \l_fontscale_Huge_size_dim }
- {
- \skip_if_eq:nnT { \f@baselineskip }
- { \l_fontscale_Huge_baselineskip_skip }
- { \token_to_str:N \Huge \prg_break: }
- }
+ \msg_error:nne { fontscale } { math-mode-error }
+ { \token_to_str:N \PrintFontSizeCommand }
}
- UNDEFINED \@
- \prg_break:
- \prg_break_point:
+ { \__fontscale_print_name: }
+ }
+\cs_new_protected:Npn \__fontscale_print_name:
+ {
+ \str_set:Ne \l__fontscale_tmp_str { \__fontscale_name: }
+ \str_if_empty:NTF \l__fontscale_tmp_str
+ { \token_to_str:N \undefined }
+ { \c_backslash_str \l__fontscale_tmp_str \@ }
}
% TEXT PURIFY
-\cs_new:Npn \__fontscale_text_purify_equivalent:n #1
+\cs_new:Npn \__fontscale_remove_arg_spec_sm:n #1
{
\bool_lazy_all:nT
{
@@ -1252,11 +1283,13 @@
}
{ \use_none:n }
}
+\text_declare_purify_equivalent:Nn \fontscalesetup
+ { \__fontscale_remove_arg_spec_sm:n }
\text_declare_purify_equivalent:Nn \SetFontStep
- { \__fontscale_text_purify_equivalent:n }
+ { \__fontscale_remove_arg_spec_sm:n }
\text_declare_purify_equivalent:Nn \SetFontScale
- { \__fontscale_text_purify_equivalent:n }
+ { \__fontscale_remove_arg_spec_sm:n }
\text_declare_purify_equivalent:Nn \SetFontSize
- { \__fontscale_text_purify_equivalent:n }
+ { \__fontscale_remove_arg_spec_sm:n }
\text_declare_purify_equivalent:Nn \ScaleFont { \use_none:n }
\text_declare_purify_equivalent:Nn \SetFontSizeBaselineskip { \use_none:nn } \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/hebdomon/hebdomon.cls b/Master/texmf-dist/tex/latex/hebdomon/hebdomon.cls
new file mode 100644
index 00000000000..33277f76c3a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/hebdomon/hebdomon.cls
@@ -0,0 +1,412 @@
+% Hebdomon document class for use in report and assessment writing
+% Written by D. T. McGuiness: dtm@mci4me.at
+
+% v0.1 - Angry Avocado [WS2024]
+
+\NeedsTeXFormat{LaTeX2e}[1994/06/01]
+\ProvidesClass{hebdomon}[2024/08/08 v0.1 Report and Documentation standard]
+
+% This document is based on the excellent KOMA Script scrreprt class
+% The following options are declared beforehand.
+
+\RequirePackage{ifthen} % require an if-else loop to
+% choose depending on the field
+
+% Allows students to choose which package for code printing.
+
+\newboolean{mnt} % set bool operator for minted
+\newboolean{lst} % set bool operator for lstlisting
+\newboolean{drw} % set bool operator for PGF/TikZ
+
+%-OPTION: set option to choose minted code printing package
+\DeclareOption{minted}{
+ \setboolean{mnt}{true}
+}
+
+%-OPTION: set option to choose lstlisting code printing package
+\DeclareOption{lstlisting}{
+ \setboolean{lst}{true}
+}
+
+%-OPTION: set option to choose PGF/TikZ plotting packages
+\DeclareOption{draw}{
+ \setboolean{drw}{true}
+}
+
+\DeclareOption*{
+ \PassOptionsToClass{\CurrentOption}{scrreprt}
+}
+\ExecuteOptions{}
+\ProcessOptions \relax
+
+% Load the base class to create the custom template
+\LoadClass[
+ bibliography = totoc,
+ headings = big,
+ captions = tableheading,
+ chapterprefix = true,
+]{scrreprt}
+
+% Page Geometry -----------------------------------------------------------
+% Define the default page geometry
+\RequirePackage[
+ left = 3.0cm,
+ right = 2.0cm,
+ top = 2.5cm,
+ bottom = 2.5cm]{geometry}
+
+% Required Packages -------------------------------------------------------
+\RequirePackage{nicematrix} % For modern table design
+\RequirePackage{booktabs} % To access \midrule \toprule \bottomrule
+
+% For use in referencing purposes
+\RequirePackage[
+ backend=bibtex]{biblatex}
+
+\RequirePackage{graphicx} % To enable image insertion
+\RequirePackage{environ} % To allow new environments with Environ
+
+
+\RequirePackage{lmodern}
+\RequirePackage[sfdefault]{FiraSans}
+
+\RequirePackage{minitoc}
+\RequirePackage{setspace}
+
+\RequirePackage{hyperref} % Allow the use of hyperlink within document
+
+\RequirePackage{enumitem}
+
+\RequirePackage{amsmath}
+
+\usepackage[labelfont=bf]{caption} % Set the caption style to bold
+
+\RequirePackage{titlesec}
+
+% %%%%% ----- Colour Definitions ------ %%%%%
+\RequirePackage{xcolor}
+
+% Define the MCI colours.
+\definecolor{mciRed}{HTML}{821131}
+\definecolor{mciBlue}{HTML}{004983}
+\definecolor{mciOrange}{HTML}{fe640b}
+\definecolor{quoteColour}{HTML}{CBA6F7}
+\definecolor{nord7}{HTML}{81a1c1}
+\definecolor{norda}{HTML}{bf616a}
+\definecolor{nord9}{HTML}{5e81ac}
+\definecolor{nord13}{HTML}{ebcb8b}
+\definecolor{nord14}{HTML}{a3be8c}
+
+% %%%%% ----- Code Presentation ----- %%%%%
+% To make this class more compatible and avoid questions about pygments,
+% the author has decided to use listings for code presentation, instead of
+% minted.
+\RequirePackage{listings}
+
+\lstset{
+ aboveskip={1.3\baselineskip},
+ basicstyle=\small\ttfamily\linespread{4},
+ breaklines=false,
+ backgroundcolor = \color[HTML]{eff1f5},
+ columns=flexible,
+ commentstyle=\color[HTML]{6c6f85}\ttfamily,
+ escapechar=@,
+ extendedchars=true,
+ identifierstyle=\color{black},
+ inputencoding=latin1,
+ keywordstyle=\color[HTML]{fe640b},
+ language=Python,
+ ndkeywordstyle=\color[HTML]{228B22},
+ numbers=left,
+ numberstyle=\tiny,
+ prebreak = \raisebox{0ex}[0ex][0ex]{\ensuremath{\hookleftarrow}},
+ showstringspaces=false,
+ stringstyle=\color[HTML]{40a02b}\ttfamily,
+ upquote=true,
+ emph={None},
+ emphstyle={\color[HTML]{FE640B}},
+ % keywordstyle=[1]{\color[HTML]{8839ef}},
+ % morekeywords={(,)},
+ keywordstyle=[2]\color[HTML]{D20F39},
+ keywordstyle={[3]\color[HTML]{8839ef}},
+ keywords=[3]{x},
+}
+
+% \lstset{style=mystyle}
+
+% New Environment Definitions ---------------------------------------------
+% To create environments tcolorbox package is required to make them
+% aesthetically pleasing.
+\RequirePackage{tcolorbox}
+\tcbuselibrary{breakable, minted, skins,theorems, hooks, most}
+
+% %%%%% ----- tcolorbox Templates ----- %%%%%
+
+% Define the excerpt environment style.
+\tcbset{%
+ quoteTemplate/.style={%
+ enhanced,
+ breakable,
+ arc=0pt,
+ outer arc=0pt,
+ toprule=0pt,
+ rightrule=0pt,
+ bottomrule=0pt,
+ leftrule=1mm,
+ colback=white,
+ colframe=mciRed,
+ detach title
+ }%
+}%
+
+\tcbset{%
+ blockTemplate/.style={%
+ enhanced,
+ breakable,
+ arc=0pt,
+ outer arc=0pt,
+ toprule=0pt,
+ rightrule=0pt,
+ bottomrule=0pt,
+ leftrule=1mm,
+ colback=#1!25,
+ colframe=#1,
+ coltitle=black,
+ detach title
+ }%
+}%
+
+% %%%%% --------------------------------%%%%%
+
+% Environment used to insert quotations.
+\NewEnviron{excerpt}[1][]{%
+ \begin{tcolorbox}[blockTemplate=nord7]
+ \BODY
+ \end{tcolorbox}
+}%
+
+\NewEnviron{example}[1][]{%
+ \begin{tcolorbox}[blockTemplate=nord14]
+ \BODY
+ \end{tcolorbox}
+}%
+
+\NewEnviron{highlight}[1][]{%
+ \begin{tcolorbox}[blockTemplate=nord13]
+ \BODY
+ \end{tcolorbox}
+}%
+
+\NewEnviron{theory}[1][]{%
+ \begin{tcolorbox}[blockTemplate=black]
+ \BODY
+ \end{tcolorbox}
+}%
+
+\NewEnviron{warning}[1][]{%
+ \begin{tcolorbox}[blockTemplate=norda]
+ \BODY
+ \end{tcolorbox}
+}%
+
+\NewEnviron{hgitemize}[1][]{%
+ \begin{itemize}[leftmargin=!,labelindent=-29.2pt]
+ \BODY
+ \end{itemize}
+}%
+
+
+
+
+
+% KOMA-Script Configuration -----------------------------------------------
+
+\addtokomafont{chapterprefix}{\raggedleft}
+\addtokomafont{chapter}{\fontsize{30}{38}\selectfont}
+\addtokomafont{section}{\huge}
+\addtokomafont{subsection}{\Large}
+\addtokomafont{subsubsection}{\large}
+
+% Set the fontstyle of minitoc to that of the document
+\renewcommand{\mtifont}{\large\sffamily}
+\renewcommand{\mtcfont}{\small\sffamily}
+\renewcommand{\mtcSfont}{\small\sffamily}
+\renewcommand{\mtcSSfont}{\small\sffamily}
+\renewcommand{\mtcSSSfont}{\small\sffamily}
+
+\newcommand{\StudentName}[1]{\author{#1}}
+
+% Set the depth of TOC
+\setcounter{secnumdepth}{3} % number subsubsections
+\setcounter{tocdepth}{3} % list subsubsections
+
+% Configure the document titles
+\newcommand{\Chapter}[1]{\chapter{\textcolor{mciBlue}{#1}}\minitoc}
+\newcommand{\Section}[1]{\section{\textcolor{mciBlue}{#1}}}
+\newcommand{\Subsection}[1]{\subsection{\textcolor{mciBlue}{#1}}}
+\newcommand{\Subsubsection}[1]{\subsubsection{\textcolor{mciBlue}{#1}}}
+
+\newcommand{\hlight}[1]{\textcolor{mciOrange}{#1}}
+
+
+% Configure the baseline of the document
+\renewcommand{\baselinestretch}{1.2}
+
+\renewcommand*{\chapterformat}{%
+ \mbox{\scalebox{1.5}{\chapappifchapterprefix{\nobreakspace}}%
+ \scalebox{4}{\color{mciRed}\thechapter\autodot}\enskip}}
+
+\newcommand{\heading}[1]{\subsubsection*{$\blacksquare$ #1}}
+\newcommand{\marginsecnumber}[1]{%
+ \makebox[0pt][r]{#1\hspace{6pt}}%
+}
+
+\titleformat{\section} {\normalfont\Large\bfseries}
+{\marginsecnumber\thesection} {0pt} {}
+\titleformat{\subsection} {\normalfont\large\bfseries}
+{\marginsecnumber\thesubsection} {0pt} {}
+\titleformat{\subsubsection}
+{\normalfont\normalsize\bfseries}
+{\marginsecnumber\thesubsubsection}
+{0pt} {}
+\titleformat{\paragraph}[runin]
+{\normalfont\normalsize\bfseries}
+{\marginsecnumber\theparagraph}
+{0pt} {}
+\titleformat{\subparagraph}[runin]
+{\normalfont\normalsize\bfseries}
+{\marginsecnumber\thesubparagraph}
+{0pt}
+{}
+
+\titlespacing*{\subsection}{0pt}{*3.25}{*1.5}%
+
+\setlength\parindent{0pt} % set no indent for the entire file
+
+\ifthenelse{\boolean{mnt}}{%
+ \RequirePackage{minted}
+
+ \newcommand{\pcode}[1]{%
+ {%
+ \colorbox{gray!10}{%
+ \mintinline[fontsize=\small]{text}{#1}%
+ }%
+ }%
+ }%
+
+ %\usemintedstyle{catppuccin-latte}
+
+ \definecolor{catback}{HTML}{585b70}
+ \definecolor{catground}{HTML}{eff1f5}
+
+ % Set box and font rules for inputminted command for paper
+ \newtcbinputlisting{\codeinputpaper}[4][]{%
+ listing file={#3},
+ minted language=#2,
+ minted options={
+ fontsize=\small,
+ tabsize=4,
+ xleftmargin=-2.25mm,
+ numbersep=5mm,
+ breaklines=true,
+ highlightcolor=orange!50,
+ %formatcom=orange!50
+ },% <-- put other minted options inside the brackets
+ overlay unbroken and first={%
+ \begin{tcbclipinterior}
+ \fill[catback] (frame.south west) rectangle
+ ([xshift=1mm]frame.north west);
+ \fill[catback] (frame.north east) rectangle
+ ([xshift=-4mm, yshift=-10mm]frame.north east);
+ \fill[catback]
+ ([xshift=-4mm, yshift=-10mm]frame.north east) --
+ ([xshift=0mm, yshift=-10mm]frame.north east) --
+ ([xshift=0mm, yshift=-12mm]frame.north east);
+ \end{tcbclipinterior}
+ \node[rotate=-90, minimum width=1cm, anchor=north,
+ font=\bfseries] at ([xshift=0mm, yshift=-4mm]frame.north
+ east) {\tiny \textcolor{white}{#2}}; },
+ sharp corners,
+ leftrule=1mm,
+ toprule=0pt,
+ rightrule=0pt,
+ bottomrule=0pt,
+ colback=catground,
+ colframe=black,
+ breakable,
+ enhanced,% <-- put other tcolorbox options here
+ arc=0mm,
+ boxrule=0pt,
+ frame hidden,
+ listing only,
+ minted options app={#1}}
+
+ \RequirePackage{xpatch}
+
+ \newenvironment{code}[1]
+ {%
+ \VerbatimEnvironment
+ \begin{minted}{#1}%
+}
+{%
+ \end{minted}%
+ }
+ %
+ \xpatchcmd{\mintinline}{\begingroup}{\begingroup\let\itshape\relax}{}{}
+ \xpatchcmd{\minted}{\VerbatimEnvironment}{\VerbatimEnvironment\let\itshape\relax}{}{}
+ \xpatchcmd{\inputminted}{\begingroup}{\begingroup\let\itshape\relax}{}{}
+}{}
+
+\ifthenelse{\boolean{lst}}{%
+ \RequirePackage{listings}%
+ \RequirePackage{xparse}
+
+ \NewDocumentCommand{\pcode}{v}{%
+ #1%
+ }
+
+ \newenvironment{code}[1]
+ {%
+ \VerbatimEnvironment
+ \begin{lstlisting}{language=#1}%
+}
+{%
+ \end{lstlisting}%
+ }
+}{}
+
+
+\ifthenelse{\boolean{drw}}{%
+ \RequirePackage{pgfplots} % Enable to draw plots in the documents
+ \usepackage{tikz} % Enable Tikz and its libraries
+ \pgfplotsset{compat=1.18} % Set the pgf compatibility.
+ %
+ \usepgfplotslibrary{polar} % To access polarplot
+ %
+ \pgfplotsset{
+ hebdomon/.style={
+ minor grid style={dotted, gray!50},
+ major grid style={dotted, gray!50},
+ %
+ grid = both,
+ minor tick num=2,
+ ytick align=outside,
+ xtick align=outside,
+ axis line style={draw=none},
+ axis lines = left,
+ %
+ line width=2pt,
+ %
+ legend style = {
+ line width=0.5pt
+ },
+ %
+ every non boxed x axis/.append style={x axis line style=-},
+ every non boxed y axis/.append style={y axis line style=-},
+ %
+ },
+ }
+}{}
+
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty b/Master/texmf-dist/tex/latex/hypcap/hypcap.sty
index c9486d68fca..04f91fefea4 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty
+++ b/Master/texmf-dist/tex/latex/hypcap/hypcap.sty
@@ -9,11 +9,11 @@
%% This is a generated file.
%%
%% Project: hypcap
-%% Version: 2016/05/16 v1.12
+%% Version: 2024-07-26 v1.13
%%
%% Copyright (C)
%% 1999-2001, 2006-2008, 2011 Heiko Oberdiek
-%% 2016-2019 Oberdiek Package Support Group
+%% 2016-2024 Oberdiek Package Support Group
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -29,8 +29,7 @@
%%
%% The Current Maintainers of this work are
%% Heiko Oberdiek and the Oberdiek Package Support Group
-%% https://github.com/ho-tex/oberdiek/issues
-%%
+%% https://github.com/ho-tex/hypcap/issues
%%
%% This work consists of the main source file hypcap.dtx
%% and the derived files
@@ -38,7 +37,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hypcap}%
- [2016/05/16 v1.12 Adjusting the anchors of captions (HO)]
+ [2024-07-26 v1.13 Adjusting the anchors of captions (HO)]
\@ifundefined{hyper@@anchor}{%
\PackageError{hypcap}{You have to load 'hyperref' first}\@ehc
\endinput
@@ -116,7 +115,7 @@
\capstart
}{%
\if@capstart
- \PackageError{hypcap}{You have forgotten to use \string\caption}%
+ \PackageWarning{hypcap}{You have forgotten to use \string\caption}%
\global\@capstartfalse
\else
\fi
diff --git a/Master/texmf-dist/tex/latex/hypdestopt/hypdestopt.sty b/Master/texmf-dist/tex/latex/hypdestopt/hypdestopt.sty
index 8218f1c7711..d789eadad43 100644
--- a/Master/texmf-dist/tex/latex/hypdestopt/hypdestopt.sty
+++ b/Master/texmf-dist/tex/latex/hypdestopt/hypdestopt.sty
@@ -9,11 +9,11 @@
%% This is a generated file.
%%
%% Project: hypdestopt
-%% Version: 2020-09-02 v2.7
+%% Version: 2024-08-07 v2.8
%%
%% Copyright (C)
%% 2006-2008, 2011 Heiko Oberdiek
-%% 2016-2020 Oberdiek Package Support Group
+%% 2016-2024 Oberdiek Package Support Group
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -37,7 +37,19 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hypdestopt}%
- [2020-09-02 v2.7 Hyperref destination optimizer (HO)]%
+ [2024-08-07 v2.8 Hyperref destination optimizer (HO)]%
+\IfDocumentMetadataTF
+ {
+ \PackageWarning{hypdestopt}
+ {
+ \string\DocumentMetadata detected. \MessageBreak
+ The package will do nothing.
+ }{}
+ }{}
+\IfDocumentMetadataTF
+ {
+ \endinput
+ }{}
\newif\ifHypDest@Verbose
\DeclareOption{verbose}{\HypDest@Verbosetrue}
\def\HypDest@VerboseInfo#1{%
diff --git a/Master/texmf-dist/tex/latex/iran-bibtex/iran-bibtex.sty b/Master/texmf-dist/tex/latex/iran-bibtex/iran-bibtex.sty
index 1cc11bf54d3..9ee5b3525d7 100644
--- a/Master/texmf-dist/tex/latex/iran-bibtex/iran-bibtex.sty
+++ b/Master/texmf-dist/tex/latex/iran-bibtex/iran-bibtex.sty
@@ -1,5 +1,5 @@
%%
-%% This is file “iran-bibtex.styâ€, v0.4.1 (2024-05-06)
+%% This is file “iran-bibtex.styâ€, v0.4.3 (2024-08-04)
%%
%% __________________________________________________
%% Copyright (c) 2023-2024 Farshad Rasuli
@@ -26,10 +26,10 @@
% === Package structure: Identification
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{iran-bibtex}
- [2024-05-06 v0.4.1 Iran Manual of Style (1st edn, 2016)]
+ [2024-08-04 v0.4.3 Iran Manual of Style (1st edn, 2016)]
-\def\iranbibtex@version{0.4.1}
-\def\iranbibtexdate{2024-05-06} % May 6th, 2024
+\def\iranbibtex@version{0.4.3}
+\def\iranbibtexdate{2024-08-04} % August 4th, 2024
\def\iranbibtexfirstrelease{2023-12-12} % December 12th, 2023
\edef\@iranbibtex@info{%
***************************************************************%
@@ -168,9 +168,9 @@
%% provide command for bibliography environment
\newcommand{\enquote}[1]{``#1''}
\newcommand{\faquote}[1]{«#1»}
-\providecommand{\url}[1]{{\tt #1}}
-\providecommand{\doi}[1]{\url{#1}}
-\providecommand{\eprint}[2][]{\url{#2}}
+\providecommand{\url}[1]{\@ifpackageloaded{hyperref}{\href{#1}{#1}}{\tt #1}}
+\providecommand{\doi}[1]{\@ifpackageloaded{hyperref}{\href{https://doi.org/#1}{#1}}{\url{#1}}}
+\providecommand{\eprint}[2][]{\@ifpackageloaded{hyperref}{\href{#2}{#2}}{\url{#2}}}
diff --git a/Master/texmf-dist/tex/latex/iwonamath/iwonamath.sty b/Master/texmf-dist/tex/latex/iwonamath/iwonamath.sty
index e4679f35cc5..96a879699f5 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/iwonamath.sty
+++ b/Master/texmf-dist/tex/latex/iwonamath/iwonamath.sty
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesExplPackage {iwonamath}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\keys_define:nn { iwonamath/options }
{
@@ -67,6 +67,7 @@
\SetSymbolFont{symbols2} {bold}{OMS}{cmsy}{b}{n}
\DeclareMathDelimiter{\lVert}{\mathopen} {symbols2}{"6B}{largesymbols}{"0D}
\DeclareMathDelimiter{\rVert}{\mathclose}{symbols2}{"6B}{largesymbols}{"0D}
+ \DeclareMathDelimiter{\|}{\mathclose}{symbols2}{"6B}{largesymbols}{"0D}
}
{}
\DeclareDocumentCommand \DefineIwonaMathVersion { m }
diff --git a/Master/texmf-dist/tex/latex/iwonamath/omliwonamath.fd b/Master/texmf-dist/tex/latex/iwonamath/omliwonamath.fd
index eca19657e23..869b63021f1 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/omliwonamath.fd
+++ b/Master/texmf-dist/tex/latex/iwonamath/omliwonamath.fd
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\ProvidesExplFile
{omliwonamath.fd}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\tl_if_exist:NTF \l__iwonamath_scale_tl
{}
diff --git a/Master/texmf-dist/tex/latex/iwonamath/omliwonamathc.fd b/Master/texmf-dist/tex/latex/iwonamath/omliwonamathc.fd
index 452341075ff..567abb4d8c7 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/omliwonamathc.fd
+++ b/Master/texmf-dist/tex/latex/iwonamath/omliwonamathc.fd
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\ProvidesExplFile
{omliwonamathc.fd}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\tl_if_exist:NTF \l__iwonamath_scale_tl
{}
diff --git a/Master/texmf-dist/tex/latex/iwonamath/omliwonamathl.fd b/Master/texmf-dist/tex/latex/iwonamath/omliwonamathl.fd
index a0dba2a8290..c52bb24dcfd 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/omliwonamathl.fd
+++ b/Master/texmf-dist/tex/latex/iwonamath/omliwonamathl.fd
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\ProvidesExplFile
{omliwonamathl.fd}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\tl_if_exist:NTF \l__iwonamath_scale_tl
{}
diff --git a/Master/texmf-dist/tex/latex/iwonamath/omliwonamathlc.fd b/Master/texmf-dist/tex/latex/iwonamath/omliwonamathlc.fd
index 90d147d1ee2..ebfaea2b699 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/omliwonamathlc.fd
+++ b/Master/texmf-dist/tex/latex/iwonamath/omliwonamathlc.fd
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\ProvidesExplFile
{omliwonamathlc.fd}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\tl_if_exist:NTF \l__iwonamath_scale_tl
{}
diff --git a/Master/texmf-dist/tex/latex/iwonamath/omsiwonamath.fd b/Master/texmf-dist/tex/latex/iwonamath/omsiwonamath.fd
index 958053cd49a..7a0c889c7db 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/omsiwonamath.fd
+++ b/Master/texmf-dist/tex/latex/iwonamath/omsiwonamath.fd
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\ProvidesExplFile
{omsiwonamath.fd}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\tl_if_exist:NTF \l__iwonamath_scale_tl
{}
diff --git a/Master/texmf-dist/tex/latex/iwonamath/omsiwonamathc.fd b/Master/texmf-dist/tex/latex/iwonamath/omsiwonamathc.fd
index 02b892ffc55..22c17550110 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/omsiwonamathc.fd
+++ b/Master/texmf-dist/tex/latex/iwonamath/omsiwonamathc.fd
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\ProvidesExplFile
{omsiwonamathc.fd}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\tl_if_exist:NTF \l__iwonamath_scale_tl
{}
diff --git a/Master/texmf-dist/tex/latex/iwonamath/omsiwonamathcmsy.fd b/Master/texmf-dist/tex/latex/iwonamath/omsiwonamathcmsy.fd
index 107011cf5a7..5a66a04ae6e 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/omsiwonamathcmsy.fd
+++ b/Master/texmf-dist/tex/latex/iwonamath/omsiwonamathcmsy.fd
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\ProvidesExplFile
{omsiwonamathcmsy.fd}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\tl_if_exist:NTF \l__iwonamath_scale_tl
{}
diff --git a/Master/texmf-dist/tex/latex/iwonamath/omsiwonamathl.fd b/Master/texmf-dist/tex/latex/iwonamath/omsiwonamathl.fd
index d291ba7eb08..3e0815ef80b 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/omsiwonamathl.fd
+++ b/Master/texmf-dist/tex/latex/iwonamath/omsiwonamathl.fd
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\ProvidesExplFile
{omsiwonamathl.fd}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\tl_if_exist:NTF \l__iwonamath_scale_tl
{}
diff --git a/Master/texmf-dist/tex/latex/iwonamath/omsiwonamathlc.fd b/Master/texmf-dist/tex/latex/iwonamath/omsiwonamathlc.fd
index 55a040e93eb..8cdb0f65035 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/omsiwonamathlc.fd
+++ b/Master/texmf-dist/tex/latex/iwonamath/omsiwonamathlc.fd
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\ProvidesExplFile
{omsiwonamathlc.fd}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\tl_if_exist:NTF \l__iwonamath_scale_tl
{}
diff --git a/Master/texmf-dist/tex/latex/iwonamath/omxiwonamath.fd b/Master/texmf-dist/tex/latex/iwonamath/omxiwonamath.fd
index 662121a6be4..8b33fd85b99 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/omxiwonamath.fd
+++ b/Master/texmf-dist/tex/latex/iwonamath/omxiwonamath.fd
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\ProvidesExplFile
{omxiwonamath.fd}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\tl_if_exist:NTF \l__iwonamath_scale_tl
{}
diff --git a/Master/texmf-dist/tex/latex/iwonamath/omxiwonamathc.fd b/Master/texmf-dist/tex/latex/iwonamath/omxiwonamathc.fd
index fce676f1e8d..9738a6961d5 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/omxiwonamathc.fd
+++ b/Master/texmf-dist/tex/latex/iwonamath/omxiwonamathc.fd
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\ProvidesExplFile
{omxiwonamathc.fd}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\tl_if_exist:NTF \l__iwonamath_scale_tl
{}
diff --git a/Master/texmf-dist/tex/latex/iwonamath/omxiwonamathl.fd b/Master/texmf-dist/tex/latex/iwonamath/omxiwonamathl.fd
index 895f359e352..759ecad381b 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/omxiwonamathl.fd
+++ b/Master/texmf-dist/tex/latex/iwonamath/omxiwonamathl.fd
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\ProvidesExplFile
{omxiwonamathl.fd}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\tl_if_exist:NTF \l__iwonamath_scale_tl
{}
diff --git a/Master/texmf-dist/tex/latex/iwonamath/omxiwonamathlc.fd b/Master/texmf-dist/tex/latex/iwonamath/omxiwonamathlc.fd
index 85f60415e32..fbe5cdc48cc 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/omxiwonamathlc.fd
+++ b/Master/texmf-dist/tex/latex/iwonamath/omxiwonamathlc.fd
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\ProvidesExplFile
{omxiwonamathlc.fd}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\tl_if_exist:NTF \l__iwonamath_scale_tl
{}
diff --git a/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamath.fd b/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamath.fd
index 20be53c3aff..789656bfa71 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamath.fd
+++ b/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamath.fd
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\ProvidesExplFile
{ot1iwonamath.fd}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\tl_if_exist:NTF \l__iwonamath_scale_tl
{}
diff --git a/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathc.fd b/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathc.fd
index a0b92a2b372..182d34be2f9 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathc.fd
+++ b/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathc.fd
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\ProvidesExplFile
{ot1iwonamathc.fd}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\tl_if_exist:NTF \l__iwonamath_scale_tl
{}
diff --git a/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathcm.fd b/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathcm.fd
index a5e69e07ad4..4f49f9befbb 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathcm.fd
+++ b/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathcm.fd
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\ProvidesExplFile
{ot1iwonamathcm.fd}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\tl_if_exist:NTF \l__iwonamath_scale_tl
{}
diff --git a/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathl.fd b/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathl.fd
index 82060b21d1c..504e9c87ad8 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathl.fd
+++ b/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathl.fd
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\ProvidesExplFile
{ot1iwonamathl.fd}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\tl_if_exist:NTF \l__iwonamath_scale_tl
{}
diff --git a/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathlc.fd b/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathlc.fd
index c5b2f0024b2..5ad18477c78 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathlc.fd
+++ b/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathlc.fd
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\ProvidesExplFile
{ot1iwonamathlc.fd}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\tl_if_exist:NTF \l__iwonamath_scale_tl
{}
diff --git a/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathlcm.fd b/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathlcm.fd
index 130c63822eb..c1b3f9bb442 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathlcm.fd
+++ b/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathlcm.fd
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\ProvidesExplFile
{ot1iwonamathlcm.fd}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\tl_if_exist:NTF \l__iwonamath_scale_tl
{}
diff --git a/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathlm.fd b/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathlm.fd
index ab72419cd80..f15d880adc4 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathlm.fd
+++ b/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathlm.fd
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\ProvidesExplFile
{ot1iwonamathlm.fd}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\tl_if_exist:NTF \l__iwonamath_scale_tl
{}
diff --git a/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathm.fd b/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathm.fd
index 7a103a029b6..9f82d657344 100644
--- a/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathm.fd
+++ b/Master/texmf-dist/tex/latex/iwonamath/ot1iwonamathm.fd
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\ProvidesExplFile
{ot1iwonamathm.fd}
-{2023-08-31} {1.0}
+{2024-07-19} {1.1}
{Scaled Iwona math fonts}
\tl_if_exist:NTF \l__iwonamath_scale_tl
{}
diff --git a/Master/texmf-dist/tex/latex/jsonparse/jsonparse.sty b/Master/texmf-dist/tex/latex/jsonparse/jsonparse.sty
index 680e89bfcac..514064d92a1 100644
--- a/Master/texmf-dist/tex/latex/jsonparse/jsonparse.sty
+++ b/Master/texmf-dist/tex/latex/jsonparse/jsonparse.sty
@@ -10,15 +10,16 @@
%
% This work has the LPPL maintenance status `maintained'.
%
-\ProvidesExplPackage {jsonparse} {2024-04-28} {0.8.3}
+\ProvidesExplPackage {jsonparse} {2024-08-08} {0.8.7}
{JSON Parse}
\bool_new:N \l__jsonparse_debug_mode_bool
-\keys_define:nn { jsonparse } {
+\keys_define:nn { jsonparse / global } {
debug .bool_set:N = \l__jsonparse_debug_mode_bool ,
debug .default:n = { true } ,
+ debug .initial:n = { false }
}
-\ProcessKeyOptions [ jsonparse ]
+\ProcessKeyOptions [ jsonparse / global ]
\msg_new:nnn { jsonparse } { debug-info } {
#1
@@ -43,7 +44,7 @@
\msg_new:nnn { jsonparse } { file-exists } {
\msg_error_text:n { jsonparse } \iow_newline:
- File ~ #1 ~ already ~ existing.
+ File ~ #1 ~ already ~ existing.
}
\msg_new:nnn { jsonparse } { escape-in-key } {
@@ -56,6 +57,11 @@
Escape ~ character ~ #1 ~ not ~ found.
}
+\msg_new:nnn { jsonparse } { unknown-key } {
+ \msg_warning_text:n { jsonparse } \iow_newline:
+ Ignoring ~ unknown ~ key: ~ #1.
+}
+
\msg_new:nnn { jsonparse } { saving-external } {
\msg_info_text:n { jsonparse } \iow_newline:
Saving ~ external ~ file: ~ #1.
@@ -67,14 +73,21 @@
}
% ===
-
+
+\str_new:N \l_jsonparse_externalize_prefix_str
+\str_new:N \l_jsonparse_current_prop_str
+
+\tl_new:N \l__jsonparse_externalize_file_name_tl
+
\str_new:N \l__jsonparse_child_sep_str
\str_new:N \l__jsonparse_array_sep_left_str
\str_new:N \l__jsonparse_array_sep_right_str
\str_new:N \l__jsonparse_true_str
\str_new:N \l__jsonparse_false_str
\str_new:N \l__jsonparse_null_str
-\bool_new:N \l__jsonparse_array_index_zero_based_bool
+\bool_new:N \l__jsonparse_zero_based_bool
+\bool_new:N \l__jsonparse_rescan_bool
+\bool_new:N \l__jsonparse_externalize_bool
\str_new:N \l__jsonparse_backspace_str
\str_new:N \l__jsonparse_formfeed_str
@@ -82,6 +95,8 @@
\str_new:N \l__jsonparse_carriage_return_str
\str_new:N \l__jsonparse_horizontal_tab_str
+\clist_new:N \l__jsonparse_unused_keys_clist
+
\clist_new:N \l__jsonparse_escape_tex_chars_clist
\clist_set:Nn \l__jsonparse_escape_tex_chars_clist {
number_sign ,
@@ -98,35 +113,48 @@
\bool_new:c { l__jsonparse_escape_ #1 _bool }
}
-\keys_define:nn { jsonparse } {
- array ~ index ~ zero-based .bool_set:N = \l__jsonparse_array_index_zero_based_bool ,
- array ~ index ~ zero-based .default:n = { true } ,
- array ~ index ~ zero-based .initial:n = { true } ,
- separator .code:n = { \keys_set:nn { jsonparse / separator } {#1} },
- separator / child .str_set:N = \l__jsonparse_child_sep_str ,
- separator / child .initial:n = { . } ,
- separator / array ~ left .str_set:N = \l__jsonparse_array_sep_left_str ,
- separator / array ~ left .initial:n = { [ } ,
- separator / array ~ right .str_set:N = \l__jsonparse_array_sep_right_str ,
- separator / array ~ right .initial:n = { ] } ,
- replacement .code:n = { \keys_set:nn { jsonparse / replacement } {#1} },
- replacement / true .str_set:N = \l__jsonparse_true_str ,
- replacement / true .initial:n = { true } ,
- replacement / false .str_set:N = \l__jsonparse_false_str ,
- replacement / false .initial:n = { false } ,
- replacement / null .str_set:N = \l__jsonparse_null_str ,
- replacement / null .initial:n = { null } ,
- replacement / backspace .str_set:N = \l__jsonparse_backspace_str ,
- replacement / backspace .initial:n = { ~ } ,
- replacement / formfeed .str_set:N = \l__jsonparse_formfeed_str ,
- replacement / formfeed .initial:n = { ~ } ,
- replacement / linefeed .str_set:N = \l__jsonparse_linefeed_str ,
- replacement / linefeed .initial:n = { ~ } ,
- replacement / carriage ~ return .str_set:N = \l__jsonparse_carriage_return_str ,
- replacement / carriage ~ return .initial:n = { ~ } ,
- replacement / horizontal ~ tab .str_set:N = \l__jsonparse_horizontal_tab_str ,
- replacement / horizontal ~ tab .initial:n = { ~ } ,
- escape .code:n = {
+\keys_define:nn { jsonparse / parse } {
+ externalize .bool_set:N = \l__jsonparse_externalize_bool ,
+ externalize .default:n = { true } ,
+ externalize .initial:n = { false } ,
+ externalize ~ prefix .str_set:N = \l_jsonparse_externalize_prefix_str ,
+ externalize ~ prefix .initial:n = { } ,
+ externalize ~ file ~ name .tl_set:N = \l__jsonparse_externalize_file_name_tl ,
+ externalize ~ file ~ name .initial:n = {
+ \l_jsonparse_externalize_prefix_str \c_sys_jobname_str \c_underscore_str \l_jsonparse_current_prop_str
+ } ,
+ separator .code:n = { \keys_set:nn { jsonparse / parse / separator } {#1} } ,
+ separator / child .str_set:N = \l__jsonparse_child_sep_str ,
+ separator / child .initial:n = { . } ,
+ separator / array ~ left .str_set:N = \l__jsonparse_array_sep_left_str ,
+ separator / array ~ left .initial:n = { [ } ,
+ separator / array ~ right .str_set:N = \l__jsonparse_array_sep_right_str ,
+ separator / array ~ right .initial:n = { ] } ,
+ zero-based .bool_set:N = \l__jsonparse_zero_based_bool ,
+ zero-based .default:n = { true } ,
+ zero-based .initial:n = { true } ,
+ replace .code:n = { \keys_set:nn { jsonparse / parse / replace } {#1} } ,
+ replace / true .str_set:N = \l__jsonparse_true_str ,
+ replace / true .initial:n = { true } ,
+ replace / false .str_set:N = \l__jsonparse_false_str ,
+ replace / false .initial:n = { false } ,
+ replace / null .str_set:N = \l__jsonparse_null_str ,
+ replace / null .initial:n = { null }
+}
+
+\keys_define:nn { jsonparse / typeset } {
+ replace .code:n = { \keys_set:nn { jsonparse / typeset / replace } {#1} } ,
+ replace / backspace .str_set:N = \l__jsonparse_backspace_str ,
+ replace / backspace .initial:n = { ~ } ,
+ replace / formfeed .str_set:N = \l__jsonparse_formfeed_str ,
+ replace / formfeed .initial:n = { ~ } ,
+ replace / linefeed .str_set:N = \l__jsonparse_linefeed_str ,
+ replace / linefeed .initial:n = { ~ } ,
+ replace / carriage ~ return .str_set:N = \l__jsonparse_carriage_return_str ,
+ replace / carriage ~ return .initial:n = { ~ } ,
+ replace / horizontal ~ tab .str_set:N = \l__jsonparse_horizontal_tab_str ,
+ replace / horizontal ~ tab .initial:n = { ~ } ,
+ escape .code:n = {
\str_case:nnF {#1} {
{ all } {
\clist_map_inline:Nn \l__jsonparse_escape_tex_chars_clist {
@@ -168,11 +196,27 @@
}
}
}
+ } ,
+ escape .groups:n = { output } ,
+ rescan .bool_set:N = \l__jsonparse_rescan_bool ,
+ rescan .default:n = { true } ,
+ rescan .initial:n = { true } ,
+ rescan .groups:n = { output }
+}
+
+\cs_new:Npn \__jsonparse_warning_unused_keys: {
+ \clist_map_inline:Nn \l__jsonparse_unused_keys_clist {
+ \msg_warning:nne { jsonparse } { unknown-key } {
+ ##1
+ }
}
}
\NewDocumentCommand { \JSONParseSet } { m } {
- \keys_set:nn { jsonparse } {#1}
+ \keys_set_known:nnN { jsonparse / global } {#1} \l__jsonparse_unused_keys_clist
+ \keys_set_known:noN { jsonparse / parse } { \l__jsonparse_unused_keys_clist } \l__jsonparse_unused_keys_clist
+ \keys_set_known:noN { jsonparse / typeset } { \l__jsonparse_unused_keys_clist } \l__jsonparse_unused_keys_clist
+ \__jsonparse_warning_unused_keys:
}
% ===
@@ -181,6 +225,7 @@
\cs_new:Npn \str_casefold:n { \str_foldcase:n }
}
+\cs_generate_variant:Nn \file_input:n { e }
\cs_generate_variant:Nn \tl_gset_rescan:Nnn { Nne }
\cs_generate_variant:Nn \tl_range:nnn { nne , nen }
\cs_generate_variant:Nn \tl_range:Nnn { Nne , Nen }
@@ -193,14 +238,20 @@
\cs_generate_variant:Nn \str_case_e:nn { en }
\cs_generate_variant:Nn \str_casefold:n { o }
\cs_generate_variant:Nn \str_head_ignore_spaces:n { o }
+\cs_generate_variant:Nn \str_set:Nn { Ne }
\cs_generate_variant:Nn \prop_gput:Nnn { Nee }
\cs_generate_variant:Nn \prop_item:Nn { Ne , ce }
\cs_generate_variant:Nn \prop_put:Nnn { Nen , Nee }
+\cs_generate_variant:Nn \keys_set_known:nnN { noN }
\cs_generate_variant:Nn \iow_now:Nn { Ne }
+\cs_generate_variant:Nn \iow_open:Nn { Ne }
\cs_generate_variant:Nn \msg_error:nnn { nno }
\cs_generate_variant:Nn \msg_error:nnnn { nnoo }
+\cs_generate_variant:Nn \msg_info:nnn { nne }
\cs_generate_variant:Nn \msg_log:nnn { nne }
+\cs_generate_variant:Nn \msg_warning:nnn { nne }
+\prg_generate_conditional_variant:Nnn \file_if_exist:n { e } { T , TF }
\prg_generate_conditional_variant:Nnn \tl_if_eq:nn { en } { T }
\prg_generate_conditional_variant:Nnn \tl_if_head_eq_charcode:nN { oN } { T , TF }
\prg_generate_conditional_variant:Nnn \tl_if_in:nn { nV } { F }
@@ -224,7 +275,7 @@
\int_new:N \l__jsonparse_array_count_last_int
\bool_new:N \l__jsonparse_prop_map_first_bool
-\bool_new:N \l__jsonparse_load_external_bool
+\bool_new:N \l__jsonparse_externalize_load_bool
\ior_new:N \l__jsonparse_json_ior
\iow_new:N \g__jsonparse_externalize_iow
@@ -366,10 +417,10 @@
\bool_if:NT \l__jsonparse_debug_mode_bool {
\msg_log:nnn { jsonparse } { debug-info } {
(arr ~ begin)
- }
+ }
}
\int_zero:N \l__jsonparse_array_index_int
- \bool_if:NT \l__jsonparse_array_index_zero_based_bool {
+ \bool_if:NT \l__jsonparse_zero_based_bool {
\int_decr:N \l__jsonparse_array_index_int
}
\tl_set_eq:NN \l__jsonparse_object_array_key_tl \l__jsonparse_key_tl
@@ -412,7 +463,7 @@
\tl_if_head_eq_charcode:oNTF { \l__jsonparse_remainder_tl } : {
\tl_remove_once:NV \l__jsonparse_remainder_tl \c_colon_str
\tl_set:Ne \l__jsonparse_key_tl { \l__jsonparse_prefix_tl #1 }
- } {
+ } {
\tl_set:Nn \l__jsonparse_val_tl {#1}
\prop_gput:Nee \g_jsonparse_entries_prop
{ \l__jsonparse_key_tl } { \l__jsonparse_val_tl }
@@ -515,7 +566,7 @@
\tl_if_empty:NF \l__jsonparse_remainder_tl {
\exp_args:No \jsonparse_parse:n { \l__jsonparse_remainder_tl }
}
-}
+}
\cs_new_protected:Npn \jsonparse_filter:Nn #1#2 {
\prop_clear:N \l__jsonparse_temp_prop
@@ -542,98 +593,117 @@
\prop_if_exist:NF #1 {
\prop_new:N #1
}
- \prop_gput:Nnn #1 { #2 } { #3 }
+ \prop_gput:Nnn #1 {#2} {#3}
}
\cs_new:Npn \__jsonparse_externalize:Nn #1#2 {
- \file_if_exist:nTF {#2} {
- \msg_error:nnn { jsonparse } { file-exists }
+ \file_if_exist:eTF {#2} {
+ \msg_error:nne { jsonparse } { file-exists }
{#2}
} {
- \iow_open:Nn \g__jsonparse_externalize_iow {#2}
+ \iow_open:Ne \g__jsonparse_externalize_iow {#2}
\prop_map_inline:Nn #1 {
\iow_now:Nn \g__jsonparse_externalize_iow {
\JSONParsePut {#1} {##1} {##2}
}
}
\iow_close:N \g__jsonparse_externalize_iow
- \msg_info:nnn { jsonparse } { saving-external }
+ \msg_info:nne { jsonparse } { saving-external }
{#2}
}
}
% ===
-\NewDocumentCommand { \JSONParse } { o m +v } {
- \bool_set_false:N \l__jsonparse_load_external_bool
- \tl_if_novalue:nF {#1} {
- \file_if_exist:nT { #1 .jsonparse } {
- \bool_set_true:N \l__jsonparse_load_external_bool
- }
+\cs_new:Npn \__json_nested_construct_cs:Nnn #1 #2 #3 {
+ \cs_set:Npn #1 #2 ##1 #3 #2 ##2 #3 {
+ \prop_item:ce {##1} {##2}
}
- \bool_if:NTF \l__jsonparse_load_external_bool {
- \msg_info:nnn { jsonparse } { loading-external }
- { #1 .jsonparse }
- \file_input:n { #1 .jsonparse }
- } {
- \prop_new:N #2
- \tl_gclear:N \g__jsonparse_json_tl
- \group_begin:
- \cs_set:Npn \" { \exp_not:N \" }
- \cs_set:Npn \/ { \exp_not:N \/ }
- \cs_set:Npn \\ { \exp_not:N \\ }
- \cs_set:Npn \b { \exp_not:N \b }
- \cs_set:Npn \f { \exp_not:N \f }
- \cs_set:Npn \n { \exp_not:N \n }
- \cs_set:Npn \r { \exp_not:N \r }
- \cs_set:Npn \t { \exp_not:N \t }
- \cs_set:Npn \u { \exp_not:N \u }
- \cs_set:Npn \x [ ##1 ] [ ##2 ] { \prop_item:ce {##1} {##2} }
- \tl_gset_rescan:Nne \g__jsonparse_json_tl { \cctab_select:N \c__jsonparse_json_escape_cctab } {#3}
- \exp_args:NNe \jsonparse_parse_to_prop:Nn #2 { \g__jsonparse_json_tl }
- \group_end:
- \tl_if_novalue:nF {#1} {
- \__jsonparse_externalize:Nn #2 { #1 .jsonparse }
+}
+\cs_generate_variant:Nn \__json_nested_construct_cs:Nnn { Noo }
+
+\NewDocumentCommand { \JSONParse } { O{} m +v } {
+ \group_begin:
+ \str_set:Ne \l_jsonparse_current_prop_str { \cs_to_str:N #2 }
+ \keys_set_known:nnN { jsonparse / global } {#1} \l__jsonparse_unused_keys_clist
+ \keys_set_known:noN { jsonparse / parse } { \l__jsonparse_unused_keys_clist } \l__jsonparse_unused_keys_clist
+ \__jsonparse_warning_unused_keys:
+ \bool_set_false:N \l__jsonparse_externalize_load_bool
+ \bool_if:NT \l__jsonparse_externalize_bool {
+ \file_if_exist:eT { \l__jsonparse_externalize_file_name_tl .jsonparse } {
+ \bool_set_true:N \l__jsonparse_externalize_load_bool
+ }
}
- }
+ \bool_if:NTF \l__jsonparse_externalize_load_bool {
+ \msg_info:nne { jsonparse } { loading-external }
+ { \l__jsonparse_externalize_file_name_tl .jsonparse }
+ \file_input:e { \l__jsonparse_externalize_file_name_tl .jsonparse }
+ } {
+ \prop_new:N #2
+ \tl_gclear:N \g__jsonparse_json_tl
+ \group_begin:
+ \cs_set:Npn \" { \exp_not:N \" }
+ \cs_set:Npn \/ { \exp_not:N \/ }
+ \cs_set:Npn \\ { \exp_not:N \\ }
+ \cs_set:Npn \b { \exp_not:N \b }
+ \cs_set:Npn \f { \exp_not:N \f }
+ \cs_set:Npn \n { \exp_not:N \n }
+ \cs_set:Npn \r { \exp_not:N \r }
+ \cs_set:Npn \t { \exp_not:N \t }
+ \cs_set:Npn \u { \exp_not:N \u }
+ \__json_nested_construct_cs:Noo \x \c_left_brace_str \c_right_brace_str
+ \tl_gset_rescan:Nne \g__jsonparse_json_tl { \cctab_select:N \c__jsonparse_json_escape_cctab } {#3}
+ \exp_args:NNe \jsonparse_parse_to_prop:Nn #2 { \g__jsonparse_json_tl }
+ \group_end:
+ \bool_if:NT \l__jsonparse_externalize_bool {
+ \__jsonparse_externalize:Nn #2 { \l__jsonparse_externalize_file_name_tl .jsonparse }
+ }
+ }
+ \group_end:
}
-\NewDocumentCommand { \JSONParseFromFile } { o m m } {
+\NewDocumentCommand { \JSONParseFromFile } { O{} m m } {
\file_if_exist:nF {#3} {
\msg_error:nnn { jsonparse } { file-not-found }
{#3}
}
- \bool_set_false:N \l__jsonparse_load_external_bool
- \tl_if_novalue:nF {#1} {
- \file_if_exist:nT { #1 .jsonparse } {
- \bool_set_true:N \l__jsonparse_load_external_bool
+ \group_begin:
+ \str_set:Ne \l_jsonparse_current_prop_str { \cs_to_str:N #2 }
+ \keys_set_known:nnN { jsonparse / global } {#1} \l__jsonparse_unused_keys_clist
+ \keys_set_known:noN { jsonparse / parse } { \l__jsonparse_unused_keys_clist } \l__jsonparse_unused_keys_clist
+ \__jsonparse_warning_unused_keys:
+ \bool_set_false:N \l__jsonparse_externalize_load_bool
+ \bool_if:NT \l__jsonparse_externalize_bool {
+ \file_if_exist:eT { \l__jsonparse_externalize_file_name_tl .jsonparse } {
+ \bool_set_true:N \l__jsonparse_externalize_load_bool
+ }
}
- }
- \bool_if:NTF \l__jsonparse_load_external_bool {
- \msg_info:nnn { jsonparse } { loading-external }
- { #1 .jsonparse }
- \file_input:n { #1 .jsonparse }
- } {
- \prop_new:N #2
- \tl_gclear:N \g__jsonparse_json_tl
- \group_begin:
- \cs_set:Npn \" { \exp_not:N \" }
- \cs_set:Npn \/ { \exp_not:N \/ }
- \cs_set:Npn \\ { \exp_not:N \\ }
- \cs_set:Npn \b { \exp_not:N \b }
- \cs_set:Npn \f { \exp_not:N \f }
- \cs_set:Npn \n { \exp_not:N \n }
- \cs_set:Npn \r { \exp_not:N \r }
- \cs_set:Npn \t { \exp_not:N \t }
- \cs_set:Npn \u { \exp_not:N \u }
- \cs_set:Npn \x [ ##1 ] [ ##2 ] { \prop_item:ce {##1} {##2} }
- \file_get:nnN {#3} { \cctab_select:N \c__jsonparse_json_escape_cctab } \g__jsonparse_json_tl
- \exp_args:NNe \jsonparse_parse_to_prop:Nn #2 { \g__jsonparse_json_tl }
- \group_end:
- \tl_if_novalue:nF {#1} {
- \__jsonparse_externalize:Nn #2 { #1 .jsonparse }
+ \bool_if:NTF \l__jsonparse_externalize_load_bool {
+ \msg_info:nne { jsonparse } { loading-external }
+ { \l__jsonparse_externalize_file_name_tl .jsonparse }
+ \file_input:e { \l__jsonparse_externalize_file_name_tl .jsonparse }
+ } {
+ \prop_new:N #2
+ \tl_gclear:N \g__jsonparse_json_tl
+ \group_begin:
+ \cs_set:Npn \" { \exp_not:N \" }
+ \cs_set:Npn \/ { \exp_not:N \/ }
+ \cs_set:Npn \\ { \exp_not:N \\ }
+ \cs_set:Npn \b { \exp_not:N \b }
+ \cs_set:Npn \f { \exp_not:N \f }
+ \cs_set:Npn \n { \exp_not:N \n }
+ \cs_set:Npn \r { \exp_not:N \r }
+ \cs_set:Npn \t { \exp_not:N \t }
+ \cs_set:Npn \u { \exp_not:N \u }
+ \cs_set:Npn \x [ ##1 ] [ ##2 ] { \prop_item:ce {##1} {##2} }
+ \file_get:nnN {#3} { \cctab_select:N \c__jsonparse_json_escape_cctab } \g__jsonparse_json_tl
+ \exp_args:NNe \jsonparse_parse_to_prop:Nn #2 { \g__jsonparse_json_tl }
+ \group_end:
+ \bool_if:NT \l__jsonparse_externalize_bool {
+ \__jsonparse_externalize:Nn #2 { \l__jsonparse_externalize_file_name_tl .jsonparse }
+ }
}
- }
+ \group_end:
}
\NewExpandableDocumentCommand { \JSONParseExpandableValue } { m m } {
@@ -682,12 +752,16 @@
\group_end:
}
-\NewDocumentCommand { \JSONParseValue } { s m m } {
- \bool_if:NTF #1 {
- \prop_item:Ne #2 {#3}
- } {
- \exp_args:Ne \__jsonparse_rescan:n { \prop_item:Ne #2 {#3} }
- }
+\NewDocumentCommand { \JSONParseValue } { O{} m m } {
+ \group_begin:
+ \keys_set_known:nn { jsonparse / typeset } {#1} \l__jsonparse_unused_keys_clist
+ \__jsonparse_warning_unused_keys:
+ \bool_if:NTF \l__jsonparse_rescan_bool {
+ \exp_args:Ne \__jsonparse_rescan:n { \prop_item:Ne #2 {#3} }
+ } {
+ \prop_item:Ne #2 {#3}
+ }
+ \group_end:
}
\NewDocumentCommand { \JSONParseKeys } { m m } {
@@ -700,7 +774,7 @@
\tl_if_in:nVF {##1} \l__jsonparse_child_sep_str {
\bool_if:NTF \l__jsonparse_prop_map_first_bool {
\bool_set_false:N \l__jsonparse_prop_map_first_bool
- } {
+ } {
\tl_put_right:Nn \l__jsonparse_temp_tl { , }
}
\tl_put_right:Nn \l__jsonparse_temp_tl { " ##1 " }
@@ -710,8 +784,10 @@
\tl_set_eq:NN #2 \l__jsonparse_temp_tl
}
-\NewDocumentCommand { \JSONParseArrayValues } { s m m O{} m } {
+\NewDocumentCommand { \JSONParseArrayValues } { O{} m m O{} m } {
\group_begin:
+ \keys_set_known:nn { jsonparse / typeset } {#1} \l__jsonparse_unused_keys_clist
+ \__jsonparse_warning_unused_keys:
\tl_set:Nn \l__jsonparse_temp_tl {#2}
\jsonparse_filter:Nn \l__jsonparse_temp_tl {#3}
\bool_set_true:N \l__jsonparse_prop_map_first_bool
@@ -721,13 +797,13 @@
} {#4} {
\bool_if:NTF \l__jsonparse_prop_map_first_bool {
\bool_set_false:N \l__jsonparse_prop_map_first_bool
- } {
+ } {
#5
}
- \bool_if:NTF #1 {
- ##2
- } {
+ \bool_if:NTF \l__jsonparse_rescan_bool {
\__jsonparse_rescan:n {##2}
+ } {
+ ##2
}
}
}
@@ -759,10 +835,12 @@
\tl_new:N \JSONParseArrayIndex
\tl_new:N \JSONParseArrayKey
-\tl_new:N \JSONParseArrayValue
+\tl_new:N \JSONParseArrayValue
-\NewDocumentCommand { \JSONParseArrayValuesMap } { s m m O{} m } {
+\NewDocumentCommand { \JSONParseArrayValuesMap } { O{} m m O{} m } {
\group_begin:
+ \keys_set_known:nn { jsonparse / typeset } {#1} \l__jsonparse_unused_keys_clist
+ \__jsonparse_warning_unused_keys:
\jsonparse_filter:Nn #2 {#3}
\prop_map_inline:Nn #2 {
\str_if_eq:enT {
@@ -771,10 +849,10 @@
\int_incr:N \l__jsonparse_array_index_int
\tl_set:Ne \JSONParseArrayIndex { \__jsonparse_get_array_index:w ##1 \q_stop }
\tl_set:Nn \JSONParseArrayKey {##1}
- \bool_if:NTF #1 {
- \tl_set:Nn \JSONParseArrayValue { \prop_item:Nn #2 {##1} }
- } {
+ \bool_if:NTF \l__jsonparse_rescan_bool {
\tl_set:Nn \JSONParseArrayValue { \exp_args:Ne \__jsonparse_rescan:n { \prop_item:Nn #2 {##1} } }
+ } {
+ \tl_set:Nn \JSONParseArrayValue { \prop_item:Nn #2 {##1} }
}
\use:c {#5}
}
diff --git a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-Inf.fd b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-Inf.fd
index 1741a4af34c..966bf21d46a 100644
--- a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-Inf.fd
+++ b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{LGRJunicode-Inf.fd}
- [2024/06/03 (autoinst) Font definitions for LGR/Junicode-Inf.]
+ [2024/07/21 (autoinst) Font definitions for LGR/Junicode-Inf.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,6 +20,33 @@
\DeclareFontFamily{LGR}{Junicode-Inf}{}
+% ---- lsc = lightsemicondensed ----
+
+\DeclareFontShape{LGR}{Junicode-Inf}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-inf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Junicode-Inf}{lightsemicondensed}{n}{
+ <-> alias * Junicode-Inf/lsc/n
+}{}
+
+\DeclareFontShape{LGR}{Junicode-Inf}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-inf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Junicode-Inf}{lightsemicondensed}{it}{
+ <-> alias * Junicode-Inf/lsc/it
+}{}
+
+\DeclareFontShape{LGR}{Junicode-Inf}{lsc}{sl}{
+ <-> ssub * Junicode-Inf/lsc/it
+}{}
+
+\DeclareFontShape{LGR}{Junicode-Inf}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-Inf/lightsemicondensed/it
+}{}
+
+
% ---- mediumexpanded ----
\DeclareFontShape{LGR}{Junicode-Inf}{mediumexpanded}{it}{
@@ -35,50 +62,43 @@
}{}
-% ---- sbsx = semiboldsemiexpanded ----
+% ---- b = bold ----
-\DeclareFontShape{LGR}{Junicode-Inf}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-Inf/sbsx/it
+\DeclareFontShape{LGR}{Junicode-Inf}{bold}{it}{
+ <-> alias * Junicode-Inf/b/it
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-Inf/sbsx/n
+\DeclareFontShape{LGR}{Junicode-Inf}{bold}{n}{
+ <-> alias * Junicode-Inf/b/n
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{sbsx}{sl}{
- <-> ssub * Junicode-Inf/sbsx/it
+\DeclareFontShape{LGR}{Junicode-Inf}{b}{sl}{
+ <-> ssub * Junicode-Inf/b/it
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-Inf/semiboldsemiexpanded/it
+\DeclareFontShape{LGR}{Junicode-Inf}{bold}{sl}{
+ <-> ssub * Junicode-Inf/bold/it
}{}
-% ---- mediumsemiexpanded ----
-
-\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-inf-lgr
-}{}
+% ---- x = expanded ----
-\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-Inf/mediumsemiexpanded/it
+\DeclareFontShape{LGR}{Junicode-Inf}{expanded}{it}{
+ <-> alias * Junicode-Inf/x/it
}{}
-
-% ---- x = expanded ----
-
\DeclareFontShape{LGR}{Junicode-Inf}{x}{n}{
<-> \Junicode@@scale Junicode-Exp-inf-lgr
}{}
@@ -87,14 +107,6 @@
<-> alias * Junicode-Inf/x/n
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-inf-lgr
-}{}
-
-\DeclareFontShape{LGR}{Junicode-Inf}{expanded}{it}{
- <-> alias * Junicode-Inf/x/it
-}{}
-
\DeclareFontShape{LGR}{Junicode-Inf}{x}{sl}{
<-> ssub * Junicode-Inf/x/it
}{}
@@ -104,6 +116,33 @@
}{}
+% ---- sbx = semiboldexpanded ----
+
+\DeclareFontShape{LGR}{Junicode-Inf}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-inf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Junicode-Inf}{semiboldexpanded}{it}{
+ <-> alias * Junicode-Inf/sbx/it
+}{}
+
+\DeclareFontShape{LGR}{Junicode-Inf}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-inf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Junicode-Inf}{semiboldexpanded}{n}{
+ <-> alias * Junicode-Inf/sbx/n
+}{}
+
+\DeclareFontShape{LGR}{Junicode-Inf}{sbx}{sl}{
+ <-> ssub * Junicode-Inf/sbx/it
+}{}
+
+\DeclareFontShape{LGR}{Junicode-Inf}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-Inf/semiboldexpanded/it
+}{}
+
+
% ---- c = condensed ----
\DeclareFontShape{LGR}{Junicode-Inf}{c}{it}{
@@ -131,345 +170,306 @@
}{}
-% ---- sx = semiexpanded ----
-
-\DeclareFontShape{LGR}{Junicode-Inf}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-inf-lgr
-}{}
+% ---- sc = semicondensed ----
-\DeclareFontShape{LGR}{Junicode-Inf}{semiexpanded}{it}{
- <-> alias * Junicode-Inf/sx/it
+\DeclareFontShape{LGR}{Junicode-Inf}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{semicondensed}{n}{
+ <-> alias * Junicode-Inf/sc/n
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{semiexpanded}{n}{
- <-> alias * Junicode-Inf/sx/n
+\DeclareFontShape{LGR}{Junicode-Inf}{sc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{sx}{sl}{
- <-> ssub * Junicode-Inf/sx/it
+\DeclareFontShape{LGR}{Junicode-Inf}{semicondensed}{it}{
+ <-> alias * Junicode-Inf/sc/it
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{semiexpanded}{sl}{
- <-> ssub * Junicode-Inf/semiexpanded/it
+\DeclareFontShape{LGR}{Junicode-Inf}{sc}{sl}{
+ <-> ssub * Junicode-Inf/sc/it
}{}
-
-% ---- m = regular ----
-
-\DeclareFontShape{LGR}{Junicode-Inf}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{semicondensed}{sl}{
+ <-> ssub * Junicode-Inf/semicondensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{regular}{it}{
- <-> alias * Junicode-Inf/m/it
-}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-inf-lgr
-}{}
+% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{LGR}{Junicode-Inf}{regular}{n}{
- <-> alias * Junicode-Inf/m/n
+\DeclareFontShape{LGR}{Junicode-Inf}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{m}{sl}{
- <-> ssub * Junicode-Inf/m/it
+\DeclareFontShape{LGR}{Junicode-Inf}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-Inf/bsx/n
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{regular}{sl}{
- <-> ssub * Junicode-Inf/regular/it
+\DeclareFontShape{LGR}{Junicode-Inf}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-inf-lgr
}{}
-
-% ---- medium ----
-
-\DeclareFontShape{LGR}{Junicode-Inf}{medium}{n}{
- <-> \Junicode@@scale Junicode-Medium-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-Inf/bsx/it
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{medium}{it}{
- <-> \Junicode@@scale Junicode-MediumItalic-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{bsx}{sl}{
+ <-> ssub * Junicode-Inf/bsx/it
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{medium}{sl}{
- <-> ssub * Junicode-Inf/medium/it
+\DeclareFontShape{LGR}{Junicode-Inf}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-Inf/boldsemiexpanded/it
}{}
-% ---- lsc = lightsemicondensed ----
-
-\DeclareFontShape{LGR}{Junicode-Inf}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-inf-lgr
-}{}
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{LGR}{Junicode-Inf}{lightsemicondensed}{it}{
- <-> alias * Junicode-Inf/lsc/it
+\DeclareFontShape{LGR}{Junicode-Inf}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-Inf/sbsx/it
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{lightsemicondensed}{n}{
- <-> alias * Junicode-Inf/lsc/n
+\DeclareFontShape{LGR}{Junicode-Inf}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{lsc}{sl}{
- <-> ssub * Junicode-Inf/lsc/it
+\DeclareFontShape{LGR}{Junicode-Inf}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-Inf/sbsx/n
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-Inf/lightsemicondensed/it
+\DeclareFontShape{LGR}{Junicode-Inf}{sbsx}{sl}{
+ <-> ssub * Junicode-Inf/sbsx/it
}{}
-
-% ---- l = light ----
-
-\DeclareFontShape{LGR}{Junicode-Inf}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-Inf/semiboldsemiexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{light}{n}{
- <-> alias * Junicode-Inf/l/n
-}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-inf-lgr
-}{}
+% ---- mediumcondensed ----
-\DeclareFontShape{LGR}{Junicode-Inf}{light}{it}{
- <-> alias * Junicode-Inf/l/it
+\DeclareFontShape{LGR}{Junicode-Inf}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{l}{sl}{
- <-> ssub * Junicode-Inf/l/it
+\DeclareFontShape{LGR}{Junicode-Inf}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{light}{sl}{
- <-> ssub * Junicode-Inf/light/it
+\DeclareFontShape{LGR}{Junicode-Inf}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-Inf/mediumcondensed/it
}{}
-% ---- bx = boldexpanded ----
+% ---- sb = semibold ----
-\DeclareFontShape{LGR}{Junicode-Inf}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{boldexpanded}{it}{
- <-> alias * Junicode-Inf/bx/it
+\DeclareFontShape{LGR}{Junicode-Inf}{semibold}{n}{
+ <-> alias * Junicode-Inf/sb/n
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{boldexpanded}{n}{
- <-> alias * Junicode-Inf/bx/n
+\DeclareFontShape{LGR}{Junicode-Inf}{semibold}{it}{
+ <-> alias * Junicode-Inf/sb/it
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{bx}{sl}{
- <-> ssub * Junicode-Inf/bx/it
+\DeclareFontShape{LGR}{Junicode-Inf}{sb}{sl}{
+ <-> ssub * Junicode-Inf/sb/it
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{boldexpanded}{sl}{
- <-> ssub * Junicode-Inf/boldexpanded/it
+\DeclareFontShape{LGR}{Junicode-Inf}{semibold}{sl}{
+ <-> ssub * Junicode-Inf/semibold/it
}{}
-% ---- mediumcondensed ----
+% ---- mediumsemicondensed ----
-\DeclareFontShape{LGR}{Junicode-Inf}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{mediumcondensed}{sl}{
- <-> ssub * Junicode-Inf/mediumcondensed/it
+\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-Inf/mediumsemicondensed/it
}{}
-% ---- b = bold ----
+% ---- l = light ----
-\DeclareFontShape{LGR}{Junicode-Inf}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{bold}{it}{
- <-> alias * Junicode-Inf/b/it
+\DeclareFontShape{LGR}{Junicode-Inf}{light}{n}{
+ <-> alias * Junicode-Inf/l/n
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{bold}{n}{
- <-> alias * Junicode-Inf/b/n
+\DeclareFontShape{LGR}{Junicode-Inf}{light}{it}{
+ <-> alias * Junicode-Inf/l/it
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{b}{sl}{
- <-> ssub * Junicode-Inf/b/it
+\DeclareFontShape{LGR}{Junicode-Inf}{l}{sl}{
+ <-> ssub * Junicode-Inf/l/it
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{bold}{sl}{
- <-> ssub * Junicode-Inf/bold/it
+\DeclareFontShape{LGR}{Junicode-Inf}{light}{sl}{
+ <-> ssub * Junicode-Inf/light/it
}{}
-% ---- bsx = boldsemiexpanded ----
-
-\DeclareFontShape{LGR}{Junicode-Inf}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-inf-lgr
-}{}
+% ---- sx = semiexpanded ----
-\DeclareFontShape{LGR}{Junicode-Inf}{boldsemiexpanded}{n}{
- <-> alias * Junicode-Inf/bsx/n
+\DeclareFontShape{LGR}{Junicode-Inf}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{semiexpanded}{n}{
+ <-> alias * Junicode-Inf/sx/n
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{boldsemiexpanded}{it}{
- <-> alias * Junicode-Inf/bsx/it
+\DeclareFontShape{LGR}{Junicode-Inf}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{bsx}{sl}{
- <-> ssub * Junicode-Inf/bsx/it
+\DeclareFontShape{LGR}{Junicode-Inf}{semiexpanded}{it}{
+ <-> alias * Junicode-Inf/sx/it
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-Inf/boldsemiexpanded/it
+\DeclareFontShape{LGR}{Junicode-Inf}{sx}{sl}{
+ <-> ssub * Junicode-Inf/sx/it
}{}
-
-% ---- lc = lightcondensed ----
-
-\DeclareFontShape{LGR}{Junicode-Inf}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{semiexpanded}{sl}{
+ <-> ssub * Junicode-Inf/semiexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{lightcondensed}{n}{
- <-> alias * Junicode-Inf/lc/n
-}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-inf-lgr
-}{}
+% ---- medium ----
-\DeclareFontShape{LGR}{Junicode-Inf}{lightcondensed}{it}{
- <-> alias * Junicode-Inf/lc/it
+\DeclareFontShape{LGR}{Junicode-Inf}{medium}{n}{
+ <-> \Junicode@@scale Junicode-Medium-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{lc}{sl}{
- <-> ssub * Junicode-Inf/lc/it
+\DeclareFontShape{LGR}{Junicode-Inf}{medium}{it}{
+ <-> \Junicode@@scale Junicode-MediumItalic-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{lightcondensed}{sl}{
- <-> ssub * Junicode-Inf/lightcondensed/it
+\DeclareFontShape{LGR}{Junicode-Inf}{medium}{sl}{
+ <-> ssub * Junicode-Inf/medium/it
}{}
-% ---- sb = semibold ----
+% ---- bx = boldexpanded ----
-\DeclareFontShape{LGR}{Junicode-Inf}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{semibold}{it}{
- <-> alias * Junicode-Inf/sb/it
+\DeclareFontShape{LGR}{Junicode-Inf}{boldexpanded}{n}{
+ <-> alias * Junicode-Inf/bx/n
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{semibold}{n}{
- <-> alias * Junicode-Inf/sb/n
+\DeclareFontShape{LGR}{Junicode-Inf}{boldexpanded}{it}{
+ <-> alias * Junicode-Inf/bx/it
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{sb}{sl}{
- <-> ssub * Junicode-Inf/sb/it
+\DeclareFontShape{LGR}{Junicode-Inf}{bx}{sl}{
+ <-> ssub * Junicode-Inf/bx/it
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{semibold}{sl}{
- <-> ssub * Junicode-Inf/semibold/it
+\DeclareFontShape{LGR}{Junicode-Inf}{boldexpanded}{sl}{
+ <-> ssub * Junicode-Inf/boldexpanded/it
}{}
-% ---- sc = semicondensed ----
+% ---- mediumsemiexpanded ----
-\DeclareFontShape{LGR}{Junicode-Inf}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{semicondensed}{n}{
- <-> alias * Junicode-Inf/sc/n
+\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{sc}{it}{
- <-> \Junicode@@scale Junicode-SmCondItalic-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-Inf/mediumsemiexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{semicondensed}{it}{
- <-> alias * Junicode-Inf/sc/it
-}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{sc}{sl}{
- <-> ssub * Junicode-Inf/sc/it
-}{}
+% ---- m = regular ----
-\DeclareFontShape{LGR}{Junicode-Inf}{semicondensed}{sl}{
- <-> ssub * Junicode-Inf/semicondensed/it
+\DeclareFontShape{LGR}{Junicode-Inf}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-inf-lgr
}{}
+\DeclareFontShape{LGR}{Junicode-Inf}{regular}{n}{
+ <-> alias * Junicode-Inf/m/n
+}{}
-% ---- mediumsemicondensed ----
+\DeclareFontShape{LGR}{Junicode-Inf}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-inf-lgr
+}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{regular}{it}{
+ <-> alias * Junicode-Inf/m/it
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{m}{sl}{
+ <-> ssub * Junicode-Inf/m/it
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-Inf/mediumsemicondensed/it
+\DeclareFontShape{LGR}{Junicode-Inf}{regular}{sl}{
+ <-> ssub * Junicode-Inf/regular/it
}{}
-% ---- sbx = semiboldexpanded ----
+% ---- lc = lightcondensed ----
-\DeclareFontShape{LGR}{Junicode-Inf}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{semiboldexpanded}{it}{
- <-> alias * Junicode-Inf/sbx/it
+\DeclareFontShape{LGR}{Junicode-Inf}{lightcondensed}{n}{
+ <-> alias * Junicode-Inf/lc/n
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-inf-lgr
+\DeclareFontShape{LGR}{Junicode-Inf}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-inf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{semiboldexpanded}{n}{
- <-> alias * Junicode-Inf/sbx/n
+\DeclareFontShape{LGR}{Junicode-Inf}{lightcondensed}{it}{
+ <-> alias * Junicode-Inf/lc/it
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{sbx}{sl}{
- <-> ssub * Junicode-Inf/sbx/it
+\DeclareFontShape{LGR}{Junicode-Inf}{lc}{sl}{
+ <-> ssub * Junicode-Inf/lc/it
}{}
-\DeclareFontShape{LGR}{Junicode-Inf}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-Inf/semiboldexpanded/it
+\DeclareFontShape{LGR}{Junicode-Inf}{lightcondensed}{sl}{
+ <-> ssub * Junicode-Inf/lightcondensed/it
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-LF.fd b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-LF.fd
index 5e4958c6c0f..da1c18dc7b9 100644
--- a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-LF.fd
+++ b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{LGRJunicode-LF.fd}
- [2024/06/03 (autoinst) Font definitions for LGR/Junicode-LF.]
+ [2024/07/21 (autoinst) Font definitions for LGR/Junicode-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,161 +20,212 @@
\DeclareFontFamily{LGR}{Junicode-LF}{}
-% ---- bx = boldexpanded ----
+% ---- c = condensed ----
-\DeclareFontShape{LGR}{Junicode-LF}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{c}{sc}{
+ <-> \Junicode@@scale Junicode-Cond-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{it}{
- <-> alias * Junicode-LF/bx/it
+\DeclareFontShape{LGR}{Junicode-LF}{condensed}{sc}{
+ <-> alias * Junicode-LF/c/sc
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{bx}{scit}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{c}{scit}{
+ <-> \Junicode@@scale Junicode-CondItalic-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{scit}{
- <-> alias * Junicode-LF/bx/scit
+\DeclareFontShape{LGR}{Junicode-LF}{condensed}{scit}{
+ <-> alias * Junicode-LF/c/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{n}{
- <-> alias * Junicode-LF/bx/n
+\DeclareFontShape{LGR}{Junicode-LF}{condensed}{n}{
+ <-> alias * Junicode-LF/c/n
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{bx}{sc}{
- <-> \Junicode@@scale Junicode-ExpBold-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{sc}{
- <-> alias * Junicode-LF/bx/sc
+\DeclareFontShape{LGR}{Junicode-LF}{condensed}{it}{
+ <-> alias * Junicode-LF/c/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{bx}{scsl}{
- <-> ssub * Junicode-LF/bx/scit
+\DeclareFontShape{LGR}{Junicode-LF}{c}{sl}{
+ <-> ssub * Junicode-LF/c/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{scsl}{
- <-> ssub * Junicode-LF/boldexpanded/scit
+\DeclareFontShape{LGR}{Junicode-LF}{condensed}{sl}{
+ <-> ssub * Junicode-LF/condensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{bx}{sl}{
- <-> ssub * Junicode-LF/bx/it
+\DeclareFontShape{LGR}{Junicode-LF}{c}{scsl}{
+ <-> ssub * Junicode-LF/c/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{sl}{
- <-> ssub * Junicode-LF/boldexpanded/it
+\DeclareFontShape{LGR}{Junicode-LF}{condensed}{scsl}{
+ <-> ssub * Junicode-LF/condensed/scit
}{}
-% ---- l = light ----
+% ---- sbx = semiboldexpanded ----
-\DeclareFontShape{LGR}{Junicode-LF}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{sbx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{light}{n}{
- <-> alias * Junicode-LF/l/n
+\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{sc}{
+ <-> alias * Junicode-LF/sbx/sc
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{l}{sc}{
- <-> \Junicode@@scale Junicode-Light-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{light}{sc}{
- <-> alias * Junicode-LF/l/sc
+\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{it}{
+ <-> alias * Junicode-LF/sbx/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{sbx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{light}{it}{
- <-> alias * Junicode-LF/l/it
+\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{scit}{
+ <-> alias * Junicode-LF/sbx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{l}{scit}{
- <-> \Junicode@@scale Junicode-LightItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{light}{scit}{
- <-> alias * Junicode-LF/l/scit
+\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{n}{
+ <-> alias * Junicode-LF/sbx/n
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{l}{scsl}{
- <-> ssub * Junicode-LF/l/scit
+\DeclareFontShape{LGR}{Junicode-LF}{sbx}{sl}{
+ <-> ssub * Junicode-LF/sbx/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{light}{scsl}{
- <-> ssub * Junicode-LF/light/scit
+\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-LF/semiboldexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{l}{sl}{
- <-> ssub * Junicode-LF/l/it
+\DeclareFontShape{LGR}{Junicode-LF}{sbx}{scsl}{
+ <-> ssub * Junicode-LF/sbx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{light}{sl}{
- <-> ssub * Junicode-LF/light/it
+\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{scsl}{
+ <-> ssub * Junicode-LF/semiboldexpanded/scit
}{}
-% ---- medium ----
+% ---- x = expanded ----
-\DeclareFontShape{LGR}{Junicode-LF}{medium}{it}{
- <-> \Junicode@@scale Junicode-MediumItalic-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{x}{sc}{
+ <-> \Junicode@@scale Junicode-Exp-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{medium}{scit}{
- <-> \Junicode@@scale Junicode-MediumItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{expanded}{sc}{
+ <-> alias * Junicode-LF/x/sc
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{medium}{n}{
- <-> \Junicode@@scale Junicode-Medium-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{x}{scit}{
+ <-> \Junicode@@scale Junicode-ExpItalic-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{medium}{sc}{
- <-> \Junicode@@scale Junicode-Medium-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{expanded}{scit}{
+ <-> alias * Junicode-LF/x/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{medium}{scsl}{
- <-> ssub * Junicode-LF/medium/scit
+\DeclareFontShape{LGR}{Junicode-LF}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{medium}{sl}{
- <-> ssub * Junicode-LF/medium/it
+\DeclareFontShape{LGR}{Junicode-LF}{expanded}{n}{
+ <-> alias * Junicode-LF/x/n
}{}
+\DeclareFontShape{LGR}{Junicode-LF}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-lf-lgr
+}{}
-% ---- lsc = lightsemicondensed ----
+\DeclareFontShape{LGR}{Junicode-LF}{expanded}{it}{
+ <-> alias * Junicode-LF/x/it
+}{}
-\DeclareFontShape{LGR}{Junicode-LF}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{x}{sl}{
+ <-> ssub * Junicode-LF/x/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{lightsemicondensed}{n}{
- <-> alias * Junicode-LF/lsc/n
+\DeclareFontShape{LGR}{Junicode-LF}{expanded}{sl}{
+ <-> ssub * Junicode-LF/expanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{lsc}{sc}{
- <-> \Junicode@@scale Junicode-SmCondLight-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{x}{scsl}{
+ <-> ssub * Junicode-LF/x/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{lightsemicondensed}{sc}{
- <-> alias * Junicode-LF/lsc/sc
+\DeclareFontShape{LGR}{Junicode-LF}{expanded}{scsl}{
+ <-> ssub * Junicode-LF/expanded/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-lgr
+
+% ---- b = bold ----
+
+\DeclareFontShape{LGR}{Junicode-LF}{b}{sc}{
+ <-> \Junicode@@scale Junicode-Bold-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{lightsemicondensed}{it}{
- <-> alias * Junicode-LF/lsc/it
+\DeclareFontShape{LGR}{Junicode-LF}{bold}{sc}{
+ <-> alias * Junicode-LF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{Junicode-LF}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Junicode-LF}{bold}{it}{
+ <-> alias * Junicode-LF/b/it
+}{}
+
+\DeclareFontShape{LGR}{Junicode-LF}{b}{scit}{
+ <-> \Junicode@@scale Junicode-BoldItalic-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Junicode-LF}{bold}{scit}{
+ <-> alias * Junicode-LF/b/scit
+}{}
+
+\DeclareFontShape{LGR}{Junicode-LF}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Junicode-LF}{bold}{n}{
+ <-> alias * Junicode-LF/b/n
}{}
+\DeclareFontShape{LGR}{Junicode-LF}{b}{sl}{
+ <-> ssub * Junicode-LF/b/it
+}{}
+
+\DeclareFontShape{LGR}{Junicode-LF}{bold}{sl}{
+ <-> ssub * Junicode-LF/bold/it
+}{}
+
+\DeclareFontShape{LGR}{Junicode-LF}{b}{scsl}{
+ <-> ssub * Junicode-LF/b/scit
+}{}
+
+\DeclareFontShape{LGR}{Junicode-LF}{bold}{scsl}{
+ <-> ssub * Junicode-LF/bold/scit
+}{}
+
+
+% ---- lsc = lightsemicondensed ----
+
\DeclareFontShape{LGR}{Junicode-LF}{lsc}{scit}{
<-> \Junicode@@scale Junicode-SmCondLightItalic-lf-sc-lgr
}{}
@@ -183,12 +234,28 @@
<-> alias * Junicode-LF/lsc/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{lsc}{scsl}{
- <-> ssub * Junicode-LF/lsc/scit
+\DeclareFontShape{LGR}{Junicode-LF}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{lightsemicondensed}{scsl}{
- <-> ssub * Junicode-LF/lightsemicondensed/scit
+\DeclareFontShape{LGR}{Junicode-LF}{lightsemicondensed}{n}{
+ <-> alias * Junicode-LF/lsc/n
+}{}
+
+\DeclareFontShape{LGR}{Junicode-LF}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Junicode-LF}{lightsemicondensed}{it}{
+ <-> alias * Junicode-LF/lsc/it
+}{}
+
+\DeclareFontShape{LGR}{Junicode-LF}{lsc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondLight-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Junicode-LF}{lightsemicondensed}{sc}{
+ <-> alias * Junicode-LF/lsc/sc
}{}
\DeclareFontShape{LGR}{Junicode-LF}{lsc}{sl}{
@@ -199,25 +266,44 @@
<-> ssub * Junicode-LF/lightsemicondensed/it
}{}
+\DeclareFontShape{LGR}{Junicode-LF}{lsc}{scsl}{
+ <-> ssub * Junicode-LF/lsc/scit
+}{}
-% ---- m = regular ----
+\DeclareFontShape{LGR}{Junicode-LF}{lightsemicondensed}{scsl}{
+ <-> ssub * Junicode-LF/lightsemicondensed/scit
+}{}
-\DeclareFontShape{LGR}{Junicode-LF}{m}{scit}{
- <-> \Junicode@@scale Junicode-Italic-lf-sc-lgr
+
+% ---- mediumexpanded ----
+
+\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-ExpMedium-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{regular}{scit}{
- <-> alias * Junicode-LF/m/scit
+\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{regular}{it}{
- <-> alias * Junicode-LF/m/it
+\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-LF/mediumexpanded/it
}{}
+\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{scsl}{
+ <-> ssub * Junicode-LF/mediumexpanded/scit
+}{}
+
+
+% ---- m = regular ----
+
\DeclareFontShape{LGR}{Junicode-LF}{m}{sc}{
<-> \Junicode@@scale Junicode-Regular-lf-sc-lgr
}{}
@@ -234,361 +320,334 @@
<-> alias * Junicode-LF/m/n
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{m}{scsl}{
- <-> ssub * Junicode-LF/m/scit
+\DeclareFontShape{LGR}{Junicode-LF}{m}{scit}{
+ <-> \Junicode@@scale Junicode-Italic-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{regular}{scsl}{
- <-> ssub * Junicode-LF/regular/scit
+\DeclareFontShape{LGR}{Junicode-LF}{regular}{scit}{
+ <-> alias * Junicode-LF/m/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{m}{sl}{
- <-> ssub * Junicode-LF/m/it
+\DeclareFontShape{LGR}{Junicode-LF}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{regular}{sl}{
- <-> ssub * Junicode-LF/regular/it
+\DeclareFontShape{LGR}{Junicode-LF}{regular}{it}{
+ <-> alias * Junicode-LF/m/it
}{}
-
-% ---- x = expanded ----
-
-\DeclareFontShape{LGR}{Junicode-LF}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{m}{sl}{
+ <-> ssub * Junicode-LF/m/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{expanded}{n}{
- <-> alias * Junicode-LF/x/n
+\DeclareFontShape{LGR}{Junicode-LF}{regular}{sl}{
+ <-> ssub * Junicode-LF/regular/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{x}{sc}{
- <-> \Junicode@@scale Junicode-Exp-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{m}{scsl}{
+ <-> ssub * Junicode-LF/m/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{expanded}{sc}{
- <-> alias * Junicode-LF/x/sc
+\DeclareFontShape{LGR}{Junicode-LF}{regular}{scsl}{
+ <-> ssub * Junicode-LF/regular/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-lf-lgr
-}{}
-\DeclareFontShape{LGR}{Junicode-LF}{expanded}{it}{
- <-> alias * Junicode-LF/x/it
-}{}
+% ---- mediumsemiexpanded ----
-\DeclareFontShape{LGR}{Junicode-LF}{x}{scit}{
- <-> \Junicode@@scale Junicode-ExpItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{expanded}{scit}{
- <-> alias * Junicode-LF/x/scit
+\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{x}{scsl}{
- <-> ssub * Junicode-LF/x/scit
+\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{expanded}{scsl}{
- <-> ssub * Junicode-LF/expanded/scit
+\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{x}{sl}{
- <-> ssub * Junicode-LF/x/it
+\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-LF/mediumsemiexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{expanded}{sl}{
- <-> ssub * Junicode-LF/expanded/it
+\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{scsl}{
+ <-> ssub * Junicode-LF/mediumsemiexpanded/scit
}{}
-% ---- c = condensed ----
+% ---- bx = boldexpanded ----
-\DeclareFontShape{LGR}{Junicode-LF}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{bx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpBold-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{condensed}{it}{
- <-> alias * Junicode-LF/c/it
+\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{sc}{
+ <-> alias * Junicode-LF/bx/sc
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{c}{scit}{
- <-> \Junicode@@scale Junicode-CondItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{condensed}{scit}{
- <-> alias * Junicode-LF/c/scit
+\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{n}{
+ <-> alias * Junicode-LF/bx/n
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{bx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{condensed}{n}{
- <-> alias * Junicode-LF/c/n
+\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{scit}{
+ <-> alias * Junicode-LF/bx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{c}{sc}{
- <-> \Junicode@@scale Junicode-Cond-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{condensed}{sc}{
- <-> alias * Junicode-LF/c/sc
+\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{it}{
+ <-> alias * Junicode-LF/bx/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{c}{scsl}{
- <-> ssub * Junicode-LF/c/scit
+\DeclareFontShape{LGR}{Junicode-LF}{bx}{sl}{
+ <-> ssub * Junicode-LF/bx/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{condensed}{scsl}{
- <-> ssub * Junicode-LF/condensed/scit
+\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{sl}{
+ <-> ssub * Junicode-LF/boldexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{c}{sl}{
- <-> ssub * Junicode-LF/c/it
+\DeclareFontShape{LGR}{Junicode-LF}{bx}{scsl}{
+ <-> ssub * Junicode-LF/bx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{condensed}{sl}{
- <-> ssub * Junicode-LF/condensed/it
+\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{scsl}{
+ <-> ssub * Junicode-LF/boldexpanded/scit
}{}
-% ---- sx = semiexpanded ----
+% ---- medium ----
-\DeclareFontShape{LGR}{Junicode-LF}{sx}{sc}{
- <-> \Junicode@@scale Junicode-SmExp-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{medium}{it}{
+ <-> \Junicode@@scale Junicode-MediumItalic-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{sc}{
- <-> alias * Junicode-LF/sx/sc
+\DeclareFontShape{LGR}{Junicode-LF}{medium}{scit}{
+ <-> \Junicode@@scale Junicode-MediumItalic-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{medium}{n}{
+ <-> \Junicode@@scale Junicode-Medium-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{n}{
- <-> alias * Junicode-LF/sx/n
+\DeclareFontShape{LGR}{Junicode-LF}{medium}{sc}{
+ <-> \Junicode@@scale Junicode-Medium-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{sx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{medium}{sl}{
+ <-> ssub * Junicode-LF/medium/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{scit}{
- <-> alias * Junicode-LF/sx/scit
+\DeclareFontShape{LGR}{Junicode-LF}{medium}{scsl}{
+ <-> ssub * Junicode-LF/medium/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-lf-lgr
-}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{it}{
- <-> alias * Junicode-LF/sx/it
-}{}
+% ---- lc = lightcondensed ----
-\DeclareFontShape{LGR}{Junicode-LF}{sx}{scsl}{
- <-> ssub * Junicode-LF/sx/scit
+\DeclareFontShape{LGR}{Junicode-LF}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{scsl}{
- <-> ssub * Junicode-LF/semiexpanded/scit
+\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{it}{
+ <-> alias * Junicode-LF/lc/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{sx}{sl}{
- <-> ssub * Junicode-LF/sx/it
+\DeclareFontShape{LGR}{Junicode-LF}{lc}{scit}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{sl}{
- <-> ssub * Junicode-LF/semiexpanded/it
+\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{scit}{
+ <-> alias * Junicode-LF/lc/scit
}{}
+\DeclareFontShape{LGR}{Junicode-LF}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-lf-lgr
+}{}
-% ---- mediumsemiexpanded ----
+\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{n}{
+ <-> alias * Junicode-LF/lc/n
+}{}
-\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{lc}{sc}{
+ <-> \Junicode@@scale Junicode-CondLight-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{sc}{
- <-> \Junicode@@scale Junicode-SmExpMedium-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{sc}{
+ <-> alias * Junicode-LF/lc/sc
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{lc}{sl}{
+ <-> ssub * Junicode-LF/lc/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{scit}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{sl}{
+ <-> ssub * Junicode-LF/lightcondensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{scsl}{
- <-> ssub * Junicode-LF/mediumsemiexpanded/scit
+\DeclareFontShape{LGR}{Junicode-LF}{lc}{scsl}{
+ <-> ssub * Junicode-LF/lc/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-LF/mediumsemiexpanded/it
+\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{scsl}{
+ <-> ssub * Junicode-LF/lightcondensed/scit
}{}
-% ---- mediumexpanded ----
+% ---- mediumsemicondensed ----
-\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{scit}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{sc}{
- <-> \Junicode@@scale Junicode-ExpMedium-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{scsl}{
- <-> ssub * Junicode-LF/mediumexpanded/scit
+\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-LF/mediumsemicondensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{sl}{
- <-> ssub * Junicode-LF/mediumexpanded/it
+\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{scsl}{
+ <-> ssub * Junicode-LF/mediumsemicondensed/scit
}{}
-% ---- sbsx = semiboldsemiexpanded ----
+% ---- sx = semiexpanded ----
-\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{sc}{
- <-> alias * Junicode-LF/sbsx/sc
+\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{it}{
+ <-> alias * Junicode-LF/sx/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-LF/sbsx/n
+\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{n}{
+ <-> alias * Junicode-LF/sx/n
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{sx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{scit}{
- <-> alias * Junicode-LF/sbsx/scit
+\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{scit}{
+ <-> alias * Junicode-LF/sx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{sx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExp-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-LF/sbsx/it
+\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{sc}{
+ <-> alias * Junicode-LF/sx/sc
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{scsl}{
- <-> ssub * Junicode-LF/sbsx/scit
+\DeclareFontShape{LGR}{Junicode-LF}{sx}{sl}{
+ <-> ssub * Junicode-LF/sx/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{scsl}{
- <-> ssub * Junicode-LF/semiboldsemiexpanded/scit
+\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{sl}{
+ <-> ssub * Junicode-LF/semiexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{sl}{
- <-> ssub * Junicode-LF/sbsx/it
+\DeclareFontShape{LGR}{Junicode-LF}{sx}{scsl}{
+ <-> ssub * Junicode-LF/sx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-LF/semiboldsemiexpanded/it
+\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{scsl}{
+ <-> ssub * Junicode-LF/semiexpanded/scit
}{}
-% ---- sbx = semiboldexpanded ----
-
-\DeclareFontShape{LGR}{Junicode-LF}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-lf-lgr
-}{}
-
-\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{n}{
- <-> alias * Junicode-LF/sbx/n
-}{}
+% ---- l = light ----
-\DeclareFontShape{LGR}{Junicode-LF}{sbx}{sc}{
- <-> \Junicode@@scale Junicode-ExpSmBold-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{l}{sc}{
+ <-> \Junicode@@scale Junicode-Light-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{sc}{
- <-> alias * Junicode-LF/sbx/sc
+\DeclareFontShape{LGR}{Junicode-LF}{light}{sc}{
+ <-> alias * Junicode-LF/l/sc
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{it}{
- <-> alias * Junicode-LF/sbx/it
+\DeclareFontShape{LGR}{Junicode-LF}{light}{n}{
+ <-> alias * Junicode-LF/l/n
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{sbx}{scit}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{l}{scit}{
+ <-> \Junicode@@scale Junicode-LightItalic-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{scit}{
- <-> alias * Junicode-LF/sbx/scit
+\DeclareFontShape{LGR}{Junicode-LF}{light}{scit}{
+ <-> alias * Junicode-LF/l/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{sbx}{scsl}{
- <-> ssub * Junicode-LF/sbx/scit
+\DeclareFontShape{LGR}{Junicode-LF}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{scsl}{
- <-> ssub * Junicode-LF/semiboldexpanded/scit
+\DeclareFontShape{LGR}{Junicode-LF}{light}{it}{
+ <-> alias * Junicode-LF/l/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{sbx}{sl}{
- <-> ssub * Junicode-LF/sbx/it
+\DeclareFontShape{LGR}{Junicode-LF}{l}{sl}{
+ <-> ssub * Junicode-LF/l/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-LF/semiboldexpanded/it
+\DeclareFontShape{LGR}{Junicode-LF}{light}{sl}{
+ <-> ssub * Junicode-LF/light/it
}{}
-
-% ---- mediumsemicondensed ----
-
-\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{l}{scsl}{
+ <-> ssub * Junicode-LF/l/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{sc}{
- <-> \Junicode@@scale Junicode-SmCondMedium-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{light}{scsl}{
+ <-> ssub * Junicode-LF/light/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-lgr
-}{}
-\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{scit}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-sc-lgr
-}{}
+% ---- sb = semibold ----
-\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{scsl}{
- <-> ssub * Junicode-LF/mediumsemicondensed/scit
+\DeclareFontShape{LGR}{Junicode-LF}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-LF/mediumsemicondensed/it
+\DeclareFontShape{LGR}{Junicode-LF}{semibold}{it}{
+ <-> alias * Junicode-LF/sb/it
}{}
-
-% ---- sb = semibold ----
-
\DeclareFontShape{LGR}{Junicode-LF}{sb}{scit}{
<-> \Junicode@@scale Junicode-SmBoldItalic-lf-sc-lgr
}{}
@@ -597,12 +656,12 @@
<-> alias * Junicode-LF/sb/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semibold}{it}{
- <-> alias * Junicode-LF/sb/it
+\DeclareFontShape{LGR}{Junicode-LF}{semibold}{n}{
+ <-> alias * Junicode-LF/sb/n
}{}
\DeclareFontShape{LGR}{Junicode-LF}{sb}{sc}{
@@ -613,12 +672,12 @@
<-> alias * Junicode-LF/sb/sc
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{sb}{sl}{
+ <-> ssub * Junicode-LF/sb/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semibold}{n}{
- <-> alias * Junicode-LF/sb/n
+\DeclareFontShape{LGR}{Junicode-LF}{semibold}{sl}{
+ <-> ssub * Junicode-LF/semibold/it
}{}
\DeclareFontShape{LGR}{Junicode-LF}{sb}{scsl}{
@@ -629,33 +688,36 @@
<-> ssub * Junicode-LF/semibold/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{sb}{sl}{
- <-> ssub * Junicode-LF/sb/it
-}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semibold}{sl}{
- <-> ssub * Junicode-LF/semibold/it
-}{}
+% ---- mediumcondensed ----
+\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{scit}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-lf-sc-lgr
+}{}
-% ---- sc = semicondensed ----
+\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-lf-lgr
+}{}
-\DeclareFontShape{LGR}{Junicode-LF}{sc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semicondensed}{scit}{
- <-> alias * Junicode-LF/sc/scit
+\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{sc}{
+ <-> \Junicode@@scale Junicode-CondMedium-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{sc}{it}{
- <-> \Junicode@@scale Junicode-SmCondItalic-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-LF/mediumcondensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semicondensed}{it}{
- <-> alias * Junicode-LF/sc/it
+\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{scsl}{
+ <-> ssub * Junicode-LF/mediumcondensed/scit
}{}
+
+% ---- sc = semicondensed ----
+
\DeclareFontShape{LGR}{Junicode-LF}{sc}{sc}{
<-> \Junicode@@scale Junicode-SmCond-lf-sc-lgr
}{}
@@ -664,6 +726,14 @@
<-> alias * Junicode-LF/sc/sc
}{}
+\DeclareFontShape{LGR}{Junicode-LF}{sc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{Junicode-LF}{semicondensed}{it}{
+ <-> alias * Junicode-LF/sc/it
+}{}
+
\DeclareFontShape{LGR}{Junicode-LF}{sc}{n}{
<-> \Junicode@@scale Junicode-SmCond-lf-lgr
}{}
@@ -672,12 +742,12 @@
<-> alias * Junicode-LF/sc/n
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{sc}{scsl}{
- <-> ssub * Junicode-LF/sc/scit
+\DeclareFontShape{LGR}{Junicode-LF}{sc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{semicondensed}{scsl}{
- <-> ssub * Junicode-LF/semicondensed/scit
+\DeclareFontShape{LGR}{Junicode-LF}{semicondensed}{scit}{
+ <-> alias * Junicode-LF/sc/scit
}{}
\DeclareFontShape{LGR}{Junicode-LF}{sc}{sl}{
@@ -688,66 +758,74 @@
<-> ssub * Junicode-LF/semicondensed/it
}{}
+\DeclareFontShape{LGR}{Junicode-LF}{sc}{scsl}{
+ <-> ssub * Junicode-LF/sc/scit
+}{}
-% ---- lc = lightcondensed ----
+\DeclareFontShape{LGR}{Junicode-LF}{semicondensed}{scsl}{
+ <-> ssub * Junicode-LF/semicondensed/scit
+}{}
-\DeclareFontShape{LGR}{Junicode-LF}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-lf-lgr
+
+% ---- sbsx = semiboldsemiexpanded ----
+
+\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{it}{
- <-> alias * Junicode-LF/lc/it
+\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{sc}{
+ <-> alias * Junicode-LF/sbsx/sc
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{lc}{scit}{
- <-> \Junicode@@scale Junicode-CondLightItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{scit}{
- <-> alias * Junicode-LF/lc/scit
+\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-LF/sbsx/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-lf-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{n}{
- <-> alias * Junicode-LF/lc/n
+\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{scit}{
+ <-> alias * Junicode-LF/sbsx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{lc}{sc}{
- <-> \Junicode@@scale Junicode-CondLight-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-lf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{sc}{
- <-> alias * Junicode-LF/lc/sc
+\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-LF/sbsx/n
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{lc}{scsl}{
- <-> ssub * Junicode-LF/lc/scit
+\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{sl}{
+ <-> ssub * Junicode-LF/sbsx/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{scsl}{
- <-> ssub * Junicode-LF/lightcondensed/scit
+\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-LF/semiboldsemiexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{lc}{sl}{
- <-> ssub * Junicode-LF/lc/it
+\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{scsl}{
+ <-> ssub * Junicode-LF/sbsx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{sl}{
- <-> ssub * Junicode-LF/lightcondensed/it
+\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-LF/semiboldsemiexpanded/scit
}{}
% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{LGR}{Junicode-LF}{bsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpBold-lf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-LF}{bsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{boldsemiexpanded}{sc}{
- <-> alias * Junicode-LF/bsx/sc
+\DeclareFontShape{LGR}{Junicode-LF}{boldsemiexpanded}{scit}{
+ <-> alias * Junicode-LF/bsx/scit
}{}
\DeclareFontShape{LGR}{Junicode-LF}{bsx}{n}{
@@ -758,14 +836,6 @@
<-> alias * Junicode-LF/bsx/n
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{bsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-sc-lgr
-}{}
-
-\DeclareFontShape{LGR}{Junicode-LF}{boldsemiexpanded}{scit}{
- <-> alias * Junicode-LF/bsx/scit
-}{}
-
\DeclareFontShape{LGR}{Junicode-LF}{bsx}{it}{
<-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-lgr
}{}
@@ -774,12 +844,12 @@
<-> alias * Junicode-LF/bsx/it
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{bsx}{scsl}{
- <-> ssub * Junicode-LF/bsx/scit
+\DeclareFontShape{LGR}{Junicode-LF}{bsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpBold-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{boldsemiexpanded}{scsl}{
- <-> ssub * Junicode-LF/boldsemiexpanded/scit
+\DeclareFontShape{LGR}{Junicode-LF}{boldsemiexpanded}{sc}{
+ <-> alias * Junicode-LF/bsx/sc
}{}
\DeclareFontShape{LGR}{Junicode-LF}{bsx}{sl}{
@@ -790,82 +860,12 @@
<-> ssub * Junicode-LF/boldsemiexpanded/it
}{}
-
-% ---- b = bold ----
-
-\DeclareFontShape{LGR}{Junicode-LF}{b}{scit}{
- <-> \Junicode@@scale Junicode-BoldItalic-lf-sc-lgr
-}{}
-
-\DeclareFontShape{LGR}{Junicode-LF}{bold}{scit}{
- <-> alias * Junicode-LF/b/scit
-}{}
-
-\DeclareFontShape{LGR}{Junicode-LF}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-lf-lgr
-}{}
-
-\DeclareFontShape{LGR}{Junicode-LF}{bold}{it}{
- <-> alias * Junicode-LF/b/it
-}{}
-
-\DeclareFontShape{LGR}{Junicode-LF}{b}{sc}{
- <-> \Junicode@@scale Junicode-Bold-lf-sc-lgr
-}{}
-
-\DeclareFontShape{LGR}{Junicode-LF}{bold}{sc}{
- <-> alias * Junicode-LF/b/sc
-}{}
-
-\DeclareFontShape{LGR}{Junicode-LF}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-lf-lgr
-}{}
-
-\DeclareFontShape{LGR}{Junicode-LF}{bold}{n}{
- <-> alias * Junicode-LF/b/n
-}{}
-
-\DeclareFontShape{LGR}{Junicode-LF}{b}{scsl}{
- <-> ssub * Junicode-LF/b/scit
-}{}
-
-\DeclareFontShape{LGR}{Junicode-LF}{bold}{scsl}{
- <-> ssub * Junicode-LF/bold/scit
-}{}
-
-\DeclareFontShape{LGR}{Junicode-LF}{b}{sl}{
- <-> ssub * Junicode-LF/b/it
-}{}
-
-\DeclareFontShape{LGR}{Junicode-LF}{bold}{sl}{
- <-> ssub * Junicode-LF/bold/it
-}{}
-
-
-% ---- mediumcondensed ----
-
-\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{scit}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-lf-sc-lgr
-}{}
-
-\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-lf-lgr
-}{}
-
-\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{sc}{
- <-> \Junicode@@scale Junicode-CondMedium-lf-sc-lgr
-}{}
-
-\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-lf-lgr
-}{}
-
-\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{scsl}{
- <-> ssub * Junicode-LF/mediumcondensed/scit
+\DeclareFontShape{LGR}{Junicode-LF}{bsx}{scsl}{
+ <-> ssub * Junicode-LF/bsx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{sl}{
- <-> ssub * Junicode-LF/mediumcondensed/it
+\DeclareFontShape{LGR}{Junicode-LF}{boldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-LF/boldsemiexpanded/scit
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-OsF.fd b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-OsF.fd
index e63959e9b76..129ac229558 100644
--- a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-OsF.fd
+++ b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{LGRJunicode-OsF.fd}
- [2024/06/03 (autoinst) Font definitions for LGR/Junicode-OsF.]
+ [2024/07/21 (autoinst) Font definitions for LGR/Junicode-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,363 +20,363 @@
\DeclareFontFamily{LGR}{Junicode-OsF}{}
-% ---- sx = semiexpanded ----
+% ---- sc = semicondensed ----
-\DeclareFontShape{LGR}{Junicode-OsF}{sx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{scit}{
- <-> alias * Junicode-OsF/sx/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{n}{
+ <-> alias * Junicode-OsF/sc/n
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{sc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{it}{
- <-> alias * Junicode-OsF/sx/it
+\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{scit}{
+ <-> alias * Junicode-OsF/sc/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sx}{sc}{
- <-> \Junicode@@scale Junicode-SmExp-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{sc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{sc}{
- <-> alias * Junicode-OsF/sx/sc
+\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{it}{
+ <-> alias * Junicode-OsF/sc/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{sc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCond-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{n}{
- <-> alias * Junicode-OsF/sx/n
+\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{sc}{
+ <-> alias * Junicode-OsF/sc/sc
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sx}{scsl}{
- <-> ssub * Junicode-OsF/sx/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{sc}{sl}{
+ <-> ssub * Junicode-OsF/sc/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{scsl}{
- <-> ssub * Junicode-OsF/semiexpanded/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{sl}{
+ <-> ssub * Junicode-OsF/semicondensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sx}{sl}{
- <-> ssub * Junicode-OsF/sx/it
+\DeclareFontShape{LGR}{Junicode-OsF}{sc}{scsl}{
+ <-> ssub * Junicode-OsF/sc/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{sl}{
- <-> ssub * Junicode-OsF/semiexpanded/it
+\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{scsl}{
+ <-> ssub * Junicode-OsF/semicondensed/scit
}{}
-% ---- c = condensed ----
+% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{LGR}{Junicode-OsF}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpBold-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{n}{
- <-> alias * Junicode-OsF/c/n
+\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{sc}{
+ <-> alias * Junicode-OsF/bsx/sc
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{c}{sc}{
- <-> \Junicode@@scale Junicode-Cond-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{sc}{
- <-> alias * Junicode-OsF/c/sc
+\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-OsF/bsx/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{it}{
- <-> alias * Junicode-OsF/c/it
+\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-OsF/bsx/n
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{c}{scit}{
- <-> \Junicode@@scale Junicode-CondItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{scit}{
- <-> alias * Junicode-OsF/c/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{scit}{
+ <-> alias * Junicode-OsF/bsx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{c}{scsl}{
- <-> ssub * Junicode-OsF/c/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{sl}{
+ <-> ssub * Junicode-OsF/bsx/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{scsl}{
- <-> ssub * Junicode-OsF/condensed/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-OsF/boldsemiexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{c}{sl}{
- <-> ssub * Junicode-OsF/c/it
+\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{scsl}{
+ <-> ssub * Junicode-OsF/bsx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{sl}{
- <-> ssub * Junicode-OsF/condensed/it
+\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/boldsemiexpanded/scit
}{}
-% ---- x = expanded ----
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{LGR}{Junicode-OsF}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{it}{
- <-> alias * Junicode-OsF/x/it
+\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-OsF/sbsx/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{x}{scit}{
- <-> \Junicode@@scale Junicode-ExpItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{scit}{
- <-> alias * Junicode-OsF/x/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{scit}{
+ <-> alias * Junicode-OsF/sbsx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{n}{
- <-> alias * Junicode-OsF/x/n
+\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-OsF/sbsx/n
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{x}{sc}{
- <-> \Junicode@@scale Junicode-Exp-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{sc}{
- <-> alias * Junicode-OsF/x/sc
+\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{sc}{
+ <-> alias * Junicode-OsF/sbsx/sc
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{x}{scsl}{
- <-> ssub * Junicode-OsF/x/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{sl}{
+ <-> ssub * Junicode-OsF/sbsx/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{scsl}{
- <-> ssub * Junicode-OsF/expanded/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-OsF/semiboldsemiexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{x}{sl}{
- <-> ssub * Junicode-OsF/x/it
+\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{scsl}{
+ <-> ssub * Junicode-OsF/sbsx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{sl}{
- <-> ssub * Junicode-OsF/expanded/it
+\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/semiboldsemiexpanded/scit
}{}
-% ---- sbsx = semiboldsemiexpanded ----
+% ---- sb = semibold ----
-\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{sb}{sc}{
+ <-> \Junicode@@scale Junicode-SmBold-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-OsF/sbsx/n
+\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{sc}{
+ <-> alias * Junicode-OsF/sb/sc
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{sc}{
- <-> alias * Junicode-OsF/sbsx/sc
+\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{n}{
+ <-> alias * Junicode-OsF/sb/n
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{sb}{scit}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-OsF/sbsx/it
+\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{scit}{
+ <-> alias * Junicode-OsF/sb/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{scit}{
- <-> alias * Junicode-OsF/sbsx/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{it}{
+ <-> alias * Junicode-OsF/sb/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{scsl}{
- <-> ssub * Junicode-OsF/sbsx/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{sb}{sl}{
+ <-> ssub * Junicode-OsF/sb/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{scsl}{
- <-> ssub * Junicode-OsF/semiboldsemiexpanded/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{sl}{
+ <-> ssub * Junicode-OsF/semibold/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{sl}{
- <-> ssub * Junicode-OsF/sbsx/it
+\DeclareFontShape{LGR}{Junicode-OsF}{sb}{scsl}{
+ <-> ssub * Junicode-OsF/sb/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-OsF/semiboldsemiexpanded/it
+\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{scsl}{
+ <-> ssub * Junicode-OsF/semibold/scit
}{}
-% ---- mediumexpanded ----
+% ---- mediumcondensed ----
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{scit}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{sc}{
+ <-> \Junicode@@scale Junicode-CondMedium-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{sc}{
- <-> \Junicode@@scale Junicode-ExpMedium-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{scit}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{scsl}{
- <-> ssub * Junicode-OsF/mediumexpanded/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-OsF/mediumcondensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{sl}{
- <-> ssub * Junicode-OsF/mediumexpanded/it
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{scsl}{
+ <-> ssub * Junicode-OsF/mediumcondensed/scit
}{}
-% ---- mediumsemiexpanded ----
+% ---- mediumsemicondensed ----
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{sc}{
- <-> \Junicode@@scale Junicode-SmExpMedium-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{scit}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{scsl}{
- <-> ssub * Junicode-OsF/mediumsemiexpanded/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-OsF/mediumsemicondensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-OsF/mediumsemiexpanded/it
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{scsl}{
+ <-> ssub * Junicode-OsF/mediumsemicondensed/scit
}{}
-% ---- l = light ----
+% ---- sx = semiexpanded ----
-\DeclareFontShape{LGR}{Junicode-OsF}{l}{sc}{
- <-> \Junicode@@scale Junicode-Light-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{sx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExp-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{light}{sc}{
- <-> alias * Junicode-OsF/l/sc
+\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{sc}{
+ <-> alias * Junicode-OsF/sx/sc
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{light}{n}{
- <-> alias * Junicode-OsF/l/n
+\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{it}{
+ <-> alias * Junicode-OsF/sx/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{l}{scit}{
- <-> \Junicode@@scale Junicode-LightItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{light}{scit}{
- <-> alias * Junicode-OsF/l/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{n}{
+ <-> alias * Junicode-OsF/sx/n
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{sx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{light}{it}{
- <-> alias * Junicode-OsF/l/it
+\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{scit}{
+ <-> alias * Junicode-OsF/sx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{l}{scsl}{
- <-> ssub * Junicode-OsF/l/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{sx}{sl}{
+ <-> ssub * Junicode-OsF/sx/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{light}{scsl}{
- <-> ssub * Junicode-OsF/light/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{sl}{
+ <-> ssub * Junicode-OsF/semiexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{l}{sl}{
- <-> ssub * Junicode-OsF/l/it
+\DeclareFontShape{LGR}{Junicode-OsF}{sx}{scsl}{
+ <-> ssub * Junicode-OsF/sx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{light}{sl}{
- <-> ssub * Junicode-OsF/light/it
+\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/semiexpanded/scit
}{}
-% ---- bx = boldexpanded ----
+% ---- l = light ----
-\DeclareFontShape{LGR}{Junicode-OsF}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{n}{
- <-> alias * Junicode-OsF/bx/n
+\DeclareFontShape{LGR}{Junicode-OsF}{light}{n}{
+ <-> alias * Junicode-OsF/l/n
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{bx}{sc}{
- <-> \Junicode@@scale Junicode-ExpBold-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{l}{scit}{
+ <-> \Junicode@@scale Junicode-LightItalic-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{sc}{
- <-> alias * Junicode-OsF/bx/sc
+\DeclareFontShape{LGR}{Junicode-OsF}{light}{scit}{
+ <-> alias * Junicode-OsF/l/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{it}{
- <-> alias * Junicode-OsF/bx/it
+\DeclareFontShape{LGR}{Junicode-OsF}{light}{it}{
+ <-> alias * Junicode-OsF/l/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{bx}{scit}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{l}{sc}{
+ <-> \Junicode@@scale Junicode-Light-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{scit}{
- <-> alias * Junicode-OsF/bx/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{light}{sc}{
+ <-> alias * Junicode-OsF/l/sc
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{bx}{scsl}{
- <-> ssub * Junicode-OsF/bx/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{l}{sl}{
+ <-> ssub * Junicode-OsF/l/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{scsl}{
- <-> ssub * Junicode-OsF/boldexpanded/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{light}{sl}{
+ <-> ssub * Junicode-OsF/light/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{bx}{sl}{
- <-> ssub * Junicode-OsF/bx/it
+\DeclareFontShape{LGR}{Junicode-OsF}{l}{scsl}{
+ <-> ssub * Junicode-OsF/l/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{sl}{
- <-> ssub * Junicode-OsF/boldexpanded/it
+\DeclareFontShape{LGR}{Junicode-OsF}{light}{scsl}{
+ <-> ssub * Junicode-OsF/light/scit
}{}
@@ -414,14 +414,6 @@
<-> alias * Junicode-OsF/m/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{m}{scsl}{
- <-> ssub * Junicode-OsF/m/scit
-}{}
-
-\DeclareFontShape{LGR}{Junicode-OsF}{regular}{scsl}{
- <-> ssub * Junicode-OsF/regular/scit
-}{}
-
\DeclareFontShape{LGR}{Junicode-OsF}{m}{sl}{
<-> ssub * Junicode-OsF/m/it
}{}
@@ -430,55 +422,39 @@
<-> ssub * Junicode-OsF/regular/it
}{}
-
-% ---- lsc = lightsemicondensed ----
-
-\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{sc}{
- <-> \Junicode@@scale Junicode-SmCondLight-osf-sc-lgr
-}{}
-
-\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{sc}{
- <-> alias * Junicode-OsF/lsc/sc
-}{}
-
-\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{m}{scsl}{
+ <-> ssub * Junicode-OsF/m/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{n}{
- <-> alias * Junicode-OsF/lsc/n
+\DeclareFontShape{LGR}{Junicode-OsF}{regular}{scsl}{
+ <-> ssub * Junicode-OsF/regular/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-sc-lgr
-}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{scit}{
- <-> alias * Junicode-OsF/lsc/scit
-}{}
+% ---- mediumsemiexpanded ----
-\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{it}{
- <-> alias * Junicode-OsF/lsc/it
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{scsl}{
- <-> ssub * Junicode-OsF/lsc/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{scsl}{
- <-> ssub * Junicode-OsF/lightsemicondensed/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{sl}{
- <-> ssub * Junicode-OsF/lsc/it
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-OsF/mediumsemiexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-OsF/lightsemicondensed/it
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/mediumsemiexpanded/scit
}{}
@@ -488,384 +464,408 @@
<-> \Junicode@@scale Junicode-Medium-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{medium}{n}{
- <-> \Junicode@@scale Junicode-Medium-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{medium}{it}{
+ <-> \Junicode@@scale Junicode-MediumItalic-osf-lgr
}{}
\DeclareFontShape{LGR}{Junicode-OsF}{medium}{scit}{
<-> \Junicode@@scale Junicode-MediumItalic-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{medium}{it}{
- <-> \Junicode@@scale Junicode-MediumItalic-osf-lgr
-}{}
-
-\DeclareFontShape{LGR}{Junicode-OsF}{medium}{scsl}{
- <-> ssub * Junicode-OsF/medium/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{medium}{n}{
+ <-> \Junicode@@scale Junicode-Medium-osf-lgr
}{}
\DeclareFontShape{LGR}{Junicode-OsF}{medium}{sl}{
<-> ssub * Junicode-OsF/medium/it
}{}
+\DeclareFontShape{LGR}{Junicode-OsF}{medium}{scsl}{
+ <-> ssub * Junicode-OsF/medium/scit
+}{}
-% ---- b = bold ----
-\DeclareFontShape{LGR}{Junicode-OsF}{b}{scit}{
- <-> \Junicode@@scale Junicode-BoldItalic-osf-sc-lgr
+% ---- bx = boldexpanded ----
+
+\DeclareFontShape{LGR}{Junicode-OsF}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{bold}{scit}{
- <-> alias * Junicode-OsF/b/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{it}{
+ <-> alias * Junicode-OsF/bx/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{bx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{bold}{it}{
- <-> alias * Junicode-OsF/b/it
+\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{scit}{
+ <-> alias * Junicode-OsF/bx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{b}{sc}{
- <-> \Junicode@@scale Junicode-Bold-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{bold}{sc}{
- <-> alias * Junicode-OsF/b/sc
+\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{n}{
+ <-> alias * Junicode-OsF/bx/n
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{bx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpBold-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{bold}{n}{
- <-> alias * Junicode-OsF/b/n
+\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{sc}{
+ <-> alias * Junicode-OsF/bx/sc
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{b}{scsl}{
- <-> ssub * Junicode-OsF/b/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{bx}{sl}{
+ <-> ssub * Junicode-OsF/bx/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{bold}{scsl}{
- <-> ssub * Junicode-OsF/bold/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{sl}{
+ <-> ssub * Junicode-OsF/boldexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{b}{sl}{
- <-> ssub * Junicode-OsF/b/it
+\DeclareFontShape{LGR}{Junicode-OsF}{bx}{scsl}{
+ <-> ssub * Junicode-OsF/bx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{bold}{sl}{
- <-> ssub * Junicode-OsF/bold/it
+\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/boldexpanded/scit
}{}
-% ---- mediumcondensed ----
+% ---- lc = lightcondensed ----
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{scit}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{lc}{sc}{
+ <-> \Junicode@@scale Junicode-CondLight-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{sc}{
+ <-> alias * Junicode-OsF/lc/sc
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{sc}{
- <-> \Junicode@@scale Junicode-CondMedium-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{lc}{scit}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{scit}{
+ <-> alias * Junicode-OsF/lc/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{scsl}{
- <-> ssub * Junicode-OsF/mediumcondensed/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{sl}{
- <-> ssub * Junicode-OsF/mediumcondensed/it
+\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{n}{
+ <-> alias * Junicode-OsF/lc/n
}{}
+\DeclareFontShape{LGR}{Junicode-OsF}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-osf-lgr
+}{}
-% ---- mediumsemicondensed ----
+\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{it}{
+ <-> alias * Junicode-OsF/lc/it
+}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{lc}{sl}{
+ <-> ssub * Junicode-OsF/lc/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{scit}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{sl}{
+ <-> ssub * Junicode-OsF/lightcondensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{lc}{scsl}{
+ <-> ssub * Junicode-OsF/lc/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{sc}{
- <-> \Junicode@@scale Junicode-SmCondMedium-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{scsl}{
+ <-> ssub * Junicode-OsF/lightcondensed/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{scsl}{
- <-> ssub * Junicode-OsF/mediumsemicondensed/scit
+
+% ---- lsc = lightsemicondensed ----
+
+\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-OsF/mediumsemicondensed/it
+\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{scit}{
+ <-> alias * Junicode-OsF/lsc/scit
}{}
+\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-osf-lgr
+}{}
-% ---- sbx = semiboldexpanded ----
+\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{n}{
+ <-> alias * Junicode-OsF/lsc/n
+}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{it}{
- <-> alias * Junicode-OsF/sbx/it
+\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{it}{
+ <-> alias * Junicode-OsF/lsc/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{scit}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondLight-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{scit}{
- <-> alias * Junicode-OsF/sbx/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{sc}{
+ <-> alias * Junicode-OsF/lsc/sc
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{sl}{
+ <-> ssub * Junicode-OsF/lsc/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{n}{
- <-> alias * Junicode-OsF/sbx/n
+\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-OsF/lightsemicondensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{sc}{
- <-> \Junicode@@scale Junicode-ExpSmBold-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{scsl}{
+ <-> ssub * Junicode-OsF/lsc/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{sc}{
- <-> alias * Junicode-OsF/sbx/sc
+\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{scsl}{
+ <-> ssub * Junicode-OsF/lightsemicondensed/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{scsl}{
- <-> ssub * Junicode-OsF/sbx/scit
+
+% ---- mediumexpanded ----
+
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-ExpMedium-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{scsl}{
- <-> ssub * Junicode-OsF/semiboldexpanded/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{sl}{
- <-> ssub * Junicode-OsF/sbx/it
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-OsF/semiboldexpanded/it
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-lgr
}{}
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-OsF/mediumexpanded/it
+}{}
-% ---- bsx = boldsemiexpanded ----
+\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/mediumexpanded/scit
+}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpBold-osf-sc-lgr
+
+% ---- x = expanded ----
+
+\DeclareFontShape{LGR}{Junicode-OsF}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{sc}{
- <-> alias * Junicode-OsF/bsx/sc
+\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{n}{
+ <-> alias * Junicode-OsF/x/n
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{x}{scit}{
+ <-> \Junicode@@scale Junicode-ExpItalic-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{n}{
- <-> alias * Junicode-OsF/bsx/n
+\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{scit}{
+ <-> alias * Junicode-OsF/x/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{scit}{
- <-> alias * Junicode-OsF/bsx/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{it}{
+ <-> alias * Junicode-OsF/x/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{x}{sc}{
+ <-> \Junicode@@scale Junicode-Exp-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{it}{
- <-> alias * Junicode-OsF/bsx/it
+\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{sc}{
+ <-> alias * Junicode-OsF/x/sc
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{scsl}{
- <-> ssub * Junicode-OsF/bsx/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{x}{sl}{
+ <-> ssub * Junicode-OsF/x/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{scsl}{
- <-> ssub * Junicode-OsF/boldsemiexpanded/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{sl}{
+ <-> ssub * Junicode-OsF/expanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{sl}{
- <-> ssub * Junicode-OsF/bsx/it
+\DeclareFontShape{LGR}{Junicode-OsF}{x}{scsl}{
+ <-> ssub * Junicode-OsF/x/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-OsF/boldsemiexpanded/it
+\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{scsl}{
+ <-> ssub * Junicode-OsF/expanded/scit
}{}
-% ---- lc = lightcondensed ----
+% ---- b = bold ----
-\DeclareFontShape{LGR}{Junicode-OsF}{lc}{scit}{
- <-> \Junicode@@scale Junicode-CondLightItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{b}{sc}{
+ <-> \Junicode@@scale Junicode-Bold-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{scit}{
- <-> alias * Junicode-OsF/lc/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{bold}{sc}{
+ <-> alias * Junicode-OsF/b/sc
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{it}{
- <-> alias * Junicode-OsF/lc/it
+\DeclareFontShape{LGR}{Junicode-OsF}{bold}{it}{
+ <-> alias * Junicode-OsF/b/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{lc}{sc}{
- <-> \Junicode@@scale Junicode-CondLight-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{b}{scit}{
+ <-> \Junicode@@scale Junicode-BoldItalic-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{sc}{
- <-> alias * Junicode-OsF/lc/sc
+\DeclareFontShape{LGR}{Junicode-OsF}{bold}{scit}{
+ <-> alias * Junicode-OsF/b/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{n}{
- <-> alias * Junicode-OsF/lc/n
+\DeclareFontShape{LGR}{Junicode-OsF}{bold}{n}{
+ <-> alias * Junicode-OsF/b/n
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{lc}{scsl}{
- <-> ssub * Junicode-OsF/lc/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{b}{sl}{
+ <-> ssub * Junicode-OsF/b/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{scsl}{
- <-> ssub * Junicode-OsF/lightcondensed/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{bold}{sl}{
+ <-> ssub * Junicode-OsF/bold/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{lc}{sl}{
- <-> ssub * Junicode-OsF/lc/it
+\DeclareFontShape{LGR}{Junicode-OsF}{b}{scsl}{
+ <-> ssub * Junicode-OsF/b/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{sl}{
- <-> ssub * Junicode-OsF/lightcondensed/it
+\DeclareFontShape{LGR}{Junicode-OsF}{bold}{scsl}{
+ <-> ssub * Junicode-OsF/bold/scit
}{}
-% ---- sc = semicondensed ----
+% ---- sbx = semiboldexpanded ----
-\DeclareFontShape{LGR}{Junicode-OsF}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{n}{
- <-> alias * Junicode-OsF/sc/n
+\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{it}{
+ <-> alias * Junicode-OsF/sbx/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sc}{sc}{
- <-> \Junicode@@scale Junicode-SmCond-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{sc}{
- <-> alias * Junicode-OsF/sc/sc
+\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{scit}{
+ <-> alias * Junicode-OsF/sbx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sc}{it}{
- <-> \Junicode@@scale Junicode-SmCondItalic-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{it}{
- <-> alias * Junicode-OsF/sc/it
+\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{n}{
+ <-> alias * Junicode-OsF/sbx/n
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{scit}{
- <-> alias * Junicode-OsF/sc/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{sc}{
+ <-> alias * Junicode-OsF/sbx/sc
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sc}{scsl}{
- <-> ssub * Junicode-OsF/sc/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{sl}{
+ <-> ssub * Junicode-OsF/sbx/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{scsl}{
- <-> ssub * Junicode-OsF/semicondensed/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-OsF/semiboldexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sc}{sl}{
- <-> ssub * Junicode-OsF/sc/it
+\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{scsl}{
+ <-> ssub * Junicode-OsF/sbx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{sl}{
- <-> ssub * Junicode-OsF/semicondensed/it
+\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/semiboldexpanded/scit
}{}
-% ---- sb = semibold ----
+% ---- c = condensed ----
-\DeclareFontShape{LGR}{Junicode-OsF}{sb}{scit}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{scit}{
- <-> alias * Junicode-OsF/sb/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{it}{
+ <-> alias * Junicode-OsF/c/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-osf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{it}{
- <-> alias * Junicode-OsF/sb/it
+\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{n}{
+ <-> alias * Junicode-OsF/c/n
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sb}{sc}{
- <-> \Junicode@@scale Junicode-SmBold-osf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{c}{scit}{
+ <-> \Junicode@@scale Junicode-CondItalic-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{sc}{
- <-> alias * Junicode-OsF/sb/sc
+\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{scit}{
+ <-> alias * Junicode-OsF/c/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-osf-lgr
+\DeclareFontShape{LGR}{Junicode-OsF}{c}{sc}{
+ <-> \Junicode@@scale Junicode-Cond-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{n}{
- <-> alias * Junicode-OsF/sb/n
+\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{sc}{
+ <-> alias * Junicode-OsF/c/sc
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sb}{scsl}{
- <-> ssub * Junicode-OsF/sb/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{c}{sl}{
+ <-> ssub * Junicode-OsF/c/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{scsl}{
- <-> ssub * Junicode-OsF/semibold/scit
+\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{sl}{
+ <-> ssub * Junicode-OsF/condensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{sb}{sl}{
- <-> ssub * Junicode-OsF/sb/it
+\DeclareFontShape{LGR}{Junicode-OsF}{c}{scsl}{
+ <-> ssub * Junicode-OsF/c/scit
}{}
-\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{sl}{
- <-> ssub * Junicode-OsF/semibold/it
+\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{scsl}{
+ <-> ssub * Junicode-OsF/condensed/scit
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-Sup.fd b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-Sup.fd
index 01cd3f1df7a..f9051a7c583 100644
--- a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-Sup.fd
+++ b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{LGRJunicode-Sup.fd}
- [2024/06/03 (autoinst) Font definitions for LGR/Junicode-Sup.]
+ [2024/07/21 (autoinst) Font definitions for LGR/Junicode-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,23 +20,16 @@
\DeclareFontFamily{LGR}{Junicode-Sup}{}
-% ---- mediumsemicondensed ----
-
-\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-sup-lgr
-}{}
+% ---- sbx = semiboldexpanded ----
-\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-Sup/mediumsemicondensed/it
+\DeclareFontShape{LGR}{Junicode-Sup}{semiboldexpanded}{n}{
+ <-> alias * Junicode-Sup/sbx/n
}{}
-
-% ---- sbx = semiboldexpanded ----
-
\DeclareFontShape{LGR}{Junicode-Sup}{sbx}{it}{
<-> \Junicode@@scale Junicode-ExpSmBoldItalic-sup-lgr
}{}
@@ -45,14 +38,6 @@
<-> alias * Junicode-Sup/sbx/it
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-sup-lgr
-}{}
-
-\DeclareFontShape{LGR}{Junicode-Sup}{semiboldexpanded}{n}{
- <-> alias * Junicode-Sup/sbx/n
-}{}
-
\DeclareFontShape{LGR}{Junicode-Sup}{sbx}{sl}{
<-> ssub * Junicode-Sup/sbx/it
}{}
@@ -62,111 +47,99 @@
}{}
-% ---- lc = lightcondensed ----
-
-\DeclareFontShape{LGR}{Junicode-Sup}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-sup-lgr
-}{}
+% ---- c = condensed ----
-\DeclareFontShape{LGR}{Junicode-Sup}{lightcondensed}{n}{
- <-> alias * Junicode-Sup/lc/n
+\DeclareFontShape{LGR}{Junicode-Sup}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{condensed}{n}{
+ <-> alias * Junicode-Sup/c/n
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{lightcondensed}{it}{
- <-> alias * Junicode-Sup/lc/it
+\DeclareFontShape{LGR}{Junicode-Sup}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{lc}{sl}{
- <-> ssub * Junicode-Sup/lc/it
+\DeclareFontShape{LGR}{Junicode-Sup}{condensed}{it}{
+ <-> alias * Junicode-Sup/c/it
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{lightcondensed}{sl}{
- <-> ssub * Junicode-Sup/lightcondensed/it
+\DeclareFontShape{LGR}{Junicode-Sup}{c}{sl}{
+ <-> ssub * Junicode-Sup/c/it
}{}
-
-% ---- bsx = boldsemiexpanded ----
-
-\DeclareFontShape{LGR}{Junicode-Sup}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{condensed}{sl}{
+ <-> ssub * Junicode-Sup/condensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{boldsemiexpanded}{it}{
- <-> alias * Junicode-Sup/bsx/it
-}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-sup-lgr
-}{}
+% ---- mediumexpanded ----
-\DeclareFontShape{LGR}{Junicode-Sup}{boldsemiexpanded}{n}{
- <-> alias * Junicode-Sup/bsx/n
+\DeclareFontShape{LGR}{Junicode-Sup}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{bsx}{sl}{
- <-> ssub * Junicode-Sup/bsx/it
+\DeclareFontShape{LGR}{Junicode-Sup}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-Sup/boldsemiexpanded/it
+\DeclareFontShape{LGR}{Junicode-Sup}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-Sup/mediumexpanded/it
}{}
-% ---- sc = semicondensed ----
+% ---- lsc = lightsemicondensed ----
-\DeclareFontShape{LGR}{Junicode-Sup}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{semicondensed}{n}{
- <-> alias * Junicode-Sup/sc/n
+\DeclareFontShape{LGR}{Junicode-Sup}{lightsemicondensed}{n}{
+ <-> alias * Junicode-Sup/lsc/n
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{sc}{it}{
- <-> \Junicode@@scale Junicode-SmCondItalic-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{semicondensed}{it}{
- <-> alias * Junicode-Sup/sc/it
+\DeclareFontShape{LGR}{Junicode-Sup}{lightsemicondensed}{it}{
+ <-> alias * Junicode-Sup/lsc/it
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{sc}{sl}{
- <-> ssub * Junicode-Sup/sc/it
+\DeclareFontShape{LGR}{Junicode-Sup}{lsc}{sl}{
+ <-> ssub * Junicode-Sup/lsc/it
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{semicondensed}{sl}{
- <-> ssub * Junicode-Sup/semicondensed/it
+\DeclareFontShape{LGR}{Junicode-Sup}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-Sup/lightsemicondensed/it
}{}
-% ---- sb = semibold ----
+% ---- x = expanded ----
-\DeclareFontShape{LGR}{Junicode-Sup}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{semibold}{it}{
- <-> alias * Junicode-Sup/sb/it
+\DeclareFontShape{LGR}{Junicode-Sup}{expanded}{n}{
+ <-> alias * Junicode-Sup/x/n
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{semibold}{n}{
- <-> alias * Junicode-Sup/sb/n
+\DeclareFontShape{LGR}{Junicode-Sup}{expanded}{it}{
+ <-> alias * Junicode-Sup/x/it
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{sb}{sl}{
- <-> ssub * Junicode-Sup/sb/it
+\DeclareFontShape{LGR}{Junicode-Sup}{x}{sl}{
+ <-> ssub * Junicode-Sup/x/it
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{semibold}{sl}{
- <-> ssub * Junicode-Sup/semibold/it
+\DeclareFontShape{LGR}{Junicode-Sup}{expanded}{sl}{
+ <-> ssub * Junicode-Sup/expanded/it
}{}
@@ -197,18 +170,30 @@
}{}
-% ---- mediumcondensed ----
+% ---- sx = semiexpanded ----
-\DeclareFontShape{LGR}{Junicode-Sup}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{semiexpanded}{it}{
+ <-> alias * Junicode-Sup/sx/it
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{mediumcondensed}{sl}{
- <-> ssub * Junicode-Sup/mediumcondensed/it
+\DeclareFontShape{LGR}{Junicode-Sup}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{Junicode-Sup}{semiexpanded}{n}{
+ <-> alias * Junicode-Sup/sx/n
+}{}
+
+\DeclareFontShape{LGR}{Junicode-Sup}{sx}{sl}{
+ <-> ssub * Junicode-Sup/sx/it
+}{}
+
+\DeclareFontShape{LGR}{Junicode-Sup}{semiexpanded}{sl}{
+ <-> ssub * Junicode-Sup/semiexpanded/it
}{}
@@ -239,30 +224,60 @@
}{}
-% ---- bx = boldexpanded ----
+% ---- mediumsemicondensed ----
-\DeclareFontShape{LGR}{Junicode-Sup}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{boldexpanded}{n}{
- <-> alias * Junicode-Sup/bx/n
+\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-Sup/mediumsemicondensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{boldexpanded}{it}{
- <-> alias * Junicode-Sup/bx/it
+
+% ---- lc = lightcondensed ----
+
+\DeclareFontShape{LGR}{Junicode-Sup}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{bx}{sl}{
- <-> ssub * Junicode-Sup/bx/it
+\DeclareFontShape{LGR}{Junicode-Sup}{lightcondensed}{n}{
+ <-> alias * Junicode-Sup/lc/n
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{boldexpanded}{sl}{
- <-> ssub * Junicode-Sup/boldexpanded/it
+\DeclareFontShape{LGR}{Junicode-Sup}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{Junicode-Sup}{lightcondensed}{it}{
+ <-> alias * Junicode-Sup/lc/it
+}{}
+
+\DeclareFontShape{LGR}{Junicode-Sup}{lc}{sl}{
+ <-> ssub * Junicode-Sup/lc/it
+}{}
+
+\DeclareFontShape{LGR}{Junicode-Sup}{lightcondensed}{sl}{
+ <-> ssub * Junicode-Sup/lightcondensed/it
+}{}
+
+
+% ---- mediumsemiexpanded ----
+
+\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-Sup/mediumsemiexpanded/it
}{}
@@ -308,168 +323,153 @@
}{}
-% ---- lsc = lightsemicondensed ----
+% ---- bx = boldexpanded ----
-\DeclareFontShape{LGR}{Junicode-Sup}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{lightsemicondensed}{n}{
- <-> alias * Junicode-Sup/lsc/n
+\DeclareFontShape{LGR}{Junicode-Sup}{boldexpanded}{it}{
+ <-> alias * Junicode-Sup/bx/it
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{lightsemicondensed}{it}{
- <-> alias * Junicode-Sup/lsc/it
+\DeclareFontShape{LGR}{Junicode-Sup}{boldexpanded}{n}{
+ <-> alias * Junicode-Sup/bx/n
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{lsc}{sl}{
- <-> ssub * Junicode-Sup/lsc/it
+\DeclareFontShape{LGR}{Junicode-Sup}{bx}{sl}{
+ <-> ssub * Junicode-Sup/bx/it
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-Sup/lightsemicondensed/it
+\DeclareFontShape{LGR}{Junicode-Sup}{boldexpanded}{sl}{
+ <-> ssub * Junicode-Sup/boldexpanded/it
}{}
-% ---- c = condensed ----
+% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{LGR}{Junicode-Sup}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{condensed}{n}{
- <-> alias * Junicode-Sup/c/n
+\DeclareFontShape{LGR}{Junicode-Sup}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-Sup/bsx/it
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{condensed}{it}{
- <-> alias * Junicode-Sup/c/it
+\DeclareFontShape{LGR}{Junicode-Sup}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-Sup/bsx/n
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{c}{sl}{
- <-> ssub * Junicode-Sup/c/it
+\DeclareFontShape{LGR}{Junicode-Sup}{bsx}{sl}{
+ <-> ssub * Junicode-Sup/bsx/it
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{condensed}{sl}{
- <-> ssub * Junicode-Sup/condensed/it
+\DeclareFontShape{LGR}{Junicode-Sup}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-Sup/boldsemiexpanded/it
}{}
-% ---- x = expanded ----
-
-\DeclareFontShape{LGR}{Junicode-Sup}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-sup-lgr
-}{}
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{LGR}{Junicode-Sup}{expanded}{n}{
- <-> alias * Junicode-Sup/x/n
+\DeclareFontShape{LGR}{Junicode-Sup}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-Sup/sbsx/n
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{expanded}{it}{
- <-> alias * Junicode-Sup/x/it
+\DeclareFontShape{LGR}{Junicode-Sup}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{x}{sl}{
- <-> ssub * Junicode-Sup/x/it
+\DeclareFontShape{LGR}{Junicode-Sup}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-Sup/sbsx/it
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{expanded}{sl}{
- <-> ssub * Junicode-Sup/expanded/it
+\DeclareFontShape{LGR}{Junicode-Sup}{sbsx}{sl}{
+ <-> ssub * Junicode-Sup/sbsx/it
}{}
-
-% ---- sx = semiexpanded ----
-
-\DeclareFontShape{LGR}{Junicode-Sup}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-Sup/semiboldsemiexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{semiexpanded}{it}{
- <-> alias * Junicode-Sup/sx/it
-}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-sup-lgr
-}{}
+% ---- sc = semicondensed ----
-\DeclareFontShape{LGR}{Junicode-Sup}{semiexpanded}{n}{
- <-> alias * Junicode-Sup/sx/n
+\DeclareFontShape{LGR}{Junicode-Sup}{sc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{sx}{sl}{
- <-> ssub * Junicode-Sup/sx/it
+\DeclareFontShape{LGR}{Junicode-Sup}{semicondensed}{it}{
+ <-> alias * Junicode-Sup/sc/it
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{semiexpanded}{sl}{
- <-> ssub * Junicode-Sup/semiexpanded/it
+\DeclareFontShape{LGR}{Junicode-Sup}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-sup-lgr
}{}
-
-% ---- mediumexpanded ----
-
-\DeclareFontShape{LGR}{Junicode-Sup}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{semicondensed}{n}{
+ <-> alias * Junicode-Sup/sc/n
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{sc}{sl}{
+ <-> ssub * Junicode-Sup/sc/it
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{mediumexpanded}{sl}{
- <-> ssub * Junicode-Sup/mediumexpanded/it
+\DeclareFontShape{LGR}{Junicode-Sup}{semicondensed}{sl}{
+ <-> ssub * Junicode-Sup/semicondensed/it
}{}
-% ---- sbsx = semiboldsemiexpanded ----
+% ---- sb = semibold ----
-\DeclareFontShape{LGR}{Junicode-Sup}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-Sup/sbsx/it
+\DeclareFontShape{LGR}{Junicode-Sup}{semibold}{it}{
+ <-> alias * Junicode-Sup/sb/it
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-Sup/sbsx/n
+\DeclareFontShape{LGR}{Junicode-Sup}{semibold}{n}{
+ <-> alias * Junicode-Sup/sb/n
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{sbsx}{sl}{
- <-> ssub * Junicode-Sup/sbsx/it
+\DeclareFontShape{LGR}{Junicode-Sup}{sb}{sl}{
+ <-> ssub * Junicode-Sup/sb/it
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-Sup/semiboldsemiexpanded/it
+\DeclareFontShape{LGR}{Junicode-Sup}{semibold}{sl}{
+ <-> ssub * Junicode-Sup/semibold/it
}{}
-% ---- mediumsemiexpanded ----
+% ---- mediumcondensed ----
-\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-sup-lgr
+\DeclareFontShape{LGR}{Junicode-Sup}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-sup-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-Sup/mediumsemiexpanded/it
+\DeclareFontShape{LGR}{Junicode-Sup}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-Sup/mediumcondensed/it
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-TLF.fd b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-TLF.fd
index 64237086df5..d0970130c3d 100644
--- a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-TLF.fd
+++ b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{LGRJunicode-TLF.fd}
- [2024/06/03 (autoinst) Font definitions for LGR/Junicode-TLF.]
+ [2024/07/21 (autoinst) Font definitions for LGR/Junicode-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,607 +20,626 @@
\DeclareFontFamily{LGR}{Junicode-TLF}{}
-% ---- lsc = lightsemicondensed ----
+% ---- sbx = semiboldexpanded ----
-\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{it}{
- <-> alias * Junicode-TLF/lsc/it
+\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{n}{
+ <-> alias * Junicode-TLF/sbx/n
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{scit}{
- <-> alias * Junicode-TLF/lsc/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{scit}{
+ <-> alias * Junicode-TLF/sbx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{n}{
- <-> alias * Junicode-TLF/lsc/n
+\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{it}{
+ <-> alias * Junicode-TLF/sbx/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{sc}{
- <-> \Junicode@@scale Junicode-SmCondLight-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{sc}{
- <-> alias * Junicode-TLF/lsc/sc
+\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{sc}{
+ <-> alias * Junicode-TLF/sbx/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{scsl}{
- <-> ssub * Junicode-TLF/lsc/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{sl}{
+ <-> ssub * Junicode-TLF/sbx/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{scsl}{
- <-> ssub * Junicode-TLF/lightsemicondensed/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-TLF/semiboldexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{sl}{
- <-> ssub * Junicode-TLF/lsc/it
+\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{scsl}{
+ <-> ssub * Junicode-TLF/sbx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-TLF/lightsemicondensed/it
+\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/semiboldexpanded/scit
}{}
-% ---- medium ----
+% ---- c = condensed ----
-\DeclareFontShape{LGR}{Junicode-TLF}{medium}{it}{
- <-> \Junicode@@scale Junicode-MediumItalic-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{medium}{scit}{
- <-> \Junicode@@scale Junicode-MediumItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{n}{
+ <-> alias * Junicode-TLF/c/n
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{medium}{n}{
- <-> \Junicode@@scale Junicode-Medium-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{c}{scit}{
+ <-> \Junicode@@scale Junicode-CondItalic-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{medium}{sc}{
- <-> \Junicode@@scale Junicode-Medium-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{scit}{
+ <-> alias * Junicode-TLF/c/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{medium}{scsl}{
- <-> ssub * Junicode-TLF/medium/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{medium}{sl}{
- <-> ssub * Junicode-TLF/medium/it
+\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{it}{
+ <-> alias * Junicode-TLF/c/it
}{}
-
-% ---- m = regular ----
-
-\DeclareFontShape{LGR}{Junicode-TLF}{m}{sc}{
- <-> \Junicode@@scale Junicode-Regular-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{c}{sc}{
+ <-> \Junicode@@scale Junicode-Cond-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{regular}{sc}{
- <-> alias * Junicode-TLF/m/sc
+\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{sc}{
+ <-> alias * Junicode-TLF/c/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{c}{sl}{
+ <-> ssub * Junicode-TLF/c/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{regular}{n}{
- <-> alias * Junicode-TLF/m/n
+\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{sl}{
+ <-> ssub * Junicode-TLF/condensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{m}{scit}{
- <-> \Junicode@@scale Junicode-Italic-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{c}{scsl}{
+ <-> ssub * Junicode-TLF/c/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{regular}{scit}{
- <-> alias * Junicode-TLF/m/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{scsl}{
+ <-> ssub * Junicode-TLF/condensed/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-tlf-lgr
+
+% ---- mediumexpanded ----
+
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-ExpMedium-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{regular}{it}{
- <-> alias * Junicode-TLF/m/it
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{m}{scsl}{
- <-> ssub * Junicode-TLF/m/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{regular}{scsl}{
- <-> ssub * Junicode-TLF/regular/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{m}{sl}{
- <-> ssub * Junicode-TLF/m/it
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-TLF/mediumexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{regular}{sl}{
- <-> ssub * Junicode-TLF/regular/it
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/mediumexpanded/scit
}{}
-% ---- bx = boldexpanded ----
+% ---- lsc = lightsemicondensed ----
-\DeclareFontShape{LGR}{Junicode-TLF}{bx}{sc}{
- <-> \Junicode@@scale Junicode-ExpBold-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondLight-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{sc}{
- <-> alias * Junicode-TLF/bx/sc
+\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{sc}{
+ <-> alias * Junicode-TLF/lsc/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{n}{
- <-> alias * Junicode-TLF/bx/n
+\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{scit}{
+ <-> alias * Junicode-TLF/lsc/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{bx}{scit}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{scit}{
- <-> alias * Junicode-TLF/bx/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{n}{
+ <-> alias * Junicode-TLF/lsc/n
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{it}{
- <-> alias * Junicode-TLF/bx/it
+\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{it}{
+ <-> alias * Junicode-TLF/lsc/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{bx}{scsl}{
- <-> ssub * Junicode-TLF/bx/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{sl}{
+ <-> ssub * Junicode-TLF/lsc/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{scsl}{
- <-> ssub * Junicode-TLF/boldexpanded/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-TLF/lightsemicondensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{bx}{sl}{
- <-> ssub * Junicode-TLF/bx/it
+\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{scsl}{
+ <-> ssub * Junicode-TLF/lsc/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{sl}{
- <-> ssub * Junicode-TLF/boldexpanded/it
+\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{scsl}{
+ <-> ssub * Junicode-TLF/lightsemicondensed/scit
}{}
-% ---- l = light ----
+% ---- x = expanded ----
-\DeclareFontShape{LGR}{Junicode-TLF}{l}{scit}{
- <-> \Junicode@@scale Junicode-LightItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{x}{sc}{
+ <-> \Junicode@@scale Junicode-Exp-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{light}{scit}{
- <-> alias * Junicode-TLF/l/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{sc}{
+ <-> alias * Junicode-TLF/x/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{x}{scit}{
+ <-> \Junicode@@scale Junicode-ExpItalic-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{light}{it}{
- <-> alias * Junicode-TLF/l/it
+\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{scit}{
+ <-> alias * Junicode-TLF/x/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{l}{sc}{
- <-> \Junicode@@scale Junicode-Light-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{light}{sc}{
- <-> alias * Junicode-TLF/l/sc
+\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{n}{
+ <-> alias * Junicode-TLF/x/n
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{light}{n}{
- <-> alias * Junicode-TLF/l/n
+\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{it}{
+ <-> alias * Junicode-TLF/x/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{l}{scsl}{
- <-> ssub * Junicode-TLF/l/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{x}{sl}{
+ <-> ssub * Junicode-TLF/x/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{light}{scsl}{
- <-> ssub * Junicode-TLF/light/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{sl}{
+ <-> ssub * Junicode-TLF/expanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{l}{sl}{
- <-> ssub * Junicode-TLF/l/it
+\DeclareFontShape{LGR}{Junicode-TLF}{x}{scsl}{
+ <-> ssub * Junicode-TLF/x/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{light}{sl}{
- <-> ssub * Junicode-TLF/light/it
+\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{scsl}{
+ <-> ssub * Junicode-TLF/expanded/scit
}{}
-% ---- mediumsemiexpanded ----
+% ---- b = bold ----
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{b}{sc}{
+ <-> \Junicode@@scale Junicode-Bold-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{sc}{
- <-> \Junicode@@scale Junicode-SmExpMedium-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{bold}{sc}{
+ <-> alias * Junicode-TLF/b/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{b}{scit}{
+ <-> \Junicode@@scale Junicode-BoldItalic-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{scit}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{bold}{scit}{
+ <-> alias * Junicode-TLF/b/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{scsl}{
- <-> ssub * Junicode-TLF/mediumsemiexpanded/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-TLF/mediumsemiexpanded/it
+\DeclareFontShape{LGR}{Junicode-TLF}{bold}{n}{
+ <-> alias * Junicode-TLF/b/n
}{}
+\DeclareFontShape{LGR}{Junicode-TLF}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-tlf-lgr
+}{}
-% ---- sbsx = semiboldsemiexpanded ----
+\DeclareFontShape{LGR}{Junicode-TLF}{bold}{it}{
+ <-> alias * Junicode-TLF/b/it
+}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{b}{sl}{
+ <-> ssub * Junicode-TLF/b/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-TLF/sbsx/n
+\DeclareFontShape{LGR}{Junicode-TLF}{bold}{sl}{
+ <-> ssub * Junicode-TLF/bold/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{b}{scsl}{
+ <-> ssub * Junicode-TLF/b/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{sc}{
- <-> alias * Junicode-TLF/sbsx/sc
+\DeclareFontShape{LGR}{Junicode-TLF}{bold}{scsl}{
+ <-> ssub * Junicode-TLF/bold/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-lgr
+
+% ---- sx = semiexpanded ----
+
+\DeclareFontShape{LGR}{Junicode-TLF}{sx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExp-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-TLF/sbsx/it
+\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{sc}{
+ <-> alias * Junicode-TLF/sx/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{scit}{
- <-> alias * Junicode-TLF/sbsx/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{n}{
+ <-> alias * Junicode-TLF/sx/n
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{scsl}{
- <-> ssub * Junicode-TLF/sbsx/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{sx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{scsl}{
- <-> ssub * Junicode-TLF/semiboldsemiexpanded/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{scit}{
+ <-> alias * Junicode-TLF/sx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{sl}{
- <-> ssub * Junicode-TLF/sbsx/it
+\DeclareFontShape{LGR}{Junicode-TLF}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-TLF/semiboldsemiexpanded/it
+\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{it}{
+ <-> alias * Junicode-TLF/sx/it
}{}
+\DeclareFontShape{LGR}{Junicode-TLF}{sx}{sl}{
+ <-> ssub * Junicode-TLF/sx/it
+}{}
-% ---- mediumexpanded ----
+\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{sl}{
+ <-> ssub * Junicode-TLF/semiexpanded/it
+}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{sx}{scsl}{
+ <-> ssub * Junicode-TLF/sx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{sc}{
- <-> \Junicode@@scale Junicode-ExpMedium-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/semiexpanded/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-lgr
+
+% ---- l = light ----
+
+\DeclareFontShape{LGR}{Junicode-TLF}{l}{scit}{
+ <-> \Junicode@@scale Junicode-LightItalic-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{scit}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{light}{scit}{
+ <-> alias * Junicode-TLF/l/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{scsl}{
- <-> ssub * Junicode-TLF/mediumexpanded/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{sl}{
- <-> ssub * Junicode-TLF/mediumexpanded/it
+\DeclareFontShape{LGR}{Junicode-TLF}{light}{n}{
+ <-> alias * Junicode-TLF/l/n
}{}
+\DeclareFontShape{LGR}{Junicode-TLF}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-tlf-lgr
+}{}
-% ---- sx = semiexpanded ----
+\DeclareFontShape{LGR}{Junicode-TLF}{light}{it}{
+ <-> alias * Junicode-TLF/l/it
+}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sx}{sc}{
- <-> \Junicode@@scale Junicode-SmExp-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{l}{sc}{
+ <-> \Junicode@@scale Junicode-Light-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{sc}{
- <-> alias * Junicode-TLF/sx/sc
+\DeclareFontShape{LGR}{Junicode-TLF}{light}{sc}{
+ <-> alias * Junicode-TLF/l/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{l}{sl}{
+ <-> ssub * Junicode-TLF/l/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{n}{
- <-> alias * Junicode-TLF/sx/n
+\DeclareFontShape{LGR}{Junicode-TLF}{light}{sl}{
+ <-> ssub * Junicode-TLF/light/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{l}{scsl}{
+ <-> ssub * Junicode-TLF/l/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{scit}{
- <-> alias * Junicode-TLF/sx/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{light}{scsl}{
+ <-> ssub * Junicode-TLF/light/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-tlf-lgr
+
+% ---- mediumsemicondensed ----
+
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{it}{
- <-> alias * Junicode-TLF/sx/it
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sx}{scsl}{
- <-> ssub * Junicode-TLF/sx/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{scsl}{
- <-> ssub * Junicode-TLF/semiexpanded/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sx}{sl}{
- <-> ssub * Junicode-TLF/sx/it
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-TLF/mediumsemicondensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{sl}{
- <-> ssub * Junicode-TLF/semiexpanded/it
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{scsl}{
+ <-> ssub * Junicode-TLF/mediumsemicondensed/scit
}{}
-% ---- c = condensed ----
+% ---- lc = lightcondensed ----
-\DeclareFontShape{LGR}{Junicode-TLF}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{lc}{scit}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{it}{
- <-> alias * Junicode-TLF/c/it
+\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{scit}{
+ <-> alias * Junicode-TLF/lc/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{c}{scit}{
- <-> \Junicode@@scale Junicode-CondItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{scit}{
- <-> alias * Junicode-TLF/c/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{n}{
+ <-> alias * Junicode-TLF/lc/n
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{n}{
- <-> alias * Junicode-TLF/c/n
+\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{it}{
+ <-> alias * Junicode-TLF/lc/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{c}{sc}{
- <-> \Junicode@@scale Junicode-Cond-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{lc}{sc}{
+ <-> \Junicode@@scale Junicode-CondLight-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{sc}{
- <-> alias * Junicode-TLF/c/sc
+\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{sc}{
+ <-> alias * Junicode-TLF/lc/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{c}{scsl}{
- <-> ssub * Junicode-TLF/c/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{lc}{sl}{
+ <-> ssub * Junicode-TLF/lc/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{scsl}{
- <-> ssub * Junicode-TLF/condensed/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{sl}{
+ <-> ssub * Junicode-TLF/lightcondensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{c}{sl}{
- <-> ssub * Junicode-TLF/c/it
+\DeclareFontShape{LGR}{Junicode-TLF}{lc}{scsl}{
+ <-> ssub * Junicode-TLF/lc/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{sl}{
- <-> ssub * Junicode-TLF/condensed/it
+\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{scsl}{
+ <-> ssub * Junicode-TLF/lightcondensed/scit
}{}
-% ---- x = expanded ----
+% ---- m = regular ----
-\DeclareFontShape{LGR}{Junicode-TLF}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{n}{
- <-> alias * Junicode-TLF/x/n
+\DeclareFontShape{LGR}{Junicode-TLF}{regular}{n}{
+ <-> alias * Junicode-TLF/m/n
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{x}{sc}{
- <-> \Junicode@@scale Junicode-Exp-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{m}{scit}{
+ <-> \Junicode@@scale Junicode-Italic-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{sc}{
- <-> alias * Junicode-TLF/x/sc
+\DeclareFontShape{LGR}{Junicode-TLF}{regular}{scit}{
+ <-> alias * Junicode-TLF/m/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{it}{
- <-> alias * Junicode-TLF/x/it
+\DeclareFontShape{LGR}{Junicode-TLF}{regular}{it}{
+ <-> alias * Junicode-TLF/m/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{x}{scit}{
- <-> \Junicode@@scale Junicode-ExpItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{m}{sc}{
+ <-> \Junicode@@scale Junicode-Regular-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{scit}{
- <-> alias * Junicode-TLF/x/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{regular}{sc}{
+ <-> alias * Junicode-TLF/m/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{x}{scsl}{
- <-> ssub * Junicode-TLF/x/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{m}{sl}{
+ <-> ssub * Junicode-TLF/m/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{scsl}{
- <-> ssub * Junicode-TLF/expanded/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{regular}{sl}{
+ <-> ssub * Junicode-TLF/regular/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{x}{sl}{
- <-> ssub * Junicode-TLF/x/it
+\DeclareFontShape{LGR}{Junicode-TLF}{m}{scsl}{
+ <-> ssub * Junicode-TLF/m/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{sl}{
- <-> ssub * Junicode-TLF/expanded/it
+\DeclareFontShape{LGR}{Junicode-TLF}{regular}{scsl}{
+ <-> ssub * Junicode-TLF/regular/scit
}{}
-% ---- sc = semicondensed ----
+% ---- mediumsemiexpanded ----
-\DeclareFontShape{LGR}{Junicode-TLF}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{n}{
- <-> alias * Junicode-TLF/sc/n
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sc}{sc}{
- <-> \Junicode@@scale Junicode-SmCond-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{sc}{
- <-> alias * Junicode-TLF/sc/sc
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sc}{it}{
- <-> \Junicode@@scale Junicode-SmCondItalic-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-TLF/mediumsemiexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{it}{
- <-> alias * Junicode-TLF/sc/it
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/mediumsemiexpanded/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondItalic-tlf-sc-lgr
+
+% ---- medium ----
+
+\DeclareFontShape{LGR}{Junicode-TLF}{medium}{sc}{
+ <-> \Junicode@@scale Junicode-Medium-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{scit}{
- <-> alias * Junicode-TLF/sc/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{medium}{it}{
+ <-> \Junicode@@scale Junicode-MediumItalic-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sc}{scsl}{
- <-> ssub * Junicode-TLF/sc/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{medium}{scit}{
+ <-> \Junicode@@scale Junicode-MediumItalic-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{scsl}{
- <-> ssub * Junicode-TLF/semicondensed/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{medium}{n}{
+ <-> \Junicode@@scale Junicode-Medium-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sc}{sl}{
- <-> ssub * Junicode-TLF/sc/it
+\DeclareFontShape{LGR}{Junicode-TLF}{medium}{sl}{
+ <-> ssub * Junicode-TLF/medium/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{sl}{
- <-> ssub * Junicode-TLF/semicondensed/it
+\DeclareFontShape{LGR}{Junicode-TLF}{medium}{scsl}{
+ <-> ssub * Junicode-TLF/medium/scit
}{}
-% ---- sb = semibold ----
+% ---- bx = boldexpanded ----
-\DeclareFontShape{LGR}{Junicode-TLF}{sb}{scit}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{bx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpBold-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{scit}{
- <-> alias * Junicode-TLF/sb/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{sc}{
+ <-> alias * Junicode-TLF/bx/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{bx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{it}{
- <-> alias * Junicode-TLF/sb/it
+\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{scit}{
+ <-> alias * Junicode-TLF/bx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sb}{sc}{
- <-> \Junicode@@scale Junicode-SmBold-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{sc}{
- <-> alias * Junicode-TLF/sb/sc
+\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{n}{
+ <-> alias * Junicode-TLF/bx/n
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{n}{
- <-> alias * Junicode-TLF/sb/n
+\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{it}{
+ <-> alias * Junicode-TLF/bx/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sb}{scsl}{
- <-> ssub * Junicode-TLF/sb/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{bx}{sl}{
+ <-> ssub * Junicode-TLF/bx/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{scsl}{
- <-> ssub * Junicode-TLF/semibold/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{sl}{
+ <-> ssub * Junicode-TLF/boldexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sb}{sl}{
- <-> ssub * Junicode-TLF/sb/it
+\DeclareFontShape{LGR}{Junicode-TLF}{bx}{scsl}{
+ <-> ssub * Junicode-TLF/bx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{sl}{
- <-> ssub * Junicode-TLF/semibold/it
+\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/boldexpanded/scit
}{}
% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{LGR}{Junicode-TLF}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-tlf-lgr
-}{}
-
-\DeclareFontShape{LGR}{Junicode-TLF}{boldsemiexpanded}{n}{
- <-> alias * Junicode-TLF/bsx/n
-}{}
-
\DeclareFontShape{LGR}{Junicode-TLF}{bsx}{sc}{
<-> \Junicode@@scale Junicode-SmExpBold-tlf-sc-lgr
}{}
@@ -645,12 +664,12 @@
<-> alias * Junicode-TLF/bsx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{bsx}{scsl}{
- <-> ssub * Junicode-TLF/bsx/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{boldsemiexpanded}{scsl}{
- <-> ssub * Junicode-TLF/boldsemiexpanded/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-TLF/bsx/n
}{}
\DeclareFontShape{LGR}{Junicode-TLF}{bsx}{sl}{
@@ -661,211 +680,192 @@
<-> ssub * Junicode-TLF/boldsemiexpanded/it
}{}
-
-% ---- lc = lightcondensed ----
-
-\DeclareFontShape{LGR}{Junicode-TLF}{lc}{scit}{
- <-> \Junicode@@scale Junicode-CondLightItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{bsx}{scsl}{
+ <-> ssub * Junicode-TLF/bsx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{scit}{
- <-> alias * Junicode-TLF/lc/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{boldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/boldsemiexpanded/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-tlf-lgr
-}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{it}{
- <-> alias * Junicode-TLF/lc/it
-}{}
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{LGR}{Junicode-TLF}{lc}{sc}{
- <-> \Junicode@@scale Junicode-CondLight-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{sc}{
- <-> alias * Junicode-TLF/lc/sc
+\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{sc}{
+ <-> alias * Junicode-TLF/sbsx/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{n}{
- <-> alias * Junicode-TLF/lc/n
+\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-TLF/sbsx/n
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{lc}{scsl}{
- <-> ssub * Junicode-TLF/lc/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{scsl}{
- <-> ssub * Junicode-TLF/lightcondensed/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{scit}{
+ <-> alias * Junicode-TLF/sbsx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{lc}{sl}{
- <-> ssub * Junicode-TLF/lc/it
+\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{sl}{
- <-> ssub * Junicode-TLF/lightcondensed/it
+\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-TLF/sbsx/it
}{}
-
-% ---- sbx = semiboldexpanded ----
-
-\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{sl}{
+ <-> ssub * Junicode-TLF/sbsx/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{n}{
- <-> alias * Junicode-TLF/sbx/n
+\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-TLF/semiboldsemiexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{sc}{
- <-> \Junicode@@scale Junicode-ExpSmBold-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{scsl}{
+ <-> ssub * Junicode-TLF/sbsx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{sc}{
- <-> alias * Junicode-TLF/sbx/sc
+\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/semiboldsemiexpanded/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-lgr
-}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{it}{
- <-> alias * Junicode-TLF/sbx/it
-}{}
+% ---- sc = semicondensed ----
-\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{scit}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{sc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCond-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{scit}{
- <-> alias * Junicode-TLF/sbx/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{sc}{
+ <-> alias * Junicode-TLF/sc/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{scsl}{
- <-> ssub * Junicode-TLF/sbx/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{scsl}{
- <-> ssub * Junicode-TLF/semiboldexpanded/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{n}{
+ <-> alias * Junicode-TLF/sc/n
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{sl}{
- <-> ssub * Junicode-TLF/sbx/it
+\DeclareFontShape{LGR}{Junicode-TLF}{sc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-TLF/semiboldexpanded/it
+\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{scit}{
+ <-> alias * Junicode-TLF/sc/scit
}{}
-
-% ---- mediumsemicondensed ----
-
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{sc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{scit}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{it}{
+ <-> alias * Junicode-TLF/sc/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{sc}{sl}{
+ <-> ssub * Junicode-TLF/sc/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{sc}{
- <-> \Junicode@@scale Junicode-SmCondMedium-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{sl}{
+ <-> ssub * Junicode-TLF/semicondensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{scsl}{
- <-> ssub * Junicode-TLF/mediumsemicondensed/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{sc}{scsl}{
+ <-> ssub * Junicode-TLF/sc/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-TLF/mediumsemicondensed/it
+\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{scsl}{
+ <-> ssub * Junicode-TLF/semicondensed/scit
}{}
-% ---- mediumcondensed ----
+% ---- sb = semibold ----
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{sc}{
- <-> \Junicode@@scale Junicode-CondMedium-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{sb}{sc}{
+ <-> \Junicode@@scale Junicode-SmBold-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{sc}{
+ <-> alias * Junicode-TLF/sb/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{scit}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{sb}{scit}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{scit}{
+ <-> alias * Junicode-TLF/sb/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{scsl}{
- <-> ssub * Junicode-TLF/mediumcondensed/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{sl}{
- <-> ssub * Junicode-TLF/mediumcondensed/it
+\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{n}{
+ <-> alias * Junicode-TLF/sb/n
}{}
-
-% ---- b = bold ----
-
-\DeclareFontShape{LGR}{Junicode-TLF}{b}{scit}{
- <-> \Junicode@@scale Junicode-BoldItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{bold}{scit}{
- <-> alias * Junicode-TLF/b/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{it}{
+ <-> alias * Junicode-TLF/sb/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-tlf-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{sb}{sl}{
+ <-> ssub * Junicode-TLF/sb/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{bold}{it}{
- <-> alias * Junicode-TLF/b/it
+\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{sl}{
+ <-> ssub * Junicode-TLF/semibold/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{b}{sc}{
- <-> \Junicode@@scale Junicode-Bold-tlf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TLF}{sb}{scsl}{
+ <-> ssub * Junicode-TLF/sb/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{bold}{sc}{
- <-> alias * Junicode-TLF/b/sc
+\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{scsl}{
+ <-> ssub * Junicode-TLF/semibold/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-tlf-lgr
+
+% ---- mediumcondensed ----
+
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{bold}{n}{
- <-> alias * Junicode-TLF/b/n
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{scit}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{b}{scsl}{
- <-> ssub * Junicode-TLF/b/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{bold}{scsl}{
- <-> ssub * Junicode-TLF/bold/scit
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{sc}{
+ <-> \Junicode@@scale Junicode-CondMedium-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{b}{sl}{
- <-> ssub * Junicode-TLF/b/it
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-TLF/mediumcondensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-TLF}{bold}{sl}{
- <-> ssub * Junicode-TLF/bold/it
+\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{scsl}{
+ <-> ssub * Junicode-TLF/mediumcondensed/scit
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-TOsF.fd b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-TOsF.fd
index 79de53f63f9..b402baf7106 100644
--- a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{LGRJunicode-TOsF.fd}
- [2024/06/03 (autoinst) Font definitions for LGR/Junicode-TOsF.]
+ [2024/07/21 (autoinst) Font definitions for LGR/Junicode-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -30,14 +30,6 @@
<-> alias * Junicode-TOsF/l/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-tosf-lgr
-}{}
-
-\DeclareFontShape{LGR}{Junicode-TOsF}{light}{n}{
- <-> alias * Junicode-TOsF/l/n
-}{}
-
\DeclareFontShape{LGR}{Junicode-TOsF}{l}{scit}{
<-> \Junicode@@scale Junicode-LightItalic-tosf-sc-lgr
}{}
@@ -46,20 +38,20 @@
<-> alias * Junicode-TOsF/l/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{light}{it}{
- <-> alias * Junicode-TOsF/l/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{light}{n}{
+ <-> alias * Junicode-TOsF/l/n
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{l}{scsl}{
- <-> ssub * Junicode-TOsF/l/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{light}{scsl}{
- <-> ssub * Junicode-TOsF/light/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{light}{it}{
+ <-> alias * Junicode-TOsF/l/it
}{}
\DeclareFontShape{LGR}{Junicode-TOsF}{l}{sl}{
@@ -70,350 +62,302 @@
<-> ssub * Junicode-TOsF/light/it
}{}
-
-% ---- bx = boldexpanded ----
-
-\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{scit}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{l}{scsl}{
+ <-> ssub * Junicode-TOsF/l/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{scit}{
- <-> alias * Junicode-TOsF/bx/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{light}{scsl}{
+ <-> ssub * Junicode-TOsF/light/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-lgr
-}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{it}{
- <-> alias * Junicode-TOsF/bx/it
-}{}
+% ---- sx = semiexpanded ----
-\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{sc}{
- <-> \Junicode@@scale Junicode-ExpBold-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{sc}{
- <-> alias * Junicode-TOsF/bx/sc
+\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{scit}{
+ <-> alias * Junicode-TOsF/sx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{n}{
- <-> alias * Junicode-TOsF/bx/n
+\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{n}{
+ <-> alias * Junicode-TOsF/sx/n
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{scsl}{
- <-> ssub * Junicode-TOsF/bx/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/boldexpanded/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{it}{
+ <-> alias * Junicode-TOsF/sx/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{sl}{
- <-> ssub * Junicode-TOsF/bx/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExp-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{sl}{
- <-> ssub * Junicode-TOsF/boldexpanded/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{sc}{
+ <-> alias * Junicode-TOsF/sx/sc
}{}
-
-% ---- m = regular ----
-
-\DeclareFontShape{LGR}{Junicode-TOsF}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{sl}{
+ <-> ssub * Junicode-TOsF/sx/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{n}{
- <-> alias * Junicode-TOsF/m/n
+\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/semiexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{m}{sc}{
- <-> \Junicode@@scale Junicode-Regular-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{scsl}{
+ <-> ssub * Junicode-TOsF/sx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{sc}{
- <-> alias * Junicode-TOsF/m/sc
+\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/semiexpanded/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-tosf-lgr
-}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{it}{
- <-> alias * Junicode-TOsF/m/it
-}{}
+% ---- mediumsemicondensed ----
-\DeclareFontShape{LGR}{Junicode-TOsF}{m}{scit}{
- <-> \Junicode@@scale Junicode-Italic-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{scit}{
- <-> alias * Junicode-TOsF/m/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{m}{scsl}{
- <-> ssub * Junicode-TOsF/m/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{scsl}{
- <-> ssub * Junicode-TOsF/regular/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{m}{sl}{
- <-> ssub * Junicode-TOsF/m/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-TOsF/mediumsemicondensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{sl}{
- <-> ssub * Junicode-TOsF/regular/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{scsl}{
+ <-> ssub * Junicode-TOsF/mediumsemicondensed/scit
}{}
-% ---- lsc = lightsemicondensed ----
+% ---- lc = lightcondensed ----
-\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{sc}{
- <-> \Junicode@@scale Junicode-SmCondLight-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{sc}{
+ <-> \Junicode@@scale Junicode-CondLight-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{sc}{
- <-> alias * Junicode-TOsF/lsc/sc
+\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{sc}{
+ <-> alias * Junicode-TOsF/lc/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{n}{
- <-> alias * Junicode-TOsF/lsc/n
+\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{n}{
+ <-> alias * Junicode-TOsF/lc/n
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{scit}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{scit}{
- <-> alias * Junicode-TOsF/lsc/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{scit}{
+ <-> alias * Junicode-TOsF/lc/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{it}{
- <-> alias * Junicode-TOsF/lsc/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{it}{
+ <-> alias * Junicode-TOsF/lc/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{scsl}{
- <-> ssub * Junicode-TOsF/lsc/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{sl}{
+ <-> ssub * Junicode-TOsF/lc/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{scsl}{
- <-> ssub * Junicode-TOsF/lightsemicondensed/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{sl}{
+ <-> ssub * Junicode-TOsF/lightcondensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{sl}{
- <-> ssub * Junicode-TOsF/lsc/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{scsl}{
+ <-> ssub * Junicode-TOsF/lc/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-TOsF/lightsemicondensed/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{scsl}{
+ <-> ssub * Junicode-TOsF/lightcondensed/scit
}{}
% ---- medium ----
-\DeclareFontShape{LGR}{Junicode-TOsF}{medium}{n}{
- <-> \Junicode@@scale Junicode-Medium-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{medium}{scit}{
+ <-> \Junicode@@scale Junicode-MediumItalic-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{medium}{sc}{
- <-> \Junicode@@scale Junicode-Medium-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{medium}{n}{
+ <-> \Junicode@@scale Junicode-Medium-tosf-lgr
}{}
\DeclareFontShape{LGR}{Junicode-TOsF}{medium}{it}{
<-> \Junicode@@scale Junicode-MediumItalic-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{medium}{scit}{
- <-> \Junicode@@scale Junicode-MediumItalic-tosf-sc-lgr
-}{}
-
-\DeclareFontShape{LGR}{Junicode-TOsF}{medium}{scsl}{
- <-> ssub * Junicode-TOsF/medium/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{medium}{sc}{
+ <-> \Junicode@@scale Junicode-Medium-tosf-sc-lgr
}{}
\DeclareFontShape{LGR}{Junicode-TOsF}{medium}{sl}{
<-> ssub * Junicode-TOsF/medium/it
}{}
-
-% ---- sx = semiexpanded ----
-
-\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{medium}{scsl}{
+ <-> ssub * Junicode-TOsF/medium/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{n}{
- <-> alias * Junicode-TOsF/sx/n
-}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{sc}{
- <-> \Junicode@@scale Junicode-SmExp-tosf-sc-lgr
-}{}
+% ---- bx = boldexpanded ----
-\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{sc}{
- <-> alias * Junicode-TOsF/sx/sc
+\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpBold-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{sc}{
+ <-> alias * Junicode-TOsF/bx/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{it}{
- <-> alias * Junicode-TOsF/sx/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{it}{
+ <-> alias * Junicode-TOsF/bx/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{scit}{
- <-> alias * Junicode-TOsF/sx/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{scsl}{
- <-> ssub * Junicode-TOsF/sx/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{scit}{
+ <-> alias * Junicode-TOsF/bx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/semiexpanded/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{sl}{
- <-> ssub * Junicode-TOsF/sx/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{n}{
+ <-> alias * Junicode-TOsF/bx/n
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{sl}{
- <-> ssub * Junicode-TOsF/semiexpanded/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{sl}{
+ <-> ssub * Junicode-TOsF/bx/it
}{}
-
-% ---- x = expanded ----
-
-\DeclareFontShape{LGR}{Junicode-TOsF}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/boldexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{it}{
- <-> alias * Junicode-TOsF/x/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{scsl}{
+ <-> ssub * Junicode-TOsF/bx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{x}{scit}{
- <-> \Junicode@@scale Junicode-ExpItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/boldexpanded/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{scit}{
- <-> alias * Junicode-TOsF/x/scit
-}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-tosf-lgr
-}{}
+% ---- m = regular ----
-\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{n}{
- <-> alias * Junicode-TOsF/x/n
+\DeclareFontShape{LGR}{Junicode-TOsF}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{x}{sc}{
- <-> \Junicode@@scale Junicode-Exp-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{n}{
+ <-> alias * Junicode-TOsF/m/n
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{sc}{
- <-> alias * Junicode-TOsF/x/sc
+\DeclareFontShape{LGR}{Junicode-TOsF}{m}{scit}{
+ <-> \Junicode@@scale Junicode-Italic-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{x}{scsl}{
- <-> ssub * Junicode-TOsF/x/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{scit}{
+ <-> alias * Junicode-TOsF/m/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{scsl}{
- <-> ssub * Junicode-TOsF/expanded/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{x}{sl}{
- <-> ssub * Junicode-TOsF/x/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{it}{
+ <-> alias * Junicode-TOsF/m/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{sl}{
- <-> ssub * Junicode-TOsF/expanded/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{m}{sc}{
+ <-> \Junicode@@scale Junicode-Regular-tosf-sc-lgr
}{}
-
-% ---- c = condensed ----
-
-\DeclareFontShape{LGR}{Junicode-TOsF}{c}{sc}{
- <-> \Junicode@@scale Junicode-Cond-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{sc}{
+ <-> alias * Junicode-TOsF/m/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{sc}{
- <-> alias * Junicode-TOsF/c/sc
+\DeclareFontShape{LGR}{Junicode-TOsF}{m}{sl}{
+ <-> ssub * Junicode-TOsF/m/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{sl}{
+ <-> ssub * Junicode-TOsF/regular/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{n}{
- <-> alias * Junicode-TOsF/c/n
+\DeclareFontShape{LGR}{Junicode-TOsF}{m}{scsl}{
+ <-> ssub * Junicode-TOsF/m/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{c}{scit}{
- <-> \Junicode@@scale Junicode-CondItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{scsl}{
+ <-> ssub * Junicode-TOsF/regular/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{scit}{
- <-> alias * Junicode-TOsF/c/scit
-}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-tosf-lgr
+% ---- mediumsemiexpanded ----
+
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{it}{
- <-> alias * Junicode-TOsF/c/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{c}{scsl}{
- <-> ssub * Junicode-TOsF/c/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{scsl}{
- <-> ssub * Junicode-TOsF/condensed/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{c}{sl}{
- <-> ssub * Junicode-TOsF/c/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/mediumsemiexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{sl}{
- <-> ssub * Junicode-TOsF/condensed/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/mediumsemiexpanded/scit
}{}
% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{LGR}{Junicode-TOsF}{sbsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-sc-lgr
-}{}
-
-\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldsemiexpanded}{sc}{
- <-> alias * Junicode-TOsF/sbsx/sc
-}{}
-
\DeclareFontShape{LGR}{Junicode-TOsF}{sbsx}{n}{
<-> \Junicode@@scale Junicode-SmExpSmBold-tosf-lgr
}{}
@@ -438,12 +382,12 @@
<-> alias * Junicode-TOsF/sbsx/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{sbsx}{scsl}{
- <-> ssub * Junicode-TOsF/sbsx/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{sbsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldsemiexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/semiboldsemiexpanded/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldsemiexpanded}{sc}{
+ <-> alias * Junicode-TOsF/sbsx/sc
}{}
\DeclareFontShape{LGR}{Junicode-TOsF}{sbsx}{sl}{
@@ -454,345 +398,385 @@
<-> ssub * Junicode-TOsF/semiboldsemiexpanded/it
}{}
-
-% ---- mediumexpanded ----
-
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{scit}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{sbsx}{scsl}{
+ <-> ssub * Junicode-TOsF/sbsx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/semiboldsemiexpanded/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{sc}{
- <-> \Junicode@@scale Junicode-ExpMedium-tosf-sc-lgr
+
+% ---- bsx = boldsemiexpanded ----
+
+\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpBold-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{sc}{
+ <-> alias * Junicode-TOsF/bsx/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/mediumexpanded/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{sl}{
- <-> ssub * Junicode-TOsF/mediumexpanded/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-TOsF/bsx/n
}{}
+\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-sc-lgr
+}{}
-% ---- mediumsemiexpanded ----
+\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{scit}{
+ <-> alias * Junicode-TOsF/bsx/scit
+}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{sc}{
- <-> \Junicode@@scale Junicode-SmExpMedium-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-TOsF/bsx/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{sl}{
+ <-> ssub * Junicode-TOsF/bsx/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{scit}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/boldsemiexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/mediumsemiexpanded/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{scsl}{
+ <-> ssub * Junicode-TOsF/bsx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-TOsF/mediumsemiexpanded/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/boldsemiexpanded/scit
}{}
-% ---- mediumsemicondensed ----
+% ---- sc = semicondensed ----
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{scit}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCond-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{sc}{
+ <-> alias * Junicode-TOsF/sc/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{sc}{
- <-> \Junicode@@scale Junicode-SmCondMedium-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{n}{
+ <-> alias * Junicode-TOsF/sc/n
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{scsl}{
- <-> ssub * Junicode-TOsF/mediumsemicondensed/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-TOsF/mediumsemicondensed/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{scit}{
+ <-> alias * Junicode-TOsF/sc/scit
}{}
-
-% ---- sbx = semiboldexpanded ----
-
-\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{n}{
- <-> alias * Junicode-TOsF/sbx/n
+\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{it}{
+ <-> alias * Junicode-TOsF/sc/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{sc}{
- <-> \Junicode@@scale Junicode-ExpSmBold-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{sl}{
+ <-> ssub * Junicode-TOsF/sc/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{sc}{
- <-> alias * Junicode-TOsF/sbx/sc
+\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{sl}{
+ <-> ssub * Junicode-TOsF/semicondensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{scsl}{
+ <-> ssub * Junicode-TOsF/sc/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{it}{
- <-> alias * Junicode-TOsF/sbx/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{scsl}{
+ <-> ssub * Junicode-TOsF/semicondensed/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{scit}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-sc-lgr
+
+% ---- mediumcondensed ----
+
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{sc}{
+ <-> \Junicode@@scale Junicode-CondMedium-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{scit}{
- <-> alias * Junicode-TOsF/sbx/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{scit}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{scsl}{
- <-> ssub * Junicode-TOsF/sbx/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/semiboldexpanded/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{sl}{
- <-> ssub * Junicode-TOsF/sbx/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-TOsF/mediumcondensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-TOsF/semiboldexpanded/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{scsl}{
+ <-> ssub * Junicode-TOsF/mediumcondensed/scit
}{}
-% ---- bsx = boldsemiexpanded ----
+% ---- sb = semibold ----
-\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpBold-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{sc}{
- <-> alias * Junicode-TOsF/bsx/sc
+\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{it}{
+ <-> alias * Junicode-TOsF/sb/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{n}{
- <-> alias * Junicode-TOsF/bsx/n
+\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{n}{
+ <-> alias * Junicode-TOsF/sb/n
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{scit}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{scit}{
- <-> alias * Junicode-TOsF/bsx/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{scit}{
+ <-> alias * Junicode-TOsF/sb/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{sc}{
+ <-> \Junicode@@scale Junicode-SmBold-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{it}{
- <-> alias * Junicode-TOsF/bsx/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{sc}{
+ <-> alias * Junicode-TOsF/sb/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{scsl}{
- <-> ssub * Junicode-TOsF/bsx/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{sl}{
+ <-> ssub * Junicode-TOsF/sb/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/boldsemiexpanded/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{sl}{
+ <-> ssub * Junicode-TOsF/semibold/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{sl}{
- <-> ssub * Junicode-TOsF/bsx/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{scsl}{
+ <-> ssub * Junicode-TOsF/sb/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-TOsF/boldsemiexpanded/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{scsl}{
+ <-> ssub * Junicode-TOsF/semibold/scit
}{}
-% ---- lc = lightcondensed ----
+% ---- sbx = semiboldexpanded ----
-\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{n}{
- <-> alias * Junicode-TOsF/lc/n
+\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{sc}{
+ <-> alias * Junicode-TOsF/sbx/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{sc}{
- <-> \Junicode@@scale Junicode-CondLight-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{sc}{
- <-> alias * Junicode-TOsF/lc/sc
+\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{scit}{
+ <-> alias * Junicode-TOsF/sbx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{it}{
- <-> alias * Junicode-TOsF/lc/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{n}{
+ <-> alias * Junicode-TOsF/sbx/n
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{scit}{
- <-> \Junicode@@scale Junicode-CondLightItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{scit}{
- <-> alias * Junicode-TOsF/lc/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{it}{
+ <-> alias * Junicode-TOsF/sbx/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{scsl}{
- <-> ssub * Junicode-TOsF/lc/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{sl}{
+ <-> ssub * Junicode-TOsF/sbx/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{scsl}{
- <-> ssub * Junicode-TOsF/lightcondensed/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/semiboldexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{sl}{
- <-> ssub * Junicode-TOsF/lc/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{scsl}{
+ <-> ssub * Junicode-TOsF/sbx/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{sl}{
- <-> ssub * Junicode-TOsF/lightcondensed/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/semiboldexpanded/scit
}{}
-% ---- sc = semicondensed ----
+% ---- c = condensed ----
-\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{scit}{
- <-> alias * Junicode-TOsF/sc/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{it}{
+ <-> alias * Junicode-TOsF/c/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{it}{
- <-> \Junicode@@scale Junicode-SmCondItalic-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{c}{scit}{
+ <-> \Junicode@@scale Junicode-CondItalic-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{it}{
- <-> alias * Junicode-TOsF/sc/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{scit}{
+ <-> alias * Junicode-TOsF/c/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{sc}{
- <-> \Junicode@@scale Junicode-SmCond-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{sc}{
- <-> alias * Junicode-TOsF/sc/sc
+\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{n}{
+ <-> alias * Junicode-TOsF/c/n
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{c}{sc}{
+ <-> \Junicode@@scale Junicode-Cond-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{n}{
- <-> alias * Junicode-TOsF/sc/n
+\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{sc}{
+ <-> alias * Junicode-TOsF/c/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{scsl}{
- <-> ssub * Junicode-TOsF/sc/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{c}{sl}{
+ <-> ssub * Junicode-TOsF/c/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{scsl}{
- <-> ssub * Junicode-TOsF/semicondensed/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{sl}{
+ <-> ssub * Junicode-TOsF/condensed/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{sl}{
- <-> ssub * Junicode-TOsF/sc/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{c}{scsl}{
+ <-> ssub * Junicode-TOsF/c/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{sl}{
- <-> ssub * Junicode-TOsF/semicondensed/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{scsl}{
+ <-> ssub * Junicode-TOsF/condensed/scit
}{}
-% ---- sb = semibold ----
+% ---- mediumexpanded ----
-\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{n}{
- <-> alias * Junicode-TOsF/sb/n
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{sc}{
- <-> \Junicode@@scale Junicode-SmBold-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{sc}{
- <-> alias * Junicode-TOsF/sb/sc
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-ExpMedium-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/mediumexpanded/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{it}{
- <-> alias * Junicode-TOsF/sb/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/mediumexpanded/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{scit}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-sc-lgr
+
+% ---- lsc = lightsemicondensed ----
+
+\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{scit}{
- <-> alias * Junicode-TOsF/sb/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{n}{
+ <-> alias * Junicode-TOsF/lsc/n
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{scsl}{
- <-> ssub * Junicode-TOsF/sb/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{scsl}{
- <-> ssub * Junicode-TOsF/semibold/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{scit}{
+ <-> alias * Junicode-TOsF/lsc/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{sl}{
- <-> ssub * Junicode-TOsF/sb/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{sl}{
- <-> ssub * Junicode-TOsF/semibold/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{it}{
+ <-> alias * Junicode-TOsF/lsc/it
+}{}
+
+\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondLight-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{sc}{
+ <-> alias * Junicode-TOsF/lsc/sc
+}{}
+
+\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{sl}{
+ <-> ssub * Junicode-TOsF/lsc/it
+}{}
+
+\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-TOsF/lightsemicondensed/it
+}{}
+
+\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{scsl}{
+ <-> ssub * Junicode-TOsF/lsc/scit
+}{}
+
+\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{scsl}{
+ <-> ssub * Junicode-TOsF/lightsemicondensed/scit
}{}
% ---- b = bold ----
+\DeclareFontShape{LGR}{Junicode-TOsF}{b}{sc}{
+ <-> \Junicode@@scale Junicode-Bold-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{Junicode-TOsF}{bold}{sc}{
+ <-> alias * Junicode-TOsF/b/sc
+}{}
+
\DeclareFontShape{LGR}{Junicode-TOsF}{b}{it}{
<-> \Junicode@@scale Junicode-BoldItalic-tosf-lgr
}{}
@@ -817,12 +801,12 @@
<-> alias * Junicode-TOsF/b/n
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{b}{sc}{
- <-> \Junicode@@scale Junicode-Bold-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{b}{sl}{
+ <-> ssub * Junicode-TOsF/b/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{bold}{sc}{
- <-> alias * Junicode-TOsF/b/sc
+\DeclareFontShape{LGR}{Junicode-TOsF}{bold}{sl}{
+ <-> ssub * Junicode-TOsF/bold/it
}{}
\DeclareFontShape{LGR}{Junicode-TOsF}{b}{scsl}{
@@ -833,39 +817,55 @@
<-> ssub * Junicode-TOsF/bold/scit
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{b}{sl}{
- <-> ssub * Junicode-TOsF/b/it
+
+% ---- x = expanded ----
+
+\DeclareFontShape{LGR}{Junicode-TOsF}{x}{scit}{
+ <-> \Junicode@@scale Junicode-ExpItalic-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{bold}{sl}{
- <-> ssub * Junicode-TOsF/bold/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{scit}{
+ <-> alias * Junicode-TOsF/x/scit
}{}
+\DeclareFontShape{LGR}{Junicode-TOsF}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-tosf-lgr
+}{}
-% ---- mediumcondensed ----
+\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{n}{
+ <-> alias * Junicode-TOsF/x/n
+}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{scit}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-tosf-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{it}{
+ <-> alias * Junicode-TOsF/x/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{sc}{
- <-> \Junicode@@scale Junicode-CondMedium-tosf-sc-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{x}{sc}{
+ <-> \Junicode@@scale Junicode-Exp-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-tosf-lgr
+\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{sc}{
+ <-> alias * Junicode-TOsF/x/sc
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{scsl}{
- <-> ssub * Junicode-TOsF/mediumcondensed/scit
+\DeclareFontShape{LGR}{Junicode-TOsF}{x}{sl}{
+ <-> ssub * Junicode-TOsF/x/it
}{}
-\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{sl}{
- <-> ssub * Junicode-TOsF/mediumcondensed/it
+\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{sl}{
+ <-> ssub * Junicode-TOsF/expanded/it
+}{}
+
+\DeclareFontShape{LGR}{Junicode-TOsF}{x}{scsl}{
+ <-> ssub * Junicode-TOsF/x/scit
+}{}
+
+\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{scsl}{
+ <-> ssub * Junicode-TOsF/expanded/scit
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-Inf.fd b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-Inf.fd
index ba4320e2d53..b442772ef0e 100644
--- a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-Inf.fd
+++ b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{LY1Junicode-Inf.fd}
- [2024/06/03 (autoinst) Font definitions for LY1/Junicode-Inf.]
+ [2024/07/21 (autoinst) Font definitions for LY1/Junicode-Inf.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,72 +20,57 @@
\DeclareFontFamily{LY1}{Junicode-Inf}{}
-% ---- mediumcondensed ----
-
-\DeclareFontShape{LY1}{Junicode-Inf}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-inf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Junicode-Inf}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-inf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Junicode-Inf}{mediumcondensed}{sl}{
- <-> ssub * Junicode-Inf/mediumcondensed/it
-}{}
-
-
-% ---- b = bold ----
+% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{LY1}{Junicode-Inf}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{bold}{n}{
- <-> alias * Junicode-Inf/b/n
+\DeclareFontShape{LY1}{Junicode-Inf}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-Inf/bsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{bold}{it}{
- <-> alias * Junicode-Inf/b/it
+\DeclareFontShape{LY1}{Junicode-Inf}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-Inf/bsx/n
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{b}{sl}{
- <-> ssub * Junicode-Inf/b/it
+\DeclareFontShape{LY1}{Junicode-Inf}{bsx}{sl}{
+ <-> ssub * Junicode-Inf/bsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{bold}{sl}{
- <-> ssub * Junicode-Inf/bold/it
+\DeclareFontShape{LY1}{Junicode-Inf}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-Inf/boldsemiexpanded/it
}{}
-% ---- sb = semibold ----
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{LY1}{Junicode-Inf}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{semibold}{it}{
- <-> alias * Junicode-Inf/sb/it
+\DeclareFontShape{LY1}{Junicode-Inf}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-Inf/sbsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{semibold}{n}{
- <-> alias * Junicode-Inf/sb/n
+\DeclareFontShape{LY1}{Junicode-Inf}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-Inf/sbsx/n
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{sb}{sl}{
- <-> ssub * Junicode-Inf/sb/it
+\DeclareFontShape{LY1}{Junicode-Inf}{sbsx}{sl}{
+ <-> ssub * Junicode-Inf/sbsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{semibold}{sl}{
- <-> ssub * Junicode-Inf/semibold/it
+\DeclareFontShape{LY1}{Junicode-Inf}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-Inf/semiboldsemiexpanded/it
}{}
@@ -116,84 +101,99 @@
}{}
-% ---- lc = lightcondensed ----
+% ---- mediumcondensed ----
-\DeclareFontShape{LY1}{Junicode-Inf}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{lightcondensed}{n}{
- <-> alias * Junicode-Inf/lc/n
+\DeclareFontShape{LY1}{Junicode-Inf}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-Inf/mediumcondensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{lightcondensed}{it}{
- <-> alias * Junicode-Inf/lc/it
+
+% ---- sb = semibold ----
+
+\DeclareFontShape{LY1}{Junicode-Inf}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{lc}{sl}{
- <-> ssub * Junicode-Inf/lc/it
+\DeclareFontShape{LY1}{Junicode-Inf}{semibold}{it}{
+ <-> alias * Junicode-Inf/sb/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{lightcondensed}{sl}{
- <-> ssub * Junicode-Inf/lightcondensed/it
+\DeclareFontShape{LY1}{Junicode-Inf}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-inf-ly1
}{}
+\DeclareFontShape{LY1}{Junicode-Inf}{semibold}{n}{
+ <-> alias * Junicode-Inf/sb/n
+}{}
-% ---- bsx = boldsemiexpanded ----
+\DeclareFontShape{LY1}{Junicode-Inf}{sb}{sl}{
+ <-> ssub * Junicode-Inf/sb/it
+}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{semibold}{sl}{
+ <-> ssub * Junicode-Inf/semibold/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{boldsemiexpanded}{it}{
- <-> alias * Junicode-Inf/bsx/it
+
+% ---- l = light ----
+
+\DeclareFontShape{LY1}{Junicode-Inf}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{light}{n}{
+ <-> alias * Junicode-Inf/l/n
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{boldsemiexpanded}{n}{
- <-> alias * Junicode-Inf/bsx/n
+\DeclareFontShape{LY1}{Junicode-Inf}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{bsx}{sl}{
- <-> ssub * Junicode-Inf/bsx/it
+\DeclareFontShape{LY1}{Junicode-Inf}{light}{it}{
+ <-> alias * Junicode-Inf/l/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-Inf/boldsemiexpanded/it
+\DeclareFontShape{LY1}{Junicode-Inf}{l}{sl}{
+ <-> ssub * Junicode-Inf/l/it
}{}
+\DeclareFontShape{LY1}{Junicode-Inf}{light}{sl}{
+ <-> ssub * Junicode-Inf/light/it
+}{}
-% ---- sbx = semiboldexpanded ----
-\DeclareFontShape{LY1}{Junicode-Inf}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-inf-ly1
+% ---- sx = semiexpanded ----
+
+\DeclareFontShape{LY1}{Junicode-Inf}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{semiboldexpanded}{it}{
- <-> alias * Junicode-Inf/sbx/it
+\DeclareFontShape{LY1}{Junicode-Inf}{semiexpanded}{n}{
+ <-> alias * Junicode-Inf/sx/n
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{semiboldexpanded}{n}{
- <-> alias * Junicode-Inf/sbx/n
+\DeclareFontShape{LY1}{Junicode-Inf}{semiexpanded}{it}{
+ <-> alias * Junicode-Inf/sx/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{sbx}{sl}{
- <-> ssub * Junicode-Inf/sbx/it
+\DeclareFontShape{LY1}{Junicode-Inf}{sx}{sl}{
+ <-> ssub * Junicode-Inf/sx/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-Inf/semiboldexpanded/it
+\DeclareFontShape{LY1}{Junicode-Inf}{semiexpanded}{sl}{
+ <-> ssub * Junicode-Inf/semiexpanded/it
}{}
@@ -212,154 +212,134 @@
}{}
-% ---- mediumsemiexpanded ----
-
-\DeclareFontShape{LY1}{Junicode-Inf}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-inf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Junicode-Inf}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-inf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Junicode-Inf}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-Inf/mediumsemiexpanded/it
-}{}
-
-
-% ---- sbsx = semiboldsemiexpanded ----
+% ---- lc = lightcondensed ----
-\DeclareFontShape{LY1}{Junicode-Inf}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-Inf/sbsx/it
+\DeclareFontShape{LY1}{Junicode-Inf}{lightcondensed}{it}{
+ <-> alias * Junicode-Inf/lc/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-Inf/sbsx/n
+\DeclareFontShape{LY1}{Junicode-Inf}{lightcondensed}{n}{
+ <-> alias * Junicode-Inf/lc/n
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{sbsx}{sl}{
- <-> ssub * Junicode-Inf/sbsx/it
+\DeclareFontShape{LY1}{Junicode-Inf}{lc}{sl}{
+ <-> ssub * Junicode-Inf/lc/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-Inf/semiboldsemiexpanded/it
+\DeclareFontShape{LY1}{Junicode-Inf}{lightcondensed}{sl}{
+ <-> ssub * Junicode-Inf/lightcondensed/it
}{}
-% ---- mediumexpanded ----
+% ---- medium ----
-\DeclareFontShape{LY1}{Junicode-Inf}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{medium}{it}{
+ <-> \Junicode@@scale Junicode-MediumItalic-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{medium}{n}{
+ <-> \Junicode@@scale Junicode-Medium-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{mediumexpanded}{sl}{
- <-> ssub * Junicode-Inf/mediumexpanded/it
+\DeclareFontShape{LY1}{Junicode-Inf}{medium}{sl}{
+ <-> ssub * Junicode-Inf/medium/it
}{}
-% ---- sx = semiexpanded ----
+% ---- bx = boldexpanded ----
-\DeclareFontShape{LY1}{Junicode-Inf}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{semiexpanded}{n}{
- <-> alias * Junicode-Inf/sx/n
+\DeclareFontShape{LY1}{Junicode-Inf}{boldexpanded}{n}{
+ <-> alias * Junicode-Inf/bx/n
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{semiexpanded}{it}{
- <-> alias * Junicode-Inf/sx/it
+\DeclareFontShape{LY1}{Junicode-Inf}{boldexpanded}{it}{
+ <-> alias * Junicode-Inf/bx/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{sx}{sl}{
- <-> ssub * Junicode-Inf/sx/it
+\DeclareFontShape{LY1}{Junicode-Inf}{bx}{sl}{
+ <-> ssub * Junicode-Inf/bx/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{semiexpanded}{sl}{
- <-> ssub * Junicode-Inf/semiexpanded/it
+\DeclareFontShape{LY1}{Junicode-Inf}{boldexpanded}{sl}{
+ <-> ssub * Junicode-Inf/boldexpanded/it
}{}
-% ---- x = expanded ----
+% ---- m = regular ----
-\DeclareFontShape{LY1}{Junicode-Inf}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{expanded}{it}{
- <-> alias * Junicode-Inf/x/it
+\DeclareFontShape{LY1}{Junicode-Inf}{regular}{n}{
+ <-> alias * Junicode-Inf/m/n
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{expanded}{n}{
- <-> alias * Junicode-Inf/x/n
+\DeclareFontShape{LY1}{Junicode-Inf}{regular}{it}{
+ <-> alias * Junicode-Inf/m/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{x}{sl}{
- <-> ssub * Junicode-Inf/x/it
+\DeclareFontShape{LY1}{Junicode-Inf}{m}{sl}{
+ <-> ssub * Junicode-Inf/m/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{expanded}{sl}{
- <-> ssub * Junicode-Inf/expanded/it
+\DeclareFontShape{LY1}{Junicode-Inf}{regular}{sl}{
+ <-> ssub * Junicode-Inf/regular/it
}{}
-% ---- c = condensed ----
+% ---- mediumsemiexpanded ----
-\DeclareFontShape{LY1}{Junicode-Inf}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{condensed}{it}{
- <-> alias * Junicode-Inf/c/it
+\DeclareFontShape{LY1}{Junicode-Inf}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-Inf/mediumsemiexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{condensed}{n}{
- <-> alias * Junicode-Inf/c/n
+
+% ---- mediumexpanded ----
+
+\DeclareFontShape{LY1}{Junicode-Inf}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{c}{sl}{
- <-> ssub * Junicode-Inf/c/it
+\DeclareFontShape{LY1}{Junicode-Inf}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{condensed}{sl}{
- <-> ssub * Junicode-Inf/condensed/it
+\DeclareFontShape{LY1}{Junicode-Inf}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-Inf/mediumexpanded/it
}{}
% ---- lsc = lightsemicondensed ----
-\DeclareFontShape{LY1}{Junicode-Inf}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-inf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Junicode-Inf}{lightsemicondensed}{it}{
- <-> alias * Junicode-Inf/lsc/it
-}{}
-
\DeclareFontShape{LY1}{Junicode-Inf}{lsc}{n}{
<-> \Junicode@@scale Junicode-SmCondLight-inf-ly1
}{}
@@ -368,6 +348,14 @@
<-> alias * Junicode-Inf/lsc/n
}{}
+\DeclareFontShape{LY1}{Junicode-Inf}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Junicode-Inf}{lightsemicondensed}{it}{
+ <-> alias * Junicode-Inf/lsc/it
+}{}
+
\DeclareFontShape{LY1}{Junicode-Inf}{lsc}{sl}{
<-> ssub * Junicode-Inf/lsc/it
}{}
@@ -377,99 +365,111 @@
}{}
-% ---- medium ----
+% ---- b = bold ----
-\DeclareFontShape{LY1}{Junicode-Inf}{medium}{n}{
- <-> \Junicode@@scale Junicode-Medium-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{medium}{it}{
- <-> \Junicode@@scale Junicode-MediumItalic-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{bold}{n}{
+ <-> alias * Junicode-Inf/b/n
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{medium}{sl}{
- <-> ssub * Junicode-Inf/medium/it
+\DeclareFontShape{LY1}{Junicode-Inf}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-inf-ly1
}{}
+\DeclareFontShape{LY1}{Junicode-Inf}{bold}{it}{
+ <-> alias * Junicode-Inf/b/it
+}{}
-% ---- m = regular ----
+\DeclareFontShape{LY1}{Junicode-Inf}{b}{sl}{
+ <-> ssub * Junicode-Inf/b/it
+}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{bold}{sl}{
+ <-> ssub * Junicode-Inf/bold/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{regular}{n}{
- <-> alias * Junicode-Inf/m/n
+
+% ---- x = expanded ----
+
+\DeclareFontShape{LY1}{Junicode-Inf}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{expanded}{it}{
+ <-> alias * Junicode-Inf/x/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{regular}{it}{
- <-> alias * Junicode-Inf/m/it
+\DeclareFontShape{LY1}{Junicode-Inf}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{m}{sl}{
- <-> ssub * Junicode-Inf/m/it
+\DeclareFontShape{LY1}{Junicode-Inf}{expanded}{n}{
+ <-> alias * Junicode-Inf/x/n
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{regular}{sl}{
- <-> ssub * Junicode-Inf/regular/it
+\DeclareFontShape{LY1}{Junicode-Inf}{x}{sl}{
+ <-> ssub * Junicode-Inf/x/it
}{}
+\DeclareFontShape{LY1}{Junicode-Inf}{expanded}{sl}{
+ <-> ssub * Junicode-Inf/expanded/it
+}{}
-% ---- bx = boldexpanded ----
-\DeclareFontShape{LY1}{Junicode-Inf}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-inf-ly1
+% ---- sbx = semiboldexpanded ----
+
+\DeclareFontShape{LY1}{Junicode-Inf}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{boldexpanded}{it}{
- <-> alias * Junicode-Inf/bx/it
+\DeclareFontShape{LY1}{Junicode-Inf}{semiboldexpanded}{it}{
+ <-> alias * Junicode-Inf/sbx/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{boldexpanded}{n}{
- <-> alias * Junicode-Inf/bx/n
+\DeclareFontShape{LY1}{Junicode-Inf}{semiboldexpanded}{n}{
+ <-> alias * Junicode-Inf/sbx/n
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{bx}{sl}{
- <-> ssub * Junicode-Inf/bx/it
+\DeclareFontShape{LY1}{Junicode-Inf}{sbx}{sl}{
+ <-> ssub * Junicode-Inf/sbx/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{boldexpanded}{sl}{
- <-> ssub * Junicode-Inf/boldexpanded/it
+\DeclareFontShape{LY1}{Junicode-Inf}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-Inf/semiboldexpanded/it
}{}
-% ---- l = light ----
+% ---- c = condensed ----
-\DeclareFontShape{LY1}{Junicode-Inf}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{light}{n}{
- <-> alias * Junicode-Inf/l/n
+\DeclareFontShape{LY1}{Junicode-Inf}{condensed}{n}{
+ <-> alias * Junicode-Inf/c/n
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-inf-ly1
+\DeclareFontShape{LY1}{Junicode-Inf}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-inf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{light}{it}{
- <-> alias * Junicode-Inf/l/it
+\DeclareFontShape{LY1}{Junicode-Inf}{condensed}{it}{
+ <-> alias * Junicode-Inf/c/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{l}{sl}{
- <-> ssub * Junicode-Inf/l/it
+\DeclareFontShape{LY1}{Junicode-Inf}{c}{sl}{
+ <-> ssub * Junicode-Inf/c/it
}{}
-\DeclareFontShape{LY1}{Junicode-Inf}{light}{sl}{
- <-> ssub * Junicode-Inf/light/it
+\DeclareFontShape{LY1}{Junicode-Inf}{condensed}{sl}{
+ <-> ssub * Junicode-Inf/condensed/it
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-LF.fd b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-LF.fd
index 86852180b23..a225169dea5 100644
--- a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-LF.fd
+++ b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{LY1Junicode-LF.fd}
- [2024/06/03 (autoinst) Font definitions for LY1/Junicode-LF.]
+ [2024/07/21 (autoinst) Font definitions for LY1/Junicode-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,312 +20,285 @@
\DeclareFontFamily{LY1}{Junicode-LF}{}
-% ---- mediumexpanded ----
+% ---- c = condensed ----
-\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{scit}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{c}{sc}{
+ <-> \Junicode@@scale Junicode-Cond-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{condensed}{sc}{
+ <-> alias * Junicode-LF/c/sc
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{sc}{
- <-> \Junicode@@scale Junicode-ExpMedium-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{c}{scit}{
+ <-> \Junicode@@scale Junicode-CondItalic-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{condensed}{scit}{
+ <-> alias * Junicode-LF/c/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{scsl}{
- <-> ssub * Junicode-LF/mediumexpanded/scit
+\DeclareFontShape{LY1}{Junicode-LF}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{sl}{
- <-> ssub * Junicode-LF/mediumexpanded/it
+\DeclareFontShape{LY1}{Junicode-LF}{condensed}{n}{
+ <-> alias * Junicode-LF/c/n
}{}
-
-% ---- sbsx = semiboldsemiexpanded ----
-
-\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{scit}{
- <-> alias * Junicode-LF/sbsx/scit
+\DeclareFontShape{LY1}{Junicode-LF}{condensed}{it}{
+ <-> alias * Junicode-LF/c/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{c}{sl}{
+ <-> ssub * Junicode-LF/c/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-LF/sbsx/it
+\DeclareFontShape{LY1}{Junicode-LF}{condensed}{sl}{
+ <-> ssub * Junicode-LF/condensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{c}{scsl}{
+ <-> ssub * Junicode-LF/c/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{sc}{
- <-> alias * Junicode-LF/sbsx/sc
+\DeclareFontShape{LY1}{Junicode-LF}{condensed}{scsl}{
+ <-> ssub * Junicode-LF/condensed/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-lf-ly1
-}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-LF/sbsx/n
-}{}
+% ---- sbx = semiboldexpanded ----
-\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{scsl}{
- <-> ssub * Junicode-LF/sbsx/scit
+\DeclareFontShape{LY1}{Junicode-LF}{sbx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{scsl}{
- <-> ssub * Junicode-LF/semiboldsemiexpanded/scit
+\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{sc}{
+ <-> alias * Junicode-LF/sbx/sc
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{sl}{
- <-> ssub * Junicode-LF/sbsx/it
+\DeclareFontShape{LY1}{Junicode-LF}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-LF/semiboldsemiexpanded/it
+\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{n}{
+ <-> alias * Junicode-LF/sbx/n
}{}
+\DeclareFontShape{LY1}{Junicode-LF}{sbx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-sc-ly1
+}{}
-% ---- mediumsemiexpanded ----
+\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{scit}{
+ <-> alias * Junicode-LF/sbx/scit
+}{}
-\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{sc}{
- <-> \Junicode@@scale Junicode-SmExpMedium-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{it}{
+ <-> alias * Junicode-LF/sbx/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{scit}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{sbx}{sl}{
+ <-> ssub * Junicode-LF/sbx/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-LF/semiboldexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{scsl}{
- <-> ssub * Junicode-LF/mediumsemiexpanded/scit
+\DeclareFontShape{LY1}{Junicode-LF}{sbx}{scsl}{
+ <-> ssub * Junicode-LF/sbx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-LF/mediumsemiexpanded/it
+\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{scsl}{
+ <-> ssub * Junicode-LF/semiboldexpanded/scit
}{}
-% ---- x = expanded ----
+% ---- b = bold ----
-\DeclareFontShape{LY1}{Junicode-LF}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{expanded}{it}{
- <-> alias * Junicode-LF/x/it
+\DeclareFontShape{LY1}{Junicode-LF}{bold}{it}{
+ <-> alias * Junicode-LF/b/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{x}{scit}{
- <-> \Junicode@@scale Junicode-ExpItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{b}{scit}{
+ <-> \Junicode@@scale Junicode-BoldItalic-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{expanded}{scit}{
- <-> alias * Junicode-LF/x/scit
+\DeclareFontShape{LY1}{Junicode-LF}{bold}{scit}{
+ <-> alias * Junicode-LF/b/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{expanded}{n}{
- <-> alias * Junicode-LF/x/n
+\DeclareFontShape{LY1}{Junicode-LF}{bold}{n}{
+ <-> alias * Junicode-LF/b/n
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{x}{sc}{
- <-> \Junicode@@scale Junicode-Exp-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{b}{sc}{
+ <-> \Junicode@@scale Junicode-Bold-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{expanded}{sc}{
- <-> alias * Junicode-LF/x/sc
+\DeclareFontShape{LY1}{Junicode-LF}{bold}{sc}{
+ <-> alias * Junicode-LF/b/sc
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{x}{scsl}{
- <-> ssub * Junicode-LF/x/scit
+\DeclareFontShape{LY1}{Junicode-LF}{b}{sl}{
+ <-> ssub * Junicode-LF/b/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{expanded}{scsl}{
- <-> ssub * Junicode-LF/expanded/scit
+\DeclareFontShape{LY1}{Junicode-LF}{bold}{sl}{
+ <-> ssub * Junicode-LF/bold/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{x}{sl}{
- <-> ssub * Junicode-LF/x/it
+\DeclareFontShape{LY1}{Junicode-LF}{b}{scsl}{
+ <-> ssub * Junicode-LF/b/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{expanded}{sl}{
- <-> ssub * Junicode-LF/expanded/it
+\DeclareFontShape{LY1}{Junicode-LF}{bold}{scsl}{
+ <-> ssub * Junicode-LF/bold/scit
}{}
-% ---- c = condensed ----
-
-\DeclareFontShape{LY1}{Junicode-LF}{c}{scit}{
- <-> \Junicode@@scale Junicode-CondItalic-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{Junicode-LF}{condensed}{scit}{
- <-> alias * Junicode-LF/c/scit
-}{}
+% ---- x = expanded ----
-\DeclareFontShape{LY1}{Junicode-LF}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{x}{sc}{
+ <-> \Junicode@@scale Junicode-Exp-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{condensed}{it}{
- <-> alias * Junicode-LF/c/it
+\DeclareFontShape{LY1}{Junicode-LF}{expanded}{sc}{
+ <-> alias * Junicode-LF/x/sc
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{c}{sc}{
- <-> \Junicode@@scale Junicode-Cond-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{x}{scit}{
+ <-> \Junicode@@scale Junicode-ExpItalic-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{condensed}{sc}{
- <-> alias * Junicode-LF/c/sc
+\DeclareFontShape{LY1}{Junicode-LF}{expanded}{scit}{
+ <-> alias * Junicode-LF/x/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{condensed}{n}{
- <-> alias * Junicode-LF/c/n
+\DeclareFontShape{LY1}{Junicode-LF}{expanded}{n}{
+ <-> alias * Junicode-LF/x/n
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{c}{scsl}{
- <-> ssub * Junicode-LF/c/scit
+\DeclareFontShape{LY1}{Junicode-LF}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{condensed}{scsl}{
- <-> ssub * Junicode-LF/condensed/scit
+\DeclareFontShape{LY1}{Junicode-LF}{expanded}{it}{
+ <-> alias * Junicode-LF/x/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{c}{sl}{
- <-> ssub * Junicode-LF/c/it
+\DeclareFontShape{LY1}{Junicode-LF}{x}{sl}{
+ <-> ssub * Junicode-LF/x/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{condensed}{sl}{
- <-> ssub * Junicode-LF/condensed/it
+\DeclareFontShape{LY1}{Junicode-LF}{expanded}{sl}{
+ <-> ssub * Junicode-LF/expanded/it
}{}
-
-% ---- sx = semiexpanded ----
-
-\DeclareFontShape{LY1}{Junicode-LF}{sx}{sc}{
- <-> \Junicode@@scale Junicode-SmExp-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{x}{scsl}{
+ <-> ssub * Junicode-LF/x/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{sc}{
- <-> alias * Junicode-LF/sx/sc
+\DeclareFontShape{LY1}{Junicode-LF}{expanded}{scsl}{
+ <-> ssub * Junicode-LF/expanded/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-lf-ly1
-}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{n}{
- <-> alias * Junicode-LF/sx/n
-}{}
+% ---- lsc = lightsemicondensed ----
-\DeclareFontShape{LY1}{Junicode-LF}{sx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{lsc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondLight-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{scit}{
- <-> alias * Junicode-LF/sx/scit
+\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{sc}{
+ <-> alias * Junicode-LF/lsc/sc
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{it}{
- <-> alias * Junicode-LF/sx/it
+\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{it}{
+ <-> alias * Junicode-LF/lsc/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{sx}{scsl}{
- <-> ssub * Junicode-LF/sx/scit
+\DeclareFontShape{LY1}{Junicode-LF}{lsc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{scsl}{
- <-> ssub * Junicode-LF/semiexpanded/scit
+\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{scit}{
+ <-> alias * Junicode-LF/lsc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{sx}{sl}{
- <-> ssub * Junicode-LF/sx/it
+\DeclareFontShape{LY1}{Junicode-LF}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{sl}{
- <-> ssub * Junicode-LF/semiexpanded/it
+\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{n}{
+ <-> alias * Junicode-LF/lsc/n
}{}
-
-% ---- m = regular ----
-
-\DeclareFontShape{LY1}{Junicode-LF}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{lsc}{sl}{
+ <-> ssub * Junicode-LF/lsc/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{regular}{n}{
- <-> alias * Junicode-LF/m/n
+\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-LF/lightsemicondensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{m}{sc}{
- <-> \Junicode@@scale Junicode-Regular-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{lsc}{scsl}{
+ <-> ssub * Junicode-LF/lsc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{regular}{sc}{
- <-> alias * Junicode-LF/m/sc
+\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{scsl}{
+ <-> ssub * Junicode-LF/lightsemicondensed/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-lf-ly1
-}{}
-\DeclareFontShape{LY1}{Junicode-LF}{regular}{it}{
- <-> alias * Junicode-LF/m/it
-}{}
+% ---- mediumexpanded ----
-\DeclareFontShape{LY1}{Junicode-LF}{m}{scit}{
- <-> \Junicode@@scale Junicode-Italic-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{regular}{scit}{
- <-> alias * Junicode-LF/m/scit
+\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{m}{scsl}{
- <-> ssub * Junicode-LF/m/scit
+\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{regular}{scsl}{
- <-> ssub * Junicode-LF/regular/scit
+\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-ExpMedium-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{m}{sl}{
- <-> ssub * Junicode-LF/m/it
+\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-LF/mediumexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{regular}{sl}{
- <-> ssub * Junicode-LF/regular/it
+\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{scsl}{
+ <-> ssub * Junicode-LF/mediumexpanded/scit
}{}
@@ -347,358 +320,404 @@
<-> \Junicode@@scale Junicode-Medium-lf-sc-ly1
}{}
+\DeclareFontShape{LY1}{Junicode-LF}{medium}{sl}{
+ <-> ssub * Junicode-LF/medium/it
+}{}
+
\DeclareFontShape{LY1}{Junicode-LF}{medium}{scsl}{
<-> ssub * Junicode-LF/medium/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{medium}{sl}{
- <-> ssub * Junicode-LF/medium/it
+
+% ---- bx = boldexpanded ----
+
+\DeclareFontShape{LY1}{Junicode-LF}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-ly1
}{}
+\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{it}{
+ <-> alias * Junicode-LF/bx/it
+}{}
-% ---- lsc = lightsemicondensed ----
+\DeclareFontShape{LY1}{Junicode-LF}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-lf-ly1
+}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{n}{
+ <-> alias * Junicode-LF/bx/n
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{n}{
- <-> alias * Junicode-LF/lsc/n
+\DeclareFontShape{LY1}{Junicode-LF}{bx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lsc}{sc}{
- <-> \Junicode@@scale Junicode-SmCondLight-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{scit}{
+ <-> alias * Junicode-LF/bx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{sc}{
- <-> alias * Junicode-LF/lsc/sc
+\DeclareFontShape{LY1}{Junicode-LF}{bx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpBold-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{sc}{
+ <-> alias * Junicode-LF/bx/sc
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{it}{
- <-> alias * Junicode-LF/lsc/it
+\DeclareFontShape{LY1}{Junicode-LF}{bx}{sl}{
+ <-> ssub * Junicode-LF/bx/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lsc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{sl}{
+ <-> ssub * Junicode-LF/boldexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{scit}{
- <-> alias * Junicode-LF/lsc/scit
+\DeclareFontShape{LY1}{Junicode-LF}{bx}{scsl}{
+ <-> ssub * Junicode-LF/bx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lsc}{scsl}{
- <-> ssub * Junicode-LF/lsc/scit
+\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{scsl}{
+ <-> ssub * Junicode-LF/boldexpanded/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{scsl}{
- <-> ssub * Junicode-LF/lightsemicondensed/scit
+
+% ---- mediumsemiexpanded ----
+
+\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lsc}{sl}{
- <-> ssub * Junicode-LF/lsc/it
+\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-LF/lightsemicondensed/it
+\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-ly1
}{}
+\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-lf-sc-ly1
+}{}
-% ---- l = light ----
+\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-LF/mediumsemiexpanded/it
+}{}
-\DeclareFontShape{LY1}{Junicode-LF}{l}{sc}{
- <-> \Junicode@@scale Junicode-Light-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{scsl}{
+ <-> ssub * Junicode-LF/mediumsemiexpanded/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{light}{sc}{
- <-> alias * Junicode-LF/l/sc
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{Junicode-LF}{m}{sc}{
+ <-> \Junicode@@scale Junicode-Regular-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{regular}{sc}{
+ <-> alias * Junicode-LF/m/sc
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{light}{n}{
- <-> alias * Junicode-LF/l/n
+\DeclareFontShape{LY1}{Junicode-LF}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{l}{scit}{
- <-> \Junicode@@scale Junicode-LightItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{regular}{it}{
+ <-> alias * Junicode-LF/m/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{light}{scit}{
- <-> alias * Junicode-LF/l/scit
+\DeclareFontShape{LY1}{Junicode-LF}{m}{scit}{
+ <-> \Junicode@@scale Junicode-Italic-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{regular}{scit}{
+ <-> alias * Junicode-LF/m/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{light}{it}{
- <-> alias * Junicode-LF/l/it
+\DeclareFontShape{LY1}{Junicode-LF}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{l}{scsl}{
- <-> ssub * Junicode-LF/l/scit
+\DeclareFontShape{LY1}{Junicode-LF}{regular}{n}{
+ <-> alias * Junicode-LF/m/n
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{light}{scsl}{
- <-> ssub * Junicode-LF/light/scit
+\DeclareFontShape{LY1}{Junicode-LF}{m}{sl}{
+ <-> ssub * Junicode-LF/m/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{l}{sl}{
- <-> ssub * Junicode-LF/l/it
+\DeclareFontShape{LY1}{Junicode-LF}{regular}{sl}{
+ <-> ssub * Junicode-LF/regular/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{light}{sl}{
- <-> ssub * Junicode-LF/light/it
+\DeclareFontShape{LY1}{Junicode-LF}{m}{scsl}{
+ <-> ssub * Junicode-LF/m/scit
}{}
+\DeclareFontShape{LY1}{Junicode-LF}{regular}{scsl}{
+ <-> ssub * Junicode-LF/regular/scit
+}{}
-% ---- bx = boldexpanded ----
-\DeclareFontShape{LY1}{Junicode-LF}{bx}{scit}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-sc-ly1
+% ---- lc = lightcondensed ----
+
+\DeclareFontShape{LY1}{Junicode-LF}{lc}{sc}{
+ <-> \Junicode@@scale Junicode-CondLight-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{scit}{
- <-> alias * Junicode-LF/bx/scit
+\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{sc}{
+ <-> alias * Junicode-LF/lc/sc
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{it}{
- <-> alias * Junicode-LF/bx/it
+\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{it}{
+ <-> alias * Junicode-LF/lc/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{bx}{sc}{
- <-> \Junicode@@scale Junicode-ExpBold-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{sc}{
- <-> alias * Junicode-LF/bx/sc
+\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{n}{
+ <-> alias * Junicode-LF/lc/n
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{lc}{scit}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{n}{
- <-> alias * Junicode-LF/bx/n
+\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{scit}{
+ <-> alias * Junicode-LF/lc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{bx}{scsl}{
- <-> ssub * Junicode-LF/bx/scit
+\DeclareFontShape{LY1}{Junicode-LF}{lc}{sl}{
+ <-> ssub * Junicode-LF/lc/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{scsl}{
- <-> ssub * Junicode-LF/boldexpanded/scit
+\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{sl}{
+ <-> ssub * Junicode-LF/lightcondensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{bx}{sl}{
- <-> ssub * Junicode-LF/bx/it
+\DeclareFontShape{LY1}{Junicode-LF}{lc}{scsl}{
+ <-> ssub * Junicode-LF/lc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{sl}{
- <-> ssub * Junicode-LF/boldexpanded/it
+\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{scsl}{
+ <-> ssub * Junicode-LF/lightcondensed/scit
}{}
-% ---- mediumcondensed ----
+% ---- mediumsemicondensed ----
-\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{sc}{
- <-> \Junicode@@scale Junicode-CondMedium-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{scit}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{scsl}{
- <-> ssub * Junicode-LF/mediumcondensed/scit
+\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-LF/mediumsemicondensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{sl}{
- <-> ssub * Junicode-LF/mediumcondensed/it
+\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{scsl}{
+ <-> ssub * Junicode-LF/mediumsemicondensed/scit
}{}
-% ---- b = bold ----
+% ---- l = light ----
-\DeclareFontShape{LY1}{Junicode-LF}{b}{sc}{
- <-> \Junicode@@scale Junicode-Bold-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{l}{sc}{
+ <-> \Junicode@@scale Junicode-Light-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{bold}{sc}{
- <-> alias * Junicode-LF/b/sc
+\DeclareFontShape{LY1}{Junicode-LF}{light}{sc}{
+ <-> alias * Junicode-LF/l/sc
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{bold}{n}{
- <-> alias * Junicode-LF/b/n
+\DeclareFontShape{LY1}{Junicode-LF}{light}{it}{
+ <-> alias * Junicode-LF/l/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{b}{scit}{
- <-> \Junicode@@scale Junicode-BoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{bold}{scit}{
- <-> alias * Junicode-LF/b/scit
+\DeclareFontShape{LY1}{Junicode-LF}{light}{n}{
+ <-> alias * Junicode-LF/l/n
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{l}{scit}{
+ <-> \Junicode@@scale Junicode-LightItalic-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{bold}{it}{
- <-> alias * Junicode-LF/b/it
+\DeclareFontShape{LY1}{Junicode-LF}{light}{scit}{
+ <-> alias * Junicode-LF/l/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{b}{scsl}{
- <-> ssub * Junicode-LF/b/scit
+\DeclareFontShape{LY1}{Junicode-LF}{l}{sl}{
+ <-> ssub * Junicode-LF/l/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{bold}{scsl}{
- <-> ssub * Junicode-LF/bold/scit
+\DeclareFontShape{LY1}{Junicode-LF}{light}{sl}{
+ <-> ssub * Junicode-LF/light/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{b}{sl}{
- <-> ssub * Junicode-LF/b/it
+\DeclareFontShape{LY1}{Junicode-LF}{l}{scsl}{
+ <-> ssub * Junicode-LF/l/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{bold}{sl}{
- <-> ssub * Junicode-LF/bold/it
+\DeclareFontShape{LY1}{Junicode-LF}{light}{scsl}{
+ <-> ssub * Junicode-LF/light/scit
}{}
-% ---- bsx = boldsemiexpanded ----
+% ---- sx = semiexpanded ----
-\DeclareFontShape{LY1}{Junicode-LF}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{sx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExp-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{it}{
- <-> alias * Junicode-LF/bsx/it
+\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{sc}{
+ <-> alias * Junicode-LF/sx/sc
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{bsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{sx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{scit}{
- <-> alias * Junicode-LF/bsx/scit
+\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{scit}{
+ <-> alias * Junicode-LF/sx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{n}{
- <-> alias * Junicode-LF/bsx/n
+\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{n}{
+ <-> alias * Junicode-LF/sx/n
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{bsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpBold-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{sc}{
- <-> alias * Junicode-LF/bsx/sc
+\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{it}{
+ <-> alias * Junicode-LF/sx/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{bsx}{scsl}{
- <-> ssub * Junicode-LF/bsx/scit
+\DeclareFontShape{LY1}{Junicode-LF}{sx}{sl}{
+ <-> ssub * Junicode-LF/sx/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{scsl}{
- <-> ssub * Junicode-LF/boldsemiexpanded/scit
+\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{sl}{
+ <-> ssub * Junicode-LF/semiexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{bsx}{sl}{
- <-> ssub * Junicode-LF/bsx/it
+\DeclareFontShape{LY1}{Junicode-LF}{sx}{scsl}{
+ <-> ssub * Junicode-LF/sx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-LF/boldsemiexpanded/it
+\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{scsl}{
+ <-> ssub * Junicode-LF/semiexpanded/scit
}{}
-% ---- lc = lightcondensed ----
+% ---- mediumcondensed ----
-\DeclareFontShape{LY1}{Junicode-LF}{lc}{scit}{
- <-> \Junicode@@scale Junicode-CondLightItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{sc}{
+ <-> \Junicode@@scale Junicode-CondMedium-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{scit}{
- <-> alias * Junicode-LF/lc/scit
+\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{scit}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{it}{
- <-> alias * Junicode-LF/lc/it
+\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lc}{sc}{
- <-> \Junicode@@scale Junicode-CondLight-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-LF/mediumcondensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{sc}{
- <-> alias * Junicode-LF/lc/sc
+\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{scsl}{
+ <-> ssub * Junicode-LF/mediumcondensed/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-lf-ly1
+
+% ---- sb = semibold ----
+
+\DeclareFontShape{LY1}{Junicode-LF}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{n}{
- <-> alias * Junicode-LF/lc/n
+\DeclareFontShape{LY1}{Junicode-LF}{semibold}{it}{
+ <-> alias * Junicode-LF/sb/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lc}{scsl}{
- <-> ssub * Junicode-LF/lc/scit
+\DeclareFontShape{LY1}{Junicode-LF}{sb}{scit}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{scsl}{
- <-> ssub * Junicode-LF/lightcondensed/scit
+\DeclareFontShape{LY1}{Junicode-LF}{semibold}{scit}{
+ <-> alias * Junicode-LF/sb/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lc}{sl}{
- <-> ssub * Junicode-LF/lc/it
+\DeclareFontShape{LY1}{Junicode-LF}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{sl}{
- <-> ssub * Junicode-LF/lightcondensed/it
+\DeclareFontShape{LY1}{Junicode-LF}{semibold}{n}{
+ <-> alias * Junicode-LF/sb/n
}{}
+\DeclareFontShape{LY1}{Junicode-LF}{sb}{sc}{
+ <-> \Junicode@@scale Junicode-SmBold-lf-sc-ly1
+}{}
-% ---- sc = semicondensed ----
+\DeclareFontShape{LY1}{Junicode-LF}{semibold}{sc}{
+ <-> alias * Junicode-LF/sb/sc
+}{}
-\DeclareFontShape{LY1}{Junicode-LF}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{sb}{sl}{
+ <-> ssub * Junicode-LF/sb/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semicondensed}{n}{
- <-> alias * Junicode-LF/sc/n
+\DeclareFontShape{LY1}{Junicode-LF}{semibold}{sl}{
+ <-> ssub * Junicode-LF/semibold/it
+}{}
+
+\DeclareFontShape{LY1}{Junicode-LF}{sb}{scsl}{
+ <-> ssub * Junicode-LF/sb/scit
}{}
+\DeclareFontShape{LY1}{Junicode-LF}{semibold}{scsl}{
+ <-> ssub * Junicode-LF/semibold/scit
+}{}
+
+
+% ---- sc = semicondensed ----
+
\DeclareFontShape{LY1}{Junicode-LF}{sc}{sc}{
<-> \Junicode@@scale Junicode-SmCond-lf-sc-ly1
}{}
@@ -723,12 +742,12 @@
<-> alias * Junicode-LF/sc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{sc}{scsl}{
- <-> ssub * Junicode-LF/sc/scit
+\DeclareFontShape{LY1}{Junicode-LF}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semicondensed}{scsl}{
- <-> ssub * Junicode-LF/semicondensed/scit
+\DeclareFontShape{LY1}{Junicode-LF}{semicondensed}{n}{
+ <-> alias * Junicode-LF/sc/n
}{}
\DeclareFontShape{LY1}{Junicode-LF}{sc}{sl}{
@@ -739,133 +758,114 @@
<-> ssub * Junicode-LF/semicondensed/it
}{}
-
-% ---- sb = semibold ----
-
-\DeclareFontShape{LY1}{Junicode-LF}{sb}{sc}{
- <-> \Junicode@@scale Junicode-SmBold-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{Junicode-LF}{semibold}{sc}{
- <-> alias * Junicode-LF/sb/sc
-}{}
-
-\DeclareFontShape{LY1}{Junicode-LF}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{sc}{scsl}{
+ <-> ssub * Junicode-LF/sc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semibold}{n}{
- <-> alias * Junicode-LF/sb/n
+\DeclareFontShape{LY1}{Junicode-LF}{semicondensed}{scsl}{
+ <-> ssub * Junicode-LF/semicondensed/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{sb}{scit}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-lf-sc-ly1
-}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semibold}{scit}{
- <-> alias * Junicode-LF/sb/scit
-}{}
+% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{LY1}{Junicode-LF}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{bsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpBold-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semibold}{it}{
- <-> alias * Junicode-LF/sb/it
+\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{sc}{
+ <-> alias * Junicode-LF/bsx/sc
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{sb}{scsl}{
- <-> ssub * Junicode-LF/sb/scit
+\DeclareFontShape{LY1}{Junicode-LF}{bsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semibold}{scsl}{
- <-> ssub * Junicode-LF/semibold/scit
+\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{scit}{
+ <-> alias * Junicode-LF/bsx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{sb}{sl}{
- <-> ssub * Junicode-LF/sb/it
+\DeclareFontShape{LY1}{Junicode-LF}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semibold}{sl}{
- <-> ssub * Junicode-LF/semibold/it
+\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-LF/bsx/n
}{}
-
-% ---- mediumsemicondensed ----
-
-\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{scit}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-LF/bsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{sc}{
- <-> \Junicode@@scale Junicode-SmCondMedium-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{bsx}{sl}{
+ <-> ssub * Junicode-LF/bsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-LF/boldsemiexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{scsl}{
- <-> ssub * Junicode-LF/mediumsemicondensed/scit
+\DeclareFontShape{LY1}{Junicode-LF}{bsx}{scsl}{
+ <-> ssub * Junicode-LF/bsx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-LF/mediumsemicondensed/it
+\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-LF/boldsemiexpanded/scit
}{}
-% ---- sbx = semiboldexpanded ----
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{LY1}{Junicode-LF}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{n}{
- <-> alias * Junicode-LF/sbx/n
+\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{sc}{
+ <-> alias * Junicode-LF/sbsx/sc
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{sbx}{sc}{
- <-> \Junicode@@scale Junicode-ExpSmBold-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{sc}{
- <-> alias * Junicode-LF/sbx/sc
+\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-LF/sbsx/n
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{it}{
- <-> alias * Junicode-LF/sbx/it
+\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{scit}{
+ <-> alias * Junicode-LF/sbsx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{sbx}{scit}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{scit}{
- <-> alias * Junicode-LF/sbx/scit
+\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-LF/sbsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{sbx}{scsl}{
- <-> ssub * Junicode-LF/sbx/scit
+\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{sl}{
+ <-> ssub * Junicode-LF/sbsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{scsl}{
- <-> ssub * Junicode-LF/semiboldexpanded/scit
+\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-LF/semiboldsemiexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{sbx}{sl}{
- <-> ssub * Junicode-LF/sbx/it
+\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{scsl}{
+ <-> ssub * Junicode-LF/sbsx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-LF/semiboldexpanded/it
+\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-LF/semiboldsemiexpanded/scit
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-OsF.fd b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-OsF.fd
index fd942d07b1b..eb4595a4bf5 100644
--- a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-OsF.fd
+++ b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{LY1Junicode-OsF.fd}
- [2024/06/03 (autoinst) Font definitions for LY1/Junicode-OsF.]
+ [2024/07/21 (autoinst) Font definitions for LY1/Junicode-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,852 +20,852 @@
\DeclareFontFamily{LY1}{Junicode-OsF}{}
-% ---- medium ----
+% ---- mediumcondensed ----
-\DeclareFontShape{LY1}{Junicode-OsF}{medium}{it}{
- <-> \Junicode@@scale Junicode-MediumItalic-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{sc}{
+ <-> \Junicode@@scale Junicode-CondMedium-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{medium}{scit}{
- <-> \Junicode@@scale Junicode-MediumItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{medium}{n}{
- <-> \Junicode@@scale Junicode-Medium-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{medium}{sc}{
- <-> \Junicode@@scale Junicode-Medium-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{scit}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{medium}{scsl}{
- <-> ssub * Junicode-OsF/medium/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-OsF/mediumcondensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{medium}{sl}{
- <-> ssub * Junicode-OsF/medium/it
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{scsl}{
+ <-> ssub * Junicode-OsF/mediumcondensed/scit
}{}
-% ---- lsc = lightsemicondensed ----
+% ---- sb = semibold ----
-\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{sb}{scit}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{scit}{
- <-> alias * Junicode-OsF/lsc/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{scit}{
+ <-> alias * Junicode-OsF/sb/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{it}{
- <-> alias * Junicode-OsF/lsc/it
+\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{n}{
+ <-> alias * Junicode-OsF/sb/n
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{sc}{
- <-> \Junicode@@scale Junicode-SmCondLight-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{sc}{
- <-> alias * Junicode-OsF/lsc/sc
+\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{it}{
+ <-> alias * Junicode-OsF/sb/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{sb}{sc}{
+ <-> \Junicode@@scale Junicode-SmBold-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{n}{
- <-> alias * Junicode-OsF/lsc/n
+\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{sc}{
+ <-> alias * Junicode-OsF/sb/sc
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{scsl}{
- <-> ssub * Junicode-OsF/lsc/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{sb}{sl}{
+ <-> ssub * Junicode-OsF/sb/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{scsl}{
- <-> ssub * Junicode-OsF/lightsemicondensed/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{sl}{
+ <-> ssub * Junicode-OsF/semibold/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{sl}{
- <-> ssub * Junicode-OsF/lsc/it
+\DeclareFontShape{LY1}{Junicode-OsF}{sb}{scsl}{
+ <-> ssub * Junicode-OsF/sb/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-OsF/lightsemicondensed/it
+\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{scsl}{
+ <-> ssub * Junicode-OsF/semibold/scit
}{}
-% ---- m = regular ----
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{LY1}{Junicode-OsF}{m}{sc}{
- <-> \Junicode@@scale Junicode-Regular-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{regular}{sc}{
- <-> alias * Junicode-OsF/m/sc
+\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{sc}{
+ <-> alias * Junicode-OsF/sbsx/sc
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{regular}{n}{
- <-> alias * Junicode-OsF/m/n
+\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{scit}{
+ <-> alias * Junicode-OsF/sbsx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{m}{scit}{
- <-> \Junicode@@scale Junicode-Italic-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{regular}{scit}{
- <-> alias * Junicode-OsF/m/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-OsF/sbsx/n
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{regular}{it}{
- <-> alias * Junicode-OsF/m/it
+\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-OsF/sbsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{m}{scsl}{
- <-> ssub * Junicode-OsF/m/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{sl}{
+ <-> ssub * Junicode-OsF/sbsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{regular}{scsl}{
- <-> ssub * Junicode-OsF/regular/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-OsF/semiboldsemiexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{m}{sl}{
- <-> ssub * Junicode-OsF/m/it
+\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{scsl}{
+ <-> ssub * Junicode-OsF/sbsx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{regular}{sl}{
- <-> ssub * Junicode-OsF/regular/it
+\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/semiboldsemiexpanded/scit
}{}
-% ---- bx = boldexpanded ----
+% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{LY1}{Junicode-OsF}{bx}{sc}{
- <-> \Junicode@@scale Junicode-ExpBold-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpBold-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{sc}{
- <-> alias * Junicode-OsF/bx/sc
+\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{sc}{
+ <-> alias * Junicode-OsF/bsx/sc
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{n}{
- <-> alias * Junicode-OsF/bx/n
+\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{scit}{
+ <-> alias * Junicode-OsF/bsx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{bx}{scit}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{scit}{
- <-> alias * Junicode-OsF/bx/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-OsF/bsx/n
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{it}{
- <-> alias * Junicode-OsF/bx/it
+\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-OsF/bsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{bx}{scsl}{
- <-> ssub * Junicode-OsF/bx/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{sl}{
+ <-> ssub * Junicode-OsF/bsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{scsl}{
- <-> ssub * Junicode-OsF/boldexpanded/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-OsF/boldsemiexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{bx}{sl}{
- <-> ssub * Junicode-OsF/bx/it
+\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{scsl}{
+ <-> ssub * Junicode-OsF/bsx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{sl}{
- <-> ssub * Junicode-OsF/boldexpanded/it
+\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/boldsemiexpanded/scit
}{}
-% ---- l = light ----
+% ---- sc = semicondensed ----
-\DeclareFontShape{LY1}{Junicode-OsF}{l}{scit}{
- <-> \Junicode@@scale Junicode-LightItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{sc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{light}{scit}{
- <-> alias * Junicode-OsF/l/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{it}{
+ <-> alias * Junicode-OsF/sc/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{sc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{light}{it}{
- <-> alias * Junicode-OsF/l/it
+\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{scit}{
+ <-> alias * Junicode-OsF/sc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{l}{sc}{
- <-> \Junicode@@scale Junicode-Light-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{light}{sc}{
- <-> alias * Junicode-OsF/l/sc
+\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{n}{
+ <-> alias * Junicode-OsF/sc/n
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{sc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCond-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{light}{n}{
- <-> alias * Junicode-OsF/l/n
+\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{sc}{
+ <-> alias * Junicode-OsF/sc/sc
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{l}{scsl}{
- <-> ssub * Junicode-OsF/l/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{sc}{sl}{
+ <-> ssub * Junicode-OsF/sc/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{light}{scsl}{
- <-> ssub * Junicode-OsF/light/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{sl}{
+ <-> ssub * Junicode-OsF/semicondensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{l}{sl}{
- <-> ssub * Junicode-OsF/l/it
+\DeclareFontShape{LY1}{Junicode-OsF}{sc}{scsl}{
+ <-> ssub * Junicode-OsF/sc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{light}{sl}{
- <-> ssub * Junicode-OsF/light/it
+\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{scsl}{
+ <-> ssub * Junicode-OsF/semicondensed/scit
}{}
-% ---- mediumsemiexpanded ----
+% ---- lc = lightcondensed ----
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{lc}{scit}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{sc}{
- <-> \Junicode@@scale Junicode-SmExpMedium-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{scit}{
+ <-> alias * Junicode-OsF/lc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{scit}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{n}{
+ <-> alias * Junicode-OsF/lc/n
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{scsl}{
- <-> ssub * Junicode-OsF/mediumsemiexpanded/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-OsF/mediumsemiexpanded/it
+\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{it}{
+ <-> alias * Junicode-OsF/lc/it
}{}
-
-% ---- mediumexpanded ----
-
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{scit}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{lc}{sc}{
+ <-> \Junicode@@scale Junicode-CondLight-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{sc}{
+ <-> alias * Junicode-OsF/lc/sc
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{sc}{
- <-> \Junicode@@scale Junicode-ExpMedium-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{lc}{sl}{
+ <-> ssub * Junicode-OsF/lc/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{sl}{
+ <-> ssub * Junicode-OsF/lightcondensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{scsl}{
- <-> ssub * Junicode-OsF/mediumexpanded/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{lc}{scsl}{
+ <-> ssub * Junicode-OsF/lc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{sl}{
- <-> ssub * Junicode-OsF/mediumexpanded/it
+\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{scsl}{
+ <-> ssub * Junicode-OsF/lightcondensed/scit
}{}
-% ---- sbsx = semiboldsemiexpanded ----
+% ---- medium ----
-\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{medium}{it}{
+ <-> \Junicode@@scale Junicode-MediumItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-OsF/sbsx/it
+\DeclareFontShape{LY1}{Junicode-OsF}{medium}{scit}{
+ <-> \Junicode@@scale Junicode-MediumItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{medium}{n}{
+ <-> \Junicode@@scale Junicode-Medium-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{scit}{
- <-> alias * Junicode-OsF/sbsx/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{medium}{sc}{
+ <-> \Junicode@@scale Junicode-Medium-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{medium}{sl}{
+ <-> ssub * Junicode-OsF/medium/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-OsF/sbsx/n
+\DeclareFontShape{LY1}{Junicode-OsF}{medium}{scsl}{
+ <-> ssub * Junicode-OsF/medium/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-osf-sc-ly1
-}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{sc}{
- <-> alias * Junicode-OsF/sbsx/sc
-}{}
+% ---- bx = boldexpanded ----
-\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{scsl}{
- <-> ssub * Junicode-OsF/sbsx/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{scsl}{
- <-> ssub * Junicode-OsF/semiboldsemiexpanded/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{it}{
+ <-> alias * Junicode-OsF/bx/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{sl}{
- <-> ssub * Junicode-OsF/sbsx/it
+\DeclareFontShape{LY1}{Junicode-OsF}{bx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-OsF/semiboldsemiexpanded/it
+\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{scit}{
+ <-> alias * Junicode-OsF/bx/scit
}{}
+\DeclareFontShape{LY1}{Junicode-OsF}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-osf-ly1
+}{}
-% ---- c = condensed ----
+\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{n}{
+ <-> alias * Junicode-OsF/bx/n
+}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{bx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpBold-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{n}{
- <-> alias * Junicode-OsF/c/n
+\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{sc}{
+ <-> alias * Junicode-OsF/bx/sc
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{c}{sc}{
- <-> \Junicode@@scale Junicode-Cond-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{bx}{sl}{
+ <-> ssub * Junicode-OsF/bx/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{sc}{
- <-> alias * Junicode-OsF/c/sc
+\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{sl}{
+ <-> ssub * Junicode-OsF/boldexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{bx}{scsl}{
+ <-> ssub * Junicode-OsF/bx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{it}{
- <-> alias * Junicode-OsF/c/it
+\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/boldexpanded/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{c}{scit}{
- <-> \Junicode@@scale Junicode-CondItalic-osf-sc-ly1
+
+% ---- mediumsemiexpanded ----
+
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{scit}{
- <-> alias * Junicode-OsF/c/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{c}{scsl}{
- <-> ssub * Junicode-OsF/c/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{scsl}{
- <-> ssub * Junicode-OsF/condensed/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{c}{sl}{
- <-> ssub * Junicode-OsF/c/it
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-OsF/mediumsemiexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{sl}{
- <-> ssub * Junicode-OsF/condensed/it
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/mediumsemiexpanded/scit
}{}
-% ---- x = expanded ----
+% ---- m = regular ----
-\DeclareFontShape{LY1}{Junicode-OsF}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{m}{scit}{
+ <-> \Junicode@@scale Junicode-Italic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{it}{
- <-> alias * Junicode-OsF/x/it
+\DeclareFontShape{LY1}{Junicode-OsF}{regular}{scit}{
+ <-> alias * Junicode-OsF/m/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{x}{scit}{
- <-> \Junicode@@scale Junicode-ExpItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{scit}{
- <-> alias * Junicode-OsF/x/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{regular}{n}{
+ <-> alias * Junicode-OsF/m/n
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{n}{
- <-> alias * Junicode-OsF/x/n
+\DeclareFontShape{LY1}{Junicode-OsF}{regular}{it}{
+ <-> alias * Junicode-OsF/m/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{x}{sc}{
- <-> \Junicode@@scale Junicode-Exp-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{m}{sc}{
+ <-> \Junicode@@scale Junicode-Regular-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{sc}{
- <-> alias * Junicode-OsF/x/sc
+\DeclareFontShape{LY1}{Junicode-OsF}{regular}{sc}{
+ <-> alias * Junicode-OsF/m/sc
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{x}{scsl}{
- <-> ssub * Junicode-OsF/x/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{m}{sl}{
+ <-> ssub * Junicode-OsF/m/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{scsl}{
- <-> ssub * Junicode-OsF/expanded/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{regular}{sl}{
+ <-> ssub * Junicode-OsF/regular/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{x}{sl}{
- <-> ssub * Junicode-OsF/x/it
+\DeclareFontShape{LY1}{Junicode-OsF}{m}{scsl}{
+ <-> ssub * Junicode-OsF/m/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{sl}{
- <-> ssub * Junicode-OsF/expanded/it
+\DeclareFontShape{LY1}{Junicode-OsF}{regular}{scsl}{
+ <-> ssub * Junicode-OsF/regular/scit
}{}
-% ---- sx = semiexpanded ----
+% ---- l = light ----
-\DeclareFontShape{LY1}{Junicode-OsF}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{it}{
- <-> alias * Junicode-OsF/sx/it
+\DeclareFontShape{LY1}{Junicode-OsF}{light}{n}{
+ <-> alias * Junicode-OsF/l/n
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{l}{scit}{
+ <-> \Junicode@@scale Junicode-LightItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{scit}{
- <-> alias * Junicode-OsF/sx/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{light}{scit}{
+ <-> alias * Junicode-OsF/l/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{n}{
- <-> alias * Junicode-OsF/sx/n
+\DeclareFontShape{LY1}{Junicode-OsF}{light}{it}{
+ <-> alias * Junicode-OsF/l/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sx}{sc}{
- <-> \Junicode@@scale Junicode-SmExp-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{l}{sc}{
+ <-> \Junicode@@scale Junicode-Light-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{sc}{
- <-> alias * Junicode-OsF/sx/sc
+\DeclareFontShape{LY1}{Junicode-OsF}{light}{sc}{
+ <-> alias * Junicode-OsF/l/sc
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sx}{scsl}{
- <-> ssub * Junicode-OsF/sx/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{l}{sl}{
+ <-> ssub * Junicode-OsF/l/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{scsl}{
- <-> ssub * Junicode-OsF/semiexpanded/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{light}{sl}{
+ <-> ssub * Junicode-OsF/light/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sx}{sl}{
- <-> ssub * Junicode-OsF/sx/it
+\DeclareFontShape{LY1}{Junicode-OsF}{l}{scsl}{
+ <-> ssub * Junicode-OsF/l/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{sl}{
- <-> ssub * Junicode-OsF/semiexpanded/it
+\DeclareFontShape{LY1}{Junicode-OsF}{light}{scsl}{
+ <-> ssub * Junicode-OsF/light/scit
}{}
-% ---- sc = semicondensed ----
+% ---- sx = semiexpanded ----
-\DeclareFontShape{LY1}{Junicode-OsF}{sc}{it}{
- <-> \Junicode@@scale Junicode-SmCondItalic-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{sx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExp-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{it}{
- <-> alias * Junicode-OsF/sc/it
+\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{sc}{
+ <-> alias * Junicode-OsF/sx/sc
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{sx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{scit}{
- <-> alias * Junicode-OsF/sc/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{scit}{
+ <-> alias * Junicode-OsF/sx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{n}{
- <-> alias * Junicode-OsF/sc/n
+\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{n}{
+ <-> alias * Junicode-OsF/sx/n
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sc}{sc}{
- <-> \Junicode@@scale Junicode-SmCond-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{sc}{
- <-> alias * Junicode-OsF/sc/sc
+\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{it}{
+ <-> alias * Junicode-OsF/sx/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sc}{scsl}{
- <-> ssub * Junicode-OsF/sc/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{sx}{sl}{
+ <-> ssub * Junicode-OsF/sx/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{scsl}{
- <-> ssub * Junicode-OsF/semicondensed/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{sl}{
+ <-> ssub * Junicode-OsF/semiexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sc}{sl}{
- <-> ssub * Junicode-OsF/sc/it
+\DeclareFontShape{LY1}{Junicode-OsF}{sx}{scsl}{
+ <-> ssub * Junicode-OsF/sx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{sl}{
- <-> ssub * Junicode-OsF/semicondensed/it
+\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/semiexpanded/scit
}{}
-% ---- sb = semibold ----
+% ---- mediumsemicondensed ----
-\DeclareFontShape{LY1}{Junicode-OsF}{sb}{scit}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{scit}{
- <-> alias * Junicode-OsF/sb/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{it}{
- <-> alias * Junicode-OsF/sb/it
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sb}{sc}{
- <-> \Junicode@@scale Junicode-SmBold-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-OsF/mediumsemicondensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{sc}{
- <-> alias * Junicode-OsF/sb/sc
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{scsl}{
+ <-> ssub * Junicode-OsF/mediumsemicondensed/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-osf-ly1
-}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{n}{
- <-> alias * Junicode-OsF/sb/n
-}{}
+% ---- b = bold ----
-\DeclareFontShape{LY1}{Junicode-OsF}{sb}{scsl}{
- <-> ssub * Junicode-OsF/sb/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{b}{sc}{
+ <-> \Junicode@@scale Junicode-Bold-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{scsl}{
- <-> ssub * Junicode-OsF/semibold/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{bold}{sc}{
+ <-> alias * Junicode-OsF/b/sc
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sb}{sl}{
- <-> ssub * Junicode-OsF/sb/it
+\DeclareFontShape{LY1}{Junicode-OsF}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{sl}{
- <-> ssub * Junicode-OsF/semibold/it
+\DeclareFontShape{LY1}{Junicode-OsF}{bold}{it}{
+ <-> alias * Junicode-OsF/b/it
}{}
-
-% ---- bsx = boldsemiexpanded ----
-
-\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{n}{
- <-> alias * Junicode-OsF/bsx/n
+\DeclareFontShape{LY1}{Junicode-OsF}{bold}{n}{
+ <-> alias * Junicode-OsF/b/n
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpBold-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{b}{scit}{
+ <-> \Junicode@@scale Junicode-BoldItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{sc}{
- <-> alias * Junicode-OsF/bsx/sc
+\DeclareFontShape{LY1}{Junicode-OsF}{bold}{scit}{
+ <-> alias * Junicode-OsF/b/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{b}{sl}{
+ <-> ssub * Junicode-OsF/b/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{it}{
- <-> alias * Junicode-OsF/bsx/it
+\DeclareFontShape{LY1}{Junicode-OsF}{bold}{sl}{
+ <-> ssub * Junicode-OsF/bold/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{b}{scsl}{
+ <-> ssub * Junicode-OsF/b/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{scit}{
- <-> alias * Junicode-OsF/bsx/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{bold}{scsl}{
+ <-> ssub * Junicode-OsF/bold/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{scsl}{
- <-> ssub * Junicode-OsF/bsx/scit
+
+% ---- x = expanded ----
+
+\DeclareFontShape{LY1}{Junicode-OsF}{x}{scit}{
+ <-> \Junicode@@scale Junicode-ExpItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{scsl}{
- <-> ssub * Junicode-OsF/boldsemiexpanded/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{scit}{
+ <-> alias * Junicode-OsF/x/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{sl}{
- <-> ssub * Junicode-OsF/bsx/it
+\DeclareFontShape{LY1}{Junicode-OsF}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-OsF/boldsemiexpanded/it
+\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{n}{
+ <-> alias * Junicode-OsF/x/n
}{}
+\DeclareFontShape{LY1}{Junicode-OsF}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-osf-ly1
+}{}
-% ---- lc = lightcondensed ----
+\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{it}{
+ <-> alias * Junicode-OsF/x/it
+}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lc}{scit}{
- <-> \Junicode@@scale Junicode-CondLightItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{x}{sc}{
+ <-> \Junicode@@scale Junicode-Exp-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{scit}{
- <-> alias * Junicode-OsF/lc/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{sc}{
+ <-> alias * Junicode-OsF/x/sc
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{x}{sl}{
+ <-> ssub * Junicode-OsF/x/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{it}{
- <-> alias * Junicode-OsF/lc/it
+\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{sl}{
+ <-> ssub * Junicode-OsF/expanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lc}{sc}{
- <-> \Junicode@@scale Junicode-CondLight-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{x}{scsl}{
+ <-> ssub * Junicode-OsF/x/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{sc}{
- <-> alias * Junicode-OsF/lc/sc
+\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{scsl}{
+ <-> ssub * Junicode-OsF/expanded/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-osf-ly1
+
+% ---- mediumexpanded ----
+
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-ExpMedium-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{n}{
- <-> alias * Junicode-OsF/lc/n
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lc}{scsl}{
- <-> ssub * Junicode-OsF/lc/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{scsl}{
- <-> ssub * Junicode-OsF/lightcondensed/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lc}{sl}{
- <-> ssub * Junicode-OsF/lc/it
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-OsF/mediumexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{sl}{
- <-> ssub * Junicode-OsF/lightcondensed/it
+\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/mediumexpanded/scit
}{}
-% ---- sbx = semiboldexpanded ----
+% ---- lsc = lightsemicondensed ----
-\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondLight-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{it}{
- <-> alias * Junicode-OsF/sbx/it
+\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{sc}{
+ <-> alias * Junicode-OsF/lsc/sc
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{scit}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{scit}{
- <-> alias * Junicode-OsF/sbx/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{it}{
+ <-> alias * Junicode-OsF/lsc/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{n}{
- <-> alias * Junicode-OsF/sbx/n
+\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{n}{
+ <-> alias * Junicode-OsF/lsc/n
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{sc}{
- <-> \Junicode@@scale Junicode-ExpSmBold-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{sc}{
- <-> alias * Junicode-OsF/sbx/sc
+\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{scit}{
+ <-> alias * Junicode-OsF/lsc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{scsl}{
- <-> ssub * Junicode-OsF/sbx/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{sl}{
+ <-> ssub * Junicode-OsF/lsc/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{scsl}{
- <-> ssub * Junicode-OsF/semiboldexpanded/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-OsF/lightsemicondensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{sl}{
- <-> ssub * Junicode-OsF/sbx/it
+\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{scsl}{
+ <-> ssub * Junicode-OsF/lsc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-OsF/semiboldexpanded/it
+\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{scsl}{
+ <-> ssub * Junicode-OsF/lightsemicondensed/scit
}{}
-% ---- mediumsemicondensed ----
+% ---- c = condensed ----
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{sc}{
- <-> \Junicode@@scale Junicode-SmCondMedium-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{n}{
+ <-> alias * Junicode-OsF/c/n
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{scit}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{c}{scit}{
+ <-> \Junicode@@scale Junicode-CondItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{scit}{
+ <-> alias * Junicode-OsF/c/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{scsl}{
- <-> ssub * Junicode-OsF/mediumsemicondensed/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-OsF/mediumsemicondensed/it
+\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{it}{
+ <-> alias * Junicode-OsF/c/it
}{}
-
-% ---- mediumcondensed ----
-
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{sc}{
- <-> \Junicode@@scale Junicode-CondMedium-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{c}{sc}{
+ <-> \Junicode@@scale Junicode-Cond-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{sc}{
+ <-> alias * Junicode-OsF/c/sc
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{scit}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{c}{sl}{
+ <-> ssub * Junicode-OsF/c/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{sl}{
+ <-> ssub * Junicode-OsF/condensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{scsl}{
- <-> ssub * Junicode-OsF/mediumcondensed/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{c}{scsl}{
+ <-> ssub * Junicode-OsF/c/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{sl}{
- <-> ssub * Junicode-OsF/mediumcondensed/it
+\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{scsl}{
+ <-> ssub * Junicode-OsF/condensed/scit
}{}
-% ---- b = bold ----
+% ---- sbx = semiboldexpanded ----
-\DeclareFontShape{LY1}{Junicode-OsF}{b}{scit}{
- <-> \Junicode@@scale Junicode-BoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{bold}{scit}{
- <-> alias * Junicode-OsF/b/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{it}{
+ <-> alias * Junicode-OsF/sbx/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{bold}{it}{
- <-> alias * Junicode-OsF/b/it
+\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{scit}{
+ <-> alias * Junicode-OsF/sbx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{b}{sc}{
- <-> \Junicode@@scale Junicode-Bold-osf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-osf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{bold}{sc}{
- <-> alias * Junicode-OsF/b/sc
+\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{n}{
+ <-> alias * Junicode-OsF/sbx/n
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-osf-ly1
+\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{bold}{n}{
- <-> alias * Junicode-OsF/b/n
+\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{sc}{
+ <-> alias * Junicode-OsF/sbx/sc
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{b}{scsl}{
- <-> ssub * Junicode-OsF/b/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{sl}{
+ <-> ssub * Junicode-OsF/sbx/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{bold}{scsl}{
- <-> ssub * Junicode-OsF/bold/scit
+\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-OsF/semiboldexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{b}{sl}{
- <-> ssub * Junicode-OsF/b/it
+\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{scsl}{
+ <-> ssub * Junicode-OsF/sbx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-OsF}{bold}{sl}{
- <-> ssub * Junicode-OsF/bold/it
+\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/semiboldexpanded/scit
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-Sup.fd b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-Sup.fd
index 55a81ba0ea5..8de022b535c 100644
--- a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-Sup.fd
+++ b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{LY1Junicode-Sup.fd}
- [2024/06/03 (autoinst) Font definitions for LY1/Junicode-Sup.]
+ [2024/07/21 (autoinst) Font definitions for LY1/Junicode-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,57 +20,57 @@
\DeclareFontFamily{LY1}{Junicode-Sup}{}
-% ---- sx = semiexpanded ----
+% ---- c = condensed ----
-\DeclareFontShape{LY1}{Junicode-Sup}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-sup-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{semiexpanded}{it}{
- <-> alias * Junicode-Sup/sx/it
+\DeclareFontShape{LY1}{Junicode-Sup}{condensed}{n}{
+ <-> alias * Junicode-Sup/c/n
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-sup-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{semiexpanded}{n}{
- <-> alias * Junicode-Sup/sx/n
+\DeclareFontShape{LY1}{Junicode-Sup}{condensed}{it}{
+ <-> alias * Junicode-Sup/c/it
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{sx}{sl}{
- <-> ssub * Junicode-Sup/sx/it
+\DeclareFontShape{LY1}{Junicode-Sup}{c}{sl}{
+ <-> ssub * Junicode-Sup/c/it
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{semiexpanded}{sl}{
- <-> ssub * Junicode-Sup/semiexpanded/it
+\DeclareFontShape{LY1}{Junicode-Sup}{condensed}{sl}{
+ <-> ssub * Junicode-Sup/condensed/it
}{}
-% ---- c = condensed ----
+% ---- sbx = semiboldexpanded ----
-\DeclareFontShape{LY1}{Junicode-Sup}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-sup-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{condensed}{it}{
- <-> alias * Junicode-Sup/c/it
+\DeclareFontShape{LY1}{Junicode-Sup}{semiboldexpanded}{it}{
+ <-> alias * Junicode-Sup/sbx/it
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-sup-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{condensed}{n}{
- <-> alias * Junicode-Sup/c/n
+\DeclareFontShape{LY1}{Junicode-Sup}{semiboldexpanded}{n}{
+ <-> alias * Junicode-Sup/sbx/n
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{c}{sl}{
- <-> ssub * Junicode-Sup/c/it
+\DeclareFontShape{LY1}{Junicode-Sup}{sbx}{sl}{
+ <-> ssub * Junicode-Sup/sbx/it
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{condensed}{sl}{
- <-> ssub * Junicode-Sup/condensed/it
+\DeclareFontShape{LY1}{Junicode-Sup}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-Sup/semiboldexpanded/it
}{}
@@ -101,156 +101,114 @@
}{}
-% ---- mediumsemiexpanded ----
+% ---- b = bold ----
-\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-sup-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{bold}{it}{
+ <-> alias * Junicode-Sup/b/it
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-Sup/mediumsemiexpanded/it
+\DeclareFontShape{LY1}{Junicode-Sup}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-sup-ly1
}{}
-
-% ---- sbsx = semiboldsemiexpanded ----
-
-\DeclareFontShape{LY1}{Junicode-Sup}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{bold}{n}{
+ <-> alias * Junicode-Sup/b/n
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-Sup/sbsx/it
+\DeclareFontShape{LY1}{Junicode-Sup}{b}{sl}{
+ <-> ssub * Junicode-Sup/b/it
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{bold}{sl}{
+ <-> ssub * Junicode-Sup/bold/it
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-Sup/sbsx/n
-}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{sbsx}{sl}{
- <-> ssub * Junicode-Sup/sbsx/it
-}{}
+% ---- mediumexpanded ----
-\DeclareFontShape{LY1}{Junicode-Sup}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-Sup/semiboldsemiexpanded/it
+\DeclareFontShape{LY1}{Junicode-Sup}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-sup-ly1
}{}
-
-% ---- mediumexpanded ----
-
\DeclareFontShape{LY1}{Junicode-Sup}{mediumexpanded}{n}{
<-> \Junicode@@scale Junicode-ExpMedium-sup-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-sup-ly1
-}{}
-
\DeclareFontShape{LY1}{Junicode-Sup}{mediumexpanded}{sl}{
<-> ssub * Junicode-Sup/mediumexpanded/it
}{}
-% ---- bx = boldexpanded ----
-
-\DeclareFontShape{LY1}{Junicode-Sup}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{Junicode-Sup}{boldexpanded}{n}{
- <-> alias * Junicode-Sup/bx/n
-}{}
-
-\DeclareFontShape{LY1}{Junicode-Sup}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{Junicode-Sup}{boldexpanded}{it}{
- <-> alias * Junicode-Sup/bx/it
-}{}
-
-\DeclareFontShape{LY1}{Junicode-Sup}{bx}{sl}{
- <-> ssub * Junicode-Sup/bx/it
-}{}
-
-\DeclareFontShape{LY1}{Junicode-Sup}{boldexpanded}{sl}{
- <-> ssub * Junicode-Sup/boldexpanded/it
-}{}
-
-
-% ---- l = light ----
+% ---- lsc = lightsemicondensed ----
-\DeclareFontShape{LY1}{Junicode-Sup}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-sup-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{light}{it}{
- <-> alias * Junicode-Sup/l/it
+\DeclareFontShape{LY1}{Junicode-Sup}{lightsemicondensed}{n}{
+ <-> alias * Junicode-Sup/lsc/n
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-sup-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{light}{n}{
- <-> alias * Junicode-Sup/l/n
+\DeclareFontShape{LY1}{Junicode-Sup}{lightsemicondensed}{it}{
+ <-> alias * Junicode-Sup/lsc/it
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{l}{sl}{
- <-> ssub * Junicode-Sup/l/it
+\DeclareFontShape{LY1}{Junicode-Sup}{lsc}{sl}{
+ <-> ssub * Junicode-Sup/lsc/it
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{light}{sl}{
- <-> ssub * Junicode-Sup/light/it
+\DeclareFontShape{LY1}{Junicode-Sup}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-Sup/lightsemicondensed/it
}{}
-% ---- lsc = lightsemicondensed ----
+% ---- lc = lightcondensed ----
-\DeclareFontShape{LY1}{Junicode-Sup}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-sup-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{lightsemicondensed}{n}{
- <-> alias * Junicode-Sup/lsc/n
+\DeclareFontShape{LY1}{Junicode-Sup}{lightcondensed}{n}{
+ <-> alias * Junicode-Sup/lc/n
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-sup-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{lightsemicondensed}{it}{
- <-> alias * Junicode-Sup/lsc/it
+\DeclareFontShape{LY1}{Junicode-Sup}{lightcondensed}{it}{
+ <-> alias * Junicode-Sup/lc/it
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{lsc}{sl}{
- <-> ssub * Junicode-Sup/lsc/it
+\DeclareFontShape{LY1}{Junicode-Sup}{lc}{sl}{
+ <-> ssub * Junicode-Sup/lc/it
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-Sup/lightsemicondensed/it
+\DeclareFontShape{LY1}{Junicode-Sup}{lightcondensed}{sl}{
+ <-> ssub * Junicode-Sup/lightcondensed/it
}{}
-% ---- medium ----
+% ---- mediumsemiexpanded ----
-\DeclareFontShape{LY1}{Junicode-Sup}{medium}{it}{
- <-> \Junicode@@scale Junicode-MediumItalic-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-sup-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{medium}{n}{
- <-> \Junicode@@scale Junicode-Medium-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-sup-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{medium}{sl}{
- <-> ssub * Junicode-Sup/medium/it
+\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-Sup/mediumsemiexpanded/it
}{}
@@ -281,127 +239,119 @@
}{}
-% ---- b = bold ----
+% ---- medium ----
-\DeclareFontShape{LY1}{Junicode-Sup}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{medium}{it}{
+ <-> \Junicode@@scale Junicode-MediumItalic-sup-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{bold}{it}{
- <-> alias * Junicode-Sup/b/it
+\DeclareFontShape{LY1}{Junicode-Sup}{medium}{n}{
+ <-> \Junicode@@scale Junicode-Medium-sup-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{medium}{sl}{
+ <-> ssub * Junicode-Sup/medium/it
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{bold}{n}{
- <-> alias * Junicode-Sup/b/n
-}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{b}{sl}{
- <-> ssub * Junicode-Sup/b/it
-}{}
+% ---- bx = boldexpanded ----
-\DeclareFontShape{LY1}{Junicode-Sup}{bold}{sl}{
- <-> ssub * Junicode-Sup/bold/it
+\DeclareFontShape{LY1}{Junicode-Sup}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-sup-ly1
}{}
+\DeclareFontShape{LY1}{Junicode-Sup}{boldexpanded}{n}{
+ <-> alias * Junicode-Sup/bx/n
+}{}
-% ---- mediumcondensed ----
+\DeclareFontShape{LY1}{Junicode-Sup}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-sup-ly1
+}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{boldexpanded}{it}{
+ <-> alias * Junicode-Sup/bx/it
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{bx}{sl}{
+ <-> ssub * Junicode-Sup/bx/it
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{mediumcondensed}{sl}{
- <-> ssub * Junicode-Sup/mediumcondensed/it
+\DeclareFontShape{LY1}{Junicode-Sup}{boldexpanded}{sl}{
+ <-> ssub * Junicode-Sup/boldexpanded/it
}{}
-% ---- sbx = semiboldexpanded ----
+% ---- sx = semiexpanded ----
-\DeclareFontShape{LY1}{Junicode-Sup}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-sup-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{semiboldexpanded}{n}{
- <-> alias * Junicode-Sup/sbx/n
+\DeclareFontShape{LY1}{Junicode-Sup}{semiexpanded}{n}{
+ <-> alias * Junicode-Sup/sx/n
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-sup-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{semiboldexpanded}{it}{
- <-> alias * Junicode-Sup/sbx/it
+\DeclareFontShape{LY1}{Junicode-Sup}{semiexpanded}{it}{
+ <-> alias * Junicode-Sup/sx/it
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{sbx}{sl}{
- <-> ssub * Junicode-Sup/sbx/it
+\DeclareFontShape{LY1}{Junicode-Sup}{sx}{sl}{
+ <-> ssub * Junicode-Sup/sx/it
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-Sup/semiboldexpanded/it
+\DeclareFontShape{LY1}{Junicode-Sup}{semiexpanded}{sl}{
+ <-> ssub * Junicode-Sup/semiexpanded/it
}{}
-% ---- mediumsemicondensed ----
+% ---- l = light ----
-\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-sup-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{light}{it}{
+ <-> alias * Junicode-Sup/l/it
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-Sup/mediumsemicondensed/it
+\DeclareFontShape{LY1}{Junicode-Sup}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-sup-ly1
}{}
-
-% ---- sc = semicondensed ----
-
-\DeclareFontShape{LY1}{Junicode-Sup}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{light}{n}{
+ <-> alias * Junicode-Sup/l/n
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{semicondensed}{n}{
- <-> alias * Junicode-Sup/sc/n
+\DeclareFontShape{LY1}{Junicode-Sup}{l}{sl}{
+ <-> ssub * Junicode-Sup/l/it
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{sc}{it}{
- <-> \Junicode@@scale Junicode-SmCondItalic-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{light}{sl}{
+ <-> ssub * Junicode-Sup/light/it
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{semicondensed}{it}{
- <-> alias * Junicode-Sup/sc/it
+
+% ---- mediumsemicondensed ----
+
+\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-sup-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{sc}{sl}{
- <-> ssub * Junicode-Sup/sc/it
+\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-sup-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{semicondensed}{sl}{
- <-> ssub * Junicode-Sup/semicondensed/it
+\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-Sup/mediumsemicondensed/it
}{}
% ---- sb = semibold ----
-\DeclareFontShape{LY1}{Junicode-Sup}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{Junicode-Sup}{semibold}{it}{
- <-> alias * Junicode-Sup/sb/it
-}{}
-
\DeclareFontShape{LY1}{Junicode-Sup}{sb}{n}{
<-> \Junicode@@scale Junicode-SmBold-sup-ly1
}{}
@@ -410,6 +360,14 @@
<-> alias * Junicode-Sup/sb/n
}{}
+\DeclareFontShape{LY1}{Junicode-Sup}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Junicode-Sup}{semibold}{it}{
+ <-> alias * Junicode-Sup/sb/it
+}{}
+
\DeclareFontShape{LY1}{Junicode-Sup}{sb}{sl}{
<-> ssub * Junicode-Sup/sb/it
}{}
@@ -419,6 +377,21 @@
}{}
+% ---- mediumcondensed ----
+
+\DeclareFontShape{LY1}{Junicode-Sup}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Junicode-Sup}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Junicode-Sup}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-Sup/mediumcondensed/it
+}{}
+
+
% ---- bsx = boldsemiexpanded ----
\DeclareFontShape{LY1}{Junicode-Sup}{bsx}{it}{
@@ -446,30 +419,57 @@
}{}
-% ---- lc = lightcondensed ----
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{LY1}{Junicode-Sup}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-sup-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{lightcondensed}{n}{
- <-> alias * Junicode-Sup/lc/n
+\DeclareFontShape{LY1}{Junicode-Sup}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-Sup/sbsx/n
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-sup-ly1
+\DeclareFontShape{LY1}{Junicode-Sup}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-sup-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{lightcondensed}{it}{
- <-> alias * Junicode-Sup/lc/it
+\DeclareFontShape{LY1}{Junicode-Sup}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-Sup/sbsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{lc}{sl}{
- <-> ssub * Junicode-Sup/lc/it
+\DeclareFontShape{LY1}{Junicode-Sup}{sbsx}{sl}{
+ <-> ssub * Junicode-Sup/sbsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-Sup}{lightcondensed}{sl}{
- <-> ssub * Junicode-Sup/lightcondensed/it
+\DeclareFontShape{LY1}{Junicode-Sup}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-Sup/semiboldsemiexpanded/it
+}{}
+
+
+% ---- sc = semicondensed ----
+
+\DeclareFontShape{LY1}{Junicode-Sup}{sc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Junicode-Sup}{semicondensed}{it}{
+ <-> alias * Junicode-Sup/sc/it
+}{}
+
+\DeclareFontShape{LY1}{Junicode-Sup}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Junicode-Sup}{semicondensed}{n}{
+ <-> alias * Junicode-Sup/sc/n
+}{}
+
+\DeclareFontShape{LY1}{Junicode-Sup}{sc}{sl}{
+ <-> ssub * Junicode-Sup/sc/it
+}{}
+
+\DeclareFontShape{LY1}{Junicode-Sup}{semicondensed}{sl}{
+ <-> ssub * Junicode-Sup/semicondensed/it
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-TLF.fd b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-TLF.fd
index 9cabf8d170c..07d73da9c2c 100644
--- a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-TLF.fd
+++ b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{LY1Junicode-TLF.fd}
- [2024/06/03 (autoinst) Font definitions for LY1/Junicode-TLF.]
+ [2024/07/21 (autoinst) Font definitions for LY1/Junicode-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,852 +20,852 @@
\DeclareFontFamily{LY1}{Junicode-TLF}{}
-% ---- sbsx = semiboldsemiexpanded ----
+% ---- sc = semicondensed ----
-\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{sc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{sc}{
- <-> alias * Junicode-TLF/sbsx/sc
+\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{it}{
+ <-> alias * Junicode-TLF/sc/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{sc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-TLF/sbsx/n
+\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{scit}{
+ <-> alias * Junicode-TLF/sc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{scit}{
- <-> alias * Junicode-TLF/sbsx/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{n}{
+ <-> alias * Junicode-TLF/sc/n
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{sc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCond-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-TLF/sbsx/it
+\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{sc}{
+ <-> alias * Junicode-TLF/sc/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{scsl}{
- <-> ssub * Junicode-TLF/sbsx/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{sc}{sl}{
+ <-> ssub * Junicode-TLF/sc/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{scsl}{
- <-> ssub * Junicode-TLF/semiboldsemiexpanded/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{sl}{
+ <-> ssub * Junicode-TLF/semicondensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{sl}{
- <-> ssub * Junicode-TLF/sbsx/it
+\DeclareFontShape{LY1}{Junicode-TLF}{sc}{scsl}{
+ <-> ssub * Junicode-TLF/sc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-TLF/semiboldsemiexpanded/it
+\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{scsl}{
+ <-> ssub * Junicode-TLF/semicondensed/scit
}{}
-% ---- mediumexpanded ----
+% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{scit}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpBold-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{sc}{
+ <-> alias * Junicode-TLF/bsx/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{sc}{
- <-> \Junicode@@scale Junicode-ExpMedium-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-TLF/bsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{scsl}{
- <-> ssub * Junicode-TLF/mediumexpanded/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{sl}{
- <-> ssub * Junicode-TLF/mediumexpanded/it
+\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-TLF/bsx/n
}{}
-
-% ---- mediumsemiexpanded ----
-
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{sc}{
- <-> \Junicode@@scale Junicode-SmExpMedium-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{scit}{
+ <-> alias * Junicode-TLF/bsx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{scit}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{sl}{
+ <-> ssub * Junicode-TLF/bsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-TLF/boldsemiexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{scsl}{
- <-> ssub * Junicode-TLF/mediumsemiexpanded/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{scsl}{
+ <-> ssub * Junicode-TLF/bsx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-TLF/mediumsemiexpanded/it
+\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/boldsemiexpanded/scit
}{}
-% ---- sx = semiexpanded ----
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{LY1}{Junicode-TLF}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{it}{
- <-> alias * Junicode-TLF/sx/it
+\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{sc}{
+ <-> alias * Junicode-TLF/sbsx/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{scit}{
- <-> alias * Junicode-TLF/sx/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-TLF/sbsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{n}{
- <-> alias * Junicode-TLF/sx/n
+\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{scit}{
+ <-> alias * Junicode-TLF/sbsx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sx}{sc}{
- <-> \Junicode@@scale Junicode-SmExp-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{sc}{
- <-> alias * Junicode-TLF/sx/sc
+\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-TLF/sbsx/n
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sx}{scsl}{
- <-> ssub * Junicode-TLF/sx/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{sl}{
+ <-> ssub * Junicode-TLF/sbsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{scsl}{
- <-> ssub * Junicode-TLF/semiexpanded/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-TLF/semiboldsemiexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sx}{sl}{
- <-> ssub * Junicode-TLF/sx/it
+\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{scsl}{
+ <-> ssub * Junicode-TLF/sbsx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{sl}{
- <-> ssub * Junicode-TLF/semiexpanded/it
+\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/semiboldsemiexpanded/scit
}{}
-% ---- c = condensed ----
+% ---- mediumcondensed ----
-\DeclareFontShape{LY1}{Junicode-TLF}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{sc}{
+ <-> \Junicode@@scale Junicode-CondMedium-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{it}{
- <-> alias * Junicode-TLF/c/it
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{scit}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{c}{scit}{
- <-> \Junicode@@scale Junicode-CondItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{scit}{
- <-> alias * Junicode-TLF/c/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-TLF/mediumcondensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{n}{
- <-> alias * Junicode-TLF/c/n
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{scsl}{
+ <-> ssub * Junicode-TLF/mediumcondensed/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{c}{sc}{
- <-> \Junicode@@scale Junicode-Cond-tlf-sc-ly1
-}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{sc}{
- <-> alias * Junicode-TLF/c/sc
-}{}
+% ---- sb = semibold ----
-\DeclareFontShape{LY1}{Junicode-TLF}{c}{scsl}{
- <-> ssub * Junicode-TLF/c/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{sb}{sc}{
+ <-> \Junicode@@scale Junicode-SmBold-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{scsl}{
- <-> ssub * Junicode-TLF/condensed/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{sc}{
+ <-> alias * Junicode-TLF/sb/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{c}{sl}{
- <-> ssub * Junicode-TLF/c/it
+\DeclareFontShape{LY1}{Junicode-TLF}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{sl}{
- <-> ssub * Junicode-TLF/condensed/it
+\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{it}{
+ <-> alias * Junicode-TLF/sb/it
}{}
+\DeclareFontShape{LY1}{Junicode-TLF}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-tlf-ly1
+}{}
-% ---- x = expanded ----
+\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{n}{
+ <-> alias * Junicode-TLF/sb/n
+}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{x}{sc}{
- <-> \Junicode@@scale Junicode-Exp-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{sb}{scit}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{sc}{
- <-> alias * Junicode-TLF/x/sc
+\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{scit}{
+ <-> alias * Junicode-TLF/sb/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{sb}{sl}{
+ <-> ssub * Junicode-TLF/sb/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{n}{
- <-> alias * Junicode-TLF/x/n
+\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{sl}{
+ <-> ssub * Junicode-TLF/semibold/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{x}{scit}{
- <-> \Junicode@@scale Junicode-ExpItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{sb}{scsl}{
+ <-> ssub * Junicode-TLF/sb/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{scit}{
- <-> alias * Junicode-TLF/x/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{scsl}{
+ <-> ssub * Junicode-TLF/semibold/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-tlf-ly1
+
+% ---- mediumsemicondensed ----
+
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{it}{
- <-> alias * Junicode-TLF/x/it
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{x}{scsl}{
- <-> ssub * Junicode-TLF/x/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{scsl}{
- <-> ssub * Junicode-TLF/expanded/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{x}{sl}{
- <-> ssub * Junicode-TLF/x/it
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-TLF/mediumsemicondensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{sl}{
- <-> ssub * Junicode-TLF/expanded/it
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{scsl}{
+ <-> ssub * Junicode-TLF/mediumsemicondensed/scit
}{}
-% ---- m = regular ----
+% ---- l = light ----
-\DeclareFontShape{LY1}{Junicode-TLF}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{l}{sc}{
+ <-> \Junicode@@scale Junicode-Light-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{regular}{it}{
- <-> alias * Junicode-TLF/m/it
+\DeclareFontShape{LY1}{Junicode-TLF}{light}{sc}{
+ <-> alias * Junicode-TLF/l/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{m}{scit}{
- <-> \Junicode@@scale Junicode-Italic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{regular}{scit}{
- <-> alias * Junicode-TLF/m/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{light}{it}{
+ <-> alias * Junicode-TLF/l/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{regular}{n}{
- <-> alias * Junicode-TLF/m/n
+\DeclareFontShape{LY1}{Junicode-TLF}{light}{n}{
+ <-> alias * Junicode-TLF/l/n
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{m}{sc}{
- <-> \Junicode@@scale Junicode-Regular-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{l}{scit}{
+ <-> \Junicode@@scale Junicode-LightItalic-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{regular}{sc}{
- <-> alias * Junicode-TLF/m/sc
+\DeclareFontShape{LY1}{Junicode-TLF}{light}{scit}{
+ <-> alias * Junicode-TLF/l/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{m}{scsl}{
- <-> ssub * Junicode-TLF/m/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{l}{sl}{
+ <-> ssub * Junicode-TLF/l/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{regular}{scsl}{
- <-> ssub * Junicode-TLF/regular/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{light}{sl}{
+ <-> ssub * Junicode-TLF/light/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{m}{sl}{
- <-> ssub * Junicode-TLF/m/it
+\DeclareFontShape{LY1}{Junicode-TLF}{l}{scsl}{
+ <-> ssub * Junicode-TLF/l/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{regular}{sl}{
- <-> ssub * Junicode-TLF/regular/it
+\DeclareFontShape{LY1}{Junicode-TLF}{light}{scsl}{
+ <-> ssub * Junicode-TLF/light/scit
}{}
-% ---- lsc = lightsemicondensed ----
+% ---- sx = semiexpanded ----
-\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{sx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExp-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{n}{
- <-> alias * Junicode-TLF/lsc/n
+\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{sc}{
+ <-> alias * Junicode-TLF/sx/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{sc}{
- <-> \Junicode@@scale Junicode-SmCondLight-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{sc}{
- <-> alias * Junicode-TLF/lsc/sc
+\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{it}{
+ <-> alias * Junicode-TLF/sx/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{sx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{it}{
- <-> alias * Junicode-TLF/lsc/it
+\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{scit}{
+ <-> alias * Junicode-TLF/sx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{scit}{
- <-> alias * Junicode-TLF/lsc/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{n}{
+ <-> alias * Junicode-TLF/sx/n
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{scsl}{
- <-> ssub * Junicode-TLF/lsc/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{sx}{sl}{
+ <-> ssub * Junicode-TLF/sx/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{scsl}{
- <-> ssub * Junicode-TLF/lightsemicondensed/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{sl}{
+ <-> ssub * Junicode-TLF/semiexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{sl}{
- <-> ssub * Junicode-TLF/lsc/it
+\DeclareFontShape{LY1}{Junicode-TLF}{sx}{scsl}{
+ <-> ssub * Junicode-TLF/sx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-TLF/lightsemicondensed/it
+\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/semiexpanded/scit
}{}
% ---- medium ----
-\DeclareFontShape{LY1}{Junicode-TLF}{medium}{it}{
- <-> \Junicode@@scale Junicode-MediumItalic-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{medium}{sc}{
+ <-> \Junicode@@scale Junicode-Medium-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{medium}{scit}{
- <-> \Junicode@@scale Junicode-MediumItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{medium}{it}{
+ <-> \Junicode@@scale Junicode-MediumItalic-tlf-ly1
}{}
\DeclareFontShape{LY1}{Junicode-TLF}{medium}{n}{
<-> \Junicode@@scale Junicode-Medium-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{medium}{sc}{
- <-> \Junicode@@scale Junicode-Medium-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{Junicode-TLF}{medium}{scsl}{
- <-> ssub * Junicode-TLF/medium/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{medium}{scit}{
+ <-> \Junicode@@scale Junicode-MediumItalic-tlf-sc-ly1
}{}
\DeclareFontShape{LY1}{Junicode-TLF}{medium}{sl}{
<-> ssub * Junicode-TLF/medium/it
}{}
+\DeclareFontShape{LY1}{Junicode-TLF}{medium}{scsl}{
+ <-> ssub * Junicode-TLF/medium/scit
+}{}
+
-% ---- l = light ----
+% ---- bx = boldexpanded ----
-\DeclareFontShape{LY1}{Junicode-TLF}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{bx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpBold-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{light}{it}{
- <-> alias * Junicode-TLF/l/it
+\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{sc}{
+ <-> alias * Junicode-TLF/bx/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{l}{scit}{
- <-> \Junicode@@scale Junicode-LightItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{bx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{light}{scit}{
- <-> alias * Junicode-TLF/l/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{scit}{
+ <-> alias * Junicode-TLF/bx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{light}{n}{
- <-> alias * Junicode-TLF/l/n
+\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{n}{
+ <-> alias * Junicode-TLF/bx/n
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{l}{sc}{
- <-> \Junicode@@scale Junicode-Light-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{light}{sc}{
- <-> alias * Junicode-TLF/l/sc
+\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{it}{
+ <-> alias * Junicode-TLF/bx/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{l}{scsl}{
- <-> ssub * Junicode-TLF/l/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{bx}{sl}{
+ <-> ssub * Junicode-TLF/bx/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{light}{scsl}{
- <-> ssub * Junicode-TLF/light/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{sl}{
+ <-> ssub * Junicode-TLF/boldexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{l}{sl}{
- <-> ssub * Junicode-TLF/l/it
+\DeclareFontShape{LY1}{Junicode-TLF}{bx}{scsl}{
+ <-> ssub * Junicode-TLF/bx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{light}{sl}{
- <-> ssub * Junicode-TLF/light/it
+\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/boldexpanded/scit
}{}
-% ---- bx = boldexpanded ----
+% ---- mediumsemiexpanded ----
-\DeclareFontShape{LY1}{Junicode-TLF}{bx}{sc}{
- <-> \Junicode@@scale Junicode-ExpBold-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{sc}{
- <-> alias * Junicode-TLF/bx/sc
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{n}{
- <-> alias * Junicode-TLF/bx/n
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{bx}{scit}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-TLF/mediumsemiexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{scit}{
- <-> alias * Junicode-TLF/bx/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/mediumsemiexpanded/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-ly1
-}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{it}{
- <-> alias * Junicode-TLF/bx/it
-}{}
+% ---- m = regular ----
-\DeclareFontShape{LY1}{Junicode-TLF}{bx}{scsl}{
- <-> ssub * Junicode-TLF/bx/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{scsl}{
- <-> ssub * Junicode-TLF/boldexpanded/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{regular}{it}{
+ <-> alias * Junicode-TLF/m/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{bx}{sl}{
- <-> ssub * Junicode-TLF/bx/it
+\DeclareFontShape{LY1}{Junicode-TLF}{m}{scit}{
+ <-> \Junicode@@scale Junicode-Italic-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{sl}{
- <-> ssub * Junicode-TLF/boldexpanded/it
+\DeclareFontShape{LY1}{Junicode-TLF}{regular}{scit}{
+ <-> alias * Junicode-TLF/m/scit
}{}
+\DeclareFontShape{LY1}{Junicode-TLF}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-tlf-ly1
+}{}
-% ---- mediumcondensed ----
+\DeclareFontShape{LY1}{Junicode-TLF}{regular}{n}{
+ <-> alias * Junicode-TLF/m/n
+}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{scit}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{m}{sc}{
+ <-> \Junicode@@scale Junicode-Regular-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{regular}{sc}{
+ <-> alias * Junicode-TLF/m/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{sc}{
- <-> \Junicode@@scale Junicode-CondMedium-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{m}{sl}{
+ <-> ssub * Junicode-TLF/m/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{regular}{sl}{
+ <-> ssub * Junicode-TLF/regular/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{scsl}{
- <-> ssub * Junicode-TLF/mediumcondensed/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{m}{scsl}{
+ <-> ssub * Junicode-TLF/m/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{sl}{
- <-> ssub * Junicode-TLF/mediumcondensed/it
+\DeclareFontShape{LY1}{Junicode-TLF}{regular}{scsl}{
+ <-> ssub * Junicode-TLF/regular/scit
}{}
-% ---- b = bold ----
+% ---- lc = lightcondensed ----
-\DeclareFontShape{LY1}{Junicode-TLF}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{bold}{n}{
- <-> alias * Junicode-TLF/b/n
+\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{it}{
+ <-> alias * Junicode-TLF/lc/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{b}{sc}{
- <-> \Junicode@@scale Junicode-Bold-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{lc}{scit}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{bold}{sc}{
- <-> alias * Junicode-TLF/b/sc
+\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{scit}{
+ <-> alias * Junicode-TLF/lc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{bold}{it}{
- <-> alias * Junicode-TLF/b/it
+\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{n}{
+ <-> alias * Junicode-TLF/lc/n
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{b}{scit}{
- <-> \Junicode@@scale Junicode-BoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{lc}{sc}{
+ <-> \Junicode@@scale Junicode-CondLight-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{bold}{scit}{
- <-> alias * Junicode-TLF/b/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{sc}{
+ <-> alias * Junicode-TLF/lc/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{b}{scsl}{
- <-> ssub * Junicode-TLF/b/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{lc}{sl}{
+ <-> ssub * Junicode-TLF/lc/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{bold}{scsl}{
- <-> ssub * Junicode-TLF/bold/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{sl}{
+ <-> ssub * Junicode-TLF/lightcondensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{b}{sl}{
- <-> ssub * Junicode-TLF/b/it
+\DeclareFontShape{LY1}{Junicode-TLF}{lc}{scsl}{
+ <-> ssub * Junicode-TLF/lc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{bold}{sl}{
- <-> ssub * Junicode-TLF/bold/it
+\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{scsl}{
+ <-> ssub * Junicode-TLF/lightcondensed/scit
}{}
-% ---- bsx = boldsemiexpanded ----
+% ---- lsc = lightsemicondensed ----
-\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{n}{
- <-> alias * Junicode-TLF/bsx/n
+\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{it}{
+ <-> alias * Junicode-TLF/lsc/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpBold-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{sc}{
- <-> alias * Junicode-TLF/bsx/sc
+\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{scit}{
+ <-> alias * Junicode-TLF/lsc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{it}{
- <-> alias * Junicode-TLF/bsx/it
+\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{n}{
+ <-> alias * Junicode-TLF/lsc/n
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondLight-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{scit}{
- <-> alias * Junicode-TLF/bsx/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{sc}{
+ <-> alias * Junicode-TLF/lsc/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{scsl}{
- <-> ssub * Junicode-TLF/bsx/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{sl}{
+ <-> ssub * Junicode-TLF/lsc/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{scsl}{
- <-> ssub * Junicode-TLF/boldsemiexpanded/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-TLF/lightsemicondensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{sl}{
- <-> ssub * Junicode-TLF/bsx/it
+\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{scsl}{
+ <-> ssub * Junicode-TLF/lsc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-TLF/boldsemiexpanded/it
+\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{scsl}{
+ <-> ssub * Junicode-TLF/lightsemicondensed/scit
}{}
-% ---- lc = lightcondensed ----
+% ---- mediumexpanded ----
-\DeclareFontShape{LY1}{Junicode-TLF}{lc}{sc}{
- <-> \Junicode@@scale Junicode-CondLight-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-ExpMedium-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{sc}{
- <-> alias * Junicode-TLF/lc/sc
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{n}{
- <-> alias * Junicode-TLF/lc/n
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{lc}{scit}{
- <-> \Junicode@@scale Junicode-CondLightItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-TLF/mediumexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{scit}{
- <-> alias * Junicode-TLF/lc/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/mediumexpanded/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-tlf-ly1
-}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{it}{
- <-> alias * Junicode-TLF/lc/it
-}{}
+% ---- b = bold ----
-\DeclareFontShape{LY1}{Junicode-TLF}{lc}{scsl}{
- <-> ssub * Junicode-TLF/lc/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{b}{sc}{
+ <-> \Junicode@@scale Junicode-Bold-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{scsl}{
- <-> ssub * Junicode-TLF/lightcondensed/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{bold}{sc}{
+ <-> alias * Junicode-TLF/b/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{lc}{sl}{
- <-> ssub * Junicode-TLF/lc/it
+\DeclareFontShape{LY1}{Junicode-TLF}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{sl}{
- <-> ssub * Junicode-TLF/lightcondensed/it
+\DeclareFontShape{LY1}{Junicode-TLF}{bold}{n}{
+ <-> alias * Junicode-TLF/b/n
}{}
-
-% ---- sc = semicondensed ----
-
-\DeclareFontShape{LY1}{Junicode-TLF}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{b}{scit}{
+ <-> \Junicode@@scale Junicode-BoldItalic-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{n}{
- <-> alias * Junicode-TLF/sc/n
+\DeclareFontShape{LY1}{Junicode-TLF}{bold}{scit}{
+ <-> alias * Junicode-TLF/b/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sc}{sc}{
- <-> \Junicode@@scale Junicode-SmCond-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{sc}{
- <-> alias * Junicode-TLF/sc/sc
+\DeclareFontShape{LY1}{Junicode-TLF}{bold}{it}{
+ <-> alias * Junicode-TLF/b/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sc}{it}{
- <-> \Junicode@@scale Junicode-SmCondItalic-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{b}{sl}{
+ <-> ssub * Junicode-TLF/b/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{it}{
- <-> alias * Junicode-TLF/sc/it
+\DeclareFontShape{LY1}{Junicode-TLF}{bold}{sl}{
+ <-> ssub * Junicode-TLF/bold/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{b}{scsl}{
+ <-> ssub * Junicode-TLF/b/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{scit}{
- <-> alias * Junicode-TLF/sc/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{bold}{scsl}{
+ <-> ssub * Junicode-TLF/bold/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sc}{scsl}{
- <-> ssub * Junicode-TLF/sc/scit
-}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{scsl}{
- <-> ssub * Junicode-TLF/semicondensed/scit
-}{}
+% ---- x = expanded ----
-\DeclareFontShape{LY1}{Junicode-TLF}{sc}{sl}{
- <-> ssub * Junicode-TLF/sc/it
+\DeclareFontShape{LY1}{Junicode-TLF}{x}{sc}{
+ <-> \Junicode@@scale Junicode-Exp-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{sl}{
- <-> ssub * Junicode-TLF/semicondensed/it
+\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{sc}{
+ <-> alias * Junicode-TLF/x/sc
}{}
+\DeclareFontShape{LY1}{Junicode-TLF}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-tlf-ly1
+}{}
-% ---- sb = semibold ----
+\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{n}{
+ <-> alias * Junicode-TLF/x/n
+}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sb}{sc}{
- <-> \Junicode@@scale Junicode-SmBold-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{x}{scit}{
+ <-> \Junicode@@scale Junicode-ExpItalic-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{sc}{
- <-> alias * Junicode-TLF/sb/sc
+\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{scit}{
+ <-> alias * Junicode-TLF/x/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{n}{
- <-> alias * Junicode-TLF/sb/n
+\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{it}{
+ <-> alias * Junicode-TLF/x/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sb}{scit}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{x}{sl}{
+ <-> ssub * Junicode-TLF/x/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{scit}{
- <-> alias * Junicode-TLF/sb/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{sl}{
+ <-> ssub * Junicode-TLF/expanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{x}{scsl}{
+ <-> ssub * Junicode-TLF/x/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{it}{
- <-> alias * Junicode-TLF/sb/it
+\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{scsl}{
+ <-> ssub * Junicode-TLF/expanded/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sb}{scsl}{
- <-> ssub * Junicode-TLF/sb/scit
+
+% ---- sbx = semiboldexpanded ----
+
+\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{scsl}{
- <-> ssub * Junicode-TLF/semibold/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{sc}{
+ <-> alias * Junicode-TLF/sbx/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sb}{sl}{
- <-> ssub * Junicode-TLF/sb/it
+\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{sl}{
- <-> ssub * Junicode-TLF/semibold/it
+\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{it}{
+ <-> alias * Junicode-TLF/sbx/it
}{}
+\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-tlf-ly1
+}{}
-% ---- mediumsemicondensed ----
+\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{n}{
+ <-> alias * Junicode-TLF/sbx/n
+}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{sc}{
- <-> \Junicode@@scale Junicode-SmCondMedium-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{scit}{
+ <-> alias * Junicode-TLF/sbx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{scit}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{sl}{
+ <-> ssub * Junicode-TLF/sbx/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-TLF/semiboldexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{scsl}{
- <-> ssub * Junicode-TLF/mediumsemicondensed/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{scsl}{
+ <-> ssub * Junicode-TLF/sbx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-TLF/mediumsemicondensed/it
+\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/semiboldexpanded/scit
}{}
-% ---- sbx = semiboldexpanded ----
+% ---- c = condensed ----
-\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{scit}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{c}{scit}{
+ <-> \Junicode@@scale Junicode-CondItalic-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{scit}{
- <-> alias * Junicode-TLF/sbx/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{scit}{
+ <-> alias * Junicode-TLF/c/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{it}{
- <-> alias * Junicode-TLF/sbx/it
+\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{n}{
+ <-> alias * Junicode-TLF/c/n
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{sc}{
- <-> \Junicode@@scale Junicode-ExpSmBold-tlf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-tlf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{sc}{
- <-> alias * Junicode-TLF/sbx/sc
+\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{it}{
+ <-> alias * Junicode-TLF/c/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-tlf-ly1
+\DeclareFontShape{LY1}{Junicode-TLF}{c}{sc}{
+ <-> \Junicode@@scale Junicode-Cond-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{n}{
- <-> alias * Junicode-TLF/sbx/n
+\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{sc}{
+ <-> alias * Junicode-TLF/c/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{scsl}{
- <-> ssub * Junicode-TLF/sbx/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{c}{sl}{
+ <-> ssub * Junicode-TLF/c/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{scsl}{
- <-> ssub * Junicode-TLF/semiboldexpanded/scit
+\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{sl}{
+ <-> ssub * Junicode-TLF/condensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{sl}{
- <-> ssub * Junicode-TLF/sbx/it
+\DeclareFontShape{LY1}{Junicode-TLF}{c}{scsl}{
+ <-> ssub * Junicode-TLF/c/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-TLF/semiboldexpanded/it
+\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{scsl}{
+ <-> ssub * Junicode-TLF/condensed/scit
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-TOsF.fd b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-TOsF.fd
index b9e848b1a19..8465d1cb00a 100644
--- a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{LY1Junicode-TOsF.fd}
- [2024/06/03 (autoinst) Font definitions for LY1/Junicode-TOsF.]
+ [2024/07/21 (autoinst) Font definitions for LY1/Junicode-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,204 +20,215 @@
\DeclareFontFamily{LY1}{Junicode-TOsF}{}
-% ---- medium ----
+% ---- lc = lightcondensed ----
-\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{scit}{
- <-> \Junicode@@scale Junicode-MediumItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{sc}{
+ <-> \Junicode@@scale Junicode-CondLight-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{it}{
- <-> \Junicode@@scale Junicode-MediumItalic-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{sc}{
+ <-> alias * Junicode-TOsF/lc/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{sc}{
- <-> \Junicode@@scale Junicode-Medium-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{n}{
- <-> \Junicode@@scale Junicode-Medium-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{it}{
+ <-> alias * Junicode-TOsF/lc/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{scsl}{
- <-> ssub * Junicode-TOsF/medium/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{scit}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{sl}{
- <-> ssub * Junicode-TOsF/medium/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{scit}{
+ <-> alias * Junicode-TOsF/lc/scit
}{}
-
-% ---- lsc = lightsemicondensed ----
-
-\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{it}{
- <-> alias * Junicode-TOsF/lsc/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{n}{
+ <-> alias * Junicode-TOsF/lc/n
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{sl}{
+ <-> ssub * Junicode-TOsF/lc/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{scit}{
- <-> alias * Junicode-TOsF/lsc/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{sl}{
+ <-> ssub * Junicode-TOsF/lightcondensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{scsl}{
+ <-> ssub * Junicode-TOsF/lc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{n}{
- <-> alias * Junicode-TOsF/lsc/n
+\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{scsl}{
+ <-> ssub * Junicode-TOsF/lightcondensed/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{sc}{
- <-> \Junicode@@scale Junicode-SmCondLight-tosf-sc-ly1
+
+% ---- medium ----
+
+\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{sc}{
+ <-> \Junicode@@scale Junicode-Medium-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{sc}{
- <-> alias * Junicode-TOsF/lsc/sc
+\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{it}{
+ <-> \Junicode@@scale Junicode-MediumItalic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{scsl}{
- <-> ssub * Junicode-TOsF/lsc/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{scit}{
+ <-> \Junicode@@scale Junicode-MediumItalic-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{scsl}{
- <-> ssub * Junicode-TOsF/lightsemicondensed/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{n}{
+ <-> \Junicode@@scale Junicode-Medium-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{sl}{
- <-> ssub * Junicode-TOsF/lsc/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{sl}{
+ <-> ssub * Junicode-TOsF/medium/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-TOsF/lightsemicondensed/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{scsl}{
+ <-> ssub * Junicode-TOsF/medium/scit
}{}
-% ---- m = regular ----
+% ---- bx = boldexpanded ----
-\DeclareFontShape{LY1}{Junicode-TOsF}{m}{sc}{
- <-> \Junicode@@scale Junicode-Regular-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{sc}{
- <-> alias * Junicode-TOsF/m/sc
+\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{scit}{
+ <-> alias * Junicode-TOsF/bx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{n}{
- <-> alias * Junicode-TOsF/m/n
+\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{n}{
+ <-> alias * Junicode-TOsF/bx/n
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{m}{scit}{
- <-> \Junicode@@scale Junicode-Italic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{scit}{
- <-> alias * Junicode-TOsF/m/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{it}{
+ <-> alias * Junicode-TOsF/bx/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpBold-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{it}{
- <-> alias * Junicode-TOsF/m/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{sc}{
+ <-> alias * Junicode-TOsF/bx/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{m}{scsl}{
- <-> ssub * Junicode-TOsF/m/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{sl}{
+ <-> ssub * Junicode-TOsF/bx/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{scsl}{
- <-> ssub * Junicode-TOsF/regular/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/boldexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{m}{sl}{
- <-> ssub * Junicode-TOsF/m/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{scsl}{
+ <-> ssub * Junicode-TOsF/bx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{sl}{
- <-> ssub * Junicode-TOsF/regular/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/boldexpanded/scit
}{}
-% ---- bx = boldexpanded ----
+% ---- mediumsemiexpanded ----
-\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{it}{
- <-> alias * Junicode-TOsF/bx/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{scit}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{scit}{
- <-> alias * Junicode-TOsF/bx/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/mediumsemiexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{n}{
- <-> alias * Junicode-TOsF/bx/n
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/mediumsemiexpanded/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{sc}{
- <-> \Junicode@@scale Junicode-ExpBold-tosf-sc-ly1
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{Junicode-TOsF}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{sc}{
- <-> alias * Junicode-TOsF/bx/sc
+\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{it}{
+ <-> alias * Junicode-TOsF/m/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{scsl}{
- <-> ssub * Junicode-TOsF/bx/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/boldexpanded/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{n}{
+ <-> alias * Junicode-TOsF/m/n
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{sl}{
- <-> ssub * Junicode-TOsF/bx/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{m}{scit}{
+ <-> \Junicode@@scale Junicode-Italic-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{sl}{
- <-> ssub * Junicode-TOsF/boldexpanded/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{scit}{
+ <-> alias * Junicode-TOsF/m/scit
}{}
+\DeclareFontShape{LY1}{Junicode-TOsF}{m}{sc}{
+ <-> \Junicode@@scale Junicode-Regular-tosf-sc-ly1
+}{}
-% ---- l = light ----
+\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{sc}{
+ <-> alias * Junicode-TOsF/m/sc
+}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{m}{sl}{
+ <-> ssub * Junicode-TOsF/m/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{light}{n}{
- <-> alias * Junicode-TOsF/l/n
+\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{sl}{
+ <-> ssub * Junicode-TOsF/regular/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{l}{sc}{
- <-> \Junicode@@scale Junicode-Light-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{m}{scsl}{
+ <-> ssub * Junicode-TOsF/m/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{light}{sc}{
- <-> alias * Junicode-TOsF/l/sc
+\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{scsl}{
+ <-> ssub * Junicode-TOsF/regular/scit
}{}
+
+% ---- l = light ----
+
\DeclareFontShape{LY1}{Junicode-TOsF}{l}{it}{
<-> \Junicode@@scale Junicode-LightItalic-tosf-ly1
}{}
@@ -234,12 +245,20 @@
<-> alias * Junicode-TOsF/l/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{l}{scsl}{
- <-> ssub * Junicode-TOsF/l/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{light}{scsl}{
- <-> ssub * Junicode-TOsF/light/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{light}{n}{
+ <-> alias * Junicode-TOsF/l/n
+}{}
+
+\DeclareFontShape{LY1}{Junicode-TOsF}{l}{sc}{
+ <-> \Junicode@@scale Junicode-Light-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Junicode-TOsF}{light}{sc}{
+ <-> alias * Junicode-TOsF/l/sc
}{}
\DeclareFontShape{LY1}{Junicode-TOsF}{l}{sl}{
@@ -250,283 +269,275 @@
<-> ssub * Junicode-TOsF/light/it
}{}
-
-% ---- mediumsemiexpanded ----
-
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{l}{scsl}{
+ <-> ssub * Junicode-TOsF/l/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{scit}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{light}{scsl}{
+ <-> ssub * Junicode-TOsF/light/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-tosf-ly1
+
+% ---- sx = semiexpanded ----
+
+\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExp-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{sc}{
- <-> \Junicode@@scale Junicode-SmExpMedium-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{sc}{
+ <-> alias * Junicode-TOsF/sx/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/mediumsemiexpanded/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-TOsF/mediumsemiexpanded/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{it}{
+ <-> alias * Junicode-TOsF/sx/it
}{}
+\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-tosf-sc-ly1
+}{}
-% ---- mediumexpanded ----
+\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{scit}{
+ <-> alias * Junicode-TOsF/sx/scit
+}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{scit}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{n}{
+ <-> alias * Junicode-TOsF/sx/n
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{sc}{
- <-> \Junicode@@scale Junicode-ExpMedium-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{sl}{
+ <-> ssub * Junicode-TOsF/sx/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/semiexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/mediumexpanded/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{scsl}{
+ <-> ssub * Junicode-TOsF/sx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{sl}{
- <-> ssub * Junicode-TOsF/mediumexpanded/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/semiexpanded/scit
}{}
-% ---- sbsx = semiboldsemiexpanded ----
+% ---- mediumsemicondensed ----
-\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-TOsF/sbsx/n
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{sc}{
- <-> alias * Junicode-TOsF/sbsx/sc
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-TOsF/mediumsemicondensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-TOsF/sbsx/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{scsl}{
+ <-> ssub * Junicode-TOsF/mediumsemicondensed/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-sc-ly1
+
+% ---- mediumcondensed ----
+
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{scit}{
- <-> alias * Junicode-TOsF/sbsx/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{scit}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{scsl}{
- <-> ssub * Junicode-TOsF/sbsx/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/semiboldsemiexpanded/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{sc}{
+ <-> \Junicode@@scale Junicode-CondMedium-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{sl}{
- <-> ssub * Junicode-TOsF/sbsx/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-TOsF/mediumcondensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-TOsF/semiboldsemiexpanded/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{scsl}{
+ <-> ssub * Junicode-TOsF/mediumcondensed/scit
}{}
-% ---- x = expanded ----
+% ---- sb = semibold ----
-\DeclareFontShape{LY1}{Junicode-TOsF}{x}{sc}{
- <-> \Junicode@@scale Junicode-Exp-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{sc}{
- <-> alias * Junicode-TOsF/x/sc
+\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{it}{
+ <-> alias * Junicode-TOsF/sb/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{scit}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{n}{
- <-> alias * Junicode-TOsF/x/n
+\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{scit}{
+ <-> alias * Junicode-TOsF/sb/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{x}{scit}{
- <-> \Junicode@@scale Junicode-ExpItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{scit}{
- <-> alias * Junicode-TOsF/x/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{n}{
+ <-> alias * Junicode-TOsF/sb/n
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{sc}{
+ <-> \Junicode@@scale Junicode-SmBold-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{it}{
- <-> alias * Junicode-TOsF/x/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{sc}{
+ <-> alias * Junicode-TOsF/sb/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{x}{scsl}{
- <-> ssub * Junicode-TOsF/x/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{sl}{
+ <-> ssub * Junicode-TOsF/sb/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{scsl}{
- <-> ssub * Junicode-TOsF/expanded/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{sl}{
+ <-> ssub * Junicode-TOsF/semibold/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{x}{sl}{
- <-> ssub * Junicode-TOsF/x/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{scsl}{
+ <-> ssub * Junicode-TOsF/sb/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{sl}{
- <-> ssub * Junicode-TOsF/expanded/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{scsl}{
+ <-> ssub * Junicode-TOsF/semibold/scit
}{}
-% ---- c = condensed ----
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{LY1}{Junicode-TOsF}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{it}{
- <-> alias * Junicode-TOsF/c/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-TOsF/sbsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{c}{scit}{
- <-> \Junicode@@scale Junicode-CondItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{scit}{
- <-> alias * Junicode-TOsF/c/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{scit}{
+ <-> alias * Junicode-TOsF/sbsx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{n}{
- <-> alias * Junicode-TOsF/c/n
+\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-TOsF/sbsx/n
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{c}{sc}{
- <-> \Junicode@@scale Junicode-Cond-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{sc}{
- <-> alias * Junicode-TOsF/c/sc
+\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{sc}{
+ <-> alias * Junicode-TOsF/sbsx/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{c}{scsl}{
- <-> ssub * Junicode-TOsF/c/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{sl}{
+ <-> ssub * Junicode-TOsF/sbsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{scsl}{
- <-> ssub * Junicode-TOsF/condensed/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/semiboldsemiexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{c}{sl}{
- <-> ssub * Junicode-TOsF/c/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{scsl}{
+ <-> ssub * Junicode-TOsF/sbsx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{sl}{
- <-> ssub * Junicode-TOsF/condensed/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/semiboldsemiexpanded/scit
}{}
-% ---- sx = semiexpanded ----
+% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{it}{
- <-> alias * Junicode-TOsF/sx/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{scit}{
+ <-> alias * Junicode-TOsF/bsx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{scit}{
- <-> alias * Junicode-TOsF/sx/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-TOsF/bsx/n
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{n}{
- <-> alias * Junicode-TOsF/sx/n
+\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-TOsF/bsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{sc}{
- <-> \Junicode@@scale Junicode-SmExp-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpBold-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{sc}{
- <-> alias * Junicode-TOsF/sx/sc
+\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{sc}{
+ <-> alias * Junicode-TOsF/bsx/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{scsl}{
- <-> ssub * Junicode-TOsF/sx/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{sl}{
+ <-> ssub * Junicode-TOsF/bsx/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/semiexpanded/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/boldsemiexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{sl}{
- <-> ssub * Junicode-TOsF/sx/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{scsl}{
+ <-> ssub * Junicode-TOsF/bsx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{sl}{
- <-> ssub * Junicode-TOsF/semiexpanded/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/boldsemiexpanded/scit
}{}
% ---- sc = semicondensed ----
-\DeclareFontShape{LY1}{Junicode-TOsF}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-tosf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Junicode-TOsF}{semicondensed}{n}{
- <-> alias * Junicode-TOsF/sc/n
-}{}
-
-\DeclareFontShape{LY1}{Junicode-TOsF}{sc}{sc}{
- <-> \Junicode@@scale Junicode-SmCond-tosf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{Junicode-TOsF}{semicondensed}{sc}{
- <-> alias * Junicode-TOsF/sc/sc
-}{}
-
\DeclareFontShape{LY1}{Junicode-TOsF}{sc}{it}{
<-> \Junicode@@scale Junicode-SmCondItalic-tosf-ly1
}{}
@@ -535,6 +546,14 @@
<-> alias * Junicode-TOsF/sc/it
}{}
+\DeclareFontShape{LY1}{Junicode-TOsF}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Junicode-TOsF}{semicondensed}{n}{
+ <-> alias * Junicode-TOsF/sc/n
+}{}
+
\DeclareFontShape{LY1}{Junicode-TOsF}{sc}{scit}{
<-> \Junicode@@scale Junicode-SmCondItalic-tosf-sc-ly1
}{}
@@ -543,12 +562,12 @@
<-> alias * Junicode-TOsF/sc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{sc}{scsl}{
- <-> ssub * Junicode-TOsF/sc/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{sc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCond-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semicondensed}{scsl}{
- <-> ssub * Junicode-TOsF/semicondensed/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{semicondensed}{sc}{
+ <-> alias * Junicode-TOsF/sc/sc
}{}
\DeclareFontShape{LY1}{Junicode-TOsF}{sc}{sl}{
@@ -559,313 +578,294 @@
<-> ssub * Junicode-TOsF/semicondensed/it
}{}
-
-% ---- sb = semibold ----
-
-\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{sc}{scsl}{
+ <-> ssub * Junicode-TOsF/sc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{n}{
- <-> alias * Junicode-TOsF/sb/n
+\DeclareFontShape{LY1}{Junicode-TOsF}{semicondensed}{scsl}{
+ <-> ssub * Junicode-TOsF/semicondensed/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{sc}{
- <-> \Junicode@@scale Junicode-SmBold-tosf-sc-ly1
-}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{sc}{
- <-> alias * Junicode-TOsF/sb/sc
-}{}
+% ---- c = condensed ----
-\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{c}{sc}{
+ <-> \Junicode@@scale Junicode-Cond-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{it}{
- <-> alias * Junicode-TOsF/sb/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{sc}{
+ <-> alias * Junicode-TOsF/c/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{scit}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{scit}{
- <-> alias * Junicode-TOsF/sb/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{it}{
+ <-> alias * Junicode-TOsF/c/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{scsl}{
- <-> ssub * Junicode-TOsF/sb/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{scsl}{
- <-> ssub * Junicode-TOsF/semibold/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{n}{
+ <-> alias * Junicode-TOsF/c/n
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{sl}{
- <-> ssub * Junicode-TOsF/sb/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{c}{scit}{
+ <-> \Junicode@@scale Junicode-CondItalic-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{sl}{
- <-> ssub * Junicode-TOsF/semibold/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{scit}{
+ <-> alias * Junicode-TOsF/c/scit
}{}
-
-% ---- bsx = boldsemiexpanded ----
-
-\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{c}{sl}{
+ <-> ssub * Junicode-TOsF/c/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{scit}{
- <-> alias * Junicode-TOsF/bsx/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{sl}{
+ <-> ssub * Junicode-TOsF/condensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{c}{scsl}{
+ <-> ssub * Junicode-TOsF/c/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{it}{
- <-> alias * Junicode-TOsF/bsx/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{scsl}{
+ <-> ssub * Junicode-TOsF/condensed/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpBold-tosf-sc-ly1
-}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{sc}{
- <-> alias * Junicode-TOsF/bsx/sc
-}{}
+% ---- sbx = semiboldexpanded ----
-\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{n}{
- <-> alias * Junicode-TOsF/bsx/n
+\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{sc}{
+ <-> alias * Junicode-TOsF/sbx/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{scsl}{
- <-> ssub * Junicode-TOsF/bsx/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/boldsemiexpanded/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{it}{
+ <-> alias * Junicode-TOsF/sbx/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{sl}{
- <-> ssub * Junicode-TOsF/bsx/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-TOsF/boldsemiexpanded/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{n}{
+ <-> alias * Junicode-TOsF/sbx/n
}{}
-
-% ---- lc = lightcondensed ----
-
-\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{it}{
- <-> alias * Junicode-TOsF/lc/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{scit}{
+ <-> alias * Junicode-TOsF/sbx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{scit}{
- <-> \Junicode@@scale Junicode-CondLightItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{sl}{
+ <-> ssub * Junicode-TOsF/sbx/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{scit}{
- <-> alias * Junicode-TOsF/lc/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/semiboldexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{scsl}{
+ <-> ssub * Junicode-TOsF/sbx/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{n}{
- <-> alias * Junicode-TOsF/lc/n
+\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/semiboldexpanded/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{sc}{
- <-> \Junicode@@scale Junicode-CondLight-tosf-sc-ly1
-}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{sc}{
- <-> alias * Junicode-TOsF/lc/sc
-}{}
+% ---- b = bold ----
-\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{scsl}{
- <-> ssub * Junicode-TOsF/lc/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{scsl}{
- <-> ssub * Junicode-TOsF/lightcondensed/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{n}{
+ <-> alias * Junicode-TOsF/b/n
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{sl}{
- <-> ssub * Junicode-TOsF/lc/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{b}{scit}{
+ <-> \Junicode@@scale Junicode-BoldItalic-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{sl}{
- <-> ssub * Junicode-TOsF/lightcondensed/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{scit}{
+ <-> alias * Junicode-TOsF/b/scit
}{}
-
-% ---- sbx = semiboldexpanded ----
-
-\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{it}{
- <-> alias * Junicode-TOsF/sbx/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{it}{
+ <-> alias * Junicode-TOsF/b/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{scit}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{b}{sc}{
+ <-> \Junicode@@scale Junicode-Bold-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{scit}{
- <-> alias * Junicode-TOsF/sbx/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{sc}{
+ <-> alias * Junicode-TOsF/b/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{b}{sl}{
+ <-> ssub * Junicode-TOsF/b/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{n}{
- <-> alias * Junicode-TOsF/sbx/n
+\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{sl}{
+ <-> ssub * Junicode-TOsF/bold/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{sc}{
- <-> \Junicode@@scale Junicode-ExpSmBold-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{b}{scsl}{
+ <-> ssub * Junicode-TOsF/b/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{sc}{
- <-> alias * Junicode-TOsF/sbx/sc
+\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{scsl}{
+ <-> ssub * Junicode-TOsF/bold/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{scsl}{
- <-> ssub * Junicode-TOsF/sbx/scit
+
+% ---- x = expanded ----
+
+\DeclareFontShape{LY1}{Junicode-TOsF}{x}{sc}{
+ <-> \Junicode@@scale Junicode-Exp-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/semiboldexpanded/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{sc}{
+ <-> alias * Junicode-TOsF/x/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{sl}{
- <-> ssub * Junicode-TOsF/sbx/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-TOsF/semiboldexpanded/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{n}{
+ <-> alias * Junicode-TOsF/x/n
}{}
+\DeclareFontShape{LY1}{Junicode-TOsF}{x}{scit}{
+ <-> \Junicode@@scale Junicode-ExpItalic-tosf-sc-ly1
+}{}
-% ---- mediumsemicondensed ----
+\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{scit}{
+ <-> alias * Junicode-TOsF/x/scit
+}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{sc}{
- <-> \Junicode@@scale Junicode-SmCondMedium-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{it}{
+ <-> alias * Junicode-TOsF/x/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{scit}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{x}{sl}{
+ <-> ssub * Junicode-TOsF/x/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{sl}{
+ <-> ssub * Junicode-TOsF/expanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{scsl}{
- <-> ssub * Junicode-TOsF/mediumsemicondensed/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{x}{scsl}{
+ <-> ssub * Junicode-TOsF/x/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-TOsF/mediumsemicondensed/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{scsl}{
+ <-> ssub * Junicode-TOsF/expanded/scit
}{}
-% ---- mediumcondensed ----
+% ---- mediumexpanded ----
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{scit}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-ExpMedium-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{sc}{
- <-> \Junicode@@scale Junicode-CondMedium-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{scsl}{
- <-> ssub * Junicode-TOsF/mediumcondensed/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/mediumexpanded/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{sl}{
- <-> ssub * Junicode-TOsF/mediumcondensed/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/mediumexpanded/scit
}{}
-% ---- b = bold ----
+% ---- lsc = lightsemicondensed ----
-\DeclareFontShape{LY1}{Junicode-TOsF}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{n}{
- <-> alias * Junicode-TOsF/b/n
+\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{it}{
+ <-> alias * Junicode-TOsF/lsc/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{b}{sc}{
- <-> \Junicode@@scale Junicode-Bold-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{sc}{
- <-> alias * Junicode-TOsF/b/sc
+\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{scit}{
+ <-> alias * Junicode-TOsF/lsc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-tosf-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{it}{
- <-> alias * Junicode-TOsF/b/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{n}{
+ <-> alias * Junicode-TOsF/lsc/n
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{b}{scit}{
- <-> \Junicode@@scale Junicode-BoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondLight-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{scit}{
- <-> alias * Junicode-TOsF/b/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{sc}{
+ <-> alias * Junicode-TOsF/lsc/sc
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{b}{scsl}{
- <-> ssub * Junicode-TOsF/b/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{sl}{
+ <-> ssub * Junicode-TOsF/lsc/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{scsl}{
- <-> ssub * Junicode-TOsF/bold/scit
+\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-TOsF/lightsemicondensed/it
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{b}{sl}{
- <-> ssub * Junicode-TOsF/b/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{scsl}{
+ <-> ssub * Junicode-TOsF/lsc/scit
}{}
-\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{sl}{
- <-> ssub * Junicode-TOsF/bold/it
+\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{scsl}{
+ <-> ssub * Junicode-TOsF/lightsemicondensed/scit
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-Inf.fd b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-Inf.fd
index bb6dc563984..10a023e6710 100644
--- a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-Inf.fd
+++ b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{OT1Junicode-Inf.fd}
- [2024/06/03 (autoinst) Font definitions for OT1/Junicode-Inf.]
+ [2024/07/21 (autoinst) Font definitions for OT1/Junicode-Inf.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,111 +20,99 @@
\DeclareFontFamily{OT1}{Junicode-Inf}{}
-% ---- sb = semibold ----
-
-\DeclareFontShape{OT1}{Junicode-Inf}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-inf-ot1
-}{}
+% ---- lsc = lightsemicondensed ----
-\DeclareFontShape{OT1}{Junicode-Inf}{semibold}{it}{
- <-> alias * Junicode-Inf/sb/it
+\DeclareFontShape{OT1}{Junicode-Inf}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{lightsemicondensed}{n}{
+ <-> alias * Junicode-Inf/lsc/n
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{semibold}{n}{
- <-> alias * Junicode-Inf/sb/n
+\DeclareFontShape{OT1}{Junicode-Inf}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{sb}{sl}{
- <-> ssub * Junicode-Inf/sb/it
+\DeclareFontShape{OT1}{Junicode-Inf}{lightsemicondensed}{it}{
+ <-> alias * Junicode-Inf/lsc/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{semibold}{sl}{
- <-> ssub * Junicode-Inf/semibold/it
+\DeclareFontShape{OT1}{Junicode-Inf}{lsc}{sl}{
+ <-> ssub * Junicode-Inf/lsc/it
}{}
-
-% ---- sc = semicondensed ----
-
-\DeclareFontShape{OT1}{Junicode-Inf}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-Inf/lightsemicondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{semicondensed}{n}{
- <-> alias * Junicode-Inf/sc/n
-}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{sc}{it}{
- <-> \Junicode@@scale Junicode-SmCondItalic-inf-ot1
-}{}
+% ---- mediumexpanded ----
-\DeclareFontShape{OT1}{Junicode-Inf}{semicondensed}{it}{
- <-> alias * Junicode-Inf/sc/it
+\DeclareFontShape{OT1}{Junicode-Inf}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{sc}{sl}{
- <-> ssub * Junicode-Inf/sc/it
+\DeclareFontShape{OT1}{Junicode-Inf}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{semicondensed}{sl}{
- <-> ssub * Junicode-Inf/semicondensed/it
+\DeclareFontShape{OT1}{Junicode-Inf}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-Inf/mediumexpanded/it
}{}
-% ---- bsx = boldsemiexpanded ----
+% ---- b = bold ----
-\DeclareFontShape{OT1}{Junicode-Inf}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{boldsemiexpanded}{n}{
- <-> alias * Junicode-Inf/bsx/n
+\DeclareFontShape{OT1}{Junicode-Inf}{bold}{it}{
+ <-> alias * Junicode-Inf/b/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{boldsemiexpanded}{it}{
- <-> alias * Junicode-Inf/bsx/it
+\DeclareFontShape{OT1}{Junicode-Inf}{bold}{n}{
+ <-> alias * Junicode-Inf/b/n
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{bsx}{sl}{
- <-> ssub * Junicode-Inf/bsx/it
+\DeclareFontShape{OT1}{Junicode-Inf}{b}{sl}{
+ <-> ssub * Junicode-Inf/b/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-Inf/boldsemiexpanded/it
+\DeclareFontShape{OT1}{Junicode-Inf}{bold}{sl}{
+ <-> ssub * Junicode-Inf/bold/it
}{}
-% ---- lc = lightcondensed ----
+% ---- x = expanded ----
-\DeclareFontShape{OT1}{Junicode-Inf}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{lightcondensed}{it}{
- <-> alias * Junicode-Inf/lc/it
+\DeclareFontShape{OT1}{Junicode-Inf}{expanded}{it}{
+ <-> alias * Junicode-Inf/x/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{lightcondensed}{n}{
- <-> alias * Junicode-Inf/lc/n
+\DeclareFontShape{OT1}{Junicode-Inf}{expanded}{n}{
+ <-> alias * Junicode-Inf/x/n
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{lc}{sl}{
- <-> ssub * Junicode-Inf/lc/it
+\DeclareFontShape{OT1}{Junicode-Inf}{x}{sl}{
+ <-> ssub * Junicode-Inf/x/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{lightcondensed}{sl}{
- <-> ssub * Junicode-Inf/lightcondensed/it
+\DeclareFontShape{OT1}{Junicode-Inf}{expanded}{sl}{
+ <-> ssub * Junicode-Inf/expanded/it
}{}
@@ -155,156 +143,168 @@
}{}
-% ---- mediumsemicondensed ----
+% ---- c = condensed ----
-\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{condensed}{it}{
+ <-> alias * Junicode-Inf/c/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-Inf/mediumsemicondensed/it
+\DeclareFontShape{OT1}{Junicode-Inf}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-inf-ot1
}{}
-
-% ---- mediumcondensed ----
-
-\DeclareFontShape{OT1}{Junicode-Inf}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{condensed}{n}{
+ <-> alias * Junicode-Inf/c/n
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{c}{sl}{
+ <-> ssub * Junicode-Inf/c/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{mediumcondensed}{sl}{
- <-> ssub * Junicode-Inf/mediumcondensed/it
+\DeclareFontShape{OT1}{Junicode-Inf}{condensed}{sl}{
+ <-> ssub * Junicode-Inf/condensed/it
}{}
-% ---- b = bold ----
+% ---- sc = semicondensed ----
-\DeclareFontShape{OT1}{Junicode-Inf}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{sc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{bold}{it}{
- <-> alias * Junicode-Inf/b/it
+\DeclareFontShape{OT1}{Junicode-Inf}{semicondensed}{it}{
+ <-> alias * Junicode-Inf/sc/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{bold}{n}{
- <-> alias * Junicode-Inf/b/n
+\DeclareFontShape{OT1}{Junicode-Inf}{semicondensed}{n}{
+ <-> alias * Junicode-Inf/sc/n
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{b}{sl}{
- <-> ssub * Junicode-Inf/b/it
+\DeclareFontShape{OT1}{Junicode-Inf}{sc}{sl}{
+ <-> ssub * Junicode-Inf/sc/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{bold}{sl}{
- <-> ssub * Junicode-Inf/bold/it
+\DeclareFontShape{OT1}{Junicode-Inf}{semicondensed}{sl}{
+ <-> ssub * Junicode-Inf/semicondensed/it
}{}
-% ---- medium ----
+% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{OT1}{Junicode-Inf}{medium}{it}{
- <-> \Junicode@@scale Junicode-MediumItalic-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{medium}{n}{
- <-> \Junicode@@scale Junicode-Medium-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-Inf/bsx/n
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{medium}{sl}{
- <-> ssub * Junicode-Inf/medium/it
+\DeclareFontShape{OT1}{Junicode-Inf}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-inf-ot1
}{}
+\DeclareFontShape{OT1}{Junicode-Inf}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-Inf/bsx/it
+}{}
-% ---- lsc = lightsemicondensed ----
+\DeclareFontShape{OT1}{Junicode-Inf}{bsx}{sl}{
+ <-> ssub * Junicode-Inf/bsx/it
+}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-Inf/boldsemiexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{lightsemicondensed}{it}{
- <-> alias * Junicode-Inf/lsc/it
+
+% ---- sbsx = semiboldsemiexpanded ----
+
+\DeclareFontShape{OT1}{Junicode-Inf}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-Inf/sbsx/n
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{lightsemicondensed}{n}{
- <-> alias * Junicode-Inf/lsc/n
+\DeclareFontShape{OT1}{Junicode-Inf}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{lsc}{sl}{
- <-> ssub * Junicode-Inf/lsc/it
+\DeclareFontShape{OT1}{Junicode-Inf}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-Inf/sbsx/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-Inf/lightsemicondensed/it
+\DeclareFontShape{OT1}{Junicode-Inf}{sbsx}{sl}{
+ <-> ssub * Junicode-Inf/sbsx/it
}{}
+\DeclareFontShape{OT1}{Junicode-Inf}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-Inf/semiboldsemiexpanded/it
+}{}
-% ---- m = regular ----
-\DeclareFontShape{OT1}{Junicode-Inf}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-inf-ot1
-}{}
+% ---- mediumcondensed ----
-\DeclareFontShape{OT1}{Junicode-Inf}{regular}{it}{
- <-> alias * Junicode-Inf/m/it
+\DeclareFontShape{OT1}{Junicode-Inf}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{regular}{n}{
- <-> alias * Junicode-Inf/m/n
+\DeclareFontShape{OT1}{Junicode-Inf}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-Inf/mediumcondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{m}{sl}{
- <-> ssub * Junicode-Inf/m/it
-}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{regular}{sl}{
- <-> ssub * Junicode-Inf/regular/it
+% ---- sb = semibold ----
+
+\DeclareFontShape{OT1}{Junicode-Inf}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-inf-ot1
}{}
+\DeclareFontShape{OT1}{Junicode-Inf}{semibold}{it}{
+ <-> alias * Junicode-Inf/sb/it
+}{}
-% ---- bx = boldexpanded ----
+\DeclareFontShape{OT1}{Junicode-Inf}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-inf-ot1
+}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{semibold}{n}{
+ <-> alias * Junicode-Inf/sb/n
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{boldexpanded}{it}{
- <-> alias * Junicode-Inf/bx/it
+\DeclareFontShape{OT1}{Junicode-Inf}{sb}{sl}{
+ <-> ssub * Junicode-Inf/sb/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{semibold}{sl}{
+ <-> ssub * Junicode-Inf/semibold/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{boldexpanded}{n}{
- <-> alias * Junicode-Inf/bx/n
+
+% ---- mediumsemicondensed ----
+
+\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{bx}{sl}{
- <-> ssub * Junicode-Inf/bx/it
+\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{boldexpanded}{sl}{
- <-> ssub * Junicode-Inf/boldexpanded/it
+\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-Inf/mediumsemicondensed/it
}{}
@@ -335,141 +335,141 @@
}{}
-% ---- mediumsemiexpanded ----
+% ---- sx = semiexpanded ----
-\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{semiexpanded}{n}{
+ <-> alias * Junicode-Inf/sx/n
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-Inf/mediumsemiexpanded/it
+\DeclareFontShape{OT1}{Junicode-Inf}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-inf-ot1
}{}
-
-% ---- mediumexpanded ----
-
-\DeclareFontShape{OT1}{Junicode-Inf}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{semiexpanded}{it}{
+ <-> alias * Junicode-Inf/sx/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{sx}{sl}{
+ <-> ssub * Junicode-Inf/sx/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{mediumexpanded}{sl}{
- <-> ssub * Junicode-Inf/mediumexpanded/it
+\DeclareFontShape{OT1}{Junicode-Inf}{semiexpanded}{sl}{
+ <-> ssub * Junicode-Inf/semiexpanded/it
}{}
-% ---- sbsx = semiboldsemiexpanded ----
+% ---- medium ----
-\DeclareFontShape{OT1}{Junicode-Inf}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{medium}{n}{
+ <-> \Junicode@@scale Junicode-Medium-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-Inf/sbsx/n
+\DeclareFontShape{OT1}{Junicode-Inf}{medium}{it}{
+ <-> \Junicode@@scale Junicode-MediumItalic-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{medium}{sl}{
+ <-> ssub * Junicode-Inf/medium/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-Inf/sbsx/it
-}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{sbsx}{sl}{
- <-> ssub * Junicode-Inf/sbsx/it
-}{}
+% ---- bx = boldexpanded ----
-\DeclareFontShape{OT1}{Junicode-Inf}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-Inf/semiboldsemiexpanded/it
+\DeclareFontShape{OT1}{Junicode-Inf}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-inf-ot1
}{}
+\DeclareFontShape{OT1}{Junicode-Inf}{boldexpanded}{n}{
+ <-> alias * Junicode-Inf/bx/n
+}{}
-% ---- c = condensed ----
+\DeclareFontShape{OT1}{Junicode-Inf}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-inf-ot1
+}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{boldexpanded}{it}{
+ <-> alias * Junicode-Inf/bx/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{condensed}{n}{
- <-> alias * Junicode-Inf/c/n
+\DeclareFontShape{OT1}{Junicode-Inf}{bx}{sl}{
+ <-> ssub * Junicode-Inf/bx/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{boldexpanded}{sl}{
+ <-> ssub * Junicode-Inf/boldexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{condensed}{it}{
- <-> alias * Junicode-Inf/c/it
+
+% ---- mediumsemiexpanded ----
+
+\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{c}{sl}{
- <-> ssub * Junicode-Inf/c/it
+\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{condensed}{sl}{
- <-> ssub * Junicode-Inf/condensed/it
+\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-Inf/mediumsemiexpanded/it
}{}
-% ---- x = expanded ----
+% ---- m = regular ----
-\DeclareFontShape{OT1}{Junicode-Inf}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{expanded}{n}{
- <-> alias * Junicode-Inf/x/n
+\DeclareFontShape{OT1}{Junicode-Inf}{regular}{it}{
+ <-> alias * Junicode-Inf/m/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{expanded}{it}{
- <-> alias * Junicode-Inf/x/it
+\DeclareFontShape{OT1}{Junicode-Inf}{regular}{n}{
+ <-> alias * Junicode-Inf/m/n
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{x}{sl}{
- <-> ssub * Junicode-Inf/x/it
+\DeclareFontShape{OT1}{Junicode-Inf}{m}{sl}{
+ <-> ssub * Junicode-Inf/m/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{expanded}{sl}{
- <-> ssub * Junicode-Inf/expanded/it
+\DeclareFontShape{OT1}{Junicode-Inf}{regular}{sl}{
+ <-> ssub * Junicode-Inf/regular/it
}{}
-% ---- sx = semiexpanded ----
+% ---- lc = lightcondensed ----
-\DeclareFontShape{OT1}{Junicode-Inf}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{semiexpanded}{n}{
- <-> alias * Junicode-Inf/sx/n
+\DeclareFontShape{OT1}{Junicode-Inf}{lightcondensed}{n}{
+ <-> alias * Junicode-Inf/lc/n
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-inf-ot1
+\DeclareFontShape{OT1}{Junicode-Inf}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-inf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{semiexpanded}{it}{
- <-> alias * Junicode-Inf/sx/it
+\DeclareFontShape{OT1}{Junicode-Inf}{lightcondensed}{it}{
+ <-> alias * Junicode-Inf/lc/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{sx}{sl}{
- <-> ssub * Junicode-Inf/sx/it
+\DeclareFontShape{OT1}{Junicode-Inf}{lc}{sl}{
+ <-> ssub * Junicode-Inf/lc/it
}{}
-\DeclareFontShape{OT1}{Junicode-Inf}{semiexpanded}{sl}{
- <-> ssub * Junicode-Inf/semiexpanded/it
+\DeclareFontShape{OT1}{Junicode-Inf}{lightcondensed}{sl}{
+ <-> ssub * Junicode-Inf/lightcondensed/it
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-LF.fd b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-LF.fd
index a04c33f8827..28dd9eb8717 100644
--- a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-LF.fd
+++ b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{OT1Junicode-LF.fd}
- [2024/06/03 (autoinst) Font definitions for OT1/Junicode-LF.]
+ [2024/07/21 (autoinst) Font definitions for OT1/Junicode-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,207 +20,210 @@
\DeclareFontFamily{OT1}{Junicode-LF}{}
-% ---- l = light ----
+% ---- mediumsemicondensed ----
-\DeclareFontShape{OT1}{Junicode-LF}{l}{scit}{
- <-> \Junicode@@scale Junicode-LightItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{light}{scit}{
- <-> alias * Junicode-LF/l/scit
+\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{light}{it}{
- <-> alias * Junicode-LF/l/it
+\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{l}{sc}{
- <-> \Junicode@@scale Junicode-Light-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-LF/mediumsemicondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{light}{sc}{
- <-> alias * Junicode-LF/l/sc
+\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{scsl}{
+ <-> ssub * Junicode-LF/mediumsemicondensed/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-lf-ot1
-}{}
-\DeclareFontShape{OT1}{Junicode-LF}{light}{n}{
- <-> alias * Junicode-LF/l/n
-}{}
+% ---- sx = semiexpanded ----
-\DeclareFontShape{OT1}{Junicode-LF}{l}{scsl}{
- <-> ssub * Junicode-LF/l/scit
+\DeclareFontShape{OT1}{Junicode-LF}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{light}{scsl}{
- <-> ssub * Junicode-LF/light/scit
+\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{n}{
+ <-> alias * Junicode-LF/sx/n
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{l}{sl}{
- <-> ssub * Junicode-LF/l/it
+\DeclareFontShape{OT1}{Junicode-LF}{sx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{light}{sl}{
- <-> ssub * Junicode-LF/light/it
+\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{scit}{
+ <-> alias * Junicode-LF/sx/scit
}{}
-
-% ---- bx = boldexpanded ----
-
-\DeclareFontShape{OT1}{Junicode-LF}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{n}{
- <-> alias * Junicode-LF/bx/n
+\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{it}{
+ <-> alias * Junicode-LF/sx/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{bx}{sc}{
- <-> \Junicode@@scale Junicode-ExpBold-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{sx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExp-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{sc}{
- <-> alias * Junicode-LF/bx/sc
+\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{sc}{
+ <-> alias * Junicode-LF/sx/sc
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{sx}{sl}{
+ <-> ssub * Junicode-LF/sx/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{it}{
- <-> alias * Junicode-LF/bx/it
+\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{sl}{
+ <-> ssub * Junicode-LF/semiexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{bx}{scit}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{sx}{scsl}{
+ <-> ssub * Junicode-LF/sx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{scit}{
- <-> alias * Junicode-LF/bx/scit
+\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{scsl}{
+ <-> ssub * Junicode-LF/semiexpanded/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{bx}{scsl}{
- <-> ssub * Junicode-LF/bx/scit
+
+% ---- l = light ----
+
+\DeclareFontShape{OT1}{Junicode-LF}{l}{sc}{
+ <-> \Junicode@@scale Junicode-Light-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{scsl}{
- <-> ssub * Junicode-LF/boldexpanded/scit
+\DeclareFontShape{OT1}{Junicode-LF}{light}{sc}{
+ <-> alias * Junicode-LF/l/sc
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{bx}{sl}{
- <-> ssub * Junicode-LF/bx/it
+\DeclareFontShape{OT1}{Junicode-LF}{l}{scit}{
+ <-> \Junicode@@scale Junicode-LightItalic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{sl}{
- <-> ssub * Junicode-LF/boldexpanded/it
+\DeclareFontShape{OT1}{Junicode-LF}{light}{scit}{
+ <-> alias * Junicode-LF/l/scit
}{}
+\DeclareFontShape{OT1}{Junicode-LF}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-lf-ot1
+}{}
-% ---- m = regular ----
+\DeclareFontShape{OT1}{Junicode-LF}{light}{n}{
+ <-> alias * Junicode-LF/l/n
+}{}
-\DeclareFontShape{OT1}{Junicode-LF}{m}{scit}{
- <-> \Junicode@@scale Junicode-Italic-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{regular}{scit}{
- <-> alias * Junicode-LF/m/scit
+\DeclareFontShape{OT1}{Junicode-LF}{light}{it}{
+ <-> alias * Junicode-LF/l/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{l}{sl}{
+ <-> ssub * Junicode-LF/l/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{regular}{it}{
- <-> alias * Junicode-LF/m/it
+\DeclareFontShape{OT1}{Junicode-LF}{light}{sl}{
+ <-> ssub * Junicode-LF/light/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{m}{sc}{
- <-> \Junicode@@scale Junicode-Regular-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{l}{scsl}{
+ <-> ssub * Junicode-LF/l/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{regular}{sc}{
- <-> alias * Junicode-LF/m/sc
+\DeclareFontShape{OT1}{Junicode-LF}{light}{scsl}{
+ <-> ssub * Junicode-LF/light/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-lf-ot1
+
+% ---- mediumsemiexpanded ----
+
+\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{regular}{n}{
- <-> alias * Junicode-LF/m/n
+\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{m}{scsl}{
- <-> ssub * Junicode-LF/m/scit
+\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{regular}{scsl}{
- <-> ssub * Junicode-LF/regular/scit
+\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{m}{sl}{
- <-> ssub * Junicode-LF/m/it
+\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-LF/mediumsemiexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{regular}{sl}{
- <-> ssub * Junicode-LF/regular/it
+\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{scsl}{
+ <-> ssub * Junicode-LF/mediumsemiexpanded/scit
}{}
-% ---- lsc = lightsemicondensed ----
+% ---- m = regular ----
-\DeclareFontShape{OT1}{Junicode-LF}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{n}{
- <-> alias * Junicode-LF/lsc/n
+\DeclareFontShape{OT1}{Junicode-LF}{regular}{n}{
+ <-> alias * Junicode-LF/m/n
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{lsc}{sc}{
- <-> \Junicode@@scale Junicode-SmCondLight-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{m}{scit}{
+ <-> \Junicode@@scale Junicode-Italic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{sc}{
- <-> alias * Junicode-LF/lsc/sc
+\DeclareFontShape{OT1}{Junicode-LF}{regular}{scit}{
+ <-> alias * Junicode-LF/m/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{it}{
- <-> alias * Junicode-LF/lsc/it
+\DeclareFontShape{OT1}{Junicode-LF}{regular}{it}{
+ <-> alias * Junicode-LF/m/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{lsc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{m}{sc}{
+ <-> \Junicode@@scale Junicode-Regular-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{scit}{
- <-> alias * Junicode-LF/lsc/scit
+\DeclareFontShape{OT1}{Junicode-LF}{regular}{sc}{
+ <-> alias * Junicode-LF/m/sc
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{lsc}{scsl}{
- <-> ssub * Junicode-LF/lsc/scit
+\DeclareFontShape{OT1}{Junicode-LF}{m}{sl}{
+ <-> ssub * Junicode-LF/m/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{scsl}{
- <-> ssub * Junicode-LF/lightsemicondensed/scit
+\DeclareFontShape{OT1}{Junicode-LF}{regular}{sl}{
+ <-> ssub * Junicode-LF/regular/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{lsc}{sl}{
- <-> ssub * Junicode-LF/lsc/it
+\DeclareFontShape{OT1}{Junicode-LF}{m}{scsl}{
+ <-> ssub * Junicode-LF/m/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-LF/lightsemicondensed/it
+\DeclareFontShape{OT1}{Junicode-LF}{regular}{scsl}{
+ <-> ssub * Junicode-LF/regular/scit
}{}
@@ -230,177 +233,177 @@
<-> \Junicode@@scale Junicode-MediumItalic-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{medium}{scit}{
- <-> \Junicode@@scale Junicode-MediumItalic-lf-sc-ot1
-}{}
-
\DeclareFontShape{OT1}{Junicode-LF}{medium}{n}{
<-> \Junicode@@scale Junicode-Medium-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{medium}{sc}{
- <-> \Junicode@@scale Junicode-Medium-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{medium}{scit}{
+ <-> \Junicode@@scale Junicode-MediumItalic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{medium}{scsl}{
- <-> ssub * Junicode-LF/medium/scit
+\DeclareFontShape{OT1}{Junicode-LF}{medium}{sc}{
+ <-> \Junicode@@scale Junicode-Medium-lf-sc-ot1
}{}
\DeclareFontShape{OT1}{Junicode-LF}{medium}{sl}{
<-> ssub * Junicode-LF/medium/it
}{}
+\DeclareFontShape{OT1}{Junicode-LF}{medium}{scsl}{
+ <-> ssub * Junicode-LF/medium/scit
+}{}
-% ---- sx = semiexpanded ----
-\DeclareFontShape{OT1}{Junicode-LF}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-lf-ot1
+% ---- bx = boldexpanded ----
+
+\DeclareFontShape{OT1}{Junicode-LF}{bx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpBold-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{it}{
- <-> alias * Junicode-LF/sx/it
+\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{sc}{
+ <-> alias * Junicode-LF/bx/sc
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{sx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{scit}{
- <-> alias * Junicode-LF/sx/scit
+\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{n}{
+ <-> alias * Junicode-LF/bx/n
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{bx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{n}{
- <-> alias * Junicode-LF/sx/n
+\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{scit}{
+ <-> alias * Junicode-LF/bx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{sx}{sc}{
- <-> \Junicode@@scale Junicode-SmExp-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{sc}{
- <-> alias * Junicode-LF/sx/sc
+\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{it}{
+ <-> alias * Junicode-LF/bx/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{sx}{scsl}{
- <-> ssub * Junicode-LF/sx/scit
+\DeclareFontShape{OT1}{Junicode-LF}{bx}{sl}{
+ <-> ssub * Junicode-LF/bx/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{scsl}{
- <-> ssub * Junicode-LF/semiexpanded/scit
+\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{sl}{
+ <-> ssub * Junicode-LF/boldexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{sx}{sl}{
- <-> ssub * Junicode-LF/sx/it
+\DeclareFontShape{OT1}{Junicode-LF}{bx}{scsl}{
+ <-> ssub * Junicode-LF/bx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{sl}{
- <-> ssub * Junicode-LF/semiexpanded/it
+\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{scsl}{
+ <-> ssub * Junicode-LF/boldexpanded/scit
}{}
-% ---- c = condensed ----
+% ---- lc = lightcondensed ----
-\DeclareFontShape{OT1}{Junicode-LF}{c}{sc}{
- <-> \Junicode@@scale Junicode-Cond-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{condensed}{sc}{
- <-> alias * Junicode-LF/c/sc
+\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{it}{
+ <-> alias * Junicode-LF/lc/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{lc}{scit}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{condensed}{n}{
- <-> alias * Junicode-LF/c/n
+\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{scit}{
+ <-> alias * Junicode-LF/lc/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{c}{scit}{
- <-> \Junicode@@scale Junicode-CondItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{condensed}{scit}{
- <-> alias * Junicode-LF/c/scit
+\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{n}{
+ <-> alias * Junicode-LF/lc/n
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{lc}{sc}{
+ <-> \Junicode@@scale Junicode-CondLight-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{condensed}{it}{
- <-> alias * Junicode-LF/c/it
+\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{sc}{
+ <-> alias * Junicode-LF/lc/sc
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{c}{scsl}{
- <-> ssub * Junicode-LF/c/scit
+\DeclareFontShape{OT1}{Junicode-LF}{lc}{sl}{
+ <-> ssub * Junicode-LF/lc/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{condensed}{scsl}{
- <-> ssub * Junicode-LF/condensed/scit
+\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{sl}{
+ <-> ssub * Junicode-LF/lightcondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{c}{sl}{
- <-> ssub * Junicode-LF/c/it
+\DeclareFontShape{OT1}{Junicode-LF}{lc}{scsl}{
+ <-> ssub * Junicode-LF/lc/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{condensed}{sl}{
- <-> ssub * Junicode-LF/condensed/it
+\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{scsl}{
+ <-> ssub * Junicode-LF/lightcondensed/scit
}{}
-% ---- x = expanded ----
+% ---- sc = semicondensed ----
-\DeclareFontShape{OT1}{Junicode-LF}{x}{sc}{
- <-> \Junicode@@scale Junicode-Exp-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{sc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCond-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{expanded}{sc}{
- <-> alias * Junicode-LF/x/sc
+\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{sc}{
+ <-> alias * Junicode-LF/sc/sc
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{expanded}{n}{
- <-> alias * Junicode-LF/x/n
+\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{n}{
+ <-> alias * Junicode-LF/sc/n
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{x}{scit}{
- <-> \Junicode@@scale Junicode-ExpItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{sc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{expanded}{scit}{
- <-> alias * Junicode-LF/x/scit
+\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{scit}{
+ <-> alias * Junicode-LF/sc/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{sc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{expanded}{it}{
- <-> alias * Junicode-LF/x/it
+\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{it}{
+ <-> alias * Junicode-LF/sc/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{x}{scsl}{
- <-> ssub * Junicode-LF/x/scit
+\DeclareFontShape{OT1}{Junicode-LF}{sc}{sl}{
+ <-> ssub * Junicode-LF/sc/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{expanded}{scsl}{
- <-> ssub * Junicode-LF/expanded/scit
+\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{sl}{
+ <-> ssub * Junicode-LF/semicondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{x}{sl}{
- <-> ssub * Junicode-LF/x/it
+\DeclareFontShape{OT1}{Junicode-LF}{sc}{scsl}{
+ <-> ssub * Junicode-LF/sc/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{expanded}{sl}{
- <-> ssub * Junicode-LF/expanded/it
+\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{scsl}{
+ <-> ssub * Junicode-LF/semicondensed/scit
}{}
@@ -438,6 +441,14 @@
<-> alias * Junicode-LF/sbsx/it
}{}
+\DeclareFontShape{OT1}{Junicode-LF}{sbsx}{sl}{
+ <-> ssub * Junicode-LF/sbsx/it
+}{}
+
+\DeclareFontShape{OT1}{Junicode-LF}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-LF/semiboldsemiexpanded/it
+}{}
+
\DeclareFontShape{OT1}{Junicode-LF}{sbsx}{scsl}{
<-> ssub * Junicode-LF/sbsx/scit
}{}
@@ -446,93 +457,133 @@
<-> ssub * Junicode-LF/semiboldsemiexpanded/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{sbsx}{sl}{
- <-> ssub * Junicode-LF/sbsx/it
+
+% ---- bsx = boldsemiexpanded ----
+
+\DeclareFontShape{OT1}{Junicode-LF}{bsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpBold-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-LF/semiboldsemiexpanded/it
+\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{sc}{
+ <-> alias * Junicode-LF/bsx/sc
}{}
+\DeclareFontShape{OT1}{Junicode-LF}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-ot1
+}{}
-% ---- mediumexpanded ----
+\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-LF/bsx/it
+}{}
-\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{sc}{
- <-> \Junicode@@scale Junicode-ExpMedium-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-LF/bsx/n
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{scit}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{bsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{scit}{
+ <-> alias * Junicode-LF/bsx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{scsl}{
- <-> ssub * Junicode-LF/mediumexpanded/scit
+\DeclareFontShape{OT1}{Junicode-LF}{bsx}{sl}{
+ <-> ssub * Junicode-LF/bsx/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{sl}{
- <-> ssub * Junicode-LF/mediumexpanded/it
+\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-LF/boldsemiexpanded/it
}{}
+\DeclareFontShape{OT1}{Junicode-LF}{bsx}{scsl}{
+ <-> ssub * Junicode-LF/bsx/scit
+}{}
-% ---- mediumsemiexpanded ----
+\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-LF/boldsemiexpanded/scit
+}{}
-\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{scit}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-sc-ot1
+
+% ---- sb = semibold ----
+
+\DeclareFontShape{OT1}{Junicode-LF}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{semibold}{n}{
+ <-> alias * Junicode-LF/sb/n
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{sc}{
- <-> \Junicode@@scale Junicode-SmExpMedium-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{sb}{scit}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{semibold}{scit}{
+ <-> alias * Junicode-LF/sb/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{scsl}{
- <-> ssub * Junicode-LF/mediumsemiexpanded/scit
+\DeclareFontShape{OT1}{Junicode-LF}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-LF/mediumsemiexpanded/it
+\DeclareFontShape{OT1}{Junicode-LF}{semibold}{it}{
+ <-> alias * Junicode-LF/sb/it
}{}
+\DeclareFontShape{OT1}{Junicode-LF}{sb}{sc}{
+ <-> \Junicode@@scale Junicode-SmBold-lf-sc-ot1
+}{}
-% ---- mediumsemicondensed ----
+\DeclareFontShape{OT1}{Junicode-LF}{semibold}{sc}{
+ <-> alias * Junicode-LF/sb/sc
+}{}
-\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{sc}{
- <-> \Junicode@@scale Junicode-SmCondMedium-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{sb}{sl}{
+ <-> ssub * Junicode-LF/sb/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{semibold}{sl}{
+ <-> ssub * Junicode-LF/semibold/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{scit}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{sb}{scsl}{
+ <-> ssub * Junicode-LF/sb/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{semibold}{scsl}{
+ <-> ssub * Junicode-LF/semibold/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{scsl}{
- <-> ssub * Junicode-LF/mediumsemicondensed/scit
+
+% ---- mediumcondensed ----
+
+\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-LF/mediumsemicondensed/it
+\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{scit}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{sc}{
+ <-> \Junicode@@scale Junicode-CondMedium-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-LF/mediumcondensed/it
+}{}
+
+\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{scsl}{
+ <-> ssub * Junicode-LF/mediumcondensed/scit
}{}
@@ -546,14 +597,6 @@
<-> alias * Junicode-LF/sbx/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{sbx}{scit}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Junicode-LF}{semiboldexpanded}{scit}{
- <-> alias * Junicode-LF/sbx/scit
-}{}
-
\DeclareFontShape{OT1}{Junicode-LF}{sbx}{n}{
<-> \Junicode@@scale Junicode-ExpSmBold-lf-ot1
}{}
@@ -562,20 +605,20 @@
<-> alias * Junicode-LF/sbx/n
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{sbx}{sc}{
- <-> \Junicode@@scale Junicode-ExpSmBold-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{sbx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{semiboldexpanded}{sc}{
- <-> alias * Junicode-LF/sbx/sc
+\DeclareFontShape{OT1}{Junicode-LF}{semiboldexpanded}{scit}{
+ <-> alias * Junicode-LF/sbx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{sbx}{scsl}{
- <-> ssub * Junicode-LF/sbx/scit
+\DeclareFontShape{OT1}{Junicode-LF}{sbx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{semiboldexpanded}{scsl}{
- <-> ssub * Junicode-LF/semiboldexpanded/scit
+\DeclareFontShape{OT1}{Junicode-LF}{semiboldexpanded}{sc}{
+ <-> alias * Junicode-LF/sbx/sc
}{}
\DeclareFontShape{OT1}{Junicode-LF}{sbx}{sl}{
@@ -586,208 +629,192 @@
<-> ssub * Junicode-LF/semiboldexpanded/it
}{}
-
-% ---- lc = lightcondensed ----
-
-\DeclareFontShape{OT1}{Junicode-LF}{lc}{scit}{
- <-> \Junicode@@scale Junicode-CondLightItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{sbx}{scsl}{
+ <-> ssub * Junicode-LF/sbx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{scit}{
- <-> alias * Junicode-LF/lc/scit
+\DeclareFontShape{OT1}{Junicode-LF}{semiboldexpanded}{scsl}{
+ <-> ssub * Junicode-LF/semiboldexpanded/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-lf-ot1
-}{}
-\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{it}{
- <-> alias * Junicode-LF/lc/it
-}{}
+% ---- c = condensed ----
-\DeclareFontShape{OT1}{Junicode-LF}{lc}{sc}{
- <-> \Junicode@@scale Junicode-CondLight-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{sc}{
- <-> alias * Junicode-LF/lc/sc
+\DeclareFontShape{OT1}{Junicode-LF}{condensed}{it}{
+ <-> alias * Junicode-LF/c/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{n}{
- <-> alias * Junicode-LF/lc/n
+\DeclareFontShape{OT1}{Junicode-LF}{condensed}{n}{
+ <-> alias * Junicode-LF/c/n
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{lc}{scsl}{
- <-> ssub * Junicode-LF/lc/scit
+\DeclareFontShape{OT1}{Junicode-LF}{c}{scit}{
+ <-> \Junicode@@scale Junicode-CondItalic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{scsl}{
- <-> ssub * Junicode-LF/lightcondensed/scit
+\DeclareFontShape{OT1}{Junicode-LF}{condensed}{scit}{
+ <-> alias * Junicode-LF/c/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{lc}{sl}{
- <-> ssub * Junicode-LF/lc/it
+\DeclareFontShape{OT1}{Junicode-LF}{c}{sc}{
+ <-> \Junicode@@scale Junicode-Cond-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{sl}{
- <-> ssub * Junicode-LF/lightcondensed/it
+\DeclareFontShape{OT1}{Junicode-LF}{condensed}{sc}{
+ <-> alias * Junicode-LF/c/sc
}{}
-
-% ---- bsx = boldsemiexpanded ----
-
-\DeclareFontShape{OT1}{Junicode-LF}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{c}{sl}{
+ <-> ssub * Junicode-LF/c/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{it}{
- <-> alias * Junicode-LF/bsx/it
+\DeclareFontShape{OT1}{Junicode-LF}{condensed}{sl}{
+ <-> ssub * Junicode-LF/condensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{bsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{c}{scsl}{
+ <-> ssub * Junicode-LF/c/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{scit}{
- <-> alias * Junicode-LF/bsx/scit
+\DeclareFontShape{OT1}{Junicode-LF}{condensed}{scsl}{
+ <-> ssub * Junicode-LF/condensed/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-lf-ot1
-}{}
-\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{n}{
- <-> alias * Junicode-LF/bsx/n
-}{}
+% ---- lsc = lightsemicondensed ----
-\DeclareFontShape{OT1}{Junicode-LF}{bsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpBold-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{lsc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondLight-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{sc}{
- <-> alias * Junicode-LF/bsx/sc
+\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{sc}{
+ <-> alias * Junicode-LF/lsc/sc
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{bsx}{scsl}{
- <-> ssub * Junicode-LF/bsx/scit
+\DeclareFontShape{OT1}{Junicode-LF}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{scsl}{
- <-> ssub * Junicode-LF/boldsemiexpanded/scit
+\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{it}{
+ <-> alias * Junicode-LF/lsc/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{bsx}{sl}{
- <-> ssub * Junicode-LF/bsx/it
+\DeclareFontShape{OT1}{Junicode-LF}{lsc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-LF/boldsemiexpanded/it
+\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{scit}{
+ <-> alias * Junicode-LF/lsc/scit
}{}
-
-% ---- sc = semicondensed ----
-
-\DeclareFontShape{OT1}{Junicode-LF}{sc}{it}{
- <-> \Junicode@@scale Junicode-SmCondItalic-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{it}{
- <-> alias * Junicode-LF/sc/it
+\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{n}{
+ <-> alias * Junicode-LF/lsc/n
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{sc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{lsc}{sl}{
+ <-> ssub * Junicode-LF/lsc/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{scit}{
- <-> alias * Junicode-LF/sc/scit
+\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-LF/lightsemicondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{lsc}{scsl}{
+ <-> ssub * Junicode-LF/lsc/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{n}{
- <-> alias * Junicode-LF/sc/n
+\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{scsl}{
+ <-> ssub * Junicode-LF/lightsemicondensed/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{sc}{sc}{
- <-> \Junicode@@scale Junicode-SmCond-lf-sc-ot1
+
+% ---- mediumexpanded ----
+
+\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{sc}{
- <-> alias * Junicode-LF/sc/sc
+\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{sc}{scsl}{
- <-> ssub * Junicode-LF/sc/scit
+\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{scsl}{
- <-> ssub * Junicode-LF/semicondensed/scit
+\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-ExpMedium-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{sc}{sl}{
- <-> ssub * Junicode-LF/sc/it
+\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-LF/mediumexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{sl}{
- <-> ssub * Junicode-LF/semicondensed/it
+\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{scsl}{
+ <-> ssub * Junicode-LF/mediumexpanded/scit
}{}
-% ---- sb = semibold ----
+% ---- x = expanded ----
-\DeclareFontShape{OT1}{Junicode-LF}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{x}{scit}{
+ <-> \Junicode@@scale Junicode-ExpItalic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{semibold}{it}{
- <-> alias * Junicode-LF/sb/it
+\DeclareFontShape{OT1}{Junicode-LF}{expanded}{scit}{
+ <-> alias * Junicode-LF/x/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{sb}{scit}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{semibold}{scit}{
- <-> alias * Junicode-LF/sb/scit
+\DeclareFontShape{OT1}{Junicode-LF}{expanded}{n}{
+ <-> alias * Junicode-LF/x/n
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-lf-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-lf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{semibold}{n}{
- <-> alias * Junicode-LF/sb/n
+\DeclareFontShape{OT1}{Junicode-LF}{expanded}{it}{
+ <-> alias * Junicode-LF/x/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{sb}{sc}{
- <-> \Junicode@@scale Junicode-SmBold-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{x}{sc}{
+ <-> \Junicode@@scale Junicode-Exp-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{semibold}{sc}{
- <-> alias * Junicode-LF/sb/sc
+\DeclareFontShape{OT1}{Junicode-LF}{expanded}{sc}{
+ <-> alias * Junicode-LF/x/sc
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{sb}{scsl}{
- <-> ssub * Junicode-LF/sb/scit
+\DeclareFontShape{OT1}{Junicode-LF}{x}{sl}{
+ <-> ssub * Junicode-LF/x/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{semibold}{scsl}{
- <-> ssub * Junicode-LF/semibold/scit
+\DeclareFontShape{OT1}{Junicode-LF}{expanded}{sl}{
+ <-> ssub * Junicode-LF/expanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{sb}{sl}{
- <-> ssub * Junicode-LF/sb/it
+\DeclareFontShape{OT1}{Junicode-LF}{x}{scsl}{
+ <-> ssub * Junicode-LF/x/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{semibold}{sl}{
- <-> ssub * Junicode-LF/semibold/it
+\DeclareFontShape{OT1}{Junicode-LF}{expanded}{scsl}{
+ <-> ssub * Junicode-LF/expanded/scit
}{}
@@ -801,12 +828,12 @@
<-> alias * Junicode-LF/b/n
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{b}{sc}{
- <-> \Junicode@@scale Junicode-Bold-lf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-LF}{b}{scit}{
+ <-> \Junicode@@scale Junicode-BoldItalic-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{bold}{sc}{
- <-> alias * Junicode-LF/b/sc
+\DeclareFontShape{OT1}{Junicode-LF}{bold}{scit}{
+ <-> alias * Junicode-LF/b/scit
}{}
\DeclareFontShape{OT1}{Junicode-LF}{b}{it}{
@@ -817,20 +844,12 @@
<-> alias * Junicode-LF/b/it
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{b}{scit}{
- <-> \Junicode@@scale Junicode-BoldItalic-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Junicode-LF}{bold}{scit}{
- <-> alias * Junicode-LF/b/scit
-}{}
-
-\DeclareFontShape{OT1}{Junicode-LF}{b}{scsl}{
- <-> ssub * Junicode-LF/b/scit
+\DeclareFontShape{OT1}{Junicode-LF}{b}{sc}{
+ <-> \Junicode@@scale Junicode-Bold-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{bold}{scsl}{
- <-> ssub * Junicode-LF/bold/scit
+\DeclareFontShape{OT1}{Junicode-LF}{bold}{sc}{
+ <-> alias * Junicode-LF/b/sc
}{}
\DeclareFontShape{OT1}{Junicode-LF}{b}{sl}{
@@ -841,31 +860,12 @@
<-> ssub * Junicode-LF/bold/it
}{}
-
-% ---- mediumcondensed ----
-
-\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{scit}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{sc}{
- <-> \Junicode@@scale Junicode-CondMedium-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{scsl}{
- <-> ssub * Junicode-LF/mediumcondensed/scit
+\DeclareFontShape{OT1}{Junicode-LF}{b}{scsl}{
+ <-> ssub * Junicode-LF/b/scit
}{}
-\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{sl}{
- <-> ssub * Junicode-LF/mediumcondensed/it
+\DeclareFontShape{OT1}{Junicode-LF}{bold}{scsl}{
+ <-> ssub * Junicode-LF/bold/scit
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-OsF.fd b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-OsF.fd
index 3c8fa652ba3..7cefdb7a0e1 100644
--- a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-OsF.fd
+++ b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{OT1Junicode-OsF.fd}
- [2024/06/03 (autoinst) Font definitions for OT1/Junicode-OsF.]
+ [2024/07/21 (autoinst) Font definitions for OT1/Junicode-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,435 +20,446 @@
\DeclareFontFamily{OT1}{Junicode-OsF}{}
-% ---- mediumsemicondensed ----
+% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpBold-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{scit}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{sc}{
+ <-> alias * Junicode-OsF/bsx/sc
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{sc}{
- <-> \Junicode@@scale Junicode-SmCondMedium-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-OsF/bsx/n
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{scsl}{
- <-> ssub * Junicode-OsF/mediumsemicondensed/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-OsF/mediumsemicondensed/it
+\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{scit}{
+ <-> alias * Junicode-OsF/bsx/scit
}{}
-
-% ---- sbx = semiboldexpanded ----
-
-\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{it}{
- <-> alias * Junicode-OsF/sbx/it
+\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-OsF/bsx/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{scit}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{sl}{
+ <-> ssub * Junicode-OsF/bsx/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{scit}{
- <-> alias * Junicode-OsF/sbx/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-OsF/boldsemiexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{scsl}{
+ <-> ssub * Junicode-OsF/bsx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{n}{
- <-> alias * Junicode-OsF/sbx/n
+\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/boldsemiexpanded/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{sc}{
- <-> \Junicode@@scale Junicode-ExpSmBold-osf-sc-ot1
-}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{sc}{
- <-> alias * Junicode-OsF/sbx/sc
-}{}
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{scsl}{
- <-> ssub * Junicode-OsF/sbx/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{scsl}{
- <-> ssub * Junicode-OsF/semiboldexpanded/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{sc}{
+ <-> alias * Junicode-OsF/sbsx/sc
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{sl}{
- <-> ssub * Junicode-OsF/sbx/it
+\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-OsF/semiboldexpanded/it
+\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-OsF/sbsx/it
}{}
-
-% ---- bsx = boldsemiexpanded ----
-
-\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{n}{
- <-> alias * Junicode-OsF/bsx/n
+\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-OsF/sbsx/n
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpBold-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{sc}{
- <-> alias * Junicode-OsF/bsx/sc
+\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{scit}{
+ <-> alias * Junicode-OsF/sbsx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{sl}{
+ <-> ssub * Junicode-OsF/sbsx/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{it}{
- <-> alias * Junicode-OsF/bsx/it
+\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-OsF/semiboldsemiexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{scsl}{
+ <-> ssub * Junicode-OsF/sbsx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{scit}{
- <-> alias * Junicode-OsF/bsx/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/semiboldsemiexpanded/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{scsl}{
- <-> ssub * Junicode-OsF/bsx/scit
+
+% ---- sc = semicondensed ----
+
+\DeclareFontShape{OT1}{Junicode-OsF}{sc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCond-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{scsl}{
- <-> ssub * Junicode-OsF/boldsemiexpanded/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{sc}{
+ <-> alias * Junicode-OsF/sc/sc
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{sl}{
- <-> ssub * Junicode-OsF/bsx/it
+\DeclareFontShape{OT1}{Junicode-OsF}{sc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-OsF/boldsemiexpanded/it
+\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{it}{
+ <-> alias * Junicode-OsF/sc/it
}{}
+\DeclareFontShape{OT1}{Junicode-OsF}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-osf-ot1
+}{}
-% ---- lc = lightcondensed ----
+\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{n}{
+ <-> alias * Junicode-OsF/sc/n
+}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{lc}{sc}{
- <-> \Junicode@@scale Junicode-CondLight-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{sc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{sc}{
- <-> alias * Junicode-OsF/lc/sc
+\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{scit}{
+ <-> alias * Junicode-OsF/sc/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{sc}{sl}{
+ <-> ssub * Junicode-OsF/sc/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{n}{
- <-> alias * Junicode-OsF/lc/n
+\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{sl}{
+ <-> ssub * Junicode-OsF/semicondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{lc}{scit}{
- <-> \Junicode@@scale Junicode-CondLightItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{sc}{scsl}{
+ <-> ssub * Junicode-OsF/sc/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{scit}{
- <-> alias * Junicode-OsF/lc/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{scsl}{
+ <-> ssub * Junicode-OsF/semicondensed/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-osf-ot1
+
+% ---- mediumcondensed ----
+
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{it}{
- <-> alias * Junicode-OsF/lc/it
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{lc}{scsl}{
- <-> ssub * Junicode-OsF/lc/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{scit}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{scsl}{
- <-> ssub * Junicode-OsF/lightcondensed/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{sc}{
+ <-> \Junicode@@scale Junicode-CondMedium-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{lc}{sl}{
- <-> ssub * Junicode-OsF/lc/it
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-OsF/mediumcondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{sl}{
- <-> ssub * Junicode-OsF/lightcondensed/it
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{scsl}{
+ <-> ssub * Junicode-OsF/mediumcondensed/scit
}{}
-% ---- sc = semicondensed ----
+% ---- sb = semibold ----
-\DeclareFontShape{OT1}{Junicode-OsF}{sc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{sb}{sc}{
+ <-> \Junicode@@scale Junicode-SmBold-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{scit}{
- <-> alias * Junicode-OsF/sc/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{sc}{
+ <-> alias * Junicode-OsF/sb/sc
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sc}{it}{
- <-> \Junicode@@scale Junicode-SmCondItalic-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{it}{
- <-> alias * Junicode-OsF/sc/it
+\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{n}{
+ <-> alias * Junicode-OsF/sb/n
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sc}{sc}{
- <-> \Junicode@@scale Junicode-SmCond-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{sb}{scit}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{sc}{
- <-> alias * Junicode-OsF/sc/sc
+\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{scit}{
+ <-> alias * Junicode-OsF/sb/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{n}{
- <-> alias * Junicode-OsF/sc/n
+\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{it}{
+ <-> alias * Junicode-OsF/sb/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sc}{scsl}{
- <-> ssub * Junicode-OsF/sc/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{sb}{sl}{
+ <-> ssub * Junicode-OsF/sb/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{scsl}{
- <-> ssub * Junicode-OsF/semicondensed/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{sl}{
+ <-> ssub * Junicode-OsF/semibold/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sc}{sl}{
- <-> ssub * Junicode-OsF/sc/it
+\DeclareFontShape{OT1}{Junicode-OsF}{sb}{scsl}{
+ <-> ssub * Junicode-OsF/sb/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{sl}{
- <-> ssub * Junicode-OsF/semicondensed/it
+\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{scsl}{
+ <-> ssub * Junicode-OsF/semibold/scit
}{}
-% ---- sb = semibold ----
+% ---- l = light ----
-\DeclareFontShape{OT1}{Junicode-OsF}{sb}{scit}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{scit}{
- <-> alias * Junicode-OsF/sb/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{light}{it}{
+ <-> alias * Junicode-OsF/l/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{it}{
- <-> alias * Junicode-OsF/sb/it
+\DeclareFontShape{OT1}{Junicode-OsF}{light}{n}{
+ <-> alias * Junicode-OsF/l/n
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sb}{sc}{
- <-> \Junicode@@scale Junicode-SmBold-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{l}{scit}{
+ <-> \Junicode@@scale Junicode-LightItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{sc}{
- <-> alias * Junicode-OsF/sb/sc
+\DeclareFontShape{OT1}{Junicode-OsF}{light}{scit}{
+ <-> alias * Junicode-OsF/l/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{l}{sc}{
+ <-> \Junicode@@scale Junicode-Light-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{n}{
- <-> alias * Junicode-OsF/sb/n
+\DeclareFontShape{OT1}{Junicode-OsF}{light}{sc}{
+ <-> alias * Junicode-OsF/l/sc
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sb}{scsl}{
- <-> ssub * Junicode-OsF/sb/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{l}{sl}{
+ <-> ssub * Junicode-OsF/l/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{scsl}{
- <-> ssub * Junicode-OsF/semibold/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{light}{sl}{
+ <-> ssub * Junicode-OsF/light/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sb}{sl}{
- <-> ssub * Junicode-OsF/sb/it
+\DeclareFontShape{OT1}{Junicode-OsF}{l}{scsl}{
+ <-> ssub * Junicode-OsF/l/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{sl}{
- <-> ssub * Junicode-OsF/semibold/it
+\DeclareFontShape{OT1}{Junicode-OsF}{light}{scsl}{
+ <-> ssub * Junicode-OsF/light/scit
}{}
-% ---- b = bold ----
+% ---- sx = semiexpanded ----
-\DeclareFontShape{OT1}{Junicode-OsF}{b}{sc}{
- <-> \Junicode@@scale Junicode-Bold-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{sx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{bold}{sc}{
- <-> alias * Junicode-OsF/b/sc
+\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{scit}{
+ <-> alias * Junicode-OsF/sx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{bold}{n}{
- <-> alias * Junicode-OsF/b/n
+\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{n}{
+ <-> alias * Junicode-OsF/sx/n
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{b}{scit}{
- <-> \Junicode@@scale Junicode-BoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{bold}{scit}{
- <-> alias * Junicode-OsF/b/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{it}{
+ <-> alias * Junicode-OsF/sx/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{sx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExp-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{bold}{it}{
- <-> alias * Junicode-OsF/b/it
+\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{sc}{
+ <-> alias * Junicode-OsF/sx/sc
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{b}{scsl}{
- <-> ssub * Junicode-OsF/b/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{sx}{sl}{
+ <-> ssub * Junicode-OsF/sx/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{bold}{scsl}{
- <-> ssub * Junicode-OsF/bold/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{sl}{
+ <-> ssub * Junicode-OsF/semiexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{b}{sl}{
- <-> ssub * Junicode-OsF/b/it
+\DeclareFontShape{OT1}{Junicode-OsF}{sx}{scsl}{
+ <-> ssub * Junicode-OsF/sx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{bold}{sl}{
- <-> ssub * Junicode-OsF/bold/it
+\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/semiexpanded/scit
}{}
-% ---- mediumcondensed ----
+% ---- mediumsemicondensed ----
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{scit}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{sc}{
- <-> \Junicode@@scale Junicode-CondMedium-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{scsl}{
- <-> ssub * Junicode-OsF/mediumcondensed/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-OsF/mediumsemicondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{sl}{
- <-> ssub * Junicode-OsF/mediumcondensed/it
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{scsl}{
+ <-> ssub * Junicode-OsF/mediumsemicondensed/scit
}{}
-% ---- l = light ----
+% ---- lc = lightcondensed ----
-\DeclareFontShape{OT1}{Junicode-OsF}{l}{scit}{
- <-> \Junicode@@scale Junicode-LightItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{lc}{sc}{
+ <-> \Junicode@@scale Junicode-CondLight-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{light}{scit}{
- <-> alias * Junicode-OsF/l/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{sc}{
+ <-> alias * Junicode-OsF/lc/sc
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{light}{it}{
- <-> alias * Junicode-OsF/l/it
+\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{n}{
+ <-> alias * Junicode-OsF/lc/n
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{l}{sc}{
- <-> \Junicode@@scale Junicode-Light-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{lc}{scit}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{light}{sc}{
- <-> alias * Junicode-OsF/l/sc
+\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{scit}{
+ <-> alias * Junicode-OsF/lc/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{light}{n}{
- <-> alias * Junicode-OsF/l/n
+\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{it}{
+ <-> alias * Junicode-OsF/lc/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{l}{scsl}{
- <-> ssub * Junicode-OsF/l/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{lc}{sl}{
+ <-> ssub * Junicode-OsF/lc/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{light}{scsl}{
- <-> ssub * Junicode-OsF/light/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{sl}{
+ <-> ssub * Junicode-OsF/lightcondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{l}{sl}{
- <-> ssub * Junicode-OsF/l/it
+\DeclareFontShape{OT1}{Junicode-OsF}{lc}{scsl}{
+ <-> ssub * Junicode-OsF/lc/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{light}{sl}{
- <-> ssub * Junicode-OsF/light/it
+\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{scsl}{
+ <-> ssub * Junicode-OsF/lightcondensed/scit
}{}
-% ---- bx = boldexpanded ----
+% ---- medium ----
-\DeclareFontShape{OT1}{Junicode-OsF}{bx}{scit}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{medium}{it}{
+ <-> \Junicode@@scale Junicode-MediumItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{boldexpanded}{scit}{
- <-> alias * Junicode-OsF/bx/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{medium}{n}{
+ <-> \Junicode@@scale Junicode-Medium-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{medium}{scit}{
+ <-> \Junicode@@scale Junicode-MediumItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{boldexpanded}{it}{
- <-> alias * Junicode-OsF/bx/it
+\DeclareFontShape{OT1}{Junicode-OsF}{medium}{sc}{
+ <-> \Junicode@@scale Junicode-Medium-osf-sc-ot1
}{}
+\DeclareFontShape{OT1}{Junicode-OsF}{medium}{sl}{
+ <-> ssub * Junicode-OsF/medium/it
+}{}
+
+\DeclareFontShape{OT1}{Junicode-OsF}{medium}{scsl}{
+ <-> ssub * Junicode-OsF/medium/scit
+}{}
+
+
+% ---- bx = boldexpanded ----
+
\DeclareFontShape{OT1}{Junicode-OsF}{bx}{sc}{
<-> \Junicode@@scale Junicode-ExpBold-osf-sc-ot1
}{}
@@ -465,12 +476,20 @@
<-> alias * Junicode-OsF/bx/n
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{bx}{scsl}{
- <-> ssub * Junicode-OsF/bx/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{bx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{boldexpanded}{scsl}{
- <-> ssub * Junicode-OsF/boldexpanded/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{boldexpanded}{scit}{
+ <-> alias * Junicode-OsF/bx/scit
+}{}
+
+\DeclareFontShape{OT1}{Junicode-OsF}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Junicode-OsF}{boldexpanded}{it}{
+ <-> alias * Junicode-OsF/bx/it
}{}
\DeclareFontShape{OT1}{Junicode-OsF}{bx}{sl}{
@@ -481,15 +500,23 @@
<-> ssub * Junicode-OsF/boldexpanded/it
}{}
+\DeclareFontShape{OT1}{Junicode-OsF}{bx}{scsl}{
+ <-> ssub * Junicode-OsF/bx/scit
+}{}
+
+\DeclareFontShape{OT1}{Junicode-OsF}{boldexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/boldexpanded/scit
+}{}
+
% ---- m = regular ----
-\DeclareFontShape{OT1}{Junicode-OsF}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{regular}{it}{
- <-> alias * Junicode-OsF/m/it
+\DeclareFontShape{OT1}{Junicode-OsF}{regular}{n}{
+ <-> alias * Junicode-OsF/m/n
}{}
\DeclareFontShape{OT1}{Junicode-OsF}{m}{scit}{
@@ -500,12 +527,12 @@
<-> alias * Junicode-OsF/m/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{regular}{n}{
- <-> alias * Junicode-OsF/m/n
+\DeclareFontShape{OT1}{Junicode-OsF}{regular}{it}{
+ <-> alias * Junicode-OsF/m/it
}{}
\DeclareFontShape{OT1}{Junicode-OsF}{m}{sc}{
@@ -516,14 +543,6 @@
<-> alias * Junicode-OsF/m/sc
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{m}{scsl}{
- <-> ssub * Junicode-OsF/m/scit
-}{}
-
-\DeclareFontShape{OT1}{Junicode-OsF}{regular}{scsl}{
- <-> ssub * Junicode-OsF/regular/scit
-}{}
-
\DeclareFontShape{OT1}{Junicode-OsF}{m}{sl}{
<-> ssub * Junicode-OsF/m/it
}{}
@@ -532,184 +551,168 @@
<-> ssub * Junicode-OsF/regular/it
}{}
-
-% ---- lsc = lightsemicondensed ----
-
-\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{sc}{
- <-> \Junicode@@scale Junicode-SmCondLight-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{sc}{
- <-> alias * Junicode-OsF/lsc/sc
+\DeclareFontShape{OT1}{Junicode-OsF}{m}{scsl}{
+ <-> ssub * Junicode-OsF/m/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{regular}{scsl}{
+ <-> ssub * Junicode-OsF/regular/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{n}{
- <-> alias * Junicode-OsF/lsc/n
-}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{scit}{
- <-> alias * Junicode-OsF/lsc/scit
-}{}
+% ---- mediumsemiexpanded ----
-\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{it}{
- <-> alias * Junicode-OsF/lsc/it
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{scsl}{
- <-> ssub * Junicode-OsF/lsc/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{scsl}{
- <-> ssub * Junicode-OsF/lightsemicondensed/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{sl}{
- <-> ssub * Junicode-OsF/lsc/it
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-OsF/mediumsemiexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-OsF/lightsemicondensed/it
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/mediumsemiexpanded/scit
}{}
-% ---- medium ----
+% ---- mediumexpanded ----
-\DeclareFontShape{OT1}{Junicode-OsF}{medium}{n}{
- <-> \Junicode@@scale Junicode-Medium-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{medium}{sc}{
- <-> \Junicode@@scale Junicode-Medium-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{medium}{it}{
- <-> \Junicode@@scale Junicode-MediumItalic-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{medium}{scit}{
- <-> \Junicode@@scale Junicode-MediumItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-ExpMedium-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{medium}{scsl}{
- <-> ssub * Junicode-OsF/medium/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-OsF/mediumexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{medium}{sl}{
- <-> ssub * Junicode-OsF/medium/it
+\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/mediumexpanded/scit
}{}
-% ---- sx = semiexpanded ----
+% ---- lsc = lightsemicondensed ----
-\DeclareFontShape{OT1}{Junicode-OsF}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondLight-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{it}{
- <-> alias * Junicode-OsF/sx/it
+\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{sc}{
+ <-> alias * Junicode-OsF/lsc/sc
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{scit}{
- <-> alias * Junicode-OsF/sx/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{it}{
+ <-> alias * Junicode-OsF/lsc/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{n}{
- <-> alias * Junicode-OsF/sx/n
+\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{scit}{
+ <-> alias * Junicode-OsF/lsc/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sx}{sc}{
- <-> \Junicode@@scale Junicode-SmExp-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{sc}{
- <-> alias * Junicode-OsF/sx/sc
+\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{n}{
+ <-> alias * Junicode-OsF/lsc/n
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sx}{scsl}{
- <-> ssub * Junicode-OsF/sx/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{sl}{
+ <-> ssub * Junicode-OsF/lsc/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{scsl}{
- <-> ssub * Junicode-OsF/semiexpanded/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-OsF/lightsemicondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sx}{sl}{
- <-> ssub * Junicode-OsF/sx/it
+\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{scsl}{
+ <-> ssub * Junicode-OsF/lsc/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{sl}{
- <-> ssub * Junicode-OsF/semiexpanded/it
+\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{scsl}{
+ <-> ssub * Junicode-OsF/lightsemicondensed/scit
}{}
-% ---- c = condensed ----
+% ---- b = bold ----
-\DeclareFontShape{OT1}{Junicode-OsF}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{b}{scit}{
+ <-> \Junicode@@scale Junicode-BoldItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{it}{
- <-> alias * Junicode-OsF/c/it
+\DeclareFontShape{OT1}{Junicode-OsF}{bold}{scit}{
+ <-> alias * Junicode-OsF/b/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{c}{scit}{
- <-> \Junicode@@scale Junicode-CondItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{scit}{
- <-> alias * Junicode-OsF/c/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{bold}{n}{
+ <-> alias * Junicode-OsF/b/n
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{n}{
- <-> alias * Junicode-OsF/c/n
+\DeclareFontShape{OT1}{Junicode-OsF}{bold}{it}{
+ <-> alias * Junicode-OsF/b/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{c}{sc}{
- <-> \Junicode@@scale Junicode-Cond-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{b}{sc}{
+ <-> \Junicode@@scale Junicode-Bold-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{sc}{
- <-> alias * Junicode-OsF/c/sc
+\DeclareFontShape{OT1}{Junicode-OsF}{bold}{sc}{
+ <-> alias * Junicode-OsF/b/sc
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{c}{scsl}{
- <-> ssub * Junicode-OsF/c/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{b}{sl}{
+ <-> ssub * Junicode-OsF/b/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{scsl}{
- <-> ssub * Junicode-OsF/condensed/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{bold}{sl}{
+ <-> ssub * Junicode-OsF/bold/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{c}{sl}{
- <-> ssub * Junicode-OsF/c/it
+\DeclareFontShape{OT1}{Junicode-OsF}{b}{scsl}{
+ <-> ssub * Junicode-OsF/b/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{sl}{
- <-> ssub * Junicode-OsF/condensed/it
+\DeclareFontShape{OT1}{Junicode-OsF}{bold}{scsl}{
+ <-> ssub * Junicode-OsF/bold/scit
}{}
@@ -723,6 +726,14 @@
<-> alias * Junicode-OsF/x/scit
}{}
+\DeclareFontShape{OT1}{Junicode-OsF}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Junicode-OsF}{expanded}{n}{
+ <-> alias * Junicode-OsF/x/n
+}{}
+
\DeclareFontShape{OT1}{Junicode-OsF}{x}{it}{
<-> \Junicode@@scale Junicode-ExpItalic-osf-ot1
}{}
@@ -739,12 +750,12 @@
<-> alias * Junicode-OsF/x/sc
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{x}{sl}{
+ <-> ssub * Junicode-OsF/x/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{expanded}{n}{
- <-> alias * Junicode-OsF/x/n
+\DeclareFontShape{OT1}{Junicode-OsF}{expanded}{sl}{
+ <-> ssub * Junicode-OsF/expanded/it
}{}
\DeclareFontShape{OT1}{Junicode-OsF}{x}{scsl}{
@@ -755,117 +766,106 @@
<-> ssub * Junicode-OsF/expanded/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{x}{sl}{
- <-> ssub * Junicode-OsF/x/it
-}{}
-
-\DeclareFontShape{OT1}{Junicode-OsF}{expanded}{sl}{
- <-> ssub * Junicode-OsF/expanded/it
-}{}
-
-% ---- sbsx = semiboldsemiexpanded ----
+% ---- sbx = semiboldexpanded ----
-\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{scit}{
- <-> alias * Junicode-OsF/sbsx/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{n}{
+ <-> alias * Junicode-OsF/sbx/n
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-OsF/sbsx/it
+\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{scit}{
+ <-> alias * Junicode-OsF/sbx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{sc}{
- <-> alias * Junicode-OsF/sbsx/sc
+\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{it}{
+ <-> alias * Junicode-OsF/sbx/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-OsF/sbsx/n
+\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{sc}{
+ <-> alias * Junicode-OsF/sbx/sc
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{scsl}{
- <-> ssub * Junicode-OsF/sbsx/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{sl}{
+ <-> ssub * Junicode-OsF/sbx/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{scsl}{
- <-> ssub * Junicode-OsF/semiboldsemiexpanded/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-OsF/semiboldexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{sl}{
- <-> ssub * Junicode-OsF/sbsx/it
+\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{scsl}{
+ <-> ssub * Junicode-OsF/sbx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-OsF/semiboldsemiexpanded/it
+\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/semiboldexpanded/scit
}{}
-% ---- mediumexpanded ----
+% ---- c = condensed ----
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{sc}{
- <-> \Junicode@@scale Junicode-ExpMedium-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{it}{
+ <-> alias * Junicode-OsF/c/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-osf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{scit}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{n}{
+ <-> alias * Junicode-OsF/c/n
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{scsl}{
- <-> ssub * Junicode-OsF/mediumexpanded/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{c}{scit}{
+ <-> \Junicode@@scale Junicode-CondItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{sl}{
- <-> ssub * Junicode-OsF/mediumexpanded/it
+\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{scit}{
+ <-> alias * Junicode-OsF/c/scit
}{}
-
-% ---- mediumsemiexpanded ----
-
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{c}{sc}{
+ <-> \Junicode@@scale Junicode-Cond-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{sc}{
- <-> \Junicode@@scale Junicode-SmExpMedium-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{sc}{
+ <-> alias * Junicode-OsF/c/sc
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{c}{sl}{
+ <-> ssub * Junicode-OsF/c/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{scit}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{sl}{
+ <-> ssub * Junicode-OsF/condensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{scsl}{
- <-> ssub * Junicode-OsF/mediumsemiexpanded/scit
+\DeclareFontShape{OT1}{Junicode-OsF}{c}{scsl}{
+ <-> ssub * Junicode-OsF/c/scit
}{}
-\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-OsF/mediumsemiexpanded/it
+\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{scsl}{
+ <-> ssub * Junicode-OsF/condensed/scit
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-Sup.fd b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-Sup.fd
index 3e51e57f5ae..337961822dd 100644
--- a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-Sup.fd
+++ b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{OT1Junicode-Sup.fd}
- [2024/06/03 (autoinst) Font definitions for OT1/Junicode-Sup.]
+ [2024/07/21 (autoinst) Font definitions for OT1/Junicode-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,168 +20,207 @@
\DeclareFontFamily{OT1}{Junicode-Sup}{}
-% ---- m = regular ----
+% ---- c = condensed ----
-\DeclareFontShape{OT1}{Junicode-Sup}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{regular}{n}{
- <-> alias * Junicode-Sup/m/n
+\DeclareFontShape{OT1}{Junicode-Sup}{condensed}{it}{
+ <-> alias * Junicode-Sup/c/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{regular}{it}{
- <-> alias * Junicode-Sup/m/it
+\DeclareFontShape{OT1}{Junicode-Sup}{condensed}{n}{
+ <-> alias * Junicode-Sup/c/n
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{m}{sl}{
- <-> ssub * Junicode-Sup/m/it
+\DeclareFontShape{OT1}{Junicode-Sup}{c}{sl}{
+ <-> ssub * Junicode-Sup/c/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{regular}{sl}{
- <-> ssub * Junicode-Sup/regular/it
+\DeclareFontShape{OT1}{Junicode-Sup}{condensed}{sl}{
+ <-> ssub * Junicode-Sup/condensed/it
}{}
-% ---- lsc = lightsemicondensed ----
+% ---- sbx = semiboldexpanded ----
-\DeclareFontShape{OT1}{Junicode-Sup}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{lightsemicondensed}{it}{
- <-> alias * Junicode-Sup/lsc/it
+\DeclareFontShape{OT1}{Junicode-Sup}{semiboldexpanded}{n}{
+ <-> alias * Junicode-Sup/sbx/n
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{lightsemicondensed}{n}{
- <-> alias * Junicode-Sup/lsc/n
+\DeclareFontShape{OT1}{Junicode-Sup}{semiboldexpanded}{it}{
+ <-> alias * Junicode-Sup/sbx/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{lsc}{sl}{
- <-> ssub * Junicode-Sup/lsc/it
+\DeclareFontShape{OT1}{Junicode-Sup}{sbx}{sl}{
+ <-> ssub * Junicode-Sup/sbx/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-Sup/lightsemicondensed/it
+\DeclareFontShape{OT1}{Junicode-Sup}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-Sup/semiboldexpanded/it
}{}
-% ---- medium ----
+% ---- x = expanded ----
-\DeclareFontShape{OT1}{Junicode-Sup}{medium}{n}{
- <-> \Junicode@@scale Junicode-Medium-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{medium}{it}{
- <-> \Junicode@@scale Junicode-MediumItalic-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{expanded}{it}{
+ <-> alias * Junicode-Sup/x/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{medium}{sl}{
- <-> ssub * Junicode-Sup/medium/it
+\DeclareFontShape{OT1}{Junicode-Sup}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-sup-ot1
}{}
+\DeclareFontShape{OT1}{Junicode-Sup}{expanded}{n}{
+ <-> alias * Junicode-Sup/x/n
+}{}
-% ---- l = light ----
+\DeclareFontShape{OT1}{Junicode-Sup}{x}{sl}{
+ <-> ssub * Junicode-Sup/x/it
+}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{expanded}{sl}{
+ <-> ssub * Junicode-Sup/expanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{light}{it}{
- <-> alias * Junicode-Sup/l/it
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{Junicode-Sup}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{bold}{it}{
+ <-> alias * Junicode-Sup/b/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{light}{n}{
- <-> alias * Junicode-Sup/l/n
+\DeclareFontShape{OT1}{Junicode-Sup}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{l}{sl}{
- <-> ssub * Junicode-Sup/l/it
+\DeclareFontShape{OT1}{Junicode-Sup}{bold}{n}{
+ <-> alias * Junicode-Sup/b/n
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{light}{sl}{
- <-> ssub * Junicode-Sup/light/it
+\DeclareFontShape{OT1}{Junicode-Sup}{b}{sl}{
+ <-> ssub * Junicode-Sup/b/it
}{}
+\DeclareFontShape{OT1}{Junicode-Sup}{bold}{sl}{
+ <-> ssub * Junicode-Sup/bold/it
+}{}
-% ---- bx = boldexpanded ----
-\DeclareFontShape{OT1}{Junicode-Sup}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-sup-ot1
+% ---- mediumexpanded ----
+
+\DeclareFontShape{OT1}{Junicode-Sup}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{boldexpanded}{n}{
- <-> alias * Junicode-Sup/bx/n
+\DeclareFontShape{OT1}{Junicode-Sup}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-Sup/mediumexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{boldexpanded}{it}{
- <-> alias * Junicode-Sup/bx/it
+
+% ---- lsc = lightsemicondensed ----
+
+\DeclareFontShape{OT1}{Junicode-Sup}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{bx}{sl}{
- <-> ssub * Junicode-Sup/bx/it
+\DeclareFontShape{OT1}{Junicode-Sup}{lightsemicondensed}{it}{
+ <-> alias * Junicode-Sup/lsc/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{boldexpanded}{sl}{
- <-> ssub * Junicode-Sup/boldexpanded/it
+\DeclareFontShape{OT1}{Junicode-Sup}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-sup-ot1
}{}
+\DeclareFontShape{OT1}{Junicode-Sup}{lightsemicondensed}{n}{
+ <-> alias * Junicode-Sup/lsc/n
+}{}
-% ---- sbsx = semiboldsemiexpanded ----
+\DeclareFontShape{OT1}{Junicode-Sup}{lsc}{sl}{
+ <-> ssub * Junicode-Sup/lsc/it
+}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-Sup/lightsemicondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-Sup/sbsx/it
+
+% ---- lc = lightcondensed ----
+
+\DeclareFontShape{OT1}{Junicode-Sup}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{lightcondensed}{n}{
+ <-> alias * Junicode-Sup/lc/n
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-Sup/sbsx/n
+\DeclareFontShape{OT1}{Junicode-Sup}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{sbsx}{sl}{
- <-> ssub * Junicode-Sup/sbsx/it
+\DeclareFontShape{OT1}{Junicode-Sup}{lightcondensed}{it}{
+ <-> alias * Junicode-Sup/lc/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-Sup/semiboldsemiexpanded/it
+\DeclareFontShape{OT1}{Junicode-Sup}{lc}{sl}{
+ <-> ssub * Junicode-Sup/lc/it
}{}
+\DeclareFontShape{OT1}{Junicode-Sup}{lightcondensed}{sl}{
+ <-> ssub * Junicode-Sup/lightcondensed/it
+}{}
-% ---- mediumexpanded ----
-\DeclareFontShape{OT1}{Junicode-Sup}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-sup-ot1
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{Junicode-Sup}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{regular}{n}{
+ <-> alias * Junicode-Sup/m/n
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{mediumexpanded}{sl}{
- <-> ssub * Junicode-Sup/mediumexpanded/it
+\DeclareFontShape{OT1}{Junicode-Sup}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Junicode-Sup}{regular}{it}{
+ <-> alias * Junicode-Sup/m/it
+}{}
+
+\DeclareFontShape{OT1}{Junicode-Sup}{m}{sl}{
+ <-> ssub * Junicode-Sup/m/it
+}{}
+
+\DeclareFontShape{OT1}{Junicode-Sup}{regular}{sl}{
+ <-> ssub * Junicode-Sup/regular/it
}{}
@@ -200,138 +239,114 @@
}{}
-% ---- sx = semiexpanded ----
-
-\DeclareFontShape{OT1}{Junicode-Sup}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{Junicode-Sup}{semiexpanded}{it}{
- <-> alias * Junicode-Sup/sx/it
-}{}
-
-\DeclareFontShape{OT1}{Junicode-Sup}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-sup-ot1
-}{}
+% ---- medium ----
-\DeclareFontShape{OT1}{Junicode-Sup}{semiexpanded}{n}{
- <-> alias * Junicode-Sup/sx/n
+\DeclareFontShape{OT1}{Junicode-Sup}{medium}{it}{
+ <-> \Junicode@@scale Junicode-MediumItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{sx}{sl}{
- <-> ssub * Junicode-Sup/sx/it
+\DeclareFontShape{OT1}{Junicode-Sup}{medium}{n}{
+ <-> \Junicode@@scale Junicode-Medium-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{semiexpanded}{sl}{
- <-> ssub * Junicode-Sup/semiexpanded/it
+\DeclareFontShape{OT1}{Junicode-Sup}{medium}{sl}{
+ <-> ssub * Junicode-Sup/medium/it
}{}
-% ---- x = expanded ----
+% ---- bx = boldexpanded ----
-\DeclareFontShape{OT1}{Junicode-Sup}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{expanded}{n}{
- <-> alias * Junicode-Sup/x/n
+\DeclareFontShape{OT1}{Junicode-Sup}{boldexpanded}{it}{
+ <-> alias * Junicode-Sup/bx/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{expanded}{it}{
- <-> alias * Junicode-Sup/x/it
+\DeclareFontShape{OT1}{Junicode-Sup}{boldexpanded}{n}{
+ <-> alias * Junicode-Sup/bx/n
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{x}{sl}{
- <-> ssub * Junicode-Sup/x/it
+\DeclareFontShape{OT1}{Junicode-Sup}{bx}{sl}{
+ <-> ssub * Junicode-Sup/bx/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{expanded}{sl}{
- <-> ssub * Junicode-Sup/expanded/it
+\DeclareFontShape{OT1}{Junicode-Sup}{boldexpanded}{sl}{
+ <-> ssub * Junicode-Sup/boldexpanded/it
}{}
-% ---- c = condensed ----
+% ---- sx = semiexpanded ----
-\DeclareFontShape{OT1}{Junicode-Sup}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{condensed}{it}{
- <-> alias * Junicode-Sup/c/it
+\DeclareFontShape{OT1}{Junicode-Sup}{semiexpanded}{it}{
+ <-> alias * Junicode-Sup/sx/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{condensed}{n}{
- <-> alias * Junicode-Sup/c/n
+\DeclareFontShape{OT1}{Junicode-Sup}{semiexpanded}{n}{
+ <-> alias * Junicode-Sup/sx/n
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{c}{sl}{
- <-> ssub * Junicode-Sup/c/it
+\DeclareFontShape{OT1}{Junicode-Sup}{sx}{sl}{
+ <-> ssub * Junicode-Sup/sx/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{condensed}{sl}{
- <-> ssub * Junicode-Sup/condensed/it
+\DeclareFontShape{OT1}{Junicode-Sup}{semiexpanded}{sl}{
+ <-> ssub * Junicode-Sup/semiexpanded/it
}{}
-% ---- lc = lightcondensed ----
-
-\DeclareFontShape{OT1}{Junicode-Sup}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-sup-ot1
-}{}
+% ---- l = light ----
-\DeclareFontShape{OT1}{Junicode-Sup}{lightcondensed}{it}{
- <-> alias * Junicode-Sup/lc/it
+\DeclareFontShape{OT1}{Junicode-Sup}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{light}{it}{
+ <-> alias * Junicode-Sup/l/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{lightcondensed}{n}{
- <-> alias * Junicode-Sup/lc/n
+\DeclareFontShape{OT1}{Junicode-Sup}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{lc}{sl}{
- <-> ssub * Junicode-Sup/lc/it
+\DeclareFontShape{OT1}{Junicode-Sup}{light}{n}{
+ <-> alias * Junicode-Sup/l/n
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{lightcondensed}{sl}{
- <-> ssub * Junicode-Sup/lightcondensed/it
+\DeclareFontShape{OT1}{Junicode-Sup}{l}{sl}{
+ <-> ssub * Junicode-Sup/l/it
}{}
-
-% ---- bsx = boldsemiexpanded ----
-
-\DeclareFontShape{OT1}{Junicode-Sup}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{light}{sl}{
+ <-> ssub * Junicode-Sup/light/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{boldsemiexpanded}{n}{
- <-> alias * Junicode-Sup/bsx/n
-}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-sup-ot1
-}{}
+% ---- mediumsemicondensed ----
-\DeclareFontShape{OT1}{Junicode-Sup}{boldsemiexpanded}{it}{
- <-> alias * Junicode-Sup/bsx/it
+\DeclareFontShape{OT1}{Junicode-Sup}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{bsx}{sl}{
- <-> ssub * Junicode-Sup/bsx/it
+\DeclareFontShape{OT1}{Junicode-Sup}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-Sup/boldsemiexpanded/it
+\DeclareFontShape{OT1}{Junicode-Sup}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-Sup/mediumsemicondensed/it
}{}
@@ -362,114 +377,99 @@
}{}
-% ---- sc = semicondensed ----
+% ---- mediumcondensed ----
-\DeclareFontShape{OT1}{Junicode-Sup}{sc}{it}{
- <-> \Junicode@@scale Junicode-SmCondItalic-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{semicondensed}{it}{
- <-> alias * Junicode-Sup/sc/it
+\DeclareFontShape{OT1}{Junicode-Sup}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-Sup/mediumcondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{semicondensed}{n}{
- <-> alias * Junicode-Sup/sc/n
-}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{sc}{sl}{
- <-> ssub * Junicode-Sup/sc/it
-}{}
+% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{OT1}{Junicode-Sup}{semicondensed}{sl}{
- <-> ssub * Junicode-Sup/semicondensed/it
+\DeclareFontShape{OT1}{Junicode-Sup}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-sup-ot1
}{}
-
-% ---- mediumsemicondensed ----
-
-\DeclareFontShape{OT1}{Junicode-Sup}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-Sup/bsx/n
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-Sup/mediumsemicondensed/it
+\DeclareFontShape{OT1}{Junicode-Sup}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-Sup/bsx/it
}{}
-
-% ---- sbx = semiboldexpanded ----
-
-\DeclareFontShape{OT1}{Junicode-Sup}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{bsx}{sl}{
+ <-> ssub * Junicode-Sup/bsx/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{semiboldexpanded}{n}{
- <-> alias * Junicode-Sup/sbx/n
+\DeclareFontShape{OT1}{Junicode-Sup}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-Sup/boldsemiexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-sup-ot1
-}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{semiboldexpanded}{it}{
- <-> alias * Junicode-Sup/sbx/it
-}{}
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{OT1}{Junicode-Sup}{sbx}{sl}{
- <-> ssub * Junicode-Sup/sbx/it
+\DeclareFontShape{OT1}{Junicode-Sup}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-Sup/semiboldexpanded/it
+\DeclareFontShape{OT1}{Junicode-Sup}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-Sup/sbsx/it
}{}
+\DeclareFontShape{OT1}{Junicode-Sup}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-sup-ot1
+}{}
-% ---- mediumcondensed ----
-
-\DeclareFontShape{OT1}{Junicode-Sup}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-Sup/sbsx/n
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{sbsx}{sl}{
+ <-> ssub * Junicode-Sup/sbsx/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{mediumcondensed}{sl}{
- <-> ssub * Junicode-Sup/mediumcondensed/it
+\DeclareFontShape{OT1}{Junicode-Sup}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-Sup/semiboldsemiexpanded/it
}{}
-% ---- b = bold ----
+% ---- sc = semicondensed ----
-\DeclareFontShape{OT1}{Junicode-Sup}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{bold}{it}{
- <-> alias * Junicode-Sup/b/it
+\DeclareFontShape{OT1}{Junicode-Sup}{semicondensed}{n}{
+ <-> alias * Junicode-Sup/sc/n
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-sup-ot1
+\DeclareFontShape{OT1}{Junicode-Sup}{sc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-sup-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{bold}{n}{
- <-> alias * Junicode-Sup/b/n
+\DeclareFontShape{OT1}{Junicode-Sup}{semicondensed}{it}{
+ <-> alias * Junicode-Sup/sc/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{b}{sl}{
- <-> ssub * Junicode-Sup/b/it
+\DeclareFontShape{OT1}{Junicode-Sup}{sc}{sl}{
+ <-> ssub * Junicode-Sup/sc/it
}{}
-\DeclareFontShape{OT1}{Junicode-Sup}{bold}{sl}{
- <-> ssub * Junicode-Sup/bold/it
+\DeclareFontShape{OT1}{Junicode-Sup}{semicondensed}{sl}{
+ <-> ssub * Junicode-Sup/semicondensed/it
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-TLF.fd b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-TLF.fd
index 47eb8d3cf5b..77ad7e0b311 100644
--- a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-TLF.fd
+++ b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{OT1Junicode-TLF.fd}
- [2024/06/03 (autoinst) Font definitions for OT1/Junicode-TLF.]
+ [2024/07/21 (autoinst) Font definitions for OT1/Junicode-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,86 +20,75 @@
\DeclareFontFamily{OT1}{Junicode-TLF}{}
-% ---- mediumsemicondensed ----
+% ---- sc = semicondensed ----
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{scit}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{sc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{scit}{
+ <-> alias * Junicode-TLF/sc/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{sc}{
- <-> \Junicode@@scale Junicode-SmCondMedium-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{n}{
+ <-> alias * Junicode-TLF/sc/n
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{scsl}{
- <-> ssub * Junicode-TLF/mediumsemicondensed/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{sc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-TLF/mediumsemicondensed/it
+\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{it}{
+ <-> alias * Junicode-TLF/sc/it
}{}
-
-% ---- sbx = semiboldexpanded ----
-
-\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{sc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCond-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{n}{
- <-> alias * Junicode-TLF/sbx/n
+\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{sc}{
+ <-> alias * Junicode-TLF/sc/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{sc}{
- <-> \Junicode@@scale Junicode-ExpSmBold-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{sc}{sl}{
+ <-> ssub * Junicode-TLF/sc/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{sc}{
- <-> alias * Junicode-TLF/sbx/sc
+\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{sl}{
+ <-> ssub * Junicode-TLF/semicondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{sc}{scsl}{
+ <-> ssub * Junicode-TLF/sc/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{it}{
- <-> alias * Junicode-TLF/sbx/it
+\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{scsl}{
+ <-> ssub * Junicode-TLF/semicondensed/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{scit}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-sc-ot1
-}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{scit}{
- <-> alias * Junicode-TLF/sbx/scit
-}{}
+% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{scsl}{
- <-> ssub * Junicode-TLF/sbx/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{scsl}{
- <-> ssub * Junicode-TLF/semiboldexpanded/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-TLF/bsx/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{sl}{
- <-> ssub * Junicode-TLF/sbx/it
+\DeclareFontShape{OT1}{Junicode-TLF}{bsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-TLF/semiboldexpanded/it
+\DeclareFontShape{OT1}{Junicode-TLF}{boldsemiexpanded}{scit}{
+ <-> alias * Junicode-TLF/bsx/scit
}{}
-
-% ---- bsx = boldsemiexpanded ----
-
\DeclareFontShape{OT1}{Junicode-TLF}{bsx}{n}{
<-> \Junicode@@scale Junicode-SmExpBold-tlf-ot1
}{}
@@ -116,20 +105,12 @@
<-> alias * Junicode-TLF/bsx/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Junicode-TLF}{boldsemiexpanded}{it}{
- <-> alias * Junicode-TLF/bsx/it
-}{}
-
-\DeclareFontShape{OT1}{Junicode-TLF}{bsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{bsx}{sl}{
+ <-> ssub * Junicode-TLF/bsx/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{boldsemiexpanded}{scit}{
- <-> alias * Junicode-TLF/bsx/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-TLF/boldsemiexpanded/it
}{}
\DeclareFontShape{OT1}{Junicode-TLF}{bsx}{scsl}{
@@ -140,74 +121,66 @@
<-> ssub * Junicode-TLF/boldsemiexpanded/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{bsx}{sl}{
- <-> ssub * Junicode-TLF/bsx/it
-}{}
-
-\DeclareFontShape{OT1}{Junicode-TLF}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-TLF/boldsemiexpanded/it
-}{}
-
-% ---- lc = lightcondensed ----
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{OT1}{Junicode-TLF}{lc}{scit}{
- <-> \Junicode@@scale Junicode-CondLightItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{scit}{
- <-> alias * Junicode-TLF/lc/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{sc}{
+ <-> alias * Junicode-TLF/sbsx/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{it}{
- <-> alias * Junicode-TLF/lc/it
+\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-TLF/sbsx/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lc}{sc}{
- <-> \Junicode@@scale Junicode-CondLight-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{sc}{
- <-> alias * Junicode-TLF/lc/sc
+\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-TLF/sbsx/n
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{n}{
- <-> alias * Junicode-TLF/lc/n
+\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{scit}{
+ <-> alias * Junicode-TLF/sbsx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lc}{scsl}{
- <-> ssub * Junicode-TLF/lc/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{sl}{
+ <-> ssub * Junicode-TLF/sbsx/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{scsl}{
- <-> ssub * Junicode-TLF/lightcondensed/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-TLF/semiboldsemiexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lc}{sl}{
- <-> ssub * Junicode-TLF/lc/it
+\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{scsl}{
+ <-> ssub * Junicode-TLF/sbsx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{sl}{
- <-> ssub * Junicode-TLF/lightcondensed/it
+\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/semiboldsemiexpanded/scit
}{}
% ---- sb = semibold ----
-\DeclareFontShape{OT1}{Junicode-TLF}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{sb}{sc}{
+ <-> \Junicode@@scale Junicode-SmBold-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semibold}{it}{
- <-> alias * Junicode-TLF/sb/it
+\DeclareFontShape{OT1}{Junicode-TLF}{semibold}{sc}{
+ <-> alias * Junicode-TLF/sb/sc
}{}
\DeclareFontShape{OT1}{Junicode-TLF}{sb}{scit}{
@@ -226,20 +199,12 @@
<-> alias * Junicode-TLF/sb/n
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{sb}{sc}{
- <-> \Junicode@@scale Junicode-SmBold-tlf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Junicode-TLF}{semibold}{sc}{
- <-> alias * Junicode-TLF/sb/sc
-}{}
-
-\DeclareFontShape{OT1}{Junicode-TLF}{sb}{scsl}{
- <-> ssub * Junicode-TLF/sb/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semibold}{scsl}{
- <-> ssub * Junicode-TLF/semibold/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{semibold}{it}{
+ <-> alias * Junicode-TLF/sb/it
}{}
\DeclareFontShape{OT1}{Junicode-TLF}{sb}{sl}{
@@ -250,146 +215,122 @@
<-> ssub * Junicode-TLF/semibold/it
}{}
-
-% ---- sc = semicondensed ----
-
-\DeclareFontShape{OT1}{Junicode-TLF}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{n}{
- <-> alias * Junicode-TLF/sc/n
-}{}
-
-\DeclareFontShape{OT1}{Junicode-TLF}{sc}{sc}{
- <-> \Junicode@@scale Junicode-SmCond-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{sb}{scsl}{
+ <-> ssub * Junicode-TLF/sb/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{sc}{
- <-> alias * Junicode-TLF/sc/sc
+\DeclareFontShape{OT1}{Junicode-TLF}{semibold}{scsl}{
+ <-> ssub * Junicode-TLF/semibold/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{sc}{it}{
- <-> \Junicode@@scale Junicode-SmCondItalic-tlf-ot1
-}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{it}{
- <-> alias * Junicode-TLF/sc/it
-}{}
+% ---- mediumcondensed ----
-\DeclareFontShape{OT1}{Junicode-TLF}{sc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{sc}{
+ <-> \Junicode@@scale Junicode-CondMedium-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{scit}{
- <-> alias * Junicode-TLF/sc/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{scit}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{sc}{scsl}{
- <-> ssub * Junicode-TLF/sc/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{scsl}{
- <-> ssub * Junicode-TLF/semicondensed/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{sc}{sl}{
- <-> ssub * Junicode-TLF/sc/it
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-TLF/mediumcondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{sl}{
- <-> ssub * Junicode-TLF/semicondensed/it
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{scsl}{
+ <-> ssub * Junicode-TLF/mediumcondensed/scit
}{}
-% ---- b = bold ----
+% ---- mediumsemicondensed ----
-\DeclareFontShape{OT1}{Junicode-TLF}{b}{sc}{
- <-> \Junicode@@scale Junicode-Bold-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{bold}{sc}{
- <-> alias * Junicode-TLF/b/sc
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{bold}{n}{
- <-> alias * Junicode-TLF/b/n
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{b}{scit}{
- <-> \Junicode@@scale Junicode-BoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-TLF/mediumsemicondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{bold}{scit}{
- <-> alias * Junicode-TLF/b/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{scsl}{
+ <-> ssub * Junicode-TLF/mediumsemicondensed/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-tlf-ot1
-}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{bold}{it}{
- <-> alias * Junicode-TLF/b/it
-}{}
+% ---- sx = semiexpanded ----
-\DeclareFontShape{OT1}{Junicode-TLF}{b}{scsl}{
- <-> ssub * Junicode-TLF/b/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{sx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExp-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{bold}{scsl}{
- <-> ssub * Junicode-TLF/bold/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{sc}{
+ <-> alias * Junicode-TLF/sx/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{b}{sl}{
- <-> ssub * Junicode-TLF/b/it
+\DeclareFontShape{OT1}{Junicode-TLF}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{bold}{sl}{
- <-> ssub * Junicode-TLF/bold/it
+\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{n}{
+ <-> alias * Junicode-TLF/sx/n
}{}
+\DeclareFontShape{OT1}{Junicode-TLF}{sx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-tlf-sc-ot1
+}{}
-% ---- mediumcondensed ----
+\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{scit}{
+ <-> alias * Junicode-TLF/sx/scit
+}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{scit}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{it}{
+ <-> alias * Junicode-TLF/sx/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{sx}{sl}{
+ <-> ssub * Junicode-TLF/sx/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{sc}{
- <-> \Junicode@@scale Junicode-CondMedium-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{sl}{
+ <-> ssub * Junicode-TLF/semiexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{scsl}{
- <-> ssub * Junicode-TLF/mediumcondensed/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{sx}{scsl}{
+ <-> ssub * Junicode-TLF/sx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{sl}{
- <-> ssub * Junicode-TLF/mediumcondensed/it
+\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/semiexpanded/scit
}{}
% ---- l = light ----
-\DeclareFontShape{OT1}{Junicode-TLF}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-tlf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Junicode-TLF}{light}{n}{
- <-> alias * Junicode-TLF/l/n
-}{}
-
\DeclareFontShape{OT1}{Junicode-TLF}{l}{sc}{
<-> \Junicode@@scale Junicode-Light-tlf-sc-ot1
}{}
@@ -406,20 +347,20 @@
<-> alias * Junicode-TLF/l/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{l}{scit}{
- <-> \Junicode@@scale Junicode-LightItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{light}{scit}{
- <-> alias * Junicode-TLF/l/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{light}{n}{
+ <-> alias * Junicode-TLF/l/n
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{l}{scsl}{
- <-> ssub * Junicode-TLF/l/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{l}{scit}{
+ <-> \Junicode@@scale Junicode-LightItalic-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{light}{scsl}{
- <-> ssub * Junicode-TLF/light/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{light}{scit}{
+ <-> alias * Junicode-TLF/l/scit
}{}
\DeclareFontShape{OT1}{Junicode-TLF}{l}{sl}{
@@ -430,297 +371,308 @@
<-> ssub * Junicode-TLF/light/it
}{}
+\DeclareFontShape{OT1}{Junicode-TLF}{l}{scsl}{
+ <-> ssub * Junicode-TLF/l/scit
+}{}
-% ---- bx = boldexpanded ----
+\DeclareFontShape{OT1}{Junicode-TLF}{light}{scsl}{
+ <-> ssub * Junicode-TLF/light/scit
+}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{bx}{scit}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-sc-ot1
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{Junicode-TLF}{m}{scit}{
+ <-> \Junicode@@scale Junicode-Italic-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{scit}{
- <-> alias * Junicode-TLF/bx/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{regular}{scit}{
+ <-> alias * Junicode-TLF/m/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{it}{
- <-> alias * Junicode-TLF/bx/it
+\DeclareFontShape{OT1}{Junicode-TLF}{regular}{n}{
+ <-> alias * Junicode-TLF/m/n
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{bx}{sc}{
- <-> \Junicode@@scale Junicode-ExpBold-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{sc}{
- <-> alias * Junicode-TLF/bx/sc
+\DeclareFontShape{OT1}{Junicode-TLF}{regular}{it}{
+ <-> alias * Junicode-TLF/m/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{m}{sc}{
+ <-> \Junicode@@scale Junicode-Regular-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{n}{
- <-> alias * Junicode-TLF/bx/n
+\DeclareFontShape{OT1}{Junicode-TLF}{regular}{sc}{
+ <-> alias * Junicode-TLF/m/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{bx}{scsl}{
- <-> ssub * Junicode-TLF/bx/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{m}{sl}{
+ <-> ssub * Junicode-TLF/m/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{scsl}{
- <-> ssub * Junicode-TLF/boldexpanded/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{regular}{sl}{
+ <-> ssub * Junicode-TLF/regular/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{bx}{sl}{
- <-> ssub * Junicode-TLF/bx/it
+\DeclareFontShape{OT1}{Junicode-TLF}{m}{scsl}{
+ <-> ssub * Junicode-TLF/m/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{sl}{
- <-> ssub * Junicode-TLF/boldexpanded/it
+\DeclareFontShape{OT1}{Junicode-TLF}{regular}{scsl}{
+ <-> ssub * Junicode-TLF/regular/scit
}{}
-% ---- m = regular ----
+% ---- mediumsemiexpanded ----
-\DeclareFontShape{OT1}{Junicode-TLF}{m}{scit}{
- <-> \Junicode@@scale Junicode-Italic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{regular}{scit}{
- <-> alias * Junicode-TLF/m/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{regular}{it}{
- <-> alias * Junicode-TLF/m/it
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{m}{sc}{
- <-> \Junicode@@scale Junicode-Regular-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-TLF/mediumsemiexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{regular}{sc}{
- <-> alias * Junicode-TLF/m/sc
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/mediumsemiexpanded/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-tlf-ot1
+
+% ---- medium ----
+
+\DeclareFontShape{OT1}{Junicode-TLF}{medium}{sc}{
+ <-> \Junicode@@scale Junicode-Medium-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{regular}{n}{
- <-> alias * Junicode-TLF/m/n
+\DeclareFontShape{OT1}{Junicode-TLF}{medium}{n}{
+ <-> \Junicode@@scale Junicode-Medium-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{m}{scsl}{
- <-> ssub * Junicode-TLF/m/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{medium}{scit}{
+ <-> \Junicode@@scale Junicode-MediumItalic-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{regular}{scsl}{
- <-> ssub * Junicode-TLF/regular/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{medium}{it}{
+ <-> \Junicode@@scale Junicode-MediumItalic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{m}{sl}{
- <-> ssub * Junicode-TLF/m/it
+\DeclareFontShape{OT1}{Junicode-TLF}{medium}{sl}{
+ <-> ssub * Junicode-TLF/medium/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{regular}{sl}{
- <-> ssub * Junicode-TLF/regular/it
+\DeclareFontShape{OT1}{Junicode-TLF}{medium}{scsl}{
+ <-> ssub * Junicode-TLF/medium/scit
}{}
-% ---- lsc = lightsemicondensed ----
+% ---- bx = boldexpanded ----
-\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{sc}{
- <-> \Junicode@@scale Junicode-SmCondLight-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{sc}{
- <-> alias * Junicode-TLF/lsc/sc
+\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{it}{
+ <-> alias * Junicode-TLF/bx/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{n}{
- <-> alias * Junicode-TLF/lsc/n
+\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{n}{
+ <-> alias * Junicode-TLF/bx/n
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{bx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{scit}{
- <-> alias * Junicode-TLF/lsc/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{scit}{
+ <-> alias * Junicode-TLF/bx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{bx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpBold-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{it}{
- <-> alias * Junicode-TLF/lsc/it
+\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{sc}{
+ <-> alias * Junicode-TLF/bx/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{scsl}{
- <-> ssub * Junicode-TLF/lsc/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{bx}{sl}{
+ <-> ssub * Junicode-TLF/bx/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{scsl}{
- <-> ssub * Junicode-TLF/lightsemicondensed/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{sl}{
+ <-> ssub * Junicode-TLF/boldexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{sl}{
- <-> ssub * Junicode-TLF/lsc/it
+\DeclareFontShape{OT1}{Junicode-TLF}{bx}{scsl}{
+ <-> ssub * Junicode-TLF/bx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-TLF/lightsemicondensed/it
+\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/boldexpanded/scit
}{}
-% ---- medium ----
+% ---- lc = lightcondensed ----
-\DeclareFontShape{OT1}{Junicode-TLF}{medium}{sc}{
- <-> \Junicode@@scale Junicode-Medium-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{lc}{sc}{
+ <-> \Junicode@@scale Junicode-CondLight-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{medium}{n}{
- <-> \Junicode@@scale Junicode-Medium-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{sc}{
+ <-> alias * Junicode-TLF/lc/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{medium}{scit}{
- <-> \Junicode@@scale Junicode-MediumItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{medium}{it}{
- <-> \Junicode@@scale Junicode-MediumItalic-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{it}{
+ <-> alias * Junicode-TLF/lc/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{medium}{scsl}{
- <-> ssub * Junicode-TLF/medium/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{lc}{scit}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{medium}{sl}{
- <-> ssub * Junicode-TLF/medium/it
+\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{scit}{
+ <-> alias * Junicode-TLF/lc/scit
}{}
-
-% ---- sx = semiexpanded ----
-
-\DeclareFontShape{OT1}{Junicode-TLF}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{n}{
- <-> alias * Junicode-TLF/sx/n
+\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{n}{
+ <-> alias * Junicode-TLF/lc/n
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{sx}{sc}{
- <-> \Junicode@@scale Junicode-SmExp-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{lc}{sl}{
+ <-> ssub * Junicode-TLF/lc/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{sc}{
- <-> alias * Junicode-TLF/sx/sc
+\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{sl}{
+ <-> ssub * Junicode-TLF/lightcondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{lc}{scsl}{
+ <-> ssub * Junicode-TLF/lc/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{it}{
- <-> alias * Junicode-TLF/sx/it
+\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{scsl}{
+ <-> ssub * Junicode-TLF/lightcondensed/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{sx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpItalic-tlf-sc-ot1
-}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{scit}{
- <-> alias * Junicode-TLF/sx/scit
-}{}
+% ---- lsc = lightsemicondensed ----
-\DeclareFontShape{OT1}{Junicode-TLF}{sx}{scsl}{
- <-> ssub * Junicode-TLF/sx/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{scsl}{
- <-> ssub * Junicode-TLF/semiexpanded/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{scit}{
+ <-> alias * Junicode-TLF/lsc/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{sx}{sl}{
- <-> ssub * Junicode-TLF/sx/it
+\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{sl}{
- <-> ssub * Junicode-TLF/semiexpanded/it
+\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{n}{
+ <-> alias * Junicode-TLF/lsc/n
}{}
+\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-ot1
+}{}
-% ---- c = condensed ----
+\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{it}{
+ <-> alias * Junicode-TLF/lsc/it
+}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{c}{sc}{
- <-> \Junicode@@scale Junicode-Cond-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondLight-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{sc}{
- <-> alias * Junicode-TLF/c/sc
+\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{sc}{
+ <-> alias * Junicode-TLF/lsc/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{sl}{
+ <-> ssub * Junicode-TLF/lsc/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{n}{
- <-> alias * Junicode-TLF/c/n
+\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-TLF/lightsemicondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{c}{scit}{
- <-> \Junicode@@scale Junicode-CondItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{scsl}{
+ <-> ssub * Junicode-TLF/lsc/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{scit}{
- <-> alias * Junicode-TLF/c/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{scsl}{
+ <-> ssub * Junicode-TLF/lightsemicondensed/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-tlf-ot1
+
+% ---- mediumexpanded ----
+
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-ExpMedium-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{it}{
- <-> alias * Junicode-TLF/c/it
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{c}{scsl}{
- <-> ssub * Junicode-TLF/c/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{scsl}{
- <-> ssub * Junicode-TLF/condensed/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{c}{sl}{
- <-> ssub * Junicode-TLF/c/it
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-TLF/mediumexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{sl}{
- <-> ssub * Junicode-TLF/condensed/it
+\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/mediumexpanded/scit
}{}
% ---- x = expanded ----
-\DeclareFontShape{OT1}{Junicode-TLF}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{x}{sc}{
+ <-> \Junicode@@scale Junicode-Exp-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{expanded}{it}{
- <-> alias * Junicode-TLF/x/it
+\DeclareFontShape{OT1}{Junicode-TLF}{expanded}{sc}{
+ <-> alias * Junicode-TLF/x/sc
}{}
\DeclareFontShape{OT1}{Junicode-TLF}{x}{scit}{
@@ -739,12 +691,20 @@
<-> alias * Junicode-TLF/x/n
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{x}{sc}{
- <-> \Junicode@@scale Junicode-Exp-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{expanded}{sc}{
- <-> alias * Junicode-TLF/x/sc
+\DeclareFontShape{OT1}{Junicode-TLF}{expanded}{it}{
+ <-> alias * Junicode-TLF/x/it
+}{}
+
+\DeclareFontShape{OT1}{Junicode-TLF}{x}{sl}{
+ <-> ssub * Junicode-TLF/x/it
+}{}
+
+\DeclareFontShape{OT1}{Junicode-TLF}{expanded}{sl}{
+ <-> ssub * Junicode-TLF/expanded/it
}{}
\DeclareFontShape{OT1}{Junicode-TLF}{x}{scsl}{
@@ -755,117 +715,157 @@
<-> ssub * Junicode-TLF/expanded/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{x}{sl}{
- <-> ssub * Junicode-TLF/x/it
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{Junicode-TLF}{b}{scit}{
+ <-> \Junicode@@scale Junicode-BoldItalic-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{expanded}{sl}{
- <-> ssub * Junicode-TLF/expanded/it
+\DeclareFontShape{OT1}{Junicode-TLF}{bold}{scit}{
+ <-> alias * Junicode-TLF/b/scit
}{}
+\DeclareFontShape{OT1}{Junicode-TLF}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-tlf-ot1
+}{}
-% ---- sbsx = semiboldsemiexpanded ----
+\DeclareFontShape{OT1}{Junicode-TLF}{bold}{n}{
+ <-> alias * Junicode-TLF/b/n
+}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-TLF/sbsx/it
+\DeclareFontShape{OT1}{Junicode-TLF}{bold}{it}{
+ <-> alias * Junicode-TLF/b/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{b}{sc}{
+ <-> \Junicode@@scale Junicode-Bold-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{scit}{
- <-> alias * Junicode-TLF/sbsx/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{bold}{sc}{
+ <-> alias * Junicode-TLF/b/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{b}{sl}{
+ <-> ssub * Junicode-TLF/b/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-TLF/sbsx/n
+\DeclareFontShape{OT1}{Junicode-TLF}{bold}{sl}{
+ <-> ssub * Junicode-TLF/bold/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{b}{scsl}{
+ <-> ssub * Junicode-TLF/b/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{sc}{
- <-> alias * Junicode-TLF/sbsx/sc
+\DeclareFontShape{OT1}{Junicode-TLF}{bold}{scsl}{
+ <-> ssub * Junicode-TLF/bold/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{scsl}{
- <-> ssub * Junicode-TLF/sbsx/scit
+
+% ---- sbx = semiboldexpanded ----
+
+\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{scsl}{
- <-> ssub * Junicode-TLF/semiboldsemiexpanded/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{sc}{
+ <-> alias * Junicode-TLF/sbx/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{sl}{
- <-> ssub * Junicode-TLF/sbsx/it
+\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-TLF/semiboldsemiexpanded/it
+\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{it}{
+ <-> alias * Junicode-TLF/sbx/it
}{}
+\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-tlf-ot1
+}{}
-% ---- mediumexpanded ----
+\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{n}{
+ <-> alias * Junicode-TLF/sbx/n
+}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{sc}{
- <-> \Junicode@@scale Junicode-ExpMedium-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{scit}{
+ <-> alias * Junicode-TLF/sbx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{scit}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{sl}{
+ <-> ssub * Junicode-TLF/sbx/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-TLF/semiboldexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{scsl}{
- <-> ssub * Junicode-TLF/mediumexpanded/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{scsl}{
+ <-> ssub * Junicode-TLF/sbx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{sl}{
- <-> ssub * Junicode-TLF/mediumexpanded/it
+\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/semiboldexpanded/scit
}{}
-% ---- mediumsemiexpanded ----
+% ---- c = condensed ----
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{sc}{
- <-> \Junicode@@scale Junicode-SmExpMedium-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{c}{sc}{
+ <-> \Junicode@@scale Junicode-Cond-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{sc}{
+ <-> alias * Junicode-TLF/c/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{scit}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{c}{scit}{
+ <-> \Junicode@@scale Junicode-CondItalic-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-ot1
+\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{scit}{
+ <-> alias * Junicode-TLF/c/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{scsl}{
- <-> ssub * Junicode-TLF/mediumsemiexpanded/scit
+\DeclareFontShape{OT1}{Junicode-TLF}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-tlf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-TLF/mediumsemiexpanded/it
+\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{n}{
+ <-> alias * Junicode-TLF/c/n
+}{}
+
+\DeclareFontShape{OT1}{Junicode-TLF}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{it}{
+ <-> alias * Junicode-TLF/c/it
+}{}
+
+\DeclareFontShape{OT1}{Junicode-TLF}{c}{sl}{
+ <-> ssub * Junicode-TLF/c/it
+}{}
+
+\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{sl}{
+ <-> ssub * Junicode-TLF/condensed/it
+}{}
+
+\DeclareFontShape{OT1}{Junicode-TLF}{c}{scsl}{
+ <-> ssub * Junicode-TLF/c/scit
+}{}
+
+\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{scsl}{
+ <-> ssub * Junicode-TLF/condensed/scit
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-TOsF.fd b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-TOsF.fd
index 77547d3a2c7..d7caf690797 100644
--- a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{OT1Junicode-TOsF.fd}
- [2024/06/03 (autoinst) Font definitions for OT1/Junicode-TOsF.]
+ [2024/07/21 (autoinst) Font definitions for OT1/Junicode-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,394 +20,394 @@
\DeclareFontFamily{OT1}{Junicode-TOsF}{}
-% ---- bx = boldexpanded ----
+% ---- c = condensed ----
-\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{scit}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{c}{scit}{
+ <-> \Junicode@@scale Junicode-CondItalic-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{scit}{
- <-> alias * Junicode-TOsF/bx/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{scit}{
+ <-> alias * Junicode-TOsF/c/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{it}{
- <-> alias * Junicode-TOsF/bx/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{n}{
+ <-> alias * Junicode-TOsF/c/n
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{sc}{
- <-> \Junicode@@scale Junicode-ExpBold-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{sc}{
- <-> alias * Junicode-TOsF/bx/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{it}{
+ <-> alias * Junicode-TOsF/c/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{c}{sc}{
+ <-> \Junicode@@scale Junicode-Cond-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{n}{
- <-> alias * Junicode-TOsF/bx/n
+\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{sc}{
+ <-> alias * Junicode-TOsF/c/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{scsl}{
- <-> ssub * Junicode-TOsF/bx/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{c}{sl}{
+ <-> ssub * Junicode-TOsF/c/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/boldexpanded/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{sl}{
+ <-> ssub * Junicode-TOsF/condensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{sl}{
- <-> ssub * Junicode-TOsF/bx/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{c}{scsl}{
+ <-> ssub * Junicode-TOsF/c/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{sl}{
- <-> ssub * Junicode-TOsF/boldexpanded/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{scsl}{
+ <-> ssub * Junicode-TOsF/condensed/scit
}{}
-% ---- l = light ----
+% ---- sbx = semiboldexpanded ----
-\DeclareFontShape{OT1}{Junicode-TOsF}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{light}{n}{
- <-> alias * Junicode-TOsF/l/n
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{sc}{
+ <-> alias * Junicode-TOsF/sbx/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{l}{sc}{
- <-> \Junicode@@scale Junicode-Light-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{light}{sc}{
- <-> alias * Junicode-TOsF/l/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{it}{
+ <-> alias * Junicode-TOsF/sbx/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{light}{it}{
- <-> alias * Junicode-TOsF/l/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{scit}{
+ <-> alias * Junicode-TOsF/sbx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{l}{scit}{
- <-> \Junicode@@scale Junicode-LightItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{light}{scit}{
- <-> alias * Junicode-TOsF/l/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{n}{
+ <-> alias * Junicode-TOsF/sbx/n
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{l}{scsl}{
- <-> ssub * Junicode-TOsF/l/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{sl}{
+ <-> ssub * Junicode-TOsF/sbx/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{light}{scsl}{
- <-> ssub * Junicode-TOsF/light/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/semiboldexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{l}{sl}{
- <-> ssub * Junicode-TOsF/l/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{scsl}{
+ <-> ssub * Junicode-TOsF/sbx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{light}{sl}{
- <-> ssub * Junicode-TOsF/light/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/semiboldexpanded/scit
}{}
-% ---- lsc = lightsemicondensed ----
+% ---- x = expanded ----
-\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{n}{
- <-> alias * Junicode-TOsF/lsc/n
+\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{n}{
+ <-> alias * Junicode-TOsF/x/n
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{sc}{
- <-> \Junicode@@scale Junicode-SmCondLight-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{x}{scit}{
+ <-> \Junicode@@scale Junicode-ExpItalic-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{sc}{
- <-> alias * Junicode-TOsF/lsc/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{scit}{
+ <-> alias * Junicode-TOsF/x/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{it}{
- <-> alias * Junicode-TOsF/lsc/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{it}{
+ <-> alias * Junicode-TOsF/x/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{x}{sc}{
+ <-> \Junicode@@scale Junicode-Exp-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{scit}{
- <-> alias * Junicode-TOsF/lsc/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{sc}{
+ <-> alias * Junicode-TOsF/x/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{scsl}{
- <-> ssub * Junicode-TOsF/lsc/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{x}{sl}{
+ <-> ssub * Junicode-TOsF/x/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{scsl}{
- <-> ssub * Junicode-TOsF/lightsemicondensed/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{sl}{
+ <-> ssub * Junicode-TOsF/expanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{sl}{
- <-> ssub * Junicode-TOsF/lsc/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{x}{scsl}{
+ <-> ssub * Junicode-TOsF/x/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-TOsF/lightsemicondensed/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{scsl}{
+ <-> ssub * Junicode-TOsF/expanded/scit
}{}
-% ---- medium ----
+% ---- b = bold ----
-\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{n}{
- <-> \Junicode@@scale Junicode-Medium-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{sc}{
- <-> \Junicode@@scale Junicode-Medium-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{it}{
+ <-> alias * Junicode-TOsF/b/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{it}{
- <-> \Junicode@@scale Junicode-MediumItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{scit}{
- <-> \Junicode@@scale Junicode-MediumItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{n}{
+ <-> alias * Junicode-TOsF/b/n
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{scsl}{
- <-> ssub * Junicode-TOsF/medium/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{b}{scit}{
+ <-> \Junicode@@scale Junicode-BoldItalic-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{sl}{
- <-> ssub * Junicode-TOsF/medium/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{scit}{
+ <-> alias * Junicode-TOsF/b/scit
}{}
-
-% ---- m = regular ----
-
-\DeclareFontShape{OT1}{Junicode-TOsF}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{b}{sc}{
+ <-> \Junicode@@scale Junicode-Bold-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{it}{
- <-> alias * Junicode-TOsF/m/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{sc}{
+ <-> alias * Junicode-TOsF/b/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{m}{scit}{
- <-> \Junicode@@scale Junicode-Italic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{b}{sl}{
+ <-> ssub * Junicode-TOsF/b/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{scit}{
- <-> alias * Junicode-TOsF/m/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{sl}{
+ <-> ssub * Junicode-TOsF/bold/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{b}{scsl}{
+ <-> ssub * Junicode-TOsF/b/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{n}{
- <-> alias * Junicode-TOsF/m/n
+\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{scsl}{
+ <-> ssub * Junicode-TOsF/bold/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{m}{sc}{
- <-> \Junicode@@scale Junicode-Regular-tosf-sc-ot1
+
+% ---- mediumexpanded ----
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{sc}{
- <-> alias * Junicode-TOsF/m/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{m}{scsl}{
- <-> ssub * Junicode-TOsF/m/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{scsl}{
- <-> ssub * Junicode-TOsF/regular/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-ExpMedium-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{m}{sl}{
- <-> ssub * Junicode-TOsF/m/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/mediumexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{sl}{
- <-> ssub * Junicode-TOsF/regular/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/mediumexpanded/scit
}{}
-% ---- sx = semiexpanded ----
+% ---- lsc = lightsemicondensed ----
-\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{sc}{
- <-> \Junicode@@scale Junicode-SmExp-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondLight-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{sc}{
- <-> alias * Junicode-TOsF/sx/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{sc}{
+ <-> alias * Junicode-TOsF/lsc/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{n}{
- <-> alias * Junicode-TOsF/sx/n
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{n}{
+ <-> alias * Junicode-TOsF/lsc/n
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{scit}{
- <-> alias * Junicode-TOsF/sx/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{scit}{
+ <-> alias * Junicode-TOsF/lsc/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{it}{
- <-> alias * Junicode-TOsF/sx/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{it}{
+ <-> alias * Junicode-TOsF/lsc/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{scsl}{
- <-> ssub * Junicode-TOsF/sx/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{sl}{
+ <-> ssub * Junicode-TOsF/lsc/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/semiexpanded/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-TOsF/lightsemicondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{sl}{
- <-> ssub * Junicode-TOsF/sx/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{scsl}{
+ <-> ssub * Junicode-TOsF/lsc/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{sl}{
- <-> ssub * Junicode-TOsF/semiexpanded/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{scsl}{
+ <-> ssub * Junicode-TOsF/lightsemicondensed/scit
}{}
-% ---- c = condensed ----
+% ---- lc = lightcondensed ----
-\DeclareFontShape{OT1}{Junicode-TOsF}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{scit}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{it}{
- <-> alias * Junicode-TOsF/c/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{scit}{
+ <-> alias * Junicode-TOsF/lc/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{c}{scit}{
- <-> \Junicode@@scale Junicode-CondItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{scit}{
- <-> alias * Junicode-TOsF/c/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{n}{
+ <-> alias * Junicode-TOsF/lc/n
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{n}{
- <-> alias * Junicode-TOsF/c/n
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{it}{
+ <-> alias * Junicode-TOsF/lc/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{c}{sc}{
- <-> \Junicode@@scale Junicode-Cond-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{sc}{
+ <-> \Junicode@@scale Junicode-CondLight-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{sc}{
- <-> alias * Junicode-TOsF/c/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{sc}{
+ <-> alias * Junicode-TOsF/lc/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{c}{scsl}{
- <-> ssub * Junicode-TOsF/c/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{sl}{
+ <-> ssub * Junicode-TOsF/lc/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{scsl}{
- <-> ssub * Junicode-TOsF/condensed/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{sl}{
+ <-> ssub * Junicode-TOsF/lightcondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{c}{sl}{
- <-> ssub * Junicode-TOsF/c/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{scsl}{
+ <-> ssub * Junicode-TOsF/lc/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{sl}{
- <-> ssub * Junicode-TOsF/condensed/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{scsl}{
+ <-> ssub * Junicode-TOsF/lightcondensed/scit
}{}
-% ---- x = expanded ----
+% ---- m = regular ----
-\DeclareFontShape{OT1}{Junicode-TOsF}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{m}{sc}{
+ <-> \Junicode@@scale Junicode-Regular-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{n}{
- <-> alias * Junicode-TOsF/x/n
+\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{sc}{
+ <-> alias * Junicode-TOsF/m/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{x}{sc}{
- <-> \Junicode@@scale Junicode-Exp-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{sc}{
- <-> alias * Junicode-TOsF/x/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{it}{
+ <-> alias * Junicode-TOsF/m/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{m}{scit}{
+ <-> \Junicode@@scale Junicode-Italic-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{it}{
- <-> alias * Junicode-TOsF/x/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{scit}{
+ <-> alias * Junicode-TOsF/m/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{x}{scit}{
- <-> \Junicode@@scale Junicode-ExpItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{scit}{
- <-> alias * Junicode-TOsF/x/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{n}{
+ <-> alias * Junicode-TOsF/m/n
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{x}{scsl}{
- <-> ssub * Junicode-TOsF/x/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{m}{sl}{
+ <-> ssub * Junicode-TOsF/m/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{scsl}{
- <-> ssub * Junicode-TOsF/expanded/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{sl}{
+ <-> ssub * Junicode-TOsF/regular/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{x}{sl}{
- <-> ssub * Junicode-TOsF/x/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{m}{scsl}{
+ <-> ssub * Junicode-TOsF/m/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{sl}{
- <-> ssub * Junicode-TOsF/expanded/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{scsl}{
+ <-> ssub * Junicode-TOsF/regular/scit
}{}
% ---- mediumsemiexpanded ----
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{sc}{
- <-> \Junicode@@scale Junicode-SmExpMedium-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-ot1
}{}
\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{n}{
@@ -418,145 +418,196 @@
<-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/mediumsemiexpanded/it
}{}
\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{scsl}{
<-> ssub * Junicode-TOsF/mediumsemiexpanded/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-TOsF/mediumsemiexpanded/it
+
+% ---- medium ----
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{sc}{
+ <-> \Junicode@@scale Junicode-Medium-tosf-sc-ot1
}{}
+\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{n}{
+ <-> \Junicode@@scale Junicode-Medium-tosf-ot1
+}{}
-% ---- sbsx = semiboldsemiexpanded ----
+\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{scit}{
+ <-> \Junicode@@scale Junicode-MediumItalic-tosf-sc-ot1
+}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{it}{
+ <-> \Junicode@@scale Junicode-MediumItalic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{sc}{
- <-> alias * Junicode-TOsF/sbsx/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{sl}{
+ <-> ssub * Junicode-TOsF/medium/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{scsl}{
+ <-> ssub * Junicode-TOsF/medium/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-TOsF/sbsx/n
+
+% ---- bx = boldexpanded ----
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpBold-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{sc}{
+ <-> alias * Junicode-TOsF/bx/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{scit}{
- <-> alias * Junicode-TOsF/sbsx/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{scit}{
+ <-> alias * Junicode-TOsF/bx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-TOsF/sbsx/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{scsl}{
- <-> ssub * Junicode-TOsF/sbsx/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{n}{
+ <-> alias * Junicode-TOsF/bx/n
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/semiboldsemiexpanded/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{sl}{
- <-> ssub * Junicode-TOsF/sbsx/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{it}{
+ <-> alias * Junicode-TOsF/bx/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-TOsF/semiboldsemiexpanded/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{sl}{
+ <-> ssub * Junicode-TOsF/bx/it
}{}
+\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/boldexpanded/it
+}{}
-% ---- mediumexpanded ----
+\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{scsl}{
+ <-> ssub * Junicode-TOsF/bx/scit
+}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{sc}{
- <-> \Junicode@@scale Junicode-ExpMedium-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/boldexpanded/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-tosf-ot1
+
+% ---- sx = semiexpanded ----
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{scit}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{it}{
+ <-> alias * Junicode-TOsF/sx/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/mediumexpanded/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{n}{
+ <-> alias * Junicode-TOsF/sx/n
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{sl}{
- <-> ssub * Junicode-TOsF/mediumexpanded/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-tosf-sc-ot1
}{}
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{scit}{
+ <-> alias * Junicode-TOsF/sx/scit
+}{}
-% ---- sbx = semiboldexpanded ----
+\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExp-tosf-sc-ot1
+}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{sc}{
+ <-> alias * Junicode-TOsF/sx/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{it}{
- <-> alias * Junicode-TOsF/sbx/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{sl}{
+ <-> ssub * Junicode-TOsF/sx/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{scit}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/semiexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{scit}{
- <-> alias * Junicode-TOsF/sbx/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{scsl}{
+ <-> ssub * Junicode-TOsF/sx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/semiexpanded/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{n}{
- <-> alias * Junicode-TOsF/sbx/n
+
+% ---- l = light ----
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{l}{sc}{
+ <-> \Junicode@@scale Junicode-Light-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{sc}{
- <-> \Junicode@@scale Junicode-ExpSmBold-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{light}{sc}{
+ <-> alias * Junicode-TOsF/l/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{sc}{
- <-> alias * Junicode-TOsF/sbx/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{scsl}{
- <-> ssub * Junicode-TOsF/sbx/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{light}{it}{
+ <-> alias * Junicode-TOsF/l/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/semiboldexpanded/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{sl}{
- <-> ssub * Junicode-TOsF/sbx/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{light}{n}{
+ <-> alias * Junicode-TOsF/l/n
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-TOsF/semiboldexpanded/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{l}{scit}{
+ <-> \Junicode@@scale Junicode-LightItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{light}{scit}{
+ <-> alias * Junicode-TOsF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{l}{sl}{
+ <-> ssub * Junicode-TOsF/l/it
+}{}
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{light}{sl}{
+ <-> ssub * Junicode-TOsF/light/it
+}{}
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{l}{scsl}{
+ <-> ssub * Junicode-TOsF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{Junicode-TOsF}{light}{scsl}{
+ <-> ssub * Junicode-TOsF/light/scit
}{}
@@ -566,36 +617,28 @@
<-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{scit}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-sc-ot1
-}{}
-
\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{n}{
<-> \Junicode@@scale Junicode-SmCondMedium-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{sc}{
- <-> \Junicode@@scale Junicode-SmCondMedium-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{scsl}{
- <-> ssub * Junicode-TOsF/mediumsemicondensed/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-tosf-sc-ot1
}{}
\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{sl}{
<-> ssub * Junicode-TOsF/mediumsemicondensed/it
}{}
-
-% ---- sb = semibold ----
-
-\DeclareFontShape{OT1}{Junicode-TOsF}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{scsl}{
+ <-> ssub * Junicode-TOsF/mediumsemicondensed/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semibold}{n}{
- <-> alias * Junicode-TOsF/sb/n
-}{}
+
+% ---- sb = semibold ----
\DeclareFontShape{OT1}{Junicode-TOsF}{sb}{sc}{
<-> \Junicode@@scale Junicode-SmBold-tosf-sc-ot1
@@ -605,12 +648,12 @@
<-> alias * Junicode-TOsF/sb/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semibold}{it}{
- <-> alias * Junicode-TOsF/sb/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{semibold}{n}{
+ <-> alias * Junicode-TOsF/sb/n
}{}
\DeclareFontShape{OT1}{Junicode-TOsF}{sb}{scit}{
@@ -621,12 +664,12 @@
<-> alias * Junicode-TOsF/sb/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sb}{scsl}{
- <-> ssub * Junicode-TOsF/sb/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semibold}{scsl}{
- <-> ssub * Junicode-TOsF/semibold/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{semibold}{it}{
+ <-> alias * Junicode-TOsF/sb/it
}{}
\DeclareFontShape{OT1}{Junicode-TOsF}{sb}{sl}{
@@ -637,66 +680,50 @@
<-> ssub * Junicode-TOsF/semibold/it
}{}
-
-% ---- sc = semicondensed ----
-
-\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{it}{
- <-> \Junicode@@scale Junicode-SmCondItalic-tosf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{it}{
- <-> alias * Junicode-TOsF/sc/it
-}{}
-
-\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sb}{scsl}{
+ <-> ssub * Junicode-TOsF/sb/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{scit}{
- <-> alias * Junicode-TOsF/sc/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{semibold}{scsl}{
+ <-> ssub * Junicode-TOsF/semibold/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-tosf-ot1
-}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{n}{
- <-> alias * Junicode-TOsF/sc/n
-}{}
+% ---- mediumcondensed ----
-\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{sc}{
- <-> \Junicode@@scale Junicode-SmCond-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{sc}{
+ <-> \Junicode@@scale Junicode-CondMedium-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{sc}{
- <-> alias * Junicode-TOsF/sc/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{scsl}{
- <-> ssub * Junicode-TOsF/sc/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{scit}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{scsl}{
- <-> ssub * Junicode-TOsF/semicondensed/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{sl}{
- <-> ssub * Junicode-TOsF/sc/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-TOsF/mediumcondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{sl}{
- <-> ssub * Junicode-TOsF/semicondensed/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{scsl}{
+ <-> ssub * Junicode-TOsF/mediumcondensed/scit
}{}
% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpBold-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{boldsemiexpanded}{scit}{
- <-> alias * Junicode-TOsF/bsx/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{boldsemiexpanded}{sc}{
+ <-> alias * Junicode-TOsF/bsx/sc
}{}
\DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{it}{
@@ -707,14 +734,6 @@
<-> alias * Junicode-TOsF/bsx/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpBold-tosf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Junicode-TOsF}{boldsemiexpanded}{sc}{
- <-> alias * Junicode-TOsF/bsx/sc
-}{}
-
\DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{n}{
<-> \Junicode@@scale Junicode-SmExpBold-tosf-ot1
}{}
@@ -723,12 +742,12 @@
<-> alias * Junicode-TOsF/bsx/n
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{scsl}{
- <-> ssub * Junicode-TOsF/bsx/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{boldsemiexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/boldsemiexpanded/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{boldsemiexpanded}{scit}{
+ <-> alias * Junicode-TOsF/bsx/scit
}{}
\DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{sl}{
@@ -739,133 +758,114 @@
<-> ssub * Junicode-TOsF/boldsemiexpanded/it
}{}
-
-% ---- lc = lightcondensed ----
-
-\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{sc}{
- <-> \Junicode@@scale Junicode-CondLight-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{scsl}{
+ <-> ssub * Junicode-TOsF/bsx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{sc}{
- <-> alias * Junicode-TOsF/lc/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{boldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/boldsemiexpanded/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-tosf-ot1
-}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{n}{
- <-> alias * Junicode-TOsF/lc/n
-}{}
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{scit}{
- <-> \Junicode@@scale Junicode-CondLightItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{scit}{
- <-> alias * Junicode-TOsF/lc/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-TOsF/sbsx/n
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{it}{
- <-> alias * Junicode-TOsF/lc/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{scit}{
+ <-> alias * Junicode-TOsF/sbsx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{scsl}{
- <-> ssub * Junicode-TOsF/lc/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{scsl}{
- <-> ssub * Junicode-TOsF/lightcondensed/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-TOsF/sbsx/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{sl}{
- <-> ssub * Junicode-TOsF/lc/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{sl}{
- <-> ssub * Junicode-TOsF/lightcondensed/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{sc}{
+ <-> alias * Junicode-TOsF/sbsx/sc
}{}
-
-% ---- b = bold ----
-
-\DeclareFontShape{OT1}{Junicode-TOsF}{b}{sc}{
- <-> \Junicode@@scale Junicode-Bold-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{sl}{
+ <-> ssub * Junicode-TOsF/sbsx/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{sc}{
- <-> alias * Junicode-TOsF/b/sc
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/semiboldsemiexpanded/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{scsl}{
+ <-> ssub * Junicode-TOsF/sbsx/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{n}{
- <-> alias * Junicode-TOsF/b/n
+\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/semiboldsemiexpanded/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{b}{scit}{
- <-> \Junicode@@scale Junicode-BoldItalic-tosf-sc-ot1
-}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{scit}{
- <-> alias * Junicode-TOsF/b/scit
-}{}
+% ---- sc = semicondensed ----
-\DeclareFontShape{OT1}{Junicode-TOsF}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCond-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{it}{
- <-> alias * Junicode-TOsF/b/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{sc}{
+ <-> alias * Junicode-TOsF/sc/sc
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{b}{scsl}{
- <-> ssub * Junicode-TOsF/b/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{scsl}{
- <-> ssub * Junicode-TOsF/bold/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{it}{
+ <-> alias * Junicode-TOsF/sc/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{b}{sl}{
- <-> ssub * Junicode-TOsF/b/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{sl}{
- <-> ssub * Junicode-TOsF/bold/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{scit}{
+ <-> alias * Junicode-TOsF/sc/scit
}{}
-
-% ---- mediumcondensed ----
-
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{scit}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-tosf-ot1
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{n}{
+ <-> alias * Junicode-TOsF/sc/n
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{sc}{
- <-> \Junicode@@scale Junicode-CondMedium-tosf-sc-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{sl}{
+ <-> ssub * Junicode-TOsF/sc/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-tosf-ot1
+\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{sl}{
+ <-> ssub * Junicode-TOsF/semicondensed/it
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{scsl}{
- <-> ssub * Junicode-TOsF/mediumcondensed/scit
+\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{scsl}{
+ <-> ssub * Junicode-TOsF/sc/scit
}{}
-\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{sl}{
- <-> ssub * Junicode-TOsF/mediumcondensed/it
+\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{scsl}{
+ <-> ssub * Junicode-TOsF/semicondensed/scit
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/T1Junicode-Inf.fd b/Master/texmf-dist/tex/latex/junicode/T1Junicode-Inf.fd
index 847a5511252..8aa4e98b72b 100644
--- a/Master/texmf-dist/tex/latex/junicode/T1Junicode-Inf.fd
+++ b/Master/texmf-dist/tex/latex/junicode/T1Junicode-Inf.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{T1Junicode-Inf.fd}
- [2024/06/03 (autoinst) Font definitions for T1/Junicode-Inf.]
+ [2024/07/21 (autoinst) Font definitions for T1/Junicode-Inf.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,146 +20,85 @@
\DeclareFontFamily{T1}{Junicode-Inf}{}
-% ---- sbsx = semiboldsemiexpanded ----
-
-\DeclareFontShape{T1}{Junicode-Inf}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-inf-t1
-}{}
-
-\DeclareFontShape{T1}{Junicode-Inf}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-Inf/sbsx/it
-}{}
-
-\DeclareFontShape{T1}{Junicode-Inf}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-inf-t1
-}{}
-
-\DeclareFontShape{T1}{Junicode-Inf}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-Inf/sbsx/n
-}{}
-
-\DeclareFontShape{T1}{Junicode-Inf}{sbsx}{sl}{
- <-> ssub * Junicode-Inf/sbsx/it
-}{}
-
-\DeclareFontShape{T1}{Junicode-Inf}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-Inf/semiboldsemiexpanded/it
-}{}
-
-
-% ---- mediumexpanded ----
-
-\DeclareFontShape{T1}{Junicode-Inf}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-inf-t1
-}{}
+% ---- lc = lightcondensed ----
-\DeclareFontShape{T1}{Junicode-Inf}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-inf-t1
+\DeclareFontShape{T1}{Junicode-Inf}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-inf-t1
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{mediumexpanded}{sl}{
- <-> ssub * Junicode-Inf/mediumexpanded/it
+\DeclareFontShape{T1}{Junicode-Inf}{lightcondensed}{n}{
+ <-> alias * Junicode-Inf/lc/n
}{}
-
-% ---- mediumsemiexpanded ----
-
-\DeclareFontShape{T1}{Junicode-Inf}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-inf-t1
+\DeclareFontShape{T1}{Junicode-Inf}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-inf-t1
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-inf-t1
+\DeclareFontShape{T1}{Junicode-Inf}{lightcondensed}{it}{
+ <-> alias * Junicode-Inf/lc/it
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-Inf/mediumsemiexpanded/it
+\DeclareFontShape{T1}{Junicode-Inf}{lc}{sl}{
+ <-> ssub * Junicode-Inf/lc/it
}{}
-
-% ---- sx = semiexpanded ----
-
-\DeclareFontShape{T1}{Junicode-Inf}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-inf-t1
+\DeclareFontShape{T1}{Junicode-Inf}{lightcondensed}{sl}{
+ <-> ssub * Junicode-Inf/lightcondensed/it
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{semiexpanded}{n}{
- <-> alias * Junicode-Inf/sx/n
-}{}
-\DeclareFontShape{T1}{Junicode-Inf}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-inf-t1
-}{}
+% ---- medium ----
-\DeclareFontShape{T1}{Junicode-Inf}{semiexpanded}{it}{
- <-> alias * Junicode-Inf/sx/it
+\DeclareFontShape{T1}{Junicode-Inf}{medium}{it}{
+ <-> \Junicode@@scale Junicode-MediumItalic-inf-t1
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{sx}{sl}{
- <-> ssub * Junicode-Inf/sx/it
+\DeclareFontShape{T1}{Junicode-Inf}{medium}{n}{
+ <-> \Junicode@@scale Junicode-Medium-inf-t1
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{semiexpanded}{sl}{
- <-> ssub * Junicode-Inf/semiexpanded/it
+\DeclareFontShape{T1}{Junicode-Inf}{medium}{sl}{
+ <-> ssub * Junicode-Inf/medium/it
}{}
-% ---- c = condensed ----
-
-\DeclareFontShape{T1}{Junicode-Inf}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-inf-t1
-}{}
-
-\DeclareFontShape{T1}{Junicode-Inf}{condensed}{it}{
- <-> alias * Junicode-Inf/c/it
-}{}
+% ---- bx = boldexpanded ----
-\DeclareFontShape{T1}{Junicode-Inf}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-inf-t1
+\DeclareFontShape{T1}{Junicode-Inf}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-inf-t1
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{condensed}{n}{
- <-> alias * Junicode-Inf/c/n
+\DeclareFontShape{T1}{Junicode-Inf}{boldexpanded}{it}{
+ <-> alias * Junicode-Inf/bx/it
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{c}{sl}{
- <-> ssub * Junicode-Inf/c/it
+\DeclareFontShape{T1}{Junicode-Inf}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-inf-t1
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{condensed}{sl}{
- <-> ssub * Junicode-Inf/condensed/it
+\DeclareFontShape{T1}{Junicode-Inf}{boldexpanded}{n}{
+ <-> alias * Junicode-Inf/bx/n
}{}
-
-% ---- x = expanded ----
-
-\DeclareFontShape{T1}{Junicode-Inf}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-inf-t1
+\DeclareFontShape{T1}{Junicode-Inf}{bx}{sl}{
+ <-> ssub * Junicode-Inf/bx/it
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{expanded}{it}{
- <-> alias * Junicode-Inf/x/it
+\DeclareFontShape{T1}{Junicode-Inf}{boldexpanded}{sl}{
+ <-> ssub * Junicode-Inf/boldexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-inf-t1
-}{}
-\DeclareFontShape{T1}{Junicode-Inf}{expanded}{n}{
- <-> alias * Junicode-Inf/x/n
-}{}
+% ---- m = regular ----
-\DeclareFontShape{T1}{Junicode-Inf}{x}{sl}{
- <-> ssub * Junicode-Inf/x/it
+\DeclareFontShape{T1}{Junicode-Inf}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-inf-t1
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{expanded}{sl}{
- <-> ssub * Junicode-Inf/expanded/it
+\DeclareFontShape{T1}{Junicode-Inf}{regular}{it}{
+ <-> alias * Junicode-Inf/m/it
}{}
-
-% ---- m = regular ----
-
\DeclareFontShape{T1}{Junicode-Inf}{m}{n}{
<-> \Junicode@@scale Junicode-Regular-inf-t1
}{}
@@ -168,14 +107,6 @@
<-> alias * Junicode-Inf/m/n
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-inf-t1
-}{}
-
-\DeclareFontShape{T1}{Junicode-Inf}{regular}{it}{
- <-> alias * Junicode-Inf/m/it
-}{}
-
\DeclareFontShape{T1}{Junicode-Inf}{m}{sl}{
<-> ssub * Junicode-Inf/m/it
}{}
@@ -185,45 +116,18 @@
}{}
-% ---- lsc = lightsemicondensed ----
-
-\DeclareFontShape{T1}{Junicode-Inf}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-inf-t1
-}{}
-
-\DeclareFontShape{T1}{Junicode-Inf}{lightsemicondensed}{n}{
- <-> alias * Junicode-Inf/lsc/n
-}{}
-
-\DeclareFontShape{T1}{Junicode-Inf}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-inf-t1
-}{}
-
-\DeclareFontShape{T1}{Junicode-Inf}{lightsemicondensed}{it}{
- <-> alias * Junicode-Inf/lsc/it
-}{}
-
-\DeclareFontShape{T1}{Junicode-Inf}{lsc}{sl}{
- <-> ssub * Junicode-Inf/lsc/it
-}{}
-
-\DeclareFontShape{T1}{Junicode-Inf}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-Inf/lightsemicondensed/it
-}{}
-
-
-% ---- medium ----
+% ---- mediumsemiexpanded ----
-\DeclareFontShape{T1}{Junicode-Inf}{medium}{it}{
- <-> \Junicode@@scale Junicode-MediumItalic-inf-t1
+\DeclareFontShape{T1}{Junicode-Inf}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-inf-t1
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{medium}{n}{
- <-> \Junicode@@scale Junicode-Medium-inf-t1
+\DeclareFontShape{T1}{Junicode-Inf}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-inf-t1
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{medium}{sl}{
- <-> ssub * Junicode-Inf/medium/it
+\DeclareFontShape{T1}{Junicode-Inf}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-Inf/mediumsemiexpanded/it
}{}
@@ -254,30 +158,45 @@
}{}
-% ---- bx = boldexpanded ----
+% ---- sx = semiexpanded ----
-\DeclareFontShape{T1}{Junicode-Inf}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-inf-t1
+\DeclareFontShape{T1}{Junicode-Inf}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-inf-t1
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{boldexpanded}{n}{
- <-> alias * Junicode-Inf/bx/n
+\DeclareFontShape{T1}{Junicode-Inf}{semiexpanded}{it}{
+ <-> alias * Junicode-Inf/sx/it
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-inf-t1
+\DeclareFontShape{T1}{Junicode-Inf}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-inf-t1
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{boldexpanded}{it}{
- <-> alias * Junicode-Inf/bx/it
+\DeclareFontShape{T1}{Junicode-Inf}{semiexpanded}{n}{
+ <-> alias * Junicode-Inf/sx/n
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{bx}{sl}{
- <-> ssub * Junicode-Inf/bx/it
+\DeclareFontShape{T1}{Junicode-Inf}{sx}{sl}{
+ <-> ssub * Junicode-Inf/sx/it
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{boldexpanded}{sl}{
- <-> ssub * Junicode-Inf/boldexpanded/it
+\DeclareFontShape{T1}{Junicode-Inf}{semiexpanded}{sl}{
+ <-> ssub * Junicode-Inf/semiexpanded/it
+}{}
+
+
+% ---- mediumsemicondensed ----
+
+\DeclareFontShape{T1}{Junicode-Inf}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-inf-t1
+}{}
+
+\DeclareFontShape{T1}{Junicode-Inf}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-inf-t1
+}{}
+
+\DeclareFontShape{T1}{Junicode-Inf}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-Inf/mediumsemicondensed/it
}{}
@@ -296,84 +215,84 @@
}{}
-% ---- b = bold ----
+% ---- sb = semibold ----
-\DeclareFontShape{T1}{Junicode-Inf}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-inf-t1
+\DeclareFontShape{T1}{Junicode-Inf}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-inf-t1
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{bold}{n}{
- <-> alias * Junicode-Inf/b/n
+\DeclareFontShape{T1}{Junicode-Inf}{semibold}{it}{
+ <-> alias * Junicode-Inf/sb/it
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-inf-t1
+\DeclareFontShape{T1}{Junicode-Inf}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-inf-t1
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{bold}{it}{
- <-> alias * Junicode-Inf/b/it
+\DeclareFontShape{T1}{Junicode-Inf}{semibold}{n}{
+ <-> alias * Junicode-Inf/sb/n
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{b}{sl}{
- <-> ssub * Junicode-Inf/b/it
+\DeclareFontShape{T1}{Junicode-Inf}{sb}{sl}{
+ <-> ssub * Junicode-Inf/sb/it
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{bold}{sl}{
- <-> ssub * Junicode-Inf/bold/it
+\DeclareFontShape{T1}{Junicode-Inf}{semibold}{sl}{
+ <-> ssub * Junicode-Inf/semibold/it
}{}
-% ---- bsx = boldsemiexpanded ----
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{T1}{Junicode-Inf}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-inf-t1
+\DeclareFontShape{T1}{Junicode-Inf}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-inf-t1
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{boldsemiexpanded}{n}{
- <-> alias * Junicode-Inf/bsx/n
+\DeclareFontShape{T1}{Junicode-Inf}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-Inf/sbsx/n
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-inf-t1
+\DeclareFontShape{T1}{Junicode-Inf}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-inf-t1
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{boldsemiexpanded}{it}{
- <-> alias * Junicode-Inf/bsx/it
+\DeclareFontShape{T1}{Junicode-Inf}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-Inf/sbsx/it
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{bsx}{sl}{
- <-> ssub * Junicode-Inf/bsx/it
+\DeclareFontShape{T1}{Junicode-Inf}{sbsx}{sl}{
+ <-> ssub * Junicode-Inf/sbsx/it
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-Inf/boldsemiexpanded/it
+\DeclareFontShape{T1}{Junicode-Inf}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-Inf/semiboldsemiexpanded/it
}{}
-% ---- lc = lightcondensed ----
+% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{T1}{Junicode-Inf}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-inf-t1
+\DeclareFontShape{T1}{Junicode-Inf}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-inf-t1
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{lightcondensed}{n}{
- <-> alias * Junicode-Inf/lc/n
+\DeclareFontShape{T1}{Junicode-Inf}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-Inf/bsx/n
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-inf-t1
+\DeclareFontShape{T1}{Junicode-Inf}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-inf-t1
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{lightcondensed}{it}{
- <-> alias * Junicode-Inf/lc/it
+\DeclareFontShape{T1}{Junicode-Inf}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-Inf/bsx/it
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{lc}{sl}{
- <-> ssub * Junicode-Inf/lc/it
+\DeclareFontShape{T1}{Junicode-Inf}{bsx}{sl}{
+ <-> ssub * Junicode-Inf/bsx/it
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{lightcondensed}{sl}{
- <-> ssub * Junicode-Inf/lightcondensed/it
+\DeclareFontShape{T1}{Junicode-Inf}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-Inf/boldsemiexpanded/it
}{}
@@ -404,50 +323,43 @@
}{}
-% ---- sb = semibold ----
+% ---- c = condensed ----
-\DeclareFontShape{T1}{Junicode-Inf}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-inf-t1
+\DeclareFontShape{T1}{Junicode-Inf}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-inf-t1
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{semibold}{n}{
- <-> alias * Junicode-Inf/sb/n
+\DeclareFontShape{T1}{Junicode-Inf}{condensed}{it}{
+ <-> alias * Junicode-Inf/c/it
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-inf-t1
+\DeclareFontShape{T1}{Junicode-Inf}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-inf-t1
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{semibold}{it}{
- <-> alias * Junicode-Inf/sb/it
+\DeclareFontShape{T1}{Junicode-Inf}{condensed}{n}{
+ <-> alias * Junicode-Inf/c/n
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{sb}{sl}{
- <-> ssub * Junicode-Inf/sb/it
+\DeclareFontShape{T1}{Junicode-Inf}{c}{sl}{
+ <-> ssub * Junicode-Inf/c/it
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{semibold}{sl}{
- <-> ssub * Junicode-Inf/semibold/it
+\DeclareFontShape{T1}{Junicode-Inf}{condensed}{sl}{
+ <-> ssub * Junicode-Inf/condensed/it
}{}
-% ---- mediumsemicondensed ----
-
-\DeclareFontShape{T1}{Junicode-Inf}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-inf-t1
-}{}
+% ---- sbx = semiboldexpanded ----
-\DeclareFontShape{T1}{Junicode-Inf}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-inf-t1
+\DeclareFontShape{T1}{Junicode-Inf}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-inf-t1
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-Inf/mediumsemicondensed/it
+\DeclareFontShape{T1}{Junicode-Inf}{semiboldexpanded}{n}{
+ <-> alias * Junicode-Inf/sbx/n
}{}
-
-% ---- sbx = semiboldexpanded ----
-
\DeclareFontShape{T1}{Junicode-Inf}{sbx}{it}{
<-> \Junicode@@scale Junicode-ExpSmBoldItalic-inf-t1
}{}
@@ -456,14 +368,6 @@
<-> alias * Junicode-Inf/sbx/it
}{}
-\DeclareFontShape{T1}{Junicode-Inf}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-inf-t1
-}{}
-
-\DeclareFontShape{T1}{Junicode-Inf}{semiboldexpanded}{n}{
- <-> alias * Junicode-Inf/sbx/n
-}{}
-
\DeclareFontShape{T1}{Junicode-Inf}{sbx}{sl}{
<-> ssub * Junicode-Inf/sbx/it
}{}
@@ -473,6 +377,102 @@
}{}
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{Junicode-Inf}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-inf-t1
+}{}
+
+\DeclareFontShape{T1}{Junicode-Inf}{bold}{it}{
+ <-> alias * Junicode-Inf/b/it
+}{}
+
+\DeclareFontShape{T1}{Junicode-Inf}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-inf-t1
+}{}
+
+\DeclareFontShape{T1}{Junicode-Inf}{bold}{n}{
+ <-> alias * Junicode-Inf/b/n
+}{}
+
+\DeclareFontShape{T1}{Junicode-Inf}{b}{sl}{
+ <-> ssub * Junicode-Inf/b/it
+}{}
+
+\DeclareFontShape{T1}{Junicode-Inf}{bold}{sl}{
+ <-> ssub * Junicode-Inf/bold/it
+}{}
+
+
+% ---- x = expanded ----
+
+\DeclareFontShape{T1}{Junicode-Inf}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-inf-t1
+}{}
+
+\DeclareFontShape{T1}{Junicode-Inf}{expanded}{n}{
+ <-> alias * Junicode-Inf/x/n
+}{}
+
+\DeclareFontShape{T1}{Junicode-Inf}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-inf-t1
+}{}
+
+\DeclareFontShape{T1}{Junicode-Inf}{expanded}{it}{
+ <-> alias * Junicode-Inf/x/it
+}{}
+
+\DeclareFontShape{T1}{Junicode-Inf}{x}{sl}{
+ <-> ssub * Junicode-Inf/x/it
+}{}
+
+\DeclareFontShape{T1}{Junicode-Inf}{expanded}{sl}{
+ <-> ssub * Junicode-Inf/expanded/it
+}{}
+
+
+% ---- mediumexpanded ----
+
+\DeclareFontShape{T1}{Junicode-Inf}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-inf-t1
+}{}
+
+\DeclareFontShape{T1}{Junicode-Inf}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-inf-t1
+}{}
+
+\DeclareFontShape{T1}{Junicode-Inf}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-Inf/mediumexpanded/it
+}{}
+
+
+% ---- lsc = lightsemicondensed ----
+
+\DeclareFontShape{T1}{Junicode-Inf}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-inf-t1
+}{}
+
+\DeclareFontShape{T1}{Junicode-Inf}{lightsemicondensed}{n}{
+ <-> alias * Junicode-Inf/lsc/n
+}{}
+
+\DeclareFontShape{T1}{Junicode-Inf}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-inf-t1
+}{}
+
+\DeclareFontShape{T1}{Junicode-Inf}{lightsemicondensed}{it}{
+ <-> alias * Junicode-Inf/lsc/it
+}{}
+
+\DeclareFontShape{T1}{Junicode-Inf}{lsc}{sl}{
+ <-> ssub * Junicode-Inf/lsc/it
+}{}
+
+\DeclareFontShape{T1}{Junicode-Inf}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-Inf/lightsemicondensed/it
+}{}
+
+
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
\endinput
diff --git a/Master/texmf-dist/tex/latex/junicode/T1Junicode-LF.fd b/Master/texmf-dist/tex/latex/junicode/T1Junicode-LF.fd
index e694d9fc06b..96a93a875c1 100644
--- a/Master/texmf-dist/tex/latex/junicode/T1Junicode-LF.fd
+++ b/Master/texmf-dist/tex/latex/junicode/T1Junicode-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{T1Junicode-LF.fd}
- [2024/06/03 (autoinst) Font definitions for T1/Junicode-LF.]
+ [2024/07/21 (autoinst) Font definitions for T1/Junicode-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,178 +20,167 @@
\DeclareFontFamily{T1}{Junicode-LF}{}
-% ---- sbsx = semiboldsemiexpanded ----
+% ---- c = condensed ----
-\DeclareFontShape{T1}{Junicode-LF}{sbsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{c}{scit}{
+ <-> \Junicode@@scale Junicode-CondItalic-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{scit}{
- <-> alias * Junicode-LF/sbsx/scit
+\DeclareFontShape{T1}{Junicode-LF}{condensed}{scit}{
+ <-> alias * Junicode-LF/c/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-LF/sbsx/it
+\DeclareFontShape{T1}{Junicode-LF}{condensed}{n}{
+ <-> alias * Junicode-LF/c/n
}{}
-\DeclareFontShape{T1}{Junicode-LF}{sbsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{sc}{
- <-> alias * Junicode-LF/sbsx/sc
+\DeclareFontShape{T1}{Junicode-LF}{condensed}{it}{
+ <-> alias * Junicode-LF/c/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{c}{sc}{
+ <-> \Junicode@@scale Junicode-Cond-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-LF/sbsx/n
+\DeclareFontShape{T1}{Junicode-LF}{condensed}{sc}{
+ <-> alias * Junicode-LF/c/sc
}{}
-\DeclareFontShape{T1}{Junicode-LF}{sbsx}{scsl}{
- <-> ssub * Junicode-LF/sbsx/scit
+\DeclareFontShape{T1}{Junicode-LF}{c}{sl}{
+ <-> ssub * Junicode-LF/c/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{scsl}{
- <-> ssub * Junicode-LF/semiboldsemiexpanded/scit
+\DeclareFontShape{T1}{Junicode-LF}{condensed}{sl}{
+ <-> ssub * Junicode-LF/condensed/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{sbsx}{sl}{
- <-> ssub * Junicode-LF/sbsx/it
+\DeclareFontShape{T1}{Junicode-LF}{c}{scsl}{
+ <-> ssub * Junicode-LF/c/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-LF/semiboldsemiexpanded/it
+\DeclareFontShape{T1}{Junicode-LF}{condensed}{scsl}{
+ <-> ssub * Junicode-LF/condensed/scit
}{}
-% ---- mediumexpanded ----
+% ---- sbx = semiboldexpanded ----
-\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{sbx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{scit}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{sc}{
+ <-> alias * Junicode-LF/sbx/sc
}{}
-\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{sc}{
- <-> \Junicode@@scale Junicode-ExpMedium-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{it}{
+ <-> alias * Junicode-LF/sbx/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{scsl}{
- <-> ssub * Junicode-LF/mediumexpanded/scit
+\DeclareFontShape{T1}{Junicode-LF}{sbx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{sl}{
- <-> ssub * Junicode-LF/mediumexpanded/it
+\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{scit}{
+ <-> alias * Junicode-LF/sbx/scit
}{}
-
-% ---- mediumsemiexpanded ----
-
-\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{scit}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{n}{
+ <-> alias * Junicode-LF/sbx/n
}{}
-\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{sc}{
- <-> \Junicode@@scale Junicode-SmExpMedium-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{sbx}{sl}{
+ <-> ssub * Junicode-LF/sbx/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-LF/semiboldexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{scsl}{
- <-> ssub * Junicode-LF/mediumsemiexpanded/scit
+\DeclareFontShape{T1}{Junicode-LF}{sbx}{scsl}{
+ <-> ssub * Junicode-LF/sbx/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-LF/mediumsemiexpanded/it
+\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{scsl}{
+ <-> ssub * Junicode-LF/semiboldexpanded/scit
}{}
-% ---- sx = semiexpanded ----
+% ---- b = bold ----
-\DeclareFontShape{T1}{Junicode-LF}{sx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpItalic-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{b}{scit}{
+ <-> \Junicode@@scale Junicode-BoldItalic-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{scit}{
- <-> alias * Junicode-LF/sx/scit
+\DeclareFontShape{T1}{Junicode-LF}{bold}{scit}{
+ <-> alias * Junicode-LF/b/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{it}{
- <-> alias * Junicode-LF/sx/it
+\DeclareFontShape{T1}{Junicode-LF}{bold}{n}{
+ <-> alias * Junicode-LF/b/n
}{}
-\DeclareFontShape{T1}{Junicode-LF}{sx}{sc}{
- <-> \Junicode@@scale Junicode-SmExp-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{sc}{
- <-> alias * Junicode-LF/sx/sc
+\DeclareFontShape{T1}{Junicode-LF}{bold}{it}{
+ <-> alias * Junicode-LF/b/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{b}{sc}{
+ <-> \Junicode@@scale Junicode-Bold-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{n}{
- <-> alias * Junicode-LF/sx/n
+\DeclareFontShape{T1}{Junicode-LF}{bold}{sc}{
+ <-> alias * Junicode-LF/b/sc
}{}
-\DeclareFontShape{T1}{Junicode-LF}{sx}{scsl}{
- <-> ssub * Junicode-LF/sx/scit
+\DeclareFontShape{T1}{Junicode-LF}{b}{sl}{
+ <-> ssub * Junicode-LF/b/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{scsl}{
- <-> ssub * Junicode-LF/semiexpanded/scit
+\DeclareFontShape{T1}{Junicode-LF}{bold}{sl}{
+ <-> ssub * Junicode-LF/bold/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{sx}{sl}{
- <-> ssub * Junicode-LF/sx/it
+\DeclareFontShape{T1}{Junicode-LF}{b}{scsl}{
+ <-> ssub * Junicode-LF/b/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{sl}{
- <-> ssub * Junicode-LF/semiexpanded/it
+\DeclareFontShape{T1}{Junicode-LF}{bold}{scsl}{
+ <-> ssub * Junicode-LF/bold/scit
}{}
% ---- x = expanded ----
-\DeclareFontShape{T1}{Junicode-LF}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-lf-t1
-}{}
-
-\DeclareFontShape{T1}{Junicode-LF}{expanded}{it}{
- <-> alias * Junicode-LF/x/it
-}{}
-
-\DeclareFontShape{T1}{Junicode-LF}{x}{scit}{
- <-> \Junicode@@scale Junicode-ExpItalic-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{x}{sc}{
+ <-> \Junicode@@scale Junicode-Exp-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{expanded}{scit}{
- <-> alias * Junicode-LF/x/scit
+\DeclareFontShape{T1}{Junicode-LF}{expanded}{sc}{
+ <-> alias * Junicode-LF/x/sc
}{}
\DeclareFontShape{T1}{Junicode-LF}{x}{n}{
@@ -202,20 +191,20 @@
<-> alias * Junicode-LF/x/n
}{}
-\DeclareFontShape{T1}{Junicode-LF}{x}{sc}{
- <-> \Junicode@@scale Junicode-Exp-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{x}{scit}{
+ <-> \Junicode@@scale Junicode-ExpItalic-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{expanded}{sc}{
- <-> alias * Junicode-LF/x/sc
+\DeclareFontShape{T1}{Junicode-LF}{expanded}{scit}{
+ <-> alias * Junicode-LF/x/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{x}{scsl}{
- <-> ssub * Junicode-LF/x/scit
+\DeclareFontShape{T1}{Junicode-LF}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{expanded}{scsl}{
- <-> ssub * Junicode-LF/expanded/scit
+\DeclareFontShape{T1}{Junicode-LF}{expanded}{it}{
+ <-> alias * Junicode-LF/x/it
}{}
\DeclareFontShape{T1}{Junicode-LF}{x}{sl}{
@@ -226,166 +215,146 @@
<-> ssub * Junicode-LF/expanded/it
}{}
-
-% ---- c = condensed ----
-
-\DeclareFontShape{T1}{Junicode-LF}{c}{scit}{
- <-> \Junicode@@scale Junicode-CondItalic-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{x}{scsl}{
+ <-> ssub * Junicode-LF/x/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{condensed}{scit}{
- <-> alias * Junicode-LF/c/scit
+\DeclareFontShape{T1}{Junicode-LF}{expanded}{scsl}{
+ <-> ssub * Junicode-LF/expanded/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-lf-t1
-}{}
-\DeclareFontShape{T1}{Junicode-LF}{condensed}{it}{
- <-> alias * Junicode-LF/c/it
-}{}
+% ---- lsc = lightsemicondensed ----
-\DeclareFontShape{T1}{Junicode-LF}{c}{sc}{
- <-> \Junicode@@scale Junicode-Cond-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{condensed}{sc}{
- <-> alias * Junicode-LF/c/sc
+\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{it}{
+ <-> alias * Junicode-LF/lsc/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{condensed}{n}{
- <-> alias * Junicode-LF/c/n
+\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{n}{
+ <-> alias * Junicode-LF/lsc/n
}{}
-\DeclareFontShape{T1}{Junicode-LF}{c}{scsl}{
- <-> ssub * Junicode-LF/c/scit
+\DeclareFontShape{T1}{Junicode-LF}{lsc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{condensed}{scsl}{
- <-> ssub * Junicode-LF/condensed/scit
+\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{scit}{
+ <-> alias * Junicode-LF/lsc/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{c}{sl}{
- <-> ssub * Junicode-LF/c/it
+\DeclareFontShape{T1}{Junicode-LF}{lsc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondLight-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{condensed}{sl}{
- <-> ssub * Junicode-LF/condensed/it
+\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{sc}{
+ <-> alias * Junicode-LF/lsc/sc
}{}
-
-% ---- m = regular ----
-
-\DeclareFontShape{T1}{Junicode-LF}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{lsc}{sl}{
+ <-> ssub * Junicode-LF/lsc/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{regular}{it}{
- <-> alias * Junicode-LF/m/it
+\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-LF/lightsemicondensed/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{m}{scit}{
- <-> \Junicode@@scale Junicode-Italic-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{lsc}{scsl}{
+ <-> ssub * Junicode-LF/lsc/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{regular}{scit}{
- <-> alias * Junicode-LF/m/scit
+\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{scsl}{
+ <-> ssub * Junicode-LF/lightsemicondensed/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-lf-t1
-}{}
-\DeclareFontShape{T1}{Junicode-LF}{regular}{n}{
- <-> alias * Junicode-LF/m/n
-}{}
+% ---- mediumexpanded ----
-\DeclareFontShape{T1}{Junicode-LF}{m}{sc}{
- <-> \Junicode@@scale Junicode-Regular-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{regular}{sc}{
- <-> alias * Junicode-LF/m/sc
+\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{m}{scsl}{
- <-> ssub * Junicode-LF/m/scit
+\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{regular}{scsl}{
- <-> ssub * Junicode-LF/regular/scit
+\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-ExpMedium-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{m}{sl}{
- <-> ssub * Junicode-LF/m/it
+\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-LF/mediumexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{regular}{sl}{
- <-> ssub * Junicode-LF/regular/it
+\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{scsl}{
+ <-> ssub * Junicode-LF/mediumexpanded/scit
}{}
-% ---- lsc = lightsemicondensed ----
+% ---- bx = boldexpanded ----
-\DeclareFontShape{T1}{Junicode-LF}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{bx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpBold-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{n}{
- <-> alias * Junicode-LF/lsc/n
+\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{sc}{
+ <-> alias * Junicode-LF/bx/sc
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lsc}{sc}{
- <-> \Junicode@@scale Junicode-SmCondLight-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{sc}{
- <-> alias * Junicode-LF/lsc/sc
+\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{it}{
+ <-> alias * Junicode-LF/bx/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{bx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{it}{
- <-> alias * Junicode-LF/lsc/it
+\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{scit}{
+ <-> alias * Junicode-LF/bx/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lsc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{scit}{
- <-> alias * Junicode-LF/lsc/scit
+\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{n}{
+ <-> alias * Junicode-LF/bx/n
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lsc}{scsl}{
- <-> ssub * Junicode-LF/lsc/scit
+\DeclareFontShape{T1}{Junicode-LF}{bx}{sl}{
+ <-> ssub * Junicode-LF/bx/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{scsl}{
- <-> ssub * Junicode-LF/lightsemicondensed/scit
+\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{sl}{
+ <-> ssub * Junicode-LF/boldexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lsc}{sl}{
- <-> ssub * Junicode-LF/lsc/it
+\DeclareFontShape{T1}{Junicode-LF}{bx}{scsl}{
+ <-> ssub * Junicode-LF/bx/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-LF/lightsemicondensed/it
+\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{scsl}{
+ <-> ssub * Junicode-LF/boldexpanded/scit
}{}
% ---- medium ----
-\DeclareFontShape{T1}{Junicode-LF}{medium}{it}{
- <-> \Junicode@@scale Junicode-MediumItalic-lf-t1
-}{}
-
\DeclareFontShape{T1}{Junicode-LF}{medium}{scit}{
<-> \Junicode@@scale Junicode-MediumItalic-lf-sc-t1
}{}
@@ -394,298 +363,356 @@
<-> \Junicode@@scale Junicode-Medium-lf-t1
}{}
+\DeclareFontShape{T1}{Junicode-LF}{medium}{it}{
+ <-> \Junicode@@scale Junicode-MediumItalic-lf-t1
+}{}
+
\DeclareFontShape{T1}{Junicode-LF}{medium}{sc}{
<-> \Junicode@@scale Junicode-Medium-lf-sc-t1
}{}
+\DeclareFontShape{T1}{Junicode-LF}{medium}{sl}{
+ <-> ssub * Junicode-LF/medium/it
+}{}
+
\DeclareFontShape{T1}{Junicode-LF}{medium}{scsl}{
<-> ssub * Junicode-LF/medium/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{medium}{sl}{
- <-> ssub * Junicode-LF/medium/it
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{Junicode-LF}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-lf-t1
}{}
+\DeclareFontShape{T1}{Junicode-LF}{regular}{it}{
+ <-> alias * Junicode-LF/m/it
+}{}
-% ---- l = light ----
+\DeclareFontShape{T1}{Junicode-LF}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-lf-t1
+}{}
-\DeclareFontShape{T1}{Junicode-LF}{l}{sc}{
- <-> \Junicode@@scale Junicode-Light-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{regular}{n}{
+ <-> alias * Junicode-LF/m/n
}{}
-\DeclareFontShape{T1}{Junicode-LF}{light}{sc}{
- <-> alias * Junicode-LF/l/sc
+\DeclareFontShape{T1}{Junicode-LF}{m}{scit}{
+ <-> \Junicode@@scale Junicode-Italic-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{regular}{scit}{
+ <-> alias * Junicode-LF/m/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{light}{n}{
- <-> alias * Junicode-LF/l/n
+\DeclareFontShape{T1}{Junicode-LF}{m}{sc}{
+ <-> \Junicode@@scale Junicode-Regular-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{l}{scit}{
- <-> \Junicode@@scale Junicode-LightItalic-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{regular}{sc}{
+ <-> alias * Junicode-LF/m/sc
}{}
-\DeclareFontShape{T1}{Junicode-LF}{light}{scit}{
- <-> alias * Junicode-LF/l/scit
+\DeclareFontShape{T1}{Junicode-LF}{m}{sl}{
+ <-> ssub * Junicode-LF/m/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{regular}{sl}{
+ <-> ssub * Junicode-LF/regular/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{light}{it}{
- <-> alias * Junicode-LF/l/it
+\DeclareFontShape{T1}{Junicode-LF}{m}{scsl}{
+ <-> ssub * Junicode-LF/m/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{l}{scsl}{
- <-> ssub * Junicode-LF/l/scit
+\DeclareFontShape{T1}{Junicode-LF}{regular}{scsl}{
+ <-> ssub * Junicode-LF/regular/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{light}{scsl}{
- <-> ssub * Junicode-LF/light/scit
+
+% ---- mediumsemiexpanded ----
+
+\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{l}{sl}{
- <-> ssub * Junicode-LF/l/it
+\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{light}{sl}{
- <-> ssub * Junicode-LF/light/it
+\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-lf-sc-t1
}{}
+\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-LF/mediumsemiexpanded/it
+}{}
-% ---- bx = boldexpanded ----
+\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{scsl}{
+ <-> ssub * Junicode-LF/mediumsemiexpanded/scit
+}{}
-\DeclareFontShape{T1}{Junicode-LF}{bx}{scit}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-sc-t1
+
+% ---- lc = lightcondensed ----
+
+\DeclareFontShape{T1}{Junicode-LF}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{scit}{
- <-> alias * Junicode-LF/bx/scit
+\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{it}{
+ <-> alias * Junicode-LF/lc/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{lc}{scit}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{it}{
- <-> alias * Junicode-LF/bx/it
+\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{scit}{
+ <-> alias * Junicode-LF/lc/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{bx}{sc}{
- <-> \Junicode@@scale Junicode-ExpBold-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{sc}{
- <-> alias * Junicode-LF/bx/sc
+\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{n}{
+ <-> alias * Junicode-LF/lc/n
}{}
-\DeclareFontShape{T1}{Junicode-LF}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{lc}{sc}{
+ <-> \Junicode@@scale Junicode-CondLight-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{n}{
- <-> alias * Junicode-LF/bx/n
+\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{sc}{
+ <-> alias * Junicode-LF/lc/sc
}{}
-\DeclareFontShape{T1}{Junicode-LF}{bx}{scsl}{
- <-> ssub * Junicode-LF/bx/scit
+\DeclareFontShape{T1}{Junicode-LF}{lc}{sl}{
+ <-> ssub * Junicode-LF/lc/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{scsl}{
- <-> ssub * Junicode-LF/boldexpanded/scit
+\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{sl}{
+ <-> ssub * Junicode-LF/lightcondensed/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{bx}{sl}{
- <-> ssub * Junicode-LF/bx/it
+\DeclareFontShape{T1}{Junicode-LF}{lc}{scsl}{
+ <-> ssub * Junicode-LF/lc/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{sl}{
- <-> ssub * Junicode-LF/boldexpanded/it
+\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{scsl}{
+ <-> ssub * Junicode-LF/lightcondensed/scit
}{}
-% ---- mediumcondensed ----
+% ---- mediumsemicondensed ----
-\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{scit}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{sc}{
- <-> \Junicode@@scale Junicode-CondMedium-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{scsl}{
- <-> ssub * Junicode-LF/mediumcondensed/scit
+\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-LF/mediumsemicondensed/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{sl}{
- <-> ssub * Junicode-LF/mediumcondensed/it
+\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{scsl}{
+ <-> ssub * Junicode-LF/mediumsemicondensed/scit
}{}
-% ---- b = bold ----
+% ---- l = light ----
-\DeclareFontShape{T1}{Junicode-LF}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{l}{sc}{
+ <-> \Junicode@@scale Junicode-Light-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{bold}{n}{
- <-> alias * Junicode-LF/b/n
+\DeclareFontShape{T1}{Junicode-LF}{light}{sc}{
+ <-> alias * Junicode-LF/l/sc
}{}
-\DeclareFontShape{T1}{Junicode-LF}{b}{sc}{
- <-> \Junicode@@scale Junicode-Bold-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{bold}{sc}{
- <-> alias * Junicode-LF/b/sc
+\DeclareFontShape{T1}{Junicode-LF}{light}{n}{
+ <-> alias * Junicode-LF/l/n
}{}
-\DeclareFontShape{T1}{Junicode-LF}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{l}{scit}{
+ <-> \Junicode@@scale Junicode-LightItalic-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{bold}{it}{
- <-> alias * Junicode-LF/b/it
+\DeclareFontShape{T1}{Junicode-LF}{light}{scit}{
+ <-> alias * Junicode-LF/l/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{b}{scit}{
- <-> \Junicode@@scale Junicode-BoldItalic-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{bold}{scit}{
- <-> alias * Junicode-LF/b/scit
+\DeclareFontShape{T1}{Junicode-LF}{light}{it}{
+ <-> alias * Junicode-LF/l/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{b}{scsl}{
- <-> ssub * Junicode-LF/b/scit
+\DeclareFontShape{T1}{Junicode-LF}{l}{sl}{
+ <-> ssub * Junicode-LF/l/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{bold}{scsl}{
- <-> ssub * Junicode-LF/bold/scit
+\DeclareFontShape{T1}{Junicode-LF}{light}{sl}{
+ <-> ssub * Junicode-LF/light/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{b}{sl}{
- <-> ssub * Junicode-LF/b/it
+\DeclareFontShape{T1}{Junicode-LF}{l}{scsl}{
+ <-> ssub * Junicode-LF/l/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{bold}{sl}{
- <-> ssub * Junicode-LF/bold/it
+\DeclareFontShape{T1}{Junicode-LF}{light}{scsl}{
+ <-> ssub * Junicode-LF/light/scit
}{}
-% ---- bsx = boldsemiexpanded ----
+% ---- sx = semiexpanded ----
-\DeclareFontShape{T1}{Junicode-LF}{bsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpBold-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{sx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExp-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{sc}{
- <-> alias * Junicode-LF/bsx/sc
+\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{sc}{
+ <-> alias * Junicode-LF/sx/sc
}{}
-\DeclareFontShape{T1}{Junicode-LF}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{sx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{n}{
- <-> alias * Junicode-LF/bsx/n
+\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{scit}{
+ <-> alias * Junicode-LF/sx/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{bsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{scit}{
- <-> alias * Junicode-LF/bsx/scit
+\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{n}{
+ <-> alias * Junicode-LF/sx/n
}{}
-\DeclareFontShape{T1}{Junicode-LF}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{it}{
- <-> alias * Junicode-LF/bsx/it
+\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{it}{
+ <-> alias * Junicode-LF/sx/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{bsx}{scsl}{
- <-> ssub * Junicode-LF/bsx/scit
+\DeclareFontShape{T1}{Junicode-LF}{sx}{sl}{
+ <-> ssub * Junicode-LF/sx/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{scsl}{
- <-> ssub * Junicode-LF/boldsemiexpanded/scit
+\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{sl}{
+ <-> ssub * Junicode-LF/semiexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{bsx}{sl}{
- <-> ssub * Junicode-LF/bsx/it
+\DeclareFontShape{T1}{Junicode-LF}{sx}{scsl}{
+ <-> ssub * Junicode-LF/sx/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-LF/boldsemiexpanded/it
+\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{scsl}{
+ <-> ssub * Junicode-LF/semiexpanded/scit
}{}
-% ---- lc = lightcondensed ----
+% ---- mediumcondensed ----
-\DeclareFontShape{T1}{Junicode-LF}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{sc}{
+ <-> \Junicode@@scale Junicode-CondMedium-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{n}{
- <-> alias * Junicode-LF/lc/n
+\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lc}{sc}{
- <-> \Junicode@@scale Junicode-CondLight-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{scit}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{sc}{
- <-> alias * Junicode-LF/lc/sc
+\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-LF/mediumcondensed/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{it}{
- <-> alias * Junicode-LF/lc/it
+\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{scsl}{
+ <-> ssub * Junicode-LF/mediumcondensed/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lc}{scit}{
- <-> \Junicode@@scale Junicode-CondLightItalic-lf-sc-t1
+
+% ---- sb = semibold ----
+
+\DeclareFontShape{T1}{Junicode-LF}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{scit}{
- <-> alias * Junicode-LF/lc/scit
+\DeclareFontShape{T1}{Junicode-LF}{semibold}{n}{
+ <-> alias * Junicode-LF/sb/n
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lc}{scsl}{
- <-> ssub * Junicode-LF/lc/scit
+\DeclareFontShape{T1}{Junicode-LF}{sb}{scit}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{scsl}{
- <-> ssub * Junicode-LF/lightcondensed/scit
+\DeclareFontShape{T1}{Junicode-LF}{semibold}{scit}{
+ <-> alias * Junicode-LF/sb/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lc}{sl}{
- <-> ssub * Junicode-LF/lc/it
+\DeclareFontShape{T1}{Junicode-LF}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{sl}{
- <-> ssub * Junicode-LF/lightcondensed/it
+\DeclareFontShape{T1}{Junicode-LF}{semibold}{it}{
+ <-> alias * Junicode-LF/sb/it
+}{}
+
+\DeclareFontShape{T1}{Junicode-LF}{sb}{sc}{
+ <-> \Junicode@@scale Junicode-SmBold-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Junicode-LF}{semibold}{sc}{
+ <-> alias * Junicode-LF/sb/sc
+}{}
+
+\DeclareFontShape{T1}{Junicode-LF}{sb}{sl}{
+ <-> ssub * Junicode-LF/sb/it
+}{}
+
+\DeclareFontShape{T1}{Junicode-LF}{semibold}{sl}{
+ <-> ssub * Junicode-LF/semibold/it
+}{}
+
+\DeclareFontShape{T1}{Junicode-LF}{sb}{scsl}{
+ <-> ssub * Junicode-LF/sb/scit
+}{}
+
+\DeclareFontShape{T1}{Junicode-LF}{semibold}{scsl}{
+ <-> ssub * Junicode-LF/semibold/scit
}{}
@@ -699,12 +726,12 @@
<-> alias * Junicode-LF/sc/n
}{}
-\DeclareFontShape{T1}{Junicode-LF}{sc}{sc}{
- <-> \Junicode@@scale Junicode-SmCond-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{sc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semicondensed}{sc}{
- <-> alias * Junicode-LF/sc/sc
+\DeclareFontShape{T1}{Junicode-LF}{semicondensed}{scit}{
+ <-> alias * Junicode-LF/sc/scit
}{}
\DeclareFontShape{T1}{Junicode-LF}{sc}{it}{
@@ -715,20 +742,12 @@
<-> alias * Junicode-LF/sc/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{sc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondItalic-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{Junicode-LF}{semicondensed}{scit}{
- <-> alias * Junicode-LF/sc/scit
-}{}
-
-\DeclareFontShape{T1}{Junicode-LF}{sc}{scsl}{
- <-> ssub * Junicode-LF/sc/scit
+\DeclareFontShape{T1}{Junicode-LF}{sc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCond-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semicondensed}{scsl}{
- <-> ssub * Junicode-LF/semicondensed/scit
+\DeclareFontShape{T1}{Junicode-LF}{semicondensed}{sc}{
+ <-> alias * Junicode-LF/sc/sc
}{}
\DeclareFontShape{T1}{Junicode-LF}{sc}{sl}{
@@ -739,133 +758,114 @@
<-> ssub * Junicode-LF/semicondensed/it
}{}
-
-% ---- sb = semibold ----
-
-\DeclareFontShape{T1}{Junicode-LF}{sb}{sc}{
- <-> \Junicode@@scale Junicode-SmBold-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{Junicode-LF}{semibold}{sc}{
- <-> alias * Junicode-LF/sb/sc
-}{}
-
-\DeclareFontShape{T1}{Junicode-LF}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{sc}{scsl}{
+ <-> ssub * Junicode-LF/sc/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semibold}{n}{
- <-> alias * Junicode-LF/sb/n
+\DeclareFontShape{T1}{Junicode-LF}{semicondensed}{scsl}{
+ <-> ssub * Junicode-LF/semicondensed/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{sb}{scit}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-lf-sc-t1
-}{}
-\DeclareFontShape{T1}{Junicode-LF}{semibold}{scit}{
- <-> alias * Junicode-LF/sb/scit
-}{}
+% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{T1}{Junicode-LF}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semibold}{it}{
- <-> alias * Junicode-LF/sb/it
+\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-LF/bsx/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{sb}{scsl}{
- <-> ssub * Junicode-LF/sb/scit
+\DeclareFontShape{T1}{Junicode-LF}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semibold}{scsl}{
- <-> ssub * Junicode-LF/semibold/scit
+\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-LF/bsx/n
}{}
-\DeclareFontShape{T1}{Junicode-LF}{sb}{sl}{
- <-> ssub * Junicode-LF/sb/it
+\DeclareFontShape{T1}{Junicode-LF}{bsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semibold}{sl}{
- <-> ssub * Junicode-LF/semibold/it
+\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{scit}{
+ <-> alias * Junicode-LF/bsx/scit
}{}
-
-% ---- mediumsemicondensed ----
-
-\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{scit}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{bsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpBold-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{sc}{
+ <-> alias * Junicode-LF/bsx/sc
}{}
-\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{sc}{
- <-> \Junicode@@scale Junicode-SmCondMedium-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{bsx}{sl}{
+ <-> ssub * Junicode-LF/bsx/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-LF/boldsemiexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{scsl}{
- <-> ssub * Junicode-LF/mediumsemicondensed/scit
+\DeclareFontShape{T1}{Junicode-LF}{bsx}{scsl}{
+ <-> ssub * Junicode-LF/bsx/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-LF/mediumsemicondensed/it
+\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-LF/boldsemiexpanded/scit
}{}
-% ---- sbx = semiboldexpanded ----
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{T1}{Junicode-LF}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{n}{
- <-> alias * Junicode-LF/sbx/n
+\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-LF/sbsx/n
}{}
-\DeclareFontShape{T1}{Junicode-LF}{sbx}{sc}{
- <-> \Junicode@@scale Junicode-ExpSmBold-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{sbsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{sc}{
- <-> alias * Junicode-LF/sbx/sc
+\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{scit}{
+ <-> alias * Junicode-LF/sbsx/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-t1
+\DeclareFontShape{T1}{Junicode-LF}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{it}{
- <-> alias * Junicode-LF/sbx/it
+\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-LF/sbsx/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{sbx}{scit}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-sc-t1
+\DeclareFontShape{T1}{Junicode-LF}{sbsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-lf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{scit}{
- <-> alias * Junicode-LF/sbx/scit
+\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{sc}{
+ <-> alias * Junicode-LF/sbsx/sc
}{}
-\DeclareFontShape{T1}{Junicode-LF}{sbx}{scsl}{
- <-> ssub * Junicode-LF/sbx/scit
+\DeclareFontShape{T1}{Junicode-LF}{sbsx}{sl}{
+ <-> ssub * Junicode-LF/sbsx/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{scsl}{
- <-> ssub * Junicode-LF/semiboldexpanded/scit
+\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-LF/semiboldsemiexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-LF}{sbx}{sl}{
- <-> ssub * Junicode-LF/sbx/it
+\DeclareFontShape{T1}{Junicode-LF}{sbsx}{scsl}{
+ <-> ssub * Junicode-LF/sbsx/scit
}{}
-\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-LF/semiboldexpanded/it
+\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-LF/semiboldsemiexpanded/scit
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/T1Junicode-OsF.fd b/Master/texmf-dist/tex/latex/junicode/T1Junicode-OsF.fd
index 6af4216213e..0055076c6d7 100644
--- a/Master/texmf-dist/tex/latex/junicode/T1Junicode-OsF.fd
+++ b/Master/texmf-dist/tex/latex/junicode/T1Junicode-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{T1Junicode-OsF.fd}
- [2024/06/03 (autoinst) Font definitions for T1/Junicode-OsF.]
+ [2024/07/21 (autoinst) Font definitions for T1/Junicode-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,234 +20,312 @@
\DeclareFontFamily{T1}{Junicode-OsF}{}
-% ---- mediumsemicondensed ----
+% ---- b = bold ----
-\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{sc}{
- <-> \Junicode@@scale Junicode-SmCondMedium-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{b}{sc}{
+ <-> \Junicode@@scale Junicode-Bold-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{bold}{sc}{
+ <-> alias * Junicode-OsF/b/sc
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{scit}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{b}{scit}{
+ <-> \Junicode@@scale Junicode-BoldItalic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{bold}{scit}{
+ <-> alias * Junicode-OsF/b/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{scsl}{
- <-> ssub * Junicode-OsF/mediumsemicondensed/scit
+\DeclareFontShape{T1}{Junicode-OsF}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-OsF/mediumsemicondensed/it
+\DeclareFontShape{T1}{Junicode-OsF}{bold}{n}{
+ <-> alias * Junicode-OsF/b/n
}{}
+\DeclareFontShape{T1}{Junicode-OsF}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-osf-t1
+}{}
-% ---- sbx = semiboldexpanded ----
+\DeclareFontShape{T1}{Junicode-OsF}{bold}{it}{
+ <-> alias * Junicode-OsF/b/it
+}{}
-\DeclareFontShape{T1}{Junicode-OsF}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{b}{sl}{
+ <-> ssub * Junicode-OsF/b/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{n}{
- <-> alias * Junicode-OsF/sbx/n
+\DeclareFontShape{T1}{Junicode-OsF}{bold}{sl}{
+ <-> ssub * Junicode-OsF/bold/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{sbx}{sc}{
- <-> \Junicode@@scale Junicode-ExpSmBold-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{b}{scsl}{
+ <-> ssub * Junicode-OsF/b/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{sc}{
- <-> alias * Junicode-OsF/sbx/sc
+\DeclareFontShape{T1}{Junicode-OsF}{bold}{scsl}{
+ <-> ssub * Junicode-OsF/bold/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-t1
+
+% ---- x = expanded ----
+
+\DeclareFontShape{T1}{Junicode-OsF}{x}{sc}{
+ <-> \Junicode@@scale Junicode-Exp-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{it}{
- <-> alias * Junicode-OsF/sbx/it
+\DeclareFontShape{T1}{Junicode-OsF}{expanded}{sc}{
+ <-> alias * Junicode-OsF/x/sc
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{sbx}{scit}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{scit}{
- <-> alias * Junicode-OsF/sbx/scit
+\DeclareFontShape{T1}{Junicode-OsF}{expanded}{it}{
+ <-> alias * Junicode-OsF/x/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{sbx}{scsl}{
- <-> ssub * Junicode-OsF/sbx/scit
+\DeclareFontShape{T1}{Junicode-OsF}{x}{scit}{
+ <-> \Junicode@@scale Junicode-ExpItalic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{scsl}{
- <-> ssub * Junicode-OsF/semiboldexpanded/scit
+\DeclareFontShape{T1}{Junicode-OsF}{expanded}{scit}{
+ <-> alias * Junicode-OsF/x/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{sbx}{sl}{
- <-> ssub * Junicode-OsF/sbx/it
+\DeclareFontShape{T1}{Junicode-OsF}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-OsF/semiboldexpanded/it
+\DeclareFontShape{T1}{Junicode-OsF}{expanded}{n}{
+ <-> alias * Junicode-OsF/x/n
}{}
+\DeclareFontShape{T1}{Junicode-OsF}{x}{sl}{
+ <-> ssub * Junicode-OsF/x/it
+}{}
-% ---- lc = lightcondensed ----
+\DeclareFontShape{T1}{Junicode-OsF}{expanded}{sl}{
+ <-> ssub * Junicode-OsF/expanded/it
+}{}
-\DeclareFontShape{T1}{Junicode-OsF}{lc}{sc}{
- <-> \Junicode@@scale Junicode-CondLight-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{x}{scsl}{
+ <-> ssub * Junicode-OsF/x/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{sc}{
- <-> alias * Junicode-OsF/lc/sc
+\DeclareFontShape{T1}{Junicode-OsF}{expanded}{scsl}{
+ <-> ssub * Junicode-OsF/expanded/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-osf-t1
+
+% ---- lsc = lightsemicondensed ----
+
+\DeclareFontShape{T1}{Junicode-OsF}{lsc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondLight-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{n}{
- <-> alias * Junicode-OsF/lc/n
+\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{sc}{
+ <-> alias * Junicode-OsF/lsc/sc
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{lc}{scit}{
- <-> \Junicode@@scale Junicode-CondLightItalic-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{lsc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{scit}{
- <-> alias * Junicode-OsF/lc/scit
+\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{scit}{
+ <-> alias * Junicode-OsF/lsc/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{it}{
- <-> alias * Junicode-OsF/lc/it
+\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{n}{
+ <-> alias * Junicode-OsF/lsc/n
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{lc}{scsl}{
- <-> ssub * Junicode-OsF/lc/scit
+\DeclareFontShape{T1}{Junicode-OsF}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{scsl}{
- <-> ssub * Junicode-OsF/lightcondensed/scit
+\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{it}{
+ <-> alias * Junicode-OsF/lsc/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{lc}{sl}{
- <-> ssub * Junicode-OsF/lc/it
+\DeclareFontShape{T1}{Junicode-OsF}{lsc}{sl}{
+ <-> ssub * Junicode-OsF/lsc/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{sl}{
- <-> ssub * Junicode-OsF/lightcondensed/it
+\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-OsF/lightsemicondensed/it
}{}
+\DeclareFontShape{T1}{Junicode-OsF}{lsc}{scsl}{
+ <-> ssub * Junicode-OsF/lsc/scit
+}{}
-% ---- bsx = boldsemiexpanded ----
+\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{scsl}{
+ <-> ssub * Junicode-OsF/lightsemicondensed/scit
+}{}
-\DeclareFontShape{T1}{Junicode-OsF}{bsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-sc-t1
+
+% ---- mediumexpanded ----
+
+\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-ExpMedium-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{scit}{
- <-> alias * Junicode-OsF/bsx/scit
+\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{it}{
- <-> alias * Junicode-OsF/bsx/it
+\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{bsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpBold-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-OsF/mediumexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{sc}{
- <-> alias * Junicode-OsF/bsx/sc
+\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/mediumexpanded/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-osf-t1
+
+% ---- c = condensed ----
+
+\DeclareFontShape{T1}{Junicode-OsF}{c}{sc}{
+ <-> \Junicode@@scale Junicode-Cond-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{n}{
- <-> alias * Junicode-OsF/bsx/n
+\DeclareFontShape{T1}{Junicode-OsF}{condensed}{sc}{
+ <-> alias * Junicode-OsF/c/sc
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{bsx}{scsl}{
- <-> ssub * Junicode-OsF/bsx/scit
+\DeclareFontShape{T1}{Junicode-OsF}{c}{scit}{
+ <-> \Junicode@@scale Junicode-CondItalic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{scsl}{
- <-> ssub * Junicode-OsF/boldsemiexpanded/scit
+\DeclareFontShape{T1}{Junicode-OsF}{condensed}{scit}{
+ <-> alias * Junicode-OsF/c/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{bsx}{sl}{
- <-> ssub * Junicode-OsF/bsx/it
+\DeclareFontShape{T1}{Junicode-OsF}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-OsF/boldsemiexpanded/it
+\DeclareFontShape{T1}{Junicode-OsF}{condensed}{n}{
+ <-> alias * Junicode-OsF/c/n
}{}
+\DeclareFontShape{T1}{Junicode-OsF}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-osf-t1
+}{}
-% ---- sc = semicondensed ----
+\DeclareFontShape{T1}{Junicode-OsF}{condensed}{it}{
+ <-> alias * Junicode-OsF/c/it
+}{}
-\DeclareFontShape{T1}{Junicode-OsF}{sc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondItalic-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{c}{sl}{
+ <-> ssub * Junicode-OsF/c/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{scit}{
- <-> alias * Junicode-OsF/sc/scit
+\DeclareFontShape{T1}{Junicode-OsF}{condensed}{sl}{
+ <-> ssub * Junicode-OsF/condensed/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{sc}{it}{
- <-> \Junicode@@scale Junicode-SmCondItalic-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{c}{scsl}{
+ <-> ssub * Junicode-OsF/c/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{it}{
- <-> alias * Junicode-OsF/sc/it
+\DeclareFontShape{T1}{Junicode-OsF}{condensed}{scsl}{
+ <-> ssub * Junicode-OsF/condensed/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{sc}{sc}{
- <-> \Junicode@@scale Junicode-SmCond-osf-sc-t1
+
+% ---- sbx = semiboldexpanded ----
+
+\DeclareFontShape{T1}{Junicode-OsF}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{sc}{
- <-> alias * Junicode-OsF/sc/sc
+\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{it}{
+ <-> alias * Junicode-OsF/sbx/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{sbx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{n}{
- <-> alias * Junicode-OsF/sc/n
+\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{scit}{
+ <-> alias * Junicode-OsF/sbx/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{sc}{scsl}{
- <-> ssub * Junicode-OsF/sc/scit
+\DeclareFontShape{T1}{Junicode-OsF}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{scsl}{
- <-> ssub * Junicode-OsF/semicondensed/scit
+\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{n}{
+ <-> alias * Junicode-OsF/sbx/n
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{sc}{sl}{
- <-> ssub * Junicode-OsF/sc/it
+\DeclareFontShape{T1}{Junicode-OsF}{sbx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{sl}{
- <-> ssub * Junicode-OsF/semicondensed/it
+\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{sc}{
+ <-> alias * Junicode-OsF/sbx/sc
+}{}
+
+\DeclareFontShape{T1}{Junicode-OsF}{sbx}{sl}{
+ <-> ssub * Junicode-OsF/sbx/it
+}{}
+
+\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-OsF/semiboldexpanded/it
+}{}
+
+\DeclareFontShape{T1}{Junicode-OsF}{sbx}{scsl}{
+ <-> ssub * Junicode-OsF/sbx/scit
+}{}
+
+\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/semiboldexpanded/scit
+}{}
+
+
+% ---- mediumcondensed ----
+
+\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{scit}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{sc}{
+ <-> \Junicode@@scale Junicode-CondMedium-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-OsF/mediumcondensed/it
+}{}
+
+\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{scsl}{
+ <-> ssub * Junicode-OsF/mediumcondensed/scit
}{}
@@ -261,6 +339,14 @@
<-> alias * Junicode-OsF/sb/scit
}{}
+\DeclareFontShape{T1}{Junicode-OsF}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Junicode-OsF}{semibold}{n}{
+ <-> alias * Junicode-OsF/sb/n
+}{}
+
\DeclareFontShape{T1}{Junicode-OsF}{sb}{it}{
<-> \Junicode@@scale Junicode-SmBoldItalic-osf-t1
}{}
@@ -277,12 +363,12 @@
<-> alias * Junicode-OsF/sb/sc
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{sb}{sl}{
+ <-> ssub * Junicode-OsF/sb/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semibold}{n}{
- <-> alias * Junicode-OsF/sb/n
+\DeclareFontShape{T1}{Junicode-OsF}{semibold}{sl}{
+ <-> ssub * Junicode-OsF/semibold/it
}{}
\DeclareFontShape{T1}{Junicode-OsF}{sb}{scsl}{
@@ -293,154 +379,162 @@
<-> ssub * Junicode-OsF/semibold/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{sb}{sl}{
- <-> ssub * Junicode-OsF/sb/it
+
+% ---- sc = semicondensed ----
+
+\DeclareFontShape{T1}{Junicode-OsF}{sc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCond-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semibold}{sl}{
- <-> ssub * Junicode-OsF/semibold/it
+\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{sc}{
+ <-> alias * Junicode-OsF/sc/sc
}{}
+\DeclareFontShape{T1}{Junicode-OsF}{sc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-osf-t1
+}{}
-% ---- b = bold ----
+\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{it}{
+ <-> alias * Junicode-OsF/sc/it
+}{}
-\DeclareFontShape{T1}{Junicode-OsF}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{bold}{it}{
- <-> alias * Junicode-OsF/b/it
+\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{n}{
+ <-> alias * Junicode-OsF/sc/n
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{b}{scit}{
- <-> \Junicode@@scale Junicode-BoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{sc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{bold}{scit}{
- <-> alias * Junicode-OsF/b/scit
+\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{scit}{
+ <-> alias * Junicode-OsF/sc/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{sc}{sl}{
+ <-> ssub * Junicode-OsF/sc/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{bold}{n}{
- <-> alias * Junicode-OsF/b/n
+\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{sl}{
+ <-> ssub * Junicode-OsF/semicondensed/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{b}{sc}{
- <-> \Junicode@@scale Junicode-Bold-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{sc}{scsl}{
+ <-> ssub * Junicode-OsF/sc/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{bold}{sc}{
- <-> alias * Junicode-OsF/b/sc
+\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{scsl}{
+ <-> ssub * Junicode-OsF/semicondensed/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{b}{scsl}{
- <-> ssub * Junicode-OsF/b/scit
+
+% ---- sbsx = semiboldsemiexpanded ----
+
+\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{bold}{scsl}{
- <-> ssub * Junicode-OsF/bold/scit
+\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-OsF/sbsx/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{b}{sl}{
- <-> ssub * Junicode-OsF/b/it
+\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{bold}{sl}{
- <-> ssub * Junicode-OsF/bold/it
+\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-OsF/sbsx/n
}{}
+\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-sc-t1
+}{}
-% ---- mediumcondensed ----
+\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{scit}{
+ <-> alias * Junicode-OsF/sbsx/scit
+}{}
-\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{sc}{
- <-> \Junicode@@scale Junicode-CondMedium-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{sc}{
+ <-> alias * Junicode-OsF/sbsx/sc
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{scit}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{sl}{
+ <-> ssub * Junicode-OsF/sbsx/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-OsF/semiboldsemiexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{scsl}{
- <-> ssub * Junicode-OsF/mediumcondensed/scit
+\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{scsl}{
+ <-> ssub * Junicode-OsF/sbsx/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{sl}{
- <-> ssub * Junicode-OsF/mediumcondensed/it
+\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/semiboldsemiexpanded/scit
}{}
-% ---- l = light ----
+% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{T1}{Junicode-OsF}{l}{sc}{
- <-> \Junicode@@scale Junicode-Light-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{bsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpBold-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{light}{sc}{
- <-> alias * Junicode-OsF/l/sc
+\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{sc}{
+ <-> alias * Junicode-OsF/bsx/sc
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{bsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{light}{n}{
- <-> alias * Junicode-OsF/l/n
+\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{scit}{
+ <-> alias * Junicode-OsF/bsx/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{l}{scit}{
- <-> \Junicode@@scale Junicode-LightItalic-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{light}{scit}{
- <-> alias * Junicode-OsF/l/scit
+\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-OsF/bsx/n
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{light}{it}{
- <-> alias * Junicode-OsF/l/it
+\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-OsF/bsx/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{l}{scsl}{
- <-> ssub * Junicode-OsF/l/scit
+\DeclareFontShape{T1}{Junicode-OsF}{bsx}{sl}{
+ <-> ssub * Junicode-OsF/bsx/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{light}{scsl}{
- <-> ssub * Junicode-OsF/light/scit
+\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-OsF/boldsemiexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{l}{sl}{
- <-> ssub * Junicode-OsF/l/it
+\DeclareFontShape{T1}{Junicode-OsF}{bsx}{scsl}{
+ <-> ssub * Junicode-OsF/bsx/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{light}{sl}{
- <-> ssub * Junicode-OsF/light/it
+\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/boldsemiexpanded/scit
}{}
% ---- bx = boldexpanded ----
-\DeclareFontShape{T1}{Junicode-OsF}{bx}{sc}{
- <-> \Junicode@@scale Junicode-ExpBold-osf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{Junicode-OsF}{boldexpanded}{sc}{
- <-> alias * Junicode-OsF/bx/sc
-}{}
-
\DeclareFontShape{T1}{Junicode-OsF}{bx}{n}{
<-> \Junicode@@scale Junicode-ExpBold-osf-t1
}{}
@@ -465,12 +559,12 @@
<-> alias * Junicode-OsF/bx/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{bx}{scsl}{
- <-> ssub * Junicode-OsF/bx/scit
+\DeclareFontShape{T1}{Junicode-OsF}{bx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpBold-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{boldexpanded}{scsl}{
- <-> ssub * Junicode-OsF/boldexpanded/scit
+\DeclareFontShape{T1}{Junicode-OsF}{boldexpanded}{sc}{
+ <-> alias * Junicode-OsF/bx/sc
}{}
\DeclareFontShape{T1}{Junicode-OsF}{bx}{sl}{
@@ -481,55 +575,12 @@
<-> ssub * Junicode-OsF/boldexpanded/it
}{}
-
-% ---- m = regular ----
-
-\DeclareFontShape{T1}{Junicode-OsF}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Junicode-OsF}{regular}{it}{
- <-> alias * Junicode-OsF/m/it
-}{}
-
-\DeclareFontShape{T1}{Junicode-OsF}{m}{scit}{
- <-> \Junicode@@scale Junicode-Italic-osf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{Junicode-OsF}{regular}{scit}{
- <-> alias * Junicode-OsF/m/scit
-}{}
-
-\DeclareFontShape{T1}{Junicode-OsF}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Junicode-OsF}{regular}{n}{
- <-> alias * Junicode-OsF/m/n
-}{}
-
-\DeclareFontShape{T1}{Junicode-OsF}{m}{sc}{
- <-> \Junicode@@scale Junicode-Regular-osf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{Junicode-OsF}{regular}{sc}{
- <-> alias * Junicode-OsF/m/sc
-}{}
-
-\DeclareFontShape{T1}{Junicode-OsF}{m}{scsl}{
- <-> ssub * Junicode-OsF/m/scit
-}{}
-
-\DeclareFontShape{T1}{Junicode-OsF}{regular}{scsl}{
- <-> ssub * Junicode-OsF/regular/scit
-}{}
-
-\DeclareFontShape{T1}{Junicode-OsF}{m}{sl}{
- <-> ssub * Junicode-OsF/m/it
+\DeclareFontShape{T1}{Junicode-OsF}{bx}{scsl}{
+ <-> ssub * Junicode-OsF/bx/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{regular}{sl}{
- <-> ssub * Junicode-OsF/regular/it
+\DeclareFontShape{T1}{Junicode-OsF}{boldexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/boldexpanded/scit
}{}
@@ -539,333 +590,282 @@
<-> \Junicode@@scale Junicode-MediumItalic-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{medium}{scit}{
- <-> \Junicode@@scale Junicode-MediumItalic-osf-sc-t1
-}{}
-
\DeclareFontShape{T1}{Junicode-OsF}{medium}{n}{
<-> \Junicode@@scale Junicode-Medium-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{medium}{sc}{
- <-> \Junicode@@scale Junicode-Medium-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{medium}{scit}{
+ <-> \Junicode@@scale Junicode-MediumItalic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{medium}{scsl}{
- <-> ssub * Junicode-OsF/medium/scit
+\DeclareFontShape{T1}{Junicode-OsF}{medium}{sc}{
+ <-> \Junicode@@scale Junicode-Medium-osf-sc-t1
}{}
\DeclareFontShape{T1}{Junicode-OsF}{medium}{sl}{
<-> ssub * Junicode-OsF/medium/it
}{}
-
-% ---- lsc = lightsemicondensed ----
-
-\DeclareFontShape{T1}{Junicode-OsF}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{medium}{scsl}{
+ <-> ssub * Junicode-OsF/medium/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{it}{
- <-> alias * Junicode-OsF/lsc/it
-}{}
-\DeclareFontShape{T1}{Junicode-OsF}{lsc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{scit}{
- <-> alias * Junicode-OsF/lsc/scit
-}{}
+% ---- m = regular ----
-\DeclareFontShape{T1}{Junicode-OsF}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{n}{
- <-> alias * Junicode-OsF/lsc/n
+\DeclareFontShape{T1}{Junicode-OsF}{regular}{it}{
+ <-> alias * Junicode-OsF/m/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{lsc}{sc}{
- <-> \Junicode@@scale Junicode-SmCondLight-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{sc}{
- <-> alias * Junicode-OsF/lsc/sc
+\DeclareFontShape{T1}{Junicode-OsF}{regular}{n}{
+ <-> alias * Junicode-OsF/m/n
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{lsc}{scsl}{
- <-> ssub * Junicode-OsF/lsc/scit
+\DeclareFontShape{T1}{Junicode-OsF}{m}{scit}{
+ <-> \Junicode@@scale Junicode-Italic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{scsl}{
- <-> ssub * Junicode-OsF/lightsemicondensed/scit
+\DeclareFontShape{T1}{Junicode-OsF}{regular}{scit}{
+ <-> alias * Junicode-OsF/m/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{lsc}{sl}{
- <-> ssub * Junicode-OsF/lsc/it
+\DeclareFontShape{T1}{Junicode-OsF}{m}{sc}{
+ <-> \Junicode@@scale Junicode-Regular-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-OsF/lightsemicondensed/it
+\DeclareFontShape{T1}{Junicode-OsF}{regular}{sc}{
+ <-> alias * Junicode-OsF/m/sc
}{}
-
-% ---- c = condensed ----
-
-\DeclareFontShape{T1}{Junicode-OsF}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{m}{sl}{
+ <-> ssub * Junicode-OsF/m/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{condensed}{it}{
- <-> alias * Junicode-OsF/c/it
+\DeclareFontShape{T1}{Junicode-OsF}{regular}{sl}{
+ <-> ssub * Junicode-OsF/regular/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{c}{scit}{
- <-> \Junicode@@scale Junicode-CondItalic-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{m}{scsl}{
+ <-> ssub * Junicode-OsF/m/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{condensed}{scit}{
- <-> alias * Junicode-OsF/c/scit
+\DeclareFontShape{T1}{Junicode-OsF}{regular}{scsl}{
+ <-> ssub * Junicode-OsF/regular/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-osf-t1
-}{}
-\DeclareFontShape{T1}{Junicode-OsF}{condensed}{n}{
- <-> alias * Junicode-OsF/c/n
-}{}
+% ---- mediumsemiexpanded ----
-\DeclareFontShape{T1}{Junicode-OsF}{c}{sc}{
- <-> \Junicode@@scale Junicode-Cond-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{condensed}{sc}{
- <-> alias * Junicode-OsF/c/sc
+\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{c}{scsl}{
- <-> ssub * Junicode-OsF/c/scit
+\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{condensed}{scsl}{
- <-> ssub * Junicode-OsF/condensed/scit
+\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{c}{sl}{
- <-> ssub * Junicode-OsF/c/it
+\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-OsF/mediumsemiexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{condensed}{sl}{
- <-> ssub * Junicode-OsF/condensed/it
+\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/mediumsemiexpanded/scit
}{}
-% ---- x = expanded ----
+% ---- lc = lightcondensed ----
-\DeclareFontShape{T1}{Junicode-OsF}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{expanded}{it}{
- <-> alias * Junicode-OsF/x/it
+\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{it}{
+ <-> alias * Junicode-OsF/lc/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{x}{scit}{
- <-> \Junicode@@scale Junicode-ExpItalic-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{lc}{scit}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{expanded}{scit}{
- <-> alias * Junicode-OsF/x/scit
+\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{scit}{
+ <-> alias * Junicode-OsF/lc/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{expanded}{n}{
- <-> alias * Junicode-OsF/x/n
+\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{n}{
+ <-> alias * Junicode-OsF/lc/n
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{x}{sc}{
- <-> \Junicode@@scale Junicode-Exp-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{lc}{sc}{
+ <-> \Junicode@@scale Junicode-CondLight-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{expanded}{sc}{
- <-> alias * Junicode-OsF/x/sc
+\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{sc}{
+ <-> alias * Junicode-OsF/lc/sc
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{x}{scsl}{
- <-> ssub * Junicode-OsF/x/scit
+\DeclareFontShape{T1}{Junicode-OsF}{lc}{sl}{
+ <-> ssub * Junicode-OsF/lc/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{expanded}{scsl}{
- <-> ssub * Junicode-OsF/expanded/scit
+\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{sl}{
+ <-> ssub * Junicode-OsF/lightcondensed/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{x}{sl}{
- <-> ssub * Junicode-OsF/x/it
+\DeclareFontShape{T1}{Junicode-OsF}{lc}{scsl}{
+ <-> ssub * Junicode-OsF/lc/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{expanded}{sl}{
- <-> ssub * Junicode-OsF/expanded/it
+\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{scsl}{
+ <-> ssub * Junicode-OsF/lightcondensed/scit
}{}
-% ---- sx = semiexpanded ----
-
-\DeclareFontShape{T1}{Junicode-OsF}{sx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpItalic-osf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{scit}{
- <-> alias * Junicode-OsF/sx/scit
-}{}
+% ---- mediumsemicondensed ----
-\DeclareFontShape{T1}{Junicode-OsF}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{it}{
- <-> alias * Junicode-OsF/sx/it
+\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{sx}{sc}{
- <-> \Junicode@@scale Junicode-SmExp-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{sc}{
- <-> alias * Junicode-OsF/sx/sc
+\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-OsF/mediumsemicondensed/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{n}{
- <-> alias * Junicode-OsF/sx/n
+\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{scsl}{
+ <-> ssub * Junicode-OsF/mediumsemicondensed/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{sx}{scsl}{
- <-> ssub * Junicode-OsF/sx/scit
-}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{scsl}{
- <-> ssub * Junicode-OsF/semiexpanded/scit
-}{}
+% ---- l = light ----
-\DeclareFontShape{T1}{Junicode-OsF}{sx}{sl}{
- <-> ssub * Junicode-OsF/sx/it
+\DeclareFontShape{T1}{Junicode-OsF}{l}{sc}{
+ <-> \Junicode@@scale Junicode-Light-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{sl}{
- <-> ssub * Junicode-OsF/semiexpanded/it
+\DeclareFontShape{T1}{Junicode-OsF}{light}{sc}{
+ <-> alias * Junicode-OsF/l/sc
}{}
-
-% ---- mediumexpanded ----
-
-\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{scit}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{light}{it}{
+ <-> alias * Junicode-OsF/l/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{sc}{
- <-> \Junicode@@scale Junicode-ExpMedium-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{light}{n}{
+ <-> alias * Junicode-OsF/l/n
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{scsl}{
- <-> ssub * Junicode-OsF/mediumexpanded/scit
+\DeclareFontShape{T1}{Junicode-OsF}{l}{scit}{
+ <-> \Junicode@@scale Junicode-LightItalic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{sl}{
- <-> ssub * Junicode-OsF/mediumexpanded/it
+\DeclareFontShape{T1}{Junicode-OsF}{light}{scit}{
+ <-> alias * Junicode-OsF/l/scit
}{}
-
-% ---- sbsx = semiboldsemiexpanded ----
-
-\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{l}{sl}{
+ <-> ssub * Junicode-OsF/l/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{scit}{
- <-> alias * Junicode-OsF/sbsx/scit
+\DeclareFontShape{T1}{Junicode-OsF}{light}{sl}{
+ <-> ssub * Junicode-OsF/light/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{l}{scsl}{
+ <-> ssub * Junicode-OsF/l/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-OsF/sbsx/it
+\DeclareFontShape{T1}{Junicode-OsF}{light}{scsl}{
+ <-> ssub * Junicode-OsF/light/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-osf-sc-t1
-}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{sc}{
- <-> alias * Junicode-OsF/sbsx/sc
-}{}
+% ---- sx = semiexpanded ----
-\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{sx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExp-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-OsF/sbsx/n
+\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{sc}{
+ <-> alias * Junicode-OsF/sx/sc
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{scsl}{
- <-> ssub * Junicode-OsF/sbsx/scit
+\DeclareFontShape{T1}{Junicode-OsF}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{scsl}{
- <-> ssub * Junicode-OsF/semiboldsemiexpanded/scit
+\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{n}{
+ <-> alias * Junicode-OsF/sx/n
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{sl}{
- <-> ssub * Junicode-OsF/sbsx/it
+\DeclareFontShape{T1}{Junicode-OsF}{sx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-OsF/semiboldsemiexpanded/it
+\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{scit}{
+ <-> alias * Junicode-OsF/sx/scit
}{}
-
-% ---- mediumsemiexpanded ----
-
-\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-osf-t1
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{sc}{
- <-> \Junicode@@scale Junicode-SmExpMedium-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{it}{
+ <-> alias * Junicode-OsF/sx/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-t1
+\DeclareFontShape{T1}{Junicode-OsF}{sx}{sl}{
+ <-> ssub * Junicode-OsF/sx/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{scit}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-sc-t1
+\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{sl}{
+ <-> ssub * Junicode-OsF/semiexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{scsl}{
- <-> ssub * Junicode-OsF/mediumsemiexpanded/scit
+\DeclareFontShape{T1}{Junicode-OsF}{sx}{scsl}{
+ <-> ssub * Junicode-OsF/sx/scit
}{}
-\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-OsF/mediumsemiexpanded/it
+\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{scsl}{
+ <-> ssub * Junicode-OsF/semiexpanded/scit
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/T1Junicode-Sup.fd b/Master/texmf-dist/tex/latex/junicode/T1Junicode-Sup.fd
index dd152bd085e..86903276ad1 100644
--- a/Master/texmf-dist/tex/latex/junicode/T1Junicode-Sup.fd
+++ b/Master/texmf-dist/tex/latex/junicode/T1Junicode-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{T1Junicode-Sup.fd}
- [2024/06/03 (autoinst) Font definitions for T1/Junicode-Sup.]
+ [2024/07/21 (autoinst) Font definitions for T1/Junicode-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,126 +20,111 @@
\DeclareFontFamily{T1}{Junicode-Sup}{}
-% ---- sx = semiexpanded ----
+% ---- c = condensed ----
-\DeclareFontShape{T1}{Junicode-Sup}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{semiexpanded}{n}{
- <-> alias * Junicode-Sup/sx/n
+\DeclareFontShape{T1}{Junicode-Sup}{condensed}{n}{
+ <-> alias * Junicode-Sup/c/n
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{semiexpanded}{it}{
- <-> alias * Junicode-Sup/sx/it
+\DeclareFontShape{T1}{Junicode-Sup}{condensed}{it}{
+ <-> alias * Junicode-Sup/c/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{sx}{sl}{
- <-> ssub * Junicode-Sup/sx/it
+\DeclareFontShape{T1}{Junicode-Sup}{c}{sl}{
+ <-> ssub * Junicode-Sup/c/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{semiexpanded}{sl}{
- <-> ssub * Junicode-Sup/semiexpanded/it
+\DeclareFontShape{T1}{Junicode-Sup}{condensed}{sl}{
+ <-> ssub * Junicode-Sup/condensed/it
}{}
-% ---- x = expanded ----
-
-\DeclareFontShape{T1}{Junicode-Sup}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-sup-t1
-}{}
+% ---- sbx = semiboldexpanded ----
-\DeclareFontShape{T1}{Junicode-Sup}{expanded}{n}{
- <-> alias * Junicode-Sup/x/n
+\DeclareFontShape{T1}{Junicode-Sup}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{semiboldexpanded}{it}{
+ <-> alias * Junicode-Sup/sbx/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{expanded}{it}{
- <-> alias * Junicode-Sup/x/it
+\DeclareFontShape{T1}{Junicode-Sup}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{x}{sl}{
- <-> ssub * Junicode-Sup/x/it
+\DeclareFontShape{T1}{Junicode-Sup}{semiboldexpanded}{n}{
+ <-> alias * Junicode-Sup/sbx/n
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{expanded}{sl}{
- <-> ssub * Junicode-Sup/expanded/it
+\DeclareFontShape{T1}{Junicode-Sup}{sbx}{sl}{
+ <-> ssub * Junicode-Sup/sbx/it
}{}
-
-% ---- c = condensed ----
-
-\DeclareFontShape{T1}{Junicode-Sup}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-Sup/semiboldexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{condensed}{n}{
- <-> alias * Junicode-Sup/c/n
-}{}
-\DeclareFontShape{T1}{Junicode-Sup}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-sup-t1
-}{}
+% ---- x = expanded ----
-\DeclareFontShape{T1}{Junicode-Sup}{condensed}{it}{
- <-> alias * Junicode-Sup/c/it
+\DeclareFontShape{T1}{Junicode-Sup}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{c}{sl}{
- <-> ssub * Junicode-Sup/c/it
+\DeclareFontShape{T1}{Junicode-Sup}{expanded}{n}{
+ <-> alias * Junicode-Sup/x/n
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{condensed}{sl}{
- <-> ssub * Junicode-Sup/condensed/it
+\DeclareFontShape{T1}{Junicode-Sup}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-sup-t1
}{}
-
-% ---- mediumsemiexpanded ----
-
-\DeclareFontShape{T1}{Junicode-Sup}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{expanded}{it}{
+ <-> alias * Junicode-Sup/x/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{x}{sl}{
+ <-> ssub * Junicode-Sup/x/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-Sup/mediumsemiexpanded/it
+\DeclareFontShape{T1}{Junicode-Sup}{expanded}{sl}{
+ <-> ssub * Junicode-Sup/expanded/it
}{}
-% ---- sbsx = semiboldsemiexpanded ----
+% ---- b = bold ----
-\DeclareFontShape{T1}{Junicode-Sup}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-Sup/sbsx/n
+\DeclareFontShape{T1}{Junicode-Sup}{bold}{it}{
+ <-> alias * Junicode-Sup/b/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-Sup/sbsx/it
+\DeclareFontShape{T1}{Junicode-Sup}{bold}{n}{
+ <-> alias * Junicode-Sup/b/n
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{sbsx}{sl}{
- <-> ssub * Junicode-Sup/sbsx/it
+\DeclareFontShape{T1}{Junicode-Sup}{b}{sl}{
+ <-> ssub * Junicode-Sup/b/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-Sup/semiboldsemiexpanded/it
+\DeclareFontShape{T1}{Junicode-Sup}{bold}{sl}{
+ <-> ssub * Junicode-Sup/bold/it
}{}
@@ -158,84 +143,99 @@
}{}
-% ---- bx = boldexpanded ----
+% ---- lsc = lightsemicondensed ----
-\DeclareFontShape{T1}{Junicode-Sup}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{boldexpanded}{it}{
- <-> alias * Junicode-Sup/bx/it
+\DeclareFontShape{T1}{Junicode-Sup}{lightsemicondensed}{it}{
+ <-> alias * Junicode-Sup/lsc/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{boldexpanded}{n}{
- <-> alias * Junicode-Sup/bx/n
+\DeclareFontShape{T1}{Junicode-Sup}{lightsemicondensed}{n}{
+ <-> alias * Junicode-Sup/lsc/n
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{bx}{sl}{
- <-> ssub * Junicode-Sup/bx/it
+\DeclareFontShape{T1}{Junicode-Sup}{lsc}{sl}{
+ <-> ssub * Junicode-Sup/lsc/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{boldexpanded}{sl}{
- <-> ssub * Junicode-Sup/boldexpanded/it
+\DeclareFontShape{T1}{Junicode-Sup}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-Sup/lightsemicondensed/it
}{}
-% ---- l = light ----
+% ---- lc = lightcondensed ----
-\DeclareFontShape{T1}{Junicode-Sup}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{light}{n}{
- <-> alias * Junicode-Sup/l/n
+\DeclareFontShape{T1}{Junicode-Sup}{lightcondensed}{it}{
+ <-> alias * Junicode-Sup/lc/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{light}{it}{
- <-> alias * Junicode-Sup/l/it
+\DeclareFontShape{T1}{Junicode-Sup}{lightcondensed}{n}{
+ <-> alias * Junicode-Sup/lc/n
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{l}{sl}{
- <-> ssub * Junicode-Sup/l/it
+\DeclareFontShape{T1}{Junicode-Sup}{lc}{sl}{
+ <-> ssub * Junicode-Sup/lc/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{light}{sl}{
- <-> ssub * Junicode-Sup/light/it
+\DeclareFontShape{T1}{Junicode-Sup}{lightcondensed}{sl}{
+ <-> ssub * Junicode-Sup/lightcondensed/it
}{}
-% ---- lsc = lightsemicondensed ----
+% ---- m = regular ----
-\DeclareFontShape{T1}{Junicode-Sup}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{lightsemicondensed}{n}{
- <-> alias * Junicode-Sup/lsc/n
+\DeclareFontShape{T1}{Junicode-Sup}{regular}{it}{
+ <-> alias * Junicode-Sup/m/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{lightsemicondensed}{it}{
- <-> alias * Junicode-Sup/lsc/it
+\DeclareFontShape{T1}{Junicode-Sup}{regular}{n}{
+ <-> alias * Junicode-Sup/m/n
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{lsc}{sl}{
- <-> ssub * Junicode-Sup/lsc/it
+\DeclareFontShape{T1}{Junicode-Sup}{m}{sl}{
+ <-> ssub * Junicode-Sup/m/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-Sup/lightsemicondensed/it
+\DeclareFontShape{T1}{Junicode-Sup}{regular}{sl}{
+ <-> ssub * Junicode-Sup/regular/it
+}{}
+
+
+% ---- mediumsemiexpanded ----
+
+\DeclareFontShape{T1}{Junicode-Sup}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Junicode-Sup}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Junicode-Sup}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-Sup/mediumsemiexpanded/it
}{}
@@ -254,99 +254,84 @@
}{}
-% ---- m = regular ----
-
-\DeclareFontShape{T1}{Junicode-Sup}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-sup-t1
-}{}
+% ---- bx = boldexpanded ----
-\DeclareFontShape{T1}{Junicode-Sup}{regular}{it}{
- <-> alias * Junicode-Sup/m/it
+\DeclareFontShape{T1}{Junicode-Sup}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{boldexpanded}{it}{
+ <-> alias * Junicode-Sup/bx/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{regular}{n}{
- <-> alias * Junicode-Sup/m/n
+\DeclareFontShape{T1}{Junicode-Sup}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{m}{sl}{
- <-> ssub * Junicode-Sup/m/it
+\DeclareFontShape{T1}{Junicode-Sup}{boldexpanded}{n}{
+ <-> alias * Junicode-Sup/bx/n
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{regular}{sl}{
- <-> ssub * Junicode-Sup/regular/it
+\DeclareFontShape{T1}{Junicode-Sup}{bx}{sl}{
+ <-> ssub * Junicode-Sup/bx/it
}{}
-
-% ---- b = bold ----
-
-\DeclareFontShape{T1}{Junicode-Sup}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{boldexpanded}{sl}{
+ <-> ssub * Junicode-Sup/boldexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{bold}{it}{
- <-> alias * Junicode-Sup/b/it
-}{}
-\DeclareFontShape{T1}{Junicode-Sup}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-sup-t1
-}{}
+% ---- sx = semiexpanded ----
-\DeclareFontShape{T1}{Junicode-Sup}{bold}{n}{
- <-> alias * Junicode-Sup/b/n
+\DeclareFontShape{T1}{Junicode-Sup}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{b}{sl}{
- <-> ssub * Junicode-Sup/b/it
+\DeclareFontShape{T1}{Junicode-Sup}{semiexpanded}{n}{
+ <-> alias * Junicode-Sup/sx/n
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{bold}{sl}{
- <-> ssub * Junicode-Sup/bold/it
+\DeclareFontShape{T1}{Junicode-Sup}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-sup-t1
}{}
-
-% ---- mediumcondensed ----
-
-\DeclareFontShape{T1}{Junicode-Sup}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{semiexpanded}{it}{
+ <-> alias * Junicode-Sup/sx/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{sx}{sl}{
+ <-> ssub * Junicode-Sup/sx/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{mediumcondensed}{sl}{
- <-> ssub * Junicode-Sup/mediumcondensed/it
+\DeclareFontShape{T1}{Junicode-Sup}{semiexpanded}{sl}{
+ <-> ssub * Junicode-Sup/semiexpanded/it
}{}
-% ---- sbx = semiboldexpanded ----
+% ---- l = light ----
-\DeclareFontShape{T1}{Junicode-Sup}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{semiboldexpanded}{it}{
- <-> alias * Junicode-Sup/sbx/it
+\DeclareFontShape{T1}{Junicode-Sup}{light}{n}{
+ <-> alias * Junicode-Sup/l/n
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{semiboldexpanded}{n}{
- <-> alias * Junicode-Sup/sbx/n
+\DeclareFontShape{T1}{Junicode-Sup}{light}{it}{
+ <-> alias * Junicode-Sup/l/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{sbx}{sl}{
- <-> ssub * Junicode-Sup/sbx/it
+\DeclareFontShape{T1}{Junicode-Sup}{l}{sl}{
+ <-> ssub * Junicode-Sup/l/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-Sup/semiboldexpanded/it
+\DeclareFontShape{T1}{Junicode-Sup}{light}{sl}{
+ <-> ssub * Junicode-Sup/light/it
}{}
@@ -367,14 +352,6 @@
% ---- sb = semibold ----
-\DeclareFontShape{T1}{Junicode-Sup}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-sup-t1
-}{}
-
-\DeclareFontShape{T1}{Junicode-Sup}{semibold}{it}{
- <-> alias * Junicode-Sup/sb/it
-}{}
-
\DeclareFontShape{T1}{Junicode-Sup}{sb}{n}{
<-> \Junicode@@scale Junicode-SmBold-sup-t1
}{}
@@ -383,6 +360,14 @@
<-> alias * Junicode-Sup/sb/n
}{}
+\DeclareFontShape{T1}{Junicode-Sup}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Junicode-Sup}{semibold}{it}{
+ <-> alias * Junicode-Sup/sb/it
+}{}
+
\DeclareFontShape{T1}{Junicode-Sup}{sb}{sl}{
<-> ssub * Junicode-Sup/sb/it
}{}
@@ -392,43 +377,50 @@
}{}
-% ---- sc = semicondensed ----
+% ---- mediumcondensed ----
-\DeclareFontShape{T1}{Junicode-Sup}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{semicondensed}{n}{
- <-> alias * Junicode-Sup/sc/n
+\DeclareFontShape{T1}{Junicode-Sup}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{sc}{it}{
- <-> \Junicode@@scale Junicode-SmCondItalic-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-Sup/mediumcondensed/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{semicondensed}{it}{
- <-> alias * Junicode-Sup/sc/it
-}{}
-\DeclareFontShape{T1}{Junicode-Sup}{sc}{sl}{
- <-> ssub * Junicode-Sup/sc/it
+% ---- sbsx = semiboldsemiexpanded ----
+
+\DeclareFontShape{T1}{Junicode-Sup}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{semicondensed}{sl}{
- <-> ssub * Junicode-Sup/semicondensed/it
+\DeclareFontShape{T1}{Junicode-Sup}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-Sup/sbsx/n
}{}
+\DeclareFontShape{T1}{Junicode-Sup}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-sup-t1
+}{}
-% ---- bsx = boldsemiexpanded ----
+\DeclareFontShape{T1}{Junicode-Sup}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-Sup/sbsx/it
+}{}
-\DeclareFontShape{T1}{Junicode-Sup}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{sbsx}{sl}{
+ <-> ssub * Junicode-Sup/sbsx/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{boldsemiexpanded}{n}{
- <-> alias * Junicode-Sup/bsx/n
+\DeclareFontShape{T1}{Junicode-Sup}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-Sup/semiboldsemiexpanded/it
}{}
+
+% ---- bsx = boldsemiexpanded ----
+
\DeclareFontShape{T1}{Junicode-Sup}{bsx}{it}{
<-> \Junicode@@scale Junicode-SmExpBoldItalic-sup-t1
}{}
@@ -437,6 +429,14 @@
<-> alias * Junicode-Sup/bsx/it
}{}
+\DeclareFontShape{T1}{Junicode-Sup}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Junicode-Sup}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-Sup/bsx/n
+}{}
+
\DeclareFontShape{T1}{Junicode-Sup}{bsx}{sl}{
<-> ssub * Junicode-Sup/bsx/it
}{}
@@ -446,30 +446,30 @@
}{}
-% ---- lc = lightcondensed ----
+% ---- sc = semicondensed ----
-\DeclareFontShape{T1}{Junicode-Sup}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{sc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{lightcondensed}{n}{
- <-> alias * Junicode-Sup/lc/n
+\DeclareFontShape{T1}{Junicode-Sup}{semicondensed}{it}{
+ <-> alias * Junicode-Sup/sc/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-sup-t1
+\DeclareFontShape{T1}{Junicode-Sup}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-sup-t1
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{lightcondensed}{it}{
- <-> alias * Junicode-Sup/lc/it
+\DeclareFontShape{T1}{Junicode-Sup}{semicondensed}{n}{
+ <-> alias * Junicode-Sup/sc/n
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{lc}{sl}{
- <-> ssub * Junicode-Sup/lc/it
+\DeclareFontShape{T1}{Junicode-Sup}{sc}{sl}{
+ <-> ssub * Junicode-Sup/sc/it
}{}
-\DeclareFontShape{T1}{Junicode-Sup}{lightcondensed}{sl}{
- <-> ssub * Junicode-Sup/lightcondensed/it
+\DeclareFontShape{T1}{Junicode-Sup}{semicondensed}{sl}{
+ <-> ssub * Junicode-Sup/semicondensed/it
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/T1Junicode-TLF.fd b/Master/texmf-dist/tex/latex/junicode/T1Junicode-TLF.fd
index 1cf635bb8fe..014b2b6c696 100644
--- a/Master/texmf-dist/tex/latex/junicode/T1Junicode-TLF.fd
+++ b/Master/texmf-dist/tex/latex/junicode/T1Junicode-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{T1Junicode-TLF.fd}
- [2024/06/03 (autoinst) Font definitions for T1/Junicode-TLF.]
+ [2024/07/21 (autoinst) Font definitions for T1/Junicode-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,656 +20,632 @@
\DeclareFontFamily{T1}{Junicode-TLF}{}
-% ---- sbx = semiboldexpanded ----
+% ---- l = light ----
-\DeclareFontShape{T1}{Junicode-TLF}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{l}{sc}{
+ <-> \Junicode@@scale Junicode-Light-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{n}{
- <-> alias * Junicode-TLF/sbx/n
+\DeclareFontShape{T1}{Junicode-TLF}{light}{sc}{
+ <-> alias * Junicode-TLF/l/sc
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sbx}{sc}{
- <-> \Junicode@@scale Junicode-ExpSmBold-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{sc}{
- <-> alias * Junicode-TLF/sbx/sc
+\DeclareFontShape{T1}{Junicode-TLF}{light}{it}{
+ <-> alias * Junicode-TLF/l/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{it}{
- <-> alias * Junicode-TLF/sbx/it
+\DeclareFontShape{T1}{Junicode-TLF}{light}{n}{
+ <-> alias * Junicode-TLF/l/n
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sbx}{scit}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{l}{scit}{
+ <-> \Junicode@@scale Junicode-LightItalic-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{scit}{
- <-> alias * Junicode-TLF/sbx/scit
+\DeclareFontShape{T1}{Junicode-TLF}{light}{scit}{
+ <-> alias * Junicode-TLF/l/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sbx}{scsl}{
- <-> ssub * Junicode-TLF/sbx/scit
+\DeclareFontShape{T1}{Junicode-TLF}{l}{sl}{
+ <-> ssub * Junicode-TLF/l/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{scsl}{
- <-> ssub * Junicode-TLF/semiboldexpanded/scit
+\DeclareFontShape{T1}{Junicode-TLF}{light}{sl}{
+ <-> ssub * Junicode-TLF/light/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sbx}{sl}{
- <-> ssub * Junicode-TLF/sbx/it
+\DeclareFontShape{T1}{Junicode-TLF}{l}{scsl}{
+ <-> ssub * Junicode-TLF/l/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-TLF/semiboldexpanded/it
+\DeclareFontShape{T1}{Junicode-TLF}{light}{scsl}{
+ <-> ssub * Junicode-TLF/light/scit
}{}
-% ---- mediumsemicondensed ----
+% ---- sx = semiexpanded ----
-\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExp-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{sc}{
- <-> \Junicode@@scale Junicode-SmCondMedium-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{sc}{
+ <-> alias * Junicode-TLF/sx/sc
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{scit}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{it}{
+ <-> alias * Junicode-TLF/sx/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{scsl}{
- <-> ssub * Junicode-TLF/mediumsemicondensed/scit
+\DeclareFontShape{T1}{Junicode-TLF}{sx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-TLF/mediumsemicondensed/it
+\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{scit}{
+ <-> alias * Junicode-TLF/sx/scit
}{}
-
-% ---- sc = semicondensed ----
-
-\DeclareFontShape{T1}{Junicode-TLF}{sc}{sc}{
- <-> \Junicode@@scale Junicode-SmCond-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{sc}{
- <-> alias * Junicode-TLF/sc/sc
+\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{n}{
+ <-> alias * Junicode-TLF/sx/n
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sx}{sl}{
+ <-> ssub * Junicode-TLF/sx/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{n}{
- <-> alias * Junicode-TLF/sc/n
+\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{sl}{
+ <-> ssub * Junicode-TLF/semiexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sx}{scsl}{
+ <-> ssub * Junicode-TLF/sx/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{scit}{
- <-> alias * Junicode-TLF/sc/scit
+\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/semiexpanded/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sc}{it}{
- <-> \Junicode@@scale Junicode-SmCondItalic-tlf-t1
+
+% ---- mediumsemicondensed ----
+
+\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{it}{
- <-> alias * Junicode-TLF/sc/it
+\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sc}{scsl}{
- <-> ssub * Junicode-TLF/sc/scit
+\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{scsl}{
- <-> ssub * Junicode-TLF/semicondensed/scit
+\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sc}{sl}{
- <-> ssub * Junicode-TLF/sc/it
+\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-TLF/mediumsemicondensed/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{sl}{
- <-> ssub * Junicode-TLF/semicondensed/it
+\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{scsl}{
+ <-> ssub * Junicode-TLF/mediumsemicondensed/scit
}{}
-% ---- sb = semibold ----
+% ---- lc = lightcondensed ----
-\DeclareFontShape{T1}{Junicode-TLF}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{lc}{sc}{
+ <-> \Junicode@@scale Junicode-CondLight-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semibold}{it}{
- <-> alias * Junicode-TLF/sb/it
+\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{sc}{
+ <-> alias * Junicode-TLF/lc/sc
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sb}{scit}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semibold}{scit}{
- <-> alias * Junicode-TLF/sb/scit
+\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{it}{
+ <-> alias * Junicode-TLF/lc/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semibold}{n}{
- <-> alias * Junicode-TLF/sb/n
+\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{n}{
+ <-> alias * Junicode-TLF/lc/n
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sb}{sc}{
- <-> \Junicode@@scale Junicode-SmBold-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{lc}{scit}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semibold}{sc}{
- <-> alias * Junicode-TLF/sb/sc
+\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{scit}{
+ <-> alias * Junicode-TLF/lc/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sb}{scsl}{
- <-> ssub * Junicode-TLF/sb/scit
+\DeclareFontShape{T1}{Junicode-TLF}{lc}{sl}{
+ <-> ssub * Junicode-TLF/lc/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semibold}{scsl}{
- <-> ssub * Junicode-TLF/semibold/scit
+\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{sl}{
+ <-> ssub * Junicode-TLF/lightcondensed/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sb}{sl}{
- <-> ssub * Junicode-TLF/sb/it
+\DeclareFontShape{T1}{Junicode-TLF}{lc}{scsl}{
+ <-> ssub * Junicode-TLF/lc/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semibold}{sl}{
- <-> ssub * Junicode-TLF/semibold/it
+\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{scsl}{
+ <-> ssub * Junicode-TLF/lightcondensed/scit
}{}
-% ---- bsx = boldsemiexpanded ----
+% ---- bx = boldexpanded ----
-\DeclareFontShape{T1}{Junicode-TLF}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{bx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{n}{
- <-> alias * Junicode-TLF/bsx/n
+\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{scit}{
+ <-> alias * Junicode-TLF/bx/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{bsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpBold-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{sc}{
- <-> alias * Junicode-TLF/bsx/sc
+\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{n}{
+ <-> alias * Junicode-TLF/bx/n
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{it}{
- <-> alias * Junicode-TLF/bsx/it
+\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{it}{
+ <-> alias * Junicode-TLF/bx/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{bsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{bx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpBold-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{scit}{
- <-> alias * Junicode-TLF/bsx/scit
+\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{sc}{
+ <-> alias * Junicode-TLF/bx/sc
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{bsx}{scsl}{
- <-> ssub * Junicode-TLF/bsx/scit
+\DeclareFontShape{T1}{Junicode-TLF}{bx}{sl}{
+ <-> ssub * Junicode-TLF/bx/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{scsl}{
- <-> ssub * Junicode-TLF/boldsemiexpanded/scit
+\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{sl}{
+ <-> ssub * Junicode-TLF/boldexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{bsx}{sl}{
- <-> ssub * Junicode-TLF/bsx/it
+\DeclareFontShape{T1}{Junicode-TLF}{bx}{scsl}{
+ <-> ssub * Junicode-TLF/bx/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-TLF/boldsemiexpanded/it
+\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/boldexpanded/scit
}{}
-% ---- lc = lightcondensed ----
-
-\DeclareFontShape{T1}{Junicode-TLF}{lc}{sc}{
- <-> \Junicode@@scale Junicode-CondLight-tlf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{sc}{
- <-> alias * Junicode-TLF/lc/sc
-}{}
+% ---- medium ----
-\DeclareFontShape{T1}{Junicode-TLF}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{medium}{sc}{
+ <-> \Junicode@@scale Junicode-Medium-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{n}{
- <-> alias * Junicode-TLF/lc/n
+\DeclareFontShape{T1}{Junicode-TLF}{medium}{it}{
+ <-> \Junicode@@scale Junicode-MediumItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{lc}{scit}{
- <-> \Junicode@@scale Junicode-CondLightItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{medium}{n}{
+ <-> \Junicode@@scale Junicode-Medium-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{scit}{
- <-> alias * Junicode-TLF/lc/scit
+\DeclareFontShape{T1}{Junicode-TLF}{medium}{scit}{
+ <-> \Junicode@@scale Junicode-MediumItalic-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{medium}{sl}{
+ <-> ssub * Junicode-TLF/medium/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{it}{
- <-> alias * Junicode-TLF/lc/it
+\DeclareFontShape{T1}{Junicode-TLF}{medium}{scsl}{
+ <-> ssub * Junicode-TLF/medium/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{lc}{scsl}{
- <-> ssub * Junicode-TLF/lc/scit
-}{}
-\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{scsl}{
- <-> ssub * Junicode-TLF/lightcondensed/scit
-}{}
+% ---- mediumsemiexpanded ----
-\DeclareFontShape{T1}{Junicode-TLF}{lc}{sl}{
- <-> ssub * Junicode-TLF/lc/it
+\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{sl}{
- <-> ssub * Junicode-TLF/lightcondensed/it
+\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-sc-t1
}{}
-
-% ---- b = bold ----
-
-\DeclareFontShape{T1}{Junicode-TLF}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{bold}{n}{
- <-> alias * Junicode-TLF/b/n
+\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{b}{sc}{
- <-> \Junicode@@scale Junicode-Bold-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-TLF/mediumsemiexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{bold}{sc}{
- <-> alias * Junicode-TLF/b/sc
+\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/mediumsemiexpanded/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-tlf-t1
-}{}
-\DeclareFontShape{T1}{Junicode-TLF}{bold}{it}{
- <-> alias * Junicode-TLF/b/it
-}{}
+% ---- m = regular ----
-\DeclareFontShape{T1}{Junicode-TLF}{b}{scit}{
- <-> \Junicode@@scale Junicode-BoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{m}{sc}{
+ <-> \Junicode@@scale Junicode-Regular-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{bold}{scit}{
- <-> alias * Junicode-TLF/b/scit
+\DeclareFontShape{T1}{Junicode-TLF}{regular}{sc}{
+ <-> alias * Junicode-TLF/m/sc
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{b}{scsl}{
- <-> ssub * Junicode-TLF/b/scit
+\DeclareFontShape{T1}{Junicode-TLF}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{bold}{scsl}{
- <-> ssub * Junicode-TLF/bold/scit
+\DeclareFontShape{T1}{Junicode-TLF}{regular}{it}{
+ <-> alias * Junicode-TLF/m/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{b}{sl}{
- <-> ssub * Junicode-TLF/b/it
+\DeclareFontShape{T1}{Junicode-TLF}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{bold}{sl}{
- <-> ssub * Junicode-TLF/bold/it
+\DeclareFontShape{T1}{Junicode-TLF}{regular}{n}{
+ <-> alias * Junicode-TLF/m/n
}{}
-
-% ---- mediumcondensed ----
-
-\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{scit}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{m}{scit}{
+ <-> \Junicode@@scale Junicode-Italic-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{regular}{scit}{
+ <-> alias * Junicode-TLF/m/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{sc}{
- <-> \Junicode@@scale Junicode-CondMedium-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{m}{sl}{
+ <-> ssub * Junicode-TLF/m/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{regular}{sl}{
+ <-> ssub * Junicode-TLF/regular/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{scsl}{
- <-> ssub * Junicode-TLF/mediumcondensed/scit
+\DeclareFontShape{T1}{Junicode-TLF}{m}{scsl}{
+ <-> ssub * Junicode-TLF/m/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{sl}{
- <-> ssub * Junicode-TLF/mediumcondensed/it
+\DeclareFontShape{T1}{Junicode-TLF}{regular}{scsl}{
+ <-> ssub * Junicode-TLF/regular/scit
}{}
-% ---- bx = boldexpanded ----
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{T1}{Junicode-TLF}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{it}{
- <-> alias * Junicode-TLF/bx/it
+\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-TLF/sbsx/n
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{bx}{scit}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{scit}{
- <-> alias * Junicode-TLF/bx/scit
+\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{scit}{
+ <-> alias * Junicode-TLF/sbsx/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{n}{
- <-> alias * Junicode-TLF/bx/n
+\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-TLF/sbsx/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{bx}{sc}{
- <-> \Junicode@@scale Junicode-ExpBold-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{sc}{
- <-> alias * Junicode-TLF/bx/sc
+\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{sc}{
+ <-> alias * Junicode-TLF/sbsx/sc
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{bx}{scsl}{
- <-> ssub * Junicode-TLF/bx/scit
+\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{sl}{
+ <-> ssub * Junicode-TLF/sbsx/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{scsl}{
- <-> ssub * Junicode-TLF/boldexpanded/scit
+\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-TLF/semiboldsemiexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{bx}{sl}{
- <-> ssub * Junicode-TLF/bx/it
+\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{scsl}{
+ <-> ssub * Junicode-TLF/sbsx/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{sl}{
- <-> ssub * Junicode-TLF/boldexpanded/it
+\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/semiboldsemiexpanded/scit
}{}
-% ---- l = light ----
+% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{T1}{Junicode-TLF}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{light}{it}{
- <-> alias * Junicode-TLF/l/it
+\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-TLF/bsx/n
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{l}{scit}{
- <-> \Junicode@@scale Junicode-LightItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{bsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{light}{scit}{
- <-> alias * Junicode-TLF/l/scit
+\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{scit}{
+ <-> alias * Junicode-TLF/bsx/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{light}{n}{
- <-> alias * Junicode-TLF/l/n
+\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-TLF/bsx/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{l}{sc}{
- <-> \Junicode@@scale Junicode-Light-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{bsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpBold-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{light}{sc}{
- <-> alias * Junicode-TLF/l/sc
+\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{sc}{
+ <-> alias * Junicode-TLF/bsx/sc
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{l}{scsl}{
- <-> ssub * Junicode-TLF/l/scit
+\DeclareFontShape{T1}{Junicode-TLF}{bsx}{sl}{
+ <-> ssub * Junicode-TLF/bsx/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{light}{scsl}{
- <-> ssub * Junicode-TLF/light/scit
+\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-TLF/boldsemiexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{l}{sl}{
- <-> ssub * Junicode-TLF/l/it
+\DeclareFontShape{T1}{Junicode-TLF}{bsx}{scsl}{
+ <-> ssub * Junicode-TLF/bsx/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{light}{sl}{
- <-> ssub * Junicode-TLF/light/it
+\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/boldsemiexpanded/scit
}{}
-% ---- medium ----
+% ---- sc = semicondensed ----
-\DeclareFontShape{T1}{Junicode-TLF}{medium}{sc}{
- <-> \Junicode@@scale Junicode-Medium-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{medium}{n}{
- <-> \Junicode@@scale Junicode-Medium-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{n}{
+ <-> alias * Junicode-TLF/sc/n
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{medium}{scit}{
- <-> \Junicode@@scale Junicode-MediumItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{medium}{it}{
- <-> \Junicode@@scale Junicode-MediumItalic-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{scit}{
+ <-> alias * Junicode-TLF/sc/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{medium}{scsl}{
- <-> ssub * Junicode-TLF/medium/scit
+\DeclareFontShape{T1}{Junicode-TLF}{sc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{medium}{sl}{
- <-> ssub * Junicode-TLF/medium/it
+\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{it}{
+ <-> alias * Junicode-TLF/sc/it
}{}
-
-% ---- lsc = lightsemicondensed ----
-
-\DeclareFontShape{T1}{Junicode-TLF}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCond-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{it}{
- <-> alias * Junicode-TLF/lsc/it
+\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{sc}{
+ <-> alias * Junicode-TLF/sc/sc
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{lsc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sc}{sl}{
+ <-> ssub * Junicode-TLF/sc/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{scit}{
- <-> alias * Junicode-TLF/lsc/scit
+\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{sl}{
+ <-> ssub * Junicode-TLF/semicondensed/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sc}{scsl}{
+ <-> ssub * Junicode-TLF/sc/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{n}{
- <-> alias * Junicode-TLF/lsc/n
+\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{scsl}{
+ <-> ssub * Junicode-TLF/semicondensed/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{lsc}{sc}{
- <-> \Junicode@@scale Junicode-SmCondLight-tlf-sc-t1
+
+% ---- mediumcondensed ----
+
+\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{sc}{
+ <-> \Junicode@@scale Junicode-CondMedium-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{sc}{
- <-> alias * Junicode-TLF/lsc/sc
+\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{lsc}{scsl}{
- <-> ssub * Junicode-TLF/lsc/scit
+\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{scit}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{scsl}{
- <-> ssub * Junicode-TLF/lightsemicondensed/scit
+\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{lsc}{sl}{
- <-> ssub * Junicode-TLF/lsc/it
+\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-TLF/mediumcondensed/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-TLF/lightsemicondensed/it
+\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{scsl}{
+ <-> ssub * Junicode-TLF/mediumcondensed/scit
}{}
-% ---- m = regular ----
+% ---- sb = semibold ----
-\DeclareFontShape{T1}{Junicode-TLF}{m}{sc}{
- <-> \Junicode@@scale Junicode-Regular-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sb}{sc}{
+ <-> \Junicode@@scale Junicode-SmBold-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{regular}{sc}{
- <-> alias * Junicode-TLF/m/sc
+\DeclareFontShape{T1}{Junicode-TLF}{semibold}{sc}{
+ <-> alias * Junicode-TLF/sb/sc
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{regular}{n}{
- <-> alias * Junicode-TLF/m/n
+\DeclareFontShape{T1}{Junicode-TLF}{semibold}{n}{
+ <-> alias * Junicode-TLF/sb/n
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{m}{scit}{
- <-> \Junicode@@scale Junicode-Italic-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sb}{scit}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{regular}{scit}{
- <-> alias * Junicode-TLF/m/scit
+\DeclareFontShape{T1}{Junicode-TLF}{semibold}{scit}{
+ <-> alias * Junicode-TLF/sb/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{regular}{it}{
- <-> alias * Junicode-TLF/m/it
+\DeclareFontShape{T1}{Junicode-TLF}{semibold}{it}{
+ <-> alias * Junicode-TLF/sb/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{m}{scsl}{
- <-> ssub * Junicode-TLF/m/scit
+\DeclareFontShape{T1}{Junicode-TLF}{sb}{sl}{
+ <-> ssub * Junicode-TLF/sb/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{regular}{scsl}{
- <-> ssub * Junicode-TLF/regular/scit
+\DeclareFontShape{T1}{Junicode-TLF}{semibold}{sl}{
+ <-> ssub * Junicode-TLF/semibold/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{m}{sl}{
- <-> ssub * Junicode-TLF/m/it
+\DeclareFontShape{T1}{Junicode-TLF}{sb}{scsl}{
+ <-> ssub * Junicode-TLF/sb/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{regular}{sl}{
- <-> ssub * Junicode-TLF/regular/it
+\DeclareFontShape{T1}{Junicode-TLF}{semibold}{scsl}{
+ <-> ssub * Junicode-TLF/semibold/scit
}{}
-% ---- x = expanded ----
+% ---- sbx = semiboldexpanded ----
-\DeclareFontShape{T1}{Junicode-TLF}{x}{scit}{
- <-> \Junicode@@scale Junicode-ExpItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{expanded}{scit}{
- <-> alias * Junicode-TLF/x/scit
+\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{it}{
+ <-> alias * Junicode-TLF/sbx/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sbx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{expanded}{it}{
- <-> alias * Junicode-TLF/x/it
+\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{scit}{
+ <-> alias * Junicode-TLF/sbx/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{x}{sc}{
- <-> \Junicode@@scale Junicode-Exp-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{expanded}{sc}{
- <-> alias * Junicode-TLF/x/sc
+\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{n}{
+ <-> alias * Junicode-TLF/sbx/n
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{sbx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{expanded}{n}{
- <-> alias * Junicode-TLF/x/n
+\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{sc}{
+ <-> alias * Junicode-TLF/sbx/sc
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{x}{scsl}{
- <-> ssub * Junicode-TLF/x/scit
+\DeclareFontShape{T1}{Junicode-TLF}{sbx}{sl}{
+ <-> ssub * Junicode-TLF/sbx/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{expanded}{scsl}{
- <-> ssub * Junicode-TLF/expanded/scit
+\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-TLF/semiboldexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{x}{sl}{
- <-> ssub * Junicode-TLF/x/it
+\DeclareFontShape{T1}{Junicode-TLF}{sbx}{scsl}{
+ <-> ssub * Junicode-TLF/sbx/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{expanded}{sl}{
- <-> ssub * Junicode-TLF/expanded/it
+\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/semiboldexpanded/scit
}{}
% ---- c = condensed ----
-\DeclareFontShape{T1}{Junicode-TLF}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{c}{sc}{
+ <-> \Junicode@@scale Junicode-Cond-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{condensed}{it}{
- <-> alias * Junicode-TLF/c/it
+\DeclareFontShape{T1}{Junicode-TLF}{condensed}{sc}{
+ <-> alias * Junicode-TLF/c/sc
}{}
\DeclareFontShape{T1}{Junicode-TLF}{c}{scit}{
@@ -688,12 +664,20 @@
<-> alias * Junicode-TLF/c/n
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{c}{sc}{
- <-> \Junicode@@scale Junicode-Cond-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{condensed}{sc}{
- <-> alias * Junicode-TLF/c/sc
+\DeclareFontShape{T1}{Junicode-TLF}{condensed}{it}{
+ <-> alias * Junicode-TLF/c/it
+}{}
+
+\DeclareFontShape{T1}{Junicode-TLF}{c}{sl}{
+ <-> ssub * Junicode-TLF/c/it
+}{}
+
+\DeclareFontShape{T1}{Junicode-TLF}{condensed}{sl}{
+ <-> ssub * Junicode-TLF/condensed/it
}{}
\DeclareFontShape{T1}{Junicode-TLF}{c}{scsl}{
@@ -704,168 +688,184 @@
<-> ssub * Junicode-TLF/condensed/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{c}{sl}{
- <-> ssub * Junicode-TLF/c/it
-}{}
-\DeclareFontShape{T1}{Junicode-TLF}{condensed}{sl}{
- <-> ssub * Junicode-TLF/condensed/it
-}{}
+% ---- mediumexpanded ----
+\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-t1
+}{}
-% ---- sx = semiexpanded ----
+\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-sc-t1
+}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sx}{sc}{
- <-> \Junicode@@scale Junicode-SmExp-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{sc}{
- <-> alias * Junicode-TLF/sx/sc
+\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-ExpMedium-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-TLF/mediumexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{n}{
- <-> alias * Junicode-TLF/sx/n
+\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{scsl}{
+ <-> ssub * Junicode-TLF/mediumexpanded/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpItalic-tlf-sc-t1
+
+% ---- lsc = lightsemicondensed ----
+
+\DeclareFontShape{T1}{Junicode-TLF}{lsc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{scit}{
- <-> alias * Junicode-TLF/sx/scit
+\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{scit}{
+ <-> alias * Junicode-TLF/lsc/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{it}{
- <-> alias * Junicode-TLF/sx/it
+\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{n}{
+ <-> alias * Junicode-TLF/lsc/n
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sx}{scsl}{
- <-> ssub * Junicode-TLF/sx/scit
+\DeclareFontShape{T1}{Junicode-TLF}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{scsl}{
- <-> ssub * Junicode-TLF/semiexpanded/scit
+\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{it}{
+ <-> alias * Junicode-TLF/lsc/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sx}{sl}{
- <-> ssub * Junicode-TLF/sx/it
+\DeclareFontShape{T1}{Junicode-TLF}{lsc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondLight-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{sl}{
- <-> ssub * Junicode-TLF/semiexpanded/it
+\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{sc}{
+ <-> alias * Junicode-TLF/lsc/sc
}{}
+\DeclareFontShape{T1}{Junicode-TLF}{lsc}{sl}{
+ <-> ssub * Junicode-TLF/lsc/it
+}{}
-% ---- mediumsemiexpanded ----
+\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-TLF/lightsemicondensed/it
+}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{lsc}{scsl}{
+ <-> ssub * Junicode-TLF/lsc/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{sc}{
- <-> \Junicode@@scale Junicode-SmExpMedium-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{scsl}{
+ <-> ssub * Junicode-TLF/lightsemicondensed/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-t1
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{Junicode-TLF}{b}{scit}{
+ <-> \Junicode@@scale Junicode-BoldItalic-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{scit}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{bold}{scit}{
+ <-> alias * Junicode-TLF/b/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{scsl}{
- <-> ssub * Junicode-TLF/mediumsemiexpanded/scit
+\DeclareFontShape{T1}{Junicode-TLF}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-TLF/mediumsemiexpanded/it
+\DeclareFontShape{T1}{Junicode-TLF}{bold}{n}{
+ <-> alias * Junicode-TLF/b/n
}{}
+\DeclareFontShape{T1}{Junicode-TLF}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-tlf-t1
+}{}
-% ---- mediumexpanded ----
+\DeclareFontShape{T1}{Junicode-TLF}{bold}{it}{
+ <-> alias * Junicode-TLF/b/it
+}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{b}{sc}{
+ <-> \Junicode@@scale Junicode-Bold-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{sc}{
- <-> \Junicode@@scale Junicode-ExpMedium-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{bold}{sc}{
+ <-> alias * Junicode-TLF/b/sc
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{b}{sl}{
+ <-> ssub * Junicode-TLF/b/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{scit}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{bold}{sl}{
+ <-> ssub * Junicode-TLF/bold/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{scsl}{
- <-> ssub * Junicode-TLF/mediumexpanded/scit
+\DeclareFontShape{T1}{Junicode-TLF}{b}{scsl}{
+ <-> ssub * Junicode-TLF/b/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{sl}{
- <-> ssub * Junicode-TLF/mediumexpanded/it
+\DeclareFontShape{T1}{Junicode-TLF}{bold}{scsl}{
+ <-> ssub * Junicode-TLF/bold/scit
}{}
-% ---- sbsx = semiboldsemiexpanded ----
+% ---- x = expanded ----
-\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{x}{scit}{
+ <-> \Junicode@@scale Junicode-ExpItalic-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{scit}{
- <-> alias * Junicode-TLF/sbsx/scit
+\DeclareFontShape{T1}{Junicode-TLF}{expanded}{scit}{
+ <-> alias * Junicode-TLF/x/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-TLF/sbsx/it
+\DeclareFontShape{T1}{Junicode-TLF}{expanded}{n}{
+ <-> alias * Junicode-TLF/x/n
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-sc-t1
+\DeclareFontShape{T1}{Junicode-TLF}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-tlf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{sc}{
- <-> alias * Junicode-TLF/sbsx/sc
+\DeclareFontShape{T1}{Junicode-TLF}{expanded}{it}{
+ <-> alias * Junicode-TLF/x/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-t1
+\DeclareFontShape{T1}{Junicode-TLF}{x}{sc}{
+ <-> \Junicode@@scale Junicode-Exp-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-TLF/sbsx/n
+\DeclareFontShape{T1}{Junicode-TLF}{expanded}{sc}{
+ <-> alias * Junicode-TLF/x/sc
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{scsl}{
- <-> ssub * Junicode-TLF/sbsx/scit
+\DeclareFontShape{T1}{Junicode-TLF}{x}{sl}{
+ <-> ssub * Junicode-TLF/x/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{scsl}{
- <-> ssub * Junicode-TLF/semiboldsemiexpanded/scit
+\DeclareFontShape{T1}{Junicode-TLF}{expanded}{sl}{
+ <-> ssub * Junicode-TLF/expanded/it
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{sl}{
- <-> ssub * Junicode-TLF/sbsx/it
+\DeclareFontShape{T1}{Junicode-TLF}{x}{scsl}{
+ <-> ssub * Junicode-TLF/x/scit
}{}
-\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-TLF/semiboldsemiexpanded/it
+\DeclareFontShape{T1}{Junicode-TLF}{expanded}{scsl}{
+ <-> ssub * Junicode-TLF/expanded/scit
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/T1Junicode-TOsF.fd b/Master/texmf-dist/tex/latex/junicode/T1Junicode-TOsF.fd
index a2fcfe44b24..18e9f6fd8bd 100644
--- a/Master/texmf-dist/tex/latex/junicode/T1Junicode-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/junicode/T1Junicode-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{T1Junicode-TOsF.fd}
- [2024/06/03 (autoinst) Font definitions for T1/Junicode-TOsF.]
+ [2024/07/21 (autoinst) Font definitions for T1/Junicode-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,852 +20,852 @@
\DeclareFontFamily{T1}{Junicode-TOsF}{}
-% ---- lsc = lightsemicondensed ----
+% ---- mediumcondensed ----
-\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{sc}{
+ <-> \Junicode@@scale Junicode-CondMedium-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{it}{
- <-> alias * Junicode-TOsF/lsc/it
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{scit}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{scit}{
- <-> alias * Junicode-TOsF/lsc/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-TOsF/mediumcondensed/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{n}{
- <-> alias * Junicode-TOsF/lsc/n
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{scsl}{
+ <-> ssub * Junicode-TOsF/mediumcondensed/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{sc}{
- <-> \Junicode@@scale Junicode-SmCondLight-tosf-sc-t1
-}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{sc}{
- <-> alias * Junicode-TOsF/lsc/sc
-}{}
+% ---- sb = semibold ----
-\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{scsl}{
- <-> ssub * Junicode-TOsF/lsc/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{sb}{sc}{
+ <-> \Junicode@@scale Junicode-SmBold-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{scsl}{
- <-> ssub * Junicode-TOsF/lightsemicondensed/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{sc}{
+ <-> alias * Junicode-TOsF/sb/sc
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{sl}{
- <-> ssub * Junicode-TOsF/lsc/it
+\DeclareFontShape{T1}{Junicode-TOsF}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-TOsF/lightsemicondensed/it
+\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{it}{
+ <-> alias * Junicode-TOsF/sb/it
}{}
+\DeclareFontShape{T1}{Junicode-TOsF}{sb}{scit}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-sc-t1
+}{}
-% ---- medium ----
+\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{scit}{
+ <-> alias * Junicode-TOsF/sb/scit
+}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{medium}{it}{
- <-> \Junicode@@scale Junicode-MediumItalic-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{medium}{scit}{
- <-> \Junicode@@scale Junicode-MediumItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{n}{
+ <-> alias * Junicode-TOsF/sb/n
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{medium}{n}{
- <-> \Junicode@@scale Junicode-Medium-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{sb}{sl}{
+ <-> ssub * Junicode-TOsF/sb/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{medium}{sc}{
- <-> \Junicode@@scale Junicode-Medium-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{sl}{
+ <-> ssub * Junicode-TOsF/semibold/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{medium}{scsl}{
- <-> ssub * Junicode-TOsF/medium/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{sb}{scsl}{
+ <-> ssub * Junicode-TOsF/sb/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{medium}{sl}{
- <-> ssub * Junicode-TOsF/medium/it
+\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{scsl}{
+ <-> ssub * Junicode-TOsF/semibold/scit
}{}
-% ---- m = regular ----
+% ---- sc = semicondensed ----
-\DeclareFontShape{T1}{Junicode-TOsF}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{sc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{regular}{it}{
- <-> alias * Junicode-TOsF/m/it
+\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{it}{
+ <-> alias * Junicode-TOsF/sc/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{m}{scit}{
- <-> \Junicode@@scale Junicode-Italic-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{regular}{scit}{
- <-> alias * Junicode-TOsF/m/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{n}{
+ <-> alias * Junicode-TOsF/sc/n
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{sc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{regular}{n}{
- <-> alias * Junicode-TOsF/m/n
+\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{scit}{
+ <-> alias * Junicode-TOsF/sc/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{m}{sc}{
- <-> \Junicode@@scale Junicode-Regular-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{sc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCond-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{regular}{sc}{
- <-> alias * Junicode-TOsF/m/sc
+\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{sc}{
+ <-> alias * Junicode-TOsF/sc/sc
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{m}{scsl}{
- <-> ssub * Junicode-TOsF/m/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{sc}{sl}{
+ <-> ssub * Junicode-TOsF/sc/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{regular}{scsl}{
- <-> ssub * Junicode-TOsF/regular/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{sl}{
+ <-> ssub * Junicode-TOsF/semicondensed/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{m}{sl}{
- <-> ssub * Junicode-TOsF/m/it
+\DeclareFontShape{T1}{Junicode-TOsF}{sc}{scsl}{
+ <-> ssub * Junicode-TOsF/sc/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{regular}{sl}{
- <-> ssub * Junicode-TOsF/regular/it
+\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{scsl}{
+ <-> ssub * Junicode-TOsF/semicondensed/scit
}{}
-% ---- bx = boldexpanded ----
+% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{T1}{Junicode-TOsF}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpBold-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{n}{
- <-> alias * Junicode-TOsF/bx/n
+\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{sc}{
+ <-> alias * Junicode-TOsF/bsx/sc
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{bx}{sc}{
- <-> \Junicode@@scale Junicode-ExpBold-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{sc}{
- <-> alias * Junicode-TOsF/bx/sc
+\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{scit}{
+ <-> alias * Junicode-TOsF/bsx/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{it}{
- <-> alias * Junicode-TOsF/bx/it
+\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-TOsF/bsx/n
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{bx}{scit}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{scit}{
- <-> alias * Junicode-TOsF/bx/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-TOsF/bsx/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{bx}{scsl}{
- <-> ssub * Junicode-TOsF/bx/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{sl}{
+ <-> ssub * Junicode-TOsF/bsx/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/boldexpanded/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/boldsemiexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{bx}{sl}{
- <-> ssub * Junicode-TOsF/bx/it
+\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{scsl}{
+ <-> ssub * Junicode-TOsF/bsx/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{sl}{
- <-> ssub * Junicode-TOsF/boldexpanded/it
+\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/boldsemiexpanded/scit
}{}
-% ---- l = light ----
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{T1}{Junicode-TOsF}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{light}{n}{
- <-> alias * Junicode-TOsF/l/n
+\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{sc}{
+ <-> alias * Junicode-TOsF/sbsx/sc
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{l}{sc}{
- <-> \Junicode@@scale Junicode-Light-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{light}{sc}{
- <-> alias * Junicode-TOsF/l/sc
+\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-TOsF/sbsx/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{light}{it}{
- <-> alias * Junicode-TOsF/l/it
+\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-TOsF/sbsx/n
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{l}{scit}{
- <-> \Junicode@@scale Junicode-LightItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{light}{scit}{
- <-> alias * Junicode-TOsF/l/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{scit}{
+ <-> alias * Junicode-TOsF/sbsx/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{l}{scsl}{
- <-> ssub * Junicode-TOsF/l/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{sl}{
+ <-> ssub * Junicode-TOsF/sbsx/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{light}{scsl}{
- <-> ssub * Junicode-TOsF/light/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/semiboldsemiexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{l}{sl}{
- <-> ssub * Junicode-TOsF/l/it
+\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{scsl}{
+ <-> ssub * Junicode-TOsF/sbsx/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{light}{sl}{
- <-> ssub * Junicode-TOsF/light/it
+\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/semiboldsemiexpanded/scit
}{}
-% ---- mediumsemiexpanded ----
+% ---- medium ----
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{medium}{sc}{
+ <-> \Junicode@@scale Junicode-Medium-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{scit}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{medium}{it}{
+ <-> \Junicode@@scale Junicode-MediumItalic-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{medium}{n}{
+ <-> \Junicode@@scale Junicode-Medium-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{sc}{
- <-> \Junicode@@scale Junicode-SmExpMedium-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{medium}{scit}{
+ <-> \Junicode@@scale Junicode-MediumItalic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/mediumsemiexpanded/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{medium}{sl}{
+ <-> ssub * Junicode-TOsF/medium/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-TOsF/mediumsemiexpanded/it
+\DeclareFontShape{T1}{Junicode-TOsF}{medium}{scsl}{
+ <-> ssub * Junicode-TOsF/medium/scit
}{}
-% ---- sbsx = semiboldsemiexpanded ----
+% ---- bx = boldexpanded ----
-\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{bx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpBold-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{sc}{
- <-> alias * Junicode-TOsF/sbsx/sc
+\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{sc}{
+ <-> alias * Junicode-TOsF/bx/sc
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{bx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-TOsF/sbsx/n
+\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{scit}{
+ <-> alias * Junicode-TOsF/bx/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{scit}{
- <-> alias * Junicode-TOsF/sbsx/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{n}{
+ <-> alias * Junicode-TOsF/bx/n
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-TOsF/sbsx/it
+\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{it}{
+ <-> alias * Junicode-TOsF/bx/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{scsl}{
- <-> ssub * Junicode-TOsF/sbsx/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{bx}{sl}{
+ <-> ssub * Junicode-TOsF/bx/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/semiboldsemiexpanded/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/boldexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{sl}{
- <-> ssub * Junicode-TOsF/sbsx/it
+\DeclareFontShape{T1}{Junicode-TOsF}{bx}{scsl}{
+ <-> ssub * Junicode-TOsF/bx/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-TOsF/semiboldsemiexpanded/it
+\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/boldexpanded/scit
}{}
-% ---- mediumexpanded ----
+% ---- m = regular ----
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{m}{sc}{
+ <-> \Junicode@@scale Junicode-Regular-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{scit}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{regular}{sc}{
+ <-> alias * Junicode-TOsF/m/sc
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{sc}{
- <-> \Junicode@@scale Junicode-ExpMedium-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{regular}{it}{
+ <-> alias * Junicode-TOsF/m/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/mediumexpanded/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{sl}{
- <-> ssub * Junicode-TOsF/mediumexpanded/it
+\DeclareFontShape{T1}{Junicode-TOsF}{regular}{n}{
+ <-> alias * Junicode-TOsF/m/n
}{}
-
-% ---- sx = semiexpanded ----
-
-\DeclareFontShape{T1}{Junicode-TOsF}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{m}{scit}{
+ <-> \Junicode@@scale Junicode-Italic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{n}{
- <-> alias * Junicode-TOsF/sx/n
+\DeclareFontShape{T1}{Junicode-TOsF}{regular}{scit}{
+ <-> alias * Junicode-TOsF/m/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sx}{sc}{
- <-> \Junicode@@scale Junicode-SmExp-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{m}{sl}{
+ <-> ssub * Junicode-TOsF/m/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{sc}{
- <-> alias * Junicode-TOsF/sx/sc
+\DeclareFontShape{T1}{Junicode-TOsF}{regular}{sl}{
+ <-> ssub * Junicode-TOsF/regular/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{m}{scsl}{
+ <-> ssub * Junicode-TOsF/m/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{it}{
- <-> alias * Junicode-TOsF/sx/it
+\DeclareFontShape{T1}{Junicode-TOsF}{regular}{scsl}{
+ <-> ssub * Junicode-TOsF/regular/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpItalic-tosf-sc-t1
-}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{scit}{
- <-> alias * Junicode-TOsF/sx/scit
-}{}
+% ---- mediumsemiexpanded ----
-\DeclareFontShape{T1}{Junicode-TOsF}{sx}{scsl}{
- <-> ssub * Junicode-TOsF/sx/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/semiexpanded/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sx}{sl}{
- <-> ssub * Junicode-TOsF/sx/it
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{sl}{
- <-> ssub * Junicode-TOsF/semiexpanded/it
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-tosf-sc-t1
}{}
-
-% ---- x = expanded ----
-
-\DeclareFontShape{T1}{Junicode-TOsF}{x}{scit}{
- <-> \Junicode@@scale Junicode-ExpItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/mediumsemiexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{scit}{
- <-> alias * Junicode-TOsF/x/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/mediumsemiexpanded/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-tosf-t1
-}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{it}{
- <-> alias * Junicode-TOsF/x/it
-}{}
+% ---- lc = lightcondensed ----
-\DeclareFontShape{T1}{Junicode-TOsF}{x}{sc}{
- <-> \Junicode@@scale Junicode-Exp-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{sc}{
- <-> alias * Junicode-TOsF/x/sc
+\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{it}{
+ <-> alias * Junicode-TOsF/lc/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{lc}{scit}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{n}{
- <-> alias * Junicode-TOsF/x/n
+\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{scit}{
+ <-> alias * Junicode-TOsF/lc/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{x}{scsl}{
- <-> ssub * Junicode-TOsF/x/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{scsl}{
- <-> ssub * Junicode-TOsF/expanded/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{n}{
+ <-> alias * Junicode-TOsF/lc/n
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{x}{sl}{
- <-> ssub * Junicode-TOsF/x/it
+\DeclareFontShape{T1}{Junicode-TOsF}{lc}{sc}{
+ <-> \Junicode@@scale Junicode-CondLight-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{sl}{
- <-> ssub * Junicode-TOsF/expanded/it
+\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{sc}{
+ <-> alias * Junicode-TOsF/lc/sc
}{}
-
-% ---- c = condensed ----
-
-\DeclareFontShape{T1}{Junicode-TOsF}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{lc}{sl}{
+ <-> ssub * Junicode-TOsF/lc/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{n}{
- <-> alias * Junicode-TOsF/c/n
+\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{sl}{
+ <-> ssub * Junicode-TOsF/lightcondensed/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{c}{sc}{
- <-> \Junicode@@scale Junicode-Cond-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{lc}{scsl}{
+ <-> ssub * Junicode-TOsF/lc/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{sc}{
- <-> alias * Junicode-TOsF/c/sc
+\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{scsl}{
+ <-> ssub * Junicode-TOsF/lightcondensed/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-tosf-t1
-}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{it}{
- <-> alias * Junicode-TOsF/c/it
-}{}
+% ---- mediumsemicondensed ----
-\DeclareFontShape{T1}{Junicode-TOsF}{c}{scit}{
- <-> \Junicode@@scale Junicode-CondItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{scit}{
- <-> alias * Junicode-TOsF/c/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{c}{scsl}{
- <-> ssub * Junicode-TOsF/c/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{scsl}{
- <-> ssub * Junicode-TOsF/condensed/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{c}{sl}{
- <-> ssub * Junicode-TOsF/c/it
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-TOsF/mediumsemicondensed/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{sl}{
- <-> ssub * Junicode-TOsF/condensed/it
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{scsl}{
+ <-> ssub * Junicode-TOsF/mediumsemicondensed/scit
}{}
-% ---- sc = semicondensed ----
+% ---- l = light ----
-\DeclareFontShape{T1}{Junicode-TOsF}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{n}{
- <-> alias * Junicode-TOsF/sc/n
+\DeclareFontShape{T1}{Junicode-TOsF}{light}{n}{
+ <-> alias * Junicode-TOsF/l/n
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sc}{sc}{
- <-> \Junicode@@scale Junicode-SmCond-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{l}{scit}{
+ <-> \Junicode@@scale Junicode-LightItalic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{sc}{
- <-> alias * Junicode-TOsF/sc/sc
+\DeclareFontShape{T1}{Junicode-TOsF}{light}{scit}{
+ <-> alias * Junicode-TOsF/l/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sc}{it}{
- <-> \Junicode@@scale Junicode-SmCondItalic-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{it}{
- <-> alias * Junicode-TOsF/sc/it
+\DeclareFontShape{T1}{Junicode-TOsF}{light}{it}{
+ <-> alias * Junicode-TOsF/l/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sc}{scit}{
- <-> \Junicode@@scale Junicode-SmCondItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{l}{sc}{
+ <-> \Junicode@@scale Junicode-Light-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{scit}{
- <-> alias * Junicode-TOsF/sc/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{light}{sc}{
+ <-> alias * Junicode-TOsF/l/sc
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sc}{scsl}{
- <-> ssub * Junicode-TOsF/sc/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{l}{sl}{
+ <-> ssub * Junicode-TOsF/l/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{scsl}{
- <-> ssub * Junicode-TOsF/semicondensed/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{light}{sl}{
+ <-> ssub * Junicode-TOsF/light/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sc}{sl}{
- <-> ssub * Junicode-TOsF/sc/it
+\DeclareFontShape{T1}{Junicode-TOsF}{l}{scsl}{
+ <-> ssub * Junicode-TOsF/l/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{sl}{
- <-> ssub * Junicode-TOsF/semicondensed/it
+\DeclareFontShape{T1}{Junicode-TOsF}{light}{scsl}{
+ <-> ssub * Junicode-TOsF/light/scit
}{}
-% ---- sb = semibold ----
+% ---- sx = semiexpanded ----
-\DeclareFontShape{T1}{Junicode-TOsF}{sb}{scit}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{scit}{
- <-> alias * Junicode-TOsF/sb/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{it}{
+ <-> alias * Junicode-TOsF/sx/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{it}{
- <-> alias * Junicode-TOsF/sb/it
+\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{n}{
+ <-> alias * Junicode-TOsF/sx/n
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sb}{sc}{
- <-> \Junicode@@scale Junicode-SmBold-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{sx}{scit}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{sc}{
- <-> alias * Junicode-TOsF/sb/sc
+\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{scit}{
+ <-> alias * Junicode-TOsF/sx/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{sx}{sc}{
+ <-> \Junicode@@scale Junicode-SmExp-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{n}{
- <-> alias * Junicode-TOsF/sb/n
+\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{sc}{
+ <-> alias * Junicode-TOsF/sx/sc
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sb}{scsl}{
- <-> ssub * Junicode-TOsF/sb/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{sx}{sl}{
+ <-> ssub * Junicode-TOsF/sx/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{scsl}{
- <-> ssub * Junicode-TOsF/semibold/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/semiexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sb}{sl}{
- <-> ssub * Junicode-TOsF/sb/it
+\DeclareFontShape{T1}{Junicode-TOsF}{sx}{scsl}{
+ <-> ssub * Junicode-TOsF/sx/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{sl}{
- <-> ssub * Junicode-TOsF/semibold/it
+\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/semiexpanded/scit
}{}
-% ---- bsx = boldsemiexpanded ----
+% ---- b = bold ----
-\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{b}{sc}{
+ <-> \Junicode@@scale Junicode-Bold-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{it}{
- <-> alias * Junicode-TOsF/bsx/it
+\DeclareFontShape{T1}{Junicode-TOsF}{bold}{sc}{
+ <-> alias * Junicode-TOsF/b/sc
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{scit}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{b}{scit}{
+ <-> \Junicode@@scale Junicode-BoldItalic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{scit}{
- <-> alias * Junicode-TOsF/bsx/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{bold}{scit}{
+ <-> alias * Junicode-TOsF/b/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{n}{
- <-> alias * Junicode-TOsF/bsx/n
+\DeclareFontShape{T1}{Junicode-TOsF}{bold}{n}{
+ <-> alias * Junicode-TOsF/b/n
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{sc}{
- <-> \Junicode@@scale Junicode-SmExpBold-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{sc}{
- <-> alias * Junicode-TOsF/bsx/sc
+\DeclareFontShape{T1}{Junicode-TOsF}{bold}{it}{
+ <-> alias * Junicode-TOsF/b/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{scsl}{
- <-> ssub * Junicode-TOsF/bsx/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{b}{sl}{
+ <-> ssub * Junicode-TOsF/b/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/boldsemiexpanded/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{bold}{sl}{
+ <-> ssub * Junicode-TOsF/bold/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{sl}{
- <-> ssub * Junicode-TOsF/bsx/it
+\DeclareFontShape{T1}{Junicode-TOsF}{b}{scsl}{
+ <-> ssub * Junicode-TOsF/b/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-TOsF/boldsemiexpanded/it
+\DeclareFontShape{T1}{Junicode-TOsF}{bold}{scsl}{
+ <-> ssub * Junicode-TOsF/bold/scit
}{}
-% ---- lc = lightcondensed ----
+% ---- x = expanded ----
-\DeclareFontShape{T1}{Junicode-TOsF}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{n}{
- <-> alias * Junicode-TOsF/lc/n
+\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{it}{
+ <-> alias * Junicode-TOsF/x/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{lc}{sc}{
- <-> \Junicode@@scale Junicode-CondLight-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{sc}{
- <-> alias * Junicode-TOsF/lc/sc
+\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{n}{
+ <-> alias * Junicode-TOsF/x/n
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{x}{scit}{
+ <-> \Junicode@@scale Junicode-ExpItalic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{it}{
- <-> alias * Junicode-TOsF/lc/it
+\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{scit}{
+ <-> alias * Junicode-TOsF/x/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{lc}{scit}{
- <-> \Junicode@@scale Junicode-CondLightItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{x}{sc}{
+ <-> \Junicode@@scale Junicode-Exp-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{scit}{
- <-> alias * Junicode-TOsF/lc/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{sc}{
+ <-> alias * Junicode-TOsF/x/sc
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{lc}{scsl}{
- <-> ssub * Junicode-TOsF/lc/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{x}{sl}{
+ <-> ssub * Junicode-TOsF/x/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{scsl}{
- <-> ssub * Junicode-TOsF/lightcondensed/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{sl}{
+ <-> ssub * Junicode-TOsF/expanded/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{lc}{sl}{
- <-> ssub * Junicode-TOsF/lc/it
+\DeclareFontShape{T1}{Junicode-TOsF}{x}{scsl}{
+ <-> ssub * Junicode-TOsF/x/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{sl}{
- <-> ssub * Junicode-TOsF/lightcondensed/it
+\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{scsl}{
+ <-> ssub * Junicode-TOsF/expanded/scit
}{}
-% ---- sbx = semiboldexpanded ----
+% ---- lsc = lightsemicondensed ----
-\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{sc}{
+ <-> \Junicode@@scale Junicode-SmCondLight-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{n}{
- <-> alias * Junicode-TOsF/sbx/n
+\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{sc}{
+ <-> alias * Junicode-TOsF/lsc/sc
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{sc}{
- <-> \Junicode@@scale Junicode-ExpSmBold-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{sc}{
- <-> alias * Junicode-TOsF/sbx/sc
+\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{n}{
+ <-> alias * Junicode-TOsF/lsc/n
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{scit}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{it}{
- <-> alias * Junicode-TOsF/sbx/it
+\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{scit}{
+ <-> alias * Junicode-TOsF/lsc/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{scit}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{scit}{
- <-> alias * Junicode-TOsF/sbx/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{it}{
+ <-> alias * Junicode-TOsF/lsc/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{scsl}{
- <-> ssub * Junicode-TOsF/sbx/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{sl}{
+ <-> ssub * Junicode-TOsF/lsc/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{scsl}{
- <-> ssub * Junicode-TOsF/semiboldexpanded/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-TOsF/lightsemicondensed/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{sl}{
- <-> ssub * Junicode-TOsF/sbx/it
+\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{scsl}{
+ <-> ssub * Junicode-TOsF/lsc/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-TOsF/semiboldexpanded/it
+\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{scsl}{
+ <-> ssub * Junicode-TOsF/lightsemicondensed/scit
}{}
-% ---- mediumsemicondensed ----
+% ---- mediumexpanded ----
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{sc}{
- <-> \Junicode@@scale Junicode-SmCondMedium-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{scit}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{scit}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{sc}{
+ <-> \Junicode@@scale Junicode-ExpMedium-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{scsl}{
- <-> ssub * Junicode-TOsF/mediumsemicondensed/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/mediumexpanded/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-TOsF/mediumsemicondensed/it
+\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/mediumexpanded/scit
}{}
-% ---- mediumcondensed ----
+% ---- c = condensed ----
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{scit}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{it}{
+ <-> alias * Junicode-TOsF/c/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{c}{scit}{
+ <-> \Junicode@@scale Junicode-CondItalic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{sc}{
- <-> \Junicode@@scale Junicode-CondMedium-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{scit}{
+ <-> alias * Junicode-TOsF/c/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{scsl}{
- <-> ssub * Junicode-TOsF/mediumcondensed/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{sl}{
- <-> ssub * Junicode-TOsF/mediumcondensed/it
+\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{n}{
+ <-> alias * Junicode-TOsF/c/n
}{}
+\DeclareFontShape{T1}{Junicode-TOsF}{c}{sc}{
+ <-> \Junicode@@scale Junicode-Cond-tosf-sc-t1
+}{}
-% ---- b = bold ----
+\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{sc}{
+ <-> alias * Junicode-TOsF/c/sc
+}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-tosf-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{c}{sl}{
+ <-> ssub * Junicode-TOsF/c/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{bold}{n}{
- <-> alias * Junicode-TOsF/b/n
+\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{sl}{
+ <-> ssub * Junicode-TOsF/condensed/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{b}{sc}{
- <-> \Junicode@@scale Junicode-Bold-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{c}{scsl}{
+ <-> ssub * Junicode-TOsF/c/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{bold}{sc}{
- <-> alias * Junicode-TOsF/b/sc
+\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{scsl}{
+ <-> ssub * Junicode-TOsF/condensed/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-tosf-t1
+
+% ---- sbx = semiboldexpanded ----
+
+\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{bold}{it}{
- <-> alias * Junicode-TOsF/b/it
+\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{it}{
+ <-> alias * Junicode-TOsF/sbx/it
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{b}{scit}{
- <-> \Junicode@@scale Junicode-BoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{scit}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{bold}{scit}{
- <-> alias * Junicode-TOsF/b/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{scit}{
+ <-> alias * Junicode-TOsF/sbx/scit
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{b}{scsl}{
- <-> ssub * Junicode-TOsF/b/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-tosf-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{bold}{scsl}{
- <-> ssub * Junicode-TOsF/bold/scit
+\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{n}{
+ <-> alias * Junicode-TOsF/sbx/n
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{b}{sl}{
- <-> ssub * Junicode-TOsF/b/it
+\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{sc}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{Junicode-TOsF}{bold}{sl}{
- <-> ssub * Junicode-TOsF/bold/it
+\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{sc}{
+ <-> alias * Junicode-TOsF/sbx/sc
+}{}
+
+\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{sl}{
+ <-> ssub * Junicode-TOsF/sbx/it
+}{}
+
+\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/semiboldexpanded/it
+}{}
+
+\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{scsl}{
+ <-> ssub * Junicode-TOsF/sbx/scit
+}{}
+
+\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{scsl}{
+ <-> ssub * Junicode-TOsF/semiboldexpanded/scit
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/TS1Junicode-LF.fd b/Master/texmf-dist/tex/latex/junicode/TS1Junicode-LF.fd
index 1e3cb0a31c4..80b213adcbd 100644
--- a/Master/texmf-dist/tex/latex/junicode/TS1Junicode-LF.fd
+++ b/Master/texmf-dist/tex/latex/junicode/TS1Junicode-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{TS1Junicode-LF.fd}
- [2024/06/03 (autoinst) Font definitions for TS1/Junicode-LF.]
+ [2024/07/21 (autoinst) Font definitions for TS1/Junicode-LF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,89 +20,70 @@
\DeclareFontFamily{TS1}{Junicode-LF}{}
-% ---- l = light ----
+% ---- sbx = semiboldexpanded ----
-\DeclareFontShape{TS1}{Junicode-LF}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{light}{n}{
- <-> alias * Junicode-LF/l/n
+\DeclareFontShape{TS1}{Junicode-LF}{semiboldexpanded}{it}{
+ <-> alias * Junicode-LF/sbx/it
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{light}{it}{
- <-> alias * Junicode-LF/l/it
+\DeclareFontShape{TS1}{Junicode-LF}{semiboldexpanded}{n}{
+ <-> alias * Junicode-LF/sbx/n
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{l}{sl}{
- <-> ssub * Junicode-LF/l/it
+\DeclareFontShape{TS1}{Junicode-LF}{sbx}{sl}{
+ <-> ssub * Junicode-LF/sbx/it
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{light}{sl}{
- <-> ssub * Junicode-LF/light/it
+\DeclareFontShape{TS1}{Junicode-LF}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-LF/semiboldexpanded/it
}{}
-% ---- bx = boldexpanded ----
-
-\DeclareFontShape{TS1}{Junicode-LF}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Junicode-LF}{boldexpanded}{it}{
- <-> alias * Junicode-LF/bx/it
-}{}
+% ---- c = condensed ----
-\DeclareFontShape{TS1}{Junicode-LF}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{boldexpanded}{n}{
- <-> alias * Junicode-LF/bx/n
+\DeclareFontShape{TS1}{Junicode-LF}{condensed}{it}{
+ <-> alias * Junicode-LF/c/it
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{bx}{sl}{
- <-> ssub * Junicode-LF/bx/it
+\DeclareFontShape{TS1}{Junicode-LF}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{boldexpanded}{sl}{
- <-> ssub * Junicode-LF/boldexpanded/it
+\DeclareFontShape{TS1}{Junicode-LF}{condensed}{n}{
+ <-> alias * Junicode-LF/c/n
}{}
-
-% ---- m = regular ----
-
-\DeclareFontShape{TS1}{Junicode-LF}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{c}{sl}{
+ <-> ssub * Junicode-LF/c/it
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{regular}{it}{
- <-> alias * Junicode-LF/m/it
+\DeclareFontShape{TS1}{Junicode-LF}{condensed}{sl}{
+ <-> ssub * Junicode-LF/condensed/it
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-lf-ts1
-}{}
-\DeclareFontShape{TS1}{Junicode-LF}{regular}{n}{
- <-> alias * Junicode-LF/m/n
-}{}
+% ---- lsc = lightsemicondensed ----
-\DeclareFontShape{TS1}{Junicode-LF}{m}{sl}{
- <-> ssub * Junicode-LF/m/it
+\DeclareFontShape{TS1}{Junicode-LF}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{regular}{sl}{
- <-> ssub * Junicode-LF/regular/it
+\DeclareFontShape{TS1}{Junicode-LF}{lightsemicondensed}{it}{
+ <-> alias * Junicode-LF/lsc/it
}{}
-
-% ---- lsc = lightsemicondensed ----
-
\DeclareFontShape{TS1}{Junicode-LF}{lsc}{n}{
<-> \Junicode@@scale Junicode-SmCondLight-lf-ts1
}{}
@@ -111,14 +92,6 @@
<-> alias * Junicode-LF/lsc/n
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Junicode-LF}{lightsemicondensed}{it}{
- <-> alias * Junicode-LF/lsc/it
-}{}
-
\DeclareFontShape{TS1}{Junicode-LF}{lsc}{sl}{
<-> ssub * Junicode-LF/lsc/it
}{}
@@ -128,58 +101,50 @@
}{}
-% ---- medium ----
+% ---- mediumexpanded ----
-\DeclareFontShape{TS1}{Junicode-LF}{medium}{it}{
- <-> \Junicode@@scale Junicode-MediumItalic-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{medium}{n}{
- <-> \Junicode@@scale Junicode-Medium-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{medium}{sl}{
- <-> ssub * Junicode-LF/medium/it
+\DeclareFontShape{TS1}{Junicode-LF}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-LF/mediumexpanded/it
}{}
-% ---- sx = semiexpanded ----
+% ---- b = bold ----
-\DeclareFontShape{TS1}{Junicode-LF}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{semiexpanded}{it}{
- <-> alias * Junicode-LF/sx/it
+\DeclareFontShape{TS1}{Junicode-LF}{bold}{it}{
+ <-> alias * Junicode-LF/b/it
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{semiexpanded}{n}{
- <-> alias * Junicode-LF/sx/n
+\DeclareFontShape{TS1}{Junicode-LF}{bold}{n}{
+ <-> alias * Junicode-LF/b/n
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{sx}{sl}{
- <-> ssub * Junicode-LF/sx/it
+\DeclareFontShape{TS1}{Junicode-LF}{b}{sl}{
+ <-> ssub * Junicode-LF/b/it
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{semiexpanded}{sl}{
- <-> ssub * Junicode-LF/semiexpanded/it
+\DeclareFontShape{TS1}{Junicode-LF}{bold}{sl}{
+ <-> ssub * Junicode-LF/bold/it
}{}
% ---- x = expanded ----
-\DeclareFontShape{TS1}{Junicode-LF}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Junicode-LF}{expanded}{n}{
- <-> alias * Junicode-LF/x/n
-}{}
-
\DeclareFontShape{TS1}{Junicode-LF}{x}{it}{
<-> \Junicode@@scale Junicode-ExpItalic-lf-ts1
}{}
@@ -188,6 +153,14 @@
<-> alias * Junicode-LF/x/it
}{}
+\DeclareFontShape{TS1}{Junicode-LF}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Junicode-LF}{expanded}{n}{
+ <-> alias * Junicode-LF/x/n
+}{}
+
\DeclareFontShape{TS1}{Junicode-LF}{x}{sl}{
<-> ssub * Junicode-LF/x/it
}{}
@@ -197,156 +170,156 @@
}{}
-% ---- c = condensed ----
-
-\DeclareFontShape{TS1}{Junicode-LF}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Junicode-LF}{condensed}{n}{
- <-> alias * Junicode-LF/c/n
-}{}
-
-\DeclareFontShape{TS1}{Junicode-LF}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-lf-ts1
-}{}
+% ---- mediumsemicondensed ----
-\DeclareFontShape{TS1}{Junicode-LF}{condensed}{it}{
- <-> alias * Junicode-LF/c/it
+\DeclareFontShape{TS1}{Junicode-LF}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{c}{sl}{
- <-> ssub * Junicode-LF/c/it
+\DeclareFontShape{TS1}{Junicode-LF}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{condensed}{sl}{
- <-> ssub * Junicode-LF/condensed/it
+\DeclareFontShape{TS1}{Junicode-LF}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-LF/mediumsemicondensed/it
}{}
-% ---- sbsx = semiboldsemiexpanded ----
+% ---- l = light ----
-\DeclareFontShape{TS1}{Junicode-LF}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-LF/sbsx/n
+\DeclareFontShape{TS1}{Junicode-LF}{light}{n}{
+ <-> alias * Junicode-LF/l/n
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-LF/sbsx/it
+\DeclareFontShape{TS1}{Junicode-LF}{light}{it}{
+ <-> alias * Junicode-LF/l/it
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{sbsx}{sl}{
- <-> ssub * Junicode-LF/sbsx/it
+\DeclareFontShape{TS1}{Junicode-LF}{l}{sl}{
+ <-> ssub * Junicode-LF/l/it
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-LF/semiboldsemiexpanded/it
+\DeclareFontShape{TS1}{Junicode-LF}{light}{sl}{
+ <-> ssub * Junicode-LF/light/it
}{}
-% ---- mediumexpanded ----
+% ---- sx = semiexpanded ----
-\DeclareFontShape{TS1}{Junicode-LF}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{semiexpanded}{it}{
+ <-> alias * Junicode-LF/sx/it
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{mediumexpanded}{sl}{
- <-> ssub * Junicode-LF/mediumexpanded/it
+\DeclareFontShape{TS1}{Junicode-LF}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-lf-ts1
}{}
-
-% ---- mediumsemiexpanded ----
-
-\DeclareFontShape{TS1}{Junicode-LF}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{semiexpanded}{n}{
+ <-> alias * Junicode-LF/sx/n
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{sx}{sl}{
+ <-> ssub * Junicode-LF/sx/it
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-LF/mediumsemiexpanded/it
+\DeclareFontShape{TS1}{Junicode-LF}{semiexpanded}{sl}{
+ <-> ssub * Junicode-LF/semiexpanded/it
}{}
-% ---- mediumsemicondensed ----
+% ---- medium ----
-\DeclareFontShape{TS1}{Junicode-LF}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{medium}{it}{
+ <-> \Junicode@@scale Junicode-MediumItalic-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{medium}{n}{
+ <-> \Junicode@@scale Junicode-Medium-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-LF/mediumsemicondensed/it
+\DeclareFontShape{TS1}{Junicode-LF}{medium}{sl}{
+ <-> ssub * Junicode-LF/medium/it
}{}
-% ---- sbx = semiboldexpanded ----
+% ---- bx = boldexpanded ----
-\DeclareFontShape{TS1}{Junicode-LF}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{semiboldexpanded}{it}{
- <-> alias * Junicode-LF/sbx/it
+\DeclareFontShape{TS1}{Junicode-LF}{boldexpanded}{it}{
+ <-> alias * Junicode-LF/bx/it
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{semiboldexpanded}{n}{
- <-> alias * Junicode-LF/sbx/n
+\DeclareFontShape{TS1}{Junicode-LF}{boldexpanded}{n}{
+ <-> alias * Junicode-LF/bx/n
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{sbx}{sl}{
- <-> ssub * Junicode-LF/sbx/it
+\DeclareFontShape{TS1}{Junicode-LF}{bx}{sl}{
+ <-> ssub * Junicode-LF/bx/it
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-LF/semiboldexpanded/it
+\DeclareFontShape{TS1}{Junicode-LF}{boldexpanded}{sl}{
+ <-> ssub * Junicode-LF/boldexpanded/it
}{}
-% ---- bsx = boldsemiexpanded ----
+% ---- m = regular ----
-\DeclareFontShape{TS1}{Junicode-LF}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{boldsemiexpanded}{n}{
- <-> alias * Junicode-LF/bsx/n
+\DeclareFontShape{TS1}{Junicode-LF}{regular}{n}{
+ <-> alias * Junicode-LF/m/n
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{boldsemiexpanded}{it}{
- <-> alias * Junicode-LF/bsx/it
+\DeclareFontShape{TS1}{Junicode-LF}{regular}{it}{
+ <-> alias * Junicode-LF/m/it
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{bsx}{sl}{
- <-> ssub * Junicode-LF/bsx/it
+\DeclareFontShape{TS1}{Junicode-LF}{m}{sl}{
+ <-> ssub * Junicode-LF/m/it
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-LF/boldsemiexpanded/it
+\DeclareFontShape{TS1}{Junicode-LF}{regular}{sl}{
+ <-> ssub * Junicode-LF/regular/it
+}{}
+
+
+% ---- mediumsemiexpanded ----
+
+\DeclareFontShape{TS1}{Junicode-LF}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Junicode-LF}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Junicode-LF}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-LF/mediumsemiexpanded/it
}{}
@@ -404,75 +377,102 @@
}{}
-% ---- sb = semibold ----
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{TS1}{Junicode-LF}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{semibold}{it}{
- <-> alias * Junicode-LF/sb/it
+\DeclareFontShape{TS1}{Junicode-LF}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-LF/sbsx/n
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{semibold}{n}{
- <-> alias * Junicode-LF/sb/n
+\DeclareFontShape{TS1}{Junicode-LF}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-LF/sbsx/it
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{sb}{sl}{
- <-> ssub * Junicode-LF/sb/it
+\DeclareFontShape{TS1}{Junicode-LF}{sbsx}{sl}{
+ <-> ssub * Junicode-LF/sbsx/it
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{semibold}{sl}{
- <-> ssub * Junicode-LF/semibold/it
+\DeclareFontShape{TS1}{Junicode-LF}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-LF/semiboldsemiexpanded/it
}{}
-% ---- b = bold ----
+% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{TS1}{Junicode-LF}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{bold}{n}{
- <-> alias * Junicode-LF/b/n
+\DeclareFontShape{TS1}{Junicode-LF}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-LF/bsx/n
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-lf-ts1
+\DeclareFontShape{TS1}{Junicode-LF}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{bold}{it}{
- <-> alias * Junicode-LF/b/it
+\DeclareFontShape{TS1}{Junicode-LF}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-LF/bsx/it
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{b}{sl}{
- <-> ssub * Junicode-LF/b/it
+\DeclareFontShape{TS1}{Junicode-LF}{bsx}{sl}{
+ <-> ssub * Junicode-LF/bsx/it
}{}
-\DeclareFontShape{TS1}{Junicode-LF}{bold}{sl}{
- <-> ssub * Junicode-LF/bold/it
+\DeclareFontShape{TS1}{Junicode-LF}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-LF/boldsemiexpanded/it
}{}
% ---- mediumcondensed ----
-\DeclareFontShape{TS1}{Junicode-LF}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-lf-ts1
-}{}
-
\DeclareFontShape{TS1}{Junicode-LF}{mediumcondensed}{it}{
<-> \Junicode@@scale Junicode-CondMediumItalic-lf-ts1
}{}
+\DeclareFontShape{TS1}{Junicode-LF}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-lf-ts1
+}{}
+
\DeclareFontShape{TS1}{Junicode-LF}{mediumcondensed}{sl}{
<-> ssub * Junicode-LF/mediumcondensed/it
}{}
+% ---- sb = semibold ----
+
+\DeclareFontShape{TS1}{Junicode-LF}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Junicode-LF}{semibold}{n}{
+ <-> alias * Junicode-LF/sb/n
+}{}
+
+\DeclareFontShape{TS1}{Junicode-LF}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Junicode-LF}{semibold}{it}{
+ <-> alias * Junicode-LF/sb/it
+}{}
+
+\DeclareFontShape{TS1}{Junicode-LF}{sb}{sl}{
+ <-> ssub * Junicode-LF/sb/it
+}{}
+
+\DeclareFontShape{TS1}{Junicode-LF}{semibold}{sl}{
+ <-> ssub * Junicode-LF/semibold/it
+}{}
+
+
% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
\endinput
diff --git a/Master/texmf-dist/tex/latex/junicode/TS1Junicode-OsF.fd b/Master/texmf-dist/tex/latex/junicode/TS1Junicode-OsF.fd
index 8c49fdb846e..6f9d7fe6c58 100644
--- a/Master/texmf-dist/tex/latex/junicode/TS1Junicode-OsF.fd
+++ b/Master/texmf-dist/tex/latex/junicode/TS1Junicode-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{TS1Junicode-OsF.fd}
- [2024/06/03 (autoinst) Font definitions for TS1/Junicode-OsF.]
+ [2024/07/21 (autoinst) Font definitions for TS1/Junicode-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,31 +20,35 @@
\DeclareFontFamily{TS1}{Junicode-OsF}{}
-% ---- mediumsemicondensed ----
+% ---- c = condensed ----
-\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{condensed}{n}{
+ <-> alias * Junicode-OsF/c/n
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-OsF/mediumsemicondensed/it
+\DeclareFontShape{TS1}{Junicode-OsF}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-osf-ts1
}{}
+\DeclareFontShape{TS1}{Junicode-OsF}{condensed}{it}{
+ <-> alias * Junicode-OsF/c/it
+}{}
-% ---- sbx = semiboldexpanded ----
-
-\DeclareFontShape{TS1}{Junicode-OsF}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{c}{sl}{
+ <-> ssub * Junicode-OsF/c/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{semiboldexpanded}{n}{
- <-> alias * Junicode-OsF/sbx/n
+\DeclareFontShape{TS1}{Junicode-OsF}{condensed}{sl}{
+ <-> ssub * Junicode-OsF/condensed/it
}{}
+
+% ---- sbx = semiboldexpanded ----
+
\DeclareFontShape{TS1}{Junicode-OsF}{sbx}{it}{
<-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-ts1
}{}
@@ -53,6 +57,14 @@
<-> alias * Junicode-OsF/sbx/it
}{}
+\DeclareFontShape{TS1}{Junicode-OsF}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Junicode-OsF}{semiboldexpanded}{n}{
+ <-> alias * Junicode-OsF/sbx/n
+}{}
+
\DeclareFontShape{TS1}{Junicode-OsF}{sbx}{sl}{
<-> ssub * Junicode-OsF/sbx/it
}{}
@@ -62,180 +74,168 @@
}{}
-% ---- bsx = boldsemiexpanded ----
+% ---- x = expanded ----
-\DeclareFontShape{TS1}{Junicode-OsF}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{boldsemiexpanded}{it}{
- <-> alias * Junicode-OsF/bsx/it
+\DeclareFontShape{TS1}{Junicode-OsF}{expanded}{it}{
+ <-> alias * Junicode-OsF/x/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{boldsemiexpanded}{n}{
- <-> alias * Junicode-OsF/bsx/n
+\DeclareFontShape{TS1}{Junicode-OsF}{expanded}{n}{
+ <-> alias * Junicode-OsF/x/n
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{bsx}{sl}{
- <-> ssub * Junicode-OsF/bsx/it
+\DeclareFontShape{TS1}{Junicode-OsF}{x}{sl}{
+ <-> ssub * Junicode-OsF/x/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-OsF/boldsemiexpanded/it
+\DeclareFontShape{TS1}{Junicode-OsF}{expanded}{sl}{
+ <-> ssub * Junicode-OsF/expanded/it
}{}
-% ---- lc = lightcondensed ----
-
-\DeclareFontShape{TS1}{Junicode-OsF}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-osf-ts1
-}{}
+% ---- b = bold ----
-\DeclareFontShape{TS1}{Junicode-OsF}{lightcondensed}{n}{
- <-> alias * Junicode-OsF/lc/n
+\DeclareFontShape{TS1}{Junicode-OsF}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{bold}{n}{
+ <-> alias * Junicode-OsF/b/n
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{lightcondensed}{it}{
- <-> alias * Junicode-OsF/lc/it
+\DeclareFontShape{TS1}{Junicode-OsF}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{lc}{sl}{
- <-> ssub * Junicode-OsF/lc/it
+\DeclareFontShape{TS1}{Junicode-OsF}{bold}{it}{
+ <-> alias * Junicode-OsF/b/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{lightcondensed}{sl}{
- <-> ssub * Junicode-OsF/lightcondensed/it
+\DeclareFontShape{TS1}{Junicode-OsF}{b}{sl}{
+ <-> ssub * Junicode-OsF/b/it
}{}
-
-% ---- sb = semibold ----
-
-\DeclareFontShape{TS1}{Junicode-OsF}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{bold}{sl}{
+ <-> ssub * Junicode-OsF/bold/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{semibold}{n}{
- <-> alias * Junicode-OsF/sb/n
-}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-osf-ts1
-}{}
+% ---- mediumexpanded ----
-\DeclareFontShape{TS1}{Junicode-OsF}{semibold}{it}{
- <-> alias * Junicode-OsF/sb/it
+\DeclareFontShape{TS1}{Junicode-OsF}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{sb}{sl}{
- <-> ssub * Junicode-OsF/sb/it
+\DeclareFontShape{TS1}{Junicode-OsF}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{semibold}{sl}{
- <-> ssub * Junicode-OsF/semibold/it
+\DeclareFontShape{TS1}{Junicode-OsF}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-OsF/mediumexpanded/it
}{}
-% ---- sc = semicondensed ----
+% ---- lsc = lightsemicondensed ----
-\DeclareFontShape{TS1}{Junicode-OsF}{sc}{it}{
- <-> \Junicode@@scale Junicode-SmCondItalic-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{semicondensed}{it}{
- <-> alias * Junicode-OsF/sc/it
+\DeclareFontShape{TS1}{Junicode-OsF}{lightsemicondensed}{it}{
+ <-> alias * Junicode-OsF/lsc/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{semicondensed}{n}{
- <-> alias * Junicode-OsF/sc/n
+\DeclareFontShape{TS1}{Junicode-OsF}{lightsemicondensed}{n}{
+ <-> alias * Junicode-OsF/lsc/n
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{sc}{sl}{
- <-> ssub * Junicode-OsF/sc/it
+\DeclareFontShape{TS1}{Junicode-OsF}{lsc}{sl}{
+ <-> ssub * Junicode-OsF/lsc/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{semicondensed}{sl}{
- <-> ssub * Junicode-OsF/semicondensed/it
+\DeclareFontShape{TS1}{Junicode-OsF}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-OsF/lightsemicondensed/it
}{}
-% ---- b = bold ----
+% ---- lc = lightcondensed ----
-\DeclareFontShape{TS1}{Junicode-OsF}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{bold}{n}{
- <-> alias * Junicode-OsF/b/n
+\DeclareFontShape{TS1}{Junicode-OsF}{lightcondensed}{n}{
+ <-> alias * Junicode-OsF/lc/n
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{bold}{it}{
- <-> alias * Junicode-OsF/b/it
+\DeclareFontShape{TS1}{Junicode-OsF}{lightcondensed}{it}{
+ <-> alias * Junicode-OsF/lc/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{b}{sl}{
- <-> ssub * Junicode-OsF/b/it
+\DeclareFontShape{TS1}{Junicode-OsF}{lc}{sl}{
+ <-> ssub * Junicode-OsF/lc/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{bold}{sl}{
- <-> ssub * Junicode-OsF/bold/it
+\DeclareFontShape{TS1}{Junicode-OsF}{lightcondensed}{sl}{
+ <-> ssub * Junicode-OsF/lightcondensed/it
}{}
-% ---- mediumcondensed ----
+% ---- m = regular ----
-\DeclareFontShape{TS1}{Junicode-OsF}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{regular}{it}{
+ <-> alias * Junicode-OsF/m/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{mediumcondensed}{sl}{
- <-> ssub * Junicode-OsF/mediumcondensed/it
+\DeclareFontShape{TS1}{Junicode-OsF}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-osf-ts1
}{}
-
-% ---- l = light ----
-
-\DeclareFontShape{TS1}{Junicode-OsF}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{regular}{n}{
+ <-> alias * Junicode-OsF/m/n
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{light}{it}{
- <-> alias * Junicode-OsF/l/it
+\DeclareFontShape{TS1}{Junicode-OsF}{m}{sl}{
+ <-> ssub * Junicode-OsF/m/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{regular}{sl}{
+ <-> ssub * Junicode-OsF/regular/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{light}{n}{
- <-> alias * Junicode-OsF/l/n
+
+% ---- mediumsemiexpanded ----
+
+\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{l}{sl}{
- <-> ssub * Junicode-OsF/l/it
+\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{light}{sl}{
- <-> ssub * Junicode-OsF/light/it
+\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-OsF/mediumsemiexpanded/it
}{}
@@ -266,173 +266,169 @@
}{}
-% ---- m = regular ----
+% ---- medium ----
-\DeclareFontShape{TS1}{Junicode-OsF}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{medium}{n}{
+ <-> \Junicode@@scale Junicode-Medium-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{regular}{n}{
- <-> alias * Junicode-OsF/m/n
+\DeclareFontShape{TS1}{Junicode-OsF}{medium}{it}{
+ <-> \Junicode@@scale Junicode-MediumItalic-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{medium}{sl}{
+ <-> ssub * Junicode-OsF/medium/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{regular}{it}{
- <-> alias * Junicode-OsF/m/it
-}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{m}{sl}{
- <-> ssub * Junicode-OsF/m/it
-}{}
+% ---- sx = semiexpanded ----
-\DeclareFontShape{TS1}{Junicode-OsF}{regular}{sl}{
- <-> ssub * Junicode-OsF/regular/it
+\DeclareFontShape{TS1}{Junicode-OsF}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-osf-ts1
}{}
+\DeclareFontShape{TS1}{Junicode-OsF}{semiexpanded}{it}{
+ <-> alias * Junicode-OsF/sx/it
+}{}
-% ---- medium ----
+\DeclareFontShape{TS1}{Junicode-OsF}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-osf-ts1
+}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{medium}{it}{
- <-> \Junicode@@scale Junicode-MediumItalic-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{semiexpanded}{n}{
+ <-> alias * Junicode-OsF/sx/n
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{medium}{n}{
- <-> \Junicode@@scale Junicode-Medium-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{sx}{sl}{
+ <-> ssub * Junicode-OsF/sx/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{medium}{sl}{
- <-> ssub * Junicode-OsF/medium/it
+\DeclareFontShape{TS1}{Junicode-OsF}{semiexpanded}{sl}{
+ <-> ssub * Junicode-OsF/semiexpanded/it
}{}
-% ---- lsc = lightsemicondensed ----
+% ---- l = light ----
-\DeclareFontShape{TS1}{Junicode-OsF}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{lightsemicondensed}{n}{
- <-> alias * Junicode-OsF/lsc/n
+\DeclareFontShape{TS1}{Junicode-OsF}{light}{n}{
+ <-> alias * Junicode-OsF/l/n
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{lightsemicondensed}{it}{
- <-> alias * Junicode-OsF/lsc/it
+\DeclareFontShape{TS1}{Junicode-OsF}{light}{it}{
+ <-> alias * Junicode-OsF/l/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{lsc}{sl}{
- <-> ssub * Junicode-OsF/lsc/it
+\DeclareFontShape{TS1}{Junicode-OsF}{l}{sl}{
+ <-> ssub * Junicode-OsF/l/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-OsF/lightsemicondensed/it
+\DeclareFontShape{TS1}{Junicode-OsF}{light}{sl}{
+ <-> ssub * Junicode-OsF/light/it
}{}
-% ---- c = condensed ----
+% ---- mediumsemicondensed ----
-\DeclareFontShape{TS1}{Junicode-OsF}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{condensed}{it}{
- <-> alias * Junicode-OsF/c/it
+\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-OsF/mediumsemicondensed/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{condensed}{n}{
- <-> alias * Junicode-OsF/c/n
-}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{c}{sl}{
- <-> ssub * Junicode-OsF/c/it
-}{}
+% ---- sb = semibold ----
-\DeclareFontShape{TS1}{Junicode-OsF}{condensed}{sl}{
- <-> ssub * Junicode-OsF/condensed/it
+\DeclareFontShape{TS1}{Junicode-OsF}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-osf-ts1
}{}
+\DeclareFontShape{TS1}{Junicode-OsF}{semibold}{n}{
+ <-> alias * Junicode-OsF/sb/n
+}{}
-% ---- x = expanded ----
+\DeclareFontShape{TS1}{Junicode-OsF}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-osf-ts1
+}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{semibold}{it}{
+ <-> alias * Junicode-OsF/sb/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{expanded}{it}{
- <-> alias * Junicode-OsF/x/it
+\DeclareFontShape{TS1}{Junicode-OsF}{sb}{sl}{
+ <-> ssub * Junicode-OsF/sb/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{semibold}{sl}{
+ <-> ssub * Junicode-OsF/semibold/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{expanded}{n}{
- <-> alias * Junicode-OsF/x/n
+
+% ---- mediumcondensed ----
+
+\DeclareFontShape{TS1}{Junicode-OsF}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{x}{sl}{
- <-> ssub * Junicode-OsF/x/it
+\DeclareFontShape{TS1}{Junicode-OsF}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{expanded}{sl}{
- <-> ssub * Junicode-OsF/expanded/it
+\DeclareFontShape{TS1}{Junicode-OsF}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-OsF/mediumcondensed/it
}{}
-% ---- sx = semiexpanded ----
+% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{TS1}{Junicode-OsF}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{semiexpanded}{it}{
- <-> alias * Junicode-OsF/sx/it
+\DeclareFontShape{TS1}{Junicode-OsF}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-OsF/bsx/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{semiexpanded}{n}{
- <-> alias * Junicode-OsF/sx/n
+\DeclareFontShape{TS1}{Junicode-OsF}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-OsF/bsx/n
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{sx}{sl}{
- <-> ssub * Junicode-OsF/sx/it
+\DeclareFontShape{TS1}{Junicode-OsF}{bsx}{sl}{
+ <-> ssub * Junicode-OsF/bsx/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{semiexpanded}{sl}{
- <-> ssub * Junicode-OsF/semiexpanded/it
+\DeclareFontShape{TS1}{Junicode-OsF}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-OsF/boldsemiexpanded/it
}{}
-% ---- mediumexpanded ----
-
-\DeclareFontShape{TS1}{Junicode-OsF}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-osf-ts1
-}{}
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{TS1}{Junicode-OsF}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{mediumexpanded}{sl}{
- <-> ssub * Junicode-OsF/mediumexpanded/it
+\DeclareFontShape{TS1}{Junicode-OsF}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-OsF/sbsx/n
}{}
-
-% ---- sbsx = semiboldsemiexpanded ----
-
\DeclareFontShape{TS1}{Junicode-OsF}{sbsx}{it}{
<-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-ts1
}{}
@@ -441,14 +437,6 @@
<-> alias * Junicode-OsF/sbsx/it
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Junicode-OsF}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-OsF/sbsx/n
-}{}
-
\DeclareFontShape{TS1}{Junicode-OsF}{sbsx}{sl}{
<-> ssub * Junicode-OsF/sbsx/it
}{}
@@ -458,18 +446,30 @@
}{}
-% ---- mediumsemiexpanded ----
+% ---- sc = semicondensed ----
-\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-osf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-ts1
+\DeclareFontShape{TS1}{Junicode-OsF}{semicondensed}{n}{
+ <-> alias * Junicode-OsF/sc/n
}{}
-\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-OsF/mediumsemiexpanded/it
+\DeclareFontShape{TS1}{Junicode-OsF}{sc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Junicode-OsF}{semicondensed}{it}{
+ <-> alias * Junicode-OsF/sc/it
+}{}
+
+\DeclareFontShape{TS1}{Junicode-OsF}{sc}{sl}{
+ <-> ssub * Junicode-OsF/sc/it
+}{}
+
+\DeclareFontShape{TS1}{Junicode-OsF}{semicondensed}{sl}{
+ <-> ssub * Junicode-OsF/semicondensed/it
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/TS1Junicode-TLF.fd b/Master/texmf-dist/tex/latex/junicode/TS1Junicode-TLF.fd
index 8ff70a59bb5..9d106c1467d 100644
--- a/Master/texmf-dist/tex/latex/junicode/TS1Junicode-TLF.fd
+++ b/Master/texmf-dist/tex/latex/junicode/TS1Junicode-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{TS1Junicode-TLF.fd}
- [2024/06/03 (autoinst) Font definitions for TS1/Junicode-TLF.]
+ [2024/07/21 (autoinst) Font definitions for TS1/Junicode-TLF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,104 +20,85 @@
\DeclareFontFamily{TS1}{Junicode-TLF}{}
-% ---- sx = semiexpanded ----
-
-\DeclareFontShape{TS1}{Junicode-TLF}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-tlf-ts1
-}{}
+% ---- sb = semibold ----
-\DeclareFontShape{TS1}{Junicode-TLF}{semiexpanded}{n}{
- <-> alias * Junicode-TLF/sx/n
+\DeclareFontShape{TS1}{Junicode-TLF}{sb}{it}{
+ <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{semibold}{it}{
+ <-> alias * Junicode-TLF/sb/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{semiexpanded}{it}{
- <-> alias * Junicode-TLF/sx/it
+\DeclareFontShape{TS1}{Junicode-TLF}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{sx}{sl}{
- <-> ssub * Junicode-TLF/sx/it
+\DeclareFontShape{TS1}{Junicode-TLF}{semibold}{n}{
+ <-> alias * Junicode-TLF/sb/n
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{semiexpanded}{sl}{
- <-> ssub * Junicode-TLF/semiexpanded/it
+\DeclareFontShape{TS1}{Junicode-TLF}{sb}{sl}{
+ <-> ssub * Junicode-TLF/sb/it
}{}
-
-% ---- x = expanded ----
-
-\DeclareFontShape{TS1}{Junicode-TLF}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{semibold}{sl}{
+ <-> ssub * Junicode-TLF/semibold/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{expanded}{it}{
- <-> alias * Junicode-TLF/x/it
-}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-tlf-ts1
-}{}
+% ---- mediumcondensed ----
-\DeclareFontShape{TS1}{Junicode-TLF}{expanded}{n}{
- <-> alias * Junicode-TLF/x/n
+\DeclareFontShape{TS1}{Junicode-TLF}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{x}{sl}{
- <-> ssub * Junicode-TLF/x/it
+\DeclareFontShape{TS1}{Junicode-TLF}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{expanded}{sl}{
- <-> ssub * Junicode-TLF/expanded/it
+\DeclareFontShape{TS1}{Junicode-TLF}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-TLF/mediumcondensed/it
}{}
-% ---- c = condensed ----
+% ---- bsx = boldsemiexpanded ----
-\DeclareFontShape{TS1}{Junicode-TLF}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{bsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpBold-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{condensed}{n}{
- <-> alias * Junicode-TLF/c/n
+\DeclareFontShape{TS1}{Junicode-TLF}{boldsemiexpanded}{n}{
+ <-> alias * Junicode-TLF/bsx/n
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{bsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{condensed}{it}{
- <-> alias * Junicode-TLF/c/it
+\DeclareFontShape{TS1}{Junicode-TLF}{boldsemiexpanded}{it}{
+ <-> alias * Junicode-TLF/bsx/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{c}{sl}{
- <-> ssub * Junicode-TLF/c/it
+\DeclareFontShape{TS1}{Junicode-TLF}{bsx}{sl}{
+ <-> ssub * Junicode-TLF/bsx/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{condensed}{sl}{
- <-> ssub * Junicode-TLF/condensed/it
+\DeclareFontShape{TS1}{Junicode-TLF}{boldsemiexpanded}{sl}{
+ <-> ssub * Junicode-TLF/boldsemiexpanded/it
}{}
-% ---- mediumsemiexpanded ----
-
-\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-tlf-ts1
-}{}
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-TLF/mediumsemiexpanded/it
+\DeclareFontShape{TS1}{Junicode-TLF}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-TLF/sbsx/n
}{}
-
-% ---- sbsx = semiboldsemiexpanded ----
-
\DeclareFontShape{TS1}{Junicode-TLF}{sbsx}{it}{
<-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-ts1
}{}
@@ -126,14 +107,6 @@
<-> alias * Junicode-TLF/sbsx/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Junicode-TLF}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-TLF/sbsx/n
-}{}
-
\DeclareFontShape{TS1}{Junicode-TLF}{sbsx}{sl}{
<-> ssub * Junicode-TLF/sbsx/it
}{}
@@ -143,333 +116,360 @@
}{}
-% ---- mediumexpanded ----
+% ---- sc = semicondensed ----
-\DeclareFontShape{TS1}{Junicode-TLF}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{sc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondItalic-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{semicondensed}{it}{
+ <-> alias * Junicode-TLF/sc/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{mediumexpanded}{sl}{
- <-> ssub * Junicode-TLF/mediumexpanded/it
+\DeclareFontShape{TS1}{Junicode-TLF}{sc}{n}{
+ <-> \Junicode@@scale Junicode-SmCond-tlf-ts1
}{}
+\DeclareFontShape{TS1}{Junicode-TLF}{semicondensed}{n}{
+ <-> alias * Junicode-TLF/sc/n
+}{}
-% ---- bx = boldexpanded ----
+\DeclareFontShape{TS1}{Junicode-TLF}{sc}{sl}{
+ <-> ssub * Junicode-TLF/sc/it
+}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{semicondensed}{sl}{
+ <-> ssub * Junicode-TLF/semicondensed/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{boldexpanded}{n}{
- <-> alias * Junicode-TLF/bx/n
+
+% ---- lc = lightcondensed ----
+
+\DeclareFontShape{TS1}{Junicode-TLF}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{lightcondensed}{n}{
+ <-> alias * Junicode-TLF/lc/n
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{boldexpanded}{it}{
- <-> alias * Junicode-TLF/bx/it
+\DeclareFontShape{TS1}{Junicode-TLF}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{bx}{sl}{
- <-> ssub * Junicode-TLF/bx/it
+\DeclareFontShape{TS1}{Junicode-TLF}{lightcondensed}{it}{
+ <-> alias * Junicode-TLF/lc/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{boldexpanded}{sl}{
- <-> ssub * Junicode-TLF/boldexpanded/it
+\DeclareFontShape{TS1}{Junicode-TLF}{lc}{sl}{
+ <-> ssub * Junicode-TLF/lc/it
}{}
+\DeclareFontShape{TS1}{Junicode-TLF}{lightcondensed}{sl}{
+ <-> ssub * Junicode-TLF/lightcondensed/it
+}{}
-% ---- l = light ----
-\DeclareFontShape{TS1}{Junicode-TLF}{l}{it}{
- <-> \Junicode@@scale Junicode-LightItalic-tlf-ts1
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{Junicode-TLF}{m}{it}{
+ <-> \Junicode@@scale Junicode-Italic-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{light}{it}{
- <-> alias * Junicode-TLF/l/it
+\DeclareFontShape{TS1}{Junicode-TLF}{regular}{it}{
+ <-> alias * Junicode-TLF/m/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{l}{n}{
- <-> \Junicode@@scale Junicode-Light-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{m}{n}{
+ <-> \Junicode@@scale Junicode-Regular-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{light}{n}{
- <-> alias * Junicode-TLF/l/n
+\DeclareFontShape{TS1}{Junicode-TLF}{regular}{n}{
+ <-> alias * Junicode-TLF/m/n
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{l}{sl}{
- <-> ssub * Junicode-TLF/l/it
+\DeclareFontShape{TS1}{Junicode-TLF}{m}{sl}{
+ <-> ssub * Junicode-TLF/m/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{light}{sl}{
- <-> ssub * Junicode-TLF/light/it
+\DeclareFontShape{TS1}{Junicode-TLF}{regular}{sl}{
+ <-> ssub * Junicode-TLF/regular/it
}{}
-% ---- lsc = lightsemicondensed ----
+% ---- mediumsemiexpanded ----
-\DeclareFontShape{TS1}{Junicode-TLF}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{lightsemicondensed}{n}{
- <-> alias * Junicode-TLF/lsc/n
+\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-TLF/mediumsemiexpanded/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{lightsemicondensed}{it}{
- <-> alias * Junicode-TLF/lsc/it
+
+% ---- bx = boldexpanded ----
+
+\DeclareFontShape{TS1}{Junicode-TLF}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{lsc}{sl}{
- <-> ssub * Junicode-TLF/lsc/it
+\DeclareFontShape{TS1}{Junicode-TLF}{boldexpanded}{it}{
+ <-> alias * Junicode-TLF/bx/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-TLF/lightsemicondensed/it
+\DeclareFontShape{TS1}{Junicode-TLF}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-tlf-ts1
}{}
+\DeclareFontShape{TS1}{Junicode-TLF}{boldexpanded}{n}{
+ <-> alias * Junicode-TLF/bx/n
+}{}
-% ---- medium ----
+\DeclareFontShape{TS1}{Junicode-TLF}{bx}{sl}{
+ <-> ssub * Junicode-TLF/bx/it
+}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{medium}{it}{
- <-> \Junicode@@scale Junicode-MediumItalic-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{boldexpanded}{sl}{
+ <-> ssub * Junicode-TLF/boldexpanded/it
}{}
+
+% ---- medium ----
+
\DeclareFontShape{TS1}{Junicode-TLF}{medium}{n}{
<-> \Junicode@@scale Junicode-Medium-tlf-ts1
}{}
+\DeclareFontShape{TS1}{Junicode-TLF}{medium}{it}{
+ <-> \Junicode@@scale Junicode-MediumItalic-tlf-ts1
+}{}
+
\DeclareFontShape{TS1}{Junicode-TLF}{medium}{sl}{
<-> ssub * Junicode-TLF/medium/it
}{}
-% ---- m = regular ----
+% ---- sx = semiexpanded ----
-\DeclareFontShape{TS1}{Junicode-TLF}{m}{n}{
- <-> \Junicode@@scale Junicode-Regular-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{regular}{n}{
- <-> alias * Junicode-TLF/m/n
+\DeclareFontShape{TS1}{Junicode-TLF}{semiexpanded}{n}{
+ <-> alias * Junicode-TLF/sx/n
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{m}{it}{
- <-> \Junicode@@scale Junicode-Italic-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{regular}{it}{
- <-> alias * Junicode-TLF/m/it
+\DeclareFontShape{TS1}{Junicode-TLF}{semiexpanded}{it}{
+ <-> alias * Junicode-TLF/sx/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{m}{sl}{
- <-> ssub * Junicode-TLF/m/it
+\DeclareFontShape{TS1}{Junicode-TLF}{sx}{sl}{
+ <-> ssub * Junicode-TLF/sx/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{regular}{sl}{
- <-> ssub * Junicode-TLF/regular/it
+\DeclareFontShape{TS1}{Junicode-TLF}{semiexpanded}{sl}{
+ <-> ssub * Junicode-TLF/semiexpanded/it
}{}
-% ---- b = bold ----
+% ---- l = light ----
-\DeclareFontShape{TS1}{Junicode-TLF}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{l}{it}{
+ <-> \Junicode@@scale Junicode-LightItalic-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{bold}{n}{
- <-> alias * Junicode-TLF/b/n
+\DeclareFontShape{TS1}{Junicode-TLF}{light}{it}{
+ <-> alias * Junicode-TLF/l/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{l}{n}{
+ <-> \Junicode@@scale Junicode-Light-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{bold}{it}{
- <-> alias * Junicode-TLF/b/it
+\DeclareFontShape{TS1}{Junicode-TLF}{light}{n}{
+ <-> alias * Junicode-TLF/l/n
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{b}{sl}{
- <-> ssub * Junicode-TLF/b/it
+\DeclareFontShape{TS1}{Junicode-TLF}{l}{sl}{
+ <-> ssub * Junicode-TLF/l/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{bold}{sl}{
- <-> ssub * Junicode-TLF/bold/it
+\DeclareFontShape{TS1}{Junicode-TLF}{light}{sl}{
+ <-> ssub * Junicode-TLF/light/it
}{}
-% ---- mediumcondensed ----
+% ---- mediumsemicondensed ----
-\DeclareFontShape{TS1}{Junicode-TLF}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{mediumcondensed}{sl}{
- <-> ssub * Junicode-TLF/mediumcondensed/it
+\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-TLF/mediumsemicondensed/it
}{}
-% ---- sbx = semiboldexpanded ----
+% ---- x = expanded ----
-\DeclareFontShape{TS1}{Junicode-TLF}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{semiboldexpanded}{n}{
- <-> alias * Junicode-TLF/sbx/n
+\DeclareFontShape{TS1}{Junicode-TLF}{expanded}{it}{
+ <-> alias * Junicode-TLF/x/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{semiboldexpanded}{it}{
- <-> alias * Junicode-TLF/sbx/it
+\DeclareFontShape{TS1}{Junicode-TLF}{expanded}{n}{
+ <-> alias * Junicode-TLF/x/n
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{sbx}{sl}{
- <-> ssub * Junicode-TLF/sbx/it
+\DeclareFontShape{TS1}{Junicode-TLF}{x}{sl}{
+ <-> ssub * Junicode-TLF/x/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-TLF/semiboldexpanded/it
+\DeclareFontShape{TS1}{Junicode-TLF}{expanded}{sl}{
+ <-> ssub * Junicode-TLF/expanded/it
}{}
-% ---- mediumsemicondensed ----
+% ---- b = bold ----
-\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{bold}{n}{
+ <-> alias * Junicode-TLF/b/n
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-TLF/mediumsemicondensed/it
+\DeclareFontShape{TS1}{Junicode-TLF}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-tlf-ts1
}{}
-
-% ---- sc = semicondensed ----
-
-\DeclareFontShape{TS1}{Junicode-TLF}{sc}{it}{
- <-> \Junicode@@scale Junicode-SmCondItalic-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{bold}{it}{
+ <-> alias * Junicode-TLF/b/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{semicondensed}{it}{
- <-> alias * Junicode-TLF/sc/it
+\DeclareFontShape{TS1}{Junicode-TLF}{b}{sl}{
+ <-> ssub * Junicode-TLF/b/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{sc}{n}{
- <-> \Junicode@@scale Junicode-SmCond-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{bold}{sl}{
+ <-> ssub * Junicode-TLF/bold/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{semicondensed}{n}{
- <-> alias * Junicode-TLF/sc/n
+
+% ---- mediumexpanded ----
+
+\DeclareFontShape{TS1}{Junicode-TLF}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{sc}{sl}{
- <-> ssub * Junicode-TLF/sc/it
+\DeclareFontShape{TS1}{Junicode-TLF}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{semicondensed}{sl}{
- <-> ssub * Junicode-TLF/semicondensed/it
+\DeclareFontShape{TS1}{Junicode-TLF}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-TLF/mediumexpanded/it
}{}
-% ---- sb = semibold ----
+% ---- lsc = lightsemicondensed ----
-\DeclareFontShape{TS1}{Junicode-TLF}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{semibold}{n}{
- <-> alias * Junicode-TLF/sb/n
+\DeclareFontShape{TS1}{Junicode-TLF}{lightsemicondensed}{it}{
+ <-> alias * Junicode-TLF/lsc/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{sb}{it}{
- <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{semibold}{it}{
- <-> alias * Junicode-TLF/sb/it
+\DeclareFontShape{TS1}{Junicode-TLF}{lightsemicondensed}{n}{
+ <-> alias * Junicode-TLF/lsc/n
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{sb}{sl}{
- <-> ssub * Junicode-TLF/sb/it
+\DeclareFontShape{TS1}{Junicode-TLF}{lsc}{sl}{
+ <-> ssub * Junicode-TLF/lsc/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{semibold}{sl}{
- <-> ssub * Junicode-TLF/semibold/it
+\DeclareFontShape{TS1}{Junicode-TLF}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-TLF/lightsemicondensed/it
}{}
-% ---- bsx = boldsemiexpanded ----
+% ---- c = condensed ----
-\DeclareFontShape{TS1}{Junicode-TLF}{bsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{boldsemiexpanded}{it}{
- <-> alias * Junicode-TLF/bsx/it
+\DeclareFontShape{TS1}{Junicode-TLF}{condensed}{n}{
+ <-> alias * Junicode-TLF/c/n
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{bsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpBold-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{boldsemiexpanded}{n}{
- <-> alias * Junicode-TLF/bsx/n
+\DeclareFontShape{TS1}{Junicode-TLF}{condensed}{it}{
+ <-> alias * Junicode-TLF/c/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{bsx}{sl}{
- <-> ssub * Junicode-TLF/bsx/it
+\DeclareFontShape{TS1}{Junicode-TLF}{c}{sl}{
+ <-> ssub * Junicode-TLF/c/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{boldsemiexpanded}{sl}{
- <-> ssub * Junicode-TLF/boldsemiexpanded/it
+\DeclareFontShape{TS1}{Junicode-TLF}{condensed}{sl}{
+ <-> ssub * Junicode-TLF/condensed/it
}{}
-% ---- lc = lightcondensed ----
+% ---- sbx = semiboldexpanded ----
-\DeclareFontShape{TS1}{Junicode-TLF}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{lightcondensed}{n}{
- <-> alias * Junicode-TLF/lc/n
+\DeclareFontShape{TS1}{Junicode-TLF}{semiboldexpanded}{n}{
+ <-> alias * Junicode-TLF/sbx/n
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-tlf-ts1
+\DeclareFontShape{TS1}{Junicode-TLF}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{lightcondensed}{it}{
- <-> alias * Junicode-TLF/lc/it
+\DeclareFontShape{TS1}{Junicode-TLF}{semiboldexpanded}{it}{
+ <-> alias * Junicode-TLF/sbx/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{lc}{sl}{
- <-> ssub * Junicode-TLF/lc/it
+\DeclareFontShape{TS1}{Junicode-TLF}{sbx}{sl}{
+ <-> ssub * Junicode-TLF/sbx/it
}{}
-\DeclareFontShape{TS1}{Junicode-TLF}{lightcondensed}{sl}{
- <-> ssub * Junicode-TLF/lightcondensed/it
+\DeclareFontShape{TS1}{Junicode-TLF}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-TLF/semiboldexpanded/it
}{}
diff --git a/Master/texmf-dist/tex/latex/junicode/TS1Junicode-TOsF.fd b/Master/texmf-dist/tex/latex/junicode/TS1Junicode-TOsF.fd
index 02b2f8fbda9..73d254e1220 100644
--- a/Master/texmf-dist/tex/latex/junicode/TS1Junicode-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/junicode/TS1Junicode-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2024/06/03
+%% Generated by autoinst on 2024/07/21
%%
\ProvidesFile{TS1Junicode-TOsF.fd}
- [2024/06/03 (autoinst) Font definitions for TS1/Junicode-TOsF.]
+ [2024/07/21 (autoinst) Font definitions for TS1/Junicode-TOsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,16 +20,23 @@
\DeclareFontFamily{TS1}{Junicode-TOsF}{}
-% ---- sb = semibold ----
+% ---- mediumcondensed ----
-\DeclareFontShape{TS1}{Junicode-TOsF}{sb}{n}{
- <-> \Junicode@@scale Junicode-SmBold-tosf-ts1
+\DeclareFontShape{TS1}{Junicode-TOsF}{mediumcondensed}{it}{
+ <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{semibold}{n}{
- <-> alias * Junicode-TOsF/sb/n
+\DeclareFontShape{TS1}{Junicode-TOsF}{mediumcondensed}{n}{
+ <-> \Junicode@@scale Junicode-CondMedium-tosf-ts1
}{}
+\DeclareFontShape{TS1}{Junicode-TOsF}{mediumcondensed}{sl}{
+ <-> ssub * Junicode-TOsF/mediumcondensed/it
+}{}
+
+
+% ---- sb = semibold ----
+
\DeclareFontShape{TS1}{Junicode-TOsF}{sb}{it}{
<-> \Junicode@@scale Junicode-SmBoldItalic-tosf-ts1
}{}
@@ -38,6 +45,14 @@
<-> alias * Junicode-TOsF/sb/it
}{}
+\DeclareFontShape{TS1}{Junicode-TOsF}{sb}{n}{
+ <-> \Junicode@@scale Junicode-SmBold-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Junicode-TOsF}{semibold}{n}{
+ <-> alias * Junicode-TOsF/sb/n
+}{}
+
\DeclareFontShape{TS1}{Junicode-TOsF}{sb}{sl}{
<-> ssub * Junicode-TOsF/sb/it
}{}
@@ -74,33 +89,6 @@
}{}
-% ---- lc = lightcondensed ----
-
-\DeclareFontShape{TS1}{Junicode-TOsF}{lc}{n}{
- <-> \Junicode@@scale Junicode-CondLight-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Junicode-TOsF}{lightcondensed}{n}{
- <-> alias * Junicode-TOsF/lc/n
-}{}
-
-\DeclareFontShape{TS1}{Junicode-TOsF}{lc}{it}{
- <-> \Junicode@@scale Junicode-CondLightItalic-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Junicode-TOsF}{lightcondensed}{it}{
- <-> alias * Junicode-TOsF/lc/it
-}{}
-
-\DeclareFontShape{TS1}{Junicode-TOsF}{lc}{sl}{
- <-> ssub * Junicode-TOsF/lc/it
-}{}
-
-\DeclareFontShape{TS1}{Junicode-TOsF}{lightcondensed}{sl}{
- <-> ssub * Junicode-TOsF/lightcondensed/it
-}{}
-
-
% ---- bsx = boldsemiexpanded ----
\DeclareFontShape{TS1}{Junicode-TOsF}{bsx}{n}{
@@ -128,87 +116,30 @@
}{}
-% ---- sbx = semiboldexpanded ----
-
-\DeclareFontShape{TS1}{Junicode-TOsF}{sbx}{it}{
- <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldexpanded}{it}{
- <-> alias * Junicode-TOsF/sbx/it
-}{}
-
-\DeclareFontShape{TS1}{Junicode-TOsF}{sbx}{n}{
- <-> \Junicode@@scale Junicode-ExpSmBold-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldexpanded}{n}{
- <-> alias * Junicode-TOsF/sbx/n
-}{}
-
-\DeclareFontShape{TS1}{Junicode-TOsF}{sbx}{sl}{
- <-> ssub * Junicode-TOsF/sbx/it
-}{}
-
-\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldexpanded}{sl}{
- <-> ssub * Junicode-TOsF/semiboldexpanded/it
-}{}
-
-
-% ---- mediumsemicondensed ----
-
-\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemicondensed}{n}{
- <-> \Junicode@@scale Junicode-SmCondMedium-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemicondensed}{it}{
- <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemicondensed}{sl}{
- <-> ssub * Junicode-TOsF/mediumsemicondensed/it
-}{}
-
-
-% ---- mediumcondensed ----
-
-\DeclareFontShape{TS1}{Junicode-TOsF}{mediumcondensed}{it}{
- <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Junicode-TOsF}{mediumcondensed}{n}{
- <-> \Junicode@@scale Junicode-CondMedium-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Junicode-TOsF}{mediumcondensed}{sl}{
- <-> ssub * Junicode-TOsF/mediumcondensed/it
-}{}
-
-
-% ---- b = bold ----
+% ---- sbsx = semiboldsemiexpanded ----
-\DeclareFontShape{TS1}{Junicode-TOsF}{b}{n}{
- <-> \Junicode@@scale Junicode-Bold-tosf-ts1
+\DeclareFontShape{TS1}{Junicode-TOsF}{sbsx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{bold}{n}{
- <-> alias * Junicode-TOsF/b/n
+\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldsemiexpanded}{it}{
+ <-> alias * Junicode-TOsF/sbsx/it
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{b}{it}{
- <-> \Junicode@@scale Junicode-BoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{Junicode-TOsF}{sbsx}{n}{
+ <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{bold}{it}{
- <-> alias * Junicode-TOsF/b/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldsemiexpanded}{n}{
+ <-> alias * Junicode-TOsF/sbsx/n
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{b}{sl}{
- <-> ssub * Junicode-TOsF/b/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{sbsx}{sl}{
+ <-> ssub * Junicode-TOsF/sbsx/it
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{bold}{sl}{
- <-> ssub * Junicode-TOsF/bold/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldsemiexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/semiboldsemiexpanded/it
}{}
@@ -227,30 +158,30 @@
}{}
-% ---- lsc = lightsemicondensed ----
+% ---- bx = boldexpanded ----
-\DeclareFontShape{TS1}{Junicode-TOsF}{lsc}{n}{
- <-> \Junicode@@scale Junicode-SmCondLight-tosf-ts1
+\DeclareFontShape{TS1}{Junicode-TOsF}{bx}{it}{
+ <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{lightsemicondensed}{n}{
- <-> alias * Junicode-TOsF/lsc/n
+\DeclareFontShape{TS1}{Junicode-TOsF}{boldexpanded}{it}{
+ <-> alias * Junicode-TOsF/bx/it
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{lsc}{it}{
- <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-ts1
+\DeclareFontShape{TS1}{Junicode-TOsF}{bx}{n}{
+ <-> \Junicode@@scale Junicode-ExpBold-tosf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{lightsemicondensed}{it}{
- <-> alias * Junicode-TOsF/lsc/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{boldexpanded}{n}{
+ <-> alias * Junicode-TOsF/bx/n
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{lsc}{sl}{
- <-> ssub * Junicode-TOsF/lsc/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{bx}{sl}{
+ <-> ssub * Junicode-TOsF/bx/it
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{lightsemicondensed}{sl}{
- <-> ssub * Junicode-TOsF/lightsemicondensed/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{boldexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/boldexpanded/it
}{}
@@ -281,30 +212,60 @@
}{}
-% ---- bx = boldexpanded ----
+% ---- mediumsemiexpanded ----
-\DeclareFontShape{TS1}{Junicode-TOsF}{bx}{it}{
- <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemiexpanded}{it}{
+ <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{boldexpanded}{it}{
- <-> alias * Junicode-TOsF/bx/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemiexpanded}{n}{
+ <-> \Junicode@@scale Junicode-SmExpMedium-tosf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{bx}{n}{
- <-> \Junicode@@scale Junicode-ExpBold-tosf-ts1
+\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemiexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/mediumsemiexpanded/it
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{boldexpanded}{n}{
- <-> alias * Junicode-TOsF/bx/n
+
+% ---- lc = lightcondensed ----
+
+\DeclareFontShape{TS1}{Junicode-TOsF}{lc}{n}{
+ <-> \Junicode@@scale Junicode-CondLight-tosf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{bx}{sl}{
- <-> ssub * Junicode-TOsF/bx/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{lightcondensed}{n}{
+ <-> alias * Junicode-TOsF/lc/n
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{boldexpanded}{sl}{
- <-> ssub * Junicode-TOsF/boldexpanded/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{lc}{it}{
+ <-> \Junicode@@scale Junicode-CondLightItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Junicode-TOsF}{lightcondensed}{it}{
+ <-> alias * Junicode-TOsF/lc/it
+}{}
+
+\DeclareFontShape{TS1}{Junicode-TOsF}{lc}{sl}{
+ <-> ssub * Junicode-TOsF/lc/it
+}{}
+
+\DeclareFontShape{TS1}{Junicode-TOsF}{lightcondensed}{sl}{
+ <-> ssub * Junicode-TOsF/lightcondensed/it
+}{}
+
+
+% ---- mediumsemicondensed ----
+
+\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemicondensed}{n}{
+ <-> \Junicode@@scale Junicode-SmCondMedium-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemicondensed}{it}{
+ <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemicondensed}{sl}{
+ <-> ssub * Junicode-TOsF/mediumsemicondensed/it
}{}
@@ -335,141 +296,180 @@
}{}
-% ---- mediumsemiexpanded ----
+% ---- sx = semiexpanded ----
-\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemiexpanded}{it}{
- <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-ts1
+\DeclareFontShape{TS1}{Junicode-TOsF}{sx}{it}{
+ <-> \Junicode@@scale Junicode-SmExpItalic-tosf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemiexpanded}{n}{
- <-> \Junicode@@scale Junicode-SmExpMedium-tosf-ts1
+\DeclareFontShape{TS1}{Junicode-TOsF}{semiexpanded}{it}{
+ <-> alias * Junicode-TOsF/sx/it
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemiexpanded}{sl}{
- <-> ssub * Junicode-TOsF/mediumsemiexpanded/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{sx}{n}{
+ <-> \Junicode@@scale Junicode-SmExp-tosf-ts1
}{}
+\DeclareFontShape{TS1}{Junicode-TOsF}{semiexpanded}{n}{
+ <-> alias * Junicode-TOsF/sx/n
+}{}
-% ---- mediumexpanded ----
+\DeclareFontShape{TS1}{Junicode-TOsF}{sx}{sl}{
+ <-> ssub * Junicode-TOsF/sx/it
+}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{mediumexpanded}{it}{
- <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-ts1
+\DeclareFontShape{TS1}{Junicode-TOsF}{semiexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/semiexpanded/it
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{mediumexpanded}{n}{
- <-> \Junicode@@scale Junicode-ExpMedium-tosf-ts1
+
+% ---- b = bold ----
+
+\DeclareFontShape{TS1}{Junicode-TOsF}{b}{n}{
+ <-> \Junicode@@scale Junicode-Bold-tosf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{mediumexpanded}{sl}{
- <-> ssub * Junicode-TOsF/mediumexpanded/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{bold}{n}{
+ <-> alias * Junicode-TOsF/b/n
}{}
+\DeclareFontShape{TS1}{Junicode-TOsF}{b}{it}{
+ <-> \Junicode@@scale Junicode-BoldItalic-tosf-ts1
+}{}
-% ---- sbsx = semiboldsemiexpanded ----
+\DeclareFontShape{TS1}{Junicode-TOsF}{bold}{it}{
+ <-> alias * Junicode-TOsF/b/it
+}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{sbsx}{it}{
- <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{Junicode-TOsF}{b}{sl}{
+ <-> ssub * Junicode-TOsF/b/it
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldsemiexpanded}{it}{
- <-> alias * Junicode-TOsF/sbsx/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{bold}{sl}{
+ <-> ssub * Junicode-TOsF/bold/it
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{sbsx}{n}{
- <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-ts1
+
+% ---- x = expanded ----
+
+\DeclareFontShape{TS1}{Junicode-TOsF}{x}{n}{
+ <-> \Junicode@@scale Junicode-Exp-tosf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldsemiexpanded}{n}{
- <-> alias * Junicode-TOsF/sbsx/n
+\DeclareFontShape{TS1}{Junicode-TOsF}{expanded}{n}{
+ <-> alias * Junicode-TOsF/x/n
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{sbsx}{sl}{
- <-> ssub * Junicode-TOsF/sbsx/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{x}{it}{
+ <-> \Junicode@@scale Junicode-ExpItalic-tosf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldsemiexpanded}{sl}{
- <-> ssub * Junicode-TOsF/semiboldsemiexpanded/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{expanded}{it}{
+ <-> alias * Junicode-TOsF/x/it
}{}
+\DeclareFontShape{TS1}{Junicode-TOsF}{x}{sl}{
+ <-> ssub * Junicode-TOsF/x/it
+}{}
-% ---- c = condensed ----
+\DeclareFontShape{TS1}{Junicode-TOsF}{expanded}{sl}{
+ <-> ssub * Junicode-TOsF/expanded/it
+}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{c}{n}{
- <-> \Junicode@@scale Junicode-Cond-tosf-ts1
+
+% ---- lsc = lightsemicondensed ----
+
+\DeclareFontShape{TS1}{Junicode-TOsF}{lsc}{it}{
+ <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{condensed}{n}{
- <-> alias * Junicode-TOsF/c/n
+\DeclareFontShape{TS1}{Junicode-TOsF}{lightsemicondensed}{it}{
+ <-> alias * Junicode-TOsF/lsc/it
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{c}{it}{
- <-> \Junicode@@scale Junicode-CondItalic-tosf-ts1
+\DeclareFontShape{TS1}{Junicode-TOsF}{lsc}{n}{
+ <-> \Junicode@@scale Junicode-SmCondLight-tosf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{condensed}{it}{
- <-> alias * Junicode-TOsF/c/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{lightsemicondensed}{n}{
+ <-> alias * Junicode-TOsF/lsc/n
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{c}{sl}{
- <-> ssub * Junicode-TOsF/c/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{lsc}{sl}{
+ <-> ssub * Junicode-TOsF/lsc/it
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{condensed}{sl}{
- <-> ssub * Junicode-TOsF/condensed/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{lightsemicondensed}{sl}{
+ <-> ssub * Junicode-TOsF/lightsemicondensed/it
}{}
-% ---- x = expanded ----
+% ---- mediumexpanded ----
-\DeclareFontShape{TS1}{Junicode-TOsF}{x}{it}{
- <-> \Junicode@@scale Junicode-ExpItalic-tosf-ts1
+\DeclareFontShape{TS1}{Junicode-TOsF}{mediumexpanded}{it}{
+ <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{expanded}{it}{
- <-> alias * Junicode-TOsF/x/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{mediumexpanded}{n}{
+ <-> \Junicode@@scale Junicode-ExpMedium-tosf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{x}{n}{
- <-> \Junicode@@scale Junicode-Exp-tosf-ts1
+\DeclareFontShape{TS1}{Junicode-TOsF}{mediumexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/mediumexpanded/it
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{expanded}{n}{
- <-> alias * Junicode-TOsF/x/n
+
+% ---- c = condensed ----
+
+\DeclareFontShape{TS1}{Junicode-TOsF}{c}{it}{
+ <-> \Junicode@@scale Junicode-CondItalic-tosf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{x}{sl}{
- <-> ssub * Junicode-TOsF/x/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{condensed}{it}{
+ <-> alias * Junicode-TOsF/c/it
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{expanded}{sl}{
- <-> ssub * Junicode-TOsF/expanded/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{c}{n}{
+ <-> \Junicode@@scale Junicode-Cond-tosf-ts1
}{}
+\DeclareFontShape{TS1}{Junicode-TOsF}{condensed}{n}{
+ <-> alias * Junicode-TOsF/c/n
+}{}
-% ---- sx = semiexpanded ----
+\DeclareFontShape{TS1}{Junicode-TOsF}{c}{sl}{
+ <-> ssub * Junicode-TOsF/c/it
+}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{sx}{it}{
- <-> \Junicode@@scale Junicode-SmExpItalic-tosf-ts1
+\DeclareFontShape{TS1}{Junicode-TOsF}{condensed}{sl}{
+ <-> ssub * Junicode-TOsF/condensed/it
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{semiexpanded}{it}{
- <-> alias * Junicode-TOsF/sx/it
+
+% ---- sbx = semiboldexpanded ----
+
+\DeclareFontShape{TS1}{Junicode-TOsF}{sbx}{it}{
+ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{sx}{n}{
- <-> \Junicode@@scale Junicode-SmExp-tosf-ts1
+\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldexpanded}{it}{
+ <-> alias * Junicode-TOsF/sbx/it
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{semiexpanded}{n}{
- <-> alias * Junicode-TOsF/sx/n
+\DeclareFontShape{TS1}{Junicode-TOsF}{sbx}{n}{
+ <-> \Junicode@@scale Junicode-ExpSmBold-tosf-ts1
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{sx}{sl}{
- <-> ssub * Junicode-TOsF/sx/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldexpanded}{n}{
+ <-> alias * Junicode-TOsF/sbx/n
}{}
-\DeclareFontShape{TS1}{Junicode-TOsF}{semiexpanded}{sl}{
- <-> ssub * Junicode-TOsF/semiexpanded/it
+\DeclareFontShape{TS1}{Junicode-TOsF}{sbx}{sl}{
+ <-> ssub * Junicode-TOsF/sbx/it
+}{}
+
+\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldexpanded}{sl}{
+ <-> ssub * Junicode-TOsF/semiboldexpanded/it
}{}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index 95e0590b7bb..54aa898cc98 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
@@ -75,7 +75,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2024-05-27}%
+\def\ExplFileDate{2024-07-20}%
\begingroup
\def\next{\endgroup}%
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -8385,8 +8385,8 @@ Type H <return> for immediate help}\def~{\errmessage{%
\cs_new:Npn \__clist_remove_all:
{ \exp_after:wN \__clist_remove_all:w \__clist_tmp:w , }
\cs_new:Npn \__clist_remove_all:w #1 , \s__clist_mark , #2 , { \exp_not:n {#1} }
-\cs_generate_variant:Nn \clist_remove_all:Nn { c , NV , cV }
-\cs_generate_variant:Nn \clist_gremove_all:Nn { c , NV , cV }
+\cs_generate_variant:Nn \clist_remove_all:Nn { c , NV , cV , Ne , ce }
+\cs_generate_variant:Nn \clist_gremove_all:Nn { c , NV , cV , Ne , ce }
\cs_new_protected:Npn \clist_reverse:N #1
{ \__kernel_tl_set:Nx #1 { \exp_args:No \clist_reverse:n {#1} } }
\cs_new_protected:Npn \clist_greverse:N #1
@@ -13859,8 +13859,8 @@ Type H <return> for immediate help}\def~{\errmessage{%
{
\bool_if:NTF \l__keys_no_value_bool
{
- \exp_after:wN \__keys_define_code:w
- \l__keys_property_str \s__keys_stop
+ \__keys_define_code:nnn
+ { \use:c { \c__keys_props_root_str \l__keys_property_str } {#1} }
{ \use:c { \c__keys_props_root_str \l__keys_property_str } }
{
\msg_error:nnee { keys } { property-requires-value }
@@ -13869,9 +13869,27 @@ Type H <return> for immediate help}\def~{\errmessage{%
}
{ \use:c { \c__keys_props_root_str \l__keys_property_str } {#1} }
}
-\exp_last_unbraced:NNNNo
- \cs_new:Npn \__keys_define_code:w #1 \c_colon_str #2 \s__keys_stop
- { \tl_if_empty:nTF {#2} }
+\cs_new:Npe \__keys_define_code:nnn
+ {
+ \exp_not:N \exp_after:wN \exp_not:N \__keys_define_code:w
+ \exp_not:N \l__keys_property_str
+ \c_colon_str \c_colon_str
+ \exp_not:N \s__keys_stop
+ }
+\use:e
+ {
+ \cs_new:Npn \exp_not:N \__keys_define_code:w
+ #1 \c_colon_str #2 \c_colon_str #3 \exp_not:N \s__keys_stop
+ }
+ {
+ \tl_if_empty:nTF {#3}
+ { \use_i:nnn }
+ {
+ \tl_if_empty:nTF {#2}
+ { \use_ii:nnn }
+ { \use_iii:nnn }
+ }
+ }
\cs_new_protected:Npn \__keys_bool_set:Nn #1#2
{ \__keys_bool_set:Nnnn #1 {#2} { true } { false } }
\cs_generate_variant:Nn \__keys_bool_set:Nn { c }
@@ -37377,10 +37395,10 @@ Type H <return> for immediate help}\def~{\errmessage{%
{ \text_uppercase:nn {#1} {#2} }
\__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \text_titlecase_first:n }
\cs_new:Npn \tl_mixed_case:n #1
- { \text_titlecase_first:n {#1} }
+ { \text_titlecase_first:n { \text_lowercase:n {#1} } }
\__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \text_titlecase_first:nn }
\cs_new:Npn \tl_mixed_case:nn #1#2
- { \text_titlecase_first:nn {#1} {#2} }
+ { \text_titlecase_first:nn {#1} { \text_lowercase:n {#2} } }
\__kernel_patch_deprecation:nnNNpn { 2022-05-23 } { \token_case_meaning:Nn }
\cs_new:Npn \tl_case:Nn { \token_case_meaning:Nn }
\__kernel_patch_deprecation:nnNNpn { 2022-05-23 } { \token_case_meaning:NnT }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
index 851886310a1..6f417c325c5 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2024-05-27}%
+\def\ExplFileDate{2024-07-20}%
\let\ExplLoaderFileDate\ExplFileDate
\begingroup
\catcode`\_=11
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx
index d7d58039ca2..512497e7a09 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2024-05-27}%
+\def\ExplFileDate{2024-07-20}%
\let\ExplLoaderFileDate\ExplFileDate
\begingroup
\catcode`\_=11
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index cf17f7356be..10c4ecbc700 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2024-05-27}%
+\def\ExplFileDate{2024-07-20}%
\let\ExplLoaderFileDate\ExplFileDate
\ProvidesPackage{expl3}
[%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3debug.def b/Master/texmf-dist/tex/latex/l3kernel/l3debug.def
index 6c0cdc45d0f..000b6dcb41c 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3debug.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3debug.def
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: l3debug.dtx
-\ProvidesExplFile{l3debug.def}{2024-05-27}{}{L3 Debugging support}
+\ProvidesExplFile{l3debug.def}{2024-07-20}{}{L3 Debugging support}
\scan_new:N \s__debug_stop
\cs_new:Npn \__debug_use_i_delimit_by_s_stop:nw #1 #2 \s__debug_stop {#1}
\quark_new:N \q__debug_recursion_tail
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
index 34540214876..4d4876f5607 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
@@ -20,7 +20,7 @@
%%
%% File: l3doc.dtx
\RequirePackage{calc}
-\ProvidesExplClass{l3doc}{2024-05-27}{}
+\ProvidesExplClass{l3doc}{2024-07-20}{}
{L3 Experimental documentation class}
\clist_new:N \g_docinput_clist
\seq_new:N \g_doc_functions_seq
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/lni/lni.cls b/Master/texmf-dist/tex/latex/lni/lni.cls
index 14eb413f8aa..8e8c9fae7e2 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/07/01 v1.9 Official class for submissions to the ``Lecture Notes
+ [2024/07/23 v1.10 Official class for submissions to the ``Lecture Notes
in Informatics'']
\RequirePackage{iftex}\ifluatex\else\pdfoutput=1\fi%
\def\@clearglobaloption#1{%
@@ -291,7 +291,7 @@
\RequirePackage[hang]{footmisc}
\setlength{\footnotemargin}{1em}
\long\def\@makefntext#1{%
- \def\@makefnmark{\rlap{\normalfont\@thefnmark}}%
+ \def\@makefnmark{\rlap{\normalfont\textsuperscript{\@thefnmark}}}%
\ifFN@hangfoot
\bgroup
\setbox\@tempboxa\hbox{%
@@ -380,9 +380,9 @@
\newcommand{\@multiaffil}[1]{%
\ifcsundef{@emailsandorcids#1}{\csgdef{@emailsandorcids#1}{}}{}%
\ifcsempty{@emailsandorcids#1}%
- {\csgappto{@emailsandorcids#1}{%
+ {\protected@csxappto{@emailsandorcids#1}{%
\if\relax\@currEmail\relax\else\email{\@currEmail}\fi\if\relax\@currOrcid\relax\else,\ \orcid{\@currOrcid}\fi}}%
- {\csgappto{@emailsandorcids#1}{%
+ {\protected@csxappto{@emailsandorcids#1}{%
\if\relax\@currEmail\relax\else;\ \email{\@currEmail}\fi\if\relax\@currOrcid\relax\else,\ \orcid{\@currOrcid}\fi}}%
}
@@ -678,6 +678,7 @@
\renewcommand{\headrulewidth}{0.4pt} %Linie unter Kopfzeile
\fi%
\RequirePackage{url}
+\urlstyle{same}
\g@addto@macro{\UrlBreaks}{\UrlOrds}
\RequirePackage{xspace}
\AddToHook{env/document/begin}[lni/loadhyperref]{%
diff --git a/Master/texmf-dist/tex/latex/luwiantype/luwiantype.sty b/Master/texmf-dist/tex/latex/luwiantype/luwiantype.sty
index 8a148f080a5..ea33fb4fb59 100644
--- a/Master/texmf-dist/tex/latex/luwiantype/luwiantype.sty
+++ b/Master/texmf-dist/tex/latex/luwiantype/luwiantype.sty
@@ -1,7 +1,7 @@
%% Copyright 2024 Jonathan Walls
%
% 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/lppl-1-3c.txt
@@ -12,15 +12,16 @@
%
% The Current Maintainer of this work is Jonathan Walls.
%
-% This work consists of the files luwiantype-doc.tex
-% and the derived file LuwianType.sty.
+% 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]
+\ProvidesPackage{luwiantype}[2024/07/15 Luwian Hieroglyph Typing Package]
%Required packages and declarations
\usepackage{fontspec}
diff --git a/Master/texmf-dist/tex/latex/magicwatermark/magicwatermark.sty b/Master/texmf-dist/tex/latex/magicwatermark/magicwatermark.sty
index 7a466628722..d7b86472526 100644
--- a/Master/texmf-dist/tex/latex/magicwatermark/magicwatermark.sty
+++ b/Master/texmf-dist/tex/latex/magicwatermark/magicwatermark.sty
@@ -1,290 +1,452 @@
-%%
-%% This is file `magicwatermark.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% magicwatermark.dtx (with options: `package')
-%%
-%% IMPORTANT NOTICE:
-%%
-%% For the copyright see the source file.
-%%
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from magicwatermark.sty.
-%%
-%% For distribution of the original source see the terms
-%% for copying and modification in the file magicwatermark.dtx.
-%%
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
-\NeedsTeXFormat{LaTeX2e}[2020/10/01]
-\ProvidesPackage{magicwatermark}[2021/12/22 v1.0.1 watermark for ljguo ]
-
-
-\documentclass{ctexart}
-\usepackage{magicwatermark}
-\PageSetup[
- rotate = 30, % 设置旋转角度
- color = red!80, % 设置水å°å†…容颜色
- scale = 6 % 设置比例
-]{
- æ°´å°å†…容
+\ProvidesExplPackage{magicwatermark}{2024/06/11}{1.2A}{magic watermark, author}
+
+\RequirePackage{everypage-1x}
+
+\msg_new:nnn {magicwatermark}{ Unable to parse }
+{
+ Unable~to~parse~this~list~parameter.^^J
+ #1
}
-\Watermark % 全文生效
-\begin{document}
-...
-\end{document}
-\end{lstlisting}
-\documentclass{ctexart}
-\usepackage{magicwatermark}
-\EvenPageSetup[color=cyan,showframe,scale=4]{å¶æ•°é¡µ} % 设置奇数页
-\OddPageSetup[color=purple,showframe,scale=4]{奇数页} % 设置å¶æ•°é¡µ
-\EvenWatermark % 显示水å°
-\OddWatermark
-\begin{document}
-...
-\end{document}
-\end{lstlisting}
-\documentclass{ctexart}
-\usepackage{magicwatermark}
-\PageSetup*{
- \begin{tikzpicture}[remember picture,overlay]
- \node[cyan,scale = 2,shift={(-1,-1)}] at
- (current page.north east){--~\thepage~--};
- \end{tikzpicture}
+
+\msg_new:nnn {magicwatermark}{ Enable TikZ }
+{
+ tikz~option~has~been~disabled,^^J
+ style~will~be~ignored.
}
-\begin{document}
-...
-\Watermark % 该命令之å‰ä¸ç”Ÿæ•ˆ
-\end{document}
-\end{lstlisting}
-\documentclass{ctexart}
-\usepackage{magicwatermark}
-\NewWatermark{one} % 新建两个水å°
-\NewWatermark{two}
-\MyPageSetup[scale=5,color=blue]{one}{æ°´å°å†…容一} % 设置水å°
-\MyPageSetup[scale=5,color=red]{two}{æ°´å°å†…容二}
-\begin{document}
-\MyWatermark{one} % 使用第一个水å°
-...
-\newpage
-\ClearWatermark{one} % 清除第一个水å°
-\MyWatermark{two} % 使用第二个水å°
-...
-\end{document}
-\end{lstlisting}
-\RequirePackage{everypage-1x,tikz,xparse,expl3}
-\ExplSyntaxOn
-\tl_new:N \l_mainpage_tl
-\tl_new:N \l_evenpage_tl
-\tl_new:N \l_oddpage_tl
-\tl_new:N \g_case_tl
-\tl_new:N \g_clear_all_tl
-\msg_new:nnn{clear}{not~have}{I~can~not~find~the~"\clear"~watermark~!}
-\NewDocumentCommand{\PageSetup}{sO{}+m}
+
+\msg_new:nnn {magicwatermark}{ Load TikZ }
{
- \IfBooleanTF{#1}
+ Please~load~tikz~package~before~magicwatermark.
+}
+
+\seq_new:N \l__mw_tmpa_seq
+\seq_new:N \l__mw_tmpb_seq
+\seq_new:N \l__mw_tmpc_seq
+\seq_new:N \l__mw_tmpd_seq
+
+
+\int_new:N \l__mw_tmpa_int
+\int_new:N \l__mw_tmpb_int
+\int_new:N \l__mw_tmpc_int
+\int_new:N \l__mw_tmpd_int
+\int_new:N \l__mw_tmpe_int
+
+\clist_new:N \l__mw_list_arabic_number_clist
+\clist_new:N \l__mw_list_roman_number_clist
+\clist_new:N \l__mw_list_range_clist
+\clist_new:N \l__mw_list_expression_clist
+
+
+
+
+\clist_new:N \l__mw_tmpa_clist
+\clist_new:N \l__mw_tmpb_clist
+\clist_new:N \l__mw_tmpc_clist
+
+
+\tl_new:N \l__mw_tmpa_tl
+\tl_new:N \l__mw_tmpb_tl
+\tl_new:N \l__mw_tmpc_tl
+\tl_new:N \g__mw_list_tl
+
+\tl_new:N \g__mw_style_tl
+\tl_new:N \g__mw_content_tl
+
+\bool_new:N \g__mw_is_append_bool
+\bool_set_false:N \g__mw_is_append_bool
+\bool_new:N \g__mw_tikz_bool
+\bool_set_true:N \g__mw_tikz_bool
+
+\regex_const:Nn \c__mw_arabic_numbers_regex { ^\d+$ }
+\regex_const:Nn \c__mw_roman_numbers_regex { ^[ivxlcdm]+$ }
+
+
+
+\int_new:N \g__mw_last_page_int
+
+\AtBeginDocument{
+ \int_compare:nTF { \@abspage@last = \number\maxdimen }
+ {
+ \int_gset:Nn \g__mw_last_page_int { 10 }
+ }
+ {
+ \int_gset:Nn \g__mw_last_page_int { \@abspage@last }
+ }
+}
+
+\cs_new_protected:Npn \__mw_clist_deduplicate:N #1
+{
+ \group_begin:
+ \clist_clear:N \l_tmpa_clist
+ \clist_map_inline:Nn #1
+ {
+ \clist_if_in:NnF \l_tmpa_clist { ##1 }
+ { \clist_put_right:Nn \l_tmpa_clist { ##1 } }
+ }
+ \clist_gset_eq:NN #1 \l_tmpa_clist
+ \group_end:
+}
+
+
+\cs_new:Npn \__mw_list_parser_aux:n #1 {
+
+ \clist_clear:N \l__mw_list_arabic_number_clist
+ \clist_clear:N \l__mw_list_roman_number_clist
+ \clist_clear:N \l__mw_list_range_clist
+ \clist_clear:N \l__mw_list_expression_clist
+
+ % split by commas
+ \group_begin:
+ \seq_set_split:Nnn \l__mw_tmpa_seq { , } { #1 }
+ \seq_map_inline:Nn \l__mw_tmpa_seq
+ {
+ \tl_if_eq:nnTF { ##1 } { odd } % odd, push 2X + 1
{
- \tl_set:Nn \l_mainpage_tl{#3}
+ \clist_gput_right:Nn \l__mw_list_expression_clist { 2X + 1 }
}
{
- \tl_set:Nn \l_mainpage_tl
+ \tl_if_eq:nnTF { ##1 } { even } % even, push 2X
+ {
+ \clist_gput_right:Nn \l__mw_list_expression_clist { 2X }
+ }
+ {
+ \tl_if_in:nnTF { ##1 } { X } % expression, push ##1
{
- \group_begin:
- \keys_set:nn{watermark}{#2}
- \begin{tikzpicture}[remember~picture,overlay]
- \node
- [
- scale = \fp_use:N\l_scale_fp,
- opacity = \fp_use:N\l_opacity_fp,
- shift = \tl_use:N\l_shift_tl,
- color = \tl_use:N \l_color_tl,
- rotate = \fp_use:N \l_rotate_fp,
- align = \tl_use:N \l_align_tl,
- \bool_if:NTF \l_showframe_bool{draw}{},
- ]
- at(current~page.center){#3};
- \end{tikzpicture}
- \group_end:
+ \clist_gput_right:Nn \l__mw_list_expression_clist { ##1 }
}
+ {
+ \tl_if_in:nnTF { ##1 } { - } % range, push ##1
+ {
+ \clist_gput_right:Nn \l__mw_list_range_clist { ##1 }
+ }
+ {
+ \__mw_if_arabic_number:nTF { ##1 }
+ {
+ \clist_gput_right:Nn \l__mw_list_arabic_number_clist { ##1 }
+ }
+ {
+ \__mw_if_roman_number:nTF { ##1 }
+ {
+ \clist_gput_right:Nn \l__mw_list_roman_number_clist { ##1 }
+ }
+ {
+ % error
+ \msg_error:nnn {magicwatermark}{ Unable to parse }
+ {
+ Error~list~parameter~``##1''.
+ }
+ }
+ }
+ }
+ }
+ }
}
+ }
+ \group_end:
}
-\NewDocumentCommand{\Watermark}{}
+
+\prg_new_conditional:Npnn \__mw_if_arabic_number:n #1 { p, T, F, TF }
{
- \AddEverypageHook{\tl_use:N \l_mainpage_tl}
+ \regex_match:NnTF \c__mw_arabic_numbers_regex { #1 }
+ {
+ \prg_return_true:
+ }
+ {
+ \prg_return_false:
+ }
}
-\NewDocumentCommand{\EvenPageSetup}{sO{}+m}
+
+\prg_new_conditional:Npnn \__mw_if_roman_number:n #1 { p, T, F, TF }
{
- \IfBooleanTF{#1}
+ \regex_match:NnTF \c__mw_roman_numbers_regex { #1 }
+ {
+ \prg_return_true:
+ }
+ {
+ \prg_return_false:
+ }
+}
+
+\prg_generate_conditional_variant:Nnn \__mw_if_arabic_number:n { x } {p, T, F, TF}
+\prg_generate_conditional_variant:Nnn \__mw_if_roman_number:n { x } {p, T, F, TF}
+
+
+\cs_new:Npn \__mw_list_parser_for_arabic_number:n #1 {
+ % arabic number
+ \fp_compare:nTF { #1 <= \g__mw_last_page_int && #1 > 0 }
+ {
+ \clist_put_right:Nn \l__mw_tmpa_clist { #1 }
+ }
+ {
+ % error
+ \msg_error:nnn {magicwatermark}{ Unable to parse }
{
- \tl_set:Nn \l_evenpage_tl{#3}
+ Error~list~parameter~``#1''.^^J
+ Error~number~``#1''.
}
+ }
+}
+
+
+
+\cs_new:Npn \__mw_list_parser_for_roman_number:n #1 {
+ % roman number
+ \int_set:Nn \l__mw_tmpa_int { \g__mw_last_page_int - \int_from_roman:n { #1 } + 1 }
+ \fp_compare:nTF
+ {
+ \l__mw_tmpa_int <= \g__mw_last_page_int && \l__mw_tmpa_int > 0
+ }
+ {
+ \clist_put_right:NV \l__mw_tmpa_clist \l__mw_tmpa_int
+ }
+ {
+ % error
+ \msg_error:nnn {magicwatermark}{ Unable to parse }
{
- \tl_set:Nn \l_evenpage_tl
- {
- \group_begin:
- \keys_set:nn{watermark}{#2}
- \begin{tikzpicture}[remember~picture,overlay]
- \node
- [
- scale = \fp_use:N\l_scale_fp,
- opacity = \fp_use:N\l_opacity_fp,
- shift = \tl_use:N\l_shift_tl,
- color = \tl_use:N \l_color_tl,
- rotate = \fp_use:N \l_rotate_fp,
- align = \tl_use:N \l_align_tl,
- \bool_if:NTF \l_showframe_bool{draw}{},
- ]
- at(current~page.center){#3};
- \end{tikzpicture}
- \group_end:
- }
+ Error~list~parameter~``#1''.^^J
+ Error~roman~number~``#1''.
}
+ }
}
-\NewDocumentCommand{\EvenWatermark}{}
-{
- \AddEverypageHook
+
+
+\cs_new:Npn \__mw_list_parser_for_range:n #1 {
+ % range, 1-5, 3-i
+ \seq_set_split:Nnn \l__mw_tmpb_seq { - } { #1 }
+
+ \__mw_if_arabic_number:xTF { \seq_item:Nn \l__mw_tmpb_seq { 1 } }
+ {
+ \int_set:Nn \l__mw_tmpb_int { \seq_item:Nn \l__mw_tmpb_seq { 1 } }
+ }
+ {
+ \__mw_if_roman_number:xTF { \seq_item:Nn \l__mw_tmpb_seq { 1 } }
{
- \int_if_even:nT{\int_use:N \value{page}}
- {
- \tl_use:N \l_evenpage_tl
- }
+ \exp_args:NNx \int_set:Nn \l__mw_tmpb_int
+ {
+ \g__mw_last_page_int - \exp_not:N \int_from_roman:n { \seq_item:Nn \l__mw_tmpb_seq { 1 } } + 1
+ }
}
-}
-\NewDocumentCommand{\OddPageSetup}{sO{}+m}
-{
- \IfBooleanTF{#1}
{
- \tl_set:Nn \l_oddpage_tl{#3}
+ \int_set:Nn \l__mw_tmpb_int { -1 }
+ % error
+ \msg_error:nnn {magicwatermark}{ Unable to parse }
+ {
+ Error~list~parameter~``#1''.^^J
+ Error~range~left~``#1''.
+ }
}
+ }
+
+ \__mw_if_arabic_number:xTF { \seq_item:Nn \l__mw_tmpb_seq { 2 } }
+ {
+ \int_set:Nn \l__mw_tmpc_int { \seq_item:Nn \l__mw_tmpb_seq { 2 } }
+ }
+ {
+ \__mw_if_roman_number:xTF { \seq_item:Nn \l__mw_tmpb_seq { 2 } }
{
- \tl_set:Nn \l_oddpage_tl
+ \exp_args:NNx \int_set:Nn \l__mw_tmpc_int
+ {
+ \g__mw_last_page_int - \exp_not:N \int_from_roman:n { \seq_item:Nn \l__mw_tmpb_seq { 2 } } + 1
+ }
+ }
{
- \group_begin:
- \keys_set:nn{watermark}{#2}
- \begin{tikzpicture}[remember~picture,overlay]
- \node
- [
- scale = \fp_use:N\l_scale_fp,
- opacity = \fp_use:N\l_opacity_fp,
- shift = \tl_use:N\l_shift_tl,
- color = \tl_use:N \l_color_tl,
- rotate = \fp_use:N \l_rotate_fp,
- align = \tl_use:N \l_align_tl,
- \bool_if:NTF \l_showframe_bool{draw}{},
- ]
- at(current~page.center){#3};
- \end{tikzpicture}
- \group_end:
+ \int_set:Nn \l__mw_tmpc_int { -1 }
+ % error
+ \msg_error:nnn {magicwatermark}{ Unable to parse }
+ {
+ Error~list~parameter~``#1''.^^J
+ Error~range~right~``#1''.
+ }
}
+ }
+
+ \fp_compare:nT { \l__mw_tmpb_int > 0 && \l__mw_tmpc_int > 0}
+ {
+ \int_step_inline:nnn
+ { \int_min:nn { \l__mw_tmpb_int } { \l__mw_tmpc_int } }
+ { \int_max:nn { \l__mw_tmpb_int } { \l__mw_tmpc_int } }
+ {
+ \clist_put_right:Nn \l__mw_tmpa_clist { ##1 }
}
+ }
}
-\NewDocumentCommand{\OddWatermark}{}
-{
- \AddEverypageHook
+
+\cs_new:Npn \__mw_list_parser_for_expression:n #1 {
+ \int_zero:N \l__mw_tmpd_int
+ \int_zero:N \l__mw_tmpe_int
+ \group_begin:
+ \tl_set:Nn \l__mw_tmpa_tl { #1 }
+ \regex_replace_all:nnN { (\d+)X } { \1*\c{l__mw_tmpe_int} } \l__mw_tmpa_tl
+ \tl_replace_all:Nnn \l__mw_tmpa_tl { X } { \l__mw_tmpe_int }
+ % \tl_show:N \l__mw_tmpa_tl
+ \int_while_do:nn { \l__mw_tmpd_int < \g__mw_last_page_int }
{
- \int_if_odd:nT{\int_use:N \value{page}}
- {
- \tl_use:N \l_oddpage_tl
- }
+ \int_set:Nn \l__mw_tmpd_int
+ {
+ \fp_eval:n { \l__mw_tmpa_tl }
+ }
+ \clist_gput_right:NV \l__mw_tmpa_clist \l__mw_tmpd_int
+ \int_incr:N \l__mw_tmpe_int
}
+ \group_end:
}
-\NewDocumentCommand{\NewWatermark}{m}
-{
- \tl_new:c {l_#1_tl}
- \tl_put_right:Nn \g_case_tl {{#1}{\tl_clear:c {l_#1_tl}}}
- \tl_put_right:Nn \g_clear_all_tl {\tl_clear:c {l_#1_tl}}
+
+\cs_new_nopar:Npn \__mw_list_parser:nN #1#2 {
+
+ % case 1 -> odd, even
+ % case 2 -> number, 1
+ % case 3 -> roman, i
+ % case 4 -> range, 1-5, 3-ii
+ % case 5 -> expression, 3X + 1
+
+ \__mw_list_parser_aux:n { #1 }
+
+ \clist_clear:N \l__mw_tmpa_clist
+ \clist_map_inline:Nn \l__mw_list_arabic_number_clist
+ {
+ \__mw_list_parser_for_arabic_number:n { ##1 }
+ }
+
+ \clist_map_inline:Nn \l__mw_list_roman_number_clist
+ {
+ \__mw_list_parser_for_roman_number:n { ##1 }
+ }
+
+
+ \clist_map_inline:Nn \l__mw_list_range_clist
+ {
+ \__mw_list_parser_for_range:n { ##1 }
+ }
+
+
+ \clist_map_inline:Nn \l__mw_list_expression_clist
+ {
+ \__mw_list_parser_for_expression:n { ##1 }
+ }
+
+
+ \clist_sort:Nn \l__mw_tmpa_clist {
+ \int_compare:nNnTF { ##1 } > { ##2 }
+ { \sort_return_swapped: }
+ { \sort_return_same: }
+ }
+ \__mw_clist_deduplicate:N \l__mw_tmpa_clist
+ \clist_set_eq:NN #2 \l__mw_tmpa_clist
}
-\NewDocumentCommand{\MyPageSetup}{O{} m +m}
-{
- \tl_set:cn {l_#2_tl}
+
+
+\cs_new:Npn \__mw_parser:nN #1#2 {
+ \clist_clear:N #2
+ \tl_if_eq:nnTF { #1 } { * }
+ {
+ \int_step_inline:nnn { 1 } { \g__mw_last_page_int }
{
- \group_begin:
- \keys_set:nn{watermark}{#1}
- \begin{tikzpicture}[remember~picture,overlay]
- \node
- [
- scale = \fp_use:N\l_scale_fp,
- opacity = \fp_use:N\l_opacity_fp,
- shift = \tl_use:N\l_shift_tl,
- color = \tl_use:N \l_color_tl,
- rotate = \fp_use:N \l_rotate_fp,
- align = \tl_use:N \l_align_tl,
- \bool_if:NTF \l_showframe_bool{draw}{},
- ]
- at(current~page.center){#3};
- \end{tikzpicture}
- \group_end:
+ \clist_put_right:Nn #2 { ##1 }
}
+ }
+ {
+ \__mw_list_parser:nN { #1 } #2
+ }
}
-\NewDocumentCommand{\MyWatermark}{m}
+
+
+
+\keys_define:nn { mw / new }
{
- \AddEverypageHook{\tl_use:c {l_#1_tl}}
+ pages .tl_set:N = \g__mw_list_tl,
+ style .tl_set:N = \g__mw_style_tl,
+ % style .code:n = \__mw_parse_style:n { #1 },
+ content .tl_set:N = \g__mw_content_tl,
+ is~append .bool_set:N = \g__mw_is_append_bool,
+ tikz .bool_set:N = \g__mw_tikz_bool
}
-\keys_define:nn{watermark}
-{
- scale.fp_set:N = \l_scale_fp,
- scale.initial:n = 1.0,
- scale.default:n = 1.0,
- opacity.fp_set:N = \l_opacity_fp,
- opacity.initial:n = 0.8,
- opacity.default:n = 0.8,
- shift.tl_set:N = \l_shift_tl,
- shift.initial:n = {(0,0)},
- shift.default:n = {(0,0)},
- color.tl_set:N = \l_color_tl,
- color.initial:n = black,
- color.default:n =black,
- rotate.fp_set:N =\l_rotate_fp,
- rotate.initial:n = 0.0,
- rotate.default:n = 0.0,
- align.tl_set:N = \l_align_tl,
- align.initial:n = center,
- align.default:n = center,
- showframe.bool_set:N = \l_showframe_bool,
- showframe.initial:n = false,
- showframe.default:n = true,
+
+\cs_new:Npn \__mw_parse_style: {
+ \tl_if_empty:NF \g__mw_style_tl
+ {
+ \bool_if:NTF \g__mw_tikz_bool
+ {
+ \IfPackageLoadedTF{tikz}
+ {
+ \tl_set_eq:NN \l__mw_tmpc_tl \g__mw_style_tl
+ }
+ {
+ \msg_error:nn {magicwatermark}{ Load TikZ }
+ }
+ }
+ {
+ \msg_warning:nn {magicwatermark}{ Enable TikZ }
+ }
+ }
}
-\tl_gset:Nn \g_clear_all_tl
+
+\keys_define:nn { mw }
{
- \tl_clear:N \l_mainpage_tl
- \tl_clear:N \l_evenpage_tl
- \tl_clear:N \l_oddpage_tl
+ setup .code:n = \__mw_new_watermark:n {#1}
}
-\tl_gset:Nn \g_case_tl{
- {all}
- {
- \tl_use:N\g_clear_all_tl
- }
- {even}
- {
- \tl_clear:N \l_evenpage_tl
- }
- {odd}
+
+
+\cs_new:Npn \__mw_new_watermark:n #1 {
+ \group_begin:
+ \keys_set:nn { mw / new }{#1}
+
+ % parse style
+ \__mw_parse_style:
+
+ % parse pages
+ \exp_args:NV \__mw_parser:nN \g__mw_list_tl \l__mw_tmpc_clist
+
+ \clist_map_inline:Nn \l__mw_tmpc_clist {
+
+ \bool_if:NTF \g__mw_tikz_bool
+ {
+ \IfPackageLoadedTF{tikz}
+ {
+ \tl_set:Ne \l__mw_tmpb_tl
{
- \tl_clear:N \l_oddpage_tl
+ \exp_not:N \tikz[remember~picture, overlay]
+ {
+ \exp_not:N \node[inner~sep = 0pt, outer~sep = 0pt, opacity = .5, align = left, \exp_not:V \g__mw_style_tl] at (current~page.center)
+ {
+ \exp_not:V \g__mw_content_tl
+ };
+ }
}
- {main}
+ }
+ {
+ \msg_error:nn {magicwatermark}{ Load TikZ }
+ }
+ }
+ {
+ \tl_set:NV \l__mw_tmpb_tl \g__mw_content_tl
+ }
+
+ \bool_if:nTF { \g__mw_is_append_bool && \tl_if_exist_p:c { g__mw_content_ \int_to_roman:n { ##1 } _tl } }
+ {
+ \tl_gput_right:cV { g__mw_content_ \int_to_roman:n { ##1 } _tl } \l__mw_tmpb_tl
+ }
+ {
+ \tl_gset:cV { g__mw_content_ \int_to_roman:n { ##1 } _tl } \l__mw_tmpb_tl
+ }
+ }
+ \group_end:
+}
+
+
+\NewDocumentCommand{\MagicWatermark}{m}{
+ \group_begin:
+ \AtBeginDocument{
+ \keys_set:nn { mw } { #1 }
+ \AddEverypageHook{
+ \tl_if_exist:cT { g__mw_content_ \int_to_roman:n { \value{page} }_tl }
{
- \tl_clear:N \l_mainpage_tl
+ \tl_use:c { g__mw_content_ \int_to_roman:n { \value{page} } _tl }
}
+ }
+ }
+ \group_end:
}
-\NewDocumentCommand{\ClearWatermark}{m}
-{
-\clist_gset:Nn \g_clear_clist{#1}
-\clist_map_variable:NNn \g_clear_clist \clear
-{
- \exp_args:NV \str_case:nVF \clear
- \g_case_tl
- {\msg_warning:nn{clear}{not~have}}
-}
-}
-\ExplSyntaxOff
-\endinput
-%%
-%% End of file `magicwatermark.sty'.
+
+\@onlypreamble\MagicWatermark \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/mailing/mailing.sty b/Master/texmf-dist/tex/latex/mailing/mailing.sty
index a1b445dafce..2dca395590d 100644
--- a/Master/texmf-dist/tex/latex/mailing/mailing.sty
+++ b/Master/texmf-dist/tex/latex/mailing/mailing.sty
@@ -6,18 +6,18 @@
%%
%% mailing.dtx (with options: `package')
%%
-%% Copyright (C) 1999-2004 Johannes Braams. All rights reserved.
+%% Copyright (C) 1999-2024 Johannes Braams. All rights reserved.
%%
%% This file was generated from file(s) of the mailing package.
%% ------------------------------------------------------------
%%
%% It 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
-%% version 2003/12/01 or later.
+%% 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".
%%
@@ -28,17 +28,17 @@
%% without such generated files.
%%
%% The list of all files belonging to the mailing package is
-%% given in the file `manifest.txt.
+%% given in the file `MANIFEST'.
%%
%% The list of derived (unpacked) files belonging to the distribution
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
-%% Copyright (C) 1999-2004 Johannes L. Braams texniek at braams.cistron.nl
+%% Copyright (C) 1999-2024 Johannes L. Braams texniek at texniek.nl
%%
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{mailing}
- [2004/02/20 v1.0b Send letters to multiple addresses]
+ [2024/07/20 v1.0c Send letters to multiple addresses]
\newcommand{\addressfile}[1]{%
\def\M@filename{#1}}
\long\def\mailingtext#1{\global\mailing@text={#1}}
diff --git a/Master/texmf-dist/tex/latex/mathastext/mathastext.sty b/Master/texmf-dist/tex/latex/mathastext/mathastext.sty
index 2bddf362229..4ff41f668ac 100644
--- a/Master/texmf-dist/tex/latex/mathastext/mathastext.sty
+++ b/Master/texmf-dist/tex/latex/mathastext/mathastext.sty
@@ -23,24 +23,21 @@
%%----------------------------------------------------------------
%% Package: mathastext
%% Info: Use the text font in math mode (JFB)
-%% Version: 1.3zb 2023/12/29
+%% Version: 1.4b 2024/07/27
%% License: LPPL 1.3c (http://www.latex-project.org/lppl/lppl-1-3c.txt)
-%% Copyright (C) 2011-2019, 2022, 2023 Jean-Francois Burnol
-%% <jfbu at free dot fr>
+%% Copyright (C) 2011-2019, 2022-2024 Jean-Francois Burnol
+%% <jfbu at free dot fr>
%% Examples of use of mathastext:
%% http://jf.burnol.free.fr/mathastext.html
%% http://jf.burnol.free.fr/showcase.html
%%----------------------------------------------------------------
-\NeedsTeXFormat{LaTeX2e}
+\NeedsTeXFormat{LaTeX2e}[2020/02/02]
\ProvidesPackage {mathastext}
- [2023/12/29 v1.3zb Use the text font in math mode (JFB)]
+ [2024/07/27 v1.4b Use the text font in math mode (JFB)]
\def\mst@infoline#1{\immediate\write\m@ne
{(\space\space\space mathastext:\space\space\space) #1}}
\immediate\write\m@ne{}
\PackageInfo{mathastext}{Starting the math mode configuration\@gobble}
-\newif\ifmst@robust@obsessed@LaTeX@era
-\@ifl@t@r\fmtversion{2019/10/01}{\mst@robust@obsessed@LaTeX@eratrue}{}
-\edef\mst@robustifyingspace{\ifmst@robust@obsessed@LaTeX@era\space\fi}
\let\mst@Umathcharnumdef\Umathcharnumdef
\let\mst@Umathcodenum \Umathcodenum
\let\mst@Umathcode \Umathcode
@@ -75,20 +72,39 @@
\newif\ifmst@XeOrLua
\ifmst@LuaTeX\mst@XeOrLuatrue\fi
\ifmst@XeTeX \mst@XeOrLuatrue\fi
+\ifmst@XeTeX
+ \def\mst@OnlyIfNotMathActive#1{%
+ \ifnum\mst@Umathcodenum`#1="1FFFFF
+ \expandafter\@gobble
+ \else\expandafter\@firstofone
+ \fi
+ }
+\else\ifmst@LuaTeX
+ \def\mst@OnlyIfNotMathActive#1{%
+ \ifnum\mst@Umathcodenum`#1="1000000
+ \expandafter\@gobble
+ \else\expandafter\@firstofone
+ \fi
+ }
+\else
+ \def\mst@OnlyIfNotMathActive#1{%
+ \ifnum\mathcode`#1="8000
+ \expandafter\@gobble
+ \else\expandafter\@firstofone
+ \fi
+ }
+\fi\fi
\def\mst@oti{OT1}
-\def\mst@eui{EU1}\def\mst@euii{EU2}\def\mst@tu{TU}
-\def\mst@OneifUniEnc {%
- \ifx \mst@tmp@enc\mst@tu 1\else
- \ifx \mst@tmp@enc\mst@eui 1\else
- \ifx \mst@tmp@enc\mst@euii 1\else 0\fi\fi\fi }
+\def\mst@tu{TU}
+\def\mst@OneifUniEnc{\ifx\mst@tmp@enc\mst@tu1\else0\fi}
\newif\ifmst@goahead
\newif\ifmst@abort
\def\mst@enc{\encodingdefault}
\def\mst@fam{\familydefault}
\def\mst@ser{\seriesdefault}
- \def\mst@opsh{\shapedefault} %% will be default shape for operator names
+ \def\mst@opsh{\shapedefault}
\def\mst@bold{\bfdefault}
- \def\mst@ltsh{\shapedefault} %% will be default shape for letters
+ \def\mst@ltsh{\shapedefault}
\edef\mst@greekfont{\familydefault}
\newif\ifmst@italic
\newif\ifmst@frenchmath
@@ -131,25 +147,26 @@
\newif\ifmst@noexclam
\DeclareOption{noexclam}{\mst@noexclamtrue}
\newif\ifmst@asterisk
- \DeclareOption{noasterisk}{\PackageWarningNoLine{mathastext}
- {option `noasterisk\string' is deprecated.^^J\space\space\space
- Check the documentation}}
\DeclareOption{asterisk}{\mst@asterisktrue}
\newif\ifmst@nospecials
\DeclareOption{nospecials}{\mst@nospecialstrue}
-\newif\ifmst@basic % 1.3 to avoid unnecessary patch of amsmath \newmcodes@
+\newif\ifmst@basic
\DeclareOption{basic}{\mst@basictrue
\ExecuteOptions{noparenthesis,nopunctuation,%
noplusnominus,noequal,noexclam,nospecials,nolessnomore}}
\newif\ifmst@nohbar
\DeclareOption{nohbar}{\mst@nohbartrue}
+\newif\ifmst@activedigits
+ \DeclareOption{activedigits}{\mst@activedigitstrue}
\newif\ifmst@nodigits
\DeclareOption{nodigits}{\mst@nodigitstrue}
\newif\ifmst@defaultimath
\DeclareOption{defaultimath}{\mst@defaultimathtrue}
+\newif\ifmst@noletters
+ \DeclareOption{noletters}{\mst@noletterstrue\ExecuteOptions{nohbar,defaultimath}}
\newif\ifmst@mathaccents
\DeclareOption{mathaccents}{\mst@mathaccentstrue}
-\newif\ifmst@unimathaccents % 1.3u
+\newif\ifmst@unimathaccents
\DeclareOption{unimathaccents}{\mst@mathaccentstrue\mst@unimathaccentstrue}
\newif\ifmst@needsymbol
\newif\ifmst@symboldelimiters
@@ -157,7 +174,7 @@
\newif\ifmst@symboldigits
\DeclareOption{symboldigits}{\mst@needsymboltrue\mst@symboldigitstrue}
\newif\ifmst@symbolgreek
-\newif\ifmst@customgreek %% new with 1.3d
+\newif\ifmst@customgreek
\DeclareOption{symbolgreek}{\mst@needsymboltrue\mst@symbolgreektrue
\mst@customgreektrue }
\newif\ifmst@symbolre
@@ -214,6 +231,13 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\DeclareOption{fouriervec}{\mst@fouriervectrue}
\newif\ifmst@subdued
\DeclareOption{subdued}{\mst@subduedtrue}
+\newif\ifmst@everymath
+ \DeclareOption{everymath}{\mst@everymathtrue
+\PackageWarningNoLine{mathastext}{%
+ `everymath\string' will be removed at next major release.\MessageBreak
+ Please report to the author the circumstances\MessageBreak
+ which mandated its use in the present document}%
+}
\def\mst@unicodeminus {2013}
\def\mst@checkoption #1unicodeminus#2\mst@#3\mst@@
{\ifx\\#3\\\PackageWarningNoLine{mathastext}
@@ -230,7 +254,20 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\DeclareMathAccent{#1}}
\def\mst@normalversionname{normal}%
\def\mst@boldversionname{bold}%
-\newmuskip\mst@exists@muskip %% v 1.15e
+\def\mst@OnlyIfNotSubdued#1{%
+ \ifmst@subdued
+ \ifx\math@version\mst@normalversionname
+ \else
+ \ifx\math@version\mst@boldversionname
+ \else
+ #1%
+ \fi
+ \fi
+ \else
+ #1%
+ \fi
+}%
+\newmuskip\mst@exists@muskip
\newmuskip\mst@forall@muskip
\def\mst@exists@skip{1mu}
\def\mst@forall@skip{.6667mu}
@@ -258,25 +295,37 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\newcommand*\MTexistsdoesskip {\AtBeginDocument {\MTexistsdoesskip }}
\newcommand*\MTnormalforall {\AtBeginDocument {\MTnormalforall }}
\newcommand*\MTforalldoesskip {\AtBeginDocument {\MTforalldoesskip }}
-\newmuskip\mst@prime@muskip %% v 1.2
+\newmuskip\mst@prime@muskip
\def\mst@prime@skip{.5mu}
\ifmst@italic\ifmst@frenchmath\else\def\mst@prime@skip{0mu}\fi\fi
+\def\mst@tmp#1{%
+\def\mst@mathactivateprime{%
+ \ifnum\catcode`#1=\active
+ \@ifundefined{active@char#1}
+ {}
+ {\mst@do@activecase #1{}{\mst@active@math@prime}}%
+ \else
+ \mst@@mathactivate #1{}{\mst@active@math@prime}%
+ \fi
+}%
+\def\mst@undo@mathactivateprime{\mst@mathdeactivate#1{"8000}}%
+}\expandafter\mst@tmp\string'
\def\mst@active@math@prime{\sp\bgroup\mskip\mst@prime@muskip\prim@s}
-{\catcode`\'=12
-\gdef\mst@@modifyprime{\mst@mathactivate'{}\mst@active@math@prime}}
-\newcommand*\MTnormalprime {\let\mst@modifyprime\@empty }
-\newcommand*\MTprimedoesskip {\let\mst@modifyprime\mst@@modifyprime}
-\ifmst@subdued
- \MTnormalprime
+\ifmst@everymath
+ \newcommand*\MTnormalprime {\let\mst@modifyprime\@empty}
+ \newcommand*\MTprimedoesskip{\let\mst@modifyprime\mst@mathactivateprime}%
+ \AtBeginDocument{%
+ \everymath\expandafter
+ {\the\everymath \mst@modifyprime \MTnormalprime}%
+ \everydisplay\expandafter
+ {\the\everydisplay \mst@modifyprime \MTnormalprime}%
+ \MTprimedoesskip
+ }
\else
- \MTprimedoesskip
+ \newcommand*\MTnormalprime {\mst@undo@mathactivateprime}
+ \newcommand*\MTprimedoesskip{\mst@mathactivateprime}
+ \AtBeginDocument{\MTprimedoesskip}
\fi
-\AtBeginDocument{%
- \everymath\expandafter
- {\the\everymath \mst@modifyprime \MTnormalprime}%
- \everydisplay\expandafter
- {\the\everydisplay \mst@modifyprime \MTnormalprime}%
-}
\newcommand*\MTexistsskip[1]{\edef\mst@exists@skip{#1}%
\mst@exists@muskip\mst@exists@skip\relax}
\newcommand*\MTforallskip[1]{\edef\mst@forall@skip{#1}%
@@ -290,47 +339,131 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\let\mathastextforallskip\MTforallskip
\let\mathastextprimeskip\MTprimeskip
\ifmst@noparen\else
-\AtBeginDocument{%
- \@ifundefined{resetMathstrut@}{% nothing to do, no amsmath
- }{% amsmath loaded, and possibly patched by things such as lualatex-math
- \let\mst@savedresetMathstrut@\resetMathstrut@
- \ifx\mst@the\the % means that \MTnonlettersobeymathxx was used in preamble
- \let\mst@the\@gobble\MTnonlettersobeymathxx
- \fi}}
+\AtEndOfPackage{%
+ \AtBeginDocument{%
+ \@ifundefined{resetMathstrut@}
+ {}%
+ {%
+ \let\mst@savedresetMathstrut@\resetMathstrut@
+ \ifx\mst@the\the
+ \let\mst@the\@gobble
+ \MTnonlettersobeymathxx
+ \fi
+ }%
+ }%
+}%
\fi
-\newtoks\mst@do@nonletters
-\newtoks\mst@do@easynonletters
-\newtoks\mst@do@az
-\newtoks\mst@do@AZ
-\let\mst@the\@gobble
-\newcommand*\MTnonlettersdonotobeymathxx{%
- \ifx\mst@the\@gobble
+\def\mst@magic@v #1#2#3#4#5{#1#3#4}
+\def\mst@magic@vi #1#2#3#4#5#6{#1#2#4#5}
+\def\mst@fork{\ifmmode\mst@magic@v\fi\@thirdofthree}
+\def\mst@safefork{\ifmmode\if@safe@actives\else\mst@magic@vi\fi\fi\@thirdofthree}
+\def\mst@do@activecase#1#2#3{%
+ \ifx\relax #2\relax\mathcode`#1=`#1\relax\else\mathcode`#1=#3\relax\fi
+ \ifmst@everymath\else\@ifundefined{mst@hackedshorthand@#1}{\fi
+ \expandafter\let\csname mst@orig@user@active#1\expandafter\endcsname
+ \csname user@active#1\endcsname
+ \expandafter\let\csname mst@orig@normal@char#1\expandafter\endcsname
+ \csname normal@char#1\endcsname
+ \ifmst@everymath\else}{}\fi
+ \def\mst@tmp##1##2{\def##1{\mst@fork{#2}{#3}##2}}%
+ \expandafter\mst@tmp\csname user@active#1\expandafter\endcsname
+ \csname mst@orig@user@active#1\endcsname
+ \def\mst@tmp##1##2{\def##1{\mst@safefork{#2}{#3}##2}}%
+ \expandafter\mst@tmp\csname normal@char#1\expandafter\endcsname
+ \csname mst@orig@normal@char#1\endcsname
+ \ifmst@everymath
\else
- \@ifundefined{mst@savedresetMathstrut@}{}{%
- \PackageInfo{mathastext}{restoring for this group or environment
- the original\MessageBreak
- amsmath \protect\resetMathstrut@}%
- \let\resetMathstrut@\mst@savedresetMathstrut@}%
+ \expandafter\let\csname mst@hackedshorthand@#1\endcsname\@empty
\fi
- \let\mst@the\@gobble
-}%
-\def\mst@OnlyIfNotSubdued#1{%
- \ifmst@subdued
- \ifx\math@version\mst@normalversionname
- \else
- \ifx\math@version\mst@boldversionname
- \else
- #1%
- \fi
- \fi
+}
+\begingroup
+ \catcode`\~=\active
+ \def\x{%
+\endgroup
+\ifmst@everymath
+ \def\mst@@mathactivate##1##2##3{%
+ \begingroup
+ \lccode`~=`##1
+ \lccode`##1=`##1
+ \lowercase{\endgroup
+ \mathcode`##1="8000
+ \def~{##2##3}%
+ }%
+ }%
+\else
+ \def\mst@@mathactivate##1##2##3{%
+ \begingroup
+ \lccode`~=`##1
+ \lccode`##1=`##1
+ \lowercase{\endgroup
+ \mathcode`##1="8000
+ \@ifundefined{mst@prioractivemeaning@##1}
+ {\expandafter\let
+ \csname mst@prioractivemeaning@##1\endcsname ~}
+ {}%
+ \def~{\ifmmode##2##3\else##1\fi}%
+ }%
+ }%
+\fi
+}\x
+\def\mst@mathactivate#1#2#3{%
+ \ifnum\catcode`#1=\active
+ \@ifundefined{active@char#1}{}{\mst@do@activecase #1{#2}{#3}}%
\else
- #1%
+ \mst@OnlyIfNotMathActive{#1}{\mst@@mathactivate #1{#2}{#3}}%
\fi
+}
+\ifmst@everymath
+\else
+\def\mst@mathdeactivate#1#2{%
+ \mathcode`#1=#2\relax
+ \@ifundefined{active@char#1}
+ {\@ifundefined{mst@prioractivemeaning@#1}
+ {}%
+ {\mst@restoreactivemeaning#1%
+ \expandafter\let\csname mst@prioractivemeaning@#1\endcsname\relax}%
+ }
+ {\@ifundefined{mst@hackedshorthand@#1}
+ {}
+ {\expandafter\let\csname user@active#1\expandafter\endcsname
+ \csname mst@orig@user@active#1\endcsname
+ \expandafter\let\csname normal@char#1\expandafter\endcsname
+ \csname mst@orig@normal@char#1\endcsname
+ \expandafter\let\csname mst@hackedshorthand@#1\endcsname\relax
+ }%
+ }%
}%
-\def\mst@nonlettersobeymathxx{%
- \ifx\mst@the\the
- \else
- \@ifundefined{mst@savedresetMathstrut@}{}{%
+\def\mst@restoreactivemeaning#1{%
+ \begingroup
+ \lccode`~=`#1
+ \lccode`#1=`#1
+ \lowercase{\endgroup
+ \expandafter\let\expandafter~\csname mst@prioractivemeaning@#1\endcsname
+ }%
+}
+\fi
+\newtoks\mst@do@nonletters
+\ifmst@everymath
+\else
+ \newtoks\mst@undo@nonletters
+\fi
+\ifmst@everymath
+ \def\mst@addtodo@nonletters#1#2#3{\mst@do@nonletters\expandafter
+ {\the\mst@do@nonletters\mst@mathactivate#1#2#3}%
+ }%
+\else
+ \def\mst@addtodo@nonletters#1#2#3{\mst@do@nonletters\expandafter
+ {\the\mst@do@nonletters\mst@mathactivate#1#2#3}%
+ \edef\mst@tmp{\noexpand\mst@mathdeactivate#1{\the\mathcode`#1}}%
+ \mst@undo@nonletters\expandafter\expandafter\expandafter
+ {\expandafter\mst@tmp\the\mst@undo@nonletters}%
+ }%
+\fi
+\let\mst@the\@gobble
+\def\mst@redefine@resetMathstrut@{%
+ \@ifundefined{mst@savedresetMathstrut@}
+ {}
+ {%
\ifmst@symboldelimiters
\def\resetMathstrut@{%
\setbox\z@\hbox{\the\textfont\symmtpsymbol\char40
@@ -343,117 +476,117 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\the\textfont\symoperators\char40}%
\ht\Mathstrutbox@\ht\z@ \dp\Mathstrutbox@\dp\z@}%
\fi
- \PackageInfo{mathastext}{\string\resetMathstrut@\space
- from amsmath replaced for this\MessageBreak group or environment}}%
- \fi
- \let\mst@the\the
+ \PackageInfo{mathastext}{\string\resetMathstrut@\space
+ from amsmath replaced for this\MessageBreak group or environment}%
+ }%
}%
-\newcommand*\MTnonlettersobeymathxx
- {\mst@OnlyIfNotSubdued\mst@nonlettersobeymathxx}%
-\newcommand*\MTeasynonlettersdonotobeymathxx{\let\mst@theeasy\@gobble}%
-\def\mst@easynonlettersobeymathxx{\let\mst@theeasy\the}%
-\newcommand*\MTeasynonlettersobeymathxx
- {\mst@OnlyIfNotSubdued\mst@easynonlettersobeymathxx}%
-\MTeasynonlettersobeymathxx % no-op here if subdued mode
-\def\mst@mathactiveletters{\let\mst@thef\the \let\mst@theF\the}%
-\newcommand*\MTmathactiveletters
- {\mst@OnlyIfNotSubdued\mst@mathactiveletters}%
-\MTmathactiveletters % no-op here if subdued mode
-\def\mst@mathactiveLetters{\let\mst@theF\the}%
-\newcommand*\MTmathactiveLetters
- {\mst@OnlyIfNotSubdued\mst@mathactiveLetters}%
-\newcommand*\MTmathstandardletters{\let\mst@thef\@gobble \let\mst@theF\@gobble}%
-\newcommand*\MTicinmath{%
- \MTmathactiveletters
- \def\mst@itcorr{\ifnum\fam=\m@ne\/\fi}%
- \let\mst@ITcorr\mst@itcorr}
-\newcommand*\MTICinmath{%
- \MTmathactiveLetters
- \def\mst@ITcorr{\ifnum\fam=\m@ne\/\fi}}
-\newcommand*\MTnoicinmath{\let\mst@itcorr\@empty\let\mst@ITcorr\@empty}
-\newcommand*\MTnoICinmath{\let\mst@ITcorr\@empty}
-\newcommand*\MTicalsoinmathxx{%
- \ifx\mst@itcorr\@empty\else\def\mst@itcorr{\/}\fi
- \ifx\mst@ITcorr\@empty\else\def\mst@ITcorr{\/}\fi}
-\newcommand*\MTsetmathskips[3]{%
- \@namedef{mst@before#1}{\ifnum\fam=\m@ne\mskip#2\relax\fi }%
- \@namedef{mst@after#1}{\ifnum\fam=\m@ne\mskip#3\relax\fi }%
-}
-\newcommand*\MTunsetmathskips[1]{%
- \@namedef{mst@before#1}{}%
- \@namedef{mst@after#1}{}%
-}
-\def\mst@magic@v #1#2#3#4#5{#1#3#4}
-\def\mst@magic@vi #1#2#3#4#5#6{#1#2#4#5}
-\def\mst@fork{\ifmmode\mst@magic@v\fi\@thirdofthree}
-\def\mst@safefork{\ifmmode\if@safe@actives\else\mst@magic@vi\fi\fi\@thirdofthree}
-\def\mst@do@activecase#1#2#3{% #1 is a category 11 or 12 character token
- \@ifundefined{active@char#1}{}{%
- \ifcat #1a\mathcode`#1=#2\else
- \ifx\relax #2\relax\mathcode`#1=`#1 \else\mathcode`#1=#3\fi\fi
- \expandafter\expandafter\expandafter\let\expandafter\expandafter
- \csname mst@orig@user@active#1\endcsname
- \csname user@active#1\endcsname
- \expandafter\expandafter\expandafter\let\expandafter\expandafter
- \csname mst@orig@normal@char#1\endcsname
- \csname normal@char#1\endcsname
- \ifcat #1a%
- \expandafter\edef\csname user@active#1\endcsname
- {\noexpand\mst@fork {{#2\noexpand#3}}{}\expandafter
- \noexpand\csname mst@orig@user@active#1\endcsname
- }%
- \expandafter\edef\csname normal@char#1\endcsname
- {\noexpand\mst@safefork {{#2\noexpand#3}}{}\expandafter
- \noexpand\csname mst@orig@normal@char#1\endcsname
- }%
+\def\mst@restore@resetMathstrut@{%
+ \@ifundefined{mst@savedresetMathstrut@}{}{%
+ \PackageInfo{mathastext}{restoring for this group or environment
+ the original\MessageBreak
+ amsmath \protect\resetMathstrut@}%
+ \let\resetMathstrut@\mst@savedresetMathstrut@}%
+}%
+\ifmst@everymath
+ \newcommand*\MTnonlettersobeymathxx{%
+ \mst@OnlyIfNotSubdued{%
+ \ifx\mst@the\the
+ \else
+ \mst@redefine@resetMathstrut@
+ \fi
+ \let\mst@the\the
+ }%
+ }%
+ \newcommand*\MTnonlettersdonotobeymathxx{%
+ \ifx\mst@the\@gobble
\else
- \expandafter\edef\csname user@active#1\endcsname
- {\noexpand\mst@fork {#2}\noexpand#3\expandafter
- \noexpand\csname mst@orig@user@active#1\endcsname
- }%
- \expandafter\edef\csname normal@char#1\endcsname
- {\noexpand\mst@safefork {#2}\noexpand#3\expandafter
- \noexpand\csname mst@orig@normal@char#1\endcsname
- }%
- \fi}}
-\begingroup
- \catcode`\~=\active
- \def\x{\endgroup
- \def\mst@mathactivate##1##2##3{% ##1 guaranteed of cat 11 or 12
- \begingroup
- \lccode`~=`##1
- \lccode`##1=`##1
- \lowercase{\endgroup
- \ifnum\catcode`##1=\active
- \mst@do@activecase ##1{##2}##3%
- % careful as ##2 is empty in the asterisk and
- % prime case!
- \else
- \mathcode`##1="8000
- % version 1.3 adds the possibility of extra skips around letters,
- % (only if non catcode active at the time of use).
- \ifcat##1a\edef~{% extra braces for a^b for example
- {\expandafter\noexpand\csname mst@before##1\endcsname
- ##2\noexpand##3%
- \expandafter\noexpand\csname mst@after##1\endcsname}}%
- \else\def~{##2##3}\fi
- \fi}}}
-\x
-\def\mst@addtodo@nonletters#1#2#3{%
- % #1 will be of cat 11 or 12.
- % #2 is empty for asterisk and right quote
- \mst@do@nonletters\expandafter
- {\the\mst@do@nonletters \mst@mathactivate#1{#2}#3}%
-}
-\def\mst@addtodo@easynonletters#1#2{% #1 is a one char control sequence
- \mst@do@easynonletters\expandafter{\the\mst@do@easynonletters\mathcode`#1=#2}%
-}
-\def\mst@addtodo@az#1#2{%
- \mst@do@az\expandafter{\the\mst@do@az\mst@mathactivate#1#2\mst@itcorr}
-}
-\def\mst@addtodo@AZ#1#2{%
- \mst@do@AZ\expandafter{\the\mst@do@AZ\mst@mathactivate#1#2\mst@ITcorr}%
-}
+ \mst@restore@resetMathstrut@
+ \fi
+ \let\mst@the\@gobble
+ }%
+\else
+ \newcommand*\MTnonlettersobeymathxx{%
+ \mst@OnlyIfNotSubdued{%
+ \AtBeginDocument{\MTnonlettersobeymathxx}%
+ }%
+ }%
+ \newcommand*\MTnonlettersdonotobeymathxx{%
+ \AtBeginDocument{\MTnonlettersdonotobeymathxx}%
+ }%
+ \AtBeginDocument{%
+ \renewcommand*\MTnonlettersobeymathxx{%
+ \mst@OnlyIfNotSubdued{%
+ \the\mst@do@nonletters
+ \ifx\mst@the\the
+ \else
+ \mst@redefine@resetMathstrut@
+ \fi
+ \let\mst@the\the
+ }%
+ }%
+ \renewcommand*\MTnonlettersdonotobeymathxx{%
+ \the\mst@undo@nonletters
+ \ifx\mst@the\@gobble
+ \else
+ \mst@restore@resetMathstrut@
+ \fi
+ \let\mst@the\@gobble
+ }%
+ }%
+\fi
+\newtoks\mst@do@easynonletters
+\ifmst@everymath
+ \newcommand*\MTeasynonlettersdonotobeymathxx{\let\mst@theeasy\@gobble}%
+ \newcommand*\MTeasynonlettersobeymathxx{%
+ \mst@OnlyIfNotSubdued{\let\mst@theeasy\the}%
+ }%
+ \MTeasynonlettersobeymathxx
+\else
+ \newtoks\mst@undo@easynonletters
+ \newcommand*\MTeasynonlettersdonotobeymathxx{\the\mst@undo@easynonletters}
+ \newcommand*\MTeasynonlettersobeymathxx{%
+ \mst@OnlyIfNotSubdued{\the\mst@do@easynonletters}%
+ }%
+ \AtEndOfPackage{\MTeasynonlettersobeymathxx}%
+\fi
+\ifmst@everymath
+ \def\mst@addtodo@easynonletters#1#2{%
+ \mst@do@easynonletters\expandafter{%
+ \the\mst@do@easynonletters
+ \mst@OnlyIfNotMathActive{#1}{\mathcode`#1=#2}%
+ }%
+ }%
+ \def\mst@addtodo@easynonletters@U#1#2{%
+ \mst@do@easynonletters\expandafter{%
+ \the\mst@do@easynonletters
+ \mst@OnlyIfNotMathActive{#1}{\mst@Umathcodenum`#1=#2}%
+ }%
+ }%
+\else
+ \def\mst@addtodo@easynonletters#1#2{%
+ \mst@do@easynonletters\expandafter
+ {\the\mst@do@easynonletters
+ \mst@OnlyIfNotMathActive{#1}{\mathcode`#1=#2}}%
+ \def\mst@tmp##1\relax{%
+ \def\mst@tmp{\mst@OnlyIfNotMathActive{#1}{\mathcode`#1=##1\relax}}%
+ }%
+ \expandafter\mst@tmp\the\mathcode`#1\relax
+ \mst@undo@easynonletters\expandafter\expandafter\expandafter
+ {\expandafter\mst@tmp\the\mst@undo@easynonletters}%
+ }%
+ \def\mst@addtodo@easynonletters@U#1#2{%
+ \mst@do@easynonletters\expandafter{%
+ \the\mst@do@easynonletters
+ \mst@OnlyIfNotMathActive{#1}{\mst@Umathcodenum`#1=#2}%
+ }%
+ \def\mst@tmp##1\relax{%
+ \def\mst@tmp{\mst@OnlyIfNotMathActive{#1}{\mst@Umathcodenum`#1=##1\relax}}%
+ }%
+ \expandafter\mst@tmp\the\mst@Umathcodenum`#1\relax
+ \mst@undo@easynonletters\expandafter\expandafter\expandafter
+ {\expandafter\mst@tmp\the\mst@undo@easynonletters}%
+ }%
+\fi
\ifmst@basic
\else
\ifmst@XeOrLua
@@ -481,7 +614,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
}%
\let\mst@originalnewmcodes@\newmcodes@
\fi
- }% end of AtBeginDocument
+ }%
\else
\AtBeginDocument {%
\ifx\newmcodes@\@undefined\else
@@ -501,9 +634,9 @@ defaultbf,defaultit,defaultsf,defaulttt}}
}%
\let\mst@originalnewmcodes@\newmcodes@
\fi
- }% end of second AtBeginDocument
- \fi % mst@XeOrLua
-\fi % mst@basic
+ }%
+ \fi
+\fi
\newcommand*\MTresetnewmcodes{\ifx\mst@originalnewmcodes@\undefined\else
\let\newmcodes@\mst@originalnewmcodes@\fi}
\newcommand*\MTcustomizenewmcodes{\ifx\mst@originalnewmcodes@\undefined\else
@@ -515,35 +648,42 @@ defaultbf,defaultit,defaultsf,defaulttt}}
{\def\operator@font{\mathgroup\symmtoperatorfont}}
\MTmathoperatorsobeymathxx
\DeclareSymbolFont{mtletterfont}{\mst@enc}{\mst@fam}{\mst@ser}{\mst@ltsh}
-\begingroup
-\catcode`N 12
-\catcode`O 12
-\catcode`D 12
-\catcode`E 12
-\lowercase{\gdef\mst@fixmathfonts@ #1=NODE;#2#3\relax #4\@empty #5}%
- {\ifx#2\empty\else\font\mst@mathfont=#1=base;#2#3\relax#5=\mst@mathfont\fi}
-\lowercase{\gdef\MTfixmathfonts
-{\expandafter\mst@fixmathfonts@
- \fontname\textfont\symmtoperatorfont\relax\relax=NODE;\empty\relax\@empty
- {\textfont\symmtoperatorfont}%
- \expandafter\mst@fixmathfonts@
- \fontname\scriptfont\symmtoperatorfont\relax\relax=NODE;\empty\relax\@empty
- {\scriptfont\symmtoperatorfont}%
- \expandafter\mst@fixmathfonts@
- \fontname\scriptscriptfont\symmtoperatorfont\relax\relax=NODE;\empty\relax\@empty
- {\scriptscriptfont\symmtoperatorfont}%
- \expandafter\mst@fixmathfonts@
- \fontname\textfont\symmtletterfont\relax\relax=NODE;\empty\relax\@empty
- {\textfont\symmtletterfont}%
- \expandafter\mst@fixmathfonts@
- \fontname\scriptfont\symmtletterfont\relax\relax=NODE;\empty\relax\@empty
- {\scriptfont\symmtletterfont}%
- \expandafter\mst@fixmathfonts@
- \fontname\scriptscriptfont\symmtletterfont\relax\relax=NODE;\empty\relax\@empty
- {\scriptscriptfont\symmtletterfont}%
- }%
+\def\mst@fixmathfonts@#1.#2.#3.{%
+\def\mst@fixmathfonts@##1##2#1=##3;##4##5\relax##6\@empty##7{%
+ \ifx##3\empty\else
+ \if"##1%
+ \font\mst@mathfont=##1##2#1=base;##4##5\relax
+ \else
+ \mst@arrrrgh@fixmathfonts##1##2#1=base;##4##5#2\empty#3\relax
+ \fi
+ ##7=\mst@mathfont
+ \fi
}%
-\endgroup
+\def\mst@arrrrgh@fixmathfonts##1#2##2##3#3##4\relax{%
+ \ifx##2\empty
+ \font\mst@mathfont="##1"\relax
+ \else
+ \font\mst@mathfont="##1"#2##2##3#3\relax
+ \fi
+}%
+}%
+\expandafter\mst@fixmathfonts@\detokenize{mode. at.pt.}%
+\def\MTfixmathfonts#1{%
+\def\MTfixmathfonts{%
+ \expandafter\mst@fixmathfonts@\fontname\textfont\symmtoperatorfont
+ \relax\relax #1=;\empty\relax\@empty{\textfont\symmtoperatorfont}%
+ \expandafter\mst@fixmathfonts@\fontname\scriptfont\symmtoperatorfont
+ \relax\relax #1=;\empty\relax\@empty{\scriptfont\symmtoperatorfont}%
+ \expandafter\mst@fixmathfonts@\fontname\scriptscriptfont\symmtoperatorfont
+ \relax\relax #1=;\empty\relax\@empty{\scriptscriptfont\symmtoperatorfont}%
+ \expandafter\mst@fixmathfonts@\fontname\textfont\symmtletterfont
+ \relax\relax #1=;\empty\relax\@empty{\textfont\symmtletterfont}%
+ \expandafter\mst@fixmathfonts@\fontname\scriptfont\symmtletterfont
+ \relax\relax #1=;\empty\relax\@empty{\scriptfont\symmtletterfont}%
+ \expandafter\mst@fixmathfonts@\fontname\scriptscriptfont\symmtletterfont
+ \relax\relax #1=;\empty\relax\@empty{\scriptscriptfont\symmtletterfont}%
+}}%
+\expandafter\MTfixmathfonts\expandafter{\detokenize{mode}}%
\ifmst@LuaTeX
\everymath\expandafter{\the\everymath\mst@fixmathfonts}%
\everydisplay\expandafter{\the\everydisplay\mst@fixmathfonts}%
@@ -567,7 +707,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\let\mst@original@it\mathit
\let\mst@original@sf\mathsf
\let\mst@original@tt\mathtt
-\def\mst@restorealphabets{% for subdued
+\def\mst@restorealphabets{%
\let\mathnormal\mst@original@normal
\let\mathrm\mst@original@rm
\let\mathbf\mst@original@bf
@@ -666,26 +806,31 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\ifmst@selfGreek
\DeclareSymbolFont{mtselfGreekfont}{OT1}{\mst@fam}{\mst@ser}{\mst@greek@ush}
\fi\fi
-\ifmst@needeuler\mst@infoline{will use Euler font; command \string\MTEulerScale}
-\DeclareSymbolFont{mteulervm}{U}{zeur}{m}{n}
-\DeclareSymbolFontAlphabet{\MathEuler}{mteulervm}
-\DeclareMathAlphabet{\MathEulerBold}{U}{zeur}{\mst@bold}{n}
+\ifmst@needeuler
+\mst@infoline{will use Euler font; command \string\MTEulerScale}
+ \DeclareSymbolFont{mteulervm}{U}{zeur}{m}{n}
+ \DeclareSymbolFontAlphabet{\MathEuler}{mteulervm}
+ \DeclareMathAlphabet{\MathEulerBold}{U}{zeur}{\mst@bold}{n}
\fi
\newcommand*\MTEulerScale[1]{\edef\zeu@Scale{#1}}
\let\MathastextEulerScale\MTEulerScale
-\ifmst@needsymbol\mst@infoline{will use Symbol font; command \string\MTSymbolScale}
- \def\psy@scale{1}
- \DeclareSymbolFont{mtpsymbol}{U}{psy}{m}{n}
- \DeclareSymbolFontAlphabet{\MathPSymbol}{mtpsymbol}
-\AtBeginDocument{%
- \DeclareFontFamily{U}{psy}{}%
- \DeclareFontShape{U}{psy}{m}{n}{<->s*[\psy@scale] psyr}{}%
-}
+\ifmst@needsymbol
+ \mst@infoline{will use Symbol font; command \string\MTSymbolScale}
+ \def\psy@scale{1}
+ \DeclareSymbolFont{mtpsymbol}{U}{psy}{m}{n}
+ \DeclareSymbolFontAlphabet{\MathPSymbol}{mtpsymbol}
+ \AtBeginDocument{%
+ \DeclareFontFamily{U}{psy}{}%
+ \DeclareFontShape{U}{psy}{m}{n}{<->s*[\psy@scale] psyr}{}%
+ }
\fi
\newcommand*\MTSymbolScale[1]{\edef\psy@scale{#1}}
\let\MathastextSymbolScale\MTSymbolScale
-\DeclareRobustCommand*\pmvec[1]{\mathord{\stackrel{\raisebox{-.5ex}%
-{\tiny\boldmath$\mathord{\rightarrow}$}}{{}#1}}}
+\protected\def\pmvec#1{%
+ \mathord{\stackrel{\raisebox{-.5ex}{\tiny\boldmath$\mathord{\rightarrow}$}}%
+ {{}#1}%
+ }%
+}
\ifmst@fouriervec
\DeclareFontEncoding{FML}{}{}
\DeclareFontSubstitution{FML}{futm}{m}{it}
@@ -715,40 +860,170 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\let\MathastextupGreek\MTupGreek
\newcommand*\MTgreekfont[1]{\def\mst@greekfont{#1}}
\let\Mathastextgreekfont\MTgreekfont
-\def\mst@DeclareMathLetter #1{%
+\ifmst@noletters
+ \let\MTmathactiveletters\@empty
+ \let\MTmathactiveLetters\@empty
+ \let\MTmathstandardletters\@empty
+\else
+\def\mst@DeclareMathLetter#1#2#3#4#5{%
\DeclareMathSymbol {#1}{\mathalpha}{mtletterfont}{`#1}%
- \expandafter
- \DeclareMathSymbol \csname mst@#1\endcsname{\mathalpha}{mtletterfont}{`#1}%
- \expandafter\mst@addtodo@az\expandafter #1\csname mst@#1\endcsname
+ \DeclareMathSymbol {#4}{\mathalpha}{mtletterfont}{`#1}%
+ \def#2{{#3#4#5\mst@itcorr}}%
+}%
+\@tfor\mst@tmp:=abcdefghijklmnopqrstuvwxyz\do{%
+ \expandafter\expandafter\expandafter\mst@DeclareMathLetter
+ \expandafter\mst@tmp
+ \csname MTcommandletter\mst@tmp\expandafter\endcsname
+ \csname mst@before@\mst@tmp\expandafter\endcsname
+ \csname MTmathcharletter\mst@tmp\expandafter\endcsname
+ \csname mst@after@\mst@tmp\endcsname
}%
-\@tfor\mst@tmp:=abcdefghijklmnopqrstuvwxyz\do
- {\expandafter\mst@DeclareMathLetter\mst@tmp}%
\ifmst@frenchmath \def\mst@font@tbu{mtoperatorfont}%
\else \def\mst@font@tbu{mtletterfont}%
\fi
-\def\mst@DeclareMathLetter #1{%
+\def\mst@DeclareMathLetter #1#2#3#4#5{%
\DeclareMathSymbol {#1}{\mathalpha}{\mst@font@tbu}{`#1}%
- \expandafter
- \DeclareMathSymbol \csname mst@#1\endcsname{\mathalpha}{\mst@font@tbu}{`#1}%
- \expandafter\mst@addtodo@AZ\expandafter #1\csname mst@#1\endcsname
+ \DeclareMathSymbol {#4}{\mathalpha}{\mst@font@tbu}{`#1}%
+ \def#2{{#3#4#5\mst@ITcorr}}%
+}%
+\@tfor\mst@tmp:=ABCDEFGHIJKLMNOPQRSTUVWXYZ\do{%
+ \expandafter\expandafter\expandafter\mst@DeclareMathLetter
+ \expandafter\mst@tmp
+ \csname MTcommandletter\mst@tmp\expandafter\endcsname
+ \csname mst@before@\mst@tmp\expandafter\endcsname
+ \csname MTmathcharletter\mst@tmp\expandafter\endcsname
+ \csname mst@after@\mst@tmp\endcsname
+}%
+\def\mst@mathactivate@lowercase{%
+ \@tfor\mst@tmp:=abcdefghijklmnopqrstuvwxyz\do{%
+ \expandafter\expandafter\expandafter
+ \mst@mathactivate\expandafter\mst@tmp\csname MTcommandletter\mst@tmp\endcsname{}%
+ }%
+}%
+\def\mst@mathactivate@uppercase{%
+ \@tfor\mst@tmp:=ABCDEFGHIJKLMNOPQRSTUVWXYZ\do{%
+ \expandafter\expandafter\expandafter
+ \mst@mathactivate\expandafter\mst@tmp\csname MTcommandletter\mst@tmp\endcsname{}%
+ }%
+}%
+\def\mst@mathdeactivate@lowercase{%
+ \@tfor\mst@tmp:=abcdefghijklmnopqrstuvwxyz\do{%
+ \expandafter\mathcode\expandafter`\mst@tmp=\csname MTmathcharletter\mst@tmp\endcsname
+ }%
}%
-\@tfor\mst@tmp:=ABCDEFGHIJKLMNOPQRSTUVWXYZ\do
- {\expandafter\mst@DeclareMathLetter\mst@tmp}%
-\let\mst@DeclareMathLetter\relax
+\def\mst@mathdeactivate@uppercase{%
+ \@tfor\mst@tmp:=ABCDEFGHIJKLMNOPQRSTUVWXYZ\do{%
+ \expandafter\mathcode\expandafter`\mst@tmp=\csname MTmathcharletter\mst@tmp\endcsname
+ }%
+}%
+\ifmst@everymath
+\else
+ \def\mst@mathdeactivate@lowercase{%
+ \@tfor\mst@tmp:=abcdefghijklmnopqrstuvwxyz\do{%
+ \expandafter\mathcode\expandafter`\mst@tmp=
+ \csname MTmathcharletter\mst@tmp\endcsname
+ }%
+ }%
+ \def\mst@mathdeactivate@uppercase{%
+ \@tfor\mst@tmp:=ABCDEFGHIJKLMNOPQRSTUVWXYZ\do{%
+ \expandafter\mathcode\expandafter`\mst@tmp=
+ \csname MTmathcharletter\mst@tmp\endcsname
+ }%
+ }%
+\fi
+\def\mst@mathactivateletters{%
+ \mst@mathactivate@lowercase
+ \mst@mathactivate@uppercase
+}%
+\newcommand*\MTmathactiveletters{%
+ \mst@OnlyIfNotSubdued
+ \mst@mathactivateletters
+}%
+\AtEndOfPackage{\MTmathactiveletters}%
+\def\mst@mathactivateLetters{\mst@activate@uppercase}%
+\newcommand*\MTmathactiveLetters{%
+ \mst@OnlyIfNotSubdued
+ \mst@mathactivateLetters
+}%
+\newcommand*\MTmathstandardletters{%
+ \mst@mathdeactivate@lowercase
+ \mst@mathdeactivate@uppercase
+}%
+\fi
+\newcommand*\MTicinmath{%
+ \MTmathactiveletters
+ \def\mst@itcorr{\ifnum\fam=\m@ne\/\fi}%
+ \let\mst@ITcorr\mst@itcorr
+}
+\newcommand*\MTICinmath{%
+ \MTmathactiveLetters
+ \def\mst@ITcorr{\ifnum\fam=\m@ne\/\fi}%
+}
+\newcommand*\MTnoicinmath{\let\mst@itcorr\@empty\let\mst@ITcorr\@empty}
+\newcommand*\MTnoICinmath{\let\mst@ITcorr\@empty}
+\newcommand*\MTicalsoinmathxx{%
+ \ifx\mst@itcorr\@empty\else\def\mst@itcorr{\/}\fi
+ \ifx\mst@ITcorr\@empty\else\def\mst@ITcorr{\/}\fi
+}
+\newcommand*\MTsetmathskips[3]{%
+ \@namedef{mst@before@#1}{\ifnum\fam=\m@ne\mskip#2\relax\fi}%
+ \@namedef{mst@after@#1}{\ifnum\fam=\m@ne\mskip#3\relax\fi}%
+}
+\newcommand*\MTunsetmathskips[1]{%
+ \@namedef{mst@before@#1}{}%
+ \@namedef{mst@after@#1}{}%
+}
+\let\MTmathactivedigits\empty
+\let\MTmathstandarddigits\empty
\ifmst@nodigits\else
-\def\mst@font@tbu{mtoperatorfont}%
-\ifmst@symboldigits \def\mst@font@tbu{mtpsymbol} \fi
-\ifmst@eulerdigits \def\mst@font@tbu{mteulervm} \fi
-\DeclareMathSymbol{0}{\mathalpha}{\mst@font@tbu}{`0}%
-\DeclareMathSymbol{1}{\mathalpha}{\mst@font@tbu}{`1}%
-\DeclareMathSymbol{2}{\mathalpha}{\mst@font@tbu}{`2}%
-\DeclareMathSymbol{3}{\mathalpha}{\mst@font@tbu}{`3}%
-\DeclareMathSymbol{4}{\mathalpha}{\mst@font@tbu}{`4}%
-\DeclareMathSymbol{5}{\mathalpha}{\mst@font@tbu}{`5}%
-\DeclareMathSymbol{6}{\mathalpha}{\mst@font@tbu}{`6}%
-\DeclareMathSymbol{7}{\mathalpha}{\mst@font@tbu}{`7}%
-\DeclareMathSymbol{8}{\mathalpha}{\mst@font@tbu}{`8}%
-\DeclareMathSymbol{9}{\mathalpha}{\mst@font@tbu}{`9}%
+ \def\mst@font@tbu{mtoperatorfont}%
+ \ifmst@symboldigits \def\mst@font@tbu{mtpsymbol}\fi
+ \ifmst@eulerdigits \def\mst@font@tbu{mteulervm}\fi
+ \DeclareMathSymbol{0}{\mathalpha}{\mst@font@tbu}{`0}%
+ \DeclareMathSymbol{1}{\mathalpha}{\mst@font@tbu}{`1}%
+ \DeclareMathSymbol{2}{\mathalpha}{\mst@font@tbu}{`2}%
+ \DeclareMathSymbol{3}{\mathalpha}{\mst@font@tbu}{`3}%
+ \DeclareMathSymbol{4}{\mathalpha}{\mst@font@tbu}{`4}%
+ \DeclareMathSymbol{5}{\mathalpha}{\mst@font@tbu}{`5}%
+ \DeclareMathSymbol{6}{\mathalpha}{\mst@font@tbu}{`6}%
+ \DeclareMathSymbol{7}{\mathalpha}{\mst@font@tbu}{`7}%
+ \DeclareMathSymbol{8}{\mathalpha}{\mst@font@tbu}{`8}%
+ \DeclareMathSymbol{9}{\mathalpha}{\mst@font@tbu}{`9}%
+ \ifmst@activedigits
+ \def\mst@DeclareMathDigit #1#2#3{%
+ \DeclareMathSymbol{#3}{\mathalpha}{\mst@font@tbu}{`#1}%
+ \def#2{#3}%
+ }%
+ \@tfor\mst@tmp:=0123456789\do{%
+ \expandafter\expandafter\expandafter\mst@DeclareMathDigit
+ \expandafter\mst@tmp
+ \csname MTcommanddigit\romannumeral\mst@tmp\expandafter\endcsname
+ \csname MTmathchardigit\romannumeral\mst@tmp\endcsname
+ }%
+ \def\mst@mathactivatedigits{%
+ \@tfor\mst@tmp:=0123456789\do{%
+ \expandafter\expandafter\expandafter\mst@mathactivate
+ \expandafter\mst@tmp\csname MTcommanddigit\romannumeral\mst@tmp\endcsname{}%
+ }%
+ }%
+ \def\MTmathactivedigits{\mst@OnlyIfNotSubdued\mst@mathactivatedigits}%
+ \MTmathactivedigits
+ \ifmst@everymath
+ \def\MTmathstandarddigits{%
+ \@tfor\mst@tmp:=0123456789\do{%
+ \expandafter\mathcode\expandafter`\mst@tmp
+ =\csname MTmathchardigit\romannumeral\mst@tmp\endcsname
+ }%
+ }%
+ \else
+ \def\MTmathstandarddigits{%
+ \@tfor\mst@tmp:=0123456789\do{%
+ \expandafter\mathcode\expandafter`\mst@tmp
+ =\csname MTmathchardigit\romannumeral\mst@tmp\endcsname
+ }%
+ }%
+ \fi
+ \fi
\fi
\ifmst@symboldelimiters
\def\mst@font@tbu{mtpsymbol}%
@@ -765,52 +1040,66 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\DeclareMathSymbol{\mst@varfam@question}{\mathalpha}{\mst@font@tbu}{"3F}%
\expandafter\mst@addtodo@nonletters\string?\mathclose\mst@varfam@question
\fi
-\def\mst@@doasterisk{\let\ast\mst@ast\mst@mathactivate*{}\mst@ast}%
-\newcommand*\MTnormalasterisk {\let\mst@doasterisk\relax}
-\newcommand*\MTactiveasterisk {\let\mst@doasterisk\mst@@doasterisk}
+\let\MTnormalasterisk\empty
+\let\MTactiveasterisk\empty
\ifmst@asterisk\mst@infoline{asterisk: \string\ast\space and *}
- \AtBeginDocument{%
- \everymath\expandafter
- {\the\everymath \mst@doasterisk \MTnormalasterisk }%
- \everydisplay\expandafter
- {\the\everydisplay\mst@doasterisk \MTnormalasterisk }}
\ifmst@symbolmisc
- \def\mst@bin@ast{%
- \mathbin{\mathchoice{\raisebox{-.1\height}%
- {\the\textfont\symmtpsymbol\char42}}%
- {\raisebox{-.1\height}%
- {\the\textfont\symmtpsymbol\char42}}%
- {\raisebox{-.1\height}%
- {\the\scriptfont\symmtpsymbol\char42}}%
- {\raisebox{-.1\height}%
- {\the\scriptscriptfont\symmtpsymbol\char42}}}}%
+ \protected\def\mst@bin@ast{\mathbin{\mathchoice
+ {\raisebox{-.1\height}{\the\textfont\symmtpsymbol\char42}}%
+ {\raisebox{-.1\height}{\the\textfont\symmtpsymbol\char42}}%
+ {\raisebox{-.1\height}{\the\scriptfont\symmtpsymbol\char42}}%
+ {\raisebox{-.1\height}{\the\scriptscriptfont\symmtpsymbol\char42}}}%
+ }%
\else
- \def\mst@bin@ast{%
- \mathbin{\mathchoice{\raisebox{-\mst@lowerast}%
- {\the\textfont\symmtoperatorfont\char42}}%
- {\raisebox{-\mst@lowerast}%
- {\the\textfont\symmtoperatorfont\char42}}%
- {\raisebox{-\mst@lowerast}%
- {\the\scriptfont\symmtoperatorfont\char42}}%
- {\raisebox{-\mst@lowerast}%
- {\the\scriptscriptfont\symmtoperatorfont\char42}}}}%
+ \protected\def\mst@bin@ast{\mathbin{\mathchoice
+ {\raisebox{-\mst@lowerast}{\the\textfont\symmtoperatorfont\char42}}%
+ {\raisebox{-\mst@lowerast}{\the\textfont\symmtoperatorfont\char42}}%
+ {\raisebox{-\mst@lowerast}{\the\scriptfont\symmtoperatorfont\char42}}%
+ {\raisebox{-\mst@lowerast}{\the\scriptscriptfont\symmtoperatorfont\char42}}}%
+ }%
\fi
- \def\mst@varfam@ast{\ifnum\fam=\m@ne\mst@bin@ast\else
- \mathbin{\mathchoice{\raisebox{-\mst@lowerast}%
- {\the\textfont\fam\char42}}%
- {\raisebox{-\mst@lowerast}%
- {\the\textfont\fam\char42}}%
- {\raisebox{-\mst@lowerast}%
- {\the\scriptfont\fam\char42}}%
- {\raisebox{-\mst@lowerast}%
- {\the\scriptscriptfont\fam\char42}}}\fi}%
- \MTactiveasterisk
- \DeclareRobustCommand*{\mst@ast}{\mst@bin@ast}
+ \protected\def\mst@varfam@ast{\ifnum\fam=\m@ne
+ \mst@bin@ast
+ \else
+ \mathbin{\mathchoice
+ {\raisebox{-\mst@lowerast}{\the\textfont\fam\char42}}%
+ {\raisebox{-\mst@lowerast}{\the\textfont\fam\char42}}%
+ {\raisebox{-\mst@lowerast}{\the\scriptfont\fam\char42}}%
+ {\raisebox{-\mst@lowerast}{\the\scriptscriptfont\fam\char42}}}%
+ \fi}%
+ \let\mst@ast\mst@bin@ast
\newcommand*\MTlowerast[1]{\def\mst@lowerast{#1}}
\MTlowerast{.3\height}
- \mst@do@easynonletters\expandafter\expandafter\expandafter
- {\expandafter\the\expandafter\mst@do@easynonletters
- \expandafter\def\csname mst@ast \endcsname{\mst@varfam@ast}}
+ \mst@do@easynonletters\expandafter{%
+ \the\mst@do@easynonletters\let\mst@ast\mst@varfam@ast
+ }%
+ \ifmst@everymath
+ \def\mst@@doasterisk {\let\ast\mst@ast\mst@mathactivate*{}\mst@ast}%
+ \def\MTnormalasterisk {\let\mst@doasterisk\relax}
+ \def\MTactiveasterisk {\let\mst@doasterisk\mst@@doasterisk}
+ \MTactiveasterisk
+ \AtBeginDocument{%
+ \everymath\expandafter
+ {\the\everymath \mst@doasterisk \MTnormalasterisk }%
+ \everydisplay\expandafter
+ {\the\everydisplay\mst@doasterisk \MTnormalasterisk }%
+ }%
+ \else
+ \def\MTnormalasterisk{\AtBeginDocument{\MTnormalasterisk}}
+ \def\MTactiveasterisk{\AtBeginDocument{\MTactiveasterisk}}
+ \mst@undo@easynonletters\expandafter{%
+ \the\mst@do@easynonletters\let\mst@ast\mst@bin@ast
+ }%
+ \AtBeginDocument{%
+ \let\mst@orig@abd@ast\ast
+ \edef\MTnormalasterisk{\noexpand\mst@mathdeactivate*{\the\mathcode`\*}%
+ \let\noexpand\ast\noexpand\mst@orig@abd@ast}%
+ \def\MTactiveasterisk{\def\ast{\mst@ast}%
+ \mst@mathactivate*{}\mst@ast
+ }%
+ \MTactiveasterisk
+ }
+ \fi
\fi
\ifmst@nopunct\else\mst@infoline{punctuation\string: \string, \string. \string:
\string; and \string\colon}
@@ -831,7 +1120,13 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\let\mathcomma\mst@varfam@comma
\let\sm@rtcomma\mst@sm@rtcomma
}
- \else % end of decimalcomma branch
+ \ifmst@everymath
+ \else
+ \edef\mst@tmp{\mathchardef\mathcomma=\the\mathcode`\,\relax}%
+ \mst@undo@nonletters\expandafter\expandafter\expandafter
+ {\expandafter\mst@tmp\the\mst@undo@nonletters}%
+ \fi
+ \else
\ifmst@ncccomma
\mst@infoline{loading package ncccomma for `smart comma\string'}
\RequirePackage{ncccomma}%
@@ -851,26 +1146,38 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\let\mathcomma\mst@varfam@comma
\let\NCC@comma\mst@NCC@comma
}
- \else % neither ncccomma nor decimalcomma
+ \ifmst@everymath
+ \else
+ \edef\mst@tmp{\mathchardef\mathcomma=\the\mathcomma\relax}%
+ \mst@undo@nonletters\expandafter\expandafter\expandafter
+ {\expandafter\mst@tmp\the\mst@undo@nonletters}%
+ \fi
+ \else
\expandafter\mst@addtodo@nonletters\string,\mathpunct\mst@varfam@comma
\fi\fi
\DeclareMathSymbol{.}{\mathord}{\mst@font@tbu}{"2E}
\DeclareMathSymbol{\mst@varfam@dot}{\mathalpha}{\mst@font@tbu}{"2E}
\mst@addtodo@easynonletters\.\mst@varfam@dot
- \DeclareMathSymbol{:}{\mathrel}{\mst@font@tbu}{"3A} % relation spacing
+ \DeclareMathSymbol{:}{\mathrel}{\mst@font@tbu}{"3A}
\DeclareMathSymbol{\mst@varfam@colon}{\mathalpha}{\mst@font@tbu}{"3A}
\expandafter\mst@addtodo@nonletters\string:\mathrel\mst@varfam@colon
\@ifpackageloaded{amsmath}
- {} % \colon defined in amsmath.sty in terms of : with some enlarged explicit
- % spacing. No need to intervene.
- {% no amsmath, use standard punctuation spacing
+ {}
+ {%
\let\colon\undefined
- % the reason is if some package has redefined \colon which then
- % can not be used in \cs{DeclareMathSymbol} anymore (we
- % shamelessly overwrite...)
\DeclareMathSymbol{\colon}{\mathpunct}{\mst@font@tbu}{"3A}
- \mst@do@nonletters\expandafter{\the\mst@do@nonletters
- \protected\def\colon{\mathpunct{\mst@varfam@colon}}}%
+ \let\mst@colon\colon
+ \mst@do@nonletters\expandafter{%
+ \the\mst@do@nonletters
+ \protected\def\colon{\mathpunct{\mst@varfam@colon}}%
+ }%
+ \ifmst@everymath
+ \else
+ \mst@undo@nonletters\expandafter{%
+ \the\mst@undo@nonletters
+ \let\colon\mst@colon
+ }%
+ \fi
}
\DeclareMathSymbol{\mst@varfam@pointvirgule}{\mathalpha}{\mst@font@tbu}{"3B}
\ifmst@binarysemicolon
@@ -880,8 +1187,8 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\else
\DeclareMathSymbol{;}{\mathpunct}{\mst@font@tbu}{"3B}
\expandafter\mst@addtodo@nonletters\string;\mathpunct\mst@varfam@pointvirgule
- \fi % binarysemicolno
-\fi % end \ifmst@nopunct else branch
+ \fi
+\fi
\ifmst@nominus
\else
\ifmst@XeOrLua
@@ -892,14 +1199,10 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\@ifpackageloaded{amsmath}
{\def\relbar{\mathrel{\mathpalette\mathsm@sh\mst@minus@sign}}}
{\DeclareRobustCommand\relbar{\mathrel{\smash\mst@minus@sign}}}
- \ifmst@robust@obsessed@LaTeX@era\expandafter\DeclareRobustCommand
- \else\expandafter\def\fi
- \rightarrowfill{$\m@th\mathord{\relbar}\mkern-7mu%
+ \DeclareRobustCommand\rightarrowfill{$\m@th\mathord{\relbar}\mkern-7mu%
\cleaders\hbox{$\mkern-2mu\relbar\mkern-2mu$}\hfill
\mkern-7mu\mathord\rightarrow$}
- \ifmst@robust@obsessed@LaTeX@era\expandafter\DeclareRobustCommand
- \else\expandafter\def\fi
- \leftarrowfill{$\m@th\mathord\leftarrow\mkern-7mu%
+ \DeclareRobustCommand\leftarrowfill{$\m@th\mathord\leftarrow\mkern-7mu%
\cleaders\hbox{$\mkern-2mu\relbar\mkern-2mu$}\hfill
\mkern-7mu\mathord{\relbar}$}
\fi
@@ -915,7 +1218,8 @@ defaultbf,defaultit,defaultsf,defaulttt}}
{\csname\mst@tmp@enc\string\textendash\endcsname}
\DeclareMathSymbol{#2}{\mathalpha}{mtoperatorfont}
{\csname\mst@tmp@enc\string\textendash\endcsname}
- \fi}% mst@dothe@endashstuff
+ \fi
+}%
\def\mst@dothe@emdashstuff#1#2#3{%
\edef\mst@tmp@enc{#3}%
\if1\mst@OneifUniEnc
@@ -926,7 +1230,8 @@ defaultbf,defaultit,defaultsf,defaulttt}}
{\csname\mst@tmp@enc\string\textemdash\endcsname}
\DeclareMathSymbol{#2}{\mathalpha}{mtoperatorfont}
{\csname\mst@tmp@enc\string\textemdash\endcsname}
- \fi}% mst@dothe@emdashstuff
+ \fi
+}%
\def\mst@dothe@hyphenstuff#1#2{%
\DeclareMathSymbol{#1}{\mathbin}{\mst@font@tbu}{"2D}%
\DeclareMathSymbol{#2}{\mathalpha}{\mst@font@tbu}{"2D}%
@@ -942,13 +1247,13 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\csname mst@minus@mv\math@version\endcsname
\relax
\else
- \mathcode`\-=\@nameuse{mst@minus@mv\math@version}% self-delimiting
+ \mathcode`\-=\@nameuse{mst@minus@mv\math@version}%
\fi
- }% \mst@nonsubduedminus
+ }%
\ifmst@endash\else\ifmst@emdash\else
\def\mst@nonsubduedminus{%
- \mathcode`\-=\@nameuse{mst@minus@mv\math@version}% self-delimiting
- }% non Umathchardef \mst@minus@mv<mathversion> macros
+ \mathcode`\-=\@nameuse{mst@minus@mv\math@version}%
+ }%
\fi\fi
\fi
\def\mst@UmathchardefWorkAround@i
@@ -965,7 +1270,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\def\mst@mathrlapinternal#1#2{\rlap{$\mathsurround=0pt#1{#2}$}}
\def\mst@dothe@hbarstuff#1#2#3{%
\edef\mst@tmp@enc{#3}%
- \if1\mst@OneifUniEnc % Unicode engine and font
+ \if1\mst@OneifUniEnc
\mst@Umathchardef#1="7 \symmtletterfont "0127 \relax %% or 210F?
\else
\begingroup
@@ -974,9 +1279,9 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\mst@DeclareMathAccent{#2}{\mathalpha}{mtletterfont}%
{\csname\mst@tmp@enc\string\=\endcsname{}}%
\endgroup
- \protected\def#1{\mst@mathrlap{#2{\ }}\mst@h}%
+ \protected\def#1{\mst@mathrlap{#2{\ }}\MTmathcharletterh}%
\fi
-}% end of \mst@dothe@hbarstuff
+}%
\ifmst@noplus\else\mst@infoline{\string+ and \string=}
\DeclareMathSymbol{+}{\mathbin}{\mst@font@tbu}{"2B}
\DeclareMathSymbol{\mst@varfam@plus}{\mathalpha}{\mst@font@tbu}{"2B}
@@ -1001,7 +1306,8 @@ defaultbf,defaultit,defaultsf,defaulttt}}
}
\expandafter\mst@addtodo@nonletters\string=\mathrel\mst@varfam@equal
\fi
-\ifmst@noparen\else\mst@infoline{parentheses \string( \string) \string[ \string] and slash \string/}
+\ifmst@noparen\else
+\mst@infoline{parentheses \string( \string) \string[ \string] and slash \string/}
\ifmst@nosmalldelims
\DeclareMathSymbol{(}{\mathopen}{\mst@font@tbu}{"28}
\DeclareMathSymbol{)}{\mathclose}{\mst@font@tbu}{"29}
@@ -1032,11 +1338,13 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\ifmst@nosmalldelims
\DeclareMathDelimiter{\mst@varfam@backslash}
{\mathalpha}{symbols}{"6E}{largesymbols}{"0F}
+ \let\mst@mathord@backslash\backslash
\else
\DeclareMathDelimiter{<}{\mathopen}{\mst@font@tbu}{"3C}{largesymbols}{"0A}
\DeclareMathDelimiter{>}{\mathclose}{\mst@font@tbu}{"3E}{largesymbols}{"0B}
- \DeclareMathDelimiter{\backslash}
+ \DeclareMathDelimiter{\mst@mathord@backslash}
{\mathord}{mtoperatorfont}{"5C}{largesymbols}{"0F}
+ \let\backslash\mst@mathord@backslash
\DeclareMathDelimiter{\mst@varfam@backslash}
{\mathalpha}{mtoperatorfont}{"5C}{largesymbols}{"0F}
\fi
@@ -1048,10 +1356,25 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\expandafter\mst@addtodo@nonletters\string>\mathrel\mst@varfam@more
\mst@do@easynonletters\expandafter{\the\mst@do@easynonletters
\let\backslash\mst@varfam@backslash}
+\ifmst@everymath
+\else
+ \mst@undo@easynonletters\expandafter{\the\mst@undo@easynonletters
+ \let\backslash\mst@mathord@backslash}
+\fi
\DeclareMathSymbol{\setminus}{\mathbin}{mtoperatorfont}{"5C}
+\let\mst@setminus\setminus
\DeclareMathSymbol{\mst@varfam@setminus}{\mathalpha}{mtoperatorfont}{"5C}
-\mst@do@nonletters\expandafter{\the\mst@do@nonletters
- \protected\def\setminus{\mathbin{\mst@varfam@setminus}}}
+\mst@do@nonletters\expandafter{%
+ \the\mst@do@nonletters
+ \protected\def\setminus{\mathbin{\mst@varfam@setminus}}%
+}
+\ifmst@everymath
+\else
+ \mst@undo@nonletters\expandafter{%
+ \the\mst@undo@nonletters
+ \let\setminus\mst@setminus
+ }
+\fi
\ifmst@XeOrLua
\mst@Umathcharnumdef\mst@vert@bar=\mst@Umathcodenum`\|\relax
\else
@@ -1066,10 +1389,20 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\protected\def\vert{|}
\DeclareMathSymbol{\mst@varfam@vbar}{\mathalpha}{\mst@font@tbu}{124}
\mst@addtodo@easynonletters\|\mst@varfam@vbar
-\let\mid\undefined % 1.3: to avoid problems with some packages
+\let\mid\undefined
\DeclareMathSymbol{\mid}{\mathrel}{\mst@font@tbu}{124}
-\mst@do@nonletters\expandafter{\the\mst@do@nonletters
- \protected\def\mid{\mathrel\mst@varfam@vbar}}
+\let\mst@mid\mid
+\mst@do@nonletters\expandafter{%
+ \the\mst@do@nonletters
+ \protected\def\mid{\mathrel\mst@varfam@vbar}%
+}
+\ifmst@everymath
+\else
+ \mst@undo@nonletters\expandafter{%
+ \the\mst@undo@nonletters
+ \let\mid\mst@mid
+ }
+\fi
\ifmst@nosmalldelims
\else
\let\lbrace\undefined \let\rbrace\undefined
@@ -1080,86 +1413,105 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\fi
\DeclareMathSymbol{\mst@varfam@lbrace}{\mathalpha}{\mst@font@tbu}{123}
\DeclareMathSymbol{\mst@varfam@rbrace}{\mathalpha}{\mst@font@tbu}{125}
-\DeclareRobustCommand*{\mst@lbrace}
- {\ifmmode\mathopen\mst@varfam@lbrace\else\textbraceleft\fi}
-\DeclareRobustCommand*{\mst@rbrace}
- {\ifmmode\mathclose\mst@varfam@rbrace\else\textbraceright\fi}
-\mst@do@nonletters\expandafter{\the\mst@do@nonletters
- \mst@dobraces{\expandafter\let\csname\string{ \expandafter\endcsname
- \csname mst@lbrace \endcsname
- \expandafter\let\csname\string} \expandafter\endcsname
- \csname mst@rbrace \endcsname}}
-\fi % end of \ifmst@alldelims
+\protected\def\mst@lbrace{\ifmmode\mathopen\mst@varfam@lbrace\else\textbraceleft\fi}
+\protected\def\mst@rbrace{\ifmmode\mathclose\mst@varfam@rbrace\else\textbraceright\fi}
+\mst@do@nonletters\expandafter{%
+ \the\mst@do@nonletters
+ \mst@dobraces{\let\{\mst@lbrace\let\}\mst@rbrace}%
+}
+\fi
\newcommand*{\MTexplicitbracesobeymathxx}{\let\mst@dobraces\@firstofone}
\newcommand*{\MTexplicitbracesdonotobeymathxx}{\let\mst@dobraces\@gobble}
+\ifmst@everymath
+\else
+ \renewcommand*\MTexplicitbracesobeymathxx{%
+ \let\mst@dobraces\@firstofone
+ \MTnonlettersobeymathxx
+ }%
+ \renewcommand*\MTexplicitbracesdonotobeymathxx{%
+ \let\mst@dobraces\@gobble
+ \protected\def\{{\ifmmode \lbrace \else \textbraceleft \fi}%
+ \protected\def\}{\ifmmode \rbrace \else \textbraceright \fi}%
+ }%
+ \mst@undo@nonletters\expandafter{\the\mst@undo@nonletters
+ \protected\def\{{\ifmmode \lbrace \else \textbraceleft \fi}%
+ \protected\def\}{\ifmmode \rbrace \else \textbraceright \fi}%
+ }%
+\fi
\MTexplicitbracesdonotobeymathxx
\ifmst@nospecials
\else
- \mst@infoline{\string\#\space\string\mathdollar\space
- \string\%\space\string\&\space}
+ \mst@infoline{\string\#\space\string\mathdollar\space
+ \string\%\space\string\&\space}
\ifmst@XeOrLua
- \mst@Umathcode`\#=0 \symmtoperatorfont "23 \relax
- \mst@Umathchardef\mathdollar=0 \symmtoperatorfont "24 \relax
- \mst@Umathcode`\%=0 \symmtoperatorfont "25 \relax
- \mst@Umathcode`\&=0 \symmtoperatorfont "26 \relax
- \mst@do@easynonletters\expandafter{%
- \the\mst@do@easynonletters
- \mst@Umathcode`\#=7 \symmtoperatorfont "23 \relax
- \mst@Umathchardef\mathdollar=7 \symmtoperatorfont "24 \relax
- \mst@Umathcode`\%=7 \symmtoperatorfont "25 \relax
- \mst@Umathcode`\&=7 \symmtoperatorfont "26 \relax
- }
+ \mst@Umathcode`\#=0 \symmtoperatorfont "23 \relax
+ \mst@Umathchardef\mathdollar=0 \symmtoperatorfont "24 \relax
+ \mst@Umathcode`\%=0 \symmtoperatorfont "25 \relax
+ \mst@Umathcode`\&=0 \symmtoperatorfont "26 \relax
+ \mst@Umathchardef\mst@varfam@mathhash = 7 \symmtoperatorfont "23 \relax
+ \mst@Umathchardef\mst@varfam@mathdollar = 7 \symmtoperatorfont "24 \relax
+ \mst@Umathchardef\mst@varfam@mathpercent = 7 \symmtoperatorfont "25 \relax
+ \mst@Umathchardef\mst@varfam@mathampersand = 7 \symmtoperatorfont "26 \relax
+ \mst@addtodo@easynonletters@U\#\mst@varfam@mathhash
+ \mst@addtodo@easynonletters@U\%\mst@varfam@mathpercent
+ \mst@addtodo@easynonletters@U\&\mst@varfam@mathampersand
\else
- \count@=\symmtoperatorfont
- \multiply\count@ by \@cclvi
- \advance\count@ by 35
- \mathcode`\#\count@
- \advance\count@ by \@ne
- \mathchardef\mathdollar\count@
- \advance\count@ by \@ne
- \mathcode`\%\count@
- \advance\count@ by \@ne
- \mathcode`\&\count@
- \count@=\symmtoperatorfont
- \multiply\count@ by \@cclvi
- \advance\count@ by 28707 % = "7023
- \mathchardef\mst@varfam@mathhash\count@
- \advance\count@ by \@ne
- \mathchardef\mst@varfam@mathdollar\count@
- \advance\count@ by \@ne
- \mathchardef\mst@varfam@mathpercent\count@
- \advance\count@ by \@ne
- \mathchardef\mst@varfam@mathampersand\count@
+ \count@=\symmtoperatorfont
+ \multiply\count@ by \@cclvi
+ \advance\count@ by 35
+ \mathcode`\#\count@
+ \advance\count@ by \@ne
+ \mathchardef\mathdollar\count@
+ \advance\count@ by \@ne
+ \mathcode`\%\count@
+ \advance\count@ by \@ne
+ \mathcode`\&\count@
+ \count@=\symmtoperatorfont
+ \multiply\count@ by \@cclvi
+ \advance\count@ by 28707 % = "7023
+ \mathchardef\mst@varfam@mathhash\count@
+ \advance\count@ by \@ne
+ \mathchardef\mst@varfam@mathdollar\count@
+ \advance\count@ by \@ne
+ \mathchardef\mst@varfam@mathpercent\count@
+ \advance\count@ by \@ne
+ \mathchardef\mst@varfam@mathampersand\count@
+ \mst@addtodo@easynonletters\#\mst@varfam@mathhash
+ \mst@addtodo@easynonletters\%\mst@varfam@mathpercent
+ \mst@addtodo@easynonletters\&\mst@varfam@mathampersand
+ \fi
\mst@do@easynonletters\expandafter{\the\mst@do@easynonletters
- \mathcode`\#=\mst@varfam@mathhash
- \let\mathdollar\mst@varfam@mathdollar
- \mathcode`\%=\mst@varfam@mathpercent
- \mathcode`\&=\mst@varfam@mathampersand}
+ \let\mathdollar\mst@varfam@mathdollar}%
+ \ifmst@everymath\else
+ \edef\mst@tmp{\ifmst@XeOrLua\mst@Umathcharnumdef\else\mathchardef\fi
+ \mathdollar=\the\mathdollar\relax}%
+ \mst@undo@easynonletters\expandafter\expandafter\expandafter
+ {\expandafter\mst@tmp\the\mst@undo@easynonletters}%
\fi
\fi
-\ifmst@symbolmisc\mst@infoline{symbolmisc: miscellaneous math symbols from Symbol font}
-\let\mst@prod\prod
+\ifmst@symbolmisc
+\mst@infoline{symbolmisc: miscellaneous math symbols from Symbol font}
\let\MToriginalprod\prod
\DeclareMathSymbol{\prodpsy}{\mathop}{mtpsymbol}{213}
-\protected\def\prod{\ifinner\prodpsy\else\mst@prod\fi}
-\let\mst@sum\sum
+\protected\def\prod{\ifinner\prodpsy\else\MToriginalprod\fi}
\let\MToriginalsum\sum
\DeclareMathSymbol{\sumpsy}{\mathop}{mtpsymbol}{229}
-\protected\def\sum{\ifinner\sumpsy\else\mst@sum\fi}
+\protected\def\sum{\ifinner\sumpsy\else\MToriginalsum\fi}
\DeclareMathSymbol{\mst@implies}{\mathrel}{mtpsymbol}{222}
-\DeclareRobustCommand*{\implies}{\;\mst@implies\;}
+\protected\def\implies{\;\mst@implies\;}
\DeclareMathSymbol{\mst@impliedby}{\mathrel}{mtpsymbol}{220}
-\DeclareRobustCommand*{\impliedby}{\;\mst@impliedby\;}
-\DeclareRobustCommand*{\iff}{\;\mst@impliedby\mathrel{\mkern-3mu}\mst@implies\;}
+\protected\def\impliedby{\;\mst@impliedby\;}
+\protected\def\iff{\;\mst@impliedby\mathrel{\mkern-3mu}\mst@implies\;}
\DeclareMathSymbol{\mst@iff}{\mathrel}{mtpsymbol}{219}
-\DeclareRobustCommand*{\shortiff}{\;\mst@iff\;}
-\DeclareMathSymbol{\mst@to}{\mathrel}{mtpsymbol}{174}
+\protected\def\shortiff{\;\mst@iff\;}
+\let\to\relax
+\DeclareMathSymbol{\to}{\mathrel}{mtpsymbol}{174}
\DeclareMathSymbol{\mst@trait}{\mathrel}{mtpsymbol}{190}
-\DeclareRobustCommand*\to{\mst@to}
-\DeclareRobustCommand*\longto{\mkern2mu\mst@trait\mathrel{\mkern-10mu}\mst@to}
-\DeclareRobustCommand*\mapsto{\mapstochar\mathrel{\mkern0.2mu}\mst@to}
-\DeclareRobustCommand*\longmapsto{%
-\mapstochar\mathrel{\mkern2mu}\mst@trait\mathrel{\mkern-10mu}\mst@to}
+\protected\def\longto{\mkern2mu\mst@trait\mathrel{\mkern-10mu}\to}
+\protected\def\mapsto{\mapstochar\mathrel{\mkern0.2mu}\to}
+\protected\def\longmapsto{%
+ \mapstochar\mathrel{\mkern2mu}\mst@trait\mathrel{\mkern-10mu}\to
+}
\DeclareMathSymbol{\aleph}{\mathord}{mtpsymbol}{192}
\DeclareMathSymbol{\inftypsy}{\mathord}{mtpsymbol}{165}
\DeclareMathSymbol{\emptyset}{\mathord}{mtpsymbol}{198}
@@ -1208,7 +1560,8 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\DeclareMathDelimiter{\langle}
{\mathopen}{mtpsymbol}{225}{largesymbols}{"0A}
\fi
-\ifmst@symbolre\mst@infoline{symbolre: \string\Re\space and \string\Im\space from Symbol font}
+\ifmst@symbolre
+\mst@infoline{symbolre: \string\Re\space and \string\Im\space from Symbol font}
\DeclareMathSymbol{\Re}{\mathord}{mtpsymbol}{"C2}
\DeclareMathSymbol{\Im}{\mathord}{mtpsymbol}{"C1}
\DeclareMathSymbol{\DotTriangle}{\mathord}{mtpsymbol}{92}
@@ -1249,11 +1602,8 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\DeclareMathSymbol{\mst@Tau}{\mst@mathord}{\mst@font@tbu}{"54}
\DeclareMathSymbol{\mst@Chi}{\mst@mathord}{\mst@font@tbu}{"58}
\ifx\mst@mathord\mathord
-%% attention le P de Symbol est un \Pi pas un \Rho
\DeclareMathSymbol{\mst@Rho}{\mathord}{mtpsymbol}{"52}
-%% attention le X de Symbol est un \Xi pas un \Chi
\DeclareMathSymbol{\mst@Chi}{\mathord}{mtpsymbol}{"43}
-%% attention le F de Symbol est un \Phi. Il n'y a pas de \Digamma
\DeclareMathSymbol{\mst@Gamma}{\mathord}{mtpsymbol}{"47}
\DeclareMathSymbol{\mst@Delta}{\mathord}{mtpsymbol}{"44}
\DeclareMathSymbol{\mst@Theta}{\mathord}{mtpsymbol}{"51}
@@ -1265,7 +1615,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\DeclareMathSymbol{\mst@Phi}{\mathord}{mtpsymbol}{"46}
\DeclareMathSymbol{\mst@Psi}{\mathord}{mtpsymbol}{"59}
\DeclareMathSymbol{\mst@Omega}{\mathord}{mtpsymbol}{"57}
- \else % de \mst@mathord=\mathord
+ \else
\DeclareMathSymbol\mst@Digamma {\mathalpha}{\mst@font@tbu}{"46}
\DeclareMathSymbol\mst@Gamma {\mathalpha}{\mst@font@tbu}{"00}
\DeclareMathSymbol\mst@Delta {\mathalpha}{\mst@font@tbu}{"01}
@@ -1278,8 +1628,8 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\DeclareMathSymbol\mst@Phi {\mathalpha}{\mst@font@tbu}{"08}
\DeclareMathSymbol\mst@Psi {\mathalpha}{\mst@font@tbu}{"09}
\DeclareMathSymbol\mst@Omega {\mathalpha}{\mst@font@tbu}{"0A}
- \fi % de \mst@mathord=\mathord
-\fi % fin de goahead
+ \fi
+\fi
\ifmst@goahead
\ifmst@eulergreek
\DeclareMathSymbol{\mst@alpha} {\mathalpha}{mteulervm}{"0B}
@@ -1582,7 +1932,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\let\mst@origdigamma\digamma
\let\mst@origpartial\partial
\let\mst@origwp\wp
- \let\mst@origell\ell }% \MTrecordstandardgreek
+ \let\mst@origell\ell }%
\MTrecordstandardgreek
\renewcommand*{\MTstandardgreek}{%
\let\Alpha\mst@origAlpha
@@ -1644,7 +1994,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\let\partial\mst@origpartial
\let\wp\mst@origwp
\let\ell\mst@origell
-}% \MTstandardgreek
+}%
\ifmst@greekplus
\def\mst@define@lowergreekletter#1#2{%
\protected\def#1{\ifcase\mst@mathalph
@@ -1724,7 +2074,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\mst@define@lowergreekletter\omega\mst@omega
\mst@define@lowergreekletter\varsigma\mst@varsigma
\mst@define@lowergreekletter\digamma\mst@digamma
-}% end of True branch of \ifmst@greekplus
+}%
\else
\renewcommand*{\MTcustomgreek}{%
\expanded{%
@@ -1741,7 +2091,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\let\noexpand\Rho\mst@Rho
\let\noexpand\Tau\mst@Tau
\let\noexpand\Chi\mst@Chi
- }% end of first big \expanded
+ }%
\ifmst@symbolgreek\else
\expanded{\let\noexpand\Digamma\mst@Digamma}%
\fi
@@ -1757,7 +2107,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\let\noexpand\Phi\mst@Phi
\let\noexpand\Psi\mst@Psi
\let\noexpand\Omega\mst@Omega
- }% end of second big \expanded
+ }%
\ifmst@selfGreek\else
\expanded{%
\let\noexpand\alpha\mst@alpha
@@ -1785,7 +2135,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\let\noexpand\psi\mst@psi
\let\noexpand\omega\mst@omega
\let\noexpand\varsigma\mst@varsigma
- }% end of third big \expanded
+ }%
\ifmst@LGRgreek
\expanded{\let\noexpand\digamma\mst@digamma}%
\fi
@@ -1800,9 +2150,9 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\ifmst@symbolgreek\else\let\ell\mst@ell\fi
\fi
\fi
-}% \MTcustomgreek
-\fi% end of else branch of \ifmst@greekplus
-\fi% end of \ifmst@customgreek
+}%
+\fi
+\fi
\let\Mathastextstandardgreek\MTstandardgreek
\let\Mathastextcustomgreek\MTcustomgreek
\ifmst@subdued\else\MTcustomgreek\fi
@@ -1819,7 +2169,6 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\def\mst@dothe@inodotstuff#1#2#3{%
\edef\mst@tmp@enc{#3}%
\if1\mst@OneifUniEnc
- % Unicode engine and font
\mst@Umathchardef#1="7 \symmtletterfont "0131 \relax
\mst@Umathchardef#2="7 \symmtletterfont "0237 \relax
\else
@@ -1827,7 +2176,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
{\csname\mst@tmp@enc\string\i\endcsname}
\DeclareMathSymbol{#2}{\mathalpha}{mtletterfont}
{\csname\mst@tmp@enc\string\j\endcsname}
- \fi}% \mst@dothe@inodotstuff
+ \fi}%
\ifmst@defaultimath\else\mst@infoline{\string\imath\space and \string\jmath\space}
\AtEndOfPackage{\AtBeginDocument{%
\protected\def\imath{\inodot}%
@@ -1865,67 +2214,57 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\let\add@unicode@accent\@firstoftwo
\if1\mst@OneifUniEnc
\ifmst@unimathaccents
- % \` -> \grave
\expandafter\xdef\csname mst@grave@mv#1\mst@robustifyingspace\endcsname
{\mst@Umathaccent
7
\number\symmtoperatorfont\space
\csname#2\string\`\endcsname{}\relax}%
- % \' -> \acute
\expandafter\xdef\csname mst@acute@mv#1\mst@robustifyingspace\endcsname
{\mst@Umathaccent
7
\number\symmtoperatorfont\space
\csname#2\string\'\endcsname{}\relax}%
- % \v -> \check
\expandafter\xdef\csname mst@check@mv#1\mst@robustifyingspace\endcsname
{\mst@Umathaccent
7
\number\symmtoperatorfont\space
\csname#2\string\v\endcsname{}\relax}%
- % \u -> \breve
\expandafter\xdef\csname mst@breve@mv#1\mst@robustifyingspace\endcsname
{\mst@Umathaccent
7
\number\symmtoperatorfont\space
\csname#2\string\u\endcsname{}\relax}%
- % \= -> \bar
\expandafter\xdef\csname mst@bar@mv#1\mst@robustifyingspace\endcsname
{\mst@Umathaccent
7
\number\symmtoperatorfont\space
\csname#2\string\=\endcsname{}\relax}%
- % \. -> \dot
\expandafter\xdef\csname mst@dot@mv#1\mst@robustifyingspace\endcsname
{\mst@Umathaccent
7
\number\symmtoperatorfont\space
\csname#2\string\.\endcsname{}\relax}%
- % \" -> \ddot
\expandafter\xdef\csname mst@ddot@mv#1\mst@robustifyingspace\endcsname
{\mst@Umathaccent
7
\number\symmtoperatorfont\space
\csname#2\string\"\endcsname{}\relax}%
- % \r -> \mathring
\expandafter\xdef\csname mst@mathring@mv#1\mst@robustifyingspace\endcsname
{\mst@Umathaccent
7
\number\symmtoperatorfont\space
\csname#2\string\r\endcsname{}\relax}%
- % \^ -> \hat
\expandafter\xdef\csname mst@hat@mv#1\mst@robustifyingspace\endcsname
{\mst@Umathaccent
7
\number\symmtoperatorfont\space
\csname#2\string\^\endcsname{}\relax}%
- % \~ -> \tilde
\expandafter\xdef\csname mst@tilde@mv#1\mst@robustifyingspace\endcsname
{\mst@Umathaccent
7
\number\symmtoperatorfont\space
\csname#2\string\~\endcsname{}\relax}%
- \else % false branch of ifmst@unimathaccents
+ \else
\AtEndOfPackage{\AtBeginDocument{%
\@tfor\@tempa:={grave}{acute}{check}{breve}{bar}%
{dot}{ddot}{mathring}{hat}{tilde}%
@@ -1938,7 +2277,6 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\csname mst@original@\@tempa\space\endcsname}%
}}%
\fi
- \ifmst@robust@obsessed@LaTeX@era
\@tfor\@tempa:={grave}{acute}{check}{breve}{bar}%
{dot}{ddot}{mathring}{hat}{tilde}%
\do
@@ -1946,52 +2284,41 @@ defaultbf,defaultit,defaultsf,defaulttt}}
{\noexpand\protect
\expandafter\noexpand\csname mst@\@tempa @mv#1 \endcsname}%
}%
- \fi
- \else % false branch of ifUniEnc
- % \` -> \grave
+ \else
\expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@grave@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\`\endcsname{}}
- % \' -> \acute
\expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@acute@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\'\endcsname{}}
- % \v -> \check
\expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@check@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\v\endcsname{}}
- % \u -> \breve
\expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@breve@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\u\endcsname{}}
- % \= -> \bar
\expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@bar@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\=\endcsname{}}
- % \. -> \dot
\expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@dot@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\.\endcsname{}}
- % \" -> \ddot
\expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@ddot@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\"\endcsname{}}
- % \r -> \mathring
\expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@mathring@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\r\endcsname{}}
- % \^ -> \hat
\expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@hat@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\^\endcsname{}}
- % \~ -> \tilde
\expandafter\mst@DeclareMathAccent\expandafter
{\csname mst@tilde@mv#1\endcsname}{\mathalpha}{mtoperatorfont}%
{\csname#2\string\~\endcsname{}}
\fi
\endgroup
}%
-\fi % \ifmst@mathaccents
+\fi
\newcommand*\MTDeclareVersion[6][]{%
\edef\mst@declareversionargs{{#1}{#2}{#3}{#4}{#5}{#6}}%
\edef\mst@version{#2}%
@@ -2002,14 +2329,14 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\MTDoNotDeclareVersion@\expandafter\@gobblefour
\fi
\relax\DeclareMathVersion{\mst@version}\MTDeclareVersion@
-}% \MTDeclareVersion
+}%
\newcommand*\MTDoNotDeclareVersion@[1][]{%
\PackageWarningNoLine{mathastext}{You asked to declare a version with name
`\mst@version'.^^J%
\@spaces Sorry but you are not allowed to do that.^^J%
\@spaces \ifmst@subdued Anyway the `subdued' option is in force\else
Use rather \string\Mathastext\space macro (with no optional argument)\fi
-}}%\MTDoNotDeclareVersion@
+}}%
\newcommand*\MTDeclareVersion@[1][]{%
\edef\mst@tmp{#1}%
\ifx\mst@tmp\empty\else
@@ -2021,7 +2348,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
inherits from `#1\string'\@gobble}%
\fi
\expandafter\MTDeclareVersion@@\mst@declareversionargs
-}% \MTDeclareVersion@
+}%
\newcommand*\MTDeclareVersion@@[6]{%
\expandafter\edef\csname mst@encoding@\mst@version\endcsname{#3}%
\expandafter\edef\csname mst@family@\mst@version\endcsname{#4}%
@@ -2042,36 +2369,56 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\ifx\mst@tmp\empty
\ifmst@italic
\SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{\mst@ltsh}%
-\immediate\write\m@ne{}%
-\PackageInfo{mathastext}{Latin letters in math version `#2\string'\MessageBreak
+ \immediate\write\m@ne{}%
+ \PackageInfo{mathastext}%
+ {\ifmst@noletters
+ \else
+ Latin letters in math version `#2\string'\MessageBreak
declared\on@line\MessageBreak
will use the font #3/#4/#5/\mst@ltsh
\ifmst@frenchmath\space(uppercase: #6)\fi\MessageBreak
+ \fi
Other characters (digits, ...) and \protect\log-like names\MessageBreak
- will be in `#6\string' shape\@gobble}%
-\immediate\write\m@ne{}%
+ \ifmst@noletters
+ will use the font #3/#4/#5/#6%
+ \else
+ will be in `#6\string' shape%
+ \fi\@gobble}%
+ \immediate\write\m@ne{}%
\expandafter\edef\csname mst@ltshape@\mst@version\endcsname{\mst@ltsh}%
\else
\SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{#6}%
-\immediate\write\m@ne{}%
-\PackageInfo{mathastext}{Latin letters in math version `#2\string'\MessageBreak
+ \ifmst@noletters
+ \else
+ \immediate\write\m@ne{}%
+ \PackageInfo{mathastext}%
+ {Latin letters in math version `#2\string'\MessageBreak
declared\on@line\MessageBreak
will use the fonts #3/#4/#5(\mst@bold)/#6\@gobble}%
-\immediate\write\m@ne{}%
+ \fi
+ \immediate\write\m@ne{}%
\expandafter\edef\csname mst@ltshape@\mst@version\endcsname{#6}%
\fi
- \else % #1 not empty
+ \else
\SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{#1}%
-\immediate\write\m@ne{}%
-\PackageInfo{mathastext}{Latin letters in math version `#2\string'\MessageBreak
+ \immediate\write\m@ne{}%
+ \PackageInfo{mathastext}%
+ {\ifmst@noletters
+ \else
+ Latin letters in math version `#2\string'\MessageBreak
declared\on@line\MessageBreak
will use the font #3/#4/#5/#1%
\ifmst@frenchmath\space(uppercase: #6)\fi\MessageBreak
+ \fi
Other characters (digits, ...) and
\protect\log-like names\MessageBreak
- will be in `#6\string' shape\@gobble}%
-\immediate\write\m@ne{}%
- \expandafter\edef\csname mst@ltshape@\mst@version\endcsname{#1}%
+ \ifmst@noletters
+ will use the font #3/#4/#5/#6%
+ \else
+ will be in `#6\string' shape%
+ \fi\@gobble}%
+ \immediate\write\m@ne{}%
+ \expandafter\edef\csname mst@ltshape@\mst@version\endcsname{#1}%
\fi
\SetMathAlphabet{\Mathnormalbold}{#2}{#3}{#4}{\mst@bold}%
{\csname mst@ltshape@\mst@version\endcsname}%
@@ -2174,12 +2521,12 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\expandafter\mst@dothe@hyphenstuff\mst@tmp
\fi
\fi
-}% \MTDeclareVersion@@
+}%
\let\MathastextDeclareVersion\MTDeclareVersion
-\newcommand*\MTversion {\@ifstar\MTversion@s\MTversion@ }
-\newcommand*\MTversion@s [1]{\mathversion{#1}\MTversion@@ }
+\newcommand*\MTversion {\@ifstar\MTversion@s\MTversion@}
+\newcommand*\MTversion@s [1]{\mathversion{#1}\MTversion@@}
\newcommand*\MTversion@ [2][]{%
- \mathversion{#2}% defines \math@version as expanded #2
+ \mathversion{#2}%
\edef\mst@tmpa{#1}%
\ifx\mst@tmpa\empty
\let\mst@tmp\math@version
@@ -2197,7 +2544,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\edef\ttdefault {\csname mst@ttdefault@\mst@tmp\endcsname}%
\usefont{\encodingdefault}{\familydefault}{\seriesdefault}{\shapedefault}%
\MTversion@@
-}% \MTversion@
+}%
\newcommand*\MTversion@@ {%
\MTexistsdoesskip
\MTforalldoesskip
@@ -2259,13 +2606,13 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\csname ifmst@greek@\math@version @upper@up\endcsname
\expandafter\let\csname ifmst@greek@lower@up\expandafter\endcsname
\csname ifmst@greek@\math@version @lower@up\endcsname
- \MTcustomgreek % new with 1.3d
+ \MTcustomgreek
\mst@nonsubduedhbar
\mst@nonsubduedinodot
\mst@nonsubduedmathaccents
\mst@nonsubduedminus
\fi
-}% \MTversion@@
+}%
\let\MathastextVersion\MTversion
\let\Mathastextversion\MTversion
\let\MTVersion\MTversion
@@ -2275,13 +2622,13 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\MTfamily{#3}
\MTseries{#4}
\MTshape{#5}
- \ifmst@italic\MTlettershape{\itdefault}\fi % was missing in v 1.14 and prior
+ \ifmst@italic\MTlettershape{\itdefault}\fi
\edef\mst@tmp{#1}
\ifx\mst@tmp\empty\else\MTlettershape{#1}\fi
\Mathastext}
\let\MathastextWillUse\MTWillUse
\let\Mathastextwilluse\MTWillUse
-\def\Mathastext {\@ifnextchar [\Mathastext@declare\Mathastext@ }
+\def\Mathastext {\@ifnextchar[\Mathastext@declare\Mathastext@}% ]
\def\Mathastext@declare [#1]{%
\edef\mst@tmp{#1}%
\ifx\mst@tmp\empty
@@ -2290,7 +2637,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\fi
\Mathastext@
{\MTDeclareVersion[\mst@ltsh]{#1}{\mst@enc}{\mst@fam}{\mst@ser}{\mst@opsh}}%
-}% \Mathastext@declare
+}%
\def\Mathastext@ {%
\mst@update@greeksh
\edef\mst@encoding@normal{\mst@enc}%
@@ -2326,7 +2673,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\def\mst@exists@skip@bold{0mu}%
\def\mst@forall@skip@bold{0mu}%
\def\mst@prime@skip@bold{0mu}%
- \else % not subdued
+ \else
\ifmst@italic
\ifmst@frenchmath
\mst@exists@muskip\mst@exists@skip\relax
@@ -2403,7 +2750,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
{\mst@ttdefault@bold}%
{\mst@series@bold}%
{\mst@shape@bold}%
- \fi % de \ifmst@subdued
+ \fi
\ifmst@needeuler
\SetSymbolFont{mteulervm}{bold}{U}{zeur}{\mst@boldvariant@normal}{n}%
\SetMathAlphabet{\MathEulerBold}{normal}%
@@ -2467,7 +2814,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\mst@infoline{Other characters (digits, ...) and \string\log-like names will be}%
\mst@infoline{typeset with the \mst@shape@normal\space shape.}%
\fi
- \fi % end of else branch \ifmst@subdued
+ \fi
\ifmst@nohbar\else
\mst@infoline{\string\hbar}%
\mst@dothe@hbarstuff
@@ -2502,7 +2849,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\let\mst@varfam@minus@mvbold\mst@varfam@minus@mvnormal
\fi
\fi
- \fi % minus
+ \fi
\ifmst@subdued
\mst@infoline{Subdued `normal\string' and `bold\string' math versions.}%
\fi
@@ -2510,7 +2857,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\mst@infoline{The \ifmst@frenchmath frenchmath \else
italic \fi option is in effect.}%
\fi
-}% \Mathastext@
+}%
\let\mathastext\Mathastext
\Mathastext
\ifmst@eulergreek
@@ -2562,6 +2909,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\MTnonlettersdonotobeymathxx
\MTeasynonlettersdonotobeymathxx
\MTmathstandardletters
+ \MTmathstandarddigits
\MTdonotfixfonts
}%
\AtBeginDocument {%
@@ -2574,19 +2922,22 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\MTprimedoesskip
\MTeasynonlettersobeymathxx
\MTicinmath
+ \MTmathactivedigits
\MTfixfonts
}%
+\ifmst@everymath
+ \AtBeginDocument{%
+ \everymath\expandafter{\the\everymath
+ \mst@the\mst@do@nonletters \let\mst@the\@gobble
+ \mst@theeasy\mst@do@easynonletters \let\mst@theeasy\@gobble
+ }%
+ \everydisplay\expandafter{\the\everydisplay
+ \mst@the\mst@do@nonletters \let\mst@the\@gobble
+ \mst@theeasy\mst@do@easynonletters \let\mst@theeasy\@gobble
+ }%
+ }
+\fi
\AtBeginDocument{%
- \everymath\expandafter{\the\everymath
- \mst@the\mst@do@nonletters \let\mst@the\@gobble
- \mst@theeasy\mst@do@easynonletters \let\mst@theeasy\@gobble
- \mst@thef\mst@do@az \let\mst@thef\@gobble
- \mst@theF\mst@do@AZ \let\mst@theF\@gobble}%
- \everydisplay\expandafter{\the\everydisplay
- \mst@the\mst@do@nonletters \let\mst@the\@gobble
- \mst@theeasy\mst@do@easynonletters \let\mst@theeasy\@gobble
- \mst@thef\mst@do@az \let\mst@thef\@gobble
- \mst@theF\mst@do@AZ \let\mst@theF\@gobble}%
\MTcustomizenewmcodes
\let\mst@original@hbar\hbar
\let\mst@original@imath\imath
@@ -2610,14 +2961,11 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\MTresetnewmcodes
\MTnoicinmath
\MTmathoperatorsdonotobeymathxx
- %\mst@subduedhbar
\let\inodot\imath
\let\jnodot\jmath
- %\mst@subduedmathaccents
\mst@subduedminus
\else
\mst@nonsubduedhbar
- % \mst@nonsubduedmathaccents % will get executed later
\mst@nonsubduedminus
\ifx\mst@itcorr\@undefined
\def\mst@itcorr{\ifnum\fam=\m@ne\/\fi}%
@@ -2633,10 +2981,10 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\fi
\fi
\fi
-}% \AtBeginDocument
+}%
\AtEndOfPackage{\AtBeginDocument{\ifmst@subdued\else\mst@nonsubduedmathaccents\fi}}%
\ifmst@subdued
-\AtBeginDocument{%
+ \AtBeginDocument{%
\def\mst@reserved#1\getanddefine@fonts\symletters#2#3\@nil{%
\def\mst@normalmv@letter{#2}}%
\expandafter\mst@reserved\mv@normal\@nil
@@ -2675,15 +3023,19 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\else
\mst@tmp@enc
\fi/\mst@reste\endcsname}%
- \expandafter\SetSymbolFont@ \expandafter\mv@normal\mst@normalmv@letter\symmtletterfont
- \expandafter\SetSymbolFont@ \expandafter\mv@bold\mst@boldmv@letter\symmtletterfont
- \expandafter\SetSymbolFont@ \expandafter\mv@normal\mst@normalmv@operator\symmtoperatorfont
- \expandafter\SetSymbolFont@ \expandafter\mv@bold\mst@boldmv@operator\symmtoperatorfont
-\immediate\write\m@ne{}%
+ \expandafter\SetSymbolFont@
+ \expandafter\mv@normal\mst@normalmv@letter\symmtletterfont
+ \expandafter\SetSymbolFont@
+ \expandafter\mv@bold\mst@boldmv@letter\symmtletterfont
+ \expandafter\SetSymbolFont@
+ \expandafter\mv@normal\mst@normalmv@operator\symmtoperatorfont
+ \expandafter\SetSymbolFont@
+ \expandafter\mv@bold\mst@boldmv@operator\symmtoperatorfont
+ \immediate\write\m@ne{}%
\PackageInfo{mathastext}{...entering subdued mode...\MessageBreak ...done}%
-\immediate\write\m@ne{}%
-}% \AtBeginDocument
-\fi % \ifmst@subdued
+ \immediate\write\m@ne{}%
+ }%
+\fi
\expandafter \gdef \expandafter \@preamblecmds \expandafter {\@preamblecmds
\do\MTitgreek
\do\MTupgreek
diff --git a/Master/texmf-dist/tex/latex/mercatormap/mercatormap.sty b/Master/texmf-dist/tex/latex/mercatormap/mercatormap.sty
index d2c8d61ae4c..b9f77b9715a 100644
--- a/Master/texmf-dist/tex/latex/mercatormap/mercatormap.sty
+++ b/Master/texmf-dist/tex/latex/mercatormap/mercatormap.sty
@@ -1,8 +1,8 @@
-%% The LaTeX package mercatormap - version 1.02 (2020/08/06)
+%% The LaTeX package mercatormap - version 1.2.0 (2024/08/05)
%% mercatormap.sty: geographic coordinates (Mercator projection) and map tiles for TikZ pictures
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2020-2024 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,24 +17,11 @@
%%
%% This work consists of all files listed in README
%%
-\RequirePackage{expl3}[2020/02/25]
-\RequirePackage{xparse}
-\ProvidesExplPackage{mercatormap}{2020/08/06}{1.02}
+\NeedsTeXFormat{LaTeX2e}[2023-11-01]
+\ProvidesExplPackage{mercatormap}{2024/08/05}{1.2.0}
{A Web Mercator projection package with map tile support}
-\@ifpackagelater { expl3 } { 2020/02/25 }
- { }
- {
- \PackageError { mercatormap } { Support~package~expl3~too~old }
- {
- You~need~to~update~your~installation~of~the~bundles~'l3kernel'~and~
- 'l3packages'.\MessageBreak
- Loading~mercatormap~will~abort!
- }
- \tex_endinput:D
- }
-\RequirePackage{siunitx}
-\RequirePackage{graphicx,tikz,pdftexcmds}
+\RequirePackage{siunitx,graphicx,tikz}
\ExplSyntaxOff
% space character problem if within explSyntax
@@ -51,8 +38,23 @@
\NewDocumentCommand\mermapsetmarker{ m } { \keys_set:nn { mermap/marker } {#1} }
-%---- constants ----------------------------------------------------------------
+%---- scratch variables --------------------------------------------------------
+
+\box_new:N \l__mermap_tmpa_box
+
+\clist_new:N \l__mermap_tmpa_clist
+\dim_new:N \l__mermap_tmpa_dim
+\dim_new:N \l__mermap_tmpb_dim
+
+\fp_new:N \l__mermap_tmpa_fp
+\fp_new:N \l__mermap_tmpb_fp
+
+\tl_new:N \g__mermap_tmpa_tl
+\tl_new:N \l__mermap_tmpa_tl
+\tl_new:N \l__mermap_tmpb_tl
+
+%---- constants ----------------------------------------------------------------
\fp_const:Nn \c__mermap_scale_radius_fp { 6371*pi/180 }
\fp_const:Nn \c__mermap_mean_radius_fp { 637100000cm }
@@ -235,16 +237,16 @@
\cs_new_nopar:Npn \__mermap_longitude_to_x:n #1
{
- \fp_set:Nn \l_tmpa_fp { #1-\l__mermap_mapwest_fp }
- \fp_sub:Nn \l_tmpa_fp { 360*floor(\l_tmpa_fp/360) }
- \fp_set:Nn \l_tmpa_fp
- { \l_tmpa_fp>\l__mermap_westeast_fp
- ?(\l_tmpa_fp-\l__mermap_westeast_fp>360-\l_tmpa_fp
- ?\l_tmpa_fp-360
- :\l_tmpa_fp)
- :\l_tmpa_fp
+ \fp_set:Nn \l__mermap_tmpa_fp { #1-\l__mermap_mapwest_fp }
+ \fp_sub:Nn \l__mermap_tmpa_fp { 360*floor(\l__mermap_tmpa_fp/360) }
+ \fp_set:Nn \l__mermap_tmpa_fp
+ { \l__mermap_tmpa_fp>\l__mermap_westeast_fp
+ ?(\l__mermap_tmpa_fp-\l__mermap_westeast_fp>360-\l__mermap_tmpa_fp
+ ?\l__mermap_tmpa_fp-360
+ :\l__mermap_tmpa_fp)
+ :\l__mermap_tmpa_fp
}
- \fp_set:Nn \l__mermap_cs_x_fp { \l_tmpa_fp*\l__mermap_cs_xfactor_fp }
+ \fp_set:Nn \l__mermap_cs_x_fp { \l__mermap_tmpa_fp*\l__mermap_cs_xfactor_fp }
}
@@ -328,7 +330,7 @@
}
-\prg_new_conditional:Npnn \__mermap_if_in_map:nn #1#2 { p, TF }
+\prg_new_conditional:Npnn \__mermap_if_in_map:nn #1#2 { p, T, F, TF }
{
\fp_compare:nNnTF {#1} > \l__mermap_mapnorth_fp
{
@@ -340,14 +342,14 @@
\prg_return_false:
}
{
- \fp_set:Nn \l_tmpa_fp { #2-\l__mermap_mapwest_fp }
- \fp_sub:Nn \l_tmpa_fp { 360*floor(\l_tmpa_fp/360) }
- \fp_compare:nNnTF \l_tmpa_fp > \l__mermap_westeast_fp
+ \fp_set:Nn \l__mermap_tmpa_fp { #2-\l__mermap_mapwest_fp }
+ \fp_sub:Nn \l__mermap_tmpa_fp { 360*floor(\l__mermap_tmpa_fp/360) }
+ \fp_compare:nNnTF \l__mermap_tmpa_fp > \l__mermap_westeast_fp
{
\prg_return_false:
}
{
- \fp_set:Nn \l__mermap_cs_x_fp { \l_tmpa_fp*\l__mermap_cs_xfactor_fp }
+ \fp_set:Nn \l__mermap_cs_x_fp { \l__mermap_tmpa_fp*\l__mermap_cs_xfactor_fp }
\__mermap_latitude_to_y:n {#1}
\pgfnoderename{mrclastpos}{mrcpos}
\pgfcoordinate{mrcpos}{
@@ -366,7 +368,7 @@
}
-\prg_new_conditional:Npnn \__mermap_if_in_vicinity:nn #1#2 { p, TF }
+\prg_new_conditional:Npnn \__mermap_if_in_vicinity:nn #1#2 { p, T, F, TF }
{
\fp_compare:nNnTF {#1} > \l__mermap_vic_north_fp
{
@@ -378,14 +380,14 @@
\prg_return_false:
}
{
- \fp_set:Nn \l_tmpa_fp { #2-\l__mermap_vic_west_fp }
- \fp_sub:Nn \l_tmpa_fp { 360*floor(\l_tmpa_fp/360) }
- \fp_compare:nNnTF \l_tmpa_fp > \l__mermap_vic_westeast_fp
+ \fp_set:Nn \l__mermap_tmpa_fp { #2-\l__mermap_vic_west_fp }
+ \fp_sub:Nn \l__mermap_tmpa_fp { 360*floor(\l__mermap_tmpa_fp/360) }
+ \fp_compare:nNnTF \l__mermap_tmpa_fp > \l__mermap_vic_westeast_fp
{
\prg_return_false:
}
{
- \fp_set:Nn \l__mermap_cs_x_fp { \l_tmpa_fp*\l__mermap_cs_xfactor_fp - \l__mermap_vic_dim_fp }
+ \fp_set:Nn \l__mermap_cs_x_fp { \l__mermap_tmpa_fp*\l__mermap_cs_xfactor_fp - \l__mermap_vic_dim_fp }
\__mermap_latitude_to_y:n {#1}
\pgfnoderename{mrclastpos}{mrcpos}
\pgfcoordinate{mrcpos}{
@@ -443,19 +445,13 @@
\NewExpandableDocumentCommand \mrcNPlat { m }
{
- \cs_if_exist_use:cF{__mermap__lat__#1}
- {
- \msg_error:nnx{ mercatormap }{ np-undefined }{ #1 }
- }
+ \cs_if_exist_use:cF{ __mermap__lat__#1 }{ 0 }
}
\NewExpandableDocumentCommand \mrcNPlon { m }
{
- \cs_if_exist_use:cF{__mermap__lon__#1}
- {
- \msg_error:nnx{ mercatormap }{ np-undefined }{ #1 }
- }
+ \cs_if_exist_use:cF{ __mermap__lon__#1 }{ 0 }
}
@@ -465,15 +461,75 @@
}
+\prg_new_conditional:Npnn \__mermap_if_NP_exists:n #1 { p, TF }
+ {
+ \cs_if_exist:cTF{ __mermap__lat__#1 }
+ {
+ \cs_if_exist:cTF{ __mermap__lon__#1 }
+ {
+ \prg_return_true:
+ }
+ {
+ \prg_return_false:
+ }
+ }
+ {
+ \prg_return_false:
+ }
+ }
+
+
+\NewDocumentCommand{\ifmrcNPexists}{ m }
+ {
+ \__mermap_if_NP_exists:nTF{ #1 }
+ }
+
+
+\prg_new_conditional:Npnn \__mermap_if_NP_in_map:n #1 { p, TF }
+ {
+ \__mermap_if_NP_exists:nTF { #1 }
+ {
+ \__mermap_if_in_map:nnTF{ \mrcNPlat{#1} }{ \mrcNPlon{#1} }
+ {
+ \prg_return_true:
+ }
+ {
+ \prg_return_false:
+ }
+ }
+ {
+ \prg_return_false:
+ }
+ }
+
+
\NewDocumentCommand{\ifmrcNPinmap}{ m }
{
- \__mermap_if_in_map:nnTF{\mrcNPlat{#1}}{\mrcNPlon{#1}}
+ \__mermap_if_NP_in_map:nTF { #1 }
+ }
+
+
+\prg_new_conditional:Npnn \__mermap_if_NP_in_vicinity:n #1 { p, TF }
+ {
+ \__mermap_if_NP_exists:nTF { #1 }
+ {
+ \__mermap_if_in_vicinity:nnTF{ \mrcNPlat{#1} }{ \mrcNPlon{#1} }
+ {
+ \prg_return_true:
+ }
+ {
+ \prg_return_false:
+ }
+ }
+ {
+ \prg_return_false:
+ }
}
\NewDocumentCommand{\ifmrcNPinvicinity}{ m }
{
- \__mermap_if_in_vicinity:nnTF{\mrcNPlat{#1}}{\mrcNPlon{#1}}
+ \__mermap_if_NP_in_vicinity:nTF{ #1 }
}
@@ -485,7 +541,7 @@
\char_set_catcode_other:n {`\"}
\tl_const:Nn \c__mermap_supply_call_boundaries_tl
- {%
+ {
\l__mermap_python_tl\c_space_tl boundaries
-u "\str_use:N\l__mermap_supply_url_str"
-at "\str_use:N\l__mermap_supply_attribution_str"
@@ -503,7 +559,7 @@
}
\tl_const:Nn \c__mermap_supply_call_reference_tl
- {%
+ {
\l__mermap_python_tl\c_space_tl reference
-u "\str_use:N\l__mermap_supply_url_str"
-at "\str_use:N\l__mermap_supply_attribution_str"
@@ -523,7 +579,7 @@
\tl_const:Nn \c__mermap_supply_call_areafit_tl
- {%
+ {
\l__mermap_python_tl\c_space_tl areafit
-u "\str_use:N\l__mermap_supply_url_str"
-at "\str_use:N\l__mermap_supply_attribution_str"
@@ -604,11 +660,11 @@
\cs_new:Npn \__mermap_supply_url_with_api_key:nnn #1#2#3
{
\str_set:Nn \l__mermap_supply_url_str {#1}
- \prop_get:NnNF \g__mermap_apikey_prop {#2} \l_tmpa_tl
+ \prop_get:NnNF \g__mermap_apikey_prop {#2} \l__mermap_tmpa_tl
{
\msg_error:nnx{ mercatormap }{ api-key-undefined }{ #2 }
}
- \str_put_right:NV \l__mermap_supply_url_str \l_tmpa_tl
+ \str_put_right:NV \l__mermap_supply_url_str \l__mermap_tmpa_tl
\str_put_right:Nn \l__mermap_supply_url_str {#3}
}
@@ -621,16 +677,16 @@
{
\msg_error:nnx{ mercatormap }{ np-undefined }{ ##1 }
}
- \fp_set:Nn \l_tmpa_fp { \mrcNPlat{##1} }
- \fp_compare:nNnT \l_tmpa_fp < \l__mermap_supply_south_fp
- { \fp_set_eq:NN \l__mermap_supply_south_fp \l_tmpa_fp }
- \fp_compare:nNnT \l_tmpa_fp > \l__mermap_supply_north_fp
- { \fp_set_eq:NN \l__mermap_supply_north_fp \l_tmpa_fp }
- \fp_set:Nn \l_tmpa_fp { \mrcNPlon{##1} }
- \fp_compare:nNnT \l_tmpa_fp < \l__mermap_supply_west_fp
- { \fp_set_eq:NN \l__mermap_supply_west_fp \l_tmpa_fp }
- \fp_compare:nNnT \l_tmpa_fp > \l__mermap_supply_east_fp
- { \fp_set_eq:NN \l__mermap_supply_east_fp \l_tmpa_fp }
+ \fp_set:Nn \l__mermap_tmpa_fp { \mrcNPlat{##1} }
+ \fp_compare:nNnT \l__mermap_tmpa_fp < \l__mermap_supply_south_fp
+ { \fp_set_eq:NN \l__mermap_supply_south_fp \l__mermap_tmpa_fp }
+ \fp_compare:nNnT \l__mermap_tmpa_fp > \l__mermap_supply_north_fp
+ { \fp_set_eq:NN \l__mermap_supply_north_fp \l__mermap_tmpa_fp }
+ \fp_set:Nn \l__mermap_tmpa_fp { \mrcNPlon{##1} }
+ \fp_compare:nNnT \l__mermap_tmpa_fp < \l__mermap_supply_west_fp
+ { \fp_set_eq:NN \l__mermap_supply_west_fp \l__mermap_tmpa_fp }
+ \fp_compare:nNnT \l__mermap_tmpa_fp > \l__mermap_supply_east_fp
+ { \fp_set_eq:NN \l__mermap_supply_east_fp \l__mermap_tmpa_fp }
}
}
@@ -662,14 +718,14 @@
{
\msg_error:nnn { mercatormap }{ input-area-marker }{ #1 }
}
- \tl_gset:Nx \g_tmpa_tl
+ \tl_gset:Nx \g__mermap_tmpa_tl
{
\exp_not:N\fp_set:Nn \exp_not:N\l__mermap_supply_west_fp { \fp_to_decimal:N\l__mermap_supply_west_fp }
\exp_not:N\fp_set:Nn \exp_not:N\l__mermap_supply_east_fp { \fp_to_decimal:N\l__mermap_supply_east_fp }
\exp_not:N\fp_set:Nn \exp_not:N\l__mermap_supply_south_fp { \fp_to_decimal:N\l__mermap_supply_south_fp }
\exp_not:N\fp_set:Nn \exp_not:N\l__mermap_supply_north_fp { \fp_to_decimal:N\l__mermap_supply_north_fp }
}
- \group_insert_after:N \g_tmpa_tl
+ \group_insert_after:N \g__mermap_tmpa_tl
\group_end:
}
@@ -715,18 +771,18 @@
_source .choice:,
area .code:n =
{
- \clist_set:Nn \l_tmpa_clist { #1 }
+ \clist_set:Nn \l__mermap_tmpa_clist { #1 }
\fp_set:Nn \l__mermap_supply_west_fp { inf }
\fp_set:Nn \l__mermap_supply_east_fp { -inf }
\fp_set:Nn \l__mermap_supply_south_fp { 89 }
\fp_set:Nn \l__mermap_supply_north_fp { -89 }
- \__mermap_supply_add_area_clist:N \l_tmpa_clist
+ \__mermap_supply_add_area_clist:N \l__mermap_tmpa_clist
},
area .value_required:n = true,
add~area .code:n =
{
- \clist_set:Nn \l_tmpa_clist { #1 }
- \__mermap_supply_add_area_clist:N \l_tmpa_clist
+ \clist_set:Nn \l__mermap_tmpa_clist { #1 }
+ \__mermap_supply_add_area_clist:N \l__mermap_tmpa_clist
},
area~from~marker~input .code:n =
{
@@ -756,20 +812,20 @@
flex~area~fit .code:n = {
\fp_compare:nNnF \l__mermap_tile_size_dim = \l__mermap_flex_tile_size_dim
{
- \fp_set:Nn \l_tmpa_fp { \l__mermap_tile_size_dim/\l__mermap_flex_tile_size_dim }
- \fp_set:Nn \l__mermap_supply_width_fp{\l__mermap_supply_width_fp*\l_tmpa_fp}
- \fp_set:Nn \l__mermap_supply_height_fp{\l__mermap_supply_height_fp*\l_tmpa_fp}
+ \fp_set:Nn \l__mermap_tmpa_fp { \l__mermap_tile_size_dim/\l__mermap_flex_tile_size_dim }
+ \fp_set:Nn \l__mermap_supply_width_fp{\l__mermap_supply_width_fp*\l__mermap_tmpa_fp}
+ \fp_set:Nn \l__mermap_supply_height_fp{\l__mermap_supply_height_fp*\l__mermap_tmpa_fp}
}
\fp_set:Nn \l__mermap_supply_width_fp{\l__mermap_supply_width_fp-(#1)/\l__mermap_flex_tile_size_dim}
\fp_set:Nn \l__mermap_supply_height_fp{\l__mermap_supply_height_fp-(#1)/\l__mermap_flex_tile_size_dim}
- \fp_set:Nn \l_tmpa_fp { min ( 180*\l__mermap_supply_width_fp / (\l__mermap_supply_east_fp-\l__mermap_supply_west_fp)
+ \fp_set:Nn \l__mermap_tmpa_fp { min ( 180*\l__mermap_supply_width_fp / (\l__mermap_supply_east_fp-\l__mermap_supply_west_fp)
, pi*\l__mermap_supply_height_fp / ln( tand(\l__mermap_supply_north_fp/2+45) / tand(\l__mermap_supply_south_fp/2+45) ) ) }
- \fp_set:Nn \l_tmpb_fp { ln(\l_tmpa_fp)/ln(2) }
- \fp_set:Nn \l_tmpb_fp { round(\l_tmpb_fp)/\l_tmpb_fp }
- \fp_set:Nn \l_tmpb_fp { \l_tmpa_fp^(\l_tmpb_fp-1+0.0000001) }
- \dim_set:Nn \l__mermap_tile_size_dim { \fp_to_dim:n { \l__mermap_flex_tile_size_dim / \l_tmpb_fp }}
- \fp_set:Nn \l__mermap_supply_width_fp { \l__mermap_supply_width_fp * \l_tmpb_fp + (#1)/\l__mermap_tile_size_dim }
- \fp_set:Nn \l__mermap_supply_height_fp { \l__mermap_supply_height_fp * \l_tmpb_fp + (#1)/\l__mermap_tile_size_dim }
+ \fp_set:Nn \l__mermap_tmpb_fp { ln(\l__mermap_tmpa_fp)/ln(2) }
+ \fp_set:Nn \l__mermap_tmpb_fp { round(\l__mermap_tmpb_fp)/\l__mermap_tmpb_fp }
+ \fp_set:Nn \l__mermap_tmpb_fp { \l__mermap_tmpa_fp^(\l__mermap_tmpb_fp-1+0.0000001) }
+ \dim_set:Nn \l__mermap_tile_size_dim { \fp_to_dim:n { \l__mermap_flex_tile_size_dim / \l__mermap_tmpb_fp }}
+ \fp_set:Nn \l__mermap_supply_width_fp { \l__mermap_supply_width_fp * \l__mermap_tmpb_fp + (#1)/\l__mermap_tile_size_dim }
+ \fp_set:Nn \l__mermap_supply_height_fp { \l__mermap_supply_height_fp * \l__mermap_tmpb_fp + (#1)/\l__mermap_tile_size_dim }
},
flex~area~fit .default:n = 0pt,
}
@@ -815,16 +871,13 @@
\msg_new:nnn { mercatormap }{ python-script }
- { Python~script~'maptiles.texpy'~is~created~(for~map~tile~download). }
+ { Python~script~'maptiles.texpy'~is~created~for~map~tile~download. }
\NewDocumentCommand \mrcactivatescript {}
{
\msg_info:nn { mercatormap }{ python-script }
- \group_begin:
- \def\@latex@warning@no@line##1{}% suppress filecontents warning
\file_input:n {\mrcpkgprefix mercatorpy.def}
- \group_end:
\bool_set_true:N \l__mermap_script_activated_bool
}
\@onlypreamble\mrcactivatescript
@@ -838,21 +891,21 @@
\cs_new:Npn \__mermap_create_definition_id:n #1
{
- \tl_set:Nx \l_tmpa_tl {#1}
- \tl_trim_spaces:N \l_tmpa_tl
- \str_set:Nx \l__mermap_definition_postfix_str {\tl_to_str:N \l_tmpa_tl}
+ \tl_set:Nx \l__mermap_tmpa_tl {#1}
+ \tl_trim_spaces:N \l__mermap_tmpa_tl
+ \str_set:Nx \l__mermap_definition_postfix_str {\tl_to_str:N \l__mermap_tmpa_tl}
\str_concat:NNN \l__mermap_definition_id_str
\l__mermap_definition_prefix_str \l__mermap_definition_postfix_str
}
\cs_new:Npn \__mermap_map:nn #1#2
{
- \tl_set:Nx \l_tmpa_tl {#2}
- \tl_trim_spaces:N \l_tmpa_tl
- \tl_if_empty:NT \l_tmpa_tl
+ \tl_set:Nx \l__mermap_tmpa_tl {#2}
+ \tl_trim_spaces:N \l__mermap_tmpa_tl
+ \tl_if_empty:NT \l__mermap_tmpa_tl
{
\int_gincr:N \g__mermap_automap_int
- \tl_set:Nx \l_tmpa_tl
+ \tl_set:Nx \l__mermap_tmpa_tl
{
automap-
\int_compare:nNnTF \g__mermap_automap_int<{10} {000}
@@ -865,7 +918,7 @@
\int_use:N \g__mermap_automap_int
}
}
- \str_set:Nx \l__mermap_definition_postfix_str {\tl_to_str:N \l_tmpa_tl}
+ \str_set:Nx \l__mermap_definition_postfix_str {\tl_to_str:N \l__mermap_tmpa_tl}
\str_concat:NNN \l__mermap_definition_id_str
\l__mermap_definition_prefix_str \l__mermap_definition_postfix_str
\__mermap_supplymap:n {#1}
@@ -886,12 +939,12 @@
{
\group_begin:
\keys_set:nn { mermap/supply } { #1 }
- \tl_set:Nx \l_tmpa_tl { \str_use:N\l__mermap_definition_id_str }
- \prop_if_in:NVT \g__mermap_definition_prop \l_tmpa_tl
+ \tl_set:Nx \l__mermap_tmpa_tl { \str_use:N\l__mermap_definition_id_str }
+ \prop_if_in:NVT \g__mermap_definition_prop \l__mermap_tmpa_tl
{
- \msg_warning:nnx { mercatormap }{ definition-id-used }{ \tl_use:N \l_tmpa_tl }
+ \msg_warning:nnx { mercatormap }{ definition-id-used }{ \tl_use:N \l__mermap_tmpa_tl }
}
- \prop_gput:NVn \g__mermap_definition_prop \l_tmpa_tl {}
+ \prop_gput:NVn \g__mermap_definition_prop \l__mermap_tmpa_tl {}
\bool_if:NT \l__mermap_script_activated_bool
{
\__mermap_supplymap_call:
@@ -927,10 +980,10 @@
\cs_new:Npn \__mermap_supplymap_call:
{
- \tl_set_eq:Nc \l_tmpa_tl {
+ \tl_set_eq:Nc \l__mermap_tmpa_tl {
c__mermap_supply_call_\l__mermap_supply_type_tl _tl }
- \tl_set:Nx \l__mermap_supply_call_tl \l_tmpa_tl
- \tl_set:Nx \l__mermap_mdfivesum_tl { \pdf@mdfivesum{\l__mermap_supply_call_tl} }
+ \tl_set:Nx \l__mermap_supply_call_tl \l__mermap_tmpa_tl
+ \tl_set:Nx \l__mermap_mdfivesum_tl { \str_mdfive_hash:e{\l__mermap_supply_call_tl} }
\file_if_exist:nTF {\l__mermap_definition_id_str.def}
{
\tl_clear:N \l__mermap_last_mdfivesum_tl
@@ -1031,8 +1084,8 @@
\cs_new_nopar:Npn \__mermap_set_flex_scale:nn #1#2
{
- \fp_set:Nn \l_tmpa_fp { 1+ln(\c__mermap_mean_radius_fp/#1*cosd(#2)*pi/\l__mermap_flex_tile_size_dim)/ln(2) }
- \keys_set:nn { mermap }{ flex~zoom=\l_tmpa_fp }
+ \fp_set:Nn \l__mermap_tmpa_fp { 1+ln(\c__mermap_mean_radius_fp/#1*cosd(#2)*pi/\l__mermap_flex_tile_size_dim)/ln(2) }
+ \keys_set:nn { mermap }{ flex~zoom=\l__mermap_tmpa_fp }
}
\use:x
@@ -1323,19 +1376,19 @@
\cs_new_nopar:Npn \__mermap_compute_network_step:nn #1#2
{
- \fp_set:Nn \l_tmpa_fp
+ \fp_set:Nn \l__mermap_tmpa_fp
{
min ( \l__mermap_network_pieces_int, round((#1)/\l__mermap_network_distance_dim) )
}
- \fp_set:Nn \l_tmpb_fp { (#2)/\l_tmpa_fp }
- \fp_set:Nn \l_tmpa_fp { floor(ln(\l_tmpb_fp)/ln(10)) }
- \fp_compare:nNnTF {\l_tmpa_fp} < {0}
+ \fp_set:Nn \l__mermap_tmpb_fp { (#2)/\l__mermap_tmpa_fp }
+ \fp_set:Nn \l__mermap_tmpa_fp { floor(ln(\l__mermap_tmpb_fp)/ln(10)) }
+ \fp_compare:nNnTF {\l__mermap_tmpa_fp} < {0}
{
- \fp_compare:nNnTF {\l_tmpa_fp} > {-5}
+ \fp_compare:nNnTF {\l__mermap_tmpa_fp} > {-5}
{
\use:x
{
- \exp_not:N\keys_set:nn { mermap }{ format~angle=decimal\fp_to_int:N\l_tmpa_fp}
+ \exp_not:N\keys_set:nn { mermap }{ format~angle=decimal\fp_to_int:N\l__mermap_tmpa_fp}
}
}
{
@@ -1345,25 +1398,25 @@
{
\keys_set:nn { mermap }{ format~angle=decimal-0 }
}
- \fp_set:Nn \l_tmpa_fp { 10^\l_tmpa_fp }
- \fp_set:Nn \l_tmpb_fp { \l_tmpb_fp/\l_tmpa_fp }
- \fp_compare:nNnTF {abs(\l_tmpb_fp-1)} < {abs(\l_tmpb_fp-2)}
+ \fp_set:Nn \l__mermap_tmpa_fp { 10^\l__mermap_tmpa_fp }
+ \fp_set:Nn \l__mermap_tmpb_fp { \l__mermap_tmpb_fp/\l__mermap_tmpa_fp }
+ \fp_compare:nNnTF {abs(\l__mermap_tmpb_fp-1)} < {abs(\l__mermap_tmpb_fp-2)}
{
- \fp_compare:nNnTF {abs(\l_tmpb_fp-1)} < {abs(\l_tmpb_fp-5)}
+ \fp_compare:nNnTF {abs(\l__mermap_tmpb_fp-1)} < {abs(\l__mermap_tmpb_fp-5)}
{
- \fp_set:Nn \l__mermap_result_fp {\l_tmpa_fp}
+ \fp_set:Nn \l__mermap_result_fp {\l__mermap_tmpa_fp}
}
{
- \fp_set:Nn \l__mermap_result_fp {5*\l_tmpa_fp}
+ \fp_set:Nn \l__mermap_result_fp {5*\l__mermap_tmpa_fp}
}
}
{
- \fp_compare:nNnTF {abs(\l_tmpb_fp-2)} < {abs(\l_tmpb_fp-5)}
+ \fp_compare:nNnTF {abs(\l__mermap_tmpb_fp-2)} < {abs(\l__mermap_tmpb_fp-5)}
{
- \fp_set:Nn \l__mermap_result_fp {2*\l_tmpa_fp}
+ \fp_set:Nn \l__mermap_result_fp {2*\l__mermap_tmpa_fp}
}
{
- \fp_set:Nn \l__mermap_result_fp {5*\l_tmpa_fp}
+ \fp_set:Nn \l__mermap_result_fp {5*\l__mermap_tmpa_fp}
}
}
}
@@ -1376,46 +1429,46 @@
\IfNoValueF {#1} { \keys_set:nn { mermap } {#1} }
\tl_use:N \l__mermap_tikz_map_clip_tl
\__mermap_compute_network_step:nn {\l__mermap_tex_height_fp}{\l__mermap_mapnorth_fp-\l__mermap_mapsouth_fp}
- \fp_set:Nn \l_tmpa_fp { ceil(\l__mermap_mapsouth_fp/\l__mermap_result_fp)*\l__mermap_result_fp}
- \fp_compare:nNnT {\l_tmpa_fp-\l__mermap_mapsouth_fp} < {1e-10}
+ \fp_set:Nn \l__mermap_tmpa_fp { ceil(\l__mermap_mapsouth_fp/\l__mermap_result_fp)*\l__mermap_result_fp}
+ \fp_compare:nNnT {\l__mermap_tmpa_fp-\l__mermap_mapsouth_fp} < {1e-10}
{
- \fp_add:Nn \l_tmpa_fp {\l__mermap_result_fp}
+ \fp_add:Nn \l__mermap_tmpa_fp {\l__mermap_result_fp}
}
- \fp_while_do:nNnn {\l_tmpa_fp} < {\l__mermap_mapnorth_fp}
+ \fp_while_do:nNnn {\l__mermap_tmpa_fp} < {\l__mermap_mapnorth_fp}
{
- \tl_set:Nn \l_tmpa_tl {\fp_use:N\l_tmpa_fp}
- \draw[gray,very~thin] (mrc~cs\c_colon_str lat=\l_tmpa_tl,lon=\mrcmapwest)
+ \tl_set:Nn \l__mermap_tmpa_tl {\fp_use:N\l__mermap_tmpa_fp}
+ \draw[gray,very~thin] (mrc~cs\c_colon_str lat=\l__mermap_tmpa_tl,lon=\mrcmapwest)
coordinate (mermap_temp)
node[right=1mm,inner~sep=0.5pt,black!50!gray,font=\l__mermap_network_font_tl,
fill=white,opacity=0.3,text~opacity=1,
- ]{\mrcformlat{\l_tmpa_tl}}
+ ]{\mrcformlat{\l__mermap_tmpa_tl}}
-- (mermap_temp -| mrcmap.east)
node[left=1mm,inner~sep=0.5pt,black!50!gray,font=\l__mermap_network_font_tl,
fill=white,opacity=0.3,text~opacity=1,
- ]{\mrcformlat{\l_tmpa_tl}}
+ ]{\mrcformlat{\l__mermap_tmpa_tl}}
;
- \fp_add:Nn \l_tmpa_fp {\l__mermap_result_fp}
+ \fp_add:Nn \l__mermap_tmpa_fp {\l__mermap_result_fp}
}
\__mermap_compute_network_step:nn {\l__mermap_tex_width_fp}{\l__mermap_mapeast_fp-\l__mermap_mapwest_fp}
- \fp_set:Nn \l_tmpa_fp { ceil(\l__mermap_mapwest_fp/\l__mermap_result_fp)*\l__mermap_result_fp}
- \fp_compare:nNnT {\l_tmpa_fp-\l__mermap_mapwest_fp} < {1e-10}
+ \fp_set:Nn \l__mermap_tmpa_fp { ceil(\l__mermap_mapwest_fp/\l__mermap_result_fp)*\l__mermap_result_fp}
+ \fp_compare:nNnT {\l__mermap_tmpa_fp-\l__mermap_mapwest_fp} < {1e-10}
{
- \fp_add:Nn \l_tmpa_fp {\l__mermap_result_fp}
+ \fp_add:Nn \l__mermap_tmpa_fp {\l__mermap_result_fp}
}
- \fp_while_do:nNnn {\l_tmpa_fp} < {\l__mermap_mapeast_fp}
+ \fp_while_do:nNnn {\l__mermap_tmpa_fp} < {\l__mermap_mapeast_fp}
{
- \tl_set:Nn \l_tmpa_tl {\fp_use:N\l_tmpa_fp}
- \draw[gray,very~thin] (mrc~cs\c_colon_str lon=\l_tmpa_tl,lat=\mrcmapsouth)
+ \tl_set:Nn \l__mermap_tmpa_tl {\fp_use:N\l__mermap_tmpa_fp}
+ \draw[gray,very~thin] (mrc~cs\c_colon_str lon=\l__mermap_tmpa_tl,lat=\mrcmapsouth)
coordinate (mermap_temp)
node[above=1mm,inner~sep=0.5pt,black!50!gray,font=\l__mermap_network_font_tl,
fill=white,opacity=0.3,text~opacity=1,
- ]{\mrcformlon{\l_tmpa_tl}}
+ ]{\mrcformlon{\l__mermap_tmpa_tl}}
-- (mermap_temp |- mrcmap.north)
node[below=1mm,inner~sep=0.5pt,black!50!gray,font=\l__mermap_network_font_tl,
fill=white,opacity=0.3,text~opacity=1,
- ]{\mrcformlon{\l_tmpa_tl}}
+ ]{\mrcformlon{\l__mermap_tmpa_tl}}
;
- \fp_add:Nn \l_tmpa_fp {\l__mermap_result_fp}
+ \fp_add:Nn \l__mermap_tmpa_fp {\l__mermap_result_fp}
}
\end{scope}
}
@@ -1488,26 +1541,26 @@
\cs_new_nopar:Npn \__mermap_pretty_distance:n #1
{
- \fp_set:Nn \l_tmpa_fp { #1 }
- \fp_compare:nNnTF \l_tmpa_fp < 5
+ \fp_set:Nn \l__mermap_tmpa_fp { #1 }
+ \fp_compare:nNnTF \l__mermap_tmpa_fp < 5
{
- \SI[round-mode=figures,round-precision=3,detect-all]{\fp_to_decimal:n{1000*\l_tmpa_fp}}{\meter}
+ \SI[round-mode=figures,round-precision=3,detect-all]{\fp_to_decimal:n{1000*\l__mermap_tmpa_fp}}{\meter}
}
{
- \SI[round-mode=figures,round-precision=3,detect-all]{\fp_to_decimal:N \l_tmpa_fp}{\kilo\meter}
+ \SI[round-mode=figures,round-precision=3,detect-all]{\fp_to_decimal:N \l__mermap_tmpa_fp}{\kilo\meter}
}
}
\cs_new_nopar:Npn \__mermap_pretty_length:n #1
{
- \fp_set:Nn \l_tmpa_fp { (#1)*\l__mermap_scale_fp }
- \fp_compare:nNnTF \l_tmpa_fp < 5
+ \fp_set:Nn \l__mermap_tmpa_fp { (#1)*\l__mermap_scale_fp }
+ \fp_compare:nNnTF \l__mermap_tmpa_fp < 5
{
- \SI[round-mode=figures,round-precision=3,detect-all]{\fp_to_decimal:n{1000*\l_tmpa_fp}}{\meter}
+ \SI[round-mode=figures,round-precision=3,detect-all]{\fp_to_decimal:n{1000*\l__mermap_tmpa_fp}}{\meter}
}
{
- \SI[round-mode=figures,round-precision=3,detect-all]{\fp_to_decimal:N \l_tmpa_fp}{\kilo\meter}
+ \SI[round-mode=figures,round-precision=3,detect-all]{\fp_to_decimal:N \l__mermap_tmpa_fp}{\kilo\meter}
}
}
@@ -1535,25 +1588,25 @@
\cs_new_nopar:Npn \__mermap_format_angle_minute:n #1
{
- \fp_set:Nn \l_tmpa_fp {floor(#1)}
- \fp_set:Nn \l_tmpb_fp {round((#1-\l_tmpa_fp)*60)}
+ \fp_set:Nn \l__mermap_tmpa_fp {floor(#1)}
+ \fp_set:Nn \l__mermap_tmpb_fp {round((#1-\l__mermap_tmpa_fp)*60)}
\ang[add-arc-degree-zero,add-arc-minute-zero]
{
- \fp_to_int:N \l_tmpa_fp ;
- \fp_to_int:N \l_tmpb_fp ;
+ \fp_to_int:N \l__mermap_tmpa_fp ;
+ \fp_to_int:N \l__mermap_tmpb_fp ;
}
}
\cs_new_nopar:Npn \__mermap_format_angle_second:n #1
{
- \fp_set:Nn \l_tmpa_fp {floor(#1)}
- \fp_set:Nn \l_tmpb_fp {floor((#1-\l_tmpa_fp)*60)}
+ \fp_set:Nn \l__mermap_tmpa_fp {floor(#1)}
+ \fp_set:Nn \l__mermap_tmpb_fp {floor((#1-\l__mermap_tmpa_fp)*60)}
\ang[add-arc-degree-zero,add-arc-minute-zero]
{
- \fp_to_int:N \l_tmpa_fp ;
- \fp_to_int:N \l_tmpb_fp ;
- \fp_to_int:n {round(((#1-\l_tmpa_fp)*60-\l_tmpb_fp)*60)}
+ \fp_to_int:N \l__mermap_tmpa_fp ;
+ \fp_to_int:N \l__mermap_tmpb_fp ;
+ \fp_to_int:n {round(((#1-\l__mermap_tmpa_fp)*60-\l__mermap_tmpb_fp)*60)}
}
}
@@ -1562,14 +1615,14 @@
\group_begin:
\IfNoValueF {#1}
{ \keys_set:nn { mermap } {#1} }
- \fp_set:Nn \l_tmpa_fp {#2}
- \fp_compare:nNnTF \l_tmpa_fp < 0
+ \fp_set:Nn \l__mermap_tmpa_fp {#2}
+ \fp_compare:nNnTF \l__mermap_tmpa_fp < 0
{
- \tl_set:Nx \l__mermap_temp_tl {\fp_to_decimal:n{-\l_tmpa_fp}}
+ \tl_set:Nx \l__mermap_temp_tl {\fp_to_decimal:n{-\l__mermap_tmpa_fp}}
\__mermap_format_south:n {\__mermap_format_angle:n{\l__mermap_temp_tl}}
}
{
- \tl_set:Nx \l__mermap_temp_tl {\fp_to_decimal:N \l_tmpa_fp}
+ \tl_set:Nx \l__mermap_temp_tl {\fp_to_decimal:N \l__mermap_tmpa_fp}
\__mermap_format_north:n {\__mermap_format_angle:n{\l__mermap_temp_tl}}
}
\group_end:
@@ -1580,14 +1633,14 @@
\group_begin:
\IfNoValueF {#1}
{ \keys_set:nn { mermap } {#1} }
- \fp_set:Nn \l_tmpa_fp {#2-360*floor((#2+180)/360)}
- \fp_compare:nNnTF \l_tmpa_fp < 0
+ \fp_set:Nn \l__mermap_tmpa_fp {#2-360*floor((#2+180)/360)}
+ \fp_compare:nNnTF \l__mermap_tmpa_fp < 0
{
- \tl_set:Nx \l__mermap_temp_tl {\fp_to_decimal:n{-\l_tmpa_fp}}
+ \tl_set:Nx \l__mermap_temp_tl {\fp_to_decimal:n{-\l__mermap_tmpa_fp}}
\__mermap_format_west:n{\__mermap_format_angle:n{\l__mermap_temp_tl}}
}
{
- \tl_set:Nx \l__mermap_temp_tl {\fp_to_decimal:N \l_tmpa_fp}
+ \tl_set:Nx \l__mermap_temp_tl {\fp_to_decimal:N \l__mermap_tmpa_fp}
\__mermap_format_east:n {\__mermap_format_angle:n{\l__mermap_temp_tl}}
}
\group_end:
@@ -1608,22 +1661,22 @@
{
\tl_if_empty:nTF {#5}
{
- \fp_set:Nn \l_tmpa_fp {0}
- \fp_set:Nn \l_tmpb_fp {0}
+ \fp_set:Nn \l__mermap_tmpa_fp {0}
+ \fp_set:Nn \l__mermap_tmpb_fp {0}
}
{
- \fp_set:Nn \l_tmpa_fp {#3*(#5)}
+ \fp_set:Nn \l__mermap_tmpa_fp {#3*(#5)}
\tl_if_empty:nTF {#6}
{
- \fp_set:Nn \l_tmpb_fp {#4*(#5)}
+ \fp_set:Nn \l__mermap_tmpb_fp {#4*(#5)}
}
{
- \fp_set:Nn \l_tmpb_fp {#4*(#6)}
+ \fp_set:Nn \l__mermap_tmpb_fp {#4*(#6)}
}
}
\tl_set:Nx \l__mermap_scalebar_at_tl
{
- {([xshift=\fp_to_dim:N\l_tmpa_fp,yshift=\fp_to_dim:N\l_tmpb_fp]mrcmap.#1)}
+ {([xshift=\fp_to_dim:N\l__mermap_tmpa_fp,yshift=\fp_to_dim:N\l__mermap_tmpb_fp]mrcmap.#1)}
}
\tl_set:Nn \l__mermap_scalebar_placement_tl {#2}
}
@@ -1691,60 +1744,56 @@
\begin{scope}[shift=(mrcscalebar.south~west)]
\__mermap_tikz_path_begin:n { fill=black, mrcscalebarmajor }
\pgfseteorule
- \fp_set:Nn \l_tmpa_fp {\l__mermap_scalebar_width_fp/\l__mermap_scale_fp} % Breite
+ \fp_set:Nn \l__mermap_tmpa_fp {\l__mermap_scalebar_width_fp/\l__mermap_scale_fp} % Breite
\pgfpathrectangle{\pgfpoint{0pt}{0pt}}
- {\pgfpoint{\fp_to_dim:N\l_tmpa_fp}{\l__mermap_scalebar_height_dim}}
+ {\pgfpoint{\fp_to_dim:N\l__mermap_tmpa_fp}{\l__mermap_scalebar_height_dim}}
\bool_if:NF \l__mermap_scalebar_transparent_bool
{
\__mermap_tikz_path_end:
\__mermap_tikz_path_begin:n { fill=white, mrcscalebarminor }
- \fp_set:Nn \l_tmpa_fp {\l__mermap_scalebar_width_fp/\l__mermap_scale_fp}
+ \fp_set:Nn \l__mermap_tmpa_fp {\l__mermap_scalebar_width_fp/\l__mermap_scale_fp}
}
- \fp_set:Nn \l_tmpb_fp {\l_tmpa_fp/\l__mermap_scalebar_partitions_int}
+ \fp_set:Nn \l__mermap_tmpb_fp {\l__mermap_tmpa_fp/\l__mermap_scalebar_partitions_int}
\bool_if:NTF \l__mermap_scalebar_double_bool
{
- \int_set:Nn \l_tmpa_int {1}
- \dim_set:Nn \l_tmpb_dim {\l__mermap_scalebar_height_dim/2}
- \dim_set:Nn \l_tmpa_dim {0.2pt-\l_tmpb_dim}
+ \dim_set:Nn \l__mermap_tmpb_dim {\l__mermap_scalebar_height_dim/2}
+ \dim_set:Nn \l__mermap_tmpa_dim {0.2pt-\l__mermap_tmpb_dim}
\int_compare:nNnTF \l__mermap_scalebar_partitions_int = 1
{
- \pgfpathrectangle{\pgfpoint{0.2pt}{\l_tmpb_dim}}
- {\pgfpoint{\fp_to_dim:n{\l_tmpb_fp-0.4pt}}{\l_tmpa_dim}}
+ \pgfpathrectangle{\pgfpoint{0.2pt}{\l__mermap_tmpb_dim}}
+ {\pgfpoint{\fp_to_dim:n{\l__mermap_tmpb_fp-0.4pt}}{\l__mermap_tmpa_dim}}
}
{
- \pgfpathrectangle{\pgfpoint{0.2pt}{\l_tmpb_dim}}
- {\pgfpoint{\fp_to_dim:n{\l_tmpb_fp-0.2pt}}{\l_tmpa_dim}}
+ \pgfpathrectangle{\pgfpoint{0.2pt}{\l__mermap_tmpb_dim}}
+ {\pgfpoint{\fp_to_dim:n{\l__mermap_tmpb_fp-0.2pt}}{\l__mermap_tmpa_dim}}
}
- \int_while_do:nNnn \l_tmpa_int < \l__mermap_scalebar_partitions_int
+ \int_step_inline:nn { \l__mermap_scalebar_partitions_int-1 }
{
- \dim_set:Nn \l_tmpa_dim {-\l_tmpa_dim}
- \int_compare:nNnTF {\l_tmpa_int+1} = \l__mermap_scalebar_partitions_int
+ \dim_set:Nn \l__mermap_tmpa_dim {-\l__mermap_tmpa_dim}
+ \int_compare:nNnTF {##1+1} = \l__mermap_scalebar_partitions_int
{
- \pgfpathrectangle{\pgfpoint{\fp_to_dim:n{\l_tmpa_int*\l_tmpb_fp}}{\l_tmpb_dim}}
- {\pgfpoint{\fp_to_dim:n{\l_tmpb_fp-0.2pt}}{\l_tmpa_dim}}
+ \pgfpathrectangle{\pgfpoint{\fp_to_dim:n{##1*\l__mermap_tmpb_fp}}{\l__mermap_tmpb_dim}}
+ {\pgfpoint{\fp_to_dim:n{\l__mermap_tmpb_fp-0.2pt}}{\l__mermap_tmpa_dim}}
}
{
- \pgfpathrectangle{\pgfpoint{\fp_to_dim:n{\l_tmpa_int*\l_tmpb_fp}}{\l_tmpb_dim}}
- {\pgfpoint{\fp_to_dim:N\l_tmpb_fp}{\l_tmpa_dim}}
+ \pgfpathrectangle{\pgfpoint{\fp_to_dim:n{##1*\l__mermap_tmpb_fp}}{\l__mermap_tmpb_dim}}
+ {\pgfpoint{\fp_to_dim:N\l__mermap_tmpb_fp}{\l__mermap_tmpa_dim}}
}
- \int_incr:N \l_tmpa_int
}
}
{
- \int_set:Nn \l_tmpa_int {1}
- \dim_set:Nn \l_tmpa_dim {\l__mermap_scalebar_height_dim-0.4pt}
- \int_while_do:nNnn \l_tmpa_int < \l__mermap_scalebar_partitions_int
+ \dim_set:Nn \l__mermap_tmpa_dim {\l__mermap_scalebar_height_dim-0.4pt}
+ \int_step_inline:nnnn { 1 }{ 2 }{ \l__mermap_scalebar_partitions_int-1 }
{
- \int_compare:nNnTF {\l_tmpa_int+1} = \l__mermap_scalebar_partitions_int
+ \int_compare:nNnTF {##1+1} = \l__mermap_scalebar_partitions_int
{
- \pgfpathrectangle{\pgfpoint{\fp_to_dim:n{\l_tmpa_int*\l_tmpb_fp}}{0.2pt}}
- {\pgfpoint{\fp_to_dim:n{\l_tmpb_fp-0.2pt}}{\l_tmpa_dim}}
+ \pgfpathrectangle{\pgfpoint{\fp_to_dim:n{##1*\l__mermap_tmpb_fp}}{0.2pt}}
+ {\pgfpoint{\fp_to_dim:n{\l__mermap_tmpb_fp-0.2pt}}{\l__mermap_tmpa_dim}}
}
{
- \pgfpathrectangle{\pgfpoint{\fp_to_dim:n{\l_tmpa_int*\l_tmpb_fp}}{0.2pt}}
- {\pgfpoint{\fp_to_dim:N\l_tmpb_fp}{\l_tmpa_dim}}
+ \pgfpathrectangle{\pgfpoint{\fp_to_dim:n{##1*\l__mermap_tmpb_fp}}{0.2pt}}
+ {\pgfpoint{\fp_to_dim:N\l__mermap_tmpb_fp}{\l__mermap_tmpa_dim}}
}
- \int_add:Nn \l_tmpa_int {2}
}
}
\__mermap_tikz_path_end:
@@ -2032,53 +2081,53 @@
\__mermap_new_marker_type:nn {pin}
{
- \tl_set:Nx \l_tmpa_tl {\fp_to_dim:N \l__mermap_marker_distance_fp}
+ \tl_set:Nx \l__mermap_tmpa_tl {\fp_to_dim:N \l__mermap_marker_distance_fp}
\path[fill=mrcmarkerfill,draw=none,fill~opacity=0.7]
- (0,0) -- (0.1,\l_tmpa_tl) -- (-0.1,\l_tmpa_tl) -- cycle;
+ (0,0) -- (0.1,\l__mermap_tmpa_tl) -- (-0.1,\l__mermap_tmpa_tl) -- cycle;
\node[fill=white,draw=none,text=mrcmarkertext,
above,font=\mrcmarkerfont,inner~sep=0.5mm,align=center,
line~width=0mm,xshift=\mrcmarkershift,
fill~opacity=0.7,text~opacity=1,xshift=0mm,mrcnodestyle,mrchyperpath]
- (pin_node) at (0,\l_tmpa_tl) {\mrcmarkercontents};
+ (pin_node) at (0,\l__mermap_tmpa_tl) {\mrcmarkercontents};
\path[draw=mrcmarkerdraw,fill=none,line~join=round,mrcpathstyle]
- (0,0) -- (0.1,\l_tmpa_tl) -- (pin_node.south~east) -- (pin_node.north~east)
+ (0,0) -- (0.1,\l__mermap_tmpa_tl) -- (pin_node.south~east) -- (pin_node.north~east)
-- (pin_node.north~west) -- (pin_node.south~west)
- -- (-0.1,\l_tmpa_tl) [line~join=bevel] -- cycle;
+ -- (-0.1,\l__mermap_tmpa_tl) [line~join=bevel] -- cycle;
}
\__mermap_new_marker_type:nn {pinflip}
{
- \tl_set:Nx \l_tmpa_tl {\fp_to_dim:N \l__mermap_marker_distance_fp}
+ \tl_set:Nx \l__mermap_tmpa_tl {\fp_to_dim:N \l__mermap_marker_distance_fp}
\path[fill=mrcmarkerfill,draw=none,fill~opacity=0.7]
- (0,0) -- (-0.1,-\l_tmpa_tl) -- (0.1,-\l_tmpa_tl) -- cycle;
+ (0,0) -- (-0.1,-\l__mermap_tmpa_tl) -- (0.1,-\l__mermap_tmpa_tl) -- cycle;
\node[fill=white,draw=none,text=mrcmarkertext,
below,font=\mrcmarkerfont,inner~sep=0.5mm,align=center,
line~width=0mm,xshift=\mrcmarkershift,
fill~opacity=0.7,text~opacity=1,xshift=0mm,mrcnodestyle,mrchyperpath]
- (pin_node) at (0,-\l_tmpa_tl) {\mrcmarkercontents};
+ (pin_node) at (0,-\l__mermap_tmpa_tl) {\mrcmarkercontents};
\path[draw=mrcmarkerdraw,fill=none,line~join=round,mrcpathstyle]
- (0,0) -- (-0.1,-\l_tmpa_tl) -- (pin_node.north~west) -- (pin_node.south~west)
+ (0,0) -- (-0.1,-\l__mermap_tmpa_tl) -- (pin_node.north~west) -- (pin_node.south~west)
-- (pin_node.south~east) -- (pin_node.north~east)
- -- (0.1,-\l_tmpa_tl) [line~join=bevel] -- cycle;
+ -- (0.1,-\l__mermap_tmpa_tl) [line~join=bevel] -- cycle;
}
\cs_new_nopar:Npn \__mermap_tikz_drop_path:n #1
{
- \tl_set:Nn \l_tmpa_tl {\fp_to_dim:N\l__mermap_marker_radius_fp}
- \tl_set:Nn \l_tmpb_tl {\fp_to_dim:n{\l__mermap_marker_radius_fp*0.552}}
+ \tl_set:Nn \l__mermap_tmpa_tl {\fp_to_dim:N\l__mermap_marker_radius_fp}
+ \tl_set:Nn \l__mermap_tmpb_tl {\fp_to_dim:n{\l__mermap_marker_radius_fp*0.552}}
\__mermap_tikz_path_begin:n
{
line~join=bevel,draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,mrchyperpath
}
\pgfpathmoveto{\pgfpoint{0pt}{\fp_to_dim:n{-2*\l__mermap_marker_radius_fp-\l__mermap_marker_shift_fp}}}
- \pgfpathcurveto{\pgfpoint{\l_tmpb_tl}{-\l_tmpa_tl}}{\pgfpoint{\l_tmpa_tl}{-\l_tmpb_tl}}
- {\pgfpoint{\l_tmpa_tl}{0pt}}
- \pgfpathcurveto{\pgfpoint{\l_tmpa_tl}{\l_tmpb_tl}}{\pgfpoint{\l_tmpb_tl}{\l_tmpa_tl}}
- {\pgfpoint{0pt}{\l_tmpa_tl}}
- \pgfpathcurveto{\pgfpoint{-\l_tmpb_tl}{\l_tmpa_tl}}{\pgfpoint{-\l_tmpa_tl}{\l_tmpb_tl}}
- {\pgfpoint{-\l_tmpa_tl}{0pt}}
- \pgfpathcurveto{\pgfpoint{-\l_tmpa_tl}{-\l_tmpb_tl}}{\pgfpoint{-\l_tmpb_tl}{-\l_tmpa_tl}}
+ \pgfpathcurveto{\pgfpoint{\l__mermap_tmpb_tl}{-\l__mermap_tmpa_tl}}{\pgfpoint{\l__mermap_tmpa_tl}{-\l__mermap_tmpb_tl}}
+ {\pgfpoint{\l__mermap_tmpa_tl}{0pt}}
+ \pgfpathcurveto{\pgfpoint{\l__mermap_tmpa_tl}{\l__mermap_tmpb_tl}}{\pgfpoint{\l__mermap_tmpb_tl}{\l__mermap_tmpa_tl}}
+ {\pgfpoint{0pt}{\l__mermap_tmpa_tl}}
+ \pgfpathcurveto{\pgfpoint{-\l__mermap_tmpb_tl}{\l__mermap_tmpa_tl}}{\pgfpoint{-\l__mermap_tmpa_tl}{\l__mermap_tmpb_tl}}
+ {\pgfpoint{-\l__mermap_tmpa_tl}{0pt}}
+ \pgfpathcurveto{\pgfpoint{-\l__mermap_tmpa_tl}{-\l__mermap_tmpb_tl}}{\pgfpoint{-\l__mermap_tmpb_tl}{-\l__mermap_tmpa_tl}}
{\pgfpoint{0pt}{\fp_to_dim:n{-2*\l__mermap_marker_radius_fp-\l__mermap_marker_shift_fp}}}
\pgfpathclose
#1
@@ -2089,14 +2138,14 @@
{
\node[circle,inner~sep=0pt,font=\mrcmarkerfont,text=mrcmarkertext,mrcnodestyle]
{
- \hbox_set:Nn \l_tmpa_box {\mrcmarkercontents}
- \fp_compare:nNnT {\box_wd:N \l_tmpa_box} > {1.5*\l__mermap_marker_radius_fp}
+ \hbox_set:Nn \l__mermap_tmpa_box {\mrcmarkercontents}
+ \fp_compare:nNnT {\box_wd:N \l__mermap_tmpa_box} > {1.5*\l__mermap_marker_radius_fp}
{
- \box_resize_to_wd_and_ht:Nnn \l_tmpa_box
+ \box_resize_to_wd_and_ht:Nnn \l__mermap_tmpa_box
{\fp_to_dim:n {1.5*\l__mermap_marker_radius_fp}}
- {\box_ht:N \l_tmpa_box}
+ {\box_ht:N \l__mermap_tmpa_box}
}
- \box_use_drop:N \l_tmpa_box
+ \box_use_drop:N \l__mermap_tmpa_box
};
}
@@ -2153,22 +2202,22 @@
\__mermap_new_marker_type:nn {ringx}
{
- \tl_set:Nn \l_tmpa_tl {\fp_to_dim:N\l__mermap_marker_radius_fp}
+ \tl_set:Nn \l__mermap_tmpa_tl {\fp_to_dim:N\l__mermap_marker_radius_fp}
\path[draw=mrcmarkerdraw,very~thin]
- (45 \c_colon_str \l_tmpa_tl)--(225\c_colon_str \l_tmpa_tl)
- (135\c_colon_str \l_tmpa_tl)--(315\c_colon_str \l_tmpa_tl);
+ (45 \c_colon_str \l__mermap_tmpa_tl)--(225\c_colon_str \l__mermap_tmpa_tl)
+ (135\c_colon_str \l__mermap_tmpa_tl)--(315\c_colon_str \l__mermap_tmpa_tl);
\path[draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,mrchyperpath,even~odd~rule]
- circle (\l_tmpa_tl) circle (\fp_to_dim:N\l__mermap_marker_inner_radius_fp);
+ circle (\l__mermap_tmpa_tl) circle (\fp_to_dim:N\l__mermap_marker_inner_radius_fp);
}
\__mermap_new_marker_type:nn {markx}
{
- \tl_set:Nn \l_tmpa_tl {\fp_to_dim:N\l__mermap_marker_radius_fp}
+ \tl_set:Nn \l__mermap_tmpa_tl {\fp_to_dim:N\l__mermap_marker_radius_fp}
\path[line~join=bevel,draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,mrchyperpath]
- (0,0) -- (35 \c_colon_str \l_tmpa_tl) -- (55 \c_colon_str \l_tmpa_tl) -- cycle
- (0,0) -- (125 \c_colon_str \l_tmpa_tl) -- (145 \c_colon_str \l_tmpa_tl) -- cycle
- (0,0) -- (215 \c_colon_str \l_tmpa_tl) -- (235 \c_colon_str \l_tmpa_tl) -- cycle
- (0,0) -- (305 \c_colon_str \l_tmpa_tl) -- (325 \c_colon_str \l_tmpa_tl) -- cycle;
+ (0,0) -- (35 \c_colon_str \l__mermap_tmpa_tl) -- (55 \c_colon_str \l__mermap_tmpa_tl) -- cycle
+ (0,0) -- (125 \c_colon_str \l__mermap_tmpa_tl) -- (145 \c_colon_str \l__mermap_tmpa_tl) -- cycle
+ (0,0) -- (215 \c_colon_str \l__mermap_tmpa_tl) -- (235 \c_colon_str \l__mermap_tmpa_tl) -- cycle
+ (0,0) -- (305 \c_colon_str \l__mermap_tmpa_tl) -- (325 \c_colon_str \l__mermap_tmpa_tl) -- cycle;
}
@@ -2269,12 +2318,21 @@
\fp_new:N \l__mermap_b_x_fp
\fp_new:N \l__mermap_b_y_fp
\fp_new:N \l__mermap_b_z_fp
+\fp_new:N \l__mermap_alpha_fp
\fp_new:N \l__mermap_delta_lambda_fp
\fp_new:N \l__mermap_delta_phi_fp
+\fp_new:N \l__mermap_n_x_fp
+\fp_new:N \l__mermap_n_y_fp
+\fp_new:N \l__mermap_n_z_fp
\fp_new:N \l__mermap_psi_fp
+\fp_new:N \l__mermap_sin_psi_fp
+\fp_new:N \l__mermap_t_fp
+\fp_new:N \l__mermap_t_psi_fp
\fp_new:N \l__mermap_t_x_fp
\fp_new:N \l__mermap_t_y_fp
\fp_new:N \l__mermap_t_z_fp
+\fp_const:Nn \c__mermap_linearization_threshold_fp { 10e-9 }
+\bool_new:N \l__mermap_linearization_bool
\int_new:N \l__mermap_samples_int
@@ -2309,41 +2367,86 @@
}
-\cs_new:Npn \__mermap_draw_orthodrome:nnnnn #1#2#3#4#5
+\cs_new_protected:Npn \__mermap_draw_orthodrome:nnnnn #1#2#3#4#5
{
\__mermap_tikz_path_begin:n { draw,mermap_every_route,#1 }
- \fp_set:Nn \l__mermap_a_x_fp { cosd(#3)*cosd(#2) }
- \fp_set:Nn \l__mermap_a_y_fp { sind(#3)*cosd(#2) }
- \fp_set:Nn \l__mermap_a_z_fp { sind(#2) }
- \fp_set:Nn \l__mermap_b_x_fp { cosd(#5)*cosd(#4) }
- \fp_set:Nn \l__mermap_b_y_fp { sind(#5)*cosd(#4) }
- \fp_set:Nn \l__mermap_b_z_fp { sind(#4) }
-
- \fp_set:Nn \l_tmpa_fp { sind(#2)*sind(#4) + cosd(#2)*cosd(#4)*cosd(#5-(#3)) }
- \fp_set:Nn \l__mermap_psi_fp { acosd(\l_tmpa_fp) }
- \fp_set:Nn \l_tmpb_fp { sind(\l__mermap_psi_fp) }
-
- \fp_set:Nn \l__mermap_b_x_fp { (\l__mermap_b_x_fp - \l_tmpa_fp*\l__mermap_a_x_fp)/\l_tmpb_fp }
- \fp_set:Nn \l__mermap_b_y_fp { (\l__mermap_b_y_fp - \l_tmpa_fp*\l__mermap_a_y_fp)/\l_tmpb_fp }
- \fp_set:Nn \l__mermap_b_z_fp { (\l__mermap_b_z_fp - \l_tmpa_fp*\l__mermap_a_z_fp)/\l_tmpb_fp }
-
- \__mermap_pgf_moveto_point:nn {#2}{#3}
- \int_set:Nn \l_tmpa_int {1}
- \int_until_do:nNnn \l_tmpa_int > \l__mermap_samples_int
- {
- \fp_set:Nn \l_tmpa_fp { \l__mermap_psi_fp*\l_tmpa_int/\l__mermap_samples_int }
- \fp_set:Nn \l_tmpb_fp { sind(\l_tmpa_fp) }
- \fp_set:Nn \l_tmpa_fp { cosd(\l_tmpa_fp) }
- \fp_set:Nn \l__mermap_t_x_fp { \l_tmpa_fp*\l__mermap_a_x_fp + \l_tmpb_fp*\l__mermap_b_x_fp }
- \fp_set:Nn \l__mermap_t_y_fp { \l_tmpa_fp*\l__mermap_a_y_fp + \l_tmpb_fp*\l__mermap_b_y_fp }
- \fp_set:Nn \l__mermap_t_z_fp { \l_tmpa_fp*\l__mermap_a_z_fp + \l_tmpb_fp*\l__mermap_b_z_fp }
- \pgfpathlineto{\__mermap_unit_sphere_point:nnn {\l__mermap_t_x_fp}{\l__mermap_t_y_fp}{\l__mermap_t_z_fp}}
- \int_incr:N \l_tmpa_int
+ \__mermap_setup_orthodrome:nnnn { #2 }{ #3 }{ #4 }{ #5 }
+ \__mermap_pgf_moveto_point:nn { #2 }{ #3 }
+ \int_step_inline:nn { \l__mermap_samples_int }
+ {
+ \__mermap_point_on_orthodrome:n { ##1/\l__mermap_samples_int }
+ \__mermap_pgf_lineto_point:nn{ \l__mermap_cs_lat_fp }{ \l__mermap_cs_lon_fp }
}
\__mermap_tikz_path_end:
}
+\cs_new_protected:Npn \__mermap_setup_orthodrome:nnnn #1#2#3#4
+ {
+ \fp_set:Nn \l__mermap_a_x_fp { cosd(#2)*cosd(#1) }
+ \fp_set:Nn \l__mermap_a_y_fp { sind(#2)*cosd(#1) }
+ \fp_set:Nn \l__mermap_a_z_fp { sind(#1) }
+
+ \fp_set:Nn \l__mermap_b_x_fp { cosd(#4)*cosd(#3) }
+ \fp_set:Nn \l__mermap_b_y_fp { sind(#4)*cosd(#3) }
+ \fp_set:Nn \l__mermap_b_z_fp { sind(#3) }
+
+ \fp_set:Nn \l__mermap_psi_fp { acosd( sind(#1)*sind(#3) + cosd(#1)*cosd(#3)*cosd(#4-(#2)) ) }
+ \fp_set:Nn \l__mermap_sin_psi_fp { sind(\l__mermap_psi_fp) }
+
+ \bool_set:Nn \l__mermap_linearization_bool { \fp_compare_p:nNn \l__mermap_psi_fp < \c__mermap_linearization_threshold_fp }
+ }
+
+
+\cs_new_protected:Npn \__mermap_point_on_orthodrome:n #1
+ {
+ \fp_set:Nn \l__mermap_t_fp { #1 }
+
+ \bool_if:NTF \l__mermap_linearization_bool
+ {
+ \fp_set:Nn \l__mermap_tmpa_fp { 1 - \l__mermap_t_fp }
+ \fp_set_eq:NN \l__mermap_tmpb_fp \l__mermap_t_fp
+ }
+ {
+ \fp_set:Nn \l__mermap_t_psi_fp { \l__mermap_t_fp * \l__mermap_psi_fp }
+ \fp_set:Nn \l__mermap_tmpa_fp { sind( \l__mermap_psi_fp - \l__mermap_t_psi_fp ) / \l__mermap_sin_psi_fp }
+ \fp_set:Nn \l__mermap_tmpb_fp { sind( \l__mermap_t_psi_fp ) / \l__mermap_sin_psi_fp }
+ }
+
+ \fp_set:Nn \l__mermap_t_x_fp { \l__mermap_tmpa_fp*\l__mermap_a_x_fp + \l__mermap_tmpb_fp*\l__mermap_b_x_fp }
+ \fp_set:Nn \l__mermap_t_y_fp { \l__mermap_tmpa_fp*\l__mermap_a_y_fp + \l__mermap_tmpb_fp*\l__mermap_b_y_fp }
+ \fp_set:Nn \l__mermap_t_z_fp { \l__mermap_tmpa_fp*\l__mermap_a_z_fp + \l__mermap_tmpb_fp*\l__mermap_b_z_fp }
+
+ \fp_set:Nn \l__mermap_cs_lat_fp { asind(\l__mermap_t_z_fp) }
+ \fp_set:Nn \l__mermap_cs_lon_fp { sign(\l__mermap_t_y_fp)*acosd(\l__mermap_t_x_fp/sqrt(\l__mermap_t_x_fp^2+\l__mermap_t_y_fp^2)) }
+ }
+
+
+\cs_new_protected:Npn \__mermap_angle_at_orthodrome:
+ {
+ \bool_if:NTF \l__mermap_linearization_bool
+ {
+ \fp_set:Nn \l__mermap_alpha_fp { 90 }
+ }
+ {
+ \fp_set:Nn \l__mermap_tmpa_fp { cosd( \l__mermap_psi_fp - \l__mermap_t_psi_fp ) }
+ \fp_set:Nn \l__mermap_tmpb_fp { cosd( \l__mermap_t_psi_fp ) }
+ \fp_set:Nn \l__mermap_n_x_fp { \l__mermap_tmpb_fp*\l__mermap_b_x_fp - \l__mermap_tmpa_fp*\l__mermap_a_x_fp }
+ \fp_set:Nn \l__mermap_n_y_fp { \l__mermap_tmpb_fp*\l__mermap_b_y_fp - \l__mermap_tmpa_fp*\l__mermap_a_y_fp }
+ \fp_set:Nn \l__mermap_n_z_fp { \l__mermap_tmpb_fp*\l__mermap_b_z_fp - \l__mermap_tmpa_fp*\l__mermap_a_z_fp }
+ \fp_set:Nn \l__mermap_tmpa_fp { sqrt( \l__mermap_n_x_fp^2 + \l__mermap_n_y_fp^2 + \l__mermap_n_z_fp^2 ) }
+ \fp_set:Nn \l__mermap_n_x_fp { \l__mermap_n_x_fp / \l__mermap_tmpa_fp }
+ \fp_set:Nn \l__mermap_n_y_fp { \l__mermap_n_y_fp / \l__mermap_tmpa_fp }
+ \fp_set:Nn \l__mermap_n_z_fp { \l__mermap_n_z_fp / \l__mermap_tmpa_fp }
+ \fp_set:Nn \l__mermap_alpha_fp { acosd( \l__mermap_n_y_fp*cosd(\l__mermap_cs_lon_fp) - \l__mermap_n_x_fp*sind(\l__mermap_cs_lon_fp) ) }
+ \fp_compare:nNnT \l__mermap_n_z_fp < 0
+ {
+ \fp_set:Nn \l__mermap_alpha_fp { 360 - \l__mermap_alpha_fp }
+ }
+ }
+ }
+
+
\NewDocumentCommand \mrcdraworthodrome { O{} mmmm }
{
\__mermap_draw_orthodrome:nnnnn {#1}{#2}{#3}{#4}{#5}
@@ -2392,11 +2495,11 @@
\fp_set:Nn \l__mermap_delta_lambda_fp {(#4-(#2))/180*pi}
\fp_compare:nNnTF {abs(\l__mermap_delta_phi_fp)} < {1e-5}
{
- \fp_set:Nn \l_tmpa_fp { tand(#1) }
- \fp_set:Nn \l_tmpb_fp { \l__mermap_delta_lambda_fp*cosd(#1)
- /( 1 + (\l_tmpa_fp + (1+2*\l_tmpa_fp*\l_tmpa_fp)*\l__mermap_delta_phi_fp/3)*\l__mermap_delta_phi_fp/2 ) }
+ \fp_set:Nn \l__mermap_tmpa_fp { tand(#1) }
+ \fp_set:Nn \l__mermap_tmpb_fp { \l__mermap_delta_lambda_fp*cosd(#1)
+ /( 1 + (\l__mermap_tmpa_fp + (1+2*\l__mermap_tmpa_fp*\l__mermap_tmpa_fp)*\l__mermap_delta_phi_fp/3)*\l__mermap_delta_phi_fp/2 ) }
\fp_set:Nn \l__mermap_result_fp {
- sqrt( \l__mermap_delta_phi_fp*\l__mermap_delta_phi_fp + \l_tmpb_fp*\l_tmpb_fp ) }
+ sqrt( \l__mermap_delta_phi_fp*\l__mermap_delta_phi_fp + \l__mermap_tmpb_fp*\l__mermap_tmpb_fp ) }
}
{
\fp_set:Nn \l__mermap_result_fp { abs(\l__mermap_delta_phi_fp)
@@ -2422,11 +2525,314 @@
\NewDocumentCommand \mrcNPprettyloxodistance { mm }
{
- \__mermap_loxo_distance:nnnn {\mrcNPlat{#1}}{\mrcNPlon{#1}}{\mrcNPlat{#2}}{\mrcNPlon{#2}}
+ \__mermap_loxo_distance:nnnn { \mrcNPlat{#1} }{ \mrcNPlon{#1} }{ \mrcNPlat{#2} }{ \mrcNPlon{#2} }
\__mermap_pretty_distance:n { \l__mermap_result_fp }
}
+\cs_new_protected:Npn \__mermap_orthodrome_point:nnn #1#2#3
+ {
+ \__mermap_point_on_orthodrome:n { #3 }
+ \__mermap_set_named_position { #1 }{ \l__mermap_cs_lat_fp }{ \l__mermap_cs_lon_fp }
+ \IfNoValueF { #2 }
+ {
+ \__mermap_angle_at_orthodrome:
+ \cs_set:Npe #2 { \fp_to_decimal:N \l__mermap_alpha_fp }
+ }
+ }
+
+\NewDocumentCommand \mrcNPfromOrthoFraction { mo mm mm m }
+ {
+ \__mermap_setup_orthodrome:nnnn { #3 }{ #4 }{ #5 }{ #6 }
+ \__mermap_orthodrome_point:nnn { #1 }{ #2 }{ #7 }
+ }
+
+\NewDocumentCommand \mrcNPfromOrthoFractionNamed { mo m m m }
+ {
+ \__mermap_setup_orthodrome:nnnn { \mrcNPlat{#3} }{ \mrcNPlon{#3} }{ \mrcNPlat{#4} }{ \mrcNPlon{#4} }
+ \__mermap_orthodrome_point:nnn { #1 }{ #2 }{ #5 }
+ }
+
+\NewDocumentCommand \mrcNPfromOrthoDistance { mo mm mm m }
+ {
+ \__mermap_ortho_distance:nnnn { #3 }{ #4 }{ #5 }{ #6 }
+ \fp_compare:nNnTF \l__mermap_result_fp > { 0.001 }
+ {
+ \__mermap_setup_orthodrome:nnnn { #3 }{ #4 }{ #5 }{ #6 }
+ \__mermap_orthodrome_point:nnn { #1 }{ #2 }{ #7 / \l__mermap_result_fp }
+ }
+ {
+ \__mermap_set_named_position { #1 }{ #3 }{ #4 }
+ \IfNoValueF { #2 }
+ {
+ \cs_set:Npn #2 { 90 }
+ }
+ }
+ }
+
+\NewDocumentCommand \mrcNPfromOrthoDistanceNamed { mo m m m }
+ {
+ \__mermap_ortho_distance:nnnn { \mrcNPlat{#3} }{ \mrcNPlon{#3} }{ \mrcNPlat{#4} }{ \mrcNPlon{#4} }
+ \fp_compare:nNnTF \l__mermap_result_fp > { 0.001 }
+ {
+ \__mermap_setup_orthodrome:nnnn { \mrcNPlat{#3} }{ \mrcNPlon{#3} }{ \mrcNPlat{#4} }{ \mrcNPlon{#4} }
+ \__mermap_orthodrome_point:nnn { #1 }{ #2 }{ #5 / \l__mermap_result_fp }
+ }
+ {
+ \__mermap_set_named_position { #1 }{ \mrcNPlat{#3} }{ \mrcNPlon{#3} }
+ \IfNoValueF { #2 }
+ {
+ \cs_set:Npn #2 { 90 }
+ }
+ }
+ }
+
+
+%---- animations ---------------------------------------------------------------
+
+\bool_new:N \l__mermap_anim_drop_first_frame_bool
+\bool_new:N \l__mermap_anim_drop_last_frame_bool
+
+\fp_new:N \l__mermap_anim_a_lat_fp
+\fp_new:N \l__mermap_anim_a_lon_fp
+\fp_new:N \l__mermap_anim_a_scaledenom_fp
+\fp_new:N \l__mermap_anim_a_time_fp
+\fp_new:N \l__mermap_anim_b_lat_fp
+\fp_new:N \l__mermap_anim_b_lon_fp
+\fp_new:N \l__mermap_anim_b_scaledenom_fp
+\fp_new:N \l__mermap_anim_b_time_fp
+\fp_new:N \l_mermap_anim_angle_fp
+\fp_new:N \l_mermap_anim_lat_fp
+\fp_new:N \l_mermap_anim_lon_fp
+\fp_new:N \l_mermap_anim_scaledenom_fp
+\fp_new:N \l_mermap_anim_time_fp
+
+\int_new:N \l__mermap_anim_final_frame_int
+\int_new:N \l__mermap_anim_frames_int
+\int_new:N \l__mermap_anim_start_frame_int
+\int_new:N \l_mermap_anim_frame_int
+
+\seq_new:N \l__mermap_anim_scaledenom_seq
+
+\tl_new:N \l__mermap_anim_timescale_tl
+\tl_new:N \l__mermap_anim_timewarp_tl
+
+
+\NewExpandableDocumentCommand \mrcTimewarpIdentity { m }
+ {
+ #1
+ }
+
+\NewExpandableDocumentCommand \mrcTimewarpSlowStart { m m }
+ {
+ (#2)^(#1)
+ }
+
+\NewExpandableDocumentCommand \mrcTimewarpSlowFinal { m m }
+ {
+ 1 - (1-#2)^(#1)
+ }
+
+\NewExpandableDocumentCommand \mrcTimewarpSlowStartFinal { m m }
+ {
+ %1 - (1-#2)^(#1)
+ #2 <= 0.5
+ ? (2*(#2))^(#1) / 2
+ : 1 - (2-2*(#2))^(#1) / 2
+ }
+
+
+\NewDocumentEnvironment { mrcAnimation }{ m +b }
+ {
+ \keys_set:nn { mermap/anim }{ #1 }
+
+ \__mermap_anim_autocorrect_scaledenom_seq:
+ \int_compare:nNnT \l__mermap_anim_frames_int < 2
+ {
+ \int_set:Nn \l__mermap_anim_frames_int { 2 }
+ }
+ \bool_if:NTF \l__mermap_anim_drop_first_frame_bool
+ {
+ \int_set:Nn \l__mermap_anim_start_frame_int { 2 }
+ }
+ {
+ \int_set:Nn \l__mermap_anim_start_frame_int { 1 }
+ }
+ \bool_if:NTF \l__mermap_anim_drop_last_frame_bool
+ {
+ \int_set:Nn \l__mermap_anim_final_frame_int { \l__mermap_anim_frames_int-1 }
+ }
+ {
+ \int_set:Nn \l__mermap_anim_final_frame_int { \l__mermap_anim_frames_int }
+ }
+
+ \__mermap_setup_orthodrome:nnnn { \l__mermap_anim_a_lat_fp }{ \l__mermap_anim_a_lon_fp }
+ { \l__mermap_anim_b_lat_fp }{ \l__mermap_anim_b_lon_fp }
+
+ \__mermap_anim_pop_time_scale:NN \l__mermap_anim_a_time_fp \l__mermap_anim_a_scaledenom_fp
+ \__mermap_anim_pop_time_scale:NN \l__mermap_anim_b_time_fp \l__mermap_anim_b_scaledenom_fp
+
+ \int_step_variable:nnNn { \l__mermap_anim_start_frame_int }{ \l__mermap_anim_final_frame_int } \l_mermap_anim_frame_int
+ {
+ \fp_set:Nn \l_mermap_anim_time_fp { (\l_mermap_anim_frame_int-1)/(\l__mermap_anim_frames_int-1) }
+ \fp_set:Nn \l_mermap_anim_time_fp { \l__mermap_anim_timewarp_tl { \l_mermap_anim_time_fp } }
+
+ \__mermap_point_on_orthodrome:n { \l_mermap_anim_time_fp }
+ \fp_set_eq:NN \l_mermap_anim_lat_fp \l__mermap_cs_lat_fp
+ \fp_set_eq:NN \l_mermap_anim_lon_fp \l__mermap_cs_lon_fp
+ \__mermap_set_named_position{ AnimNP }{ \l_mermap_anim_lat_fp }{ \l_mermap_anim_lon_fp }
+
+ \__mermap_angle_at_orthodrome:
+ \fp_set_eq:NN \l_mermap_anim_angle_fp \l__mermap_alpha_fp
+
+ \fp_while_do:nNnn \l_mermap_anim_time_fp > \l__mermap_anim_b_time_fp
+ {
+ \fp_set_eq:NN \l__mermap_anim_a_time_fp \l__mermap_anim_b_time_fp
+ \fp_set_eq:NN \l__mermap_anim_a_scaledenom_fp \l__mermap_anim_b_scaledenom_fp
+ \__mermap_anim_pop_time_scale:NN \l__mermap_anim_b_time_fp \l__mermap_anim_b_scaledenom_fp
+ }
+ \fp_set:Nn \l_mermap_anim_scaledenom_fp
+ {
+ round ( exp (
+ ln(\l__mermap_anim_a_scaledenom_fp) +
+ ( ln(\l__mermap_anim_b_scaledenom_fp)-ln(\l__mermap_anim_a_scaledenom_fp) ) *
+ ( \l_mermap_anim_time_fp-\l__mermap_anim_a_time_fp ) / ( \l__mermap_anim_b_time_fp-\l__mermap_anim_a_time_fp )
+ ) )
+ }
+
+ #2
+ }
+ }{}
+
+
+\cs_new_protected:Npn \__mermap_anim_autocorrect_scaledenom_seq:
+ {
+ \seq_get_left:NN \l__mermap_anim_scaledenom_seq \l__mermap_anim_timescale_tl
+ \bool_lazy_any:nTF
+ {
+ { \seq_if_empty_p:N \l__mermap_anim_scaledenom_seq }
+ { \tl_if_empty_p:N \l__mermap_anim_timescale_tl }
+ { \quark_if_no_value_p:N \l__mermap_anim_timescale_tl }
+ }
+ {
+ \seq_set_split:Nnn \l__mermap_anim_scaledenom_seq { - }{ 0/25000 - 1/25000 },
+ }
+ {
+ \fp_compare:nNnF { \__mermap_anim_use_time:o \l__mermap_anim_timescale_tl } = 0
+ {
+ \seq_put_left:Ne \l__mermap_anim_scaledenom_seq { 0 / \__mermap_anim_use_scale:o \l__mermap_anim_timescale_tl }
+ }
+ }
+ \seq_get_right:NNF \l__mermap_anim_scaledenom_seq \l__mermap_anim_timescale_tl
+ {
+ \msg_error:nn{ mercatormap }{ anim-scaledenom-invalid }
+ }
+ \fp_compare:nNnF { \__mermap_anim_use_time:o \l__mermap_anim_timescale_tl } = 1
+ {
+ \seq_put_right:Ne \l__mermap_anim_scaledenom_seq { 1 / \__mermap_anim_use_scale:o \l__mermap_anim_timescale_tl }
+ }
+ \fp_set:Nn \l__mermap_anim_a_time_fp { -1 }
+ \seq_map_inline:Nn \l__mermap_anim_scaledenom_seq
+ {
+ \fp_set:Nn \l__mermap_anim_b_time_fp { \__mermap_anim_use_time:n { ##1 } }
+ \fp_compare:nNnTF \l__mermap_anim_a_time_fp < \l__mermap_anim_b_time_fp
+ {
+ \fp_set_eq:NN \l__mermap_anim_a_time_fp \l__mermap_anim_b_time_fp
+ }
+ {
+ \msg_error:nn{ mercatormap }{ anim-scaledenom-invalid }
+ }
+ }
+ }
+
+\cs_new_protected:Npn \__mermap_anim_pop_time_scale:NN #1#2
+ {
+ \seq_pop_left:NN \l__mermap_anim_scaledenom_seq \l__mermap_anim_timescale_tl
+ \fp_set:Nn #1 { \__mermap_anim_use_time:o \l__mermap_anim_timescale_tl }
+ \fp_set:Nn #2 { \__mermap_anim_use_scale:o \l__mermap_anim_timescale_tl }
+ }
+
+\msg_new:nnnn{ mercatormap }{ anim-scaledenom-invalid }
+ { The~animation~scale~denominator~sequence~is~invalid. }
+ {
+ Check~\seq_use:Nn \l__mermap_anim_scaledenom_seq { ~-~ }~with~the~documentation.~
+ Time~values~are~not~strictly~monotonically~increasing.
+ }
+
+\cs_new_protected_nopar:Npn \__mermap_anim_set_position:w #1 #2 / #3 \q_stop
+ {
+ \fp_set:cn { l__mermap_anim_#1_lat_fp }{ #2 }
+ \fp_set:cn { l__mermap_anim_#1_lon_fp }{ #3 }
+ }
+
+\cs_new_nopar:Npn \__mermap_anim_use_time:w #1 / #2 \q_stop
+ {
+ #1
+ }
+\cs_new_nopar:Npn \__mermap_anim_use_time:n #1
+ {
+ \__mermap_anim_use_time:w #1 \q_stop
+ }
+\cs_generate_variant:Nn \__mermap_anim_use_time:n { o }
+
+\cs_new_nopar:Npn \__mermap_anim_use_scale:w #1 / #2 \q_stop
+ {
+ #2
+ }
+\cs_new_nopar:Npn \__mermap_anim_use_scale:n #1
+ {
+ \__mermap_anim_use_scale:w #1 \q_stop
+ }
+\cs_generate_variant:Nn \__mermap_anim_use_scale:n { o }
+
+\keys_define:nn { mermap/anim }
+ {
+ start-position .code:n = \__mermap_anim_set_position:w { a } #1 \q_stop,
+ final-position .code:n = \__mermap_anim_set_position:w { b } #1 \q_stop,
+ position .meta:n = { start-position = #1, final-position = #1 },
+ named-start-position .code:n =
+ {
+ \fp_set:Nn \l__mermap_anim_a_lat_fp { \mrcNPlat{ #1 } }
+ \fp_set:Nn \l__mermap_anim_a_lon_fp { \mrcNPlon{ #1 } }
+ },
+ named-final-position .code:n =
+ {
+ \fp_set:Nn \l__mermap_anim_b_lat_fp { \mrcNPlat{ #1 } }
+ \fp_set:Nn \l__mermap_anim_b_lon_fp { \mrcNPlon{ #1 } }
+ },
+ named-position .meta:n = { named-start-position = #1, named-final-position = #1 },
+ frames .int_set:N = \l__mermap_anim_frames_int,
+ drop-first-frame .bool_set:N = \l__mermap_anim_drop_first_frame_bool,
+ drop-last-frame .bool_set:N = \l__mermap_anim_drop_last_frame_bool,
+ drop-no-frame .meta:n = { drop-first-frame=false, drop-last-frame=false },
+ scale-denominators .code:n = \seq_set_split:Nnn \l__mermap_anim_scaledenom_seq { - }{ #1 },
+ common-scale-denominator .meta:n = { scale-denominators = 0/#1 - 1/#1 },
+ timewarp .tl_set:N = \l__mermap_anim_timewarp_tl,
+ timewarp-identity .meta:n = { timewarp = \mrcTimewarpIdentity },
+ timewarp-slow-start .meta:n = { timewarp = \mrcTimewarpSlowStart{#1} },
+ timewarp-slow-start .default:n = 2,
+ timewarp-slow-final .meta:n = { timewarp = \mrcTimewarpSlowFinal{#1} },
+ timewarp-slow-final .default:n = 2,
+ timewarp-slow-start-final .meta:n = { timewarp = \mrcTimewarpSlowStartFinal{#1} },
+ timewarp-slow-start-final .default:n = 2,
+ }
+
+\keys_set:nn { mermap/anim }
+ {
+ position = 51.4779 / 0,
+ frames = 20,
+ drop-no-frame,
+ common-scale-denominator = 25000,
+ timewarp-identity,
+ }
+
+\NewExpandableDocumentCommand\mrcAnimFrame{}{\int_to_arabic:n \l_mermap_anim_frame_int}
+\NewExpandableDocumentCommand\mrcAnimTime{}{\fp_to_decimal:N \l_mermap_anim_time_fp}
+\NewExpandableDocumentCommand\mrcAnimScaleDenom{}{\fp_to_decimal:N \l_mermap_anim_scaledenom_fp}
+\NewExpandableDocumentCommand\mrcAnimLatitude{}{\fp_to_decimal:N \l_mermap_anim_lat_fp}
+\NewExpandableDocumentCommand\mrcAnimLongitude{}{\fp_to_decimal:N \l_mermap_anim_lon_fp}
+\NewExpandableDocumentCommand\mrcAnimAngle{}{\fp_to_decimal:N \l_mermap_anim_angle_fp}
+
%---- supplier -----------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/mercatormap/mercatorpy.def b/Master/texmf-dist/tex/latex/mercatormap/mercatorpy.def
index 670d8fca3bd..0df48609bf9 100644
--- a/Master/texmf-dist/tex/latex/mercatormap/mercatorpy.def
+++ b/Master/texmf-dist/tex/latex/mercatormap/mercatorpy.def
@@ -1,19 +1,19 @@
-\begin{filecontents*}[overwrite]{maptiles.texpy}
+\begin{filecontents}[force,noheader,nowarn]{maptiles.texpy}
"""
-The LaTeX package mercatormap - version 1.02 (2020/08/06)
+The LaTeX package mercatormap - version 1.2.0 (2024/08/05)
maptiles.texpy: Python script for map tile download
-------------------------------------------------------------------------------------------
-Copyright (c) 2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+Copyright (c) 2020-2024 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
-------------------------------------------------------------------------------------------
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 2005/12/01 or later.
+ https://www.latex-project.org/lppl.txt
+and version 1.3c or later is part of all distributions of LaTeX
+version 2008-05-04 or later.
This work has the LPPL maintenance status `author-maintained'.
@@ -28,7 +28,7 @@ from pathlib import Path
from PIL import Image
-packageversion = '1.02 (2020/08/06)'
+packageversion = '1.2.0 (2024/08/05)'
def gd(x):
@@ -531,5 +531,5 @@ if __name__ == '__main__':
print('No url for download given')
mapdef.save_map(args.definition, tiles_success, merge_success, wms_success)
-\end{filecontents*}
+\end{filecontents}
diff --git a/Master/texmf-dist/tex/latex/mercatormap/mercatorsupplier.def b/Master/texmf-dist/tex/latex/mercatormap/mercatorsupplier.def
index 1bf7866b7aa..a8063f8135a 100644
--- a/Master/texmf-dist/tex/latex/mercatormap/mercatorsupplier.def
+++ b/Master/texmf-dist/tex/latex/mercatormap/mercatorsupplier.def
@@ -1,15 +1,15 @@
-%% The LaTeX package mercatormap - version 1.02 (2020/08/06)
+%% The LaTeX package mercatormap - version 1.2.0 (2024/08/05)
%% mercatorsupplier.def: predefined map supplier list
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2020-2024 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% 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
+%% 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.
%%
@@ -46,7 +46,7 @@
attribution = {
Kartendaten:~\textcopyright\nobreakspace\href{https://openstreetmap.org/copyright}{OpenStreetMap}
\ Mitwirkende,~SRTM\nobreakspace\textbar\nobreakspace
- Kartendarstellung:~\textcopyright\nobreakspace\href{http://opentopomap.org/}{OpenTopoMap}
+ Kartendarstellung:~\textcopyright\nobreakspace\href{https://opentopomap.org/}{OpenTopoMap}
\ (\href{https://creativecommons.org/licenses/by-sa/3.0/}{CC-BY-SA})
},
attribution~print = {
@@ -61,12 +61,12 @@
{
__attribution_topplusopen .meta:nn = {mermap/supply} {
attribution = {
- \textcopyright\nobreakspace\href{http://www.bkg.bund.de}{Bundesamt~f\mrcumlaut{u}r~Kartographie~und~Geod\mrcumlaut{a}sie}\nobreakspace\the\year,
- \ \href{http://sg.geodatenzentrum.de/web_public/Datenquellen_TopPlus_Open.pdf}{Datenquellen}
+ Kartendarstellung:\nobreakspace\textcopyright\nobreakspace\href{https://www.bkg.bund.de}{BKG\nobreakspace(\the\year)},
+ \ \href{https://sgx.geodatenzentrum.de/web_public/Datenquellen_TopPlus_Open.pdf}{Datenquellen}
},
attribution~print = {
- \textcopyright\nobreakspace Bundesamt~f\mrcumlaut{u}r~Kartographie~und~Geod\mrcumlaut{a}sie\nobreakspace\the\year,
- \ Datenquellen:~\detokenize{http://sg.geodatenzentrum.de/web_public/Datenquellen_TopPlus_Open.pdf}
+ \textcopyright\nobreakspace BKG\nobreakspace(\the\year),
+ \ Datenquellen:~\detokenize{https://sgx.geodatenzentrum.de/web_public/Datenquellen_TopPlus_Open.pdf}
}
}
}
@@ -85,29 +85,121 @@
basename = tiles/tpo_web_grau,
}
-\cs_new:Npn \__mermap_new_supply_source_topplusopen:n #1
+\__mermap_new_supply_source:nn { topplusopen~web~light }
+ {
+ url = {https://sgx.geodatenzentrum.de/wmts_topplus_open/tile/1.0.0/web_light/default/WEBMERCATOR/{z}/{y}/{x}.png},
+ __attribution_topplusopen,
+ basename = tiles/tpo_web_light,
+ }
+
+\__mermap_new_supply_source:nn { topplusopen~web~light~grau }
+ {
+ url = {https://sgx.geodatenzentrum.de/wmts_topplus_open/tile/1.0.0/web_light_grau/default/WEBMERCATOR/{z}/{y}/{x}.png},
+ __attribution_topplusopen,
+ basename = tiles/tpo_web_light_grau,
+ }
+
+
+\cs_new:Npn \__mermap_new_supply_source_topplusopen:nn #1#2
{
\keys_define:nn { mermap/supply/_source }
{
topplusopen~#1 .meta:nn = {mermap/supply}{
- url = {https://sgx.geodatenzentrum.de/wms_topplus_open?service=wms&version=1.3.0&request=GetMap&Layers=#1&STYLES=default&CRS=EPSG:3857&bbox={xmin},{ymin},{xmax},{ymax}&width={width}&height={height}&Format=image/png},
+ url = {https://sgx.geodatenzentrum.de/wms_topplus_open_#2?service=wms&version=1.3.0&request=GetMap&Layers=#1&STYLES=default&CRS=EPSG:3857&bbox={xmin},{ymin},{xmax},{ymax}&width={width}&height={height}&Format=image/png},
__attribution_topplusopen,
basename = tiles/tpo,
},
topplusopen~#1~grau .meta:nn = {mermap/supply}{
- url = {https://sgx.geodatenzentrum.de/wms_topplus_open?service=wms&version=1.3.0&request=GetMap&Layers=#1_grau&STYLES=default&CRS=EPSG:3857&bbox={xmin},{ymin},{xmax},{ymax}&width={width}&height={height}&Format=image/png},
+ url = {https://sgx.geodatenzentrum.de/wms_topplus_open_#2?service=wms&version=1.3.0&request=GetMap&Layers=#1&STYLES=grau&CRS=EPSG:3857&bbox={xmin},{ymin},{xmax},{ymax}&width={width}&height={height}&Format=image/png},
__attribution_topplusopen,
basename = tiles/tpo,
},
}
}
-\__mermap_new_supply_source_topplusopen:n { p5 }
-\__mermap_new_supply_source_topplusopen:n { p10 }
-\__mermap_new_supply_source_topplusopen:n { p17.5 }
-\__mermap_new_supply_source_topplusopen:n { p25 }
-\__mermap_new_supply_source_topplusopen:n { p50 }
-\__mermap_new_supply_source_topplusopen:n { p100 }
-\__mermap_new_supply_source_topplusopen:n { p250 }
+\__mermap_new_supply_source_topplusopen:nn { p5 }{ p5 }
+\__mermap_new_supply_source_topplusopen:nn { p10 }{ p10 }
+\__mermap_new_supply_source_topplusopen:nn { p17.5 }{ p17 }
+\__mermap_new_supply_source_topplusopen:nn { p25 }{ p25 }
+\__mermap_new_supply_source_topplusopen:nn { p50 }{ p50 }
+\__mermap_new_supply_source_topplusopen:nn { p100 }{ p100 }
+\__mermap_new_supply_source_topplusopen:nn { p250 }{ p250 }
+
+
+\keys_define:nn { mermap/supply }
+ {
+ __attribution_thunderforest .meta:nn = {mermap/supply} {
+ attribution = {
+ Maps~\textcopyright\nobreakspace\href{https://www.thunderforest.com/}{Thunderforest},
+ \ Data~\textcopyright\nobreakspace\href{https://openstreetmap.org/copyright}{OpenStreetMap~contributors}
+ },
+ attribution~print = {
+ Maps~\textcopyright\nobreakspace www.thunderforest.com,
+ \ Data~\textcopyright\nobreakspace www.osm.org/copyright
+ }
+ }
+ }
+\__mermap_new_supply_source:nn { thunderforest~opencyclemap }
+ {
+ url~with~api~key = {https://tile.thunderforest.com/cycle/{z}/{x}/{y}.png?apikey=}{thunderforest}{},
+ __attribution_thunderforest,
+ basename = tiles/opencyclemap,
+ }
+\__mermap_new_supply_source:nn { thunderforest~transport }
+ {
+ url~with~api~key = {https://tile.thunderforest.com/transport/{z}/{x}/{y}.png?apikey=}{thunderforest}{},
+ __attribution_thunderforest,
+ basename = tiles/transport,
+ }
+\__mermap_new_supply_source:nn { thunderforest~landscape }
+ {
+ url~with~api~key = {https://tile.thunderforest.com/landscape/{z}/{x}/{y}.png?apikey=}{thunderforest}{},
+ __attribution_thunderforest,
+ basename = tiles/landscape,
+ }
+\__mermap_new_supply_source:nn { thunderforest~outdoors }
+ {
+ url~with~api~key = {https://tile.thunderforest.com/outdoors/{z}/{x}/{y}.png?apikey=}{thunderforest}{},
+ __attribution_thunderforest,
+ basename = tiles/outdoors,
+ }
+\__mermap_new_supply_source:nn { thunderforest~atlas }
+ {
+ url~with~api~key = {https://tile.thunderforest.com/atlas/{z}/{x}/{y}.png?apikey=}{thunderforest}{},
+ __attribution_thunderforest,
+ basename = tiles/atlas,
+ }
+\__mermap_new_supply_source:nn { thunderforest~transport-dark }
+ {
+ url~with~api~key = {https://tile.thunderforest.com/transport-dark/{z}/{x}/{y}.png?apikey=}{thunderforest}{},
+ __attribution_thunderforest,
+ basename = tiles/transport-dark,
+ }
+\__mermap_new_supply_source:nn { thunderforest~spinal-map }
+ {
+ url~with~api~key = {https://tile.thunderforest.com/spinal-map/{z}/{x}/{y}.png?apikey=}{thunderforest}{},
+ __attribution_thunderforest,
+ basename = tiles/spinal-map,
+ }
+\__mermap_new_supply_source:nn { thunderforest~pioneer }
+ {
+ url~with~api~key = {https://tile.thunderforest.com/pioneer/{z}/{x}/{y}.png?apikey=}{thunderforest}{},
+ __attribution_thunderforest,
+ basename = tiles/pioneer,
+ }
+\__mermap_new_supply_source:nn { thunderforest~mobile-atlas }
+ {
+ url~with~api~key = {https://tile.thunderforest.com/mobile-atlas/{z}/{x}/{y}.png?apikey=}{thunderforest}{},
+ __attribution_thunderforest,
+ basename = tiles/mobile-atlas,
+ }
+\__mermap_new_supply_source:nn { thunderforest~neighbourhood }
+ {
+ url~with~api~key = {https://tile.thunderforest.com/neighbourhood/{z}/{x}/{y}.png?apikey=}{thunderforest}{},
+ __attribution_thunderforest,
+ basename = tiles/neighbourhood,
+ }
+
+
%% openrouteservice mapsurfer is DISCONTINUED after June 2020
%% Therefore, the following source is DEPRECATED and will be removed in future
@@ -127,7 +219,7 @@
basename = tiles/mapsurfer,
}
-\keys_define:nn { mermap/supply }
+\keys_define:nn { mermap/supply }% DISCONTINUED after July 2023 and DEPRECATED
{
__attribution_stamen .meta:nn = {mermap/supply} {
attribution = {
@@ -144,67 +236,67 @@
}
}
}
-\__mermap_new_supply_source:nn { stamen~terrain }
+\__mermap_new_supply_source:nn { stamen~terrain }% DISCONTINUED after July 2023 and DEPRECATED
{
url = {https://stamen-tiles-a.a.ssl.fastly.net/terrain/{z}/{x}/{y}.png},
__attribution_stamen,
basename = tiles/terrain,
}
-\__mermap_new_supply_source:nn { stamen~terrain-background }
+\__mermap_new_supply_source:nn { stamen~terrain-background }% DISCONTINUED after July 2023 and DEPRECATED
{
url = {https://stamen-tiles-a.a.ssl.fastly.net/terrain-background/{z}/{x}/{y}.png},
__attribution_stamen,
basename = tiles/terrain-background,
}
-\__mermap_new_supply_source:nn { stamen~terrain-labels }
+\__mermap_new_supply_source:nn { stamen~terrain-labels }% DISCONTINUED after July 2023 and DEPRECATED
{
url = {https://stamen-tiles-a.a.ssl.fastly.net/terrain-labels/{z}/{x}/{y}.png},
__attribution_stamen,
basename = tiles/terrain-labels,
}
-\__mermap_new_supply_source:nn { stamen~terrain-lines }
+\__mermap_new_supply_source:nn { stamen~terrain-lines }% DISCONTINUED after July 2023 and DEPRECATED
{
url = {https://stamen-tiles-a.a.ssl.fastly.net/terrain-lines/{z}/{x}/{y}.png},
__attribution_stamen,
basename = tiles/terrain-lines,
}
-\__mermap_new_supply_source:nn { stamen~toner }
+\__mermap_new_supply_source:nn { stamen~toner }% DISCONTINUED after July 2023 and DEPRECATED
{
url = {https://stamen-tiles-a.a.ssl.fastly.net/toner/{z}/{x}/{y}.png},
__attribution_stamen,
basename = tiles/toner,
}
-\__mermap_new_supply_source:nn { stamen~toner-lite }
+\__mermap_new_supply_source:nn { stamen~toner-lite }% DISCONTINUED after July 2023 and DEPRECATED
{
url = {https://stamen-tiles-a.a.ssl.fastly.net/toner-lite/{z}/{x}/{y}.png},
__attribution_stamen,
basename = tiles/toner-lite,
}
-\__mermap_new_supply_source:nn { stamen~toner-hybrid }
+\__mermap_new_supply_source:nn { stamen~toner-hybrid }% DISCONTINUED after July 2023 and DEPRECATED
{
url = {https://stamen-tiles-a.a.ssl.fastly.net/toner-hybrid/{z}/{x}/{y}.png},
__attribution_stamen,
basename = tiles/toner-hybrid,
}
-\__mermap_new_supply_source:nn { stamen~toner-background }
+\__mermap_new_supply_source:nn { stamen~toner-background }% DISCONTINUED after July 2023 and DEPRECATED
{
url = {https://stamen-tiles-a.a.ssl.fastly.net/toner-background/{z}/{x}/{y}.png},
__attribution_stamen,
basename = tiles/toner-background,
}
-\__mermap_new_supply_source:nn { stamen~toner-labels }
+\__mermap_new_supply_source:nn { stamen~toner-labels }% DISCONTINUED after July 2023 and DEPRECATED
{
url = {https://stamen-tiles-a.a.ssl.fastly.net/toner-labels/{z}/{x}/{y}.png},
__attribution_stamen,
basename = tiles/toner-labels,
}
-\__mermap_new_supply_source:nn { stamen~toner-lines }
+\__mermap_new_supply_source:nn { stamen~toner-lines }% DISCONTINUED after July 2023 and DEPRECATED
{
url = {https://stamen-tiles-a.a.ssl.fastly.net/toner-lines/{z}/{x}/{y}.png},
__attribution_stamen,
basename = tiles/toner-lines,
}
-\__mermap_new_supply_source:nn { stamen~watercolor }
+\__mermap_new_supply_source:nn { stamen~watercolor }% DISCONTINUED after July 2023 and DEPRECATED
{
url = {https://stamen-tiles-a.a.ssl.fastly.net/watercolor/{z}/{x}/{y}.png},
attribution = {
@@ -221,72 +313,3 @@
},
basename = tiles/watercolor,
}
-
-\keys_define:nn { mermap/supply }
- {
- __attribution_thunderforest .meta:nn = {mermap/supply} {
- attribution = {
- Maps~\textcopyright\nobreakspace\href{https://www.thunderforest.com/}{Thunderforest},
- \ Data~\textcopyright\nobreakspace\href{https://openstreetmap.org/copyright}{OpenStreetMap~contributors}
- },
- attribution~print = {
- Maps~\textcopyright\nobreakspace www.thunderforest.com,
- \ Data~\textcopyright\nobreakspace www.osm.org/copyright
- }
- }
- }
-\__mermap_new_supply_source:nn { thunderforest~opencyclemap }
- {
- url~with~api~key = {https://tile.thunderforest.com/cycle/{z}/{x}/{y}.png?apikey=}{thunderforest}{},
- __attribution_thunderforest,
- basename = tiles/opencyclemap,
- }
-\__mermap_new_supply_source:nn { thunderforest~transport }
- {
- url~with~api~key = {https://tile.thunderforest.com/transport/{z}/{x}/{y}.png?apikey=}{thunderforest}{},
- __attribution_thunderforest,
- basename = tiles/transport,
- }
-\__mermap_new_supply_source:nn { thunderforest~landscape }
- {
- url~with~api~key = {https://tile.thunderforest.com/landscape/{z}/{x}/{y}.png?apikey=}{thunderforest}{},
- __attribution_thunderforest,
- basename = tiles/landscape,
- }
-\__mermap_new_supply_source:nn { thunderforest~outdoors }
- {
- url~with~api~key = {https://tile.thunderforest.com/outdoors/{z}/{x}/{y}.png?apikey=}{thunderforest}{},
- __attribution_thunderforest,
- basename = tiles/outdoors,
- }
-\__mermap_new_supply_source:nn { thunderforest~transport-dark }
- {
- url~with~api~key = {https://tile.thunderforest.com/transport-dark/{z}/{x}/{y}.png?apikey=}{thunderforest}{},
- __attribution_thunderforest,
- basename = tiles/transport-dark,
- }
-\__mermap_new_supply_source:nn { thunderforest~spinal-map }
- {
- url~with~api~key = {https://tile.thunderforest.com/spinal-map/{z}/{x}/{y}.png?apikey=}{thunderforest}{},
- __attribution_thunderforest,
- basename = tiles/spinal-map,
- }
-\__mermap_new_supply_source:nn { thunderforest~pioneer }
- {
- url~with~api~key = {https://tile.thunderforest.com/pioneer/{z}/{x}/{y}.png?apikey=}{thunderforest}{},
- __attribution_thunderforest,
- basename = tiles/pioneer,
- }
-\__mermap_new_supply_source:nn { thunderforest~mobile-atlas }
- {
- url~with~api~key = {https://tile.thunderforest.com/mobile-atlas/{z}/{x}/{y}.png?apikey=}{thunderforest}{},
- __attribution_thunderforest,
- basename = tiles/mobile-atlas,
- }
-\__mermap_new_supply_source:nn { thunderforest~neighbourhood }
- {
- url~with~api~key = {https://tile.thunderforest.com/neighbourhood/{z}/{x}/{y}.png?apikey=}{thunderforest}{},
- __attribution_thunderforest,
- basename = tiles/neighbourhood,
- }
-
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Dnom.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Dnom.fd
new file mode 100644
index 00000000000..9c0cbcf3f51
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Dnom.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{LY1MFBOldstyle-Dnom.fd}
+ [2024/08/05 (autoinst) Font definitions for LY1/MFBOldstyle-Dnom.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{MFBOldstyle-Dnom}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{MFBOldstyle-Dnom}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-dnom-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Dnom}{bold}{n}{
+ <-> alias * MFBOldstyle-Dnom/b/n
+}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{MFBOldstyle-Dnom}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-dnom-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Dnom}{regular}{it}{
+ <-> alias * MFBOldstyle-Dnom/m/it
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Dnom}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-dnom-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Dnom}{regular}{n}{
+ <-> alias * MFBOldstyle-Dnom/m/n
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Dnom}{m}{sl}{
+ <-> ssub * MFBOldstyle-Dnom/m/it
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Dnom}{regular}{sl}{
+ <-> ssub * MFBOldstyle-Dnom/regular/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{MFBOldstyle-Dnom}{bx}{n}{
+ <-> ssub * MFBOldstyle-Dnom/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Inf.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Inf.fd
new file mode 100644
index 00000000000..19bae30bde1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Inf.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{LY1MFBOldstyle-Inf.fd}
+ [2024/08/05 (autoinst) Font definitions for LY1/MFBOldstyle-Inf.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{MFBOldstyle-Inf}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{MFBOldstyle-Inf}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Inf}{bold}{n}{
+ <-> alias * MFBOldstyle-Inf/b/n
+}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{MFBOldstyle-Inf}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Inf}{regular}{it}{
+ <-> alias * MFBOldstyle-Inf/m/it
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Inf}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Inf}{regular}{n}{
+ <-> alias * MFBOldstyle-Inf/m/n
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Inf}{m}{sl}{
+ <-> ssub * MFBOldstyle-Inf/m/it
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Inf}{regular}{sl}{
+ <-> ssub * MFBOldstyle-Inf/regular/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{MFBOldstyle-Inf}{bx}{n}{
+ <-> ssub * MFBOldstyle-Inf/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-LF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-LF.fd
new file mode 100644
index 00000000000..80eb1fae4fa
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-LF.fd
@@ -0,0 +1,75 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{LY1MFBOldstyle-LF.fd}
+ [2024/08/05 (autoinst) Font definitions for LY1/MFBOldstyle-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{MFBOldstyle-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{MFBOldstyle-LF}{m}{sc}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-LF}{regular}{sc}{
+ <-> alias * MFBOldstyle-LF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-LF}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-LF}{regular}{n}{
+ <-> alias * MFBOldstyle-LF/m/n
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-LF}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-LF}{regular}{it}{
+ <-> alias * MFBOldstyle-LF/m/it
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-LF}{m}{sl}{
+ <-> ssub * MFBOldstyle-LF/m/it
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-LF}{regular}{sl}{
+ <-> ssub * MFBOldstyle-LF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{MFBOldstyle-LF}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-LF}{bold}{n}{
+ <-> alias * MFBOldstyle-LF/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{MFBOldstyle-LF}{bx}{n}{
+ <-> ssub * MFBOldstyle-LF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Numr.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Numr.fd
new file mode 100644
index 00000000000..acc9b87ad1d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Numr.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{LY1MFBOldstyle-Numr.fd}
+ [2024/08/05 (autoinst) Font definitions for LY1/MFBOldstyle-Numr.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{MFBOldstyle-Numr}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{MFBOldstyle-Numr}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-numr-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Numr}{bold}{n}{
+ <-> alias * MFBOldstyle-Numr/b/n
+}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{MFBOldstyle-Numr}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-numr-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Numr}{regular}{n}{
+ <-> alias * MFBOldstyle-Numr/m/n
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Numr}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-numr-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Numr}{regular}{it}{
+ <-> alias * MFBOldstyle-Numr/m/it
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Numr}{m}{sl}{
+ <-> ssub * MFBOldstyle-Numr/m/it
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Numr}{regular}{sl}{
+ <-> ssub * MFBOldstyle-Numr/regular/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{MFBOldstyle-Numr}{bx}{n}{
+ <-> ssub * MFBOldstyle-Numr/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-OsF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-OsF.fd
new file mode 100644
index 00000000000..d3047c51edb
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-OsF.fd
@@ -0,0 +1,44 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{LY1MFBOldstyle-OsF.fd}
+ [2024/08/05 (autoinst) Font definitions for LY1/MFBOldstyle-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{MFBOldstyle-OsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{MFBOldstyle-OsF}{m}{sc}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-OsF}{regular}{sc}{
+ <-> alias * MFBOldstyle-OsF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-OsF}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-OsF}{regular}{n}{
+ <-> alias * MFBOldstyle-OsF/m/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Sup.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Sup.fd
new file mode 100644
index 00000000000..b2d73b05161
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Sup.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{LY1MFBOldstyle-Sup.fd}
+ [2024/08/05 (autoinst) Font definitions for LY1/MFBOldstyle-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{MFBOldstyle-Sup}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{MFBOldstyle-Sup}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Sup}{regular}{it}{
+ <-> alias * MFBOldstyle-Sup/m/it
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Sup}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Sup}{regular}{n}{
+ <-> alias * MFBOldstyle-Sup/m/n
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Sup}{m}{sl}{
+ <-> ssub * MFBOldstyle-Sup/m/it
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Sup}{regular}{sl}{
+ <-> ssub * MFBOldstyle-Sup/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{MFBOldstyle-Sup}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-Sup}{bold}{n}{
+ <-> alias * MFBOldstyle-Sup/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{MFBOldstyle-Sup}{bx}{n}{
+ <-> ssub * MFBOldstyle-Sup/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-TLF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-TLF.fd
new file mode 100644
index 00000000000..adfe1fd0d86
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-TLF.fd
@@ -0,0 +1,75 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{LY1MFBOldstyle-TLF.fd}
+ [2024/08/05 (autoinst) Font definitions for LY1/MFBOldstyle-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{MFBOldstyle-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{MFBOldstyle-TLF}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-TLF}{regular}{it}{
+ <-> alias * MFBOldstyle-TLF/m/it
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-TLF}{m}{sc}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-TLF}{regular}{sc}{
+ <-> alias * MFBOldstyle-TLF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-TLF}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-TLF}{regular}{n}{
+ <-> alias * MFBOldstyle-TLF/m/n
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-TLF}{m}{sl}{
+ <-> ssub * MFBOldstyle-TLF/m/it
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-TLF}{regular}{sl}{
+ <-> ssub * MFBOldstyle-TLF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{MFBOldstyle-TLF}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-TLF}{bold}{n}{
+ <-> alias * MFBOldstyle-TLF/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{MFBOldstyle-TLF}{bx}{n}{
+ <-> ssub * MFBOldstyle-TLF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-TOsF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-TOsF.fd
new file mode 100644
index 00000000000..317443d5afd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-TOsF.fd
@@ -0,0 +1,44 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{LY1MFBOldstyle-TOsF.fd}
+ [2024/08/05 (autoinst) Font definitions for LY1/MFBOldstyle-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{MFBOldstyle-TOsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{MFBOldstyle-TOsF}{m}{sc}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-TOsF}{regular}{sc}{
+ <-> alias * MFBOldstyle-TOsF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-TOsF}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MFBOldstyle-TOsF}{regular}{n}{
+ <-> alias * MFBOldstyle-TOsF/m/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Dnom.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Dnom.fd
new file mode 100644
index 00000000000..05863d4d529
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Dnom.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{OT1MFBOldstyle-Dnom.fd}
+ [2024/08/05 (autoinst) Font definitions for OT1/MFBOldstyle-Dnom.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{MFBOldstyle-Dnom}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{MFBOldstyle-Dnom}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-dnom-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Dnom}{regular}{it}{
+ <-> alias * MFBOldstyle-Dnom/m/it
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Dnom}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-dnom-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Dnom}{regular}{n}{
+ <-> alias * MFBOldstyle-Dnom/m/n
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Dnom}{m}{sl}{
+ <-> ssub * MFBOldstyle-Dnom/m/it
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Dnom}{regular}{sl}{
+ <-> ssub * MFBOldstyle-Dnom/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{MFBOldstyle-Dnom}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-dnom-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Dnom}{bold}{n}{
+ <-> alias * MFBOldstyle-Dnom/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{MFBOldstyle-Dnom}{bx}{n}{
+ <-> ssub * MFBOldstyle-Dnom/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Inf.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Inf.fd
new file mode 100644
index 00000000000..664a74048be
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Inf.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{OT1MFBOldstyle-Inf.fd}
+ [2024/08/05 (autoinst) Font definitions for OT1/MFBOldstyle-Inf.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{MFBOldstyle-Inf}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{MFBOldstyle-Inf}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Inf}{regular}{n}{
+ <-> alias * MFBOldstyle-Inf/m/n
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Inf}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Inf}{regular}{it}{
+ <-> alias * MFBOldstyle-Inf/m/it
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Inf}{m}{sl}{
+ <-> ssub * MFBOldstyle-Inf/m/it
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Inf}{regular}{sl}{
+ <-> ssub * MFBOldstyle-Inf/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{MFBOldstyle-Inf}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Inf}{bold}{n}{
+ <-> alias * MFBOldstyle-Inf/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{MFBOldstyle-Inf}{bx}{n}{
+ <-> ssub * MFBOldstyle-Inf/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-LF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-LF.fd
new file mode 100644
index 00000000000..2c468d897c7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-LF.fd
@@ -0,0 +1,75 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{OT1MFBOldstyle-LF.fd}
+ [2024/08/05 (autoinst) Font definitions for OT1/MFBOldstyle-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{MFBOldstyle-LF}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{MFBOldstyle-LF}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-LF}{bold}{n}{
+ <-> alias * MFBOldstyle-LF/b/n
+}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{MFBOldstyle-LF}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-LF}{regular}{it}{
+ <-> alias * MFBOldstyle-LF/m/it
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-LF}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-LF}{regular}{n}{
+ <-> alias * MFBOldstyle-LF/m/n
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-LF}{m}{sc}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-LF}{regular}{sc}{
+ <-> alias * MFBOldstyle-LF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-LF}{m}{sl}{
+ <-> ssub * MFBOldstyle-LF/m/it
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-LF}{regular}{sl}{
+ <-> ssub * MFBOldstyle-LF/regular/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{MFBOldstyle-LF}{bx}{n}{
+ <-> ssub * MFBOldstyle-LF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Numr.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Numr.fd
new file mode 100644
index 00000000000..c5df54304a2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Numr.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{OT1MFBOldstyle-Numr.fd}
+ [2024/08/05 (autoinst) Font definitions for OT1/MFBOldstyle-Numr.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{MFBOldstyle-Numr}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{MFBOldstyle-Numr}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Numr}{regular}{it}{
+ <-> alias * MFBOldstyle-Numr/m/it
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Numr}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Numr}{regular}{n}{
+ <-> alias * MFBOldstyle-Numr/m/n
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Numr}{m}{sl}{
+ <-> ssub * MFBOldstyle-Numr/m/it
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Numr}{regular}{sl}{
+ <-> ssub * MFBOldstyle-Numr/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{MFBOldstyle-Numr}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Numr}{bold}{n}{
+ <-> alias * MFBOldstyle-Numr/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{MFBOldstyle-Numr}{bx}{n}{
+ <-> ssub * MFBOldstyle-Numr/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-OsF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-OsF.fd
new file mode 100644
index 00000000000..be09da5dfe6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-OsF.fd
@@ -0,0 +1,44 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{OT1MFBOldstyle-OsF.fd}
+ [2024/08/05 (autoinst) Font definitions for OT1/MFBOldstyle-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{MFBOldstyle-OsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{MFBOldstyle-OsF}{m}{sc}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-OsF}{regular}{sc}{
+ <-> alias * MFBOldstyle-OsF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-OsF}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-OsF}{regular}{n}{
+ <-> alias * MFBOldstyle-OsF/m/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Sup.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Sup.fd
new file mode 100644
index 00000000000..2351fc9901c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Sup.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{OT1MFBOldstyle-Sup.fd}
+ [2024/08/05 (autoinst) Font definitions for OT1/MFBOldstyle-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{MFBOldstyle-Sup}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{MFBOldstyle-Sup}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Sup}{bold}{n}{
+ <-> alias * MFBOldstyle-Sup/b/n
+}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{MFBOldstyle-Sup}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Sup}{regular}{it}{
+ <-> alias * MFBOldstyle-Sup/m/it
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Sup}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Sup}{regular}{n}{
+ <-> alias * MFBOldstyle-Sup/m/n
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Sup}{m}{sl}{
+ <-> ssub * MFBOldstyle-Sup/m/it
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-Sup}{regular}{sl}{
+ <-> ssub * MFBOldstyle-Sup/regular/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{MFBOldstyle-Sup}{bx}{n}{
+ <-> ssub * MFBOldstyle-Sup/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-TLF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-TLF.fd
new file mode 100644
index 00000000000..7eb5636a123
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-TLF.fd
@@ -0,0 +1,75 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{OT1MFBOldstyle-TLF.fd}
+ [2024/08/05 (autoinst) Font definitions for OT1/MFBOldstyle-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{MFBOldstyle-TLF}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{MFBOldstyle-TLF}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-TLF}{bold}{n}{
+ <-> alias * MFBOldstyle-TLF/b/n
+}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{MFBOldstyle-TLF}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-TLF}{regular}{it}{
+ <-> alias * MFBOldstyle-TLF/m/it
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-TLF}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-TLF}{regular}{n}{
+ <-> alias * MFBOldstyle-TLF/m/n
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-TLF}{m}{sc}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-TLF}{regular}{sc}{
+ <-> alias * MFBOldstyle-TLF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-TLF}{m}{sl}{
+ <-> ssub * MFBOldstyle-TLF/m/it
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-TLF}{regular}{sl}{
+ <-> ssub * MFBOldstyle-TLF/regular/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{MFBOldstyle-TLF}{bx}{n}{
+ <-> ssub * MFBOldstyle-TLF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-TOsF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-TOsF.fd
new file mode 100644
index 00000000000..4d0db0317ac
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-TOsF.fd
@@ -0,0 +1,44 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{OT1MFBOldstyle-TOsF.fd}
+ [2024/08/05 (autoinst) Font definitions for OT1/MFBOldstyle-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{MFBOldstyle-TOsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{MFBOldstyle-TOsF}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-TOsF}{regular}{n}{
+ <-> alias * MFBOldstyle-TOsF/m/n
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-TOsF}{m}{sc}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MFBOldstyle-TOsF}{regular}{sc}{
+ <-> alias * MFBOldstyle-TOsF/m/sc
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Dnom.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Dnom.fd
new file mode 100644
index 00000000000..2c61008de9c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Dnom.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{T1MFBOldstyle-Dnom.fd}
+ [2024/08/05 (autoinst) Font definitions for T1/MFBOldstyle-Dnom.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{MFBOldstyle-Dnom}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{MFBOldstyle-Dnom}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Dnom}{regular}{n}{
+ <-> alias * MFBOldstyle-Dnom/m/n
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Dnom}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Dnom}{regular}{it}{
+ <-> alias * MFBOldstyle-Dnom/m/it
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Dnom}{m}{sl}{
+ <-> ssub * MFBOldstyle-Dnom/m/it
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Dnom}{regular}{sl}{
+ <-> ssub * MFBOldstyle-Dnom/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{MFBOldstyle-Dnom}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Dnom}{bold}{n}{
+ <-> alias * MFBOldstyle-Dnom/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{MFBOldstyle-Dnom}{bx}{n}{
+ <-> ssub * MFBOldstyle-Dnom/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Inf.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Inf.fd
new file mode 100644
index 00000000000..6f58c047b5b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Inf.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{T1MFBOldstyle-Inf.fd}
+ [2024/08/05 (autoinst) Font definitions for T1/MFBOldstyle-Inf.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{MFBOldstyle-Inf}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{MFBOldstyle-Inf}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-inf-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Inf}{bold}{n}{
+ <-> alias * MFBOldstyle-Inf/b/n
+}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{MFBOldstyle-Inf}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-inf-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Inf}{regular}{n}{
+ <-> alias * MFBOldstyle-Inf/m/n
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Inf}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-inf-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Inf}{regular}{it}{
+ <-> alias * MFBOldstyle-Inf/m/it
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Inf}{m}{sl}{
+ <-> ssub * MFBOldstyle-Inf/m/it
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Inf}{regular}{sl}{
+ <-> ssub * MFBOldstyle-Inf/regular/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{MFBOldstyle-Inf}{bx}{n}{
+ <-> ssub * MFBOldstyle-Inf/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-LF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-LF.fd
new file mode 100644
index 00000000000..8e904607902
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-LF.fd
@@ -0,0 +1,75 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{T1MFBOldstyle-LF.fd}
+ [2024/08/05 (autoinst) Font definitions for T1/MFBOldstyle-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{MFBOldstyle-LF}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{MFBOldstyle-LF}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-lf-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-LF}{bold}{n}{
+ <-> alias * MFBOldstyle-LF/b/n
+}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{MFBOldstyle-LF}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-lf-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-LF}{regular}{n}{
+ <-> alias * MFBOldstyle-LF/m/n
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-LF}{m}{sc}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-LF}{regular}{sc}{
+ <-> alias * MFBOldstyle-LF/m/sc
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-LF}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-LF}{regular}{it}{
+ <-> alias * MFBOldstyle-LF/m/it
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-LF}{m}{sl}{
+ <-> ssub * MFBOldstyle-LF/m/it
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-LF}{regular}{sl}{
+ <-> ssub * MFBOldstyle-LF/regular/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{MFBOldstyle-LF}{bx}{n}{
+ <-> ssub * MFBOldstyle-LF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Numr.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Numr.fd
new file mode 100644
index 00000000000..a8da7242611
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Numr.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{T1MFBOldstyle-Numr.fd}
+ [2024/08/05 (autoinst) Font definitions for T1/MFBOldstyle-Numr.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{MFBOldstyle-Numr}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{MFBOldstyle-Numr}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-numr-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Numr}{regular}{it}{
+ <-> alias * MFBOldstyle-Numr/m/it
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Numr}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-numr-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Numr}{regular}{n}{
+ <-> alias * MFBOldstyle-Numr/m/n
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Numr}{m}{sl}{
+ <-> ssub * MFBOldstyle-Numr/m/it
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Numr}{regular}{sl}{
+ <-> ssub * MFBOldstyle-Numr/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{MFBOldstyle-Numr}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-numr-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Numr}{bold}{n}{
+ <-> alias * MFBOldstyle-Numr/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{MFBOldstyle-Numr}{bx}{n}{
+ <-> ssub * MFBOldstyle-Numr/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-OsF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-OsF.fd
new file mode 100644
index 00000000000..2332b388489
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-OsF.fd
@@ -0,0 +1,44 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{T1MFBOldstyle-OsF.fd}
+ [2024/08/05 (autoinst) Font definitions for T1/MFBOldstyle-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{MFBOldstyle-OsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{MFBOldstyle-OsF}{m}{sc}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-OsF}{regular}{sc}{
+ <-> alias * MFBOldstyle-OsF/m/sc
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-OsF}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-osf-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-OsF}{regular}{n}{
+ <-> alias * MFBOldstyle-OsF/m/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Sup.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Sup.fd
new file mode 100644
index 00000000000..fd14ac5df23
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Sup.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{T1MFBOldstyle-Sup.fd}
+ [2024/08/05 (autoinst) Font definitions for T1/MFBOldstyle-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{MFBOldstyle-Sup}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{MFBOldstyle-Sup}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-sup-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Sup}{regular}{n}{
+ <-> alias * MFBOldstyle-Sup/m/n
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Sup}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Sup}{regular}{it}{
+ <-> alias * MFBOldstyle-Sup/m/it
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Sup}{m}{sl}{
+ <-> ssub * MFBOldstyle-Sup/m/it
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Sup}{regular}{sl}{
+ <-> ssub * MFBOldstyle-Sup/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{MFBOldstyle-Sup}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-sup-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-Sup}{bold}{n}{
+ <-> alias * MFBOldstyle-Sup/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{MFBOldstyle-Sup}{bx}{n}{
+ <-> ssub * MFBOldstyle-Sup/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-TLF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-TLF.fd
new file mode 100644
index 00000000000..d7c80e2171b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-TLF.fd
@@ -0,0 +1,75 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{T1MFBOldstyle-TLF.fd}
+ [2024/08/05 (autoinst) Font definitions for T1/MFBOldstyle-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{MFBOldstyle-TLF}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{MFBOldstyle-TLF}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-TLF}{bold}{n}{
+ <-> alias * MFBOldstyle-TLF/b/n
+}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{MFBOldstyle-TLF}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-TLF}{regular}{it}{
+ <-> alias * MFBOldstyle-TLF/m/it
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-TLF}{m}{sc}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-TLF}{regular}{sc}{
+ <-> alias * MFBOldstyle-TLF/m/sc
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-TLF}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-TLF}{regular}{n}{
+ <-> alias * MFBOldstyle-TLF/m/n
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-TLF}{m}{sl}{
+ <-> ssub * MFBOldstyle-TLF/m/it
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-TLF}{regular}{sl}{
+ <-> ssub * MFBOldstyle-TLF/regular/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{MFBOldstyle-TLF}{bx}{n}{
+ <-> ssub * MFBOldstyle-TLF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-TOsF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-TOsF.fd
new file mode 100644
index 00000000000..6f696037590
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-TOsF.fd
@@ -0,0 +1,44 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{T1MFBOldstyle-TOsF.fd}
+ [2024/08/05 (autoinst) Font definitions for T1/MFBOldstyle-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{MFBOldstyle-TOsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{MFBOldstyle-TOsF}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-TOsF}{regular}{n}{
+ <-> alias * MFBOldstyle-TOsF/m/n
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-TOsF}{m}{sc}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MFBOldstyle-TOsF}{regular}{sc}{
+ <-> alias * MFBOldstyle-TOsF/m/sc
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Dnom.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Dnom.fd
new file mode 100644
index 00000000000..dd93afa56be
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Dnom.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{T5MFBOldstyle-Dnom.fd}
+ [2024/08/05 (autoinst) Font definitions for T5/MFBOldstyle-Dnom.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T5}{MFBOldstyle-Dnom}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T5}{MFBOldstyle-Dnom}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-dnom-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Dnom}{bold}{n}{
+ <-> alias * MFBOldstyle-Dnom/b/n
+}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T5}{MFBOldstyle-Dnom}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-dnom-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Dnom}{regular}{it}{
+ <-> alias * MFBOldstyle-Dnom/m/it
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Dnom}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-dnom-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Dnom}{regular}{n}{
+ <-> alias * MFBOldstyle-Dnom/m/n
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Dnom}{m}{sl}{
+ <-> ssub * MFBOldstyle-Dnom/m/it
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Dnom}{regular}{sl}{
+ <-> ssub * MFBOldstyle-Dnom/regular/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T5}{MFBOldstyle-Dnom}{bx}{n}{
+ <-> ssub * MFBOldstyle-Dnom/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Inf.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Inf.fd
new file mode 100644
index 00000000000..4aff4a0bf02
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Inf.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{T5MFBOldstyle-Inf.fd}
+ [2024/08/05 (autoinst) Font definitions for T5/MFBOldstyle-Inf.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T5}{MFBOldstyle-Inf}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T5}{MFBOldstyle-Inf}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-inf-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Inf}{regular}{n}{
+ <-> alias * MFBOldstyle-Inf/m/n
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Inf}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-inf-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Inf}{regular}{it}{
+ <-> alias * MFBOldstyle-Inf/m/it
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Inf}{m}{sl}{
+ <-> ssub * MFBOldstyle-Inf/m/it
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Inf}{regular}{sl}{
+ <-> ssub * MFBOldstyle-Inf/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T5}{MFBOldstyle-Inf}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-inf-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Inf}{bold}{n}{
+ <-> alias * MFBOldstyle-Inf/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T5}{MFBOldstyle-Inf}{bx}{n}{
+ <-> ssub * MFBOldstyle-Inf/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-LF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-LF.fd
new file mode 100644
index 00000000000..20b7b6cc8a8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-LF.fd
@@ -0,0 +1,75 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{T5MFBOldstyle-LF.fd}
+ [2024/08/05 (autoinst) Font definitions for T5/MFBOldstyle-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T5}{MFBOldstyle-LF}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T5}{MFBOldstyle-LF}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-lf-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-LF}{bold}{n}{
+ <-> alias * MFBOldstyle-LF/b/n
+}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T5}{MFBOldstyle-LF}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-lf-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-LF}{regular}{it}{
+ <-> alias * MFBOldstyle-LF/m/it
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-LF}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-lf-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-LF}{regular}{n}{
+ <-> alias * MFBOldstyle-LF/m/n
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-LF}{m}{sc}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-lf-sc-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-LF}{regular}{sc}{
+ <-> alias * MFBOldstyle-LF/m/sc
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-LF}{m}{sl}{
+ <-> ssub * MFBOldstyle-LF/m/it
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-LF}{regular}{sl}{
+ <-> ssub * MFBOldstyle-LF/regular/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T5}{MFBOldstyle-LF}{bx}{n}{
+ <-> ssub * MFBOldstyle-LF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Numr.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Numr.fd
new file mode 100644
index 00000000000..c5e53dd36e9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Numr.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{T5MFBOldstyle-Numr.fd}
+ [2024/08/05 (autoinst) Font definitions for T5/MFBOldstyle-Numr.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T5}{MFBOldstyle-Numr}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T5}{MFBOldstyle-Numr}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-numr-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Numr}{regular}{n}{
+ <-> alias * MFBOldstyle-Numr/m/n
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Numr}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-numr-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Numr}{regular}{it}{
+ <-> alias * MFBOldstyle-Numr/m/it
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Numr}{m}{sl}{
+ <-> ssub * MFBOldstyle-Numr/m/it
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Numr}{regular}{sl}{
+ <-> ssub * MFBOldstyle-Numr/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T5}{MFBOldstyle-Numr}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-numr-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Numr}{bold}{n}{
+ <-> alias * MFBOldstyle-Numr/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T5}{MFBOldstyle-Numr}{bx}{n}{
+ <-> ssub * MFBOldstyle-Numr/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-OsF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-OsF.fd
new file mode 100644
index 00000000000..4b4bfd27399
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-OsF.fd
@@ -0,0 +1,44 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{T5MFBOldstyle-OsF.fd}
+ [2024/08/05 (autoinst) Font definitions for T5/MFBOldstyle-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T5}{MFBOldstyle-OsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T5}{MFBOldstyle-OsF}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-osf-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-OsF}{regular}{n}{
+ <-> alias * MFBOldstyle-OsF/m/n
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-OsF}{m}{sc}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-osf-sc-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-OsF}{regular}{sc}{
+ <-> alias * MFBOldstyle-OsF/m/sc
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Sup.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Sup.fd
new file mode 100644
index 00000000000..c58149a46ef
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Sup.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{T5MFBOldstyle-Sup.fd}
+ [2024/08/05 (autoinst) Font definitions for T5/MFBOldstyle-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T5}{MFBOldstyle-Sup}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T5}{MFBOldstyle-Sup}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-sup-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Sup}{regular}{it}{
+ <-> alias * MFBOldstyle-Sup/m/it
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Sup}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-sup-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Sup}{regular}{n}{
+ <-> alias * MFBOldstyle-Sup/m/n
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Sup}{m}{sl}{
+ <-> ssub * MFBOldstyle-Sup/m/it
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Sup}{regular}{sl}{
+ <-> ssub * MFBOldstyle-Sup/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T5}{MFBOldstyle-Sup}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-sup-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-Sup}{bold}{n}{
+ <-> alias * MFBOldstyle-Sup/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T5}{MFBOldstyle-Sup}{bx}{n}{
+ <-> ssub * MFBOldstyle-Sup/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-TLF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-TLF.fd
new file mode 100644
index 00000000000..5d4e067775c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-TLF.fd
@@ -0,0 +1,75 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{T5MFBOldstyle-TLF.fd}
+ [2024/08/05 (autoinst) Font definitions for T5/MFBOldstyle-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T5}{MFBOldstyle-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T5}{MFBOldstyle-TLF}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-tlf-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-TLF}{regular}{it}{
+ <-> alias * MFBOldstyle-TLF/m/it
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-TLF}{m}{sc}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tlf-sc-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-TLF}{regular}{sc}{
+ <-> alias * MFBOldstyle-TLF/m/sc
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-TLF}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tlf-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-TLF}{regular}{n}{
+ <-> alias * MFBOldstyle-TLF/m/n
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-TLF}{m}{sl}{
+ <-> ssub * MFBOldstyle-TLF/m/it
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-TLF}{regular}{sl}{
+ <-> ssub * MFBOldstyle-TLF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T5}{MFBOldstyle-TLF}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-tlf-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-TLF}{bold}{n}{
+ <-> alias * MFBOldstyle-TLF/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T5}{MFBOldstyle-TLF}{bx}{n}{
+ <-> ssub * MFBOldstyle-TLF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-TOsF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-TOsF.fd
new file mode 100644
index 00000000000..e377aa052ee
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-TOsF.fd
@@ -0,0 +1,44 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{T5MFBOldstyle-TOsF.fd}
+ [2024/08/05 (autoinst) Font definitions for T5/MFBOldstyle-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T5}{MFBOldstyle-TOsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T5}{MFBOldstyle-TOsF}{m}{sc}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tosf-sc-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-TOsF}{regular}{sc}{
+ <-> alias * MFBOldstyle-TOsF/m/sc
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-TOsF}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tosf-t5
+}{}
+
+\DeclareFontShape{T5}{MFBOldstyle-TOsF}{regular}{n}{
+ <-> alias * MFBOldstyle-TOsF/m/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-LF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-LF.fd
new file mode 100644
index 00000000000..8a6b0384cc0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-LF.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{TS1MFBOldstyle-LF.fd}
+ [2024/08/05 (autoinst) Font definitions for TS1/MFBOldstyle-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{MFBOldstyle-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{MFBOldstyle-LF}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MFBOldstyle-LF}{regular}{n}{
+ <-> alias * MFBOldstyle-LF/m/n
+}{}
+
+\DeclareFontShape{TS1}{MFBOldstyle-LF}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MFBOldstyle-LF}{regular}{it}{
+ <-> alias * MFBOldstyle-LF/m/it
+}{}
+
+\DeclareFontShape{TS1}{MFBOldstyle-LF}{m}{sl}{
+ <-> ssub * MFBOldstyle-LF/m/it
+}{}
+
+\DeclareFontShape{TS1}{MFBOldstyle-LF}{regular}{sl}{
+ <-> ssub * MFBOldstyle-LF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{TS1}{MFBOldstyle-LF}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MFBOldstyle-LF}{bold}{n}{
+ <-> alias * MFBOldstyle-LF/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{TS1}{MFBOldstyle-LF}{bx}{n}{
+ <-> ssub * MFBOldstyle-LF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-OsF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-OsF.fd
new file mode 100644
index 00000000000..e3f0e59f786
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-OsF.fd
@@ -0,0 +1,36 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{TS1MFBOldstyle-OsF.fd}
+ [2024/08/05 (autoinst) Font definitions for TS1/MFBOldstyle-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{MFBOldstyle-OsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{MFBOldstyle-OsF}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MFBOldstyle-OsF}{regular}{n}{
+ <-> alias * MFBOldstyle-OsF/m/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-TLF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-TLF.fd
new file mode 100644
index 00000000000..f25231bec92
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-TLF.fd
@@ -0,0 +1,67 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{TS1MFBOldstyle-TLF.fd}
+ [2024/08/05 (autoinst) Font definitions for TS1/MFBOldstyle-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{MFBOldstyle-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{MFBOldstyle-TLF}{m}{it}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Italic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MFBOldstyle-TLF}{regular}{it}{
+ <-> alias * MFBOldstyle-TLF/m/it
+}{}
+
+\DeclareFontShape{TS1}{MFBOldstyle-TLF}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MFBOldstyle-TLF}{regular}{n}{
+ <-> alias * MFBOldstyle-TLF/m/n
+}{}
+
+\DeclareFontShape{TS1}{MFBOldstyle-TLF}{m}{sl}{
+ <-> ssub * MFBOldstyle-TLF/m/it
+}{}
+
+\DeclareFontShape{TS1}{MFBOldstyle-TLF}{regular}{sl}{
+ <-> ssub * MFBOldstyle-TLF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{TS1}{MFBOldstyle-TLF}{b}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Bold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MFBOldstyle-TLF}{bold}{n}{
+ <-> alias * MFBOldstyle-TLF/b/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{TS1}{MFBOldstyle-TLF}{bx}{n}{
+ <-> ssub * MFBOldstyle-TLF/b/n
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-TOsF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-TOsF.fd
new file mode 100644
index 00000000000..b53f26148ef
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-TOsF.fd
@@ -0,0 +1,36 @@
+%% Generated by autoinst on 2024/08/05
+%%
+\ProvidesFile{TS1MFBOldstyle-TOsF.fd}
+ [2024/08/05 (autoinst) Font definitions for TS1/MFBOldstyle-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax
+ \let\MFBOldstyle@@scale\@empty
+\else
+ \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{MFBOldstyle-TOsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{MFBOldstyle-TOsF}{m}{n}{
+ <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MFBOldstyle-TOsF}{regular}{n}{
+ <-> alias * MFBOldstyle-TOsF/m/n
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/mfb-oldstyle.sty b/Master/texmf-dist/tex/latex/mfb-oldstyle/mfb-oldstyle.sty
new file mode 100644
index 00000000000..4bfbde6a576
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/mfb-oldstyle.sty
@@ -0,0 +1,93 @@
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{mfb-oldstyle}
+ [2024/08/05 (autoinst) Style file for MFBOldstyle fonts.]
+
+\RequirePackage{xkeyval}
+\newcommand*{\MFBOldstyle@scale}{1}
+\DeclareOptionX{scale}{\renewcommand*{\MFBOldstyle@scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\MFBOldstyle@scale}{#1}}
+
+\DeclareOptionX{lining}{\edef\MFBOldstyle@figurestyle{LF}}
+\DeclareOptionX{oldstyle}{\edef\MFBOldstyle@figurestyle{OsF}}
+\DeclareOptionX{tabular}{\edef\MFBOldstyle@figurealign{T}}
+\DeclareOptionX{proportional}{\edef\MFBOldstyle@figurealign{}}
+\edef\MFBOldstyle@figurestyle{LF}
+\edef\MFBOldstyle@figurealign{}
+
+\DeclareOptionX{mainfont}{
+ \renewcommand{\familydefault}{\rmdefault}
+}
+\DeclareOptionX{bold}{\edef\bfseries@rm{bold}}
+\DeclareOptionX{regular}{\edef\mdseries@rm{regular}}
+
+\ProcessOptionsX\relax
+
+\RequirePackage[LY1,T1,T5]{fontenc}
+\RequirePackage{textcomp}
+\RequirePackage{ifthen}
+\RequirePackage{mweights}
+
+\IfFileExists{fontaxes.sty}{
+ \RequirePackage{fontaxes}
+ \fa@naming@exception{figures}{{superior}{proportional}}{Sup}
+ \fa@naming@exception{figures}{{superior}{tabular}}{Sup}
+ \def\supfigures{\@nomath\supfigures
+ \fontfigurestyle{superior}\selectfont}
+ \let\sufigures\supfigures
+ \DeclareTextFontCommand{\textsup}{\supfigures}
+ \let\textsu\textsup
+ \let\textsuperior\textsup
+ \let\@oldtextsuperscript\textsuperscript
+ \def\textsuperscript{\@ifstar\@oldtextsuperscript\textsup}
+ \def\@makefnmark{%
+ \mbox{\footnotemarkfont\textsuperscript{\@thefnmark}}}
+ \@ifundefined{ftntm@font}%
+ {\let\footnotemarkfont\normalfont}%
+ {\let\footnotemarkfont\ftntm@font}
+
+ \fa@naming@exception{figures}{{inferior}{proportional}}{Inf}
+ \fa@naming@exception{figures}{{inferior}{tabular}}{Inf}
+ \def\inffigures{\@nomath\inffigures
+ \fontfigurestyle{inferior}\selectfont}
+ \let\infigures\inffigures
+ \DeclareTextFontCommand{\textinf}{\inffigures}
+ \let\textin\textinf
+ \let\textinferior\textinf
+ \let\@oldtextsubscript\textsubscript
+ \def\textsubscript{\@ifstar\@oldtextsubscript\textinf}
+
+ \fa@naming@exception{figures}{{numerators}{proportional}}{Numr}
+ \fa@naming@exception{figures}{{numerator}{proportional}}{Numr}
+ \fa@naming@exception{figures}{{numerators}{tabular}}{Numr}
+ \fa@naming@exception{figures}{{numerator}{tabular}}{Numr}
+
+ \fa@naming@exception{figures}{{denominators}{proportional}}{Dnom}
+ \fa@naming@exception{figures}{{denominator}{proportional}}{Dnom}
+ \fa@naming@exception{figures}{{denominators}{tabular}}{Dnom}
+ \fa@naming@exception{figures}{{denominator}{tabular}}{Dnom}
+
+}{}
+
+% Here we implement the scale=MatchLowercase option.
+% If this is given, we must compute the correct value of
+% the "\MFBOldstyle@scale" parameter before loading the .fd files;
+% but to determine that value we of course need the font's x-height.
+% To avoid triggering the loading of .fd files,
+% we use plain TeX's \font primitive to load the testfont.
+% We then compute the ratio of the current x-height to our font's x-height;
+% this is the "\MFBOldstyle@scale" we will pass to the .fd files.
+\ifthenelse{\equal{\MFBOldstyle@scale}{MatchLowercase}}
+ { \newlength{\MFBOldstyle@currentx}
+ \settoheight{\MFBOldstyle@currentx}{x}
+ \newlength{\MFBOldstyle@xheight}
+ \settoheight{\MFBOldstyle@xheight}
+ {{\font\testfont=MFBOldstyle-Regular-osf-ot1 at \f@size pt\testfont x}}
+ \renewcommand*{\MFBOldstyle@scale}
+ {\strip@pt\dimexpr\number\numexpr\number\dimexpr\MFBOldstyle@currentx\relax*65536/\number\dimexpr\MFBOldstyle@xheight\relax\relax sp\relax}}
+ {}
+
+\renewcommand*
+ {\rmdefault}
+ {MFBOldstyle-\MFBOldstyle@figurealign\MFBOldstyle@figurestyle}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/mitthesis/mitthesis.cls b/Master/texmf-dist/tex/latex/mitthesis/mitthesis.cls
index 9990a07a884..0a3a44310c5 100644
--- a/Master/texmf-dist/tex/latex/mitthesis/mitthesis.cls
+++ b/Master/texmf-dist/tex/latex/mitthesis/mitthesis.cls
@@ -7,8 +7,8 @@
%% MIT Libraries' requirements as of 2024.
%%
%% This file's version and date:
- \def\versionno{1.13}
- \def\versiondate{2024/07/03\space}
+ \def\versionno{1.14}
+ \def\versiondate{2024/07/19\space}
%%
%% Author: John H. Lienhard, V
%% Department of Mechanical Engineering
@@ -361,18 +361,16 @@
\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 } } % command not def'd until 2022/10/16
+% { \str_casefold:e { \tl_to_str:N \g__dd_month_tl } } % 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_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_first:V { \str_lowercase:f \g__dd_month_tl } }
+ \cs_new:Npn \DegreeMonth { \text_titlecase_first:n { \text_lowercase:n \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!}{
@@ -568,12 +566,16 @@
% 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} } }
+ \tl_gset:Nn \g_titlepage_supervisor_designation_tl
+ { \cs_if_exist:NTF \text_titlecase_all:n % not def'd until 2023/07/08
+ { \text_titlecase_all:n { \text_lowercase:n { \tl_trim_spaces:n {#1} } } }
+ { \tl_trim_spaces:n {#1} }
+ }
+ \tl_gset:Nn \g_abstract_supervisor_designation_tl
+ { \text_titlecase_first:n { \text_lowercase:n { \tl_trim_spaces:n {#1} } } }
}
-
+
\cs_new:Nn \__supervisor_abstractblock: {
\int_zero_new:N \l__supervisor_supervisorno_int
\int_incr:N \l__supervisor_supervisorno_int
@@ -583,12 +585,12 @@
\msg_error:nn { \ClassName } { no_supervisor }
}
{\int_until_do:nNnn { \l__supervisor_supervisorno_int } = { \g_supervisor_supervisorcnt_int } {
- \text_titlecase_first:V { \g_abstract_supervisor_designation_tl } :\space
+ \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
}
- \text_titlecase_first:V { \g_abstract_supervisor_designation_tl } :\space
+ \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
}
@@ -629,8 +631,8 @@
{ Missing\ acceptor\ department,\ check\ for\ blank\ in\ \Acceptor{name}{department}{title}\ command. }{
You\ MUST\ provide\ the\ acceptor's\ department\ using\ the\ \Acceptor{name}{department}{title}\ command.}
\msg_new:nnn { \ClassName } { blank_acceptor_title }
- { Missing\ acceptor\ title\ (blank\ in\ \Acceptor{name}{department}{title}\ command).\ Perhaps\ you\ are\ trying\ to\ save\ vertical\ space?\
- You\ can\ put\ the\ acceptor\ title\ into\ department\ field\ instead.\ For\ consistency,\ I\ will\ omit\ titles\ of\ ALL\ acceptors.}
+ { Missing\ acceptor\ title\ (blank\ in\ \Acceptor{name}{department}{title}\ command).\space Perhaps\ you\ are\ trying\ to\ save\ vertical\ space?\space
+ You\ can\ put\ the\ acceptor\ title\ into\ department\ field\ instead.\space For\ consistency,\ I\ will\ omit\ titles\ of\ ALL\ acceptors.}
\cs_new_protected:Nn \__acceptor_data_add:nnn
{
@@ -802,8 +804,7 @@
\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 },\
- \text_titlecase_all:V { \g_titlepage_supervisor_designation_tl }\\[1em]
- %\ Thesis\ Supervisor\\[1em]
+ \g_titlepage_supervisor_designation_tl \\[1em]
}
\int_compare:nNnF { \g_acceptor_acceptorcnt_int } = {0} {
\int_do_while:nNnn { \g__signature_accno_int } < { \g_acceptor_acceptorcnt_int } {
@@ -937,12 +938,12 @@
\tl_gset:Nn \g_copyright_copyrightlicencse_tl
{This\ work\ is\ licensed\ under\ a\ \mbox{\g_copyright_cclicensetext_tl}\ license.\par\g_copyright_mitpermission_tl}
\tl_gset:Nn \g_copyright_pdfrightstext_tl
- {This\ work\ is\ licensed\ under\ a\ \g_copyright_ccname_tl\ license.\ \g_copyright_mitpermission_tl}
+ {This\ work\ is\ licensed\ under\ a\ \g_copyright_ccname_tl\ license.\space \g_copyright_mitpermission_tl}
}{
\tl_gset:Nn \g_copyright_copyrightlicencse_tl
{All\ rights\ reserved. \par\g_copyright_mitpermission_tl}
\tl_gset:Nn \g_copyright_pdfrightstext_tl
- {All\ rights\ reserved.\ \g_copyright_mitpermission_tl}
+ {All\ rights\ reserved.\space \g_copyright_mitpermission_tl}
}
\int_compare:nNnTF {\g_author_authorcnt_int} > {1}
{
@@ -981,7 +982,7 @@
}
}
\hypersetup{
- pdfcopyright={Copyright\ \DegreeYear\ by\ \CopyrightAuthor.\ \g_copyright_pdfrightstext_tl},
+ pdfcopyright={Copyright\ \DegreeYear\ by\ \CopyrightAuthor.\space \g_copyright_pdfrightstext_tl},
pdfauthor={\g__author_pdfca_tl},
pdfcaptionwriter = {\g__author_pdfca_tl},
}
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
index 891b83139df..20cedc8b615 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{moderncv}[2024-07-08 v2.4.0 modern curriculum vitae and letter document class]
+\ProvidesClass{moderncv}[2024-07-18 v2.4.1 modern curriculum vitae and letter document class]
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvbodyi.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyi.sty
index 75428f6cefb..d3db954fef9 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvbodyi.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyi.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvbodyi}[2024-07-08 v2.4.0 modern curriculum vitae and letter body variant: 1]
+\ProvidesPackage{moderncvbodyi}[2024-07-18 v2.4.1 modern curriculum vitae and letter body variant: 1]
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvbodyii.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyii.sty
index 75428f6cefb..d3db954fef9 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvbodyii.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyii.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvbodyi}[2024-07-08 v2.4.0 modern curriculum vitae and letter body variant: 1]
+\ProvidesPackage{moderncvbodyi}[2024-07-18 v2.4.1 modern curriculum vitae and letter body variant: 1]
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvbodyiii.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyiii.sty
index 45ed72d87a1..37d8d132009 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvbodyiii.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyiii.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvbodyiii}[2024-07-08 v2.4.0 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
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvbodyiv.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyiv.sty
index c076a8733af..0d9fe6fb877 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvbodyiv.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyiv.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvbodyiv}[2024-07-08 v2.4.0 modern curriculum vitae and letter body variant: 4]
+\ProvidesPackage{moderncvbodyiv}[2024-07-18 v2.4.1 modern curriculum vitae and letter body variant: 4]
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvbodyv.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyv.sty
index 8129ccdd2ea..f29e57786b4 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvbodyv.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvbodyv.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvbodyv}[2024-07-08 v2.4.0 modern curriculum vitae and letter body variant: 5]
+\ProvidesPackage{moderncvbodyv}[2024-07-18 v2.4.1 modern curriculum vitae and letter body variant: 5]
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcollection.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcollection.sty
index 94375465f29..bddc9a51776 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcollection.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcollection.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcollection}[2024-07-08 v2.4.0 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 e6a64782291..29ba5bd410c 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblack.sty
@@ -10,13 +10,13 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorblack}[2024-07-08 v2.4.0 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
%-------------------------------------------------------------------------------
-\input{commons/colors}
+\input{moderncvcolors.tex}
\colorlet{color0}{black}% black
\colorlet{color1}{black}% black
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty
index fcce247668c..779b3be956c 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorblue.sty
@@ -10,13 +10,13 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorblue}[2024-07-08 v2.4.0 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
%-------------------------------------------------------------------------------
-\input{commons/colors}
+\input{moderncvcolors.tex}
\colorlet{color0}{black}% black
\colorlet{color1}{lightblue}% light blue
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorburgundy.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorburgundy.sty
index 35a48a1fa21..aeeccf5ef6b 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorburgundy.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorburgundy.sty
@@ -10,13 +10,13 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorburgundy}[2024-07-08 v2.4.0 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
%-------------------------------------------------------------------------------
-\input{commons/colors}
+\input{moderncvcolors.tex}
\colorlet{color0}{black}% black
\colorlet{color1}{burgundy}% burgundy
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty
index fe7f1c3b550..03c026ea07d 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgreen.sty
@@ -10,13 +10,13 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorgreen}[2024-07-08 v2.4.0 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
%-------------------------------------------------------------------------------
-\input{commons/colors}
+\input{moderncvcolors.tex}
\colorlet{color0}{black}% black
\colorlet{color1}{green}% green
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty
index 8e68a487d93..6bd9184c0e6 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorgrey.sty
@@ -10,13 +10,13 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorgrey}[2024-07-08 v2.4.0 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
%-------------------------------------------------------------------------------
-\input{commons/colors}
+\input{moderncvcolors.tex}
\colorlet{color0}{black}% black
\colorlet{color1}{darkgrey}% dark grey
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty
index 0fb7abed8e4..c4f612ab6db 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolororange.sty
@@ -10,13 +10,13 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolororange}[2024-07-08 v2.4.0 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
%-------------------------------------------------------------------------------
-\input{commons/colors}
+\input{moderncvcolors.tex}
\colorlet{color0}{black}% black
\colorlet{color1}{orange}% orange
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty
index 750d96f2037..d0110526f19 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorpurple.sty
@@ -10,13 +10,13 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorpurple}[2024-07-08 v2.4.0 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
%-------------------------------------------------------------------------------
-\input{commons/colors}
+\input{moderncvcolors.tex}
\colorlet{color0}{black}% black
\colorlet{color1}{purple}% purple
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty
index 915265f679e..bc51d4adf53 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolorred.sty
@@ -10,13 +10,13 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcolorred}[2024-07-08 v2.4.0 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
%-------------------------------------------------------------------------------
-\input{commons/colors}
+\input{moderncvcolors.tex}
\colorlet{color0}{black}% black
\colorlet{color1}{red}% red
diff --git a/Master/texmf-dist/doc/latex/moderncv/commons/colors.tex b/Master/texmf-dist/tex/latex/moderncv/moderncvcolors.tex
index 7f840ff059c..7f840ff059c 100644
--- a/Master/texmf-dist/doc/latex/moderncv/commons/colors.tex
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcolors.tex
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
index e70fc454310..e8e0af713ff 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvcompatibility.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvcompatibility}[2024-07-08 v2.4.0 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 915c8cc03d0..c19651ab05b 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvdebugtools.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvdebugtools.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvdebugtools}[2024-07-08 v2.4.0 modern curriculum vitae and letter debug tools]
+\ProvidesPackage{moderncvdebugtools}[2024-07-18 v2.4.1 modern curriculum vitae and letter debug tools]
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvfooti.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvfooti.sty
index 51fcdf98d43..f1de51a44ef 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvfooti.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvfooti.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvfooti}[2024-07-08 v2.4.0 modern curriculum vitae and letter footer variant: 1]
+\ProvidesPackage{moderncvfooti}[2024-07-18 v2.4.1 modern curriculum vitae and letter footer variant: 1]
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvheadi.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvheadi.sty
index 4a7c1632598..9dfb35a06c1 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvheadi.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvheadi.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvheadi}[2024-07-08 v2.4.0 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
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvheadii.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvheadii.sty
index 50d2060ded5..a36c8e1af4b 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvheadii.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvheadii.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvheadii}[2024-07-08 v2.4.0 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
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvheadiii.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvheadiii.sty
index 6e660159c6f..51a3aa2444c 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvheadiii.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvheadiii.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvheadiii}[2024-07-08 v2.4.0 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
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvheadiv.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvheadiv.sty
index 0fa81dc315f..5a088fdb732 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvheadiv.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvheadiv.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvheadiv}[2024-07-08 v2.4.0 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
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvheadv.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvheadv.sty
index b783e102865..e92233ef348 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvheadv.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvheadv.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvheadv}[2024-07-08 v2.4.0 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
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvheadvi.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvheadvi.sty
index 819ba7fdedb..ecd6dbb0411 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvheadvi.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvheadvi.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvheadvi}[2024-07-08 v2.4.0 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
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncviconsacademic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncviconsacademic.sty
index 4b586aa8b7f..cf7bbbb5365 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncviconsacademic.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncviconsacademic.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncviconsacademic}[2024-07-08 v2.4.0 modern curriculum vitae icons: academicons]
+\ProvidesPackage{moderncviconsacademic}[2024-07-18 v2.4.1 modern curriculum vitae icons: academicons]
%-------------------------------------------------------------------------------
@@ -23,7 +23,7 @@
%-------------------------------------------------------------------------------
% set colors
%-------------------------------------------------------------------------------
-\input{commons/colors}
+\input{moderncvcolors.tex}
\providecolor{orcid}{named}{default-socialicon-color}
\providecolor{researchgate}{named}{default-socialicon-color}
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncviconsawesome.sty b/Master/texmf-dist/tex/latex/moderncv/moderncviconsawesome.sty
index c81173d6f02..a51729faa6f 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncviconsawesome.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncviconsawesome.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncviconsawesome}[2024-07-08 v2.4.0 modern curriculum vitae icons: awesome]
+\ProvidesPackage{moderncviconsawesome}[2024-07-18 v2.4.1 modern curriculum vitae icons: awesome]
%-------------------------------------------------------------------------------
% required packages
@@ -22,7 +22,7 @@
%-------------------------------------------------------------------------------
% set colors
%-------------------------------------------------------------------------------
-\input{commons/colors}
+\input{moderncvcolors.tex}
\providecolor{address}{named}{default-socialicon-color}
\providecolor{mobilephone}{named}{default-socialicon-color}
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncviconsletters.sty b/Master/texmf-dist/tex/latex/moderncv/moderncviconsletters.sty
index 3d9504184a4..2dc6386d51d 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncviconsletters.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncviconsletters.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncviconsletters}[2024-07-08 v2.4.0 modern curriculum vitae icons: letter]
+\ProvidesPackage{moderncviconsletters}[2024-07-18 v2.4.1 modern curriculum vitae icons: letter]
%-------------------------------------------------------------------------------
% symbols definition
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncviconsmarvosym.sty b/Master/texmf-dist/tex/latex/moderncv/moderncviconsmarvosym.sty
index 1282ae43489..2dbc71011ee 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncviconsmarvosym.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncviconsmarvosym.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncviconsmarvosym}[2024-07-08 v2.4.0 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/moderncviconstikz.sty b/Master/texmf-dist/tex/latex/moderncv/moderncviconstikz.sty
index f328618e919..e1a0248924d 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncviconstikz.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncviconstikz.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncviconstikz}[2024-07-08 v2.4.0 modern curriculum vitae and letter icons: tickz]
+\ProvidesPackage{moderncviconstikz}[2024-07-18 v2.4.1 modern curriculum vitae and letter icons: tickz]
%-------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvskillmatrix.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvskillmatrix.sty
index c6896923436..9f03be117a7 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvskillmatrix.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvskillmatrix.sty
@@ -203,7 +203,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvskillmatrix}[2024-07-08 v2.4.0 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"
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty
index 08989063b3f..6398480ef98 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstylebanking.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstylebanking}[2024-07-08 v2.4.0 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}{}
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
index 31753c26bba..1192c8911c5 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstylecasual.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstylecasual}[2024-07-08 v2.4.0 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}{}
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty
index f3193eaf2ea..07950bcfa58 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleclassic.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstyleclassic}[2024-07-08 v2.4.0 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}{}
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty
index 2c8fc033a5b..8dcce13aa5a 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleempty.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstyleempty}[2024-07-08 v2.4.0 modern curriculum vitae scheme: empty]
+\ProvidesPackage{moderncvstyleempty}[2024-07-18 v2.4.1 modern curriculum vitae scheme: empty]
%-------------------------------------------------------------------------------
% required packages
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstylefancy.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstylefancy.sty
index 838532bf400..1ad8d8732f1 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstylefancy.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstylefancy.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstylefancy}[2024-07-08 v2.4.0 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}{}
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty
index e7d00b258f8..37de3c57b32 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncvstyleoldstyle.sty
@@ -10,7 +10,7 @@
% identification
%-------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvstyleoldstyle}[2024-07-08 v2.4.0 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}{}
diff --git a/Master/texmf-dist/tex/latex/pagelayout/pagelayout.cls b/Master/texmf-dist/tex/latex/pagelayout/pagelayout.cls
index 8e7d3616aef..655ed59bd2b 100644
--- a/Master/texmf-dist/tex/latex/pagelayout/pagelayout.cls
+++ b/Master/texmf-dist/tex/latex/pagelayout/pagelayout.cls
@@ -13,8 +13,8 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
-\ProvidesClass{pagelayout}[2024/01/17 Layout graphic rich documents]
-\def\pagelayoutversion{1.1.0}
+\ProvidesClass{pagelayout}[2024/07/31 Layout graphic rich documents]
+\def\pagelayoutversion{1.1.1}
% packages
\RequirePackage{pgfopts}
@@ -372,7 +372,11 @@
\pal@outermargin=\ifdim\pal@gridoutermargin=\pal@undefdim\pal@gridmargin\else\pal@gridoutermargin\fi
\height=\dimexpr\pal@pageheight - \pal@topmargin - \pal@bottommargin\relax
- \width=\dimexpr\pal@pagewidth - \pal@innermargin - \pal@outermargin\relax
+ \ifpal@isdoublepage
+ \width=\dimexpr2\pal@pagewidth - 2\pal@outermargin\relax
+ \else
+ \width=\dimexpr\pal@pagewidth - \pal@innermargin - \pal@outermargin\relax
+ \fi
\ifdim\dimexpr\pal@gridoptionheight\relax=\pal@undefdim
\else
\pal@gridheightdiff=\dimexpr0.5\height - 0.5\dimexpr\pal@gridoptionheight\relax\relax
diff --git a/Master/texmf-dist/tex/latex/passopt/passopt.sty b/Master/texmf-dist/tex/latex/passopt/passopt.sty
index b5c24ed9a30..d74c698d27a 100644
--- a/Master/texmf-dist/tex/latex/passopt/passopt.sty
+++ b/Master/texmf-dist/tex/latex/passopt/passopt.sty
@@ -8,7 +8,7 @@
% 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/15}{1.01}
+\ProvidesExplPackage{passopt}{2024/07/17}{1.01a}
{Passing options to packages or classes}
\cs_generate_variant:Nn \tl_if_blank:nTF { v }
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 d3e8d4cbe17..69f65ee6027 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,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Hugo Gomes @ 07/08/2024 v2.1.3
+% Hugo Gomes @ 01/08/2024 v2.1.2
% Hugo Gomes @ 07/07/2024 v2.1.1
% Hugo Gomes @ 03/04/2024 v2.1.0a
% Hugo Gomes @ 14/02/2024 v2.1.0
@@ -8,7 +10,7 @@
% Hugo Gomes @ 10/10/2022 v1.0.0
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}%
-\ProvidesPackage{pgf-PeriodicTable}[07/07/2024 pgf-PeriodicTable v2.1.1]%%
+\ProvidesPackage{pgf-PeriodicTable}[07/08/2024 pgf-PeriodicTable v2.1.3]%%
\RequirePackage{tikz}%
\usetikzlibrary{fadings}%
\tikzfading[name=aumentax, left color=transparent!80, right color=transparent!1]%
@@ -17,11 +19,19 @@
\tikzfading[name=diminuiy, bottom color=transparent!80, top color=transparent!1]%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% check the engine and load font packages
-\ifx\pdfliteral\undefined\relax% XeLaTeX or LuaLaTeX
-\RequirePackage{fontspec}[2020/02/03]\edef\pgfPT@fontspec{1}%
-\else% pdfLaTeX
-\RequirePackage[T1]{fontenc}\edef\pgfPT@fontspec{0}%
-\fi%
+% changed in v2.1.3
+% pdfLaTeX --------------------------------------------------
+\ifx\pdftexversion\undefined\else%
+\RequirePackage[T1]{fontenc}\edef\pgfPT@fontspec{0}\edef\pgfPT@engine{0}%
+\fi% -----------------------------------------------------------
+% LuaLaTeX --------------------------------------------------
+\ifx\directlua\undefined\else%
+\RequirePackage{fontspec}[2020/02/03]\edef\pgfPT@fontspec{1}\edef\pgfPT@engine{1}%
+\fi% -----------------------------------------------------------
+% XeLaTeX ---------------------------------------------------
+\ifx\XeTeXrevision\undefined\else%
+\RequirePackage{fontspec}[2020/02/03]\edef\pgfPT@fontspec{1}\edef\pgfPT@engine{2}%
+\fi% -----------------------------------------------------------
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% ifs to user language and list of user translations available
\newif\ifpgfPT@user@lang\pgfPT@user@langfalse%
@@ -3007,7 +3017,9 @@ rectangle
\fi% \pgfPT@element@count=118
\fi\fi% min=1 & max 118
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\@pgfPT@resetlayers% Restoring pgf layers to those used in the document
+% corrected in v2.1.2: \@pgfPT@resetlayers -> \pgfsetlayers{\@pgfPT@resetlayers}
+% ... Warning: Missing character: There is no m (U+006D) in font nullfont! ...
+\pgfsetlayers{\@pgfPT@resetlayers}% Restoring pgf layers to those used in the document
\fontseries{\seriesdefault}\fontshape{\shapedefault}\fontfamily{\familydefault}\selectfont% Restoring the font settings to normal mode in the document
}% end tikz
}%
@@ -3082,15 +3094,14 @@ rectangle
% renders text via pdfliteral: -------------
% #1 outline width width #2 txt #3 #4 #5 rgb stroke color #6 #7 #8 rgb fill color -----------
% #9 txt render mode (0 - fill 1 - stroke 2 - fill then stroke ---------
-\ifx\pdfliteral\undefined\relax%
-\ifx\pdfextension\undefined\relax% XeLaTeX
-\def\pgfPT@lt[#1](#2)(#3,#4,#5)(#6,#7,#8)(#9){\special{pdf:literal direct #1 w #3 #4 #5 RG #6 #7 #8 rg #9 Tr}#2\special{pdf:literal direct 0 0 0 rg 1 w 0 Tr}}%
-\else% LuaLaTeX
-\protected\def\pdfliteral{\pdfextension literal}
+% changed in v2.1.3
+\ifcase\pgfPT@engine\relax% pdfLaTeX
\def\pgfPT@lt[#1](#2)(#3,#4,#5)(#6,#7,#8)(#9){\pdfliteral direct {#1 w #3 #4 #5 RG #6 #7 #8 rg #9 Tr}{#2}\pdfliteral direct {0 0 0 rg 1 w 0 Tr}}%
-\fi%
-\else% pdfLaTeX
+\or% LuaLaTeX
+\protected\def\pdfliteral{\pdfextension literal}%
\def\pgfPT@lt[#1](#2)(#3,#4,#5)(#6,#7,#8)(#9){\pdfliteral direct {#1 w #3 #4 #5 RG #6 #7 #8 rg #9 Tr}{#2}\pdfliteral direct {0 0 0 rg 1 w 0 Tr}}%
+\or% XeLaTeX
+\def\pgfPT@lt[#1](#2)(#3,#4,#5)(#6,#7,#8)(#9){\special{pdf:literal direct #1 w #3 #4 #5 RG #6 #7 #8 rg #9 Tr}#2\special{pdf:literal direct 0 0 0 rg 1 w 0 Tr}}%
\fi%
% END !! \pgfPT@lt --------------------------------------------------------------------------------
%
@@ -3101,9 +3112,10 @@ rectangle
% auxiliary macros to set the rgb components of one color ---------------------------------------
% with use of \extractcolorspecs from xcolor package ---------------------------------------------
% each component is stored in \pgfPT@«r, g or b» & «s or f» -------------------------------------
-\def\pgfPT@extract@rgb@stroke#1{\extractcolorspecs{#1}{\pgfPTcolmodel}{\pgfPTcolinfo}\expandafter\pgfPT@set@rgb@stroke\pgfPTcolinfo\relax}%
+% v3.1.3: added conversion of the color to rgb :: \colorlet{#1}[rgb]{#1}
+\def\pgfPT@extract@rgb@stroke#1{\colorlet{#1}[rgb]{#1}\extractcolorspecs{#1}{\pgfPTcolmodel}{\pgfPTcolinfo}\expandafter\pgfPT@set@rgb@stroke\pgfPTcolinfo\relax}%
\def\pgfPT@set@rgb@stroke#1,#2,#3\relax{\def\pgfPT@rs{#1}\def\pgfPT@gs{#2}\def\pgfPT@bs{#3}}%
-\def\pgfPT@extract@rgb@fill#1{\extractcolorspecs{#1}{\pgfPTcolmodel}{\pgfPTcolinfo}\expandafter\pgfPT@set@rgb@fill\pgfPTcolinfo\relax}%
+\def\pgfPT@extract@rgb@fill#1{\colorlet{#1}[rgb]{#1}\extractcolorspecs{#1}{\pgfPTcolmodel}{\pgfPTcolinfo}\expandafter\pgfPT@set@rgb@fill\pgfPTcolinfo\relax}%
\def\pgfPT@set@rgb@fill#1,#2,#3\relax{\def\pgfPT@rf{#1}\def\pgfPT@gf{#2}\def\pgfPT@bf{#3}}%
% END !! \pgfPT@«color macros» ------------------------------------------------------------------
%
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 8406d1a9a7d..140577bcce1 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
@@ -376,7 +376,7 @@ name color/.store in=\pgfPTnamecolor,%
name color/.default=black,%
name font/.get=\pgfPTnamefont,%
name font/.store in=\pgfPTnamefont,%
-name font/.default=\fontseries{l}\selectfont\tiny,%
+name font/.default=\tiny,% \fontseries{l}\selectfont (removed @ v2.1.2)
name align/.get=\pgfPTnamealign,% new v1.0.0
name align/.store in=\pgfPTnamealign,% left|center|right
name align/.default=center%
diff --git a/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.names.tex b/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.names.tex
index 2c321dcd349..d4135f61b98 100644
--- a/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.names.tex
+++ b/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.names.tex
@@ -27,7 +27,7 @@
\def\pgfPT@nomes@iii{l\'{i}tio/pt,lithium/en,lithium/fr,Lithium/de,litio/it,litio/es,l\'{i}tio/br,\pgfPT@user@CSname@Li/user}%
\def\pgfPT@nomes@iv{ber\'{i}lio/pt,beryllium/en,b\'{e}ryllium/fr,Beryllium/de,berillio/it,berilio/es,ber\'{i}lio/br,\pgfPT@user@CSname@Be/user}%
\def\pgfPT@nomes@v{boro/pt,boron/en,bore/fr,Bor/de,boro/it,boro/es,boro/br,\pgfPT@user@CSname@B/user}%
-\def\pgfPT@nomes@vi{carbono/pt,carbon/en,carbone/fr,Kohlenstoff/de,carbonio/it,carb\'{o}n/es,carbono/br,\pgfPT@user@CSname@C/user}%
+\def\pgfPT@nomes@vi{carbono/pt,carbon/en,carbone/fr,Kohlenstoff/de,carbonio/it,carbono/es,carbono/br,\pgfPT@user@CSname@C/user}%
\def\pgfPT@nomes@vii{azoto/pt,nitrogen/en,azote/fr,Stickstoff/de,azoto/it,nitr\'{o}geno/es,nitrog\^{e}nio/br,\pgfPT@user@CSname@N/user}%
\def\pgfPT@nomes@viii{oxig\'{e}nio/pt,oxygen/en,oxyg\`{e}ne/fr,Sauerstoff/de,ossigeno/it,ox\'{i}geno/es,oxig\^{e}nio/br,\pgfPT@user@CSname@O/user}%
\def\pgfPT@nomes@ix{fl\'{u}or/pt,fluorine/en,fluor/fr,Fluor/de,fluoro/it,fl\'{u}or/es,fl\'{u}or/br,\pgfPT@user@CSname@F/user}%
@@ -47,7 +47,7 @@
\def\pgfPT@nomes@xxiii{van\'{a}dio/pt,vanadium/en,vanadium/fr,Vanadium/de,vanadio/it,vanadio/es,van\'{a}dio/br,\pgfPT@user@CSname@V/user}%
\def\pgfPT@nomes@xxiv{cr\'{o}mio/pt,chromium/en,chrome/fr,Chrom/de,cromo/it,cromo/es,cr\^{o}mio/br,\pgfPT@user@CSname@Cr/user}%
\def\pgfPT@nomes@xxv{mangan\'{e}sio/pt,manganese/en,mangan\`{e}se/fr,Mangan/de,manganese/it,manganeso/es,mangan\^{e}s/br,\pgfPT@user@CSname@Mn/user}%
-\def\pgfPT@nomes@xxvi{ferro/pt,iron/en,fer/fr,Eisen/de,ferro/it,planchar/es,ferro/br,\pgfPT@user@CSname@Fe/user}%
+\def\pgfPT@nomes@xxvi{ferro/pt,iron/en,fer/fr,Eisen/de,ferro/it,hierro/es,ferro/br,\pgfPT@user@CSname@Fe/user}%
\def\pgfPT@nomes@xxvii{cobalto/pt,cobalt/en,cobalt/fr,Kobalt/de,cobalto/it,cobalto/es,cobalto/br,\pgfPT@user@CSname@Co/user}%
\def\pgfPT@nomes@xxviii{n\'{i}quel/pt,nickel/en,nickel/fr,Nickel/de,nichel/it,n\'{i}quel/es,n\'{i}quel/br,\pgfPT@user@CSname@Ni/user}%
\def\pgfPT@nomes@xxix{cobre/pt,copper/en,cuivre/fr,Kupfer/de,rame/it,cobre/es,cobre/br,\pgfPT@user@CSname@Cu/user}%
@@ -82,7 +82,7 @@
\def\pgfPT@nomes@lviii{c\'{e}rio/pt,cerium/en,c\'{e}rium/fr,Cer/de,cerio/it,cerio/es,c\'{e}rio/br,\pgfPT@user@CSname@Ce/user}%
\def\pgfPT@nomes@lix{praseod\'{i}mio/pt,praseodymium/en,pras\'{e}odyme/fr,Praseodym/de,praseodimio/it,praseodimio/es,praseod\'{i}mio/br,\pgfPT@user@CSname@Pr/user}%
\def\pgfPT@nomes@lx{neod\'{i}mio/pt,neodymium/en,n\'{e}odyme/fr,Neodym/de,neodimio/it,neodimio/es,neod\'{i}mio/br,\pgfPT@user@CSname@Nd/user}%
-\def\pgfPT@nomes@lxi{prom\'{e}cio/pt,promethium/en,prom\'{e}thium/fr,Promethium/de,prometeo/it,prometeo/es,prom\'{e}cio/br,\pgfPT@user@CSname@Pm/user}%
+\def\pgfPT@nomes@lxi{prom\'{e}cio/pt,promethium/en,prom\'{e}thium/fr,Promethium/de,prometeo/it,prometio/es,prom\'{e}cio/br,\pgfPT@user@CSname@Pm/user}%
\def\pgfPT@nomes@lxii{sam\'{a}rio/pt,samarium/en,samarium/fr,Samarium/de,samario/it,samario/es,sam\'{a}rio/br,\pgfPT@user@CSname@Sm/user}%
\def\pgfPT@nomes@lxiii{eur\'{o}pio/pt,europium/en,europium/fr,Europium/de,europium/it,europio/es,eur\'{o}pio/br,\pgfPT@user@CSname@Eu/user}%
\def\pgfPT@nomes@lxiv{gadol\'{i}nio/pt,gadolinium/en,gadolinium/fr,Gadolinium/de,gadolinio/it,gadolinio/es,gadol\'{i}nio/br,\pgfPT@user@CSname@Gd/user}%
@@ -124,20 +124,20 @@
\def\pgfPT@nomes@c{f\'{e}rmio/pt,fermium/en,fermium/fr,Rermium/de,fermium/it,fermio/es,f\'{e}rmio/br,\pgfPT@user@CSname@Fm/user}%
\def\pgfPT@nomes@ci{mendel\'{e}vio/pt,mendelevium/en,mendelevium/fr,Mendelevium/de,mendelevio/it,mendelevio/es,mendel\'{e}vio/br,\pgfPT@user@CSname@Md/user}%
\def\pgfPT@nomes@cii{nob\'{e}lio/pt,nobelium/en,nobelium/fr,Nobelium/de,nobelium/it,nobelio/es,nob\'{e}lio/br,\pgfPT@user@CSname@No/user}%
-\def\pgfPT@nomes@ciii{laur\^{e}ncio/pt,lawrencium/en,lawrencium/fr,Lawrencium/de,laurenzio/it,lawrencium/es,laur\^{e}ncio/br,\pgfPT@user@CSname@Lr/user}%
+\def\pgfPT@nomes@ciii{laur\^{e}ncio/pt,lawrencium/en,lawrencium/fr,Lawrencium/de,laurenzio/it,lawrencio/es,laur\^{e}ncio/br,\pgfPT@user@CSname@Lr/user}%
\def\pgfPT@nomes@civ{rutherf\'{o}rdio/pt,rutherfordium/en,rutherfordium/fr,Rutherfordium/de,rutherfordium/it,rutherfordio/es,rutherf\'{o}rdio/br,\pgfPT@user@CSname@Rf/user}%
-\def\pgfPT@nomes@cv{d\'{u}bnio/pt,dubnium/en,dubnium/fr,Dubnium/de,dubnio/it,dubnium/es,d\'{u}bnio/br,\pgfPT@user@CSname@Db/user}%
+\def\pgfPT@nomes@cv{d\'{u}bnio/pt,dubnium/en,dubnium/fr,Dubnium/de,dubnio/it,dubnio/es,d\'{u}bnio/br,\pgfPT@user@CSname@Db/user}%
\def\pgfPT@nomes@cvi{seab\'{o}rgio/pt,seaborgium/en,seaborgium/fr,Seaborgium/de,seaborgio/it,seaborgio/es,seab\'{o}rgio/br,\pgfPT@user@CSname@Sg/user}%
-\def\pgfPT@nomes@cvii{b\'{o}rio/pt,bohrium/en,bohrium/fr,Bohrium/de,bohrio/it,bohrium/es,b\'{o}hrio/br,\pgfPT@user@CSname@Bh/user}%
-\def\pgfPT@nomes@cviii{h\'{a}ssio/pt,hassium/en,hassium/fr,Hassium/de,hassio/it,hassium/es,h\'{a}ssio/br,\pgfPT@user@CSname@Hs/user}%
+\def\pgfPT@nomes@cvii{b\'{o}rio/pt,bohrium/en,bohrium/fr,Bohrium/de,bohrio/it,bohrio/es,b\'{o}hrio/br,\pgfPT@user@CSname@Bh/user}%
+\def\pgfPT@nomes@cviii{h\'{a}ssio/pt,hassium/en,hassium/fr,Hassium/de,hassio/it,hasio/es,h\'{a}ssio/br,\pgfPT@user@CSname@Hs/user}%
\def\pgfPT@nomes@cix{meitn\'{e}rio/pt,meitnerium/en,meitnerium/fr,Meitnerium/de,meitnerio/it,meitnerio/es,meitn\'{e}rio/br,\pgfPT@user@CSname@Mt/user}%
-\def\pgfPT@nomes@cx{darmst\'{a}dio/pt,darmstadtium/en,darmstadtium/fr,Darmstadtium/de,darmstadtium/it,darmstadtium/es,darmst\'{a}dtio/br,\pgfPT@user@CSname@Ds/user}%
+\def\pgfPT@nomes@cx{darmst\'{a}dio/pt,darmstadtium/en,darmstadtium/fr,Darmstadtium/de,darmstadtium/it,darmstatio/es,darmst\'{a}dtio/br,\pgfPT@user@CSname@Ds/user}%
\def\pgfPT@nomes@cxi{roentg\'{e}nio/pt,roentgenium/en,roentgenium/fr,R\"{o}ntgenium/de,roentgenio/it,roentgenio/es,roentg\^{e}nio/br,\pgfPT@user@CSname@Rg/user}%
\def\pgfPT@nomes@cxii{copern\'{i}cio/pt,copernicium/en,copernicium/fr,Copernicium/de,copernicium/it,copernicio/es,copern\'{i}cio/br,\pgfPT@user@CSname@Cn/user}%
\def\pgfPT@nomes@cxiii{nip\'{o}nio/pt,nihonium/en,nihonium/fr,Nihonium/de,nihonium/it,nihonio/es,nip\^{o}nio/br,\pgfPT@user@CSname@Nh/user}%
\def\pgfPT@nomes@cxiv{fler\'{o}vio/pt,flerovium/en,flerovium/fr,Flerovium/de,flerovio/it,flerovio/es,fler\'{o}vio/br,\pgfPT@user@CSname@Fl/user}%
\def\pgfPT@nomes@cxv{mosc\'{o}vio/pt,moscovium/en,moscovium/fr,Moscovium/de,moscovium/it,moscovio/es,mosc\'{o}vio/br,\pgfPT@user@CSname@Mc/user}%
-\def\pgfPT@nomes@cxvi{liverm\'{o}rio/pt,livermorium/en,livermorium/fr,Livermorium/de,livermorio/it,livermorium/es,liverm\'{o}rio/br,\pgfPT@user@CSname@Lv/user}%
+\def\pgfPT@nomes@cxvi{liverm\'{o}rio/pt,livermorium/en,livermorium/fr,Livermorium/de,livermorio/it,livermorio/es,liverm\'{o}rio/br,\pgfPT@user@CSname@Lv/user}%
\def\pgfPT@nomes@cxvii{tenesso/pt,tennessine/en,tennessine/fr,Tenness/de,tennessine/it,teneso/es,tenesso/br,\pgfPT@user@CSname@Ts/user}%
\def\pgfPT@nomes@cxviii{ogan\'{e}sson/pt,oganesson/en,oganesson/fr,Oganesson/de,oganesson/it,oganes\'{o}n/es,oganess\^{o}nio/br,\pgfPT@user@CSname@Og/user}%
\endinput%
diff --git a/Master/texmf-dist/tex/latex/pgfornament/pgfornament.sty b/Master/texmf-dist/tex/latex/pgfornament/pgfornament.sty
index 27406e8bbf1..fad27cbb742 100644
--- a/Master/texmf-dist/tex/latex/pgfornament/pgfornament.sty
+++ b/Master/texmf-dist/tex/latex/pgfornament/pgfornament.sty
@@ -17,7 +17,7 @@
% Inspired from psvectorian P Fradin H Voss
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{tikz,pgfopts}
-\ProvidesPackage{pgfornament}[2020/05/26 v1.2 vector ornaments]
+\ProvidesPackage{pgfornament}[2024/08/14 v1.3 vector ornaments]
\gdef\pgfOrnamentsObject{pgflibraryvectorian.code.tex}
\gdef\OrnamentsFamily{vectorian}
\pgfkeys{%
@@ -138,7 +138,7 @@ baseline={([yshift=\pgfornamentydelta]current bounding box.\pgfornamentanchor)},
\pgftransformscale{\pgfornamentscale}%
\pgf@@ornament{#2}%
\end{tikzpicture}%
-\tikzset{pgfornamentstyle/.style={cm={1,0,0,1,(0,0)}}}
+\tikzset{pgfornamentstyle/.style={cm={1,0,0,1,(0,0)}}}%
}% end pgfornament
\gdef\ornamenttopos{.5}
@@ -180,8 +180,8 @@ baseline={([yshift=\pgfornamentydelta]current bounding box.\pgfornamentanchor)},
\pgfextractx{\pgf@x}{\pgfpointanchor{#2}{#3 west}}
\pgf@xb=\pgf@x
\advance\pgf@xb by -\pgf@xa
-\node[inner sep=0pt] at ($(#1.#3 east)!.5!(#2.#3 west)$) {\pgfornament[width=\pgf@xb]{#4}} ;
-}
+\node[inner sep=0pt] at ($(#1.#3 east)!.5!(#2.#3 west)$) {\pgfornament[width=\pgf@xb]{#4}};
+}%
\def\pgfornamentvline#1#2#3#4{%
\pgfextracty{\pgf@y}{\pgfpointanchor{#1}{south #3}}
\pgf@ya=\pgf@y
@@ -203,7 +203,7 @@ baseline={([yshift=\pgfornamentydelta]current bounding box.\pgfornamentanchor)},
\pgfmathsetmacro{#1}{atan2(\pgf@x,\pgf@y)}%
}%
\makeatother
-\newcommand{\resetpgfornamentstyle}{\tikzset{pgfornamentstyle/.style={}}}
+\newcommand{\resetpgfornamentstyle}{\tikzset{pgfornamentstyle/.style={}}}%
% 2020 Changing vector objects
\def\newpgfornamentfamily#1{%
@@ -219,11 +219,10 @@ baseline={([yshift=\pgfornamentydelta]current bounding box.\pgfornamentanchor)},
/ornamentline/.search also={/tikz}}
\def\pgfornamentline{\pgfutil@ifnextchar[{\pgf@ornamentline}{\pgf@ornamentline[]}}%
\def\pgf@ornamentline[#1]#2#3#4#5{%
-
\pgfqkeys{/ornamentline}{#1}%
\pgfmathsetmacro\nbo{#4}
\path (#2) -- (#3) foreach \i in {0,...,\nbo} {coordinate[pos=\i/\nbo] (p\i)}
[color=\ornamentcolor] foreach \i [count=\j] in {0,...,\number\numexpr\nbo-1} { (p\i) to [ornament=#5] (p\j)};
-}
+}%
\makeatother
\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/pgfplotsthemebeamer/pgfplotsthemebeamer.sty b/Master/texmf-dist/tex/latex/pgfplotsthemebeamer/pgfplotsthemebeamer.sty
new file mode 100644
index 00000000000..23006e89c57
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pgfplotsthemebeamer/pgfplotsthemebeamer.sty
@@ -0,0 +1,37 @@
+% !TeX root = ./testing/test.tex
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% The pgfplotsthemebeamer package
+% Using colours from the current beamer theme in pgfplots
+% Maintained by samcarter
+%
+% Project repository and bug tracker:
+% https://github.com/samcarter/pgfplotstheme-beamer
+%
+% Released under the LaTeX Project Public License v1.3c or later
+% See http://www.latex-project.org/lppl.txt
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ProvidesPackage{pgfplotsthemebeamer}[2024/08/02 version v0.2 PGFplots colours based the colours of the current beamer theme]
+
+% error if used with a class other than beamer
+\IfClassLoadedF{beamer}{%
+ \PackageError{pgfplotsthemebeamer}{This pgfplots theme needs to be used in conjunction with the beamer class}{}
+}
+
+% setting up colours
+\RequirePackage{pgfplots}
+\pgfplotsset{
+ beamercolors/.style={
+ cycle multi list={
+ mark=*\\mark=x\\mark=square*\\mark=o\\mark=+\\mark=square\\\nextlist
+ structure.fg\\alerted text.fg\\example text.fg\\
+ }
+ }
+}
+
+% making beamercolors default if package is loaded with `all` option
+\DeclareOption{all}{
+ \pgfplotsset{beamercolors}
+}
+\ProcessOptions\relax
diff --git a/Master/texmf-dist/tex/latex/photobook/photobook.cls b/Master/texmf-dist/tex/latex/photobook/photobook.cls
index a2a84809e8b..ae2ecac6b6c 100644
--- a/Master/texmf-dist/tex/latex/photobook/photobook.cls
+++ b/Master/texmf-dist/tex/latex/photobook/photobook.cls
@@ -38,6 +38,7 @@
%
% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
%
+%
% XXX ASAP: imagecell: photobook@imagecell@left and photobook@imagecell@top
% should explicitly account for clearence@left and clearence@top resp.
% XXX ASAP: imagecell: clearance should have the same semantics as cliptocell
@@ -88,12 +89,25 @@
% cell/cell* depend on absolute mode being set globally
%
%
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+%
+% Work around an issue with calc's \ratio{..}{..} breaking into an
+% "Arythmetic overflow" when working with large images.
+% (see Issues section for more info)
+%
+% NOTE: if the error persists just make this smaller but note that the
+% smaller this gets the greater the error can be for very small
+% images
+%
+\def\CalcOverflowFactor{0.1}%
+
+
%----------------------------------------------------------------------
%%% 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.31}
+\edef\photobook@FILEDATE{2024-07-19}
%% \documentclass{ltxdoc}
@@ -248,26 +262,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 +293,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}
@@ -917,7 +935,7 @@
%% \DescribeMacro{\imageblockoffsettop=<ratio>}
%
-%% The ration by which the image is raised in |\ImagePage{..}| and
+%% The ratio by which the image is raised in |\ImagePage{..}| and
%% derived templates.
%%
\edef\imageblockoffsettop{\photobook@imageblockoffsettop}
@@ -2515,8 +2533,9 @@
% NOTE: here we calculate image/cell eccentricity to decide
% to fit to width or heigh of cell...
% NOTE: did I say that I "love" how LaTeX does basic math??
+ % NOTE: \ratio{..}{..} here can break, see Issues for more info...
\setlength\photobook@imagecell@imgratio{%
- 1pt * \ratio{\wd\photobook@imagebox}{\ht\photobook@imagebox}}%
+ 1pt * \ratio{\CalcOverflowFactor\wd\photobook@imagebox}{\CalcOverflowFactor\ht\photobook@imagebox}}%
\setlength\photobook@imagecell@cellratio{%
1pt * \ratio{\cellwidth}{\cellheight}}%
\ifdim \photobook@imagecell@imgratio < \photobook@imagecell@cellratio%
@@ -2524,7 +2543,7 @@
\includegraphics[%
keepaspectratio,
width=\photobook@imagecell@scale\dimexpr
- + \cellwidth
+ \cellwidth
- \photobook@imagecell@clearance@left
- \photobook@imagecell@clearance@right \relax]{#3}}%
\else%
@@ -2532,7 +2551,7 @@
\includegraphics[%
keepaspectratio,
height=\photobook@imagecell@scale\dimexpr
- + \cellheight
+ \cellheight
- \photobook@imagecell@clearance@top
- \photobook@imagecell@clearance@bottom \relax]{#3}}%
\fi\fi\fi%
@@ -4848,8 +4867,9 @@
% align center -> check if image fits vertically...
\ifphotobook@ImagePageFit@centered\else%
\sbox{\photobook@imagebox}{\includegraphics{#3}}%
+ % NOTE: \ratio{..}{..} here can break, see Issues for more info...
\setlength\photobook@ImagePageFit@imgratio{%
- 1pt * \ratio{\wd\photobook@imagebox}{\ht\photobook@imagebox}}%
+ 1pt * \ratio{\CalcOverflowFactor\wd\photobook@imagebox}{\CalcOverflowFactor\ht\photobook@imagebox}}%
% NOTE: subtracting \bindingoffset from \cellwidth here makes sure that
% we avoid offsetting images close enough in ratio to the page and
% messing up bleeds...
@@ -5692,6 +5712,26 @@
%----------------------------------------------------------------------
+%%%% Issues
+%
+%% \subsection*{Large images can cause "Arythmetic overflow"}
+%
+%% \DescribeMacro{\CalcOverflowFactor=0.1}
+%
+%% If the issue occurs set |\CalcOverflowFactor| to a smaller value.
+%% But note, a value too small can lead to errors in the affected macros,
+%% a good value is between 0.1 and 0.01.
+%%
+%% Also note that it is recommended to pre-size images the print outside
+%% of \LaTeX.
+%%
+%% Affected macros: |\imagecell[fill]{..}{..}|, |\ImagePageFit|.
+%%
+% The issue occurs in the calc's |\ratio{..}{..}| macro when calculating
+% image proportions.
+%
+%
+%----------------------------------------------------------------------
% Index...
%
% XXX this prints trash at this point...
diff --git a/Master/texmf-dist/tex/latex/polyomino/polyomino.sty b/Master/texmf-dist/tex/latex/polyomino/polyomino.sty
new file mode 100644
index 00000000000..7a855901188
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/polyomino/polyomino.sty
@@ -0,0 +1,286 @@
+%% polyomino.sty
+%% Copyright 2024 Matthias Floré
+%
+% 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
+% 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 Matthias Floré.
+%
+% This work consists of the files polyomino.pdf, polyomino.sty,
+% polyomino.tex and README.md.
+\NeedsTeXFormat{LaTeX2e}
+\RequirePackage{tikz}
+\ProvidesExplPackage{polyomino}{2024/08/01}{1.0}{Polyominoes using TikZ and LaTeX3}
+
+%%> \subsection{Variables and variants}
+
+\bool_new:N \l__polyomino_grid_bool
+\bool_new:N \l__polyomino_pic_bool
+
+\int_new:N \l__polyomino_col_int
+\int_new:N \l__polyomino_dir_int
+\int_new:N \l__polyomino_max_int
+\int_new:N \l__polyomino_row_int
+\int_new:N \l__polyomino_x_int
+\int_new:N \l__polyomino_y_int
+
+\seq_new:N \l__polyomino_add_seq
+\seq_new:N \l__polyomino_cols_seq
+
+\tl_new:N \l__polyomino_path_tl
+\tl_new:N \l__polyomino_pic_tl
+
+\cs_generate_variant:Nn \tl_map_inline:nn { en }
+
+%%> \subsection{Pgfkeys}
+
+\pgfkeys
+ {
+ / polyomino /. is~family ,
+ / polyomino /. search~also = / polyomino / p_2 ,
+ / polyomino ,
+ at /. initial = { ( 0 , 0 ) } ,
+ empty~cell /. initial = . ,
+ grid /. code = \bool_set:Nn \l__polyomino_grid_bool { \cs:w c_#1_bool \cs_end: } ,
+ grid /. default = true ,
+ grid = false ,
+ grid~style /. style = { grid_style /. style = {#1} } ,
+ grid_style /. style = {} ,
+ row~sep /. initial = { , } ,
+ }
+
+\pgfkeys
+ {%a separate key family so that the second argument of the key p only accepts keys which apply to a separate polyomino
+ / polyomino / p_2 /. is~family ,
+ / polyomino / p_2 ,
+ connected /. code = \bool_set_false:N \l__polyomino_pic_bool ,
+ connected /. value~forbidden ,
+ discrete /. code = \bool_set_true:N \l__polyomino_pic_bool ,
+ discrete /. value~forbidden ,
+ p /. style~2~args = { #1__style /. style = {#2} } ,%2 underscores to avoid the same name as for example the key style_style
+ pic /. code =
+ {
+ \bool_set_true:N \l__polyomino_pic_bool
+ \tl_set:Nn \l__polyomino_pic_tl {#1}
+ } ,
+ style /. style = { style_style /. style = {#1} } ,
+ style_style /. style = {} ,
+ }
+
+%%> \subsection{The command \textbackslash polyomino}
+
+\NewDocumentCommand \polyomino { O {} m }
+ {
+ {%note the double braces {{...}} so that the contents is in a group and in particular, \pgfkeys is applied locally
+ \pgfkeys { / polyomino , #1 }
+ \int_zero:N \l__polyomino_col_int
+ \int_set:Nn \l__polyomino_row_int { 1 }
+ \seq_clear:N \l__polyomino_cols_seq
+ \tl_map_inline:en {#2}
+ %it is convenient that this ignores spaces in #2
+ %e argument specifier for the case that #2 is given by a command or contains a command
+ {
+ \tl_if_eq:neTF {##1} { \pgfkeysvalueof { / polyomino / row~sep } }
+ {
+ \seq_put_right:NV \l__polyomino_cols_seq \l__polyomino_col_int
+ \int_incr:N \l__polyomino_row_int
+ \int_zero:N \l__polyomino_col_int
+ }
+ {
+ \int_incr:N \l__polyomino_col_int
+ \tl_clear_new:c { l__polyomino_\int_use:N \l__polyomino_row_int _\int_use:N \l__polyomino_col_int _tl }
+ \tl_if_eq:neF {##1} { \pgfkeysvalueof { / polyomino / empty~cell } }
+ { \tl_set:cn { l__polyomino_\int_use:N \l__polyomino_row_int _\int_use:N \l__polyomino_col_int _tl } {##1} }
+ \tl_gclear_new:c { g__polyomino_\int_use:N \l__polyomino_row_int _\int_use:N \l__polyomino_col_int _tl }
+ }
+ }
+ \seq_put_right:NV \l__polyomino_cols_seq \l__polyomino_col_int
+ \int_set:Nn \l__polyomino_max_int { \fp_eval:n { max ( \seq_use:Nn \l__polyomino_cols_seq { , } ) } }
+ \seq_map_indexed_inline:Nn \l__polyomino_cols_seq
+ {
+ \tl_clear_new:c { l__polyomino_##1_0_tl }
+ \int_step_inline:nnn { ##2 + 1 } { \l__polyomino_max_int + 1 }
+ { \tl_clear_new:c { l__polyomino_##1_####1_tl } }
+ }
+ \int_step_inline:nnn { 0 } { \l__polyomino_max_int + 1 }
+ {
+ \tl_clear_new:c { l__polyomino_0_##1_tl }
+ \tl_clear_new:c { l__polyomino_\int_eval:n { \l__polyomino_row_int + 1 }_##1_tl }
+ }
+ \pgfkeys
+ {
+ / tikz ,
+ shift /. expanded = { \pgfkeysvalueof { / polyomino / at } } ,
+ shift = { ( 0 , \seq_count:N \l__polyomino_cols_seq ) }
+ }
+ \seq_map_indexed_inline:Nn \l__polyomino_cols_seq
+ {
+ \int_step_inline:nn {##2}
+ {
+ \tl_if_empty:cF { l__polyomino_##1_####1_tl }
+ {
+ {%note the double braces {{...}} so that \pgfkeys is applied locally
+ \pgfkeys { / polyomino / p_2 , \cs:w l__polyomino_##1_####1_tl \cs_end: __style }
+ \bool_if:NTF \l__polyomino_pic_bool
+ { \pic [ / polyomino / p_2 / style_style ] at ( ####1 - 0.5 , 0.5 - ##1 ) { code = { \l__polyomino_pic_tl } } ; }
+ {
+ \seq_clear:N \l__polyomino_add_seq
+ \tl_if_eq:ccF { l__polyomino_##1_####1_tl } { l__polyomino_##1_\int_eval:n { ####1 - 1 }_tl }
+ {
+ \tl_if_empty:cT { g__polyomino_##1_####1_tl }
+ {
+ \int_set:Nn \l__polyomino_dir_int { 1 }
+ \int_set:Nn \l__polyomino_col_int {####1}
+ \int_set:Nn \l__polyomino_row_int {##1}
+ \int_set:Nn \l__polyomino_x_int {####1}
+ \int_set:Nn \l__polyomino_y_int { 1 - ##1 }
+ \tl_build_begin:N \l__polyomino_path_tl
+ \fp_do_until:nn { ####1 - 1 = \l__polyomino_x_int && 1 - ##1 = \l__polyomino_y_int }
+ {
+ %concerning \tl_build_put_right:Ne \l__polyomino_path_tl,
+ %for example (0,0)--(0,1)--(0,2) results in a larger file size than (0,0)--(0,2)
+ \tl_if_eq:ccTF
+ { l__polyomino_##1_####1_tl }
+ {
+ l__polyomino
+ _\int_eval:n
+ { \l__polyomino_row_int + \clist_item:nn { 0 , 1 , 0 , -1 } { \l__polyomino_dir_int } }
+ _\int_eval:n
+ { \l__polyomino_col_int + \clist_item:nn { 1 , 0 , -1 , 0 } { \l__polyomino_dir_int } }
+ _tl
+ }
+ {
+ \tl_if_eq:ccTF
+ { l__polyomino_##1_####1_tl }
+ {
+ l__polyomino
+ _\int_eval:n
+ { \l__polyomino_row_int + \clist_item:nn { -1 , 1 , 1 , -1 } { \l__polyomino_dir_int } }
+ _\int_eval:n
+ { \l__polyomino_col_int + \clist_item:nn { 1 , 1 , -1 , -1 } { \l__polyomino_dir_int } }
+ _tl
+ }
+ {
+ \tl_build_put_right:Ne \l__polyomino_path_tl
+ { -- ( \int_use:N \l__polyomino_x_int , \int_use:N \l__polyomino_y_int ) }
+ \int_add:Nn \l__polyomino_row_int
+ { \clist_item:nn { -1 , 1 , 1 , -1 } { \l__polyomino_dir_int } }
+ \int_add:Nn \l__polyomino_col_int
+ { \clist_item:nn { 1 , 1 , -1 , -1 } { \l__polyomino_dir_int } }
+ \int_compare:nNnTF { \l__polyomino_dir_int } = { 1 }
+ { \int_set:Nn \l__polyomino_dir_int { 4 } }
+ { \int_decr:N \l__polyomino_dir_int }
+ }
+ {
+ \int_add:Nn \l__polyomino_row_int
+ { \clist_item:nn { 0 , 1 , 0 , -1 } { \l__polyomino_dir_int } }
+ \int_add:Nn \l__polyomino_col_int
+ { \clist_item:nn { 1 , 0 , -1 , 0 } { \l__polyomino_dir_int } }
+ }
+ \tl_if_empty:cTF
+ { g__polyomino_\int_use:N \l__polyomino_row_int _\int_use:N \l__polyomino_col_int _tl }
+ {
+ \seq_put_right:Ne \l__polyomino_add_seq
+ { \int_use:N \l__polyomino_row_int _\int_use:N \l__polyomino_col_int }
+ }
+ {
+ \bool_set_true:N \l__polyomino_pic_bool
+ \int_set:Nn \l__polyomino_x_int { ####1 - 1 }
+ \int_set:Nn \l__polyomino_y_int { 1 - ##1 }
+ }
+ }
+ {
+ \tl_build_put_right:Ne \l__polyomino_path_tl
+ { -- ( \int_use:N \l__polyomino_x_int , \int_use:N \l__polyomino_y_int ) }
+ \int_compare:nNnTF { \l__polyomino_dir_int } = { 4 }
+ { \int_set:Nn \l__polyomino_dir_int { 1 } }
+ { \int_incr:N \l__polyomino_dir_int }
+ }
+ \bool_if:NF \l__polyomino_pic_bool
+ {
+ \int_add:Nn \l__polyomino_x_int { \clist_item:nn { 1 , 0 , -1 , 0 } { \l__polyomino_dir_int } }
+ \int_add:Nn \l__polyomino_y_int { \clist_item:nn { 0 , -1 , 0 , 1 } { \l__polyomino_dir_int } }
+ }
+ }
+ \tl_build_end:N \l__polyomino_path_tl
+ \bool_if:NF \l__polyomino_pic_bool
+ { \fill [ / polyomino / p_2 / style_style ] ( ####1 - 1 , 1 - ##1 ) \l__polyomino_path_tl -- cycle ; }
+ }
+ }
+ \tl_gset:cn { g__polyomino_##1_####1_tl } { c }
+ \seq_map_inline:Nn \l__polyomino_add_seq
+ { \tl_gset:cn { g__polyomino_########1_tl } { c } }
+ }
+ }
+ }
+ }
+ }
+ \bool_if:NT \l__polyomino_grid_bool
+ {
+ \int_step_inline:nn { \seq_count:N \l__polyomino_cols_seq - 1 }
+ {
+ \int_zero:N \l__polyomino_col_int
+ \int_zero:N \l__polyomino_x_int
+ \int_set:Nn \l__polyomino_y_int
+ { \int_min:nn { \seq_item:Nn \l__polyomino_cols_seq {##1} } { \seq_item:Nn \l__polyomino_cols_seq { ##1 + 1 } } }
+ \int_while_do:nNnn { \l__polyomino_x_int } < { \l__polyomino_y_int }
+ {
+ \bool_do_while:nn
+ {
+ \tl_if_eq_p:cc
+ { l__polyomino_##1_\int_use:N \l__polyomino_x_int _tl }
+ { l__polyomino_\int_eval:n { ##1 + 1 }_\int_use:N \l__polyomino_x_int _tl }
+ &&
+ ! \tl_if_empty_p:c { g__polyomino_##1_\int_use:N \l__polyomino_x_int _tl }
+ &&
+ \int_compare_p:nNn { \l__polyomino_x_int } < { \l__polyomino_y_int + 1 }
+ }
+ { \int_incr:N \l__polyomino_x_int }
+ \int_compare:nNnT { \l__polyomino_x_int } > { \l__polyomino_col_int + 1 }
+ {
+ \draw [ / polyomino / grid_style ]
+ ( \int_use:N \l__polyomino_col_int , -##1 ) -- ( \int_use:N \l__polyomino_x_int - 1 , -##1 ) ;
+ }
+ \int_set_eq:NN \l__polyomino_col_int \l__polyomino_x_int
+ }
+ }
+ \int_set:Nn \l__polyomino_x_int { \seq_count:N \l__polyomino_cols_seq }
+ \int_step_inline:nn { \l__polyomino_max_int - 1 }
+ {
+ \int_zero:N \l__polyomino_row_int
+ \int_zero:N \l__polyomino_y_int
+ \int_while_do:nNnn { \l__polyomino_y_int } < { \l__polyomino_x_int }
+ {
+ \bool_do_while:nn
+ {
+ \tl_if_eq_p:cc
+ { l__polyomino_\int_use:N \l__polyomino_y_int _##1_tl }
+ { l__polyomino_\int_use:N \l__polyomino_y_int _\int_eval:n { ##1 + 1 }_tl }
+ &&
+ ! \tl_if_empty_p:c { g__polyomino_\int_use:N \l__polyomino_y_int _##1_tl }
+ &&
+ \int_compare_p:nNn { \l__polyomino_y_int } < { \l__polyomino_x_int + 1 }
+ &&
+ \int_compare_p:nNn {##1} < { \seq_item:Nn \l__polyomino_cols_seq { \l__polyomino_y_int } + 0 }
+ }
+ { \int_incr:N \l__polyomino_y_int }
+ \int_compare:nNnT { \l__polyomino_y_int } > { \l__polyomino_row_int + 1 }
+ {
+ \draw [ / polyomino / grid_style ]
+ ( ##1 , -\int_use:N \l__polyomino_row_int ) -- ( ##1 , 1 - \int_use:N \l__polyomino_y_int ) ;
+ }
+ \int_set_eq:NN \l__polyomino_row_int \l__polyomino_y_int
+ }
+ }
+ }
+ }
+ }
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/pst-coil/pst-coil.sty b/Master/texmf-dist/tex/latex/pst-coil/pst-coil.sty
index d5b0311532b..1def1526c09 100644
--- a/Master/texmf-dist/tex/latex/pst-coil/pst-coil.sty
+++ b/Master/texmf-dist/tex/latex/pst-coil/pst-coil.sty
@@ -1,4 +1,4 @@
-%% $Id: pst-coil.sty 539 2011-07-12 08:22:33Z herbert $
+%% $Id: pst-coil.sty 930 2024-08-13 18:19:44Z herbert $
\RequirePackage{pstricks}
\ProvidesPackage{pst-coil}[2010/02/01 package wrapper for
pst-coil.tex (hv)]
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index 91b0c3f8394..96a1d832947 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
@@ -28,7 +28,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2024/05/11 v2.25.6a reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2024/07/23 v2.25.7 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -2244,7 +2244,6 @@
\renewcommand{\thestanzaR}{%
\textbf{\arabic{stanzaR}}%
}
-\newif\ifl@dusedbabel
\patchcmd{\bbl@set@language}%
{\select@language{\languagename}}%
{\edef\languagename{#1}\select@language{\languagename}}%
@@ -2256,11 +2255,9 @@
\gdef\theledlanguageR{}
\AtBeginDocument{%
- \@ifundefined{xpg@main@language}{%
+ \@ifpackageloaded{babel}{%
\@ifundefined{bbl@main@language}{%
- \l@dusedbabelfalse
}{%
- \l@dusedbabeltrue
\let\l@doldselectlanguage\selectlanguage
\let\l@doldbbl@set@language\bbl@set@language
\renewcommand{\selectlanguage}[1]{%
@@ -2276,23 +2273,26 @@
\gdef\theledlanguageL{\bbl@main@language}%
\gdef\theledlanguageR{\bbl@main@language}%
}%
- }
- {%
- \@ifpackagelater{polyglossia}{2022/04/10}{}{\led@err@polyglossiaTooOld}%
- \let\old@otherlanguage\otherlanguage%
- \renewcommand{\otherlanguage}[2][]{%
- \selectlanguage[#1]{#2}%
- \xpg@set@language@only@aux[#1]{#2}%
- \ifledRcol \gdef\theledlanguageR{#2}%
- \else \gdef\theledlanguageL{#2}%
- \fi}%
+ }{}%
+ \@ifpackageloaded{polyglossia}{%
+ \@ifpackagelater{polyglossia}{2024/07/15}{}{\led@err@polyglossiaTooOld}%
\renewcommand{\l@duselanguage}[1]{%
\csuse{no\languagename @numbers}%
- \expandafter\@select@language\expandafter{#1}%
+ \selectlanguage*{#1}%
}%
- \xdef\theledlanguageL{\xpg@main@language}%
- \xdef\theledlanguageR{\xpg@main@language}%
- }%
+ \AddToHook{env/Leftside/begin}{%
+ \AddToHookNext{cmd/polyglossia@language@switched/after}{%
+ \xdef\theledlanguageL{\languagename}%
+ }%
+ }%
+ \AddToHook{env/Rightside/begin}{%
+ \AddToHookNext{cmd/polyglossia@language@switched/after}{%
+ \xdef\theledlanguageR{\languagename}%
+ }%
+ }%
+ \xdef\theledlanguageL{\mainlanguagename}%
+ \xdef\theledlanguageR{\mainlanguagename}%
+ }{}%
}%
\newcount\l@dc@maxchunks
\newcommand{\maxchunks}[1]{\l@dc@maxchunks=#1}
diff --git a/Master/texmf-dist/tex/latex/reptheorem/reptheorem.sty b/Master/texmf-dist/tex/latex/reptheorem/reptheorem.sty
index 2d12f462221..8faae5eb735 100644
--- a/Master/texmf-dist/tex/latex/reptheorem/reptheorem.sty
+++ b/Master/texmf-dist/tex/latex/reptheorem/reptheorem.sty
@@ -25,7 +25,7 @@
%% reptheorem.sty, reptheorem.pdf, reptheorem.ins
%%
-\ProvidesPackage{reptheorem}[2024-03-27 v1.0 Reptheorem package]
+\ProvidesPackage{reptheorem}[2024-08-12 v1.1 Reptheorem package]
\def\reptheorem@theoremfile{\relax}
\NewDocumentCommand{\theoremfile}{ O{\jobname.thm} }{
\def\reptheorem@theoremfile{#1}
@@ -50,14 +50,18 @@ File #1 not found. I will not import any theorems.%
}
#4
\end{#1}
+\expandafter\gdef\csname thmtype@#2\endcsname{#1}
\expandafter\long\expandafter\gdef\csname thm@#2\endcsname{#4}%
\expandafter\gdef\csname thmdesc@#2\endcsname{#3}%
\long\gdef\@thmoutput{%
+\string\expandafter\string\gdef\noexpand%
+\csname thmtype@#2\string\endcsname{#1}%
+^^J%
\string\expandafter\string\long\string\expandafter%
\string\gdef\noexpand\csname thm@#2\string\endcsname{#4}%
^^J%
-\string\expandafter\string\expandafter%
-\string\gdef\noexpand\csname thmdesc@#2\string\endcsname{#3}%
+\string\expandafter\string\gdef\noexpand%
+\csname thmdesc@#2\string\endcsname{#3}%
}
\write\@auxout{\@thmoutput}
\if\reptheorem@theoremfile\relax
@@ -66,40 +70,45 @@ File #1 not found. I will not import any theorems.%
\fi
}{}
\newcounter{old@counter}
-\NewDocumentCommand{\repthm}{ m m +o }{
+\NewDocumentCommand{\repthm}{ m +o }{
\begingroup
-\setcounter{old@counter}{\value{#1}}
- \def\thetheorem{\ref{#2}}
+\ifcsname thmtype@#1\endcsname%
+\expandafter\let\expandafter\@@thmtype\csname thmtype@#1\endcsname%
+\else%
+\def\@@thmtype{theorem}%
+\fi%
+\setcounter{old@counter}{\value{\@@thmtype}}
+ \def\thetheorem{\ref{#1}}
\let\@@theoremnotdefined\relax
-\ifcsname thm@#2\endcsname% Check if theorem is even defined
-\expandafter\edef\expandafter\@@thmdesc{\csname thmdesc@#2\endcsname}%
-\expandafter\let\expandafter\@@thm\csname thm@#2\endcsname
+\ifcsname thm@#1\endcsname% Check if theorem is even defined
+\expandafter\edef\expandafter\@@thmdesc{\csname thmdesc@#1\endcsname}%
+\expandafter\let\expandafter\@@thm\csname thm@#1\endcsname
\IfValueTF{\@@thmdesc}{% Check if theorem has name
-\begin{#1}[\@@thmdesc]
+\begin{\@@thmtype}[\@@thmdesc]
\@@thm
-\end{#1}
+\end{\@@thmtype}
}{% No optionals
-\begin{#1}
+\begin{\@@thmtype}
\@@thm
-\end{#1}
+\end{\@@thmtype}
}
\else
-\IfValueTF{#3}{
-\begin{#1}
-#3
-\end{#1}
+\IfValueTF{#2}{
+\begin{\@@thmtype}
+#2
+\end{\@@thmtype}
}{% No theorem or alt text provided: throw warning
-\begin{#1}
-\end{#1}
+\begin{\@@thmtype}
+\end{\@@thmtype}
\PackageWarning{reptheorem}{%
-Theorem #2 not defined; rebuild your project.
+Theorem #1 not defined; rebuild your project.
If the issue persists, create the theorem using
\begin{makethm} or consider adding alt text to \repthm
using the optional parameter%
}
}
\fi
-\setcounter{#1}{\value{old@counter}}
+\setcounter{\@@thmtype}{\value{old@counter}}
\endgroup
}
diff --git a/Master/texmf-dist/tex/latex/rpgicons/rpgicons-l3.sty b/Master/texmf-dist/tex/latex/rpgicons/rpgicons-l3.sty
index 3103502bf3c..cc33d61bf2f 100644
--- a/Master/texmf-dist/tex/latex/rpgicons/rpgicons-l3.sty
+++ b/Master/texmf-dist/tex/latex/rpgicons/rpgicons-l3.sty
@@ -10,8 +10,8 @@
%
% This work has the LPPL maintenance status `maintained'.
%
-\ProvidesExplPackage {rpgicons-l3} {2024-05-15} {1.8.3}
- {rpg Icons Package (l3 Variant)}
+\ProvidesExplPackage {rpgicons-l3} {2024-08-08} {1.8.4}
+ {RPG Icons Package (l3 Variant)}
\bool_new:N \l__rpgicons_unicode_mode_bool
\sys_if_engine_luatex:T {
@@ -792,22 +792,22 @@
\draw_path_lineto:n { 0cm , -.425cm }
\draw_path_moveto:n { -.425cm , 0cm }
\draw_path_lineto:n { .425cm , 0cm }
- \draw_path_moveto:n { \draw_point_polar:nnn { 30 } { .325cm } { .225cm } }
- \draw_path_lineto:n { \draw_point_polar:nn { 30 } { .4cm} }
- \draw_path_moveto:n { \draw_point_polar:nnn { 60 } { .325cm } { .225cm } }
- \draw_path_lineto:n { \draw_point_polar:nn { 60 } { .4cm} }
- \draw_path_moveto:n { \draw_point_polar:nnn { 120 } { .325cm } { .225cm } }
- \draw_path_lineto:n { \draw_point_polar:nn { 120 } { .4cm} }
- \draw_path_moveto:n { \draw_point_polar:nnn { 150 } { .325cm } { .225cm } }
- \draw_path_lineto:n { \draw_point_polar:nn { 150 } { .4cm} }
- \draw_path_moveto:n { \draw_point_polar:nnn { 210 } { .325cm } { .225cm } }
- \draw_path_lineto:n { \draw_point_polar:nn { 210 } { .4cm} }
- \draw_path_moveto:n { \draw_point_polar:nnn { 240 } { .325cm } { .225cm } }
- \draw_path_lineto:n { \draw_point_polar:nn { 240 } { .4cm} }
- \draw_path_moveto:n { \draw_point_polar:nnn { 300 } { .325cm } { .225cm } }
- \draw_path_lineto:n { \draw_point_polar:nn { 300 } { .4cm} }
- \draw_path_moveto:n { \draw_point_polar:nnn { 330 } { .325cm } { .225cm } }
- \draw_path_lineto:n { \draw_point_polar:nn { 330 } { .4cm} }
+ \draw_path_moveto:n { \draw_point_polar:nnn { .325cm } { .225cm } { 30 } }
+ \draw_path_lineto:n { \draw_point_polar:nn { .4cm } { 30 } }
+ \draw_path_moveto:n { \draw_point_polar:nnn { .325cm } { .225cm } { 60 } }
+ \draw_path_lineto:n { \draw_point_polar:nn { .4cm } { 60 } }
+ \draw_path_moveto:n { \draw_point_polar:nnn { .325cm } { .225cm } { 120 } }
+ \draw_path_lineto:n { \draw_point_polar:nn { .4cm } { 120 } }
+ \draw_path_moveto:n { \draw_point_polar:nnn { .325cm } { .225cm } { 150 } }
+ \draw_path_lineto:n { \draw_point_polar:nn { .4cm } { 150 } }
+ \draw_path_moveto:n { \draw_point_polar:nnn { .325cm } { .225cm } { 210 } }
+ \draw_path_lineto:n { \draw_point_polar:nn { .4cm } { 210 } }
+ \draw_path_moveto:n { \draw_point_polar:nnn { .325cm } { .225cm } { 240 } }
+ \draw_path_lineto:n { \draw_point_polar:nn { .4cm } { 240 } }
+ \draw_path_moveto:n { \draw_point_polar:nnn { .325cm } { .225cm } { 300 } }
+ \draw_path_lineto:n { \draw_point_polar:nn { .4cm } { 300 } }
+ \draw_path_moveto:n { \draw_point_polar:nnn { .325cm } { .225cm } { 330 } }
+ \draw_path_lineto:n { \draw_point_polar:nn { .4cm } { 330 } }
}
\cs_new:Npn \rpgicons_draw_shape_illusion: {
@@ -1546,7 +1546,7 @@
}
\cs_new:Npn \rpgicons_draw_frame_damage: {
- \draw_path_circle:nn { 0cm , 0cm } { .45cm }
+ \draw_path_circle:nn { 0cm , 0cm } { .5cm }
}
% USER COMMANDS
@@ -1910,7 +1910,7 @@
}
\cs_if_exist:NF \spell { \cs_new_eq:NN \spell \RPGIconsSpell }
-\NewDocumentCommand { \RPGIconsSpellschool } { O{positive} m O{} } {
+\NewDocumentCommand { \RPGIconsSpellschool } { O{negative} m O{} } {
\group_begin:
\keys_set_groups:nne { rpgicons / local ~ options } { extra } {#3}
\keys_set:ne { rpgicons / local ~ options } { \clist_use:Nn \l_rpgicons_types_every_spellschool_style_clist { , } }
diff --git a/Master/texmf-dist/tex/latex/rpgicons/rpgicons-pgf.sty b/Master/texmf-dist/tex/latex/rpgicons/rpgicons-pgf.sty
index 0e0c0371874..dd75a7b4c0b 100644
--- a/Master/texmf-dist/tex/latex/rpgicons/rpgicons-pgf.sty
+++ b/Master/texmf-dist/tex/latex/rpgicons/rpgicons-pgf.sty
@@ -11,7 +11,7 @@
% This work has the LPPL maintenance status `maintained'.
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{rpgicons-pgf}[2024-05-15 rpg Icons Package (PGF Variant) (1.8.3)]
+\ProvidesPackage{rpgicons-pgf}[2024-08-08 RPG Icons Package (PGF Variant) (1.8.4)]
% provide pics option
\newif\ifrpgicons@pics\rpgicons@picsfalse
diff --git a/Master/texmf-dist/tex/latex/rpgicons/rpgicons.sty b/Master/texmf-dist/tex/latex/rpgicons/rpgicons.sty
index 8079232a4fb..63a5fa2fc08 100644
--- a/Master/texmf-dist/tex/latex/rpgicons/rpgicons.sty
+++ b/Master/texmf-dist/tex/latex/rpgicons/rpgicons.sty
@@ -10,8 +10,8 @@
%
% This work has the LPPL maintenance status `maintained'.
%
-\ProvidesExplPackage {rpgicons} {2024-05-15} {1.8.3}
- {rpg Icons Package}
+\ProvidesExplPackage {rpgicons} {2024-08-08} {1.8.4}
+ {RPG Icons Package}
\bool_new:N \l__rpgicons_use_legacy_variant_bool
\clist_new:N \l__rpgicons_forwarded_options_clist
diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2colors.sty b/Master/texmf-dist/tex/latex/se2thesis/se2colors.sty
index a11d6f6325c..1ac9a8c7cbd 100644
--- a/Master/texmf-dist/tex/latex/se2thesis/se2colors.sty
+++ b/Master/texmf-dist/tex/latex/se2thesis/se2colors.sty
@@ -48,7 +48,7 @@
\endinput
}%
\providecommand \IfFormatAtLeastTF { \@ifl@t@r \fmtversion }
-\ProvidesExplPackage {se2colors} {2024-06-25} {4.2.0}
+\ProvidesExplPackage {se2colors} {2024-08-12} {4.3.2}
{A colour support package for the se2thesis bundle}
\keys_define:nn { seiicolors }
{
diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2fonts.sty b/Master/texmf-dist/tex/latex/se2thesis/se2fonts.sty
index adaf3be8b75..e86497c76be 100644
--- a/Master/texmf-dist/tex/latex/se2thesis/se2fonts.sty
+++ b/Master/texmf-dist/tex/latex/se2thesis/se2fonts.sty
@@ -48,7 +48,7 @@
\endinput
}%
\providecommand \IfFormatAtLeastTF { \@ifl@t@r \fmtversion }
-\ProvidesExplPackage {se2fonts} {2024-06-25} {4.2.0}
+\ProvidesExplPackage {se2fonts} {2024-08-12} {4.3.2}
{A font-selection support package for the se2thesis bundle}
\msg_new:nnnn { seiifonts } { pdflatex-used }
{ You~ are~ using~ pdfLaTeX~ with~ the~ se2fonts~ packages.}
diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2packages.sty b/Master/texmf-dist/tex/latex/se2thesis/se2packages.sty
index 0b93beca7d5..ae26465fee6 100644
--- a/Master/texmf-dist/tex/latex/se2thesis/se2packages.sty
+++ b/Master/texmf-dist/tex/latex/se2thesis/se2packages.sty
@@ -48,7 +48,7 @@
\endinput
}%
\providecommand \IfFormatAtLeastTF { \@ifl@t@r \fmtversion }
-\ProvidesExplPackage {se2packages} {2024-06-25} {4.2.0}
+\ProvidesExplPackage {se2packages} {2024-08-12} {4.3.2}
{Supporting packages for the se2thesis bundle}
\bool_new:N \l__slcd_packages_csquotes_bool
\bool_new:N \l__slcd_packages_booktabs_bool
diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2thesis.cls b/Master/texmf-dist/tex/latex/se2thesis/se2thesis.cls
index 9ce66446581..7893d3da55c 100644
--- a/Master/texmf-dist/tex/latex/se2thesis/se2thesis.cls
+++ b/Master/texmf-dist/tex/latex/se2thesis/se2thesis.cls
@@ -48,7 +48,7 @@
\endinput
}%
\providecommand \IfFormatAtLeastTF { \@ifl@t@r \fmtversion }
-\ProvidesExplClass {se2thesis} {2024-06-25} {4.2.0}
+\ProvidesExplClass {se2thesis} {2024-08-12} {4.3.2}
{A thesis class for the Chair of Software Engineering II}
\prg_new_conditional:Nnn \slcd_package_if_loaded:n { p, T, F, TF }
{
@@ -532,7 +532,10 @@
\renewcommand*{\@lowertitleback}{%
\group_begin:
\noindent\textbf{\@author}:\\
- \emph{\@title}\\
+ \group_begin:
+ \let\\\relax
+ \emph{\@title}
+ \group_end:\\
\tl_if_eq:NnT \l__slcd_thesis_type_tl { bachelor }
{ \GetTranslation{Bachelor-thesis},~ }
\tl_if_eq:NnT \l__slcd_thesis_type_tl { master }
diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2translations-english.trsl b/Master/texmf-dist/tex/latex/se2thesis/se2translations-english.trsl
index 0a68a9ef062..734d6f34a1f 100644
--- a/Master/texmf-dist/tex/latex/se2thesis/se2translations-english.trsl
+++ b/Master/texmf-dist/tex/latex/se2thesis/se2translations-english.trsl
@@ -32,7 +32,7 @@
%% se2packages.sty,
%% se2thesis-master-thesis-example.bib, and
%% se2thesis-master-thesis-example.pdf
-\ProvideDictionaryFor{English}{se2translations}[2024/06/25]
+\ProvideDictionaryFor{English}{se2translations}[2024/08/12]
\ProvideDictTranslation{abstract}{abstract}
\ProvideDictTranslation{Abstract}{Abstract}
\ProvideDictTranslation{acknowledgement}{acknowledgement}
@@ -57,10 +57,10 @@
\ProvideDictTranslation{External}{External Examiner}
\ProvideDictTranslation{degreeprogramme}{programme}
\ProvideDictTranslation{Degreeprogramme}{Programme}
-\ProvideDictTranslation{Bachelor-thesis}{Bachelor Thesis}
-\ProvideDictTranslation{Bachelor-thesis-proposal}{Bachelor Thesis Proposal}
-\ProvideDictTranslation{Master-thesis}{Master Thesis}
-\ProvideDictTranslation{Master-thesis-proposal}{Master Thesis Proposal}
+\ProvideDictTranslation{Bachelor-thesis}{Bachelor's Thesis}
+\ProvideDictTranslation{Bachelor-thesis-proposal}{Bachelor's Thesis Proposal}
+\ProvideDictTranslation{Master-thesis}{Master's Thesis}
+\ProvideDictTranslation{Master-thesis-proposal}{Master's Thesis Proposal}
\ProvideDictTranslation{PhD-thesis}{PhD Thesis}
\ProvideDictTranslation{PhD-thesis-proposal}{PhD Thesis Proposal}
\ProvideDictTranslation{date}{date}
diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2translations-german.trsl b/Master/texmf-dist/tex/latex/se2thesis/se2translations-german.trsl
index c4b8dda368f..867b6e3b1aa 100644
--- a/Master/texmf-dist/tex/latex/se2thesis/se2translations-german.trsl
+++ b/Master/texmf-dist/tex/latex/se2thesis/se2translations-german.trsl
@@ -32,7 +32,7 @@
%% se2packages.sty,
%% se2thesis-master-thesis-example.bib, and
%% se2thesis-master-thesis-example.pdf
-\ProvideDictionaryFor{German}{se2translations}[2024/06/25]
+\ProvideDictionaryFor{German}{se2translations}[2024/08/12]
\ProvideDictTranslation{abstract}{Zusammenfassung}
\ProvideDictTranslation{Abstract}{Zusammenfassung}
\ProvideDictTranslation{acknowledgement}{Danksagung}
diff --git a/Master/texmf-dist/tex/latex/sillypage/sillypage.sty b/Master/texmf-dist/tex/latex/sillypage/sillypage.sty
index 2c304af0505..a78ae795dc8 100644
--- a/Master/texmf-dist/tex/latex/sillypage/sillypage.sty
+++ b/Master/texmf-dist/tex/latex/sillypage/sillypage.sty
@@ -22,8 +22,8 @@
%% and version 1.3c or later is part of all distributions of LaTeX version
%% 2005/12/01 or later.
%%
-\def\sillypageDate{2023-03-04}
-\def\sillypageVersion{1.6}
+\def\sillypageDate{2024-07-23}
+\def\sillypageVersion{1.7}
\ProvidesExplPackage
{sillypage} {\sillypageDate} {\sillypageVersion}
{The silly walk as page numbering style}
@@ -36,19 +36,45 @@
\newcommand*\@silly { \__silly_step:n }
\cs_new:Npn \__silly_step:n #1
{
+ \UseTaggingSocket{__silly/begin}{#1}
+ \SuspendTagging{__silly}
\__silly_step_aux:eN
{ \int_eval:n { \int_mod:nn { #1-1 } { \silly@steps } +1 } }
\c_false_bool
+ \ResumeTagging{__silly}
+ \UseTaggingSocket{__silly/end}
}
\NewDocumentCommand \sillynumeral { m } { \__silly_numeral:n {#1} }
\newcommand*\@sillynumeral { \__silly_numeral:n }
\cs_new:Npn \__silly_numeral:n #1
{
+ \UseTaggingSocket{__silly/begin}{#1}
+ \SuspendTagging{__silly}
\exp_args:Ne \str_map_function:nN
{ \int_to_base:nn {#1} { 12 } } \__silly_numeral_aux:n
+ \ResumeTagging{__silly}
+ \UseTaggingSocket{__silly/end}
}
\cs_new:Npn \__silly_numeral_aux:n #1
{ \__silly_step_aux:eN { "\char_uppercase:N #1+1 } \c_true_bool }
+
+\NewSocket{tagsupport/__silly/begin}{1}
+\NewSocket{tagsupport/__silly/end}{0}
+\NewSocketPlug{tagsupport/__silly/begin}{tagged}
+ {
+ \mode_leave_vertical:
+ \tag_mc_end_push:
+ \tag_struct_begin:n {tag=Span}
+ \tag_mc_begin:n {actualtext=#1}
+ }
+\NewSocketPlug{tagsupport/__silly/end}{tagged}
+ {
+ \tag_mc_end:
+ \tag_struct_end:
+ \tag_mc_begin_pop:n{}
+ }
+\AssignSocketPlug{tagsupport/__silly/begin}{tagged}
+\AssignSocketPlug{tagsupport/__silly/end}{tagged}
\cs_new:Npn \__silly_step_aux:nN #1 #2
{
\cs_if_exist_use:cF { texorpdfstring } { \use_i:nn }
diff --git a/Master/texmf-dist/tex/latex/simpleicons/simpleicons.sty b/Master/texmf-dist/tex/latex/simpleicons/simpleicons.sty
index bcbe536096d..3ddb2578fff 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/07/12 13.1.0 Simple Icons 13.1.0 Logos]
+\ProvidesPackage{simpleicons}[2024/08/09 13.4.0 Simple Icons 13.4.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 e0ea8e79ccc..431517a7d60 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-pdftex.tex
+++ b/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-pdftex.tex
@@ -1076,2079 +1076,2085 @@
\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
+ \expandafter\def\csname simpleicon@gltficon\endcsname {\simpleiconsmapfive\symbol{53}}
+ \expandafter\def\csname simpleicon@gmailicon\endcsname {\simpleiconsmapfive\symbol{54}}
+ \expandafter\def\csname simpleicon@gnomeicon\endcsname {\simpleiconsmapfive\symbol{55}}
+ \expandafter\def\csname simpleicon@gnometerminalicon\endcsname {\simpleiconsmapfive\symbol{56}}
+ \expandafter\def\csname simpleicon@gnuicon\endcsname {\simpleiconsmapfive\symbol{57}}
+ \expandafter\def\csname simpleicon@gnubashicon\endcsname {\simpleiconsmapfive\symbol{58}}
+ \expandafter\def\csname simpleicon@gnuemacsicon\endcsname {\simpleiconsmapfive\symbol{59}}
+ \expandafter\def\csname simpleicon@gnuicecaticon\endcsname {\simpleiconsmapfive\symbol{60}}
+ \expandafter\def\csname simpleicon@gnuprivacyguardicon\endcsname {\simpleiconsmapfive\symbol{61}}
+ \expandafter\def\csname simpleicon@gnusocialicon\endcsname {\simpleiconsmapfive\symbol{62}}
+ \expandafter\def\csname simpleicon@goicon\endcsname {\simpleiconsmapfive\symbol{63}}
+ \expandafter\def\csname simpleicon@gocdicon\endcsname {\simpleiconsmapfive\symbol{64}}
+ \expandafter\def\csname simpleicon@godaddyicon\endcsname {\simpleiconsmapfive\symbol{65}}
+ \expandafter\def\csname simpleicon@godotengineicon\endcsname {\simpleiconsmapfive\symbol{66}}
+ \expandafter\def\csname simpleicon@gofundmeicon\endcsname {\simpleiconsmapfive\symbol{67}}
+ \expandafter\def\csname simpleicon@gogdotcomicon\endcsname {\simpleiconsmapfive\symbol{68}}
+ \expandafter\def\csname simpleicon@gojekicon\endcsname {\simpleiconsmapfive\symbol{69}}
+ \expandafter\def\csname simpleicon@golandicon\endcsname {\simpleiconsmapfive\symbol{70}}
+ \expandafter\def\csname simpleicon@goldenlineicon\endcsname {\simpleiconsmapfive\symbol{71}}
+ \expandafter\def\csname simpleicon@goldmansachsicon\endcsname {\simpleiconsmapfive\symbol{72}}
+ \expandafter\def\csname simpleicon@goodreadsicon\endcsname {\simpleiconsmapfive\symbol{73}}
+ \expandafter\def\csname simpleicon@googleicon\endcsname {\simpleiconsmapfive\symbol{74}}
+ \expandafter\def\csname simpleicon@googleadmobicon\endcsname {\simpleiconsmapfive\symbol{75}}
+ \expandafter\def\csname simpleicon@googleadsicon\endcsname {\simpleiconsmapfive\symbol{76}}
+ \expandafter\def\csname simpleicon@googleadsenseicon\endcsname {\simpleiconsmapfive\symbol{77}}
+ \expandafter\def\csname simpleicon@googleanalyticsicon\endcsname {\simpleiconsmapfive\symbol{78}}
+ \expandafter\def\csname simpleicon@googleappsscripticon\endcsname {\simpleiconsmapfive\symbol{79}}
+ \expandafter\def\csname simpleicon@googleassistanticon\endcsname {\simpleiconsmapfive\symbol{80}}
+ \expandafter\def\csname simpleicon@googleauthenticatoricon\endcsname {\simpleiconsmapfive\symbol{81}}
+ \expandafter\def\csname simpleicon@googlebigqueryicon\endcsname {\simpleiconsmapfive\symbol{82}}
+ \expandafter\def\csname simpleicon@googlebigtableicon\endcsname {\simpleiconsmapfive\symbol{83}}
+ \expandafter\def\csname simpleicon@googlecalendaricon\endcsname {\simpleiconsmapfive\symbol{84}}
+ \expandafter\def\csname simpleicon@googlecampaignmanager360icon\endcsname {\simpleiconsmapfive\symbol{85}}
+ \expandafter\def\csname simpleicon@googlecardboardicon\endcsname {\simpleiconsmapfive\symbol{86}}
+ \expandafter\def\csname simpleicon@googlechaticon\endcsname {\simpleiconsmapfive\symbol{87}}
+ \expandafter\def\csname simpleicon@googlechromeicon\endcsname {\simpleiconsmapfive\symbol{88}}
+ \expandafter\def\csname simpleicon@googlechronicleicon\endcsname {\simpleiconsmapfive\symbol{89}}
+ \expandafter\def\csname simpleicon@googleclassroomicon\endcsname {\simpleiconsmapfive\symbol{90}}
+ \expandafter\def\csname simpleicon@googlecloudicon\endcsname {\simpleiconsmapfive\symbol{91}}
+ \expandafter\def\csname simpleicon@googlecloudcomposericon\endcsname {\simpleiconsmapfive\symbol{92}}
+ \expandafter\def\csname simpleicon@googlecloudspannericon\endcsname {\simpleiconsmapfive\symbol{93}}
+ \expandafter\def\csname simpleicon@googlecloudstorageicon\endcsname {\simpleiconsmapfive\symbol{94}}
+ \expandafter\def\csname simpleicon@googlecolabicon\endcsname {\simpleiconsmapfive\symbol{95}}
+ \expandafter\def\csname simpleicon@googlecontaineroptimizedosicon\endcsname {\simpleiconsmapfive\symbol{96}}
+ \expandafter\def\csname simpleicon@googledataflowicon\endcsname {\simpleiconsmapfive\symbol{97}}
+ \expandafter\def\csname simpleicon@googledataprocicon\endcsname {\simpleiconsmapfive\symbol{98}}
+ \expandafter\def\csname simpleicon@googledatastudioicon\endcsname {\simpleiconsmapfive\symbol{99}}
+ \expandafter\def\csname simpleicon@googledisplayandvideo360icon\endcsname {\simpleiconsmapfive\symbol{100}}
+ \expandafter\def\csname simpleicon@googledocsicon\endcsname {\simpleiconsmapfive\symbol{101}}
+ \expandafter\def\csname simpleicon@googledriveicon\endcsname {\simpleiconsmapfive\symbol{102}}
+ \expandafter\def\csname simpleicon@googleearthicon\endcsname {\simpleiconsmapfive\symbol{103}}
+ \expandafter\def\csname simpleicon@googleearthengineicon\endcsname {\simpleiconsmapfive\symbol{104}}
+ \expandafter\def\csname simpleicon@googlefiticon\endcsname {\simpleiconsmapfive\symbol{105}}
+ \expandafter\def\csname simpleicon@googlefontsicon\endcsname {\simpleiconsmapfive\symbol{106}}
+ \expandafter\def\csname simpleicon@googleformsicon\endcsname {\simpleiconsmapfive\symbol{107}}
+ \expandafter\def\csname simpleicon@googlegeminiicon\endcsname {\simpleiconsmapfive\symbol{108}}
+ \expandafter\def\csname simpleicon@googlehomeicon\endcsname {\simpleiconsmapfive\symbol{109}}
+ \expandafter\def\csname simpleicon@googlekeepicon\endcsname {\simpleiconsmapfive\symbol{110}}
+ \expandafter\def\csname simpleicon@googlelensicon\endcsname {\simpleiconsmapfive\symbol{111}}
+ \expandafter\def\csname simpleicon@googlemapsicon\endcsname {\simpleiconsmapfive\symbol{112}}
+ \expandafter\def\csname simpleicon@googlemarketingplatformicon\endcsname {\simpleiconsmapfive\symbol{113}}
+ \expandafter\def\csname simpleicon@googlemeeticon\endcsname {\simpleiconsmapfive\symbol{114}}
+ \expandafter\def\csname simpleicon@googlemessagesicon\endcsname {\simpleiconsmapfive\symbol{115}}
+ \expandafter\def\csname simpleicon@googlenearbyicon\endcsname {\simpleiconsmapfive\symbol{116}}
+ \expandafter\def\csname simpleicon@googlenewsicon\endcsname {\simpleiconsmapfive\symbol{117}}
+ \expandafter\def\csname simpleicon@googlepayicon\endcsname {\simpleiconsmapfive\symbol{118}}
+ \expandafter\def\csname simpleicon@googlephotosicon\endcsname {\simpleiconsmapfive\symbol{119}}
+ \expandafter\def\csname simpleicon@googleplayicon\endcsname {\simpleiconsmapfive\symbol{120}}
+ \expandafter\def\csname simpleicon@googlepubsubicon\endcsname {\simpleiconsmapfive\symbol{121}}
+ \expandafter\def\csname simpleicon@googlescholaricon\endcsname {\simpleiconsmapfive\symbol{122}}
+ \expandafter\def\csname simpleicon@googlesearchconsoleicon\endcsname {\simpleiconsmapfive\symbol{123}}
+ \expandafter\def\csname simpleicon@googlesheetsicon\endcsname {\simpleiconsmapfive\symbol{124}}
+ \expandafter\def\csname simpleicon@googleslidesicon\endcsname {\simpleiconsmapfive\symbol{125}}
+ \expandafter\def\csname simpleicon@googlestreetviewicon\endcsname {\simpleiconsmapfive\symbol{126}}
+ \expandafter\def\csname simpleicon@googletagmanagericon\endcsname {\simpleiconsmapfive\symbol{127}}
+ \expandafter\def\csname simpleicon@googletasksicon\endcsname {\simpleiconsmapfive\symbol{128}}
+ \expandafter\def\csname simpleicon@googletranslateicon\endcsname {\simpleiconsmapfive\symbol{129}}
+ \expandafter\def\csname simpleicon@gotomeetingicon\endcsname {\simpleiconsmapfive\symbol{130}}
+ \expandafter\def\csname simpleicon@grabicon\endcsname {\simpleiconsmapfive\symbol{131}}
+ \expandafter\def\csname simpleicon@gradleicon\endcsname {\simpleiconsmapfive\symbol{132}}
+ \expandafter\def\csname simpleicon@gradleplaypublishericon\endcsname {\simpleiconsmapfive\symbol{133}}
+ \expandafter\def\csname simpleicon@grafanaicon\endcsname {\simpleiconsmapfive\symbol{134}}
+ \expandafter\def\csname simpleicon@grammarlyicon\endcsname {\simpleiconsmapfive\symbol{135}}
+ \expandafter\def\csname simpleicon@grandfraisicon\endcsname {\simpleiconsmapfive\symbol{136}}
+ \expandafter\def\csname simpleicon@grapheneosicon\endcsname {\simpleiconsmapfive\symbol{137}}
+ \expandafter\def\csname simpleicon@graphiteicon\endcsname {\simpleiconsmapfive\symbol{138}}
+ \expandafter\def\csname simpleicon@graphqlicon\endcsname {\simpleiconsmapfive\symbol{139}}
+ \expandafter\def\csname simpleicon@gravicon\endcsname {\simpleiconsmapfive\symbol{140}}
+ \expandafter\def\csname simpleicon@gravataricon\endcsname {\simpleiconsmapfive\symbol{141}}
+ \expandafter\def\csname simpleicon@graylogicon\endcsname {\simpleiconsmapfive\symbol{142}}
+ \expandafter\def\csname simpleicon@greasyforkicon\endcsname {\simpleiconsmapfive\symbol{143}}
+ \expandafter\def\csname simpleicon@greatlearningicon\endcsname {\simpleiconsmapfive\symbol{144}}
+ \expandafter\def\csname simpleicon@greenhouseicon\endcsname {\simpleiconsmapfive\symbol{145}}
+ \expandafter\def\csname simpleicon@greensockicon\endcsname {\simpleiconsmapfive\symbol{146}}
+ \expandafter\def\csname simpleicon@griddotaiicon\endcsname {\simpleiconsmapfive\symbol{147}}
+ \expandafter\def\csname simpleicon@gridsomeicon\endcsname {\simpleiconsmapfive\symbol{148}}
+ \expandafter\def\csname simpleicon@groupmeicon\endcsname {\simpleiconsmapfive\symbol{149}}
+ \expandafter\def\csname simpleicon@grouponicon\endcsname {\simpleiconsmapfive\symbol{150}}
+ \expandafter\def\csname simpleicon@grubhubicon\endcsname {\simpleiconsmapfive\symbol{151}}
+ \expandafter\def\csname simpleicon@grunticon\endcsname {\simpleiconsmapfive\symbol{152}}
+ \expandafter\def\csname simpleicon@gskicon\endcsname {\simpleiconsmapfive\symbol{153}}
+ \expandafter\def\csname simpleicon@gsmarenadotcomicon\endcsname {\simpleiconsmapfive\symbol{154}}
+ \expandafter\def\csname simpleicon@gstreamericon\endcsname {\simpleiconsmapfive\symbol{155}}
+ \expandafter\def\csname simpleicon@gtkicon\endcsname {\simpleiconsmapfive\symbol{156}}
+ \expandafter\def\csname simpleicon@guangzhoumetroicon\endcsname {\simpleiconsmapfive\symbol{157}}
+ \expandafter\def\csname simpleicon@guildedicon\endcsname {\simpleiconsmapfive\symbol{158}}
+ \expandafter\def\csname simpleicon@gulpicon\endcsname {\simpleiconsmapfive\symbol{159}}
+ \expandafter\def\csname simpleicon@gumroadicon\endcsname {\simpleiconsmapfive\symbol{160}}
+ \expandafter\def\csname simpleicon@gumtreeicon\endcsname {\simpleiconsmapfive\symbol{161}}
+ \expandafter\def\csname simpleicon@gunicornicon\endcsname {\simpleiconsmapfive\symbol{162}}
+ \expandafter\def\csname simpleicon@gurobiicon\endcsname {\simpleiconsmapfive\symbol{163}}
+ \expandafter\def\csname simpleicon@gustoicon\endcsname {\simpleiconsmapfive\symbol{164}}
+ \expandafter\def\csname simpleicon@gutenbergicon\endcsname {\simpleiconsmapfive\symbol{165}}
+ \expandafter\def\csname simpleicon@h3icon\endcsname {\simpleiconsmapfive\symbol{166}}
+ \expandafter\def\csname simpleicon@habricon\endcsname {\simpleiconsmapfive\symbol{167}}
+ \expandafter\def\csname simpleicon@hackadayicon\endcsname {\simpleiconsmapfive\symbol{168}}
+ \expandafter\def\csname simpleicon@hackclubicon\endcsname {\simpleiconsmapfive\symbol{169}}
+ \expandafter\def\csname simpleicon@hackerearthicon\endcsname {\simpleiconsmapfive\symbol{170}}
+ \expandafter\def\csname simpleicon@hackernoonicon\endcsname {\simpleiconsmapfive\symbol{171}}
+ \expandafter\def\csname simpleicon@hackeroneicon\endcsname {\simpleiconsmapfive\symbol{172}}
+ \expandafter\def\csname simpleicon@hackerrankicon\endcsname {\simpleiconsmapfive\symbol{173}}
+ \expandafter\def\csname simpleicon@hackstericon\endcsname {\simpleiconsmapfive\symbol{174}}
+ \expandafter\def\csname simpleicon@hacktheboxicon\endcsname {\simpleiconsmapfive\symbol{175}}
+ \expandafter\def\csname simpleicon@halicon\endcsname {\simpleiconsmapfive\symbol{176}}
+ \expandafter\def\csname simpleicon@handlebarsdotjsicon\endcsname {\simpleiconsmapfive\symbol{177}}
+ \expandafter\def\csname simpleicon@handmicon\endcsname {\simpleiconsmapfive\symbol{178}}
+ \expandafter\def\csname simpleicon@handshakeicon\endcsname {\simpleiconsmapfive\symbol{179}}
+ \expandafter\def\csname simpleicon@handshakeprotocolicon\endcsname {\simpleiconsmapfive\symbol{180}}
+ \expandafter\def\csname simpleicon@happycowicon\endcsname {\simpleiconsmapfive\symbol{181}}
+ \expandafter\def\csname simpleicon@harboricon\endcsname {\simpleiconsmapfive\symbol{182}}
+ \expandafter\def\csname simpleicon@harmonyosicon\endcsname {\simpleiconsmapfive\symbol{183}}
+ \expandafter\def\csname simpleicon@hashicorpicon\endcsname {\simpleiconsmapfive\symbol{184}}
+ \expandafter\def\csname simpleicon@hashnodeicon\endcsname {\simpleiconsmapfive\symbol{185}}
+ \expandafter\def\csname simpleicon@haskellicon\endcsname {\simpleiconsmapfive\symbol{186}}
+ \expandafter\def\csname simpleicon@hasuraicon\endcsname {\simpleiconsmapfive\symbol{187}}
+ \expandafter\def\csname simpleicon@hatenabookmarkicon\endcsname {\simpleiconsmapfive\symbol{188}}
+ \expandafter\def\csname simpleicon@haveibeenpwnedicon\endcsname {\simpleiconsmapfive\symbol{189}}
+ \expandafter\def\csname simpleicon@haxeicon\endcsname {\simpleiconsmapfive\symbol{190}}
+ \expandafter\def\csname simpleicon@hboicon\endcsname {\simpleiconsmapfive\symbol{191}}
+ \expandafter\def\csname simpleicon@hclicon\endcsname {\simpleiconsmapfive\symbol{192}}
+ \expandafter\def\csname simpleicon@hdfcbankicon\endcsname {\simpleiconsmapfive\symbol{193}}
+ \expandafter\def\csname simpleicon@headlessuiicon\endcsname {\simpleiconsmapfive\symbol{194}}
+ \expandafter\def\csname simpleicon@headphonezoneicon\endcsname {\simpleiconsmapfive\symbol{195}}
+ \expandafter\def\csname simpleicon@headspaceicon\endcsname {\simpleiconsmapfive\symbol{196}}
+ \expandafter\def\csname simpleicon@hearthicon\endcsname {\simpleiconsmapfive\symbol{197}}
+ \expandafter\def\csname simpleicon@hearthisdotaticon\endcsname {\simpleiconsmapfive\symbol{198}}
+ \expandafter\def\csname simpleicon@hederaicon\endcsname {\simpleiconsmapfive\symbol{199}}
+ \expandafter\def\csname simpleicon@heliumicon\endcsname {\simpleiconsmapfive\symbol{200}}
+ \expandafter\def\csname simpleicon@hellofreshicon\endcsname {\simpleiconsmapfive\symbol{201}}
+ \expandafter\def\csname simpleicon@hellyhansenicon\endcsname {\simpleiconsmapfive\symbol{202}}
+ \expandafter\def\csname simpleicon@helmicon\endcsname {\simpleiconsmapfive\symbol{203}}
+ \expandafter\def\csname simpleicon@helpdeskicon\endcsname {\simpleiconsmapfive\symbol{204}}
+ \expandafter\def\csname simpleicon@helpscouticon\endcsname {\simpleiconsmapfive\symbol{205}}
+ \expandafter\def\csname simpleicon@hepsiemlakicon\endcsname {\simpleiconsmapfive\symbol{206}}
+ \expandafter\def\csname simpleicon@hereicon\endcsname {\simpleiconsmapfive\symbol{207}}
+ \expandafter\def\csname simpleicon@herokuicon\endcsname {\simpleiconsmapfive\symbol{208}}
+ \expandafter\def\csname simpleicon@hetznericon\endcsname {\simpleiconsmapfive\symbol{209}}
+ \expandafter\def\csname simpleicon@hevyicon\endcsname {\simpleiconsmapfive\symbol{210}}
+ \expandafter\def\csname simpleicon@hexleticon\endcsname {\simpleiconsmapfive\symbol{211}}
+ \expandafter\def\csname simpleicon@hexoicon\endcsname {\simpleiconsmapfive\symbol{212}}
+ \expandafter\def\csname simpleicon@heyicon\endcsname {\simpleiconsmapfive\symbol{213}}
+ \expandafter\def\csname simpleicon@hibernateicon\endcsname {\simpleiconsmapfive\symbol{214}}
+ \expandafter\def\csname simpleicon@hibobicon\endcsname {\simpleiconsmapfive\symbol{215}}
+ \expandafter\def\csname simpleicon@hiltonicon\endcsname {\simpleiconsmapfive\symbol{216}}
+ \expandafter\def\csname simpleicon@hiltonhotelsandresortsicon\endcsname {\simpleiconsmapfive\symbol{217}}
+ \expandafter\def\csname simpleicon@hitachiicon\endcsname {\simpleiconsmapfive\symbol{218}}
+ \expandafter\def\csname simpleicon@hiveicon\endcsname {\simpleiconsmapfive\symbol{219}}
+ \expandafter\def\csname simpleicon@hiveblockchainicon\endcsname {\simpleiconsmapfive\symbol{220}}
+ \expandafter\def\csname simpleicon@hivemqicon\endcsname {\simpleiconsmapfive\symbol{221}}
+ \expandafter\def\csname simpleicon@homarricon\endcsname {\simpleiconsmapfive\symbol{222}}
+ \expandafter\def\csname simpleicon@homeadvisoricon\endcsname {\simpleiconsmapfive\symbol{223}}
+ \expandafter\def\csname simpleicon@homeassistanticon\endcsname {\simpleiconsmapfive\symbol{224}}
+ \expandafter\def\csname simpleicon@homeassistantcommunitystoreicon\endcsname {\simpleiconsmapfive\symbol{225}}
+ \expandafter\def\csname simpleicon@homebrewicon\endcsname {\simpleiconsmapfive\symbol{226}}
+ \expandafter\def\csname simpleicon@homebridgeicon\endcsname {\simpleiconsmapfive\symbol{227}}
+ \expandafter\def\csname simpleicon@homepageicon\endcsname {\simpleiconsmapfive\symbol{228}}
+ \expandafter\def\csname simpleicon@homifyicon\endcsname {\simpleiconsmapfive\symbol{229}}
+ \expandafter\def\csname simpleicon@hondaicon\endcsname {\simpleiconsmapfive\symbol{230}}
+ \expandafter\def\csname simpleicon@honeyicon\endcsname {\simpleiconsmapfive\symbol{231}}
+ \expandafter\def\csname simpleicon@honoicon\endcsname {\simpleiconsmapfive\symbol{232}}
+ \expandafter\def\csname simpleicon@honoricon\endcsname {\simpleiconsmapfive\symbol{233}}
+ \expandafter\def\csname simpleicon@hootsuiteicon\endcsname {\simpleiconsmapfive\symbol{234}}
+ \expandafter\def\csname simpleicon@hoppscotchicon\endcsname {\simpleiconsmapfive\symbol{235}}
+ \expandafter\def\csname simpleicon@hostingericon\endcsname {\simpleiconsmapfive\symbol{236}}
+ \expandafter\def\csname simpleicon@hotelsdotcomicon\endcsname {\simpleiconsmapfive\symbol{237}}
+ \expandafter\def\csname simpleicon@hotjaricon\endcsname {\simpleiconsmapfive\symbol{238}}
+ \expandafter\def\csname simpleicon@hotwireicon\endcsname {\simpleiconsmapfive\symbol{239}}
+ \expandafter\def\csname simpleicon@houdiniicon\endcsname {\simpleiconsmapfive\symbol{240}}
+ \expandafter\def\csname simpleicon@houzzicon\endcsname {\simpleiconsmapfive\symbol{241}}
+ \expandafter\def\csname simpleicon@hpicon\endcsname {\simpleiconsmapfive\symbol{242}}
+ \expandafter\def\csname simpleicon@hsbcicon\endcsname {\simpleiconsmapfive\symbol{243}}
+ \expandafter\def\csname simpleicon@html5icon\endcsname {\simpleiconsmapfive\symbol{244}}
+ \expandafter\def\csname simpleicon@htmlacademyicon\endcsname {\simpleiconsmapfive\symbol{245}}
+ \expandafter\def\csname simpleicon@htmxicon\endcsname {\simpleiconsmapfive\symbol{246}}
+ \expandafter\def\csname simpleicon@htopicon\endcsname {\simpleiconsmapfive\symbol{247}}
+ \expandafter\def\csname simpleicon@httpieicon\endcsname {\simpleiconsmapfive\symbol{248}}
+ \expandafter\def\csname simpleicon@huaweiicon\endcsname {\simpleiconsmapfive\symbol{249}}
+ \expandafter\def\csname simpleicon@hubspoticon\endcsname {\simpleiconsmapfive\symbol{250}}
+ \expandafter\def\csname simpleicon@huggingfaceicon\endcsname {\simpleiconsmapfive\symbol{251}}
+ \expandafter\def\csname simpleicon@hugoicon\endcsname {\simpleiconsmapfive\symbol{252}}
+ \expandafter\def\csname simpleicon@humblebundleicon\endcsname {\simpleiconsmapfive\symbol{253}}
+ \expandafter\def\csname simpleicon@hungryjacksicon\endcsname {\simpleiconsmapfive\symbol{254}}
+ \expandafter\def\csname simpleicon@husqvarnaicon\endcsname {\simpleiconsmapfive\symbol{255}}
+ \expandafter\def\csname simpleicon@hypericon\endcsname {\simpleiconsmapsix\symbol{0}}
+ \expandafter\def\csname simpleicon@hyperskillicon\endcsname {\simpleiconsmapsix\symbol{1}}
+ \expandafter\def\csname simpleicon@hypothesisicon\endcsname {\simpleiconsmapsix\symbol{2}}
+ \expandafter\def\csname simpleicon@hyprlandicon\endcsname {\simpleiconsmapsix\symbol{3}}
+ \expandafter\def\csname simpleicon@hyundaiicon\endcsname {\simpleiconsmapsix\symbol{4}}
+ \expandafter\def\csname simpleicon@i18nexticon\endcsname {\simpleiconsmapsix\symbol{5}}
+ \expandafter\def\csname simpleicon@i3icon\endcsname {\simpleiconsmapsix\symbol{6}}
+ \expandafter\def\csname simpleicon@iataicon\endcsname {\simpleiconsmapsix\symbol{7}}
+ \expandafter\def\csname simpleicon@ibeaconicon\endcsname {\simpleiconsmapsix\symbol{8}}
+ \expandafter\def\csname simpleicon@iberiaicon\endcsname {\simpleiconsmapsix\symbol{9}}
+ \expandafter\def\csname simpleicon@icedicon\endcsname {\simpleiconsmapsix\symbol{10}}
+ \expandafter\def\csname simpleicon@icelandicon\endcsname {\simpleiconsmapsix\symbol{11}}
+ \expandafter\def\csname simpleicon@icicibankicon\endcsname {\simpleiconsmapsix\symbol{12}}
+ \expandafter\def\csname simpleicon@icingaicon\endcsname {\simpleiconsmapsix\symbol{13}}
+ \expandafter\def\csname simpleicon@icloudicon\endcsname {\simpleiconsmapsix\symbol{14}}
+ \expandafter\def\csname simpleicon@icomoonicon\endcsname {\simpleiconsmapsix\symbol{15}}
+ \expandafter\def\csname simpleicon@iconicon\endcsname {\simpleiconsmapsix\symbol{16}}
+ \expandafter\def\csname simpleicon@iconfindericon\endcsname {\simpleiconsmapsix\symbol{17}}
+ \expandafter\def\csname simpleicon@iconifyicon\endcsname {\simpleiconsmapsix\symbol{18}}
+ \expandafter\def\csname simpleicon@iconjaricon\endcsname {\simpleiconsmapsix\symbol{19}}
+ \expandafter\def\csname simpleicon@icons8icon\endcsname {\simpleiconsmapsix\symbol{20}}
+ \expandafter\def\csname simpleicon@icqicon\endcsname {\simpleiconsmapsix\symbol{21}}
+ \expandafter\def\csname simpleicon@ieeeicon\endcsname {\simpleiconsmapsix\symbol{22}}
+ \expandafter\def\csname simpleicon@ifixiticon\endcsname {\simpleiconsmapsix\symbol{23}}
+ \expandafter\def\csname simpleicon@ifoodicon\endcsname {\simpleiconsmapsix\symbol{24}}
+ \expandafter\def\csname simpleicon@ifttticon\endcsname {\simpleiconsmapsix\symbol{25}}
+ \expandafter\def\csname simpleicon@igdbicon\endcsname {\simpleiconsmapsix\symbol{26}}
+ \expandafter\def\csname simpleicon@ignicon\endcsname {\simpleiconsmapsix\symbol{27}}
+ \expandafter\def\csname simpleicon@iheartradioicon\endcsname {\simpleiconsmapsix\symbol{28}}
+ \expandafter\def\csname simpleicon@ikeaicon\endcsname {\simpleiconsmapsix\symbol{29}}
+ \expandafter\def\csname simpleicon@iledefrancemobilitesicon\endcsname {\simpleiconsmapsix\symbol{30}}
+ \expandafter\def\csname simpleicon@imagedotscicon\endcsname {\simpleiconsmapsix\symbol{31}}
+ \expandafter\def\csname simpleicon@imagejicon\endcsname {\simpleiconsmapsix\symbol{32}}
+ \expandafter\def\csname simpleicon@imdbicon\endcsname {\simpleiconsmapsix\symbol{33}}
+ \expandafter\def\csname simpleicon@imessageicon\endcsname {\simpleiconsmapsix\symbol{34}}
+ \expandafter\def\csname simpleicon@imguricon\endcsname {\simpleiconsmapsix\symbol{35}}
+ \expandafter\def\csname simpleicon@immericon\endcsname {\simpleiconsmapsix\symbol{36}}
+ \expandafter\def\csname simpleicon@immichicon\endcsname {\simpleiconsmapsix\symbol{37}}
+ \expandafter\def\csname simpleicon@imouicon\endcsname {\simpleiconsmapsix\symbol{38}}
+ \expandafter\def\csname simpleicon@improvmxicon\endcsname {\simpleiconsmapsix\symbol{39}}
+ \expandafter\def\csname simpleicon@indeedicon\endcsname {\simpleiconsmapsix\symbol{40}}
+ \expandafter\def\csname simpleicon@indiansuperleagueicon\endcsname {\simpleiconsmapsix\symbol{41}}
+ \expandafter\def\csname simpleicon@indiehackersicon\endcsname {\simpleiconsmapsix\symbol{42}}
+ \expandafter\def\csname simpleicon@indigoicon\endcsname {\simpleiconsmapsix\symbol{43}}
+ \expandafter\def\csname simpleicon@inertiaicon\endcsname {\simpleiconsmapsix\symbol{44}}
+ \expandafter\def\csname simpleicon@infinitiicon\endcsname {\simpleiconsmapsix\symbol{45}}
+ \expandafter\def\csname simpleicon@influxdbicon\endcsname {\simpleiconsmapsix\symbol{46}}
+ \expandafter\def\csname simpleicon@infomaniakicon\endcsname {\simpleiconsmapsix\symbol{47}}
+ \expandafter\def\csname simpleicon@infoqicon\endcsname {\simpleiconsmapsix\symbol{48}}
+ \expandafter\def\csname simpleicon@informaticaicon\endcsname {\simpleiconsmapsix\symbol{49}}
+ \expandafter\def\csname simpleicon@infosysicon\endcsname {\simpleiconsmapsix\symbol{50}}
+ \expandafter\def\csname simpleicon@infracosticon\endcsname {\simpleiconsmapsix\symbol{51}}
+ \expandafter\def\csname simpleicon@ingressicon\endcsname {\simpleiconsmapsix\symbol{52}}
+ \expandafter\def\csname simpleicon@inkdropicon\endcsname {\simpleiconsmapsix\symbol{53}}
+ \expandafter\def\csname simpleicon@inkscapeicon\endcsname {\simpleiconsmapsix\symbol{54}}
+ \expandafter\def\csname simpleicon@inoreadericon\endcsname {\simpleiconsmapsix\symbol{55}}
+ \expandafter\def\csname simpleicon@insomniaicon\endcsname {\simpleiconsmapsix\symbol{56}}
+ \expandafter\def\csname simpleicon@inspireicon\endcsname {\simpleiconsmapsix\symbol{57}}
+ \expandafter\def\csname simpleicon@insta360icon\endcsname {\simpleiconsmapsix\symbol{58}}
+ \expandafter\def\csname simpleicon@instacarticon\endcsname {\simpleiconsmapsix\symbol{59}}
+ \expandafter\def\csname simpleicon@instagramicon\endcsname {\simpleiconsmapsix\symbol{60}}
+ \expandafter\def\csname simpleicon@instapapericon\endcsname {\simpleiconsmapsix\symbol{61}}
+ \expandafter\def\csname simpleicon@instatusicon\endcsname {\simpleiconsmapsix\symbol{62}}
+ \expandafter\def\csname simpleicon@instructablesicon\endcsname {\simpleiconsmapsix\symbol{63}}
+ \expandafter\def\csname simpleicon@instructureicon\endcsname {\simpleiconsmapsix\symbol{64}}
+ \expandafter\def\csname simpleicon@intelicon\endcsname {\simpleiconsmapsix\symbol{65}}
+ \expandafter\def\csname simpleicon@intellijideaicon\endcsname {\simpleiconsmapsix\symbol{66}}
+ \expandafter\def\csname simpleicon@interactiondesignfoundationicon\endcsname {\simpleiconsmapsix\symbol{67}}
+ \expandafter\def\csname simpleicon@interactjsicon\endcsname {\simpleiconsmapsix\symbol{68}}
+ \expandafter\def\csname simpleicon@interbaseicon\endcsname {\simpleiconsmapsix\symbol{69}}
+ \expandafter\def\csname simpleicon@intercomicon\endcsname {\simpleiconsmapsix\symbol{70}}
+ \expandafter\def\csname simpleicon@intermarcheicon\endcsname {\simpleiconsmapsix\symbol{71}}
+ \expandafter\def\csname simpleicon@internetarchiveicon\endcsname {\simpleiconsmapsix\symbol{72}}
+ \expandafter\def\csname simpleicon@internetcomputericon\endcsname {\simpleiconsmapsix\symbol{73}}
+ \expandafter\def\csname simpleicon@intigritiicon\endcsname {\simpleiconsmapsix\symbol{74}}
+ \expandafter\def\csname simpleicon@intuiticon\endcsname {\simpleiconsmapsix\symbol{75}}
+ \expandafter\def\csname simpleicon@invisionicon\endcsname {\simpleiconsmapsix\symbol{76}}
+ \expandafter\def\csname simpleicon@invoiceninjaicon\endcsname {\simpleiconsmapsix\symbol{77}}
+ \expandafter\def\csname simpleicon@iobrokericon\endcsname {\simpleiconsmapsix\symbol{78}}
+ \expandafter\def\csname simpleicon@ionicicon\endcsname {\simpleiconsmapsix\symbol{79}}
+ \expandafter\def\csname simpleicon@ionosicon\endcsname {\simpleiconsmapsix\symbol{80}}
+ \expandafter\def\csname simpleicon@iosicon\endcsname {\simpleiconsmapsix\symbol{81}}
+ \expandafter\def\csname simpleicon@iotaicon\endcsname {\simpleiconsmapsix\symbol{82}}
+ \expandafter\def\csname simpleicon@ipfsicon\endcsname {\simpleiconsmapsix\symbol{83}}
+ \expandafter\def\csname simpleicon@irisicon\endcsname {\simpleiconsmapsix\symbol{84}}
+ \expandafter\def\csname simpleicon@iroboticon\endcsname {\simpleiconsmapsix\symbol{85}}
+ \expandafter\def\csname simpleicon@isc2icon\endcsname {\simpleiconsmapsix\symbol{86}}
+ \expandafter\def\csname simpleicon@issuuicon\endcsname {\simpleiconsmapsix\symbol{87}}
+ \expandafter\def\csname simpleicon@istioicon\endcsname {\simpleiconsmapsix\symbol{88}}
+ \expandafter\def\csname simpleicon@itchdotioicon\endcsname {\simpleiconsmapsix\symbol{89}}
+ \expandafter\def\csname simpleicon@iterm2icon\endcsname {\simpleiconsmapsix\symbol{90}}
+ \expandafter\def\csname simpleicon@itunesicon\endcsname {\simpleiconsmapsix\symbol{91}}
+ \expandafter\def\csname simpleicon@itvxicon\endcsname {\simpleiconsmapsix\symbol{92}}
+ \expandafter\def\csname simpleicon@ivecoicon\endcsname {\simpleiconsmapsix\symbol{93}}
+ \expandafter\def\csname simpleicon@jabbericon\endcsname {\simpleiconsmapsix\symbol{94}}
+ \expandafter\def\csname simpleicon@jaegericon\endcsname {\simpleiconsmapsix\symbol{95}}
+ \expandafter\def\csname simpleicon@jaguaricon\endcsname {\simpleiconsmapsix\symbol{96}}
+ \expandafter\def\csname simpleicon@jamboardicon\endcsname {\simpleiconsmapsix\symbol{97}}
+ \expandafter\def\csname simpleicon@jamesonicon\endcsname {\simpleiconsmapsix\symbol{98}}
+ \expandafter\def\csname simpleicon@jamstackicon\endcsname {\simpleiconsmapsix\symbol{99}}
+ \expandafter\def\csname simpleicon@jasmineicon\endcsname {\simpleiconsmapsix\symbol{100}}
+ \expandafter\def\csname simpleicon@javascripticon\endcsname {\simpleiconsmapsix\symbol{101}}
+ \expandafter\def\csname simpleicon@jblicon\endcsname {\simpleiconsmapsix\symbol{102}}
+ \expandafter\def\csname simpleicon@jcbicon\endcsname {\simpleiconsmapsix\symbol{103}}
+ \expandafter\def\csname simpleicon@jeepicon\endcsname {\simpleiconsmapsix\symbol{104}}
+ \expandafter\def\csname simpleicon@jekyllicon\endcsname {\simpleiconsmapsix\symbol{105}}
+ \expandafter\def\csname simpleicon@jellyfinicon\endcsname {\simpleiconsmapsix\symbol{106}}
+ \expandafter\def\csname simpleicon@jenkinsicon\endcsname {\simpleiconsmapsix\symbol{107}}
+ \expandafter\def\csname simpleicon@jesticon\endcsname {\simpleiconsmapsix\symbol{108}}
+ \expandafter\def\csname simpleicon@jeticon\endcsname {\simpleiconsmapsix\symbol{109}}
+ \expandafter\def\csname simpleicon@jetblueicon\endcsname {\simpleiconsmapsix\symbol{110}}
+ \expandafter\def\csname simpleicon@jetbrainsicon\endcsname {\simpleiconsmapsix\symbol{111}}
+ \expandafter\def\csname simpleicon@jetpackcomposeicon\endcsname {\simpleiconsmapsix\symbol{112}}
+ \expandafter\def\csname simpleicon@jfrogicon\endcsname {\simpleiconsmapsix\symbol{113}}
+ \expandafter\def\csname simpleicon@jfrogpipelinesicon\endcsname {\simpleiconsmapsix\symbol{114}}
+ \expandafter\def\csname simpleicon@jhipstericon\endcsname {\simpleiconsmapsix\symbol{115}}
+ \expandafter\def\csname simpleicon@jinjaicon\endcsname {\simpleiconsmapsix\symbol{116}}
+ \expandafter\def\csname simpleicon@jiraicon\endcsname {\simpleiconsmapsix\symbol{117}}
+ \expandafter\def\csname simpleicon@jirasoftwareicon\endcsname {\simpleiconsmapsix\symbol{118}}
+ \expandafter\def\csname simpleicon@jitpackicon\endcsname {\simpleiconsmapsix\symbol{119}}
+ \expandafter\def\csname simpleicon@jitsiicon\endcsname {\simpleiconsmapsix\symbol{120}}
+ \expandafter\def\csname simpleicon@johndeereicon\endcsname {\simpleiconsmapsix\symbol{121}}
+ \expandafter\def\csname simpleicon@joomlaicon\endcsname {\simpleiconsmapsix\symbol{122}}
+ \expandafter\def\csname simpleicon@joplinicon\endcsname {\simpleiconsmapsix\symbol{123}}
+ \expandafter\def\csname simpleicon@jordanicon\endcsname {\simpleiconsmapsix\symbol{124}}
+ \expandafter\def\csname simpleicon@jouavicon\endcsname {\simpleiconsmapsix\symbol{125}}
+ \expandafter\def\csname simpleicon@jovianicon\endcsname {\simpleiconsmapsix\symbol{126}}
+ \expandafter\def\csname simpleicon@jpegicon\endcsname {\simpleiconsmapsix\symbol{127}}
+ \expandafter\def\csname simpleicon@jqueryicon\endcsname {\simpleiconsmapsix\symbol{128}}
+ \expandafter\def\csname simpleicon@jrgroupicon\endcsname {\simpleiconsmapsix\symbol{129}}
+ \expandafter\def\csname simpleicon@jsdelivricon\endcsname {\simpleiconsmapsix\symbol{130}}
+ \expandafter\def\csname simpleicon@jsfiddleicon\endcsname {\simpleiconsmapsix\symbol{131}}
+ \expandafter\def\csname simpleicon@jsonicon\endcsname {\simpleiconsmapsix\symbol{132}}
+ \expandafter\def\csname simpleicon@jsonwebtokensicon\endcsname {\simpleiconsmapsix\symbol{133}}
+ \expandafter\def\csname simpleicon@jsricon\endcsname {\simpleiconsmapsix\symbol{134}}
+ \expandafter\def\csname simpleicon@jssicon\endcsname {\simpleiconsmapsix\symbol{135}}
+ \expandafter\def\csname simpleicon@juceicon\endcsname {\simpleiconsmapsix\symbol{136}}
+ \expandafter\def\csname simpleicon@juejinicon\endcsname {\simpleiconsmapsix\symbol{137}}
+ \expandafter\def\csname simpleicon@jukeicon\endcsname {\simpleiconsmapsix\symbol{138}}
+ \expandafter\def\csname simpleicon@juliaicon\endcsname {\simpleiconsmapsix\symbol{139}}
+ \expandafter\def\csname simpleicon@junipernetworksicon\endcsname {\simpleiconsmapsix\symbol{140}}
+ \expandafter\def\csname simpleicon@junit5icon\endcsname {\simpleiconsmapsix\symbol{141}}
+ \expandafter\def\csname simpleicon@jupytericon\endcsname {\simpleiconsmapsix\symbol{142}}
+ \expandafter\def\csname simpleicon@justeaticon\endcsname {\simpleiconsmapsix\symbol{143}}
+ \expandafter\def\csname simpleicon@justgivingicon\endcsname {\simpleiconsmapsix\symbol{144}}
+ \expandafter\def\csname simpleicon@k3sicon\endcsname {\simpleiconsmapsix\symbol{145}}
+ \expandafter\def\csname simpleicon@k6icon\endcsname {\simpleiconsmapsix\symbol{146}}
+ \expandafter\def\csname simpleicon@kaggleicon\endcsname {\simpleiconsmapsix\symbol{147}}
+ \expandafter\def\csname simpleicon@kagiicon\endcsname {\simpleiconsmapsix\symbol{148}}
+ \expandafter\def\csname simpleicon@kahooticon\endcsname {\simpleiconsmapsix\symbol{149}}
+ \expandafter\def\csname simpleicon@kaiosicon\endcsname {\simpleiconsmapsix\symbol{150}}
+ \expandafter\def\csname simpleicon@kakaoicon\endcsname {\simpleiconsmapsix\symbol{151}}
+ \expandafter\def\csname simpleicon@kakaotalkicon\endcsname {\simpleiconsmapsix\symbol{152}}
+ \expandafter\def\csname simpleicon@kalilinuxicon\endcsname {\simpleiconsmapsix\symbol{153}}
+ \expandafter\def\csname simpleicon@kamailioicon\endcsname {\simpleiconsmapsix\symbol{154}}
+ \expandafter\def\csname simpleicon@kanikoicon\endcsname {\simpleiconsmapsix\symbol{155}}
+ \expandafter\def\csname simpleicon@karlsruherverkehrsverbundicon\endcsname {\simpleiconsmapsix\symbol{156}}
+ \expandafter\def\csname simpleicon@kasasmarticon\endcsname {\simpleiconsmapsix\symbol{157}}
+ \expandafter\def\csname simpleicon@kashflowicon\endcsname {\simpleiconsmapsix\symbol{158}}
+ \expandafter\def\csname simpleicon@kasperskyicon\endcsname {\simpleiconsmapsix\symbol{159}}
+ \expandafter\def\csname simpleicon@katacodaicon\endcsname {\simpleiconsmapsix\symbol{160}}
+ \expandafter\def\csname simpleicon@katanaicon\endcsname {\simpleiconsmapsix\symbol{161}}
+ \expandafter\def\csname simpleicon@kauflandicon\endcsname {\simpleiconsmapsix\symbol{162}}
+ \expandafter\def\csname simpleicon@kdeicon\endcsname {\simpleiconsmapsix\symbol{163}}
+ \expandafter\def\csname simpleicon@kdenliveicon\endcsname {\simpleiconsmapsix\symbol{164}}
+ \expandafter\def\csname simpleicon@kedroicon\endcsname {\simpleiconsmapsix\symbol{165}}
+ \expandafter\def\csname simpleicon@keeneticicon\endcsname {\simpleiconsmapsix\symbol{166}}
+ \expandafter\def\csname simpleicon@keepachangelogicon\endcsname {\simpleiconsmapsix\symbol{167}}
+ \expandafter\def\csname simpleicon@keepassxcicon\endcsname {\simpleiconsmapsix\symbol{168}}
+ \expandafter\def\csname simpleicon@kenticoicon\endcsname {\simpleiconsmapsix\symbol{169}}
+ \expandafter\def\csname simpleicon@kerasicon\endcsname {\simpleiconsmapsix\symbol{170}}
+ \expandafter\def\csname simpleicon@keybaseicon\endcsname {\simpleiconsmapsix\symbol{171}}
+ \expandafter\def\csname simpleicon@keycdnicon\endcsname {\simpleiconsmapsix\symbol{172}}
+ \expandafter\def\csname simpleicon@keycloakicon\endcsname {\simpleiconsmapsix\symbol{173}}
+ \expandafter\def\csname simpleicon@keystoneicon\endcsname {\simpleiconsmapsix\symbol{174}}
+ \expandafter\def\csname simpleicon@kfcicon\endcsname {\simpleiconsmapsix\symbol{175}}
+ \expandafter\def\csname simpleicon@khanacademyicon\endcsname {\simpleiconsmapsix\symbol{176}}
+ \expandafter\def\csname simpleicon@khronosgroupicon\endcsname {\simpleiconsmapsix\symbol{177}}
+ \expandafter\def\csname simpleicon@kiaicon\endcsname {\simpleiconsmapsix\symbol{178}}
+ \expandafter\def\csname simpleicon@kibanaicon\endcsname {\simpleiconsmapsix\symbol{179}}
+ \expandafter\def\csname simpleicon@kicadicon\endcsname {\simpleiconsmapsix\symbol{180}}
+ \expandafter\def\csname simpleicon@kickicon\endcsname {\simpleiconsmapsix\symbol{181}}
+ \expandafter\def\csname simpleicon@kickstartericon\endcsname {\simpleiconsmapsix\symbol{182}}
+ \expandafter\def\csname simpleicon@kikicon\endcsname {\simpleiconsmapsix\symbol{183}}
+ \expandafter\def\csname simpleicon@kingstontechnologyicon\endcsname {\simpleiconsmapsix\symbol{184}}
+ \expandafter\def\csname simpleicon@kinopoiskicon\endcsname {\simpleiconsmapsix\symbol{185}}
+ \expandafter\def\csname simpleicon@kinstaicon\endcsname {\simpleiconsmapsix\symbol{186}}
+ \expandafter\def\csname simpleicon@kirbyicon\endcsname {\simpleiconsmapsix\symbol{187}}
+ \expandafter\def\csname simpleicon@kiticon\endcsname {\simpleiconsmapsix\symbol{188}}
+ \expandafter\def\csname simpleicon@kitsuicon\endcsname {\simpleiconsmapsix\symbol{189}}
+ \expandafter\def\csname simpleicon@klarnaicon\endcsname {\simpleiconsmapsix\symbol{190}}
+ \expandafter\def\csname simpleicon@klmicon\endcsname {\simpleiconsmapsix\symbol{191}}
+ \expandafter\def\csname simpleicon@klookicon\endcsname {\simpleiconsmapsix\symbol{192}}
+ \expandafter\def\csname simpleicon@knativeicon\endcsname {\simpleiconsmapsix\symbol{193}}
+ \expandafter\def\csname simpleicon@knexdotjsicon\endcsname {\simpleiconsmapsix\symbol{194}}
+ \expandafter\def\csname simpleicon@knimeicon\endcsname {\simpleiconsmapsix\symbol{195}}
+ \expandafter\def\csname simpleicon@knipicon\endcsname {\simpleiconsmapsix\symbol{196}}
+ \expandafter\def\csname simpleicon@knowledgebaseicon\endcsname {\simpleiconsmapsix\symbol{197}}
+ \expandafter\def\csname simpleicon@knownicon\endcsname {\simpleiconsmapsix\symbol{198}}
+ \expandafter\def\csname simpleicon@koaicon\endcsname {\simpleiconsmapsix\symbol{199}}
+ \expandafter\def\csname simpleicon@kocicon\endcsname {\simpleiconsmapsix\symbol{200}}
+ \expandafter\def\csname simpleicon@kodakicon\endcsname {\simpleiconsmapsix\symbol{201}}
+ \expandafter\def\csname simpleicon@kodiicon\endcsname {\simpleiconsmapsix\symbol{202}}
+ \expandafter\def\csname simpleicon@koenigseggicon\endcsname {\simpleiconsmapsix\symbol{203}}
+ \expandafter\def\csname simpleicon@kofaxicon\endcsname {\simpleiconsmapsix\symbol{204}}
+ \expandafter\def\csname simpleicon@kofiicon\endcsname {\simpleiconsmapsix\symbol{205}}
+ \expandafter\def\csname simpleicon@komooticon\endcsname {\simpleiconsmapsix\symbol{206}}
+ \expandafter\def\csname simpleicon@konamiicon\endcsname {\simpleiconsmapsix\symbol{207}}
+ \expandafter\def\csname simpleicon@kongicon\endcsname {\simpleiconsmapsix\symbol{208}}
+ \expandafter\def\csname simpleicon@kongregateicon\endcsname {\simpleiconsmapsix\symbol{209}}
+ \expandafter\def\csname simpleicon@konvaicon\endcsname {\simpleiconsmapsix\symbol{210}}
+ \expandafter\def\csname simpleicon@kotlinicon\endcsname {\simpleiconsmapsix\symbol{211}}
+ \expandafter\def\csname simpleicon@koyebicon\endcsname {\simpleiconsmapsix\symbol{212}}
+ \expandafter\def\csname simpleicon@kritaicon\endcsname {\simpleiconsmapsix\symbol{213}}
+ \expandafter\def\csname simpleicon@ktmicon\endcsname {\simpleiconsmapsix\symbol{214}}
+ \expandafter\def\csname simpleicon@ktoricon\endcsname {\simpleiconsmapsix\symbol{215}}
+ \expandafter\def\csname simpleicon@kuaishouicon\endcsname {\simpleiconsmapsix\symbol{216}}
+ \expandafter\def\csname simpleicon@kubernetesicon\endcsname {\simpleiconsmapsix\symbol{217}}
+ \expandafter\def\csname simpleicon@kubuntuicon\endcsname {\simpleiconsmapsix\symbol{218}}
+ \expandafter\def\csname simpleicon@kucoinicon\endcsname {\simpleiconsmapsix\symbol{219}}
+ \expandafter\def\csname simpleicon@kumaicon\endcsname {\simpleiconsmapsix\symbol{220}}
+ \expandafter\def\csname simpleicon@kununuicon\endcsname {\simpleiconsmapsix\symbol{221}}
+ \expandafter\def\csname simpleicon@kuulaicon\endcsname {\simpleiconsmapsix\symbol{222}}
+ \expandafter\def\csname simpleicon@kxicon\endcsname {\simpleiconsmapsix\symbol{223}}
+ \expandafter\def\csname simpleicon@kyoceraicon\endcsname {\simpleiconsmapsix\symbol{224}}
+ \expandafter\def\csname simpleicon@labviewicon\endcsname {\simpleiconsmapsix\symbol{225}}
+ \expandafter\def\csname simpleicon@ladaicon\endcsname {\simpleiconsmapsix\symbol{226}}
+ \expandafter\def\csname simpleicon@lamborghiniicon\endcsname {\simpleiconsmapsix\symbol{227}}
+ \expandafter\def\csname simpleicon@landrovericon\endcsname {\simpleiconsmapsix\symbol{228}}
+ \expandafter\def\csname simpleicon@langchainicon\endcsname {\simpleiconsmapsix\symbol{229}}
+ \expandafter\def\csname simpleicon@lapceicon\endcsname {\simpleiconsmapsix\symbol{230}}
+ \expandafter\def\csname simpleicon@laragonicon\endcsname {\simpleiconsmapsix\symbol{231}}
+ \expandafter\def\csname simpleicon@laravelicon\endcsname {\simpleiconsmapsix\symbol{232}}
+ \expandafter\def\csname simpleicon@laravelhorizonicon\endcsname {\simpleiconsmapsix\symbol{233}}
+ \expandafter\def\csname simpleicon@laravelnovaicon\endcsname {\simpleiconsmapsix\symbol{234}}
+ \expandafter\def\csname simpleicon@lastdotfmicon\endcsname {\simpleiconsmapsix\symbol{235}}
+ \expandafter\def\csname simpleicon@lastpassicon\endcsname {\simpleiconsmapsix\symbol{236}}
+ \expandafter\def\csname simpleicon@latexicon\endcsname {\simpleiconsmapsix\symbol{237}}
+ \expandafter\def\csname simpleicon@launchpadicon\endcsname {\simpleiconsmapsix\symbol{238}}
+ \expandafter\def\csname simpleicon@lazarusicon\endcsname {\simpleiconsmapsix\symbol{239}}
+ \expandafter\def\csname simpleicon@lazyvimicon\endcsname {\simpleiconsmapsix\symbol{240}}
+ \expandafter\def\csname simpleicon@lbryicon\endcsname {\simpleiconsmapsix\symbol{241}}
+ \expandafter\def\csname simpleicon@leaderpriceicon\endcsname {\simpleiconsmapsix\symbol{242}}
+ \expandafter\def\csname simpleicon@leafleticon\endcsname {\simpleiconsmapsix\symbol{243}}
+ \expandafter\def\csname simpleicon@leagueoflegendsicon\endcsname {\simpleiconsmapsix\symbol{244}}
+ \expandafter\def\csname simpleicon@leanpubicon\endcsname {\simpleiconsmapsix\symbol{245}}
+ \expandafter\def\csname simpleicon@leetcodeicon\endcsname {\simpleiconsmapsix\symbol{246}}
+ \expandafter\def\csname simpleicon@legacygamesicon\endcsname {\simpleiconsmapsix\symbol{247}}
+ \expandafter\def\csname simpleicon@leicaicon\endcsname {\simpleiconsmapsix\symbol{248}}
+ \expandafter\def\csname simpleicon@lemmyicon\endcsname {\simpleiconsmapsix\symbol{249}}
+ \expandafter\def\csname simpleicon@lemonsqueezyicon\endcsname {\simpleiconsmapsix\symbol{250}}
+ \expandafter\def\csname simpleicon@lenovoicon\endcsname {\simpleiconsmapsix\symbol{251}}
+ \expandafter\def\csname simpleicon@lensicon\endcsname {\simpleiconsmapsix\symbol{252}}
+ \expandafter\def\csname simpleicon@leptosicon\endcsname {\simpleiconsmapsix\symbol{253}}
+ \expandafter\def\csname simpleicon@lequipeicon\endcsname {\simpleiconsmapsix\symbol{254}}
+ \expandafter\def\csname simpleicon@lernaicon\endcsname {\simpleiconsmapsix\symbol{255}}
+ \expandafter\def\csname simpleicon@leroymerlinicon\endcsname {\simpleiconsmapseven\symbol{0}}
+ \expandafter\def\csname simpleicon@leslibrairesicon\endcsname {\simpleiconsmapseven\symbol{1}}
+ \expandafter\def\csname simpleicon@lessicon\endcsname {\simpleiconsmapseven\symbol{2}}
+ \expandafter\def\csname simpleicon@letsencrypticon\endcsname {\simpleiconsmapseven\symbol{3}}
+ \expandafter\def\csname simpleicon@letterboxdicon\endcsname {\simpleiconsmapseven\symbol{4}}
+ \expandafter\def\csname simpleicon@levelsdotfyiicon\endcsname {\simpleiconsmapseven\symbol{5}}
+ \expandafter\def\csname simpleicon@lgicon\endcsname {\simpleiconsmapseven\symbol{6}}
+ \expandafter\def\csname simpleicon@liberadotchaticon\endcsname {\simpleiconsmapseven\symbol{7}}
+ \expandafter\def\csname simpleicon@liberapayicon\endcsname {\simpleiconsmapseven\symbol{8}}
+ \expandafter\def\csname simpleicon@librariesdotioicon\endcsname {\simpleiconsmapseven\symbol{9}}
+ \expandafter\def\csname simpleicon@librarythingicon\endcsname {\simpleiconsmapseven\symbol{10}}
+ \expandafter\def\csname simpleicon@libreofficeicon\endcsname {\simpleiconsmapseven\symbol{11}}
+ \expandafter\def\csname simpleicon@libreofficebaseicon\endcsname {\simpleiconsmapseven\symbol{12}}
+ \expandafter\def\csname simpleicon@libreofficecalcicon\endcsname {\simpleiconsmapseven\symbol{13}}
+ \expandafter\def\csname simpleicon@libreofficedrawicon\endcsname {\simpleiconsmapseven\symbol{14}}
+ \expandafter\def\csname simpleicon@libreofficeimpressicon\endcsname {\simpleiconsmapseven\symbol{15}}
+ \expandafter\def\csname simpleicon@libreofficemathicon\endcsname {\simpleiconsmapseven\symbol{16}}
+ \expandafter\def\csname simpleicon@libreofficewritericon\endcsname {\simpleiconsmapseven\symbol{17}}
+ \expandafter\def\csname simpleicon@librewolficon\endcsname {\simpleiconsmapseven\symbol{18}}
+ \expandafter\def\csname simpleicon@libuvicon\endcsname {\simpleiconsmapseven\symbol{19}}
+ \expandafter\def\csname simpleicon@lichessicon\endcsname {\simpleiconsmapseven\symbol{20}}
+ \expandafter\def\csname simpleicon@lidlicon\endcsname {\simpleiconsmapseven\symbol{21}}
+ \expandafter\def\csname simpleicon@lifxicon\endcsname {\simpleiconsmapseven\symbol{22}}
+ \expandafter\def\csname simpleicon@lightburnicon\endcsname {\simpleiconsmapseven\symbol{23}}
+ \expandafter\def\csname simpleicon@lighthouseicon\endcsname {\simpleiconsmapseven\symbol{24}}
+ \expandafter\def\csname simpleicon@lightningicon\endcsname {\simpleiconsmapseven\symbol{25}}
+ \expandafter\def\csname simpleicon@limesurveyicon\endcsname {\simpleiconsmapseven\symbol{26}}
+ \expandafter\def\csname simpleicon@lineicon\endcsname {\simpleiconsmapseven\symbol{27}}
+ \expandafter\def\csname simpleicon@lineageosicon\endcsname {\simpleiconsmapseven\symbol{28}}
+ \expandafter\def\csname simpleicon@linearicon\endcsname {\simpleiconsmapseven\symbol{29}}
+ \expandafter\def\csname simpleicon@liningicon\endcsname {\simpleiconsmapseven\symbol{30}}
+ \expandafter\def\csname simpleicon@linkedinicon\endcsname {\simpleiconsmapseven\symbol{31}}
+ \expandafter\def\csname simpleicon@linkerdicon\endcsname {\simpleiconsmapseven\symbol{32}}
+ \expandafter\def\csname simpleicon@linkfireicon\endcsname {\simpleiconsmapseven\symbol{33}}
+ \expandafter\def\csname simpleicon@linksysicon\endcsname {\simpleiconsmapseven\symbol{34}}
+ \expandafter\def\csname simpleicon@linktreeicon\endcsname {\simpleiconsmapseven\symbol{35}}
+ \expandafter\def\csname simpleicon@lintcodeicon\endcsname {\simpleiconsmapseven\symbol{36}}
+ \expandafter\def\csname simpleicon@linuxicon\endcsname {\simpleiconsmapseven\symbol{37}}
+ \expandafter\def\csname simpleicon@linuxcontainersicon\endcsname {\simpleiconsmapseven\symbol{38}}
+ \expandafter\def\csname simpleicon@linuxfoundationicon\endcsname {\simpleiconsmapseven\symbol{39}}
+ \expandafter\def\csname simpleicon@linuxminticon\endcsname {\simpleiconsmapseven\symbol{40}}
+ \expandafter\def\csname simpleicon@linuxprofessionalinstituteicon\endcsname {\simpleiconsmapseven\symbol{41}}
+ \expandafter\def\csname simpleicon@linuxservericon\endcsname {\simpleiconsmapseven\symbol{42}}
+ \expandafter\def\csname simpleicon@lionairicon\endcsname {\simpleiconsmapseven\symbol{43}}
+ \expandafter\def\csname simpleicon@liquibaseicon\endcsname {\simpleiconsmapseven\symbol{44}}
+ \expandafter\def\csname simpleicon@listmonkicon\endcsname {\simpleiconsmapseven\symbol{45}}
+ \expandafter\def\csname simpleicon@liticon\endcsname {\simpleiconsmapseven\symbol{46}}
+ \expandafter\def\csname simpleicon@litecoinicon\endcsname {\simpleiconsmapseven\symbol{47}}
+ \expandafter\def\csname simpleicon@literalicon\endcsname {\simpleiconsmapseven\symbol{48}}
+ \expandafter\def\csname simpleicon@litiengineicon\endcsname {\simpleiconsmapseven\symbol{49}}
+ \expandafter\def\csname simpleicon@livechaticon\endcsname {\simpleiconsmapseven\symbol{50}}
+ \expandafter\def\csname simpleicon@livejournalicon\endcsname {\simpleiconsmapseven\symbol{51}}
+ \expandafter\def\csname simpleicon@livewireicon\endcsname {\simpleiconsmapseven\symbol{52}}
+ \expandafter\def\csname simpleicon@llvmicon\endcsname {\simpleiconsmapseven\symbol{53}}
+ \expandafter\def\csname simpleicon@lmmsicon\endcsname {\simpleiconsmapseven\symbol{54}}
+ \expandafter\def\csname simpleicon@lobstersicon\endcsname {\simpleiconsmapseven\symbol{55}}
+ \expandafter\def\csname simpleicon@localicon\endcsname {\simpleiconsmapseven\symbol{56}}
+ \expandafter\def\csname simpleicon@lodashicon\endcsname {\simpleiconsmapseven\symbol{57}}
+ \expandafter\def\csname simpleicon@logitechicon\endcsname {\simpleiconsmapseven\symbol{58}}
+ \expandafter\def\csname simpleicon@logitechgicon\endcsname {\simpleiconsmapseven\symbol{59}}
+ \expandafter\def\csname simpleicon@logmeinicon\endcsname {\simpleiconsmapseven\symbol{60}}
+ \expandafter\def\csname simpleicon@logseqicon\endcsname {\simpleiconsmapseven\symbol{61}}
+ \expandafter\def\csname simpleicon@logstashicon\endcsname {\simpleiconsmapseven\symbol{62}}
+ \expandafter\def\csname simpleicon@lookericon\endcsname {\simpleiconsmapseven\symbol{63}}
+ \expandafter\def\csname simpleicon@loomicon\endcsname {\simpleiconsmapseven\symbol{64}}
+ \expandafter\def\csname simpleicon@loopicon\endcsname {\simpleiconsmapseven\symbol{65}}
+ \expandafter\def\csname simpleicon@loopbackicon\endcsname {\simpleiconsmapseven\symbol{66}}
+ \expandafter\def\csname simpleicon@lootcrateicon\endcsname {\simpleiconsmapseven\symbol{67}}
+ \expandafter\def\csname simpleicon@lospecicon\endcsname {\simpleiconsmapseven\symbol{68}}
+ \expandafter\def\csname simpleicon@lotpolishairlinesicon\endcsname {\simpleiconsmapseven\symbol{69}}
+ \expandafter\def\csname simpleicon@ltspiceicon\endcsname {\simpleiconsmapseven\symbol{70}}
+ \expandafter\def\csname simpleicon@luaicon\endcsname {\simpleiconsmapseven\symbol{71}}
+ \expandafter\def\csname simpleicon@lubuntuicon\endcsname {\simpleiconsmapseven\symbol{72}}
+ \expandafter\def\csname simpleicon@luciaicon\endcsname {\simpleiconsmapseven\symbol{73}}
+ \expandafter\def\csname simpleicon@lucidicon\endcsname {\simpleiconsmapseven\symbol{74}}
+ \expandafter\def\csname simpleicon@ludwigicon\endcsname {\simpleiconsmapseven\symbol{75}}
+ \expandafter\def\csname simpleicon@lufthansaicon\endcsname {\simpleiconsmapseven\symbol{76}}
+ \expandafter\def\csname simpleicon@lumenicon\endcsname {\simpleiconsmapseven\symbol{77}}
+ \expandafter\def\csname simpleicon@lunacyicon\endcsname {\simpleiconsmapseven\symbol{78}}
+ \expandafter\def\csname simpleicon@lutrisicon\endcsname {\simpleiconsmapseven\symbol{79}}
+ \expandafter\def\csname simpleicon@lydiaicon\endcsname {\simpleiconsmapseven\symbol{80}}
+ \expandafter\def\csname simpleicon@lyfticon\endcsname {\simpleiconsmapseven\symbol{81}}
+ \expandafter\def\csname simpleicon@maasicon\endcsname {\simpleiconsmapseven\symbol{82}}
+ \expandafter\def\csname simpleicon@macosicon\endcsname {\simpleiconsmapseven\symbol{83}}
+ \expandafter\def\csname simpleicon@macpawicon\endcsname {\simpleiconsmapseven\symbol{84}}
+ \expandafter\def\csname simpleicon@macysicon\endcsname {\simpleiconsmapseven\symbol{85}}
+ \expandafter\def\csname simpleicon@magasinsuicon\endcsname {\simpleiconsmapseven\symbol{86}}
+ \expandafter\def\csname simpleicon@magentoicon\endcsname {\simpleiconsmapseven\symbol{87}}
+ \expandafter\def\csname simpleicon@magicicon\endcsname {\simpleiconsmapseven\symbol{88}}
+ \expandafter\def\csname simpleicon@magiskicon\endcsname {\simpleiconsmapseven\symbol{89}}
+ \expandafter\def\csname simpleicon@mahindraicon\endcsname {\simpleiconsmapseven\symbol{90}}
+ \expandafter\def\csname simpleicon@mailchimpicon\endcsname {\simpleiconsmapseven\symbol{91}}
+ \expandafter\def\csname simpleicon@maildotcomicon\endcsname {\simpleiconsmapseven\symbol{92}}
+ \expandafter\def\csname simpleicon@maildotruicon\endcsname {\simpleiconsmapseven\symbol{93}}
+ \expandafter\def\csname simpleicon@mailgunicon\endcsname {\simpleiconsmapseven\symbol{94}}
+ \expandafter\def\csname simpleicon@mailtrapicon\endcsname {\simpleiconsmapseven\symbol{95}}
+ \expandafter\def\csname simpleicon@mainwpicon\endcsname {\simpleiconsmapseven\symbol{96}}
+ \expandafter\def\csname simpleicon@majorleaguehackingicon\endcsname {\simpleiconsmapseven\symbol{97}}
+ \expandafter\def\csname simpleicon@makeicon\endcsname {\simpleiconsmapseven\symbol{98}}
+ \expandafter\def\csname simpleicon@makerboticon\endcsname {\simpleiconsmapseven\symbol{99}}
+ \expandafter\def\csname simpleicon@malticon\endcsname {\simpleiconsmapseven\symbol{100}}
+ \expandafter\def\csname simpleicon@malwarebytesicon\endcsname {\simpleiconsmapseven\symbol{101}}
+ \expandafter\def\csname simpleicon@mambauiicon\endcsname {\simpleiconsmapseven\symbol{102}}
+ \expandafter\def\csname simpleicon@mampicon\endcsname {\simpleiconsmapseven\symbol{103}}
+ \expandafter\def\csname simpleicon@manicon\endcsname {\simpleiconsmapseven\symbol{104}}
+ \expandafter\def\csname simpleicon@manageiqicon\endcsname {\simpleiconsmapseven\symbol{105}}
+ \expandafter\def\csname simpleicon@manjaroicon\endcsname {\simpleiconsmapseven\symbol{106}}
+ \expandafter\def\csname simpleicon@mantineicon\endcsname {\simpleiconsmapseven\symbol{107}}
+ \expandafter\def\csname simpleicon@mapboxicon\endcsname {\simpleiconsmapseven\symbol{108}}
+ \expandafter\def\csname simpleicon@maplibreicon\endcsname {\simpleiconsmapseven\symbol{109}}
+ \expandafter\def\csname simpleicon@mariadbicon\endcsname {\simpleiconsmapseven\symbol{110}}
+ \expandafter\def\csname simpleicon@mariadbfoundationicon\endcsname {\simpleiconsmapseven\symbol{111}}
+ \expandafter\def\csname simpleicon@markdownicon\endcsname {\simpleiconsmapseven\symbol{112}}
+ \expandafter\def\csname simpleicon@marketoicon\endcsname {\simpleiconsmapseven\symbol{113}}
+ \expandafter\def\csname simpleicon@markoicon\endcsname {\simpleiconsmapseven\symbol{114}}
+ \expandafter\def\csname simpleicon@marriotticon\endcsname {\simpleiconsmapseven\symbol{115}}
+ \expandafter\def\csname simpleicon@marvelappicon\endcsname {\simpleiconsmapseven\symbol{116}}
+ \expandafter\def\csname simpleicon@maseratiicon\endcsname {\simpleiconsmapseven\symbol{117}}
+ \expandafter\def\csname simpleicon@mastercardicon\endcsname {\simpleiconsmapseven\symbol{118}}
+ \expandafter\def\csname simpleicon@mastercomfigicon\endcsname {\simpleiconsmapseven\symbol{119}}
+ \expandafter\def\csname simpleicon@mastodonicon\endcsname {\simpleiconsmapseven\symbol{120}}
+ \expandafter\def\csname simpleicon@materialdesignicon\endcsname {\simpleiconsmapseven\symbol{121}}
+ \expandafter\def\csname simpleicon@materialdesigniconsicon\endcsname {\simpleiconsmapseven\symbol{122}}
+ \expandafter\def\csname simpleicon@materialformkdocsicon\endcsname {\simpleiconsmapseven\symbol{123}}
+ \expandafter\def\csname simpleicon@matillionicon\endcsname {\simpleiconsmapseven\symbol{124}}
+ \expandafter\def\csname simpleicon@matomoicon\endcsname {\simpleiconsmapseven\symbol{125}}
+ \expandafter\def\csname simpleicon@matrixicon\endcsname {\simpleiconsmapseven\symbol{126}}
+ \expandafter\def\csname simpleicon@matterdotjsicon\endcsname {\simpleiconsmapseven\symbol{127}}
+ \expandafter\def\csname simpleicon@mattermosticon\endcsname {\simpleiconsmapseven\symbol{128}}
+ \expandafter\def\csname simpleicon@matterneticon\endcsname {\simpleiconsmapseven\symbol{129}}
+ \expandafter\def\csname simpleicon@mauticicon\endcsname {\simpleiconsmapseven\symbol{130}}
+ \expandafter\def\csname simpleicon@maxicon\endcsname {\simpleiconsmapseven\symbol{131}}
+ \expandafter\def\csname simpleicon@maxplanckgesellschafticon\endcsname {\simpleiconsmapseven\symbol{132}}
+ \expandafter\def\csname simpleicon@maytagicon\endcsname {\simpleiconsmapseven\symbol{133}}
+ \expandafter\def\csname simpleicon@mazdaicon\endcsname {\simpleiconsmapseven\symbol{134}}
+ \expandafter\def\csname simpleicon@mcafeeicon\endcsname {\simpleiconsmapseven\symbol{135}}
+ \expandafter\def\csname simpleicon@mcdonaldsicon\endcsname {\simpleiconsmapseven\symbol{136}}
+ \expandafter\def\csname simpleicon@mclarenicon\endcsname {\simpleiconsmapseven\symbol{137}}
+ \expandafter\def\csname simpleicon@mdbookicon\endcsname {\simpleiconsmapseven\symbol{138}}
+ \expandafter\def\csname simpleicon@mdnwebdocsicon\endcsname {\simpleiconsmapseven\symbol{139}}
+ \expandafter\def\csname simpleicon@mdxicon\endcsname {\simpleiconsmapseven\symbol{140}}
+ \expandafter\def\csname simpleicon@mediafireicon\endcsname {\simpleiconsmapseven\symbol{141}}
+ \expandafter\def\csname simpleicon@mediamarkticon\endcsname {\simpleiconsmapseven\symbol{142}}
+ \expandafter\def\csname simpleicon@mediatekicon\endcsname {\simpleiconsmapseven\symbol{143}}
+ \expandafter\def\csname simpleicon@medibangpainticon\endcsname {\simpleiconsmapseven\symbol{144}}
+ \expandafter\def\csname simpleicon@mediumicon\endcsname {\simpleiconsmapseven\symbol{145}}
+ \expandafter\def\csname simpleicon@medusaicon\endcsname {\simpleiconsmapseven\symbol{146}}
+ \expandafter\def\csname simpleicon@meetupicon\endcsname {\simpleiconsmapseven\symbol{147}}
+ \expandafter\def\csname simpleicon@megaicon\endcsname {\simpleiconsmapseven\symbol{148}}
+ \expandafter\def\csname simpleicon@meilisearchicon\endcsname {\simpleiconsmapseven\symbol{149}}
+ \expandafter\def\csname simpleicon@meituanicon\endcsname {\simpleiconsmapseven\symbol{150}}
+ \expandafter\def\csname simpleicon@meizuicon\endcsname {\simpleiconsmapseven\symbol{151}}
+ \expandafter\def\csname simpleicon@mendeleyicon\endcsname {\simpleiconsmapseven\symbol{152}}
+ \expandafter\def\csname simpleicon@mentorcruiseicon\endcsname {\simpleiconsmapseven\symbol{153}}
+ \expandafter\def\csname simpleicon@mercadopagoicon\endcsname {\simpleiconsmapseven\symbol{154}}
+ \expandafter\def\csname simpleicon@mercedesicon\endcsname {\simpleiconsmapseven\symbol{155}}
+ \expandafter\def\csname simpleicon@merckicon\endcsname {\simpleiconsmapseven\symbol{156}}
+ \expandafter\def\csname simpleicon@mercurialicon\endcsname {\simpleiconsmapseven\symbol{157}}
+ \expandafter\def\csname simpleicon@mermaidicon\endcsname {\simpleiconsmapseven\symbol{158}}
+ \expandafter\def\csname simpleicon@messengericon\endcsname {\simpleiconsmapseven\symbol{159}}
+ \expandafter\def\csname simpleicon@metaicon\endcsname {\simpleiconsmapseven\symbol{160}}
+ \expandafter\def\csname simpleicon@metabaseicon\endcsname {\simpleiconsmapseven\symbol{161}}
+ \expandafter\def\csname simpleicon@metacriticicon\endcsname {\simpleiconsmapseven\symbol{162}}
+ \expandafter\def\csname simpleicon@metafiltericon\endcsname {\simpleiconsmapseven\symbol{163}}
+ \expandafter\def\csname simpleicon@metasploiticon\endcsname {\simpleiconsmapseven\symbol{164}}
+ \expandafter\def\csname simpleicon@meteoricon\endcsname {\simpleiconsmapseven\symbol{165}}
+ \expandafter\def\csname simpleicon@metroicon\endcsname {\simpleiconsmapseven\symbol{166}}
+ \expandafter\def\csname simpleicon@metrodelaciudaddemexicoicon\endcsname {\simpleiconsmapseven\symbol{167}}
+ \expandafter\def\csname simpleicon@metrodemadridicon\endcsname {\simpleiconsmapseven\symbol{168}}
+ \expandafter\def\csname simpleicon@metrodeparisicon\endcsname {\simpleiconsmapseven\symbol{169}}
+ \expandafter\def\csname simpleicon@meweicon\endcsname {\simpleiconsmapseven\symbol{170}}
+ \expandafter\def\csname simpleicon@mgicon\endcsname {\simpleiconsmapseven\symbol{171}}
+ \expandafter\def\csname simpleicon@microbiticon\endcsname {\simpleiconsmapseven\symbol{172}}
+ \expandafter\def\csname simpleicon@microdotblogicon\endcsname {\simpleiconsmapseven\symbol{173}}
+ \expandafter\def\csname simpleicon@microeditoricon\endcsname {\simpleiconsmapseven\symbol{174}}
+ \expandafter\def\csname simpleicon@microgeneticsicon\endcsname {\simpleiconsmapseven\symbol{175}}
+ \expandafter\def\csname simpleicon@micropythonicon\endcsname {\simpleiconsmapseven\symbol{176}}
+ \expandafter\def\csname simpleicon@microstationicon\endcsname {\simpleiconsmapseven\symbol{177}}
+ \expandafter\def\csname simpleicon@microstrategyicon\endcsname {\simpleiconsmapseven\symbol{178}}
+ \expandafter\def\csname simpleicon@midiicon\endcsname {\simpleiconsmapseven\symbol{179}}
+ \expandafter\def\csname simpleicon@migaduicon\endcsname {\simpleiconsmapseven\symbol{180}}
+ \expandafter\def\csname simpleicon@mikrotikicon\endcsname {\simpleiconsmapseven\symbol{181}}
+ \expandafter\def\csname simpleicon@milanoteicon\endcsname {\simpleiconsmapseven\symbol{182}}
+ \expandafter\def\csname simpleicon@milvusicon\endcsname {\simpleiconsmapseven\symbol{183}}
+ \expandafter\def\csname simpleicon@mindsicon\endcsname {\simpleiconsmapseven\symbol{184}}
+ \expandafter\def\csname simpleicon@minetesticon\endcsname {\simpleiconsmapseven\symbol{185}}
+ \expandafter\def\csname simpleicon@mingww64icon\endcsname {\simpleiconsmapseven\symbol{186}}
+ \expandafter\def\csname simpleicon@miniicon\endcsname {\simpleiconsmapseven\symbol{187}}
+ \expandafter\def\csname simpleicon@minioicon\endcsname {\simpleiconsmapseven\symbol{188}}
+ \expandafter\def\csname simpleicon@mintlifyicon\endcsname {\simpleiconsmapseven\symbol{189}}
+ \expandafter\def\csname simpleicon@minutemailericon\endcsname {\simpleiconsmapseven\symbol{190}}
+ \expandafter\def\csname simpleicon@mirahezeicon\endcsname {\simpleiconsmapseven\symbol{191}}
+ \expandafter\def\csname simpleicon@miroicon\endcsname {\simpleiconsmapseven\symbol{192}}
+ \expandafter\def\csname simpleicon@misskeyicon\endcsname {\simpleiconsmapseven\symbol{193}}
+ \expandafter\def\csname simpleicon@mitsubishiicon\endcsname {\simpleiconsmapseven\symbol{194}}
+ \expandafter\def\csname simpleicon@mixicon\endcsname {\simpleiconsmapseven\symbol{195}}
+ \expandafter\def\csname simpleicon@mixcloudicon\endcsname {\simpleiconsmapseven\symbol{196}}
+ \expandafter\def\csname simpleicon@mixpanelicon\endcsname {\simpleiconsmapseven\symbol{197}}
+ \expandafter\def\csname simpleicon@mlbicon\endcsname {\simpleiconsmapseven\symbol{198}}
+ \expandafter\def\csname simpleicon@mlflowicon\endcsname {\simpleiconsmapseven\symbol{199}}
+ \expandafter\def\csname simpleicon@mobxicon\endcsname {\simpleiconsmapseven\symbol{200}}
+ \expandafter\def\csname simpleicon@mobxstatetreeicon\endcsname {\simpleiconsmapseven\symbol{201}}
+ \expandafter\def\csname simpleicon@mochaicon\endcsname {\simpleiconsmapseven\symbol{202}}
+ \expandafter\def\csname simpleicon@mockserviceworkericon\endcsname {\simpleiconsmapseven\symbol{203}}
+ \expandafter\def\csname simpleicon@modalicon\endcsname {\simpleiconsmapseven\symbol{204}}
+ \expandafter\def\csname simpleicon@modinicon\endcsname {\simpleiconsmapseven\symbol{205}}
+ \expandafter\def\csname simpleicon@modrinthicon\endcsname {\simpleiconsmapseven\symbol{206}}
+ \expandafter\def\csname simpleicon@modxicon\endcsname {\simpleiconsmapseven\symbol{207}}
+ \expandafter\def\csname simpleicon@moleculericon\endcsname {\simpleiconsmapseven\symbol{208}}
+ \expandafter\def\csname simpleicon@momenteoicon\endcsname {\simpleiconsmapseven\symbol{209}}
+ \expandafter\def\csname simpleicon@moneroicon\endcsname {\simpleiconsmapseven\symbol{210}}
+ \expandafter\def\csname simpleicon@moneygramicon\endcsname {\simpleiconsmapseven\symbol{211}}
+ \expandafter\def\csname simpleicon@mongodbicon\endcsname {\simpleiconsmapseven\symbol{212}}
+ \expandafter\def\csname simpleicon@mongooseicon\endcsname {\simpleiconsmapseven\symbol{213}}
+ \expandafter\def\csname simpleicon@mongoosedotwsicon\endcsname {\simpleiconsmapseven\symbol{214}}
+ \expandafter\def\csname simpleicon@monicaicon\endcsname {\simpleiconsmapseven\symbol{215}}
+ \expandafter\def\csname simpleicon@monkeytieicon\endcsname {\simpleiconsmapseven\symbol{216}}
+ \expandafter\def\csname simpleicon@monkeytypeicon\endcsname {\simpleiconsmapseven\symbol{217}}
+ \expandafter\def\csname simpleicon@monogameicon\endcsname {\simpleiconsmapseven\symbol{218}}
+ \expandafter\def\csname simpleicon@monoprixicon\endcsname {\simpleiconsmapseven\symbol{219}}
+ \expandafter\def\csname simpleicon@monstericon\endcsname {\simpleiconsmapseven\symbol{220}}
+ \expandafter\def\csname simpleicon@monzoicon\endcsname {\simpleiconsmapseven\symbol{221}}
+ \expandafter\def\csname simpleicon@mooicon\endcsname {\simpleiconsmapseven\symbol{222}}
+ \expandafter\def\csname simpleicon@moodleicon\endcsname {\simpleiconsmapseven\symbol{223}}
+ \expandafter\def\csname simpleicon@moonrepoicon\endcsname {\simpleiconsmapseven\symbol{224}}
+ \expandafter\def\csname simpleicon@moqicon\endcsname {\simpleiconsmapseven\symbol{225}}
+ \expandafter\def\csname simpleicon@moqupsicon\endcsname {\simpleiconsmapseven\symbol{226}}
+ \expandafter\def\csname simpleicon@morrisonsicon\endcsname {\simpleiconsmapseven\symbol{227}}
+ \expandafter\def\csname simpleicon@moscowmetroicon\endcsname {\simpleiconsmapseven\symbol{228}}
+ \expandafter\def\csname simpleicon@motorolaicon\endcsname {\simpleiconsmapseven\symbol{229}}
+ \expandafter\def\csname simpleicon@mozillaicon\endcsname {\simpleiconsmapseven\symbol{230}}
+ \expandafter\def\csname simpleicon@mpvicon\endcsname {\simpleiconsmapseven\symbol{231}}
+ \expandafter\def\csname simpleicon@mqtticon\endcsname {\simpleiconsmapseven\symbol{232}}
+ \expandafter\def\csname simpleicon@msiicon\endcsname {\simpleiconsmapseven\symbol{233}}
+ \expandafter\def\csname simpleicon@msibusinessicon\endcsname {\simpleiconsmapseven\symbol{234}}
+ \expandafter\def\csname simpleicon@mtaicon\endcsname {\simpleiconsmapseven\symbol{235}}
+ \expandafter\def\csname simpleicon@mtricon\endcsname {\simpleiconsmapseven\symbol{236}}
+ \expandafter\def\csname simpleicon@mubiicon\endcsname {\simpleiconsmapseven\symbol{237}}
+ \expandafter\def\csname simpleicon@muiicon\endcsname {\simpleiconsmapseven\symbol{238}}
+ \expandafter\def\csname simpleicon@mulesofticon\endcsname {\simpleiconsmapseven\symbol{239}}
+ \expandafter\def\csname simpleicon@mullericon\endcsname {\simpleiconsmapseven\symbol{240}}
+ \expandafter\def\csname simpleicon@multisimicon\endcsname {\simpleiconsmapseven\symbol{241}}
+ \expandafter\def\csname simpleicon@mumbleicon\endcsname {\simpleiconsmapseven\symbol{242}}
+ \expandafter\def\csname simpleicon@muoicon\endcsname {\simpleiconsmapseven\symbol{243}}
+ \expandafter\def\csname simpleicon@muralicon\endcsname {\simpleiconsmapseven\symbol{244}}
+ \expandafter\def\csname simpleicon@musescoreicon\endcsname {\simpleiconsmapseven\symbol{245}}
+ \expandafter\def\csname simpleicon@musicbrainzicon\endcsname {\simpleiconsmapseven\symbol{246}}
+ \expandafter\def\csname simpleicon@mxlinuxicon\endcsname {\simpleiconsmapseven\symbol{247}}
+ \expandafter\def\csname simpleicon@myanimelisticon\endcsname {\simpleiconsmapseven\symbol{248}}
+ \expandafter\def\csname simpleicon@mygeticon\endcsname {\simpleiconsmapseven\symbol{249}}
+ \expandafter\def\csname simpleicon@myobicon\endcsname {\simpleiconsmapseven\symbol{250}}
+ \expandafter\def\csname simpleicon@myspaceicon\endcsname {\simpleiconsmapseven\symbol{251}}
+ \expandafter\def\csname simpleicon@mysqlicon\endcsname {\simpleiconsmapseven\symbol{252}}
+ \expandafter\def\csname simpleicon@n26icon\endcsname {\simpleiconsmapseven\symbol{253}}
+ \expandafter\def\csname simpleicon@n8nicon\endcsname {\simpleiconsmapseven\symbol{254}}
+ \expandafter\def\csname simpleicon@namebaseicon\endcsname {\simpleiconsmapseven\symbol{255}}
+ \expandafter\def\csname simpleicon@namecheapicon\endcsname {\simpleiconsmapeight\symbol{0}}
+ \expandafter\def\csname simpleicon@namemcicon\endcsname {\simpleiconsmapeight\symbol{1}}
+ \expandafter\def\csname simpleicon@namesiloicon\endcsname {\simpleiconsmapeight\symbol{2}}
+ \expandafter\def\csname simpleicon@namuwikiicon\endcsname {\simpleiconsmapeight\symbol{3}}
+ \expandafter\def\csname simpleicon@nanoicon\endcsname {\simpleiconsmapeight\symbol{4}}
+ \expandafter\def\csname simpleicon@nasaicon\endcsname {\simpleiconsmapeight\symbol{5}}
+ \expandafter\def\csname simpleicon@nationalgridicon\endcsname {\simpleiconsmapeight\symbol{6}}
+ \expandafter\def\csname simpleicon@nationalrailicon\endcsname {\simpleiconsmapeight\symbol{7}}
+ \expandafter\def\csname simpleicon@nativescripticon\endcsname {\simpleiconsmapeight\symbol{8}}
+ \expandafter\def\csname simpleicon@natsdotioicon\endcsname {\simpleiconsmapeight\symbol{9}}
+ \expandafter\def\csname simpleicon@navericon\endcsname {\simpleiconsmapeight\symbol{10}}
+ \expandafter\def\csname simpleicon@nbaicon\endcsname {\simpleiconsmapeight\symbol{11}}
+ \expandafter\def\csname simpleicon@nbbicon\endcsname {\simpleiconsmapeight\symbol{12}}
+ \expandafter\def\csname simpleicon@nbcicon\endcsname {\simpleiconsmapeight\symbol{13}}
+ \expandafter\def\csname simpleicon@ndricon\endcsname {\simpleiconsmapeight\symbol{14}}
+ \expandafter\def\csname simpleicon@nearicon\endcsname {\simpleiconsmapeight\symbol{15}}
+ \expandafter\def\csname simpleicon@necicon\endcsname {\simpleiconsmapeight\symbol{16}}
+ \expandafter\def\csname simpleicon@neo4jicon\endcsname {\simpleiconsmapeight\symbol{17}}
+ \expandafter\def\csname simpleicon@neovimicon\endcsname {\simpleiconsmapeight\symbol{18}}
+ \expandafter\def\csname simpleicon@neptuneicon\endcsname {\simpleiconsmapeight\symbol{19}}
+ \expandafter\def\csname simpleicon@nestjsicon\endcsname {\simpleiconsmapeight\symbol{20}}
+ \expandafter\def\csname simpleicon@netappicon\endcsname {\simpleiconsmapeight\symbol{21}}
+ \expandafter\def\csname simpleicon@netbsdicon\endcsname {\simpleiconsmapeight\symbol{22}}
+ \expandafter\def\csname simpleicon@netcupicon\endcsname {\simpleiconsmapeight\symbol{23}}
+ \expandafter\def\csname simpleicon@netdataicon\endcsname {\simpleiconsmapeight\symbol{24}}
+ \expandafter\def\csname simpleicon@neteasecloudmusicicon\endcsname {\simpleiconsmapeight\symbol{25}}
+ \expandafter\def\csname simpleicon@netflixicon\endcsname {\simpleiconsmapeight\symbol{26}}
+ \expandafter\def\csname simpleicon@netgearicon\endcsname {\simpleiconsmapeight\symbol{27}}
+ \expandafter\def\csname simpleicon@netlifyicon\endcsname {\simpleiconsmapeight\symbol{28}}
+ \expandafter\def\csname simpleicon@netteicon\endcsname {\simpleiconsmapeight\symbol{29}}
+ \expandafter\def\csname simpleicon@nettoicon\endcsname {\simpleiconsmapeight\symbol{30}}
+ \expandafter\def\csname simpleicon@neutralinojsicon\endcsname {\simpleiconsmapeight\symbol{31}}
+ \expandafter\def\csname simpleicon@newbalanceicon\endcsname {\simpleiconsmapeight\symbol{32}}
+ \expandafter\def\csname simpleicon@neweggicon\endcsname {\simpleiconsmapeight\symbol{33}}
+ \expandafter\def\csname simpleicon@newjapanprowrestlingicon\endcsname {\simpleiconsmapeight\symbol{34}}
+ \expandafter\def\csname simpleicon@newrelicicon\endcsname {\simpleiconsmapeight\symbol{35}}
+ \expandafter\def\csname simpleicon@newyorktimesicon\endcsname {\simpleiconsmapeight\symbol{36}}
+ \expandafter\def\csname simpleicon@nextbilliondotaiicon\endcsname {\simpleiconsmapeight\symbol{37}}
+ \expandafter\def\csname simpleicon@nextcloudicon\endcsname {\simpleiconsmapeight\symbol{38}}
+ \expandafter\def\csname simpleicon@nextdnsicon\endcsname {\simpleiconsmapeight\symbol{39}}
+ \expandafter\def\csname simpleicon@nextdooricon\endcsname {\simpleiconsmapeight\symbol{40}}
+ \expandafter\def\csname simpleicon@nextdotjsicon\endcsname {\simpleiconsmapeight\symbol{41}}
+ \expandafter\def\csname simpleicon@nextraicon\endcsname {\simpleiconsmapeight\symbol{42}}
+ \expandafter\def\csname simpleicon@nextuiicon\endcsname {\simpleiconsmapeight\symbol{43}}
+ \expandafter\def\csname simpleicon@nexusmodsicon\endcsname {\simpleiconsmapeight\symbol{44}}
+ \expandafter\def\csname simpleicon@nfcicon\endcsname {\simpleiconsmapeight\symbol{45}}
+ \expandafter\def\csname simpleicon@nginxicon\endcsname {\simpleiconsmapeight\symbol{46}}
+ \expandafter\def\csname simpleicon@nginxproxymanagericon\endcsname {\simpleiconsmapeight\symbol{47}}
+ \expandafter\def\csname simpleicon@ngrokicon\endcsname {\simpleiconsmapeight\symbol{48}}
+ \expandafter\def\csname simpleicon@ngrxicon\endcsname {\simpleiconsmapeight\symbol{49}}
+ \expandafter\def\csname simpleicon@nhlicon\endcsname {\simpleiconsmapeight\symbol{50}}
+ \expandafter\def\csname simpleicon@nicehashicon\endcsname {\simpleiconsmapeight\symbol{51}}
+ \expandafter\def\csname simpleicon@niconicoicon\endcsname {\simpleiconsmapeight\symbol{52}}
+ \expandafter\def\csname simpleicon@nikeicon\endcsname {\simpleiconsmapeight\symbol{53}}
+ \expandafter\def\csname simpleicon@nikonicon\endcsname {\simpleiconsmapeight\symbol{54}}
+ \expandafter\def\csname simpleicon@nimicon\endcsname {\simpleiconsmapeight\symbol{55}}
+ \expandafter\def\csname simpleicon@nintendoicon\endcsname {\simpleiconsmapeight\symbol{56}}
+ \expandafter\def\csname simpleicon@nintendo3dsicon\endcsname {\simpleiconsmapeight\symbol{57}}
+ \expandafter\def\csname simpleicon@nintendogamecubeicon\endcsname {\simpleiconsmapeight\symbol{58}}
+ \expandafter\def\csname simpleicon@nintendoswitchicon\endcsname {\simpleiconsmapeight\symbol{59}}
+ \expandafter\def\csname simpleicon@nissanicon\endcsname {\simpleiconsmapeight\symbol{60}}
+ \expandafter\def\csname simpleicon@nixosicon\endcsname {\simpleiconsmapeight\symbol{61}}
+ \expandafter\def\csname simpleicon@nodedotjsicon\endcsname {\simpleiconsmapeight\symbol{62}}
+ \expandafter\def\csname simpleicon@nodemonicon\endcsname {\simpleiconsmapeight\symbol{63}}
+ \expandafter\def\csname simpleicon@noderedicon\endcsname {\simpleiconsmapeight\symbol{64}}
+ \expandafter\def\csname simpleicon@nokiaicon\endcsname {\simpleiconsmapeight\symbol{65}}
+ \expandafter\def\csname simpleicon@nomadicon\endcsname {\simpleiconsmapeight\symbol{66}}
+ \expandafter\def\csname simpleicon@norcoicon\endcsname {\simpleiconsmapeight\symbol{67}}
+ \expandafter\def\csname simpleicon@nordicsemiconductoricon\endcsname {\simpleiconsmapeight\symbol{68}}
+ \expandafter\def\csname simpleicon@nordvpnicon\endcsname {\simpleiconsmapeight\symbol{69}}
+ \expandafter\def\csname simpleicon@normalizedotcssicon\endcsname {\simpleiconsmapeight\symbol{70}}
+ \expandafter\def\csname simpleicon@nortonicon\endcsname {\simpleiconsmapeight\symbol{71}}
+ \expandafter\def\csname simpleicon@norwegianicon\endcsname {\simpleiconsmapeight\symbol{72}}
+ \expandafter\def\csname simpleicon@notepadplusplusicon\endcsname {\simpleiconsmapeight\symbol{73}}
+ \expandafter\def\csname simpleicon@notionicon\endcsname {\simpleiconsmapeight\symbol{74}}
+ \expandafter\def\csname simpleicon@notisticon\endcsname {\simpleiconsmapeight\symbol{75}}
+ \expandafter\def\csname simpleicon@nounprojecticon\endcsname {\simpleiconsmapeight\symbol{76}}
+ \expandafter\def\csname simpleicon@novuicon\endcsname {\simpleiconsmapeight\symbol{77}}
+ \expandafter\def\csname simpleicon@nowicon\endcsname {\simpleiconsmapeight\symbol{78}}
+ \expandafter\def\csname simpleicon@npmicon\endcsname {\simpleiconsmapeight\symbol{79}}
+ \expandafter\def\csname simpleicon@nrwlicon\endcsname {\simpleiconsmapeight\symbol{80}}
+ \expandafter\def\csname simpleicon@nsisicon\endcsname {\simpleiconsmapeight\symbol{81}}
+ \expandafter\def\csname simpleicon@ntfyicon\endcsname {\simpleiconsmapeight\symbol{82}}
+ \expandafter\def\csname simpleicon@nubankicon\endcsname {\simpleiconsmapeight\symbol{83}}
+ \expandafter\def\csname simpleicon@nucleoicon\endcsname {\simpleiconsmapeight\symbol{84}}
+ \expandafter\def\csname simpleicon@nugeticon\endcsname {\simpleiconsmapeight\symbol{85}}
+ \expandafter\def\csname simpleicon@nukeicon\endcsname {\simpleiconsmapeight\symbol{86}}
+ \expandafter\def\csname simpleicon@numbaicon\endcsname {\simpleiconsmapeight\symbol{87}}
+ \expandafter\def\csname simpleicon@numpyicon\endcsname {\simpleiconsmapeight\symbol{88}}
+ \expandafter\def\csname simpleicon@nunjucksicon\endcsname {\simpleiconsmapeight\symbol{89}}
+ \expandafter\def\csname simpleicon@nushellicon\endcsname {\simpleiconsmapeight\symbol{90}}
+ \expandafter\def\csname simpleicon@nutanixicon\endcsname {\simpleiconsmapeight\symbol{91}}
+ \expandafter\def\csname simpleicon@nuxtdotjsicon\endcsname {\simpleiconsmapeight\symbol{92}}
+ \expandafter\def\csname simpleicon@nvidiaicon\endcsname {\simpleiconsmapeight\symbol{93}}
+ \expandafter\def\csname simpleicon@nvmicon\endcsname {\simpleiconsmapeight\symbol{94}}
+ \expandafter\def\csname simpleicon@nxicon\endcsname {\simpleiconsmapeight\symbol{95}}
+ \expandafter\def\csname simpleicon@nxpicon\endcsname {\simpleiconsmapeight\symbol{96}}
+ \expandafter\def\csname simpleicon@nzxticon\endcsname {\simpleiconsmapeight\symbol{97}}
+ \expandafter\def\csname simpleicon@observableicon\endcsname {\simpleiconsmapeight\symbol{98}}
+ \expandafter\def\csname simpleicon@obsidianicon\endcsname {\simpleiconsmapeight\symbol{99}}
+ \expandafter\def\csname simpleicon@obsstudioicon\endcsname {\simpleiconsmapeight\symbol{100}}
+ \expandafter\def\csname simpleicon@ocamlicon\endcsname {\simpleiconsmapeight\symbol{101}}
+ \expandafter\def\csname simpleicon@oclificon\endcsname {\simpleiconsmapeight\symbol{102}}
+ \expandafter\def\csname simpleicon@octanerendericon\endcsname {\simpleiconsmapeight\symbol{103}}
+ \expandafter\def\csname simpleicon@octaveicon\endcsname {\simpleiconsmapeight\symbol{104}}
+ \expandafter\def\csname simpleicon@octobercmsicon\endcsname {\simpleiconsmapeight\symbol{105}}
+ \expandafter\def\csname simpleicon@octoprinticon\endcsname {\simpleiconsmapeight\symbol{106}}
+ \expandafter\def\csname simpleicon@octopusdeployicon\endcsname {\simpleiconsmapeight\symbol{107}}
+ \expandafter\def\csname simpleicon@oculusicon\endcsname {\simpleiconsmapeight\symbol{108}}
+ \expandafter\def\csname simpleicon@odnoklassnikiicon\endcsname {\simpleiconsmapeight\symbol{109}}
+ \expandafter\def\csname simpleicon@odooicon\endcsname {\simpleiconsmapeight\symbol{110}}
+ \expandafter\def\csname simpleicon@odyseeicon\endcsname {\simpleiconsmapeight\symbol{111}}
+ \expandafter\def\csname simpleicon@ohdearicon\endcsname {\simpleiconsmapeight\symbol{112}}
+ \expandafter\def\csname simpleicon@okcupidicon\endcsname {\simpleiconsmapeight\symbol{113}}
+ \expandafter\def\csname simpleicon@oktaicon\endcsname {\simpleiconsmapeight\symbol{114}}
+ \expandafter\def\csname simpleicon@oneplusicon\endcsname {\simpleiconsmapeight\symbol{115}}
+ \expandafter\def\csname simpleicon@onlyfansicon\endcsname {\simpleiconsmapeight\symbol{116}}
+ \expandafter\def\csname simpleicon@onlyofficeicon\endcsname {\simpleiconsmapeight\symbol{117}}
+ \expandafter\def\csname simpleicon@onnxicon\endcsname {\simpleiconsmapeight\symbol{118}}
+ \expandafter\def\csname simpleicon@onstaricon\endcsname {\simpleiconsmapeight\symbol{119}}
+ \expandafter\def\csname simpleicon@opelicon\endcsname {\simpleiconsmapeight\symbol{120}}
+ \expandafter\def\csname simpleicon@openaccessicon\endcsname {\simpleiconsmapeight\symbol{121}}
+ \expandafter\def\csname simpleicon@openaiicon\endcsname {\simpleiconsmapeight\symbol{122}}
+ \expandafter\def\csname simpleicon@openaigymicon\endcsname {\simpleiconsmapeight\symbol{123}}
+ \expandafter\def\csname simpleicon@openapiinitiativeicon\endcsname {\simpleiconsmapeight\symbol{124}}
+ \expandafter\def\csname simpleicon@openbadgesicon\endcsname {\simpleiconsmapeight\symbol{125}}
+ \expandafter\def\csname simpleicon@openbsdicon\endcsname {\simpleiconsmapeight\symbol{126}}
+ \expandafter\def\csname simpleicon@openbugbountyicon\endcsname {\simpleiconsmapeight\symbol{127}}
+ \expandafter\def\csname simpleicon@opencollectiveicon\endcsname {\simpleiconsmapeight\symbol{128}}
+ \expandafter\def\csname simpleicon@opencontainersinitiativeicon\endcsname {\simpleiconsmapeight\symbol{129}}
+ \expandafter\def\csname simpleicon@opencvicon\endcsname {\simpleiconsmapeight\symbol{130}}
+ \expandafter\def\csname simpleicon@openfaasicon\endcsname {\simpleiconsmapeight\symbol{131}}
+ \expandafter\def\csname simpleicon@openglicon\endcsname {\simpleiconsmapeight\symbol{132}}
+ \expandafter\def\csname simpleicon@openhabicon\endcsname {\simpleiconsmapeight\symbol{133}}
+ \expandafter\def\csname simpleicon@openidicon\endcsname {\simpleiconsmapeight\symbol{134}}
+ \expandafter\def\csname simpleicon@openjdkicon\endcsname {\simpleiconsmapeight\symbol{135}}
+ \expandafter\def\csname simpleicon@openjsfoundationicon\endcsname {\simpleiconsmapeight\symbol{136}}
+ \expandafter\def\csname simpleicon@openlayersicon\endcsname {\simpleiconsmapeight\symbol{137}}
+ \expandafter\def\csname simpleicon@openmediavaulticon\endcsname {\simpleiconsmapeight\symbol{138}}
+ \expandafter\def\csname simpleicon@openminedicon\endcsname {\simpleiconsmapeight\symbol{139}}
+ \expandafter\def\csname simpleicon@opennebulaicon\endcsname {\simpleiconsmapeight\symbol{140}}
+ \expandafter\def\csname simpleicon@openprojecticon\endcsname {\simpleiconsmapeight\symbol{141}}
+ \expandafter\def\csname simpleicon@openscadicon\endcsname {\simpleiconsmapeight\symbol{142}}
+ \expandafter\def\csname simpleicon@openseaicon\endcsname {\simpleiconsmapeight\symbol{143}}
+ \expandafter\def\csname simpleicon@opensearchicon\endcsname {\simpleiconsmapeight\symbol{144}}
+ \expandafter\def\csname simpleicon@opensourcehardwareicon\endcsname {\simpleiconsmapeight\symbol{145}}
+ \expandafter\def\csname simpleicon@opensourceinitiativeicon\endcsname {\simpleiconsmapeight\symbol{146}}
+ \expandafter\def\csname simpleicon@opensslicon\endcsname {\simpleiconsmapeight\symbol{147}}
+ \expandafter\def\csname simpleicon@openstackicon\endcsname {\simpleiconsmapeight\symbol{148}}
+ \expandafter\def\csname simpleicon@openstreetmapicon\endcsname {\simpleiconsmapeight\symbol{149}}
+ \expandafter\def\csname simpleicon@opensuseicon\endcsname {\simpleiconsmapeight\symbol{150}}
+ \expandafter\def\csname simpleicon@opentelemetryicon\endcsname {\simpleiconsmapeight\symbol{151}}
+ \expandafter\def\csname simpleicon@opentexticon\endcsname {\simpleiconsmapeight\symbol{152}}
+ \expandafter\def\csname simpleicon@opentofuicon\endcsname {\simpleiconsmapeight\symbol{153}}
+ \expandafter\def\csname simpleicon@openverseicon\endcsname {\simpleiconsmapeight\symbol{154}}
+ \expandafter\def\csname simpleicon@openvpnicon\endcsname {\simpleiconsmapeight\symbol{155}}
+ \expandafter\def\csname simpleicon@openwrticon\endcsname {\simpleiconsmapeight\symbol{156}}
+ \expandafter\def\csname simpleicon@openzeppelinicon\endcsname {\simpleiconsmapeight\symbol{157}}
+ \expandafter\def\csname simpleicon@openzfsicon\endcsname {\simpleiconsmapeight\symbol{158}}
+ \expandafter\def\csname simpleicon@operaicon\endcsname {\simpleiconsmapeight\symbol{159}}
+ \expandafter\def\csname simpleicon@operagxicon\endcsname {\simpleiconsmapeight\symbol{160}}
+ \expandafter\def\csname simpleicon@opnsenseicon\endcsname {\simpleiconsmapeight\symbol{161}}
+ \expandafter\def\csname simpleicon@oppoicon\endcsname {\simpleiconsmapeight\symbol{162}}
+ \expandafter\def\csname simpleicon@opsgenieicon\endcsname {\simpleiconsmapeight\symbol{163}}
+ \expandafter\def\csname simpleicon@opslevelicon\endcsname {\simpleiconsmapeight\symbol{164}}
+ \expandafter\def\csname simpleicon@optimismicon\endcsname {\simpleiconsmapeight\symbol{165}}
+ \expandafter\def\csname simpleicon@oracleicon\endcsname {\simpleiconsmapeight\symbol{166}}
+ \expandafter\def\csname simpleicon@orangeicon\endcsname {\simpleiconsmapeight\symbol{167}}
+ \expandafter\def\csname simpleicon@orcidicon\endcsname {\simpleiconsmapeight\symbol{168}}
+ \expandafter\def\csname simpleicon@oreillyicon\endcsname {\simpleiconsmapeight\symbol{169}}
+ \expandafter\def\csname simpleicon@orgicon\endcsname {\simpleiconsmapeight\symbol{170}}
+ \expandafter\def\csname simpleicon@organicmapsicon\endcsname {\simpleiconsmapeight\symbol{171}}
+ \expandafter\def\csname simpleicon@originicon\endcsname {\simpleiconsmapeight\symbol{172}}
+ \expandafter\def\csname simpleicon@osanoicon\endcsname {\simpleiconsmapeight\symbol{173}}
+ \expandafter\def\csname simpleicon@osficon\endcsname {\simpleiconsmapeight\symbol{174}}
+ \expandafter\def\csname simpleicon@osgeoicon\endcsname {\simpleiconsmapeight\symbol{175}}
+ \expandafter\def\csname simpleicon@oshkoshicon\endcsname {\simpleiconsmapeight\symbol{176}}
+ \expandafter\def\csname simpleicon@osmcicon\endcsname {\simpleiconsmapeight\symbol{177}}
+ \expandafter\def\csname simpleicon@osuicon\endcsname {\simpleiconsmapeight\symbol{178}}
+ \expandafter\def\csname simpleicon@ottoicon\endcsname {\simpleiconsmapeight\symbol{179}}
+ \expandafter\def\csname simpleicon@outlineicon\endcsname {\simpleiconsmapeight\symbol{180}}
+ \expandafter\def\csname simpleicon@overcasticon\endcsname {\simpleiconsmapeight\symbol{181}}
+ \expandafter\def\csname simpleicon@overleaficon\endcsname {\simpleiconsmapeight\symbol{182}}
+ \expandafter\def\csname simpleicon@ovhicon\endcsname {\simpleiconsmapeight\symbol{183}}
+ \expandafter\def\csname simpleicon@owaspicon\endcsname {\simpleiconsmapeight\symbol{184}}
+ \expandafter\def\csname simpleicon@owncloudicon\endcsname {\simpleiconsmapeight\symbol{185}}
+ \expandafter\def\csname simpleicon@oxygenicon\endcsname {\simpleiconsmapeight\symbol{186}}
+ \expandafter\def\csname simpleicon@oyoicon\endcsname {\simpleiconsmapeight\symbol{187}}
+ \expandafter\def\csname simpleicon@p5dotjsicon\endcsname {\simpleiconsmapeight\symbol{188}}
+ \expandafter\def\csname simpleicon@packagisticon\endcsname {\simpleiconsmapeight\symbol{189}}
+ \expandafter\def\csname simpleicon@packericon\endcsname {\simpleiconsmapeight\symbol{190}}
+ \expandafter\def\csname simpleicon@packticon\endcsname {\simpleiconsmapeight\symbol{191}}
+ \expandafter\def\csname simpleicon@paddleicon\endcsname {\simpleiconsmapeight\symbol{192}}
+ \expandafter\def\csname simpleicon@paddlepaddleicon\endcsname {\simpleiconsmapeight\symbol{193}}
+ \expandafter\def\csname simpleicon@paddypowericon\endcsname {\simpleiconsmapeight\symbol{194}}
+ \expandafter\def\csname simpleicon@pagekiticon\endcsname {\simpleiconsmapeight\symbol{195}}
+ \expandafter\def\csname simpleicon@pagerdutyicon\endcsname {\simpleiconsmapeight\symbol{196}}
+ \expandafter\def\csname simpleicon@pagespeedinsightsicon\endcsname {\simpleiconsmapeight\symbol{197}}
+ \expandafter\def\csname simpleicon@pagseguroicon\endcsname {\simpleiconsmapeight\symbol{198}}
+ \expandafter\def\csname simpleicon@palantiricon\endcsname {\simpleiconsmapeight\symbol{199}}
+ \expandafter\def\csname simpleicon@paloaltonetworksicon\endcsname {\simpleiconsmapeight\symbol{200}}
+ \expandafter\def\csname simpleicon@paloaltosoftwareicon\endcsname {\simpleiconsmapeight\symbol{201}}
+ \expandafter\def\csname simpleicon@panasonicicon\endcsname {\simpleiconsmapeight\symbol{202}}
+ \expandafter\def\csname simpleicon@pandasicon\endcsname {\simpleiconsmapeight\symbol{203}}
+ \expandafter\def\csname simpleicon@pandoraicon\endcsname {\simpleiconsmapeight\symbol{204}}
+ \expandafter\def\csname simpleicon@pantheonicon\endcsname {\simpleiconsmapeight\symbol{205}}
+ \expandafter\def\csname simpleicon@paperlessngxicon\endcsname {\simpleiconsmapeight\symbol{206}}
+ \expandafter\def\csname simpleicon@paperspaceicon\endcsname {\simpleiconsmapeight\symbol{207}}
+ \expandafter\def\csname simpleicon@paperswithcodeicon\endcsname {\simpleiconsmapeight\symbol{208}}
+ \expandafter\def\csname simpleicon@paramountplusicon\endcsname {\simpleiconsmapeight\symbol{209}}
+ \expandafter\def\csname simpleicon@paritysubstrateicon\endcsname {\simpleiconsmapeight\symbol{210}}
+ \expandafter\def\csname simpleicon@parrotsecurityicon\endcsname {\simpleiconsmapeight\symbol{211}}
+ \expandafter\def\csname simpleicon@parsedotlyicon\endcsname {\simpleiconsmapeight\symbol{212}}
+ \expandafter\def\csname simpleicon@passporticon\endcsname {\simpleiconsmapeight\symbol{213}}
+ \expandafter\def\csname simpleicon@pastebinicon\endcsname {\simpleiconsmapeight\symbol{214}}
+ \expandafter\def\csname simpleicon@patreonicon\endcsname {\simpleiconsmapeight\symbol{215}}
+ \expandafter\def\csname simpleicon@paychexicon\endcsname {\simpleiconsmapeight\symbol{216}}
+ \expandafter\def\csname simpleicon@payhipicon\endcsname {\simpleiconsmapeight\symbol{217}}
+ \expandafter\def\csname simpleicon@payloadcmsicon\endcsname {\simpleiconsmapeight\symbol{218}}
+ \expandafter\def\csname simpleicon@payoneericon\endcsname {\simpleiconsmapeight\symbol{219}}
+ \expandafter\def\csname simpleicon@paypalicon\endcsname {\simpleiconsmapeight\symbol{220}}
+ \expandafter\def\csname simpleicon@paytmicon\endcsname {\simpleiconsmapeight\symbol{221}}
+ \expandafter\def\csname simpleicon@pcgamingwikiicon\endcsname {\simpleiconsmapeight\symbol{222}}
+ \expandafter\def\csname simpleicon@pdmicon\endcsname {\simpleiconsmapeight\symbol{223}}
+ \expandafter\def\csname simpleicon@pdqicon\endcsname {\simpleiconsmapeight\symbol{224}}
+ \expandafter\def\csname simpleicon@peakdesignicon\endcsname {\simpleiconsmapeight\symbol{225}}
+ \expandafter\def\csname simpleicon@pearsonicon\endcsname {\simpleiconsmapeight\symbol{226}}
+ \expandafter\def\csname simpleicon@peerlisticon\endcsname {\simpleiconsmapeight\symbol{227}}
+ \expandafter\def\csname simpleicon@peertubeicon\endcsname {\simpleiconsmapeight\symbol{228}}
+ \expandafter\def\csname simpleicon@pegasusairlinesicon\endcsname {\simpleiconsmapeight\symbol{229}}
+ \expandafter\def\csname simpleicon@pelicanicon\endcsname {\simpleiconsmapeight\symbol{230}}
+ \expandafter\def\csname simpleicon@pelotonicon\endcsname {\simpleiconsmapeight\symbol{231}}
+ \expandafter\def\csname simpleicon@pennyicon\endcsname {\simpleiconsmapeight\symbol{232}}
+ \expandafter\def\csname simpleicon@penpoticon\endcsname {\simpleiconsmapeight\symbol{233}}
+ \expandafter\def\csname simpleicon@percyicon\endcsname {\simpleiconsmapeight\symbol{234}}
+ \expandafter\def\csname simpleicon@perforceicon\endcsname {\simpleiconsmapeight\symbol{235}}
+ \expandafter\def\csname simpleicon@perlicon\endcsname {\simpleiconsmapeight\symbol{236}}
+ \expandafter\def\csname simpleicon@perplexityicon\endcsname {\simpleiconsmapeight\symbol{237}}
+ \expandafter\def\csname simpleicon@persistenticon\endcsname {\simpleiconsmapeight\symbol{238}}
+ \expandafter\def\csname simpleicon@personioicon\endcsname {\simpleiconsmapeight\symbol{239}}
+ \expandafter\def\csname simpleicon@petsathomeicon\endcsname {\simpleiconsmapeight\symbol{240}}
+ \expandafter\def\csname simpleicon@peugeoticon\endcsname {\simpleiconsmapeight\symbol{241}}
+ \expandafter\def\csname simpleicon@pexelsicon\endcsname {\simpleiconsmapeight\symbol{242}}
+ \expandafter\def\csname simpleicon@pfsenseicon\endcsname {\simpleiconsmapeight\symbol{243}}
+ \expandafter\def\csname simpleicon@phabricatoricon\endcsname {\simpleiconsmapeight\symbol{244}}
+ \expandafter\def\csname simpleicon@philipshueicon\endcsname {\simpleiconsmapeight\symbol{245}}
+ \expandafter\def\csname simpleicon@phoenixframeworkicon\endcsname {\simpleiconsmapeight\symbol{246}}
+ \expandafter\def\csname simpleicon@phonepeicon\endcsname {\simpleiconsmapeight\symbol{247}}
+ \expandafter\def\csname simpleicon@phosphoriconsicon\endcsname {\simpleiconsmapeight\symbol{248}}
+ \expandafter\def\csname simpleicon@photobucketicon\endcsname {\simpleiconsmapeight\symbol{249}}
+ \expandafter\def\csname simpleicon@photocrowdicon\endcsname {\simpleiconsmapeight\symbol{250}}
+ \expandafter\def\csname simpleicon@photonicon\endcsname {\simpleiconsmapeight\symbol{251}}
+ \expandafter\def\csname simpleicon@photopeaicon\endcsname {\simpleiconsmapeight\symbol{252}}
+ \expandafter\def\csname simpleicon@phpicon\endcsname {\simpleiconsmapeight\symbol{253}}
+ \expandafter\def\csname simpleicon@phpmyadminicon\endcsname {\simpleiconsmapeight\symbol{254}}
+ \expandafter\def\csname simpleicon@phpstormicon\endcsname {\simpleiconsmapeight\symbol{255}}
+ \expandafter\def\csname simpleicon@piaggiogroupicon\endcsname {\simpleiconsmapnine\symbol{0}}
+ \expandafter\def\csname simpleicon@piaproicon\endcsname {\simpleiconsmapnine\symbol{1}}
+ \expandafter\def\csname simpleicon@picardsurgelesicon\endcsname {\simpleiconsmapnine\symbol{2}}
+ \expandafter\def\csname simpleicon@picartodottvicon\endcsname {\simpleiconsmapnine\symbol{3}}
+ \expandafter\def\csname simpleicon@picnicicon\endcsname {\simpleiconsmapnine\symbol{4}}
+ \expandafter\def\csname simpleicon@picpayicon\endcsname {\simpleiconsmapnine\symbol{5}}
+ \expandafter\def\csname simpleicon@picrewicon\endcsname {\simpleiconsmapnine\symbol{6}}
+ \expandafter\def\csname simpleicon@picxyicon\endcsname {\simpleiconsmapnine\symbol{7}}
+ \expandafter\def\csname simpleicon@piholeicon\endcsname {\simpleiconsmapnine\symbol{8}}
+ \expandafter\def\csname simpleicon@pimcoreicon\endcsname {\simpleiconsmapnine\symbol{9}}
+ \expandafter\def\csname simpleicon@pinboardicon\endcsname {\simpleiconsmapnine\symbol{10}}
+ \expandafter\def\csname simpleicon@pinescripticon\endcsname {\simpleiconsmapnine\symbol{11}}
+ \expandafter\def\csname simpleicon@pinetworkicon\endcsname {\simpleiconsmapnine\symbol{12}}
+ \expandafter\def\csname simpleicon@pingdomicon\endcsname {\simpleiconsmapnine\symbol{13}}
+ \expandafter\def\csname simpleicon@pinoicon\endcsname {\simpleiconsmapnine\symbol{14}}
+ \expandafter\def\csname simpleicon@pinteresticon\endcsname {\simpleiconsmapnine\symbol{15}}
+ \expandafter\def\csname simpleicon@pioneerdjicon\endcsname {\simpleiconsmapnine\symbol{16}}
+ \expandafter\def\csname simpleicon@pipedicon\endcsname {\simpleiconsmapnine\symbol{17}}
+ \expandafter\def\csname simpleicon@pipxicon\endcsname {\simpleiconsmapnine\symbol{18}}
+ \expandafter\def\csname simpleicon@pivotaltrackericon\endcsname {\simpleiconsmapnine\symbol{19}}
+ \expandafter\def\csname simpleicon@piwigoicon\endcsname {\simpleiconsmapnine\symbol{20}}
+ \expandafter\def\csname simpleicon@pixicon\endcsname {\simpleiconsmapnine\symbol{21}}
+ \expandafter\def\csname simpleicon@pixabayicon\endcsname {\simpleiconsmapnine\symbol{22}}
+ \expandafter\def\csname simpleicon@pixelfedicon\endcsname {\simpleiconsmapnine\symbol{23}}
+ \expandafter\def\csname simpleicon@pixivicon\endcsname {\simpleiconsmapnine\symbol{24}}
+ \expandafter\def\csname simpleicon@pixlricon\endcsname {\simpleiconsmapnine\symbol{25}}
+ \expandafter\def\csname simpleicon@pkgsrcicon\endcsname {\simpleiconsmapnine\symbol{26}}
+ \expandafter\def\csname simpleicon@planeticon\endcsname {\simpleiconsmapnine\symbol{27}}
+ \expandafter\def\csname simpleicon@planetscaleicon\endcsname {\simpleiconsmapnine\symbol{28}}
+ \expandafter\def\csname simpleicon@plangridicon\endcsname {\simpleiconsmapnine\symbol{29}}
+ \expandafter\def\csname simpleicon@platformdotshicon\endcsname {\simpleiconsmapnine\symbol{30}}
+ \expandafter\def\csname simpleicon@platformioicon\endcsname {\simpleiconsmapnine\symbol{31}}
+ \expandafter\def\csname simpleicon@platziicon\endcsname {\simpleiconsmapnine\symbol{32}}
+ \expandafter\def\csname simpleicon@plausibleanalyticsicon\endcsname {\simpleiconsmapnine\symbol{33}}
+ \expandafter\def\csname simpleicon@playcanvasicon\endcsname {\simpleiconsmapnine\symbol{34}}
+ \expandafter\def\csname simpleicon@playerdotmeicon\endcsname {\simpleiconsmapnine\symbol{35}}
+ \expandafter\def\csname simpleicon@playerfmicon\endcsname {\simpleiconsmapnine\symbol{36}}
+ \expandafter\def\csname simpleicon@playstationicon\endcsname {\simpleiconsmapnine\symbol{37}}
+ \expandafter\def\csname simpleicon@playstation2icon\endcsname {\simpleiconsmapnine\symbol{38}}
+ \expandafter\def\csname simpleicon@playstation3icon\endcsname {\simpleiconsmapnine\symbol{39}}
+ \expandafter\def\csname simpleicon@playstation4icon\endcsname {\simpleiconsmapnine\symbol{40}}
+ \expandafter\def\csname simpleicon@playstation5icon\endcsname {\simpleiconsmapnine\symbol{41}}
+ \expandafter\def\csname simpleicon@playstationportableicon\endcsname {\simpleiconsmapnine\symbol{42}}
+ \expandafter\def\csname simpleicon@playstationvitaicon\endcsname {\simpleiconsmapnine\symbol{43}}
+ \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmapnine\symbol{44}}
+ \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmapnine\symbol{45}}
+ \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmapnine\symbol{46}}
+ \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmapnine\symbol{47}}
+ \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmapnine\symbol{48}}
+ \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmapnine\symbol{49}}
+ \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmapnine\symbol{50}}
+ \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmapnine\symbol{51}}
+ \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmapnine\symbol{52}}
+ \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmapnine\symbol{53}}
+ \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmapnine\symbol{54}}
+ \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmapnine\symbol{55}}
+ \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmapnine\symbol{56}}
+ \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmapnine\symbol{57}}
+ \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmapnine\symbol{58}}
+ \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmapnine\symbol{59}}
+ \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmapnine\symbol{60}}
+ \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmapnine\symbol{61}}
+ \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmapnine\symbol{62}}
+ \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmapnine\symbol{63}}
+ \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmapnine\symbol{64}}
+ \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmapnine\symbol{65}}
+ \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmapnine\symbol{66}}
+ \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmapnine\symbol{67}}
+ \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmapnine\symbol{68}}
+ \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmapnine\symbol{69}}
+ \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmapnine\symbol{70}}
+ \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmapnine\symbol{71}}
+ \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmapnine\symbol{72}}
+ \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmapnine\symbol{73}}
+ \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmapnine\symbol{74}}
+ \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmapnine\symbol{75}}
+ \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmapnine\symbol{76}}
+ \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmapnine\symbol{77}}
+ \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmapnine\symbol{78}}
+ \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmapnine\symbol{79}}
+ \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmapnine\symbol{80}}
+ \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmapnine\symbol{81}}
+ \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmapnine\symbol{82}}
+ \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmapnine\symbol{83}}
+ \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmapnine\symbol{84}}
+ \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmapnine\symbol{85}}
+ \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmapnine\symbol{86}}
+ \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmapnine\symbol{87}}
+ \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmapnine\symbol{88}}
+ \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmapnine\symbol{89}}
+ \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmapnine\symbol{90}}
+ \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmapnine\symbol{91}}
+ \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmapnine\symbol{92}}
+ \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmapnine\symbol{93}}
+ \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmapnine\symbol{94}}
+ \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmapnine\symbol{95}}
+ \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmapnine\symbol{96}}
+ \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmapnine\symbol{97}}
+ \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmapnine\symbol{98}}
+ \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmapnine\symbol{99}}
+ \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmapnine\symbol{100}}
+ \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmapnine\symbol{101}}
+ \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmapnine\symbol{102}}
+ \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmapnine\symbol{103}}
+ \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmapnine\symbol{104}}
+ \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmapnine\symbol{105}}
+ \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmapnine\symbol{106}}
+ \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmapnine\symbol{107}}
+ \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmapnine\symbol{108}}
+ \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmapnine\symbol{109}}
+ \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmapnine\symbol{110}}
+ \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmapnine\symbol{111}}
+ \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmapnine\symbol{112}}
+ \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmapnine\symbol{113}}
+ \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmapnine\symbol{114}}
+ \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmapnine\symbol{115}}
+ \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmapnine\symbol{116}}
+ \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmapnine\symbol{117}}
+ \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmapnine\symbol{118}}
+ \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmapnine\symbol{119}}
+ \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmapnine\symbol{120}}
+ \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmapnine\symbol{121}}
+ \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmapnine\symbol{122}}
+ \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmapnine\symbol{123}}
+ \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmapnine\symbol{124}}
+ \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmapnine\symbol{125}}
+ \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmapnine\symbol{126}}
+ \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmapnine\symbol{127}}
+ \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmapnine\symbol{128}}
+ \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmapnine\symbol{129}}
+ \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmapnine\symbol{130}}
+ \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmapnine\symbol{131}}
+ \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmapnine\symbol{132}}
+ \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmapnine\symbol{133}}
+ \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmapnine\symbol{134}}
+ \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmapnine\symbol{135}}
+ \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmapnine\symbol{136}}
+ \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmapnine\symbol{137}}
+ \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmapnine\symbol{138}}
+ \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmapnine\symbol{139}}
+ \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmapnine\symbol{140}}
+ \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmapnine\symbol{141}}
+ \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmapnine\symbol{142}}
+ \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmapnine\symbol{143}}
+ \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmapnine\symbol{144}}
+ \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmapnine\symbol{145}}
+ \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmapnine\symbol{146}}
+ \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmapnine\symbol{147}}
+ \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmapnine\symbol{148}}
+ \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmapnine\symbol{149}}
+ \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmapnine\symbol{150}}
+ \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmapnine\symbol{151}}
+ \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmapnine\symbol{152}}
+ \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmapnine\symbol{153}}
+ \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmapnine\symbol{154}}
+ \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmapnine\symbol{155}}
+ \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmapnine\symbol{156}}
+ \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmapnine\symbol{157}}
+ \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmapnine\symbol{158}}
+ \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmapnine\symbol{159}}
+ \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmapnine\symbol{160}}
+ \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmapnine\symbol{161}}
+ \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmapnine\symbol{162}}
+ \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmapnine\symbol{163}}
+ \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmapnine\symbol{164}}
+ \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmapnine\symbol{165}}
+ \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmapnine\symbol{166}}
+ \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmapnine\symbol{167}}
+ \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmapnine\symbol{168}}
+ \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmapnine\symbol{169}}
+ \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmapnine\symbol{170}}
+ \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmapnine\symbol{171}}
+ \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmapnine\symbol{172}}
+ \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmapnine\symbol{173}}
+ \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmapnine\symbol{174}}
+ \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmapnine\symbol{175}}
+ \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmapnine\symbol{176}}
+ \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmapnine\symbol{177}}
+ \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmapnine\symbol{178}}
+ \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmapnine\symbol{179}}
+ \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmapnine\symbol{180}}
+ \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmapnine\symbol{181}}
+ \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmapnine\symbol{182}}
+ \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmapnine\symbol{183}}
+ \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmapnine\symbol{184}}
+ \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmapnine\symbol{185}}
+ \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmapnine\symbol{186}}
+ \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmapnine\symbol{187}}
+ \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmapnine\symbol{188}}
+ \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmapnine\symbol{189}}
+ \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmapnine\symbol{190}}
+ \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmapnine\symbol{191}}
+ \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmapnine\symbol{192}}
+ \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmapnine\symbol{193}}
+ \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmapnine\symbol{194}}
+ \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmapnine\symbol{195}}
+ \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmapnine\symbol{196}}
+ \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmapnine\symbol{197}}
+ \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmapnine\symbol{198}}
+ \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmapnine\symbol{199}}
+ \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmapnine\symbol{200}}
+ \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmapnine\symbol{201}}
+ \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmapnine\symbol{202}}
+ \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmapnine\symbol{203}}
+ \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmapnine\symbol{204}}
+ \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmapnine\symbol{205}}
+ \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmapnine\symbol{206}}
+ \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmapnine\symbol{207}}
+ \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmapnine\symbol{208}}
+ \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmapnine\symbol{209}}
+ \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmapnine\symbol{210}}
+ \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmapnine\symbol{211}}
+ \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmapnine\symbol{212}}
+ \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmapnine\symbol{213}}
+ \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmapnine\symbol{214}}
+ \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmapnine\symbol{215}}
+ \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmapnine\symbol{216}}
+ \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmapnine\symbol{217}}
+ \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmapnine\symbol{218}}
+ \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmapnine\symbol{219}}
+ \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmapnine\symbol{220}}
+ \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmapnine\symbol{221}}
+ \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmapnine\symbol{222}}
+ \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmapnine\symbol{223}}
+ \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmapnine\symbol{224}}
+ \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmapnine\symbol{225}}
+ \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmapnine\symbol{226}}
+ \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmapnine\symbol{227}}
+ \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmapnine\symbol{228}}
+ \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmapnine\symbol{229}}
+ \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmapnine\symbol{230}}
+ \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmapnine\symbol{231}}
+ \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmapnine\symbol{232}}
+ \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmapnine\symbol{233}}
+ \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmapnine\symbol{234}}
+ \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmapnine\symbol{235}}
+ \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmapnine\symbol{236}}
+ \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmapnine\symbol{237}}
+ \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmapnine\symbol{238}}
+ \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmapnine\symbol{239}}
+ \expandafter\def\csname simpleicon@redsysicon\endcsname {\simpleiconsmapnine\symbol{240}}
+ \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmapnine\symbol{241}}
+ \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmapnine\symbol{242}}
+ \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmapnine\symbol{243}}
+ \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmapnine\symbol{244}}
+ \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmapnine\symbol{245}}
+ \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmapnine\symbol{246}}
+ \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmapnine\symbol{247}}
+ \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmapnine\symbol{248}}
+ \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmapnine\symbol{249}}
+ \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmapnine\symbol{250}}
+ \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmapnine\symbol{251}}
+ \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmapnine\symbol{252}}
+ \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmapnine\symbol{253}}
+ \expandafter\def\csname simpleicon@renovateicon\endcsname {\simpleiconsmapnine\symbol{254}}
+ \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmapnine\symbol{255}}
+ \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmaponezero\symbol{0}}
+ \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmaponezero\symbol{1}}
+ \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmaponezero\symbol{2}}
+ \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmaponezero\symbol{3}}
+ \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmaponezero\symbol{4}}
+ \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmaponezero\symbol{5}}
+ \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmaponezero\symbol{6}}
+ \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmaponezero\symbol{7}}
+ \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmaponezero\symbol{8}}
+ \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmaponezero\symbol{9}}
+ \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmaponezero\symbol{10}}
+ \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmaponezero\symbol{11}}
+ \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmaponezero\symbol{12}}
+ \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmaponezero\symbol{13}}
+ \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmaponezero\symbol{14}}
+ \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmaponezero\symbol{15}}
+ \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmaponezero\symbol{16}}
+ \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmaponezero\symbol{17}}
+ \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmaponezero\symbol{18}}
+ \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmaponezero\symbol{19}}
+ \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmaponezero\symbol{20}}
+ \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmaponezero\symbol{21}}
+ \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmaponezero\symbol{22}}
+ \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmaponezero\symbol{23}}
+ \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmaponezero\symbol{24}}
+ \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmaponezero\symbol{25}}
+ \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmaponezero\symbol{26}}
+ \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmaponezero\symbol{27}}
+ \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmaponezero\symbol{28}}
+ \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmaponezero\symbol{29}}
+ \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmaponezero\symbol{30}}
+ \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmaponezero\symbol{31}}
+ \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmaponezero\symbol{32}}
+ \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmaponezero\symbol{33}}
+ \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmaponezero\symbol{34}}
+ \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmaponezero\symbol{35}}
+ \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmaponezero\symbol{36}}
+ \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmaponezero\symbol{37}}
+ \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmaponezero\symbol{38}}
+ \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmaponezero\symbol{39}}
+ \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmaponezero\symbol{40}}
+ \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmaponezero\symbol{41}}
+ \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmaponezero\symbol{42}}
+ \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmaponezero\symbol{43}}
+ \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmaponezero\symbol{44}}
+ \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmaponezero\symbol{45}}
+ \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmaponezero\symbol{46}}
+ \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmaponezero\symbol{47}}
+ \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmaponezero\symbol{48}}
+ \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmaponezero\symbol{49}}
+ \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmaponezero\symbol{50}}
+ \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmaponezero\symbol{51}}
+ \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmaponezero\symbol{52}}
+ \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmaponezero\symbol{53}}
+ \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmaponezero\symbol{54}}
+ \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmaponezero\symbol{55}}
+ \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmaponezero\symbol{56}}
+ \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmaponezero\symbol{57}}
+ \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmaponezero\symbol{58}}
+ \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmaponezero\symbol{59}}
+ \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmaponezero\symbol{60}}
+ \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmaponezero\symbol{61}}
+ \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmaponezero\symbol{62}}
+ \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmaponezero\symbol{63}}
+ \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmaponezero\symbol{64}}
+ \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmaponezero\symbol{65}}
+ \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmaponezero\symbol{66}}
+ \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmaponezero\symbol{67}}
+ \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmaponezero\symbol{68}}
+ \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmaponezero\symbol{69}}
+ \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmaponezero\symbol{70}}
+ \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmaponezero\symbol{71}}
+ \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmaponezero\symbol{72}}
+ \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmaponezero\symbol{73}}
+ \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmaponezero\symbol{74}}
+ \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmaponezero\symbol{75}}
+ \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmaponezero\symbol{76}}
+ \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmaponezero\symbol{77}}
+ \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmaponezero\symbol{78}}
+ \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmaponezero\symbol{79}}
+ \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmaponezero\symbol{80}}
+ \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmaponezero\symbol{81}}
+ \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmaponezero\symbol{82}}
+ \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmaponezero\symbol{83}}
+ \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmaponezero\symbol{84}}
+ \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmaponezero\symbol{85}}
+ \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmaponezero\symbol{86}}
+ \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmaponezero\symbol{87}}
+ \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmaponezero\symbol{88}}
+ \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmaponezero\symbol{89}}
+ \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmaponezero\symbol{90}}
+ \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmaponezero\symbol{91}}
+ \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmaponezero\symbol{92}}
+ \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmaponezero\symbol{93}}
+ \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmaponezero\symbol{94}}
+ \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmaponezero\symbol{95}}
+ \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmaponezero\symbol{96}}
+ \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmaponezero\symbol{97}}
+ \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmaponezero\symbol{98}}
+ \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmaponezero\symbol{99}}
+ \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmaponezero\symbol{100}}
+ \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmaponezero\symbol{101}}
+ \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmaponezero\symbol{102}}
+ \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmaponezero\symbol{103}}
+ \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmaponezero\symbol{104}}
+ \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmaponezero\symbol{105}}
+ \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmaponezero\symbol{106}}
+ \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmaponezero\symbol{107}}
+ \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmaponezero\symbol{108}}
+ \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmaponezero\symbol{109}}
+ \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmaponezero\symbol{110}}
+ \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmaponezero\symbol{111}}
+ \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmaponezero\symbol{112}}
+ \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmaponezero\symbol{113}}
+ \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmaponezero\symbol{114}}
+ \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmaponezero\symbol{115}}
+ \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmaponezero\symbol{116}}
+ \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmaponezero\symbol{117}}
+ \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmaponezero\symbol{118}}
+ \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmaponezero\symbol{119}}
+ \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmaponezero\symbol{120}}
+ \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmaponezero\symbol{121}}
+ \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmaponezero\symbol{122}}
+ \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmaponezero\symbol{123}}
+ \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmaponezero\symbol{124}}
+ \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmaponezero\symbol{125}}
+ \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmaponezero\symbol{126}}
+ \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmaponezero\symbol{127}}
+ \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmaponezero\symbol{128}}
+ \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmaponezero\symbol{129}}
+ \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmaponezero\symbol{130}}
+ \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmaponezero\symbol{131}}
+ \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmaponezero\symbol{132}}
+ \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmaponezero\symbol{133}}
+ \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmaponezero\symbol{134}}
+ \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmaponezero\symbol{135}}
+ \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmaponezero\symbol{136}}
+ \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmaponezero\symbol{137}}
+ \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmaponezero\symbol{138}}
+ \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmaponezero\symbol{139}}
+ \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmaponezero\symbol{140}}
+ \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmaponezero\symbol{141}}
+ \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmaponezero\symbol{142}}
+ \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmaponezero\symbol{143}}
+ \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmaponezero\symbol{144}}
+ \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmaponezero\symbol{145}}
+ \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmaponezero\symbol{146}}
+ \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmaponezero\symbol{147}}
+ \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmaponezero\symbol{148}}
+ \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmaponezero\symbol{149}}
+ \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmaponezero\symbol{150}}
+ \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmaponezero\symbol{151}}
+ \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmaponezero\symbol{152}}
+ \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmaponezero\symbol{153}}
+ \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmaponezero\symbol{154}}
+ \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmaponezero\symbol{155}}
+ \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmaponezero\symbol{156}}
+ \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmaponezero\symbol{157}}
+ \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmaponezero\symbol{158}}
+ \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmaponezero\symbol{159}}
+ \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmaponezero\symbol{160}}
+ \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmaponezero\symbol{161}}
+ \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmaponezero\symbol{162}}
+ \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmaponezero\symbol{163}}
+ \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmaponezero\symbol{164}}
+ \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmaponezero\symbol{165}}
+ \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmaponezero\symbol{166}}
+ \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmaponezero\symbol{167}}
+ \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmaponezero\symbol{168}}
+ \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmaponezero\symbol{169}}
+ \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmaponezero\symbol{170}}
+ \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmaponezero\symbol{171}}
+ \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmaponezero\symbol{172}}
+ \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmaponezero\symbol{173}}
+ \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmaponezero\symbol{174}}
+ \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmaponezero\symbol{175}}
+ \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmaponezero\symbol{176}}
+ \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmaponezero\symbol{177}}
+ \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmaponezero\symbol{178}}
+ \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmaponezero\symbol{179}}
+ \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmaponezero\symbol{180}}
+ \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmaponezero\symbol{181}}
+ \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmaponezero\symbol{182}}
+ \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmaponezero\symbol{183}}
+ \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmaponezero\symbol{184}}
+ \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmaponezero\symbol{185}}
+ \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmaponezero\symbol{186}}
+ \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmaponezero\symbol{187}}
+ \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmaponezero\symbol{188}}
+ \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmaponezero\symbol{189}}
+ \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmaponezero\symbol{190}}
+ \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmaponezero\symbol{191}}
+ \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmaponezero\symbol{192}}
+ \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmaponezero\symbol{193}}
+ \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmaponezero\symbol{194}}
+ \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmaponezero\symbol{195}}
+ \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmaponezero\symbol{196}}
+ \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmaponezero\symbol{197}}
+ \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmaponezero\symbol{198}}
+ \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmaponezero\symbol{199}}
+ \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmaponezero\symbol{200}}
+ \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmaponezero\symbol{201}}
+ \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmaponezero\symbol{202}}
+ \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmaponezero\symbol{203}}
+ \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmaponezero\symbol{204}}
+ \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmaponezero\symbol{205}}
+ \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmaponezero\symbol{206}}
+ \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmaponezero\symbol{207}}
+ \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmaponezero\symbol{208}}
+ \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmaponezero\symbol{209}}
+ \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmaponezero\symbol{210}}
+ \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmaponezero\symbol{211}}
+ \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmaponezero\symbol{212}}
+ \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmaponezero\symbol{213}}
+ \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmaponezero\symbol{214}}
+ \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmaponezero\symbol{215}}
+ \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmaponezero\symbol{216}}
+ \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmaponezero\symbol{217}}
+ \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmaponezero\symbol{218}}
+ \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmaponezero\symbol{219}}
+ \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmaponezero\symbol{220}}
+ \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmaponezero\symbol{221}}
+ \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmaponezero\symbol{222}}
+ \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmaponezero\symbol{223}}
+ \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmaponezero\symbol{224}}
+ \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmaponezero\symbol{225}}
+ \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmaponezero\symbol{226}}
+ \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmaponezero\symbol{227}}
+ \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmaponezero\symbol{228}}
+ \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmaponezero\symbol{229}}
+ \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmaponezero\symbol{230}}
+ \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmaponezero\symbol{231}}
+ \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmaponezero\symbol{232}}
+ \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmaponezero\symbol{233}}
+ \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmaponezero\symbol{234}}
+ \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmaponezero\symbol{235}}
+ \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmaponezero\symbol{236}}
+ \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmaponezero\symbol{237}}
+ \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmaponezero\symbol{238}}
+ \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmaponezero\symbol{239}}
+ \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmaponezero\symbol{240}}
+ \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmaponezero\symbol{241}}
+ \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmaponezero\symbol{242}}
+ \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmaponezero\symbol{243}}
+ \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmaponezero\symbol{244}}
+ \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmaponezero\symbol{245}}
+ \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmaponezero\symbol{246}}
+ \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmaponezero\symbol{247}}
+ \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmaponezero\symbol{248}}
+ \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmaponezero\symbol{249}}
+ \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmaponezero\symbol{250}}
+ \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmaponezero\symbol{251}}
+ \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmaponezero\symbol{252}}
+ \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmaponezero\symbol{253}}
+ \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmaponezero\symbol{254}}
+ \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmaponezero\symbol{255}}
+ \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmaponeone\symbol{0}}
+ \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmaponeone\symbol{1}}
+ \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmaponeone\symbol{2}}
+ \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmaponeone\symbol{3}}
+ \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmaponeone\symbol{4}}
+ \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmaponeone\symbol{5}}
+ \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmaponeone\symbol{6}}
+ \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmaponeone\symbol{7}}
+ \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmaponeone\symbol{8}}
+ \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmaponeone\symbol{9}}
+ \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmaponeone\symbol{10}}
+ \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmaponeone\symbol{11}}
+ \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmaponeone\symbol{12}}
+ \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmaponeone\symbol{13}}
+ \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmaponeone\symbol{14}}
+ \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmaponeone\symbol{15}}
+ \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmaponeone\symbol{16}}
+ \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmaponeone\symbol{17}}
+ \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmaponeone\symbol{18}}
+ \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmaponeone\symbol{19}}
+ \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmaponeone\symbol{20}}
+ \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmaponeone\symbol{21}}
+ \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmaponeone\symbol{22}}
+ \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmaponeone\symbol{23}}
+ \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmaponeone\symbol{24}}
+ \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmaponeone\symbol{25}}
+ \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmaponeone\symbol{26}}
+ \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmaponeone\symbol{27}}
+ \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmaponeone\symbol{28}}
+ \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmaponeone\symbol{29}}
+ \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmaponeone\symbol{30}}
+ \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmaponeone\symbol{31}}
+ \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmaponeone\symbol{32}}
+ \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmaponeone\symbol{33}}
+ \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmaponeone\symbol{34}}
+ \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmaponeone\symbol{35}}
+ \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmaponeone\symbol{36}}
+ \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmaponeone\symbol{37}}
+ \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmaponeone\symbol{38}}
+ \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmaponeone\symbol{39}}
+ \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmaponeone\symbol{40}}
+ \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmaponeone\symbol{41}}
+ \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmaponeone\symbol{42}}
+ \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmaponeone\symbol{43}}
+ \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmaponeone\symbol{44}}
+ \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmaponeone\symbol{45}}
+ \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmaponeone\symbol{46}}
+ \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmaponeone\symbol{47}}
+ \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmaponeone\symbol{48}}
+ \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmaponeone\symbol{49}}
+ \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmaponeone\symbol{50}}
+ \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmaponeone\symbol{51}}
+ \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmaponeone\symbol{52}}
+ \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmaponeone\symbol{53}}
+ \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmaponeone\symbol{54}}
+ \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmaponeone\symbol{55}}
+ \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmaponeone\symbol{56}}
+ \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmaponeone\symbol{57}}
+ \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmaponeone\symbol{58}}
+ \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmaponeone\symbol{59}}
+ \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmaponeone\symbol{60}}
+ \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmaponeone\symbol{61}}
+ \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmaponeone\symbol{62}}
+ \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmaponeone\symbol{63}}
+ \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmaponeone\symbol{64}}
+ \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmaponeone\symbol{65}}
+ \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmaponeone\symbol{66}}
+ \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmaponeone\symbol{67}}
+ \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmaponeone\symbol{68}}
+ \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmaponeone\symbol{69}}
+ \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmaponeone\symbol{70}}
+ \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmaponeone\symbol{71}}
+ \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmaponeone\symbol{72}}
+ \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmaponeone\symbol{73}}
+ \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmaponeone\symbol{74}}
+ \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmaponeone\symbol{75}}
+ \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmaponeone\symbol{76}}
+ \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmaponeone\symbol{77}}
+ \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmaponeone\symbol{78}}
+ \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmaponeone\symbol{79}}
+ \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmaponeone\symbol{80}}
+ \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmaponeone\symbol{81}}
+ \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmaponeone\symbol{82}}
+ \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmaponeone\symbol{83}}
+ \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmaponeone\symbol{84}}
+ \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmaponeone\symbol{85}}
+ \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmaponeone\symbol{86}}
+ \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmaponeone\symbol{87}}
+ \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmaponeone\symbol{88}}
+ \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmaponeone\symbol{89}}
+ \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmaponeone\symbol{90}}
+ \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmaponeone\symbol{91}}
+ \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmaponeone\symbol{92}}
+ \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmaponeone\symbol{93}}
+ \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmaponeone\symbol{94}}
+ \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmaponeone\symbol{95}}
+ \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmaponeone\symbol{96}}
+ \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmaponeone\symbol{97}}
+ \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmaponeone\symbol{98}}
+ \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmaponeone\symbol{99}}
+ \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmaponeone\symbol{100}}
+ \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmaponeone\symbol{101}}
+ \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmaponeone\symbol{102}}
+ \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmaponeone\symbol{103}}
+ \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmaponeone\symbol{104}}
+ \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmaponeone\symbol{105}}
+ \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmaponeone\symbol{106}}
+ \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmaponeone\symbol{107}}
+ \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmaponeone\symbol{108}}
+ \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmaponeone\symbol{109}}
+ \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmaponeone\symbol{110}}
+ \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmaponeone\symbol{111}}
+ \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmaponeone\symbol{112}}
+ \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmaponeone\symbol{113}}
+ \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmaponeone\symbol{114}}
+ \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmaponeone\symbol{115}}
+ \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmaponeone\symbol{116}}
+ \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmaponeone\symbol{117}}
+ \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmaponeone\symbol{118}}
+ \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmaponeone\symbol{119}}
+ \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmaponeone\symbol{120}}
+ \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmaponeone\symbol{121}}
+ \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmaponeone\symbol{122}}
+ \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmaponeone\symbol{123}}
+ \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmaponeone\symbol{124}}
+ \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmaponeone\symbol{125}}
+ \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmaponeone\symbol{126}}
+ \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmaponeone\symbol{127}}
+ \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmaponeone\symbol{128}}
+ \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmaponeone\symbol{129}}
+ \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmaponeone\symbol{130}}
+ \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmaponeone\symbol{131}}
+ \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmaponeone\symbol{132}}
+ \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmaponeone\symbol{133}}
+ \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmaponeone\symbol{134}}
+ \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmaponeone\symbol{135}}
+ \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmaponeone\symbol{136}}
+ \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmaponeone\symbol{137}}
+ \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmaponeone\symbol{138}}
+ \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmaponeone\symbol{139}}
+ \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmaponeone\symbol{140}}
+ \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmaponeone\symbol{141}}
+ \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmaponeone\symbol{142}}
+ \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmaponeone\symbol{143}}
+ \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmaponeone\symbol{144}}
+ \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmaponeone\symbol{145}}
+ \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmaponeone\symbol{146}}
+ \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmaponeone\symbol{147}}
+ \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmaponeone\symbol{148}}
+ \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmaponeone\symbol{149}}
+ \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmaponeone\symbol{150}}
+ \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmaponeone\symbol{151}}
+ \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmaponeone\symbol{152}}
+ \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmaponeone\symbol{153}}
+ \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmaponeone\symbol{154}}
+ \expandafter\def\csname simpleicon@techcrunchicon\endcsname {\simpleiconsmaponeone\symbol{155}}
+ \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmaponeone\symbol{156}}
+ \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmaponeone\symbol{157}}
+ \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmaponeone\symbol{158}}
+ \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmaponeone\symbol{159}}
+ \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmaponeone\symbol{160}}
+ \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmaponeone\symbol{161}}
+ \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmaponeone\symbol{162}}
+ \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmaponeone\symbol{163}}
+ \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmaponeone\symbol{164}}
+ \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmaponeone\symbol{165}}
+ \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmaponeone\symbol{166}}
+ \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmaponeone\symbol{167}}
+ \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmaponeone\symbol{168}}
+ \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmaponeone\symbol{169}}
+ \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmaponeone\symbol{170}}
+ \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmaponeone\symbol{171}}
+ \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmaponeone\symbol{172}}
+ \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmaponeone\symbol{173}}
+ \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmaponeone\symbol{174}}
+ \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmaponeone\symbol{175}}
+ \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmaponeone\symbol{176}}
+ \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmaponeone\symbol{177}}
+ \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmaponeone\symbol{178}}
+ \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmaponeone\symbol{179}}
+ \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmaponeone\symbol{180}}
+ \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmaponeone\symbol{181}}
+ \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmaponeone\symbol{182}}
+ \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmaponeone\symbol{183}}
+ \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmaponeone\symbol{184}}
+ \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmaponeone\symbol{185}}
+ \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmaponeone\symbol{186}}
+ \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmaponeone\symbol{187}}
+ \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmaponeone\symbol{188}}
+ \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmaponeone\symbol{189}}
+ \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmaponeone\symbol{190}}
+ \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmaponeone\symbol{191}}
+ \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmaponeone\symbol{192}}
+ \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmaponeone\symbol{193}}
+ \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmaponeone\symbol{194}}
+ \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmaponeone\symbol{195}}
+ \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmaponeone\symbol{196}}
+ \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmaponeone\symbol{197}}
+ \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmaponeone\symbol{198}}
+ \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmaponeone\symbol{199}}
+ \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmaponeone\symbol{200}}
+ \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmaponeone\symbol{201}}
+ \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmaponeone\symbol{202}}
+ \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmaponeone\symbol{203}}
+ \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmaponeone\symbol{204}}
+ \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmaponeone\symbol{205}}
+ \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmaponeone\symbol{206}}
+ \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmaponeone\symbol{207}}
+ \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmaponeone\symbol{208}}
+ \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmaponeone\symbol{209}}
+ \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmaponeone\symbol{210}}
+ \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmaponeone\symbol{211}}
+ \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmaponeone\symbol{212}}
+ \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmaponeone\symbol{213}}
+ \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmaponeone\symbol{214}}
+ \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmaponeone\symbol{215}}
+ \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmaponeone\symbol{216}}
+ \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmaponeone\symbol{217}}
+ \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmaponeone\symbol{218}}
+ \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmaponeone\symbol{219}}
+ \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmaponeone\symbol{220}}
+ \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmaponeone\symbol{221}}
+ \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmaponeone\symbol{222}}
+ \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmaponeone\symbol{223}}
+ \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmaponeone\symbol{224}}
+ \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmaponeone\symbol{225}}
+ \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmaponeone\symbol{226}}
+ \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmaponeone\symbol{227}}
+ \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmaponeone\symbol{228}}
+ \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmaponeone\symbol{229}}
+ \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmaponeone\symbol{230}}
+ \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmaponeone\symbol{231}}
+ \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmaponeone\symbol{232}}
+ \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmaponeone\symbol{233}}
+ \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmaponeone\symbol{234}}
+ \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmaponeone\symbol{235}}
+ \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmaponeone\symbol{236}}
+ \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmaponeone\symbol{237}}
+ \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmaponeone\symbol{238}}
+ \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmaponeone\symbol{239}}
+ \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmaponeone\symbol{240}}
+ \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmaponeone\symbol{241}}
+ \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmaponeone\symbol{242}}
+ \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmaponeone\symbol{243}}
+ \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmaponeone\symbol{244}}
+ \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmaponeone\symbol{245}}
+ \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmaponeone\symbol{246}}
+ \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmaponeone\symbol{247}}
+ \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmaponeone\symbol{248}}
+ \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmaponeone\symbol{249}}
+ \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmaponeone\symbol{250}}
+ \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmaponeone\symbol{251}}
+ \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmaponeone\symbol{252}}
+ \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmaponeone\symbol{253}}
+ \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmaponeone\symbol{254}}
+ \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmaponeone\symbol{255}}
+ \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmaponetwo\symbol{0}}
+ \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmaponetwo\symbol{1}}
+ \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmaponetwo\symbol{2}}
+ \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmaponetwo\symbol{3}}
+ \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmaponetwo\symbol{4}}
+ \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmaponetwo\symbol{5}}
+ \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmaponetwo\symbol{6}}
+ \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmaponetwo\symbol{7}}
+ \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmaponetwo\symbol{8}}
+ \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmaponetwo\symbol{9}}
+ \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmaponetwo\symbol{10}}
+ \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmaponetwo\symbol{11}}
+ \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmaponetwo\symbol{12}}
+ \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmaponetwo\symbol{13}}
+ \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmaponetwo\symbol{14}}
+ \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmaponetwo\symbol{15}}
+ \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmaponetwo\symbol{16}}
+ \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmaponetwo\symbol{17}}
+ \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmaponetwo\symbol{18}}
+ \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmaponetwo\symbol{19}}
+ \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmaponetwo\symbol{20}}
+ \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmaponetwo\symbol{21}}
+ \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmaponetwo\symbol{22}}
+ \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmaponetwo\symbol{23}}
+ \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmaponetwo\symbol{24}}
+ \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmaponetwo\symbol{25}}
+ \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmaponetwo\symbol{26}}
+ \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmaponetwo\symbol{27}}
+ \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmaponetwo\symbol{28}}
+ \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmaponetwo\symbol{29}}
+ \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmaponetwo\symbol{30}}
+ \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmaponetwo\symbol{31}}
+ \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmaponetwo\symbol{32}}
+ \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmaponetwo\symbol{33}}
+ \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{34}}
+ \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmaponetwo\symbol{35}}
+ \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmaponetwo\symbol{36}}
+ \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmaponetwo\symbol{37}}
+ \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmaponetwo\symbol{38}}
+ \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmaponetwo\symbol{39}}
+ \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmaponetwo\symbol{40}}
+ \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmaponetwo\symbol{41}}
+ \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmaponetwo\symbol{42}}
+ \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmaponetwo\symbol{43}}
+ \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmaponetwo\symbol{44}}
+ \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmaponetwo\symbol{45}}
+ \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmaponetwo\symbol{46}}
+ \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmaponetwo\symbol{47}}
+ \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmaponetwo\symbol{48}}
+ \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmaponetwo\symbol{49}}
+ \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmaponetwo\symbol{50}}
+ \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmaponetwo\symbol{51}}
+ \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmaponetwo\symbol{52}}
+ \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmaponetwo\symbol{53}}
+ \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmaponetwo\symbol{54}}
+ \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmaponetwo\symbol{55}}
+ \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmaponetwo\symbol{56}}
+ \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmaponetwo\symbol{57}}
+ \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmaponetwo\symbol{58}}
+ \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmaponetwo\symbol{59}}
+ \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmaponetwo\symbol{60}}
+ \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmaponetwo\symbol{61}}
+ \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmaponetwo\symbol{62}}
+ \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmaponetwo\symbol{63}}
+ \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmaponetwo\symbol{64}}
+ \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmaponetwo\symbol{65}}
+ \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmaponetwo\symbol{66}}
+ \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmaponetwo\symbol{67}}
+ \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmaponetwo\symbol{68}}
+ \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmaponetwo\symbol{69}}
+ \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmaponetwo\symbol{70}}
+ \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmaponetwo\symbol{71}}
+ \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmaponetwo\symbol{72}}
+ \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{73}}
+ \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmaponetwo\symbol{74}}
+ \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmaponetwo\symbol{75}}
+ \expandafter\def\csname simpleicon@unjsicon\endcsname {\simpleiconsmaponetwo\symbol{76}}
+ \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmaponetwo\symbol{77}}
+ \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmaponetwo\symbol{78}}
+ \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmaponetwo\symbol{79}}
+ \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmaponetwo\symbol{80}}
+ \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmaponetwo\symbol{81}}
+ \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmaponetwo\symbol{82}}
+ \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmaponetwo\symbol{83}}
+ \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmaponetwo\symbol{84}}
+ \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmaponetwo\symbol{85}}
+ \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmaponetwo\symbol{86}}
+ \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmaponetwo\symbol{87}}
+ \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmaponetwo\symbol{88}}
+ \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmaponetwo\symbol{89}}
+ \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmaponetwo\symbol{90}}
+ \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmaponetwo\symbol{91}}
+ \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmaponetwo\symbol{92}}
+ \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmaponetwo\symbol{93}}
+ \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmaponetwo\symbol{94}}
+ \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmaponetwo\symbol{95}}
+ \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmaponetwo\symbol{96}}
+ \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmaponetwo\symbol{97}}
+ \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmaponetwo\symbol{98}}
+ \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmaponetwo\symbol{99}}
+ \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmaponetwo\symbol{100}}
+ \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmaponetwo\symbol{101}}
+ \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmaponetwo\symbol{102}}
+ \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmaponetwo\symbol{103}}
+ \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmaponetwo\symbol{104}}
+ \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmaponetwo\symbol{105}}
+ \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmaponetwo\symbol{106}}
+ \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmaponetwo\symbol{107}}
+ \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmaponetwo\symbol{108}}
+ \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmaponetwo\symbol{109}}
+ \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmaponetwo\symbol{110}}
+ \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmaponetwo\symbol{111}}
+ \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmaponetwo\symbol{112}}
+ \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmaponetwo\symbol{113}}
+ \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmaponetwo\symbol{114}}
+ \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmaponetwo\symbol{115}}
+ \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmaponetwo\symbol{116}}
+ \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmaponetwo\symbol{117}}
+ \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmaponetwo\symbol{118}}
+ \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmaponetwo\symbol{119}}
+ \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmaponetwo\symbol{120}}
+ \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmaponetwo\symbol{121}}
+ \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmaponetwo\symbol{122}}
+ \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmaponetwo\symbol{123}}
+ \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmaponetwo\symbol{124}}
+ \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmaponetwo\symbol{125}}
+ \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmaponetwo\symbol{126}}
+ \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmaponetwo\symbol{127}}
+ \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmaponetwo\symbol{128}}
+ \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmaponetwo\symbol{129}}
+ \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmaponetwo\symbol{130}}
+ \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmaponetwo\symbol{131}}
+ \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmaponetwo\symbol{132}}
+ \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmaponetwo\symbol{133}}
+ \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmaponetwo\symbol{134}}
+ \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmaponetwo\symbol{135}}
+ \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmaponetwo\symbol{136}}
+ \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmaponetwo\symbol{137}}
+ \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmaponetwo\symbol{138}}
+ \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmaponetwo\symbol{139}}
+ \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmaponetwo\symbol{140}}
+ \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmaponetwo\symbol{141}}
+ \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmaponetwo\symbol{142}}
+ \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmaponetwo\symbol{143}}
+ \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmaponetwo\symbol{144}}
+ \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmaponetwo\symbol{145}}
+ \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmaponetwo\symbol{146}}
+ \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmaponetwo\symbol{147}}
+ \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmaponetwo\symbol{148}}
+ \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmaponetwo\symbol{149}}
+ \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmaponetwo\symbol{150}}
+ \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmaponetwo\symbol{151}}
+ \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmaponetwo\symbol{152}}
+ \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmaponetwo\symbol{153}}
+ \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmaponetwo\symbol{154}}
+ \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmaponetwo\symbol{155}}
+ \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmaponetwo\symbol{156}}
+ \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmaponetwo\symbol{157}}
+ \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmaponetwo\symbol{158}}
+ \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmaponetwo\symbol{159}}
+ \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmaponetwo\symbol{160}}
+ \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmaponetwo\symbol{161}}
+ \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmaponetwo\symbol{162}}
+ \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmaponetwo\symbol{163}}
+ \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmaponetwo\symbol{164}}
+ \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmaponetwo\symbol{165}}
+ \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmaponetwo\symbol{166}}
+ \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmaponetwo\symbol{167}}
+ \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmaponetwo\symbol{168}}
+ \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmaponetwo\symbol{169}}
+ \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmaponetwo\symbol{170}}
+ \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmaponetwo\symbol{171}}
+ \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmaponetwo\symbol{172}}
+ \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmaponetwo\symbol{173}}
+ \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmaponetwo\symbol{174}}
+ \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmaponetwo\symbol{175}}
+ \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmaponetwo\symbol{176}}
+ \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmaponetwo\symbol{177}}
+ \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmaponetwo\symbol{178}}
+ \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmaponetwo\symbol{179}}
+ \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmaponetwo\symbol{180}}
+ \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmaponetwo\symbol{181}}
+ \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmaponetwo\symbol{182}}
+ \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmaponetwo\symbol{183}}
+ \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmaponetwo\symbol{184}}
+ \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmaponetwo\symbol{185}}
+ \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmaponetwo\symbol{186}}
+ \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmaponetwo\symbol{187}}
+ \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmaponetwo\symbol{188}}
+ \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmaponetwo\symbol{189}}
+ \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmaponetwo\symbol{190}}
+ \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmaponetwo\symbol{191}}
+ \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmaponetwo\symbol{192}}
+ \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmaponetwo\symbol{193}}
+ \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmaponetwo\symbol{194}}
+ \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmaponetwo\symbol{195}}
+ \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmaponetwo\symbol{196}}
+ \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmaponetwo\symbol{197}}
+ \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmaponetwo\symbol{198}}
+ \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmaponetwo\symbol{199}}
+ \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmaponetwo\symbol{200}}
+ \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmaponetwo\symbol{201}}
+ \expandafter\def\csname simpleicon@webgpuicon\endcsname {\simpleiconsmaponetwo\symbol{202}}
+ \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmaponetwo\symbol{203}}
+ \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmaponetwo\symbol{204}}
+ \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmaponetwo\symbol{205}}
+ \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmaponetwo\symbol{206}}
+ \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmaponetwo\symbol{207}}
+ \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmaponetwo\symbol{208}}
+ \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmaponetwo\symbol{209}}
+ \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmaponetwo\symbol{210}}
+ \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmaponetwo\symbol{211}}
+ \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmaponetwo\symbol{212}}
+ \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmaponetwo\symbol{213}}
+ \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmaponetwo\symbol{214}}
+ \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmaponetwo\symbol{215}}
+ \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmaponetwo\symbol{216}}
+ \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmaponetwo\symbol{217}}
+ \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmaponetwo\symbol{218}}
+ \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmaponetwo\symbol{219}}
+ \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmaponetwo\symbol{220}}
+ \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmaponetwo\symbol{221}}
+ \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmaponetwo\symbol{222}}
+ \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmaponetwo\symbol{223}}
+ \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmaponetwo\symbol{224}}
+ \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmaponetwo\symbol{225}}
+ \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmaponetwo\symbol{226}}
+ \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmaponetwo\symbol{227}}
+ \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmaponetwo\symbol{228}}
+ \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmaponetwo\symbol{229}}
+ \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmaponetwo\symbol{230}}
+ \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmaponetwo\symbol{231}}
+ \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmaponetwo\symbol{232}}
+ \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmaponetwo\symbol{233}}
+ \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmaponetwo\symbol{234}}
+ \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmaponetwo\symbol{235}}
+ \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmaponetwo\symbol{236}}
+ \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmaponetwo\symbol{237}}
+ \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmaponetwo\symbol{238}}
+ \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmaponetwo\symbol{239}}
+ \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmaponetwo\symbol{240}}
+ \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmaponetwo\symbol{241}}
+ \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmaponetwo\symbol{242}}
+ \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmaponetwo\symbol{243}}
+ \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmaponetwo\symbol{244}}
+ \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmaponetwo\symbol{245}}
+ \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmaponetwo\symbol{246}}
+ \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmaponetwo\symbol{247}}
+ \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmaponetwo\symbol{248}}
+ \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmaponetwo\symbol{249}}
+ \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmaponetwo\symbol{250}}
+ \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmaponetwo\symbol{251}}
+ \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmaponetwo\symbol{252}}
+ \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmaponetwo\symbol{253}}
+ \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmaponetwo\symbol{254}}
+ \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmaponetwo\symbol{255}}
+ \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmaponethree\symbol{0}}
+ \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmaponethree\symbol{1}}
+ \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmaponethree\symbol{2}}
+ \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmaponethree\symbol{3}}
+ \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmaponethree\symbol{4}}
+ \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmaponethree\symbol{5}}
+ \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmaponethree\symbol{6}}
+ \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmaponethree\symbol{7}}
+ \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmaponethree\symbol{8}}
+ \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmaponethree\symbol{9}}
+ \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmaponethree\symbol{10}}
+ \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmaponethree\symbol{11}}
+ \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmaponethree\symbol{12}}
+ \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmaponethree\symbol{13}}
+ \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmaponethree\symbol{14}}
+ \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmaponethree\symbol{15}}
+ \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmaponethree\symbol{16}}
+ \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmaponethree\symbol{17}}
+ \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmaponethree\symbol{18}}
+ \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmaponethree\symbol{19}}
+ \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmaponethree\symbol{20}}
+ \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmaponethree\symbol{21}}
+ \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmaponethree\symbol{22}}
+ \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmaponethree\symbol{23}}
+ \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmaponethree\symbol{24}}
+ \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmaponethree\symbol{25}}
+ \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmaponethree\symbol{26}}
+ \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmaponethree\symbol{27}}
+ \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmaponethree\symbol{28}}
+ \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmaponethree\symbol{29}}
+ \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmaponethree\symbol{30}}
+ \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmaponethree\symbol{31}}
+ \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmaponethree\symbol{32}}
+ \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmaponethree\symbol{33}}
+ \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmaponethree\symbol{34}}
+ \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmaponethree\symbol{35}}
+ \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmaponethree\symbol{36}}
+ \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmaponethree\symbol{37}}
+ \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmaponethree\symbol{38}}
+ \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmaponethree\symbol{39}}
+ \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmaponethree\symbol{40}}
+ \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmaponethree\symbol{41}}
+ \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmaponethree\symbol{42}}
+ \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmaponethree\symbol{43}}
+ \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmaponethree\symbol{44}}
+ \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmaponethree\symbol{45}}
+ \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmaponethree\symbol{46}}
+ \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmaponethree\symbol{47}}
+ \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmaponethree\symbol{48}}
+ \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmaponethree\symbol{49}}
+ \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmaponethree\symbol{50}}
+ \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmaponethree\symbol{51}}
+ \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmaponethree\symbol{52}}
+ \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmaponethree\symbol{53}}
+ \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmaponethree\symbol{54}}
+ \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmaponethree\symbol{55}}
+ \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmaponethree\symbol{56}}
+ \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmaponethree\symbol{57}}
+ \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmaponethree\symbol{58}}
+ \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmaponethree\symbol{59}}
+ \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmaponethree\symbol{60}}
+ \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmaponethree\symbol{61}}
+ \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmaponethree\symbol{62}}
+ \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmaponethree\symbol{63}}
+ \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmaponethree\symbol{64}}
+ \expandafter\def\csname simpleicon@zerotiericon\endcsname {\simpleiconsmaponethree\symbol{65}}
+ \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmaponethree\symbol{66}}
+ \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmaponethree\symbol{67}}
+ \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmaponethree\symbol{68}}
+ \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmaponethree\symbol{69}}
+ \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmaponethree\symbol{70}}
+ \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmaponethree\symbol{71}}
+ \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmaponethree\symbol{72}}
+ \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmaponethree\symbol{73}}
+ \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmaponethree\symbol{74}}
+ \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmaponethree\symbol{75}}
+ \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmaponethree\symbol{76}}
+ \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmaponethree\symbol{77}}
+ \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmaponethree\symbol{78}}
+ \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmaponethree\symbol{79}}
+ \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmaponethree\symbol{80}}
+ \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmaponethree\symbol{81}}
+ \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmaponethree\symbol{82}}
+ \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmaponethree\symbol{83}}
+ \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmaponethree\symbol{84}}
+ \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmaponethree\symbol{85}}
+ \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmaponethree\symbol{86}} \ 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 7ff9b4ef295..977e6fccc7a 100644
--- a/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-xeluatex.tex
+++ b/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-xeluatex.tex
@@ -1076,2079 +1076,2085 @@
\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
+ \expandafter\def\csname simpleicon@gltficon\endcsname {\simpleiconsmap\symbol{"EE36}}
+ \expandafter\def\csname simpleicon@gmailicon\endcsname {\simpleiconsmap\symbol{"EE37}}
+ \expandafter\def\csname simpleicon@gnomeicon\endcsname {\simpleiconsmap\symbol{"EE38}}
+ \expandafter\def\csname simpleicon@gnometerminalicon\endcsname {\simpleiconsmap\symbol{"EE39}}
+ \expandafter\def\csname simpleicon@gnuicon\endcsname {\simpleiconsmap\symbol{"EE3A}}
+ \expandafter\def\csname simpleicon@gnubashicon\endcsname {\simpleiconsmap\symbol{"EE3B}}
+ \expandafter\def\csname simpleicon@gnuemacsicon\endcsname {\simpleiconsmap\symbol{"EE3C}}
+ \expandafter\def\csname simpleicon@gnuicecaticon\endcsname {\simpleiconsmap\symbol{"EE3D}}
+ \expandafter\def\csname simpleicon@gnuprivacyguardicon\endcsname {\simpleiconsmap\symbol{"EE3E}}
+ \expandafter\def\csname simpleicon@gnusocialicon\endcsname {\simpleiconsmap\symbol{"EE3F}}
+ \expandafter\def\csname simpleicon@goicon\endcsname {\simpleiconsmap\symbol{"EE40}}
+ \expandafter\def\csname simpleicon@gocdicon\endcsname {\simpleiconsmap\symbol{"EE41}}
+ \expandafter\def\csname simpleicon@godaddyicon\endcsname {\simpleiconsmap\symbol{"EE42}}
+ \expandafter\def\csname simpleicon@godotengineicon\endcsname {\simpleiconsmap\symbol{"EE43}}
+ \expandafter\def\csname simpleicon@gofundmeicon\endcsname {\simpleiconsmap\symbol{"EE44}}
+ \expandafter\def\csname simpleicon@gogdotcomicon\endcsname {\simpleiconsmap\symbol{"EE45}}
+ \expandafter\def\csname simpleicon@gojekicon\endcsname {\simpleiconsmap\symbol{"EE46}}
+ \expandafter\def\csname simpleicon@golandicon\endcsname {\simpleiconsmap\symbol{"EE47}}
+ \expandafter\def\csname simpleicon@goldenlineicon\endcsname {\simpleiconsmap\symbol{"EE48}}
+ \expandafter\def\csname simpleicon@goldmansachsicon\endcsname {\simpleiconsmap\symbol{"EE49}}
+ \expandafter\def\csname simpleicon@goodreadsicon\endcsname {\simpleiconsmap\symbol{"EE4A}}
+ \expandafter\def\csname simpleicon@googleicon\endcsname {\simpleiconsmap\symbol{"EE4B}}
+ \expandafter\def\csname simpleicon@googleadmobicon\endcsname {\simpleiconsmap\symbol{"EE4C}}
+ \expandafter\def\csname simpleicon@googleadsicon\endcsname {\simpleiconsmap\symbol{"EE4D}}
+ \expandafter\def\csname simpleicon@googleadsenseicon\endcsname {\simpleiconsmap\symbol{"EE4E}}
+ \expandafter\def\csname simpleicon@googleanalyticsicon\endcsname {\simpleiconsmap\symbol{"EE4F}}
+ \expandafter\def\csname simpleicon@googleappsscripticon\endcsname {\simpleiconsmap\symbol{"EE50}}
+ \expandafter\def\csname simpleicon@googleassistanticon\endcsname {\simpleiconsmap\symbol{"EE51}}
+ \expandafter\def\csname simpleicon@googleauthenticatoricon\endcsname {\simpleiconsmap\symbol{"EE52}}
+ \expandafter\def\csname simpleicon@googlebigqueryicon\endcsname {\simpleiconsmap\symbol{"EE53}}
+ \expandafter\def\csname simpleicon@googlebigtableicon\endcsname {\simpleiconsmap\symbol{"EE54}}
+ \expandafter\def\csname simpleicon@googlecalendaricon\endcsname {\simpleiconsmap\symbol{"EE55}}
+ \expandafter\def\csname simpleicon@googlecampaignmanager360icon\endcsname {\simpleiconsmap\symbol{"EE56}}
+ \expandafter\def\csname simpleicon@googlecardboardicon\endcsname {\simpleiconsmap\symbol{"EE57}}
+ \expandafter\def\csname simpleicon@googlechaticon\endcsname {\simpleiconsmap\symbol{"EE58}}
+ \expandafter\def\csname simpleicon@googlechromeicon\endcsname {\simpleiconsmap\symbol{"EE59}}
+ \expandafter\def\csname simpleicon@googlechronicleicon\endcsname {\simpleiconsmap\symbol{"EE5A}}
+ \expandafter\def\csname simpleicon@googleclassroomicon\endcsname {\simpleiconsmap\symbol{"EE5B}}
+ \expandafter\def\csname simpleicon@googlecloudicon\endcsname {\simpleiconsmap\symbol{"EE5C}}
+ \expandafter\def\csname simpleicon@googlecloudcomposericon\endcsname {\simpleiconsmap\symbol{"EE5D}}
+ \expandafter\def\csname simpleicon@googlecloudspannericon\endcsname {\simpleiconsmap\symbol{"EE5E}}
+ \expandafter\def\csname simpleicon@googlecloudstorageicon\endcsname {\simpleiconsmap\symbol{"EE5F}}
+ \expandafter\def\csname simpleicon@googlecolabicon\endcsname {\simpleiconsmap\symbol{"EE60}}
+ \expandafter\def\csname simpleicon@googlecontaineroptimizedosicon\endcsname {\simpleiconsmap\symbol{"EE61}}
+ \expandafter\def\csname simpleicon@googledataflowicon\endcsname {\simpleiconsmap\symbol{"EE62}}
+ \expandafter\def\csname simpleicon@googledataprocicon\endcsname {\simpleiconsmap\symbol{"EE63}}
+ \expandafter\def\csname simpleicon@googledatastudioicon\endcsname {\simpleiconsmap\symbol{"EE64}}
+ \expandafter\def\csname simpleicon@googledisplayandvideo360icon\endcsname {\simpleiconsmap\symbol{"EE65}}
+ \expandafter\def\csname simpleicon@googledocsicon\endcsname {\simpleiconsmap\symbol{"EE66}}
+ \expandafter\def\csname simpleicon@googledriveicon\endcsname {\simpleiconsmap\symbol{"EE67}}
+ \expandafter\def\csname simpleicon@googleearthicon\endcsname {\simpleiconsmap\symbol{"EE68}}
+ \expandafter\def\csname simpleicon@googleearthengineicon\endcsname {\simpleiconsmap\symbol{"EE69}}
+ \expandafter\def\csname simpleicon@googlefiticon\endcsname {\simpleiconsmap\symbol{"EE6A}}
+ \expandafter\def\csname simpleicon@googlefontsicon\endcsname {\simpleiconsmap\symbol{"EE6B}}
+ \expandafter\def\csname simpleicon@googleformsicon\endcsname {\simpleiconsmap\symbol{"EE6C}}
+ \expandafter\def\csname simpleicon@googlegeminiicon\endcsname {\simpleiconsmap\symbol{"EE6D}}
+ \expandafter\def\csname simpleicon@googlehomeicon\endcsname {\simpleiconsmap\symbol{"EE6E}}
+ \expandafter\def\csname simpleicon@googlekeepicon\endcsname {\simpleiconsmap\symbol{"EE6F}}
+ \expandafter\def\csname simpleicon@googlelensicon\endcsname {\simpleiconsmap\symbol{"EE70}}
+ \expandafter\def\csname simpleicon@googlemapsicon\endcsname {\simpleiconsmap\symbol{"EE71}}
+ \expandafter\def\csname simpleicon@googlemarketingplatformicon\endcsname {\simpleiconsmap\symbol{"EE72}}
+ \expandafter\def\csname simpleicon@googlemeeticon\endcsname {\simpleiconsmap\symbol{"EE73}}
+ \expandafter\def\csname simpleicon@googlemessagesicon\endcsname {\simpleiconsmap\symbol{"EE74}}
+ \expandafter\def\csname simpleicon@googlenearbyicon\endcsname {\simpleiconsmap\symbol{"EE75}}
+ \expandafter\def\csname simpleicon@googlenewsicon\endcsname {\simpleiconsmap\symbol{"EE76}}
+ \expandafter\def\csname simpleicon@googlepayicon\endcsname {\simpleiconsmap\symbol{"EE77}}
+ \expandafter\def\csname simpleicon@googlephotosicon\endcsname {\simpleiconsmap\symbol{"EE78}}
+ \expandafter\def\csname simpleicon@googleplayicon\endcsname {\simpleiconsmap\symbol{"EE79}}
+ \expandafter\def\csname simpleicon@googlepubsubicon\endcsname {\simpleiconsmap\symbol{"EE7A}}
+ \expandafter\def\csname simpleicon@googlescholaricon\endcsname {\simpleiconsmap\symbol{"EE7B}}
+ \expandafter\def\csname simpleicon@googlesearchconsoleicon\endcsname {\simpleiconsmap\symbol{"EE7C}}
+ \expandafter\def\csname simpleicon@googlesheetsicon\endcsname {\simpleiconsmap\symbol{"EE7D}}
+ \expandafter\def\csname simpleicon@googleslidesicon\endcsname {\simpleiconsmap\symbol{"EE7E}}
+ \expandafter\def\csname simpleicon@googlestreetviewicon\endcsname {\simpleiconsmap\symbol{"EE7F}}
+ \expandafter\def\csname simpleicon@googletagmanagericon\endcsname {\simpleiconsmap\symbol{"EE80}}
+ \expandafter\def\csname simpleicon@googletasksicon\endcsname {\simpleiconsmap\symbol{"EE81}}
+ \expandafter\def\csname simpleicon@googletranslateicon\endcsname {\simpleiconsmap\symbol{"EE82}}
+ \expandafter\def\csname simpleicon@gotomeetingicon\endcsname {\simpleiconsmap\symbol{"EE83}}
+ \expandafter\def\csname simpleicon@grabicon\endcsname {\simpleiconsmap\symbol{"EE84}}
+ \expandafter\def\csname simpleicon@gradleicon\endcsname {\simpleiconsmap\symbol{"EE85}}
+ \expandafter\def\csname simpleicon@gradleplaypublishericon\endcsname {\simpleiconsmap\symbol{"EE86}}
+ \expandafter\def\csname simpleicon@grafanaicon\endcsname {\simpleiconsmap\symbol{"EE87}}
+ \expandafter\def\csname simpleicon@grammarlyicon\endcsname {\simpleiconsmap\symbol{"EE88}}
+ \expandafter\def\csname simpleicon@grandfraisicon\endcsname {\simpleiconsmap\symbol{"EE89}}
+ \expandafter\def\csname simpleicon@grapheneosicon\endcsname {\simpleiconsmap\symbol{"EE8A}}
+ \expandafter\def\csname simpleicon@graphiteicon\endcsname {\simpleiconsmap\symbol{"EE8B}}
+ \expandafter\def\csname simpleicon@graphqlicon\endcsname {\simpleiconsmap\symbol{"EE8C}}
+ \expandafter\def\csname simpleicon@gravicon\endcsname {\simpleiconsmap\symbol{"EE8D}}
+ \expandafter\def\csname simpleicon@gravataricon\endcsname {\simpleiconsmap\symbol{"EE8E}}
+ \expandafter\def\csname simpleicon@graylogicon\endcsname {\simpleiconsmap\symbol{"EE8F}}
+ \expandafter\def\csname simpleicon@greasyforkicon\endcsname {\simpleiconsmap\symbol{"EE90}}
+ \expandafter\def\csname simpleicon@greatlearningicon\endcsname {\simpleiconsmap\symbol{"EE91}}
+ \expandafter\def\csname simpleicon@greenhouseicon\endcsname {\simpleiconsmap\symbol{"EE92}}
+ \expandafter\def\csname simpleicon@greensockicon\endcsname {\simpleiconsmap\symbol{"EE93}}
+ \expandafter\def\csname simpleicon@griddotaiicon\endcsname {\simpleiconsmap\symbol{"EE94}}
+ \expandafter\def\csname simpleicon@gridsomeicon\endcsname {\simpleiconsmap\symbol{"EE95}}
+ \expandafter\def\csname simpleicon@groupmeicon\endcsname {\simpleiconsmap\symbol{"EE96}}
+ \expandafter\def\csname simpleicon@grouponicon\endcsname {\simpleiconsmap\symbol{"EE97}}
+ \expandafter\def\csname simpleicon@grubhubicon\endcsname {\simpleiconsmap\symbol{"EE98}}
+ \expandafter\def\csname simpleicon@grunticon\endcsname {\simpleiconsmap\symbol{"EE99}}
+ \expandafter\def\csname simpleicon@gskicon\endcsname {\simpleiconsmap\symbol{"EE9A}}
+ \expandafter\def\csname simpleicon@gsmarenadotcomicon\endcsname {\simpleiconsmap\symbol{"EE9B}}
+ \expandafter\def\csname simpleicon@gstreamericon\endcsname {\simpleiconsmap\symbol{"EE9C}}
+ \expandafter\def\csname simpleicon@gtkicon\endcsname {\simpleiconsmap\symbol{"EE9D}}
+ \expandafter\def\csname simpleicon@guangzhoumetroicon\endcsname {\simpleiconsmap\symbol{"EE9E}}
+ \expandafter\def\csname simpleicon@guildedicon\endcsname {\simpleiconsmap\symbol{"EE9F}}
+ \expandafter\def\csname simpleicon@gulpicon\endcsname {\simpleiconsmap\symbol{"EEA0}}
+ \expandafter\def\csname simpleicon@gumroadicon\endcsname {\simpleiconsmap\symbol{"EEA1}}
+ \expandafter\def\csname simpleicon@gumtreeicon\endcsname {\simpleiconsmap\symbol{"EEA2}}
+ \expandafter\def\csname simpleicon@gunicornicon\endcsname {\simpleiconsmap\symbol{"EEA3}}
+ \expandafter\def\csname simpleicon@gurobiicon\endcsname {\simpleiconsmap\symbol{"EEA4}}
+ \expandafter\def\csname simpleicon@gustoicon\endcsname {\simpleiconsmap\symbol{"EEA5}}
+ \expandafter\def\csname simpleicon@gutenbergicon\endcsname {\simpleiconsmap\symbol{"EEA6}}
+ \expandafter\def\csname simpleicon@h3icon\endcsname {\simpleiconsmap\symbol{"EEA7}}
+ \expandafter\def\csname simpleicon@habricon\endcsname {\simpleiconsmap\symbol{"EEA8}}
+ \expandafter\def\csname simpleicon@hackadayicon\endcsname {\simpleiconsmap\symbol{"EEA9}}
+ \expandafter\def\csname simpleicon@hackclubicon\endcsname {\simpleiconsmap\symbol{"EEAA}}
+ \expandafter\def\csname simpleicon@hackerearthicon\endcsname {\simpleiconsmap\symbol{"EEAB}}
+ \expandafter\def\csname simpleicon@hackernoonicon\endcsname {\simpleiconsmap\symbol{"EEAC}}
+ \expandafter\def\csname simpleicon@hackeroneicon\endcsname {\simpleiconsmap\symbol{"EEAD}}
+ \expandafter\def\csname simpleicon@hackerrankicon\endcsname {\simpleiconsmap\symbol{"EEAE}}
+ \expandafter\def\csname simpleicon@hackstericon\endcsname {\simpleiconsmap\symbol{"EEAF}}
+ \expandafter\def\csname simpleicon@hacktheboxicon\endcsname {\simpleiconsmap\symbol{"EEB0}}
+ \expandafter\def\csname simpleicon@halicon\endcsname {\simpleiconsmap\symbol{"EEB1}}
+ \expandafter\def\csname simpleicon@handlebarsdotjsicon\endcsname {\simpleiconsmap\symbol{"EEB2}}
+ \expandafter\def\csname simpleicon@handmicon\endcsname {\simpleiconsmap\symbol{"EEB3}}
+ \expandafter\def\csname simpleicon@handshakeicon\endcsname {\simpleiconsmap\symbol{"EEB4}}
+ \expandafter\def\csname simpleicon@handshakeprotocolicon\endcsname {\simpleiconsmap\symbol{"EEB5}}
+ \expandafter\def\csname simpleicon@happycowicon\endcsname {\simpleiconsmap\symbol{"EEB6}}
+ \expandafter\def\csname simpleicon@harboricon\endcsname {\simpleiconsmap\symbol{"EEB7}}
+ \expandafter\def\csname simpleicon@harmonyosicon\endcsname {\simpleiconsmap\symbol{"EEB8}}
+ \expandafter\def\csname simpleicon@hashicorpicon\endcsname {\simpleiconsmap\symbol{"EEB9}}
+ \expandafter\def\csname simpleicon@hashnodeicon\endcsname {\simpleiconsmap\symbol{"EEBA}}
+ \expandafter\def\csname simpleicon@haskellicon\endcsname {\simpleiconsmap\symbol{"EEBB}}
+ \expandafter\def\csname simpleicon@hasuraicon\endcsname {\simpleiconsmap\symbol{"EEBC}}
+ \expandafter\def\csname simpleicon@hatenabookmarkicon\endcsname {\simpleiconsmap\symbol{"EEBD}}
+ \expandafter\def\csname simpleicon@haveibeenpwnedicon\endcsname {\simpleiconsmap\symbol{"EEBE}}
+ \expandafter\def\csname simpleicon@haxeicon\endcsname {\simpleiconsmap\symbol{"EEBF}}
+ \expandafter\def\csname simpleicon@hboicon\endcsname {\simpleiconsmap\symbol{"EEC0}}
+ \expandafter\def\csname simpleicon@hclicon\endcsname {\simpleiconsmap\symbol{"EEC1}}
+ \expandafter\def\csname simpleicon@hdfcbankicon\endcsname {\simpleiconsmap\symbol{"EEC2}}
+ \expandafter\def\csname simpleicon@headlessuiicon\endcsname {\simpleiconsmap\symbol{"EEC3}}
+ \expandafter\def\csname simpleicon@headphonezoneicon\endcsname {\simpleiconsmap\symbol{"EEC4}}
+ \expandafter\def\csname simpleicon@headspaceicon\endcsname {\simpleiconsmap\symbol{"EEC5}}
+ \expandafter\def\csname simpleicon@hearthicon\endcsname {\simpleiconsmap\symbol{"EEC6}}
+ \expandafter\def\csname simpleicon@hearthisdotaticon\endcsname {\simpleiconsmap\symbol{"EEC7}}
+ \expandafter\def\csname simpleicon@hederaicon\endcsname {\simpleiconsmap\symbol{"EEC8}}
+ \expandafter\def\csname simpleicon@heliumicon\endcsname {\simpleiconsmap\symbol{"EEC9}}
+ \expandafter\def\csname simpleicon@hellofreshicon\endcsname {\simpleiconsmap\symbol{"EECA}}
+ \expandafter\def\csname simpleicon@hellyhansenicon\endcsname {\simpleiconsmap\symbol{"EECB}}
+ \expandafter\def\csname simpleicon@helmicon\endcsname {\simpleiconsmap\symbol{"EECC}}
+ \expandafter\def\csname simpleicon@helpdeskicon\endcsname {\simpleiconsmap\symbol{"EECD}}
+ \expandafter\def\csname simpleicon@helpscouticon\endcsname {\simpleiconsmap\symbol{"EECE}}
+ \expandafter\def\csname simpleicon@hepsiemlakicon\endcsname {\simpleiconsmap\symbol{"EECF}}
+ \expandafter\def\csname simpleicon@hereicon\endcsname {\simpleiconsmap\symbol{"EED0}}
+ \expandafter\def\csname simpleicon@herokuicon\endcsname {\simpleiconsmap\symbol{"EED1}}
+ \expandafter\def\csname simpleicon@hetznericon\endcsname {\simpleiconsmap\symbol{"EED2}}
+ \expandafter\def\csname simpleicon@hevyicon\endcsname {\simpleiconsmap\symbol{"EED3}}
+ \expandafter\def\csname simpleicon@hexleticon\endcsname {\simpleiconsmap\symbol{"EED4}}
+ \expandafter\def\csname simpleicon@hexoicon\endcsname {\simpleiconsmap\symbol{"EED5}}
+ \expandafter\def\csname simpleicon@heyicon\endcsname {\simpleiconsmap\symbol{"EED6}}
+ \expandafter\def\csname simpleicon@hibernateicon\endcsname {\simpleiconsmap\symbol{"EED7}}
+ \expandafter\def\csname simpleicon@hibobicon\endcsname {\simpleiconsmap\symbol{"EED8}}
+ \expandafter\def\csname simpleicon@hiltonicon\endcsname {\simpleiconsmap\symbol{"EED9}}
+ \expandafter\def\csname simpleicon@hiltonhotelsandresortsicon\endcsname {\simpleiconsmap\symbol{"EEDA}}
+ \expandafter\def\csname simpleicon@hitachiicon\endcsname {\simpleiconsmap\symbol{"EEDB}}
+ \expandafter\def\csname simpleicon@hiveicon\endcsname {\simpleiconsmap\symbol{"EEDC}}
+ \expandafter\def\csname simpleicon@hiveblockchainicon\endcsname {\simpleiconsmap\symbol{"EEDD}}
+ \expandafter\def\csname simpleicon@hivemqicon\endcsname {\simpleiconsmap\symbol{"EEDE}}
+ \expandafter\def\csname simpleicon@homarricon\endcsname {\simpleiconsmap\symbol{"EEDF}}
+ \expandafter\def\csname simpleicon@homeadvisoricon\endcsname {\simpleiconsmap\symbol{"EEE0}}
+ \expandafter\def\csname simpleicon@homeassistanticon\endcsname {\simpleiconsmap\symbol{"EEE1}}
+ \expandafter\def\csname simpleicon@homeassistantcommunitystoreicon\endcsname {\simpleiconsmap\symbol{"EEE2}}
+ \expandafter\def\csname simpleicon@homebrewicon\endcsname {\simpleiconsmap\symbol{"EEE3}}
+ \expandafter\def\csname simpleicon@homebridgeicon\endcsname {\simpleiconsmap\symbol{"EEE4}}
+ \expandafter\def\csname simpleicon@homepageicon\endcsname {\simpleiconsmap\symbol{"EEE5}}
+ \expandafter\def\csname simpleicon@homifyicon\endcsname {\simpleiconsmap\symbol{"EEE6}}
+ \expandafter\def\csname simpleicon@hondaicon\endcsname {\simpleiconsmap\symbol{"EEE7}}
+ \expandafter\def\csname simpleicon@honeyicon\endcsname {\simpleiconsmap\symbol{"EEE8}}
+ \expandafter\def\csname simpleicon@honoicon\endcsname {\simpleiconsmap\symbol{"EEE9}}
+ \expandafter\def\csname simpleicon@honoricon\endcsname {\simpleiconsmap\symbol{"EEEA}}
+ \expandafter\def\csname simpleicon@hootsuiteicon\endcsname {\simpleiconsmap\symbol{"EEEB}}
+ \expandafter\def\csname simpleicon@hoppscotchicon\endcsname {\simpleiconsmap\symbol{"EEEC}}
+ \expandafter\def\csname simpleicon@hostingericon\endcsname {\simpleiconsmap\symbol{"EEED}}
+ \expandafter\def\csname simpleicon@hotelsdotcomicon\endcsname {\simpleiconsmap\symbol{"EEEE}}
+ \expandafter\def\csname simpleicon@hotjaricon\endcsname {\simpleiconsmap\symbol{"EEEF}}
+ \expandafter\def\csname simpleicon@hotwireicon\endcsname {\simpleiconsmap\symbol{"EEF0}}
+ \expandafter\def\csname simpleicon@houdiniicon\endcsname {\simpleiconsmap\symbol{"EEF1}}
+ \expandafter\def\csname simpleicon@houzzicon\endcsname {\simpleiconsmap\symbol{"EEF2}}
+ \expandafter\def\csname simpleicon@hpicon\endcsname {\simpleiconsmap\symbol{"EEF3}}
+ \expandafter\def\csname simpleicon@hsbcicon\endcsname {\simpleiconsmap\symbol{"EEF4}}
+ \expandafter\def\csname simpleicon@html5icon\endcsname {\simpleiconsmap\symbol{"EEF5}}
+ \expandafter\def\csname simpleicon@htmlacademyicon\endcsname {\simpleiconsmap\symbol{"EEF6}}
+ \expandafter\def\csname simpleicon@htmxicon\endcsname {\simpleiconsmap\symbol{"EEF7}}
+ \expandafter\def\csname simpleicon@htopicon\endcsname {\simpleiconsmap\symbol{"EEF8}}
+ \expandafter\def\csname simpleicon@httpieicon\endcsname {\simpleiconsmap\symbol{"EEF9}}
+ \expandafter\def\csname simpleicon@huaweiicon\endcsname {\simpleiconsmap\symbol{"EEFA}}
+ \expandafter\def\csname simpleicon@hubspoticon\endcsname {\simpleiconsmap\symbol{"EEFB}}
+ \expandafter\def\csname simpleicon@huggingfaceicon\endcsname {\simpleiconsmap\symbol{"EEFC}}
+ \expandafter\def\csname simpleicon@hugoicon\endcsname {\simpleiconsmap\symbol{"EEFD}}
+ \expandafter\def\csname simpleicon@humblebundleicon\endcsname {\simpleiconsmap\symbol{"EEFE}}
+ \expandafter\def\csname simpleicon@hungryjacksicon\endcsname {\simpleiconsmap\symbol{"EEFF}}
+ \expandafter\def\csname simpleicon@husqvarnaicon\endcsname {\simpleiconsmap\symbol{"EF00}}
+ \expandafter\def\csname simpleicon@hypericon\endcsname {\simpleiconsmap\symbol{"EF01}}
+ \expandafter\def\csname simpleicon@hyperskillicon\endcsname {\simpleiconsmap\symbol{"EF02}}
+ \expandafter\def\csname simpleicon@hypothesisicon\endcsname {\simpleiconsmap\symbol{"EF03}}
+ \expandafter\def\csname simpleicon@hyprlandicon\endcsname {\simpleiconsmap\symbol{"EF04}}
+ \expandafter\def\csname simpleicon@hyundaiicon\endcsname {\simpleiconsmap\symbol{"EF05}}
+ \expandafter\def\csname simpleicon@i18nexticon\endcsname {\simpleiconsmap\symbol{"EF06}}
+ \expandafter\def\csname simpleicon@i3icon\endcsname {\simpleiconsmap\symbol{"EF07}}
+ \expandafter\def\csname simpleicon@iataicon\endcsname {\simpleiconsmap\symbol{"EF08}}
+ \expandafter\def\csname simpleicon@ibeaconicon\endcsname {\simpleiconsmap\symbol{"EF09}}
+ \expandafter\def\csname simpleicon@iberiaicon\endcsname {\simpleiconsmap\symbol{"EF0A}}
+ \expandafter\def\csname simpleicon@icedicon\endcsname {\simpleiconsmap\symbol{"EF0B}}
+ \expandafter\def\csname simpleicon@icelandicon\endcsname {\simpleiconsmap\symbol{"EF0C}}
+ \expandafter\def\csname simpleicon@icicibankicon\endcsname {\simpleiconsmap\symbol{"EF0D}}
+ \expandafter\def\csname simpleicon@icingaicon\endcsname {\simpleiconsmap\symbol{"EF0E}}
+ \expandafter\def\csname simpleicon@icloudicon\endcsname {\simpleiconsmap\symbol{"EF0F}}
+ \expandafter\def\csname simpleicon@icomoonicon\endcsname {\simpleiconsmap\symbol{"EF10}}
+ \expandafter\def\csname simpleicon@iconicon\endcsname {\simpleiconsmap\symbol{"EF11}}
+ \expandafter\def\csname simpleicon@iconfindericon\endcsname {\simpleiconsmap\symbol{"EF12}}
+ \expandafter\def\csname simpleicon@iconifyicon\endcsname {\simpleiconsmap\symbol{"EF13}}
+ \expandafter\def\csname simpleicon@iconjaricon\endcsname {\simpleiconsmap\symbol{"EF14}}
+ \expandafter\def\csname simpleicon@icons8icon\endcsname {\simpleiconsmap\symbol{"EF15}}
+ \expandafter\def\csname simpleicon@icqicon\endcsname {\simpleiconsmap\symbol{"EF16}}
+ \expandafter\def\csname simpleicon@ieeeicon\endcsname {\simpleiconsmap\symbol{"EF17}}
+ \expandafter\def\csname simpleicon@ifixiticon\endcsname {\simpleiconsmap\symbol{"EF18}}
+ \expandafter\def\csname simpleicon@ifoodicon\endcsname {\simpleiconsmap\symbol{"EF19}}
+ \expandafter\def\csname simpleicon@ifttticon\endcsname {\simpleiconsmap\symbol{"EF1A}}
+ \expandafter\def\csname simpleicon@igdbicon\endcsname {\simpleiconsmap\symbol{"EF1B}}
+ \expandafter\def\csname simpleicon@ignicon\endcsname {\simpleiconsmap\symbol{"EF1C}}
+ \expandafter\def\csname simpleicon@iheartradioicon\endcsname {\simpleiconsmap\symbol{"EF1D}}
+ \expandafter\def\csname simpleicon@ikeaicon\endcsname {\simpleiconsmap\symbol{"EF1E}}
+ \expandafter\def\csname simpleicon@iledefrancemobilitesicon\endcsname {\simpleiconsmap\symbol{"EF1F}}
+ \expandafter\def\csname simpleicon@imagedotscicon\endcsname {\simpleiconsmap\symbol{"EF20}}
+ \expandafter\def\csname simpleicon@imagejicon\endcsname {\simpleiconsmap\symbol{"EF21}}
+ \expandafter\def\csname simpleicon@imdbicon\endcsname {\simpleiconsmap\symbol{"EF22}}
+ \expandafter\def\csname simpleicon@imessageicon\endcsname {\simpleiconsmap\symbol{"EF23}}
+ \expandafter\def\csname simpleicon@imguricon\endcsname {\simpleiconsmap\symbol{"EF24}}
+ \expandafter\def\csname simpleicon@immericon\endcsname {\simpleiconsmap\symbol{"EF25}}
+ \expandafter\def\csname simpleicon@immichicon\endcsname {\simpleiconsmap\symbol{"EF26}}
+ \expandafter\def\csname simpleicon@imouicon\endcsname {\simpleiconsmap\symbol{"EF27}}
+ \expandafter\def\csname simpleicon@improvmxicon\endcsname {\simpleiconsmap\symbol{"EF28}}
+ \expandafter\def\csname simpleicon@indeedicon\endcsname {\simpleiconsmap\symbol{"EF29}}
+ \expandafter\def\csname simpleicon@indiansuperleagueicon\endcsname {\simpleiconsmap\symbol{"EF2A}}
+ \expandafter\def\csname simpleicon@indiehackersicon\endcsname {\simpleiconsmap\symbol{"EF2B}}
+ \expandafter\def\csname simpleicon@indigoicon\endcsname {\simpleiconsmap\symbol{"EF2C}}
+ \expandafter\def\csname simpleicon@inertiaicon\endcsname {\simpleiconsmap\symbol{"EF2D}}
+ \expandafter\def\csname simpleicon@infinitiicon\endcsname {\simpleiconsmap\symbol{"EF2E}}
+ \expandafter\def\csname simpleicon@influxdbicon\endcsname {\simpleiconsmap\symbol{"EF2F}}
+ \expandafter\def\csname simpleicon@infomaniakicon\endcsname {\simpleiconsmap\symbol{"EF30}}
+ \expandafter\def\csname simpleicon@infoqicon\endcsname {\simpleiconsmap\symbol{"EF31}}
+ \expandafter\def\csname simpleicon@informaticaicon\endcsname {\simpleiconsmap\symbol{"EF32}}
+ \expandafter\def\csname simpleicon@infosysicon\endcsname {\simpleiconsmap\symbol{"EF33}}
+ \expandafter\def\csname simpleicon@infracosticon\endcsname {\simpleiconsmap\symbol{"EF34}}
+ \expandafter\def\csname simpleicon@ingressicon\endcsname {\simpleiconsmap\symbol{"EF35}}
+ \expandafter\def\csname simpleicon@inkdropicon\endcsname {\simpleiconsmap\symbol{"EF36}}
+ \expandafter\def\csname simpleicon@inkscapeicon\endcsname {\simpleiconsmap\symbol{"EF37}}
+ \expandafter\def\csname simpleicon@inoreadericon\endcsname {\simpleiconsmap\symbol{"EF38}}
+ \expandafter\def\csname simpleicon@insomniaicon\endcsname {\simpleiconsmap\symbol{"EF39}}
+ \expandafter\def\csname simpleicon@inspireicon\endcsname {\simpleiconsmap\symbol{"EF3A}}
+ \expandafter\def\csname simpleicon@insta360icon\endcsname {\simpleiconsmap\symbol{"EF3B}}
+ \expandafter\def\csname simpleicon@instacarticon\endcsname {\simpleiconsmap\symbol{"EF3C}}
+ \expandafter\def\csname simpleicon@instagramicon\endcsname {\simpleiconsmap\symbol{"EF3D}}
+ \expandafter\def\csname simpleicon@instapapericon\endcsname {\simpleiconsmap\symbol{"EF3E}}
+ \expandafter\def\csname simpleicon@instatusicon\endcsname {\simpleiconsmap\symbol{"EF3F}}
+ \expandafter\def\csname simpleicon@instructablesicon\endcsname {\simpleiconsmap\symbol{"EF40}}
+ \expandafter\def\csname simpleicon@instructureicon\endcsname {\simpleiconsmap\symbol{"EF41}}
+ \expandafter\def\csname simpleicon@intelicon\endcsname {\simpleiconsmap\symbol{"EF42}}
+ \expandafter\def\csname simpleicon@intellijideaicon\endcsname {\simpleiconsmap\symbol{"EF43}}
+ \expandafter\def\csname simpleicon@interactiondesignfoundationicon\endcsname {\simpleiconsmap\symbol{"EF44}}
+ \expandafter\def\csname simpleicon@interactjsicon\endcsname {\simpleiconsmap\symbol{"EF45}}
+ \expandafter\def\csname simpleicon@interbaseicon\endcsname {\simpleiconsmap\symbol{"EF46}}
+ \expandafter\def\csname simpleicon@intercomicon\endcsname {\simpleiconsmap\symbol{"EF47}}
+ \expandafter\def\csname simpleicon@intermarcheicon\endcsname {\simpleiconsmap\symbol{"EF48}}
+ \expandafter\def\csname simpleicon@internetarchiveicon\endcsname {\simpleiconsmap\symbol{"EF49}}
+ \expandafter\def\csname simpleicon@internetcomputericon\endcsname {\simpleiconsmap\symbol{"EF4A}}
+ \expandafter\def\csname simpleicon@intigritiicon\endcsname {\simpleiconsmap\symbol{"EF4B}}
+ \expandafter\def\csname simpleicon@intuiticon\endcsname {\simpleiconsmap\symbol{"EF4C}}
+ \expandafter\def\csname simpleicon@invisionicon\endcsname {\simpleiconsmap\symbol{"EF4D}}
+ \expandafter\def\csname simpleicon@invoiceninjaicon\endcsname {\simpleiconsmap\symbol{"EF4E}}
+ \expandafter\def\csname simpleicon@iobrokericon\endcsname {\simpleiconsmap\symbol{"EF4F}}
+ \expandafter\def\csname simpleicon@ionicicon\endcsname {\simpleiconsmap\symbol{"EF50}}
+ \expandafter\def\csname simpleicon@ionosicon\endcsname {\simpleiconsmap\symbol{"EF51}}
+ \expandafter\def\csname simpleicon@iosicon\endcsname {\simpleiconsmap\symbol{"EF52}}
+ \expandafter\def\csname simpleicon@iotaicon\endcsname {\simpleiconsmap\symbol{"EF53}}
+ \expandafter\def\csname simpleicon@ipfsicon\endcsname {\simpleiconsmap\symbol{"EF54}}
+ \expandafter\def\csname simpleicon@irisicon\endcsname {\simpleiconsmap\symbol{"EF55}}
+ \expandafter\def\csname simpleicon@iroboticon\endcsname {\simpleiconsmap\symbol{"EF56}}
+ \expandafter\def\csname simpleicon@isc2icon\endcsname {\simpleiconsmap\symbol{"EF57}}
+ \expandafter\def\csname simpleicon@issuuicon\endcsname {\simpleiconsmap\symbol{"EF58}}
+ \expandafter\def\csname simpleicon@istioicon\endcsname {\simpleiconsmap\symbol{"EF59}}
+ \expandafter\def\csname simpleicon@itchdotioicon\endcsname {\simpleiconsmap\symbol{"EF5A}}
+ \expandafter\def\csname simpleicon@iterm2icon\endcsname {\simpleiconsmap\symbol{"EF5B}}
+ \expandafter\def\csname simpleicon@itunesicon\endcsname {\simpleiconsmap\symbol{"EF5C}}
+ \expandafter\def\csname simpleicon@itvxicon\endcsname {\simpleiconsmap\symbol{"EF5D}}
+ \expandafter\def\csname simpleicon@ivecoicon\endcsname {\simpleiconsmap\symbol{"EF5E}}
+ \expandafter\def\csname simpleicon@jabbericon\endcsname {\simpleiconsmap\symbol{"EF5F}}
+ \expandafter\def\csname simpleicon@jaegericon\endcsname {\simpleiconsmap\symbol{"EF60}}
+ \expandafter\def\csname simpleicon@jaguaricon\endcsname {\simpleiconsmap\symbol{"EF61}}
+ \expandafter\def\csname simpleicon@jamboardicon\endcsname {\simpleiconsmap\symbol{"EF62}}
+ \expandafter\def\csname simpleicon@jamesonicon\endcsname {\simpleiconsmap\symbol{"EF63}}
+ \expandafter\def\csname simpleicon@jamstackicon\endcsname {\simpleiconsmap\symbol{"EF64}}
+ \expandafter\def\csname simpleicon@jasmineicon\endcsname {\simpleiconsmap\symbol{"EF65}}
+ \expandafter\def\csname simpleicon@javascripticon\endcsname {\simpleiconsmap\symbol{"EF66}}
+ \expandafter\def\csname simpleicon@jblicon\endcsname {\simpleiconsmap\symbol{"EF67}}
+ \expandafter\def\csname simpleicon@jcbicon\endcsname {\simpleiconsmap\symbol{"EF68}}
+ \expandafter\def\csname simpleicon@jeepicon\endcsname {\simpleiconsmap\symbol{"EF69}}
+ \expandafter\def\csname simpleicon@jekyllicon\endcsname {\simpleiconsmap\symbol{"EF6A}}
+ \expandafter\def\csname simpleicon@jellyfinicon\endcsname {\simpleiconsmap\symbol{"EF6B}}
+ \expandafter\def\csname simpleicon@jenkinsicon\endcsname {\simpleiconsmap\symbol{"EF6C}}
+ \expandafter\def\csname simpleicon@jesticon\endcsname {\simpleiconsmap\symbol{"EF6D}}
+ \expandafter\def\csname simpleicon@jeticon\endcsname {\simpleiconsmap\symbol{"EF6E}}
+ \expandafter\def\csname simpleicon@jetblueicon\endcsname {\simpleiconsmap\symbol{"EF6F}}
+ \expandafter\def\csname simpleicon@jetbrainsicon\endcsname {\simpleiconsmap\symbol{"EF70}}
+ \expandafter\def\csname simpleicon@jetpackcomposeicon\endcsname {\simpleiconsmap\symbol{"EF71}}
+ \expandafter\def\csname simpleicon@jfrogicon\endcsname {\simpleiconsmap\symbol{"EF72}}
+ \expandafter\def\csname simpleicon@jfrogpipelinesicon\endcsname {\simpleiconsmap\symbol{"EF73}}
+ \expandafter\def\csname simpleicon@jhipstericon\endcsname {\simpleiconsmap\symbol{"EF74}}
+ \expandafter\def\csname simpleicon@jinjaicon\endcsname {\simpleiconsmap\symbol{"EF75}}
+ \expandafter\def\csname simpleicon@jiraicon\endcsname {\simpleiconsmap\symbol{"EF76}}
+ \expandafter\def\csname simpleicon@jirasoftwareicon\endcsname {\simpleiconsmap\symbol{"EF77}}
+ \expandafter\def\csname simpleicon@jitpackicon\endcsname {\simpleiconsmap\symbol{"EF78}}
+ \expandafter\def\csname simpleicon@jitsiicon\endcsname {\simpleiconsmap\symbol{"EF79}}
+ \expandafter\def\csname simpleicon@johndeereicon\endcsname {\simpleiconsmap\symbol{"EF7A}}
+ \expandafter\def\csname simpleicon@joomlaicon\endcsname {\simpleiconsmap\symbol{"EF7B}}
+ \expandafter\def\csname simpleicon@joplinicon\endcsname {\simpleiconsmap\symbol{"EF7C}}
+ \expandafter\def\csname simpleicon@jordanicon\endcsname {\simpleiconsmap\symbol{"EF7D}}
+ \expandafter\def\csname simpleicon@jouavicon\endcsname {\simpleiconsmap\symbol{"EF7E}}
+ \expandafter\def\csname simpleicon@jovianicon\endcsname {\simpleiconsmap\symbol{"EF7F}}
+ \expandafter\def\csname simpleicon@jpegicon\endcsname {\simpleiconsmap\symbol{"EF80}}
+ \expandafter\def\csname simpleicon@jqueryicon\endcsname {\simpleiconsmap\symbol{"EF81}}
+ \expandafter\def\csname simpleicon@jrgroupicon\endcsname {\simpleiconsmap\symbol{"EF82}}
+ \expandafter\def\csname simpleicon@jsdelivricon\endcsname {\simpleiconsmap\symbol{"EF83}}
+ \expandafter\def\csname simpleicon@jsfiddleicon\endcsname {\simpleiconsmap\symbol{"EF84}}
+ \expandafter\def\csname simpleicon@jsonicon\endcsname {\simpleiconsmap\symbol{"EF85}}
+ \expandafter\def\csname simpleicon@jsonwebtokensicon\endcsname {\simpleiconsmap\symbol{"EF86}}
+ \expandafter\def\csname simpleicon@jsricon\endcsname {\simpleiconsmap\symbol{"EF87}}
+ \expandafter\def\csname simpleicon@jssicon\endcsname {\simpleiconsmap\symbol{"EF88}}
+ \expandafter\def\csname simpleicon@juceicon\endcsname {\simpleiconsmap\symbol{"EF89}}
+ \expandafter\def\csname simpleicon@juejinicon\endcsname {\simpleiconsmap\symbol{"EF8A}}
+ \expandafter\def\csname simpleicon@jukeicon\endcsname {\simpleiconsmap\symbol{"EF8B}}
+ \expandafter\def\csname simpleicon@juliaicon\endcsname {\simpleiconsmap\symbol{"EF8C}}
+ \expandafter\def\csname simpleicon@junipernetworksicon\endcsname {\simpleiconsmap\symbol{"EF8D}}
+ \expandafter\def\csname simpleicon@junit5icon\endcsname {\simpleiconsmap\symbol{"EF8E}}
+ \expandafter\def\csname simpleicon@jupytericon\endcsname {\simpleiconsmap\symbol{"EF8F}}
+ \expandafter\def\csname simpleicon@justeaticon\endcsname {\simpleiconsmap\symbol{"EF90}}
+ \expandafter\def\csname simpleicon@justgivingicon\endcsname {\simpleiconsmap\symbol{"EF91}}
+ \expandafter\def\csname simpleicon@k3sicon\endcsname {\simpleiconsmap\symbol{"EF92}}
+ \expandafter\def\csname simpleicon@k6icon\endcsname {\simpleiconsmap\symbol{"EF93}}
+ \expandafter\def\csname simpleicon@kaggleicon\endcsname {\simpleiconsmap\symbol{"EF94}}
+ \expandafter\def\csname simpleicon@kagiicon\endcsname {\simpleiconsmap\symbol{"EF95}}
+ \expandafter\def\csname simpleicon@kahooticon\endcsname {\simpleiconsmap\symbol{"EF96}}
+ \expandafter\def\csname simpleicon@kaiosicon\endcsname {\simpleiconsmap\symbol{"EF97}}
+ \expandafter\def\csname simpleicon@kakaoicon\endcsname {\simpleiconsmap\symbol{"EF98}}
+ \expandafter\def\csname simpleicon@kakaotalkicon\endcsname {\simpleiconsmap\symbol{"EF99}}
+ \expandafter\def\csname simpleicon@kalilinuxicon\endcsname {\simpleiconsmap\symbol{"EF9A}}
+ \expandafter\def\csname simpleicon@kamailioicon\endcsname {\simpleiconsmap\symbol{"EF9B}}
+ \expandafter\def\csname simpleicon@kanikoicon\endcsname {\simpleiconsmap\symbol{"EF9C}}
+ \expandafter\def\csname simpleicon@karlsruherverkehrsverbundicon\endcsname {\simpleiconsmap\symbol{"EF9D}}
+ \expandafter\def\csname simpleicon@kasasmarticon\endcsname {\simpleiconsmap\symbol{"EF9E}}
+ \expandafter\def\csname simpleicon@kashflowicon\endcsname {\simpleiconsmap\symbol{"EF9F}}
+ \expandafter\def\csname simpleicon@kasperskyicon\endcsname {\simpleiconsmap\symbol{"EFA0}}
+ \expandafter\def\csname simpleicon@katacodaicon\endcsname {\simpleiconsmap\symbol{"EFA1}}
+ \expandafter\def\csname simpleicon@katanaicon\endcsname {\simpleiconsmap\symbol{"EFA2}}
+ \expandafter\def\csname simpleicon@kauflandicon\endcsname {\simpleiconsmap\symbol{"EFA3}}
+ \expandafter\def\csname simpleicon@kdeicon\endcsname {\simpleiconsmap\symbol{"EFA4}}
+ \expandafter\def\csname simpleicon@kdenliveicon\endcsname {\simpleiconsmap\symbol{"EFA5}}
+ \expandafter\def\csname simpleicon@kedroicon\endcsname {\simpleiconsmap\symbol{"EFA6}}
+ \expandafter\def\csname simpleicon@keeneticicon\endcsname {\simpleiconsmap\symbol{"EFA7}}
+ \expandafter\def\csname simpleicon@keepachangelogicon\endcsname {\simpleiconsmap\symbol{"EFA8}}
+ \expandafter\def\csname simpleicon@keepassxcicon\endcsname {\simpleiconsmap\symbol{"EFA9}}
+ \expandafter\def\csname simpleicon@kenticoicon\endcsname {\simpleiconsmap\symbol{"EFAA}}
+ \expandafter\def\csname simpleicon@kerasicon\endcsname {\simpleiconsmap\symbol{"EFAB}}
+ \expandafter\def\csname simpleicon@keybaseicon\endcsname {\simpleiconsmap\symbol{"EFAC}}
+ \expandafter\def\csname simpleicon@keycdnicon\endcsname {\simpleiconsmap\symbol{"EFAD}}
+ \expandafter\def\csname simpleicon@keycloakicon\endcsname {\simpleiconsmap\symbol{"EFAE}}
+ \expandafter\def\csname simpleicon@keystoneicon\endcsname {\simpleiconsmap\symbol{"EFAF}}
+ \expandafter\def\csname simpleicon@kfcicon\endcsname {\simpleiconsmap\symbol{"EFB0}}
+ \expandafter\def\csname simpleicon@khanacademyicon\endcsname {\simpleiconsmap\symbol{"EFB1}}
+ \expandafter\def\csname simpleicon@khronosgroupicon\endcsname {\simpleiconsmap\symbol{"EFB2}}
+ \expandafter\def\csname simpleicon@kiaicon\endcsname {\simpleiconsmap\symbol{"EFB3}}
+ \expandafter\def\csname simpleicon@kibanaicon\endcsname {\simpleiconsmap\symbol{"EFB4}}
+ \expandafter\def\csname simpleicon@kicadicon\endcsname {\simpleiconsmap\symbol{"EFB5}}
+ \expandafter\def\csname simpleicon@kickicon\endcsname {\simpleiconsmap\symbol{"EFB6}}
+ \expandafter\def\csname simpleicon@kickstartericon\endcsname {\simpleiconsmap\symbol{"EFB7}}
+ \expandafter\def\csname simpleicon@kikicon\endcsname {\simpleiconsmap\symbol{"EFB8}}
+ \expandafter\def\csname simpleicon@kingstontechnologyicon\endcsname {\simpleiconsmap\symbol{"EFB9}}
+ \expandafter\def\csname simpleicon@kinopoiskicon\endcsname {\simpleiconsmap\symbol{"EFBA}}
+ \expandafter\def\csname simpleicon@kinstaicon\endcsname {\simpleiconsmap\symbol{"EFBB}}
+ \expandafter\def\csname simpleicon@kirbyicon\endcsname {\simpleiconsmap\symbol{"EFBC}}
+ \expandafter\def\csname simpleicon@kiticon\endcsname {\simpleiconsmap\symbol{"EFBD}}
+ \expandafter\def\csname simpleicon@kitsuicon\endcsname {\simpleiconsmap\symbol{"EFBE}}
+ \expandafter\def\csname simpleicon@klarnaicon\endcsname {\simpleiconsmap\symbol{"EFBF}}
+ \expandafter\def\csname simpleicon@klmicon\endcsname {\simpleiconsmap\symbol{"EFC0}}
+ \expandafter\def\csname simpleicon@klookicon\endcsname {\simpleiconsmap\symbol{"EFC1}}
+ \expandafter\def\csname simpleicon@knativeicon\endcsname {\simpleiconsmap\symbol{"EFC2}}
+ \expandafter\def\csname simpleicon@knexdotjsicon\endcsname {\simpleiconsmap\symbol{"EFC3}}
+ \expandafter\def\csname simpleicon@knimeicon\endcsname {\simpleiconsmap\symbol{"EFC4}}
+ \expandafter\def\csname simpleicon@knipicon\endcsname {\simpleiconsmap\symbol{"EFC5}}
+ \expandafter\def\csname simpleicon@knowledgebaseicon\endcsname {\simpleiconsmap\symbol{"EFC6}}
+ \expandafter\def\csname simpleicon@knownicon\endcsname {\simpleiconsmap\symbol{"EFC7}}
+ \expandafter\def\csname simpleicon@koaicon\endcsname {\simpleiconsmap\symbol{"EFC8}}
+ \expandafter\def\csname simpleicon@kocicon\endcsname {\simpleiconsmap\symbol{"EFC9}}
+ \expandafter\def\csname simpleicon@kodakicon\endcsname {\simpleiconsmap\symbol{"EFCA}}
+ \expandafter\def\csname simpleicon@kodiicon\endcsname {\simpleiconsmap\symbol{"EFCB}}
+ \expandafter\def\csname simpleicon@koenigseggicon\endcsname {\simpleiconsmap\symbol{"EFCC}}
+ \expandafter\def\csname simpleicon@kofaxicon\endcsname {\simpleiconsmap\symbol{"EFCD}}
+ \expandafter\def\csname simpleicon@kofiicon\endcsname {\simpleiconsmap\symbol{"EFCE}}
+ \expandafter\def\csname simpleicon@komooticon\endcsname {\simpleiconsmap\symbol{"EFCF}}
+ \expandafter\def\csname simpleicon@konamiicon\endcsname {\simpleiconsmap\symbol{"EFD0}}
+ \expandafter\def\csname simpleicon@kongicon\endcsname {\simpleiconsmap\symbol{"EFD1}}
+ \expandafter\def\csname simpleicon@kongregateicon\endcsname {\simpleiconsmap\symbol{"EFD2}}
+ \expandafter\def\csname simpleicon@konvaicon\endcsname {\simpleiconsmap\symbol{"EFD3}}
+ \expandafter\def\csname simpleicon@kotlinicon\endcsname {\simpleiconsmap\symbol{"EFD4}}
+ \expandafter\def\csname simpleicon@koyebicon\endcsname {\simpleiconsmap\symbol{"EFD5}}
+ \expandafter\def\csname simpleicon@kritaicon\endcsname {\simpleiconsmap\symbol{"EFD6}}
+ \expandafter\def\csname simpleicon@ktmicon\endcsname {\simpleiconsmap\symbol{"EFD7}}
+ \expandafter\def\csname simpleicon@ktoricon\endcsname {\simpleiconsmap\symbol{"EFD8}}
+ \expandafter\def\csname simpleicon@kuaishouicon\endcsname {\simpleiconsmap\symbol{"EFD9}}
+ \expandafter\def\csname simpleicon@kubernetesicon\endcsname {\simpleiconsmap\symbol{"EFDA}}
+ \expandafter\def\csname simpleicon@kubuntuicon\endcsname {\simpleiconsmap\symbol{"EFDB}}
+ \expandafter\def\csname simpleicon@kucoinicon\endcsname {\simpleiconsmap\symbol{"EFDC}}
+ \expandafter\def\csname simpleicon@kumaicon\endcsname {\simpleiconsmap\symbol{"EFDD}}
+ \expandafter\def\csname simpleicon@kununuicon\endcsname {\simpleiconsmap\symbol{"EFDE}}
+ \expandafter\def\csname simpleicon@kuulaicon\endcsname {\simpleiconsmap\symbol{"EFDF}}
+ \expandafter\def\csname simpleicon@kxicon\endcsname {\simpleiconsmap\symbol{"EFE0}}
+ \expandafter\def\csname simpleicon@kyoceraicon\endcsname {\simpleiconsmap\symbol{"EFE1}}
+ \expandafter\def\csname simpleicon@labviewicon\endcsname {\simpleiconsmap\symbol{"EFE2}}
+ \expandafter\def\csname simpleicon@ladaicon\endcsname {\simpleiconsmap\symbol{"EFE3}}
+ \expandafter\def\csname simpleicon@lamborghiniicon\endcsname {\simpleiconsmap\symbol{"EFE4}}
+ \expandafter\def\csname simpleicon@landrovericon\endcsname {\simpleiconsmap\symbol{"EFE5}}
+ \expandafter\def\csname simpleicon@langchainicon\endcsname {\simpleiconsmap\symbol{"EFE6}}
+ \expandafter\def\csname simpleicon@lapceicon\endcsname {\simpleiconsmap\symbol{"EFE7}}
+ \expandafter\def\csname simpleicon@laragonicon\endcsname {\simpleiconsmap\symbol{"EFE8}}
+ \expandafter\def\csname simpleicon@laravelicon\endcsname {\simpleiconsmap\symbol{"EFE9}}
+ \expandafter\def\csname simpleicon@laravelhorizonicon\endcsname {\simpleiconsmap\symbol{"EFEA}}
+ \expandafter\def\csname simpleicon@laravelnovaicon\endcsname {\simpleiconsmap\symbol{"EFEB}}
+ \expandafter\def\csname simpleicon@lastdotfmicon\endcsname {\simpleiconsmap\symbol{"EFEC}}
+ \expandafter\def\csname simpleicon@lastpassicon\endcsname {\simpleiconsmap\symbol{"EFED}}
+ \expandafter\def\csname simpleicon@latexicon\endcsname {\simpleiconsmap\symbol{"EFEE}}
+ \expandafter\def\csname simpleicon@launchpadicon\endcsname {\simpleiconsmap\symbol{"EFEF}}
+ \expandafter\def\csname simpleicon@lazarusicon\endcsname {\simpleiconsmap\symbol{"EFF0}}
+ \expandafter\def\csname simpleicon@lazyvimicon\endcsname {\simpleiconsmap\symbol{"EFF1}}
+ \expandafter\def\csname simpleicon@lbryicon\endcsname {\simpleiconsmap\symbol{"EFF2}}
+ \expandafter\def\csname simpleicon@leaderpriceicon\endcsname {\simpleiconsmap\symbol{"EFF3}}
+ \expandafter\def\csname simpleicon@leafleticon\endcsname {\simpleiconsmap\symbol{"EFF4}}
+ \expandafter\def\csname simpleicon@leagueoflegendsicon\endcsname {\simpleiconsmap\symbol{"EFF5}}
+ \expandafter\def\csname simpleicon@leanpubicon\endcsname {\simpleiconsmap\symbol{"EFF6}}
+ \expandafter\def\csname simpleicon@leetcodeicon\endcsname {\simpleiconsmap\symbol{"EFF7}}
+ \expandafter\def\csname simpleicon@legacygamesicon\endcsname {\simpleiconsmap\symbol{"EFF8}}
+ \expandafter\def\csname simpleicon@leicaicon\endcsname {\simpleiconsmap\symbol{"EFF9}}
+ \expandafter\def\csname simpleicon@lemmyicon\endcsname {\simpleiconsmap\symbol{"EFFA}}
+ \expandafter\def\csname simpleicon@lemonsqueezyicon\endcsname {\simpleiconsmap\symbol{"EFFB}}
+ \expandafter\def\csname simpleicon@lenovoicon\endcsname {\simpleiconsmap\symbol{"EFFC}}
+ \expandafter\def\csname simpleicon@lensicon\endcsname {\simpleiconsmap\symbol{"EFFD}}
+ \expandafter\def\csname simpleicon@leptosicon\endcsname {\simpleiconsmap\symbol{"EFFE}}
+ \expandafter\def\csname simpleicon@lequipeicon\endcsname {\simpleiconsmap\symbol{"EFFF}}
+ \expandafter\def\csname simpleicon@lernaicon\endcsname {\simpleiconsmap\symbol{"F000}}
+ \expandafter\def\csname simpleicon@leroymerlinicon\endcsname {\simpleiconsmap\symbol{"F001}}
+ \expandafter\def\csname simpleicon@leslibrairesicon\endcsname {\simpleiconsmap\symbol{"F002}}
+ \expandafter\def\csname simpleicon@lessicon\endcsname {\simpleiconsmap\symbol{"F003}}
+ \expandafter\def\csname simpleicon@letsencrypticon\endcsname {\simpleiconsmap\symbol{"F004}}
+ \expandafter\def\csname simpleicon@letterboxdicon\endcsname {\simpleiconsmap\symbol{"F005}}
+ \expandafter\def\csname simpleicon@levelsdotfyiicon\endcsname {\simpleiconsmap\symbol{"F006}}
+ \expandafter\def\csname simpleicon@lgicon\endcsname {\simpleiconsmap\symbol{"F007}}
+ \expandafter\def\csname simpleicon@liberadotchaticon\endcsname {\simpleiconsmap\symbol{"F008}}
+ \expandafter\def\csname simpleicon@liberapayicon\endcsname {\simpleiconsmap\symbol{"F009}}
+ \expandafter\def\csname simpleicon@librariesdotioicon\endcsname {\simpleiconsmap\symbol{"F00A}}
+ \expandafter\def\csname simpleicon@librarythingicon\endcsname {\simpleiconsmap\symbol{"F00B}}
+ \expandafter\def\csname simpleicon@libreofficeicon\endcsname {\simpleiconsmap\symbol{"F00C}}
+ \expandafter\def\csname simpleicon@libreofficebaseicon\endcsname {\simpleiconsmap\symbol{"F00D}}
+ \expandafter\def\csname simpleicon@libreofficecalcicon\endcsname {\simpleiconsmap\symbol{"F00E}}
+ \expandafter\def\csname simpleicon@libreofficedrawicon\endcsname {\simpleiconsmap\symbol{"F00F}}
+ \expandafter\def\csname simpleicon@libreofficeimpressicon\endcsname {\simpleiconsmap\symbol{"F010}}
+ \expandafter\def\csname simpleicon@libreofficemathicon\endcsname {\simpleiconsmap\symbol{"F011}}
+ \expandafter\def\csname simpleicon@libreofficewritericon\endcsname {\simpleiconsmap\symbol{"F012}}
+ \expandafter\def\csname simpleicon@librewolficon\endcsname {\simpleiconsmap\symbol{"F013}}
+ \expandafter\def\csname simpleicon@libuvicon\endcsname {\simpleiconsmap\symbol{"F014}}
+ \expandafter\def\csname simpleicon@lichessicon\endcsname {\simpleiconsmap\symbol{"F015}}
+ \expandafter\def\csname simpleicon@lidlicon\endcsname {\simpleiconsmap\symbol{"F016}}
+ \expandafter\def\csname simpleicon@lifxicon\endcsname {\simpleiconsmap\symbol{"F017}}
+ \expandafter\def\csname simpleicon@lightburnicon\endcsname {\simpleiconsmap\symbol{"F018}}
+ \expandafter\def\csname simpleicon@lighthouseicon\endcsname {\simpleiconsmap\symbol{"F019}}
+ \expandafter\def\csname simpleicon@lightningicon\endcsname {\simpleiconsmap\symbol{"F01A}}
+ \expandafter\def\csname simpleicon@limesurveyicon\endcsname {\simpleiconsmap\symbol{"F01B}}
+ \expandafter\def\csname simpleicon@lineicon\endcsname {\simpleiconsmap\symbol{"F01C}}
+ \expandafter\def\csname simpleicon@lineageosicon\endcsname {\simpleiconsmap\symbol{"F01D}}
+ \expandafter\def\csname simpleicon@linearicon\endcsname {\simpleiconsmap\symbol{"F01E}}
+ \expandafter\def\csname simpleicon@liningicon\endcsname {\simpleiconsmap\symbol{"F01F}}
+ \expandafter\def\csname simpleicon@linkedinicon\endcsname {\simpleiconsmap\symbol{"F020}}
+ \expandafter\def\csname simpleicon@linkerdicon\endcsname {\simpleiconsmap\symbol{"F021}}
+ \expandafter\def\csname simpleicon@linkfireicon\endcsname {\simpleiconsmap\symbol{"F022}}
+ \expandafter\def\csname simpleicon@linksysicon\endcsname {\simpleiconsmap\symbol{"F023}}
+ \expandafter\def\csname simpleicon@linktreeicon\endcsname {\simpleiconsmap\symbol{"F024}}
+ \expandafter\def\csname simpleicon@lintcodeicon\endcsname {\simpleiconsmap\symbol{"F025}}
+ \expandafter\def\csname simpleicon@linuxicon\endcsname {\simpleiconsmap\symbol{"F026}}
+ \expandafter\def\csname simpleicon@linuxcontainersicon\endcsname {\simpleiconsmap\symbol{"F027}}
+ \expandafter\def\csname simpleicon@linuxfoundationicon\endcsname {\simpleiconsmap\symbol{"F028}}
+ \expandafter\def\csname simpleicon@linuxminticon\endcsname {\simpleiconsmap\symbol{"F029}}
+ \expandafter\def\csname simpleicon@linuxprofessionalinstituteicon\endcsname {\simpleiconsmap\symbol{"F02A}}
+ \expandafter\def\csname simpleicon@linuxservericon\endcsname {\simpleiconsmap\symbol{"F02B}}
+ \expandafter\def\csname simpleicon@lionairicon\endcsname {\simpleiconsmap\symbol{"F02C}}
+ \expandafter\def\csname simpleicon@liquibaseicon\endcsname {\simpleiconsmap\symbol{"F02D}}
+ \expandafter\def\csname simpleicon@listmonkicon\endcsname {\simpleiconsmap\symbol{"F02E}}
+ \expandafter\def\csname simpleicon@liticon\endcsname {\simpleiconsmap\symbol{"F02F}}
+ \expandafter\def\csname simpleicon@litecoinicon\endcsname {\simpleiconsmap\symbol{"F030}}
+ \expandafter\def\csname simpleicon@literalicon\endcsname {\simpleiconsmap\symbol{"F031}}
+ \expandafter\def\csname simpleicon@litiengineicon\endcsname {\simpleiconsmap\symbol{"F032}}
+ \expandafter\def\csname simpleicon@livechaticon\endcsname {\simpleiconsmap\symbol{"F033}}
+ \expandafter\def\csname simpleicon@livejournalicon\endcsname {\simpleiconsmap\symbol{"F034}}
+ \expandafter\def\csname simpleicon@livewireicon\endcsname {\simpleiconsmap\symbol{"F035}}
+ \expandafter\def\csname simpleicon@llvmicon\endcsname {\simpleiconsmap\symbol{"F036}}
+ \expandafter\def\csname simpleicon@lmmsicon\endcsname {\simpleiconsmap\symbol{"F037}}
+ \expandafter\def\csname simpleicon@lobstersicon\endcsname {\simpleiconsmap\symbol{"F038}}
+ \expandafter\def\csname simpleicon@localicon\endcsname {\simpleiconsmap\symbol{"F039}}
+ \expandafter\def\csname simpleicon@lodashicon\endcsname {\simpleiconsmap\symbol{"F03A}}
+ \expandafter\def\csname simpleicon@logitechicon\endcsname {\simpleiconsmap\symbol{"F03B}}
+ \expandafter\def\csname simpleicon@logitechgicon\endcsname {\simpleiconsmap\symbol{"F03C}}
+ \expandafter\def\csname simpleicon@logmeinicon\endcsname {\simpleiconsmap\symbol{"F03D}}
+ \expandafter\def\csname simpleicon@logseqicon\endcsname {\simpleiconsmap\symbol{"F03E}}
+ \expandafter\def\csname simpleicon@logstashicon\endcsname {\simpleiconsmap\symbol{"F03F}}
+ \expandafter\def\csname simpleicon@lookericon\endcsname {\simpleiconsmap\symbol{"F040}}
+ \expandafter\def\csname simpleicon@loomicon\endcsname {\simpleiconsmap\symbol{"F041}}
+ \expandafter\def\csname simpleicon@loopicon\endcsname {\simpleiconsmap\symbol{"F042}}
+ \expandafter\def\csname simpleicon@loopbackicon\endcsname {\simpleiconsmap\symbol{"F043}}
+ \expandafter\def\csname simpleicon@lootcrateicon\endcsname {\simpleiconsmap\symbol{"F044}}
+ \expandafter\def\csname simpleicon@lospecicon\endcsname {\simpleiconsmap\symbol{"F045}}
+ \expandafter\def\csname simpleicon@lotpolishairlinesicon\endcsname {\simpleiconsmap\symbol{"F046}}
+ \expandafter\def\csname simpleicon@ltspiceicon\endcsname {\simpleiconsmap\symbol{"F047}}
+ \expandafter\def\csname simpleicon@luaicon\endcsname {\simpleiconsmap\symbol{"F048}}
+ \expandafter\def\csname simpleicon@lubuntuicon\endcsname {\simpleiconsmap\symbol{"F049}}
+ \expandafter\def\csname simpleicon@luciaicon\endcsname {\simpleiconsmap\symbol{"F04A}}
+ \expandafter\def\csname simpleicon@lucidicon\endcsname {\simpleiconsmap\symbol{"F04B}}
+ \expandafter\def\csname simpleicon@ludwigicon\endcsname {\simpleiconsmap\symbol{"F04C}}
+ \expandafter\def\csname simpleicon@lufthansaicon\endcsname {\simpleiconsmap\symbol{"F04D}}
+ \expandafter\def\csname simpleicon@lumenicon\endcsname {\simpleiconsmap\symbol{"F04E}}
+ \expandafter\def\csname simpleicon@lunacyicon\endcsname {\simpleiconsmap\symbol{"F04F}}
+ \expandafter\def\csname simpleicon@lutrisicon\endcsname {\simpleiconsmap\symbol{"F050}}
+ \expandafter\def\csname simpleicon@lydiaicon\endcsname {\simpleiconsmap\symbol{"F051}}
+ \expandafter\def\csname simpleicon@lyfticon\endcsname {\simpleiconsmap\symbol{"F052}}
+ \expandafter\def\csname simpleicon@maasicon\endcsname {\simpleiconsmap\symbol{"F053}}
+ \expandafter\def\csname simpleicon@macosicon\endcsname {\simpleiconsmap\symbol{"F054}}
+ \expandafter\def\csname simpleicon@macpawicon\endcsname {\simpleiconsmap\symbol{"F055}}
+ \expandafter\def\csname simpleicon@macysicon\endcsname {\simpleiconsmap\symbol{"F056}}
+ \expandafter\def\csname simpleicon@magasinsuicon\endcsname {\simpleiconsmap\symbol{"F057}}
+ \expandafter\def\csname simpleicon@magentoicon\endcsname {\simpleiconsmap\symbol{"F058}}
+ \expandafter\def\csname simpleicon@magicicon\endcsname {\simpleiconsmap\symbol{"F059}}
+ \expandafter\def\csname simpleicon@magiskicon\endcsname {\simpleiconsmap\symbol{"F05A}}
+ \expandafter\def\csname simpleicon@mahindraicon\endcsname {\simpleiconsmap\symbol{"F05B}}
+ \expandafter\def\csname simpleicon@mailchimpicon\endcsname {\simpleiconsmap\symbol{"F05C}}
+ \expandafter\def\csname simpleicon@maildotcomicon\endcsname {\simpleiconsmap\symbol{"F05D}}
+ \expandafter\def\csname simpleicon@maildotruicon\endcsname {\simpleiconsmap\symbol{"F05E}}
+ \expandafter\def\csname simpleicon@mailgunicon\endcsname {\simpleiconsmap\symbol{"F05F}}
+ \expandafter\def\csname simpleicon@mailtrapicon\endcsname {\simpleiconsmap\symbol{"F060}}
+ \expandafter\def\csname simpleicon@mainwpicon\endcsname {\simpleiconsmap\symbol{"F061}}
+ \expandafter\def\csname simpleicon@majorleaguehackingicon\endcsname {\simpleiconsmap\symbol{"F062}}
+ \expandafter\def\csname simpleicon@makeicon\endcsname {\simpleiconsmap\symbol{"F063}}
+ \expandafter\def\csname simpleicon@makerboticon\endcsname {\simpleiconsmap\symbol{"F064}}
+ \expandafter\def\csname simpleicon@malticon\endcsname {\simpleiconsmap\symbol{"F065}}
+ \expandafter\def\csname simpleicon@malwarebytesicon\endcsname {\simpleiconsmap\symbol{"F066}}
+ \expandafter\def\csname simpleicon@mambauiicon\endcsname {\simpleiconsmap\symbol{"F067}}
+ \expandafter\def\csname simpleicon@mampicon\endcsname {\simpleiconsmap\symbol{"F068}}
+ \expandafter\def\csname simpleicon@manicon\endcsname {\simpleiconsmap\symbol{"F069}}
+ \expandafter\def\csname simpleicon@manageiqicon\endcsname {\simpleiconsmap\symbol{"F06A}}
+ \expandafter\def\csname simpleicon@manjaroicon\endcsname {\simpleiconsmap\symbol{"F06B}}
+ \expandafter\def\csname simpleicon@mantineicon\endcsname {\simpleiconsmap\symbol{"F06C}}
+ \expandafter\def\csname simpleicon@mapboxicon\endcsname {\simpleiconsmap\symbol{"F06D}}
+ \expandafter\def\csname simpleicon@maplibreicon\endcsname {\simpleiconsmap\symbol{"F06E}}
+ \expandafter\def\csname simpleicon@mariadbicon\endcsname {\simpleiconsmap\symbol{"F06F}}
+ \expandafter\def\csname simpleicon@mariadbfoundationicon\endcsname {\simpleiconsmap\symbol{"F070}}
+ \expandafter\def\csname simpleicon@markdownicon\endcsname {\simpleiconsmap\symbol{"F071}}
+ \expandafter\def\csname simpleicon@marketoicon\endcsname {\simpleiconsmap\symbol{"F072}}
+ \expandafter\def\csname simpleicon@markoicon\endcsname {\simpleiconsmap\symbol{"F073}}
+ \expandafter\def\csname simpleicon@marriotticon\endcsname {\simpleiconsmap\symbol{"F074}}
+ \expandafter\def\csname simpleicon@marvelappicon\endcsname {\simpleiconsmap\symbol{"F075}}
+ \expandafter\def\csname simpleicon@maseratiicon\endcsname {\simpleiconsmap\symbol{"F076}}
+ \expandafter\def\csname simpleicon@mastercardicon\endcsname {\simpleiconsmap\symbol{"F077}}
+ \expandafter\def\csname simpleicon@mastercomfigicon\endcsname {\simpleiconsmap\symbol{"F078}}
+ \expandafter\def\csname simpleicon@mastodonicon\endcsname {\simpleiconsmap\symbol{"F079}}
+ \expandafter\def\csname simpleicon@materialdesignicon\endcsname {\simpleiconsmap\symbol{"F07A}}
+ \expandafter\def\csname simpleicon@materialdesigniconsicon\endcsname {\simpleiconsmap\symbol{"F07B}}
+ \expandafter\def\csname simpleicon@materialformkdocsicon\endcsname {\simpleiconsmap\symbol{"F07C}}
+ \expandafter\def\csname simpleicon@matillionicon\endcsname {\simpleiconsmap\symbol{"F07D}}
+ \expandafter\def\csname simpleicon@matomoicon\endcsname {\simpleiconsmap\symbol{"F07E}}
+ \expandafter\def\csname simpleicon@matrixicon\endcsname {\simpleiconsmap\symbol{"F07F}}
+ \expandafter\def\csname simpleicon@matterdotjsicon\endcsname {\simpleiconsmap\symbol{"F080}}
+ \expandafter\def\csname simpleicon@mattermosticon\endcsname {\simpleiconsmap\symbol{"F081}}
+ \expandafter\def\csname simpleicon@matterneticon\endcsname {\simpleiconsmap\symbol{"F082}}
+ \expandafter\def\csname simpleicon@mauticicon\endcsname {\simpleiconsmap\symbol{"F083}}
+ \expandafter\def\csname simpleicon@maxicon\endcsname {\simpleiconsmap\symbol{"F084}}
+ \expandafter\def\csname simpleicon@maxplanckgesellschafticon\endcsname {\simpleiconsmap\symbol{"F085}}
+ \expandafter\def\csname simpleicon@maytagicon\endcsname {\simpleiconsmap\symbol{"F086}}
+ \expandafter\def\csname simpleicon@mazdaicon\endcsname {\simpleiconsmap\symbol{"F087}}
+ \expandafter\def\csname simpleicon@mcafeeicon\endcsname {\simpleiconsmap\symbol{"F088}}
+ \expandafter\def\csname simpleicon@mcdonaldsicon\endcsname {\simpleiconsmap\symbol{"F089}}
+ \expandafter\def\csname simpleicon@mclarenicon\endcsname {\simpleiconsmap\symbol{"F08A}}
+ \expandafter\def\csname simpleicon@mdbookicon\endcsname {\simpleiconsmap\symbol{"F08B}}
+ \expandafter\def\csname simpleicon@mdnwebdocsicon\endcsname {\simpleiconsmap\symbol{"F08C}}
+ \expandafter\def\csname simpleicon@mdxicon\endcsname {\simpleiconsmap\symbol{"F08D}}
+ \expandafter\def\csname simpleicon@mediafireicon\endcsname {\simpleiconsmap\symbol{"F08E}}
+ \expandafter\def\csname simpleicon@mediamarkticon\endcsname {\simpleiconsmap\symbol{"F08F}}
+ \expandafter\def\csname simpleicon@mediatekicon\endcsname {\simpleiconsmap\symbol{"F090}}
+ \expandafter\def\csname simpleicon@medibangpainticon\endcsname {\simpleiconsmap\symbol{"F091}}
+ \expandafter\def\csname simpleicon@mediumicon\endcsname {\simpleiconsmap\symbol{"F092}}
+ \expandafter\def\csname simpleicon@medusaicon\endcsname {\simpleiconsmap\symbol{"F093}}
+ \expandafter\def\csname simpleicon@meetupicon\endcsname {\simpleiconsmap\symbol{"F094}}
+ \expandafter\def\csname simpleicon@megaicon\endcsname {\simpleiconsmap\symbol{"F095}}
+ \expandafter\def\csname simpleicon@meilisearchicon\endcsname {\simpleiconsmap\symbol{"F096}}
+ \expandafter\def\csname simpleicon@meituanicon\endcsname {\simpleiconsmap\symbol{"F097}}
+ \expandafter\def\csname simpleicon@meizuicon\endcsname {\simpleiconsmap\symbol{"F098}}
+ \expandafter\def\csname simpleicon@mendeleyicon\endcsname {\simpleiconsmap\symbol{"F099}}
+ \expandafter\def\csname simpleicon@mentorcruiseicon\endcsname {\simpleiconsmap\symbol{"F09A}}
+ \expandafter\def\csname simpleicon@mercadopagoicon\endcsname {\simpleiconsmap\symbol{"F09B}}
+ \expandafter\def\csname simpleicon@mercedesicon\endcsname {\simpleiconsmap\symbol{"F09C}}
+ \expandafter\def\csname simpleicon@merckicon\endcsname {\simpleiconsmap\symbol{"F09D}}
+ \expandafter\def\csname simpleicon@mercurialicon\endcsname {\simpleiconsmap\symbol{"F09E}}
+ \expandafter\def\csname simpleicon@mermaidicon\endcsname {\simpleiconsmap\symbol{"F09F}}
+ \expandafter\def\csname simpleicon@messengericon\endcsname {\simpleiconsmap\symbol{"F0A0}}
+ \expandafter\def\csname simpleicon@metaicon\endcsname {\simpleiconsmap\symbol{"F0A1}}
+ \expandafter\def\csname simpleicon@metabaseicon\endcsname {\simpleiconsmap\symbol{"F0A2}}
+ \expandafter\def\csname simpleicon@metacriticicon\endcsname {\simpleiconsmap\symbol{"F0A3}}
+ \expandafter\def\csname simpleicon@metafiltericon\endcsname {\simpleiconsmap\symbol{"F0A4}}
+ \expandafter\def\csname simpleicon@metasploiticon\endcsname {\simpleiconsmap\symbol{"F0A5}}
+ \expandafter\def\csname simpleicon@meteoricon\endcsname {\simpleiconsmap\symbol{"F0A6}}
+ \expandafter\def\csname simpleicon@metroicon\endcsname {\simpleiconsmap\symbol{"F0A7}}
+ \expandafter\def\csname simpleicon@metrodelaciudaddemexicoicon\endcsname {\simpleiconsmap\symbol{"F0A8}}
+ \expandafter\def\csname simpleicon@metrodemadridicon\endcsname {\simpleiconsmap\symbol{"F0A9}}
+ \expandafter\def\csname simpleicon@metrodeparisicon\endcsname {\simpleiconsmap\symbol{"F0AA}}
+ \expandafter\def\csname simpleicon@meweicon\endcsname {\simpleiconsmap\symbol{"F0AB}}
+ \expandafter\def\csname simpleicon@mgicon\endcsname {\simpleiconsmap\symbol{"F0AC}}
+ \expandafter\def\csname simpleicon@microbiticon\endcsname {\simpleiconsmap\symbol{"F0AD}}
+ \expandafter\def\csname simpleicon@microdotblogicon\endcsname {\simpleiconsmap\symbol{"F0AE}}
+ \expandafter\def\csname simpleicon@microeditoricon\endcsname {\simpleiconsmap\symbol{"F0AF}}
+ \expandafter\def\csname simpleicon@microgeneticsicon\endcsname {\simpleiconsmap\symbol{"F0B0}}
+ \expandafter\def\csname simpleicon@micropythonicon\endcsname {\simpleiconsmap\symbol{"F0B1}}
+ \expandafter\def\csname simpleicon@microstationicon\endcsname {\simpleiconsmap\symbol{"F0B2}}
+ \expandafter\def\csname simpleicon@microstrategyicon\endcsname {\simpleiconsmap\symbol{"F0B3}}
+ \expandafter\def\csname simpleicon@midiicon\endcsname {\simpleiconsmap\symbol{"F0B4}}
+ \expandafter\def\csname simpleicon@migaduicon\endcsname {\simpleiconsmap\symbol{"F0B5}}
+ \expandafter\def\csname simpleicon@mikrotikicon\endcsname {\simpleiconsmap\symbol{"F0B6}}
+ \expandafter\def\csname simpleicon@milanoteicon\endcsname {\simpleiconsmap\symbol{"F0B7}}
+ \expandafter\def\csname simpleicon@milvusicon\endcsname {\simpleiconsmap\symbol{"F0B8}}
+ \expandafter\def\csname simpleicon@mindsicon\endcsname {\simpleiconsmap\symbol{"F0B9}}
+ \expandafter\def\csname simpleicon@minetesticon\endcsname {\simpleiconsmap\symbol{"F0BA}}
+ \expandafter\def\csname simpleicon@mingww64icon\endcsname {\simpleiconsmap\symbol{"F0BB}}
+ \expandafter\def\csname simpleicon@miniicon\endcsname {\simpleiconsmap\symbol{"F0BC}}
+ \expandafter\def\csname simpleicon@minioicon\endcsname {\simpleiconsmap\symbol{"F0BD}}
+ \expandafter\def\csname simpleicon@mintlifyicon\endcsname {\simpleiconsmap\symbol{"F0BE}}
+ \expandafter\def\csname simpleicon@minutemailericon\endcsname {\simpleiconsmap\symbol{"F0BF}}
+ \expandafter\def\csname simpleicon@mirahezeicon\endcsname {\simpleiconsmap\symbol{"F0C0}}
+ \expandafter\def\csname simpleicon@miroicon\endcsname {\simpleiconsmap\symbol{"F0C1}}
+ \expandafter\def\csname simpleicon@misskeyicon\endcsname {\simpleiconsmap\symbol{"F0C2}}
+ \expandafter\def\csname simpleicon@mitsubishiicon\endcsname {\simpleiconsmap\symbol{"F0C3}}
+ \expandafter\def\csname simpleicon@mixicon\endcsname {\simpleiconsmap\symbol{"F0C4}}
+ \expandafter\def\csname simpleicon@mixcloudicon\endcsname {\simpleiconsmap\symbol{"F0C5}}
+ \expandafter\def\csname simpleicon@mixpanelicon\endcsname {\simpleiconsmap\symbol{"F0C6}}
+ \expandafter\def\csname simpleicon@mlbicon\endcsname {\simpleiconsmap\symbol{"F0C7}}
+ \expandafter\def\csname simpleicon@mlflowicon\endcsname {\simpleiconsmap\symbol{"F0C8}}
+ \expandafter\def\csname simpleicon@mobxicon\endcsname {\simpleiconsmap\symbol{"F0C9}}
+ \expandafter\def\csname simpleicon@mobxstatetreeicon\endcsname {\simpleiconsmap\symbol{"F0CA}}
+ \expandafter\def\csname simpleicon@mochaicon\endcsname {\simpleiconsmap\symbol{"F0CB}}
+ \expandafter\def\csname simpleicon@mockserviceworkericon\endcsname {\simpleiconsmap\symbol{"F0CC}}
+ \expandafter\def\csname simpleicon@modalicon\endcsname {\simpleiconsmap\symbol{"F0CD}}
+ \expandafter\def\csname simpleicon@modinicon\endcsname {\simpleiconsmap\symbol{"F0CE}}
+ \expandafter\def\csname simpleicon@modrinthicon\endcsname {\simpleiconsmap\symbol{"F0CF}}
+ \expandafter\def\csname simpleicon@modxicon\endcsname {\simpleiconsmap\symbol{"F0D0}}
+ \expandafter\def\csname simpleicon@moleculericon\endcsname {\simpleiconsmap\symbol{"F0D1}}
+ \expandafter\def\csname simpleicon@momenteoicon\endcsname {\simpleiconsmap\symbol{"F0D2}}
+ \expandafter\def\csname simpleicon@moneroicon\endcsname {\simpleiconsmap\symbol{"F0D3}}
+ \expandafter\def\csname simpleicon@moneygramicon\endcsname {\simpleiconsmap\symbol{"F0D4}}
+ \expandafter\def\csname simpleicon@mongodbicon\endcsname {\simpleiconsmap\symbol{"F0D5}}
+ \expandafter\def\csname simpleicon@mongooseicon\endcsname {\simpleiconsmap\symbol{"F0D6}}
+ \expandafter\def\csname simpleicon@mongoosedotwsicon\endcsname {\simpleiconsmap\symbol{"F0D7}}
+ \expandafter\def\csname simpleicon@monicaicon\endcsname {\simpleiconsmap\symbol{"F0D8}}
+ \expandafter\def\csname simpleicon@monkeytieicon\endcsname {\simpleiconsmap\symbol{"F0D9}}
+ \expandafter\def\csname simpleicon@monkeytypeicon\endcsname {\simpleiconsmap\symbol{"F0DA}}
+ \expandafter\def\csname simpleicon@monogameicon\endcsname {\simpleiconsmap\symbol{"F0DB}}
+ \expandafter\def\csname simpleicon@monoprixicon\endcsname {\simpleiconsmap\symbol{"F0DC}}
+ \expandafter\def\csname simpleicon@monstericon\endcsname {\simpleiconsmap\symbol{"F0DD}}
+ \expandafter\def\csname simpleicon@monzoicon\endcsname {\simpleiconsmap\symbol{"F0DE}}
+ \expandafter\def\csname simpleicon@mooicon\endcsname {\simpleiconsmap\symbol{"F0DF}}
+ \expandafter\def\csname simpleicon@moodleicon\endcsname {\simpleiconsmap\symbol{"F0E0}}
+ \expandafter\def\csname simpleicon@moonrepoicon\endcsname {\simpleiconsmap\symbol{"F0E1}}
+ \expandafter\def\csname simpleicon@moqicon\endcsname {\simpleiconsmap\symbol{"F0E2}}
+ \expandafter\def\csname simpleicon@moqupsicon\endcsname {\simpleiconsmap\symbol{"F0E3}}
+ \expandafter\def\csname simpleicon@morrisonsicon\endcsname {\simpleiconsmap\symbol{"F0E4}}
+ \expandafter\def\csname simpleicon@moscowmetroicon\endcsname {\simpleiconsmap\symbol{"F0E5}}
+ \expandafter\def\csname simpleicon@motorolaicon\endcsname {\simpleiconsmap\symbol{"F0E6}}
+ \expandafter\def\csname simpleicon@mozillaicon\endcsname {\simpleiconsmap\symbol{"F0E7}}
+ \expandafter\def\csname simpleicon@mpvicon\endcsname {\simpleiconsmap\symbol{"F0E8}}
+ \expandafter\def\csname simpleicon@mqtticon\endcsname {\simpleiconsmap\symbol{"F0E9}}
+ \expandafter\def\csname simpleicon@msiicon\endcsname {\simpleiconsmap\symbol{"F0EA}}
+ \expandafter\def\csname simpleicon@msibusinessicon\endcsname {\simpleiconsmap\symbol{"F0EB}}
+ \expandafter\def\csname simpleicon@mtaicon\endcsname {\simpleiconsmap\symbol{"F0EC}}
+ \expandafter\def\csname simpleicon@mtricon\endcsname {\simpleiconsmap\symbol{"F0ED}}
+ \expandafter\def\csname simpleicon@mubiicon\endcsname {\simpleiconsmap\symbol{"F0EE}}
+ \expandafter\def\csname simpleicon@muiicon\endcsname {\simpleiconsmap\symbol{"F0EF}}
+ \expandafter\def\csname simpleicon@mulesofticon\endcsname {\simpleiconsmap\symbol{"F0F0}}
+ \expandafter\def\csname simpleicon@mullericon\endcsname {\simpleiconsmap\symbol{"F0F1}}
+ \expandafter\def\csname simpleicon@multisimicon\endcsname {\simpleiconsmap\symbol{"F0F2}}
+ \expandafter\def\csname simpleicon@mumbleicon\endcsname {\simpleiconsmap\symbol{"F0F3}}
+ \expandafter\def\csname simpleicon@muoicon\endcsname {\simpleiconsmap\symbol{"F0F4}}
+ \expandafter\def\csname simpleicon@muralicon\endcsname {\simpleiconsmap\symbol{"F0F5}}
+ \expandafter\def\csname simpleicon@musescoreicon\endcsname {\simpleiconsmap\symbol{"F0F6}}
+ \expandafter\def\csname simpleicon@musicbrainzicon\endcsname {\simpleiconsmap\symbol{"F0F7}}
+ \expandafter\def\csname simpleicon@mxlinuxicon\endcsname {\simpleiconsmap\symbol{"F0F8}}
+ \expandafter\def\csname simpleicon@myanimelisticon\endcsname {\simpleiconsmap\symbol{"F0F9}}
+ \expandafter\def\csname simpleicon@mygeticon\endcsname {\simpleiconsmap\symbol{"F0FA}}
+ \expandafter\def\csname simpleicon@myobicon\endcsname {\simpleiconsmap\symbol{"F0FB}}
+ \expandafter\def\csname simpleicon@myspaceicon\endcsname {\simpleiconsmap\symbol{"F0FC}}
+ \expandafter\def\csname simpleicon@mysqlicon\endcsname {\simpleiconsmap\symbol{"F0FD}}
+ \expandafter\def\csname simpleicon@n26icon\endcsname {\simpleiconsmap\symbol{"F0FE}}
+ \expandafter\def\csname simpleicon@n8nicon\endcsname {\simpleiconsmap\symbol{"F0FF}}
+ \expandafter\def\csname simpleicon@namebaseicon\endcsname {\simpleiconsmap\symbol{"F100}}
+ \expandafter\def\csname simpleicon@namecheapicon\endcsname {\simpleiconsmap\symbol{"F101}}
+ \expandafter\def\csname simpleicon@namemcicon\endcsname {\simpleiconsmap\symbol{"F102}}
+ \expandafter\def\csname simpleicon@namesiloicon\endcsname {\simpleiconsmap\symbol{"F103}}
+ \expandafter\def\csname simpleicon@namuwikiicon\endcsname {\simpleiconsmap\symbol{"F104}}
+ \expandafter\def\csname simpleicon@nanoicon\endcsname {\simpleiconsmap\symbol{"F105}}
+ \expandafter\def\csname simpleicon@nasaicon\endcsname {\simpleiconsmap\symbol{"F106}}
+ \expandafter\def\csname simpleicon@nationalgridicon\endcsname {\simpleiconsmap\symbol{"F107}}
+ \expandafter\def\csname simpleicon@nationalrailicon\endcsname {\simpleiconsmap\symbol{"F108}}
+ \expandafter\def\csname simpleicon@nativescripticon\endcsname {\simpleiconsmap\symbol{"F109}}
+ \expandafter\def\csname simpleicon@natsdotioicon\endcsname {\simpleiconsmap\symbol{"F10A}}
+ \expandafter\def\csname simpleicon@navericon\endcsname {\simpleiconsmap\symbol{"F10B}}
+ \expandafter\def\csname simpleicon@nbaicon\endcsname {\simpleiconsmap\symbol{"F10C}}
+ \expandafter\def\csname simpleicon@nbbicon\endcsname {\simpleiconsmap\symbol{"F10D}}
+ \expandafter\def\csname simpleicon@nbcicon\endcsname {\simpleiconsmap\symbol{"F10E}}
+ \expandafter\def\csname simpleicon@ndricon\endcsname {\simpleiconsmap\symbol{"F10F}}
+ \expandafter\def\csname simpleicon@nearicon\endcsname {\simpleiconsmap\symbol{"F110}}
+ \expandafter\def\csname simpleicon@necicon\endcsname {\simpleiconsmap\symbol{"F111}}
+ \expandafter\def\csname simpleicon@neo4jicon\endcsname {\simpleiconsmap\symbol{"F112}}
+ \expandafter\def\csname simpleicon@neovimicon\endcsname {\simpleiconsmap\symbol{"F113}}
+ \expandafter\def\csname simpleicon@neptuneicon\endcsname {\simpleiconsmap\symbol{"F114}}
+ \expandafter\def\csname simpleicon@nestjsicon\endcsname {\simpleiconsmap\symbol{"F115}}
+ \expandafter\def\csname simpleicon@netappicon\endcsname {\simpleiconsmap\symbol{"F116}}
+ \expandafter\def\csname simpleicon@netbsdicon\endcsname {\simpleiconsmap\symbol{"F117}}
+ \expandafter\def\csname simpleicon@netcupicon\endcsname {\simpleiconsmap\symbol{"F118}}
+ \expandafter\def\csname simpleicon@netdataicon\endcsname {\simpleiconsmap\symbol{"F119}}
+ \expandafter\def\csname simpleicon@neteasecloudmusicicon\endcsname {\simpleiconsmap\symbol{"F11A}}
+ \expandafter\def\csname simpleicon@netflixicon\endcsname {\simpleiconsmap\symbol{"F11B}}
+ \expandafter\def\csname simpleicon@netgearicon\endcsname {\simpleiconsmap\symbol{"F11C}}
+ \expandafter\def\csname simpleicon@netlifyicon\endcsname {\simpleiconsmap\symbol{"F11D}}
+ \expandafter\def\csname simpleicon@netteicon\endcsname {\simpleiconsmap\symbol{"F11E}}
+ \expandafter\def\csname simpleicon@nettoicon\endcsname {\simpleiconsmap\symbol{"F11F}}
+ \expandafter\def\csname simpleicon@neutralinojsicon\endcsname {\simpleiconsmap\symbol{"F120}}
+ \expandafter\def\csname simpleicon@newbalanceicon\endcsname {\simpleiconsmap\symbol{"F121}}
+ \expandafter\def\csname simpleicon@neweggicon\endcsname {\simpleiconsmap\symbol{"F122}}
+ \expandafter\def\csname simpleicon@newjapanprowrestlingicon\endcsname {\simpleiconsmap\symbol{"F123}}
+ \expandafter\def\csname simpleicon@newrelicicon\endcsname {\simpleiconsmap\symbol{"F124}}
+ \expandafter\def\csname simpleicon@newyorktimesicon\endcsname {\simpleiconsmap\symbol{"F125}}
+ \expandafter\def\csname simpleicon@nextbilliondotaiicon\endcsname {\simpleiconsmap\symbol{"F126}}
+ \expandafter\def\csname simpleicon@nextcloudicon\endcsname {\simpleiconsmap\symbol{"F127}}
+ \expandafter\def\csname simpleicon@nextdnsicon\endcsname {\simpleiconsmap\symbol{"F128}}
+ \expandafter\def\csname simpleicon@nextdooricon\endcsname {\simpleiconsmap\symbol{"F129}}
+ \expandafter\def\csname simpleicon@nextdotjsicon\endcsname {\simpleiconsmap\symbol{"F12A}}
+ \expandafter\def\csname simpleicon@nextraicon\endcsname {\simpleiconsmap\symbol{"F12B}}
+ \expandafter\def\csname simpleicon@nextuiicon\endcsname {\simpleiconsmap\symbol{"F12C}}
+ \expandafter\def\csname simpleicon@nexusmodsicon\endcsname {\simpleiconsmap\symbol{"F12D}}
+ \expandafter\def\csname simpleicon@nfcicon\endcsname {\simpleiconsmap\symbol{"F12E}}
+ \expandafter\def\csname simpleicon@nginxicon\endcsname {\simpleiconsmap\symbol{"F12F}}
+ \expandafter\def\csname simpleicon@nginxproxymanagericon\endcsname {\simpleiconsmap\symbol{"F130}}
+ \expandafter\def\csname simpleicon@ngrokicon\endcsname {\simpleiconsmap\symbol{"F131}}
+ \expandafter\def\csname simpleicon@ngrxicon\endcsname {\simpleiconsmap\symbol{"F132}}
+ \expandafter\def\csname simpleicon@nhlicon\endcsname {\simpleiconsmap\symbol{"F133}}
+ \expandafter\def\csname simpleicon@nicehashicon\endcsname {\simpleiconsmap\symbol{"F134}}
+ \expandafter\def\csname simpleicon@niconicoicon\endcsname {\simpleiconsmap\symbol{"F135}}
+ \expandafter\def\csname simpleicon@nikeicon\endcsname {\simpleiconsmap\symbol{"F136}}
+ \expandafter\def\csname simpleicon@nikonicon\endcsname {\simpleiconsmap\symbol{"F137}}
+ \expandafter\def\csname simpleicon@nimicon\endcsname {\simpleiconsmap\symbol{"F138}}
+ \expandafter\def\csname simpleicon@nintendoicon\endcsname {\simpleiconsmap\symbol{"F139}}
+ \expandafter\def\csname simpleicon@nintendo3dsicon\endcsname {\simpleiconsmap\symbol{"F13A}}
+ \expandafter\def\csname simpleicon@nintendogamecubeicon\endcsname {\simpleiconsmap\symbol{"F13B}}
+ \expandafter\def\csname simpleicon@nintendoswitchicon\endcsname {\simpleiconsmap\symbol{"F13C}}
+ \expandafter\def\csname simpleicon@nissanicon\endcsname {\simpleiconsmap\symbol{"F13D}}
+ \expandafter\def\csname simpleicon@nixosicon\endcsname {\simpleiconsmap\symbol{"F13E}}
+ \expandafter\def\csname simpleicon@nodedotjsicon\endcsname {\simpleiconsmap\symbol{"F13F}}
+ \expandafter\def\csname simpleicon@nodemonicon\endcsname {\simpleiconsmap\symbol{"F140}}
+ \expandafter\def\csname simpleicon@noderedicon\endcsname {\simpleiconsmap\symbol{"F141}}
+ \expandafter\def\csname simpleicon@nokiaicon\endcsname {\simpleiconsmap\symbol{"F142}}
+ \expandafter\def\csname simpleicon@nomadicon\endcsname {\simpleiconsmap\symbol{"F143}}
+ \expandafter\def\csname simpleicon@norcoicon\endcsname {\simpleiconsmap\symbol{"F144}}
+ \expandafter\def\csname simpleicon@nordicsemiconductoricon\endcsname {\simpleiconsmap\symbol{"F145}}
+ \expandafter\def\csname simpleicon@nordvpnicon\endcsname {\simpleiconsmap\symbol{"F146}}
+ \expandafter\def\csname simpleicon@normalizedotcssicon\endcsname {\simpleiconsmap\symbol{"F147}}
+ \expandafter\def\csname simpleicon@nortonicon\endcsname {\simpleiconsmap\symbol{"F148}}
+ \expandafter\def\csname simpleicon@norwegianicon\endcsname {\simpleiconsmap\symbol{"F149}}
+ \expandafter\def\csname simpleicon@notepadplusplusicon\endcsname {\simpleiconsmap\symbol{"F14A}}
+ \expandafter\def\csname simpleicon@notionicon\endcsname {\simpleiconsmap\symbol{"F14B}}
+ \expandafter\def\csname simpleicon@notisticon\endcsname {\simpleiconsmap\symbol{"F14C}}
+ \expandafter\def\csname simpleicon@nounprojecticon\endcsname {\simpleiconsmap\symbol{"F14D}}
+ \expandafter\def\csname simpleicon@novuicon\endcsname {\simpleiconsmap\symbol{"F14E}}
+ \expandafter\def\csname simpleicon@nowicon\endcsname {\simpleiconsmap\symbol{"F14F}}
+ \expandafter\def\csname simpleicon@npmicon\endcsname {\simpleiconsmap\symbol{"F150}}
+ \expandafter\def\csname simpleicon@nrwlicon\endcsname {\simpleiconsmap\symbol{"F151}}
+ \expandafter\def\csname simpleicon@nsisicon\endcsname {\simpleiconsmap\symbol{"F152}}
+ \expandafter\def\csname simpleicon@ntfyicon\endcsname {\simpleiconsmap\symbol{"F153}}
+ \expandafter\def\csname simpleicon@nubankicon\endcsname {\simpleiconsmap\symbol{"F154}}
+ \expandafter\def\csname simpleicon@nucleoicon\endcsname {\simpleiconsmap\symbol{"F155}}
+ \expandafter\def\csname simpleicon@nugeticon\endcsname {\simpleiconsmap\symbol{"F156}}
+ \expandafter\def\csname simpleicon@nukeicon\endcsname {\simpleiconsmap\symbol{"F157}}
+ \expandafter\def\csname simpleicon@numbaicon\endcsname {\simpleiconsmap\symbol{"F158}}
+ \expandafter\def\csname simpleicon@numpyicon\endcsname {\simpleiconsmap\symbol{"F159}}
+ \expandafter\def\csname simpleicon@nunjucksicon\endcsname {\simpleiconsmap\symbol{"F15A}}
+ \expandafter\def\csname simpleicon@nushellicon\endcsname {\simpleiconsmap\symbol{"F15B}}
+ \expandafter\def\csname simpleicon@nutanixicon\endcsname {\simpleiconsmap\symbol{"F15C}}
+ \expandafter\def\csname simpleicon@nuxtdotjsicon\endcsname {\simpleiconsmap\symbol{"F15D}}
+ \expandafter\def\csname simpleicon@nvidiaicon\endcsname {\simpleiconsmap\symbol{"F15E}}
+ \expandafter\def\csname simpleicon@nvmicon\endcsname {\simpleiconsmap\symbol{"F15F}}
+ \expandafter\def\csname simpleicon@nxicon\endcsname {\simpleiconsmap\symbol{"F160}}
+ \expandafter\def\csname simpleicon@nxpicon\endcsname {\simpleiconsmap\symbol{"F161}}
+ \expandafter\def\csname simpleicon@nzxticon\endcsname {\simpleiconsmap\symbol{"F162}}
+ \expandafter\def\csname simpleicon@observableicon\endcsname {\simpleiconsmap\symbol{"F163}}
+ \expandafter\def\csname simpleicon@obsidianicon\endcsname {\simpleiconsmap\symbol{"F164}}
+ \expandafter\def\csname simpleicon@obsstudioicon\endcsname {\simpleiconsmap\symbol{"F165}}
+ \expandafter\def\csname simpleicon@ocamlicon\endcsname {\simpleiconsmap\symbol{"F166}}
+ \expandafter\def\csname simpleicon@oclificon\endcsname {\simpleiconsmap\symbol{"F167}}
+ \expandafter\def\csname simpleicon@octanerendericon\endcsname {\simpleiconsmap\symbol{"F168}}
+ \expandafter\def\csname simpleicon@octaveicon\endcsname {\simpleiconsmap\symbol{"F169}}
+ \expandafter\def\csname simpleicon@octobercmsicon\endcsname {\simpleiconsmap\symbol{"F16A}}
+ \expandafter\def\csname simpleicon@octoprinticon\endcsname {\simpleiconsmap\symbol{"F16B}}
+ \expandafter\def\csname simpleicon@octopusdeployicon\endcsname {\simpleiconsmap\symbol{"F16C}}
+ \expandafter\def\csname simpleicon@oculusicon\endcsname {\simpleiconsmap\symbol{"F16D}}
+ \expandafter\def\csname simpleicon@odnoklassnikiicon\endcsname {\simpleiconsmap\symbol{"F16E}}
+ \expandafter\def\csname simpleicon@odooicon\endcsname {\simpleiconsmap\symbol{"F16F}}
+ \expandafter\def\csname simpleicon@odyseeicon\endcsname {\simpleiconsmap\symbol{"F170}}
+ \expandafter\def\csname simpleicon@ohdearicon\endcsname {\simpleiconsmap\symbol{"F171}}
+ \expandafter\def\csname simpleicon@okcupidicon\endcsname {\simpleiconsmap\symbol{"F172}}
+ \expandafter\def\csname simpleicon@oktaicon\endcsname {\simpleiconsmap\symbol{"F173}}
+ \expandafter\def\csname simpleicon@oneplusicon\endcsname {\simpleiconsmap\symbol{"F174}}
+ \expandafter\def\csname simpleicon@onlyfansicon\endcsname {\simpleiconsmap\symbol{"F175}}
+ \expandafter\def\csname simpleicon@onlyofficeicon\endcsname {\simpleiconsmap\symbol{"F176}}
+ \expandafter\def\csname simpleicon@onnxicon\endcsname {\simpleiconsmap\symbol{"F177}}
+ \expandafter\def\csname simpleicon@onstaricon\endcsname {\simpleiconsmap\symbol{"F178}}
+ \expandafter\def\csname simpleicon@opelicon\endcsname {\simpleiconsmap\symbol{"F179}}
+ \expandafter\def\csname simpleicon@openaccessicon\endcsname {\simpleiconsmap\symbol{"F17A}}
+ \expandafter\def\csname simpleicon@openaiicon\endcsname {\simpleiconsmap\symbol{"F17B}}
+ \expandafter\def\csname simpleicon@openaigymicon\endcsname {\simpleiconsmap\symbol{"F17C}}
+ \expandafter\def\csname simpleicon@openapiinitiativeicon\endcsname {\simpleiconsmap\symbol{"F17D}}
+ \expandafter\def\csname simpleicon@openbadgesicon\endcsname {\simpleiconsmap\symbol{"F17E}}
+ \expandafter\def\csname simpleicon@openbsdicon\endcsname {\simpleiconsmap\symbol{"F17F}}
+ \expandafter\def\csname simpleicon@openbugbountyicon\endcsname {\simpleiconsmap\symbol{"F180}}
+ \expandafter\def\csname simpleicon@opencollectiveicon\endcsname {\simpleiconsmap\symbol{"F181}}
+ \expandafter\def\csname simpleicon@opencontainersinitiativeicon\endcsname {\simpleiconsmap\symbol{"F182}}
+ \expandafter\def\csname simpleicon@opencvicon\endcsname {\simpleiconsmap\symbol{"F183}}
+ \expandafter\def\csname simpleicon@openfaasicon\endcsname {\simpleiconsmap\symbol{"F184}}
+ \expandafter\def\csname simpleicon@openglicon\endcsname {\simpleiconsmap\symbol{"F185}}
+ \expandafter\def\csname simpleicon@openhabicon\endcsname {\simpleiconsmap\symbol{"F186}}
+ \expandafter\def\csname simpleicon@openidicon\endcsname {\simpleiconsmap\symbol{"F187}}
+ \expandafter\def\csname simpleicon@openjdkicon\endcsname {\simpleiconsmap\symbol{"F188}}
+ \expandafter\def\csname simpleicon@openjsfoundationicon\endcsname {\simpleiconsmap\symbol{"F189}}
+ \expandafter\def\csname simpleicon@openlayersicon\endcsname {\simpleiconsmap\symbol{"F18A}}
+ \expandafter\def\csname simpleicon@openmediavaulticon\endcsname {\simpleiconsmap\symbol{"F18B}}
+ \expandafter\def\csname simpleicon@openminedicon\endcsname {\simpleiconsmap\symbol{"F18C}}
+ \expandafter\def\csname simpleicon@opennebulaicon\endcsname {\simpleiconsmap\symbol{"F18D}}
+ \expandafter\def\csname simpleicon@openprojecticon\endcsname {\simpleiconsmap\symbol{"F18E}}
+ \expandafter\def\csname simpleicon@openscadicon\endcsname {\simpleiconsmap\symbol{"F18F}}
+ \expandafter\def\csname simpleicon@openseaicon\endcsname {\simpleiconsmap\symbol{"F190}}
+ \expandafter\def\csname simpleicon@opensearchicon\endcsname {\simpleiconsmap\symbol{"F191}}
+ \expandafter\def\csname simpleicon@opensourcehardwareicon\endcsname {\simpleiconsmap\symbol{"F192}}
+ \expandafter\def\csname simpleicon@opensourceinitiativeicon\endcsname {\simpleiconsmap\symbol{"F193}}
+ \expandafter\def\csname simpleicon@opensslicon\endcsname {\simpleiconsmap\symbol{"F194}}
+ \expandafter\def\csname simpleicon@openstackicon\endcsname {\simpleiconsmap\symbol{"F195}}
+ \expandafter\def\csname simpleicon@openstreetmapicon\endcsname {\simpleiconsmap\symbol{"F196}}
+ \expandafter\def\csname simpleicon@opensuseicon\endcsname {\simpleiconsmap\symbol{"F197}}
+ \expandafter\def\csname simpleicon@opentelemetryicon\endcsname {\simpleiconsmap\symbol{"F198}}
+ \expandafter\def\csname simpleicon@opentexticon\endcsname {\simpleiconsmap\symbol{"F199}}
+ \expandafter\def\csname simpleicon@opentofuicon\endcsname {\simpleiconsmap\symbol{"F19A}}
+ \expandafter\def\csname simpleicon@openverseicon\endcsname {\simpleiconsmap\symbol{"F19B}}
+ \expandafter\def\csname simpleicon@openvpnicon\endcsname {\simpleiconsmap\symbol{"F19C}}
+ \expandafter\def\csname simpleicon@openwrticon\endcsname {\simpleiconsmap\symbol{"F19D}}
+ \expandafter\def\csname simpleicon@openzeppelinicon\endcsname {\simpleiconsmap\symbol{"F19E}}
+ \expandafter\def\csname simpleicon@openzfsicon\endcsname {\simpleiconsmap\symbol{"F19F}}
+ \expandafter\def\csname simpleicon@operaicon\endcsname {\simpleiconsmap\symbol{"F1A0}}
+ \expandafter\def\csname simpleicon@operagxicon\endcsname {\simpleiconsmap\symbol{"F1A1}}
+ \expandafter\def\csname simpleicon@opnsenseicon\endcsname {\simpleiconsmap\symbol{"F1A2}}
+ \expandafter\def\csname simpleicon@oppoicon\endcsname {\simpleiconsmap\symbol{"F1A3}}
+ \expandafter\def\csname simpleicon@opsgenieicon\endcsname {\simpleiconsmap\symbol{"F1A4}}
+ \expandafter\def\csname simpleicon@opslevelicon\endcsname {\simpleiconsmap\symbol{"F1A5}}
+ \expandafter\def\csname simpleicon@optimismicon\endcsname {\simpleiconsmap\symbol{"F1A6}}
+ \expandafter\def\csname simpleicon@oracleicon\endcsname {\simpleiconsmap\symbol{"F1A7}}
+ \expandafter\def\csname simpleicon@orangeicon\endcsname {\simpleiconsmap\symbol{"F1A8}}
+ \expandafter\def\csname simpleicon@orcidicon\endcsname {\simpleiconsmap\symbol{"F1A9}}
+ \expandafter\def\csname simpleicon@oreillyicon\endcsname {\simpleiconsmap\symbol{"F1AA}}
+ \expandafter\def\csname simpleicon@orgicon\endcsname {\simpleiconsmap\symbol{"F1AB}}
+ \expandafter\def\csname simpleicon@organicmapsicon\endcsname {\simpleiconsmap\symbol{"F1AC}}
+ \expandafter\def\csname simpleicon@originicon\endcsname {\simpleiconsmap\symbol{"F1AD}}
+ \expandafter\def\csname simpleicon@osanoicon\endcsname {\simpleiconsmap\symbol{"F1AE}}
+ \expandafter\def\csname simpleicon@osficon\endcsname {\simpleiconsmap\symbol{"F1AF}}
+ \expandafter\def\csname simpleicon@osgeoicon\endcsname {\simpleiconsmap\symbol{"F1B0}}
+ \expandafter\def\csname simpleicon@oshkoshicon\endcsname {\simpleiconsmap\symbol{"F1B1}}
+ \expandafter\def\csname simpleicon@osmcicon\endcsname {\simpleiconsmap\symbol{"F1B2}}
+ \expandafter\def\csname simpleicon@osuicon\endcsname {\simpleiconsmap\symbol{"F1B3}}
+ \expandafter\def\csname simpleicon@ottoicon\endcsname {\simpleiconsmap\symbol{"F1B4}}
+ \expandafter\def\csname simpleicon@outlineicon\endcsname {\simpleiconsmap\symbol{"F1B5}}
+ \expandafter\def\csname simpleicon@overcasticon\endcsname {\simpleiconsmap\symbol{"F1B6}}
+ \expandafter\def\csname simpleicon@overleaficon\endcsname {\simpleiconsmap\symbol{"F1B7}}
+ \expandafter\def\csname simpleicon@ovhicon\endcsname {\simpleiconsmap\symbol{"F1B8}}
+ \expandafter\def\csname simpleicon@owaspicon\endcsname {\simpleiconsmap\symbol{"F1B9}}
+ \expandafter\def\csname simpleicon@owncloudicon\endcsname {\simpleiconsmap\symbol{"F1BA}}
+ \expandafter\def\csname simpleicon@oxygenicon\endcsname {\simpleiconsmap\symbol{"F1BB}}
+ \expandafter\def\csname simpleicon@oyoicon\endcsname {\simpleiconsmap\symbol{"F1BC}}
+ \expandafter\def\csname simpleicon@p5dotjsicon\endcsname {\simpleiconsmap\symbol{"F1BD}}
+ \expandafter\def\csname simpleicon@packagisticon\endcsname {\simpleiconsmap\symbol{"F1BE}}
+ \expandafter\def\csname simpleicon@packericon\endcsname {\simpleiconsmap\symbol{"F1BF}}
+ \expandafter\def\csname simpleicon@packticon\endcsname {\simpleiconsmap\symbol{"F1C0}}
+ \expandafter\def\csname simpleicon@paddleicon\endcsname {\simpleiconsmap\symbol{"F1C1}}
+ \expandafter\def\csname simpleicon@paddlepaddleicon\endcsname {\simpleiconsmap\symbol{"F1C2}}
+ \expandafter\def\csname simpleicon@paddypowericon\endcsname {\simpleiconsmap\symbol{"F1C3}}
+ \expandafter\def\csname simpleicon@pagekiticon\endcsname {\simpleiconsmap\symbol{"F1C4}}
+ \expandafter\def\csname simpleicon@pagerdutyicon\endcsname {\simpleiconsmap\symbol{"F1C5}}
+ \expandafter\def\csname simpleicon@pagespeedinsightsicon\endcsname {\simpleiconsmap\symbol{"F1C6}}
+ \expandafter\def\csname simpleicon@pagseguroicon\endcsname {\simpleiconsmap\symbol{"F1C7}}
+ \expandafter\def\csname simpleicon@palantiricon\endcsname {\simpleiconsmap\symbol{"F1C8}}
+ \expandafter\def\csname simpleicon@paloaltonetworksicon\endcsname {\simpleiconsmap\symbol{"F1C9}}
+ \expandafter\def\csname simpleicon@paloaltosoftwareicon\endcsname {\simpleiconsmap\symbol{"F1CA}}
+ \expandafter\def\csname simpleicon@panasonicicon\endcsname {\simpleiconsmap\symbol{"F1CB}}
+ \expandafter\def\csname simpleicon@pandasicon\endcsname {\simpleiconsmap\symbol{"F1CC}}
+ \expandafter\def\csname simpleicon@pandoraicon\endcsname {\simpleiconsmap\symbol{"F1CD}}
+ \expandafter\def\csname simpleicon@pantheonicon\endcsname {\simpleiconsmap\symbol{"F1CE}}
+ \expandafter\def\csname simpleicon@paperlessngxicon\endcsname {\simpleiconsmap\symbol{"F1CF}}
+ \expandafter\def\csname simpleicon@paperspaceicon\endcsname {\simpleiconsmap\symbol{"F1D0}}
+ \expandafter\def\csname simpleicon@paperswithcodeicon\endcsname {\simpleiconsmap\symbol{"F1D1}}
+ \expandafter\def\csname simpleicon@paramountplusicon\endcsname {\simpleiconsmap\symbol{"F1D2}}
+ \expandafter\def\csname simpleicon@paritysubstrateicon\endcsname {\simpleiconsmap\symbol{"F1D3}}
+ \expandafter\def\csname simpleicon@parrotsecurityicon\endcsname {\simpleiconsmap\symbol{"F1D4}}
+ \expandafter\def\csname simpleicon@parsedotlyicon\endcsname {\simpleiconsmap\symbol{"F1D5}}
+ \expandafter\def\csname simpleicon@passporticon\endcsname {\simpleiconsmap\symbol{"F1D6}}
+ \expandafter\def\csname simpleicon@pastebinicon\endcsname {\simpleiconsmap\symbol{"F1D7}}
+ \expandafter\def\csname simpleicon@patreonicon\endcsname {\simpleiconsmap\symbol{"F1D8}}
+ \expandafter\def\csname simpleicon@paychexicon\endcsname {\simpleiconsmap\symbol{"F1D9}}
+ \expandafter\def\csname simpleicon@payhipicon\endcsname {\simpleiconsmap\symbol{"F1DA}}
+ \expandafter\def\csname simpleicon@payloadcmsicon\endcsname {\simpleiconsmap\symbol{"F1DB}}
+ \expandafter\def\csname simpleicon@payoneericon\endcsname {\simpleiconsmap\symbol{"F1DC}}
+ \expandafter\def\csname simpleicon@paypalicon\endcsname {\simpleiconsmap\symbol{"F1DD}}
+ \expandafter\def\csname simpleicon@paytmicon\endcsname {\simpleiconsmap\symbol{"F1DE}}
+ \expandafter\def\csname simpleicon@pcgamingwikiicon\endcsname {\simpleiconsmap\symbol{"F1DF}}
+ \expandafter\def\csname simpleicon@pdmicon\endcsname {\simpleiconsmap\symbol{"F1E0}}
+ \expandafter\def\csname simpleicon@pdqicon\endcsname {\simpleiconsmap\symbol{"F1E1}}
+ \expandafter\def\csname simpleicon@peakdesignicon\endcsname {\simpleiconsmap\symbol{"F1E2}}
+ \expandafter\def\csname simpleicon@pearsonicon\endcsname {\simpleiconsmap\symbol{"F1E3}}
+ \expandafter\def\csname simpleicon@peerlisticon\endcsname {\simpleiconsmap\symbol{"F1E4}}
+ \expandafter\def\csname simpleicon@peertubeicon\endcsname {\simpleiconsmap\symbol{"F1E5}}
+ \expandafter\def\csname simpleicon@pegasusairlinesicon\endcsname {\simpleiconsmap\symbol{"F1E6}}
+ \expandafter\def\csname simpleicon@pelicanicon\endcsname {\simpleiconsmap\symbol{"F1E7}}
+ \expandafter\def\csname simpleicon@pelotonicon\endcsname {\simpleiconsmap\symbol{"F1E8}}
+ \expandafter\def\csname simpleicon@pennyicon\endcsname {\simpleiconsmap\symbol{"F1E9}}
+ \expandafter\def\csname simpleicon@penpoticon\endcsname {\simpleiconsmap\symbol{"F1EA}}
+ \expandafter\def\csname simpleicon@percyicon\endcsname {\simpleiconsmap\symbol{"F1EB}}
+ \expandafter\def\csname simpleicon@perforceicon\endcsname {\simpleiconsmap\symbol{"F1EC}}
+ \expandafter\def\csname simpleicon@perlicon\endcsname {\simpleiconsmap\symbol{"F1ED}}
+ \expandafter\def\csname simpleicon@perplexityicon\endcsname {\simpleiconsmap\symbol{"F1EE}}
+ \expandafter\def\csname simpleicon@persistenticon\endcsname {\simpleiconsmap\symbol{"F1EF}}
+ \expandafter\def\csname simpleicon@personioicon\endcsname {\simpleiconsmap\symbol{"F1F0}}
+ \expandafter\def\csname simpleicon@petsathomeicon\endcsname {\simpleiconsmap\symbol{"F1F1}}
+ \expandafter\def\csname simpleicon@peugeoticon\endcsname {\simpleiconsmap\symbol{"F1F2}}
+ \expandafter\def\csname simpleicon@pexelsicon\endcsname {\simpleiconsmap\symbol{"F1F3}}
+ \expandafter\def\csname simpleicon@pfsenseicon\endcsname {\simpleiconsmap\symbol{"F1F4}}
+ \expandafter\def\csname simpleicon@phabricatoricon\endcsname {\simpleiconsmap\symbol{"F1F5}}
+ \expandafter\def\csname simpleicon@philipshueicon\endcsname {\simpleiconsmap\symbol{"F1F6}}
+ \expandafter\def\csname simpleicon@phoenixframeworkicon\endcsname {\simpleiconsmap\symbol{"F1F7}}
+ \expandafter\def\csname simpleicon@phonepeicon\endcsname {\simpleiconsmap\symbol{"F1F8}}
+ \expandafter\def\csname simpleicon@phosphoriconsicon\endcsname {\simpleiconsmap\symbol{"F1F9}}
+ \expandafter\def\csname simpleicon@photobucketicon\endcsname {\simpleiconsmap\symbol{"F1FA}}
+ \expandafter\def\csname simpleicon@photocrowdicon\endcsname {\simpleiconsmap\symbol{"F1FB}}
+ \expandafter\def\csname simpleicon@photonicon\endcsname {\simpleiconsmap\symbol{"F1FC}}
+ \expandafter\def\csname simpleicon@photopeaicon\endcsname {\simpleiconsmap\symbol{"F1FD}}
+ \expandafter\def\csname simpleicon@phpicon\endcsname {\simpleiconsmap\symbol{"F1FE}}
+ \expandafter\def\csname simpleicon@phpmyadminicon\endcsname {\simpleiconsmap\symbol{"F1FF}}
+ \expandafter\def\csname simpleicon@phpstormicon\endcsname {\simpleiconsmap\symbol{"F200}}
+ \expandafter\def\csname simpleicon@piaggiogroupicon\endcsname {\simpleiconsmap\symbol{"F201}}
+ \expandafter\def\csname simpleicon@piaproicon\endcsname {\simpleiconsmap\symbol{"F202}}
+ \expandafter\def\csname simpleicon@picardsurgelesicon\endcsname {\simpleiconsmap\symbol{"F203}}
+ \expandafter\def\csname simpleicon@picartodottvicon\endcsname {\simpleiconsmap\symbol{"F204}}
+ \expandafter\def\csname simpleicon@picnicicon\endcsname {\simpleiconsmap\symbol{"F205}}
+ \expandafter\def\csname simpleicon@picpayicon\endcsname {\simpleiconsmap\symbol{"F206}}
+ \expandafter\def\csname simpleicon@picrewicon\endcsname {\simpleiconsmap\symbol{"F207}}
+ \expandafter\def\csname simpleicon@picxyicon\endcsname {\simpleiconsmap\symbol{"F208}}
+ \expandafter\def\csname simpleicon@piholeicon\endcsname {\simpleiconsmap\symbol{"F209}}
+ \expandafter\def\csname simpleicon@pimcoreicon\endcsname {\simpleiconsmap\symbol{"F20A}}
+ \expandafter\def\csname simpleicon@pinboardicon\endcsname {\simpleiconsmap\symbol{"F20B}}
+ \expandafter\def\csname simpleicon@pinescripticon\endcsname {\simpleiconsmap\symbol{"F20C}}
+ \expandafter\def\csname simpleicon@pinetworkicon\endcsname {\simpleiconsmap\symbol{"F20D}}
+ \expandafter\def\csname simpleicon@pingdomicon\endcsname {\simpleiconsmap\symbol{"F20E}}
+ \expandafter\def\csname simpleicon@pinoicon\endcsname {\simpleiconsmap\symbol{"F20F}}
+ \expandafter\def\csname simpleicon@pinteresticon\endcsname {\simpleiconsmap\symbol{"F210}}
+ \expandafter\def\csname simpleicon@pioneerdjicon\endcsname {\simpleiconsmap\symbol{"F211}}
+ \expandafter\def\csname simpleicon@pipedicon\endcsname {\simpleiconsmap\symbol{"F212}}
+ \expandafter\def\csname simpleicon@pipxicon\endcsname {\simpleiconsmap\symbol{"F213}}
+ \expandafter\def\csname simpleicon@pivotaltrackericon\endcsname {\simpleiconsmap\symbol{"F214}}
+ \expandafter\def\csname simpleicon@piwigoicon\endcsname {\simpleiconsmap\symbol{"F215}}
+ \expandafter\def\csname simpleicon@pixicon\endcsname {\simpleiconsmap\symbol{"F216}}
+ \expandafter\def\csname simpleicon@pixabayicon\endcsname {\simpleiconsmap\symbol{"F217}}
+ \expandafter\def\csname simpleicon@pixelfedicon\endcsname {\simpleiconsmap\symbol{"F218}}
+ \expandafter\def\csname simpleicon@pixivicon\endcsname {\simpleiconsmap\symbol{"F219}}
+ \expandafter\def\csname simpleicon@pixlricon\endcsname {\simpleiconsmap\symbol{"F21A}}
+ \expandafter\def\csname simpleicon@pkgsrcicon\endcsname {\simpleiconsmap\symbol{"F21B}}
+ \expandafter\def\csname simpleicon@planeticon\endcsname {\simpleiconsmap\symbol{"F21C}}
+ \expandafter\def\csname simpleicon@planetscaleicon\endcsname {\simpleiconsmap\symbol{"F21D}}
+ \expandafter\def\csname simpleicon@plangridicon\endcsname {\simpleiconsmap\symbol{"F21E}}
+ \expandafter\def\csname simpleicon@platformdotshicon\endcsname {\simpleiconsmap\symbol{"F21F}}
+ \expandafter\def\csname simpleicon@platformioicon\endcsname {\simpleiconsmap\symbol{"F220}}
+ \expandafter\def\csname simpleicon@platziicon\endcsname {\simpleiconsmap\symbol{"F221}}
+ \expandafter\def\csname simpleicon@plausibleanalyticsicon\endcsname {\simpleiconsmap\symbol{"F222}}
+ \expandafter\def\csname simpleicon@playcanvasicon\endcsname {\simpleiconsmap\symbol{"F223}}
+ \expandafter\def\csname simpleicon@playerdotmeicon\endcsname {\simpleiconsmap\symbol{"F224}}
+ \expandafter\def\csname simpleicon@playerfmicon\endcsname {\simpleiconsmap\symbol{"F225}}
+ \expandafter\def\csname simpleicon@playstationicon\endcsname {\simpleiconsmap\symbol{"F226}}
+ \expandafter\def\csname simpleicon@playstation2icon\endcsname {\simpleiconsmap\symbol{"F227}}
+ \expandafter\def\csname simpleicon@playstation3icon\endcsname {\simpleiconsmap\symbol{"F228}}
+ \expandafter\def\csname simpleicon@playstation4icon\endcsname {\simpleiconsmap\symbol{"F229}}
+ \expandafter\def\csname simpleicon@playstation5icon\endcsname {\simpleiconsmap\symbol{"F22A}}
+ \expandafter\def\csname simpleicon@playstationportableicon\endcsname {\simpleiconsmap\symbol{"F22B}}
+ \expandafter\def\csname simpleicon@playstationvitaicon\endcsname {\simpleiconsmap\symbol{"F22C}}
+ \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmap\symbol{"F22D}}
+ \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmap\symbol{"F22E}}
+ \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmap\symbol{"F22F}}
+ \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmap\symbol{"F230}}
+ \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmap\symbol{"F231}}
+ \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmap\symbol{"F232}}
+ \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmap\symbol{"F233}}
+ \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmap\symbol{"F234}}
+ \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmap\symbol{"F235}}
+ \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmap\symbol{"F236}}
+ \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmap\symbol{"F237}}
+ \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmap\symbol{"F238}}
+ \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmap\symbol{"F239}}
+ \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmap\symbol{"F23A}}
+ \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmap\symbol{"F23B}}
+ \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmap\symbol{"F23C}}
+ \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmap\symbol{"F23D}}
+ \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmap\symbol{"F23E}}
+ \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmap\symbol{"F23F}}
+ \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmap\symbol{"F240}}
+ \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmap\symbol{"F241}}
+ \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmap\symbol{"F242}}
+ \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmap\symbol{"F243}}
+ \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmap\symbol{"F244}}
+ \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmap\symbol{"F245}}
+ \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmap\symbol{"F246}}
+ \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmap\symbol{"F247}}
+ \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmap\symbol{"F248}}
+ \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmap\symbol{"F249}}
+ \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmap\symbol{"F24A}}
+ \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmap\symbol{"F24B}}
+ \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmap\symbol{"F24C}}
+ \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmap\symbol{"F24D}}
+ \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmap\symbol{"F24E}}
+ \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmap\symbol{"F24F}}
+ \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmap\symbol{"F250}}
+ \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmap\symbol{"F251}}
+ \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmap\symbol{"F252}}
+ \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmap\symbol{"F253}}
+ \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmap\symbol{"F254}}
+ \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmap\symbol{"F255}}
+ \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmap\symbol{"F256}}
+ \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmap\symbol{"F257}}
+ \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmap\symbol{"F258}}
+ \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmap\symbol{"F259}}
+ \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmap\symbol{"F25A}}
+ \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmap\symbol{"F25B}}
+ \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmap\symbol{"F25C}}
+ \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmap\symbol{"F25D}}
+ \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmap\symbol{"F25E}}
+ \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmap\symbol{"F25F}}
+ \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmap\symbol{"F260}}
+ \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmap\symbol{"F261}}
+ \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmap\symbol{"F262}}
+ \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmap\symbol{"F263}}
+ \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmap\symbol{"F264}}
+ \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmap\symbol{"F265}}
+ \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmap\symbol{"F266}}
+ \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmap\symbol{"F267}}
+ \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmap\symbol{"F268}}
+ \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmap\symbol{"F269}}
+ \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmap\symbol{"F26A}}
+ \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmap\symbol{"F26B}}
+ \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmap\symbol{"F26C}}
+ \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmap\symbol{"F26D}}
+ \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmap\symbol{"F26E}}
+ \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmap\symbol{"F26F}}
+ \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmap\symbol{"F270}}
+ \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmap\symbol{"F271}}
+ \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmap\symbol{"F272}}
+ \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmap\symbol{"F273}}
+ \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmap\symbol{"F274}}
+ \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmap\symbol{"F275}}
+ \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmap\symbol{"F276}}
+ \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmap\symbol{"F277}}
+ \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmap\symbol{"F278}}
+ \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmap\symbol{"F279}}
+ \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmap\symbol{"F27A}}
+ \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmap\symbol{"F27B}}
+ \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmap\symbol{"F27C}}
+ \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmap\symbol{"F27D}}
+ \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmap\symbol{"F27E}}
+ \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmap\symbol{"F27F}}
+ \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmap\symbol{"F280}}
+ \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmap\symbol{"F281}}
+ \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmap\symbol{"F282}}
+ \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmap\symbol{"F283}}
+ \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmap\symbol{"F284}}
+ \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmap\symbol{"F285}}
+ \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmap\symbol{"F286}}
+ \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmap\symbol{"F287}}
+ \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmap\symbol{"F288}}
+ \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmap\symbol{"F289}}
+ \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmap\symbol{"F28A}}
+ \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmap\symbol{"F28B}}
+ \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmap\symbol{"F28C}}
+ \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmap\symbol{"F28D}}
+ \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmap\symbol{"F28E}}
+ \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmap\symbol{"F28F}}
+ \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmap\symbol{"F290}}
+ \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmap\symbol{"F291}}
+ \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmap\symbol{"F292}}
+ \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmap\symbol{"F293}}
+ \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmap\symbol{"F294}}
+ \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmap\symbol{"F295}}
+ \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmap\symbol{"F296}}
+ \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmap\symbol{"F297}}
+ \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmap\symbol{"F298}}
+ \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmap\symbol{"F299}}
+ \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmap\symbol{"F29A}}
+ \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmap\symbol{"F29B}}
+ \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmap\symbol{"F29C}}
+ \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmap\symbol{"F29D}}
+ \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmap\symbol{"F29E}}
+ \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmap\symbol{"F29F}}
+ \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmap\symbol{"F2A0}}
+ \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmap\symbol{"F2A1}}
+ \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmap\symbol{"F2A2}}
+ \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmap\symbol{"F2A3}}
+ \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmap\symbol{"F2A4}}
+ \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmap\symbol{"F2A5}}
+ \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmap\symbol{"F2A6}}
+ \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmap\symbol{"F2A7}}
+ \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmap\symbol{"F2A8}}
+ \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmap\symbol{"F2A9}}
+ \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmap\symbol{"F2AA}}
+ \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmap\symbol{"F2AB}}
+ \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmap\symbol{"F2AC}}
+ \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmap\symbol{"F2AD}}
+ \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmap\symbol{"F2AE}}
+ \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmap\symbol{"F2AF}}
+ \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmap\symbol{"F2B0}}
+ \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmap\symbol{"F2B1}}
+ \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmap\symbol{"F2B2}}
+ \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmap\symbol{"F2B3}}
+ \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmap\symbol{"F2B4}}
+ \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmap\symbol{"F2B5}}
+ \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmap\symbol{"F2B6}}
+ \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmap\symbol{"F2B7}}
+ \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmap\symbol{"F2B8}}
+ \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmap\symbol{"F2B9}}
+ \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmap\symbol{"F2BA}}
+ \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmap\symbol{"F2BB}}
+ \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmap\symbol{"F2BC}}
+ \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmap\symbol{"F2BD}}
+ \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmap\symbol{"F2BE}}
+ \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmap\symbol{"F2BF}}
+ \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmap\symbol{"F2C0}}
+ \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmap\symbol{"F2C1}}
+ \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmap\symbol{"F2C2}}
+ \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmap\symbol{"F2C3}}
+ \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmap\symbol{"F2C4}}
+ \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmap\symbol{"F2C5}}
+ \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmap\symbol{"F2C6}}
+ \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmap\symbol{"F2C7}}
+ \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmap\symbol{"F2C8}}
+ \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmap\symbol{"F2C9}}
+ \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmap\symbol{"F2CA}}
+ \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmap\symbol{"F2CB}}
+ \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmap\symbol{"F2CC}}
+ \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmap\symbol{"F2CD}}
+ \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmap\symbol{"F2CE}}
+ \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmap\symbol{"F2CF}}
+ \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmap\symbol{"F2D0}}
+ \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmap\symbol{"F2D1}}
+ \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmap\symbol{"F2D2}}
+ \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmap\symbol{"F2D3}}
+ \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmap\symbol{"F2D4}}
+ \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmap\symbol{"F2D5}}
+ \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmap\symbol{"F2D6}}
+ \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmap\symbol{"F2D7}}
+ \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmap\symbol{"F2D8}}
+ \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmap\symbol{"F2D9}}
+ \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmap\symbol{"F2DA}}
+ \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmap\symbol{"F2DB}}
+ \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmap\symbol{"F2DC}}
+ \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmap\symbol{"F2DD}}
+ \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmap\symbol{"F2DE}}
+ \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmap\symbol{"F2DF}}
+ \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmap\symbol{"F2E0}}
+ \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmap\symbol{"F2E1}}
+ \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmap\symbol{"F2E2}}
+ \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmap\symbol{"F2E3}}
+ \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmap\symbol{"F2E4}}
+ \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmap\symbol{"F2E5}}
+ \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmap\symbol{"F2E6}}
+ \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmap\symbol{"F2E7}}
+ \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmap\symbol{"F2E8}}
+ \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmap\symbol{"F2E9}}
+ \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmap\symbol{"F2EA}}
+ \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmap\symbol{"F2EB}}
+ \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmap\symbol{"F2EC}}
+ \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmap\symbol{"F2ED}}
+ \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmap\symbol{"F2EE}}
+ \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmap\symbol{"F2EF}}
+ \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmap\symbol{"F2F0}}
+ \expandafter\def\csname simpleicon@redsysicon\endcsname {\simpleiconsmap\symbol{"F2F1}}
+ \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmap\symbol{"F2F2}}
+ \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmap\symbol{"F2F3}}
+ \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmap\symbol{"F2F4}}
+ \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmap\symbol{"F2F5}}
+ \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmap\symbol{"F2F6}}
+ \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmap\symbol{"F2F7}}
+ \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmap\symbol{"F2F8}}
+ \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmap\symbol{"F2F9}}
+ \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmap\symbol{"F2FA}}
+ \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmap\symbol{"F2FB}}
+ \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmap\symbol{"F2FC}}
+ \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmap\symbol{"F2FD}}
+ \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmap\symbol{"F2FE}}
+ \expandafter\def\csname simpleicon@renovateicon\endcsname {\simpleiconsmap\symbol{"F2FF}}
+ \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmap\symbol{"F300}}
+ \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmap\symbol{"F301}}
+ \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmap\symbol{"F302}}
+ \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmap\symbol{"F303}}
+ \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmap\symbol{"F304}}
+ \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmap\symbol{"F305}}
+ \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmap\symbol{"F306}}
+ \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmap\symbol{"F307}}
+ \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmap\symbol{"F308}}
+ \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmap\symbol{"F309}}
+ \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmap\symbol{"F30A}}
+ \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmap\symbol{"F30B}}
+ \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmap\symbol{"F30C}}
+ \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmap\symbol{"F30D}}
+ \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmap\symbol{"F30E}}
+ \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmap\symbol{"F30F}}
+ \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmap\symbol{"F310}}
+ \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmap\symbol{"F311}}
+ \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmap\symbol{"F312}}
+ \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmap\symbol{"F313}}
+ \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmap\symbol{"F314}}
+ \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmap\symbol{"F315}}
+ \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmap\symbol{"F316}}
+ \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmap\symbol{"F317}}
+ \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmap\symbol{"F318}}
+ \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmap\symbol{"F319}}
+ \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmap\symbol{"F31A}}
+ \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmap\symbol{"F31B}}
+ \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmap\symbol{"F31C}}
+ \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmap\symbol{"F31D}}
+ \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmap\symbol{"F31E}}
+ \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmap\symbol{"F31F}}
+ \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmap\symbol{"F320}}
+ \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmap\symbol{"F321}}
+ \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmap\symbol{"F322}}
+ \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmap\symbol{"F323}}
+ \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmap\symbol{"F324}}
+ \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmap\symbol{"F325}}
+ \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmap\symbol{"F326}}
+ \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmap\symbol{"F327}}
+ \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmap\symbol{"F328}}
+ \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmap\symbol{"F329}}
+ \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmap\symbol{"F32A}}
+ \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmap\symbol{"F32B}}
+ \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmap\symbol{"F32C}}
+ \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmap\symbol{"F32D}}
+ \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmap\symbol{"F32E}}
+ \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmap\symbol{"F32F}}
+ \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmap\symbol{"F330}}
+ \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmap\symbol{"F331}}
+ \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmap\symbol{"F332}}
+ \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmap\symbol{"F333}}
+ \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmap\symbol{"F334}}
+ \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmap\symbol{"F335}}
+ \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmap\symbol{"F336}}
+ \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmap\symbol{"F337}}
+ \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmap\symbol{"F338}}
+ \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmap\symbol{"F339}}
+ \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmap\symbol{"F33A}}
+ \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmap\symbol{"F33B}}
+ \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmap\symbol{"F33C}}
+ \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmap\symbol{"F33D}}
+ \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmap\symbol{"F33E}}
+ \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmap\symbol{"F33F}}
+ \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmap\symbol{"F340}}
+ \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmap\symbol{"F341}}
+ \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmap\symbol{"F342}}
+ \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmap\symbol{"F343}}
+ \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmap\symbol{"F344}}
+ \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmap\symbol{"F345}}
+ \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmap\symbol{"F346}}
+ \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmap\symbol{"F347}}
+ \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmap\symbol{"F348}}
+ \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmap\symbol{"F349}}
+ \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmap\symbol{"F34A}}
+ \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmap\symbol{"F34B}}
+ \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmap\symbol{"F34C}}
+ \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmap\symbol{"F34D}}
+ \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmap\symbol{"F34E}}
+ \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmap\symbol{"F34F}}
+ \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmap\symbol{"F350}}
+ \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmap\symbol{"F351}}
+ \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmap\symbol{"F352}}
+ \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmap\symbol{"F353}}
+ \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmap\symbol{"F354}}
+ \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmap\symbol{"F355}}
+ \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmap\symbol{"F356}}
+ \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmap\symbol{"F357}}
+ \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmap\symbol{"F358}}
+ \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmap\symbol{"F359}}
+ \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmap\symbol{"F35A}}
+ \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmap\symbol{"F35B}}
+ \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmap\symbol{"F35C}}
+ \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmap\symbol{"F35D}}
+ \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmap\symbol{"F35E}}
+ \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmap\symbol{"F35F}}
+ \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmap\symbol{"F360}}
+ \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmap\symbol{"F361}}
+ \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmap\symbol{"F362}}
+ \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmap\symbol{"F363}}
+ \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmap\symbol{"F364}}
+ \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmap\symbol{"F365}}
+ \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmap\symbol{"F366}}
+ \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmap\symbol{"F367}}
+ \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmap\symbol{"F368}}
+ \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmap\symbol{"F369}}
+ \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmap\symbol{"F36A}}
+ \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmap\symbol{"F36B}}
+ \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmap\symbol{"F36C}}
+ \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmap\symbol{"F36D}}
+ \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmap\symbol{"F36E}}
+ \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmap\symbol{"F36F}}
+ \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmap\symbol{"F370}}
+ \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmap\symbol{"F371}}
+ \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmap\symbol{"F372}}
+ \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmap\symbol{"F373}}
+ \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmap\symbol{"F374}}
+ \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmap\symbol{"F375}}
+ \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmap\symbol{"F376}}
+ \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmap\symbol{"F377}}
+ \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmap\symbol{"F378}}
+ \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmap\symbol{"F379}}
+ \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmap\symbol{"F37A}}
+ \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmap\symbol{"F37B}}
+ \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmap\symbol{"F37C}}
+ \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmap\symbol{"F37D}}
+ \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmap\symbol{"F37E}}
+ \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmap\symbol{"F37F}}
+ \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmap\symbol{"F380}}
+ \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmap\symbol{"F381}}
+ \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmap\symbol{"F382}}
+ \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmap\symbol{"F383}}
+ \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmap\symbol{"F384}}
+ \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmap\symbol{"F385}}
+ \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmap\symbol{"F386}}
+ \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmap\symbol{"F387}}
+ \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmap\symbol{"F388}}
+ \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmap\symbol{"F389}}
+ \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmap\symbol{"F38A}}
+ \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmap\symbol{"F38B}}
+ \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmap\symbol{"F38C}}
+ \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmap\symbol{"F38D}}
+ \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmap\symbol{"F38E}}
+ \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmap\symbol{"F38F}}
+ \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmap\symbol{"F390}}
+ \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmap\symbol{"F391}}
+ \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmap\symbol{"F392}}
+ \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmap\symbol{"F393}}
+ \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmap\symbol{"F394}}
+ \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmap\symbol{"F395}}
+ \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmap\symbol{"F396}}
+ \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmap\symbol{"F397}}
+ \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmap\symbol{"F398}}
+ \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmap\symbol{"F399}}
+ \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmap\symbol{"F39A}}
+ \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmap\symbol{"F39B}}
+ \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmap\symbol{"F39C}}
+ \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmap\symbol{"F39D}}
+ \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmap\symbol{"F39E}}
+ \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmap\symbol{"F39F}}
+ \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmap\symbol{"F3A0}}
+ \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmap\symbol{"F3A1}}
+ \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmap\symbol{"F3A2}}
+ \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmap\symbol{"F3A3}}
+ \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmap\symbol{"F3A4}}
+ \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmap\symbol{"F3A5}}
+ \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmap\symbol{"F3A6}}
+ \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmap\symbol{"F3A7}}
+ \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmap\symbol{"F3A8}}
+ \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmap\symbol{"F3A9}}
+ \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmap\symbol{"F3AA}}
+ \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmap\symbol{"F3AB}}
+ \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmap\symbol{"F3AC}}
+ \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmap\symbol{"F3AD}}
+ \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmap\symbol{"F3AE}}
+ \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmap\symbol{"F3AF}}
+ \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmap\symbol{"F3B0}}
+ \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmap\symbol{"F3B1}}
+ \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmap\symbol{"F3B2}}
+ \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmap\symbol{"F3B3}}
+ \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmap\symbol{"F3B4}}
+ \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmap\symbol{"F3B5}}
+ \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmap\symbol{"F3B6}}
+ \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmap\symbol{"F3B7}}
+ \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmap\symbol{"F3B8}}
+ \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmap\symbol{"F3B9}}
+ \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmap\symbol{"F3BA}}
+ \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmap\symbol{"F3BB}}
+ \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmap\symbol{"F3BC}}
+ \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmap\symbol{"F3BD}}
+ \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmap\symbol{"F3BE}}
+ \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmap\symbol{"F3BF}}
+ \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmap\symbol{"F3C0}}
+ \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmap\symbol{"F3C1}}
+ \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmap\symbol{"F3C2}}
+ \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmap\symbol{"F3C3}}
+ \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmap\symbol{"F3C4}}
+ \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmap\symbol{"F3C5}}
+ \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmap\symbol{"F3C6}}
+ \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmap\symbol{"F3C7}}
+ \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmap\symbol{"F3C8}}
+ \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmap\symbol{"F3C9}}
+ \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmap\symbol{"F3CA}}
+ \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmap\symbol{"F3CB}}
+ \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmap\symbol{"F3CC}}
+ \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmap\symbol{"F3CD}}
+ \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmap\symbol{"F3CE}}
+ \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmap\symbol{"F3CF}}
+ \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmap\symbol{"F3D0}}
+ \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmap\symbol{"F3D1}}
+ \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmap\symbol{"F3D2}}
+ \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmap\symbol{"F3D3}}
+ \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmap\symbol{"F3D4}}
+ \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmap\symbol{"F3D5}}
+ \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmap\symbol{"F3D6}}
+ \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmap\symbol{"F3D7}}
+ \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmap\symbol{"F3D8}}
+ \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmap\symbol{"F3D9}}
+ \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmap\symbol{"F3DA}}
+ \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmap\symbol{"F3DB}}
+ \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmap\symbol{"F3DC}}
+ \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmap\symbol{"F3DD}}
+ \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmap\symbol{"F3DE}}
+ \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmap\symbol{"F3DF}}
+ \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmap\symbol{"F3E0}}
+ \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmap\symbol{"F3E1}}
+ \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmap\symbol{"F3E2}}
+ \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmap\symbol{"F3E3}}
+ \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmap\symbol{"F3E4}}
+ \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmap\symbol{"F3E5}}
+ \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmap\symbol{"F3E6}}
+ \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmap\symbol{"F3E7}}
+ \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmap\symbol{"F3E8}}
+ \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmap\symbol{"F3E9}}
+ \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmap\symbol{"F3EA}}
+ \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmap\symbol{"F3EB}}
+ \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmap\symbol{"F3EC}}
+ \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmap\symbol{"F3ED}}
+ \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmap\symbol{"F3EE}}
+ \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmap\symbol{"F3EF}}
+ \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmap\symbol{"F3F0}}
+ \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmap\symbol{"F3F1}}
+ \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmap\symbol{"F3F2}}
+ \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmap\symbol{"F3F3}}
+ \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmap\symbol{"F3F4}}
+ \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmap\symbol{"F3F5}}
+ \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmap\symbol{"F3F6}}
+ \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmap\symbol{"F3F7}}
+ \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmap\symbol{"F3F8}}
+ \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmap\symbol{"F3F9}}
+ \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmap\symbol{"F3FA}}
+ \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmap\symbol{"F3FB}}
+ \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmap\symbol{"F3FC}}
+ \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmap\symbol{"F3FD}}
+ \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmap\symbol{"F3FE}}
+ \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmap\symbol{"F3FF}}
+ \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmap\symbol{"F400}}
+ \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmap\symbol{"F401}}
+ \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmap\symbol{"F402}}
+ \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmap\symbol{"F403}}
+ \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmap\symbol{"F404}}
+ \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmap\symbol{"F405}}
+ \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmap\symbol{"F406}}
+ \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmap\symbol{"F407}}
+ \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmap\symbol{"F408}}
+ \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmap\symbol{"F409}}
+ \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmap\symbol{"F40A}}
+ \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmap\symbol{"F40B}}
+ \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmap\symbol{"F40C}}
+ \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmap\symbol{"F40D}}
+ \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmap\symbol{"F40E}}
+ \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmap\symbol{"F40F}}
+ \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmap\symbol{"F410}}
+ \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmap\symbol{"F411}}
+ \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmap\symbol{"F412}}
+ \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmap\symbol{"F413}}
+ \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmap\symbol{"F414}}
+ \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmap\symbol{"F415}}
+ \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmap\symbol{"F416}}
+ \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmap\symbol{"F417}}
+ \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmap\symbol{"F418}}
+ \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmap\symbol{"F419}}
+ \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmap\symbol{"F41A}}
+ \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmap\symbol{"F41B}}
+ \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmap\symbol{"F41C}}
+ \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmap\symbol{"F41D}}
+ \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmap\symbol{"F41E}}
+ \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmap\symbol{"F41F}}
+ \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmap\symbol{"F420}}
+ \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmap\symbol{"F421}}
+ \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmap\symbol{"F422}}
+ \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmap\symbol{"F423}}
+ \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmap\symbol{"F424}}
+ \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmap\symbol{"F425}}
+ \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmap\symbol{"F426}}
+ \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmap\symbol{"F427}}
+ \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmap\symbol{"F428}}
+ \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmap\symbol{"F429}}
+ \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmap\symbol{"F42A}}
+ \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmap\symbol{"F42B}}
+ \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmap\symbol{"F42C}}
+ \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmap\symbol{"F42D}}
+ \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmap\symbol{"F42E}}
+ \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmap\symbol{"F42F}}
+ \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmap\symbol{"F430}}
+ \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmap\symbol{"F431}}
+ \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmap\symbol{"F432}}
+ \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmap\symbol{"F433}}
+ \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmap\symbol{"F434}}
+ \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmap\symbol{"F435}}
+ \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmap\symbol{"F436}}
+ \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmap\symbol{"F437}}
+ \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmap\symbol{"F438}}
+ \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmap\symbol{"F439}}
+ \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmap\symbol{"F43A}}
+ \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmap\symbol{"F43B}}
+ \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmap\symbol{"F43C}}
+ \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmap\symbol{"F43D}}
+ \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmap\symbol{"F43E}}
+ \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmap\symbol{"F43F}}
+ \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmap\symbol{"F440}}
+ \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmap\symbol{"F441}}
+ \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmap\symbol{"F442}}
+ \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmap\symbol{"F443}}
+ \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmap\symbol{"F444}}
+ \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmap\symbol{"F445}}
+ \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmap\symbol{"F446}}
+ \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmap\symbol{"F447}}
+ \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmap\symbol{"F448}}
+ \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmap\symbol{"F449}}
+ \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmap\symbol{"F44A}}
+ \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmap\symbol{"F44B}}
+ \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmap\symbol{"F44C}}
+ \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmap\symbol{"F44D}}
+ \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmap\symbol{"F44E}}
+ \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmap\symbol{"F44F}}
+ \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmap\symbol{"F450}}
+ \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmap\symbol{"F451}}
+ \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmap\symbol{"F452}}
+ \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmap\symbol{"F453}}
+ \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmap\symbol{"F454}}
+ \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmap\symbol{"F455}}
+ \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmap\symbol{"F456}}
+ \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmap\symbol{"F457}}
+ \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmap\symbol{"F458}}
+ \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmap\symbol{"F459}}
+ \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmap\symbol{"F45A}}
+ \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmap\symbol{"F45B}}
+ \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmap\symbol{"F45C}}
+ \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmap\symbol{"F45D}}
+ \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmap\symbol{"F45E}}
+ \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmap\symbol{"F45F}}
+ \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmap\symbol{"F460}}
+ \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmap\symbol{"F461}}
+ \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmap\symbol{"F462}}
+ \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmap\symbol{"F463}}
+ \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmap\symbol{"F464}}
+ \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmap\symbol{"F465}}
+ \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmap\symbol{"F466}}
+ \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmap\symbol{"F467}}
+ \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmap\symbol{"F468}}
+ \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmap\symbol{"F469}}
+ \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmap\symbol{"F46A}}
+ \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmap\symbol{"F46B}}
+ \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmap\symbol{"F46C}}
+ \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmap\symbol{"F46D}}
+ \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmap\symbol{"F46E}}
+ \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmap\symbol{"F46F}}
+ \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmap\symbol{"F470}}
+ \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmap\symbol{"F471}}
+ \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmap\symbol{"F472}}
+ \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmap\symbol{"F473}}
+ \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmap\symbol{"F474}}
+ \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmap\symbol{"F475}}
+ \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmap\symbol{"F476}}
+ \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmap\symbol{"F477}}
+ \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmap\symbol{"F478}}
+ \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmap\symbol{"F479}}
+ \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmap\symbol{"F47A}}
+ \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmap\symbol{"F47B}}
+ \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmap\symbol{"F47C}}
+ \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmap\symbol{"F47D}}
+ \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmap\symbol{"F47E}}
+ \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmap\symbol{"F47F}}
+ \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmap\symbol{"F480}}
+ \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmap\symbol{"F481}}
+ \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmap\symbol{"F482}}
+ \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmap\symbol{"F483}}
+ \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmap\symbol{"F484}}
+ \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmap\symbol{"F485}}
+ \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmap\symbol{"F486}}
+ \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmap\symbol{"F487}}
+ \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmap\symbol{"F488}}
+ \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmap\symbol{"F489}}
+ \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmap\symbol{"F48A}}
+ \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmap\symbol{"F48B}}
+ \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmap\symbol{"F48C}}
+ \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmap\symbol{"F48D}}
+ \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmap\symbol{"F48E}}
+ \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmap\symbol{"F48F}}
+ \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmap\symbol{"F490}}
+ \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmap\symbol{"F491}}
+ \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmap\symbol{"F492}}
+ \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmap\symbol{"F493}}
+ \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmap\symbol{"F494}}
+ \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmap\symbol{"F495}}
+ \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmap\symbol{"F496}}
+ \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmap\symbol{"F497}}
+ \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmap\symbol{"F498}}
+ \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmap\symbol{"F499}}
+ \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmap\symbol{"F49A}}
+ \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmap\symbol{"F49B}}
+ \expandafter\def\csname simpleicon@techcrunchicon\endcsname {\simpleiconsmap\symbol{"F49C}}
+ \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmap\symbol{"F49D}}
+ \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmap\symbol{"F49E}}
+ \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmap\symbol{"F49F}}
+ \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmap\symbol{"F4A0}}
+ \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmap\symbol{"F4A1}}
+ \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmap\symbol{"F4A2}}
+ \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmap\symbol{"F4A3}}
+ \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmap\symbol{"F4A4}}
+ \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmap\symbol{"F4A5}}
+ \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmap\symbol{"F4A6}}
+ \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmap\symbol{"F4A7}}
+ \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmap\symbol{"F4A8}}
+ \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmap\symbol{"F4A9}}
+ \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmap\symbol{"F4AA}}
+ \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmap\symbol{"F4AB}}
+ \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmap\symbol{"F4AC}}
+ \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmap\symbol{"F4AD}}
+ \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmap\symbol{"F4AE}}
+ \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmap\symbol{"F4AF}}
+ \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmap\symbol{"F4B0}}
+ \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmap\symbol{"F4B1}}
+ \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmap\symbol{"F4B2}}
+ \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmap\symbol{"F4B3}}
+ \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmap\symbol{"F4B4}}
+ \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmap\symbol{"F4B5}}
+ \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmap\symbol{"F4B6}}
+ \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmap\symbol{"F4B7}}
+ \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmap\symbol{"F4B8}}
+ \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmap\symbol{"F4B9}}
+ \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmap\symbol{"F4BA}}
+ \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmap\symbol{"F4BB}}
+ \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmap\symbol{"F4BC}}
+ \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmap\symbol{"F4BD}}
+ \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmap\symbol{"F4BE}}
+ \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmap\symbol{"F4BF}}
+ \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmap\symbol{"F4C0}}
+ \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmap\symbol{"F4C1}}
+ \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmap\symbol{"F4C2}}
+ \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmap\symbol{"F4C3}}
+ \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmap\symbol{"F4C4}}
+ \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmap\symbol{"F4C5}}
+ \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmap\symbol{"F4C6}}
+ \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmap\symbol{"F4C7}}
+ \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmap\symbol{"F4C8}}
+ \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmap\symbol{"F4C9}}
+ \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmap\symbol{"F4CA}}
+ \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmap\symbol{"F4CB}}
+ \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmap\symbol{"F4CC}}
+ \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmap\symbol{"F4CD}}
+ \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmap\symbol{"F4CE}}
+ \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmap\symbol{"F4CF}}
+ \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmap\symbol{"F4D0}}
+ \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmap\symbol{"F4D1}}
+ \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmap\symbol{"F4D2}}
+ \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmap\symbol{"F4D3}}
+ \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmap\symbol{"F4D4}}
+ \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmap\symbol{"F4D5}}
+ \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmap\symbol{"F4D6}}
+ \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmap\symbol{"F4D7}}
+ \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmap\symbol{"F4D8}}
+ \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmap\symbol{"F4D9}}
+ \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmap\symbol{"F4DA}}
+ \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmap\symbol{"F4DB}}
+ \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmap\symbol{"F4DC}}
+ \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmap\symbol{"F4DD}}
+ \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmap\symbol{"F4DE}}
+ \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmap\symbol{"F4DF}}
+ \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmap\symbol{"F4E0}}
+ \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmap\symbol{"F4E1}}
+ \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmap\symbol{"F4E2}}
+ \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmap\symbol{"F4E3}}
+ \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmap\symbol{"F4E4}}
+ \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmap\symbol{"F4E5}}
+ \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmap\symbol{"F4E6}}
+ \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmap\symbol{"F4E7}}
+ \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmap\symbol{"F4E8}}
+ \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmap\symbol{"F4E9}}
+ \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmap\symbol{"F4EA}}
+ \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmap\symbol{"F4EB}}
+ \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmap\symbol{"F4EC}}
+ \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmap\symbol{"F4ED}}
+ \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmap\symbol{"F4EE}}
+ \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmap\symbol{"F4EF}}
+ \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmap\symbol{"F4F0}}
+ \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmap\symbol{"F4F1}}
+ \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmap\symbol{"F4F2}}
+ \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmap\symbol{"F4F3}}
+ \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmap\symbol{"F4F4}}
+ \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmap\symbol{"F4F5}}
+ \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmap\symbol{"F4F6}}
+ \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmap\symbol{"F4F7}}
+ \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmap\symbol{"F4F8}}
+ \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmap\symbol{"F4F9}}
+ \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmap\symbol{"F4FA}}
+ \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmap\symbol{"F4FB}}
+ \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmap\symbol{"F4FC}}
+ \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmap\symbol{"F4FD}}
+ \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmap\symbol{"F4FE}}
+ \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmap\symbol{"F4FF}}
+ \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmap\symbol{"F500}}
+ \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmap\symbol{"F501}}
+ \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmap\symbol{"F502}}
+ \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmap\symbol{"F503}}
+ \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmap\symbol{"F504}}
+ \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmap\symbol{"F505}}
+ \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmap\symbol{"F506}}
+ \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmap\symbol{"F507}}
+ \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmap\symbol{"F508}}
+ \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmap\symbol{"F509}}
+ \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmap\symbol{"F50A}}
+ \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmap\symbol{"F50B}}
+ \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmap\symbol{"F50C}}
+ \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmap\symbol{"F50D}}
+ \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmap\symbol{"F50E}}
+ \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmap\symbol{"F50F}}
+ \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmap\symbol{"F510}}
+ \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmap\symbol{"F511}}
+ \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmap\symbol{"F512}}
+ \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmap\symbol{"F513}}
+ \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmap\symbol{"F514}}
+ \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmap\symbol{"F515}}
+ \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmap\symbol{"F516}}
+ \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmap\symbol{"F517}}
+ \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmap\symbol{"F518}}
+ \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmap\symbol{"F519}}
+ \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmap\symbol{"F51A}}
+ \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmap\symbol{"F51B}}
+ \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmap\symbol{"F51C}}
+ \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmap\symbol{"F51D}}
+ \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmap\symbol{"F51E}}
+ \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmap\symbol{"F51F}}
+ \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmap\symbol{"F520}}
+ \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmap\symbol{"F521}}
+ \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmap\symbol{"F522}}
+ \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmap\symbol{"F523}}
+ \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmap\symbol{"F524}}
+ \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmap\symbol{"F525}}
+ \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmap\symbol{"F526}}
+ \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmap\symbol{"F527}}
+ \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmap\symbol{"F528}}
+ \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmap\symbol{"F529}}
+ \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmap\symbol{"F52A}}
+ \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmap\symbol{"F52B}}
+ \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmap\symbol{"F52C}}
+ \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmap\symbol{"F52D}}
+ \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmap\symbol{"F52E}}
+ \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmap\symbol{"F52F}}
+ \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmap\symbol{"F530}}
+ \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmap\symbol{"F531}}
+ \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmap\symbol{"F532}}
+ \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmap\symbol{"F533}}
+ \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmap\symbol{"F534}}
+ \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmap\symbol{"F535}}
+ \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmap\symbol{"F536}}
+ \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmap\symbol{"F537}}
+ \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmap\symbol{"F538}}
+ \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmap\symbol{"F539}}
+ \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmap\symbol{"F53A}}
+ \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmap\symbol{"F53B}}
+ \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmap\symbol{"F53C}}
+ \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmap\symbol{"F53D}}
+ \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmap\symbol{"F53E}}
+ \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmap\symbol{"F53F}}
+ \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmap\symbol{"F540}}
+ \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmap\symbol{"F541}}
+ \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmap\symbol{"F542}}
+ \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmap\symbol{"F543}}
+ \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmap\symbol{"F544}}
+ \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmap\symbol{"F545}}
+ \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmap\symbol{"F546}}
+ \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmap\symbol{"F547}}
+ \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmap\symbol{"F548}}
+ \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmap\symbol{"F549}}
+ \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmap\symbol{"F54A}}
+ \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmap\symbol{"F54B}}
+ \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmap\symbol{"F54C}}
+ \expandafter\def\csname simpleicon@unjsicon\endcsname {\simpleiconsmap\symbol{"F54D}}
+ \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmap\symbol{"F54E}}
+ \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmap\symbol{"F54F}}
+ \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmap\symbol{"F550}}
+ \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmap\symbol{"F551}}
+ \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmap\symbol{"F552}}
+ \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmap\symbol{"F553}}
+ \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmap\symbol{"F554}}
+ \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmap\symbol{"F555}}
+ \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmap\symbol{"F556}}
+ \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmap\symbol{"F557}}
+ \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmap\symbol{"F558}}
+ \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmap\symbol{"F559}}
+ \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmap\symbol{"F55A}}
+ \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmap\symbol{"F55B}}
+ \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmap\symbol{"F55C}}
+ \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmap\symbol{"F55D}}
+ \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmap\symbol{"F55E}}
+ \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmap\symbol{"F55F}}
+ \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmap\symbol{"F560}}
+ \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmap\symbol{"F561}}
+ \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmap\symbol{"F562}}
+ \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmap\symbol{"F563}}
+ \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmap\symbol{"F564}}
+ \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmap\symbol{"F565}}
+ \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmap\symbol{"F566}}
+ \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmap\symbol{"F567}}
+ \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmap\symbol{"F568}}
+ \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmap\symbol{"F569}}
+ \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmap\symbol{"F56A}}
+ \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmap\symbol{"F56B}}
+ \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmap\symbol{"F56C}}
+ \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmap\symbol{"F56D}}
+ \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmap\symbol{"F56E}}
+ \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmap\symbol{"F56F}}
+ \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmap\symbol{"F570}}
+ \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmap\symbol{"F571}}
+ \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmap\symbol{"F572}}
+ \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmap\symbol{"F573}}
+ \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmap\symbol{"F574}}
+ \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmap\symbol{"F575}}
+ \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmap\symbol{"F576}}
+ \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmap\symbol{"F577}}
+ \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmap\symbol{"F578}}
+ \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmap\symbol{"F579}}
+ \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmap\symbol{"F57A}}
+ \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmap\symbol{"F57B}}
+ \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmap\symbol{"F57C}}
+ \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmap\symbol{"F57D}}
+ \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmap\symbol{"F57E}}
+ \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmap\symbol{"F57F}}
+ \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmap\symbol{"F580}}
+ \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmap\symbol{"F581}}
+ \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmap\symbol{"F582}}
+ \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmap\symbol{"F583}}
+ \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmap\symbol{"F584}}
+ \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmap\symbol{"F585}}
+ \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmap\symbol{"F586}}
+ \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmap\symbol{"F587}}
+ \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmap\symbol{"F588}}
+ \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmap\symbol{"F589}}
+ \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmap\symbol{"F58A}}
+ \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmap\symbol{"F58B}}
+ \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmap\symbol{"F58C}}
+ \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmap\symbol{"F58D}}
+ \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmap\symbol{"F58E}}
+ \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmap\symbol{"F58F}}
+ \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmap\symbol{"F590}}
+ \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmap\symbol{"F591}}
+ \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmap\symbol{"F592}}
+ \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmap\symbol{"F593}}
+ \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmap\symbol{"F594}}
+ \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmap\symbol{"F595}}
+ \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmap\symbol{"F596}}
+ \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmap\symbol{"F597}}
+ \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmap\symbol{"F598}}
+ \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmap\symbol{"F599}}
+ \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmap\symbol{"F59A}}
+ \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmap\symbol{"F59B}}
+ \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmap\symbol{"F59C}}
+ \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmap\symbol{"F59D}}
+ \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmap\symbol{"F59E}}
+ \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmap\symbol{"F59F}}
+ \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmap\symbol{"F5A0}}
+ \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmap\symbol{"F5A1}}
+ \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmap\symbol{"F5A2}}
+ \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmap\symbol{"F5A3}}
+ \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmap\symbol{"F5A4}}
+ \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmap\symbol{"F5A5}}
+ \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmap\symbol{"F5A6}}
+ \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmap\symbol{"F5A7}}
+ \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmap\symbol{"F5A8}}
+ \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmap\symbol{"F5A9}}
+ \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmap\symbol{"F5AA}}
+ \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmap\symbol{"F5AB}}
+ \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmap\symbol{"F5AC}}
+ \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmap\symbol{"F5AD}}
+ \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmap\symbol{"F5AE}}
+ \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmap\symbol{"F5AF}}
+ \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmap\symbol{"F5B0}}
+ \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmap\symbol{"F5B1}}
+ \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmap\symbol{"F5B2}}
+ \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmap\symbol{"F5B3}}
+ \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmap\symbol{"F5B4}}
+ \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmap\symbol{"F5B5}}
+ \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmap\symbol{"F5B6}}
+ \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmap\symbol{"F5B7}}
+ \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmap\symbol{"F5B8}}
+ \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmap\symbol{"F5B9}}
+ \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmap\symbol{"F5BA}}
+ \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmap\symbol{"F5BB}}
+ \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmap\symbol{"F5BC}}
+ \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmap\symbol{"F5BD}}
+ \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmap\symbol{"F5BE}}
+ \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmap\symbol{"F5BF}}
+ \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmap\symbol{"F5C0}}
+ \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmap\symbol{"F5C1}}
+ \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmap\symbol{"F5C2}}
+ \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmap\symbol{"F5C3}}
+ \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmap\symbol{"F5C4}}
+ \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmap\symbol{"F5C5}}
+ \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmap\symbol{"F5C6}}
+ \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmap\symbol{"F5C7}}
+ \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmap\symbol{"F5C8}}
+ \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmap\symbol{"F5C9}}
+ \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmap\symbol{"F5CA}}
+ \expandafter\def\csname simpleicon@webgpuicon\endcsname {\simpleiconsmap\symbol{"F5CB}}
+ \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmap\symbol{"F5CC}}
+ \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmap\symbol{"F5CD}}
+ \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmap\symbol{"F5CE}}
+ \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmap\symbol{"F5CF}}
+ \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmap\symbol{"F5D0}}
+ \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmap\symbol{"F5D1}}
+ \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmap\symbol{"F5D2}}
+ \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmap\symbol{"F5D3}}
+ \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmap\symbol{"F5D4}}
+ \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmap\symbol{"F5D5}}
+ \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmap\symbol{"F5D6}}
+ \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmap\symbol{"F5D7}}
+ \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmap\symbol{"F5D8}}
+ \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmap\symbol{"F5D9}}
+ \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmap\symbol{"F5DA}}
+ \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmap\symbol{"F5DB}}
+ \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmap\symbol{"F5DC}}
+ \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmap\symbol{"F5DD}}
+ \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmap\symbol{"F5DE}}
+ \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmap\symbol{"F5DF}}
+ \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmap\symbol{"F5E0}}
+ \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmap\symbol{"F5E1}}
+ \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmap\symbol{"F5E2}}
+ \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmap\symbol{"F5E3}}
+ \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmap\symbol{"F5E4}}
+ \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmap\symbol{"F5E5}}
+ \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmap\symbol{"F5E6}}
+ \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmap\symbol{"F5E7}}
+ \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmap\symbol{"F5E8}}
+ \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmap\symbol{"F5E9}}
+ \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmap\symbol{"F5EA}}
+ \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmap\symbol{"F5EB}}
+ \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmap\symbol{"F5EC}}
+ \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmap\symbol{"F5ED}}
+ \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmap\symbol{"F5EE}}
+ \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmap\symbol{"F5EF}}
+ \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmap\symbol{"F5F0}}
+ \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmap\symbol{"F5F1}}
+ \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmap\symbol{"F5F2}}
+ \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmap\symbol{"F5F3}}
+ \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmap\symbol{"F5F4}}
+ \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmap\symbol{"F5F5}}
+ \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmap\symbol{"F5F6}}
+ \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmap\symbol{"F5F7}}
+ \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmap\symbol{"F5F8}}
+ \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmap\symbol{"F5F9}}
+ \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmap\symbol{"F5FA}}
+ \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmap\symbol{"F5FB}}
+ \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmap\symbol{"F5FC}}
+ \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmap\symbol{"F5FD}}
+ \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmap\symbol{"F5FE}}
+ \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmap\symbol{"F5FF}}
+ \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmap\symbol{"F600}}
+ \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmap\symbol{"F601}}
+ \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmap\symbol{"F602}}
+ \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmap\symbol{"F603}}
+ \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmap\symbol{"F604}}
+ \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmap\symbol{"F605}}
+ \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmap\symbol{"F606}}
+ \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmap\symbol{"F607}}
+ \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmap\symbol{"F608}}
+ \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmap\symbol{"F609}}
+ \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmap\symbol{"F60A}}
+ \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmap\symbol{"F60B}}
+ \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmap\symbol{"F60C}}
+ \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmap\symbol{"F60D}}
+ \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmap\symbol{"F60E}}
+ \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmap\symbol{"F60F}}
+ \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmap\symbol{"F610}}
+ \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmap\symbol{"F611}}
+ \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmap\symbol{"F612}}
+ \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmap\symbol{"F613}}
+ \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmap\symbol{"F614}}
+ \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmap\symbol{"F615}}
+ \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmap\symbol{"F616}}
+ \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmap\symbol{"F617}}
+ \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmap\symbol{"F618}}
+ \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmap\symbol{"F619}}
+ \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmap\symbol{"F61A}}
+ \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmap\symbol{"F61B}}
+ \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmap\symbol{"F61C}}
+ \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmap\symbol{"F61D}}
+ \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmap\symbol{"F61E}}
+ \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmap\symbol{"F61F}}
+ \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmap\symbol{"F620}}
+ \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmap\symbol{"F621}}
+ \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmap\symbol{"F622}}
+ \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmap\symbol{"F623}}
+ \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmap\symbol{"F624}}
+ \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmap\symbol{"F625}}
+ \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmap\symbol{"F626}}
+ \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmap\symbol{"F627}}
+ \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmap\symbol{"F628}}
+ \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmap\symbol{"F629}}
+ \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmap\symbol{"F62A}}
+ \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmap\symbol{"F62B}}
+ \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmap\symbol{"F62C}}
+ \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmap\symbol{"F62D}}
+ \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmap\symbol{"F62E}}
+ \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmap\symbol{"F62F}}
+ \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmap\symbol{"F630}}
+ \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmap\symbol{"F631}}
+ \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmap\symbol{"F632}}
+ \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmap\symbol{"F633}}
+ \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmap\symbol{"F634}}
+ \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmap\symbol{"F635}}
+ \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmap\symbol{"F636}}
+ \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmap\symbol{"F637}}
+ \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmap\symbol{"F638}}
+ \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmap\symbol{"F639}}
+ \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmap\symbol{"F63A}}
+ \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmap\symbol{"F63B}}
+ \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmap\symbol{"F63C}}
+ \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmap\symbol{"F63D}}
+ \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmap\symbol{"F63E}}
+ \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmap\symbol{"F63F}}
+ \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmap\symbol{"F640}}
+ \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmap\symbol{"F641}}
+ \expandafter\def\csname simpleicon@zerotiericon\endcsname {\simpleiconsmap\symbol{"F642}}
+ \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmap\symbol{"F643}}
+ \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmap\symbol{"F644}}
+ \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmap\symbol{"F645}}
+ \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmap\symbol{"F646}}
+ \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmap\symbol{"F647}}
+ \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmap\symbol{"F648}}
+ \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmap\symbol{"F649}}
+ \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmap\symbol{"F64A}}
+ \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmap\symbol{"F64B}}
+ \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmap\symbol{"F64C}}
+ \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmap\symbol{"F64D}}
+ \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmap\symbol{"F64E}}
+ \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmap\symbol{"F64F}}
+ \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmap\symbol{"F650}}
+ \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmap\symbol{"F651}}
+ \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmap\symbol{"F652}}
+ \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmap\symbol{"F653}}
+ \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmap\symbol{"F654}}
+ \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmap\symbol{"F655}}
+ \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmap\symbol{"F656}}
+ \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmap\symbol{"F657}} \ 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 b7fdf3bc904..93008682ff3 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/07/12 Font definitions for U/simpleiconseight.]
+ \ProvidesFile{usimpleiconseight.fd}[2024/08/09 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 6af1a1e8100..5e47f926512 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/07/12 Font definitions for U/simpleiconsfive.]
+ \ProvidesFile{usimpleiconsfive.fd}[2024/08/09 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 3324eae514f..e059e7bf29d 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/07/12 Font definitions for U/simpleiconsfour.]
+ \ProvidesFile{usimpleiconsfour.fd}[2024/08/09 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 6fbec07c5eb..08d6304a750 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/07/12 Font definitions for U/simpleiconsnine.]
+ \ProvidesFile{usimpleiconsnine.fd}[2024/08/09 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 525eb910e67..358ed5db489 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/07/12 Font definitions for U/simpleiconsone.]
+ \ProvidesFile{usimpleiconsone.fd}[2024/08/09 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 704d6dfe38c..efe82505dd5 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/07/12 Font definitions for U/simpleiconsoneone.]
+ \ProvidesFile{usimpleiconsoneone.fd}[2024/08/09 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 95c0687d34a..2540da87c72 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/07/12 Font definitions for U/simpleiconsonethree.]
+ \ProvidesFile{usimpleiconsonethree.fd}[2024/08/09 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 24f46e9ff7c..66b5ebe7d4b 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/07/12 Font definitions for U/simpleiconsonetwo.]
+ \ProvidesFile{usimpleiconsonetwo.fd}[2024/08/09 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 fa32daf5d99..5d713429328 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/07/12 Font definitions for U/simpleiconsonezero.]
+ \ProvidesFile{usimpleiconsonezero.fd}[2024/08/09 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 e2d5c58f188..cc2cfc4d7bf 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/07/12 Font definitions for U/simpleiconsseven.]
+ \ProvidesFile{usimpleiconsseven.fd}[2024/08/09 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 e05549bde9b..d0373d234fc 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/07/12 Font definitions for U/simpleiconssix.]
+ \ProvidesFile{usimpleiconssix.fd}[2024/08/09 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 a653873414c..81258c72a60 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/07/12 Font definitions for U/simpleiconsthree.]
+ \ProvidesFile{usimpleiconsthree.fd}[2024/08/09 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 19d30bd3fcc..d96d720c3ed 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/07/12 Font definitions for U/simpleiconstwo.]
+ \ProvidesFile{usimpleiconstwo.fd}[2024/08/09 Font definitions for U/simpleiconstwo.]
\DeclareFontFamily{U}{simpleiconstwo}{}
\DeclareFontShape{U}{simpleiconstwo}{m}{n}{<-> SimpleIcons--simpleiconstwo}{}
\endinput
diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
index eec160df3fc..d48f5f2dd26 100644
--- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
+++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty
@@ -41,7 +41,7 @@
}%
\endinput
}%
-\ProvidesExplPackage {siunitx} {2024-06-24} {3.3.19}
+\ProvidesExplPackage {siunitx} {2024-08-01} {3.3.20}
{A comprehensive (SI) units package}
\msg_new:nnnn { siunitx } { incompatible-package }
{ Package~'#1'~incompatible. }
@@ -1479,7 +1479,13 @@
\str_case:nnF {#1}
{
{ down } { \use_i:nn }
- { up } { \use_ii:nn }
+ { up }
+ {
+ \str_if_eq:eeTF
+ {#2} { \prg_replicate:nn { \tl_count:n {#2} } { 0 } }
+ { \use_i:nn }
+ { \use_ii:nn }
+ }
}
{
\bool_lazy_or:nnTF
diff --git a/Master/texmf-dist/tex/latex/subeqn/subeqn.sty b/Master/texmf-dist/tex/latex/subeqn/subeqn.sty
index 7d0dcba5dcd..fab4e5ddebf 100644
--- a/Master/texmf-dist/tex/latex/subeqn/subeqn.sty
+++ b/Master/texmf-dist/tex/latex/subeqn/subeqn.sty
@@ -5,19 +5,20 @@
%% The original source files were:
%%
%% subeqn.dtx (with options: `package')
+%% This is a generated file.
%%
-%% Copyright (C) 1999-2004 Johannes Braams. All rights reserved.
+%% Copyright (C) 1999-2024 Johannes Braams. All rights reserved.
%%
%% This file was generated from file(s) of the subeqn package.
%% -----------------------------------------------------------
%%
%% It 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.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.
+%% and version 1.3Ñ or later is part of all distributions of LaTeX
+%% version 2008 or later.
%%
%% This work has the LPPL maintenance status "maintained".
%%
@@ -28,19 +29,14 @@
%% without such generated files.
%%
%% The list of all files belonging to the subeqn package is
-%% given in the file `manifest.txt.
+%% given in the file `MANIFEST'.
%%
%% The list of derived (unpacked) files belonging to the distribution
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
-%% File: `subeqn.dtx'
-%% Copyright (C) 1999-2004
-%% Donald Arsenau (asnd at reg.triumf.ca),
-%% Johannes Braams (TeXniek at braams.cistron.nl)
-%%
\NeedsTeXFormat{LaTeX2e}[1998/06/01]
\ProvidesPackage{subeqn}
- [2004/04/15 v2.0b subnumbering of equations]
+ [2024/07/21 v2.0c subnumbering of equations]
\newenvironment{subequations}{%
\refstepcounter{equation}%
\mathchardef\c@mainequation\c@equation
diff --git a/Master/texmf-dist/tex/latex/subeqnarray/subeqnarray.sty b/Master/texmf-dist/tex/latex/subeqnarray/subeqnarray.sty
index 1223f1bb376..1703304b514 100644
--- a/Master/texmf-dist/tex/latex/subeqnarray/subeqnarray.sty
+++ b/Master/texmf-dist/tex/latex/subeqnarray/subeqnarray.sty
@@ -6,18 +6,18 @@
%%
%% subeqnarray.dtx (with options: `package')
%%
-%% Copyright (C) 1999-2004 Johannes Braams. All rights reserved.
+%% Copyright (C) 1999-2024 Johannes Braams. All rights reserved.
%%
%% This file was generated from file(s) of the subeqnarray package.
%% ----------------------------------------------------------------
%%
%% It 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
-%% version 2003/12/01 or later.
+%% 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".
%%
@@ -33,18 +33,13 @@
%% The list of derived (unpacked) files belonging to the distribution
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
-%% Copyright (C) 1988--2004 by Johannes Braams,
-%% all rights resserved
%%
%% Error reports please to: J. Braams
%% TeXniek
-%% Kooienswater 62
-%% 2715 AJ Zoetermeer
-%% The Netherlands
-%% Email: texniek at braams.cistron.nl
+%% Email: texniek at texniek.nl
\NeedsTeXFormat{LaTeX2e}[1998/06/01]
\ProvidesPackage{subeqnarray}
- [2004/04/15 v2.1c subeqnarray package]
+ [2024/07/20 v2.1e subeqnarray package]
\newcounter{subequation}[equation]
\def\thesubequation{\theequation\alph{subequation}}
\DeclareOption{leqno}{%
diff --git a/Master/texmf-dist/tex/latex/supertabular/supertabular.sty b/Master/texmf-dist/tex/latex/supertabular/supertabular.sty
index 03fcf9cc6ca..05a7876b1ec 100644
--- a/Master/texmf-dist/tex/latex/supertabular/supertabular.sty
+++ b/Master/texmf-dist/tex/latex/supertabular/supertabular.sty
@@ -35,19 +35,21 @@
%% Sourcefile `supertabular.dtx'.
%%
%% Copyright (C) 1988 by Theo Jurriens
-%% Copyright (C) 1990-2020 by Johannes Braams texniek at braams.xs4all.nl
-%% Kersengaarde 33
-%% 2723 BP Zoetermeer NL
+%% Copyright (C) 1990-2024 by Johannes Braams texniek at texniek.nl
+%% The Netherlands
%% all rights reserved.
%%
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{supertabular}
- [2020/02/02 v4.1g the supertabular environment]
+ [2024/07/20 v4.2c the supertabular environment]
\newcount\c@tracingst
\DeclareOption{errorshow}{\c@tracingst\z@}
\DeclareOption{pageshow}{\c@tracingst\thr@@}
\DeclareOption{debugshow}{\c@tracingst5\relax}
+\DeclareOption{calculate}{\def\ST@calculate@rowht{\ST@compute@rowht}}
+\DeclareOption{estimate}{\def\ST@calculate@rowht{\ST@estimate@rowht}}
+\ExecuteOptions{errorshow,estimate}
\ProcessOptions
\newif\if@topcaption \@topcaptiontrue
\def\topcaption{\@topcaptiontrue\tablecaption}
@@ -76,41 +78,53 @@
\if@topcaption \vskip 10\p@ \gdef\ST@captionroom{20\p@}\fi
\endgroup}
\newcommand\tablehead[1]{%
- \gdef\@tablehead{%
- \noalign{%
- \global\let\@savcr=\\
- \global\let\\=\org@tabularcr}%
- #1%
- \noalign{\global\let\\=\@savcr}}}
+ \def\@ST@arg{#1}%
+ \ifx\@ST@arg\@empty\gdef\@tablehead{}\else
+ \gdef\@tablehead{%
+ \noalign{%
+ \global\let\@savcr=\\
+ \global\let\\=\org@tabularcr}%
+ #1%
+ \noalign{\global\let\\=\@savcr}}%
+ \fi}
\tablehead{}
\newcommand\tablefirsthead[1]{%
- \gdef\@table@first@head{%
- \noalign{%
- \global\let\@savcr=\\
- \global\let\\=\org@tabularcr}%
- #1%
- \noalign{%
- \global\let\\=\@savcr
- \global\let\@table@first@head\undefined
- }}}
+ \def\@ST@arg{#1}%
+ \ifx\@ST@arg\@empty\gdef\@table@first@head{}\else
+ \gdef\@table@first@head{%
+ \noalign{%
+ \global\let\@savcr=\\
+ \global\let\\=\org@tabularcr}%
+ #1%
+ \noalign{%
+ \global\let\\=\@savcr
+ \global\let\@table@first@head\undefined
+ }}%
+ \fi}
\newcommand\tabletail[1]{%
- \gdef\@tabletail{%
- \noalign{%
- \global\let\@savcr=\\
- \global\let\\=\org@tabularcr}%
- #1%
- \noalign{\global\let\\=\@savcr}}}
+ \def\@ST@arg{#1}%
+ \ifx\@ST@arg\@empty\gdef\@tabletail{}\else
+ \gdef\@tabletail{%
+ \noalign{%
+ \global\let\@savcr=\\
+ \global\let\\=\org@tabularcr}%
+ #1%
+ \noalign{\global\let\\=\@savcr}}%
+ \fi}
\tabletail{}
\newcommand\tablelasttail[1]{%
- \gdef\@table@last@tail{%
- \noalign{%
- \global\let\@savcr=\\
- \global\let\\=\org@tabularcr}%
- #1%
- \noalign{%
- \global\let\\=\@savcr
- \global\let\@table@last@tail\undefined
- }}}
+ \def\@ST@arg{#1}%
+ \ifx\@ST@arg\@empty\gdef\@table@last@tail{}\else
+ \gdef\@table@last@tail{%
+ \noalign{%
+ \global\let\@savcr=\\
+ \global\let\\=\org@tabularcr}%
+ #1%
+ \noalign{%
+ \global\let\\=\@savcr
+ \global\let\@table@last@tail\undefined
+ }}%
+ \fi}
\newcommand\sttraceon{\c@tracingst5\relax}
\newcommand\sttraceoff{\c@tracingst\z@}
\newcommand\ST@trace[2]{%
@@ -142,7 +156,7 @@
\newdimen\ST@tailht
\newdimen\ST@pagesofar
\newdimen\ST@pboxht
-\newdimen\ST@lineht
+\newdimen\ST@rowht
\newdimen\ST@prevht
\newdimen\ST@toadd
\newdimen\ST@dimen
@@ -191,22 +205,28 @@
\fi
\ST@dimen=\z@
\unvbox\ST@pbox\egroup\hfil}
-\def\ST@compute@lineht{%
- \ST@lineht=\ht\strutbox
+\def\ST@compute@rowht{%
+ \setbox\@tempboxa=\vbox{\@arrayparboxrestore $5^5_5$}
+ \ifnum\ht\@tempboxa>\ht\strutbox
+ \ST@rowht=\ht\@tempboxa
+ \else
+ \ST@rowht=\ht\strutbox
+ \fi
\ifx\extrarowheight\undefined\else
- \advance \ST@lineht by \extrarowheight
+ \advance \ST@rowht by \extrarowheight
+ \fi
+ \ifnum\dp\@tempboxa>\dp\strutbox
+ \advance\ST@rowht \dp\@tempboxa
+ \else
+ \advance\ST@rowht \dp\strutbox
\fi
- \ST@lineht = \arraystretch\ST@lineht
- \advance\ST@lineht \arraystretch\dp\strutbox
- \ST@trace\tw@{Normal Line height: \the\ST@lineht}%
+ \ST@rowht = \arraystretch\ST@rowht
+ \ST@trace\tw@{Normal Row height: \the\ST@rowht}%
}
-\def\estimate@lineht{%
- \ST@lineht=\arraystretch \baslineskp
- \global\advance\ST@lineht by 1\p@
- \ST@stretchht\ST@lineht\advance\ST@stretchht-\baslineskp
- \ifdim\ST@stretchht<\z@\ST@stretchht\z@\fi
- \ST@trace\tw@{Average line height: \the\ST@lineht}%
- \ST@trace\tw@{Stretched line height: \the\ST@stretchht}%
+\def\ST@estimate@rowht{%
+ \ST@rowht=\arraystretch \baslineskp
+ \global\advance\ST@rowht by 1\p@
+ \ST@trace\tw@{Average Row height: \the\ST@rowht}%
}
\def\@calfirstpageht{%
\ST@trace\tw@{Calculating height of tabular on first page}%
@@ -273,11 +293,11 @@
\@tabletail\endtabular}
\ST@tailht=\ht\@tempboxa\advance\ST@tailht\dp\@tempboxa
\fi
- \advance\ST@tailht by \ST@lineht
+ \advance\ST@tailht by \ST@rowht
\ST@trace\tw@{Height of tail: \the\ST@tailht}%
\ST@trace\tw@{Maximum height of tabular: \the\ST@pageleft}%
\@tempdima\ST@headht
- \advance\@tempdima\ST@lineht
+ \advance\@tempdima\ST@rowht
\advance\@tempdima\ST@tailht
\ST@trace\tw@{Minimum height of tabular: \the\@tempdima}%
\ifnum\@tempdima>\ST@pageleft
@@ -325,7 +345,7 @@
\let\@@tablehead=\@table@first@head
\fi
\let\ST@skippage\ST@skipfirstpart
- \ST@compute@lineht
+ \ST@calculate@rowht
\@calfirstpageht
\noindent
}
@@ -453,9 +473,9 @@
\csname org@tabular*\endcsname}
\def\ST@cr{%
\noalign{%
- \ifnum\ST@pboxht<\ST@lineht
- \global\advance\ST@pageleft -\ST@lineht
- \global\ST@prevht\ST@lineht
+ \ifnum\ST@pboxht<\ST@rowht
+ \global\advance\ST@pageleft -\ST@rowht
+ \global\ST@prevht\ST@rowht
\else
\ST@trace@cr\thr@@{Added par box with height \the\ST@pboxht}%
\global\advance\ST@pageleft -\ST@pboxht
@@ -489,7 +509,7 @@
\ST@trace\tw@{Tabular too high, moving to next page}%
\global\advance\ST@pageleft\pagetotal
\global\ST@pagesofar\z@
- \newpage
+ \penalty -\@M
\global\let\ST@skippage\ST@newpage
}}
\def\ST@newpage{%
diff --git a/Master/texmf-dist/tex/latex/tablvar/tablvar.sty b/Master/texmf-dist/tex/latex/tablvar/tablvar.sty
index 07b48703858..958d49d6e97 100644
--- a/Master/texmf-dist/tex/latex/tablvar/tablvar.sty
+++ b/Master/texmf-dist/tex/latex/tablvar/tablvar.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2018-2023 by Antoine Missier <antoine.missier@ac-toulouse.fr>
+%% Copyright (C) 2018-2024 by Antoine Missier <antoine.missier@ac-toulouse.fr>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3 of this license
@@ -22,13 +22,12 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{tablvar}
- [2023/12/23 v2.0 .dtx tablvar file]
-
+ [2024/08/09 v2.1 Tables of signs and variations]
\RequirePackage{array}
\RequirePackage{ifthen}
\RequirePackage{multido}
\RequirePackage{xkeyval}
-\RequirePackage{ifpdf}
+\RequirePackage{iftex}
\newif\iftv@tikz % false par défaut
\DeclareOption{tikz}{\tv@tikztrue}
@@ -38,23 +37,31 @@
\iftv@pstricks
\ifpdf
- \PackageError{tablvar}{Don't use the pstricks option with PDF engines}{}
+ \ifluatex
+ \PackageInfo{tablvar}{Option 'pstricks' works
+ with luapstricks}
+ \else
+ \PackageError{tablvar}{Don't use the 'pstricks' option with
+ PDF output mode}{Use 'tikz' option or change the engine}
+ \fi
\else
- \PackageInfo{tablvar}{PSTricks option is used}
+ \PackageInfo{tablvar}{Option 'pstricks' is used}
\fi
\else\iftv@tikz
- \PackageInfo{tablvar}{tikz option is used.
+ \AtEndDocument{\PackageWarningNoLine{tablvar}{Option 'tikz' is used.
\MessageBreak
- Run twice to draw the arrows correctly}
+ Maybe rerun to draw the arrows correctly}
+ }
\else\ifpdf
- \PackageWarningNoLine{tablvar}{PDF engine is used,
- I'm using the tikz option.
+ \AtEndDocument{\PackageWarningNoLine{tablvar}{Output is in PDF mode,
+ I'm using the 'tikz' option.
\MessageBreak
- Run twice to draw the arrows correctly}
+ Maybe rerun to draw the arrows correctly}
+ }
\tv@tikztrue
\else
- \PackageWarningNoLine{tablvar}{PDF engines not used,
- I'm using the pstricks option}
+ \PackageWarningNoLine{tablvar}{Output is in DVI mode,
+ I'm using the 'pstricks' option}
\tv@pstrickstrue
\fi\fi\fi
@@ -120,6 +127,12 @@
\newcounter{maxdiscont}
\setcounter{maxdiscont}{4} % nb max de discontinuités
+\newlength{\rowtopsep}
+\setlength{\rowtopsep}{2pt}
+
+\newlength{\rowbottomsep}
+\setlength{\rowbottomsep}{2pt}
+
\newcommand*{\fleche}[2]{
\iftv@tikz
\tikz[remember picture,overlay]{\draw[->,>=stealth,
@@ -182,8 +195,8 @@
\multido{\I=1+1}{\themaxdiscont}{\newcounter{discont\I}}
}
-\newlength\mil@heightshift
-\newcounter{mil@rowshift}
+\newlength\mil@shift
+\newcounter{mil@row}
\newcounter{maxZI} % nb max de ZI
\setcounter{maxZI}{4}
@@ -225,19 +238,20 @@
\setcounter{nbvarlignes}{3}
}
-\newcommand\tv@saveheight{%
- \tv@cellheight=0pt
- \tv@celldepth=0pt
- \ifdim \ht\tv@cellbox > \ht\@arstrutbox
- \global\advance\tv@cellheight by \ht\tv@cellbox
- \else
- \global\advance\tv@cellheight by \ht\@arstrutbox
+\newcommand\tv@setheight{%
+ \global\tv@cellheight=\ht\tv@cellbox
+ \ifthenelse{\value{var@ligne}=0}{
+ \global\advance\tv@cellheight by \rowtopsep}{}
+ \ifdim \tv@cellheight < \ht\@arstrutbox
+ \global\tv@cellheight = \ht\@arstrutbox
\fi
- \ifdim \dp\tv@cellbox > \dp\@arstrutbox
- \global\advance\tv@celldepth by \dp\tv@cellbox
- \else
- \global\advance\tv@celldepth by \dp\@arstrutbox
+ \global\tv@celldepth=\dp\tv@cellbox
+ \ifthenelse{\value{var@ligne}=0}{
+ \global\advance \tv@celldepth by \rowbottomsep}{}
+ \ifdim \tv@celldepth < \dp\@arstrutbox
+ \global\tv@celldepth = \dp\@arstrutbox
\fi
+ \vrule height \tv@cellheight depth \tv@celldepth width 0pt
}
\newcommand{\tvcoltypes}{
@@ -246,7 +260,7 @@
>{\setcounter{tv@icol}{0}\stepcounter{tv@row}\begin{lrbox}%
\tv@cellbox $}%
c%
- <{$\end{lrbox}\usebox{\tv@cellbox}\tv@saveheight}}
+ <{$\end{lrbox}\usebox{\tv@cellbox}\tv@setheight}}
% type de colonne i pour les intervalles
\newcolumntype{i}{>{\stepcounter{tv@icol}
\centering\arraybackslash$}p{\intervalwidth}<{$}}
@@ -262,8 +276,8 @@
\setkeys*{tablvar}{#1} % fourni par xkeyval
\if\XKV@rm\empty \else \setlength{\intervalwidth}{#1} \fi
\tvcoltypes
- \ifextleft \newcolumntype{B}{v{l}} \else \newcolumntype{B}{v{c}} \fi
- \ifextright \newcolumntype{E}{v{r}} \else \newcolumntype{E}{v{c}} \fi
+ \ifextleft\newcolumntype{B}{v{l}}\else\newcolumntype{B}{v{c}}\fi
+ \ifextright\newcolumntype{E}{v{r}}\else\newcolumntype{E}{v{c}}\fi
\tablvarinit{#2}
\ZIinit
\begin{array}{%
@@ -296,7 +310,6 @@
\newcommand*{\variations}[2][3]{% #1=nblignes (3 par défaut)
% (ré)initialisation des compteurs
\setcounter{nbvarlignes}{#1}
- \setcounter{var@ligne}{0}
\setcounter{numdiscont}{0}
\multido{\I=1+1}{\themaxdiscont}{\setcounter{discont\I}{0}}
% boucle : on exécute le code #2 un nb de fois égal à (#1)-1
@@ -323,6 +336,7 @@
}
% tracé des pointillés pour les valeurs remarquables
\multido{\Ix=1+1}{\thenumvr}{\vrconnect{X\Ix}{Y\Ix}}
+ \setcounter{var@ligne}{0}
\\ % dernier retour ligne du tableau
}
@@ -355,13 +369,17 @@
\newcommand*{\vdecal}[2]{\smash{\raisebox{#1}{$#2$}}}
\newcommand*{\mil}[1]{%
- \mil@heightshift = \ht\@arstrutbox
- \advance\mil@heightshift by \dp\@arstrutbox
- \divide\mil@heightshift by 2
- \setcounter{mil@rowshift}{3}
- \addtocounter{mil@rowshift}{-\value{nbvarlignes}}
- \multiply\mil@heightshift by \value{mil@rowshift}
- \pos*{2}{\vdecal{\mil@heightshift}{#1}}
+ \setcounter{mil@row}{\value{nbvarlignes}}
+ \ifthenelse{\isodd{\value{nbvarlignes}}}{
+ \addtocounter{mil@row}{1}
+ \divide\value{mil@row} by 2
+ \pos*{\themil@row}{\smash{#1}}
+ }{
+ \divide\value{mil@row} by 2
+ \mil@shift = \dp\@arstrutbox
+ \advance\mil@shift by 0.5ex
+ \pos*{\themil@row}{\vdecal{-\mil@shift}{#1}}
+ }
}
\newcommand*{\barre}[1][]{\makebox[0pt]{$#1$}%
@@ -372,8 +390,26 @@
\kern1.5pt\vrule width \bbrulewidth\kern1pt
\vrule width \bbrulewidth\kern1.5pt}
-\newcommand*{\limg}[3][c]{\zbox[r]{\valpos[#1]{#2}{#3\hspace{\limsep}}}}
-\newcommand*{\limd}[3][c]{\zbox[l]{\valpos[#1]{#2}{\hspace{\limsep}#3}}}
+\newcommand*{\@limg}[3][c]{%
+ \zbox[r]{\valpos[#1]{#2}{#3\hspace{\limsep}}}}
+\newcommand*{\@limd}[3][c]{%
+ \zbox[l]{\valpos[#1]{#2}{\hspace{\limsep}#3}}}
+\newcommand*{\@@limg}[1]{%
+ \ifthenelse{\equal{#1}{+}}{\@limg{1}{+\infty}}{
+ \ifthenelse{\equal{#1}{-}}{\@limg{\value{nbvarlignes}}{-\infty}}{
+ \PackageError{tablvar}{Invalid argument for \string\limg*}
+ {Only + or - are valid arguments for \string\limg*}
+ }}
+}
+\newcommand*{\@@limd}[1]{%
+ \ifthenelse{\equal{#1}{+}}{\@limd{1}{+\infty}}{
+ \ifthenelse{\equal{#1}{-}}{\@limd{\value{nbvarlignes}}{-\infty}}{
+ \PackageError{tablvar}{Invalid argument for \string\limd*}
+ {Only + or - are valid arguments for \string\limd*}
+ }}
+}
+\newcommand{\limg}{\@ifstar{\@@limg}{\@limg}}
+\newcommand{\limd}{\@ifstar{\@@limd}{\@limd}}
\newcommand*{\discont}{
\ifthenelse{\thevar@ligne=1}{
@@ -392,7 +428,9 @@
}{}
}
-\newcommand*{\bblim}[4]{\limg{#1}{#2}\bb\discont\limd{#3}{#4}}
+\newcommand*{\@bblim}[4]{\limg{#1}{#2}\bb\discont\limd{#3}{#4}}
+\newcommand*{\@@bblim}[2]{\limg*{#1}\bb\discont\limd*{#2}}
+\newcommand*{\bblim}{\@ifstar{\@@bblim}{\@bblim}}
\newcommand*{\vr}[2][2]{% ligne 2 par défaut sauf si tv@row=1
\stepcounter{numvr}
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty
index 8f712c5b367..7a9a9d6d55d 100644
--- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty
+++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty
@@ -25,7 +25,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: tagpdf.dtx
-\ProvidesExplPackage {tagpdf-base} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf-base} {2024-08-02} {0.99d}
{part of tagpdf - provide base, no-op versions of the user commands }
\cs_new_protected:Npn \__tag_whatsits: {}
\AddToHook{begindocument}
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-generic.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-generic.sty
index 0b49140d300..901c138ac94 100644
--- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-generic.sty
+++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-generic.sty
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: tagpdf-mc-generic.dtx
-\ProvidesExplPackage {tagpdf-debug-generic} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf-debug-generic} {2024-08-02} {0.99d}
{part of tagpdf - debugging code related to marking chunks - generic mode}
\cs_set_protected:Npn \tag_mc_begin:n #1 %#1 keyval
{
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-lua.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-lua.sty
index 4b6836ea134..5872b3cee0a 100644
--- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-lua.sty
+++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-lua.sty
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: tagpdf-mc-luacode.dtx
-\ProvidesExplPackage {tagpdf-debug-lua} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf-debug-lua} {2024-08-02} {0.99d}
{part of tagpdf - debugging code related to marking chunks - lua mode}
\cs_set_protected:Npn \__tag_mc_handle_stash:n #1 %1 mcidnum
{
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug.sty
index b3fd520713b..4aec29b682d 100644
--- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug.sty
+++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug.sty
@@ -26,7 +26,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: tagpdf.dtx
-\ProvidesExplPackage {tagpdf-debug} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf-debug} {2024-08-02} {0.99d}
{ debug code for tagpdf }
\@ifpackageloaded{tagpdf}{}{\PackageWarning{tagpdf-debug}{tagpdf~not~loaded,~quitting}\endinput}
\prop_gput:Nnn \g_msg_module_type_prop { tag / debug} {}
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def
index 09846bc0b56..1425f7f3ae1 100644
--- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def
+++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: tagpdf-backend.dtx
-\ProvidesExplFile {tagpdf-luatex.def} {2024-06-20} {0.99c}
+\ProvidesExplFile {tagpdf-luatex.def} {2024-08-02} {0.99d}
{tagpdf~driver~for~luatex}
{
\fontencoding{TU}\fontfamily{lmr}\fontseries{m}\fontshape{n}\fontsize{10pt}{10pt}\selectfont
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-generic.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-generic.sty
index ca704be6e82..20f619c57b2 100644
--- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-generic.sty
+++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-generic.sty
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: tagpdf-mc-generic.dtx
-\ProvidesExplPackage {tagpdf-mc-code-generic} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf-mc-code-generic} {2024-08-02} {0.99d}
{part of tagpdf - code related to marking chunks - generic mode}
\tl_new:N \l__tag_mc_ref_abspage_tl
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-lua.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-lua.sty
index 1057a7bc678..e87996ede51 100644
--- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-lua.sty
+++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-lua.sty
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: tagpdf-mc-luacode.dtx
-\ProvidesExplPackage {tagpdf-mc-code-lua} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf-mc-code-lua} {2024-08-02} {0.99d}
{tagpdf - mc code only for the luamode }
\hook_gput_code:nnn{begindocument}{tagpdf/mc}
{
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-book.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-book.def
index 19dac1571b8..c869398d1c6 100644
--- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-book.def
+++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-book.def
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: tagpdf-data.dtx
-%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2024-06-20} {0.99c}
+%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2024-08-02} {0.99d}
%% {latex-book} {https://www.latex-project.org/ns/book/2022}{}
chapter, H1,pdf2,
section, H2,pdf2,
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex.def
index 4b51be0e8d7..de5cfacde9a 100644
--- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex.def
+++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex.def
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: tagpdf-data.dtx
-%% \ProvidesExplFile {tagpdf-ns-latex.def} {2024-06-20} {0.99c}
+%% \ProvidesExplFile {tagpdf-ns-latex.def} {2024-08-02} {0.99d}
%% {latex} {https://www.latex-project.org/ns/dflt/2022}{}
title, Title, pdf2,
part, Title, pdf2,
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-mathml.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-mathml.def
index bca7660ca53..eba7d348687 100644
--- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-mathml.def
+++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-mathml.def
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: tagpdf-data.dtx
-%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2024-06-20} {0.99c}
+%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2024-08-02} {0.99d}
abs,abs,mathml,
and,and,mathml,
annotation,annotation,mathml,
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf.def
index 2e2ccc6c45f..3dd6cd6af68 100644
--- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf.def
+++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf.def
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: tagpdf-data.dtx
-%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2024-06-20} {0.99c}
+%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2024-08-02} {0.99d}
%% {pdf} {http://iso.org/pdf/ssn}{}
StructTreeRoot,StructTreeRoot,pdf,D,
Document,Document,pdf,D,
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf2.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf2.def
index b5cb091a716..f646b798d92 100644
--- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf2.def
+++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf2.def
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: tagpdf-data.dtx
-%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2024-06-20} {0.99c}
+%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2024-08-02} {0.99d}
%% {pdf2} {http://iso.org/pdf2/ssn}{}
StructTreeRoot,StructTreeRoot,pdf2,D,
Document,Document,pdf2,D,
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child-2.csv b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child-2.csv
index b0495a598c1..6acd9851901 100644
--- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child-2.csv
+++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child-2.csv
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: tagpdf-data.dtx
-%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2024-06-20} {0.99c}
+%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2024-08-02} {0.99d}
,,,StructTreeRoot,Document,DocumentFragment,Art,Part,Div,Sect,Aside,BlockQuote,NonStruct,TOC,TOCI,Index,Private,Title,Sub,Quote,Note,Reference,BibEntry,P,Hn,H,Lbl,Code,Em,Strong,Span,Link,Annot,Form,Ruby,RB,RT,RP,Warichu,WT,WP,FENote,L,LI,LBody,Table,TR,TH,TD,THead,TBody,TFoot,Caption,Figure,Formula,math,mathml,Artifact,MC
Document,both,document level,1,0..n,0..n,∅,‡,‡,∅,0..n,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,0..n,∅
DocumentFragment,2.0,document level,∅,0..n,0..n,0..n,‡,‡,0..n,0..n,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅*,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅*,∅*,∅,∅,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅,0..n,∅
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child.csv b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child.csv
index c3b120e5d5a..74e8ba8e519 100644
--- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child.csv
+++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child.csv
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: tagpdf-data.dtx
-%% \ProvidesExplFile {tagpdf-parent-child.csv} {2024-06-20} {0.99c}
+%% \ProvidesExplFile {tagpdf-parent-child.csv} {2024-08-02} {0.99d}
,,,StructTreeRoot,Document,Art,Part,Div,Sect,BlockQuote,NonStruct,TOC,TOCI,Index,Private,Quote,Note,Reference,BibEntry,P,Hn,H,Lbl,Code,Span,Link,Annot,Form,Ruby,RB,RT,RP,Warichu,WT,WP,L,LI,LBody,Table,TR,TH,TD,THead,TBody,TFoot,Caption,Figure,Formula,MC
Document,both,document level,1,0..n,∅,‡,‡,∅,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅
Art,1.7,grouping,∅,0..n,∅,‡,‡,0..n,0..n,‡,∅,∅,∅,0..n,∅,0..n,∅,∅,∅,0..1,0..1,∅,∅,∅,0..n,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,0..n,∅,∅,0..n,0..n,∅,∅,∅,0..n,0..n,∅,∅
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua
index 425dd8120f1..eebcf5ec97d 100644
--- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua
+++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua
@@ -24,8 +24,8 @@
local ProvidesLuaModule = {
name = "tagpdf",
- version = "0.99c", --TAGVERSION
- date = "2024-06-20", --TAGDATE
+ version = "0.99d", --TAGVERSION
+ date = "2024-08-02", --TAGDATE
description = "tagpdf lua code",
license = "The LATEX Project Public License 1.3c"
}
@@ -90,6 +90,8 @@ local iwspaceattributeid = luatexbase.new_attribute ("g__tag_interwordspace_attr
local iwfontattributeid = luatexbase.new_attribute ("g__tag_interwordfont_attr")
local tagunmarkedbool= token.create("g__tag_tagunmarked_bool")
local truebool = token.create("c_true_bool")
+local softhyphenbool = token.create("g__tag_softhyphen_bool")
+
local catlatex = luatexbase.registernumber("catcodetable@latex")
local tableinsert = table.insert
local nodeid = node.id
@@ -121,6 +123,9 @@ local KERN = node.id("kern")
local PENALTY = node.id("penalty")
local LOCAL_PAR = node.id("local_par")
local MATH = node.id("math")
+
+local explicit_disc = 1
+local regular_disc = 3
ltx = ltx or { }
ltx.__tag = ltx.__tag or { }
ltx.__tag.mc = ltx.__tag.mc or { } -- mc data
@@ -826,5 +831,53 @@ function ltx.__tag.func.output_parenttree (abspage)
tex.sprint(catlatex,line)
end
end
+do
+ local properties = node.get_properties_table()
+ local is_soft_hyphen_prop = 'tagpdf.rewrite-softhyphen.is_soft_hyphen'
+ local hyphen_char = 0x2D
+ local soft_hyphen_char = 0xAD
+ local softhyphen_fonts = setmetatable({}, {__index = function(t, fid)
+ local fdir = identifiers[fid]
+ local format = fdir and fdir.format
+ local result = (format == 'opentype' or format == 'truetype')
+ local characters = fdir and fdir.characters
+ result = result and (characters and characters[soft_hyphen_char]) ~= nil
+ t[fid] = result
+ return result
+ end})
+ local function process_softhyphen_pre(head, _context, _dir)
+ if softhyphenbool.mode ~= truebool.mode then return true end
+ for disc, sub in node.traverse_id(DISC, head) do
+ if sub == explicit_disc or sub == regular_disc then
+ for n, _ch, _f in node.traverse_char(disc.pre) do
+ local props = properties[n]
+ if not props then
+ props = {}
+ properties[n] = props
+ end
+ props[is_soft_hyphen_prop] = true
+ end
+ end
+ end
+ return true
+ end
+
+ local function process_softhyphen_post(head, _context, _dir)
+ if softhyphenbool.mode ~= truebool.mode then return true end
+ for disc, sub in node.traverse_id(DISC, head) do
+ for n, ch, fid in node.traverse_glyph(disc.pre) do
+ local props = properties[n]
+ if softhyphen_fonts[fid] and ch == hyphen_char and props and props[is_soft_hyphen_prop] then
+ n.char = soft_hyphen_char
+ props.glyph_info = nil
+ end
+ end
+ end
+ return true
+ end
+
+ luatexbase.add_to_callback('pre_shaping_filter', process_softhyphen_pre, 'tagpdf.rewrite-softhyphen')
+ luatexbase.add_to_callback('post_shaping_filter', process_softhyphen_post, 'tagpdf.rewrite-softhyphen')
+end
--
-- End of File `tagpdf.lua'.
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty
index 1688cdf6478..063109a7a22 100644
--- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty
+++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty
@@ -28,7 +28,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: tagpdf.dtx
-\ProvidesExplPackage {tagpdf} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdf} {2024-08-02} {0.99d}
{ A package to experiment with pdf tagging }
\bool_if:nF
@@ -137,6 +137,7 @@
\bool_set_true:N \l__tag_active_struct_bool
\bool_new:N \l__tag_active_socket_bool
\bool_new:N \g__tag_tagunmarked_bool
+\bool_new:N \g__tag_softhyphen_bool
\prg_generate_conditional_variant:Nnn \pdf_object_if_exist:n {e}{T,F,TF}
\cs_generate_variant:Nn \pdf_object_ref:n {e}
\cs_generate_variant:Nn \pdfannot_dict_put:nnn {nne}
@@ -273,6 +274,8 @@
activate/tagunmarked .bool_gset:N = \g__tag_tagunmarked_bool,
activate/tagunmarked .initial:n = true,
tagunmarked .bool_gset:N = \g__tag_tagunmarked_bool,
+ activate/softhyphen .bool_gset:N = \g__tag_softhyphen_bool,
+ activate/softhyphen .initial:n = true,
page/tabsorder .choice:,
page/tabsorder / row .code:n =
\pdfmanagement_add:nnn { Page } {Tabs}{/R},
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty
index 936f8adacd2..6ae5840b113 100644
--- a/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty
+++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty
@@ -1,5 +1,5 @@
%\RequirePackage[enable-debug]{expl3}[2018/06/14]
-\ProvidesExplPackage {tagpdfdocu-patches} {2024-06-20} {0.99c}
+\ProvidesExplPackage {tagpdfdocu-patches} {2024-08-02} {0.99d}
{patches/commands for the tagpdf documentation}
\RequirePackage{etoolbox,xpatch}
@@ -82,10 +82,6 @@
% }
\ExplSyntaxOff
-% ======== tikzpicture ==========
-% TODO this needs some investigation: it messes up the stack if one add paraOff
-
-\AddToHook{env/tikzpicture/begin}{}
%======== tcolorbox ========
% We switch of paratagging at the begin and reenable it locally in before upper.
@@ -138,22 +134,6 @@
% ======= footnote ========
% done in testphase code
-% ======= bibliography ========
-% biblatex. Creates some empty mc-chunks.
-% no internal patches, but redefining begentry/finentry is not safe.
-% better hook is needed.
-
-
-\def\blx@endbibliography{%
- \csuse{blx@endenv@\blx@theenv}%
- \blx@noitem
- \blx@locallabelwidth@finish
- \endgroup
- \blx@bibnote\blx@thepostnote
-% \endgroup
- \expandafter\endgroup\if@endpe\@doendpe\fi
-}
-
% ====== hyperref ========
% this should probably go into tagpdf, but it is related to
% problem of pdf strings and context ....
@@ -167,16 +147,147 @@
\let\tagstructend\relax
}}{}
-%====== picture =======
+%====== tikz picture =======
+% first draft to tag. The main problem is to handle paragraphs. One
+\ExplSyntaxOn
+\cs_new_protected:Npn\__tag_tikz_savepos:n #1
+ {
+ \tex_savepos:D
+ \tikz@resetexpandcount%
+ \tikz@scan@one@point\pgfutil@firstofone(current~bounding~box.north~east)\relax
+ \pgf@pos@transform{\pgf@x}{\pgf@y}%
+ \property_record:nn{#1}{xpos,ypos,abspage}
+ \property_record:nn{#1-tr}{pgfx,pgfy}
+ \tikz@scan@one@point\pgfutil@firstofone(current~bounding~box.south~west)\relax
+ \pgf@pos@transform{\pgf@x}{\pgf@y}%
+ \property_record:nn{#1-bl}{pgfx,pgfy}
+ \tex_savepos:D
+ }
+\cs_generate_variant:Nn \__tag_tikz_savepos:n {e}
+
+\NewProperty{pgfx}{now}{0}
+ {
+ \dim_compare:nNnTF {\dim_abs:n {\pgf@x}} > {15999pt}
+ { 0 }
+ { \dim_to_decimal_in_sp:n{\pgf@x} }
+ }
+\NewProperty{pgfy}{now}{0}
+ {
+ \dim_compare:nNnTF {\dim_abs:n {\pgf@y}} > {15999pt}
+ { 0 }
+ { \dim_to_decimal_in_sp:n{\pgf@y} }
+ }
+
+\cs_new_protected:Npn \__tag_tikz_getbbox:
+ {
+ \int_gincr:N\g__tag_graphic_int
+ \tl_set:Ne\l__tag_graphic_currentlabel_tl {__tag_graphic_\int_use:N \g__tag_graphic_int}
+ \tl_gset:Ne\g__tag_graphic_lx_tl
+ {
+ \dim_to_decimal_in_bp:n
+ { \property_ref:een {\l__tag_graphic_currentlabel_tl}{xpos}{0}sp
+ + \property_ref:een {\l__tag_graphic_currentlabel_tl-bl}{pgfx}{0}sp
+ }
+ }
+ \tl_gset:Ne\g__tag_graphic_ly_tl
+ {
+ \dim_to_decimal_in_bp:n
+ { \property_ref:een {\l__tag_graphic_currentlabel_tl}{ypos}{0}sp
+ + \property_ref:een {\l__tag_graphic_currentlabel_tl-bl}{pgfy}{0}sp
+ }
+ }
+ \tl_gset:Ne\g__tag_graphic_ux_tl
+ {
+ \dim_to_decimal_in_bp:n
+ { \property_ref:een {\l__tag_graphic_currentlabel_tl}{xpos}{0}sp
+ + \property_ref:een {\l__tag_graphic_currentlabel_tl-tr}{pgfx}{0}sp
+ }
+ }
+ \tl_gset:Ne\g__tag_graphic_uy_tl
+ {
+ \dim_to_decimal_in_bp:n
+ { \property_ref:een {\l__tag_graphic_currentlabel_tl}{ypos}{0}sp
+ + \property_ref:een {\l__tag_graphic_currentlabel_tl-tr}{pgfy}{0}sp
+ }
+ }
+ }
-% PAC3 complained that the BBox is missing, so we are cheating for now
-% and add a fix size.
-\tagpdfsetup
- {
- newattribute =
- {bbox}{/O /Layout /BBox [0 0 100 100]}
+\cs_new_protected:Npn \__tag_graphic_tikz_begin_picture:
+ {
+ \tag_mc_end_push:
+ \bool_if:NTF \l__tag_graphic_artifact_bool
+ { \tagmcbegin{artifact} }
+ {
+ \__tag_tikz_getbbox:
+ \tagstructbegin{tag=Figure,alt=\l__tag_graphic_alt_tl}\tagmcbegin{}
+ \__tag_prop_gput:cne
+ { g__tag_struct_\int_eval:n {\c@g__tag_struct_abs_int}_prop }
+ { A }
+ {
+ <<
+ /O /Layout /BBox~
+ [
+ \g__tag_graphic_lx_tl\c_space_tl
+ \g__tag_graphic_ly_tl\c_space_tl
+ \g__tag_graphic_ux_tl\c_space_tl
+ \g__tag_graphic_uy_tl
+ ]
+ >>
+ }
+ \bool_if:NT\l__tag_graphic_debug_bool
+ {
+ \__tag_graphic_show_bbox:VVVVne
+ \g__tag_graphic_lx_tl
+ \g__tag_graphic_ly_tl
+ \g__tag_graphic_ux_tl
+ \g__tag_graphic_uy_tl
+ {red}
+ {\int_use:N\g__tag_graphic_int}
+ }
+ }
+ \SuspendTagging{tikz}
}
+\cs_new_protected:Npn \__tag_graphic_tikz_end_picture:
+ {
+ \ResumeTagging{tikz}\tagmcend
+ \bool_if:NF \l__tag_graphic_artifact_bool
+ {
+ \tagstructend
+ \__tag_tikz_savepos:e {__tag_graphic_\int_use:N \g__tag_graphic_int}
+ }
+ \tag_mc_begin_pop:n{}
+ }
+
+\tikzset
+ {
+ every~picture/.style=
+ {
+ artifact,
+ execute~at~begin~picture=\__tag_graphic_tikz_begin_picture:,
+ execute~at~end~picture=\__tag_graphic_tikz_end_picture:
+ }
+ }
+\AddToHook{env/tikzpicture/before}{\leavevmode}
+
+\tikzset
+ {
+ alt/.code=
+ {
+ \bool_set_false:N \l__tag_graphic_artifact_bool
+ \tl_set:Nn \l__tag_graphic_alt_tl{#1}
+ }
+ }
+\tikzset
+ {
+ artifact/.code=
+ \bool_set_true:N \l__tag_graphic_artifact_bool
+ }
+
+\ExplSyntaxOff
+
+
+
\endinput
diff --git a/Master/texmf-dist/tex/generic/oberdiek/telprint.sty b/Master/texmf-dist/tex/latex/telprint/telprint.sty
index aa51f0bd5b3..f4e08a7c42d 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/telprint.sty
+++ b/Master/texmf-dist/tex/latex/telprint/telprint.sty
@@ -9,11 +9,11 @@
%% This is a generated file.
%%
%% Project: telprint
-%% Version: 2016/05/16 v1.11
+%% Version: 2024-07-26 v1.12
%%
%% Copyright (C)
%% 1996, 1997, 2004-2008 Heiko Oberdiek
-%% 2016-2019 Oberdiek Package Support Group
+%% 2016-2024 Oberdiek Package Support Group
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -29,8 +29,7 @@
%%
%% The Current Maintainers of this work are
%% Heiko Oberdiek and the Oberdiek Package Support Group
-%% https://github.com/ho-tex/oberdiek/issues
-%%
+%% https://github.com/ho-tex/telprint/issues
%%
%% The Base Interpreter refers to any `TeX-Format',
%% because some files are installed in TDS:tex/generic//.
@@ -106,7 +105,7 @@
\fi
\expandafter\x\csname ver@telprint.sty\endcsname
\ProvidesPackage{telprint}%
- [2016/05/16 v1.11 Format German phone numbers (HO)]%
+ [2024-07-26 v1.12 Format German phone numbers (HO)]%
\begingroup\catcode61\catcode48\catcode32=10\relax%
\catcode13=5 % ^^M
\endlinechar=13 %
@@ -164,7 +163,11 @@
\let\TELreset=\relax
\fi
\DeclareRobustCommand*{\telspace}[1]{\def\TELspace{#1}}
-\telspace{{}$\,${}}
+\ifcsname LaTeXReleaseInfo\endcsname
+ \telspace{\,}
+\else
+ \telspace{{}$\,${}}
+\fi
\DeclareRobustCommand*{\telhyphen}[1]{\def\TELhyphen{#1}}
\telhyphen{\leavevmode\hbox{-}}% \hbox zur Verhinderung der Trennung
\DeclareRobustCommand*{\telslash}[1]{\def\TELslash{#1}}
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/tramlines/tramlines.sty b/Master/texmf-dist/tex/latex/tramlines/tramlines.sty
index f3288a8d1ff..72878c423eb 100644
--- a/Master/texmf-dist/tex/latex/tramlines/tramlines.sty
+++ b/Master/texmf-dist/tex/latex/tramlines/tramlines.sty
@@ -1,6 +1,6 @@
-\def\tramlinesversionnumber{1.1.0}
+\def\tramlinesversionnumber{1.1.1}
\ProvidesPackage{tramlines}
-[2023/01/29\tramlinesversionnumber\
+[2024/07/18\tramlinesversionnumber\
Tramlines]
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -36,7 +36,7 @@
\centering
{%notglobal
\setlength\doublerulesep{\tramlinesep}% <-- set distance between double rule
-\begin{tabular}[t]{l c c }
+\begin{tabular}[b]{c c c }
\toprule\toprule
& #1 & \\
\bottomrule\bottomrule
diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-expose.cls b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-expose.cls
index b31ae0a4f7d..f7ff0916f44 100644
--- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-expose.cls
+++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-expose.cls
@@ -33,7 +33,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}[2022/06/01]
-\ProvidesPackage{univie-ling-expose}[2024/06/27 v.2.6 Univie Linguistic Exposes (JSp)]
+\ProvidesPackage{univie-ling-expose}[2024/07/23 v.2.7 Univie Linguistic Exposes (JSp)]
%% ============================================================
@@ -274,10 +274,10 @@
\NewDocumentCommand\weblink{mo}{%
\url{#1}%
\IfNoValueTF{#2}%
- {\ifthenelse{\isempty{\wlg@urldate}}{}{%
+ {\ifx\wlg@urldate\empty\else%
\ \urldate{\wlg@urldate}%
- }}%
- {\ \urldate{#2}}
+ \fi}%
+ {\ \urldate{#2}}%
}
}
diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-handout.cls b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-handout.cls
index 01abf2e31cb..73c5a325da4 100644
--- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-handout.cls
+++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-handout.cls
@@ -35,7 +35,7 @@
\NeedsTeXFormat{LaTeX2e}[2022/06/01]
-\ProvidesClass{univie-ling-handout}[2024/06/27 v.2.6 Univie Ling handout class (JSp)]
+\ProvidesClass{univie-ling-handout}[2024/07/23 v.2.7 Univie Ling handout class (JSp)]
%% ============================================================
%% CLASS OPTIONS
@@ -933,10 +933,10 @@
\NewDocumentCommand\weblink{mo}{%
\url{#1}%
\IfNoValueTF{#2}%
- {\ifthenelse{\isempty{\wlg@urldate}}{}{%
+ {\ifx\wlg@urldate\empty\else%
\ \urldate{\wlg@urldate}%
- }}%
- {\ \urldate{#2}}
+ \fi}%
+ {\ \urldate{#2}}%
}
}
diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-paper.cls b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-paper.cls
index 88ec71a6fae..eda1430345b 100644
--- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-paper.cls
+++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-paper.cls
@@ -32,7 +32,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}[2022/06/01]
-\ProvidesPackage{univie-ling-paper}[2024/06/27 v.2.6 Univie Linguistic Papers (JSp)]
+\ProvidesPackage{univie-ling-paper}[2024/07/23 v.2.7 Univie Linguistic Papers (JSp)]
%% ============================================================
@@ -296,10 +296,10 @@ This includes all drawings, sketches, graphics and internet sources.}
\NewDocumentCommand\weblink{mo}{%
\url{#1}%
\IfNoValueTF{#2}%
- {\ifthenelse{\isempty{\wlg@urldate}}{}{%
+ {\ifx\wlg@urldate\empty\else%
\ \urldate{\wlg@urldate}%
- }}%
- {\ \urldate{#2}}
+ \fi}%
+ {\ \urldate{#2}}%
}
}
diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-poster.cls b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-poster.cls
index 9a354e25c7f..87f5092d4ce 100644
--- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-poster.cls
+++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-poster.cls
@@ -34,7 +34,7 @@
\NeedsTeXFormat{LaTeX2e}[2022/06/01]
-\ProvidesClass{univie-ling-poster}[2024/06/27 v.2.6 Univie Ling poster class (JSp)]
+\ProvidesClass{univie-ling-poster}[2024/07/23 v.2.7 Univie Ling poster class (JSp)]
%% ============================================================
%% CLASS OPTIONS
@@ -909,10 +909,10 @@
\NewDocumentCommand\weblink{mo}{%
\url{#1}%
\IfNoValueTF{#2}%
- {\ifthenelse{\isempty{\wlg@urldate}}{}{%
+ {\ifx\wlg@urldate\empty\else%
\ \urldate{\wlg@urldate}%
- }}%
- {\ \urldate{#2}}
+ \fi}%
+ {\ \urldate{#2}}%
}
}
diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-thesis.cls b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-thesis.cls
index 4813af3abc9..91d34276a0f 100644
--- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-thesis.cls
+++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-thesis.cls
@@ -33,7 +33,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}[2022/06/01]
-\ProvidesPackage{univie-ling-thesis}[2024/06/27 v.2.6 Univie Linguistic Theses (JSp)]
+\ProvidesPackage{univie-ling-thesis}[2024/07/23 v.2.7 Univie Linguistic Theses (JSp)]
%% ============================================================
@@ -288,10 +288,10 @@ This includes all drawings, sketches, graphics and internet sources.}
\NewDocumentCommand\weblink{mo}{%
\url{#1}%
\IfNoValueTF{#2}%
- {\ifthenelse{\isempty{\wlg@urldate}}{}{%
+ {\ifx\wlg@urldate\empty\else%
\ \urldate{\wlg@urldate}%
- }}%
- {\ \urldate{#2}}
+ \fi}%
+ {\ \urldate{#2}}%
}
}
diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cls b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cls
index e85daaabe05..00deb089cca 100644
--- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cls
+++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cls
@@ -34,7 +34,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}[2022/06/01]
-\ProvidesPackage{univie-ling-wlg}[2024/06/27 v.2.6 Univie WLG journal layout (JSp)]
+\ProvidesPackage{univie-ling-wlg}[2024/07/23 v.2.7 Univie WLG journal layout (JSp)]
%% ============================================================
@@ -225,10 +225,10 @@
\NewDocumentCommand\weblink{mo}{%
\url{#1}%
\IfNoValueTF{#2}%
- {\ifthenelse{\isempty{\wlg@urldate}}{}{%
+ {\ifx\wlg@urldate\empty\else%
\ \urldate{\wlg@urldate}%
- }}%
- {\ \urldate{#2}}
+ \fi}%
+ {\ \urldate{#2}}%
}
}
@@ -1043,6 +1043,8 @@
\if@wlg@covington
\RequirePackage{covington}
\renewcommand{\p@equation}[1]{(#1)}
+ \setlength\reflistindent{\parindent}
+ \setlength\reflistparsep{0pt}
\fi
diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx b/Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx
index 43b942d15cf..985dc19f98b 100644
--- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx
+++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx
@@ -38,7 +38,7 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesFile{univie-ling.bbx}[2024/06/27 v.2.6 biblatex bibliography style]
+\ProvidesFile{univie-ling.bbx}[2024/07/23 v.2.7 biblatex bibliography style]
% Load base style (authoryear-comp)
\RequireBibliographyStyle{authoryear-comp}
diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx b/Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx
index 30064c8f911..76000569402 100644
--- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx
+++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx
@@ -36,7 +36,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesFile{univie-ling.cbx}[2024/06/27 v.2.6 biblatex citation style]
+\ProvidesFile{univie-ling.cbx}[2024/07/23 v.2.7 biblatex citation style]
\RequireCitationStyle{authoryear-comp}
diff --git a/Master/texmf-dist/tex/latex/ut-thesis/ut-thesis.cls b/Master/texmf-dist/tex/latex/ut-thesis/ut-thesis.cls
index 07ca4382793..5c33490cbaa 100644
--- a/Master/texmf-dist/tex/latex/ut-thesis/ut-thesis.cls
+++ b/Master/texmf-dist/tex/latex/ut-thesis/ut-thesis.cls
@@ -13,8 +13,8 @@
%% [https://www.sgs.utoronto.ca/academic-progress/program-completion/formatting]
%%
%% Copyright (c) 1998-2013 Francois Pitt <fpitt@cs.utoronto.ca>,
-%% 2020-2021 Jesse Knight <jesse.knight@mail.utoronto.ca>
-%% last updated at 23:30 (EST) on Tue 20 July 2021
+%% 2020-2024 Jesse Knight <jesse.x.knight@protonmail.com>
+%% last updated at 09:00 (BST) on Fri 26 July 2024
%%
%% This work may be distributed and/or modified under the conditions of
%% the LaTeX Project Public Licence, either version 1.3c of this licence
@@ -30,7 +30,7 @@
%% This work has the LPPL maintenance status "maintained".
%%
%% The Current Maintainer of this work is
-%% Jesse Knight <jesse.knight@mail.utoronto.ca>.
+%% Jesse Knight <jesse.x.knight@protonmail.com>.
%%
%% This work consists of the files:
%% - README
@@ -39,19 +39,20 @@
%% - ut-thesis.pdf (derived user manual)
%% - ut-thesis.cls (derived class file)
%%
-%% To generate ut-thesis.cls (class file), run: pdflatex ut-thesis.ins
-%% To generate ut-thesis.pdf (documentation), run: pdflatex ut-thesis.dtx
-%% To use the class, make ut-thesis.cls visible to your LaTeX distribution,
-%% by placing ut-thesis.cls either in your working directory,
-%% or in your texmf tree, perhaps: $texmf/tex/latex/ut-thesis/ut-thesis.cls
-%% and the documentation: $texmf/doc/latex/ut-thesis/ut-thesis.pdf
+%% Install ut-thesis from your favourite LaTeX distribution.
+%% Alternatively, or to use the latest version:
+%% - generate ut-thesis.cls (class file) using: pdflatex ut-thesis.ins
+%% and copy to: $texmf/tex/latex/ut-thesis/ut-thesis.cls
+%% - generate ut-thesis.pdf (documentation) using: pdflatex ut-thesis.dtx
+%% and copy to: $texmf/doc/latex/ut-thesis/ut-thesis.pdf
+%% or simply copy ut-thesis.cls to your working directory.
%%
%% See version history on GitHub:
%% [https://github.com/jessexknight/ut-thesis]
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{ut-thesis}
-[2023/02/08 v3.1.7 University of Toronto thesis class]
+[2024/07/26 v3.1.8 University of Toronto thesis class]
\newif\ifmargins@equal
\newlength{\margin@base}
\newlength{\margin@offset}
diff --git a/Master/texmf-dist/tex/latex/wheelchart/wheelchart.sty b/Master/texmf-dist/tex/latex/wheelchart/wheelchart.sty
index e2c85439761..21e232b099b 100644
--- a/Master/texmf-dist/tex/latex/wheelchart/wheelchart.sty
+++ b/Master/texmf-dist/tex/latex/wheelchart/wheelchart.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{tikz}
\usetikzlibrary{calc}
-\ProvidesExplPackage{wheelchart}{2024/03/08}{3.0}{Diagrams with circular or other shapes using TikZ and LaTeX3}
+\ProvidesExplPackage{wheelchart}{2024/07/28}{4.0}{Diagrams with circular or other shapes using TikZ and LaTeX3}
%%> \subsection{Variables}
@@ -59,6 +59,8 @@
\fp_const:Nn \c__wheelchart_arc_data_end_factor_left_fp { 1 }
\fp_const:Nn \c__wheelchart_arc_data_end_factor_right_fp { 0 }
\fp_new:N \l__wheelchart_arc_data_line_sep_factor_fp
+\fp_new:N \l__wheelchart_arc_data_lines_pos_fp
+\fp_new:N \l__wheelchart_arc_data_lines_shift_fp
\fp_new:N \l__wheelchart_arc_data_pos_fp
\fp_new:N \l__wheelchart_arc_data_radius_plot_false_fp
\fp_new:N \l__wheelchart_arc_data_sep_fp
@@ -168,6 +170,9 @@
\int_new:N \l__wheelchart_lines_ext_top_dir_int
\int_new:N \l__wheelchart_max_list_items_int
+\regex_const:Nn \c__wheelchart_braces_regex { \{(.+)\} }
+\regex_const:Nn \c__wheelchart_key_braces_regex { [\w\s]+\{(.+)\} }
+
\seq_new:N \l__wheelchart_arc_data_seq
\seq_new:N \l__wheelchart_discrete_coefficients_first_seq
\seq_new:N \l__wheelchart_discrete_coefficients_second_seq
@@ -180,8 +185,8 @@
{
sign ( \l__wheelchart_arc_data_dir_fp ) *
(
- \cs:w c__wheelchart_arc_data_start_factor_\l__wheelchart_arc_data_align_tl _fp\cs_end:
- + \cs:w c__wheelchart_arc_data_end_factor_\l__wheelchart_arc_data_align_tl _fp\cs_end:
+ \cs:w c__wheelchart_arc_data_start_factor_\l__wheelchart_arc_data_align_tl _fp \cs_end:
+ + \cs:w c__wheelchart_arc_data_end_factor_\l__wheelchart_arc_data_align_tl _fp \cs_end:
)
}
\tl_new:N \l__wheelchart_arc_data_align_tl
@@ -262,7 +267,7 @@
\cs_new_protected:Npn \__wheelchart_caption_and_title:nnnnn #1#2#3#4#5
{
- \__wheelchart_if_text:nn {#1}
+ \__wheelchart_if_text:nnn {#1} { o }
{
\node [ anchor = #2 , align = #3 , / wheelchart / #1_style ]
at ( $ (#4) + ( 0 , { #5 * ( \pgfkeysvalueof { / wheelchart / #1~sep } ) } ) $ )
@@ -282,12 +287,12 @@
{
\fp_eval:n
{
- ( 1 - (#1) ) * \cs:w g__wheelchart_slice_inner_start_angle_\WCcount _fp\cs_end:
- + (#1) * \cs:w g__wheelchart_slice_inner_end_angle_\WCcount _fp\cs_end:
+ ( 1 - (#1) ) * \cs:w g__wheelchart_slice_inner_start_angle_\WCcount _fp \cs_end:
+ + (#1) * \cs:w g__wheelchart_slice_inner_end_angle_\WCcount _fp \cs_end:
+ \l__wheelchart_counter_or_clockwise_fp * (#2)
}
}
- { \fp_eval:n { \cs:w g__wheelchart_inner_radius_\WCcount _fp\cs_end: - (#4) } }
+ { \fp_eval:n { \cs:w g__wheelchart_inner_radius_\WCcount _fp \cs_end: - (#4) } }
)
! { \fp_eval:n {#3} } !
(
@@ -295,12 +300,12 @@
{
\fp_eval:n
{
- ( 1 - (#1) ) * \cs:w g__wheelchart_slice_outer_start_angle_\WCcount _fp\cs_end:
- + (#1) * \cs:w g__wheelchart_slice_outer_end_angle_\WCcount _fp\cs_end:
+ ( 1 - (#1) ) * \cs:w g__wheelchart_slice_outer_start_angle_\WCcount _fp \cs_end:
+ + (#1) * \cs:w g__wheelchart_slice_outer_end_angle_\WCcount _fp \cs_end:
+ \l__wheelchart_counter_or_clockwise_fp * (#2)
}
}
- { \fp_eval:n { \cs:w g__wheelchart_outer_radius_\WCcount _fp\cs_end: + (#4) } }
+ { \fp_eval:n { \cs:w g__wheelchart_outer_radius_\WCcount _fp \cs_end: + (#4) } }
)
$%note the () around the #i's to keep these contents together
}
@@ -374,10 +379,10 @@
\path let
\p { l__wheelchart_def_angle_1 } =
\__wheelchart_point_plot_true:nnnnn { \WCcount } {#1} {#2} { 0 }
- { \fp_eval:n { (#4) + 1 / \cs:w g__wheelchart_samples_\WCcount _fp\cs_end: } } ,
+ { \fp_eval:n { (#4) + 1 / \cs:w g__wheelchart_samples_\WCcount _fp \cs_end: } } ,
\p { l__wheelchart_def_angle_2 } =
\__wheelchart_point_plot_true:nnnnn { \WCcount } {#1} {#2} { 1 }
- { \fp_eval:n { (#4) + 1 / \cs:w g__wheelchart_samples_\WCcount _fp\cs_end: } }
+ { \fp_eval:n { (#4) + 1 / \cs:w g__wheelchart_samples_\WCcount _fp \cs_end: } }
in [ / utils / exec = { \__wheelchart_def_angle_aux: } ]
;
}
@@ -392,10 +397,10 @@
{
( 1 - (#2) ) *
(
- \cs:w g__wheelchart_slice_outer_start_angle_#1_fp\cs_end:
- - \cs:w g__wheelchart_slice_inner_start_angle_#1_fp\cs_end:
+ \cs:w g__wheelchart_slice_outer_start_angle_#1_fp \cs_end:
+ - \cs:w g__wheelchart_slice_inner_start_angle_#1_fp \cs_end:
)
- + (#2) * ( \cs:w g__wheelchart_slice_outer_end_angle_#1_fp\cs_end: - \cs:w g__wheelchart_slice_inner_end_angle_#1_fp\cs_end: )
+ + (#2) * ( \cs:w g__wheelchart_slice_outer_end_angle_#1_fp \cs_end: - \cs:w g__wheelchart_slice_inner_end_angle_#1_fp \cs_end: )
}
\cs_new:Npn \__wheelchart_def_angle_plot_false:nnnnn #1#2#3#4#5
@@ -410,11 +415,11 @@
(
sqrt
(
- ( \cs:w g__wheelchart_outer_radius_#1_fp\cs_end: + \cs:w g__wheelchart_inner_radius_#1_fp\cs_end: ) ^ 2
- - \cs:w g__wheelchart_outer_radius_#1_fp\cs_end: * \cs:w g__wheelchart_inner_radius_#1_fp\cs_end: *
+ ( \cs:w g__wheelchart_outer_radius_#1_fp \cs_end: + \cs:w g__wheelchart_inner_radius_#1_fp \cs_end: ) ^ 2
+ - \cs:w g__wheelchart_outer_radius_#1_fp \cs_end: * \cs:w g__wheelchart_inner_radius_#1_fp \cs_end: *
(
2 + 2 * cosd ( \__wheelchart_def_angle_plot_false_aux_angle:nn {#1} {#2} )
- + \cs:w g__wheelchart_outer_radius_#1_fp\cs_end: * \cs:w g__wheelchart_inner_radius_#1_fp\cs_end:
+ + \cs:w g__wheelchart_outer_radius_#1_fp \cs_end: * \cs:w g__wheelchart_inner_radius_#1_fp \cs_end:
*
(
(
@@ -425,25 +430,25 @@
)
)
)
- + \cs:w g__wheelchart_inner_radius_#1_fp\cs_end: *
+ + \cs:w g__wheelchart_inner_radius_#1_fp \cs_end: *
(
- \cs:w g__wheelchart_inner_radius_#1_fp\cs_end:
- - \cs:w g__wheelchart_outer_radius_#1_fp\cs_end:
+ \cs:w g__wheelchart_inner_radius_#1_fp \cs_end:
+ - \cs:w g__wheelchart_outer_radius_#1_fp \cs_end:
* cosd ( \__wheelchart_def_angle_plot_false_aux_angle:nn {#1} {#2} )
)
/ \__wheelchart_def_radius:nnn {#1} {#4} {#5}
)
- * \cs:w g__wheelchart_outer_radius_#1_fp\cs_end: * sind ( \__wheelchart_def_angle_plot_false_aux_angle:nn {#1} {#2} )
+ * \cs:w g__wheelchart_outer_radius_#1_fp \cs_end: * sind ( \__wheelchart_def_angle_plot_false_aux_angle:nn {#1} {#2} )
/
(
- ( \cs:w g__wheelchart_outer_radius_#1_fp\cs_end: + \cs:w g__wheelchart_inner_radius_#1_fp\cs_end: ) ^ 2
- - 2 * \cs:w g__wheelchart_outer_radius_#1_fp\cs_end: * \cs:w g__wheelchart_inner_radius_#1_fp\cs_end:
+ ( \cs:w g__wheelchart_outer_radius_#1_fp \cs_end: + \cs:w g__wheelchart_inner_radius_#1_fp \cs_end: ) ^ 2
+ - 2 * \cs:w g__wheelchart_outer_radius_#1_fp \cs_end: * \cs:w g__wheelchart_inner_radius_#1_fp \cs_end:
* ( 1 + cosd ( \__wheelchart_def_angle_plot_false_aux_angle:nn {#1} {#2} ) )
)
)
}
- + ( 1 - (#2) ) * ( \cs:w g__wheelchart_slice_inner_start_angle_#1_fp\cs_end: )
- + (#2) * ( \cs:w g__wheelchart_slice_inner_end_angle_#1_fp\cs_end: )
+ + ( 1 - (#2) ) * ( \cs:w g__wheelchart_slice_inner_start_angle_#1_fp \cs_end: )
+ + (#2) * ( \cs:w g__wheelchart_slice_inner_end_angle_#1_fp \cs_end: )
+ \l__wheelchart_counter_or_clockwise_fp * (#3)
}
}
@@ -451,7 +456,7 @@
\cs_new_protected:Npn \__wheelchart_def_coord:nnnn #1#2#3#4
{
\path let \p { l__wheelchart_coord } =
- ( \cs:w __wheelchart_#2_plot:nn\cs_end: {#4} { \fp_use:c { g__wheelchart_#2_radius_\WCcount _fp } } )
+ ( \cs:w __wheelchart_#2_plot:nn \cs_end: {#4} { \fp_use:c { g__wheelchart_#2_radius_\WCcount _fp } } )
in
[
/ utils / exec =
@@ -484,11 +489,11 @@
<
\l__wheelchart_gap_fp
?
- min ( \cs:w g__wheelchart_abs_half_angle_minus_new_angle_\WCcount _fp\cs_end: , \l__wheelchart_gap_max_angle_def_fp )
+ min ( \cs:w g__wheelchart_abs_half_angle_minus_new_angle_\WCcount _fp \cs_end: , \l__wheelchart_gap_max_angle_def_fp )
:
asind ( min ( \l__wheelchart_gap_fp / ( (#2) + 1 - sign (#2) ) , 1 ) ) + \l__wheelchart_gap_polar_fp
- %note the min ( ... , 1 ) such that the asind is always defined
- %also note the + 1 - sign (#2) such that the denominator is also nonzero if #2 = 0
+ %note the min ( ... , 1 ) so that the asind is always defined
+ %also note the + 1 - sign (#2) so that the denominator is also nonzero if #2 = 0
}
}
@@ -516,7 +521,7 @@
:
\g__wheelchart_new_angle_fp - \g__wheelchart_angle_fp
)
- / \cs:w g__wheelchart_samples_1_fp\cs_end:
+ / \cs:w g__wheelchart_samples_1_fp \cs_end:
}
\path let
\p { l__wheelchart_slices_orientation_1 } =
@@ -579,8 +584,8 @@
{
\fp_eval:n
{
- ( 1 - (#2) ) * ( \cs:w g__wheelchart_inner_radius_#1_fp\cs_end: - (#3) )
- + (#2) * ( \cs:w g__wheelchart_outer_radius_#1_fp\cs_end: + (#3) )
+ ( 1 - (#2) ) * ( \cs:w g__wheelchart_inner_radius_#1_fp \cs_end: - (#3) )
+ + (#2) * ( \cs:w g__wheelchart_outer_radius_#1_fp \cs_end: + (#3) )
}
}
@@ -591,26 +596,26 @@
{
\fp_gset:cn { g__wheelchart_slice_#1_#2_angle_\WCcount _fp }
{
- \cs:w g__wheelchart_#3angle_fp\cs_end: +
+ \cs:w g__wheelchart_#3angle_fp \cs_end: +
(
\l__wheelchart_counter_or_clockwise_fp *
- ( (#4) * \cs:w g__wheelchart_#1_gap_\WCcount _fp\cs_end: + \cs:w l__wheelchart_slices_#1_#2_angle_shift_fp\cs_end: )
+ ( (#4) * \cs:w g__wheelchart_#1_gap_\WCcount _fp \cs_end: + \cs:w l__wheelchart_slices_#1_#2_angle_shift_fp \cs_end: )
)
}
}
{
\fp_gset:cn { g__wheelchart_slice_#1_#2_angle_\WCcount _fp }
{
- \cs:w g__wheelchart_#3angle_fp\cs_end: +
+ \cs:w g__wheelchart_#3angle_fp \cs_end: +
(
\l__wheelchart_counter_or_clockwise_fp *
(
- (#4) * \cs:w g__wheelchart_#1_gap_\WCcount _fp\cs_end: + \cs:w l__wheelchart_slices_#1_#2_angle_shift_fp\cs_end:
+ (#4) * \cs:w g__wheelchart_#1_gap_\WCcount _fp \cs_end: + \cs:w l__wheelchart_slices_#1_#2_angle_shift_fp \cs_end:
- asind
(
- \cs:w g__wheelchart_inner_radius_\WCcount _fp\cs_end:
- * sind ( \cs:w l__wheelchart_slices_#1_#2_angle_shift_fp\cs_end: )
- / \cs:w g__wheelchart_outer_radius_\WCcount _fp\cs_end:
+ \cs:w g__wheelchart_inner_radius_\WCcount _fp \cs_end:
+ * sind ( \cs:w l__wheelchart_slices_#1_#2_angle_shift_fp \cs_end: )
+ / \cs:w g__wheelchart_outer_radius_\WCcount _fp \cs_end:
)
)
)
@@ -620,8 +625,8 @@
\cs_new_protected:Npn \__wheelchart_def_slice_keys:n #1
{
- {%note the double {{...}} such that the contents is in a group
- %such that pgfkeys which are specific to the current slice are local for this slice
+ {%note the double braces {{...}} so that the contents is in a group
+ %and in particular, pgfkeys which are specific to the current slice are local for this slice
\clist_if_in:NVT \l__wheelchart_slice_range_local_clist \WCcount
{
\pgfkeys { / wheelchart , slice_final /. expanded = { \exp_not:v { l__wheelchart_slice_\WCcount _keys_clist } } }
@@ -663,24 +668,24 @@
%g__wheelchart_WCcount_counter to be larger than \WCtotalcount
\tl_build_end:N \WClegend
\cs_set:Npn \WCcount { \theg__wheelchart_WCcount_counter }
- \cs_set:Npn \WCpercentage { \cs:w l__wheelchart_WCpercentage_\theg__wheelchart_WCcount_counter\cs_end: }
- \cs_set:Npn \WCpercentagerounded { \cs:w l__wheelchart_WCpercentagerounded_\theg__wheelchart_WCcount_counter\cs_end: }
+ \cs_set:Npn \WCpercentage { \cs:w l__wheelchart_WCpercentage_\theg__wheelchart_WCcount_counter \cs_end: }
+ \cs_set:Npn \WCpercentagerounded { \cs:w l__wheelchart_WCpercentagerounded_\theg__wheelchart_WCcount_counter \cs_end: }
\str_if_eq:eeTF { \l__wheelchart_type_tl } { etoc }
{
\cs_set:Npn \WCetocthelinkedname
- { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_linked_name_\theg__wheelchart_WCcount_counter\cs_end: }
+ { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_linked_name_\theg__wheelchart_WCcount_counter \cs_end: }
\cs_set:Npn \WCetocthelinkednumber
- { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_linked_number_\theg__wheelchart_WCcount_counter\cs_end: }
+ { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_linked_number_\theg__wheelchart_WCcount_counter \cs_end: }
\cs_set:Npn \WCetocthelinkedpage
- { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_linked_page_\theg__wheelchart_WCcount_counter\cs_end: }
+ { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_linked_page_\theg__wheelchart_WCcount_counter \cs_end: }
\cs_set:Npn \WCetocthename
- { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_name_\theg__wheelchart_WCcount_counter\cs_end: }
+ { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_name_\theg__wheelchart_WCcount_counter \cs_end: }
\cs_set:Npn \WCetocthenumber
- { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_number_\theg__wheelchart_WCcount_counter\cs_end: }
+ { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_number_\theg__wheelchart_WCcount_counter \cs_end: }
\cs_set:Npn \WCetocthepage
- { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_page_\theg__wheelchart_WCcount_counter\cs_end: }
+ { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_page_\theg__wheelchart_WCcount_counter \cs_end: }
\cs_set:Npn \WCetocthenumberofpages
- { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_number_of_pages_\theg__wheelchart_WCcount_counter\cs_end: }
+ { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_number_of_pages_\theg__wheelchart_WCcount_counter \cs_end: }
}
{
\clist_if_empty:NTF \l__wheelchart_header_clist
@@ -688,7 +693,7 @@
\int_step_inline:nn { \l__wheelchart_max_list_items_int }
{
\cs_set:cpn { WCvar\int_to_Alph:n {##1} }
- { \cs:w l__wheelchart_item_WCvar\int_to_Alph:n {##1}_\theg__wheelchart_WCcount_counter\cs_end: }
+ { \cs:w l__wheelchart_item_WCvar\int_to_Alph:n {##1}_\theg__wheelchart_WCcount_counter \cs_end: }
}
}
{
@@ -717,13 +722,13 @@
(
atand
(
- \cs:w g__wheelchart_#3_y_fp\cs_end: - \cs:w g__wheelchart_#4_y_fp\cs_end: ,
- \cs:w g__wheelchart_#3_x_fp\cs_end: - \cs:w g__wheelchart_#4_x_fp\cs_end:
+ \cs:w g__wheelchart_#3_y_fp \cs_end: - \cs:w g__wheelchart_#4_y_fp \cs_end: ,
+ \cs:w g__wheelchart_#3_x_fp \cs_end: - \cs:w g__wheelchart_#4_x_fp \cs_end:
)
- atand
(
- \cs:w g__wheelchart_#1_y_fp\cs_end: - \cs:w g__wheelchart_#2_y_fp\cs_end: ,
- \cs:w g__wheelchart_#1_x_fp\cs_end: - \cs:w g__wheelchart_#2_x_fp\cs_end:
+ \cs:w g__wheelchart_#1_y_fp \cs_end: - \cs:w g__wheelchart_#2_y_fp \cs_end: ,
+ \cs:w g__wheelchart_#1_x_fp \cs_end: - \cs:w g__wheelchart_#2_x_fp \cs_end:
)
)
}
@@ -969,9 +974,9 @@
\__wheelchart_for_loop:n
{
\pgfkeysvalueof { / wheelchart / before~slices }
- \int_step_inline:nn { \fp_eval:n { round ( \cs:w g__wheelchart_value_\WCcount _fp\cs_end: ) } }
- %note that \fp_eval:n { round ( ... ) } is necessary even when the value is an integer because if parse=pgfmath
- %then .0 is added and then \int_step_inline:nn { \cs:w g__wheelchart_value_\WCcount _fp\cs_end: } would give the messages
+ \int_step_inline:nn { \fp_eval:n { round ( \cs:w g__wheelchart_value_\WCcount _fp \cs_end: ) } }
+ %note that \fp_eval:n { round ( ... ) } is necessary even when the value is an integer because pgfmath
+ %could have added .0 and then \int_step_inline:nn { \cs:w g__wheelchart_value_\WCcount _fp \cs_end: } would give the messages
%Missing character: There is no . in font nullfont! Missing character: There is no 0 in font nullfont!
{
\int_gincr:N \g__wheelchart_discrete_count_int
@@ -1082,7 +1087,7 @@
\cs_set:Npe \WCmidangle
{ \fp_use:c { g__wheelchart_WCmidangle_\WCcount _fp } }
\pgfkeysvalueof { / wheelchart / for~loop~start }%this must be placed after the definition of macros such as \WCpercentage
- %such that these macros can be used in the key for loop start
+ %so that these macros can be used in the key for loop start
\begin { scope }
[
shift = { ( \WCmidangle \c_colon_str \fp_use:c { g__wheelchart_explode_\WCcount _fp } ) } ,
@@ -1161,16 +1166,21 @@
\fp_gset:cn { g__wheelchart_#1_\WCcount _fp } { \pgfmathresult }
}
-\cs_new_protected:Npn \__wheelchart_if_text:nn #1#2
+\cs_new_protected:Npn \__wheelchart_if_text:nnn #1#2#3
{
%https://tex.stackexchange.com/questions/42280/expand-away-empty-macros-within-ifthenelse
%https://tex.stackexchange.com/questions/44919/proper-way-to-detect-empty-blank-text
\begin { pgfinterruptpicture }
+ \DeclareDocumentCommand \\ {#2} {}
+ %for arc data, \\ is used with seq_set_split so has no optional argument thus then #2 is empty
+ %otherwise, #2 is o
+ %no s because an optional star does not apply in a node
+ %no ! because a space between \\ and its optional argument is allowed in a node
%https://tex.stackexchange.com/questions/459853/savebox-within-tikzpicture-results-in-an-empty-savebox
\hbox_gset:Nn \g__wheelchart_if_text_box { \pgfkeysvalueof { / wheelchart / #1 } }
\end { pgfinterruptpicture }
\dim_compare:nNnT { \box_wd:N \g__wheelchart_if_text_box } > { 0 pt }
- { {#2} }
+ { {#3} }
}
\cs_new_protected:Npn \__wheelchart_initial:n #1
@@ -1182,7 +1192,7 @@
\tl_if_empty:nTF {#1}
{ \cs_set:Npn \WCtotalcount { 0 } }
{
- \cs:w seq_set_split:Ne\l__wheelchart_expand_list_tl\cs_end:
+ \cs:w seq_set_split:Ne\l__wheelchart_expand_list_tl \cs_end:
\l__wheelchart_list_seq
{ \pgfkeysvalueof { / wheelchart / separator~rows } }
{#1}
@@ -1190,7 +1200,7 @@
\int_zero:N \l__wheelchart_max_list_items_int
\seq_map_indexed_inline:Nn \l__wheelchart_list_seq
{
- \cs:w seq_set_split:Ne\l__wheelchart_expand_list_items_tl\cs_end:
+ \cs:w seq_set_split:Ne\l__wheelchart_expand_list_items_tl \cs_end:
\l__wheelchart_list_items_seq
{ \pgfkeysvalueof { / wheelchart / separator~columns } }
{##2}
@@ -1245,7 +1255,7 @@
\etocsetnexttocdepth { -1 }%only for the next toc
\etocsetstyle { \l__wheelchart_etoc_level_tl } {} {}
{
- \int_compare:nNnT { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int\cs_end: } > { 0 }
+ \int_compare:nNnT { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int \cs_end: } > { 0 }
{
\cs_gset:cpe
{
@@ -1304,7 +1314,7 @@
{}
\int_gzero_new:c { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int }
\pgfkeysvalueof { / wheelchart / etoc~code }
- \int_compare:nNnT { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int\cs_end: } > { 0 }
+ \int_compare:nNnT { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int \cs_end: } > { 0 }
{
\cs_gset:cpe
{
@@ -1331,32 +1341,32 @@
{
\__wheelchart_def_slice_keys:n
{ \__wheelchart_gdef_count_fp:nn { value } { value } }
- \cs_set:Npe \WCtotalnum { \fp_eval:n { \WCtotalnum + \cs:w g__wheelchart_value_\WCcount _fp\cs_end: } }
+ \cs_set:Npe \WCtotalnum { \fp_eval:n { \WCtotalnum + \cs:w g__wheelchart_value_\WCcount _fp \cs_end: } }
}
\int_step_inline:nn { \WCtotalcount }
{
\cs_set:cpe { l__wheelchart_WCpercentage_##1 }
- { \fp_eval:n { \cs:w g__wheelchart_value_##1_fp\cs_end: / ( \WCtotalnum / 100 ) } }
+ { \fp_eval:n { \cs:w g__wheelchart_value_##1_fp \cs_end: / ( \WCtotalnum / 100 ) } }
\cs_set:cpe { l__wheelchart_WCpercentagerounded_##1 }
- { \fp_eval:n { round ( \cs:w l__wheelchart_WCpercentage_##1\cs_end: , \pgfkeysvalueof { / wheelchart / perc~precision } ) } }
+ { \fp_eval:n { round ( \cs:w l__wheelchart_WCpercentage_##1 \cs_end: , \pgfkeysvalueof { / wheelchart / perc~precision } ) } }
}
}
\cs_new_protected:Npn \__wheelchart_inner_and_wheel_data:n #1
{
- \__wheelchart_if_text:nn { #1~data }
+ \__wheelchart_if_text:nnn { #1~data } { o }
{
\__wheelchart_def_fp:nn { #1_data_angle_pos } { #1~data~angle~pos }
\__wheelchart_def_fp:nn { #1_data_angle_shift } { #1~data~angle~shift }
\__wheelchart_def_fp:nn { #1_data_pos } { #1~data~pos }
\__wheelchart_def_fp:nn { #1_data_sep } { #1~data~sep }
\node [ align = left , / wheelchart / #1_data_style ] at
- \cs:w __wheelchart_point_plot_\bool_to_str:N \l__wheelchart_plot_bool :nnnnn\cs_end:
+ \cs:w __wheelchart_point_plot_\bool_to_str:N \l__wheelchart_plot_bool :nnnnn \cs_end:
{ \WCcount }
- { \cs:w l__wheelchart_#1_data_angle_pos_fp\cs_end: }
- { \cs:w l__wheelchart_#1_data_angle_shift_fp\cs_end: }
- { \cs:w l__wheelchart_#1_data_pos_fp\cs_end: }
- { \cs:w l__wheelchart_#1_data_sep_fp\cs_end: }
+ { \cs:w l__wheelchart_#1_data_angle_pos_fp \cs_end: }
+ { \cs:w l__wheelchart_#1_data_angle_shift_fp \cs_end: }
+ { \cs:w l__wheelchart_#1_data_pos_fp \cs_end: }
+ { \cs:w l__wheelchart_#1_data_sep_fp \cs_end: }
{ \pgfkeysvalueof { / wheelchart / #1~data } } ;
}
}
@@ -1366,13 +1376,13 @@
\cs_new_protected:Npn \__wheelchart_legend_append:nn #1#2
{
- \tl_build_put_right:NV \WClegend \l__wheelchart_legend_row_tl%note the V specifier such that \WClegend can also be combined
- %with an S column of the package siunitx and such that \WClegend can be used in a tblr environment of the package tabularray
+ \tl_build_put_right:NV \WClegend \l__wheelchart_legend_row_tl%note the V specifier so that \WClegend can also be combined
+ %with an S column of the package siunitx and so that \WClegend can be used in a tblr environment of the package tabularray
%and then the option expand=\WClegend needs to be given to the tblr environment
\tl_build_put_right:Nn \WClegend { \protect \setcounter { g__wheelchart_WCcount_counter } }%note the \protect for in case that
%\WClegend would be parsed in a particular way
%note that the counter g__wheelchart_WCcount_counter is defined globally and at the end of the previous \l__wheelchart_legend_row_tl
- %such that this value is defined and has the right value at the start of the next \l__wheelchart_legend_row_tl
+ %so that this value is defined and has the right value at the start of the next \l__wheelchart_legend_row_tl
%if \WClegend is used in a tblr environment of the package tabularray then \UseTblrLibrary{counter} is required
\tl_build_put_right:Ne \WClegend { { \int_eval:n {#1} } }
\tl_build_put_right:Nn \WClegend {#2}
@@ -1414,8 +1424,8 @@
{
atand
(
- \cs:w g__wheelchart_#3_y_fp\cs_end: - \cs:w g__wheelchart_#4_y_fp\cs_end: ,
- \cs:w g__wheelchart_#3_x_fp\cs_end: - \cs:w g__wheelchart_#4_x_fp\cs_end:
+ \cs:w g__wheelchart_#3_y_fp \cs_end: - \cs:w g__wheelchart_#4_y_fp \cs_end: ,
+ \cs:w g__wheelchart_#3_x_fp \cs_end: - \cs:w g__wheelchart_#4_x_fp \cs_end:
)
}
\fp_set:Nn \l__wheelchart_slices_arc_coord_fp
@@ -1440,7 +1450,7 @@
)
:
atand ( ( \l__wheelchart_slices_arc_A_fp - ( 1 / \l__wheelchart_slices_arc_A_fp ) ) / 2 )
- }%note the min ( \l__wheelchart_slices_arc_B_fp , 0 ) such that the acosd is always defined
+ }%note the min ( \l__wheelchart_slices_arc_B_fp , 0 ) so that the acosd is always defined
}
}
]
@@ -1486,8 +1496,8 @@
* abs ( ( 1 / \l__wheelchart_slices_arc_A_fp ) + \l__wheelchart_slices_arc_A_fp )
* sqrt
(
- ( \cs:w g__wheelchart_#3_x_fp\cs_end: - \cs:w g__wheelchart_#4_x_fp\cs_end: ) ^ 2
- + ( \cs:w g__wheelchart_#3_y_fp\cs_end: - \cs:w g__wheelchart_#4_y_fp\cs_end: ) ^ 2
+ ( \cs:w g__wheelchart_#3_x_fp \cs_end: - \cs:w g__wheelchart_#4_x_fp \cs_end: ) ^ 2
+ + ( \cs:w g__wheelchart_#3_y_fp \cs_end: - \cs:w g__wheelchart_#4_y_fp \cs_end: ) ^ 2
)
}
}
@@ -1539,11 +1549,11 @@
\fp_eval:n
{
(
- \cs:w g__wheelchart_#3_x_fp\cs_end: + \cs:w g__wheelchart_#4_x_fp\cs_end: +
+ \cs:w g__wheelchart_#3_x_fp \cs_end: + \cs:w g__wheelchart_#4_x_fp \cs_end: +
(
\g__wheelchart_slices_orientation_fp * ( \l__wheelchart_slices_arrow_coord_fp - 1 )
* \l__wheelchart_slices_arrow_A_fp
- * ( \cs:w g__wheelchart_#3_y_fp\cs_end: - \cs:w g__wheelchart_#4_y_fp\cs_end: )
+ * ( \cs:w g__wheelchart_#3_y_fp \cs_end: - \cs:w g__wheelchart_#4_y_fp \cs_end: )
)
)
/ 2
@@ -1552,11 +1562,11 @@
\fp_eval:n
{
(
- \cs:w g__wheelchart_#3_y_fp\cs_end: + \cs:w g__wheelchart_#4_y_fp\cs_end: +
+ \cs:w g__wheelchart_#3_y_fp \cs_end: + \cs:w g__wheelchart_#4_y_fp \cs_end: +
(
\g__wheelchart_slices_orientation_fp * ( \l__wheelchart_slices_arrow_coord_fp - 1 )
* \l__wheelchart_slices_arrow_A_fp
- * ( \cs:w g__wheelchart_#4_x_fp\cs_end: - \cs:w g__wheelchart_#3_x_fp\cs_end: )
+ * ( \cs:w g__wheelchart_#4_x_fp \cs_end: - \cs:w g__wheelchart_#3_x_fp \cs_end: )
)
)
/ 2
@@ -1593,10 +1603,10 @@
{
\fp_eval:n
{
- ( 1 - (#1) / max ( round ( \cs:w g__wheelchart_value_\WCcount _fp\cs_end: ) , 1 ) )
- * \cs:w g__wheelchart_slice_#2_start_angle_\WCcount _fp\cs_end:
- + (#1) * \cs:w g__wheelchart_slice_#2_end_angle_\WCcount _fp\cs_end:
- / max ( round ( \cs:w g__wheelchart_value_\WCcount _fp\cs_end: ) , 1 )
+ ( 1 - (#1) / max ( round ( \cs:w g__wheelchart_value_\WCcount _fp \cs_end: ) , 1 ) )
+ * \cs:w g__wheelchart_slice_#2_start_angle_\WCcount _fp \cs_end:
+ + (#1) * \cs:w g__wheelchart_slice_#2_end_angle_\WCcount _fp \cs_end:
+ / max ( round ( \cs:w g__wheelchart_value_\WCcount _fp \cs_end: ) , 1 )
}
}
@@ -1617,17 +1627,19 @@
arc_style /. style = {} ,
arc~around~line /. initial = 1 ,
arc~around~text /. default = true ,%this key is not set up with /.is choice or \bool_set:Nn
- %such that for example \WCvarA can be used as value for this key
+ %so that for example \WCvarA can be used as value for this key
arc~around~text /. initial = false ,
arc~data /. initial = {} ,
arc~data~align /. code = { \tl_set:Nn \l__wheelchart_arc_data_align_tl {#1} } ,%this key is not set up with /.is choice
- %such that for example \WCvarA can be used as value for this key
+ %so that for example \WCvarA can be used as value for this key
arc~data~align = center ,
arc~data~angle~pos /. initial = 0.5 ,
arc~data~angle~shift /. initial = 0 ,
arc~data~dir /. initial = 1 ,
arc~data~expand /. initial = n ,
arc~data~line~sep~factor /. initial = 1 ,
+ arc~data~lines~pos /. initial = 0.5 ,
+ arc~data~lines~shift /. initial = 0 ,
arc~data~pos /. initial = 1 ,
arc~data~sep /. initial = 1 ex / 1 cm ,
arc~data~style /. style = { arc_data_style /. style = {#1} } ,
@@ -1640,7 +1652,7 @@
arc~sep /. initial = 1 ex / 1 cm ,
at /. initial = { ( 0 , 0 ) } ,
before~slices /. initial = {} ,
- bool_set_true /. code = { \bool_set_true:N #1 } ,
+ bool_set_true /. code = \bool_set_true:N #1 ,
caption /. initial = {} ,
caption~left /. initial = {} ,
caption~left~sep /. initial = 0.5 ,
@@ -1670,9 +1682,9 @@
data~style /. style = { data_style /. style = {#1} } ,
data_style /. style = {} ,
discrete /. is~choice ,
- discrete / false /. code = { \bool_set_false:N \l__wheelchart_discrete_bool } ,
+ discrete / false /. code = \bool_set_false:N \l__wheelchart_discrete_bool ,
discrete / false /. value~forbidden ,
- discrete / true /. code = { \bool_set_true:N \l__wheelchart_discrete_bool } ,
+ discrete / true /. code = \bool_set_true:N \l__wheelchart_discrete_bool ,
discrete / true /. value~forbidden ,
discrete /. default = true ,
discrete = false ,
@@ -1777,7 +1789,7 @@
legend /. initial = {} ,
legend~columns /. initial = 1 ,
legend~entry /. initial = {} ,
- legend~only /. code = { \bool_set:Nn \l__wheelchart_legend_only_bool { \cs:w c_#1_bool\cs_end: } } ,
+ legend~only /. code = \bool_set:Nn \l__wheelchart_legend_only_bool { \cs:w c_#1_bool \cs_end: } ,
legend~only /. default = true ,
legend~only = false ,
legend~row /. code =
@@ -1800,7 +1812,7 @@
} ,
lines~ext~dirsep /. initial = 0 ,
lines~ext~fixed /. default = true ,%this key is not set up with /.is choice or \bool_set:Nn
- %such that for example \WCvarA can be used as value for this key
+ %so that for example \WCvarA can be used as value for this key
lines~ext~fixed /. initial = false ,
lines~ext~fixed~left /. initial =
{
@@ -1808,7 +1820,7 @@
{
\l__wheelchart_lines_ext_dir_int *
(
- \cs:w g__wheelchart_outer_radius_\WCcount _fp\cs_end: + \l__wheelchart_lines_sep_fp
+ \cs:w g__wheelchart_outer_radius_\WCcount _fp \cs_end: + \l__wheelchart_lines_sep_fp
+ \l__wheelchart_lines_fp + \l__wheelchart_lines_ext_fp
)
}
@@ -1819,7 +1831,7 @@
{
\l__wheelchart_lines_ext_dir_int *
(
- \cs:w g__wheelchart_outer_radius_\WCcount _fp\cs_end: + \l__wheelchart_lines_sep_fp
+ \cs:w g__wheelchart_outer_radius_\WCcount _fp \cs_end: + \l__wheelchart_lines_sep_fp
+ \l__wheelchart_lines_fp + \l__wheelchart_lines_ext_fp
)
}
@@ -1870,7 +1882,7 @@
outer_plot_style /. style = {} ,
outer~radius /. initial = 3 ,
perc~precision /. initial = 0 ,
- pie /. code = { \bool_set:Nn \l__wheelchart_pie_bool { \cs:w c_#1_bool\cs_end: } } ,
+ pie /. code = \bool_set:Nn \l__wheelchart_pie_bool { \cs:w c_#1_bool \cs_end: } ,
pie /. default = true ,
pie = false ,
plot /. style =
@@ -2029,12 +2041,12 @@
} ,
slices~inner /. initial =
{
- \fp_compare:nNnT { \cs:w g__wheelchart_inner_radius_\WCcount _fp\cs_end: } > { 0 }
+ \fp_compare:nNnT { \cs:w g__wheelchart_inner_radius_\WCcount _fp \cs_end: } > { 0 }
{
\fp_compare:nNnT
- { \cs:w g__wheelchart_inner_gap_\WCcount _fp\cs_end: }
+ { \cs:w g__wheelchart_inner_gap_\WCcount _fp \cs_end: }
<
- { \cs:w g__wheelchart_abs_half_angle_minus_new_angle_\WCcount _fp\cs_end: }
+ { \cs:w g__wheelchart_abs_half_angle_minus_new_angle_\WCcount _fp \cs_end: }
{
arc
[
@@ -2212,7 +2224,7 @@
{}
}
} ,
- slices~start~arrow/.style~2~args =
+ slices~start~arrow /. style~2~args =
{
slices~start =
{
@@ -2241,13 +2253,13 @@
(#1) -
\fp_eval:n
{
- \l__wheelchart_counter_or_clockwise_fp * \cs:w g__wheelchart_value_1_fp\cs_end: * 0.5
+ \l__wheelchart_counter_or_clockwise_fp * \cs:w g__wheelchart_value_1_fp \cs_end: * 0.5
* ( \l__wheelchart_total_angle_fp / \WCtotalnum )
}
}
} ,
start~half /. default = 90 ,
- title /. initial= {} ,
+ title /. initial = {} ,
title~left /. initial = {} ,
title~left~sep /. initial = 0.5 ,
title~left~style /. style = { title~left_style /. style = {#1} } ,
@@ -2283,13 +2295,13 @@
{
\cs_set:cpn {#1}
{ \use:e { \clist_item:nn {#2} { \int_mod:nn { \WCcount - 1 } { \clist_count:n {#2} } + 1 } } }
- %note the \use:e such that \WClist<name> also works when given as an argument to pgfmath
+ %note the \use:e so that \WClist<name> also works when given as an argument to pgfmath
%if the list contains a macro, for example
%\begin{tikzpicture}
%\def\n{1}
%\wheelchart[
- % value=\WClistA,
- % WClistA={\n}
+ % value=\WClistA,
+ % WClistA=\n
%]{\exampleforthismanual}
%\end{tikzpicture}
%https://tex.stackexchange.com/questions/671298/clist-item-and-pgfmathsetmacro-causing-an-error
@@ -2331,18 +2343,18 @@
{
\tl_set:Ne \l__wheelchart_key_name_tl { \pgfkeyscurrentname }%it is necessary to define \l__wheelchart_key_name_tl
%because \pgfkeyscurrentname will be overwritten by / errors / unknown~key /. expanded
- \regex_match:nVTF { \{(.+)\} } \l__wheelchart_key_name_tl
+ \regex_match:NVTF \c__wheelchart_braces_regex \l__wheelchart_key_name_tl
{
\tl_set:Ne \l__wheelchart_key_range_tl { \pgfkeyscurrentname }
- \regex_replace_all:nnN { \{(.+)\} } {} \l__wheelchart_key_name_tl
- \regex_replace_all:nnN { [\w\s]+\{(.+)\} } { \1 } \l__wheelchart_key_range_tl
+ \regex_replace_all:NnN \c__wheelchart_braces_regex {} \l__wheelchart_key_name_tl
+ \regex_replace_all:NnN \c__wheelchart_key_braces_regex { \1 } \l__wheelchart_key_range_tl
\str_if_eq:eeTF { \l__wheelchart_key_range_tl } { list }
{
\pgfkeys { / wheelchart , WC_list = { l__wheelchart_list_\l__wheelchart_key_name_tl } {#1} }
\pgfkeys
{
/ wheelchart ,
- \l__wheelchart_key_name_tl /. expand~once = { \cs:w l__wheelchart_list_\l__wheelchart_key_name_tl\cs_end: }
+ \l__wheelchart_key_name_tl /. expand~once = { \cs:w l__wheelchart_list_\l__wheelchart_key_name_tl \cs_end: }
}
}
{
@@ -2393,12 +2405,12 @@
\NewDocumentCommand \wheelchart { O {} m }
{
- {%note the double braces {{...}} such that the contents is in a group and such that & can be used in pgfmath in a tabular
+ {%note the double braces {{...}} so that the contents is in a group and so that & can be used in pgfmath in a tabular
\pgfkeys { / wheelchart , #1 }
\IfPackageLoadedTF { siunitx }
{ \cs_set:Npn \WCperc { \qty { \WCpercentagerounded } { \percent } } }
{ \cs_set:Npn \WCperc { \WCpercentagerounded \, \% } }%the definition of \WCperc is placed inside the command \wheelchart
- %such that \WCperc is not defined outside this command
+ %so that \WCperc is not defined outside this command
\bool_if:NTF \l__wheelchart_legend_only_bool
{
\__wheelchart_initial:n {#2}
@@ -2430,7 +2442,7 @@
{
\g__wheelchart_angle_fp +
(
- \l__wheelchart_counter_or_clockwise_fp * \cs:w g__wheelchart_value_\WCcount _fp\cs_end:
+ \l__wheelchart_counter_or_clockwise_fp * \cs:w g__wheelchart_value_\WCcount _fp \cs_end:
* ( \l__wheelchart_total_angle_fp / \WCtotalnum )
)
}
@@ -2455,7 +2467,7 @@
\fp_gset:cn { g__wheelchart_abs_half_angle_minus_new_angle_\WCcount _fp }
{ abs ( \g__wheelchart_angle_fp - \g__wheelchart_new_angle_fp ) / 2 }
\fp_set:Nn \l__wheelchart_abs_half_angle_minus_new_angle_minus_gap_polar_fp
- { \cs:w g__wheelchart_abs_half_angle_minus_new_angle_\WCcount _fp\cs_end: - \l__wheelchart_gap_polar_fp }
+ { \cs:w g__wheelchart_abs_half_angle_minus_new_angle_\WCcount _fp \cs_end: - \l__wheelchart_gap_polar_fp }
\fp_gzero_new:c { g__wheelchart_outer_gap_\WCcount _fp }
\fp_gzero_new:c { g__wheelchart_inner_gap_\WCcount _fp }
\bool_if:NTF \l__wheelchart_plot_bool
@@ -2466,7 +2478,7 @@
{
\fp_set:Nn \l__wheelchart_gap_max_angle_def_fp
{
- \cs:w g__wheelchart_inner_radius_\WCcount _fp\cs_end: > 0
+ \cs:w g__wheelchart_inner_radius_\WCcount _fp \cs_end: > 0
?
90
:
@@ -2490,8 +2502,8 @@
)
)
}
- \__wheelchart_def_gap:nn { outer } { \cs:w g__wheelchart_outer_radius_\WCcount _fp\cs_end: }
- \__wheelchart_def_gap:nn { inner } { \cs:w g__wheelchart_inner_radius_\WCcount _fp\cs_end: }
+ \__wheelchart_def_gap:nn { outer } { \cs:w g__wheelchart_outer_radius_\WCcount _fp \cs_end: }
+ \__wheelchart_def_gap:nn { inner } { \cs:w g__wheelchart_inner_radius_\WCcount _fp \cs_end: }
\fp_compare:nNnT { \l__wheelchart_abs_half_angle_minus_new_angle_minus_gap_polar_fp } > { 0.01 }
{
\fp_gset:cn { g__wheelchart_inner_radius_\WCcount _fp }
@@ -2508,7 +2520,7 @@
)
)
,
- \cs:w g__wheelchart_inner_radius_\WCcount _fp\cs_end:
+ \cs:w g__wheelchart_inner_radius_\WCcount _fp \cs_end:
)
}
}
@@ -2523,14 +2535,14 @@
\__wheelchart_gdef_count_fp:nn { data_pos } { data~pos }
\__wheelchart_gdef_count_fp:nn { data_sep } { data~sep }
\__wheelchart_def_angle:nnnn
- { \cs:w g__wheelchart_data_angle_pos_\WCcount _fp\cs_end: }
- { \cs:w g__wheelchart_data_angle_shift_\WCcount _fp\cs_end: }
- { \cs:w g__wheelchart_data_pos_\WCcount _fp\cs_end: }
- { \cs:w g__wheelchart_data_sep_\WCcount _fp\cs_end: }
+ { \cs:w g__wheelchart_data_angle_pos_\WCcount _fp \cs_end: }
+ { \cs:w g__wheelchart_data_angle_shift_\WCcount _fp \cs_end: }
+ { \cs:w g__wheelchart_data_pos_\WCcount _fp \cs_end: }
+ { \cs:w g__wheelchart_data_sep_\WCcount _fp \cs_end: }
\cs_set:Npe \WCdataangle { \pgfmathresult }
\__wheelchart_gdef_count_fp:nn { explode } { explode }
\pgfkeysvalueof { / wheelchart / for~loop~start }%this must be placed after the definition of macros such as
- %\WCpercentage such that these macros can be used in the key for loop start
+ %\WCpercentage so that these macros can be used in the key for loop start
\int_compare:nNnT { \WCcount } = { 1 }
{
\begin { scope }
@@ -2601,7 +2613,7 @@
[
shift /. expanded =
{
- \cs:w __wheelchart_point_plot_\bool_to_str:N \l__wheelchart_plot_bool :nnnnn\cs_end:
+ \cs:w __wheelchart_point_plot_\bool_to_str:N \l__wheelchart_plot_bool :nnnnn \cs_end:
{ \WCcount }
{ \l__wheelchart_slices_angle_pos_fp }
{ \l__wheelchart_slices_angle_shift_fp }
@@ -2639,9 +2651,9 @@
\__wheelchart_for_loop:n
{
\bool_if:NT \l__wheelchart_wheel_lines_bool
- %this is placed inside \__wheelchart_for_loop:n such that wheel lines can be applied for specific slices
+ %this is placed inside \__wheelchart_for_loop:n so that wheel lines can be applied for specific slices
{
- \int_step_inline:nnn { 0 } { \fp_eval:n { round ( \cs:w g__wheelchart_value_\WCcount _fp\cs_end: ) } }
+ \int_step_inline:nnn { 0 } { \fp_eval:n { round ( \cs:w g__wheelchart_value_\WCcount _fp \cs_end: ) } }
%note the \fp_eval:n { round ( ... ) } to avoid the messages Missing character: There is no ... in font nullfont!
{
\bool_if:NTF \l__wheelchart_plot_bool
@@ -2783,14 +2795,14 @@
\fp_compare:nF { \l__wheelchart_lines_fp == 0 && \l__wheelchart_lines_ext_fp == 0 }
{
\draw [ / wheelchart / lines_style ] let \p { l__wheelchart_lines_1 } =
- \cs:w __wheelchart_point_plot_\bool_to_str:N \l__wheelchart_plot_bool :nnnnn\cs_end:
+ \cs:w __wheelchart_point_plot_\bool_to_str:N \l__wheelchart_plot_bool :nnnnn \cs_end:
{ \WCcount }
- { \cs:w g__wheelchart_data_angle_pos_\WCcount _fp\cs_end: }
- { \cs:w g__wheelchart_data_angle_shift_\WCcount _fp\cs_end: }
- { \cs:w g__wheelchart_data_pos_\WCcount _fp\cs_end: }
+ { \cs:w g__wheelchart_data_angle_pos_\WCcount _fp \cs_end: }
+ { \cs:w g__wheelchart_data_angle_shift_\WCcount _fp \cs_end: }
+ { \cs:w g__wheelchart_data_pos_\WCcount _fp \cs_end: }
{ \l__wheelchart_lines_sep_fp + \l__wheelchart_lines_fp }
in
- \cs:w __wheelchart_point_plot_\bool_to_str:N \l__wheelchart_plot_bool :nnnnn\cs_end:
+ \cs:w __wheelchart_point_plot_\bool_to_str:N \l__wheelchart_plot_bool :nnnnn \cs_end:
{ \WCcount }
{ \l__wheelchart_lines_angle_pos_fp }
{ \l__wheelchart_lines_angle_shift_fp }
@@ -2838,7 +2850,7 @@
{
\fp_eval:n
{
- \l__wheelchart_lines_ext_dir_int * \cs:w g__wheelchart_data_sep_\WCcount _fp\cs_end:
+ \l__wheelchart_lines_ext_dir_int * \cs:w g__wheelchart_data_sep_\WCcount _fp \cs_end:
}
} ,
0
@@ -2849,7 +2861,7 @@
}
;
}
- \__wheelchart_if_text:nn { data }
+ \__wheelchart_if_text:nnn { data } { o }
{
\fp_compare:nNnTF { \l__wheelchart_lines_ext_fp } = { 0 }
{
@@ -2876,13 +2888,13 @@
\coordinate
[
at =
- \cs:w __wheelchart_point_plot_\bool_to_str:N \l__wheelchart_plot_bool :nnnnn\cs_end:
+ \cs:w __wheelchart_point_plot_\bool_to_str:N \l__wheelchart_plot_bool :nnnnn \cs_end:
{ \WCcount }
- { \cs:w g__wheelchart_data_angle_pos_\WCcount _fp\cs_end: }
- { \cs:w g__wheelchart_data_angle_shift_\WCcount _fp\cs_end: }
- { \cs:w g__wheelchart_data_pos_\WCcount _fp\cs_end: }
+ { \cs:w g__wheelchart_data_angle_pos_\WCcount _fp \cs_end: }
+ { \cs:w g__wheelchart_data_angle_shift_\WCcount _fp \cs_end: }
+ { \cs:w g__wheelchart_data_pos_\WCcount _fp \cs_end: }
{
- \cs:w g__wheelchart_data_sep_\WCcount _fp\cs_end: +
+ \cs:w g__wheelchart_data_sep_\WCcount _fp \cs_end: +
(
\l__wheelchart_lines_fp == 0
?
@@ -2902,7 +2914,7 @@
\node [ anchor = \l__wheelchart_data_anchor_tl , align = left , / wheelchart / data_style ]
at ( g__wheelchart_data_coordinate )
{ \pgfkeysvalueof { / wheelchart / data } } ;%a separate \node and not at the end of the \draw with lines_style
- %such that the key lines style is not passed to this \node
+ %so that the key lines style is not passed to this \node
}
\__wheelchart_def_fp:nn { arc_around_line } { arc~around~line }
\__wheelchart_def_fp:nn { arc_data_angle_pos } { arc~data~angle~pos }
@@ -2913,14 +2925,16 @@
\fp_gset:Nn \g__wheelchart_half_ex_over_one_cm_fp { 0.5 ex / 1 cm }%
\endpgfinterruptpicture%
\fp_gset:Nn \g__wheelchart_arc_data_aux_ii_fp { 0 }
- \__wheelchart_if_text:nn { arc~data }
+ \__wheelchart_if_text:nnn { arc~data } {}
{
- \cs_set:Npn \WCperc { \WCpercentagerounded { \, } { \% } }%such that \WCperc follows the arc if used in arc data
+ \cs_set:Npn \WCperc { \WCpercentagerounded { \, } { \% } }%so that \WCperc follows the arc if used in arc data
%this redefinition of \WCperc is local to the group of arc data
\__wheelchart_def_fp:nn { arc_data_pos } { arc~data~pos }
\__wheelchart_def_fp:nn { arc_data_sep } { arc~data~sep }
\__wheelchart_def_fp:nn { arc_data_line_sep_factor } { arc~data~line~sep~factor }
- \cs:w seq_set_split:Nn\pgfkeysvalueof { / wheelchart / arc~data~expand }\cs_end:
+ \__wheelchart_def_fp:nn { arc_data_lines_pos } { arc~data~lines~pos }
+ \__wheelchart_def_fp:nn { arc_data_lines_shift } { arc~data~lines~shift }
+ \cs:w seq_set_split:Nn\pgfkeysvalueof { / wheelchart / arc~data~expand } \cs_end:
\l__wheelchart_arc_data_seq
{ \\ }
{ \pgfkeysvalueof { / wheelchart / arc~data } }
@@ -2928,13 +2942,17 @@
{
\fp_set:Nn \l__wheelchart_arc_data_text_pos_fp
{
- \l__wheelchart_arc_data_pos_fp + 2 * \g__wheelchart_slices_orientation_fp
- * ( 2 * ####1 - \seq_count:N \l__wheelchart_arc_data_seq - 1 ) * sign ( \l__wheelchart_arc_data_dir_fp )
+ \l__wheelchart_arc_data_pos_fp + 4 * \g__wheelchart_slices_orientation_fp *
+ (
+ ####1 - 1 - \l__wheelchart_arc_data_lines_pos_fp * ( \seq_count:N \l__wheelchart_arc_data_seq - 1 )
+ + \l__wheelchart_arc_data_lines_shift_fp
+ )
+ * sign ( \l__wheelchart_arc_data_dir_fp )
* \l__wheelchart_arc_data_line_sep_factor_fp * \g__wheelchart_half_ex_over_one_cm_fp
/
(
- \cs:w g__wheelchart_outer_radius_\WCcount _fp\cs_end:
- - \cs:w g__wheelchart_inner_radius_\WCcount _fp\cs_end:
+ \cs:w g__wheelchart_outer_radius_\WCcount _fp \cs_end:
+ - \cs:w g__wheelchart_inner_radius_\WCcount _fp \cs_end:
+ 2 * \l__wheelchart_arc_data_sep_fp
)
}%the sign is needed because \l__wheelchart_arc_data_dir_fp is not necessarily 1 or -1
@@ -2957,9 +2975,9 @@
/ wheelchart / arc_data_style
}
}%get the length of the path
- %note the option overlay such that this does not increase the bounding box
+ %note the option overlay so that this does not increase the bounding box
%note the {} at the start of text and the braces around \fp_gset:Nn ...
- %such that the compilation does not stall
+ %so that the compilation does not stall
{ 0 }
{ 1 }
{ \l__wheelchart_plot_variable_tl }
@@ -3033,7 +3051,7 @@
{ \l__wheelchart_arc_data_text_pos_fp }
{ \l__wheelchart_arc_data_sep_fp + \g__wheelchart_half_ex_over_one_cm_fp }
+ \l__wheelchart_counter_or_clockwise_fp * \l__wheelchart_arc_data_dir_fp
- * \cs:w c__wheelchart_arc_data_start_factor_\l__wheelchart_arc_data_align_tl _fp\cs_end:
+ * \cs:w c__wheelchart_arc_data_start_factor_\l__wheelchart_arc_data_align_tl _fp \cs_end:
* \l__wheelchart_arc_data_total_angle_plot_false_fp
}
\path
@@ -3188,7 +3206,7 @@
}
\bool_if:NT \l__wheelchart_legend_row_bool
{ \__wheelchart_def_WClegend: }
- \__wheelchart_if_text:nn { middle }
+ \__wheelchart_if_text:nnn { middle } { o }
{ \node [ align = center , / wheelchart / middle_style ] at ( 0 , 0 ) { \pgfkeysvalueof { / wheelchart / middle } } ; }
\pgfkeysvalueof { / wheelchart / legend }
\end { scope }
@@ -3203,4 +3221,6 @@
\end { scope }
}
}
- } \ No newline at end of file
+ }
+
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/lualatex/junicodevf/junicodevf.sty b/Master/texmf-dist/tex/lualatex/junicodevf/junicodevf.sty
index 4dcee747a97..11cbe899fb7 100644
--- a/Master/texmf-dist/tex/lualatex/junicodevf/junicodevf.sty
+++ b/Master/texmf-dist/tex/lualatex/junicodevf/junicodevf.sty
@@ -129,7 +129,7 @@ mkmainfontcommand(style_idx, weight_option, weight_adjust, width_option, width_a
% Set the main font, then the alternate styles. It appears that
% the fonts aren't embedded in the PDF unless actually used.
-\setmainfont{Junicode VF}[
+\setmainfont{JunicodeVF}[
ItalicFont = {*-Italic},
BoldFont = {*},
BoldItalicFont = {*-Italic},
diff --git a/Master/texmf-dist/tex/lualatex/luacensor/luacensor.sty b/Master/texmf-dist/tex/lualatex/luacensor/luacensor.sty
index 22a8003e2d3..b4c7f45bea9 100644
--- a/Master/texmf-dist/tex/lualatex/luacensor/luacensor.sty
+++ b/Master/texmf-dist/tex/lualatex/luacensor/luacensor.sty
@@ -1,7 +1,7 @@
%luacensor.sty
-\def\luacensorversionnumber{1.1.0}
+\def\luacensorversionnumber{1.1.1}
\ProvidesPackage{luacensor}
-[2022/02/22 \luacensorversionnumber\
+[2024/04/06 \luacensorversionnumber\
Redact sensitive information using Lua]
% !TeX program = lualatex
% !TeX encoding = utf8
@@ -70,10 +70,10 @@
%Scale=1.1,
%%the below declarations are to prevent warnings about shapes not being available
%WordSpace=0,
-ItalicFont={Redacted},%
-BoldItalicFont={Redacted},%
-BoldFont={Redacted},%
-SmallCapsFont={Redacted}]{Redacted}
+ItalicFont={Redacted-Regular.ttf},%
+BoldItalicFont={Redacted-Regular.ttf},%
+BoldFont={Redacted-Regular.ttf},%
+SmallCapsFont={Redacted-Regular.ttf}]{Redacted-Regular.ttf}
\newcommand{\onething}{\cnsrfnt\ • }
\newcommand{\twothings}{\cnsrfnt\ • •}
\newcommand{\donothing}{\cnsrfnt\ }
@@ -390,7 +390,7 @@ token.set_lua("rndstring", #lft, "global")
%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newfontface\wrnstncl{QT Military}
\newcommand{\warnword}{WARNING}
-\newfontface\smbl{Deja Vu Sans Bold}
+\newfontface\smbl{DejaVuSans-Bold}
\newcommand{\danger}{\smbl ⚠︎\normalfont}
\newcommand{\warnformat}{\sffamily\bfseries \color{red}}
\newcommand{\textwarn}{This document is {\underline{NOT}} redacted. It contains private and confidential personal data, and may {\underline{NOT}} be distributed, published, or shown to those without the right to view such information. The publication of the information in this document may constitute a contempt of court, punishable by a term of imprisonment.}
diff --git a/Master/texmf-dist/tex/lualatex/piton/piton.lua b/Master/texmf-dist/tex/lualatex/piton/piton.lua
index 6ec0442b73c..616caac28d2 100644
--- a/Master/texmf-dist/tex/lualatex/piton/piton.lua
+++ b/Master/texmf-dist/tex/lualatex/piton/piton.lua
@@ -20,18 +20,13 @@
-- -------------------------------------------
--
-- This file is part of the LuaLaTeX package 'piton'.
-piton_version = "3.0b" -- 2024/05/23
+piton_version = "3.1a" -- 2024/08/12
+
if piton.comment_latex == nil then piton.comment_latex = ">" end
piton.comment_latex = "#" .. piton.comment_latex
-function piton.open_brace ()
- tex.sprint("{")
-end
-function piton.close_brace ()
- tex.sprint("}")
-end
local function sprintL3 ( s )
tex.sprint ( luatexbase.catcodetables.expl , s )
end
@@ -124,7 +119,7 @@ local SkipSpace = Q " " ^ 0
local Punct = Q ( S ".,:;!" )
-local Tab = "\t" * Lc "\\l__piton_tab_tl"
+local Tab = "\t" * Lc "\\__piton_tab:"
local SpaceIndentation = Lc "\\__piton_an_indentation_space:" * Q " "
local Delim = Q ( S "[({})]" )
local VisualSpace = space * Lc "\\l__piton_space_tl"
@@ -146,17 +141,19 @@ local function Compute_braces ( lpeg_string ) return
end
local function Compute_DetectedCommands ( lang , braces ) return
Ct ( Cc "Open"
- * C ( piton.ListCommands * P "{" )
+ * C ( piton.DetectedCommands * P "{" )
* Cc "}"
)
- * ( braces / (function ( s ) return LPEG1[lang] : match ( s ) end ) )
+ * ( braces
+ / ( function ( s ) if s ~= '' then return LPEG1[lang] : match ( s ) end end ) )
* P "}"
* Ct ( Cc "Close" )
end
local function Compute_LPEG_cleaner ( lang , braces ) return
- Ct ( ( piton.ListCommands * "{"
- * ( braces
- / ( function ( s ) return LPEG_cleaner[lang] : match ( s ) end ) )
+ Ct ( ( piton.DetectedCommands * "{"
+ * ( braces
+ / ( function ( s )
+ if s ~= '' then return LPEG_cleaner[lang] : match ( s ) end end ) )
* "}"
+ EscapeClean
+ C ( P ( 1 ) )
@@ -165,56 +162,61 @@ end
local Beamer = P ( false )
local BeamerBeginEnvironments = P ( true )
local BeamerEndEnvironments = P ( true )
-local list_beamer_env =
- { "uncoverenv" , "onlyenv" , "visibleenv" ,
- "invisibleenv" , "alertenv" , "actionenv" }
-local BeamerNamesEnvironments = P ( false )
-for _ , x in ipairs ( list_beamer_env ) do
- BeamerNamesEnvironments = BeamerNamesEnvironments + x
+piton.BeamerEnvironments = P ( false )
+for _ , x in ipairs ( piton.beamer_environments ) do
+ piton.BeamerEnvironments = piton.BeamerEnvironments + x
end
BeamerBeginEnvironments =
( space ^ 0 *
L
(
- P "\\begin{" * BeamerNamesEnvironments * "}"
+ P "\\begin{" * piton.BeamerEnvironments * "}"
* ( "<" * ( 1 - P ">" ) ^ 0 * ">" ) ^ -1
)
* "\r"
) ^ 0
BeamerEndEnvironments =
( space ^ 0 *
- L ( P "\\end{" * BeamerNamesEnvironments * "}" )
+ L ( P "\\end{" * piton.BeamerEnvironments * "}" )
* "\r"
) ^ 0
local function Compute_Beamer ( lang , braces )
local lpeg = L ( P "\\pause" * ( "[" * ( 1 - P "]" ) ^ 0 * "]" ) ^ -1 )
lpeg = lpeg +
Ct ( Cc "Open"
- * C ( ( P "\\uncover" + "\\only" + "\\alert" + "\\visible"
- + "\\invisible" + "\\action" )
+ * C ( piton.BeamerCommands
* ( "<" * ( 1 - P ">" ) ^ 0 * ">" ) ^ -1
* P "{"
)
* Cc "}"
)
- * ( braces / ( function ( s ) return LPEG1[lang] : match ( s ) end ) )
+ * ( braces /
+ ( function ( s ) if s ~= '' then return LPEG1[lang] : match ( s ) end end ) )
* "}"
* Ct ( Cc "Close" )
lpeg = lpeg +
L ( P "\\alt" * "<" * ( 1 - P ">" ) ^ 0 * ">" * "{" )
- * K ( 'ParseAgain.noCR' , braces )
+ * ( braces /
+ ( function ( s ) if s ~= '' then return LPEG1[lang] : match ( s ) end end ) )
* L ( P "}{" )
- * K ( 'ParseAgain.noCR' , braces )
+ * ( braces /
+ ( function ( s ) if s ~= '' then return LPEG1[lang] : match ( s ) end end ) )
* L ( P "}" )
lpeg = lpeg +
L ( ( P "\\temporal" ) * "<" * ( 1 - P ">" ) ^ 0 * ">" * "{" )
- * K ( 'ParseAgain.noCR' , braces )
+ * ( braces
+ / ( function ( s )
+ if s ~= '' then return LPEG1[lang] : match ( s ) end end ) )
* L ( P "}{" )
- * K ( 'ParseAgain.noCR' , braces )
+ * ( braces
+ / ( function ( s )
+ if s ~= '' then return LPEG1[lang] : match ( s ) end end ) )
* L ( P "}{" )
- * K ( 'ParseAgain.noCR' , braces )
+ * ( braces
+ / ( function ( s )
+ if s ~= '' then return LPEG1[lang] : match ( s ) end end ) )
* L ( P "}" )
- for _ , x in ipairs ( list_beamer_env ) do
+ for _ , x in ipairs ( piton.beamer_environments ) do
lpeg = lpeg +
Ct ( Cc "Open"
* C (
@@ -225,7 +227,11 @@ local function Compute_Beamer ( lang , braces )
)
* (
( ( 1 - P ( "\\end{" .. x .. "}" ) ) ^ 0 )
- / ( function ( s ) return LPEG1[lang] : match ( s ) end )
+ / ( function ( s )
+ if s ~= ''
+ then return LPEG1[lang] : match ( s )
+ end
+ end )
)
* P ( "\\end{" .. x .. "}" )
* Ct ( Cc "Close" )
@@ -270,6 +276,11 @@ local Operator =
local OperatorWord =
K ( 'Operator.Word' , P "in" + "is" + "and" + "or" + "not" )
+local For = K ( 'Keyword' , P "for" )
+ * Space
+ * Identifier
+ * Space
+ * K ( 'Keyword' , P "in" )
local Keyword =
K ( 'Keyword' ,
@@ -395,11 +406,11 @@ local ShortString = SingleShortString + DoubleShortString
local braces =
Compute_braces
(
- Q ( P "\"" + "r\"" + "R\"" + "f\"" + "F\"" )
- * ( "\"" * ( P "\\\"" + 1 - S "\"" ) ^ 0 * "\"" )
+ ( P "\"" + "r\"" + "R\"" + "f\"" + "F\"" )
+ * ( P "\\\"" + 1 - S "\"" ) ^ 0 * "\""
+
- Q ( P '\'' + 'r\'' + 'R\'' + 'f\'' + 'F\'' )
- * ( '\'' * ( P '\\\'' + 1 - S '\'' ) ^ 0 * '\'' )
+ ( P '\'' + 'r\'' + 'R\'' + 'f\'' + 'F\'' )
+ * ( P '\\\'' + 1 - S '\'' ) ^ 0 * '\''
)
if piton.beamer then Beamer = Compute_Beamer ( 'python' , braces ) end
DetectedCommands = Compute_DetectedCommands ( 'python' , braces )
@@ -509,10 +520,11 @@ local DefFunction =
* StringDoc ^ 0 -- there may be additional docstrings
) ^ -1
local ExceptionInConsole = Exception * Q ( ( 1 - P "\r" ) ^ 0 ) * EOL
+local EndKeyword = Space + Punct + Delim + EOL + Beamer + DetectedCommands + -1
local Main =
- space ^ 1 * -1
- + space ^ 0 * EOL
- + Space
+ -- space ^ 1 * -1
+ -- + space ^ 0 * EOL
+ Space
+ Tab
+ Escape + EscapeMath
+ CommentLaTeX
@@ -523,16 +535,17 @@ local Main =
+ ExceptionInConsole
+ Delim
+ Operator
- + OperatorWord * ( Space + Punct + Delim + EOL + -1 )
+ + OperatorWord * EndKeyword
+ ShortString
+ Punct
+ FromImport
+ RaiseException
+ DefFunction
+ DefClass
- + Keyword * ( Space + Punct + Delim + EOL + -1 )
+ + For
+ + Keyword * EndKeyword
+ Decorator
- + Builtin * ( Space + Punct + Delim + EOL + -1 )
+ + Builtin * EndKeyword
+ Identifier
+ Number
+ Word
@@ -545,7 +558,7 @@ LPEG2['python'] =
* Lc '\\__piton_begin_line:'
* Prompt
* SpaceIndentation ^ 0
- * LPEG1['python']
+ * ( space ^ 1 * -1 + space ^ 0 * EOL + Main ) ^ 0
* -1
* Lc '\\__piton_end_line:'
)
@@ -598,7 +611,7 @@ local DotNotation =
(
K ( 'Name.Module' , cap_identifier )
* Q "."
- * ( Identifier + Constructor + Q "(" + Q "[" + Q "{" )
+ * ( Identifier + Constructor + Q "(" + Q "[" + Q "{" ) ^ ( -1 )
+
Identifier
* Q "."
@@ -635,9 +648,9 @@ local Exception =
"Sys_blocked_io" + "Sys_error" + "Undefined_recursive_module" )
local Char =
K ( 'String.Short' , "'" * ( ( 1 - P "'" ) ^ 0 + "\\'" ) * "'" )
-braces = Compute_braces ( "\"" * ( 1 - S "\"" ) ^ 0 * "\"" )
+local braces = Compute_braces ( "\"" * ( 1 - S "\"" ) ^ 0 * "\"" )
if piton.beamer then
- Beamer = Compute_Beamer ( 'ocaml' , "\"" * ( 1 - S "\"" ) ^ 0 * "\"" )
+ Beamer = Compute_Beamer ( 'ocaml' , braces ) -- modified 2024/07/24
end
DetectedCommands = Compute_DetectedCommands ( 'ocaml' , braces )
LPEG_cleaner['ocaml'] = Compute_LPEG_cleaner ( 'ocaml' , braces )
@@ -754,10 +767,9 @@ local DefModule =
K ( 'Keyword' , P "include" + "open" )
* Space * K ( 'Name.Module' , cap_identifier )
local TypeParameter = K ( 'TypeParameter' , "'" * alpha * # ( 1 - P "'" ) )
+local EndKeyword = Space + Punct + Delim + EOL + Beamer + DetectedCommands + -1
local Main =
- space ^ 1 * -1
- + space ^ 0 * EOL
- + Space
+ Space
+ Tab
+ Escape + EscapeMath
+ Beamer
@@ -773,9 +785,9 @@ local Main =
+ DefFunction
+ DefModule
+ Record
- + Keyword * ( Space + Punct + Delim + EOL + -1 )
- + OperatorWord * ( Space + Punct + Delim + EOL + -1 )
- + Builtin * ( Space + Punct + Delim + EOL + -1 )
+ + Keyword * EndKeyword
+ + OperatorWord * EndKeyword
+ + Builtin * EndKeyword
+ DotNotation
+ Constructor
+ Identifier
@@ -789,7 +801,7 @@ LPEG2['ocaml'] =
* BeamerBeginEnvironments
* Lc '\\__piton_begin_line:'
* SpaceIndentation ^ 0
- * LPEG1['ocaml']
+ * ( space ^ 1 * -1 + space ^ 0 * EOL + Main ) ^ 0
* -1
* Lc '\\__piton_end_line:'
)
@@ -843,7 +855,7 @@ String =
) ^ 0
* Q "\""
)
-braces = Compute_braces ( "\"" * ( 1 - S "\"" ) ^ 0 * "\"" )
+local braces = Compute_braces ( "\"" * ( 1 - S "\"" ) ^ 0 * "\"" )
if piton.beamer then Beamer = Compute_Beamer ( 'c' , braces ) end
DetectedCommands = Compute_DetectedCommands ( 'c' , braces )
LPEG_cleaner['c'] = Compute_LPEG_cleaner ( 'c' , braces )
@@ -859,10 +871,9 @@ local LongComment =
* ( CommentMath + Q ( ( 1 - P "*/" - S "$\r" ) ^ 1 ) + EOL ) ^ 0
* Q "*/"
) -- $
+local EndKeyword = Space + Punct + Delim + EOL + Beamer + DetectedCommands + -1
local Main =
- space ^ 1 * -1
- + space ^ 0 * EOL
- + Space
+ Space
+ Tab
+ Escape + EscapeMath
+ CommentLaTeX
@@ -876,9 +887,9 @@ local Main =
+ Punct
+ DefFunction
+ DefClass
- + Type * ( Q "*" ^ -1 + Space + Punct + Delim + EOL + -1 )
- + Keyword * ( Space + Punct + Delim + EOL + -1 )
- + Builtin * ( Space + Punct + Delim + EOL + -1 )
+ + Type * ( Q "*" ^ -1 + EndKeyword )
+ + Keyword * EndKeyword
+ + Builtin * EndKeyword
+ Identifier
+ Number
+ Word
@@ -889,7 +900,7 @@ LPEG2['c'] =
* BeamerBeginEnvironments
* Lc '\\__piton_begin_line:'
* SpaceIndentation ^ 0
- * LPEG1['c']
+ * ( space ^ 1 * -1 + space ^ 0 * EOL + Main ) ^ 0
* -1
* Lc '\\__piton_end_line:'
)
@@ -951,7 +962,7 @@ local Identifier =
end
)
local String = K ( 'String.Long' , "'" * ( 1 - P "'" ) ^ 1 * "'" )
-braces = Compute_braces ( String )
+local braces = Compute_braces ( "'" * ( 1 - P "'" ) ^ 1 * "'" )
if piton.beamer then Beamer = Compute_Beamer ( 'sql' , braces ) end
DetectedCommands = Compute_DetectedCommands ( 'sql' , braces )
LPEG_cleaner['sql'] = Compute_LPEG_cleaner ( 'sql' , braces )
@@ -967,6 +978,7 @@ local LongComment =
* ( CommentMath + Q ( ( 1 - P "*/" - S "$\r" ) ^ 1 ) + EOL ) ^ 0
* Q "*/"
) -- $
+local EndKeyword = Space + Punct + Delim + EOL + Beamer + DetectedCommands + -1
local TableField =
K ( 'Name.Table' , identifier )
* Q "."
@@ -1005,10 +1017,9 @@ local WeCatchTableNames =
+ LuaKeyword "TABLE"
)
* ( Space + EOL ) * OneTable
+local EndKeyword = Space + Punct + Delim + EOL + Beamer + DetectedCommands + -1
local Main =
- space ^ 1 * -1
- + space ^ 0 * EOL
- + Space
+ Space
+ Tab
+ Escape + EscapeMath
+ CommentLaTeX
@@ -1030,7 +1041,7 @@ LPEG2['sql'] =
* BeamerBeginEnvironments
* Lc [[ \__piton_begin_line: ]]
* SpaceIndentation ^ 0
- * LPEG1['sql']
+ * ( space ^ 1 * -1 + space ^ 0 * EOL + Main ) ^ 0
* -1
* Lc [[ \__piton_end_line: ]]
)
@@ -1052,7 +1063,8 @@ local String =
* Q "\""
)
-braces = Compute_braces ( String )
+local braces = Compute_braces ( P "\"" * ( P "\\\"" + 1 - P "\"" ) ^ 1 * "\"" )
+
if piton.beamer then Beamer = Compute_Beamer ( 'minimal' , braces ) end
DetectedCommands = Compute_DetectedCommands ( 'minimal' , braces )
@@ -1066,9 +1078,7 @@ local Identifier = K ( 'Identifier' , identifier )
local Delim = Q ( S "{[()]}" )
local Main =
- space ^ 1 * -1
- + space ^ 0 * EOL
- + Space
+ Space
+ Tab
+ Escape + EscapeMath
+ CommentLaTeX
@@ -1090,7 +1100,7 @@ LPEG2['minimal'] =
* BeamerBeginEnvironments
* Lc [[ \__piton_begin_line: ]]
* SpaceIndentation ^ 0
- * LPEG1['minimal']
+ * ( space ^ 1 * -1 + space ^ 0 * EOL + Main ) ^ 0
* -1
* Lc [[ \__piton_end_line: ]]
)
@@ -1099,7 +1109,7 @@ function piton.Parse ( language , code )
local t = LPEG2[language] : match ( code )
if t == nil
then
- sprintL3 [[ \__piton_error_or_warning:n { syntax~error } ]]
+ sprintL3 [[ \__piton_error_or_warning:n { SyntaxError } ]]
return -- to exit in force the function
end
local left_stack = {}
@@ -1233,10 +1243,13 @@ end
function piton.GobbleParse ( lang , n , code )
piton.last_code = gobble ( n , code )
piton.last_language = lang
- sprintL3 [[ \bool_if:NT \g__piton_footnote_bool \savenotes \vtop \bgroup ]]
+ piton.CountLines ( piton.last_code )
+ sprintL3 [[ \bool_if:NT \g__piton_footnote_bool \savenotes ]]
+ sprintL3 [[ \vtop \bgroup ]]
piton.Parse ( lang , piton.last_code )
- sprintL3
- [[\vspace{2.5pt}\egroup\bool_if:NT\g__piton_footnote_bool\endsavenotes\par]]
+ sprintL3 [[ \vspace{2.5pt} \egroup ]]
+ sprintL3 [[ \bool_if:NT \g__piton_footnote_bool \endsavenotes ]]
+ sprintL3 [[ \par ]]
if piton.write and piton.write ~= '' then
local file = assert ( io.open ( piton.write , piton.write_mode ) )
file:write ( piton.get_last_code ( ) )
@@ -1250,21 +1263,25 @@ function piton.GobbleSplitParse ( lang , n , code )
/ ( function ( x ) sprintL3 [[ \__piton_incr_visual_line: ]] end )
) ^ 1
/ ( function ( x )
- sprintL3 [[ \l__piton_split_separation_tl \int_gzero:N \g__piton_line_int ]]
+ sprintL3 ( piton.string_between_chunks )
end )
) ^ 0 * V "F" ,
F = C ( V "G" ^ 0 )
/ ( function ( x ) piton.GobbleParse ( lang , 0 , x ) end ) ,
G = ( 1 - P "\r" ) ^ 0 * "\r" - ( P " " ^ 0 * "\r" )
+ + ( ( 1 - P "\r" ) ^ 1 * -1 - ( P " " ^ 0 * -1 ) )
} : match ( gobble ( n , code ) )
end
+piton.string_between_chunks =
+ [[ \par \l__piton_split_separation_tl \mode_leave_vertical: ]]
+ .. [[ \int_gzero:N \g__piton_line_int ]]
function piton.get_last_code ( )
return LPEG_cleaner[piton.last_language] : match ( piton.last_code )
end
function piton.CountLines ( code )
local count = 0
for i in code : gmatch ( "\r" ) do count = count + 1 end
- sprintL3 ( [[ \int_set:Nn \l__piton_nb_lines_int { ]] .. count .. '}' )
+ sprintL3 ( string.format ( [[ \int_set:Nn \l__piton_nb_lines_int { % i } ]] , count ) )
end
function piton.CountNonEmptyLines ( code )
local count = 0
@@ -1275,12 +1292,14 @@ function piton.CountNonEmptyLines ( code )
* -1
) / table.getn
) : match ( code )
- sprintL3 ( [[ \int_set:Nn \l__piton_nb_non_empty_lines_int { ]] .. count .. '}' )
+ sprintL3
+ ( string.format ( [[ \int_set:Nn \l__piton_nb_non_empty_lines_int { % i } ]] , count ) )
end
function piton.CountLinesFile ( name )
local count = 0
for line in io.lines ( name ) do count = count + 1 end
- sprintL3 ( [[ \int_set:Nn \l__piton_nb_lines_int { ]] .. count .. '}' )
+ sprintL3
+ ( string.format ( [[ \int_set:Nn \l__piton_nb_lines_int { %i } ]], count))
end
function piton.CountNonEmptyLinesFile ( name )
local count = 0
@@ -1289,7 +1308,8 @@ function piton.CountNonEmptyLinesFile ( name )
count = count + 1
end
end
- sprintL3 ( [[ \int_set:Nn \l__piton_nb_non_empty_lines_int { ]] .. count .. '}' )
+ sprintL3
+ ( string.format ( [[ \int_set:Nn \l__piton_nb_non_empty_lines_int { % i } ]] , count ) )
end
function piton.ComputeRange(marker_beginning,marker_end,file_name)
local s = ( Cs ( ( P '##' / '#' + 1 ) ^ 0 ) ) : match ( marker_beginning )
@@ -1334,7 +1354,7 @@ function piton.new_language ( lang , definition )
function add_to_other ( c )
if c ~= " " then
extra_others[c] = true
- other = other + P "c"
+ other = other + P ( c )
end
end
local strict_braces =
@@ -1466,6 +1486,7 @@ function piton.new_language ( lang , definition )
end
end
local long_string = P ( false )
+ local Long_string = P ( false )
local LongString = P (false )
local central_pattern = P ( false )
for _ , x in ipairs ( def_table ) do
@@ -1486,20 +1507,24 @@ function piton.new_language ( lang , definition )
then prefix = lpeg.B ( 1 - letter - ")" - "]" )
else prefix = P ( true )
end
+ long_string = long_string +
+ prefix
+ * arg3
+ * ( space + central_pattern ) ^ 0
+ * arg4
local pattern =
prefix
* Q ( arg3 )
* ( VisualSpace + Q ( central_pattern ^ 1 ) + EOL ) ^ 0
* Q ( arg4 )
- long_string = long_string + pattern
+ Long_string = Long_string + pattern
LongString = LongString +
Ct ( Cc "Open" * Cc ( "{" .. arg2 .. "{" ) * Cc "}}" )
* pattern
* Ct ( Cc "Close" )
end
end
-
- local braces = Compute_braces ( String )
+ local braces = Compute_braces ( long_string )
if piton.beamer then Beamer = Compute_Beamer ( lang , braces ) end
DetectedCommands = Compute_DetectedCommands ( lang , braces )
@@ -1599,9 +1624,7 @@ function piton.new_language ( lang , definition )
local Delim = Q ( S "{[()]}" )
local Punct = Q ( S "=,:;!\\'\"" )
local Main =
- space ^ 1 * -1
- + space ^ 0 * EOL
- + Space
+ Space
+ Tab
+ Escape + EscapeMath
+ CommentLaTeX
@@ -1623,7 +1646,7 @@ function piton.new_language ( lang , definition )
* BeamerBeginEnvironments
* Lc [[\__piton_begin_line:]]
* SpaceIndentation ^ 0
- * LPEG1[lang]
+ * ( space ^ 1 * -1 + space ^ 0 * EOL + Main ) ^ 0
* -1
* Lc [[\__piton_end_line:]]
)
diff --git a/Master/texmf-dist/tex/lualatex/piton/piton.sty b/Master/texmf-dist/tex/lualatex/piton/piton.sty
index 72591ea8baa..3dfd6d0d8cf 100644
--- a/Master/texmf-dist/tex/lualatex/piton/piton.sty
+++ b/Master/texmf-dist/tex/lualatex/piton/piton.sty
@@ -19,8 +19,9 @@
%% LaTeX version 2005/12/01 or later.
%% -------------------------------------------
%%
-\def\PitonFileVersion{3.0b}
-\def\PitonFileDate{2024/05/23}
+\def\PitonFileVersion{3.1a}
+\def\PitonFileDate{2024/08/12}
+
@@ -31,6 +32,7 @@
{\PitonFileDate}
{\PitonFileVersion}
{Highlight informatic listings with LPEG on LuaLaTeX}
+\RequirePackage { amstext }
\cs_new_protected:Npn \__piton_error:n { \msg_error:nn { piton } }
\cs_new_protected:Npn \__piton_warning:n { \msg_warning:nn { piton } }
\cs_new_protected:Npn \__piton_error:nn { \msg_error:nnn { piton } }
@@ -96,18 +98,8 @@
beamer .bool_gset:N = \g__piton_beamer_bool ,
beamer .default:n = true ,
- math-comments .code:n = \__piton_error:n { moved~to~preamble } ,
- comment-latex .code:n = \__piton_error:n { moved~to~preamble } ,
-
unknown .code:n = \__piton_error:n { Unknown~key~for~package }
}
-\__piton_msg_new:nn { moved~to~preamble }
- {
- The~key~'\l_keys_key_str'~*must*~now~be~used~with~
- \token_to_str:N \PitonOptions`in~the~preamble~of~your~
- document.\\
- That~key~will~be~ignored.
- }
\__piton_msg_new:nn { Unknown~key~for~package }
{
Unknown~key.\\
@@ -165,7 +157,11 @@
}
\lua_now:n
{
- piton.ListCommands = lpeg.P ( false )
+ piton.BeamerCommands = lpeg.P ( "\\uncover" )
+ + "\\only" + "\\visible" + "\\invisible" + "\\alert" + "\\action"
+ piton.beamer_environments = { "uncoverenv" , "onlyenv" , "visibleenv" ,
+ "invisibleenv" , "alertenv" , "actionenv" }
+ piton.DetectedCommands = lpeg.P ( false )
piton.last_code = ''
piton.last_language = ''
}
@@ -181,9 +177,10 @@
\int_new:N \g__piton_line_int
\tl_new:N \g__piton_aux_tl
\int_new:N \l__piton_splittable_int
-\tl_new:N \l__piton_split_separation_tl
-\tl_set:Nn \l__piton_split_separation_tl { \vspace{\baselineskip} \vspace{-1.25pt} }
\int_set:Nn \l__piton_splittable_int { 100 }
+\tl_new:N \l__piton_split_separation_tl
+\tl_set:Nn \l__piton_split_separation_tl
+ { \vspace { \baselineskip } \vspace { -1.25pt } }
\clist_new:N \l__piton_bg_color_clist
\tl_new:N \l__piton_prompt_bg_color_tl
\str_new:N \l__piton_begin_range_str
@@ -210,24 +207,21 @@
\bool_new:N \l__piton_left_margin_auto_bool
\dim_new:N \l__piton_numbers_sep_dim
\dim_set:Nn \l__piton_numbers_sep_dim { 0.7 em }
-\tl_new:N \l__piton_tab_tl
\seq_new:N \g__piton_languages_seq
-\cs_new_protected:Npn \__piton_set_tab_tl:n #1
+\int_new:N \l__piton_tab_size_int
+\int_set:Nn \l__piton_tab_size_int { 4 }
+\cs_new_protected:Npn \__piton_tab:
{
- \tl_clear:N \l__piton_tab_tl
- \prg_replicate:nn { #1 }
- { \tl_put_right:Nn \l__piton_tab_tl { ~ } }
- }
-\__piton_set_tab_tl:n { 4 }
-\cs_new_protected:Npn \__piton_convert_tab_tl:
- {
- \hbox_set:Nn \l_tmpa_box { \l__piton_tab_tl }
- \dim_set:Nn \l_tmpa_dim { \box_wd:N \l_tmpa_box }
- \tl_set:Nn \l__piton_tab_tl
+ \bool_if:NTF \l__piton_show_spaces_bool
{
+ \hbox_set:Nn \l_tmpa_box
+ { \prg_replicate:nn \l__piton_tab_size_int { ~ } }
+ \dim_set:Nn \l_tmpa_dim { \box_wd:N \l_tmpa_box }
\( \mathcolor { gray }
- { \hbox_to_wd:nn \l_tmpa_dim { \rightarrowfill } \) }
+ { \hbox_to_wd:nn \l_tmpa_dim { \rightarrowfill } } \)
}
+ { \hbox:n { \prg_replicate:nn \l__piton_tab_size_int { ~ } } }
+ \int_gadd:Nn \g__piton_indentation_int \l__piton_tab_size_int
}
\int_new:N \l__piton_gobble_int
\tl_new:N \l__piton_space_tl
@@ -311,14 +305,14 @@
{
\bool_if:nF
{
- \str_if_eq_p:nn { #1 } { \PitonStyle {Prompt}{} }
+ \str_if_eq_p:nn { #1 } { \PitonStyle { Prompt } { } }
&&
\l__piton_skip_empty_lines_bool
}
{ \int_gincr:N \g__piton_visual_line_int }
\bool_if:nT
{
- ! \str_if_eq_p:nn { #1 } { \PitonStyle {Prompt}{} }
+ ! \str_if_eq_p:nn { #1 } { \PitonStyle { Prompt } { } }
||
( ! \l__piton_skip_empty_lines_bool && \l__piton_label_empty_lines_bool )
}
@@ -391,11 +385,12 @@
\int_compare:nNnT \g__piton_line_int > { \l__piton_splittable_int - 1 }
{
\int_compare:nNnT
- { \l__piton_nb_lines_int - \g__piton_line_int } > \l__piton_splittable_int
+ { \l__piton_nb_lines_int - \g__piton_line_int + 1 } > \l__piton_splittable_int
{
\egroup
\bool_if:NT \g__piton_footnote_bool \endsavenotes
- \par \mode_leave_vertical:
+ \par
+ \mode_leave_vertical:
\bool_if:NT \g__piton_footnote_bool \savenotes
\vtop \bgroup
}
@@ -431,6 +426,8 @@
\bool_new:N \l__piton_skip_empty_lines_bool
\bool_set_true:N \l__piton_skip_empty_lines_bool
\bool_new:N \l__piton_line_numbers_absolute_bool
+\tl_new:N \l__piton_line_numbers_format_bool
+\tl_set:Nn \l__piton_line_numbers_format_tl { \footnotesize \color { gray } }
\bool_new:N \l__piton_label_empty_lines_bool
\bool_set_true:N \l__piton_label_empty_lines_bool
\int_new:N \l__piton_number_lines_start_int
@@ -452,12 +449,8 @@
false .code:n = \bool_set_false:N \l__piton_line_numbers_bool ,
start .code:n =
- \bool_if:NTF \l__piton_in_PitonOptions_bool
- { Invalid~key }
- {
- \bool_set_true:N \l__piton_line_numbers_bool
- \int_set:Nn \l__piton_number_lines_start_int { #1 }
- } ,
+ \bool_set_true:N \l__piton_line_numbers_bool
+ \int_set:Nn \l__piton_number_lines_start_int { #1 } ,
start .value_required:n = true ,
skip-empty-lines .code:n =
@@ -484,11 +477,7 @@
{
\bool_set_true:N \l__piton_line_numbers_absolute_bool
\bool_set_false:N \l__piton_skip_empty_lines_bool
- }
- \bool_lazy_or:nnF
- \l__piton_in_PitonInputFile_bool
- \l__piton_in_PitonOptions_bool
- { \__piton_error:n { Invalid~key } } ,
+ } ,
absolute .value_forbidden:n = true ,
resume .code:n =
@@ -500,14 +489,25 @@
sep .dim_set:N = \l__piton_numbers_sep_dim ,
sep .value_required:n = true ,
+ format .tl_set:N = \l__piton_line_numbers_format_tl ,
+ format .value_required:n = true ,
+
unknown .code:n = \__piton_error:n { Unknown~key~for~line-numbers }
}
\keys_define:nn { PitonOptions }
{
detected-commands .code:n =
- \lua_now:n { piton.addListCommands('#1') } ,
+ \lua_now:n { piton.addDetectedCommands('#1') } ,
detected-commands .value_required:n = true ,
detected-commands .usage:n = preamble ,
+ detected-beamer-commands .code:n =
+ \lua_now:n { piton.addBeamerCommands('#1') } ,
+ detected-beamer-commands .value_required:n = true ,
+ detected-beamer-commands .usage:n = preamble ,
+ detected-beamer-environments .code:n =
+ \lua_now:n { piton.addBeamerEnvironments('#1') } ,
+ detected-beamer-environments .value_required:n = true ,
+ detected-beamer-environments .usage:n = preamble ,
begin-escape .code:n =
\lua_now:e { piton.begin_escape = "\lua_escape:n{#1}" } ,
begin-escape .value_required:n = true ,
@@ -610,11 +610,9 @@
} ,
left-margin .value_required:n = true ,
- tab-size .code:n = \__piton_set_tab_tl:n { #1 } ,
+ tab-size .int_set:N = \l__piton_tab_size_int ,
tab-size .value_required:n = true ,
- show-spaces .code:n =
- \bool_set_true:N \l__piton_show_spaces_bool
- \__piton_convert_tab_tl: ,
+ show-spaces .bool_set:N = \l__piton_show_spaces_bool ,
show-spaces .value_forbidden:n = true ,
show-spaces-in-strings .code:n = \tl_set:Nn \l__piton_space_tl { ⣠} , % U+2423
show-spaces-in-strings .value_forbidden:n = true ,
@@ -695,9 +693,8 @@
\hbox_overlap_left:n
{
{
- \color { gray }
- \footnotesize
- \int_to_arabic:n \g__piton_visual_line_int
+ \l__piton_line_numbers_format_tl
+ { \int_to_arabic:n \g__piton_visual_line_int }
}
\skip_horizontal:N \l__piton_numbers_sep_dim
}
@@ -783,7 +780,6 @@
\NewDocumentCommand { \__piton_piton_standard } { m }
{
\group_begin:
- \ttfamily
\automatichyphenmode = 1
\cs_set_eq:NN \\ \c_backslash_str
\cs_set_eq:NN \% \c_percent_str
@@ -805,7 +801,11 @@
\bool_if:NT \l__piton_break_lines_in_piton_bool
{ \regex_replace_all:nnN { \x20 } { \x20 } \l_tmpa_tl }
}
- \l_tmpa_tl
+ \if_mode_math:
+ \text { \ttfamily \l_tmpa_tl }
+ \else:
+ \ttfamily \l_tmpa_tl
+ \fi:
\group_end:
}
\NewDocumentCommand { \__piton_piton_verbatim } { v }
@@ -861,34 +861,9 @@
\cs_new_protected:Npn \__piton_piton_no_cr:n #1
{
\group_begin:
- \cs_set_protected:Npn \__piton_begin_line: { }
- \cs_set_protected:Npn \__piton_end_line: { }
- \cs_set:cpn { pitonStyle _ \l_piton_language_str _ Prompt } { }
- \cs_set:cpn { pitonStyle _ Prompt } { }
\cs_set_protected:Npn \__piton_newline:
{ \msg_fatal:nn { piton } { cr~not~allowed } }
- \bool_lazy_or:nnTF
- \l__piton_break_lines_in_piton_bool
- \l__piton_break_lines_in_Piton_bool
- {
- \tl_set:Nx \l_tmpa_tl
- {
- \lua_now:e
- { piton.ParseTer('\l_piton_language_str',token.scan_string()) }
- { #1 }
- }
- }
- {
- \tl_set:Nx \l_tmpa_tl
- {
- \lua_now:e
- { piton.Parse('\l_piton_language_str',token.scan_string()) }
- { #1 }
- }
- }
- \bool_if:NT \l__piton_show_spaces_bool
- { \regex_replace_all:nnN { \x20 } { ⣠} \l_tmpa_tl } % U+2423
- \l_tmpa_tl
+ \__piton_piton:n { #1 }
\group_end:
}
\cs_new:Npn \__piton_pre_env:
@@ -912,7 +887,7 @@
{
\hbox_set:Nn \l_tmpa_box
{
- \footnotesize
+ \l__piton_line_numbers_format_tl
\bool_if:NTF \l__piton_skip_empty_lines_bool
{
\lua_now:n
@@ -968,12 +943,12 @@
}
{
\group_end:
- \mode_if_vertical:TF \mode_leave_vertical: \newline
- \lua_now:n { piton.CountLines(token.scan_argument()) } { ##1 }
+ \mode_if_vertical:TF { \noindent \mode_leave_vertical: } \newline
\__piton_compute_left_margin:nn { CountNonEmptyLines } { ##1 }
\__piton_compute_width:
\ttfamily
\dim_zero:N \parskip
+ \noindent % added 2024/08/07
\str_if_empty:NTF \l__piton_path_write_str
{ \lua_now:e { piton.write = "\l__piton_write_str" } }
{
@@ -1136,7 +1111,6 @@
\__piton_compute_left_margin:no { CountNonEmptyLinesFile } \l__piton_file_name_str
\__piton_compute_width:
\ttfamily
- % \leavevmode
\lua_now:e
{
piton.ParseFile(
@@ -1246,8 +1220,6 @@
{
String .meta:n = { String.Long = #1 , String.Short = #1 } ,
Comment.Math .tl_set:c = pitonStyle _ Comment.Math ,
- ParseAgain .tl_set:c = pitonStyle _ ParseAgain ,
- ParseAgain .value_required:n = true ,
ParseAgain.noCR .tl_set:c = pitonStyle _ ParseAgain.noCR ,
ParseAgain.noCR .value_required:n = true ,
unknown .code:n =
@@ -1293,7 +1265,6 @@
UserFunction = ,
Prompt = ,
ParseAgain.noCR = \__piton_piton_no_cr:n ,
- ParseAgain = \__piton_piton:n ,
Discard = \use_none:n
}
\AtBeginDocument
@@ -1436,7 +1407,7 @@
markers~and~explicit~number~of~lines.\\
Your~whole~file~'\l__piton_file_name_str'~will~be~included.
}
-\__piton_msg_new:nn { syntax~error }
+\__piton_msg_new:nn { SyntaxError }
{
Your~code~of~the~language~"\l_piton_language_str"~is~not~
syntactically~correct.\\
@@ -1480,6 +1451,8 @@
break-lines-in-Piton,~
continuation-symbol,~
continuation-symbol-on-indentation,~
+ detected-beamer-commands,~
+ detected-beamer-environments,~
detected-commands,~
end-of-broken-line,~
end-range,~
@@ -1555,8 +1528,25 @@
E = ( V "F" * ( "," * V "F" ) ^ 0 ) / add ,
F = space ^ 0 * ( ( alpha ^ 1 ) / "\\%0" ) * space ^ 0
}
- function piton.addListCommands( key_value )
- piton.ListCommands = piton.ListCommands + my_lpeg : match ( key_value )
+ function piton.addDetectedCommands( key_value )
+ piton.DetectedCommands = piton.DetectedCommands + my_lpeg : match ( key_value )
+ end
+ function piton.addBeamerCommands( key_value )
+ piton.BeamerCommands
+ = piton.BeamerCommands + my_lpeg : match ( key_value )
+ end
+ local function insert(...)
+ local s = piton.beamer_environments
+ for _ , x in ipairs({...}) do table.insert(s,x) end
+ return s
+ end
+ local my_lpeg_bis =
+ P { "E" ,
+ E = ( V "F" * ( "," * V "F" ) ^ 0 ) / insert ,
+ F = space ^ 0 * ( alpha ^ 1 ) * space ^ 0
+ }
+ function piton.addBeamerEnvironments( key_value )
+ piton.beamer_environments = my_lpeg_bis : match ( key_value )
end
\end{luacode*}
diff --git a/Master/texmf-dist/tex/lualatex/tango/tango.cls b/Master/texmf-dist/tex/lualatex/tango/tango.cls
index 7fad8c30d87..f188200b4ca 100644
--- a/Master/texmf-dist/tex/lualatex/tango/tango.cls
+++ b/Master/texmf-dist/tex/lualatex/tango/tango.cls
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}%
\ProvidesClass{tango}%
-[2024/07/11 v0.7.2 tango document class. Michel Bovani]% %
+[2024/07/15 v0.8.0 tango document class. Michel Bovani]% %
%
% Ensure luatex engine
\RequirePackage{iftex}[2019/10/24]
@@ -28,6 +28,18 @@
\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
@@ -70,6 +82,42 @@
\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 %%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -834,6 +882,209 @@ CustomiseFigTabCaptions=false}
\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
@@ -1005,7 +1256,7 @@ labelwidth=0.75\TgoStandardMargin, labelsep=0.25\TgoStandardMargin, itemindent=!
\ifTgoBook
\newcommand\TgoChapterBox[1]{%
{\filright\sffamily\addfontfeature{RawFeature=-onum}\fontseries{eb}\selectfont\HUGE\hspace*{-0.06em}\thechapter}%
-\quad\parbox[b]{0.75\textwidth}{\filright#1}
+\quad\parbox{0.75\textwidth}{\filright#1}
}
\titleformat{\part}[display]{\centering\color{ColorOne}\sffamily
\addfontfeature{RawFeature=-onum}\fontseries{eb}\selectfont\Huge}
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
index e0dc1cb90b8..972e36172fd 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.33.1",
- date = "2024/07/14",
+ version = "2.34.5",
+ date = "2024/08/03",
description = "Lua package to typeset Metapost with LuaTeX's MPLib.",
}
@@ -45,7 +45,6 @@ local function termorlog (target, text, kind)
if kind == "Error" then error() end
end
end
-
local function warn (...) -- beware '%' symbol
termorlog("term and log", select("#",...) > 1 and format(...) or ...)
end
@@ -65,18 +64,14 @@ local texsprint = tex.sprint
local texgettoks = tex.gettoks
local texgetbox = tex.getbox
local texruntoks = tex.runtoks
-
if not texruntoks then
err("Your LuaTeX version is too old. Please upgrade it to the latest")
end
-
local is_defined = token.is_defined
local get_macro = token.get_macro
-
local mplib = require ('mplib')
local kpse = require ('kpse')
local lfs = require ('lfs')
-
local lfsattributes = lfs.attributes
local lfsisdir = lfs.isdir
local lfsmkdir = lfs.mkdir
@@ -87,7 +82,6 @@ local file = file or { }
local replacesuffix = file.replacesuffix or function(filename, suffix)
return (filename:gsub("%.[%a%d]+$","")) .. "." .. suffix
end
-
local is_writable = file.is_writable or function(name)
if lfsisdir(name) then
name = name .. "/_luam_plib_temp_file_"
@@ -106,11 +100,8 @@ local mk_full_path = lfs.mkdirp or lfs.mkdirs or function(path)
end
end
-local luamplibtime = kpse.find_file("luamplib.lua")
-luamplibtime = luamplibtime and lfsattributes(luamplibtime,"modification")
-
+local luamplibtime = lfsattributes(kpse.find_file"luamplib.lua", "modification")
local currenttime = os.time()
-
local outputdir, cachedir
if lfstouch then
for i,v in ipairs{'TEXMFVAR','TEXMF_OUTPUT_DIRECTORY','.','TEXMFOUTPUT'} do
@@ -147,7 +138,6 @@ function luamplib.getcachedir(dir)
end
end
end
-
local noneedtoreplace = {
["boxes.mp"] = true, -- ["format.mp"] = true,
["graph.mp"] = true, ["marith.mp"] = true, ["mfplain.mp"] = true,
@@ -165,7 +155,6 @@ local noneedtoreplace = {
["mp-tool.mpiv"] = true, ["mp-cont.mpiv"] = true,
}
luamplib.noneedtoreplace = noneedtoreplace
-
local function replaceformatmp(file,newfile,ofmodify)
local fh = ioopen(file,"r")
if not fh then return file end
@@ -183,12 +172,10 @@ local function replaceformatmp(file,newfile,ofmodify)
lfstouch(newfile,currenttime,ofmodify)
return newfile
end
-
local name_b = "%f[%a_]"
local name_e = "%f[^%a_]"
local btex_etex = name_b.."btex"..name_e.."%s*(.-)%s*"..name_b.."etex"..name_e
local verbatimtex_etex = name_b.."verbatimtex"..name_e.."%s*(.-)%s*"..name_b.."etex"..name_e
-
local function replaceinputmpfile (name,file)
local ofmodify = lfsattributes(file,"modification")
if not ofmodify then return file end
@@ -201,19 +188,15 @@ local function replaceinputmpfile (name,file)
return nf.size == 0 and file or newfile
end
end
-
if name == "format.mp" then return replaceformatmp(file,newfile,ofmodify) end
-
local fh = ioopen(file,"r")
if not fh then return file end
local data = fh:read("*all"); fh:close()
-
local count,cnt = 0,0
data, cnt = data:gsub(btex_etex, "btex %1 etex ") -- space
count = count + cnt
data, cnt = data:gsub(verbatimtex_etex, "verbatimtex %1 etex;") -- semicolon
count = count + cnt
-
if count == 0 then
noneedtoreplace[name] = true
fh = ioopen(newfile,"w");
@@ -223,7 +206,6 @@ local function replaceinputmpfile (name,file)
end
return file
end
-
fh = ioopen(newfile,"w")
if not fh then return file end
fh:write(data); fh:close()
@@ -239,12 +221,10 @@ do
end
mpkpse = kpse.new(arg[exe], "mpost")
end
-
local special_ftype = {
pfb = "type1 fonts",
enc = "enc files",
}
-
function luamplib.finder (name, mode, ftype)
if mode == "w" then
if name and name ~= "mpout.log" then
@@ -274,17 +254,14 @@ local preamble = [[
let normalfontsize = fontsize;
input %s ;
]]
-
local currentformat = "plain"
function luamplib.setformat (name)
currentformat = name
end
-
luamplib.codeinherit = false
local mplibinstances = {}
luamplib.instances = mplibinstances
local has_instancename = false
-
local function reporterror (result, prevlog)
if not result then
err("no result object returned")
@@ -316,7 +293,6 @@ local function reporterror (result, prevlog)
return log
end
end
-
if not math.initialseed then math.randomseed(currenttime) end
local function luamplibload (name)
local mpx = mplib.new {
@@ -344,7 +320,6 @@ local function luamplibload (name)
log = reporterror(result)
return mpx, result, log
end
-
local function process (data, instancename)
local currfmt
if instancename and instancename ~= "" then
@@ -385,20 +360,17 @@ local function process (data, instancename)
end
local pdfmode = tex.outputmode > 0
+
local catlatex = luatexbase.registernumber("catcodetable@latex")
local catat11 = luatexbase.registernumber("catcodetable@atletter")
-
local function run_tex_code (str, cat)
texruntoks(function() texsprint(cat or catlatex, str) end)
end
-
local texboxes = { globalid = 0, localid = 4096 }
local factor = 65536*(7227/7200)
-
local textext_fmt = 'image(addto currentpicture doublepath unitsquare \z
-xscaled %f yscaled %f shifted (0,-%f) \z
-withprescript "mplibtexboxid=%i:%f:%f")'
-
+ xscaled %f yscaled %f shifted (0,-%f) \z
+ withprescript "mplibtexboxid=%i:%f:%f")'
local function process_tex_text (str)
if str then
local global = (has_instancename or luamplib.globaltextext or luamplib.codeinherit)
@@ -436,7 +408,6 @@ local mplibcolorfmt = {
[[\color_select:n%s\endgroup]],
},
}
-
local colfmt = is_defined'color_select:n' and "l3color" or "xcolor"
if colfmt == "l3color" then
run_tex_code{
@@ -450,7 +421,6 @@ if colfmt == "l3color" then
}
end
local ccexplat = luatexbase.registernumber"luamplibcctabexplat"
-
local function process_color (str)
if str then
if not str:find("%b{}") then
@@ -501,14 +471,12 @@ end
local tex_code_pre_mplib = {}
luamplib.figid = 1
luamplib.in_the_fig = false
-
local function process_verbatimtex_prefig (str)
if str then
tex_code_pre_mplib[luamplib.figid] = str
end
return ""
end
-
local function process_verbatimtex_infig (str)
if str then
return format('special "postmplibverbtex=%s";', str)
@@ -530,7 +498,6 @@ local mp = mp
mp.mf_path_reset = mp.mf_path_reset or function() end
mp.mf_finish_saving_data = mp.mf_finish_saving_data or function() end
mp.report = mp.report or info
-
catcodes = catcodes or {}
local catcodes = catcodes
catcodes.numbers = catcodes.numbers or {}
@@ -559,7 +526,6 @@ local function mpprint(buffer,...)
end
end
end
-
function luamplib.runscript (code)
local id, str = code:match("(.-){(.*)}")
if id and str then
@@ -594,9 +560,7 @@ local function protecttexcontents (str)
:gsub("%zPerCent%z", "\\%%")
:gsub("%s+", " ")
end
-
luamplib.legacyverbatimtex = true
-
function luamplib.maketext (str, what)
if str and str ~= "" then
str = protecttexcontents(str)
@@ -623,10 +587,10 @@ function luamplib.maketext (str, what)
end
local function colorsplit (res)
- local t, tt = { }, res:gsub("[%[%]]",""):explode()
+ local t, tt = { }, res:gsub("[%[%]]","",2):explode()
local be = tt[1]:find"^%d" and 1 or 2
for i=be, #tt do
- if tt[i]:find"^%a" then break end
+ if not tonumber(tt[i]) then break end
t[#t+1] = tt[i]
end
return t
@@ -673,7 +637,9 @@ luamplib.shadecolor = function (str)
return colorsplit(res)
end
-local running = -1073741824
+local decimals = "%.%d+"
+local function rmzeros(str) return str:gsub("%.?0+$","") end
+
local emboldenfonts = { }
local function getemboldenwidth (curr, fakebold)
local width = emboldenfonts.width
@@ -706,13 +672,14 @@ local function getrulewhatsit (line, wd, ht, dp)
fmt = "pdf:content "..fmt
pl = node.new("whatsit","special")
end
- pl.data = fmt:format(line, 0, -dp, wd, ht+dp, "B")
+ pl.data = fmt:format(line, 0, -dp, wd, ht+dp, "B") :gsub(decimals,rmzeros)
local ss = node.new"glue"
node.setglue(ss, 0, 65536, 65536, 2, 2)
pl.next = ss
return pl
end
local function getrulemetric (box, curr, bp)
+ local running = -1073741824
local wd,ht,dp = curr.width, curr.height, curr.depth
wd = wd == running and box.width or wd
ht = ht == running and box.height or ht
@@ -764,7 +731,8 @@ local function embolden (box, curr, fakebold)
head, curr = node.remove(head, curr)
elseif curr.id == node.id"glyph" and curr.font > 0 then
local f = curr.font
- local i = emboldenfonts[f]
+ local key = format("%s:%s",f,fakebold)
+ local i = emboldenfonts[key]
if not i then
local ft = font.getfont(f) or font.getcopy(f)
if pdfmode then
@@ -780,7 +748,7 @@ local function embolden (box, curr, fakebold)
name = format('%s;embolden=%s;',name,fakebold)
_, i = fonts.constructors.readanddefine(name,ft.size)
end
- emboldenfonts[f] = i
+ emboldenfonts[key] = i
end
curr.font = i
end
@@ -792,6 +760,9 @@ end
local function graphictextcolor (col, filldraw)
if col:find"^[%d%.:]+$" then
col = col:explode":"
+ for i=1,#col do
+ col[i] = format("%.3f", col[i])
+ end
if pdfmode then
local op = #col == 4 and "k" or #col == 3 and "rg" or "g"
col[#col+1] = filldraw == "fill" and op or op:upper()
@@ -981,7 +952,7 @@ function luamplib.glyph (f, c)
end
local rulefmt = "mpliboutlinepic[%i]:=image(addto currentpicture contour \z
-unitsquare shifted - center unitsquare;) xscaled %f yscaled %f shifted (%f,%f);"
+ unitsquare shifted - center unitsquare;) xscaled %f yscaled %f shifted (%f,%f);"
local outline_horz, outline_vert
function outline_vert (res, box, curr, xshift, yshift)
local b2u = box.dir == "LTL"
@@ -1403,7 +1374,13 @@ vardef mpliboutlinetext@# (expr t) text rest =
) mplib_do_outline_options_r; )
enddef ;
primarydef t withpattern p =
- image( fill t withprescript "mplibpattern=" & if numeric p: decimal fi p; )
+ image(
+ if cycle t:
+ fill
+ else:
+ draw
+ fi
+ t withprescript "mplibpattern=" & if numeric p: decimal fi p; )
enddef;
vardef mplibtransformmatrix (text e) =
save t; transform t;
@@ -1418,12 +1395,20 @@ vardef mplibtransformmatrix (text e) =
& "}");
enddef;
primarydef p withfademethod s =
- p withprescript "mplibfadetype=" & 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
+ decimal (xpart llcorner p -1/4) & ":" &
+ decimal (ypart llcorner p -1/4) & ":" &
+ decimal (xpart urcorner p +1/4) & ":" &
+ decimal (ypart urcorner p +1/4)
enddef;
def withfadeopacity (expr a,b) =
withprescript "mplibfadeopacity=" &
@@ -1450,6 +1435,34 @@ def withfadebbox (expr a,b) =
decimal xpart b & ":" &
decimal ypart b
enddef;
+primarydef p asgroup s =
+ image(
+ draw center p
+ withprescript "mplibgroupbbox=" &
+ decimal (xpart llcorner p -1/4) & ":" &
+ decimal (ypart llcorner p -1/4) & ":" &
+ decimal (xpart urcorner p +1/4) & ":" &
+ decimal (ypart urcorner p +1/4)
+ withprescript "gr_state=start"
+ withprescript "gr_type=" & s;
+ draw p;
+ draw center p withprescript "gr_state=stop";
+ )
+enddef;
+def withgroupbbox (expr a,b) =
+ withprescript "mplibgroupbbox=" &
+ decimal xpart a & ":" &
+ decimal ypart a & ":" &
+ decimal xpart b & ":" &
+ decimal ypart b
+enddef;
+def withgroupname expr s =
+ withprescript "mplibgroupname=" & s
+enddef;
+def usemplibgroup primary s =
+ draw maketext("\usemplibgroup{" & s & "}")
+ shifted runscript("return luamplib.trgroupshifts['" & s & "']")
+enddef;
]],
legacyverbatimtex = [[
def specialVerbatimTeX (text t) = runscript("luamplibprefig{"&t&"}") enddef;
@@ -1475,7 +1488,6 @@ enddef;
}
luamplib.verbatiminput = false
-
local function protect_expansion (str)
if str then
str = str:gsub("\\","!!!Control!!!")
@@ -1486,7 +1498,6 @@ local function protect_expansion (str)
return format("\\unexpanded{%s}",str)
end
end
-
local function unprotect_expansion (str)
if str then
return str:gsub("!!!Control!!!", "\\")
@@ -1496,22 +1507,17 @@ local function unprotect_expansion (str)
:gsub("!!!RBrace!!!", "}")
end
end
-
luamplib.everymplib = setmetatable({ [""] = "" },{ __index = function(t) return t[""] end })
luamplib.everyendmplib = setmetatable({ [""] = "" },{ __index = function(t) return t[""] end })
-
function luamplib.process_mplibcode (data, instancename)
texboxes.localid = 4096
-
if luamplib.legacyverbatimtex then
luamplib.figid, tex_code_pre_mplib = 1, {}
end
-
local everymplib = luamplib.everymplib[instancename]
local everyendmplib = luamplib.everyendmplib[instancename]
data = format("\n%s\n%s\n%s\n",everymplib, data, everyendmplib)
:gsub("\r","\n")
-
if luamplib.verbatiminput then
data = data:gsub("\\mpcolor%s+(.-%b{})","mplibcolor(\"%1\")")
:gsub("\\mpdim%s+(%b{})", "mplibdimen(\"%1\")")
@@ -1540,25 +1546,15 @@ function luamplib.process_mplibcode (data, instancename)
return format("verbatimtex %s etex", unprotect_expansion(str))
end)
end
-
process(data, instancename)
end
-local further_split_keys = {
- mplibtexboxid = true,
- sh_color_a = true,
- sh_color_b = true,
-}
local function script2table(s)
local t = {}
for _,i in ipairs(s:explode("\13+")) do
local k,v = i:match("(.-)=(.*)") -- v may contain = or empty.
if k and v and k ~= "" and not t[k] then
- if further_split_keys[k] or further_split_keys[k:sub(1,10)] then
- t[k] = v:explode(":")
- else
- t[k] = v
- end
+ t[k] = v
end
end
return t
@@ -1568,36 +1564,24 @@ local figcontents = { post = { } }
local function put2output(a,...)
figcontents[#figcontents+1] = type(a) == "string" and format(a,...) or a
end
-
local function pdf_startfigure(n,llx,lly,urx,ury)
put2output("\\mplibstarttoPDF{%f}{%f}{%f}{%f}",llx,lly,urx,ury)
end
-
local function pdf_stopfigure()
put2output("\\mplibstoptoPDF")
end
-
-local function pdf_literalcode (fmt,...)
- put2output{-2, format(fmt,...)}
-end
-
-local function start_pdf_code()
- if pdfmode then
- pdf_literalcode("q")
- else
- put2output"\\special{pdf:bcontent}"
- end
-end
-local function stop_pdf_code()
- if pdfmode then
- pdf_literalcode("Q")
- else
- put2output"\\special{pdf:econtent}"
- end
+local function pdf_literalcode (...)
+ put2output{ -2, format(...) :gsub(decimals,rmzeros) }
end
+local start_pdf_code = pdfmode
+ and function() pdf_literalcode"q" end
+ or function() put2output"\\special{pdf:bcontent}" end
+local stop_pdf_code = pdfmode
+ and function() pdf_literalcode"Q" end
+ or function() put2output"\\special{pdf:econtent}" end
local function put_tex_boxes (object,prescript)
- local box = prescript.mplibtexboxid
+ local box = prescript.mplibtexboxid:explode":"
local n,tw,th = box[1],tonumber(box[2]),tonumber(box[3])
if n and tw and th then
local op = object.path
@@ -1653,7 +1637,6 @@ local pdfobjs, pdfetcs = {}, {}
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, stream)
local key = os
if stream then key = key..stream end
@@ -1680,7 +1663,6 @@ local function update_pdfobjs (os, stream)
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
local getpageres = pdfetcs.getpageres
@@ -1716,11 +1698,20 @@ if pdfmode then
end
else
texsprint {
+ "\\luamplibatfirstshipout{",
"\\special{pdf:obj @MPlibTr<<>>}",
"\\special{pdf:obj @MPlibSh<<>>}",
"\\special{pdf:obj @MPlibCS<<>>}",
- "\\special{pdf:obj @MPlibPt<<>>}",
+ "\\special{pdf:obj @MPlibPt<<>>}}",
}
+ pdfetcs.resadded = { }
+ pdfetcs.fallback_update_resources = function (name,res,obj)
+ texsprint{"\\special{pdf:put ", obj, " <<", res, ">>}"}
+ if not pdfetcs.resadded[name] then
+ texsprint{"\\luamplibateveryshipout{\\special{pdf:put @resources <</", name, " ", obj, ">>}}"}
+ pdfetcs.resadded[name] = obj
+ end
+ end
end
local transparancy_modes = { [0] = "Normal",
@@ -1742,77 +1733,84 @@ local function add_extgs_resources (on, new)
local tr = format("/%s %s", key, val)
if is_defined(pdfetcs.pgfextgs) then
texsprint { "\\csname ", pdfetcs.pgfextgs, "\\endcsname{", tr, "}" }
- elseif pdfmode then
- if is_defined"TRP@list" then
- texsprint(catat11,{
- [[\if@filesw\immediate\write\@auxout{]],
- [[\string\g@addto@macro\string\TRP@list{]],
- tr,
- [[}}\fi]],
- })
- if not get_macro"TRP@list":find(tr) then
- texsprint(catat11,[[\global\TRP@reruntrue]])
- end
- else
- pdfetcs.fallback_update_resources("ExtGState", tr)
+ elseif is_defined"TRP@list" then
+ texsprint(catat11,{
+ [[\if@filesw\immediate\write\@auxout{]],
+ [[\string\g@addto@macro\string\TRP@list{]],
+ tr,
+ [[}}\fi]],
+ })
+ if not get_macro"TRP@list":find(tr) then
+ texsprint(catat11,[[\global\TRP@reruntrue]])
end
else
- texsprint { "\\special{pdf:put @MPlibTr<<", tr, ">>}" }
+ pdfetcs.fallback_update_resources("ExtGState",tr,"@MPlibTr")
end
end
end
- if not pdfmode and not pdfmanagement and not is_defined(pdfetcs.pgfextgs) then
- texsprint"\\special{pdf:put @resources <</ExtGState @MPlibTr>>}"
- end
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 on
if opaq then
+ local key, on, os, new
local mode = prescript.tr_alternative or 1
- mode = transparancy_modes[tonumber(mode)]
- local os, new = format("<</BM /%s/ca %.3f/CA %.3f/AIS false>>",mode,opaq,opaq)
- on, new = update_pdfobjs(os)
- local key = add_extgs_resources(on,new)
- start_pdf_code()
- pdf_literalcode("/%s gs",key)
+ mode = transparancy_modes[tonumber(mode)] or mode
+ opaq = format("%.3f", opaq) :gsub(decimals,rmzeros)
+ for i,v in ipairs{ {mode,opaq},{"Normal",1} } do
+ os = format("<</BM/%s/ca %s/CA %s/AIS false>>",v[1],v[2],v[2])
+ 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 on
end
local function sh_pdfpageresources(shtype,domain,colorspace,ca,cb,coordinates,steps,fractions)
- local fun2fmt,os = "<</FunctionType 2/Domain [%s]/C0 [%s]/C1 [%s]/N 1>>"
+ for _,v in ipairs{ca,cb} do
+ for i,vv in ipairs(v) do
+ for ii,vvv in ipairs(vv) do
+ v[i][ii] = tonumber(vvv) and format("%.3f",vvv) or vvv
+ end
+ end
+ end
+ local fun2fmt,os = "<</FunctionType 2/Domain[%s]/C0[%s]/C1[%s]/N 1>>"
if steps > 1 then
local list,bounds,encode = { },{ },{ }
for i=1,steps do
if i < steps then
- bounds[i] = fractions[i] or 1
+ bounds[i] = format("%.3f", fractions[i] or 1)
end
encode[2*i-1] = 0
encode[2*i] = 1
os = fun2fmt:format(domain,tableconcat(ca[i],' '),tableconcat(cb[i],' '))
+ :gsub(decimals,rmzeros)
list[i] = format(pdfetcs.resfmt, update_pdfobjs(os))
end
os = tableconcat {
"<</FunctionType 3",
- format("/Bounds [%s]", tableconcat(bounds,' ')),
- format("/Encode [%s]", tableconcat(encode,' ')),
- format("/Functions [%s]", tableconcat(list, ' ')),
- format("/Domain [%s]>>", domain),
- }
+ format("/Bounds[%s]", tableconcat(bounds,' ')),
+ format("/Encode[%s]", tableconcat(encode,' ')),
+ format("/Functions[%s]", tableconcat(list, ' ')),
+ format("/Domain[%s]>>", domain),
+ } :gsub(decimals,rmzeros)
else
os = fun2fmt:format(domain,tableconcat(ca[1],' '),tableconcat(cb[1],' '))
+ :gsub(decimals,rmzeros)
end
local objref = format(pdfetcs.resfmt, update_pdfobjs(os))
os = tableconcat {
format("<</ShadingType %i", shtype),
format("/ColorSpace %s", colorspace),
format("/Function %s", objref),
- format("/Coords [%s]", coordinates),
- "/Extend [true true]/AntiAlias true>>",
- }
+ format("/Coords[%s]", coordinates),
+ "/Extend[true true]/AntiAlias true>>",
+ } :gsub(decimals,rmzeros)
local on, new = update_pdfobjs(os)
if new then
local key, val = format("MPlibSh%s", on), format(pdfetcs.resfmt, on)
@@ -1822,19 +1820,11 @@ local function sh_pdfpageresources(shtype,domain,colorspace,ca,cb,coordinates,st
}
else
local res = format("/%s %s", key, val)
- if pdfmode then
- pdfetcs.fallback_update_resources("Shading", res)
- else
- texsprint { "\\special{pdf:put @MPlibSh<<", res, ">>}" }
- end
+ pdfetcs.fallback_update_resources("Shading",res,"@MPlibSh")
end
end
- if not pdfmode and not pdfmanagement then
- texsprint"\\special{pdf:put @resources <</Shading @MPlibSh>>}"
- end
return on
end
-
local function color_normalize(ca,cb)
if #cb == 1 then
if #ca == 4 then
@@ -1846,7 +1836,6 @@ local function color_normalize(ca,cb)
cb[1], cb[2], cb[3], cb[4] = 1-cb[1], 1-cb[2], 1-cb[3], 0
end
end
-
pdfetcs.clrspcs = setmetatable({ }, { __index = function(t,names)
run_tex_code({
[[\color_model_new:nnn]],
@@ -1858,7 +1847,6 @@ pdfetcs.clrspcs = setmetatable({ }, { __index = function(t,names)
t[names] = colorspace
return colorspace
end })
-
local function do_preobj_SH(object,prescript)
local shade_no
local sh_type = prescript and prescript.sh_type
@@ -1866,14 +1854,14 @@ local function do_preobj_SH(object,prescript)
return
else
local domain = prescript.sh_domain or "0 1"
- local centera = prescript.sh_center_a or "0 0"; centera = centera:explode()
- local centerb = prescript.sh_center_b or "0 0"; centerb = centerb:explode()
+ local centera = (prescript.sh_center_a or "0 0"):explode()
+ local centerb = (prescript.sh_center_b or "0 0"):explode()
local transform = prescript.sh_transform == "yes"
local sx,sy,sr,dx,dy = 1,1,1,0,0
if transform then
- local first = prescript.sh_first or "0 0"; first = first:explode()
- local setx = prescript.sh_set_x or "0 0"; setx = setx:explode()
- local sety = prescript.sh_set_y or "0 0"; sety = sety:explode()
+ local first = (prescript.sh_first or "0 0"):explode()
+ local setx = (prescript.sh_set_x or "0 0"):explode()
+ local sety = (prescript.sh_set_y or "0 0"):explode()
local x,y = tonumber(setx[1]) or 0, tonumber(sety[1]) or 0
if x ~= 0 and y ~= 0 then
local path = object.path
@@ -1895,15 +1883,15 @@ local function do_preobj_SH(object,prescript)
end
end
local ca, cb, colorspace, steps, fractions
- ca = { prescript.sh_color_a_1 or prescript.sh_color_a or {0} }
- cb = { prescript.sh_color_b_1 or prescript.sh_color_b or {1} }
+ ca = { (prescript.sh_color_a_1 or prescript.sh_color_a or "0"):explode":" }
+ cb = { (prescript.sh_color_b_1 or prescript.sh_color_b or "1"):explode":" }
steps = tonumber(prescript.sh_step) or 1
if steps > 1 then
fractions = { prescript.sh_fraction_1 or 0 }
for i=2,steps do
fractions[i] = prescript[format("sh_fraction_%i",i)] or (i/steps)
- ca[i] = prescript[format("sh_color_a_%i",i)] or {0}
- cb[i] = prescript[format("sh_color_b_%i",i)] or {1}
+ ca[i] = (prescript[format("sh_color_a_%i",i)] or "0"):explode":"
+ cb[i] = (prescript[format("sh_color_b_%i",i)] or "1"):explode":"
end
end
if prescript.mplib_spotcolor then
@@ -1970,49 +1958,20 @@ local function do_preobj_SH(object,prescript)
else
err"unknown shading type"
end
- pdf_literalcode("q /Pattern cs")
end
return shade_no
end
pdfetcs.patterns = { }
-local patterns = pdfetcs.patterns
-function luamplib.registerpattern ( boxid, name, opts )
- local box = texgetbox(boxid)
- local wd = format("%.3f",box.width/factor)
- local hd = format("%.3f",(box.height+box.depth)/factor)
- info("w/h/d of '%s': %s %s 0.0", name, wd, hd)
- if opts.xstep == 0 then opts.xstep = nil end
- if opts.ystep == 0 then opts.ystep = nil end
- if opts.colored == nil then
- opts.colored = opts.coloured
- if opts.colored == nil then
- opts.colored = true
- end
- end
- if type(opts.matrix) == "table" then opts.matrix = tableconcat(opts.matrix," ") end
- if type(opts.bbox) == "table" then opts.bbox = tableconcat(opts.bbox," ") end
- if opts.matrix and opts.matrix:find"%a" then
- local data = format("mplibtransformmatrix(%s);",opts.matrix)
- process(data,"@mplibtransformmatrix")
- local t = luamplib.transformmatrix
- opts.matrix = format("%s %s %s %s", t[1], t[2], t[3], t[4])
- opts.xshift = opts.xshift or t[5]
- opts.yshift = opts.yshift or t[6]
+local function gather_resources (optres)
+ local t, do_pattern = { }, not optres
+ local names = {"ExtGState","ColorSpace","Shading"}
+ if do_pattern then
+ names[#names+1] = "Pattern"
end
- local attr = {
- "/Type/Pattern",
- "/PatternType 1",
- format("/PaintType %i", opts.colored and 1 or 2),
- "/TilingType 2",
- format("/XStep %s", opts.xstep or wd),
- 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),
- }
if pdfmode then
- local optres, t = opts.resources or "", { }
if pdfmanagement then
- for _,v in ipairs{"ExtGState","ColorSpace","Shading"} do
+ 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))
@@ -2021,26 +1980,19 @@ function luamplib.registerpattern ( boxid, name, opts )
else
local res = pdfetcs.getpageres() or ""
run_tex_code[[\mplibtmptoks\expandafter{\the\pdfvariable pageresources}]]
- res = (res .. texgettoks'mplibtmptoks'):explode()
- res = tableconcat(res," "):explode"/+"
+ res = res .. texgettoks'mplibtmptoks'
+ if do_pattern then return res end
+ res = res:explode"/+"
for _,v in ipairs(res) do
+ v = v:match"^%s*(.-)%s*$"
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
- local index = tex.saveboxresource(boxid, tableconcat(attr), optres, true, opts.bbox and 4 or 1)
- patterns[name] = { id = index, colored = opts.colored }
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
+ 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 {
@@ -2056,24 +2008,81 @@ function luamplib.registerpattern ( boxid, name, opts )
"\\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'
+ else
+ 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 tableconcat(t)
+end
+function luamplib.registerpattern ( boxid, name, opts )
+ local box = texgetbox(boxid)
+ local wd = format("%.3f",box.width/factor)
+ local hd = format("%.3f",(box.height+box.depth)/factor)
+ info("w/h/d of pattern '%s': %s 0", name, format("%s %s",wd, hd):gsub(decimals,rmzeros))
+ if opts.xstep == 0 then opts.xstep = nil end
+ if opts.ystep == 0 then opts.ystep = nil end
+ if opts.colored == nil then
+ opts.colored = opts.coloured
+ if opts.colored == nil then
+ opts.colored = true
+ end
+ end
+ if type(opts.matrix) == "table" then opts.matrix = tableconcat(opts.matrix," ") end
+ if type(opts.bbox) == "table" then opts.bbox = tableconcat(opts.bbox," ") end
+ if opts.matrix and opts.matrix:find"%a" then
+ local data = format("mplibtransformmatrix(%s);",opts.matrix)
+ process(data,"@mplibtransformmatrix")
+ local t = luamplib.transformmatrix
+ opts.matrix = format("%f %f %f %f", t[1], t[2], t[3], t[4])
+ opts.xshift = opts.xshift or format("%f",t[5])
+ opts.yshift = opts.yshift or format("%f",t[6])
+ end
+ local attr = {
+ "/Type/Pattern",
+ "/PatternType 1",
+ format("/PaintType %i", opts.colored and 1 or 2),
+ "/TilingType 2",
+ format("/XStep %s", opts.xstep or wd),
+ 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 ""
+ optres = optres .. gather_resources(optres)
+ local patterns = pdfetcs.patterns
+ if pdfmode then
+ if opts.bbox then
+ attr[#attr+1] = format("/BBox[%s]", opts.bbox)
end
- optres = optres .. tableconcat(t)
+ attr = tableconcat(attr) :gsub(decimals,rmzeros)
+ local index = tex.saveboxresource(boxid, attr, optres, true, opts.bbox and 4 or 1)
+ patterns[name] = { id = index, colored = opts.colored }
+ else
+ local cnt = #patterns + 1
+ local objname = "@mplibpattern" .. cnt
+ local metric = format("bbox %s", opts.bbox or format("0 0 %s %s",wd,hd))
texsprint {
- [[\ifvmode\nointerlineskip\fi]],
- format([[\hbox to0pt{\vbox to0pt{\hsize=\wd %i\vss\noindent]], boxid), -- force horiz mode?
- [[\special{pdf:bcontent}]],
- [[\special{pdf:bxobj ]], objname, format(" %s}", metric),
- format([[\raise\dp %i\box %i]], boxid, boxid),
- format([[\special{pdf:put @resources <<%s>>}]], optres),
- [[\special{pdf:exobj <<]], tableconcat(attr), ">>}",
- [[\special{pdf:econtent}]],
- [[\par}\hss}]],
+ "\\expandafter\\newbox\\csname luamplib.patternbox.", cnt, "\\endcsname",
+ "\\global\\setbox\\csname luamplib.patternbox.", cnt, "\\endcsname",
+ "\\hbox{\\unhbox ", boxid, "}\\luamplibatnextshipout{",
+ "\\special{pdf:bcontent}",
+ "\\special{pdf:bxobj ", objname, " ", metric, "}",
+ "\\raise\\dp\\csname luamplib.patternbox.", cnt, "\\endcsname",
+ "\\box\\csname luamplib.patternbox.", cnt, "\\endcsname",
+ "\\special{pdf:put @resources <<", optres, ">>}",
+ "\\special{pdf:exobj <<", tableconcat(attr), ">>}",
+ "\\special{pdf:econtent}}",
}
- patterns[#patterns+1] = objname
- patterns[name] = { id = #patterns, colored = opts.colored }
+ patterns[cnt] = objname
+ patterns[name] = { id = cnt, colored = opts.colored }
end
end
local function pattern_colorspace (cs)
@@ -2088,21 +2097,17 @@ local function pattern_colorspace (cs)
local res = format("/%s %s", key, val)
if is_defined(pdfetcs.pgfcolorspace) then
texsprint { "\\csname ", pdfetcs.pgfcolorspace, "\\endcsname{", res, "}" }
- elseif pdfmode then
- pdfetcs.fallback_update_resources("ColorSpace", res)
else
- texsprint { "\\special{pdf:put @MPlibCS<<", res, ">>}" }
+ pdfetcs.fallback_update_resources("ColorSpace",res,"@MPlibCS")
end
end
end
- if not pdfmode and not pdfmanagement and not is_defined(pdfetcs.pgfcolorspace) then
- texsprint"\\special{pdf:put @resources <</ColorSpace @MPlibCS>>}"
- end
return on
end
local function do_preobj_PAT(object, prescript)
local name = prescript and prescript.mplibpattern
if not name then return end
+ local patterns = pdfetcs.patterns
local patt = patterns[name]
local index = patt and patt.id or err("cannot get pattern object '%s'", name)
local key = format("MPlibPt%s",index)
@@ -2142,35 +2147,37 @@ local function do_preobj_PAT(object, prescript)
local res = format("/%s %s", key, val)
if is_defined(pdfetcs.pgfpattern) then
texsprint { "\\csname ", pdfetcs.pgfpattern, "\\endcsname{", res, "}" }
- elseif pdfmode then
- pdfetcs.fallback_update_resources("Pattern", res)
else
- texsprint { "\\special{pdf:put @MPlibPt<<", res, ">>}" }
+ pdfetcs.fallback_update_resources("Pattern",res,"@MPlibPt")
end
end
end
- if not pdfmode and not pdfmanagement and not is_defined(pdfetcs.pgfpattern) then
- texsprint"\\special{pdf:put @resources <</Pattern @MPlibPt>>}"
- end
patt.done = true
end
+pdfetcs.fading = { }
local function do_preobj_FADE (object, prescript)
- if object.postscript == "collect" then return end
local fd_type = prescript and prescript.mplibfadetype
- if not fd_type then return end
+ 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 width, height = bbox[3]-bbox[1], bbox[4]-bbox[2]
- local vec = prescript.mplibfadevector
- vec = vec and vec:explode":"
- or fd_type == "linear" and {bbox[1], bbox[2], bbox[3], bbox[2]} -- left to right
- or {width/2, height/2, width/2, height/2} -- center for both circles
local dx, dy = -bbox[1], -bbox[2]
- bbox = format("0 0 %f %f", bbox[3]+dx, bbox[4]+dy)
+ 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])
@@ -2184,25 +2191,155 @@ local function do_preobj_FADE (object, prescript)
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)
+ bbox = format("0 0 %f %f", bbox[3]+dx, bbox[4]+dy)
local streamtext = format("q /Pattern cs/MPlibFd%s scn %s re f Q", on, bbox)
+ :gsub(decimals,rmzeros)
os = format("<</Pattern<</MPlibFd%s %s>>>>", on, format(pdfetcs.resfmt, on))
on = update_pdfobjs(os)
- local resources = "/Resources " .. format(pdfetcs.resfmt, on)
+ local 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,
+ "/BBox[", bbox, "]",
+ "/Matrix[1 0 0 1 ", format("%f %f", -dx,-dy), "]",
+ "/Resources ", resources,
"/Group ", format(pdfetcs.resfmt, on),
- }
+ } :gsub(decimals,rmzeros)
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)
- return on
+ if fd_stop then return "standalone" end
+ return "start"
+end
+
+pdfetcs.tr_group = { shifts = { } }
+luamplib.trgroupshifts = pdfetcs.tr_group.shifts
+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.name = prescript.mplibgroupname or "lastmplibgroup"
+ trgroup.isolated, trgroup.knockout = false, false
+ for _,v in ipairs(prescript.gr_type:explode",+") do
+ trgroup[v] = true
+ end
+ trgroup.bbox = prescript.mplibgroupbbox:explode":"
+ put2output[[\begingroup\setbox\mplibscratchbox\hbox\bgroup]]
+ elseif grstate == "stop" then
+ local llx,lly,urx,ury = tableunpack(trgroup.bbox)
+ put2output(tableconcat{
+ "\\egroup",
+ format("\\wd\\mplibscratchbox %fbp", urx-llx),
+ format("\\ht\\mplibscratchbox %fbp", ury-lly),
+ "\\dp\\mplibscratchbox 0pt",
+ })
+ local grattr = format("/Group<</S/Transparency/I %s/K %s>>",trgroup.isolated,trgroup.knockout)
+ local res = gather_resources()
+ local bbox = format("%f %f %f %f", llx,lly,urx,ury) :gsub(decimals,rmzeros)
+ if pdfmode then
+ put2output(tableconcat{
+ "\\saveboxresource type 2 attr{/Type/XObject/Subtype/Form/FormType 1",
+ "/BBox[", bbox, "]", grattr, "} resources{", res, "}\\mplibscratchbox",
+ [[\setbox\mplibscratchbox\hbox{\useboxresource\lastsavedboxresourceindex}]],
+ [[\wd\mplibscratchbox 0pt\ht\mplibscratchbox 0pt\dp\mplibscratchbox 0pt]],
+ [[\box\mplibscratchbox\endgroup]],
+ "\\expandafter\\xdef\\csname luamplib.group.", trgroup.name, "\\endcsname{",
+ "\\noexpand\\mplibstarttoPDF{",llx,"}{",lly,"}{",urx,"}{",ury,"}",
+ "\\useboxresource \\the\\lastsavedboxresourceindex\\noexpand\\mplibstoptoPDF}",
+ })
+ else
+ trgroup.cnt = (trgroup.cnt or 0) + 1
+ local objname = format("@mplibtrgr%s", trgroup.cnt)
+ put2output(tableconcat{
+ "\\special{pdf:bxobj ", objname, " bbox ", bbox, "}",
+ "\\unhbox\\mplibscratchbox",
+ "\\special{pdf:put @resources <<", res, ">>}",
+ "\\special{pdf:exobj <<", grattr, ">>}",
+ "\\special{pdf:uxobj ", objname, "}\\endgroup",
+ })
+ token.set_macro("luamplib.group."..trgroup.name, tableconcat{
+ "\\mplibstarttoPDF{",llx,"}{",lly,"}{",urx,"}{",ury,"}",
+ "\\special{pdf:uxobj ", objname, "}\\mplibstoptoPDF",
+ }, "global")
+ end
+ trgroup.shifts[trgroup.name] = { llx, lly }
+ end
+ return grstate
+end
+function luamplib.registergroup (boxid, name, opts)
+ local box = texgetbox(boxid)
+ local wd, ht, dp = node.getwhd(box)
+ local res = (opts.resources or "") .. gather_resources()
+ local attr = { "/Type/XObject/Subtype/Form/FormType 1" }
+ if type(opts.matrix) == "table" then opts.matrix = tableconcat(opts.matrix," ") end
+ if type(opts.bbox) == "table" then opts.bbox = tableconcat(opts.bbox," ") end
+ if opts.matrix and opts.matrix:find"%a" then
+ local data = format("mplibtransformmatrix(%s);",opts.matrix)
+ process(data,"@mplibtransformmatrix")
+ opts.matrix = format("%f %f %f %f %f %f",tableunpack(luamplib.transformmatrix))
+ end
+ local grtype = 3
+ if opts.bbox then
+ attr[#attr+1] = format("/BBox[%s]", opts.bbox)
+ grtype = 2
+ end
+ if opts.matrix then
+ attr[#attr+1] = format("/Matrix[%s]", opts.matrix)
+ grtype = opts.bbox and 4 or 1
+ end
+ if opts.asgroup then
+ local t = { isolated = false, knockout = false }
+ for _,v in ipairs(opts.asgroup:explode",+") do t[v] = true end
+ attr[#attr+1] = format("/Group<</S/Transparency/I %s/K %s>>", t.isolated, t.knockout)
+ end
+ local trgroup = pdfetcs.tr_group
+ trgroup.shifts[name] = { get_macro'MPllx', get_macro'MPlly' }
+ local whd
+ if pdfmode then
+ attr = tableconcat(attr) :gsub(decimals,rmzeros)
+ local index = tex.saveboxresource(boxid, attr, res, true, grtype)
+ token.set_macro("luamplib.group."..name, "\\useboxresource "..index, "global")
+ whd = format("%.3f %.3f 0", wd/factor, (ht+dp)/factor) :gsub(decimals,rmzeros)
+ else
+ trgroup.cnt = (trgroup.cnt or 0) + 1
+ local objname = format("@mplibtrgr%s", trgroup.cnt)
+ texsprint {
+ "\\expandafter\\newbox\\csname luamplib.groupbox.", trgroup.cnt, "\\endcsname",
+ "\\global\\setbox\\csname luamplib.groupbox.", trgroup.cnt, "\\endcsname",
+ "\\hbox{\\unhbox ", boxid, "}\\luamplibatnextshipout{",
+ "\\special{pdf:bcontent}",
+ "\\special{pdf:bxobj ", objname, " width ", wd, "sp height ", ht, "sp depth ", dp, "sp}",
+ "\\unhbox\\csname luamplib.groupbox.", trgroup.cnt, "\\endcsname",
+ "\\special{pdf:put @resources <<", res, ">>}",
+ "\\special{pdf:exobj <<", tableconcat(attr), ">>}",
+ "\\special{pdf:econtent}}",
+ }
+ token.set_macro("luamplib.group."..name, tableconcat{
+ "\\begingroup\\setbox\\mplibscratchbox\\hbox{\\special{pdf:uxobj ", objname, "}}",
+ "\\wd\\mplibscratchbox ", wd, "sp",
+ "\\ht\\mplibscratchbox ", ht, "sp",
+ "\\dp\\mplibscratchbox ", dp, "sp",
+ "\\box\\mplibscratchbox\\endgroup",
+ }, "global")
+ whd = format("%.3f %.3f %.3f", wd/factor, ht/factor, dp/factor) :gsub(decimals,rmzeros)
+ end
+ info("w/h/d of group '%s': %s", name, whd)
+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)
@@ -2334,6 +2471,8 @@ function luamplib.flush (result,flusher)
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
+ local pattern_ = do_preobj_PAT(object,prescript) -- pattern
if prescript and prescript.mplibtexboxid then
put_tex_boxes(object,prescript)
elseif objecttype == "start_bounds" or objecttype == "stop_bounds" then --skip
@@ -2355,7 +2494,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
@@ -2379,8 +2518,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
@@ -2422,6 +2559,11 @@ function luamplib.flush (result,flusher)
objecttype = 'fill'
end
end
+ local shade_no = do_preobj_SH(object,prescript) -- shading
+ if shade_no then
+ pdf_literalcode"q /Pattern cs"
+ objecttype = false
+ end
if transformed then
start_pdf_code()
end
@@ -2442,18 +2584,16 @@ function luamplib.flush (result,flusher)
else
flushnormalpath(path,open)
end
- if not shade_no then -- conflict with shading
- if objecttype == "fill" then
- pdf_literalcode(evenodd and "h f*" or "h f")
- elseif objecttype == "outline" then
- if both then
- pdf_literalcode(evenodd and "h B*" or "h B")
- else
- pdf_literalcode(open and "S" or "h S")
- end
- elseif objecttype == "both" then
+ if objecttype == "fill" then
+ pdf_literalcode(evenodd and "h f*" or "h f")
+ elseif objecttype == "outline" then
+ if both then
pdf_literalcode(evenodd and "h B*" or "h B")
+ else
+ pdf_literalcode(open and "S" or "h S")
end
+ elseif objecttype == "both" then
+ pdf_literalcode(evenodd and "h B*" or "h B")
end
end
if transformed then
@@ -2493,18 +2633,25 @@ function luamplib.flush (result,flusher)
end
end
if shade_no then -- shading
- pdf_literalcode("W n /MPlibSh%s sh Q",shade_no)
+ pdf_literalcode("W%s n /MPlibSh%s sh Q",evenodd and "*" or "",shade_no)
end
end
end
- if fading_ then -- fading
- stop_pdf_code()
- 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 16b5906ad5f..f305eacd4e0 100644
--- a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
+++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
@@ -8,15 +8,24 @@
%%
%% See source file 'luamplib.dtx' for licencing and contact information.
%%
-\bgroup\expandafter\expandafter\expandafter\egroup
-\expandafter\ifx\csname selectfont\endcsname\relax
- \input ltluatex
-\else
+\ifcsname ProvidesPackage\endcsname
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luamplib}
- [2024/07/14 v2.33.1 mplib package for LuaTeX]
- \ifx\newluafunction\@undefined
+ [2024/08/03 v2.34.5 mplib package for LuaTeX]
+\fi
+\ifdefined\newluafunction\else
\input ltluatex
+\fi
+\ifnum\outputmode=0
+ \ifdefined\AddToHookNext
+ \def\luamplibatnextshipout{\AddToHookNext{shipout/background}}
+ \def\luamplibatfirstshipout{\AddToHook{shipout/firstpage}}
+ \def\luamplibateveryshipout{\AddToHook{shipout/background}}
+ \else
+ \input atbegshi.sty
+ \def\luamplibatnextshipout#1{\AtBeginShipoutNext{\AtBeginShipoutAddToBox{#1}}}
+ \let\luamplibatfirstshipout\AtBeginShipoutFirst
+ \def\luamplibateveryshipout#1{\AtBeginShipout{\AtBeginShipoutAddToBox{#1}}}
\fi
\fi
\directlua{require("luamplib")}
@@ -46,6 +55,35 @@
\catcode`\&=12 \catcode`\$=12 \catcode`\%=12 \catcode`\^^M=12
}
\def\mplibputtextbox#1{\vbox to 0pt{\vss\hbox to 0pt{\raise\dp#1\copy#1\hss}}}
+\protected\def\usemplibgroup#1{\csname luamplib.group.#1\endcsname}
+\protected\def\mplibgroup#1{%
+ \begingroup
+ \def\MPllx{0}\def\MPlly{0}%
+ \def\mplibgroupname{#1}%
+ \mplibgroupgetnexttok
+}
+\def\mplibgroupgetnexttok{\futurelet\nexttok\mplibgroupbranch}
+\def\mplibgroupskipspace{\afterassignment\mplibgroupgetnexttok\let\nexttok= }
+\def\mplibgroupbranch{%
+ \ifx [\nexttok
+ \expandafter\mplibgroupopts
+ \else
+ \ifx\mplibsptoken\nexttok
+ \expandafter\expandafter\expandafter\mplibgroupskipspace
+ \else
+ \let\mplibgroupoptions\empty
+ \expandafter\expandafter\expandafter\mplibgroupmain
+ \fi
+ \fi
+}
+\def\mplibgroupopts[#1]{\def\mplibgroupoptions{#1}\mplibgroupmain}
+\def\mplibgroupmain{\setbox\mplibscratchbox\hbox\bgroup\ignorespaces}
+\protected\def\endmplibgroup{\egroup
+ \directlua{ luamplib.registergroup(
+ \the\mplibscratchbox, '\mplibgroupname', {\mplibgroupoptions}
+ )}%
+ \endgroup
+}
{\def\:{\global\let\mplibsptoken= } \: }
\protected\def\mppattern#1{%
\begingroup
diff --git a/Master/texmf-dist/tex/plain/cweb/cwebacromac.tex b/Master/texmf-dist/tex/plain/cweb/cwebacromac.tex
index f8462d06a37..3e8baad77c1 100644
--- a/Master/texmf-dist/tex/plain/cweb/cwebacromac.tex
+++ b/Master/texmf-dist/tex/plain/cweb/cwebacromac.tex
@@ -1,6 +1,8 @@
% hypertext macros for CWEB listings (in addition to cwebmac.tex)
-% Version 2.0 --- May 2024
+% Used in cwebmac.tex, pdfctwimac.tex, pdfproofmac.tex
+% Version 3.0 --- August 2024
\ifx\ifacrohint\undefined\endinput\fi % these are not standalone macros
+
\ifluatex % LuaTeX is almost like pdfTeX
\protected\def\pdfliteral {\pdfextension literal}
\protected\def\pdfstartlink {\pdfextension startlink\space}
@@ -15,7 +17,6 @@
\let\pdfoutput=\outputmode
\fi % end of LuaTeX->pdfTeX redirection macros
-% Used in cwebmac.tex, pdfctwimac.tex, pdfproofmac.tex
\def\tocpages{1} % Most programs have one-page Table-of-Contents
\def\startpdf{\def\pagemode{/PageMode /UseOutlines}
\ifnum\contentspagenumber=0 \advance \pageno by -\tocpages
@@ -24,9 +25,53 @@
\else \twodigits=\pageno \pageno=\contentspagenumber
\advance \pageno by \tocpages \advance \twodigits by -\pageno
\def\pagelabels{/PageLabels << /Nums [ 0 << /S/D/St \the\pageno >>
- \the\twodigits << /S/D/St \contentspagenumber >> ] >>} \fi
+ \the\twodigits << /S/D/St \contentspagenumber >> ] >>}
+ \fi
\ifpdflua\pdfcatalog{\pagemode\space\pagelabels}
- \else \special{pdf: docview << \pagemode\space\pagelabels >>}\fi}
+ \else\special{pdf: docview << \pagemode\space\pagelabels >>}\fi}
+\ifacrohint\def\digits{\pdflink{\the\countA}\scan}
+\else\def\digits{{\the\countA}\scan}\fi
+\def\scan#1{\begingroup
+ \ifx!#1% exit on exclamation point
+ \else\ifx,#1,\space\aftergroup\scan % insert ,\space}\scan ...
+ \else\ifx\[#1\aftergroup#1% insert }\[...
+ \else\ifx\*#1\aftergroup\lapstar\aftergroup\scan % insert }\lapstar\scan ...
+ \else\ifnum`#1>`9#1\aftergroup\scan % insert #1}\scan ...
+ \else\ifnum`#1<`0#1\aftergroup\scan % insert #1}\scan ...
+ \else
+ \afterassignment\digits \aftergroup\countA
+ \aftergroup#1% insert }\countA=#1...\digits ...
+ \fi\fi\fi\fi\fi \fi
+ \endgroup}
+
+% Local variables; there are a few externals like '\toksA' and '\countA'
+\newtoks\toksB \newtoks\toksC \newtoks\toksD \newtoks\toksF \newtoks\sanitizer
+\newif\iftokprocessed \newif\ifTnum \newif\ifinstr \newif\ifhavenum
+
+\ifacrohint % Common macros for \ifacro and \ifhint to create \pdflink's
+\def\pdfnote#1.{\setbox0=\hbox{\toksA={#1.}\toksB={}\maketoks}\the\toksA}
+\def\firstsecno#1.{\setbox0=\hbox{\toksA={#1.}\toksB={}%
+ \def\makenote{\addtokens\toksB{\the\toksC}\def\makenote{\let\space\empty
+ \toksC={}\toksD={}}\makenote}\maketoks}}
+\def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
+\def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}%
+ \ifcat\noexpand\first0\countB=`#1\else\countB=0\fi}
+\def\maketoks{\expandafter\poptoks\the\toksA|ENDTOKS|%
+ \let\next=\maketoks % continue processing by default
+ \ifnum\countB>`9 \countB=0 \fi
+ \ifnum\countB<`0
+ \ifhavenum\makenote\fi
+ \ifx\first.\let\next=\maketoksdone % fullstop
+ \else \addtokens\toksB{\the\toksD} \ifx\first,\addtokens\toksB{\space}\fi
+ \fi
+ \else \addtokens\toksC{\the\toksD}\global\havenumtrue
+ \fi
+ \next
+}
+\def\makenote{\addtokens\toksB
+ {\noexpand\pdflink{\the\toksC}}\toksC={}\global\havenumfalse}
+\def\maketoksdone{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
+\fi % End of common pdf/hint macros
\ifacro % The following are general pdf macros
\def\thewidth{\the\wd0 \space}
@@ -34,13 +79,14 @@
\def\thedepth{\the\dp\strutbox\space}
\ifpdflua
\ifx\pdfannotlink\undefined\let\pdfannotlink\pdfstartlink\fi% for pdfTeX 0.14
- \def\pdflink#1#2{\hbox{\pdfannotlink height \theheight depth \thedepth
+ \def\pdflink#1{\hbox{\pdfannotlink height \theheight depth \thedepth
attr{/Border [0 0 0]} goto num #1 \Blue #1\Black\pdfendlink}} % changed 3.69
-\else\def\pdflink#1#2{\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}%
+\else\def\pdflink#1{\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}%
\special{pdf: ec}}\special{pdf: ann width \thewidth height \theheight
- depth \thedepth << /Type /Annot /Subtype /Link
- /Border [0 0 0] /A << /S /GoTo /D (#2) >> >>}\box0\relax}\fi
-\def\sanitizecommand#1#2{\addtokens\usersanitizer
+ depth \thedepth << /Type /Annot /Subtype /Link /Border [0 0 0]
+ /A << /S /GoTo /D (\romannumeral#1) >> >>}\box0\relax}
+\fi
+\def\sanitizecommand#1#2{\addtokens\sanitizer
{\noexpand\dosanitizecommand\noexpand#1{#2}}}
\def\dosanitizecommand#1#2{\ifx\nxt#1\addF{#2}\fi}
@@ -49,7 +95,8 @@
\catcode`\[=12 \catcode`\]=12 \catcode`\{=1 \catcode`\}=2
\catcode`\~=12 \def\tildechar{~} \catcode`\~=13
\catcode`\|=0 |catcode`|\=12 |def|bschar{\} |catcode`|\=0 \catcode`\|=12
-\def\makeoutlinetoks{\Tnumfalse\afterassignment\makeolproctok\let\nxt= }
+\def\makeoutlinetoks{\toksF={}\Tnumfalse
+ \afterassignment\makeolproctok\let\nxt= }
\def\makeolnexttok{\afterassignment\makeolproctok\let\nxt= }
\def\makeolgobbletok{\afterassignment\makeolnexttok\let\nxt= }
\def\addF#1{\addtokens\toksF{#1}\tokprocessedtrue}
@@ -64,7 +111,7 @@
\else\if\noexpand\nxt\relax % we have a control sequence; is it one we know?
\ifx\nxt~\addF\space
\else\ifx\nxt\onespace\addF\space
- \else\the\usersanitizer
+ \else\the\sanitizer
\iftokprocessed\else\makeolproctokctli
\iftokprocessed\else\makeolproctokctlii
\iftokprocessed\else\makeolproctokctliii % if not recognised, skip it
@@ -141,48 +188,19 @@
\fi\fi\fi\fi\fi
}
\def\outlinedone{\edef\outlinest{\global\noexpand\toksE={\the\toksF}}%
- \outlinest\let\outlinedone=\relax}
+ \outlinest\let\outlinedone=\relax\outlinedone}
\fi % End of pdf macros
\ifhint
-% The following uses HINT primitives to implement:
+% The following top level macros use HINT primitives to implement:
% \HINThome to mark the position of the home page
% \HINTlabel to attach a label to the top of a section
% \HINTlink to link a section number to the section label
% \HINTcontents to produce an 'outline' item
-% These are the top level HINT macros that are used in this file
-% No HINT primitives are used directly.
\def\HINThome{\HINTdest name {HINT.home}%
\HINToutline goto name {HINT.home} depth 1 {Table of Contents}}
\def\HINTlabel{{\let\*=\empty\HINTdest num \secstar top}}
-\def\HINTlink#1#2{\HINTstartlink goto num #1 {#1}\HINTendlink}% #2 not used ???
+\def\HINTlink#1{\HINTstartlink goto num #1 {#1}\HINTendlink}
\def\HINTcontents#1#2#3{\HINToutline goto num #3 depth #2 {#1}}
\let\pdflink=\HINTlink
\fi % End of HINT macros
-
-% Common macros for \ifacro and \ifhint
-\ifacrohint
-\def\pdfnote#1.{\setbox0=\hbox{\toksA={#1.}\toksB={}\maketoks}\the\toksA}
-\def\firstsecno#1.{\setbox0=\hbox{\toksA={#1.}\toksB={}%
- \def\makenote{\addtokens\toksB{\the\toksC}\def\makenote{\toksD={}
- \toksC={}\let\space\empty}\makenote}\maketoks}}
-\def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
-\def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}%
- \ifcat\noexpand\first0\countB=`#1\else\countB=0\fi\toksA={#2}}
-\def\maketoks{\expandafter\poptoks\the\toksA|ENDTOKS|%
- \ifnum\countB>`9 \countB=0 \fi
- \ifnum\countB<`0
- \ifnum0=\countC\else\makenote\fi
- \ifx\first.\let\next=\maketoksdone\else
- \let\next=\maketoks
- \addtokens\toksB{\the\toksD}
- \ifx\first,\addtokens\toksB{\space}\fi
- \fi
- \else \addtokens\toksC{\the\toksD}\global\countC=1\let\next=\maketoks
- \fi
- \next
-}
-\def\makenote{\addtokens\toksB
- {\noexpand\pdflink{\the\toksC}{\romannumeral\the\toksC}}\toksC={}\global\countC=0}
-\def\maketoksdone{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
-\fi % End of common macros
diff --git a/Master/texmf-dist/tex/plain/cweb/cwebbin/dcwebmac.tex b/Master/texmf-dist/tex/plain/cweb/cwebbin/dcwebmac.tex
index 09e222d3c3a..dd8b43bea93 100644
--- a/Master/texmf-dist/tex/plain/cweb/cwebbin/dcwebmac.tex
+++ b/Master/texmf-dist/tex/plain/cweb/cwebbin/dcwebmac.tex
@@ -28,7 +28,7 @@
% Version 3.64 [p21] --- Andreas Scherer, Octobre 2005
% Version 3.64 [p22] --- Andreas Scherer, March 2016
% Version 4.9 --- Andreas Scherer, June 2022
-% Version 4.12 --- Andreas Scherer, May 2024
+% Version 4.12 --- Andreas Scherer, August 2024
\ifx\undefined\botofcontents\input cwebmac.tex\fi
diff --git a/Master/texmf-dist/tex/plain/cweb/cwebbin/fcwebmac.tex b/Master/texmf-dist/tex/plain/cweb/cwebbin/fcwebmac.tex
index 82d67edb1a5..ff0c0b30bd9 100644
--- a/Master/texmf-dist/tex/plain/cweb/cwebbin/fcwebmac.tex
+++ b/Master/texmf-dist/tex/plain/cweb/cwebbin/fcwebmac.tex
@@ -28,7 +28,7 @@
% Version 3.64 [p21] --- Andreas Scherer, October 2005
% Version 3.64 [p22] --- Andreas Scherer, March 2016
% Version 4.9 --- Andreas Scherer, June 2022
-% Version 4.12 --- Andreas Scherer, May 2024
+% Version 4.12 --- Andreas Scherer, August 2024
% french translations --- Denis Roegel, 18 September 1994
diff --git a/Master/texmf-dist/tex/plain/cweb/cwebbin/icwebmac.tex b/Master/texmf-dist/tex/plain/cweb/cwebbin/icwebmac.tex
index 5f2e7d3a45a..cbb5696984e 100644
--- a/Master/texmf-dist/tex/plain/cweb/cwebbin/icwebmac.tex
+++ b/Master/texmf-dist/tex/plain/cweb/cwebbin/icwebmac.tex
@@ -28,7 +28,7 @@
% Version 3.64 [p21] --- Andreas Scherer, October 2005
% Version 3.64 [p22] --- Andreas Scherer, March 2016
% Version 4.9 --- Andreas Scherer, June 2022
-% Version 4.12 --- Andreas Scherer, May 2024
+% Version 4.12 --- Andreas Scherer, August 2024
\ifx\undefined\botofcontents\input cwebmac.tex\fi
@@ -73,7 +73,7 @@
\def\inx{\par\vskip6pt plus 1fil % we are beginning the index
\def\page{\box255 } \normalbottom
\write\cont{} % ensure that the contents file isn't empty
- \write\cont{\catcode `\noexpand\@=12\relax} % \makeatother
+ \write\cont{\catcode `\noexpand\@=12\relax} % \makeatother
\closeout\cont % the contents information has been fully gathered
\output{\ifpagesaved\normaloutput{\box\sbox}\lheader\rheader\fi
\global\setbox\sbox=\page \global\pagesavedtrue \mark{\topmark}}
@@ -82,9 +82,7 @@
\vsize=\pageheight \advance\vsize by -\ht\sbox % the remaining height
\hsize=.5\pagewidth \advance\hsize by -10pt
% column width for the index (20pt between cols)
- \ifhint\else
- \parfillskip 0pt plus .6\hsize % try to avoid almost empty lines
- \fi
+ \ifhint\else\parfillskip 0pt plus .6\hsize\fi % avoid almost empty lines
\def\lr{L} % this tells whether the left or right column is next
\output{\if L\lr\global\setbox\lbox=\page \gdef\lr{R}
\else\normaloutput{\vbox to\pageheight{\box\sbox\vss
@@ -93,9 +91,9 @@
\message{Indice Analitico:}
\parskip 0pt plus .5pt
\outer\def\I##1, ##2.{\par\hangindent2em\noindent##1:\kern1em
- \ifacrohint\pdfnote##2.\else##2\fi.} % index entry
- \def\[##1]{$\underline{##1}$} % underlined index item
- \rm \rightskip0pt plus 2.5em \tolerance 10000 \let\*=\lapstar
+ \scan##2!.} % index entry
+ \def\[##1]{$\underline{\scan##1!}$\scan} % underlined index item
+ \rm \rightskip0pt plus 2.5em \tolerance 10000
\hyphenpenalty 10000 \parindent0pt
\readindex}
\def\fin{\par\vfill\eject % this is done when we are ending the index
diff --git a/Master/texmf-dist/tex/plain/cweb/cwebbin/pdfctproofmac.tex b/Master/texmf-dist/tex/plain/cweb/cwebbin/pdfctproofmac.tex
index f41ad4d6334..4079d5f704b 100644
--- a/Master/texmf-dist/tex/plain/cweb/cwebbin/pdfctproofmac.tex
+++ b/Master/texmf-dist/tex/plain/cweb/cwebbin/pdfctproofmac.tex
@@ -1,5 +1,5 @@
% standard macros for CWEB listings (in addition to plain.tex)
-% Version 4.12 --- May 2024
+% Version 4.12 --- August 2024
% modified for proofs in CTWILL
% modified for PDF/HINT output with 'tex "\let\pdf+' or '{hi|lua|pdf|xe}tex'
% This file is not copyrighted and can be used freely.
@@ -14,15 +14,6 @@
\font\ninerm=cmr9
\let\mc=\ninerm % medium caps
-\def\CEE/{{\mc C\spacefactor1000}}
-\def\UNIX/{{\mc U\kern-.05emNIX\spacefactor1000}}
-\def\TEX/{\TeX}
-\def\CPLUSPLUS/{{\mc C\PP\spacefactor1000}}
-\def\Cee{\CEE/} % for backward compatibility
-\def\Cpp{\CPLUSPLUS/} % for backward compatibility
-\def\9#1{}
- % with this definition of \9 you can say @:sort key}{TeX code@>
- % to alphabetize an index entry by the sort key but format with the TeX code
\font\eightrm=cmr8
\let\sc=\eightrm % small caps (NOT a caps-and-small-caps font)
\let\mainfont=\tenrm
@@ -33,6 +24,16 @@
\font\tentex=cmtex10 % TeX extended character set (used in strings)
\fontdimen7\tentex=0pt % no double space after sentences
+\def\CEE/{{\mc C\spacefactor1000}}
+\def\UNIX/{{\mc U\kern-.05emNIX\spacefactor1000}}
+\def\TEX/{\TeX}
+\def\CPLUSPLUS/{{\mc C\PP\spacefactor1000}}
+\def\Cee{\CEE/} % for backward compatibility
+\def\Cpp{\CPLUSPLUS/} % for backward compatibility
+\def\9#1{}
+ % with this definition of \9 you can say @:sort key}{TeX code@>
+ % to alphabetize an index entry by the sort key but format with the TeX code
+
\def\\#1{\leavevmode\hbox{\it#1\/\kern.05em}} % italic type for identifiers
\def\|#1{\leavevmode\hbox{$#1$}} % one-letter identifiers look better this way
\def\&#1{\leavevmode\hbox{\bf
@@ -116,11 +117,9 @@
\def\note#1#2.{\Y\noindent{\hangindent2em%
\baselineskip10pt\eightrm#1~\ifacrohint{\pdfnote#2.}\else#2\fi.\par}}
-\newtoks\toksA \newtoks\toksB \newtoks\toksC \newtoks\toksD
-\newtoks\toksE \newtoks\toksF \newtoks\usersanitizer
+\newtoks\toksA \newtoks\toksE
\newcount\countA \countA=0 \newcount\countB \countB=0
-\newcount\countC \countC=0 \newcount\countD \countD=0
-\newif\iftokprocessed \newif\ifTnum \newif\ifinstr
+\newcount\countNOS \countNOS=0
{\def\\{\global\let\spacechar= }\\ }
% Here we decide the output format, depending on the TeX engine in use:
@@ -137,7 +136,7 @@
\def\Black{\pdfliteral{0 g 0 G}} % use rgb colors for direct PDF output too
\def\Blue{\pdfliteral{\pdflinkcolor\space rg \pdflinkcolor\space RG}}
\fi
-\ifacrohint \input cwebacromac \fi % load hypertext macros
+\input cwebacromac % load hypertext macros
\def\pdfURL#1#2{\ifpdf \ifpdflua\pdfannotlink height \theheight depth \thedepth
attr {/Border [0 0 0]} user { /Type /Annot /Subtype /Link /A
<< /S /URI /URI (#2) >>}\Blue #1\Black \pdfendlink % changed in 3.69
@@ -187,7 +186,7 @@
\outer\def\M#1{\MN{#1}\ifon\vfil\penalty-100\vfilneg % beginning of section
\vskip\intersecskip\startsection\ignorespaces}
\outer\def\N#1#2#3.{% beginning of starred section
- \ifpdf{\toksF={}\makeoutlinetoks#3\outlinedone\outlinedone}\fi
+ \ifpdf{\makeoutlinetoks#3\outlinedone}\fi
\gdepth=#1\gtitle={#3}\MN{#2}%
\ifon\ifnum#1<\secpagedepth \vfil\eject % force page break if depth is small
\else\vfil\penalty-100\vfilneg\vskip\intersecskip\fi\fi
@@ -327,18 +326,16 @@
\newbox\lbox % lefthand column in the index
\def\inx{\par\vskip6pt plus 1fil % we are beginning the index
\write\cont{} % ensure that the contents file isn't empty
- \write\cont{\catcode `\noexpand\@=12\relax} % \makeatother
+ \write\cont{\catcode `\noexpand\@=12\relax} % \makeatother
\closeout\cont % the contents information has been fully gathered
\output{\ifpagesaved\normaloutput{\box\sbox}\lheader\rheader\fi
- \global\setbox\sbox=\page \global\pagesavedtrue}
+ \global\setbox\sbox=\page \global\pagesavedtrue \mark{\topmark}}
\pagesavedfalse \eject % eject the page-so-far and predecessors
\setbox\sbox\vbox{\unvbox\sbox} % take it out of its box
\vsize=\pageheight \advance\vsize by -\ht\sbox % the remaining height
\hsize=.5\pagewidth \advance\hsize by -10pt
% column width for the index (20pt between cols)
- \ifhint\else
- \parfillskip 0pt plus .6\hsize % try to avoid almost empty lines
- \fi
+ \ifhint\else\parfillskip 0pt plus .6\hsize\fi % avoid almost empty lines
\def\lr{L} % this tells whether the left or right column is next
\output{\if L\lr\global\setbox\lbox=\page \gdef\lr{R}
\else\normaloutput{\vbox to\pageheight{\box\sbox\vss
@@ -347,9 +344,9 @@
\message{Index:}
\parskip 0pt plus .5pt
\outer\def\I##1, ##2.{\par\hangindent2em\noindent##1:\kern1em
- \ifacrohint\pdfnote##2.\else##2\fi.} % index entry
- \def\[##1]{$\underline{##1}$} % underlined index item
- \rm \rightskip0pt plus 2.5em \tolerance 10000 \let\*=\lapstar
+ \scan##2!.} % index entry
+ \def\[##1]{$\underline{\scan##1!}$\scan} % underlined index item
+ \rm \rightskip0pt plus 2.5em \tolerance 10000
\hyphenpenalty 10000 \parindent0pt
\readindex}
\def\fin{\par\vfill\eject % this is done when we are ending the index
@@ -370,23 +367,21 @@
\def\I{\par\hangindent 2em}\let\*=*
\ifpdf \def\outsecname{Names of the sections} \let\Xpdf\X
\ifpdflua \pdfdest name {NOS} fith
- \pdfoutline goto name {NOS} count -\the\countD {\outsecname}
- \def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.%
- {\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}%
- \pdfoutline goto num \the\toksA \expandafter{\the\toksE}}
+ \pdfoutline goto name {NOS} count -\the\countNOS {\outsecname}
\else \special{pdf: outline -1 << /Title (\outsecname)
- /Dest [ @thispage /FitH @ypos ] >>}
- \def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.%
- {\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}%
- \special{pdf: outline 0 << /Title (\the\toksE)
- /A << /S /GoTo /D (\romannumeral\the\toksA) >> >>}}
- \fi\fi
+ /Dest [ @thispage /FitH @ypos ] >>}\fi
+ \def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.%
+ {\makeoutlinetoks##2\outlinedone}%
+ \ifpdflua \pdfoutline goto num \the\toksA \expandafter{\the\toksE}
+ \else \special{pdf: outline 0 << /Title (\the\toksE)
+ /A << /S /GoTo /D (\romannumeral\the\toksA) >> >>}\fi}
+ \fi % \ifacro
\readsections}
\def\makebookmarks{\let\ZZ=\writebookmarkline \readcontents\relax}
\def\countsections{\message{Number of named sections:}
- {\def\I{\global\advance\countD by 1}\def\X##1\X{\relax}
+ {\def\I{\global\advance\countNOS by 1}\def\X##1\X{\relax}
\def\Q##1.{\relax}\def\Qs##1.{\relax}\def\U##1.{\relax}\def\Us##1.{\relax}
- \readsections\relax}\message{\the\countD}}
+ \readsections\relax}\message{\the\countNOS}}
\def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0%
\else \csname#1\endcsname \fi} % Petr Olsak's macros from texinfo.tex
\def\advancenumber#1{\countA=\expnumber{#1}\relax \advance\countA by1
@@ -412,17 +407,14 @@
\line{\consetup{#2}#1
\rm\leaders\hbox to .5em{.\hfil}\hfil
\ \ifhint
- \HINTlink{#3}{\romannumeral#3}% No page numbers in HINT
+ \HINTlink{#3}% No page numbers in HINT
\HINTcontents{#1}{#2}{#3}%
- \else\ifacro\pdflink{#3}{\romannumeral#3}\else#3\fi
+ \else\ifacro\pdflink{#3}\else#3\fi
\hbox to3em{\hss#4}\fi}}
\def\consetup#1{\ifcase#1 \bf % depth -1 (@**)
\or % depth 0 (@*)
\or \hskip2em % depth 1 (@*1)
- \or \hskip4em % depth 2 (@*2)
- \or \hskip6em % depth 3 (@*3)
- \or \hskip8em % depth 4 (@*4)
- \or \hskip10em % depth 5 (@*5)
+ \or \hskip4em \or \hskip6em \or \hskip8em \or \hskip10em % depth 2,3,4,5
\else \hskip12em \fi} % depth 6 or more
\def\noinx{\let\inx=\end} % no indexes or table of contents
\def\nosecs{\let\FIN=\fin \def\fin{\let\parfillskip=\end \FIN}}
diff --git a/Master/texmf-dist/tex/plain/cweb/cwebbin/pdfctwimac.tex b/Master/texmf-dist/tex/plain/cweb/cwebbin/pdfctwimac.tex
index 2a0499949e6..d1278cac3bf 100644
--- a/Master/texmf-dist/tex/plain/cweb/cwebbin/pdfctwimac.tex
+++ b/Master/texmf-dist/tex/plain/cweb/cwebbin/pdfctwimac.tex
@@ -1,5 +1,5 @@
% standard macros for CWEB listings (in addition to plain.tex)
-% Version 4.12 --- May 2024
+% Version 4.12 --- August 2024
% modified for pages produced by CTWILL
% further modified for page size of the MMIXware book
% modified for PDF output with 'tex "\let\pdf+' or '{lua|pdf|xe}tex'
@@ -26,15 +26,6 @@
\font\ninerm=cmr9
\let\mc=\ninerm % medium caps
-\def\CEE/{{\mc C\spacefactor1000}}
-\def\UNIX/{{\mc U\kern-.05emNIX\spacefactor1000}}
-\def\TEX/{\TeX}
-\def\CPLUSPLUS/{{\mc C\PP\spacefactor1000}}
-\def\Cee{\CEE/} % for backward compatibility
-\def\Cpp{\CPLUSPLUS/} % for backward compatibility
-\def\9#1{}
- % with this definition of \9 you can say @:sort key}{TeX code@>
- % to alphabetize an index entry by the sort key but format with the TeX code
\font\eightrm=cmr8
\font\sixrm=cmr6
\font\ninei=cmmi9
@@ -146,6 +137,16 @@
\font\titlefont=cmr7 scaled\magstep4 % title on the contents page
\font\ttitlefont=cmtt10 scaled\magstep2 % typewriter type in title
+\def\CEE/{{\mc C\spacefactor1000}}
+\def\UNIX/{{\mc U\kern-.05emNIX\spacefactor1000}}
+\def\TEX/{\TeX}
+\def\CPLUSPLUS/{{\mc C\PP\spacefactor1000}}
+\def\Cee{\CEE/} % for backward compatibility
+\def\Cpp{\CPLUSPLUS/} % for backward compatibility
+\def\9#1{}
+ % with this definition of \9 you can say @:sort key}{TeX code@>
+ % to alphabetize an index entry by the sort key but format with the TeX code
+
\def\\#1{\leavevmode\hbox{\it#1\/\kern.05em}} % italic type for identifiers
\def\|#1{\leavevmode\hbox{$#1$}} % one-letter identifiers look better this way
\def\&#1{\leavevmode\hbox{\bf
@@ -228,11 +229,9 @@
\Y\noindent{\hangindent2\em\baselineskip10pt%
\eightrm#1~\ifacro{\pdfnote#2.}\else#2\fi.\par}}
-\newtoks\toksA \newtoks\toksB \newtoks\toksC \newtoks\toksD
-\newtoks\toksE \newtoks\toksF \newtoks\usersanitizer
+\newtoks\toksA \newtoks\toksE
\newcount\countA \countA=0 \newcount\countB \countB=0
-\newcount\countC \countC=0 \newcount\countD \countD=0
-\newif\iftokprocessed \newif\ifTnum \newif\ifinstr
+\newcount\countNOS \countNOS=0
{\def\\{\global\let\spacechar= }\\ }
% Here we decide the output format, depending on the TeX engine in use:
@@ -253,7 +252,7 @@
\def\Black{\pdfliteral{0 g 0 G}} % use rgb colors for direct PDF output too
\def\Blue{\pdfliteral{\pdflinkcolor\space rg \pdflinkcolor\space RG}}
\fi
-\ifacrohint \input cwebacromac \fi % load hypertext macros
+\input cwebacromac % load hypertext macros
\def\lapstar{\rlap{*}}
\def\stsec{\tenpoint\rightskip=0pt % get out of C mode (cf. \B)
@@ -301,7 +300,7 @@
\outer\def\NN{\ifvoid\partialpage\leftfalse
\else\ifdim\ht\partialpage<\pageht \lefttrue\else\leftfalse\fi\fi\NNN}
\outer\def\NNN#1#2#3.{% beginning of starred section
- \ifacro{\toksF={}\makeoutlinetoks#3\outlinedone\outlinedone}\fi
+ \ifacro{\makeoutlinetoks#3\outlinedone}\fi
\gdepth=#1\gtitle={#3}\def\secno{#2}\xdef\secstar{#2}
\ifleft \flushout
\gdef\rlhead{\let\i=I\uppercase{\ignorespaces#3}} % running left headline
@@ -334,7 +333,7 @@
\def\T#1{\leavevmode % octal, hex or decimal constant
\hbox{$\def\?{\kern.2em}%$%
\let\ \, % C++ digit separator becomes a little white space
- \def\$##1{\egroup_{\rm##1}\bgroup}% suffix to constant
+ \def\$##1{\egroup_{\rm##1}\bgroup}%$% suffix to constant
\def\_{\cdot 10^{\aftergroup}}% power of ten (via dirty trick)
\let\~=\oct \let\^=\hex \let\\=\bin {#1}$}}%$%
\def\U{\note{This code is used in section}} % xref for use of a section
@@ -543,22 +542,20 @@
\def\outsecname{Names of the sections}
\ifpdflua \makebookmarks \countsections
\pdfdest name {NOS} fith
- \pdfoutline goto name {NOS} count -\the\countD {\outsecname}
- \def\X##1:##2\X{\firstsecno##1.%
- {\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}%
- \pdfoutline goto num \the\toksA \expandafter{\the\toksE}}
+ \pdfoutline goto name {NOS} count -\the\countNOS {\outsecname}
\else \special{pdf: outline -1 << /Title (\outsecname)
- /Dest [ @thispage /FitH @ypos ] >>}
- \def\X##1:##2\X{\firstsecno##1.%
- {\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}%
- \special{pdf: outline 0 << /Title (\the\toksE)
- /A << /S /GoTo /D (\romannumeral\the\toksA) >> >>}}
- \fi \readsections \fi}
+ /Dest [ @thispage /FitH @ypos ] >>}\fi
+ \def\X##1:##2\X{\firstsecno##1.%
+ {\makeoutlinetoks##2\outlinedone}%
+ \ifpdflua \pdfoutline goto num \the\toksA \expandafter{\the\toksE}
+ \else \special{pdf: outline 0 << /Title (\the\toksE)
+ /A << /S /GoTo /D (\romannumeral\the\toksA) >> >>}\fi}
+ \readsections \fi}
\def\makebookmarks{\let\ZZ=\writebookmarkline \readcontents\relax}
\def\countsections{\message{Number of named sections:}
- {\def\I{\global\advance\countD by 1}\def\X##1\X{\relax}
+ {\def\I{\global\advance\countNOS by 1}\def\X##1\X{\relax}
\def\Q##1.{\relax}\def\Qs##1.{\relax}\def\U##1.{\relax}\def\Us##1.{\relax}
- \readsections\relax}\message{\the\countD}}
+ \readsections\relax}\message{\the\countNOS}}
\def\writebookmarkline#1#2#3#4#5{{%
\let\(=\let \let\)=\let \let\[=\let \let\]=\let \let\/=\let
\pdfoutline goto num #3 count -\expnumber{chunk#2.#3} {#5}}}
@@ -579,7 +576,7 @@
%\def\contentsline#1#2#3#4#5{\ifnum#2=0 \smallbreak\fi
%\line{\consetup{#2}#1
%\rm\leaders\hbox to .5em{.\hfil}\hfil
- %\ \ifacro\pdflink{#3}{\romannumeral#3}\else#3\fi\hbox to3em{\hss#4}}}
+ %\ \ifacro\pdflink{#3}\else#3\fi\hbox to3em{\hss#4}}}
%\def\consetup#1{\ifcase#1 \bf % depth -1 (@**)
%\or % depth 0 (@*)
%\or \hskip2em % depth 1 (@*1)
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/tex/plain/cweb/cwebmac.tex b/Master/texmf-dist/tex/plain/cweb/cwebmac.tex
index 99e899476ce..a46dc4b782f 100644
--- a/Master/texmf-dist/tex/plain/cweb/cwebmac.tex
+++ b/Master/texmf-dist/tex/plain/cweb/cwebmac.tex
@@ -1,26 +1,14 @@
% standard macros for CWEB listings (in addition to plain.tex)
-% Version 4.12 --- May 2024
+% Version 4.12 --- August 2024
\ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros
\xdef\fmtversion{\fmtversion+CWEB4.12}
\chardef\cwebversion=4 \chardef\cwebrevision=12
-\let\:=\. % preserve a way to get the dot accent
- % (all other accents will still work as usual)
-
\parskip 0pt % no stretch between paragraphs
\parindent 1em % for paragraphs and for the first line of C text
\font\ninerm=cmr9
\let\mc=\ninerm % medium caps
-\def\CEE/{{\mc C\spacefactor1000}}
-\def\UNIX/{{\mc U\kern-.05emNIX\spacefactor1000}}
-\def\TEX/{\TeX}
-\def\CPLUSPLUS/{{\mc C\PP\spacefactor1000}}
-\def\Cee{\CEE/} % for backward compatibility
-\def\Cpp{\CPLUSPLUS/} % for backward compatibility
-\def\9#1{}
- % with this definition of \9 you can say @:sort key}{TeX code@>
- % to alphabetize an index entry by the sort key but format with the TeX code
\font\eightrm=cmr8
\let\sc=\eightrm % for smallish caps (NOT a caps-and-small-caps font)
\let\mainfont=\tenrm
@@ -31,6 +19,17 @@
\font\tentex=cmtex10 % TeX extended character set (used in strings)
\fontdimen7\tentex=0pt % no double space after sentences
+\def\CEE/{{\mc C\spacefactor1000}}
+\def\UNIX/{{\mc U\kern-.05emNIX\spacefactor1000}}
+\def\TEX/{\TeX}
+\def\CPLUSPLUS/{{\mc C\PP\spacefactor1000}}
+\def\Cee{\CEE/} % for backward compatibility
+\def\Cpp{\CPLUSPLUS/} % for backward compatibility
+\def\9#1{} % with this definition of \9 you can say @:sort key}{TeX code@>
+ % to alphabetize an index entry by the sort key but format with the TeX code
+\let\:=\. % preserve a way to get the dot accent
+ % (all other accents will still work as usual)
+
\def\\#1{\leavevmode\hbox{\it#1\/\kern.05em}} % italic type for identifiers
\def\|#1{\leavevmode\hbox{$#1$}} % one-letter identifiers look better this way
\def\&#1{\leavevmode\hbox{\bf
@@ -112,14 +111,10 @@
\let\yskip=\smallskip
\def\?{\mathrel?}
\def\,{\relax\ifmmode\mskip\thinmuskip\else\thinspace\fi}
-\def\note#1#2.{\Y\noindent{\hangindent2em%
- \baselineskip10pt\eightrm#1~\ifacrohint{\pdfnote#2.}\else#2\fi.\par}}
-\newtoks\toksA \newtoks\toksB \newtoks\toksC \newtoks\toksD
-\newtoks\toksE \newtoks\toksF \newtoks\usersanitizer
+\newtoks\toksA \newtoks\toksE
\newcount\countA \countA=0 \newcount\countB \countB=0
-\newcount\countC \countC=0 \newcount\countD \countD=0
-\newif\iftokprocessed \newif\ifTnum \newif\ifinstr
+\newcount\countNOS \countNOS=0
{\def\\{\global\let\spacechar= }\\ }
% Here we decide the output format, depending on the TeX engine in use:
@@ -136,7 +131,7 @@
\def\Black{\pdfliteral{0 g 0 G}} % use rgb colors for direct PDF output too
\def\Blue{\pdfliteral{\pdflinkcolor\space rg \pdflinkcolor\space RG}}
\fi
-\ifacrohint \input cwebacromac \fi % load hypertext macros
+\input cwebacromac % load hypertext macros
\def\pdfURL#1#2{\ifpdf \ifpdflua\pdfannotlink height \theheight depth \thedepth
attr {/Border [0 0 0]} user { /Type /Annot /Subtype /Link /A
<< /S /URI /URI (#2) >>}\Blue #1\Black \pdfendlink % changed in 3.69
@@ -159,6 +154,8 @@
[ @thispage /FitH @ypos ]}\fi}}\fi}
\let\startsection=\stsec
\def\defin#1{\global\advance\ind by 2 \1\&{#1 }} % begin `define' or `format'
+\def\note#1#2.{\Y\noindent{\hangindent2em\baselineskip10pt%
+ \eightrm#1~\ifacrohint{\pdfnote#2.}\else#2\fi.\par}}
\def\A{\note{See also section}} % xref for doubly defined section name
\def\As{\note{See also sections}} % xref for multiply defined section name
\def\B{\rightskip=0pt plus 100pt minus 10pt % go into C mode
@@ -186,7 +183,7 @@
\outer\def\M#1{\MN{#1}\ifon\vfil\penalty-100\vfilneg % beginning of section
\vskip\intersecskip\startsection\ignorespaces}
\outer\def\N#1#2#3.{% beginning of starred section
- \ifacro{\toksF={}\makeoutlinetoks#3\outlinedone\outlinedone}\fi
+ \ifacro{\makeoutlinetoks#3\outlinedone}\fi
\gdepth=#1\gtitle={#3}\MN{#2}%
\ifon\ifnum#1<\secpagedepth \vfil\eject % force page break if depth is small
\else\vfil\penalty-100\vfilneg\vskip\intersecskip\fi\fi
@@ -240,9 +237,8 @@
\def\oct{\hbox{$^\circ$\kern-.1em\it\aftergroup\?\aftergroup}} % CWEB style
\def\hex{\hbox{$^{\scriptscriptstyle\#}$\tt\aftergroup}} % CWEB style
\def\bin{\hbox{$^{\scriptscriptstyle b}$\tt\aftergroup}} % new in CWEB 4.3
-\def\vb#1{\leavevmode\hbox{\kern2pt\vrule\vtop{\vbox{\hrule
- \hbox{\strut\kern2pt\.{#1}\kern2pt}}
- \hrule}\vrule\kern2pt}} % verbatim string
+\def\vb#1{\leavevmode\hbox{\kern2pt\vrule\vtop{\vbox{\hrule\hbox{\strut
+ \kern2pt\.{#1}\kern2pt}}\hrule}\vrule\kern2pt}} % verbatim string
\def\p#1{\cdot 2^{#1}} % power of two (hex exponent)
\def\onmaybe{\let\ifon=\maybe} \let\maybe=\iftrue
@@ -317,9 +313,7 @@
\vsize=\pageheight \advance\vsize by -\ht\sbox % the remaining height
\hsize=.5\pagewidth \advance\hsize by -10pt
% column width for the index (20pt between cols)
- \ifhint\else
- \parfillskip 0pt plus .6\hsize % try to avoid almost empty lines
- \fi
+ \ifhint\else\parfillskip 0pt plus .6\hsize\fi % avoid almost empty lines
\def\lr{L} % this tells whether the left or right column is next
\output{\if L\lr\global\setbox\lbox=\page \gdef\lr{R}
\else\normaloutput{\vbox to\pageheight{\box\sbox\vss
@@ -328,9 +322,9 @@
\message{Index:}
\parskip 0pt plus .5pt
\outer\def\I##1, ##2.{\par\hangindent2em\noindent##1:\kern1em
- \ifacrohint\pdfnote##2.\else##2\fi.} % index entry
- \def\[##1]{$\underline{##1}$} % underlined index item
- \rm \rightskip0pt plus 2.5em \tolerance 10000 \let\*=\lapstar
+ \scan##2!.} % index entry
+ \def\[##1]{$\underline{\scan##1!}$\scan} % underlined index item
+ \rm \rightskip0pt plus 2.5em \tolerance 10000
\hyphenpenalty 10000 \parindent0pt
\readindex}
\def\fin{\par\vfill\eject % this is done when we are ending the index
@@ -353,23 +347,21 @@
\ifacro \def\outsecname{Names of the sections} \let\Xpdf\X
% \ifpdflua \makebookmarks \pdfdest name {NOS} fitb % in versions < 3.68
\ifpdflua \pdfdest name {NOS} fith % changed in version 3.69
- \pdfoutline goto name {NOS} count -\the\countD {\outsecname}
- \def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.%
- {\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}%
- \pdfoutline goto num \the\toksA \expandafter{\the\toksE}}
+ \pdfoutline goto name {NOS} count -\the\countNOS {\outsecname}
\else \special{pdf: outline -1 << /Title (\outsecname)
- /Dest [ @thispage /FitH @ypos ] >>}
- \def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.%
- {\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}%
- \special{pdf: outline 0 << /Title (\the\toksE)
- /A << /S /GoTo /D (\romannumeral\the\toksA) >> >>}}
- \fi\fi
+ /Dest [ @thispage /FitH @ypos ] >>}\fi
+ \def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.%
+ {\makeoutlinetoks##2\outlinedone}%
+ \ifpdflua \pdfoutline goto num \the\toksA \expandafter{\the\toksE}
+ \else \special{pdf: outline 0 << /Title (\the\toksE)
+ /A << /S /GoTo /D (\romannumeral\the\toksA) >> >>}\fi}
+ \fi % \ifacro
\readsections}
\def\makebookmarks{\let\ZZ=\writebookmarkline \readcontents\relax}
\def\countsections{\message{Number of named sections:}
- {\def\I{\global\advance\countD by 1}\def\X##1\X{\relax}
+ {\def\I{\global\advance\countNOS by 1}\def\X##1\X{\relax}
\def\Q##1.{\relax}\def\Qs##1.{\relax}\def\U##1.{\relax}\def\Us##1.{\relax}
- \readsections\relax}\message{\the\countD}}
+ \readsections\relax}\message{\the\countNOS}}
\def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0%
\else \csname#1\endcsname \fi} % Petr Olsak's macros from texinfo.tex
\def\advancenumber#1{\countA=\expnumber{#1}\relax \advance\countA by1
@@ -395,9 +387,9 @@
\line{\consetup{#2}#1
\rm\leaders\hbox to .5em{.\hfil}\hfil
\ \ifhint
- \HINTlink{#3}{\romannumeral#3}% No page numbers in HINT
+ \HINTlink{#3}% No page numbers in HINT
\HINTcontents{#1}{#2}{#3}%
- \else\ifacro\pdflink{#3}{\romannumeral#3}\else#3\fi
+ \else\ifacro\pdflink{#3}\else#3\fi
\hbox to3em{\hss#4}\fi}}
\def\consetup#1{\ifcase#1 \bf % depth -1 (@**)
\or % depth 0 (@*)
diff --git a/Master/texmf-dist/tex/plain/pwebmac/pwebmac.tex b/Master/texmf-dist/tex/plain/pwebmac/pwebmac.tex
index 01bba0e19f3..50070a7dc28 100644
--- a/Master/texmf-dist/tex/plain/pwebmac/pwebmac.tex
+++ b/Master/texmf-dist/tex/plain/pwebmac/pwebmac.tex
@@ -5,7 +5,7 @@
% macro integration \`a la CWEB by Andreas Scherer <andreas_tex@freenet.de>.
% This file is not copyrighted and can be used freely.
\ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros
-\xdef\fmtversion{\fmtversion+PWEBMAC4.12}
+\xdef\fmtversion{\fmtversion+PWEBMAC5.0}
\parskip 0pt % no stretch between paragraphs
\parindent 1em % for paragraphs and for the first line of Pascal text
@@ -74,8 +74,8 @@
\newtoks\toksA \newtoks\toksB \newtoks\toksC \newtoks\toksD
\newtoks\toksE \newtoks\toksF \newtoks\usersanitizer
\newcount\countA \countA=0 \newcount\countB \countB=0
-\newcount\countC \countC=0 \newcount\countD \countD=0
-\newif\iftokprocessed \newif\ifTnum \newif\ifinstr
+\newcount\countNOS \countNOS=0
+\newif\iftokprocessed \newif\ifTnum \newif\ifinstr \newif\ifhavenum
{\def\\{\global\let\spacechar= }\\ }
% Here we decide the output format, depending on the TeX engine in use:
@@ -89,8 +89,7 @@
\newif\ifpdflua \ifluatex\pdfluatrue\fi \ifpdftex\pdfluatrue\fi
\ifpdflua % pdfTeX and luaTeX produce PDF output if \pdfoutput>0 (default)
\def\Black{\pdfliteral{0 g 0 G}} % use rgb colors for direct PDF output too
- \def\Blue{\pdfliteral{\pdflinkcolor\space rg \pdflinkcolor\space RG}}
-\fi
+ \def\Blue{\pdfliteral{\pdflinkcolor\space rg \pdflinkcolor\space RG}} \fi
\ifluatex % LuaTeX is almost like pdfTeX
\protected\def\pdfliteral {\pdfextension literal}
@@ -108,28 +107,56 @@
\let\pdfoutput=\outputmode
\fi % end of LuaTeX->pdfTeX redirection macros
+\ifacrohint % Common macros for \ifpdf and \ifhint for \pdflink's
+\def\pdfnote#1.{\setbox0=\hbox{\toksA={#1.}\toksB={}\maketoks}\the\toksA}
+\def\firstsecno#1.{\setbox0=\hbox{\toksA={#1.}\toksB={}%
+ \def\makenote{\addtokens\toksB{\the\toksC}\def\makenote{\let\space\empty
+ \toksC={}\toksD={}}\makenote}\maketoks}}
+\def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
+\def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}%
+ \ifcat\noexpand\first0\countB=`#1\else\countB=0\fi}
+\def\maketoks{\expandafter\poptoks\the\toksA|ENDTOKS|%
+ \let\next=\maketoks % continue processing by default
+ \ifnum\countB>`9 \countB=0 \fi
+ \ifnum\countB<`0
+ \ifhavenum\makenote\fi
+ \ifx\first.\let\next=\maketoksdone % fullstop
+ \else \addtokens\toksB{\the\toksD}
+ \ifx\first,\addtokens\toksB{\space}\fi
+ \fi
+ \else \addtokens\toksC{\the\toksD}\global\havenumtrue
+ \fi
+ \next
+}
+\def\makenote{\addtokens\toksB
+ {\noexpand\pdflink{\the\toksC}}\toksC={}\global\havenumfalse}
+\def\maketoksdone{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
+\fi % End of common pdf/hint macros
+
\ifpdf % The following are general pdf macros from 'cwebmac.tex 3.70'
\def\thewidth{\the\wd0 \space}
\def\theheight{\the\ht\strutbox\space}
\def\thedepth{\the\dp\strutbox\space}
\ifpdflua
\ifx\pdfannotlink\undefined\let\pdfannotlink\pdfstartlink\fi% for pdfTeX 0.14
- \def\pdflink#1#2{\hbox{\pdfannotlink height \theheight depth \thedepth
+ \def\pdflink#1{\hbox{\pdfannotlink height \theheight depth \thedepth
attr{/Border [0 0 0]} goto num #1 \Blue #1\Black\pdfendlink}}
-\else\def\pdflink#1#2{\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}%
+\else\def\pdflink#1{\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}%
\special{pdf: ec}}\special{pdf: ann width \thewidth height \theheight
- depth \thedepth << /Type /Annot /Subtype /Link
- /Border [0 0 0] /A << /S /GoTo /D (#2) >> >>}\box0\relax}\fi
+ depth \thedepth << /Type /Annot /Subtype /Link /Border [0 0 0]
+ /A << /S /GoTo /D (\romannumeral#1) >> >>}\box0\relax}\fi
\def\sanitizecommand#1#2{\addtokens\usersanitizer
{\noexpand\dosanitizecommand\noexpand#1{#2}}}
\def\dosanitizecommand#1#2{\ifx\nxt#1\addF{#2}\fi}
+\ifhint\else\sanitizecommand\to{..}\fi % a trivial example; requires \addtokens
\catcode`\[=1 \catcode`\]=2 \catcode`\{=12 \catcode`\}=12
\def\lbchar[{] \def\rbchar[}]
\catcode`\[=12 \catcode`\]=12 \catcode`\{=1 \catcode`\}=2
\catcode`\~=12 \def\tildechar{~} \catcode`\~=13
\catcode`\|=0 |catcode`|\=12 |def|bschar{\} |catcode`|\=0 \catcode`\|=12
-\def\makeoutlinetoks{\Tnumfalse\afterassignment\makeolproctok\let\nxt= }
+\def\makeoutlinetoks{\toksF={}\Tnumfalse
+ \afterassignment\makeolproctok\let\nxt= }
\def\makeolnexttok{\afterassignment\makeolproctok\let\nxt= }
\def\makeolgobbletok{\afterassignment\makeolnexttok\let\nxt= }
\def\addF#1{\addtokens\toksF{#1}\tokprocessedtrue}
@@ -191,7 +218,7 @@
}
\def\makeolproctokchar#1 #2 #3{\addF{#3}}
\def\outlinedone{\edef\outlinest{\global\noexpand\toksE={\the\toksF}}%
- \outlinest\let\outlinedone=\relax}
+ \outlinest\let\outlinedone=\relax\outlinedone}
\fi % End of general pdf macros
\ifhint
@@ -205,40 +232,11 @@
\def\HINThome{\HINTdest name {HINT.home}%
\HINToutline goto name {HINT.home} depth 1 {Table of Contents}}
\def\HINTlabel{{\let\*=\empty\HINTdest num \modstar top}}
-\def\HINTlink#1#2{\HINTstartlink goto num #1 {#1}\HINTendlink}% #2 not used ???
+\def\HINTlink#1{\HINTstartlink goto num #1 {#1}\HINTendlink}
\def\HINTcontents#1#2{\HINToutline goto num #2 depth 1 {#1}}
\let\pdflink=\HINTlink
\fi % End of HINT macros
-% Common macros for \ifpdf and \ifhint
-\ifacrohint
-\def\pdfnote#1.{\setbox0=\hbox{\toksA={#1.}\toksB={}\maketoks}\the\toksA}
-\def\firstsecno#1.{\setbox0=\hbox{\toksA={#1.}\toksB={}%
- \def\makenote{\addtokens\toksB{\the\toksC}\def\makenote{\toksD={}
- \toksC={}\let\space\empty}\makenote}\maketoks}}
-\def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
-\ifhint\else\sanitizecommand\to{..}\fi % a trivial example; requires \addtokens
-\def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}%
- \ifcat\noexpand\first0\countB=`#1\else\countB=0\fi\toksA={#2}}
-\def\maketoks{\expandafter\poptoks\the\toksA|ENDTOKS|%
- \ifnum\countB>`9 \countB=0 \fi
- \ifnum\countB<`0
- \ifnum0=\countC\else\makenote\fi
- \ifx\first.\let\next=\maketoksdone\else
- \let\next=\maketoks
- \addtokens\toksB{\the\toksD}
- \ifx\first,\addtokens\toksB{\space}\fi
- \fi
- \else \addtokens\toksC{\the\toksD}\global\countC=1\let\next=\maketoks
- \fi
- \next
-}
-\def\makenote{\addtokens\toksB
- {\noexpand\pdflink{\the\toksC}{\romannumeral\the\toksC}}%
- \toksC={}\global\countC=0}
-\def\maketoksdone{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
-\fi % End of common pdf/hint macros
-
\def\pdfURL#1#2{\ifpdf \ifpdflua\pdfannotlink height \theheight depth \thedepth
attr {/Border [0 0 0]} user { /Type /Annot /Subtype /Link /A
<< /S /URI /URI (#2) >> }\Blue #1\Black \pdfendlink
@@ -280,7 +278,7 @@
\outer\def\M#1.{\MN#1.\ifon\vfil\penalty-100\vfilneg % beginning of section
\vskip\intersecskip\startsection\ignorespaces}
\outer\def\N#1.#2.{% beginning of starred section
- \ifpdf{\toksF={}\makeoutlinetoks#2\outlinedone\outlinedone}\fi
+ \ifpdf{\makeoutlinetoks#2\outlinedone}\fi
\gtitle={#2}\MN#1.\vfil\eject % define running headline
\message{*\modno} % progress report
\def\stripprefix##1>{}\def\gtitletoks{#2}%
@@ -411,17 +409,31 @@
\message{Index:}
\parskip 0pt plus .5pt
\outer\def\:##1, ##2.{\par\hangindent2em\noindent##1:\kern1em
- \ifacrohint\pdfnote##2.\else##2\fi.} % index entry
+ \scan##2!.} % index entry
\let\ttentry=\. \def\.##1{\ttentry{##1\kern.2em}} % give \tt a little room
- \def\[##1]{$\underline{##1}$} % underlined index item
- \rm \rightskip0pt plus 2.5em \tolerance 10000 \let\*=\lapstar
+ \def\[##1]{$\underline{\scan##1!}$\scan} % underlined index item
+ \ifacrohint\def\digits{\pdflink{\the\countA}\scan}
+ \else\def\digits{{\the\countA}\scan}\fi
+ \def\scan##1{\begingroup
+ \ifx!##1% exit on exclamation point
+ \else\ifx,##1,\space\aftergroup\scan % insert ,\space}\scan...
+ \else\ifx\[##1\aftergroup##1% insert }\[...
+ \else\ifx\*##1\aftergroup\lapstar\aftergroup\scan % insert }\lapstar\scan...
+ \else\ifnum`##1>`9##1\aftergroup\scan % insert #1}\scan...
+ \else\ifnum`##1<`0##1\aftergroup\scan % insert #1}\scan...
+ \else
+ \afterassignment\digits \aftergroup\countA
+ \aftergroup##1% insert }\countA=#1\digits...
+ \fi\fi\fi\fi\fi \fi
+ \endgroup}
+ \rm \rightskip0pt plus 2.5em \tolerance 10000
\hyphenpenalty 10000 \parindent0pt}
\def\fin{\par\vfill\eject % this is done when we are ending the index
\ifpagesaved\null\vfill\eject\fi % output a null index column
\if L\lr\else\null\vfill\eject\fi % finish the current page
\ifpdflua \makebookmarks % added in Version 4.5
\ifnum\pdfshellescape=1 {\let\\=\BS % count the @<named sections@>
- \global\countD=\input{|grep -c -e '\\:\\X' \jobname.tex}} \fi\fi
+ \global\countNOS=\input{|grep -c -e '\\:\\X' \jobname.tex}} \fi\fi
\parfillskip 0pt plus 1fil
\def\grouptitle{NAMES OF THE SECTIONS}
\let\topsecno=\nullsec
@@ -435,18 +447,16 @@
\def\:{\par\hangindent 2em}\let\*=*\let\.=\ttentry
\ifpdf \def\outsecname{Names of the sections} \let\Xpdf\X
\ifpdflua \pdfdest name {NOS} fith
- \ifnum \the\countD>0 \xdef\modno{\the\countD} \fi
+ \ifnum \countNOS>0 \xdef\modno{\the\countNOS} \fi
\pdfoutline goto name {NOS} count -\modno {\outsecname}
- \def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.%
- {\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}%
- \pdfoutline goto num \the\toksA \expandafter{\the\toksE}}
\else \special{pdf: outline -1 << /Title (\outsecname)
- /Dest [ @thispage /FitH @ypos ] >>}
- \def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.%
- {\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}%
- \special{pdf: outline 0 << /Title (\the\toksE)
- /A << /S /GoTo /D (\romannumeral\the\toksA) >> >>}}
- \fi\fi}
+ /Dest [ @thispage /FitH @ypos ] >>}\fi
+ \def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.%
+ {\makeoutlinetoks##2\outlinedone}%
+ \ifpdflua \pdfoutline goto num \the\toksA \expandafter{\the\toksE}
+ \else \special{pdf: outline 0 << /Title (\the\toksE)
+ /A << /S /GoTo /D (\romannumeral\the\toksA) >> >>}\fi}
+ \fi}
\def\makebookmarks{\def\?##1]{[##1]}%
\let\Z=\writebookmarkline \readcontents\relax}
\def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0%
@@ -474,9 +484,9 @@
\line{\ignorespaces#1
\rm\leaders\hbox to .5em{.\hfil}\hfil
\ \ifhint
- \HINTlink{#2}{\romannumeral#2}% No page numbers in HINT
+ \HINTlink{#2}% No page numbers in HINT
\HINTcontents{#1}{#2}%
- \else\ifpdf\pdflink{#2}{\romannumeral#2}\else#2\fi
+ \else\ifpdf\pdflink{#2}\else#2\fi
\hbox to3em{\hss#3}\fi}}
\def\today{\ifcase\month\or
January\or February\or March\or April\or May\or June\or
diff --git a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def
index 331dcd32f22..d584942789f 100644
--- a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def
+++ b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def
@@ -1,7 +1,7 @@
%%
%% This is file 'pxjahyper-ajm.def'.
%%
-%% Copyright (c) 2012-2023 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2012-2024 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -11,7 +11,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesFile{pxjahyper-ajm.def}[2023/03/01 v1.3]
+\ProvidesFile{pxjahyper-ajm.def}[2024/08/14 v1.4]
%% avoid multiple loading
\csname pxjahyperajmLoaded\endcsname
diff --git a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty
index 2d730c51511..dfbe94f8be3 100644
--- a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty
+++ b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty
@@ -1,7 +1,7 @@
%%
%% This is file 'pxjahyper-enc.sty'.
%%
-%% Copyright (c) 2012-2023 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2012-2024 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxjahyper-enc}[2023/03/01 v1.3]
+\ProvidesPackage{pxjahyper-enc}[2024/08/14 v1.4]
\def\pxhe@pkgname{pxjahyper-enc}
\providecommand{\bxDebug}[1]{}
diff --git a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def
index 4ce0174a9e2..dee65ec5d6e 100644
--- a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def
+++ b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def
@@ -1,7 +1,7 @@
%%
%% This is file 'pxjahyper-uni.def'.
%%
-%% Copyright (c) 2012-2023 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2012-2024 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesFile{pxjahyper-uni.def}[2023/03/01 v1.3]
+\ProvidesFile{pxjahyper-uni.def}[2024/08/14 v1.4]
\providecommand{\bxDebug}[1]{}
%--------------------------------------- environment check
diff --git a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty
index 9c3652b29f1..7cca26784cd 100644
--- a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty
+++ b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty
@@ -1,7 +1,7 @@
%%
%% This is file 'pxjahyper.sty'.
%%
-%% Copyright (c) 2012-2023 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2012-2024 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxjahyper}[2023/03/01 v1.3]
+\ProvidesPackage{pxjahyper}[2024/08/14 v1.4]
\def\pxhy@pkgname{pxjahyper}
\providecommand{\bxDebug}[1]{}
@@ -51,9 +51,12 @@
\newif\ifpxhy@otfmacros
\newif\ifpxhy@Uchar@avail
\newif\ifpxhy@ucs@avail
+\newif\ifpxhy@toucs@avail
\let\pxhy@jsclasses@name\relax
\newif\ifpxhy@jlreq@cls
\newif\ifpxhy@fallback@geta
+\newif\ifpxhy@fallback@warn
+\newif\ifpxhy@fallback@cidm
\newif\ifpxhy@extjis@map
\newif\ifpxhy@extjis@use
\newif\ifpxhy@ajhankaku@chars
@@ -91,7 +94,7 @@
\DeclareOption{resetdvidriver}{%
\let\pxhy@driver\@undefined
}
-\DeclareOption{autodvidriver}{%
+\DeclareOption{autodvidriver}{% DEPRECATED
\let\pxhy@driver\@undefined
}
\DeclareOption{auto}{% DEPRECATED
@@ -171,14 +174,15 @@
\DeclareOption{nootfmacros}{%
\pxhy@otfmacrosfalse
}
-\DeclareOption{fallback-geta}{%
+\DeclareOption{fallback-geta}{% DEPRECATED
\pxjahypersetup{fallback=geta}%
}
-\DeclareOption{fallback-delete}{%
+\DeclareOption{fallback-delete}{% DEPRECATED
\pxjahypersetup{fallback=delete}%
}
-\DeclareOption{force-unicode}{%
- \let\pxhy@force@unicode=t
+\DeclareOption{force-unicode}{% DEPRECATED
+ \PackageWarningNoLine\pxhy@pkgname
+ {'force-unicode' is DEPRECATED and ignored}%
}
\DeclareOption{disable-Ux}{% for debug
\let\pxhy@disable@Ux=t
@@ -194,6 +198,16 @@
}
\let\pxhy@kv@fallback@@geta\pxhy@fallback@getatrue
\let\pxhy@kv@fallback@@delete\pxhy@fallback@getafalse
+% 'fallback-warn=<bool>'
+\pxhy@fallback@warntrue
+\define@key{\pxhy@pkgname}{fallback-warn}[true]{%
+ \pxhy@handle@key{fallback-warn}{#1}{fallback@warn#1}%
+}
+% 'fallback-cidm=<bool>'
+\pxhy@fallback@cidmtrue
+\define@key{\pxhy@pkgname}{fallback-cidm}[true]{%
+ \pxhy@handle@key{fallback-cidm}{#1}{fallback@cidm#1}%
+}
% 'extjis=<bool>'
\pxhy@extjis@usetrue
\define@key{\pxhy@pkgname}{extjis}[true]{%
@@ -289,6 +303,8 @@
\pxhy@check\Uchar{\pxhy@Uchar@availtrue}
%% pxhy@ucs@avail switch
\pxhy@check\ucs{\pxhy@ucs@availtrue}
+%% pxhy@toucs@avail switch
+\pxhy@check\toucs{\pxhy@toucs@availtrue}
%% pxhy@extjis@map switch
% Note that 'tounicode' is necessary.
@@ -311,6 +327,8 @@
\@ifl@t@r\fmtversion{2021/11/15}{%
\chardef\pxhy@hook@system=2
}{\@ifl@t@r\fmtversion{2020/02/02}{%
+ % NB. We need to support this intermediate version, because
+ % the hook order matters here.
\chardef\pxhy@hook@system=1
}{}}
@@ -328,13 +346,7 @@
\pxhy@uniescapetrue
\fi\fi
-% hyperref 'unicode' is allowed only on upLaTeX.
-\ifnum0\ifpxhy@hy@unicode\ifpxhy@uptex\else
- \ifx t\pxhy@force@unicode\else1\fi\fi\fi>\z@
-% \PackageWarningNoLine\pxhy@pkgname
-% {The support for the hyperref 'unicode' mode\MessageBreak
-% on the pTeX engine is currently experimental}%
-\fi
+% hyperref 'unicode' mode
\ifpxhy@hy@unicode
\pxhy@uniescapefalse
%\pxhy@otfutftrue
@@ -429,8 +441,7 @@ pxhy@fallback@geta = \ifpxhy@fallback@geta true\else false\fi^^J%
\fi
%% \pxhy@geta : GETA MARK
-\pxhy@get@jchar{\jis"222E}
-\let\pxhy@geta\pxhy@jchar
+\pxhy@let@jchar@jc\pxhy@geta{222E}
%% \pxhy@print@geta
\def\pxhy@print@geta{%
@@ -472,6 +483,25 @@ pxhy@fallback@geta = \ifpxhy@fallback@geta true\else false\fi^^J%
#1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi
}
+%% \pxhy@ifempty{<text>}{<true>}{<false>}
+\def\pxhy@ifempty#1{%
+ \pxhy@cond\ifx\pxhy@mt#1\pxhy@mt\fi
+}
+
+%% \pxhy@read@num{<text>}\CScont
+\def\pxhy@read@num#1{%
+ \expandafter\pxhy@read@num@a\number#1\pxhy@mk#1\pxhy@mk#1\pxhy@mk
+}
+\def\pxhy@read@num@a#1#2\pxhy@mk{%
+ \expandafter\pxhy@read@num@b\romannumeral\if-#1\else-\fi
+}
+\def\pxhy@read@num@b#1\pxhy@mk#2\pxhy@mk{%
+ \expandafter\pxhy@read@num@c\number\pxhy@ifempty{#1}{#2}{}\pxhy@mk
+}
+\def\pxhy@read@num@c#1\pxhy@mk#2{%
+ \pxhy@cond\ifnum#1<\z@\fi{#2{0}}{#2{#1}}%
+}
+
%--------------------------------------- Helpers (e-TeX)
\ifpxhy@etex
@@ -748,6 +778,47 @@ pxhy@fallback@geta = \ifpxhy@fallback@geta true\else false\fi^^J%
\noexpand\pxhy@uchex@out{\pxhy@uc@REPL}%
}
+%--------------------------------------- Unavailable characters
+
+%%<+> \pxjahyperBadCharacter{<label>}
+\newcommand*\pxjahyperBadCharacter[1]{%
+ \ifpxhy@fallback@warn
+ % issue a warning
+ \pxhy@bad@character@a{#1}%
+ \fi
+ \pxhy@print@geta
+}
+\def\pxhy@bad@character@a#1{%
+ % Here the control sequence with name <label> is supposed to be
+ % undefined. This token is intentionally left in the stream.
+ % Then this unknown token will be detected by the hyperref process
+ % and cause it to issue an warning
+ % "Token not allowed in a PDF string (... removing `\<label>'".
+ \expandafter\ifx\csname<#1>\endcsname\relax
+ \csname<#1>\endcsname
+ % If the token should be defined, it is replaced for safety.
+ \else \csname pxhy@<#1>\endcsname
+ \fi
+}
+
+%% \pxhy@fallback@num{<prefix>}<fast>{<number>}
+% Makes a bad character with label '<prefix><number>', after parsing
+% the given number input.
+\def\pxhy@fallback@num#1#2#3{%
+ \ifpxhy@fallback@warn
+ \if t#2%
+ \expandafter\pxhy@fallback@num@a\expandafter{\number#3}{#1}%
+ \else
+ \pxhy@read@num{#3}\pxhy@fallback@num@a{#1}%
+ \fi
+ \else
+ \pxjahyperBadCharacter{}%
+ \fi
+}
+\def\pxhy@fallback@num@a#1#2{%
+ \pxjahyperBadCharacter{#2#1}%
+}
+
%--------------------------------------- Hooks to pdfstringdef
%% variables
@@ -760,6 +831,7 @@ pxhy@fallback@geta = \ifpxhy@fallback@geta true\else false\fi^^J%
\ifpxhy@hy@unicode %<*unicode>
%% \pxhy@Ux
+ % In hyperref "unicode" mode, \unichar is used.
\def\pxhy@Ux{\pxhy@uchex}%
\pxhy@utfXVIfalse
\def\pxhy@uchex@out#1{%
@@ -770,6 +842,7 @@ pxhy@fallback@geta = \ifpxhy@fallback@geta true\else false\fi^^J%
\ifpxhy@uptex
%% \pxhy@Ux
+ % On upTeX with \Uchar, \Uchar is used.
\def\pxhy@Ux{\pxhy@uchex}
\pxhy@utfXVIfalse
\def\pxhy@uchex@out#1{\Uchar"#1 }
@@ -777,29 +850,31 @@ pxhy@fallback@geta = \ifpxhy@fallback@geta true\else false\fi^^J%
\else\ifpxhy@ucs@avail
%% \pxhy@Ux
+ % On pTeX with \Uchar and \ucs, we convert the Unicode value to
+ % an internal-code value (using \ucs) and apply \Uchar to it.
\def\pxhy@Ux{\pxhy@uchex}
\pxhy@utfXVIfalse
\def\pxhy@uchex@out#1{%
\expandafter\pxhy@uchex@out@a\ucs"#1\pxhy@mk{#1}%
}
\chardef\pxhy@max@asc="7F
- \def\pxhy@uchex@out@a#1\pxhy@mk#2{%
- \ifnum#1<\z@
- \ifnum"#2>\pxhy@max@asc
+ \def\pxhy@uchex@out@a#1\pxhy@mk#2{% #1:internal #2:Unicode
+ \ifnum#1<\z@ % not in internal (or JIS)
+ \ifnum"#2>\pxhy@max@asc % not ASCII
\ifpxhy@extjis@use
+ % try special conversion
\expandafter\pxhy@uchex@out@b\csname
pxhy@uc/\number"#2\endcsname{#2}%
\else \pxhy@uchex@out@b\relax{#2}%
\fi
- \else \Uchar"#2
+ \else \Uchar"#2 % ASCII
\fi
- \else \Uchar#1
+ \else \Uchar#1 % in internal-code
\fi
}
- \def\pxhy@uchex@out@b#1#2{%
- \ifx#1\relax
- \@nameuse{U+#2}%
- \pxhy@print@geta
+ \def\pxhy@uchex@out@b#1#2{% #2:Unicode
+ \ifx#1\relax % not supported
+ \pxjahyperBadCharacter{U+#2}%
\else #1%
\fi
}
@@ -808,6 +883,9 @@ pxhy@fallback@geta = \ifpxhy@fallback@geta true\else false\fi^^J%
\else\ifpxhy@uptex %<*upTeX>
%% \pxhy@Ux
+ % On upTeX without \Uchar, we convert the Unicode value to a ja-char
+ % token using \pxhy@get@jchar, which is not fully expandable.
+ % So we need \pdfstringdefPostHook.
\def\pxhy@Ux{\pxhy@uchex}%
\pxhy@utfXVIfalse
@@ -912,7 +990,7 @@ pxhy@fallback@geta = \ifpxhy@fallback@geta true\else false\fi^^J%
\fi
%--------------------------------------- Fix for high-byte protection
-\ifpxhy@etex
+\ifpxhy@hy@unicode\else \ifpxhy@etex
\begingroup
% Check for high-byte protection.
\catcode"EF=\active \catcode`\^=7
@@ -949,7 +1027,7 @@ pxhy@fallback@geta = \ifpxhy@fallback@geta true\else false\fi^^J%
\fi
\endgroup
-\fi
+\fi\fi
%--------------------------------------- Support for 'otfutf'
\ifpxhy@otfutf
@@ -960,8 +1038,7 @@ pxhy@fallback@geta = \ifpxhy@fallback@geta true\else false\fi^^J%
\def\pxhy@UTF{\pxhy@uchex}
\pxhy@utfXVIfalse
\def\pxhy@uchex@out#1{%
- \@nameuse{U+#1}% issue a warning
- \pxhy@print@geta
+ \pxjahyperBadCharacter{U+#1}%
}
\else
\let\pxhy@UTF\pxhy@Ux
@@ -999,26 +1076,22 @@ pxhy@fallback@geta = \ifpxhy@fallback@geta true\else false\fi^^J%
%% \pxhy@CID{<cid>}
\def\pxhy@CID#1{%
- \expandafter\expandafter\expandafter\pxhy@cid@aux
- \bxjaCidToUcsHex{#1}\pxhy@mk{\pxhy@xdetokenize{#1}}%
+ \pxhy@triexpandafter\pxhy@cid@aux\bxjaCidToUcsHex{#1}@f{#1}%
}
%% \pxhy@fast@CID{<cid>}
\def\pxhy@fast@CID#1{%
- \expandafter\expandafter\expandafter\pxhy@cid@aux
- \bxjaFastCidToUcsHex{#1}\pxhy@mk{\number#1}%
+ \pxhy@triexpandafter\pxhy@cid@aux\bxjaFastCidToUcsHex{#1}@t{#1}%
}
\ifx\pxhy@Ux\@undefined
- \def\pxhy@cid@aux#1\pxhy@mk#2{%
- \@nameuse{CID+#2}% issue a warning
- \pxhy@print@geta
+ \def\pxhy@cid@aux#1@#2#3{%
+ \pxhy@fallback@num{CID+}#2{#3}%
}
\else
-\def\pxhy@cid@aux#1\pxhy@mk#2{%
+\def\pxhy@cid@aux#1@#2#3{%
\ifnum"#1>\z@
\pxhy@Ux{#1}%
\else
- \@nameuse{CID+#2}%
- \pxhy@print@geta
+ \pxhy@fallback@num{CID+}#2{#3}%
\fi
}
\fi
@@ -1059,11 +1132,30 @@ pxhy@fallback@geta = \ifpxhy@fallback@geta true\else false\fi^^J%
\fi
}
+%% \pxhy@CIDC{<cid>} / \pxhy@CIDK{<cid>} / \pxhy@CIDT{<cid>}
+\def\pxhy@CIDC{\pxhy@fallback@num{CIDC+}f}
+\def\pxhy@CIDK{\pxhy@fallback@num{CIDK+}f}
+\def\pxhy@CIDT{\pxhy@fallback@num{CIDT+}f}
+
+%% \pxhy@dispatch@fallback@cidm
+\@onlypreamble\pxhy@dispatch@fallback@cidm
+\def\pxhy@dispatch@fallback@cidm{%
+ \global\let\pxhy@dispatch@fallback@cidm\relax
+ \ltx@GlobalPrependToMacro\pdfstringdefPreHook{%
+ \ifpxhy@fallback@cidm
+ \let\CIDC\pxhy@CIDC
+ \let\CIDK\pxhy@CIDK
+ \let\CIDT\pxhy@CIDT
+ \fi
+ }%
+}
+
%% enable hooks
\pxhy@hook@after@package{otf}{\pxhy@dispatch@otfcid}
\ifpxhy@otfmacros
\pxhy@hook@after@package{ajmacros}{\pxhy@dispatch@otfmacros}
\fi
+\pxhy@hook@after@package{mlcid}{\pxhy@dispatch@fallback@cidm}
\fi
%--------------------------------------- Extended JIS mapping
@@ -1161,6 +1253,7 @@ pxhy@fallback@geta = \ifpxhy@fallback@geta true\else false\fi^^J%
%%<+> \pxDeclarePdfTextCommand{\CS}{<jis>}{<ucs>}
\@onlypreamble\pxDeclarePdfTextCommand
\newcommand*\pxDeclarePdfTextCommand[3]{%
+ \pxhy@prepare@txtcmd#1%
\pxhy@decl@pdf@tc{#2}{#3}%
{\DeclareTextCommand{#1}{\pxhy@pdfenc}}%
{\pxhy@revoke@pdf@tc{#1}}%
@@ -1169,6 +1262,7 @@ pxhy@fallback@geta = \ifpxhy@fallback@geta true\else false\fi^^J%
%%<+> \pxDeclarePdfTextComposite{\CS}{<arg>}{<jis>}{<ucs>}
\@onlypreamble\pxDeclarePdfTextComposite
\newcommand*\pxDeclarePdfTextComposite[4]{%
+ \pxhy@prepare@txtcmd#1%
\pxhy@decl@pdf@tc{#3}{#4}%
{\DeclareTextCompositeCommand{#1}{\pxhy@pdfenc}{#2}}%
{\pxhy@revoke@pdf@tcc{#1}{#2}}%
@@ -1202,8 +1296,8 @@ pxhy@fallback@geta = \ifpxhy@fallback@geta true\else false\fi^^J%
%% \pxhy@decl@pdf@tc
\@onlypreamble\pxhy@decl@pdf@tc
\def\pxhy@decl@pdf@tc#1#2{%
- \edef\pxhy@next{{#1}{\ifx\pxhy@mt#2\pxhy@mt FFFD\else#2\fi}}%
- \expandafter\pxhy@get@body\pxhy@next
+ \edef\pxhy@next{{#1}{#2}}%
+ \uppercase\expandafter{\expandafter\pxhy@get@body\pxhy@next}%
\ifx\pxhy@body\@undefined
\let\pxhy@next\@secondoftwo
\else
@@ -1217,21 +1311,60 @@ pxhy@fallback@geta = \ifpxhy@fallback@geta true\else false\fi^^J%
#2{#1}%
}
+%% \pxhy@prepare@txtcmd\CS
+% If \CS is defined and not an encoding-aware command,
+% let \[?\CS] be equivalent to \CS, so that doing
+% \DeclareTextCommand\CS... will keep the original meaning of \CS.
+\@onlypreamble\pxhy@prepare@txtcmd
+\def\pxhy@next#1#2\pxhy@end{%#1='\',#2='cmd'
+ \def\pxhy@prepare@txtcmd##1{%
+ \ifx##1\@undefined\else
+ \def\pxhy@tmpb{\pxhy@prepare@txtcmd@c##1}%
+ \expandafter\pxhy@prepare@txtcmd@a\meaning##1{}->#1 \pxhy@end
+ \fi
+ }%
+ \def\pxhy@prepare@txtcmd@a##1->#1##2 ##3\pxhy@end{%
+ \pxhy@prepare@txtcmd@b##2_{}-#2_\pxhy@end
+ }%
+ \def\pxhy@prepare@txtcmd@b##1-#2_##2\pxhy@end{%
+ % if not an encoding-aware command...
+ \ifx\pxhy@mt##2\pxhy@mt \pxhy@tmpb \fi
+ }%
+}\expandafter\pxhy@next\string\cmd\pxhy@end
+\def\pxhy@prepare@txtcmd@c#1{%
+ \expandafter\let\csname?\string#1\endcsname#1%
+}
+
%% \pxhy@get@body{<jis>}{<ucs>}
\@onlypreamble\pxhy@get@body
+\@onlypreamble\pxhy@get@body@a
+\def\pxhy@get@body#1#2{%
+ \edef\pxhy@next{%
+ {\ifx\pxhy@mt#1\pxhy@mt -1\else \jis"#1\fi}%
+ {\ifx\pxhy@mt#2\pxhy@mt
+ \ifx\pxhy@mt#1\pxhy@mt -1%
+ \else\ifpxhy@uptex \jis"#1%
+ \else\ifpxhy@toucs@avail \toucs\jis"#1%
+ \else -1\fi\fi\fi
+ \else \number"#2%
+ \fi}}%
+ \expandafter\pxhy@get@body@a\pxhy@next
+}
\ifpxhy@uptex %<*upTeX>
- \def\pxhy@get@body#1#2{%
- \pxhy@get@jchar{\ucs"#2}%
+ \def\pxhy@get@body@a#1#2{%
+ \pxhy@get@jchar{\ifnum#2<\z@ "FFFD\else#2\fi}%
\let\pxhy@body\pxhy@jchar
}%
\else\ifpxhy@hy@unicode %<*unicode>
- \def\pxhy@get@body#1#2{%
- \def\pxhy@body{\unichar{"#2}}%
+ \def\pxhy@get@body@a#1#2{%
+ \edef\pxhy@body{%
+ \noexpand\unichar{\ifnum#2<\z@ "FFFD\else#2\fi}}%
}%
\else\ifpxhy@uniescape %<*uniescape>
\def\pxhy@get@body#1#2{%
\ifx\pxhy@mt#1\pxhy@mt
- \def\pxhy@body{\0x#2}%
+ \edef\pxhy@body{\noexpand\0x%
+ \ifx\pxhy@mt#2\pxhy@mt FFFD\else#2\fi}%
\else
\pxhy@get@jchar{\jis"#1}%
\let\pxhy@body\pxhy@jchar
@@ -1239,14 +1372,14 @@ pxhy@fallback@geta = \ifpxhy@fallback@geta true\else false\fi^^J%
}%
\else %<*!>
\chardef\pxhy@cc@jis@only=1
- \def\pxhy@get@body#1#2{%
- \ifx\pxhy@mt#1\pxhy@mt
- \let\pxhy@body\@undefined
- \else
- \pxhy@get@jchar{\jis"#1}%
- \let\pxhy@body\pxhy@jchar
- \fi
- }%
+ \def\pxhy@get@body@a#1#2{%
+ \ifnum#1<\z@
+ \let\pxhy@body\@undefined
+ \else
+ \pxhy@get@jchar{#1}%
+ \let\pxhy@body\pxhy@jchar
+ \fi
+ }%
\fi\fi\fi %</>
%%%%%%%%%%%%%%%%%%%% the definitions
@@ -1695,14 +1828,14 @@ pxhy@fallback@geta = \ifpxhy@fallback@geta true\else false\fi^^J%
%% register to 'disable' list
\ltx@GlobalPrependToMacro\pdfstringdefPreHook{\pxhy@disable@tc@commands}
-\else %<*!textcmd>
+\else %<*!charcmds>
\@onlypreamble\pxDeclarePdfTextCommand
\newcommand*\pxDeclarePdfTextCommand[3]{}
\@onlypreamble\pxDeclarePdfTextComposite
\newcommand*\pxDeclarePdfTextComposite[4]{}
-\fi %</textcmd>
+\fi %</charcmds>
%--------------------------------------- Enable hyperref unicode
\ifpxhy@hy@unicode
diff --git a/Master/texmf-dist/tex4ht/ht-fonts/unicode/TeXvect10/vect10.htf b/Master/texmf-dist/tex4ht/ht-fonts/unicode/TeXvect10/vect10.htf
new file mode 100644
index 00000000000..901b3012987
--- /dev/null
+++ b/Master/texmf-dist/tex4ht/ht-fonts/unicode/TeXvect10/vect10.htf
@@ -0,0 +1,53 @@
+vect10 0 47
+'&#x60;' '' grave 0 % generated from vect10.tfm, 2024-07-31-11:51
+'&#x00B4;' '' acute 1 % Copyright 2024 TeX Users Group
+'&#x02C6;' '' circumflex 2 %
+'&#x02DC;' '' tilde 3 % This work may be distributed and/or modified under the
+'&#x00A8;' '' dieresis 4 % conditions of the LaTeX Project Public License, either
+'&#x02DD;' '' hungarumlaut 5 % version 1.3c of this license or (at your option) any
+'&#x02DA;' '' ring 6 % later version. The latest version of this license is in
+'&#x02C7;' '' caron 7 % http://www.latex-project.org/lppl.txt
+'&#x02D8;' '' breve 8 % 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>.
+'' '' %
+'&#x201C;' '' quotedblleft 16 % If you modify this program, changing the
+'&#x201D;' '' quotedblright 17 % version identification would be appreciated.
+'&#x201E;' '' quotedblbase 18
+'&#x00AB;' '' guillemotleft 19
+'&#x00BB;' '' guillemotright 20
+'&#x2013;' '' endash 21
+'&#x2014;' '' emdash 22
+'&#x200C;' '' cwm 23
+'&#x2030;' '' perthousand 24
+'' ''
+'' ''
+'' ''
+'' ''
+'' ''
+'' ''
+'' ''
+' ' '' space 32
+'!' '' exclam 33
+'"' '' quotedbl 34
+'#' '' numbersign 35
+'$' '' dollar 36
+'%' '' percent 37
+'&amp;' '' ampersand 38
+'&#x2019;' '' quoteright 39
+'(' '' parenleft 40
+')' '' parenright 41
+'*' '' asterisk 42
+'+' '' plus 43
+',' '' comma 44
+'-' '' hyphen 45
+'.' '' period 46
+'/' '' slash 47
+vect10 0 47
+htfcss: vect10 font-family: 'TeXvect10', serif;
+
+
diff --git a/Master/texmf-dist/web2c/updmap.cfg b/Master/texmf-dist/web2c/updmap.cfg
index 85aac71c5ee..ab5c7e03331 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 Jul 9 01:40:24 2024
+# Generated by /home/texlive/karl/Master/bin/x86_64-linux/tlmgr on Thu Aug 8 01:40:23 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
@@ -352,6 +352,7 @@ Map mdsymbol.map
Map merriweather.map
Map troff-updmap.map
Map metsymb.map
+Map MFBOldstyle.map
MixedMap mflogo.map
Map miama.map
Map mintspirit.map